diff --git a/README.md b/README.md index 3f2ff48dd92..9714bbd1ab3 100644 --- a/README.md +++ b/README.md @@ -12,12 +12,12 @@ build daemon as so-called channels. To get channel information via git, add ``` For stability and maximum binary package support, it is recommended to maintain -custom changes on top of one of the channels, e.g. `nixos-17.09` for the latest +custom changes on top of one of the channels, e.g. `nixos-18.03` for the latest release and `nixos-unstable` for the latest successful build of master: ``` % git remote update channels -% git rebase channels/nixos-17.09 +% git rebase channels/nixos-18.03 ``` For pull-requests, please rebase onto nixpkgs `master`. @@ -31,9 +31,9 @@ For pull-requests, please rebase onto nixpkgs `master`. * [Manual (NixOS)](https://nixos.org/nixos/manual/) * [Community maintained wiki](https://nixos.wiki/) * [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined) -* [Continuous package builds for 17.09 release](https://hydra.nixos.org/jobset/nixos/release-17.09) +* [Continuous package builds for 18.03 release](https://hydra.nixos.org/jobset/nixos/release-18.03) * [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents) -* [Tests for 17.09 release](https://hydra.nixos.org/job/nixos/release-17.09/tested#tabs-constituents) +* [Tests for 18.03 release](https://hydra.nixos.org/job/nixos/release-18.03/tested#tabs-constituents) Communication: diff --git a/doc/.gitignore b/doc/.gitignore new file mode 100644 index 00000000000..d0ba103fa9f --- /dev/null +++ b/doc/.gitignore @@ -0,0 +1,6 @@ +*.chapter.xml +*.section.xml +.version +out +manual-full.xml +highlightjs diff --git a/doc/Makefile b/doc/Makefile new file mode 100644 index 00000000000..0ddae8631f3 --- /dev/null +++ b/doc/Makefile @@ -0,0 +1,90 @@ +MD_TARGETS=$(addsuffix .xml, $(basename $(wildcard ./*.md ./**/*.md))) + +.PHONY: all +all: validate out/html/index.html out/epub/manual.epub + +.PHONY: debug +debug: + nix-shell --run "xmloscopy --docbook5 ./manual.xml ./manual-full.xml" + +.PHONY: clean +clean: + rm -f ${MD_TARGETS} .version manual-full.xml + rm -rf ./out/ ./highlightjs + +.PHONY: validate +validate: manual-full.xml + jing "$$RNG" manual-full.xml + +out/html/index.html: manual-full.xml style.css highlightjs + mkdir -p out/html + xsltproc ${xsltFlags} \ + --nonet --xinclude \ + --output $@ \ + "$$XSL/docbook/xhtml/docbook.xsl" \ + ./manual-full.xml + + mkdir -p out/html/highlightjs/ + cp -r highlightjs out/html/ + + cp ./overrides.css out/html/ + cp ./style.css out/html/style.css + + mkdir -p out/html/images/callouts + cp "$$XSL/docbook/images/callouts/"*.svg out/html/images/callouts/ + chmod u+w -R out/html/ + +out/epub/manual.epub: manual-full.xml + mkdir -p out/epub/scratch + xsltproc ${xsltFlags} --nonet \ + --output out/epub/scratch/ \ + "$$XSL/docbook/epub/docbook.xsl" \ + ./manual-full.xml + + cp ./overrides.css out/epub/scratch/OEBPS + cp ./style.css out/epub/scratch/OEBPS + mkdir -p out/epub/scratch/OEBPS/images/callouts/ + cp "$$XSL/docbook/images/callouts/"*.svg out/epub/scratch/OEBPS/images/callouts/ + echo "application/epub+zip" > mimetype + zip -0Xq "out/epub/manual.epub" mimetype + rm mimetype + cd "out/epub/scratch/" && zip -Xr9D "../manual.epub" * + rm -rf "out/epub/scratch/" + +highlightjs: + mkdir -p highlightjs + cp -r "$$HIGHLIGHTJS/highlight.pack.js" highlightjs/ + cp -r "$$HIGHLIGHTJS/LICENSE" highlightjs/ + cp -r "$$HIGHLIGHTJS/mono-blue.css" highlightjs/ + cp -r "$$HIGHLIGHTJS/loader.js" highlightjs/ + + +manual-full.xml: ${MD_TARGETS} .version *.xml + xmllint --nonet --xinclude --noxincludenode manual.xml --output manual-full.xml + +.version: + nix-instantiate --eval \ + -E '(import ../lib).nixpkgsVersion' > .version + +%.section.xml: %.section.md + pandoc $^ -w docbook+smart \ + -f markdown+smart \ + | sed -e 's|||' \ + -e 's|||' \ + -e '1s| id=| xml:id=|' \ + -e '1s|\(<[^ ]* \)|\1xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" |' \ + | cat > $@ + +%.chapter.xml: %.chapter.md + pandoc $^ -w docbook+smart \ + --top-level-division=chapter \ + -f markdown+smart \ + | sed -e 's|||' \ + -e 's|||' \ + -e '1s| id=| xml:id=|' \ + -e '1s|\(<[^ ]* \)|\1|' \ + | cat > $@ diff --git a/doc/contributing.xml b/doc/contributing.xml index a83059aa36e..7aa0df271ff 100644 --- a/doc/contributing.xml +++ b/doc/contributing.xml @@ -6,12 +6,27 @@ The DocBook sources of the Nixpkgs manual are in the doc -subdirectory of the Nixpkgs repository. If you make modifications to -the manual, it's important to build it before committing. You can do that as follows: +subdirectory of the Nixpkgs repository. + +You can quickly check your edits with make: -$ cd /path/to/nixpkgs -$ nix-build doc + $ cd /path/to/nixpkgs/doc + $ nix-shell + [nix-shell]$ make + + +If you experience problems, run make debug +to help understand the docbook errors. + +After making modifications to the manual, it's important to +build it before committing. You can do that as follows: + + + $ cd /path/to/nixpkgs/doc + $ nix-shell + [nix-shell]$ make clean + [nix-shell]$ nix-build . If the build succeeds, the manual will be in diff --git a/doc/default.nix b/doc/default.nix index 60c613878c7..8abde58bb11 100644 --- a/doc/default.nix +++ b/doc/default.nix @@ -7,112 +7,41 @@ in pkgs.stdenv.mkDerivation { name = "nixpkgs-manual"; + buildInputs = with pkgs; [ pandoc libxml2 libxslt zip jing ]; - buildInputs = with pkgs; [ pandoc libxml2 libxslt zip ]; + src = ./.; - xsltFlags = '' - --param section.autolabel 1 - --param section.label.includes.component.label 1 - --param html.stylesheet 'style.css' - --param xref.with.number.and.title 1 - --param toc.section.depth 3 - --param admon.style ''' - --param callout.graphics.extension '.gif' + # Hacking on these variables? Make sure to close and open + # nix-shell between each test, maybe even: + # $ nix-shell --run "make clean all" + # otherwise they won't reapply :) + HIGHLIGHTJS = pkgs.documentation-highlighter; + XSL = "${pkgs.docbook5_xsl}/xml/xsl"; + RNG = "${pkgs.docbook5}/xml/rng/docbook/docbook.rng"; + xsltFlags = lib.concatStringsSep " " [ + "--param section.autolabel 1" + "--param section.label.includes.component.label 1" + "--stringparam html.stylesheet 'style.css overrides.css highlightjs/mono-blue.css'" + "--stringparam html.script './highlightjs/highlight.pack.js ./highlightjs/loader.js'" + "--param xref.with.number.and.title 1" + "--param toc.section.depth 3" + "--stringparam admon.style ''" + "--stringparam callout.graphics.extension .svg" + ]; + + postPatch = '' + echo ${lib.nixpkgsVersion} > .version ''; + installPhase = '' + dest="$out/share/doc/nixpkgs" + mkdir -p "$(dirname "$dest")" + mv out/html "$dest" + mv "$dest/index.html" "$dest/manual.html" - buildCommand = let toDocbook = { useChapters ? false, inputFile, outputFile }: - let - extraHeader = lib.optionalString (!useChapters) - ''xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" ''; - in '' - { - pandoc '${inputFile}' -w docbook+smart ${lib.optionalString useChapters "--top-level-division=chapter"} \ - -f markdown+smart \ - | sed -e 's|||' \ - -e 's|||' \ - -e '1s| id=| xml:id=|' \ - -e '1s|\(<[^ ]* \)|\1${extraHeader}|' - } > '${outputFile}' - ''; - in + mv out/epub/manual.epub "$dest/nixpkgs-manual.epub" - '' - ln -s '${sources}/'*.xml . - mkdir ./languages-frameworks - cp -s '${sources-langs}'/* ./languages-frameworks - '' - + toDocbook { - inputFile = ./introduction.md; - outputFile = "introduction.xml"; - useChapters = true; - } - + toDocbook { - inputFile = ./shell.md; - outputFile = "shell.xml"; - } - + toDocbook { - inputFile = ./languages-frameworks/python.md; - outputFile = "./languages-frameworks/python.xml"; - } - + toDocbook { - inputFile = ./languages-frameworks/haskell.md; - outputFile = "./languages-frameworks/haskell.xml"; - } - + toDocbook { - inputFile = ../pkgs/development/idris-modules/README.md; - outputFile = "languages-frameworks/idris.xml"; - } - + toDocbook { - inputFile = ../pkgs/development/node-packages/README.md; - outputFile = "languages-frameworks/node.xml"; - } - + toDocbook { - inputFile = ../pkgs/development/r-modules/README.md; - outputFile = "languages-frameworks/r.xml"; - } - + toDocbook { - inputFile = ./languages-frameworks/rust.md; - outputFile = "./languages-frameworks/rust.xml"; - } - + toDocbook { - inputFile = ./languages-frameworks/vim.md; - outputFile = "./languages-frameworks/vim.xml"; - } - + '' - echo ${lib.nixpkgsVersion} > .version - - # validate against relaxng schema - xmllint --nonet --xinclude --noxincludenode manual.xml --output manual-full.xml - ${pkgs.jing}/bin/jing ${pkgs.docbook5}/xml/rng/docbook/docbook.rng manual-full.xml - - dst=$out/share/doc/nixpkgs - mkdir -p $dst - xsltproc $xsltFlags --nonet --xinclude \ - --output $dst/manual.html \ - ${pkgs.docbook5_xsl}/xml/xsl/docbook/xhtml/docbook.xsl \ - ./manual.xml - - cp ${./style.css} $dst/style.css - - mkdir -p $dst/images/callouts - cp "${pkgs.docbook5_xsl}/xml/xsl/docbook/images/callouts/"*.gif $dst/images/callouts/ - - mkdir -p $out/nix-support - echo "doc manual $dst manual.html" >> $out/nix-support/hydra-build-products - - xsltproc $xsltFlags --nonet --xinclude \ - --output $dst/epub/ \ - ${pkgs.docbook5_xsl}/xml/xsl/docbook/epub/docbook.xsl \ - ./manual.xml - - cp -r $dst/images $dst/epub/OEBPS - echo "application/epub+zip" > mimetype - manual="$dst/nixpkgs-manual.epub" - zip -0Xq "$manual" mimetype - cd $dst/epub && zip -Xr9D "$manual" * - rm -rf $dst/epub + mkdir -p $out/nix-support/ + echo "doc manual $dest manual.html" >> $out/nix-support/hydra-build-products ''; } diff --git a/doc/introduction.md b/doc/introduction.chapter.md similarity index 100% rename from doc/introduction.md rename to doc/introduction.chapter.md diff --git a/doc/languages-frameworks/haskell.md b/doc/languages-frameworks/haskell.section.md similarity index 100% rename from doc/languages-frameworks/haskell.md rename to doc/languages-frameworks/haskell.section.md diff --git a/doc/languages-frameworks/idris.section.md b/doc/languages-frameworks/idris.section.md new file mode 100644 index 00000000000..005ed360285 --- /dev/null +++ b/doc/languages-frameworks/idris.section.md @@ -0,0 +1,39 @@ +Idris packages +============== + +This directory contains build rules for idris packages. In addition, +it contains several functions to build and compose those packages. +Everything is exposed to the user via the `idrisPackages` attribute. + +callPackage +------------ + +This is like the normal nixpkgs callPackage function, specialized to +idris packages. + +builtins +--------- + +This is a list of all of the libraries that come packaged with Idris +itself. + +build-idris-package +-------------------- + +A function to build an idris package. Its sole argument is a set like +you might pass to `stdenv.mkDerivation`, except `build-idris-package` +sets several attributes for you. See `build-idris-package.nix` for +details. + +build-builtin-package +---------------------- + +A version of `build-idris-package` specialized to builtin libraries. +Mostly for internal use. + +with-packages +------------- + +Bundle idris together with a list of packages. Because idris currently +only supports a single directory in its library path, you must include +all desired libraries here, including `prelude` and `base`. \ No newline at end of file diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml index fc15d847d15..188fbaa7599 100644 --- a/doc/languages-frameworks/index.xml +++ b/doc/languages-frameworks/index.xml @@ -17,19 +17,18 @@ such as Perl or Haskell. These are described in this chapter. - - + + - + - + - + - + - - + diff --git a/doc/languages-frameworks/node.section.md b/doc/languages-frameworks/node.section.md new file mode 100644 index 00000000000..17a203ed12b --- /dev/null +++ b/doc/languages-frameworks/node.section.md @@ -0,0 +1,51 @@ +Node.js packages +================ +The `pkgs/development/node-packages` folder contains a generated collection of +[NPM packages](https://npmjs.com/) that can be installed with the Nix package +manager. + +As a rule of thumb, the package set should only provide *end user* software +packages, such as command-line utilities. Libraries should only be added to the +package set if there is a non-NPM package that requires it. + +When it is desired to use NPM libraries in a development project, use the +`node2nix` generator directly on the `package.json` configuration file of the +project. + +The package set also provides support for multiple Node.js versions. The policy +is that a new package should be added to the collection for the latest stable LTS +release (which is currently 6.x), unless there is an explicit reason to support +a different release. + +If your package uses native addons, you need to examine what kind of native +build system it uses. Here are some examples: + +* `node-gyp` +* `node-gyp-builder` +* `node-pre-gyp` + +After you have identified the correct system, you need to override your package +expression while adding in build system as a build input. For example, `dat` +requires `node-gyp-build`, so we override its expression in `default-v6.nix`: + +```nix +dat = nodePackages.dat.override (oldAttrs: { + buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-gyp-build ]; +}); +``` + +To add a package from NPM to nixpkgs: + + 1. Modify `pkgs/development/node-packages/node-packages-v6.json` to add, update + or remove package entries. (Or `pkgs/development/node-packages/node-packages-v4.json` + for packages depending on Node.js 4.x) + 2. Run the script: `(cd pkgs/development/node-packages && ./generate.sh)`. + 3. Build your new package to test your changes: + `cd /path/to/nixpkgs && nix-build -A nodePackages.`. + To build against a specific Node.js version (e.g. 4.x): + `nix-build -A nodePackages_4_x.` + 4. Add and commit all modified and generated files. + +For more information about the generation process, consult the +[README.md](https://github.com/svanderburg/node2nix) file of the `node2nix` +tool. diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.section.md similarity index 98% rename from doc/languages-frameworks/python.md rename to doc/languages-frameworks/python.section.md index 039ca8545e9..0f871395854 100644 --- a/doc/languages-frameworks/python.md +++ b/doc/languages-frameworks/python.section.md @@ -871,8 +871,10 @@ Executing `python setup.py bdist_wheel` in a `nix-shell `fails with ``` ValueError: ZIP does not support timestamps before 1980 ``` -This is because files are included that depend on items in the Nix store which have a timestamp of, that is, it corresponds to January the 1st, 1970 at 00:00:00. And as the error informs you, ZIP does not support that. -The command `bdist_wheel` takes into account `SOURCE_DATE_EPOCH`, and `nix-shell` sets this to 1. By setting it to a value corresponding to 1980 or later, or by unsetting it, it is possible to build wheels. + +This is because files from the Nix store (which have a timestamp of the UNIX epoch of January 1, 1970) are included in the .ZIP, but .ZIP archives follow the DOS convention of counting timestamps from 1980. + +The command `bdist_wheel` reads the `SOURCE_DATE_EPOCH` environment variable, which `nix-shell` sets to 1. Unsetting this variable or giving it a value corresponding to 1980 or later enables building wheels. Use 1980 as timestamp: ```shell @@ -882,7 +884,7 @@ or the current time: ```shell nix-shell --run "SOURCE_DATE_EPOCH=$(date +%s) python3 setup.py bdist_wheel" ``` -or unset: +or unset `SOURCE_DATE_EPOCH`: ```shell nix-shell --run "unset SOURCE_DATE_EPOCH; python3 setup.py bdist_wheel" ``` diff --git a/doc/languages-frameworks/r.section.md b/doc/languages-frameworks/r.section.md new file mode 100644 index 00000000000..c8f02bd1478 --- /dev/null +++ b/doc/languages-frameworks/r.section.md @@ -0,0 +1,120 @@ +R packages +========== + +## Installation + +Define an environment for R that contains all the libraries that you'd like to +use by adding the following snippet to your $HOME/.config/nixpkgs/config.nix file: + +```nix +{ + packageOverrides = super: let self = super.pkgs; in + { + + rEnv = super.rWrapper.override { + packages = with self.rPackages; [ + devtools + ggplot2 + reshape2 + yaml + optparse + ]; + }; + }; +} +``` + +Then you can use `nix-env -f "" -iA rEnv` to install it into your user +profile. The set of available libraries can be discovered by running the +command `nix-env -f "" -qaP -A rPackages`. The first column from that +output is the name that has to be passed to rWrapper in the code snipped above. + +However, if you'd like to add a file to your project source to make the +environment available for other contributors, you can create a `default.nix` +file like so: +```nix +let + pkgs = import {}; + stdenv = pkgs.stdenv; +in with pkgs; { + myProject = stdenv.mkDerivation { + name = "myProject"; + version = "1"; + src = if pkgs.lib.inNixShell then null else nix; + + buildInputs = with rPackages; [ + R + ggplot2 + knitr + ]; + }; +} +``` +and then run `nix-shell .` to be dropped into a shell with those packages +available. + +## RStudio + +RStudio uses a standard set of packages and ignores any custom R +environments or installed packages you may have. To create a custom +environment, see `rstudioWrapper`, which functions similarly to +`rWrapper`: + +```nix +{ + packageOverrides = super: let self = super.pkgs; in + { + + rstudioEnv = super.rstudioWrapper.override { + packages = with self.rPackages; [ + dplyr + ggplot2 + reshape2 + ]; + }; + }; +} +``` + +Then like above, `nix-env -f "" -iA rstudioEnv` will install +this into your user profile. + +Alternatively, you can create a self-contained `shell.nix` without the need to +modify any configuration files: + +```nix +{ pkgs ? import {} +}: + +pkgs.rstudioWrapper.override { + packages = with pkgs.rPackages; [ dplyr ggplot2 reshape2 ]; +} + +``` + +Executing `nix-shell` will then drop you into an environment equivalent to the +one above. If you need additional packages just add them to the list and +re-enter the shell. + +## Updating the package set + +```bash +nix-shell generate-shell.nix + +Rscript generate-r-packages.R cran > cran-packages.nix.new +mv cran-packages.nix.new cran-packages.nix + +Rscript generate-r-packages.R bioc > bioc-packages.nix.new +mv bioc-packages.nix.new bioc-packages.nix +``` + +`generate-r-packages.R ` reads `-packages.nix`, therefor the renaming. + + +## Testing if the Nix-expression could be evaluated + +```bash +nix-build test-evaluation.nix --dry-run +``` + +If this exits fine, the expression is ok. If not, you have to edit `default.nix` diff --git a/doc/languages-frameworks/rust.md b/doc/languages-frameworks/rust.section.md similarity index 82% rename from doc/languages-frameworks/rust.md rename to doc/languages-frameworks/rust.section.md index f0498eac5b1..b77c41e9b22 100644 --- a/doc/languages-frameworks/rust.md +++ b/doc/languages-frameworks/rust.section.md @@ -16,6 +16,12 @@ cargo into the `environment.systemPackages` or bring them into scope with `nix-shell -p rustc cargo`. +> If you are using NixOS and you want to use rust without a nix expression you +> probably want to add the following in your `configuration.nix` to build +> crates with C dependencies. +> +> environment.systemPackages = [binutils gcc gnumake openssl pkgconfig] + For daily builds (beta and nightly) use either rustup from nixpkgs or use the [Rust nightlies overlay](#using-the-rust-nightlies-overlay). @@ -76,7 +82,7 @@ an example for a minimal `hello` crate: Compiling hello v0.1.0 (file:///tmp/hello) Finished dev [unoptimized + debuginfo] target(s) in 0.20 secs $ carnix -o hello.nix --src ./. Cargo.lock --standalone - $ nix-build hello.nix + $ nix-build hello.nix -A hello_0_1_0 Now, the file produced by the call to `carnix`, called `hello.nix`, looks like: @@ -276,6 +282,84 @@ features, we would write: Where `diesel.nix` is the file generated by Carnix, as explained above. + +## Setting Up `nix-shell` +Oftentimes you want to develop code from within `nix-shell`. Unfortunately +`buildRustCrate` does not support common `nix-shell` operations directly +(see [this issue](https://github.com/NixOS/nixpkgs/issues/37945)) +so we will use `stdenv.mkDerivation` instead. + +Using the example `hello` project above, we want to do the following: +- Have access to `cargo` and `rustc` +- Have the `openssl` library available to a crate through it's _normal_ + compilation mechanism (`pkg-config`). + +A typical `shell.nix` might look like: + +``` +with import {}; + +stdenv.mkDerivation { + name = "rust-env"; + buildInputs = [ + rustc cargo + + # Example Additional Dependencies + pkgconfig openssl + ]; + + # Set Environment Variables + RUST_BACKTRACE = 1; +} +``` + +You should now be able to run the following: +``` +$ nix-shell --pure +$ cargo build +$ cargo test +``` + +### Controlling Rust Version Inside `nix-shell` +To control your rust version (i.e. use nightly) from within `shell.nix` (or +other nix expressions) you can use the following `shell.nix` + +``` +# Latest Nightly +with import {}; +let src = fetchFromGitHub { + owner = "mozilla"; + repo = "nixpkgs-mozilla"; + # commit from: 2018-03-27 + rev = "2945b0b6b2fd19e7d23bac695afd65e320efcebe"; + sha256 = "034m1dryrzh2lmjvk3c0krgip652dql46w5yfwpvh7gavd3iypyw"; + }; +in +with import "${src.out}/rust-overlay.nix" pkgs pkgs; +stdenv.mkDerivation { + name = "rust-env"; + buildInputs = [ + # Note: to use use stable, just replace `nightly` with `stable` + latest.rustChannels.nightly.rust + + # Add some extra dependencies from `pkgs` + pkgconfig openssl + ]; + + # Set Environment Variables + RUST_BACKTRACE = 1; +} +``` + +Now run: +``` +$ rustc --version +rustc 1.26.0-nightly (188e693b3 2018-03-26) +``` + +To see that you are using nightly. + + ## Using the Rust nightlies overlay Mozilla provides an overlay for nixpkgs to bring a nightly version of Rust into scope. diff --git a/doc/languages-frameworks/vim.md b/doc/languages-frameworks/vim.section.md similarity index 100% rename from doc/languages-frameworks/vim.md rename to doc/languages-frameworks/vim.section.md diff --git a/doc/manual.xml b/doc/manual.xml index eb0a24789d4..385079eb578 100644 --- a/doc/manual.xml +++ b/doc/manual.xml @@ -9,7 +9,7 @@ - + diff --git a/doc/multiple-output.xml b/doc/multiple-output.xml index 2f23da8df01..277d3d81413 100644 --- a/doc/multiple-output.xml +++ b/doc/multiple-output.xml @@ -36,10 +36,16 @@ Here you find how to write a derivation that produces multiple outputs. In nixpkgs there is a framework supporting multiple-output derivations. It tries to cover most cases by default behavior. You can find the source separated in <nixpkgs/pkgs/build-support/setup-hooks/multiple-outputs.sh>; it's relatively well-readable. The whole machinery is triggered by defining the outputs attribute to contain the list of desired output names (strings). outputs = [ "bin" "dev" "out" "doc" ]; - Often such a single line is enough. For each output an equally named environment variable is passed to the builder and contains the path in nix store for that output. By convention, the first output should contain the executable programs provided by the package as that output is used by Nix in string conversions, allowing references to binaries like ${pkgs.perl}/bin/perl to always work. Typically you also want to have the main out output, as it catches any files that didn't get elsewhere. - + Often such a single line is enough. For each output an equally named environment variable is passed to the builder and contains the path in nix store for that output. Typically you also want to have the main out output, as it catches any files that didn't get elsewhere. There is a special handling of the debug output, described at . +
+ <quote>Binaries first</quote> + A commonly adopted convention in nixpkgs is that executables provided by the package are contained within its first output. This convention allows the dependent packages to reference the executables provided by packages in a uniform manner. For instance, provided with the knowledge that the perl package contains a perl executable it can be referenced as ${pkgs.perl}/bin/perl within a Nix derivation that needs to execute a Perl script. + The glibc package is a deliberate single exception to the binaries first convention. The glibc has libs as its first output allowing the libraries provided by glibc to be referenced directly (e.g. ${stdenv.glibc}/lib/ld-linux-x86-64.so.2). The executables provided by glibc can be accessed via its bin attribute (e.g. ${stdenv.glibc.bin}/bin/ldd). + The reason for why glibc deviates from the convention is because referencing a library provided by glibc is a very common operation among Nix packages. For instance, third-party executables packaged by Nix are typically patched and relinked with the relevant version of glibc libraries from Nix packages (please see the documentation on patchelf for more details). +
+
File type groups The support code currently recognizes some particular kinds of outputs and either instructs the build system of the package to put files into their desired outputs or it moves the files during the fixup phase. Each group of file types has an outputFoo variable specifying the output name where they should go. If that variable isn't defined by the derivation writer, it is guessed – a default output name is defined, falling back to other possibilities if the output isn't defined. diff --git a/doc/overrides.css b/doc/overrides.css new file mode 100644 index 00000000000..4c7d4a31be2 --- /dev/null +++ b/doc/overrides.css @@ -0,0 +1,9 @@ +.docbook .xref img[src^=images\/callouts\/], +.screen img, +.programlisting img { + width: 1em; +} + +.calloutlist img { + width: 1.5em; +} diff --git a/doc/shell.nix b/doc/shell.nix new file mode 100644 index 00000000000..22590142ee1 --- /dev/null +++ b/doc/shell.nix @@ -0,0 +1,4 @@ +{ pkgs ? import ../. {} }: +(import ./default.nix).overrideAttrs (x: { + buildInputs = x.buildInputs ++ [ pkgs.xmloscopy ]; +}) diff --git a/doc/shell.md b/doc/shell.section.md similarity index 97% rename from doc/shell.md rename to doc/shell.section.md index 079574d4ae8..cb8832a814f 100644 --- a/doc/shell.md +++ b/doc/shell.section.md @@ -4,6 +4,8 @@ author: zimbatm date: 2017-10-30 --- +# mkShell + pkgs.mkShell is a special kind of derivation that is only useful when using it combined with nix-shell. It will in fact fail to instantiate when invoked with nix-build. diff --git a/doc/style.css b/doc/style.css index ac76a64bbb2..0db907815b6 100644 --- a/doc/style.css +++ b/doc/style.css @@ -29,8 +29,8 @@ h2 /* chapters, appendices, subtitle */ } /* Extra space between chapters, appendices. */ -div.chapter > div.titlepage h2, div.appendix > div.titlepage h2 -{ +div.chapter > div.titlepage h2, div.appendix > div.titlepage h2 +{ margin-top: 1.5em; } @@ -104,7 +104,7 @@ pre.screen, pre.programlisting padding: 3px 3px; margin-left: 1.5em; margin-right: 1.5em; - color: #600000; + background: #f4f4f8; font-family: monospace; border-radius: 0.4em; @@ -118,7 +118,6 @@ div.example pre.programlisting margin: 0 0 0 0; } - /*************************************************************************** Notes, warnings etc: ***************************************************************************/ @@ -172,7 +171,7 @@ div.navfooter * /*************************************************************************** - Links colors and highlighting: + Links colors and highlighting: ***************************************************************************/ a { text-decoration: none; } @@ -209,7 +208,7 @@ tt, code .term { font-weight: bold; - + } div.variablelist dd p, div.glosslist dd p @@ -249,7 +248,24 @@ table box-shadow: 0.4em 0.4em 0.5em #e0e0e0; } +table.simplelist +{ + text-align: left; + color: #005aa0; + border: 0; + padding: 5px; + background: #fffff5; + font-weight: normal; + font-style: italic; + box-shadow: none; + margin-bottom: 1em; +} + +div.navheader table, div.navfooter table { + box-shadow: none; +} + div.affiliation { font-style: italic; -} \ No newline at end of file +} diff --git a/lib/default.nix b/lib/default.nix index b5ccc3b5144..cbe0a0ba21b 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -21,7 +21,7 @@ let # packaging customisation = callLibs ./customisation.nix; - maintainers = import ./maintainers-list.nix; + maintainers = import ../maintainers/maintainer-list.nix; meta = callLibs ./meta.nix; sources = callLibs ./sources.nix; versions = callLibs ./versions.nix; diff --git a/lib/modules.nix b/lib/modules.nix index 654c4c588de..acd07f732bd 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -660,7 +660,7 @@ rec { doRename = { from, to, visible, warn, use }: let toOf = attrByPath to - (abort "Renaming error: option `${showOption to}' does not exists."); + (abort "Renaming error: option `${showOption to}' does not exist."); in { config, options, ... }: { options = setAttrByPath from (mkOption { diff --git a/lib/systems/for-meta.nix b/lib/systems/for-meta.nix index 68c68c2cd36..e2239ad6917 100644 --- a/lib/systems/for-meta.nix +++ b/lib/systems/for-meta.nix @@ -4,8 +4,8 @@ let inherit (lib.systems.inspect) patterns; in rec { - inherit (lib.systems.doubles) all mesaPlatforms; - none = []; + all = [ {} ]; # `{}` matches anything + none = []; arm = [ patterns.isAarch32 ]; aarch64 = [ patterns.isAarch64 ]; @@ -24,4 +24,7 @@ in rec { netbsd = [ patterns.isNetBSD ]; openbsd = [ patterns.isOpenBSD ]; unix = patterns.isUnix; # Actually a list + windows = [ patterns.isWindows ]; + + inherit (lib.systems.doubles) mesaPlatforms; } diff --git a/lib/maintainers-list.nix b/maintainers/maintainer-list.nix similarity index 99% rename from lib/maintainers-list.nix rename to maintainers/maintainer-list.nix index 608c36e91d2..946080aa89d 100644 --- a/lib/maintainers-list.nix +++ b/maintainers/maintainer-list.nix @@ -176,6 +176,11 @@ github = "abigailbuccaneer"; name = "Abigail Bunyan"; }; + aborsu = { + email = "a.borsu@gmail.com"; + github = "aborsu"; + name = "Augustin Borsu"; + }; aboseley = { email = "adam.boseley@gmail.com"; github = "aboseley"; @@ -314,6 +319,11 @@ github = "amiloradovsky"; name = "Andrew Miloradovsky"; }; + aminechikhaoui = { + email = "amine.chikhaoui91@gmail.com"; + github = "AmineChikhaoui"; + name = "Amine Chikhaoui"; + }; amorsillo = { email = "andrew.morsillo@gmail.com"; github = "AndrewMorsillo"; @@ -555,7 +565,6 @@ }; bjg = { email = "bjg@gnu.org"; - github = "civodul"; name = "Brian Gough"; }; bjornfor = { @@ -632,11 +641,6 @@ github = "calbrecht"; name = "Christian Albrecht"; }; - calrama = { - email = "moritz@ucworks.org"; - github = "MoritzMaxeiner"; - name = "Moritz Maxeiner"; - }; calvertvl = { email = "calvertvl@gmail.com"; github = "calvertvl"; @@ -1524,6 +1528,11 @@ github = "hrdinka"; name = "Christoph Hrdinka"; }; + hschaeidt = { + email = "he.schaeidt@gmail.com"; + github = "hschaeidt"; + name = "Hendrik Schaeidt"; + }; htr = { email = "hugo@linux.com"; github = "htr"; @@ -1663,7 +1672,7 @@ name = "Johannes Frankenau"; }; jgeerds = { - email = "jascha@jgeerds.name"; + email = "jascha@geerds.org"; github = "jgeerds"; name = "Jascha Geerds"; }; @@ -2013,6 +2022,11 @@ github = "lo1tuma"; name = "Mathias Schreck"; }; + lopsided98 = { + email = "benwolsieffer@gmail.com"; + github = "lopsided98"; + name = "Ben Wolsieffer"; + }; loskutov = { email = "ignat.loskutov@gmail.com"; github = "loskutov"; @@ -3155,6 +3169,11 @@ github = "sellout"; name = "Greg Pfeil"; }; + sengaya = { + email = "tlo@sengaya.de"; + github = "sengaya"; + name = "Thilo Uttendorfer"; + }; sepi = { email = "raffael@mancini.lu"; github = "sepi"; diff --git a/maintainers/scripts/update-python-libraries b/maintainers/scripts/update-python-libraries index ec2691ff617..4536662c842 100755 --- a/maintainers/scripts/update-python-libraries +++ b/maintainers/scripts/update-python-libraries @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i python3 -p 'python3.withPackages(ps: with ps; [ packaging requests toolz ])' -p git +#! nix-shell -i python3 -p "python3.withPackages(ps: with ps; [ packaging requests toolz ])" -p git """ Update a Python package expression by passing in the `.nix` file, or the directory containing it. @@ -358,4 +358,4 @@ def main(): if __name__ == '__main__': - main() \ No newline at end of file + main() diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index 6098b057a37..0e4b3186841 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -124,11 +124,12 @@ let manualXsltprocOptions = toString [ "--param section.autolabel 1" "--param section.label.includes.component.label 1" - "--stringparam html.stylesheet style.css" + "--stringparam html.stylesheet 'style.css overrides.css highlightjs/mono-blue.css'" + "--stringparam html.script './highlightjs/highlight.pack.js ./highlightjs/loader.js'" "--param xref.with.number.and.title 1" "--param toc.section.depth 3" "--stringparam admon.style ''" - "--stringparam callout.graphics.extension .gif" + "--stringparam callout.graphics.extension .svg" "--stringparam current.docid manual" "--param chunk.section.depth 0" "--param chunk.first.sections 1" @@ -260,9 +261,11 @@ in rec { ${manual-combined}/manual-combined.xml mkdir -p $dst/images/callouts - cp ${docbook5_xsl}/xml/xsl/docbook/images/callouts/*.gif $dst/images/callouts/ + cp ${docbook5_xsl}/xml/xsl/docbook/images/callouts/*.svg $dst/images/callouts/ - cp ${./style.css} $dst/style.css + cp ${../../../doc/style.css} $dst/style.css + cp ${../../../doc/overrides.css} $dst/overrides.css + cp -r ${pkgs.documentation-highlighter} $dst/highlightjs mkdir -p $out/nix-support echo "nix-build out $out" >> $out/nix-support/hydra-build-products @@ -286,7 +289,7 @@ in rec { ${manual-combined}/manual-combined.xml mkdir -p $dst/epub/OEBPS/images/callouts - cp -r ${docbook5_xsl}/xml/xsl/docbook/images/callouts/*.gif $dst/epub/OEBPS/images/callouts # */ + cp -r ${docbook5_xsl}/xml/xsl/docbook/images/callouts/*.svg $dst/epub/OEBPS/images/callouts # */ echo "application/epub+zip" > mimetype manual="$dst/nixos-manual.epub" zip -0Xq "$manual" mimetype diff --git a/nixos/doc/manual/development/option-types.xml b/nixos/doc/manual/development/option-types.xml index ec940d5d2b8..13fa8d1e114 100644 --- a/nixos/doc/manual/development/option-types.xml +++ b/nixos/doc/manual/development/option-types.xml @@ -282,8 +282,8 @@ options.mod = mkOption { option set (). -Declaration of a list - nof submodules +Declaration of a list + of submodules options.mod = mkOption { description = "submodule example"; diff --git a/nixos/doc/manual/installation/installing-from-other-distro.xml b/nixos/doc/manual/installation/installing-from-other-distro.xml index 55623898827..ecd020a067a 100644 --- a/nixos/doc/manual/installation/installing-from-other-distro.xml +++ b/nixos/doc/manual/installation/installing-from-other-distro.xml @@ -227,6 +227,18 @@ $ sudo groupdel nixbld line) + Support for NIXOS_LUSTRATE was added + in NixOS 16.09. The act of "lustrating" refers to the + wiping of the existing distribution. Creating + /etc/NIXOS_LUSTRATE can also be used on + NixOS to remove all mutable files from your root partition + (anything that's not in /nix or + /boot gets "lustrated" on the next + boot. + lustrate /ˈlʌstreɪt/ verb. + purify by expiatory sacrifice, ceremonial washing, or + some other ritual action. + Let's create the files: diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index e20b6574b72..1f09704bce5 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -115,23 +115,17 @@ for a UEFI installation is by and large the same as a BIOS installation. The dif UEFI systems For creating boot partitions: mkfs.fat. Again it’s recommended to assign a - label to the boot partition: . For example: -# mkfs.fat -F 32 -L boot /dev/sda3 +# mkfs.fat -F 32 -n boot /dev/sda3 For creating LVM volumes, the LVM commands, e.g., - - -# pvcreate /dev/sda1 /dev/sdb1 -# vgcreate MyVolGroup /dev/sda1 /dev/sdb1 -# lvcreate --size 2G --name bigdisk MyVolGroup -# lvcreate --size 1G --name smalldisk MyVolGroup - - + pvcreate, vgcreate, and + lvcreate. For creating software RAID devices, use mdadm. @@ -155,6 +149,7 @@ for a UEFI installation is by and large the same as a BIOS installation. The dif Mount the boot file system on /mnt/boot, e.g. +# mkdir -p /mnt/boot # mount /dev/disk/by-label/boot /mnt/boot @@ -366,8 +361,9 @@ drive (here /dev/sda). (for UEFI systems only) +# mkfs.fat -F 32 -n boot /dev/sda3 # (for UEFI systems only) # mount /dev/disk/by-label/nixos /mnt +# mkdir -p /mnt/boot # (for UEFI systems only) # mount /dev/disk/by-label/boot /mnt/boot # (for UEFI systems only) # nixos-generate-config --root /mnt # nano /mnt/etc/nixos/configuration.nix diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml index b755245a69f..9221c2951ed 100644 --- a/nixos/doc/manual/release-notes/rl-1803.xml +++ b/nixos/doc/manual/release-notes/rl-1803.xml @@ -4,7 +4,7 @@ version="5.0" xml:id="sec-release-18.03"> -Release 18.03 (“Impala”, 2018/03/??) +Release 18.03 (“Impala”, 2018/04/04)
+ + + + End of support is planned for end of October 2018, handing over to 18.09. + + + + + + Platform support: x86_64-linux and x86_64-darwin since release time (the latter isn't NixOS, really). + Binaries for aarch64-linux are available, but no channel exists yet, as it's waiting for some test fixes, etc. + + + Nix now defaults to 2.0; see its @@ -27,13 +41,13 @@ has the following highlights: - Linux kernel defaults to the 4.14 branch (it was 4.9). + Core version changes: linux: 4.9 -> 4.14, glibc: 2.25 -> 2.26, gcc: 6 -> 7, systemd: 234 -> 237. - GCC defaults to 7.x (it was 6.x). + Desktop version changes: gnome: 3.24 -> 3.26, (KDE) plasma-desktop: 5.10 -> 5.12. @@ -59,13 +73,7 @@ has the following highlights: - - The GNOME version is now 3.26. - - - - - PHP now defaults to PHP 7.2 + PHP now defaults to PHP 7.2, updated from 7.1. @@ -81,9 +89,66 @@ has the following highlights: The following new services were added since the last release: - - - + ./config/krb5/default.nix + ./hardware/digitalbitbox.nix + ./misc/label.nix + ./programs/ccache.nix + ./programs/criu.nix + ./programs/digitalbitbox/default.nix + ./programs/less.nix + ./programs/npm.nix + ./programs/plotinus.nix + ./programs/rootston.nix + ./programs/systemtap.nix + ./programs/sway.nix + ./programs/udevil.nix + ./programs/way-cooler.nix + ./programs/yabar.nix + ./programs/zsh/zsh-autoenv.nix + ./services/backup/borgbackup.nix + ./services/backup/crashplan-small-business.nix + ./services/desktops/dleyna-renderer.nix + ./services/desktops/dleyna-server.nix + ./services/desktops/pipewire.nix + ./services/desktops/gnome3/chrome-gnome-shell.nix + ./services/desktops/gnome3/tracker-miners.nix + ./services/hardware/fwupd.nix + ./services/hardware/interception-tools.nix + ./services/hardware/u2f.nix + ./services/hardware/usbmuxd.nix + ./services/mail/clamsmtp.nix + ./services/mail/dkimproxy-out.nix + ./services/mail/pfix-srsd.nix + ./services/misc/gitea.nix + ./services/misc/home-assistant.nix + ./services/misc/ihaskell.nix + ./services/misc/logkeys.nix + ./services/misc/novacomd.nix + ./services/misc/osrm.nix + ./services/misc/plexpy.nix + ./services/misc/pykms.nix + ./services/misc/tzupdate.nix + ./services/monitoring/fusion-inventory.nix + ./services/monitoring/prometheus/exporters.nix + ./services/network-filesystems/beegfs.nix + ./services/network-filesystems/davfs2.nix + ./services/network-filesystems/openafs/client.nix + ./services/network-filesystems/openafs/server.nix + ./services/network-filesystems/ceph.nix + ./services/networking/aria2.nix + ./services/networking/monero.nix + ./services/networking/nghttpx/default.nix + ./services/networking/nixops-dns.nix + ./services/networking/rxe.nix + ./services/networking/stunnel.nix + ./services/web-apps/matomo.nix + ./services/web-apps/restya-board.nix + ./services/web-servers/mighttpd2.nix + ./services/x11/fractalart.nix + ./system/boot/binfmt.nix + ./system/boot/grow-partition.nix + ./tasks/filesystems/ecryptfs.nix + ./virtualisation/hyperv-guest.nix
@@ -174,7 +239,7 @@ following incompatible changes: the openssh_with_kerberos package is now a deprecated alias. If you do not want Kerberos support, - you can do openssh.override { withKerboros = false; }. + you can do openssh.override { withKerberos = false; }. Note, this also applies to the openssh_hpn package. @@ -322,6 +387,43 @@ following incompatible changes: external module. + + + The Prosody XMPP server has received a major update. The following modules were renamed: + + + + is now + + + + + is now + + + + + + + Many new modules are now core modules, most notably + and . + + + + The better-performing libevent backend is now enabled by default. + + + + withCommunityModules now passes through the modules to . + Use withOnlyInstalledCommunityModules for modules that should not be enabled directly, e.g lib_ldap. + + + + + All prometheus exporter modules are now defined as submodules. + The exporters are configured using services.prometheus.exporters. + +
@@ -381,15 +483,6 @@ following incompatible changes: have been added to set up static routing. - - - The option is now - none by default. An assertion failure is thrown if WM's - and DM's default are none. - To explicitly run a plain X session without and DM or WM, the newly - introduced option must be set to true. - - The option is now 127.0.0.1 by default. diff --git a/nixos/doc/manual/style.css b/nixos/doc/manual/style.css deleted file mode 100644 index 3118b37ead1..00000000000 --- a/nixos/doc/manual/style.css +++ /dev/null @@ -1,267 +0,0 @@ -/* Copied from http://bakefile.sourceforge.net/, which appears - licensed under the GNU GPL. */ - - -/*************************************************************************** - Basic headers and text: - ***************************************************************************/ - -body -{ - font-family: "Nimbus Sans L", sans-serif; - background: white; - margin: 2em 1em 2em 1em; -} - -h1, h2, h3, h4 -{ - color: #005aa0; -} - -h1 /* title */ -{ - font-size: 200%; -} - -h2 /* chapters, appendices, subtitle */ -{ - font-size: 180%; -} - -/* Extra space between chapters, appendices. */ -div.chapter > div.titlepage h2, div.appendix > div.titlepage h2 -{ - margin-top: 1.5em; -} - -div.section > div.titlepage h2 /* sections */ -{ - font-size: 150%; - margin-top: 1.5em; -} - -h3 /* subsections */ -{ - font-size: 125%; -} - -div.simplesect h2 -{ - font-size: 110%; -} - -div.appendix h3 -{ - font-size: 150%; - margin-top: 1.5em; -} - -div.refnamediv h2, div.refsynopsisdiv h2, div.refsection h2 /* refentry parts */ -{ - margin-top: 1.4em; - font-size: 125%; -} - -div.refsection h3 -{ - font-size: 110%; -} - - -/*************************************************************************** - Examples: - ***************************************************************************/ - -div.example -{ - border: 1px solid #b0b0b0; - padding: 6px 6px; - margin-left: 1.5em; - margin-right: 1.5em; - background: #f4f4f8; - border-radius: 0.4em; - box-shadow: 0.4em 0.4em 0.5em #e0e0e0; -} - -div.example p.title -{ - margin-top: 0em; -} - -div.example pre -{ - box-shadow: none; -} - - -/*************************************************************************** - Screen dumps: - ***************************************************************************/ - -pre.screen, pre.programlisting -{ - border: 1px solid #b0b0b0; - padding: 3px 3px; - margin-left: 1.5em; - margin-right: 1.5em; - color: #600000; - background: #f4f4f8; - font-family: monospace; - border-radius: 0.4em; - box-shadow: 0.4em 0.4em 0.5em #e0e0e0; -} - -div.example pre.programlisting -{ - border: 0px; - padding: 0 0; - margin: 0 0 0 0; -} - - -/*************************************************************************** - Notes, warnings etc: - ***************************************************************************/ - -.note, .warning -{ - border: 1px solid #b0b0b0; - padding: 3px 3px; - margin-left: 1.5em; - margin-right: 1.5em; - margin-bottom: 1em; - padding: 0.3em 0.3em 0.3em 0.3em; - background: #fffff5; - border-radius: 0.4em; - box-shadow: 0.4em 0.4em 0.5em #e0e0e0; -} - -div.note, div.warning -{ - font-style: italic; -} - -div.note h3, div.warning h3 -{ - color: red; - font-size: 100%; - padding-right: 0.5em; - display: inline; -} - -div.note p, div.warning p -{ - margin-bottom: 0em; -} - -div.note h3 + p, div.warning h3 + p -{ - display: inline; -} - -div.note h3 -{ - color: blue; - font-size: 100%; -} - -div.navfooter * -{ - font-size: 90%; -} - - -/*************************************************************************** - Links colors and highlighting: - ***************************************************************************/ - -a { text-decoration: none; } -a:hover { text-decoration: underline; } -a:link { color: #0048b3; } -a:visited { color: #002a6a; } - - -/*************************************************************************** - Table of contents: - ***************************************************************************/ - -div.toc -{ - font-size: 90%; -} - -div.toc dl -{ - margin-top: 0em; - margin-bottom: 0em; -} - - -/*************************************************************************** - Special elements: - ***************************************************************************/ - -tt, code -{ - color: #400000; -} - -.term -{ - font-weight: bold; - -} - -div.variablelist dd p, div.glosslist dd p -{ - margin-top: 0em; -} - -div.variablelist dd, div.glosslist dd -{ - margin-left: 1.5em; -} - -div.glosslist dt -{ - font-style: italic; -} - -.varname -{ - color: #400000; -} - -span.command strong -{ - font-weight: normal; - color: #400000; -} - -div.calloutlist table -{ - box-shadow: none; -} - -table -{ - border-collapse: collapse; - box-shadow: 0.4em 0.4em 0.5em #e0e0e0; -} - -table.simplelist -{ - text-align: left; - color: #005aa0; - border: 0; - padding: 5px; - background: #fffff5; - font-weight: normal; - font-style: italic; - box-shadow: none; - margin-bottom: 1em; -} - -div.navheader table, div.navfooter table { - box-shadow: none; -} diff --git a/nixos/lib/make-ext4-fs.nix b/nixos/lib/make-ext4-fs.nix index 21c69ed560a..986d80ff1b9 100644 --- a/nixos/lib/make-ext4-fs.nix +++ b/nixos/lib/make-ext4-fs.nix @@ -7,23 +7,22 @@ , volumeLabel }: +let + sdClosureInfo = pkgs.closureInfo { rootPaths = storePaths; }; +in + pkgs.stdenv.mkDerivation { name = "ext4-fs.img"; nativeBuildInputs = with pkgs; [e2fsprogs libfaketime perl]; - # For obtaining the closure of `storePaths'. - exportReferencesGraph = - map (x: [("closure-" + baseNameOf x) x]) storePaths; - buildCommand = '' # Add the closures of the top-level store objects. - storePaths=$(perl ${pkgs.pathsFromGraph} closure-*) + storePaths=$(cat ${sdClosureInfo}/store-paths) - # Also include a manifest of the closures in a format suitable - # for nix-store --load-db. - printRegistration=1 perl ${pkgs.pathsFromGraph} closure-* > nix-path-registration + # Also include a manifest of the closures in a format suitable for nix-store --load-db. + cp ${sdClosureInfo}/registration nix-path-registration # Make a crude approximation of the size of the target image. # If the script starts failing, increase the fudge factors here. diff --git a/nixos/maintainers/scripts/gce/create-gce.sh b/nixos/maintainers/scripts/gce/create-gce.sh index ef1801fe54b..0fd26d34d07 100755 --- a/nixos/maintainers/scripts/gce/create-gce.sh +++ b/nixos/maintainers/scripts/gce/create-gce.sh @@ -3,7 +3,7 @@ set -euo pipefail -BUCKET_NAME="${BUCKET_NAME:-nixos-images}" +BUCKET_NAME="${BUCKET_NAME:-nixos-cloud-images}" TIMESTAMP="$(date +%Y%m%d%H%M)" export TIMESTAMP @@ -19,5 +19,5 @@ img_name=$(basename "$img_path") img_id=$(echo "$img_name" | sed 's|.raw.tar.gz$||;s|\.|-|g;s|_|-|g') if ! gsutil ls "gs://${BUCKET_NAME}/$img_name"; then gsutil cp "$img_path" "gs://${BUCKET_NAME}/$img_name" + gsutil acl ch -u AllUsers:R "gs://${BUCKET_NAME}/$img_name" fi -gcloud compute images create "$img_id" --source-uri "gs://${BUCKET_NAME}/$img_name" diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix index d8980944adc..6aef3fe9ba1 100644 --- a/nixos/modules/config/no-x-libs.nix +++ b/nixos/modules/config/no-x-libs.nix @@ -32,7 +32,6 @@ with lib; networkmanager-l2tp = pkgs.networkmanager-l2tp.override { withGnome = false; }; networkmanager-openconnect = pkgs.networkmanager-openconnect.override { withGnome = false; }; networkmanager-openvpn = pkgs.networkmanager-openvpn.override { withGnome = false; }; - networkmanager-pptp = pkgs.networkmanager-pptp.override { withGnome = false; }; networkmanager-vpnc = pkgs.networkmanager-vpnc.override { withGnome = false; }; networkmanager-iodine = pkgs.networkmanager-iodine.override { withGnome = false; }; pinentry = pkgs.pinentry_ncurses; diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index 11e969b760e..592f8a212c9 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -35,6 +35,7 @@ let name = mkOption { type = types.str; + apply = x: assert (builtins.stringLength x < 32 || abort "Username '${x}' is longer than 31 characters which is not allowed!"); x; description = '' The name of the user account. If undefined, the name of the attribute set will be used. @@ -91,6 +92,7 @@ let group = mkOption { type = types.str; + apply = x: assert (builtins.stringLength x < 32 || abort "Group name '${x}' is longer than 31 characters which is not allowed!"); x; default = "nogroup"; description = "The user's primary group."; }; diff --git a/nixos/modules/hardware/video/amdgpu-pro.nix b/nixos/modules/hardware/video/amdgpu-pro.nix index 5cc96d8bd07..50af022b93c 100644 --- a/nixos/modules/hardware/video/amdgpu-pro.nix +++ b/nixos/modules/hardware/video/amdgpu-pro.nix @@ -15,13 +15,19 @@ let opengl = config.hardware.opengl; + kernel = pkgs.linux_4_9.override { + extraConfig = '' + KALLSYMS_ALL y + ''; + }; + in { config = mkIf enabled { - nixpkgs.config.xorg.abiCompat = "1.18"; + nixpkgs.config.xorg.abiCompat = "1.19"; services.xserver.drivers = singleton { name = "amdgpu"; modules = [ package ]; libPath = [ package ]; }; @@ -31,6 +37,9 @@ in boot.extraModulePackages = [ package ]; + boot.kernelPackages = + pkgs.recurseIntoAttrs (pkgs.linuxPackagesFor kernel); + boot.blacklistedKernelModules = [ "radeon" ]; hardware.firmware = [ package ]; @@ -38,10 +47,15 @@ in system.activationScripts.setup-amdgpu-pro = '' mkdir -p /run/lib ln -sfn ${package}/lib ${package.libCompatDir} + ln -sfn ${package} /run/amdgpu-pro '' + optionalString opengl.driSupport32Bit '' ln -sfn ${package32}/lib ${package32.libCompatDir} ''; + system.requiredKernelConfig = with config.lib.kernelConfig; [ + (isYes "KALLSYMS_ALL") + ]; + environment.etc = { "amd/amdrc".source = package + "/etc/amd/amdrc"; "amd/amdapfxx.blb".source = package + "/etc/amd/amdapfxx.blb"; diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index 50c085dd7ee..9055c781161 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -16,8 +16,6 @@ let kernelPackages.nvidia_x11 else if elem "nvidiaBeta" drivers then kernelPackages.nvidia_x11_beta - else if elem "nvidiaLegacy173" drivers then - kernelPackages.nvidia_x11_legacy173 else if elem "nvidiaLegacy304" drivers then kernelPackages.nvidia_x11_legacy304 else if elem "nvidiaLegacy340" drivers then diff --git a/nixos/modules/installer/cd-dvd/channel.nix b/nixos/modules/installer/cd-dvd/channel.nix index 4a198316795..01cfe8a02e1 100644 --- a/nixos/modules/installer/cd-dvd/channel.nix +++ b/nixos/modules/installer/cd-dvd/channel.nix @@ -21,7 +21,9 @@ let if [ ! -e $out/nixos/nixpkgs ]; then ln -s . $out/nixos/nixpkgs fi + echo -n ${config.system.nixos.revision} > $out/nixos/.git-revision echo -n ${config.system.nixos.versionSuffix} > $out/nixos/.version-suffix + echo ${config.system.nixos.versionSuffix} | sed -e s/pre// > $out/nixos/svn-revision ''; in diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix index 3306846b7fa..ddf91a5656c 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix @@ -21,9 +21,6 @@ in "it cannot be cross compiled"; }; - # Needed by RPi firmware - nixpkgs.config.allowUnfree = true; - boot.loader.grub.enable = false; boot.loader.generic-extlinux-compatible.enable = true; diff --git a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix index 08903ba397a..891923234dd 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix @@ -21,9 +21,6 @@ in "it cannot be cross compiled"; }; - # Needed by RPi firmware - nixpkgs.config.allowUnfree = true; - boot.loader.grub.enable = false; boot.loader.generic-extlinux-compatible.enable = true; diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix index 2833b75b84d..212013b5e28 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix @@ -21,9 +21,6 @@ in "it cannot be cross compiled"; }; - # Needed by RPi firmware - nixpkgs.config.allowUnfree = true; - boot.loader.grub.enable = false; boot.loader.generic-extlinux-compatible.enable = true; diff --git a/nixos/modules/installer/cd-dvd/sd-image.nix b/nixos/modules/installer/cd-dvd/sd-image.nix index 23312c073d5..c091923de60 100644 --- a/nixos/modules/installer/cd-dvd/sd-image.nix +++ b/nixos/modules/installer/cd-dvd/sd-image.nix @@ -20,6 +20,20 @@ let in { options.sdImage = { + imageName = mkOption { + default = "${config.sdImage.imageBaseName}-${config.system.nixos.label}-${pkgs.stdenv.system}.img"; + description = '' + Name of the generated image file. + ''; + }; + + imageBaseName = mkOption { + default = "nixos-sd-image"; + description = '' + Prefix of the name of the generated image file. + ''; + }; + storePaths = mkOption { type = with types; listOf package; example = literalExample "[ pkgs.stdenv ]"; @@ -61,19 +75,25 @@ in sdImage.storePaths = [ config.system.build.toplevel ]; system.build.sdImage = pkgs.stdenv.mkDerivation { - name = "sd-image-${pkgs.stdenv.system}.img"; + name = config.sdImage.imageName; buildInputs = with pkgs; [ dosfstools e2fsprogs mtools libfaketime utillinux ]; buildCommand = '' + mkdir -p $out/nix-support $out/sd-image + export img=$out/sd-image/${config.sdImage.imageName} + + echo "${pkgs.stdenv.system}" > $out/nix-support/system + echo "file sd-image $img" >> $out/nix-support/hydra-build-products + # Create the image file sized to fit /boot and /, plus 20M of slack rootSizeBlocks=$(du -B 512 --apparent-size ${rootfsImage} | awk '{ print $1 }') bootSizeBlocks=$((${toString config.sdImage.bootSize} * 1024 * 1024 / 512)) imageSize=$((rootSizeBlocks * 512 + bootSizeBlocks * 512 + 20 * 1024 * 1024)) - truncate -s $imageSize $out + truncate -s $imageSize $img # type=b is 'W95 FAT32', type=83 is 'Linux'. - sfdisk $out <&2 || true diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh index 9ede74a54cd..2af73519bc5 100644 --- a/nixos/modules/installer/tools/nixos-rebuild.sh +++ b/nixos/modules/installer/tools/nixos-rebuild.sh @@ -382,6 +382,6 @@ fi if [ "$action" = build-vm ]; then cat >&2 < "${cpath}/full.pem" + # Create fullchain.pem (same format as "simp_le ... -f fullchain.pem" creates) + cat $workdir/{server.crt,ca.crt} > "${cpath}/fullchain.pem" - # Clean up working directory - rm $workdir/server.csr - rm $workdir/server.pass.key + # Create full.pem for e.g. lighttpd + cat $workdir/{server.key,server.crt,ca.crt} > "${cpath}/full.pem" # Give key acme permissions - chmod ${rights} '${cpath}/key.pem' - chown '${data.user}:${data.group}' '${cpath}/key.pem' - chmod ${rights} '${cpath}/fullchain.pem' - chown '${data.user}:${data.group}' '${cpath}/fullchain.pem' - chmod ${rights} '${cpath}/full.pem' - chown '${data.user}:${data.group}' '${cpath}/full.pem' + chown '${data.user}:${data.group}' "${cpath}/"{key,fullchain,full}.pem + chmod ${rights} "${cpath}/"{key,fullchain,full}.pem ''; serviceConfig = { Type = "oneshot"; - RuntimeDirectory = "acme-selfsigned-${cert}"; PermissionsStartOnly = true; + PrivateTmp = true; User = data.user; Group = data.group; }; diff --git a/nixos/modules/security/sudo.nix b/nixos/modules/security/sudo.nix index a57f14bb5ae..ed7703dba3d 100644 --- a/nixos/modules/security/sudo.nix +++ b/nixos/modules/security/sudo.nix @@ -47,8 +47,8 @@ in default = true; description = '' - Whether users of the wheel group can execute - commands as super user without entering a password. + Whether users of the wheel group must + provide a password to run commands as super user via sudo. ''; }; diff --git a/nixos/modules/services/backup/borgbackup.nix b/nixos/modules/services/backup/borgbackup.nix new file mode 100644 index 00000000000..1b730e0c2b7 --- /dev/null +++ b/nixos/modules/services/backup/borgbackup.nix @@ -0,0 +1,580 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + isLocalPath = x: + builtins.substring 0 1 x == "/" # absolute path + || builtins.substring 0 1 x == "." # relative path + || builtins.match "[.*:.*]" == null; # not machine:path + + mkExcludeFile = cfg: + # Write each exclude pattern to a new line + pkgs.writeText "excludefile" (concatStringsSep "\n" cfg.exclude); + + mkKeepArgs = cfg: + # If cfg.prune.keep e.g. has a yearly attribute, + # its content is passed on as --keep-yearly + concatStringsSep " " + (mapAttrsToList (x: y: "--keep-${x}=${toString y}") cfg.prune.keep); + + mkBackupScript = cfg: '' + on_exit() + { + exitStatus=$? + # Reset the EXIT handler, or else we're called again on 'exit' below + trap - EXIT + ${cfg.postHook} + exit $exitStatus + } + trap 'on_exit' INT TERM QUIT EXIT + + archiveName="${cfg.archiveBaseName}-$(date ${cfg.dateFormat})" + archiveSuffix="${optionalString cfg.appendFailedSuffix ".failed"}" + ${cfg.preHook} + '' + optionalString cfg.doInit '' + # Run borg init if the repo doesn't exist yet + if ! borg list > /dev/null; then + borg init \ + --encryption ${cfg.encryption.mode} \ + $extraInitArgs + ${cfg.postInit} + fi + '' + '' + borg create \ + --compression ${cfg.compression} \ + --exclude-from ${mkExcludeFile cfg} \ + $extraCreateArgs \ + "::$archiveName$archiveSuffix" \ + ${escapeShellArgs cfg.paths} + '' + optionalString cfg.appendFailedSuffix '' + borg rename "::$archiveName$archiveSuffix" "$archiveName" + '' + '' + ${cfg.postCreate} + '' + optionalString (cfg.prune.keep != { }) '' + borg prune \ + ${mkKeepArgs cfg} \ + --prefix ${escapeShellArg cfg.prune.prefix} \ + $extraPruneArgs + ${cfg.postPrune} + ''; + + mkPassEnv = cfg: with cfg.encryption; + if passCommand != null then + { BORG_PASSCOMMAND = passCommand; } + else if passphrase != null then + { BORG_PASSPHRASE = passphrase; } + else { }; + + mkBackupService = name: cfg: + let + userHome = config.users.users.${cfg.user}.home; + in nameValuePair "borgbackup-job-${name}" { + description = "BorgBackup job ${name}"; + path = with pkgs; [ + borgbackup openssh + ]; + script = mkBackupScript cfg; + serviceConfig = { + User = cfg.user; + Group = cfg.group; + # Only run when no other process is using CPU or disk + CPUSchedulingPolicy = "idle"; + IOSchedulingClass = "idle"; + ProtectSystem = "strict"; + ReadWritePaths = + [ "${userHome}/.config/borg" "${userHome}/.cache/borg" ] + # Borg needs write access to repo if it is not remote + ++ optional (isLocalPath cfg.repo) cfg.repo; + PrivateTmp = true; + }; + environment = { + BORG_REPO = cfg.repo; + inherit (cfg) extraInitArgs extraCreateArgs extraPruneArgs; + } // (mkPassEnv cfg) // cfg.environment; + inherit (cfg) startAt; + }; + + # Paths listed in ReadWritePaths must exist before service is started + mkActivationScript = name: cfg: + let + install = "install -o ${cfg.user} -g ${cfg.group}"; + in + nameValuePair "borgbackup-job-${name}" (stringAfter [ "users" ] ('' + # Eensure that the home directory already exists + # We can't assert createHome == true because that's not the case for root + cd "${config.users.users.${cfg.user}.home}" + ${install} -d .config/borg + ${install} -d .cache/borg + '' + optionalString (isLocalPath cfg.repo) '' + ${install} -d ${escapeShellArg cfg.repo} + '')); + + mkPassAssertion = name: cfg: { + assertion = with cfg.encryption; + mode != "none" -> passCommand != null || passphrase != null; + message = + "passCommand or passphrase has to be specified because" + + '' borgbackup.jobs.${name}.encryption != "none"''; + }; + + mkRepoService = name: cfg: + nameValuePair "borgbackup-repo-${name}" { + description = "Create BorgBackup repository ${name} directory"; + script = '' + mkdir -p ${escapeShellArg cfg.path} + chown ${cfg.user}:${cfg.group} ${escapeShellArg cfg.path} + ''; + serviceConfig = { + # The service's only task is to ensure that the specified path exists + Type = "oneshot"; + }; + wantedBy = [ "multi-user.target" ]; + }; + + mkAuthorizedKey = cfg: appendOnly: key: + let + # Because of the following line, clients do not need to specify an absolute repo path + cdCommand = "cd ${escapeShellArg cfg.path}"; + restrictedArg = "--restrict-to-${if cfg.allowSubRepos then "path" else "repository"} ."; + appendOnlyArg = optionalString appendOnly "--append-only"; + quotaArg = optionalString (cfg.quota != null) "--storage-quota ${cfg.quota}"; + serveCommand = "borg serve ${restrictedArg} ${appendOnlyArg} ${quotaArg}"; + in + ''command="${cdCommand} && ${serveCommand}",restrict ${key}''; + + mkUsersConfig = name: cfg: { + users.${cfg.user} = { + openssh.authorizedKeys.keys = + (map (mkAuthorizedKey cfg false) cfg.authorizedKeys + ++ map (mkAuthorizedKey cfg true) cfg.authorizedKeysAppendOnly); + useDefaultShell = true; + }; + groups.${cfg.group} = { }; + }; + + mkKeysAssertion = name: cfg: { + assertion = cfg.authorizedKeys != [ ] || cfg.authorizedKeysAppendOnly != [ ]; + message = + "borgbackup.repos.${name} does not make sense" + + " without at least one public key"; + }; + +in { + meta.maintainers = with maintainers; [ dotlambda ]; + + ###### interface + + options.services.borgbackup.jobs = mkOption { + description = "Deduplicating backups using BorgBackup."; + default = { }; + example = literalExample '' + { + rootBackup = { + paths = "/"; + exclude = [ "/nix" ]; + repo = "/path/to/local/repo"; + encryption = { + mode = "repokey"; + passphrase = "secret"; + }; + compression = "auto,lzma"; + startAt = "weekly"; + }; + } + ''; + type = types.attrsOf (types.submodule (let globalConfig = config; in + { name, config, ... }: { + options = { + + paths = mkOption { + type = with types; either path (nonEmptyListOf path); + description = "Path(s) to back up."; + example = "/home/user"; + apply = x: if isList x then x else [ x ]; + }; + + repo = mkOption { + type = types.str; + description = "Remote or local repository to back up to."; + example = "user@machine:/path/to/repo"; + }; + + archiveBaseName = mkOption { + type = types.strMatching "[^/{}]+"; + default = "${globalConfig.networking.hostName}-${name}"; + defaultText = "\${config.networking.hostName}-"; + description = '' + How to name the created archives. A timestamp, whose format is + determined by , will be appended. The full + name can be modified at runtime ($archiveName). + Placeholders like {hostname} must not be used. + ''; + }; + + dateFormat = mkOption { + type = types.str; + description = '' + Arguments passed to date + to create a timestamp suffix for the archive name. + ''; + default = "+%Y-%m-%dT%H:%M:%S"; + example = "-u +%s"; + }; + + startAt = mkOption { + type = with types; either str (listOf str); + default = "daily"; + description = '' + When or how often the backup should run. + Must be in the format described in + systemd.time + 7. + If you do not want the backup to start + automatically, use [ ]. + ''; + }; + + user = mkOption { + type = types.str; + description = '' + The user borg is run as. + User or group need read permission + for the specified . + ''; + default = "root"; + }; + + group = mkOption { + type = types.str; + description = '' + The group borg is run as. User or group needs read permission + for the specified . + ''; + default = "root"; + }; + + encryption.mode = mkOption { + type = types.enum [ + "repokey" "keyfile" + "repokey-blake2" "keyfile-blake2" + "authenticated" "authenticated-blake2" + "none" + ]; + description = '' + Encryption mode to use. Setting a mode + other than "none" requires + you to specify a + or a . + ''; + }; + + encryption.passCommand = mkOption { + type = with types; nullOr str; + description = '' + A command which prints the passphrase to stdout. + Mutually exclusive with . + ''; + default = null; + example = "cat /path/to/passphrase_file"; + }; + + encryption.passphrase = mkOption { + type = with types; nullOr str; + description = '' + The passphrase the backups are encrypted with. + Mutually exclusive with . + If you do not want the passphrase to be stored in the + world-readable Nix store, use . + ''; + default = null; + }; + + compression = mkOption { + # "auto" is optional, + # compression mode must be given, + # compression level is optional + type = types.strMatching "none|(auto,)?(lz4|zstd|zlib|lzma)(,[[:digit:]]{1,2})?"; + description = '' + Compression method to use. Refer to + borg help compression + for all available options. + ''; + default = "lz4"; + example = "auto,lzma"; + }; + + exclude = mkOption { + type = with types; listOf str; + description = '' + Exclude paths matching any of the given patterns. See + borg help patterns for pattern syntax. + ''; + default = [ ]; + example = [ + "/home/*/.cache" + "/nix" + ]; + }; + + doInit = mkOption { + type = types.bool; + description = '' + Run borg init if the + specified does not exist. + You should set this to false + if the repository is located on an external drive + that might not always be mounted. + ''; + default = true; + }; + + appendFailedSuffix = mkOption { + type = types.bool; + description = '' + Append a .failed suffix + to the archive name, which is only removed if + borg create has a zero exit status. + ''; + default = true; + }; + + prune.keep = mkOption { + # Specifying e.g. `prune.keep.yearly = -1` + # means there is no limit of yearly archives to keep + # The regex is for use with e.g. --keep-within 1y + type = with types; attrsOf (either int (strMatching "[[:digit:]]+[Hdwmy]")); + description = '' + Prune a repository by deleting all archives not matching any of the + specified retention options. See borg help prune + for the available options. + ''; + default = { }; + example = literalExample '' + { + within = "1d"; # Keep all archives from the last day + daily = 7; + weekly = 4; + monthly = -1; # Keep at least one archive for each month + } + ''; + }; + + prune.prefix = mkOption { + type = types.str; + description = '' + Only consider archive names starting with this prefix for pruning. + By default, only archives created by this job are considered. + Use "" to consider all archives. + ''; + default = config.archiveBaseName; + defaultText = "\${archiveBaseName}"; + }; + + environment = mkOption { + type = with types; attrsOf str; + description = '' + Environment variables passed to the backup script. + You can for example specify which SSH key to use. + ''; + default = { }; + example = { BORG_RSH = "ssh -i /path/to/key"; }; + }; + + preHook = mkOption { + type = types.lines; + description = '' + Shell commands to run before the backup. + This can for example be used to mount file systems. + ''; + default = ""; + example = '' + # To add excluded paths at runtime + extraCreateArgs="$extraCreateArgs --exclude /some/path" + ''; + }; + + postInit = mkOption { + type = types.lines; + description = '' + Shell commands to run after borg init. + ''; + default = ""; + }; + + postCreate = mkOption { + type = types.lines; + description = '' + Shell commands to run after borg create. The name + of the created archive is stored in $archiveName. + ''; + default = ""; + }; + + postPrune = mkOption { + type = types.lines; + description = '' + Shell commands to run after borg prune. + ''; + default = ""; + }; + + postHook = mkOption { + type = types.lines; + description = '' + Shell commands to run just before exit. They are executed + even if a previous command exits with a non-zero exit code. + The latter is available as $exitStatus. + ''; + default = ""; + }; + + extraInitArgs = mkOption { + type = types.str; + description = '' + Additional arguments for borg init. + Can also be set at runtime using $extraInitArgs. + ''; + default = ""; + example = "--append-only"; + }; + + extraCreateArgs = mkOption { + type = types.str; + description = '' + Additional arguments for borg create. + Can also be set at runtime using $extraCreateArgs. + ''; + default = ""; + example = "--stats --checkpoint-interval 600"; + }; + + extraPruneArgs = mkOption { + type = types.str; + description = '' + Additional arguments for borg prune. + Can also be set at runtime using $extraPruneArgs. + ''; + default = ""; + example = "--save-space"; + }; + + }; + } + )); + }; + + options.services.borgbackup.repos = mkOption { + description = '' + Serve BorgBackup repositories to given public SSH keys, + restricting their access to the repository only. + Also, clients do not need to specify the absolute path when accessing the repository, + i.e. user@machine:. is enough. (Note colon and dot.) + ''; + default = { }; + type = types.attrsOf (types.submodule ( + { name, config, ... }: { + options = { + + path = mkOption { + type = types.path; + description = '' + Where to store the backups. Note that the directory + is created automatically, with correct permissions. + ''; + default = "/var/lib/borgbackup"; + }; + + user = mkOption { + type = types.str; + description = '' + The user borg serve is run as. + User or group needs write permission + for the specified . + ''; + default = "borg"; + }; + + group = mkOption { + type = types.str; + description = '' + The group borg serve is run as. + User or group needs write permission + for the specified . + ''; + default = "borg"; + }; + + authorizedKeys = mkOption { + type = with types; listOf str; + description = '' + Public SSH keys that are given full write access to this repository. + You should use a different SSH key for each repository you write to, because + the specified keys are restricted to running borg serve + and can only access this single repository. + ''; + default = [ ]; + }; + + authorizedKeysAppendOnly = mkOption { + type = with types; listOf str; + description = '' + Public SSH keys that can only be used to append new data (archives) to the repository. + Note that archives can still be marked as deleted and are subsequently removed from disk + upon accessing the repo with full write access, e.g. when pruning. + ''; + default = [ ]; + }; + + allowSubRepos = mkOption { + type = types.bool; + description = '' + Allow clients to create repositories in subdirectories of the + specified . These can be accessed using + user@machine:path/to/subrepo. Note that a + applies to repositories independently. + Therefore, if this is enabled, clients can create multiple + repositories and upload an arbitrary amount of data. + ''; + default = false; + }; + + quota = mkOption { + # See the definition of parse_file_size() in src/borg/helpers/parseformat.py + type = with types; nullOr (strMatching "[[:digit:].]+[KMGTP]?"); + description = '' + Storage quota for the repository. This quota is ensured for all + sub-repositories if is enabled + but not for the overall storage space used. + ''; + default = null; + example = "100G"; + }; + + }; + } + )); + }; + + ###### implementation + + config = mkIf (with config.services.borgbackup; jobs != { } || repos != { }) + (with config.services.borgbackup; { + assertions = + mapAttrsToList mkPassAssertion jobs + ++ mapAttrsToList mkKeysAssertion repos; + + system.activationScripts = mapAttrs' mkActivationScript jobs; + + systemd.services = + # A job named "foo" is mapped to systemd.services.borgbackup-job-foo + mapAttrs' mkBackupService jobs + # A repo named "foo" is mapped to systemd.services.borgbackup-repo-foo + // mapAttrs' mkRepoService repos; + + users = mkMerge (mapAttrsToList mkUsersConfig repos); + + environment.systemPackages = with pkgs; [ borgbackup ]; + }); +} diff --git a/nixos/modules/services/backup/znapzend.nix b/nixos/modules/services/backup/znapzend.nix index 762bb4b3867..3d133f82d20 100644 --- a/nixos/modules/services/backup/znapzend.nix +++ b/nixos/modules/services/backup/znapzend.nix @@ -386,7 +386,7 @@ in echo Resetting znapzend zetups ${pkgs.znapzend}/bin/znapzendzetup list \ | grep -oP '(?<=\*\*\* backup plan: ).*(?= \*\*\*)' \ - | xargs ${pkgs.znapzend}/bin/znapzendzetup delete + | xargs -I{} ${pkgs.znapzend}/bin/znapzendzetup delete "{}" '' + concatStringsSep "\n" (mapAttrsToList (dataset: config: '' echo Importing znapzend zetup ${config} for dataset ${dataset} ${pkgs.znapzend}/bin/znapzendzetup import --write ${dataset} ${config} diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix index 54047a50caa..c2f4e9c0c5a 100644 --- a/nixos/modules/services/continuous-integration/jenkins/default.nix +++ b/nixos/modules/services/continuous-integration/jenkins/default.nix @@ -145,6 +145,11 @@ in { }; config = mkIf cfg.enable { + # server references the dejavu fonts + environment.systemPackages = [ + pkgs.dejavu_fonts + ]; + users.extraGroups = optional (cfg.group == "jenkins") { name = "jenkins"; gid = config.ids.gids.jenkins; @@ -200,10 +205,12 @@ in { ${replacePlugins} ''; + # For reference: https://wiki.jenkins.io/display/JENKINS/JenkinsLinuxStartupScript script = '' ${pkgs.jdk}/bin/java ${concatStringsSep " " cfg.extraJavaOptions} -jar ${cfg.package}/webapps/jenkins.war --httpListenAddress=${cfg.listenAddress} \ --httpPort=${toString cfg.port} \ --prefix=${cfg.prefix} \ + -Djava.awt.headless=true \ ${concatStringsSep " " cfg.extraOptions} ''; diff --git a/nixos/modules/services/hardware/trezord.nix b/nixos/modules/services/hardware/trezord.nix index 38d0a3a1d75..f2ec00a7d3e 100644 --- a/nixos/modules/services/hardware/trezord.nix +++ b/nixos/modules/services/hardware/trezord.nix @@ -26,8 +26,15 @@ in { name = "trezord-udev-rules"; destination = "/etc/udev/rules.d/51-trezor.rules"; text = '' - SUBSYSTEM=="usb", ATTR{idVendor}=="534c", ATTR{idProduct}=="0001", MODE="0666", GROUP="dialout", SYMLINK+="trezor%n" - KERNEL=="hidraw*", ATTRS{idVendor}=="534c", ATTRS{idProduct}=="0001", MODE="0666", GROUP="dialout" + # Trezor 1 + SUBSYSTEM=="usb", ATTR{idVendor}=="534c", ATTR{idProduct}=="0001", MODE="0666", GROUP="dialout", SYMLINK+="trezor%n" + KERNEL=="hidraw*", ATTRS{idVendor}=="534c", ATTRS{idProduct}=="0001", MODE="0666", GROUP="dialout" + + # Trezor 2 (Model-T) + SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="53c0", MODE="0661", GROUP="dialout", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="trezor%n" + SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="53c1", MODE="0660", GROUP="dialout", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="trezor%n" + KERNEL=="hidraw*", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="53c1", MODE="0660", GROUP="dialout", TAG+="uaccess", TAG+="udev-acl" + ]; ''; }); @@ -38,7 +45,7 @@ in { path = []; serviceConfig = { Type = "simple"; - ExecStart = "${pkgs.trezord}/bin/trezord -f"; + ExecStart = "${pkgs.trezord}/bin/trezord-go"; User = "trezord"; }; }; diff --git a/nixos/modules/services/logging/graylog.nix b/nixos/modules/services/logging/graylog.nix index a0dc0d6d089..95f31829882 100644 --- a/nixos/modules/services/logging/graylog.nix +++ b/nixos/modules/services/logging/graylog.nix @@ -141,7 +141,7 @@ in JAVA_HOME = jre; GRAYLOG_CONF = "${confFile}"; }; - path = [ pkgs.openjdk8 pkgs.which pkgs.procps ]; + path = [ pkgs.jre_headless pkgs.which pkgs.procps ]; preStart = '' mkdir -p /var/lib/graylog -m 755 diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix index b42c73b8666..543e732127a 100644 --- a/nixos/modules/services/mail/dovecot.nix +++ b/nixos/modules/services/mail/dovecot.nix @@ -30,6 +30,7 @@ let '' default_internal_user = ${cfg.user} + default_internal_group = ${cfg.group} ${optionalString (cfg.mailUser != null) "mail_uid = ${cfg.mailUser}"} ${optionalString (cfg.mailGroup != null) "mail_gid = ${cfg.mailGroup}"} diff --git a/nixos/modules/services/misc/defaultUnicornConfig.rb b/nixos/modules/services/misc/defaultUnicornConfig.rb index 84622622db7..0b58c59c7a5 100644 --- a/nixos/modules/services/misc/defaultUnicornConfig.rb +++ b/nixos/modules/services/misc/defaultUnicornConfig.rb @@ -1,205 +1,69 @@ -# The following was taken from github.com/crohr/syslogger and is BSD -# licensed. -require 'syslog' -require 'logger' -require 'thread' - -class Syslogger - - VERSION = "1.6.0" - - attr_reader :level, :ident, :options, :facility, :max_octets - attr_accessor :formatter - - MAPPING = { - Logger::DEBUG => Syslog::LOG_DEBUG, - Logger::INFO => Syslog::LOG_INFO, - Logger::WARN => Syslog::LOG_WARNING, - Logger::ERROR => Syslog::LOG_ERR, - Logger::FATAL => Syslog::LOG_CRIT, - Logger::UNKNOWN => Syslog::LOG_ALERT - } - - # - # Initializes default options for the logger - # ident:: the name of your program [default=$0]. - # options:: syslog options [default=Syslog::LOG_PID | Syslog::LOG_CONS]. - # Correct values are: - # LOG_CONS : writes the message on the console if an error occurs when sending the message; - # LOG_NDELAY : no delay before sending the message; - # LOG_PERROR : messages will also be written on STDERR; - # LOG_PID : adds the process number to the message (just after the program name) - # facility:: the syslog facility [default=nil] Correct values include: - # Syslog::LOG_DAEMON - # Syslog::LOG_USER - # Syslog::LOG_SYSLOG - # Syslog::LOG_LOCAL2 - # Syslog::LOG_NEWS - # etc. - # - # Usage: - # logger = Syslogger.new("my_app", Syslog::LOG_PID | Syslog::LOG_CONS, Syslog::LOG_LOCAL0) - # logger.level = Logger::INFO # use Logger levels - # logger.warn "warning message" - # logger.debug "debug message" - # - def initialize(ident = $0, options = Syslog::LOG_PID | Syslog::LOG_CONS, facility = nil) - @ident = ident - @options = options || (Syslog::LOG_PID | Syslog::LOG_CONS) - @facility = facility - @level = Logger::INFO - @mutex = Mutex.new - @formatter = Logger::Formatter.new - end - - %w{debug info warn error fatal unknown}.each do |logger_method| - # Accepting *args as message could be nil. - # Default params not supported in ruby 1.8.7 - define_method logger_method.to_sym do |*args, &block| - return true if @level > Logger.const_get(logger_method.upcase) - message = args.first || block && block.call - add(Logger.const_get(logger_method.upcase), message) - end - - unless logger_method == 'unknown' - define_method "#{logger_method}?".to_sym do - @level <= Logger.const_get(logger_method.upcase) - end - end - end - - # Log a message at the Logger::INFO level. Useful for use with Rack::CommonLogger - def write(msg) - add(Logger::INFO, msg) - end - - # Logs a message at the Logger::INFO level. - def <<(msg) - add(Logger::INFO, msg) - end - - # Low level method to add a message. - # +severity+:: the level of the message. One of Logger::DEBUG, Logger::INFO, Logger::WARN, Logger::ERROR, Logger::FATAL, Logger::UNKNOWN - # +message+:: the message string. - # If nil, the method will call the block and use the result as the message string. - # If both are nil or no block is given, it will use the progname as per the behaviour of both the standard Ruby logger, and the Rails BufferedLogger. - # +progname+:: optionally, overwrite the program name that appears in the log message. - def add(severity, message = nil, progname = nil, &block) - if message.nil? && block.nil? && !progname.nil? - message, progname = progname, nil - end - progname ||= @ident - - @mutex.synchronize do - Syslog.open(progname, @options, @facility) do |s| - s.mask = Syslog::LOG_UPTO(MAPPING[@level]) - communication = clean(message || block && block.call) - if self.max_octets - buffer = "#{tags_text}" - communication.bytes do |byte| - buffer.concat(byte) - # if the last byte we added is potentially part of an escape, we'll go ahead and add another byte - if buffer.bytesize >= self.max_octets && !['%'.ord,'\\'.ord].include?(byte) - s.log(MAPPING[severity],buffer) - buffer = "" - end - end - s.log(MAPPING[severity],buffer) unless buffer.empty? - else - s.log(MAPPING[severity],"#{tags_text}#{communication}") - end - end - end - end - - # Set the max octets of the messages written to the log - def max_octets=(max_octets) - @max_octets = max_octets - end - - # Sets the minimum level for messages to be written in the log. - # +level+:: one of Logger::DEBUG, Logger::INFO, Logger::WARN, Logger::ERROR, Logger::FATAL, Logger::UNKNOWN - def level=(level) - level = Logger.const_get(level.to_s.upcase) if level.is_a?(Symbol) - - unless level.is_a?(Fixnum) - raise ArgumentError.new("Invalid logger level `#{level.inspect}`") - end - - @level = level - end - - # Sets the ident string passed along to Syslog - def ident=(ident) - @ident = ident - end - - # Tagging code borrowed from ActiveSupport gem - def tagged(*tags) - new_tags = push_tags(*tags) - yield self - ensure - pop_tags(new_tags.size) - end - - def push_tags(*tags) - tags.flatten.reject{ |i| i.respond_to?(:empty?) ? i.empty? : !i }.tap do |new_tags| - current_tags.concat new_tags - end - end - - def pop_tags(size = 1) - current_tags.pop size - end - - def clear_tags! - current_tags.clear - end - - protected - - # Borrowed from SyslogLogger. - def clean(message) - message = message.to_s.dup - message.strip! # remove whitespace - message.gsub!(/\n/, '\\n') # escape newlines - message.gsub!(/%/, '%%') # syslog(3) freaks on % (printf) - message.gsub!(/\e\[[^m]*m/, '') # remove useless ansi color codes - message - end - - private - - def tags_text - tags = current_tags - if tags.any? - tags.collect { |tag| "[#{tag}] " }.join - end - end - - def current_tags - Thread.current[:syslogger_tagged_logging_tags] ||= [] - end -end - -worker_processes 2 -working_directory ENV["GITLAB_PATH"] -pid ENV["UNICORN_PATH"] + "/tmp/pids/unicorn.pid" +worker_processes 3 listen ENV["UNICORN_PATH"] + "/tmp/sockets/gitlab.socket", :backlog => 1024 +listen "/run/gitlab/gitlab.socket", :backlog => 1024 + +working_directory ENV["GITLAB_PATH"] + +pid ENV["UNICORN_PATH"] + "/tmp/pids/unicorn.pid" timeout 60 -logger Syslogger.new - +# combine Ruby 2.0.0dev or REE with "preload_app true" for memory savings +# http://rubyenterpriseedition.com/faq.html#adapt_apps_for_cow preload_app true - GC.respond_to?(:copy_on_write_friendly=) and GC.copy_on_write_friendly = true check_client_connection false +before_fork do |server, worker| + # the following is highly recommended for Rails + "preload_app true" + # as there's no need for the master process to hold a connection + defined?(ActiveRecord::Base) and + ActiveRecord::Base.connection.disconnect! + + # The following is only recommended for memory/DB-constrained + # installations. It is not needed if your system can house + # twice as many worker_processes as you have configured. + # + # This allows a new master process to incrementally + # phase out the old master process with SIGTTOU to avoid a + # thundering herd (especially in the "preload_app false" case) + # when doing a transparent upgrade. The last worker spawned + # will then kill off the old master process with a SIGQUIT. + old_pid = "#{server.config[:pid]}.oldbin" + if old_pid != server.pid + begin + sig = (worker.nr + 1) >= server.worker_processes ? :QUIT : :TTOU + Process.kill(sig, File.read(old_pid).to_i) + rescue Errno::ENOENT, Errno::ESRCH + end + end + + # Throttle the master from forking too quickly by sleeping. Due + # to the implementation of standard Unix signal handlers, this + # helps (but does not completely) prevent identical, repeated signals + # from being lost when the receiving process is busy. + # sleep 1 +end + after_fork do |server, worker| + # per-process listener ports for debugging/admin/migrations + # addr = "127.0.0.1:#{9293 + worker.nr}" + # server.listen(addr, :tries => -1, :delay => 5, :tcp_nopush => true) + + # the following is *required* for Rails + "preload_app true", defined?(ActiveRecord::Base) and ActiveRecord::Base.establish_connection + + # reset prometheus client, this will cause any opened metrics files to be closed + defined?(::Prometheus::Client.reinitialize_on_pid_change) && + Prometheus::Client.reinitialize_on_pid_change + + # if preload_app is true, then you may also want to check and + # restart any other shared sockets/descriptors such as Memcached, + # and Redis. TokyoCabinet file handles are safe to reuse + # between any number of forked children (assuming your kernel + # correctly implements pread()/pwrite() system calls) end diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix index f0b44b7bede..63e976ae566 100644 --- a/nixos/modules/services/misc/gitea.nix +++ b/nixos/modules/services/misc/gitea.nix @@ -4,6 +4,8 @@ with lib; let cfg = config.services.gitea; + pg = config.services.postgresql; + usePostgresql = cfg.database.type == "postgres"; configFile = pkgs.writeText "app.ini" '' APP_NAME = ${cfg.appName} RUN_USER = ${cfg.user} @@ -16,6 +18,9 @@ let USER = ${cfg.database.user} PASSWD = #dbpass# PATH = ${cfg.database.path} + ${optionalString usePostgresql '' + SSL_MODE = disable + ''} [repository] ROOT = ${cfg.repositoryRoot} @@ -35,6 +40,10 @@ let SECRET_KEY = #secretkey# INSTALL_LOCK = true + [log] + ROOT_PATH = ${cfg.log.rootPath} + LEVEL = ${cfg.log.level} + ${cfg.extraConfig} ''; in @@ -60,6 +69,19 @@ in description = "gitea data directory."; }; + log = { + rootPath = mkOption { + default = "${cfg.stateDir}/log"; + type = types.str; + description = "Root path for log files."; + }; + level = mkOption { + default = "Trace"; + type = types.enum [ "Trace" "Debug" "Info" "Warn" "Error" "Critical" ]; + description = "General log level."; + }; + }; + user = mkOption { type = types.str; default = "gitea"; @@ -82,7 +104,7 @@ in port = mkOption { type = types.int; - default = 3306; + default = (if !usePostgresql then 3306 else pg.port); description = "Database host port."; }; @@ -123,6 +145,15 @@ in default = "${cfg.stateDir}/data/gitea.db"; description = "Path to the sqlite3 database file."; }; + + createDatabase = mkOption { + type = types.bool; + default = true; + description = '' + Whether to create a local postgresql database automatically. + This only applies if database type "postgres" is selected. + ''; + }; }; appName = mkOption { @@ -186,10 +217,11 @@ in }; config = mkIf cfg.enable { + services.postgresql.enable = mkIf usePostgresql (mkDefault true); systemd.services.gitea = { description = "gitea"; - after = [ "network.target" ]; + after = [ "network.target" "postgresql.service" ]; wantedBy = [ "multi-user.target" ]; path = [ pkgs.gitea.bin ]; @@ -231,12 +263,31 @@ in mkdir -p ${cfg.stateDir}/conf cp -r ${pkgs.gitea.out}/locale ${cfg.stateDir}/conf/locale fi + '' + optionalString (usePostgresql && cfg.database.createDatabase) '' + if ! test -e "${cfg.stateDir}/db-created"; then + echo "CREATE ROLE ${cfg.database.user} + WITH ENCRYPTED PASSWORD '$(head -n1 ${cfg.database.passwordFile})' + NOCREATEDB NOCREATEROLE LOGIN" | + ${pkgs.sudo}/bin/sudo -u ${pg.superUser} ${pg.package}/bin/psql + ${pkgs.sudo}/bin/sudo -u ${pg.superUser} \ + ${pg.package}/bin/createdb \ + --owner=${cfg.database.user} \ + --encoding=UTF8 \ + --lc-collate=C \ + --lc-ctype=C \ + --template=template0 \ + ${cfg.database.name} + touch "${cfg.stateDir}/db-created" + fi + '' + '' + chown ${cfg.user} -R ${cfg.stateDir} ''; serviceConfig = { Type = "simple"; User = cfg.user; WorkingDirectory = cfg.stateDir; + PermissionsStartOnly = true; ExecStart = "${pkgs.gitea.bin}/bin/gitea web"; Restart = "always"; }; @@ -253,6 +304,7 @@ in description = "Gitea Service"; home = cfg.stateDir; createHome = true; + useDefaultShell = true; }; }; diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 9ed5875a019..20d7ec90dcc 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -143,6 +143,7 @@ let GITLAB_PATH = "${cfg.packages.gitlab}/share/gitlab/"; GITLAB_STATE_PATH = "${cfg.statePath}"; GITLAB_UPLOADS_PATH = "${cfg.statePath}/uploads"; + SCHEMA = "${cfg.statePath}/db/schema.rb"; GITLAB_LOG_PATH = "${cfg.statePath}/log"; GITLAB_SHELL_PATH = "${cfg.packages.gitlab-shell}"; GITLAB_SHELL_CONFIG_PATH = "${cfg.statePath}/shell/config.yml"; @@ -500,7 +501,7 @@ in { Type = "simple"; User = cfg.user; Group = cfg.group; - TimeoutSec = "300"; + TimeoutSec = "infinity"; Restart = "on-failure"; WorkingDirectory = gitlabEnv.HOME; ExecStart = "${cfg.packages.gitaly}/bin/gitaly ${gitalyToml}"; @@ -566,6 +567,7 @@ in { mkdir -p ${cfg.statePath}/tmp/pids mkdir -p ${cfg.statePath}/tmp/sockets mkdir -p ${cfg.statePath}/shell + mkdir -p ${cfg.statePath}/db rm -rf ${cfg.statePath}/config ${cfg.statePath}/shell/hooks mkdir -p ${cfg.statePath}/config @@ -580,6 +582,7 @@ in { ln -sf ${cfg.statePath}/log /run/gitlab/log ln -sf ${cfg.statePath}/uploads /run/gitlab/uploads ln -sf ${cfg.statePath}/tmp /run/gitlab/tmp + ln -sf $GITLAB_SHELL_CONFIG_PATH /run/gitlab/shell-config.yml chown -R ${cfg.user}:${cfg.group} /run/gitlab # Prepare home directory @@ -587,6 +590,7 @@ in { touch ${gitlabEnv.HOME}/.ssh/authorized_keys chown -R ${cfg.user}:${cfg.group} ${gitlabEnv.HOME}/ + cp -rf ${cfg.packages.gitlab}/share/gitlab/db/* ${cfg.statePath}/db cp -rf ${cfg.packages.gitlab}/share/gitlab/config.dist/* ${cfg.statePath}/config ${optionalString cfg.smtp.enable '' ln -sf ${smtpSettings} ${cfg.statePath}/config/initializers/smtp_settings.rb diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix index cc60a143fa6..ac37c11106e 100644 --- a/nixos/modules/services/misc/home-assistant.nix +++ b/nixos/modules/services/misc/home-assistant.nix @@ -104,7 +104,6 @@ in { config = mkIf cfg.enable { systemd.services.home-assistant = { description = "Home Assistant"; - wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; preStart = lib.optionalString (cfg.config != null) '' rm -f ${cfg.configDir}/configuration.yaml @@ -121,6 +120,16 @@ in { ReadWritePaths = "${cfg.configDir}"; PrivateTmp = true; }; + path = [ + "/run/wrappers" # needed for ping + ]; + }; + + systemd.targets.home-assistant = rec { + description = "Home Assistant"; + wantedBy = [ "multi-user.target" ]; + wants = [ "home-assistant.service" ]; + after = wants; }; users.extraUsers.hass = { diff --git a/nixos/modules/services/misc/parsoid.nix b/nixos/modules/services/misc/parsoid.nix index ae3f84333d2..c757093e5c1 100644 --- a/nixos/modules/services/misc/parsoid.nix +++ b/nixos/modules/services/misc/parsoid.nix @@ -6,6 +6,8 @@ let cfg = config.services.parsoid; + parsoid = pkgs.nodePackages."parsoid-git://github.com/abbradar/parsoid#stable"; + confTree = { worker_heartbeat_timeout = 300000; logging = { level = "info"; }; @@ -93,7 +95,7 @@ in after = [ "network.target" ]; serviceConfig = { User = "nobody"; - ExecStart = "${pkgs.nodePackages.parsoid}/lib/node_modules/parsoid/bin/server.js -c ${confFile} -n ${toString cfg.workers}"; + ExecStart = "${parsoid}/lib/node_modules/parsoid/bin/server.js -c ${confFile} -n ${toString cfg.workers}"; }; }; diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index 921be23f368..eceb91525db 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -25,6 +25,7 @@ let DATABASE_USER = cfg.database.user; DATABASE_PASSWORD = cfg.database.password; DATABASE_PATH = cfg.database.path; + DATABASE_CONN_MAX_LIFETIME = cfg.database.connMaxLifetime; SECURITY_ADMIN_USER = cfg.security.adminUser; SECURITY_ADMIN_PASSWORD = cfg.security.adminPassword; @@ -49,7 +50,7 @@ in { protocol = mkOption { description = "Which protocol to listen."; default = "http"; - type = types.enum ["http" "https"]; + type = types.enum ["http" "https" "socket"]; }; addr = mkOption { @@ -143,6 +144,15 @@ in { default = "${cfg.dataDir}/data/grafana.db"; type = types.path; }; + + connMaxLifetime = mkOption { + description = '' + Sets the maximum amount of time (in seconds) a connection may be reused. + For MySQL this setting should be shorter than the `wait_timeout' variable. + ''; + default = 14400; + type = types.int; + }; }; security = { @@ -241,7 +251,9 @@ in { description = "Grafana Service Daemon"; wantedBy = ["multi-user.target"]; after = ["networking.target"]; - environment = mapAttrs' (n: v: nameValuePair "GF_${n}" (toString v)) envOptions; + environment = { + QT_QPA_PLATFORM = "offscreen"; + } // mapAttrs' (n: v: nameValuePair "GF_${n}" (toString v)) envOptions; serviceConfig = { ExecStart = "${cfg.package.bin}/bin/grafana-server -homepath ${cfg.dataDir}"; WorkingDirectory = cfg.dataDir; diff --git a/nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix b/nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix deleted file mode 100644 index ce2e1cf2d74..00000000000 --- a/nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ config, pkgs, lib, ... }: - -with lib; - -let - cfg = config.services.prometheus.blackboxExporter; -in { - options = { - services.prometheus.blackboxExporter = { - enable = mkEnableOption "prometheus blackbox exporter"; - - configFile = mkOption { - type = types.path; - description = '' - Path to configuration file. - ''; - }; - - port = mkOption { - type = types.int; - default = 9115; - description = '' - Port to listen on. - ''; - }; - - extraFlags = mkOption { - type = types.listOf types.str; - default = []; - description = '' - Extra commandline options when launching the blackbox exporter. - ''; - }; - - openFirewall = mkOption { - type = types.bool; - default = false; - description = '' - Open port in firewall for incoming connections. - ''; - }; - }; - }; - - config = mkIf cfg.enable { - networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port; - - systemd.services.prometheus-blackbox-exporter = { - description = "Prometheus exporter for blackbox probes"; - unitConfig.Documentation = "https://github.com/prometheus/blackbox_exporter"; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - User = "nobody"; - Restart = "always"; - PrivateTmp = true; - WorkingDirectory = /tmp; - AmbientCapabilities = [ "CAP_NET_RAW" ]; # for ping probes - ExecStart = '' - ${pkgs.prometheus-blackbox-exporter}/bin/blackbox_exporter \ - --web.listen-address :${toString cfg.port} \ - --config.file ${cfg.configFile} \ - ${concatStringsSep " \\\n " cfg.extraFlags} - ''; - ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; - }; - }; - }; -} diff --git a/nixos/modules/services/monitoring/prometheus/collectd-exporter.nix b/nixos/modules/services/monitoring/prometheus/collectd-exporter.nix deleted file mode 100644 index f8a5b9576a1..00000000000 --- a/nixos/modules/services/monitoring/prometheus/collectd-exporter.nix +++ /dev/null @@ -1,128 +0,0 @@ -{ config, pkgs, lib, ... }: - -with lib; - -let - cfg = config.services.prometheus.collectdExporter; - - collectSettingsArgs = if (cfg.collectdBinary.enable) then '' - -collectd.listen-address ${optionalString (cfg.collectdBinary.listenAddress != null) cfg.collectdBinary.listenAddress}:${toString cfg.collectdBinary.port} \ - -collectd.security-level ${cfg.collectdBinary.securityLevel} \ - '' else ""; - -in { - options = { - services.prometheus.collectdExporter = { - enable = mkEnableOption "prometheus collectd exporter"; - - port = mkOption { - type = types.int; - default = 9103; - description = '' - Port to listen on. - This is used for scraping as well as the to receive collectd data via the write_http plugin. - ''; - }; - - listenAddress = mkOption { - type = types.nullOr types.str; - default = null; - example = "0.0.0.0"; - description = '' - Address to listen on for web interface, telemetry and collectd JSON data. - ''; - }; - - collectdBinary = { - enable = mkEnableOption "collectd binary protocol receiver"; - - authFile = mkOption { - default = null; - type = types.nullOr types.path; - description = "File mapping user names to pre-shared keys (passwords)."; - }; - - port = mkOption { - type = types.int; - default = 25826; - description = ''Network address on which to accept collectd binary network packets.''; - }; - - listenAddress = mkOption { - type = types.nullOr types.str; - default = null; - example = "0.0.0.0"; - description = '' - Address to listen on for binary network packets. - ''; - }; - - securityLevel = mkOption { - type = types.enum ["None" "Sign" "Encrypt"]; - default = "None"; - description = '' - Minimum required security level for accepted packets. - ''; - }; - }; - - extraFlags = mkOption { - type = types.listOf types.str; - default = []; - description = '' - Extra commandline options when launching the collectd exporter. - ''; - }; - - logFormat = mkOption { - type = types.str; - default = "logger:stderr"; - example = "logger:syslog?appname=bob&local=7 or logger:stdout?json=true"; - description = '' - Set the log target and format. - ''; - }; - - logLevel = mkOption { - type = types.enum ["debug" "info" "warn" "error" "fatal"]; - default = "info"; - description = '' - Only log messages with the given severity or above. - ''; - }; - - openFirewall = mkOption { - type = types.bool; - default = false; - description = '' - Open port in firewall for incoming connections. - ''; - }; - }; - }; - - config = mkIf cfg.enable { - networking.firewall.allowedTCPPorts = (optional cfg.openFirewall cfg.port) ++ - (optional (cfg.openFirewall && cfg.collectdBinary.enable) cfg.collectdBinary.port); - - systemd.services.prometheus-collectd-exporter = { - description = "Prometheus exporter for Collectd metrics"; - unitConfig.Documentation = "https://github.com/prometheus/collectd_exporter"; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - DynamicUser = true; - Restart = "always"; - PrivateTmp = true; - WorkingDirectory = /tmp; - ExecStart = '' - ${pkgs.prometheus-collectd-exporter}/bin/collectd_exporter \ - -log.format ${cfg.logFormat} \ - -log.level ${cfg.logLevel} \ - -web.listen-address ${optionalString (cfg.listenAddress != null) cfg.listenAddress}:${toString cfg.port} \ - ${collectSettingsArgs} \ - ${concatStringsSep " " cfg.extraFlags} - ''; - }; - }; - }; -} diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix new file mode 100644 index 00000000000..8d6ca1e40a1 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -0,0 +1,172 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.prometheus.exporters; + + # each attribute in `exporterOpts` is expected to have specified: + # - port (types.int): port on which the exporter listens + # - serviceOpts (types.attrs): config that is merged with the + # default definition of the exporter's + # systemd service + # - extraOpts (types.attrs): extra configuration options to + # configure the exporter with, which + # are appended to the default options + # + # Note that `extraOpts` is optional, but a script for the exporter's + # systemd service must be provided by specifying either + # `serviceOpts.script` or `serviceOpts.serviceConfig.ExecStart` + exporterOpts = { + blackbox = import ./exporters/blackbox.nix { inherit config lib pkgs; }; + collectd = import ./exporters/collectd.nix { inherit config lib pkgs; }; + fritzbox = import ./exporters/fritzbox.nix { inherit config lib pkgs; }; + json = import ./exporters/json.nix { inherit config lib pkgs; }; + minio = import ./exporters/minio.nix { inherit config lib pkgs; }; + nginx = import ./exporters/nginx.nix { inherit config lib pkgs; }; + node = import ./exporters/node.nix { inherit config lib pkgs; }; + postfix = import ./exporters/postfix.nix { inherit config lib pkgs; }; + snmp = import ./exporters/snmp.nix { inherit config lib pkgs; }; + unifi = import ./exporters/unifi.nix { inherit config lib pkgs; }; + varnish = import ./exporters/varnish.nix { inherit config lib pkgs; }; + }; + + mkExporterOpts = ({ name, port }: { + enable = mkEnableOption "the prometheus ${name} exporter"; + port = mkOption { + type = types.int; + default = port; + description = '' + Port to listen on. + ''; + }; + listenAddress = mkOption { + type = types.str; + default = "0.0.0.0"; + description = '' + Address to listen on. + ''; + }; + extraFlags = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Extra commandline options to pass to the ${name} exporter. + ''; + }; + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Open port in firewall for incoming connections. + ''; + }; + firewallFilter = mkOption { + type = types.str; + default = "-p tcp -m tcp --dport ${toString port}"; + example = literalExample '' + "-i eth0 -p tcp -m tcp --dport ${toString port}" + ''; + description = '' + Specify a filter for iptables to use when + + is true. It is used as `ip46tables -I INPUT -j ACCEPT`. + ''; + }; + user = mkOption { + type = types.str; + default = "nobody"; + description = '' + User name under which the ${name} exporter shall be run. + Has no effect when is true. + ''; + }; + group = mkOption { + type = types.str; + default = "nobody"; + description = '' + Group under which the ${name} exporter shall be run. + Has no effect when is true. + ''; + }; + }); + + mkSubModule = { name, port, extraOpts, serviceOpts }: { + ${name} = mkOption { + type = types.submodule { + options = (mkExporterOpts { + inherit name port; + } // extraOpts); + }; + internal = true; + default = {}; + }; + }; + + mkSubModules = (foldl' (a: b: a//b) {} + (mapAttrsToList (name: opts: mkSubModule { + inherit name; + inherit (opts) port serviceOpts; + extraOpts = opts.extraOpts or {}; + }) exporterOpts) + ); + + mkExporterConf = { name, conf, serviceOpts }: + mkIf conf.enable { + networking.firewall.extraCommands = mkIf conf.openFirewall '' + ip46tables -I INPUT ${conf.firewallFilter} -j ACCEPT + ''; + systemd.services."prometheus-${name}-exporter" = mkMerge ([{ + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + serviceConfig = { + Restart = mkDefault "always"; + PrivateTmp = mkDefault true; + WorkingDirectory = mkDefault /tmp; + } // mkIf (!(serviceOpts.serviceConfig.DynamicUser or false)) { + User = conf.user; + Group = conf.group; + }; + } serviceOpts ]); + }; +in +{ + options.services.prometheus.exporters = mkOption { + type = types.submodule { + options = (mkSubModules); + }; + description = "Prometheus exporter configuration"; + default = {}; + example = literalExample '' + { + node = { + enable = true; + enabledCollectors = [ "systemd" ]; + }; + varnish.enable = true; + } + ''; + }; + + config = mkMerge ([{ + assertions = [{ + assertion = (cfg.snmp.configurationPath == null) != (cfg.snmp.configuration == null); + message = '' + Please ensure you have either `services.prometheus.exporters.snmp.configuration' + or `services.prometheus.exporters.snmp.configurationPath' set! + ''; + }]; + }] ++ [(mkIf config.services.minio.enable { + services.prometheus.exporters.minio.minioAddress = mkDefault "http://localhost:9000"; + services.prometheus.exporters.minio.minioAccessKey = mkDefault config.services.minio.accessKey; + services.prometheus.exporters.minio.minioAccessSecret = mkDefault config.services.minio.secretKey; + })] ++ (mapAttrsToList (name: conf: + mkExporterConf { + inherit name; + inherit (conf) serviceOpts; + conf = cfg.${name}; + }) exporterOpts) + ); + + meta.doc = ./exporters.xml; +} diff --git a/nixos/modules/services/monitoring/prometheus/exporters.xml b/nixos/modules/services/monitoring/prometheus/exporters.xml new file mode 100644 index 00000000000..4f0bcb29810 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters.xml @@ -0,0 +1,135 @@ + + +Prometheus exporters + +Prometheus exporters provide metrics for the prometheus monitoring system. + +
Configuration + One of the most common exporters is the node exporter, it provides hardware and OS metrics from the host it's running on. The exporter could be configured as follows: + + services.promtheus.exporters.node = { + enable = true; + enabledCollectors = [ + "logind" + "systemd" + ]; + disabledCollectors = [ + "textfile" + ]; + openFirewall = true; + firewallFilter = "-i br0 -p tcp -m tcp --dport 9100"; + }; + +It should now serve all metrics from the collectors +that are explicitly enabled and the ones that are +enabled by default, via http under /metrics. In this example the firewall should just +allow incoming connections to the exporter's port on the bridge interface br0 +(this would have to be configured seperately of course). +For more information about configuration see man configuration.nix or +search through the available options. + +
+
Adding a new exporter + To add a new exporter, it has to be packaged first (see nixpkgs/pkgs/servers/monitoring/prometheus/ for examples), then a module can be added. The postfix exporter is used in this example: + + + + Some default options for all exporters are provided by + nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix: + + + + + enable + port + listenAddress + extraFlags + openFirewall + firewallFilter + user + group + + + + As there is already a package available, the module can now be added. + This is accomplished by adding a new file to the + nixos/modules/services/monitoring/prometheus/exporters/ directory, + which will be called postfix.nix and contains all exporter specific options + and configuration: + + # nixpgs/nixos/modules/services/prometheus/exporters/postfix.nix + { config, lib, pkgs }: + + with lib; + + let + # for convenience we define cfg here + cfg = config.services.prometheus.exporters.postfix; + in + { + port = 9154; # The postfix exporter listens on this port by default + + # `extraOpts` is an attribute set which contains additional options + # (and optional overrides for default options). + # Note that this attribute is optional. + extraOpts = { + telemetryPath = mkOption { + type = types.str; + default = "/metrics"; + description = '' + Path under which to expose metrics. + ''; + }; + logfilePath = mkOption { + type = types.path; + default = /var/log/postfix_exporter_input.log; + example = /var/log/mail.log; + description = '' + Path where Postfix writes log entries. + This file will be truncated by this exporter! + ''; + }; + showqPath = mkOption { + type = types.path; + default = /var/spool/postfix/public/showq; + example = /var/lib/postfix/queue/public/showq; + description = '' + Path at which Postfix places its showq socket. + ''; + }; + }; + + # `serviceOpts` is an attribute set which contains configuration + # for the exporter's systemd service. One of + # `serviceOpts.script` and `serviceOpts.serviceConfig.ExecStart` + # has to be specified here. This will be merged with the default + # service confiuration. + serviceOpts = { + serviceConfig = { + ExecStart = '' + ${pkgs.prometheus-postfix-exporter}/bin/postfix_exporter \ + --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ + --web.telemetry-path ${cfg.telemetryPath} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + }; + }; + } + + + + + + This should already be enough for the postfix exporter. Additionally one could + now add assertions and conditional default values. This can be done in the + 'meta-module' that combines all exporter definitions and generates the submodules: + nixpkgs/nixos/modules/services/prometheus/exporters.nix + + + +
+ diff --git a/nixos/modules/services/monitoring/prometheus/exporters/blackbox.nix b/nixos/modules/services/monitoring/prometheus/exporters/blackbox.nix new file mode 100644 index 00000000000..d09d1c4f366 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/blackbox.nix @@ -0,0 +1,31 @@ +{ config, lib, pkgs }: + +with lib; + +let + cfg = config.services.prometheus.exporters.blackbox; +in +{ + port = 9115; + extraOpts = { + configFile = mkOption { + type = types.path; + description = '' + Path to configuration file. + ''; + }; + }; + serviceOpts = { + serviceConfig = { + AmbientCapabilities = [ "CAP_NET_RAW" ]; # for ping probes + DynamicUser = true; + ExecStart = '' + ${pkgs.prometheus-blackbox-exporter}/bin/blackbox_exporter \ + --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ + --config.file ${cfg.configFile} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + }; + }; +} diff --git a/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix b/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix new file mode 100644 index 00000000000..0eba3527162 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix @@ -0,0 +1,78 @@ +{ config, lib, pkgs }: + +with lib; + +let + cfg = config.services.prometheus.exporters.collectd; +in +{ + port = 9103; + extraOpts = { + collectdBinary = { + enable = mkEnableOption "collectd binary protocol receiver"; + + authFile = mkOption { + default = null; + type = types.nullOr types.path; + description = "File mapping user names to pre-shared keys (passwords)."; + }; + + port = mkOption { + type = types.int; + default = 25826; + description = ''Network address on which to accept collectd binary network packets.''; + }; + + listenAddress = mkOption { + type = types.str; + default = "0.0.0.0"; + description = '' + Address to listen on for binary network packets. + ''; + }; + + securityLevel = mkOption { + type = types.enum ["None" "Sign" "Encrypt"]; + default = "None"; + description = '' + Minimum required security level for accepted packets. + ''; + }; + }; + + logFormat = mkOption { + type = types.str; + default = "logger:stderr"; + example = "logger:syslog?appname=bob&local=7 or logger:stdout?json=true"; + description = '' + Set the log target and format. + ''; + }; + + logLevel = mkOption { + type = types.enum ["debug" "info" "warn" "error" "fatal"]; + default = "info"; + description = '' + Only log messages with the given severity or above. + ''; + }; + }; + serviceOpts = let + collectSettingsArgs = if (cfg.collectdBinary.enable) then '' + -collectd.listen-address ${cfg.collectdBinary.listenAddress}:${toString cfg.collectdBinary.port} \ + -collectd.security-level ${cfg.collectdBinary.securityLevel} \ + '' else ""; + in { + serviceConfig = { + DynamicUser = true; + ExecStart = '' + ${pkgs.prometheus-collectd-exporter}/bin/collectd_exporter \ + -log.format ${cfg.logFormat} \ + -log.level ${cfg.logLevel} \ + -web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ + ${collectSettingsArgs} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + }; + }; +} diff --git a/nixos/modules/services/monitoring/prometheus/exporters/fritzbox.nix b/nixos/modules/services/monitoring/prometheus/exporters/fritzbox.nix new file mode 100644 index 00000000000..a3f1d9d3132 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/fritzbox.nix @@ -0,0 +1,39 @@ +{ config, lib, pkgs }: + +with lib; + +let + cfg = config.services.prometheus.exporters.fritzbox; +in +{ + port = 9133; + extraOpts = { + gatewayAddress = mkOption { + type = types.str; + default = "fritz.box"; + description = '' + The hostname or IP of the FRITZ!Box. + ''; + }; + + gatewayPort = mkOption { + type = types.int; + default = 49000; + description = '' + The port of the FRITZ!Box UPnP service. + ''; + }; + }; + serviceOpts = { + serviceConfig = { + DynamicUser = true; + ExecStart = '' + ${pkgs.prometheus-fritzbox-exporter}/bin/fritzbox_exporter \ + -listen-address ${cfg.listenAddress}:${toString cfg.port} \ + -gateway-address ${cfg.gatewayAddress} \ + -gateway-port ${toString cfg.gatewayPort} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + }; + }; +} diff --git a/nixos/modules/services/monitoring/prometheus/exporters/json.nix b/nixos/modules/services/monitoring/prometheus/exporters/json.nix new file mode 100644 index 00000000000..a5494e85e01 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/json.nix @@ -0,0 +1,36 @@ +{ config, lib, pkgs }: + +with lib; + +let + cfg = config.services.prometheus.exporters.json; +in +{ + port = 7979; + extraOpts = { + url = mkOption { + type = types.str; + description = '' + URL to scrape JSON from. + ''; + }; + configFile = mkOption { + type = types.path; + description = '' + Path to configuration file. + ''; + }; + listenAddress = {}; # not used + }; + serviceOpts = { + serviceConfig = { + DynamicUser = true; + ExecStart = '' + ${pkgs.prometheus-json-exporter}/bin/prometheus-json-exporter \ + --port ${toString cfg.port} \ + ${cfg.url} ${cfg.configFile} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + }; + }; +} diff --git a/nixos/modules/services/monitoring/prometheus/exporters/minio.nix b/nixos/modules/services/monitoring/prometheus/exporters/minio.nix new file mode 100644 index 00000000000..3cc4ffdbc8f --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/minio.nix @@ -0,0 +1,65 @@ +{ config, lib, pkgs }: + +with lib; + +let + cfg = config.services.prometheus.exporters.minio; +in +{ + port = 9290; + extraOpts = { + minioAddress = mkOption { + type = types.str; + example = "https://10.0.0.1:9000"; + description = '' + The URL of the minio server. + Use HTTPS if Minio accepts secure connections only. + By default this connects to the local minio server if enabled. + ''; + }; + + minioAccessKey = mkOption { + type = types.str; + example = "yourMinioAccessKey"; + description = '' + The value of the Minio access key. + It is required in order to connect to the server. + By default this uses the one from the local minio server if enabled + and config.services.minio.accessKey. + ''; + }; + + minioAccessSecret = mkOption { + type = types.str; + description = '' + The value of the Minio access secret. + It is required in order to connect to the server. + By default this uses the one from the local minio server if enabled + and config.services.minio.secretKey. + ''; + }; + + minioBucketStats = mkOption { + type = types.bool; + default = false; + description = '' + Collect statistics about the buckets and files in buckets. + It requires more computation, use it carefully in case of large buckets.. + ''; + }; + }; + serviceOpts = { + serviceConfig = { + DynamicUser = true; + ExecStart = '' + ${pkgs.prometheus-minio-exporter}/bin/minio-exporter \ + -web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ + -minio.server ${cfg.minioAddress} \ + -minio.access-key ${cfg.minioAccessKey} \ + -minio.access-secret ${cfg.minioAccessSecret} \ + ${optionalString cfg.minioBucketStats "-minio.bucket-stats"} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + }; + }; +} diff --git a/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix b/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix new file mode 100644 index 00000000000..6a3ba2d0457 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix @@ -0,0 +1,31 @@ +{ config, lib, pkgs }: + +with lib; + +let + cfg = config.services.prometheus.exporters.nginx; +in +{ + port = 9113; + extraOpts = { + scrapeUri = mkOption { + type = types.string; + default = "http://localhost/nginx_status"; + description = '' + Address to access the nginx status page. + Can be enabled with services.nginx.statusPage = true. + ''; + }; + }; + serviceOpts = { + serviceConfig = { + DynamicUser = true; + ExecStart = '' + ${pkgs.prometheus-nginx-exporter}/bin/nginx_exporter \ + -nginx.scrape_uri '${cfg.scrapeUri}' \ + -telemetry.address ${cfg.listenAddress}:${toString cfg.port} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + }; + }; +} diff --git a/nixos/modules/services/monitoring/prometheus/exporters/node.nix b/nixos/modules/services/monitoring/prometheus/exporters/node.nix new file mode 100644 index 00000000000..c85f5f9cfb2 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/node.nix @@ -0,0 +1,39 @@ +{ config, lib, pkgs }: + +with lib; + +let + cfg = config.services.prometheus.exporters.node; +in +{ + port = 9100; + extraOpts = { + enabledCollectors = mkOption { + type = types.listOf types.string; + default = []; + example = ''[ "systemd" ]''; + description = '' + Collectors to enable. The collectors listed here are enabled in addition to the default ones. + ''; + }; + disabledCollectors = mkOption { + type = types.listOf types.str; + default = []; + example = ''[ "timex" ]''; + description = '' + Collectors to disable which are enabled by default. + ''; + }; + }; + serviceOpts = { + serviceConfig = { + ExecStart = '' + ${pkgs.prometheus-node-exporter}/bin/node_exporter \ + ${concatMapStringsSep " " (x: "--collector." + x) cfg.enabledCollectors} \ + ${concatMapStringsSep " " (x: "--no-collector." + x) cfg.disabledCollectors} \ + --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + }; + }; +} diff --git a/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix b/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix new file mode 100644 index 00000000000..1e909aa27d8 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix @@ -0,0 +1,46 @@ +{ config, lib, pkgs }: + +with lib; + +let + cfg = config.services.prometheus.exporters.postfix; +in +{ + port = 9154; + extraOpts = { + telemetryPath = mkOption { + type = types.str; + default = "/metrics"; + description = '' + Path under which to expose metrics. + ''; + }; + logfilePath = mkOption { + type = types.path; + default = "/var/log/postfix_exporter_input.log"; + example = "/var/log/mail.log"; + description = '' + Path where Postfix writes log entries. + This file will be truncated by this exporter! + ''; + }; + showqPath = mkOption { + type = types.path; + default = "/var/spool/postfix/public/showq"; + example = "/var/lib/postfix/queue/public/showq"; + description = '' + Path where Postfix places it's showq socket. + ''; + }; + }; + serviceOpts = { + serviceConfig = { + ExecStart = '' + ${pkgs.prometheus-postfix-exporter}/bin/postfix_exporter \ + --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ + --web.telemetry-path ${cfg.telemetryPath} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + }; + }; +} diff --git a/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix b/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix new file mode 100644 index 00000000000..404cd0a1896 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix @@ -0,0 +1,71 @@ +{ config, lib, pkgs }: + +with lib; + +let + cfg = config.services.prometheus.exporters.snmp; +in +{ + port = 9116; + extraOpts = { + configurationPath = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Path to a snmp exporter configuration file. Mutually exclusive with 'configuration' option. + ''; + example = "./snmp.yml"; + }; + + configuration = mkOption { + type = types.nullOr types.attrs; + default = {}; + description = '' + Snmp exporter configuration as nix attribute set. Mutually exclusive with 'configurationPath' option. + ''; + example = '' + { + "default" = { + "version" = 2; + "auth" = { + "community" = "public"; + }; + }; + }; + ''; + }; + + logFormat = mkOption { + type = types.str; + default = "logger:stderr"; + description = '' + Set the log target and format. + ''; + }; + + logLevel = mkOption { + type = types.enum ["debug" "info" "warn" "error" "fatal"]; + default = "info"; + description = '' + Only log messages with the given severity or above. + ''; + }; + }; + serviceOpts = let + configFile = if cfg.configurationPath != null + then cfg.configurationPath + else "${pkgs.writeText "snmp-eporter-conf.yml" (builtins.toJSON cfg.configuration)}"; + in { + serviceConfig = { + DynamicUser = true; + ExecStart = '' + ${pkgs.prometheus-snmp-exporter.bin}/bin/snmp_exporter \ + -config.file ${configFile} \ + -log.format ${cfg.logFormat} \ + -log.level ${cfg.logLevel} \ + -web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + }; + }; +} diff --git a/nixos/modules/services/monitoring/prometheus/exporters/unifi.nix b/nixos/modules/services/monitoring/prometheus/exporters/unifi.nix new file mode 100644 index 00000000000..011dcbe208e --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/unifi.nix @@ -0,0 +1,67 @@ +{ config, lib, pkgs }: + +with lib; + +let + cfg = config.services.prometheus.exporters.unifi; +in +{ + port = 9130; + extraOpts = { + unifiAddress = mkOption { + type = types.str; + example = "https://10.0.0.1:8443"; + description = '' + URL of the UniFi Controller API. + ''; + }; + + unifiInsecure = mkOption { + type = types.bool; + default = false; + description = '' + If enabled skip the verification of the TLS certificate of the UniFi Controller API. + Use with caution. + ''; + }; + + unifiUsername = mkOption { + type = types.str; + example = "ReadOnlyUser"; + description = '' + username for authentication against UniFi Controller API. + ''; + }; + + unifiPassword = mkOption { + type = types.str; + description = '' + Password for authentication against UniFi Controller API. + ''; + }; + + unifiTimeout = mkOption { + type = types.str; + default = "5s"; + example = "2m"; + description = '' + Timeout including unit for UniFi Controller API requests. + ''; + }; + }; + serviceOpts = { + serviceConfig = { + DynamicUser = true; + ExecStart = '' + ${pkgs.prometheus-unifi-exporter}/bin/unifi_exporter \ + -telemetry.addr ${cfg.listenAddress}:${toString cfg.port} \ + -unifi.addr ${cfg.unifiAddress} \ + -unifi.username ${cfg.unifiUsername} \ + -unifi.password ${cfg.unifiPassword} \ + -unifi.timeout ${cfg.unifiTimeout} \ + ${optionalString cfg.unifiInsecure "-unifi.insecure" } \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + }; + }; +} diff --git a/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix b/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix new file mode 100644 index 00000000000..b439a83e7aa --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix @@ -0,0 +1,21 @@ +{ config, lib, pkgs }: + +with lib; + +let + cfg = config.services.prometheus.exporters.varnish; +in +{ + port = 9131; + serviceOpts = { + path = [ pkgs.varnish ]; + serviceConfig = { + DynamicUser = true; + ExecStart = '' + ${pkgs.prometheus-varnish-exporter}/bin/prometheus_varnish_exporter \ + -web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + }; + }; +} diff --git a/nixos/modules/services/monitoring/prometheus/fritzbox-exporter.nix b/nixos/modules/services/monitoring/prometheus/fritzbox-exporter.nix deleted file mode 100644 index 6da39b6519c..00000000000 --- a/nixos/modules/services/monitoring/prometheus/fritzbox-exporter.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ config, pkgs, lib, ... }: - -with lib; - -let - cfg = config.services.prometheus.fritzboxExporter; -in { - options = { - services.prometheus.fritzboxExporter = { - enable = mkEnableOption "prometheus fritzbox exporter"; - - port = mkOption { - type = types.int; - default = 9133; - description = '' - Port to listen on. - ''; - }; - - gatewayAddress = mkOption { - type = types.str; - default = "fritz.box"; - description = '' - The hostname or IP of the FRITZ!Box. - ''; - }; - - gatewayPort = mkOption { - type = types.int; - default = 49000; - description = '' - The port of the FRITZ!Box UPnP service. - ''; - }; - - extraFlags = mkOption { - type = types.listOf types.str; - default = []; - description = '' - Extra commandline options when launching the fritzbox exporter. - ''; - }; - - openFirewall = mkOption { - type = types.bool; - default = false; - description = '' - Open port in firewall for incoming connections. - ''; - }; - }; - }; - - config = mkIf cfg.enable { - networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port; - - systemd.services.prometheus-fritzbox-exporter = { - description = "Prometheus exporter for FRITZ!Box via UPnP"; - unitConfig.Documentation = "https://github.com/ndecker/fritzbox_exporter"; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - User = "nobody"; - Restart = "always"; - PrivateTmp = true; - WorkingDirectory = /tmp; - ExecStart = '' - ${pkgs.prometheus-fritzbox-exporter}/bin/fritzbox_exporter \ - -listen-address :${toString cfg.port} \ - -gateway-address ${cfg.gatewayAddress} \ - -gateway-port ${toString cfg.gatewayPort} \ - ${concatStringsSep " \\\n " cfg.extraFlags} - ''; - }; - }; - }; -} diff --git a/nixos/modules/services/monitoring/prometheus/json-exporter.nix b/nixos/modules/services/monitoring/prometheus/json-exporter.nix deleted file mode 100644 index 6bc56df9834..00000000000 --- a/nixos/modules/services/monitoring/prometheus/json-exporter.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ config, pkgs, lib, ... }: - -with lib; - -let - cfg = config.services.prometheus.jsonExporter; -in { - options = { - services.prometheus.jsonExporter = { - enable = mkEnableOption "prometheus JSON exporter"; - - url = mkOption { - type = types.str; - description = '' - URL to scrape JSON from. - ''; - }; - - configFile = mkOption { - type = types.path; - description = '' - Path to configuration file. - ''; - }; - - port = mkOption { - type = types.int; - default = 7979; - description = '' - Port to listen on. - ''; - }; - - extraFlags = mkOption { - type = types.listOf types.str; - default = []; - description = '' - Extra commandline options when launching the JSON exporter. - ''; - }; - - openFirewall = mkOption { - type = types.bool; - default = false; - description = '' - Open port in firewall for incoming connections. - ''; - }; - }; - }; - - config = mkIf cfg.enable { - networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port; - - systemd.services.prometheus-json-exporter = { - description = "Prometheus exporter for JSON over HTTP"; - unitConfig.Documentation = "https://github.com/kawamuray/prometheus-json-exporter"; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - User = "nobody"; - Restart = "always"; - PrivateTmp = true; - WorkingDirectory = /tmp; - ExecStart = '' - ${pkgs.prometheus-json-exporter}/bin/prometheus-json-exporter \ - --port ${toString cfg.port} \ - ${cfg.url} ${cfg.configFile} \ - ${concatStringsSep " \\\n " cfg.extraFlags} - ''; - ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; - }; - }; - }; -} diff --git a/nixos/modules/services/monitoring/prometheus/minio-exporter.nix b/nixos/modules/services/monitoring/prometheus/minio-exporter.nix deleted file mode 100644 index 4314671523c..00000000000 --- a/nixos/modules/services/monitoring/prometheus/minio-exporter.nix +++ /dev/null @@ -1,117 +0,0 @@ -{ config, pkgs, lib, ... }: - -with lib; - -let - cfg = config.services.prometheus.minioExporter; -in { - options = { - services.prometheus.minioExporter = { - enable = mkEnableOption "prometheus minio exporter"; - - port = mkOption { - type = types.int; - default = 9290; - description = '' - Port to listen on. - ''; - }; - - listenAddress = mkOption { - type = types.nullOr types.str; - default = null; - example = "0.0.0.0"; - description = '' - Address to listen on for web interface and telemetry. - ''; - }; - - minioAddress = mkOption { - type = types.str; - example = "https://10.0.0.1:9000"; - default = if config.services.minio.enable then "http://localhost:9000" else null; - description = '' - The URL of the minio server. - Use HTTPS if Minio accepts secure connections only. - By default this connects to the local minio server if enabled. - ''; - }; - - minioAccessKey = mkOption ({ - type = types.str; - example = "BKIKJAA5BMMU2RHO6IBB"; - description = '' - The value of the Minio access key. - It is required in order to connect to the server. - By default this uses the one from the local minio server if enabled - and config.services.minio.accessKey. - ''; - } // optionalAttrs (config.services.minio.enable && config.services.minio.accessKey != "") { - default = config.services.minio.accessKey; - }); - - minioAccessSecret = mkOption ({ - type = types.str; - description = '' - The calue of the Minio access secret. - It is required in order to connect to the server. - By default this uses the one from the local minio server if enabled - and config.services.minio.secretKey. - ''; - } // optionalAttrs (config.services.minio.enable && config.services.minio.secretKey != "") { - default = config.services.minio.secretKey; - }); - - minioBucketStats = mkOption { - type = types.bool; - default = false; - description = '' - Collect statistics about the buckets and files in buckets. - It requires more computation, use it carefully in case of large buckets.. - ''; - }; - - extraFlags = mkOption { - type = types.listOf types.str; - default = []; - description = '' - Extra commandline options when launching the minio exporter. - ''; - }; - - openFirewall = mkOption { - type = types.bool; - default = false; - description = '' - Open port in firewall for incoming connections. - ''; - }; - }; - }; - - config = mkIf cfg.enable { - networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port; - - systemd.services.prometheus-minio-exporter = { - description = "Prometheus exporter for Minio server metrics"; - unitConfig.Documentation = "https://github.com/joe-pll/minio-exporter"; - wantedBy = [ "multi-user.target" ]; - after = optional config.services.minio.enable "minio.service"; - serviceConfig = { - DynamicUser = true; - Restart = "always"; - PrivateTmp = true; - WorkingDirectory = /tmp; - ExecStart = '' - ${pkgs.prometheus-minio-exporter}/bin/minio-exporter \ - -web.listen-address ${optionalString (cfg.listenAddress != null) cfg.listenAddress}:${toString cfg.port} \ - -minio.server ${cfg.minioAddress} \ - -minio.access-key ${cfg.minioAccessKey} \ - -minio.access-secret ${cfg.minioAccessSecret} \ - ${optionalString cfg.minioBucketStats "-minio.bucket-stats"} \ - ${concatStringsSep " \\\n " cfg.extraFlags} - ''; - }; - }; - }; -} diff --git a/nixos/modules/services/monitoring/prometheus/nginx-exporter.nix b/nixos/modules/services/monitoring/prometheus/nginx-exporter.nix deleted file mode 100644 index 1ccafee3b18..00000000000 --- a/nixos/modules/services/monitoring/prometheus/nginx-exporter.nix +++ /dev/null @@ -1,78 +0,0 @@ -{ config, pkgs, lib, ... }: - -with lib; - -let - cfg = config.services.prometheus.nginxExporter; -in { - options = { - services.prometheus.nginxExporter = { - enable = mkEnableOption "prometheus nginx exporter"; - - port = mkOption { - type = types.int; - default = 9113; - description = '' - Port to listen on. - ''; - }; - - listenAddress = mkOption { - type = types.string; - default = "0.0.0.0"; - description = '' - Address to listen on. - ''; - }; - - scrapeUri = mkOption { - type = types.string; - default = "http://localhost/nginx_status"; - description = '' - Address to access the nginx status page. - Can be enabled with services.nginx.statusPage = true. - ''; - }; - - extraFlags = mkOption { - type = types.listOf types.str; - default = []; - description = '' - Extra commandline options when launching the nginx exporter. - ''; - }; - - openFirewall = mkOption { - type = types.bool; - default = false; - description = '' - Open port in firewall for incoming connections. - ''; - }; - }; - }; - - config = mkIf cfg.enable { - networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port; - - systemd.services.prometheus-nginx-exporter = { - after = [ "network.target" "nginx.service" ]; - description = "Prometheus exporter for nginx metrics"; - unitConfig.Documentation = "https://github.com/discordianfish/nginx_exporter"; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - User = "nobody"; - Restart = "always"; - PrivateTmp = true; - WorkingDirectory = /tmp; - ExecStart = '' - ${pkgs.prometheus-nginx-exporter}/bin/nginx_exporter \ - -nginx.scrape_uri '${cfg.scrapeUri}' \ - -telemetry.address ${cfg.listenAddress}:${toString cfg.port} \ - ${concatStringsSep " \\\n " cfg.extraFlags} - ''; - ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; - }; - }; - }; -} diff --git a/nixos/modules/services/monitoring/prometheus/node-exporter.nix b/nixos/modules/services/monitoring/prometheus/node-exporter.nix deleted file mode 100644 index bad4389ce79..00000000000 --- a/nixos/modules/services/monitoring/prometheus/node-exporter.nix +++ /dev/null @@ -1,87 +0,0 @@ -{ config, pkgs, lib, ... }: - -with lib; - -let - cfg = config.services.prometheus.nodeExporter; -in { - options = { - services.prometheus.nodeExporter = { - enable = mkEnableOption "prometheus node exporter"; - - port = mkOption { - type = types.int; - default = 9100; - description = '' - Port to listen on. - ''; - }; - - listenAddress = mkOption { - type = types.string; - default = "0.0.0.0"; - description = '' - Address to listen on. - ''; - }; - - enabledCollectors = mkOption { - type = types.listOf types.string; - default = []; - example = ''[ "systemd" ]''; - description = '' - Collectors to enable. The collectors listed here are enabled in addition to the default ones. - ''; - }; - - disabledCollectors = mkOption { - type = types.listOf types.str; - default = []; - example = ''[ "timex" ]''; - description = '' - Collectors to disable which are enabled by default. - ''; - }; - - extraFlags = mkOption { - type = types.listOf types.str; - default = []; - description = '' - Extra commandline options when launching the node exporter. - ''; - }; - - openFirewall = mkOption { - type = types.bool; - default = false; - description = '' - Open port in firewall for incoming connections. - ''; - }; - }; - }; - - config = mkIf cfg.enable { - networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port; - - systemd.services.prometheus-node-exporter = { - description = "Prometheus exporter for machine metrics"; - unitConfig.Documentation = "https://github.com/prometheus/node_exporter"; - wantedBy = [ "multi-user.target" ]; - script = '' - exec ${pkgs.prometheus-node-exporter}/bin/node_exporter \ - ${concatMapStringsSep " " (x: "--collector." + x) cfg.enabledCollectors} \ - ${concatMapStringsSep " " (x: "--no-collector." + x) cfg.disabledCollectors} \ - --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ - ${concatStringsSep " \\\n " cfg.extraFlags} - ''; - serviceConfig = { - User = "nobody"; - Restart = "always"; - PrivateTmp = true; - WorkingDirectory = /tmp; - ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; - }; - }; - }; -} diff --git a/nixos/modules/services/monitoring/prometheus/snmp-exporter.nix b/nixos/modules/services/monitoring/prometheus/snmp-exporter.nix deleted file mode 100644 index fe33f8c1f04..00000000000 --- a/nixos/modules/services/monitoring/prometheus/snmp-exporter.nix +++ /dev/null @@ -1,127 +0,0 @@ -{ config, pkgs, lib, ... }: - -with lib; - -let - cfg = config.services.prometheus.snmpExporter; - mkConfigFile = pkgs.writeText "snmp.yml" (if cfg.configurationPath == null then builtins.toJSON cfg.configuration else builtins.readFile cfg.configurationPath); -in { - options = { - services.prometheus.snmpExporter = { - enable = mkEnableOption "Prometheus snmp exporter"; - - user = mkOption { - type = types.str; - default = "nobody"; - description = '' - User name under which snmp exporter shall be run. - ''; - }; - - group = mkOption { - type = types.str; - default = "nogroup"; - description = '' - Group under which snmp exporter shall be run. - ''; - }; - - port = mkOption { - type = types.int; - default = 9116; - description = '' - Port to listen on. - ''; - }; - - listenAddress = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - Address to listen on for web interface and telemetry. - ''; - }; - - configurationPath = mkOption { - type = types.nullOr types.path; - default = null; - description = '' - Path to a snmp exporter configuration file. Mutually exclusive with 'configuration' option. - ''; - example = "./snmp.yml"; - }; - - configuration = mkOption { - type = types.nullOr types.attrs; - default = {}; - description = '' - Snmp exporter configuration as nix attribute set. Mutually exclusive with 'configurationPath' option. - ''; - example = '' - { - "default" = { - "version" = 2; - "auth" = { - "community" = "public"; - }; - }; - }; - ''; - }; - - logFormat = mkOption { - type = types.str; - default = "logger:stderr"; - description = '' - Set the log target and format. - ''; - }; - - logLevel = mkOption { - type = types.enum ["debug" "info" "warn" "error" "fatal"]; - default = "info"; - description = '' - Only log messages with the given severity or above. - ''; - }; - - openFirewall = mkOption { - type = types.bool; - default = false; - description = '' - Open port in firewall for incoming connections. - ''; - }; - }; - }; - - config = mkIf cfg.enable { - networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port; - - assertions = singleton - { - assertion = (cfg.configurationPath == null) != (cfg.configuration == null); - message = "Please ensure you have either 'configuration' or 'configurationPath' set!"; - }; - - systemd.services.prometheus-snmp-exporter = { - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - script = '' - ${pkgs.prometheus-snmp-exporter.bin}/bin/snmp_exporter \ - -config.file ${mkConfigFile} \ - -log.format ${cfg.logFormat} \ - -log.level ${cfg.logLevel} \ - -web.listen-address ${optionalString (cfg.listenAddress != null) cfg.listenAddress}:${toString cfg.port} - ''; - - serviceConfig = { - User = cfg.user; - Group = cfg.group; - Restart = "always"; - PrivateTmp = true; - WorkingDirectory = "/tmp"; - }; - }; - }; -} diff --git a/nixos/modules/services/monitoring/prometheus/unifi-exporter.nix b/nixos/modules/services/monitoring/prometheus/unifi-exporter.nix deleted file mode 100644 index 0a56d6ae95a..00000000000 --- a/nixos/modules/services/monitoring/prometheus/unifi-exporter.nix +++ /dev/null @@ -1,105 +0,0 @@ -{ config, pkgs, lib, ... }: - -with lib; - -let - cfg = config.services.prometheus.unifiExporter; -in { - options = { - services.prometheus.unifiExporter = { - enable = mkEnableOption "prometheus unifi exporter"; - - port = mkOption { - type = types.int; - default = 9130; - description = '' - Port to listen on. - ''; - }; - - unifiAddress = mkOption { - type = types.str; - example = "https://10.0.0.1:8443"; - description = '' - URL of the UniFi Controller API. - ''; - }; - - unifiInsecure = mkOption { - type = types.bool; - default = false; - description = '' - If enabled skip the verification of the TLS certificate of the UniFi Controller API. - Use with caution. - ''; - }; - - unifiUsername = mkOption { - type = types.str; - example = "ReadOnlyUser"; - description = '' - username for authentication against UniFi Controller API. - ''; - }; - - unifiPassword = mkOption { - type = types.str; - description = '' - Password for authentication against UniFi Controller API. - ''; - }; - - unifiTimeout = mkOption { - type = types.str; - default = "5s"; - example = "2m"; - description = '' - Timeout including unit for UniFi Controller API requests. - ''; - }; - - extraFlags = mkOption { - type = types.listOf types.str; - default = []; - description = '' - Extra commandline options when launching the unifi exporter. - ''; - }; - - openFirewall = mkOption { - type = types.bool; - default = false; - description = '' - Open port in firewall for incoming connections. - ''; - }; - }; - }; - - config = mkIf cfg.enable { - networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port; - - systemd.services.prometheus-unifi-exporter = { - description = "Prometheus exporter for UniFi Controller metrics"; - unitConfig.Documentation = "https://github.com/mdlayher/unifi_exporter"; - wantedBy = [ "multi-user.target" ]; - after = optional config.services.unifi.enable "unifi.service"; - serviceConfig = { - User = "nobody"; - Restart = "always"; - PrivateTmp = true; - WorkingDirectory = /tmp; - ExecStart = '' - ${pkgs.prometheus-unifi-exporter}/bin/unifi_exporter \ - -telemetry.addr :${toString cfg.port} \ - -unifi.addr ${cfg.unifiAddress} \ - -unifi.username ${cfg.unifiUsername} \ - -unifi.password ${cfg.unifiPassword} \ - -unifi.timeout ${cfg.unifiTimeout} \ - ${optionalString cfg.unifiInsecure "-unifi.insecure" } \ - ${concatStringsSep " \\\n " cfg.extraFlags} - ''; - }; - }; - }; -} diff --git a/nixos/modules/services/monitoring/prometheus/varnish-exporter.nix b/nixos/modules/services/monitoring/prometheus/varnish-exporter.nix deleted file mode 100644 index 143ebb62aea..00000000000 --- a/nixos/modules/services/monitoring/prometheus/varnish-exporter.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ config, pkgs, lib, ... }: - -# Shamelessly cribbed from nginx-exporter.nix. ~ C. -with lib; - -let - cfg = config.services.prometheus.varnishExporter; -in { - options = { - services.prometheus.varnishExporter = { - enable = mkEnableOption "prometheus Varnish exporter"; - - port = mkOption { - type = types.int; - default = 9131; - description = '' - Port to listen on. - ''; - }; - - extraFlags = mkOption { - type = types.listOf types.str; - default = []; - description = '' - Extra commandline options when launching the Varnish exporter. - ''; - }; - - openFirewall = mkOption { - type = types.bool; - default = false; - description = '' - Open port in firewall for incoming connections. - ''; - }; - }; - }; - - config = mkIf cfg.enable { - networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port; - - systemd.services.prometheus-varnish-exporter = { - description = "Prometheus exporter for Varnish metrics"; - unitConfig.Documentation = "https://github.com/jonnenauha/prometheus_varnish_exporter"; - wantedBy = [ "multi-user.target" ]; - path = [ pkgs.varnish ]; - script = '' - exec ${pkgs.prometheus-varnish-exporter}/bin/prometheus_varnish_exporter \ - -web.listen-address :${toString cfg.port} \ - ${concatStringsSep " \\\n " cfg.extraFlags} - ''; - serviceConfig = { - User = "nobody"; - Restart = "always"; - PrivateTmp = true; - WorkingDirectory = /tmp; - ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; - }; - }; - }; -} diff --git a/nixos/modules/services/networking/dhcpd.nix b/nixos/modules/services/networking/dhcpd.nix index 2eac6dfec5b..fd7e317eee9 100644 --- a/nixos/modules/services/networking/dhcpd.nix +++ b/nixos/modules/services/networking/dhcpd.nix @@ -36,6 +36,7 @@ let preStart = '' mkdir -m 755 -p ${cfg.stateDir} + chown dhcpd:nogroup ${cfg.stateDir} touch ${cfg.stateDir}/dhcpd.leases ''; diff --git a/nixos/modules/services/networking/dnscache.nix b/nixos/modules/services/networking/dnscache.nix index 379203cd1ab..470f418643e 100644 --- a/nixos/modules/services/networking/dnscache.nix +++ b/nixos/modules/services/networking/dnscache.nix @@ -14,7 +14,7 @@ let ${concatStrings (mapAttrsToList (host: ips: '' ${concatMapStrings (ip: '' - echo ${lib.escapeShellArg ip} > "$out/servers/"${lib.escapeShellArg host} + echo ${lib.escapeShellArg ip} >> "$out/servers/"${lib.escapeShellArg host} '') ips} '') cfg.domainServers)} diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index f83fb7a6d5d..10e96eb4036 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -135,8 +135,7 @@ in { default = { inherit networkmanager modemmanager wpa_supplicant networkmanager-openvpn networkmanager-vpnc networkmanager-openconnect networkmanager-fortisslvpn - networkmanager-pptp networkmanager-l2tp - networkmanager-iodine; }; + networkmanager-l2tp networkmanager-iodine; }; internal = true; }; @@ -267,8 +266,6 @@ in { message = "You can not use networking.networkmanager with networking.wireless"; }]; - boot.kernelModules = [ "ppp_mppe" ]; # Needed for most (all?) PPTP VPN connections. - environment.etc = with cfg.basePackages; [ { source = configFile; target = "NetworkManager/NetworkManager.conf"; @@ -285,9 +282,6 @@ in { { source = "${networkmanager-fortisslvpn}/etc/NetworkManager/VPN/nm-fortisslvpn-service.name"; target = "NetworkManager/VPN/nm-fortisslvpn-service.name"; } - { source = "${networkmanager-pptp}/etc/NetworkManager/VPN/nm-pptp-service.name"; - target = "NetworkManager/VPN/nm-pptp-service.name"; - } { source = "${networkmanager-l2tp}/etc/NetworkManager/VPN/nm-l2tp-service.name"; target = "NetworkManager/VPN/nm-l2tp-service.name"; } diff --git a/nixos/modules/services/networking/nix-serve.nix b/nixos/modules/services/networking/nix-serve.nix index 3e865e3b76a..8499e7c0f7c 100644 --- a/nixos/modules/services/networking/nix-serve.nix +++ b/nixos/modules/services/networking/nix-serve.nix @@ -55,6 +55,8 @@ in environment.NIX_SECRET_KEY_FILE = cfg.secretKeyFile; serviceConfig = { + Restart = "always"; + RestartSec = "5s"; ExecStart = "${pkgs.nix-serve}/bin/nix-serve " + "--listen ${cfg.bindAddress}:${toString cfg.port} ${cfg.extraParams}"; User = "nix-serve"; diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix index 9d7e6d6018a..d57ebb61f63 100644 --- a/nixos/modules/services/networking/prosody.nix +++ b/nixos/modules/services/networking/prosody.nix @@ -15,6 +15,7 @@ let description = "Path to the key file."; }; + # TODO: rename to certificate to match the prosody config cert = mkOption { type = types.path; description = "Path to the certificate file."; @@ -30,7 +31,7 @@ let }; moduleOpts = { - + # Generally required roster = mkOption { type = types.bool; default = true; @@ -61,12 +62,38 @@ let description = "Service discovery"; }; - legacyauth = mkOption { + # Not essential, but recommended + carbons = mkOption { type = types.bool; default = true; - description = "Legacy authentication. Only used by some old clients and bots"; + description = "Keep multiple clients in sync"; }; + pep = mkOption { + type = types.bool; + default = true; + description = "Enables users to publish their mood, activity, playing music and more"; + }; + + private = mkOption { + type = types.bool; + default = true; + description = "Private XML storage (for room bookmarks, etc.)"; + }; + + blocklist = mkOption { + type = types.bool; + default = true; + description = "Allow users to block communications with other users"; + }; + + vcard = mkOption { + type = types.bool; + default = true; + description = "Allow users to set vCards"; + }; + + # Nice to have version = mkOption { type = types.bool; default = true; @@ -91,36 +118,112 @@ let description = "Replies to XMPP pings with pongs"; }; - console = mkOption { + register = mkOption { type = types.bool; - default = false; - description = "telnet to port 5582"; + default = true; + description = "Allow users to register on this server using a client and change passwords"; }; + mam = mkOption { + type = types.bool; + default = false; + description = "Store messages in an archive and allow users to access it"; + }; + + # Admin interfaces + admin_adhoc = mkOption { + type = types.bool; + default = true; + description = "Allows administration via an XMPP client that supports ad-hoc commands"; + }; + + admin_telnet = mkOption { + type = types.bool; + default = false; + description = "Opens telnet console interface on localhost port 5582"; + }; + + # HTTP modules bosh = mkOption { type = types.bool; default = false; description = "Enable BOSH clients, aka 'Jabber over HTTP'"; }; - httpserver = mkOption { - type = types.bool; - default = false; - description = "Serve static files from a directory over HTTP"; - }; - websocket = mkOption { type = types.bool; default = false; description = "Enable WebSocket support"; }; + http_files = mkOption { + type = types.bool; + default = false; + description = "Serve static files from a directory over HTTP"; + }; + + # Other specific functionality + limits = mkOption { + type = types.bool; + default = false; + description = "Enable bandwidth limiting for XMPP connections"; + }; + + groups = mkOption { + type = types.bool; + default = false; + description = "Shared roster support"; + }; + + server_contact_info = mkOption { + type = types.bool; + default = false; + description = "Publish contact information for this service"; + }; + + announce = mkOption { + type = types.bool; + default = false; + description = "Send announcement to all online users"; + }; + + welcome = mkOption { + type = types.bool; + default = false; + description = "Welcome users who register accounts"; + }; + + watchregistrations = mkOption { + type = types.bool; + default = false; + description = "Alert admins of registrations"; + }; + + motd = mkOption { + type = types.bool; + default = false; + description = "Send a message to users when they log in"; + }; + + legacyauth = mkOption { + type = types.bool; + default = false; + description = "Legacy authentication. Only used by some old clients and bots"; + }; + + proxy65 = mkOption { + type = types.bool; + default = false; + description = "Enables a file transfer proxy service which clients behind NAT can use"; + }; + }; toLua = x: if builtins.isString x then ''"${x}"'' - else if builtins.isBool x then toString x + else if builtins.isBool x then (if x == true then "true" else "false") else if builtins.isInt x then toString x + else if builtins.isList x then ''{ ${lib.concatStringsSep ", " (map (n: toLua n) x) } }'' else throw "Invalid Lua value"; createSSLOptsStr = o: '' @@ -198,6 +301,59 @@ in description = "Allow account creation"; }; + c2sRequireEncryption = mkOption { + type = types.bool; + default = true; + description = '' + Force clients to use encrypted connections? This option will + prevent clients from authenticating unless they are using encryption. + ''; + }; + + s2sRequireEncryption = mkOption { + type = types.bool; + default = true; + description = '' + Force servers to use encrypted connections? This option will + prevent servers from authenticating unless they are using encryption. + Note that this is different from authentication. + ''; + }; + + s2sSecureAuth = mkOption { + type = types.bool; + default = false; + description = '' + Force certificate authentication for server-to-server connections? + This provides ideal security, but requires servers you communicate + with to support encryption AND present valid, trusted certificates. + For more information see https://prosody.im/doc/s2s#security + ''; + }; + + s2sInsecureDomains = mkOption { + type = types.listOf types.str; + default = []; + example = [ "insecure.example.com" ]; + description = '' + Some servers have invalid or self-signed certificates. You can list + remote domains here that will not be required to authenticate using + certificates. They will be authenticated using DNS instead, even + when s2s_secure_auth is enabled. + ''; + }; + + s2sSecureDomains = mkOption { + type = types.listOf types.str; + default = []; + example = [ "jabber.org" ]; + description = '' + Even if you leave s2s_secure_auth disabled, you can still require valid + certificates for some domains by specifying a list here. + ''; + }; + + modules = moduleOpts; extraModules = mkOption { @@ -206,6 +362,12 @@ in description = "Enable custom modules"; }; + extraPluginPaths = mkOption { + type = types.listOf types.path; + default = []; + description = "Addtional path in which to look find plugins/modules"; + }; + virtualHosts = mkOption { description = "Define the virtual hosts"; @@ -255,38 +417,48 @@ in config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.prosody ]; + environment.systemPackages = [ cfg.package ]; environment.etc."prosody/prosody.cfg.lua".text = '' pidfile = "/var/lib/prosody/prosody.pid" - log = "*syslog" data_path = "/var/lib/prosody" - - allow_registration = ${boolToString cfg.allowRegistration}; - - ${ optionalString cfg.modules.console "console_enabled = true;" } + plugin_paths = { + ${lib.concatStringsSep ", " (map (n: "\"${n}\"") cfg.extraPluginPaths) } + } ${ optionalString (cfg.ssl != null) (createSSLOptsStr cfg.ssl) } - admins = { ${lib.concatStringsSep ", " (map (n: "\"${n}\"") cfg.admins) } }; + admins = ${toLua cfg.admins} + + -- we already build with libevent, so we can just enable it for a more performant server + use_libevent = true modules_enabled = { ${ lib.concatStringsSep "\n\ \ " (lib.mapAttrsToList - (name: val: optionalString val ''"${name}";'') + (name: val: optionalString val "${toLua name};") cfg.modules) } - - ${ optionalString cfg.allowRegistration "\"register\"\;" } - - ${ lib.concatStringsSep "\n" (map (x: "\"${x}\";") cfg.extraModules)} - - "posix"; + ${ lib.concatStringsSep "\n" (map (x: "${toLua x};") cfg.package.communityModules)} + ${ lib.concatStringsSep "\n" (map (x: "${toLua x};") cfg.extraModules)} }; + allow_registration = ${toLua cfg.allowRegistration} + + c2s_require_encryption = ${toLua cfg.c2sRequireEncryption} + + s2s_require_encryption = ${toLua cfg.s2sRequireEncryption} + + s2s_secure_auth = ${toLua cfg.s2sSecureAuth} + + s2s_insecure_domains = ${toLua cfg.s2sInsecureDomains} + + s2s_secure_domains = ${toLua cfg.s2sSecureDomains} + + ${ cfg.extraConfig } ${ lib.concatStringsSep "\n" (lib.mapAttrsToList (n: v: '' diff --git a/nixos/modules/services/networking/resilio.nix b/nixos/modules/services/networking/resilio.nix index d1c4101f80b..2956a5ecbc0 100644 --- a/nixos/modules/services/networking/resilio.nix +++ b/nixos/modules/services/networking/resilio.nix @@ -50,12 +50,7 @@ in description = '' If enabled, start the Resilio Sync daemon. Once enabled, you can interact with the service through the Web UI, or configure it in your - NixOS configuration. Enabling the resilio service - also installs a systemd user unit which can be used to start - user-specific copies of the daemon. Once installed, you can use - systemctl --user start resilio as your user to start - the daemon using the configuration file located at - $HOME/.config/resilio-sync/config.json. + NixOS configuration. ''; }; diff --git a/nixos/modules/services/networking/unbound.nix b/nixos/modules/services/networking/unbound.nix index 545ee327d59..f069a9883a7 100644 --- a/nixos/modules/services/networking/unbound.nix +++ b/nixos/modules/services/networking/unbound.nix @@ -112,7 +112,7 @@ in mkdir -m 0755 -p ${stateDir}/dev/ cp ${confFile} ${stateDir}/unbound.conf ${optionalString cfg.enableRootTrustAnchor '' - ${pkgs.unbound}/bin/unbound-anchor -a ${rootTrustAnchorFile} + ${pkgs.unbound}/bin/unbound-anchor -a ${rootTrustAnchorFile} || echo "Root anchor updated!" chown unbound ${stateDir} ${rootTrustAnchorFile} ''} touch ${stateDir}/dev/random diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index 4c7f58d1d8b..ecab8cfc7df 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -124,7 +124,7 @@ in listenAddresses = mkOption { type = types.listOf types.str; - default = [ "127.0.0.1:631" ]; + default = [ "localhost:631" ]; example = [ "*:631" ]; description = '' A list of addresses and ports on which to listen. @@ -321,7 +321,10 @@ in ''} ''; - serviceConfig.PrivateTmp = true; + serviceConfig = { + PrivateTmp = true; + RuntimeDirectory = [ "cups" ]; + }; }; systemd.services.cups-browsed = mkIf avahiEnabled diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix index adef500b7b5..d61f588205a 100644 --- a/nixos/modules/services/search/elasticsearch.nix +++ b/nixos/modules/services/search/elasticsearch.nix @@ -32,8 +32,11 @@ let (if es5 then (pkgs.writeTextDir "log4j2.properties" cfg.logging) else (pkgs.writeTextDir "logging.yml" cfg.logging)) ]; - # Elasticsearch 5.x won't start when the scripts directory does not exist - postBuild = if es5 then "${pkgs.coreutils}/bin/mkdir -p $out/scripts" else ""; + postBuild = concatStringsSep "\n" (concatLists [ + # Elasticsearch 5.x won't start when the scripts directory does not exist + (optional es5 "${pkgs.coreutils}/bin/mkdir -p $out/scripts") + (optional es6 "ln -s ${cfg.package}/config/jvm.options $out/jvm.options") + ]); }; esPlugins = pkgs.buildEnv { diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix index dd6b585b7e2..c283f1f3c6b 100644 --- a/nixos/modules/services/torrent/transmission.nix +++ b/nixos/modules/services/torrent/transmission.nix @@ -59,8 +59,8 @@ in time the service starts). String values must be quoted, integer and boolean values must not. - See https://trac.transmissionbt.com/wiki/EditConfigFiles for - documentation. + See https://github.com/transmission/transmission/wiki/Editing-Configuration-Files + for documentation. ''; }; diff --git a/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix b/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix index 1d53ce65900..4bbd041b6e0 100644 --- a/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix +++ b/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix @@ -118,7 +118,7 @@ with lib; default = []; example = [ { urlPath = "/foo/bar.png"; - files = "/home/eelco/some-file.png"; + file = "/home/eelco/some-file.png"; } ]; description = '' diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix index 4622c7b760f..f435e85f6b8 100644 --- a/nixos/modules/services/x11/desktop-managers/default.nix +++ b/nixos/modules/services/x11/desktop-managers/default.nix @@ -87,11 +87,11 @@ in default = mkOption { type = types.str; - default = "none"; - example = "plasma5"; + default = ""; + example = "none"; description = "Default desktop manager loaded if none have been chosen."; apply = defaultDM: - if defaultDM == "none" && cfg.session.list != [] then + if defaultDM == "" && cfg.session.list != [] then (head cfg.session.list).name else if any (w: w.name == defaultDM) cfg.session.list then defaultDM diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 7256013d5d8..10e8ef0ed38 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -182,8 +182,7 @@ in { { inherit (pkgs) networkmanager modemmanager wpa_supplicant; inherit (pkgs.gnome3) networkmanager-openvpn networkmanager-vpnc networkmanager-openconnect networkmanager-fortisslvpn - networkmanager-pptp networkmanager-iodine - networkmanager-l2tp; }; + networkmanager-iodine networkmanager-l2tp; }; # Needed for themes and backgrounds environment.pathsToLink = [ "/share" ]; diff --git a/nixos/modules/services/x11/desktop-managers/lxqt.nix b/nixos/modules/services/x11/desktop-managers/lxqt.nix index fb907618d35..2596ec4ad85 100644 --- a/nixos/modules/services/x11/desktop-managers/lxqt.nix +++ b/nixos/modules/services/x11/desktop-managers/lxqt.nix @@ -61,6 +61,8 @@ in environment.variables.GIO_EXTRA_MODULES = [ "${pkgs.gvfs}/lib/gio/modules" ]; + services.upower.enable = config.powerManagement.enable; }; + } diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix index 0117dc9d132..db83aaf3c19 100644 --- a/nixos/modules/services/x11/desktop-managers/mate.nix +++ b/nixos/modules/services/x11/desktop-managers/mate.nix @@ -108,6 +108,8 @@ in services.gnome3.gnome-keyring.enable = true; services.upower.enable = config.powerManagement.enable; + security.pam.services."mate-screensaver".unixAuth = true; + environment.pathsToLink = [ "/share" ]; }; diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix index 25ba95fccd7..e617e55a7a5 100644 --- a/nixos/modules/services/x11/window-managers/default.nix +++ b/nixos/modules/services/x11/window-managers/default.nix @@ -12,6 +12,7 @@ in ./afterstep.nix ./bspwm.nix ./dwm.nix + ./evilwm.nix ./exwm.nix ./fluxbox.nix ./fvwm.nix @@ -61,9 +62,7 @@ in example = "wmii"; description = "Default window manager loaded if none have been chosen."; apply = defaultWM: - if defaultWM == "none" && cfg.session != [] then - (head cfg.session).name - else if any (w: w.name == defaultWM) cfg.session then + if any (w: w.name == defaultWM) cfg.session then defaultWM else throw "Default window manager (${defaultWM}) not found."; diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index f96d3c5afba..e7918cf9d31 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -161,15 +161,6 @@ in ''; }; - plainX = mkOption { - type = types.bool; - default = false; - description = '' - Whether the X11 session can be plain (without DM/WM) and - the Xsession script will be used as fallback or not. - ''; - }; - autorun = mkOption { type = types.bool; default = true; @@ -561,11 +552,6 @@ in + "${toString (length primaryHeads)} heads set to primary: " + concatMapStringsSep ", " (x: x.output) primaryHeads; }) - { assertion = cfg.desktopManager.default == "none" && cfg.windowManager.default == "none" -> cfg.plainX; - message = "Either the desktop manager or the window manager shouldn't be `none`! " - + "To explicitly allow this, you can also set `services.xserver.plainX` to `true`. " - + "The `default` value looks for enabled WMs/DMs and select the first one."; - } ]; environment.etc = diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index 3bd7d355826..8ea05ed1468 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -77,8 +77,8 @@ in type = types.int; default = 4; description = '' - The kernel console log level. Log messages with a priority - numerically less than this will not appear on the console. + The kernel console loglevel. All Kernel Messages with a log level smaller + than this setting will be printed to the console. ''; }; diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index cc03e54ead6..8bd203106f5 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -182,7 +182,7 @@ sub GrubFs { # Based on the type pull in the identifier from the system my ($status, @devInfo) = runCommand("@utillinux@/bin/blkid -o export @{[$fs->device]}"); if ($status != 0) { - die "Failed to get blkid info for @{[$fs->mount]} on @{[$fs->device]}"; + die "Failed to get blkid info (returned $status) for @{[$fs->mount]} on @{[$fs->device]}"; } my @matches = join("", @devInfo) =~ m/@{[uc $fsIdentifier]}=([^\n]*)/; if ($#matches != 0) { diff --git a/nixos/modules/system/boot/systemd-nspawn.nix b/nixos/modules/system/boot/systemd-nspawn.nix index 8fa9f8b795e..64b3b8b584e 100644 --- a/nixos/modules/system/boot/systemd-nspawn.nix +++ b/nixos/modules/system/boot/systemd-nspawn.nix @@ -110,7 +110,7 @@ in { config = let - units = mapAttrs' (n: v: nameValuePair "${n}.nspawn" (instanceToUnit n v)) cfg; + units = mapAttrs' (n: v: let nspawnFile = "${n}.nspawn"; in nameValuePair nspawnFile (instanceToUnit nspawnFile v)) cfg; in mkIf (cfg != {}) { environment.etc."systemd/nspawn".source = generateUnits "nspawn" units [] []; diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix index 43a9c28bb69..5255f1a1b97 100644 --- a/nixos/modules/system/boot/systemd-unit-options.nix +++ b/nixos/modules/system/boot/systemd-unit-options.nix @@ -217,7 +217,7 @@ in rec { environment = mkOption { default = {}; - type = types.attrs; # FIXME + type = with types; attrsOf (nullOr (either str package)); example = { PATH = "/foo/bar/bin"; LANG = "nl_NL.UTF-8"; }; description = "Environment variables passed to the service's processes."; }; diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index aff46ea861a..87691cbe9e2 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -516,7 +516,7 @@ in }; systemd.globalEnvironment = mkOption { - type = types.attrs; + type = with types; attrsOf (nullOr (either str package)); default = {}; example = { TZ = "CET"; }; description = '' diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index 630fe6d114c..c7d56790fa0 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -68,8 +68,7 @@ let (hasAttr dev cfg.macvlans) || (hasAttr dev cfg.sits) || (hasAttr dev cfg.vlans) || - (hasAttr dev cfg.vswitches) || - (hasAttr dev cfg.wlanInterfaces) + (hasAttr dev cfg.vswitches) then [ "${dev}-netdev.service" ] else optional (dev != null && dev != "lo" && !config.boot.isContainer) (subsystemDevice dev); diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 5036b701bd8..95641c03b14 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -142,7 +142,7 @@ let default = { }; example = { mtu = "1492"; window = "524288"; }; description = '' - Other route options. See the symbol OPTION + Other route options. See the symbol OPTIONS in the ip-route(8) manual page for the details. ''; }; @@ -191,7 +191,7 @@ let preferTempAddress = mkOption { type = types.bool; default = cfg.enableIPv6; - defaultText = literalExample "config.networking.enableIpv6"; + defaultText = literalExample "config.networking.enableIPv6"; description = '' When using SLAAC prefer a temporary (IPv6) address over the EUI-64 address for originating connections. This is used to reduce tracking. diff --git a/nixos/modules/virtualisation/ec2-amis.nix b/nixos/modules/virtualisation/ec2-amis.nix index 01512911a05..baffad79b00 100644 --- a/nixos/modules/virtualisation/ec2-amis.nix +++ b/nixos/modules/virtualisation/ec2-amis.nix @@ -240,5 +240,22 @@ let self = { "17.09".sa-east-1.hvm-ebs = "ami-4762202b"; "17.09".ap-south-1.hvm-ebs = "ami-4e376021"; - latest = self."17.09"; + # 18.03.131792.becbe4dbe16 + "18.03".eu-west-1.hvm-ebs = "ami-cda4fab4"; + "18.03".eu-west-2.hvm-ebs = "ami-d96786be"; + "18.03".eu-west-3.hvm-ebs = "ami-6b0cba16"; + "18.03".eu-central-1.hvm-ebs = "ami-5e2b75b5"; + "18.03".us-east-1.hvm-ebs = "ami-d464cba9"; + "18.03".us-east-2.hvm-ebs = "ami-fd221298"; + "18.03".us-west-1.hvm-ebs = "ami-ff0d1d9f"; + "18.03".us-west-2.hvm-ebs = "ami-c05c3bb8"; + "18.03".ca-central-1.hvm-ebs = "ami-cc72f4a8"; + "18.03".ap-southeast-1.hvm-ebs = "ami-b61633ca"; + "18.03".ap-southeast-2.hvm-ebs = "ami-530fc131"; + "18.03".ap-northeast-1.hvm-ebs = "ami-90d6c0ec"; + "18.03".ap-northeast-2.hvm-ebs = "ami-a1248bcf"; + "18.03".sa-east-1.hvm-ebs = "ami-b090c6dc"; + "18.03".ap-south-1.hvm-ebs = "ami-32c9ec5d"; + + latest = self."18.03"; }; in self diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index 155a33b3bb3..0b6bec786da 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -2,7 +2,7 @@ with lib; let - diskSize = 1024; # MB + diskSize = 1536; # MB gce = pkgs.google-compute-engine; in { @@ -57,6 +57,12 @@ in # Always include cryptsetup so that NixOps can use it. environment.systemPackages = [ pkgs.cryptsetup ]; + # Make sure GCE image does not replace host key that NixOps sets + environment.etc."default/instance_configs.cfg".text = lib.mkDefault '' + [InstanceSetup] + set_host_keys = false + ''; + # Rely on GCP's firewall instead networking.firewall.enable = mkDefault false; @@ -69,6 +75,9 @@ in networking.usePredictableInterfaceNames = false; + # GC has 1460 MTU + networking.interfaces.eth0.mtu = 1460; + # allow the google-accounts-daemon to manage users users.mutableUsers = true; # and allow users to sudo without password diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 13d0eb7de5c..dcd7e6fb8da 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -319,8 +319,8 @@ in networkingOptions = mkOption { default = [ - "-net nic,vlan=0,model=virtio" - "-net user,vlan=0\${QEMU_NET_OPTS:+,$QEMU_NET_OPTS}" + "-net nic,netdev=user.0,model=virtio" + "-netdev user,id=user.0\${QEMU_NET_OPTS:+,$QEMU_NET_OPTS}" ]; type = types.listOf types.str; description = '' @@ -434,9 +434,11 @@ in virtualisation.pathsInNixDB = [ config.system.build.toplevel ]; - # FIXME: Figure out how to make this work on non-x86 - virtualisation.qemu.options = - mkIf (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) [ "-vga std" "-usbdevice tablet" ]; + # FIXME: Consolidate this one day. + virtualisation.qemu.options = mkMerge [ + (mkIf (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) [ "-vga std" "-usb" "-device usb-tablet,bus=usb-bus.0" ]) + (mkIf (pkgs.stdenv.isAarch32 || pkgs.stdenv.isAarch64) [ "-device virtio-gpu-pci" "-device usb-ehci,id=usb0" "-device usb-kbd" "-device usb-tablet" ]) + ]; # Mount the host filesystem via 9P, and bind-mount the Nix store # of the host into our own filesystem. We use mkVMOverride to diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 9d4a551a958..e010b532a68 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -52,17 +52,17 @@ in rec { (all nixos.dummy) (all nixos.manual) - nixos.iso_minimal.x86_64-linux - nixos.iso_minimal.i686-linux - nixos.iso_graphical.x86_64-linux - nixos.ova.x86_64-linux + nixos.iso_minimal.x86_64-linux or [] + nixos.iso_minimal.i686-linux or [] + nixos.iso_graphical.x86_64-linux or [] + nixos.ova.x86_64-linux or [] #(all nixos.tests.containers) - nixos.tests.chromium.x86_64-linux + nixos.tests.chromium.x86_64-linux or [] (all nixos.tests.firefox) (all nixos.tests.firewall) (all nixos.tests.gnome3) - nixos.tests.installer.zfsroot.x86_64-linux # ZFS is 64bit only + nixos.tests.installer.zfsroot.x86_64-linux or [] # ZFS is 64bit only (all nixos.tests.installer.lvm) (all nixos.tests.installer.luksroot) (all nixos.tests.installer.separateBoot) @@ -81,7 +81,7 @@ in rec { (all nixos.tests.boot.uefiUsb) (all nixos.tests.boot-stage1) (all nixos.tests.hibernate) - nixos.tests.docker.x86_64-linux + nixos.tests.docker.x86_64-linux or [] (all nixos.tests.ecryptfs) (all nixos.tests.env) (all nixos.tests.ipv6) diff --git a/nixos/release.nix b/nixos/release.nix index a7d373d1f7c..54e2f4c55b6 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -16,11 +16,14 @@ let inherit system; } // args); - callTestOnTheseSystems = systems: fn: args: forMatchingSystems systems (system: hydraJob (importTest fn args system)); - callTest = callTestOnTheseSystems supportedSystems; + callTestOnMatchingSystems = systems: fn: args: + forMatchingSystems + systems + (system: hydraJob (importTest fn args system)); + callTest = callTestOnMatchingSystems supportedSystems; - callSubTests = callSubTestsOnTheseSystems supportedSystems; - callSubTestsOnTheseSystems = systems: fn: args: let + callSubTests = callSubTestsOnMatchingSystems supportedSystems; + callSubTestsOnMatchingSystems = systems: fn: args: let discover = attrs: let subTests = filterAttrs (const (hasAttr "test")) attrs; in mapAttrs (const (t: hydraJob t.test)) subTests; @@ -51,6 +54,17 @@ let }).config.system.build.isoImage); + makeSdImage = + { module, maintainers ? ["dezgeg"], system }: + + with import nixpkgs { inherit system; }; + + hydraJob ((import lib/eval-config.nix { + inherit system; + modules = [ module versionModule ]; + }).config.system.build.sdImage); + + makeSystemTarball = { module, maintainers ? ["viric"], system }: @@ -151,6 +165,10 @@ in rec { inherit system; }); + sd_image = forMatchingSystems [ "aarch64-linux" ] (system: makeSdImage { + module = ./modules/installer/cd-dvd/sd-image-aarch64.nix; + inherit system; + }); # A bootable VirtualBox virtual appliance as an OVA file (i.e. packaged OVF). ova = forMatchingSystems [ "x86_64-linux" ] (system: @@ -229,9 +247,9 @@ in rec { tests.boot-stage1 = callTest tests/boot-stage1.nix {}; tests.borgbackup = callTest tests/borgbackup.nix {}; tests.buildbot = callTest tests/buildbot.nix {}; - tests.cadvisor = callTestOnTheseSystems ["x86_64-linux"] tests/cadvisor.nix {}; - tests.ceph = callTestOnTheseSystems ["x86_64-linux"] tests/ceph.nix {}; - tests.chromium = (callSubTestsOnTheseSystems ["x86_64-linux"] tests/chromium.nix {}).stable; + tests.cadvisor = callTestOnMatchingSystems ["x86_64-linux"] tests/cadvisor.nix {}; + tests.ceph = callTestOnMatchingSystems ["x86_64-linux"] tests/ceph.nix {}; + tests.chromium = (callSubTestsOnMatchingSystems ["x86_64-linux"] tests/chromium.nix {}).stable or {}; tests.cjdns = callTest tests/cjdns.nix {}; tests.cloud-init = callTest tests/cloud-init.nix {}; tests.containers-ipv4 = callTest tests/containers-ipv4.nix {}; @@ -245,21 +263,22 @@ in rec { tests.containers-hosts = callTest tests/containers-hosts.nix {}; tests.containers-macvlans = callTest tests/containers-macvlans.nix {}; tests.couchdb = callTest tests/couchdb.nix {}; - tests.docker = callTestOnTheseSystems ["x86_64-linux"] tests/docker.nix {}; - tests.docker-tools = callTestOnTheseSystems ["x86_64-linux"] tests/docker-tools.nix {}; - tests.docker-edge = callTestOnTheseSystems ["x86_64-linux"] tests/docker-edge.nix {}; + tests.docker = callTestOnMatchingSystems ["x86_64-linux"] tests/docker.nix {}; + tests.docker-tools = callTestOnMatchingSystems ["x86_64-linux"] tests/docker-tools.nix {}; + tests.docker-tools-overlay = callTestOnMatchingSystems ["x86_64-linux"] tests/docker-tools-overlay.nix {}; + tests.docker-edge = callTestOnMatchingSystems ["x86_64-linux"] tests/docker-edge.nix {}; tests.dovecot = callTest tests/dovecot.nix {}; - tests.dnscrypt-proxy = callTestOnTheseSystems ["x86_64-linux"] tests/dnscrypt-proxy.nix {}; + tests.dnscrypt-proxy = callTestOnMatchingSystems ["x86_64-linux"] tests/dnscrypt-proxy.nix {}; tests.ecryptfs = callTest tests/ecryptfs.nix {}; - tests.etcd = callTestOnTheseSystems ["x86_64-linux"] tests/etcd.nix {}; - tests.ec2-nixops = (callSubTestsOnTheseSystems ["x86_64-linux"] tests/ec2.nix {}).boot-ec2-nixops; - tests.ec2-config = (callSubTestsOnTheseSystems ["x86_64-linux"] tests/ec2.nix {}).boot-ec2-config; - tests.elk = callSubTestsOnTheseSystems ["x86_64-linux"] tests/elk.nix {}; + tests.etcd = callTestOnMatchingSystems ["x86_64-linux"] tests/etcd.nix {}; + tests.ec2-nixops = (callSubTestsOnMatchingSystems ["x86_64-linux"] tests/ec2.nix {}).boot-ec2-nixops or {}; + tests.ec2-config = (callSubTestsOnMatchingSystems ["x86_64-linux"] tests/ec2.nix {}).boot-ec2-config or {}; + tests.elk = callSubTestsOnMatchingSystems ["x86_64-linux"] tests/elk.nix {}; tests.env = callTest tests/env.nix {}; tests.ferm = callTest tests/ferm.nix {}; tests.firefox = callTest tests/firefox.nix {}; tests.firewall = callTest tests/firewall.nix {}; - tests.fleet = callTestOnTheseSystems ["x86_64-linux"] tests/fleet.nix {}; + tests.fleet = callTestOnMatchingSystems ["x86_64-linux"] tests/fleet.nix {}; tests.fwupd = callTest tests/fwupd.nix {}; #tests.gitlab = callTest tests/gitlab.nix {}; tests.gitolite = callTest tests/gitolite.nix {}; @@ -292,7 +311,7 @@ in rec { tests.kernel-copperhead = callTest tests/kernel-copperhead.nix {}; tests.kernel-latest = callTest tests/kernel-latest.nix {}; tests.kernel-lts = callTest tests/kernel-lts.nix {}; - tests.kubernetes = hydraJob (import tests/kubernetes/default.nix { system = "x86_64-linux"; }); + tests.kubernetes = callSubTestsOnMatchingSystems ["x86_64-linux"] tests/kubernetes/default.nix {}; tests.latestKernel.login = callTest tests/login.nix { latestKernel = true; }; tests.ldap = callTest tests/ldap.nix {}; #tests.lightdm = callTest tests/lightdm.nix {}; @@ -322,14 +341,14 @@ in rec { tests.nginx = callTest tests/nginx.nix { }; tests.nghttpx = callTest tests/nghttpx.nix { }; tests.nix-ssh-serve = callTest tests/nix-ssh-serve.nix { }; - tests.novacomd = callTestOnTheseSystems ["x86_64-linux"] tests/novacomd.nix { }; + tests.novacomd = callTestOnMatchingSystems ["x86_64-linux"] tests/novacomd.nix { }; tests.leaps = callTest tests/leaps.nix { }; tests.nsd = callTest tests/nsd.nix {}; tests.openssh = callTest tests/openssh.nix {}; tests.openldap = callTest tests/openldap.nix {}; tests.owncloud = callTest tests/owncloud.nix {}; tests.pam-oath-login = callTest tests/pam-oath-login.nix {}; - #tests.panamax = callTestOnTheseSystems ["x86_64-linux"] tests/panamax.nix {}; + #tests.panamax = callTestOnMatchingSystems ["x86_64-linux"] tests/panamax.nix {}; tests.peerflix = callTest tests/peerflix.nix {}; tests.php-pcre = callTest tests/php-pcre.nix {}; tests.postgresql = callSubTests tests/postgresql.nix {}; @@ -340,6 +359,7 @@ in rec { tests.predictable-interface-names = callSubTests tests/predictable-interface-names.nix {}; tests.printing = callTest tests/printing.nix {}; tests.prometheus = callTest tests/prometheus.nix {}; + tests.prosody = callTest tests/prosody.nix {}; tests.proxy = callTest tests/proxy.nix {}; # tests.quagga = callTest tests/quagga.nix {}; tests.quake3 = callTest tests/quake3.nix {}; @@ -362,7 +382,7 @@ in rec { tests.tomcat = callTest tests/tomcat.nix {}; tests.udisks2 = callTest tests/udisks2.nix {}; tests.vault = callTest tests/vault.nix {}; - tests.virtualbox = callSubTestsOnTheseSystems ["x86_64-linux"] tests/virtualbox.nix {}; + tests.virtualbox = callSubTestsOnMatchingSystems ["x86_64-linux"] tests/virtualbox.nix {}; tests.wordpress = callTest tests/wordpress.nix {}; tests.xfce = callTest tests/xfce.nix {}; tests.xmonad = callTest tests/xmonad.nix {}; diff --git a/nixos/tests/atd.nix b/nixos/tests/atd.nix index c2c0a716e0d..5260c8ddfb8 100644 --- a/nixos/tests/atd.nix +++ b/nixos/tests/atd.nix @@ -17,20 +17,14 @@ import ./make-test.nix ({ pkgs, lib, ... }: startAll; $machine->fail("test -f ~root/at-1"); - $machine->fail("test -f ~root/batch-1"); $machine->fail("test -f ~alice/at-1"); - $machine->fail("test -f ~alice/batch-1"); $machine->succeed("echo 'touch ~root/at-1' | at now+1min"); - $machine->succeed("echo 'touch ~root/batch-1' | batch"); $machine->succeed("su - alice -c \"echo 'touch at-1' | at now+1min\""); - $machine->succeed("su - alice -c \"echo 'touch batch-1' | batch\""); $machine->succeed("sleep 1.5m"); $machine->succeed("test -f ~root/at-1"); - $machine->succeed("test -f ~root/batch-1"); $machine->succeed("test -f ~alice/at-1"); - $machine->succeed("test -f ~alice/batch-1"); ''; }) diff --git a/nixos/tests/borgbackup.nix b/nixos/tests/borgbackup.nix index 123b02be725..36731773de2 100644 --- a/nixos/tests/borgbackup.nix +++ b/nixos/tests/borgbackup.nix @@ -1,21 +1,162 @@ -import ./make-test.nix ({ pkgs, ...}: { +import ./make-test.nix ({ pkgs, ... }: + +let + passphrase = "supersecret"; + dataDir = "/ran:dom/data"; + excludeFile = "not_this_file"; + keepFile = "important_file"; + keepFileData = "important_data"; + localRepo = "/root/back:up"; + archiveName = "my_archive"; + remoteRepo = "borg@server:."; # No need to specify path + privateKey = pkgs.writeText "id_ed25519" '' + -----BEGIN OPENSSH PRIVATE KEY----- + b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW + QyNTUxOQAAACBx8UB04Q6Q/fwDFjakHq904PYFzG9pU2TJ9KXpaPMcrwAAAJB+cF5HfnBe + RwAAAAtzc2gtZWQyNTUxOQAAACBx8UB04Q6Q/fwDFjakHq904PYFzG9pU2TJ9KXpaPMcrw + AAAEBN75NsJZSpt63faCuaD75Unko0JjlSDxMhYHAPJk2/xXHxQHThDpD9/AMWNqQer3Tg + 9gXMb2lTZMn0pelo8xyvAAAADXJzY2h1ZXR6QGt1cnQ= + -----END OPENSSH PRIVATE KEY----- + ''; + publicKey = '' + ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHHxQHThDpD9/AMWNqQer3Tg9gXMb2lTZMn0pelo8xyv root@client + ''; + privateKeyAppendOnly = pkgs.writeText "id_ed25519" '' + -----BEGIN OPENSSH PRIVATE KEY----- + b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW + QyNTUxOQAAACBacZuz1ELGQdhI7PF6dGFafCDlvh8pSEc4cHjkW0QjLwAAAJC9YTxxvWE8 + cQAAAAtzc2gtZWQyNTUxOQAAACBacZuz1ELGQdhI7PF6dGFafCDlvh8pSEc4cHjkW0QjLw + AAAEAAhV7wTl5dL/lz+PF/d4PnZXuG1Id6L/mFEiGT1tZsuFpxm7PUQsZB2Ejs8Xp0YVp8 + IOW+HylIRzhweORbRCMvAAAADXJzY2h1ZXR6QGt1cnQ= + -----END OPENSSH PRIVATE KEY----- + ''; + publicKeyAppendOnly = '' + ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFpxm7PUQsZB2Ejs8Xp0YVp8IOW+HylIRzhweORbRCMv root@client + ''; + +in { name = "borgbackup"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ mic92 ]; + meta = with pkgs.stdenv.lib; { + maintainers = with maintainers; [ dotlambda ]; }; nodes = { - machine = { config, pkgs, ... }: { - environment.systemPackages = [ pkgs.borgbackup ]; + client = { config, pkgs, ... }: { + services.borgbackup.jobs = { + + local = rec { + paths = dataDir; + repo = localRepo; + preHook = '' + # Don't append a timestamp + archiveName="${archiveName}" + ''; + encryption = { + mode = "repokey"; + inherit passphrase; + }; + compression = "auto,zlib,9"; + prune.keep = { + within = "1y"; + yearly = 5; + }; + exclude = [ "*/${excludeFile}" ]; + postHook = "echo post"; + startAt = [ ]; # Do not run automatically + }; + + remote = { + paths = dataDir; + repo = remoteRepo; + encryption.mode = "none"; + startAt = [ ]; + environment.BORG_RSH = "ssh -oStrictHostKeyChecking=no -i /root/id_ed25519"; + }; + + remoteAppendOnly = { + paths = dataDir; + repo = remoteRepo; + encryption.mode = "none"; + startAt = [ ]; + environment.BORG_RSH = "ssh -oStrictHostKeyChecking=no -i /root/id_ed25519.appendOnly"; + }; + + }; + }; + + server = { config, pkgs, ... }: { + services.openssh = { + enable = true; + passwordAuthentication = false; + challengeResponseAuthentication = false; + }; + + services.borgbackup.repos.repo1 = { + authorizedKeys = [ publicKey ]; + path = "/data/borgbackup"; + }; + + # Second repo to make sure the authorizedKeys options are merged correctly + services.borgbackup.repos.repo2 = { + authorizedKeysAppendOnly = [ publicKeyAppendOnly ]; + path = "/data/borgbackup"; + quota = ".5G"; + }; }; }; testScript = '' - my $borg = "BORG_PASSPHRASE=supersecret borg"; - $machine->succeed("$borg init --encryption=repokey /tmp/backup"); - $machine->succeed("mkdir /tmp/data/ && echo 'data' >/tmp/data/file"); - $machine->succeed("$borg create --stats /tmp/backup::test /tmp/data"); - $machine->succeed("$borg extract /tmp/backup::test"); - $machine->succeed('c=$(cat data/file) && echo "c = $c" >&2 && [[ "$c" == "data" ]]'); + startAll; + + $client->fail('test -d "${remoteRepo}"'); + + $client->succeed("cp ${privateKey} /root/id_ed25519"); + $client->succeed("chmod 0600 /root/id_ed25519"); + $client->succeed("cp ${privateKeyAppendOnly} /root/id_ed25519.appendOnly"); + $client->succeed("chmod 0600 /root/id_ed25519.appendOnly"); + + $client->succeed("mkdir -p ${dataDir}"); + $client->succeed("touch ${dataDir}/${excludeFile}"); + $client->succeed("echo '${keepFileData}' > ${dataDir}/${keepFile}"); + + subtest "local", sub { + my $borg = "BORG_PASSPHRASE='${passphrase}' borg"; + $client->systemctl("start --wait borgbackup-job-local"); + $client->fail("systemctl is-failed borgbackup-job-local"); + # Make sure exactly one archive has been created + $client->succeed("c=\$($borg list '${localRepo}' | wc -l) && [[ \$c == '1' ]]"); + # Make sure excludeFile has been excluded + $client->fail("$borg list '${localRepo}::${archiveName}' | grep -qF '${excludeFile}'"); + # Make sure keepFile has the correct content + $client->succeed("$borg extract '${localRepo}::${archiveName}'"); + $client->succeed('c=$(cat ${dataDir}/${keepFile}) && [[ "$c" == "${keepFileData}" ]]'); + }; + + subtest "remote", sub { + my $borg = "BORG_RSH='ssh -oStrictHostKeyChecking=no -i /root/id_ed25519' borg"; + $server->waitForUnit("sshd.service"); + $client->waitForUnit("network.target"); + $client->systemctl("start --wait borgbackup-job-remote"); + $client->fail("systemctl is-failed borgbackup-job-remote"); + + # Make sure we can't access repos other than the specified one + $client->fail("$borg list borg\@server:wrong"); + + #TODO: Make sure that data is actually deleted + }; + + subtest "remoteAppendOnly", sub { + my $borg = "BORG_RSH='ssh -oStrictHostKeyChecking=no -i /root/id_ed25519.appendOnly' borg"; + $server->waitForUnit("sshd.service"); + $client->waitForUnit("network.target"); + $client->systemctl("start --wait borgbackup-job-remoteAppendOnly"); + $client->fail("systemctl is-failed borgbackup-job-remoteAppendOnly"); + + # Make sure we can't access repos other than the specified one + $client->fail("$borg list borg\@server:wrong"); + + #TODO: Make sure that data is not actually deleted + }; + ''; }) diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix index 3a2c6516476..65c314e22e1 100644 --- a/nixos/tests/chromium.nix +++ b/nixos/tests/chromium.nix @@ -151,11 +151,11 @@ mapAttrs (channel: chromiumPkg: makeTest rec { $machine->screenshot("sandbox_info"); - $machine->succeed(ru "${xdo "submit-url" '' + $machine->succeed(ru "${xdo "find-window" '' search --sync --onlyvisible --name "sandbox status" windowfocus --sync ''}"); - $machine->succeed(ru "${xdo "submit-url" '' + $machine->succeed(ru "${xdo "copy-sandbox-info" '' key --delay 1000 Ctrl+a Ctrl+c ''}"); @@ -166,6 +166,26 @@ mapAttrs (channel: chromiumPkg: makeTest rec { && $clipboard =~ /network namespaces.*yes/mi && $clipboard =~ /seccomp.*sandbox.*yes/mi && $clipboard =~ /you are adequately sandboxed/mi; + + $machine->sleep(1); + $machine->succeed(ru "${xdo "find-window-after-copy" '' + search --onlyvisible --name "sandbox status" + ''}"); + + my $clipboard = $machine->succeed(ru "echo void | ${pkgs.xclip}/bin/xclip -i"); + $machine->succeed(ru "${xdo "copy-sandbox-info" '' + key --delay 1000 Ctrl+a Ctrl+c + ''}"); + + my $clipboard = $machine->succeed(ru "${pkgs.xclip}/bin/xclip -o"); + die "copying twice in a row does not work properly: $clipboard" + unless $clipboard =~ /namespace sandbox.*yes/mi + && $clipboard =~ /pid namespaces.*yes/mi + && $clipboard =~ /network namespaces.*yes/mi + && $clipboard =~ /seccomp.*sandbox.*yes/mi + && $clipboard =~ /you are adequately sandboxed/mi; + + $machine->screenshot("afer_copy_from_chromium"); }; $machine->shutdown; diff --git a/nixos/tests/common/letsencrypt.nix b/nixos/tests/common/letsencrypt.nix index 9b53d9d61a1..10cde45d18a 100644 --- a/nixos/tests/common/letsencrypt.nix +++ b/nixos/tests/common/letsencrypt.nix @@ -138,8 +138,8 @@ let boulder = let owner = "letsencrypt"; repo = "boulder"; - rev = "9866abab8962a591f06db457a4b84c518cc88243"; - version = "20170510"; + rev = "9c6a1f2adc4c26d925588f5ae366cfd4efb7813a"; + version = "20180129"; in pkgs.buildGoPackage rec { name = "${repo}-${version}"; @@ -147,7 +147,7 @@ let src = pkgs.fetchFromGitHub { name = "${name}-src"; inherit rev owner repo; - sha256 = "170m5cjngbrm36wi7wschqw8jzs7kxpcyzmshq3pcrmcpigrhna1"; + sha256 = "09kszswrifm9rc6idfaq0p1mz5w21as2qbc8gd5pphrq9cf9pn55"; }; postPatch = '' @@ -168,6 +168,18 @@ let cat "${snakeOilCa}/ca.pem" > test/test-ca.pem ''; + # Until vendored pkcs11 is go 1.9 compatible + preBuild = '' + rm -r go/src/github.com/letsencrypt/boulder/vendor/github.com/miekg/pkcs11 + ''; + + extraSrcs = map mkGoDep [ + { goPackagePath = "github.com/miekg/pkcs11"; + rev = "6dbd569b952ec150d1425722dbbe80f2c6193f83"; + sha256 = "1m8g6fx7df6hf6q6zsbyw1icjmm52dmsx28rgb0h930wagvngfwb"; + } + ]; + goPackagePath = "github.com/${owner}/${repo}"; buildInputs = [ pkgs.libtool ]; }; @@ -284,7 +296,11 @@ let ocsp-updater.after = [ "boulder-publisher" ]; ocsp-responder.args = "--config ${cfgDir}/ocsp-responder.json"; ct-test-srv = {}; - mail-test-srv.args = "--closeFirst 5"; + mail-test-srv.args = let + key = "${boulderSource}/test/mail-test-srv/minica-key.pem"; + crt = "${boulderSource}/test/mail-test-srv/minica.pem"; + in + "--closeFirst 5 --cert ${crt} --key ${key}"; }; commonPath = [ softhsm pkgs.mariadb goose boulder ]; diff --git a/nixos/tests/containers-imperative.nix b/nixos/tests/containers-imperative.nix index 7e2a5497638..20902913e9a 100644 --- a/nixos/tests/containers-imperative.nix +++ b/nixos/tests/containers-imperative.nix @@ -20,7 +20,7 @@ import ./make-test.nix ({ pkgs, ...} : { containers.foo.config = {}; }; }; - in [ pkgs.stdenv emptyContainer.config.containers.foo.path ]; + in [ pkgs.stdenv emptyContainer.config.containers.foo.path pkgs.libxslt ]; }; testScript = diff --git a/nixos/tests/containers-tmpfs.nix b/nixos/tests/containers-tmpfs.nix index 564831fa273..873dd364369 100644 --- a/nixos/tests/containers-tmpfs.nix +++ b/nixos/tests/containers-tmpfs.nix @@ -1,7 +1,7 @@ # Test for NixOS' container support. import ./make-test.nix ({ pkgs, ...} : { - name = "containers-bridge"; + name = "containers-tmpfs"; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ ckampka ]; }; diff --git a/nixos/tests/docker-tools-overlay.nix b/nixos/tests/docker-tools-overlay.nix new file mode 100644 index 00000000000..9d7fa3e7a8c --- /dev/null +++ b/nixos/tests/docker-tools-overlay.nix @@ -0,0 +1,32 @@ +# this test creates a simple GNU image with docker tools and sees if it executes + +import ./make-test.nix ({ pkgs, ... }: +{ + name = "docker-tools-overlay"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ lnl7 ]; + }; + + nodes = { + docker = + { config, pkgs, ... }: + { + virtualisation.docker.enable = true; + virtualisation.docker.storageDriver = "overlay"; # defaults to overlay2 + }; + }; + + testScript = + '' + $docker->waitForUnit("sockets.target"); + + $docker->succeed("docker load --input='${pkgs.dockerTools.examples.bash}'"); + $docker->succeed("docker run --rm ${pkgs.dockerTools.examples.bash.imageName} bash --version"); + + # Check if the nix store has correct user permissions depending on what + # storage driver is used, incorrectly built images can show up as readonly. + # drw------- 3 0 0 3 Apr 14 11:36 /nix + # drw------- 99 0 0 100 Apr 14 11:36 /nix/store + $docker->succeed("docker run --rm -u 1000:1000 ${pkgs.dockerTools.examples.bash.imageName} bash --version"); + ''; +}) diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix index e52a4c3f884..4466081d01e 100644 --- a/nixos/tests/docker-tools.nix +++ b/nixos/tests/docker-tools.nix @@ -3,14 +3,14 @@ import ./make-test.nix ({ pkgs, ... }: { name = "docker-tools"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ ]; + maintainers = [ lnl7 ]; }; nodes = { docker = { config, pkgs, ... }: { virtualisation = { - diskSize = 1024; + diskSize = 2048; docker.enable = true; }; }; @@ -21,19 +21,29 @@ import ./make-test.nix ({ pkgs, ... }: { $docker->waitForUnit("sockets.target"); $docker->succeed("docker load --input='${pkgs.dockerTools.examples.bash}'"); - $docker->succeed("docker run ${pkgs.dockerTools.examples.bash.imageName} /bin/bash --version"); + $docker->succeed("docker run --rm ${pkgs.dockerTools.examples.bash.imageName} bash --version"); + $docker->succeed("docker rmi ${pkgs.dockerTools.examples.bash.imageName}"); + # Check if the nix store is correctly initialized by listing dependencies of the installed Nix binary $docker->succeed("docker load --input='${pkgs.dockerTools.examples.nix}'"); - $docker->succeed("docker run ${pkgs.dockerTools.examples.nix.imageName} /bin/nix-store -qR ${pkgs.nix}"); + $docker->succeed("docker run --rm ${pkgs.dockerTools.examples.nix.imageName} nix-store -qR ${pkgs.nix}"); + $docker->succeed("docker rmi ${pkgs.dockerTools.examples.nix.imageName}"); # To test the pullImage tool $docker->succeed("docker load --input='${pkgs.dockerTools.examples.nixFromDockerHub}'"); - $docker->succeed("docker run nixos/nix:1.11 nix-store --version"); + $docker->succeed("docker run --rm nixos/nix:1.11 nix-store --version"); + $docker->succeed("docker rmi nixos/nix:1.11"); # To test runAsRoot and entry point $docker->succeed("docker load --input='${pkgs.dockerTools.examples.nginx}'"); $docker->succeed("docker run --name nginx -d -p 8000:80 ${pkgs.dockerTools.examples.nginx.imageName}"); $docker->waitUntilSucceeds('curl http://localhost:8000/'); $docker->succeed("docker rm --force nginx"); + $docker->succeed("docker rmi '${pkgs.dockerTools.examples.nginx.imageName}'"); + + # An pulled image can be used as base image + $docker->succeed("docker load --input='${pkgs.dockerTools.examples.onTopOfPulledImage}'"); + $docker->succeed("docker run --rm ontopofpulledimage hello"); + $docker->succeed("docker rmi ontopofpulledimage"); ''; }) diff --git a/nixos/tests/grafana.nix b/nixos/tests/grafana.nix index 16b8181498a..d45776c3ee2 100644 --- a/nixos/tests/grafana.nix +++ b/nixos/tests/grafana.nix @@ -20,6 +20,6 @@ import ./make-test.nix ({ lib, ... }: $machine->start; $machine->waitForUnit("grafana.service"); $machine->waitForOpenPort(3000); - $machine->succeed("curl -sS http://127.0.0.1:3000/"); + $machine->succeed("curl -sSfL http://127.0.0.1:3000/"); ''; }) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index c12919540a3..acf248d0a5a 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -69,13 +69,20 @@ let let iface = if grubVersion == 1 then "ide" else "virtio"; isEfi = bootLoader == "systemd-boot" || (bootLoader == "grub" && grubUseEfi); + + # FIXME don't duplicate the -enable-kvm etc. flags here yet again! qemuFlags = (if system == "x86_64-linux" then "-m 768 " else "-m 512 ") + - (optionalString (system == "x86_64-linux") "-cpu kvm64 "); + (optionalString (system == "x86_64-linux") "-cpu kvm64 ") + + (optionalString (system == "aarch64-linux") "-enable-kvm -machine virt,gic-version=host -cpu host "); + hdFlags = ''hda => "vm-state-machine/machine.qcow2", hdaInterface => "${iface}", '' - + optionalString isEfi ''bios => "${pkgs.OVMF.fd}/FV/OVMF.fd", ''; - in - '' + + optionalString isEfi (if pkgs.stdenv.isAarch64 + then ''bios => "${pkgs.OVMF.fd}/FV/QEMU_EFI.fd", '' + else ''bios => "${pkgs.OVMF.fd}/FV/OVMF.fd", ''); + in if !isEfi && !(pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) then + throw "Non-EFI boot methods are only supported on i686 / x86_64" + else '' $machine->start; # Make sure that we get a login prompt etc. diff --git a/nixos/tests/kernel-copperhead.nix b/nixos/tests/kernel-copperhead.nix index 07427d7f2a8..0af978f1851 100644 --- a/nixos/tests/kernel-copperhead.nix +++ b/nixos/tests/kernel-copperhead.nix @@ -6,14 +6,14 @@ import ./make-test.nix ({ pkgs, ...} : { machine = { config, lib, pkgs, ... }: { - boot.kernelPackages = pkgs.linuxPackages_hardened_copperhead; + boot.kernelPackages = pkgs.linuxPackages_copperhead_hardened; }; testScript = '' $machine->succeed("uname -a"); $machine->succeed("uname -s | grep 'Linux'"); - $machine->succeed("uname -a | grep '${pkgs.linuxPackages_hardened_copperhead.kernel.modDirVersion}'"); + $machine->succeed("uname -a | grep '${pkgs.linuxPackages_copperhead_hardened.kernel.modDirVersion}'"); $machine->succeed("uname -a | grep 'hardened'"); ''; }) diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix index 4fd9466dc50..179c95e7643 100644 --- a/nixos/tests/misc.nix +++ b/nixos/tests/misc.nix @@ -96,7 +96,7 @@ import ./make-test.nix ({ pkgs, ...} : rec { $machine->succeed("systemctl start systemd-udev-settle.service"); subtest "udev-auto-load", sub { $machine->waitForUnit('systemd-udev-settle.service'); - $machine->succeed('lsmod | grep psmouse'); + $machine->succeed('lsmod | grep mousedev'); }; # Test whether systemd-tmpfiles-clean works. diff --git a/nixos/tests/openldap.nix b/nixos/tests/openldap.nix index 1178701c609..1eaf87a8eaa 100644 --- a/nixos/tests/openldap.nix +++ b/nixos/tests/openldap.nix @@ -1,5 +1,5 @@ import ./make-test.nix { - name = "dovecot"; + name = "openldap"; machine = { pkgs, ... }: { services.openldap = { @@ -28,8 +28,8 @@ import ./make-test.nix { }; testScript = '' - $machine->succeed('systemctl status openldap.service'); $machine->waitForUnit('openldap.service'); + $machine->succeed('systemctl status openldap.service'); $machine->succeed('ldapsearch -LLL -D "cn=root,dc=example" -w notapassword -b "dc=example"'); ''; } diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix index 2d3ecaf94cf..98900883061 100644 --- a/nixos/tests/printing.nix +++ b/nixos/tests/printing.nix @@ -39,7 +39,9 @@ import ./make-test.nix ({pkgs, ... }: { $client->waitForUnit("cups.service"); $client->sleep(10); # wait until cups is fully initialized $client->succeed("lpstat -r") =~ /scheduler is running/ or die; - $client->succeed("lpstat -H") =~ "localhost:631" or die; + # Test that UNIX socket is used for connections. + $client->succeed("lpstat -H") =~ "/var/run/cups/cups.sock" or die; + # Test that HTTP server is available too. $client->succeed("curl --fail http://localhost:631/"); $client->succeed("curl --fail http://server:631/"); $server->fail("curl --fail --connect-timeout 2 http://client:631/"); diff --git a/nixos/tests/prosody.nix b/nixos/tests/prosody.nix new file mode 100644 index 00000000000..fcebfaf74e1 --- /dev/null +++ b/nixos/tests/prosody.nix @@ -0,0 +1,75 @@ +import ./make-test.nix { + name = "prosody"; + + machine = { config, pkgs, ... }: { + services.prosody = { + enable = true; + # TODO: use a self-signed certificate + c2sRequireEncryption = false; + }; + environment.systemPackages = let + sendMessage = pkgs.writeScriptBin "send-message" '' + #!/usr/bin/env python3 + # Based on the sleekxmpp send_client example, look there for more details: + # https://github.com/fritzy/SleekXMPP/blob/develop/examples/send_client.py + import sleekxmpp + + class SendMsgBot(sleekxmpp.ClientXMPP): + """ + A basic SleekXMPP bot that will log in, send a message, + and then log out. + """ + def __init__(self, jid, password, recipient, message): + sleekxmpp.ClientXMPP.__init__(self, jid, password) + + self.recipient = recipient + self.msg = message + + self.add_event_handler("session_start", self.start, threaded=True) + + def start(self, event): + self.send_presence() + self.get_roster() + + self.send_message(mto=self.recipient, + mbody=self.msg, + mtype='chat') + + self.disconnect(wait=True) + + + if __name__ == '__main__': + xmpp = SendMsgBot("test1@localhost", "test1", "test2@localhost", "Hello World!") + xmpp.register_plugin('xep_0030') # Service Discovery + xmpp.register_plugin('xep_0199') # XMPP Ping + + # TODO: verify certificate + # If you want to verify the SSL certificates offered by a server: + # xmpp.ca_certs = "path/to/ca/cert" + + if xmpp.connect(('localhost', 5222)): + xmpp.process(block=True) + else: + print("Unable to connect.") + sys.exit(1) + ''; + in [ (pkgs.python3.withPackages (ps: [ ps.sleekxmpp ])) sendMessage ]; + }; + + testScript = '' + $machine->waitForUnit('prosody.service'); + $machine->succeed('prosodyctl status') =~ /Prosody is running/; + + # set password to 'test' (it's asked twice) + $machine->succeed('yes test1 | prosodyctl adduser test1@localhost'); + # set password to 'y' + $machine->succeed('yes | prosodyctl adduser test2@localhost'); + # correct password to 'test2' + $machine->succeed('yes test2 | prosodyctl passwd test2@localhost'); + + $machine->succeed("send-message"); + + $machine->succeed('prosodyctl deluser test1@localhost'); + $machine->succeed('prosodyctl deluser test2@localhost'); + ''; +} diff --git a/nixos/tests/vault.nix b/nixos/tests/vault.nix index 2c08d06f286..515d5c8bac2 100644 --- a/nixos/tests/vault.nix +++ b/nixos/tests/vault.nix @@ -17,7 +17,7 @@ import ./make-test.nix ({ pkgs, ... }: $machine->waitForUnit('multi-user.target'); $machine->waitForUnit('vault.service'); $machine->waitForOpenPort(8200); - $machine->succeed('vault init'); - $machine->succeed('vault status | grep "Sealed: true"'); + $machine->succeed('vault operator init'); + $machine->succeed('vault status | grep Sealed | grep true'); ''; }) diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index 5574293ba37..249571fcede 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -43,6 +43,9 @@ let "init=${pkgs.writeScript "mini-init.sh" miniInit}" ]; + # XXX: Remove this once TSS location detection has been fixed in VirtualBox + boot.kernelPackages = pkgs.linuxPackages_4_9; + fileSystems."/" = { device = "vboxshare"; fsType = "vboxsf"; diff --git a/pkgs/applications/altcoins/bitcoin-abc.nix b/pkgs/applications/altcoins/bitcoin-abc.nix index 011e3cd7c87..219ab5d4f80 100644 --- a/pkgs/applications/altcoins/bitcoin-abc.nix +++ b/pkgs/applications/altcoins/bitcoin-abc.nix @@ -7,13 +7,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "bitcoin" + (toString (optional (!withGui) "d")) + "-abc-" + version; - version = "0.16.0"; + version = "0.16.2"; src = fetchFromGitHub { owner = "bitcoin-ABC"; repo = "bitcoin-abc"; rev = "v${version}"; - sha256 = "0wwcgvd8zgl5qh6z1sa3kdv1lr9cwwbs9j2gaad5mqr9sfwbbxdh"; + sha256 = "0d5npn4p321jqsbqjxkbv0ncvs2hp9vdp30np6n8n53f896cxl92"; }; patches = [ ./fix-bitcoin-qt-build.patch ]; diff --git a/pkgs/applications/altcoins/bitcoin-classic.nix b/pkgs/applications/altcoins/bitcoin-classic.nix index 9a2145d91cf..31c8ed6fc8d 100644 --- a/pkgs/applications/altcoins/bitcoin-classic.nix +++ b/pkgs/applications/altcoins/bitcoin-classic.nix @@ -7,13 +7,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "bitcoin" + (toString (optional (!withGui) "d")) + "-classic-" + version; - version = "1.3.6"; + version = "1.3.8"; src = fetchFromGitHub { owner = "bitcoinclassic"; repo = "bitcoinclassic"; rev = "v${version}"; - sha256 = "129gkg035gv7zmc463jl2spvdh0fl4q8v4jdaslfnp34hbwi1p07"; + sha256 = "06ij9v7zbdnhxq9429nnxiw655cp8idldj18l7fmj94gqx07n5vh"; }; patches = [ ./fix-bitcoin-qt-build.patch ]; diff --git a/pkgs/applications/altcoins/bitcoin-unlimited-const-comparators.patch b/pkgs/applications/altcoins/bitcoin-unlimited-const-comparators.patch new file mode 100644 index 00000000000..1b74a48a84a --- /dev/null +++ b/pkgs/applications/altcoins/bitcoin-unlimited-const-comparators.patch @@ -0,0 +1,38 @@ +--- a/src/txmempool.h ++++ b/src/txmempool.h +@@ -204,7 +204,7 @@ + class CompareTxMemPoolEntryByDescendantScore + { + public: +- bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) ++ bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) const + { + bool fUseADescendants = UseDescendantScore(a); + bool fUseBDescendants = UseDescendantScore(b); +@@ -226,7 +226,7 @@ + } + + // Calculate which score to use for an entry (avoiding division). +- bool UseDescendantScore(const CTxMemPoolEntry &a) ++ bool UseDescendantScore(const CTxMemPoolEntry &a) const + { + double f1 = (double)a.GetModifiedFee() * a.GetSizeWithDescendants(); + double f2 = (double)a.GetModFeesWithDescendants() * a.GetTxSize(); +@@ -241,7 +241,7 @@ + class CompareTxMemPoolEntryByScore + { + public: +- bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) ++ bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) const + { + double f1 = (double)a.GetModifiedFee() * b.GetTxSize(); + double f2 = (double)b.GetModifiedFee() * a.GetTxSize(); +@@ -255,7 +255,7 @@ + class CompareTxMemPoolEntryByEntryTime + { + public: +- bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) ++ bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) const + { + return a.GetTime() < b.GetTime(); + } diff --git a/pkgs/applications/altcoins/bitcoin-unlimited.nix b/pkgs/applications/altcoins/bitcoin-unlimited.nix index 9eb1e54b909..d9040377ebe 100644 --- a/pkgs/applications/altcoins/bitcoin-unlimited.nix +++ b/pkgs/applications/altcoins/bitcoin-unlimited.nix @@ -7,13 +7,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "bitcoin" + (toString (optional (!withGui) "d")) + "-unlimited-" + version; - version = "1.0.2.0"; + version = "1.0.3.0"; src = fetchFromGitHub { owner = "bitcoinunlimited"; repo = "bitcoinunlimited"; rev = "v${version}"; - sha256 = "17cmyns1908s2rqs0zwr05f3541nqm2pg08n2xn97g2k3yimdg5q"; + sha256 = "0l02a7h502msrp4c02wgm7f3159ap8l61k4890vas99gq7ywxkcx"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; @@ -21,8 +21,13 @@ stdenv.mkDerivation rec { miniupnpc utillinux protobuf libevent ] ++ optionals withGui [ qt4 qrencode ]; + patches = [ + ./bitcoin-unlimited-const-comparators.patch + ]; + configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] ++ optionals withGui [ "--with-gui=qt4" ]; + enableParallelBuilding = true; meta = { description = "Peer-to-peer electronic cash system (Unlimited client)"; diff --git a/pkgs/applications/altcoins/bitcoin-xt.nix b/pkgs/applications/altcoins/bitcoin-xt.nix index 38867619804..ccc55d17bcf 100644 --- a/pkgs/applications/altcoins/bitcoin-xt.nix +++ b/pkgs/applications/altcoins/bitcoin-xt.nix @@ -6,13 +6,13 @@ with stdenv.lib; stdenv.mkDerivation rec{ name = "bitcoin" + (toString (optional (!withGui) "d")) + "-xt-" + version; - version = "0.11G2"; + version = "0.11H"; src = fetchFromGitHub { owner = "bitcoinxt"; repo = "bitcoinxt"; rev = "v${version}"; - sha256 = "071rljvsabyc9j64v248qfb7zfqpfl84hpsnvlavin235zljq8qs"; + sha256 = "1v43bynmidn2zdpky939km721x3ks91bzyh4200gji61qzsmyg62"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; diff --git a/pkgs/applications/altcoins/btc1.nix b/pkgs/applications/altcoins/btc1.nix index 8ade6fb5251..95e03ee6a21 100644 --- a/pkgs/applications/altcoins/btc1.nix +++ b/pkgs/applications/altcoins/btc1.nix @@ -5,11 +5,11 @@ with stdenv.lib; stdenv.mkDerivation rec{ name = "bit1" + (toString (optional (!withGui) "d")) + "-" + version; - version = "1.14.5"; + version = "1.15.1"; src = fetchurl { url = "https://github.com/btc1/bitcoin/archive/v${version}.tar.gz"; - sha256 = "1az6bbblh3adgcs16r9cjz8jacg6sbwfpg8zzfzkbp9h9j85ass5"; + sha256 = "0v0g2wb4nsnhddxzb63vj2bc1mgyj05vqm5imicjfz8prvgc0si8"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; diff --git a/pkgs/applications/altcoins/dcrd.nix b/pkgs/applications/altcoins/dcrd.nix index 8a8c4a7f102..cc3e83befa6 100644 --- a/pkgs/applications/altcoins/dcrd.nix +++ b/pkgs/applications/altcoins/dcrd.nix @@ -29,5 +29,6 @@ buildGoPackage rec { homepage = "https://decred.org"; description = "Decred daemon in Go (golang)"; license = with lib.licenses; [ isc ]; + broken = stdenv.isLinux; # 2018-04-10 }; } diff --git a/pkgs/applications/altcoins/dcrwallet.nix b/pkgs/applications/altcoins/dcrwallet.nix index aa6e8a0315e..8d966684b23 100644 --- a/pkgs/applications/altcoins/dcrwallet.nix +++ b/pkgs/applications/altcoins/dcrwallet.nix @@ -38,5 +38,6 @@ buildGoPackage rec { homepage = "https://decred.org"; description = "Decred daemon in Go (golang)"; license = with lib.licenses; [ isc ]; + broken = stdenv.isLinux; # 2018-04-10 }; } diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index a4caf8d4ef5..6acabd9a80f 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -1,4 +1,4 @@ -{ callPackage, boost155, openssl_1_1_0, haskellPackages, darwin, libsForQt5, miniupnpc_2, python3 }: +{ callPackage, boost155, boost165, openssl_1_1_0, haskellPackages, darwin, libsForQt5, miniupnpc_2, python3 }: rec { @@ -7,20 +7,20 @@ rec { bitcoin = libsForQt5.callPackage ./bitcoin.nix { miniupnpc = miniupnpc_2; withGui = true; }; bitcoind = callPackage ./bitcoin.nix { miniupnpc = miniupnpc_2; withGui = false; }; - bitcoin-abc = libsForQt5.callPackage ./bitcoin-abc.nix { withGui = true; }; - bitcoind-abc = callPackage ./bitcoin-abc.nix { withGui = false; }; + bitcoin-abc = libsForQt5.callPackage ./bitcoin-abc.nix { boost = boost165; withGui = true; }; + bitcoind-abc = callPackage ./bitcoin-abc.nix { boost = boost165; withGui = false; }; bitcoin-unlimited = callPackage ./bitcoin-unlimited.nix { withGui = true; }; bitcoind-unlimited = callPackage ./bitcoin-unlimited.nix { withGui = false; }; - bitcoin-classic = libsForQt5.callPackage ./bitcoin-classic.nix { withGui = true; }; - bitcoind-classic = callPackage ./bitcoin-classic.nix { withGui = false; }; + bitcoin-classic = libsForQt5.callPackage ./bitcoin-classic.nix { boost = boost165; withGui = true; }; + bitcoind-classic = callPackage ./bitcoin-classic.nix { boost = boost165; withGui = false; }; - bitcoin-xt = callPackage ./bitcoin-xt.nix { withGui = true; }; - bitcoind-xt = callPackage ./bitcoin-xt.nix { withGui = false; }; + bitcoin-xt = callPackage ./bitcoin-xt.nix { boost = boost165; withGui = true; }; + bitcoind-xt = callPackage ./bitcoin-xt.nix { boost = boost165; withGui = false; }; - btc1 = callPackage ./btc1.nix { withGui = true; }; - btc1d = callPackage ./btc1.nix { withGui = false; }; + btc1 = callPackage ./btc1.nix { boost = boost165; withGui = true; }; + btc1d = callPackage ./btc1.nix { boost = boost165; withGui = false; }; cryptop = python3.pkgs.callPackage ./cryptop { }; @@ -31,8 +31,8 @@ rec { dero = callPackage ./dero.nix { }; - dogecoin = callPackage ./dogecoin.nix { withGui = true; }; - dogecoind = callPackage ./dogecoin.nix { withGui = false; }; + dogecoin = callPackage ./dogecoin.nix { boost = boost165; withGui = true; }; + dogecoind = callPackage ./dogecoin.nix { boost = boost165; withGui = false; }; ethsign = callPackage ./ethsign { }; @@ -46,8 +46,10 @@ rec { litecoin = callPackage ./litecoin.nix { withGui = true; }; litecoind = callPackage ./litecoin.nix { withGui = false; }; - memorycoin = callPackage ./memorycoin.nix { withGui = true; }; - memorycoind = callPackage ./memorycoin.nix { withGui = false; }; + masari = callPackage ./masari.nix { }; + + memorycoin = callPackage ./memorycoin.nix { boost = boost165; withGui = true; }; + memorycoind = callPackage ./memorycoin.nix { boost = boost165; withGui = false; }; namecoin = callPackage ./namecoin.nix { withGui = true; }; namecoind = callPackage ./namecoin.nix { withGui = false; }; diff --git a/pkgs/applications/altcoins/freicoin.nix b/pkgs/applications/altcoins/freicoin.nix index a44dbbd62ce..b753e2d48c9 100644 --- a/pkgs/applications/altcoins/freicoin.nix +++ b/pkgs/applications/altcoins/freicoin.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "freicoin"; repo = "freicoin"; rev = "v${version}"; - sha256 = "1m5pcnfhwhcj7q00p2sy3h73rkdm3w6grmljgiq53gshcj08cq1z"; + sha256 = "1v1qwv4x5agjba82s1vknmdgq67y26wzdwbmwwqavv7f7y3y860h"; }; qmakeFlags = ["USE_UPNP=-"]; diff --git a/pkgs/applications/altcoins/hevm.nix b/pkgs/applications/altcoins/hevm.nix index 51e5f6bcb29..1aa598f3254 100644 --- a/pkgs/applications/altcoins/hevm.nix +++ b/pkgs/applications/altcoins/hevm.nix @@ -55,6 +55,7 @@ lib.overrideDerivation (mkDerivation rec { description = "Ethereum virtual machine evaluator"; license = stdenv.lib.licenses.agpl3; maintainers = [stdenv.lib.maintainers.dbrock]; + broken = true; # 2018-04-10 }) (attrs: { buildInputs = attrs.buildInputs ++ [solc]; nativeBuildInputs = attrs.nativeBuildInputs ++ [makeWrapper]; diff --git a/pkgs/applications/altcoins/litecoin.nix b/pkgs/applications/altcoins/litecoin.nix index ac42caa8099..12cf5dcb71c 100644 --- a/pkgs/applications/altcoins/litecoin.nix +++ b/pkgs/applications/altcoins/litecoin.nix @@ -8,13 +8,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "litecoin" + (toString (optional (!withGui) "d")) + "-" + version; - version = "0.14.2"; + version = "0.15.1"; src = fetchFromGitHub { owner = "litecoin-project"; repo = "litecoin"; rev = "v${version}"; - sha256 = "1smadd5d2mpz2v3pyk7wqm60vdp81zqr4m3z4wfvnlz62m1m800y"; + sha256 = "01q0lj0grabyfh67ar984m9lv9xs0rakadkci8jpfbp8xw166r40"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; diff --git a/pkgs/applications/altcoins/masari.nix b/pkgs/applications/altcoins/masari.nix new file mode 100644 index 00000000000..02a6d25df51 --- /dev/null +++ b/pkgs/applications/altcoins/masari.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, unbound, openssl, boost +, lmdb, miniupnpc, readline }: + +stdenv.mkDerivation rec { + name = "masari-${version}"; + version = "0.1.4.0"; + + src = fetchFromGitHub { + owner = "masari-project"; + repo = "masari"; + rev = "v${version}"; + sha256 = "0l6i21wkq5f6z8xr756i7vqgkzk7lixaa31ydy34fkfcqxppgxz3"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ boost miniupnpc openssl lmdb unbound readline ]; + + enableParallelBuilding = true; + + meta = with lib; { + description = "scalability-focused, untraceable, secure, and fungible cryptocurrency using the RingCT protocol"; + homepage = "https://www.getmasari.org/"; + license = licenses.bsd3; + maintainers = with maintainers; [ fpletz ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/altcoins/memorycoin.nix b/pkgs/applications/altcoins/memorycoin.nix index a14276d4fa2..b9335dbabe5 100644 --- a/pkgs/applications/altcoins/memorycoin.nix +++ b/pkgs/applications/altcoins/memorycoin.nix @@ -51,6 +51,6 @@ stdenv.mkDerivation rec{ homepage = http://www.bitcoin.org/; maintainers = with maintainers; [ AndersonTorres ]; license = licenses.mit; - platforms = platforms.unix; + platforms = subtractLists [ "aarch64-linux" ] platforms.unix; }; } diff --git a/pkgs/applications/altcoins/monero-gui/default.nix b/pkgs/applications/altcoins/monero-gui/default.nix index 0d2899b2e64..2aff86ae1d3 100644 --- a/pkgs/applications/altcoins/monero-gui/default.nix +++ b/pkgs/applications/altcoins/monero-gui/default.nix @@ -2,32 +2,34 @@ , makeWrapper, makeDesktopItem , qtbase, qmake, qtmultimedia, qttools , qtgraphicaleffects, qtdeclarative -, qtlocation, qtquickcontrols, qtwebchannel +, qtlocation, qtquickcontrols2, qtwebchannel , qtwebengine, qtx11extras, qtxmlpatterns , monero, unbound, readline, boost, libunwind +, pcsclite, zeromq, cppzmq, pkgconfig }: with stdenv.lib; stdenv.mkDerivation rec { name = "monero-gui-${version}"; - version = "0.11.1.0"; + version = "0.12.0.0"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero-gui"; rev = "v${version}"; - sha256 = "01d7apwrv8j8bh7plvvhlnll3ransaha3n6rx19nkgvfn319hswq"; + sha256 = "1mg5ival8a2wdp14yib4wzqax4xyvd40zjy9anhszljds1439jhl"; }; - nativeBuildInputs = [ qmake ]; + nativeBuildInputs = [ qmake pkgconfig ]; buildInputs = [ qtbase qtmultimedia qtgraphicaleffects - qtdeclarative qtlocation qtquickcontrols + qtdeclarative qtlocation qtquickcontrols2 qtwebchannel qtwebengine qtx11extras qtxmlpatterns monero unbound readline - boost libunwind makeWrapper + boost libunwind pcsclite zeromq cppzmq + makeWrapper ]; patches = [ diff --git a/pkgs/applications/altcoins/monero-gui/move-log-file.patch b/pkgs/applications/altcoins/monero-gui/move-log-file.patch index 928fb32911f..08840c6a65e 100644 --- a/pkgs/applications/altcoins/monero-gui/move-log-file.patch +++ b/pkgs/applications/altcoins/monero-gui/move-log-file.patch @@ -1,8 +1,8 @@ diff --git a/main.cpp b/main.cpp -index 1a9a979..2316929 100644 +index c03b160..a8ea263 100644 --- a/main.cpp +++ b/main.cpp -@@ -74,10 +74,6 @@ int main(int argc, char *argv[]) +@@ -80,14 +80,16 @@ int main(int argc, char *argv[]) // qDebug() << "High DPI auto scaling - enabled"; //#endif @@ -13,9 +13,6 @@ index 1a9a979..2316929 100644 MainApp app(argc, argv); qDebug() << "app startd"; -@@ -86,6 +82,13 @@ int main(int argc, char *argv[]) - app.setOrganizationDomain("getmonero.org"); - app.setOrganizationName("monero-project"); + // Log settings + QString logfile = @@ -23,20 +20,19 @@ index 1a9a979..2316929 100644 + + "/monero-wallet-gui.log"; + Monero::Wallet::init(argv[0], logfile.toUtf8().constData()); + -+ - filter *eventFilter = new filter; - app.installEventFilter(eventFilter); - + app.setApplicationName("monero-core"); + app.setOrganizationDomain("getmonero.org"); + app.setOrganizationName("monero-project"); diff --git a/src/libwalletqt/Wallet.cpp b/src/libwalletqt/Wallet.cpp -index 8525bf3..6967b24 100644 +index 74649ce..fe1efc6 100644 --- a/src/libwalletqt/Wallet.cpp +++ b/src/libwalletqt/Wallet.cpp -@@ -613,7 +613,7 @@ QString Wallet::getDaemonLogPath() const - - QString Wallet::getWalletLogPath() const - { -- return QCoreApplication::applicationDirPath() + "/monero-wallet-gui.log"; -+ return QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + "/monero-wallet-gui.log"; +@@ -729,7 +729,7 @@ QString Wallet::getWalletLogPath() const + #ifdef Q_OS_MACOS + return QStandardPaths::standardLocations(QStandardPaths::HomeLocation).at(0) + "/Library/Logs/" + filename; + #else +- return QCoreApplication::applicationDirPath() + "/" + filename; ++ return QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + filename; + #endif } - Wallet::Wallet(Monero::Wallet *w, QObject *parent) diff --git a/pkgs/applications/altcoins/monero/build-wallet-rpc.patch b/pkgs/applications/altcoins/monero/build-wallet-rpc.patch deleted file mode 100644 index 5436332db80..00000000000 --- a/pkgs/applications/altcoins/monero/build-wallet-rpc.patch +++ /dev/null @@ -1,78 +0,0 @@ -diff --git a/src/wallet/CMakeLists.txt b/src/wallet/CMakeLists.txt -index 63908005..f6656d5c 100644 ---- a/src/wallet/CMakeLists.txt -+++ b/src/wallet/CMakeLists.txt -@@ -86,43 +86,40 @@ target_link_libraries(wallet - ${EXTRA_LIBRARIES}) - add_dependencies(wallet version) - --if (NOT BUILD_GUI_DEPS) -- set(wallet_rpc_sources -- wallet_rpc_server.cpp) -+set(wallet_rpc_sources -+ wallet_rpc_server.cpp) - -- set(wallet_rpc_headers) -+set(wallet_rpc_headers) - -- set(wallet_rpc_private_headers -- wallet_rpc_server.h) -+set(wallet_rpc_private_headers -+ wallet_rpc_server.h) - -- monero_private_headers(wallet_rpc_server -- ${wallet_rpc_private_headers}) -- monero_add_executable(wallet_rpc_server -- ${wallet_rpc_sources} -- ${wallet_rpc_headers} -- ${wallet_rpc_private_headers}) -- -- target_link_libraries(wallet_rpc_server -- PRIVATE -- wallet -- epee -- rpc -- cryptonote_core -- cncrypto -- common -- ${Boost_CHRONO_LIBRARY} -- ${Boost_PROGRAM_OPTIONS_LIBRARY} -- ${Boost_FILESYSTEM_LIBRARY} -- ${Boost_THREAD_LIBRARY} -- ${CMAKE_THREAD_LIBS_INIT} -- ${EXTRA_LIBRARIES}) -- add_dependencies(wallet_rpc_server version) -- set_property(TARGET wallet_rpc_server -- PROPERTY -- OUTPUT_NAME "monero-wallet-rpc") -- install(TARGETS wallet_rpc_server DESTINATION bin) --endif() -+monero_private_headers(wallet_rpc_server -+ ${wallet_rpc_private_headers}) -+monero_add_executable(wallet_rpc_server -+ ${wallet_rpc_sources} -+ ${wallet_rpc_headers} -+ ${wallet_rpc_private_headers}) - -+target_link_libraries(wallet_rpc_server -+ PRIVATE -+ wallet -+ epee -+ rpc -+ cryptonote_core -+ cncrypto -+ common -+ ${Boost_CHRONO_LIBRARY} -+ ${Boost_PROGRAM_OPTIONS_LIBRARY} -+ ${Boost_FILESYSTEM_LIBRARY} -+ ${Boost_THREAD_LIBRARY} -+ ${CMAKE_THREAD_LIBS_INIT} -+ ${EXTRA_LIBRARIES}) -+add_dependencies(wallet_rpc_server version) -+set_property(TARGET wallet_rpc_server -+ PROPERTY -+ OUTPUT_NAME "monero-wallet-rpc") -+install(TARGETS wallet_rpc_server DESTINATION bin) - - # build and install libwallet_merged only if we building for GUI - if (BUILD_GUI_DEPS) diff --git a/pkgs/applications/altcoins/monero/default.nix b/pkgs/applications/altcoins/monero/default.nix index 4b1e9cd4ea3..8be24522f56 100644 --- a/pkgs/applications/altcoins/monero/default.nix +++ b/pkgs/applications/altcoins/monero/default.nix @@ -1,46 +1,44 @@ -{ stdenv, fetchpatch, fetchFromGitHub, cmake -, boost, miniupnpc, openssl, pkgconfig, unbound +{ stdenv, fetchFromGitHub, cmake, pkgconfig, git +, boost, miniupnpc, openssl, unbound, cppzmq +, zeromq, pcsclite, readline +, CoreData, IOKit, PCSC }: +assert stdenv.isDarwin -> IOKit != null; + +with stdenv.lib; + stdenv.mkDerivation rec { name = "monero-${version}"; - version = "0.11.1.0"; + version = "0.12.0.0"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero"; rev = "v${version}"; - sha256 = "0nrpxx6r63ia6ard85d504x2kgaikvrhb5sg93ml70l6djyy1148"; + sha256 = "1lc9mkrl1m8mdbvj88y8y5rv44vinxf7dyv221ndmw5c5gs5zfgk"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig git ]; - buildInputs = [ boost miniupnpc openssl unbound ]; - - patches = [ - ./build-wallet-rpc.patch # fixed in next release - ]; + buildInputs = [ + boost miniupnpc openssl unbound + cppzmq zeromq pcsclite readline + ] ++ optionals stdenv.isDarwin [ IOKit CoreData PCSC ]; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DBUILD_GUI_DEPS=ON" + "-DReadline_ROOT_DIR=${readline.dev}" ]; - doCheck = false; + hardeningDisable = [ "fortify" ]; - installPhase = '' - make install - install -Dt "$out/bin/" \ - bin/monero-blockchain-export \ - bin/monero-blockchain-import \ - bin/monero-wallet-rpc - ''; - - meta = with stdenv.lib; { + meta = { description = "Private, secure, untraceable currency"; homepage = https://getmonero.org/; license = licenses.bsd3; platforms = platforms.all; - maintainers = [ maintainers.ehmry ]; + maintainers = with maintainers; [ ehmry rnhmjoj ]; }; } diff --git a/pkgs/applications/altcoins/namecoin.nix b/pkgs/applications/altcoins/namecoin.nix index 83bead0adac..f7349581169 100644 --- a/pkgs/applications/altcoins/namecoin.nix +++ b/pkgs/applications/altcoins/namecoin.nix @@ -3,14 +3,14 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "nc0.13.0rc1"; + version = "nc0.15.99-name-tab-beta2"; name = "namecoin" + toString (optional (!withGui) "d") + "-" + version; src = fetchFromGitHub { owner = "namecoin"; repo = "namecoin-core"; rev = version; - sha256 = "17zz0rm3js285w2assxp8blfx830rs0ambcsaqqfli9mnaik3m39"; + sha256 = "1r0v0yvlazmidxp6xhapbdawqb8fhzrdp11d4an5vgxa208s6wdf"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix index be70443fd4d..4dced0cfafa 100644 --- a/pkgs/applications/audio/deadbeef/default.nix +++ b/pkgs/applications/audio/deadbeef/default.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { description = "Ultimate Music Player for GNU/Linux"; homepage = http://deadbeef.sourceforge.net/; license = licenses.gpl2; - platforms = platforms.linux; + platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ maintainers.abbradar ]; repositories.git = "https://github.com/Alexey-Yakovenko/deadbeef"; }; diff --git a/pkgs/applications/audio/mi2ly/default.nix b/pkgs/applications/audio/mi2ly/default.nix index fa4ea6343e9..4dfc7b13046 100644 --- a/pkgs/applications/audio/mi2ly/default.nix +++ b/pkgs/applications/audio/mi2ly/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.gpl2Plus ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; + broken = true; # 2018-04-11 }; } diff --git a/pkgs/applications/audio/mp3blaster/default.nix b/pkgs/applications/audio/mp3blaster/default.nix index ed7a4e786f0..eb5aa7c036c 100644 --- a/pkgs/applications/audio/mp3blaster/default.nix +++ b/pkgs/applications/audio/mp3blaster/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ncurses, libvorbis }: +{ stdenv, fetchFromGitHub, ncurses, libvorbis, SDL }: stdenv.mkDerivation rec { version = "3.2.6"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses libvorbis - ]; + ] ++ stdenv.lib.optional stdenv.isDarwin SDL; buildFlags = [ "CXXFLAGS=-Wno-narrowing" ]; diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix index 10c3bb2a195..87f5f94bb30 100644 --- a/pkgs/applications/audio/ncmpcpp/default.nix +++ b/pkgs/applications/audio/ncmpcpp/default.nix @@ -12,11 +12,11 @@ assert taglibSupport -> (taglib != null); with stdenv.lib; stdenv.mkDerivation rec { name = "ncmpcpp-${version}"; - version = "0.8.1"; + version = "0.8.2"; src = fetchurl { url = "https://ncmpcpp.rybczak.net/stable/${name}.tar.bz2"; - sha256 = "1zw8d07b2bkssbsybg6jnmpq001w525viajrnz4jvfml3l55gyad"; + sha256 = "0m0mjb049sl62vx13h9waavysa30mk0rphacksnvf94n13la62v5"; }; configureFlags = [ "BOOST_LIB_SUFFIX=" ] diff --git a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix index 8f04bf116a6..3670fb8347d 100644 --- a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix +++ b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix @@ -20,13 +20,16 @@ stdenv.mkDerivation rec { mv helmholtz~/src/Makefile . rm -rf helmholtz~/src/ rm helmholtz~/helmholtz~.pd_darwin + rm helmholtz~/helmholtz~.pd_linux rm helmholtz~/helmholtz~.dll rm -rf __MACOSX ''; patchPhase = '' + mkdir -p $out/helmholtz~ sed -i "s@current: pd_darwin@current: pd_linux@g" Makefile sed -i "s@-Wl@@g" Makefile + sed -i "s@\$(NAME).pd_linux \.\./\$(NAME).pd_linux@helmholtz~.pd_linux $out/helmholtz~/@g" Makefile ''; installPhase = '' diff --git a/pkgs/applications/audio/soundscape-renderer/default.nix b/pkgs/applications/audio/soundscape-renderer/default.nix index 47851adc3aa..babe4edff9d 100644 --- a/pkgs/applications/audio/soundscape-renderer/default.nix +++ b/pkgs/applications/audio/soundscape-renderer/default.nix @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { # Without it doesn't find all of the boost libraries. BOOST_LIB_DIR="${boost}/lib"; + # uses the deprecated get_generic_category() in boost_system + NIX_CFLAGS_COMPILE="-DBOOST_SYSTEM_ENABLE_DEPRECATED=1"; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 9ac0c49ebc3..87bf440ed4f 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -9,7 +9,7 @@ let # Latest version number can be found at: # http://repository-origin.spotify.com/pool/non-free/s/spotify-client/ # Be careful not to pick the testing version. - version = "1.0.69.336.g7edcc575-39"; + version = "1.0.77.338.g758ebd78-41"; deps = [ alsaLib @@ -54,7 +54,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb"; - sha256 = "0bh2q7g478g7wj661fypxcbhrbq87zingfyigg7rz1shgsgwc3gd"; + sha256 = "1971jc0431pl8yixpl37ryl2l0pqdf0xjvkg59nqdwj3vbdx5606"; }; buildInputs = [ dpkg makeWrapper ]; diff --git a/pkgs/applications/audio/squishyball/default.nix b/pkgs/applications/audio/squishyball/default.nix index 2022183f4a0..496ce779ffb 100644 --- a/pkgs/applications/audio/squishyball/default.nix +++ b/pkgs/applications/audio/squishyball/default.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { buildInputs = [ flac libao libvorbis ncurses opusfile ]; + NIX_CFLAGS_COMPILE = "-DNCURSES_INTERNALS"; + patches = [ ./gnu-screen.patch ]; postInstall = '' diff --git a/pkgs/applications/audio/streamripper/default.nix b/pkgs/applications/audio/streamripper/default.nix index 0fb1b77e708..39d1c266a37 100644 --- a/pkgs/applications/audio/streamripper/default.nix +++ b/pkgs/applications/audio/streamripper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl , glib, pkgconfig, libogg, libvorbis }: +{ stdenv, fetchurl , glib, pkgconfig, libogg, libvorbis, libmad }: stdenv.mkDerivation rec { name = "streamripper-${version}"; @@ -10,13 +10,12 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib libogg libvorbis ]; + buildInputs = [ glib libogg libvorbis libmad ]; meta = with stdenv.lib; { homepage = http://streamripper.sourceforge.net/; description = "Application that lets you record streaming mp3 to your hard drive"; license = licenses.gpl2; - platforms = platforms.linux; maintainers = with maintainers; [ the-kenny ]; }; } diff --git a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix index 486a52ef667..685f9c159b6 100644 --- a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix @@ -28,6 +28,8 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc" ] ++ stdenv.lib.optional useGTK2 "--with-gtk2"; + NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated-declarations" ]; + installFlags = [ "localstatedir=\${TMPDIR}" "sysconfdir=\${out}/etc" diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index 2c2227dd4ee..5e6d44807ee 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -29,6 +29,7 @@ , writeTextFile , xkeyboard_config , zlib +, gtk2, gnome_vfs, glib, GConf , fontsConf }: @@ -95,6 +96,11 @@ let libpulseaudio libX11 + # For GTKLookAndFeel + gtk2 + gnome_vfs + glib + GConf ]}" \ --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \ --set FONTCONFIG_FILE ${fontsConf} diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 4a71153cf91..382066d1dbd 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -1,20 +1,27 @@ -{ stdenv, callPackage, fetchurl, makeFontsConf }: +{ stdenv, callPackage, fetchurl, makeFontsConf, gnome2 }: let mkStudio = opts: callPackage (import ./common.nix opts) { fontsConf = makeFontsConf { fontDirectories = []; }; + inherit (gnome2) GConf gnome_vfs; }; in rec { + # Old alias + preview = beta; + + # Attributes are named by the channels + # linux-bundle stable = mkStudio { pname = "android-studio"; + #pname = "android-studio-stable"; # TODO: Rename version = "3.0.1.0"; # "Android Studio 3.0.1" build = "171.4443003"; sha256Hash = "1krahlqr70nq3csqiinq2m4fgs68j11hd9gg2dx2nrpw5zni0wdd"; meta = with stdenv.lib; { - description = "The Official IDE for Android (stable version)"; + description = "The Official IDE for Android (stable channel)"; longDescription = '' Android Studio is the official IDE for Android app development, based on IntelliJ IDEA. @@ -27,15 +34,38 @@ in rec { }; # linux-beta-bundle - preview = mkStudio { + beta = mkStudio { pname = "android-studio-preview"; - version = "3.1.0.12"; # "Android Studio 3.1 Beta 4" - build = "173.4615496"; - sha256Hash = "0rp0vg5hwv7kdrirydvnwznpfwibwwm2dxsbhbxfkyahph10ly72"; + #pname = "android-studio-beta"; # TODO: Rename + version = "3.1.0.14"; # "Android Studio 3.1 RC 2" + build = "173.4640767"; + sha256Hash = "00v8qbis4jm31v1g9989f9y15av6p3ywj8mmfxcsc3hjlpzdgid8"; meta = stable.meta // { - description = "The Official IDE for Android (preview version)"; + description = "The Official IDE for Android (beta channel)"; homepage = https://developer.android.com/studio/preview/index.html; }; }; + + dev = mkStudio { + pname = "android-studio-dev"; + version = "3.2.0.5"; # "Android Studio 3.2 Canary 6" + build = "173.4640885"; + sha256Hash = "1fbjk1dhvi975dm09s9iz9ja53fjqca07nw5h068gdj3358pj3k8"; + + meta = beta.meta // { + description = "The Official IDE for Android (dev channel)"; + }; + }; + + canary = mkStudio { + pname = "android-studio-canary"; + version = "3.2.0.5"; # "Android Studio 3.2 Canary 6" + build = "173.4640885"; + sha256Hash = "1fbjk1dhvi975dm09s9iz9ja53fjqca07nw5h068gdj3358pj3k8"; + + meta = beta.meta // { + description = "The Official IDE for Android (canary channel)"; + }; + }; } diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 2194ff226b5..9fbf4431f60 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "atom-${version}"; - version = "1.24.0"; + version = "1.25.1"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "1yvwz4lkf7ya775h3fvrg1wkdc30321j666vfjlmax5mbcjrxkzf"; + sha256 = "0h0kr4w26c6i89rb9y4aw4l8f63al42i2cy3ddk16m1irzij9fk4"; name = "${name}.deb"; }; diff --git a/pkgs/applications/editors/codeblocks/default.nix b/pkgs/applications/editors/codeblocks/default.nix index 20c2623e034..72642cfbe63 100644 --- a/pkgs/applications/editors/codeblocks/default.nix +++ b/pkgs/applications/editors/codeblocks/default.nix @@ -6,12 +6,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "${pname}-${stdenv.lib.optionalString contribPlugins "full-"}${version}"; - version = "16.01"; + version = "17.12"; pname = "codeblocks"; src = fetchurl { - url = "mirror://sourceforge/codeblocks/Sources/${version}/codeblocks_${version}.tar.gz"; - sha256 = "00sskm91r20ywydwqwx6v7z3nwn9lyh5297c5wp3razldlh9vyrh"; + url = "mirror://sourceforge/codeblocks/Sources/${version}/codeblocks_${version}.tar.xz"; + sha256 = "1q2pph7md1p10i83rir2l4gvy7ym2iw8w6sk5vl995knf851m20k"; }; nativeBuildInputs = [ autoreconfHook pkgconfig libtool file zip ]; @@ -22,11 +22,7 @@ stdenv.mkDerivation rec { preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; postConfigure = optionalString stdenv.isLinux "substituteInPlace libtool --replace ldconfig ${stdenv.cc.libc.bin}/bin/ldconfig"; configureFlags = [ "--enable-pch=no" ] - ++ optional contribPlugins "--with-contrib-plugins"; - - # Fix boost 1.59 compat - # Try removing in the next version - #CPPFLAGS = "-DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED"; + ++ optional contribPlugins [ "--with-contrib-plugins" "--with-boost-libdir=${boost}/lib" ]; meta = { maintainers = [ maintainers.linquize ]; diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index 5d850614e95..cee28f7d656 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -507,18 +507,13 @@ rec { }; }; - spotbugs = buildEclipsePlugin rec { + spotbugs = buildEclipseUpdateSite rec { name = "spotbugs-${version}"; - version = "3.1.2.r201802250230-59118d9"; + version = "3.1.3"; - srcFeature = fetchurl { - url = "https://spotbugs.github.io/eclipse/features/com.github.spotbugs.plugin.eclipse_${version}.jar"; - sha256 = "1p0pz7znpfi5h1wr60sl8clkpd7rzkh7krmc0nxc6w43gkgkg9h4"; - }; - - srcPlugin = fetchurl { - url = "https://spotbugs.github.io/eclipse/plugins/com.github.spotbugs.plugin.eclipse_${version}.jar"; - sha256 = "1z3jjbcjif4qip1gx2dhfcm9fyhps96ms7z3ngbdcakgw7wai9v4"; + src = fetchzip { + url = "https://github.com/spotbugs/spotbugs/releases/download/${version}/eclipsePlugin.zip"; + sha256 = "01zrmk497bxzqgwgbpsvi5iz5qk9b4q949h4918abm54zvkgndlg"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix index 4964de13986..55b2620026e 100644 --- a/pkgs/applications/editors/focuswriter/default.nix +++ b/pkgs/applications/editors/focuswriter/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { description = "Simple, distraction-free writing environment"; license = licenses.gpl3Plus; maintainers = with maintainers; [ madjar ]; - platforms = platforms.all; + platforms = platforms.linux; homepage = https://gottcode.org/focuswriter/; }; } diff --git a/pkgs/applications/editors/hexcurse/default.nix b/pkgs/applications/editors/hexcurse/default.nix index 5c0f2ee18e1..22cc4d47e68 100644 --- a/pkgs/applications/editors/hexcurse/default.nix +++ b/pkgs/applications/editors/hexcurse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, ncurses }: +{ stdenv, lib, fetchFromGitHub, fetchpatch, ncurses }: stdenv.mkDerivation rec { name = "hexcurse-${version}"; @@ -11,6 +11,18 @@ stdenv.mkDerivation rec { sha256 = "17ckkxfzbqvvfdnh10if4aqdcq98q3vl6dn1v6f4lhr4ifnyjdlk"; }; buildInputs = [ ncurses ]; + patches = [ + # gcc7 compat + (fetchpatch { + url = https://github.com/LonnyGomes/hexcurse/commit/d808cb7067d1df067f8b707fabbfaf9f8931484c.patch; + sha256 = "0h8345blmc401c6bivf0imn4cwii67264yrzxg821r46wrnfvyi2"; + }) + # gcc7 compat + (fetchpatch { + url = https://github.com/LonnyGomes/hexcurse/commit/716b5d58ac859cc240b8ccb9cbd79ace3e0593c1.patch; + sha256 = "0v6gbp6pjpmnzswlf6d97aywiy015g3kcmfrrkspsbb7lh1y3nix"; + }) + ]; meta = with lib; { description = "ncurses-based console hexeditor written in C"; diff --git a/pkgs/applications/editors/ht/default.nix b/pkgs/applications/editors/ht/default.nix index 112eebfaf6f..63864bc581d 100644 --- a/pkgs/applications/editors/ht/default.nix +++ b/pkgs/applications/editors/ht/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; + patches = [ ./gcc7.patch ]; + meta = with lib; { description = "File editor/viewer/analyzer for executables"; homepage = http://hte.sourceforge.net; diff --git a/pkgs/applications/editors/ht/gcc7.patch b/pkgs/applications/editors/ht/gcc7.patch new file mode 100644 index 00000000000..a90deaac698 --- /dev/null +++ b/pkgs/applications/editors/ht/gcc7.patch @@ -0,0 +1,11 @@ +--- ht-2.1.0.org/htapp.cc 2014-09-14 16:55:26.000000000 +0100 ++++ ht-2.1.0/htapp.cc 2018-03-10 12:48:07.158533800 +0000 +@@ -3023,7 +3023,7 @@ + { + uint a = 2; + uint b = u/a; +- while (abs(a - b) > 1) { ++ while (abs((int)(a - b)) > 1) { + a = (a+b)/2; + b = u/a; + } diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index a02773f715c..84ba32c4125 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -104,9 +104,9 @@ let }) (attrs: { postFixup = (attrs.postFixup or "") + '' interp="$(cat $NIX_CC/nix-support/dynamic-linker)" - patchelf --set-interpreter $interp $out/goland*/plugins/intellij-go-plugin/lib/dlv/linux/dlv + patchelf --set-interpreter $interp $out/goland*/plugins/go/lib/dlv/linux/dlv - chmod +x $out/goland*/plugins/intellij-go-plugin/lib/dlv/linux/dlv + chmod +x $out/goland*/plugins/go/lib/dlv/linux/dlv ''; }); @@ -211,7 +211,7 @@ let }); buildWebStorm = { name, version, src, license, description, wmClass, update-channel }: - (mkJetBrainsProduct { + lib.overrideDerivation (mkJetBrainsProduct { inherit name version src wmClass jdk; product = "WebStorm"; meta = with stdenv.lib; { @@ -225,8 +225,13 @@ let maintainers = with maintainers; [ abaldeau ]; platforms = platforms.linux; }; + }) (attrs: { + patchPhase = (attrs.patchPhase or "") + optionalString (stdenv.isLinux) '' + # Webstorm tries to use bundled jre if available. + # Lets prevent this for the moment + rm -r jre64 + ''; }); - in { @@ -234,12 +239,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2017.3.3"; /* updated by script */ + version = "2018.1"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "0j090863y68ppw34qkldm8h4lpbhalhqn70gb0ifj9bglf17503d"; /* updated by script */ + sha256 = "1mwajah0qghkw2f4hap5f35x826h8318a0bjbn9lpknffgfi0zc3"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion_Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -247,12 +252,12 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2017.3.5"; /* updated by script */ + version = "2017.3.7"; /* updated by script */ description = "Your Swiss Army Knife for Databases and SQL"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "1hfy0mxdsvydjjklh8fwdz6f6qxajhngmcmyyzw0gdfhw6ldrv9c"; /* updated by script */ + sha256 = "1pmkv1yd8xwqa4kdffg0vvk3whmnvrs9js7vnq4ilm39zzksqmpa"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; update-channel = "datagrip_2017_3"; @@ -260,12 +265,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2017.3.2"; /* updated by script */ + version = "2018.1"; /* updated by script */ description = "Up and Coming Go IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "0bhvj1xqlpy58yq2s5nrhhaw53i913zpr135b1f6r5s22nvkigvm"; /* updated by script */ + sha256 = "0r008q3dn30zbn9zzyjj6pz3myxrb9i1s96kinj9vy0cj7gb0aai"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "goland_release"; @@ -273,12 +278,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2017.3.4"; /* updated by script */ + version = "2018.1"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "15qsfirzmmjhwzkhx36zr4n0z5lhs021n2n3wim01g309ymr4gl9"; /* updated by script */ + sha256 = "08dlyf2zfgcbbbnadx5x0n877diyglg9h7h39njcw4ajh4aninyq"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IDEA_Release"; @@ -286,12 +291,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2017.3.4"; /* updated by script */ + version = "2018.1"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz"; - sha256 = "0f937s6zc1sv0gdlxf9kkc8l8rg78a5mxsfr2laab0g37rfy8c99"; /* updated by script */ + sha256 = "1483w692n29v22f5vchh8fbizwn74wlznd5pvlscxs4ly9af7935"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IDEA_Release"; @@ -299,12 +304,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2017.3.4"; /* updated by script */ + version = "2017.3.6"; /* updated by script */ description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "1hxkn0p0lp021bbysypwn8s69iggb76iwq38jv5a1ql7v5r1nwvd"; /* updated by script */ + sha256 = "00g86fggh8wfm02k9wwn33yqmbfr2b1x3vnvyn9gdpycdk46lqgw"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PS2017.3"; @@ -312,12 +317,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2017.3.3"; /* updated by script */ + version = "2018.1"; /* updated by script */ description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "1j9pp8lfy62d9l3953d5mpij60s6sqyv3bcjimgy85hsrw570x3r"; /* updated by script */ + sha256 = "0f3chibs7lp3kgkd0ah6d7z1lf3n4scalmadpxcn0fd6bap5mnjb"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm_Release"; @@ -325,12 +330,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2017.3.3"; /* updated by script */ + version = "2018.1"; /* updated by script */ description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "180cwva49air4j7g409algrm4svvmcbapspf9als3djhazqmczgr"; /* updated by script */ + sha256 = "0lq5bqnfxj02sbd4yaf3ma6nps7cnf0d11dzqjv9m6b41y55dp0k"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm_Release"; @@ -351,12 +356,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2017.3.2"; /* updated by script */ + version = "2017.3.3"; /* updated by script */ description = "The Most Intelligent Ruby and Rails IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "1dc14k7i0nfhkzi0j53hysqzxcls29j487jr9kv1aqp81k544bdy"; /* updated by script */ + sha256 = "1b0y8pcg8wwprm1swrl4laajnmx2c359bi7ahsyfjfprlzwx7wck"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; update-channel = "rm2017.3"; @@ -364,12 +369,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2017.3.4"; /* updated by script */ + version = "2018.1"; /* updated by script */ description = "Professional IDE for Web and JavaScript development"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "0d5whqa6c76l6g5yj0yq8a3k1x6d9kxwnac1dwsiy5dbr5jk0cyj"; /* updated by script */ + sha256 = "1lx852gycrzajh58k1r2wfpwwjna6y3fsd5srw5fgzw58f120vn4"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WS_Release"; diff --git a/pkgs/applications/editors/vis/default.nix b/pkgs/applications/editors/vis/default.nix index 0db93f78781..2af6e93bcfc 100644 --- a/pkgs/applications/editors/vis/default.nix +++ b/pkgs/applications/editors/vis/default.nix @@ -26,6 +26,10 @@ stdenv.mkDerivation rec { libselinux ]; + postPatch = '' + patchShebangs ./configure + ''; + LUA_CPATH="${lpeg}/lib/lua/${lua.luaversion}/?.so;"; LUA_PATH="${lpeg}/share/lua/${lua.luaversion}/?.lua"; diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index 4c825cc9891..a8b38012a13 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -2,7 +2,7 @@ makeWrapper, libXScrnSaver, libxkbfile, libsecret }: let - version = "1.20.1"; + version = "1.21.1"; channel = "stable"; plat = { @@ -12,9 +12,9 @@ let }.${stdenv.system}; sha256 = { - "i686-linux" = "0gycz857bl9ikfrylim970qgmyw7rcy3gbg2zsjddp9cgdk9basn"; - "x86_64-linux" = "0rx0qyxv173s9wjw97f94h61f12lh42grnmabgsvwd87b8zx4qim"; - "x86_64-darwin" = "0mqxmmkp3bsmy1g35prsgan61zzq5368gp720v37cwx1rskl0bfg"; + "i686-linux" = "0c5wh6i4yl601hg0r1c8y25lz7j2p4vhisdnvnx9nzd6v4ib27cj"; + "x86_64-linux" = "19i0wkl0qccq2cm10khy0xxb53a6g2m061g71y54s4cxb4wimc9l"; + "x86_64-darwin" = "0d1ws4c3n80gypiarqbylyipg273ssc0m29jnrg7hx1mcy5ljb1i"; }.${stdenv.system}; archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz"; @@ -79,7 +79,7 @@ in patchelf \ --set-rpath "${rpath}" \ - $out/lib/vscode/resources/app/node_modules/keytar/build/Release/keytar.node + $out/lib/vscode/resources/app/node_modules.asar.unpacked/keytar/build/Release/keytar.node ln -s ${lib.makeLibraryPath [libsecret]}/libsecret-1.so.0 $out/lib/vscode/libsecret-1.so.0 ''; diff --git a/pkgs/applications/editors/wxhexeditor/default.nix b/pkgs/applications/editors/wxhexeditor/default.nix index ad294480e60..85d9b0546d6 100644 --- a/pkgs/applications/editors/wxhexeditor/default.nix +++ b/pkgs/applications/editors/wxhexeditor/default.nix @@ -1,25 +1,35 @@ -{ stdenv, fetchurl, wxGTK, autoconf, automake, libtool, python, gettext, bash }: +{ stdenv, fetchFromGitHub, fetchpatch, wxGTK, autoconf, automake, libtool, python, gettext, bash }: stdenv.mkDerivation rec { name = "wxHexEditor-${version}"; - version = "v0.22"; + version = "v0.24"; - src = fetchurl { - url = "mirror://sourceforge/wxhexeditor/${name}-src.tar.bz2"; - sha256 = "15ir038g4lyw1q5bsay974hvj0nkg2yd9kccwxz808cd45fp411w"; + src = fetchFromGitHub { + repo = "wxHexEditor"; + owner = "EUA"; + rev = version; + sha256 = "08xnhaif8syv1fa0k6lc3jm7yg2k50b02lyds8w0jyzh4xi5crqj"; }; buildInputs = [ wxGTK autoconf automake libtool python gettext ]; - patchPhase = '' - substituteInPlace Makefile --replace "/usr/local" "$out" + preConfigure = "patchShebangs ."; + + prePatch = '' + substituteInPlace Makefile --replace "/usr" "$out" substituteInPlace Makefile --replace "mhash; ./configure" "mhash; ./configure --prefix=$out" - substituteInPlace udis86/autogen.sh --replace "/bin/bash" "${bash}/bin/bash" ''; + patches = [ + # https://github.com/EUA/wxHexEditor/issues/90 + (fetchpatch { + url = https://github.com/EUA/wxHexEditor/commit/d0fa3ddc3e9dc9b05f90b650991ef134f74eed01.patch; + sha256 = "1wcb70hrnhq72frj89prcqylpqs74xrfz3kdfdkq84p5qfz9svyj"; + }) + ]; + buildPhase = '' make OPTFLAGS="-fopenmp" - ''; meta = { diff --git a/pkgs/applications/editors/zed/node-packages.nix b/pkgs/applications/editors/zed/node-packages.nix index 5aaa75b6c91..e47f11e6eb5 100644 --- a/pkgs/applications/editors/zed/node-packages.nix +++ b/pkgs/applications/editors/zed/node-packages.nix @@ -1,99 +1,9 @@ -# This file has been generated by node2nix 1.3.0. Do not edit! +# This file has been generated by node2nix 1.5.3. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: let sources = { - "bytes-1.0.0" = { - name = "bytes"; - packageName = "bytes"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz"; - sha1 = "3569ede8ba34315fab99c3e92cb04c7220de1fa8"; - }; - }; - "depd-0.4.4" = { - name = "depd"; - packageName = "depd"; - version = "0.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/depd/-/depd-0.4.4.tgz"; - sha1 = "07091fae75f97828d89b4a02a2d4778f0e7c0662"; - }; - }; - "iconv-lite-0.4.4" = { - name = "iconv-lite"; - packageName = "iconv-lite"; - version = "0.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.4.tgz"; - sha1 = "e95f2e41db0735fc21652f7827a5ee32e63c83a8"; - }; - }; - "media-typer-0.2.0" = { - name = "media-typer"; - packageName = "media-typer"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/media-typer/-/media-typer-0.2.0.tgz"; - sha1 = "d8a065213adfeaa2e76321a2b6dda36ff6335984"; - }; - }; - "on-finished-2.1.0" = { - name = "on-finished"; - packageName = "on-finished"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/on-finished/-/on-finished-2.1.0.tgz"; - sha1 = "0c539f09291e8ffadde0c8a25850fb2cedc7022d"; - }; - }; - "qs-2.2.2" = { - name = "qs"; - packageName = "qs"; - version = "2.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-2.2.2.tgz"; - sha1 = "dfe783f1854b1ac2b3ade92775ad03e27e03218c"; - }; - }; - "raw-body-1.3.0" = { - name = "raw-body"; - packageName = "raw-body"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/raw-body/-/raw-body-1.3.0.tgz"; - sha1 = "978230a156a5548f42eef14de22d0f4f610083d1"; - }; - }; - "type-is-1.3.2" = { - name = "type-is"; - packageName = "type-is"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/type-is/-/type-is-1.3.2.tgz"; - sha1 = "4f2a5dc58775ca1630250afc7186f8b36309d1bb"; - }; - }; - "ee-first-1.0.5" = { - name = "ee-first"; - packageName = "ee-first"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/ee-first/-/ee-first-1.0.5.tgz"; - sha1 = "8c9b212898d8cd9f1a9436650ce7be202c9e9ff0"; - }; - }; - "mime-types-1.0.2" = { - name = "mime-types"; - packageName = "mime-types"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"; - sha1 = "995ae1392ab8affcbfcb2641dd054e943c0d5dce"; - }; - }; "accepts-1.0.7" = { name = "accepts"; packageName = "accepts"; @@ -103,6 +13,78 @@ let sha1 = "5b501fb4f0704309964ccdb048172541208dab1a"; }; }; + "asn1-0.1.11" = { + name = "asn1"; + packageName = "asn1"; + version = "0.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"; + sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7"; + }; + }; + "assert-plus-0.1.5" = { + name = "assert-plus"; + packageName = "assert-plus"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"; + sha1 = "ee74009413002d84cec7219c6ac811812e723160"; + }; + }; + "async-0.9.2" = { + name = "async"; + packageName = "async"; + version = "0.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-0.9.2.tgz"; + sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d"; + }; + }; + "aws-sign2-0.5.0" = { + name = "aws-sign2"; + packageName = "aws-sign2"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"; + sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63"; + }; + }; + "balanced-match-1.0.0" = { + name = "balanced-match"; + packageName = "balanced-match"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"; + sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; + }; + }; + "block-stream-0.0.9" = { + name = "block-stream"; + packageName = "block-stream"; + version = "0.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz"; + sha1 = "13ebfe778a03205cfe03751481ebb4b3300c126a"; + }; + }; + "boom-0.4.2" = { + name = "boom"; + packageName = "boom"; + version = "0.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"; + sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b"; + }; + }; + "brace-expansion-1.1.11" = { + name = "brace-expansion"; + packageName = "brace-expansion"; + version = "1.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"; + sha512 = "248cnpbbf0p32h53rd3g8wzpgrkaj4p078ra1g6l16f82i6bzkvmhwqan5rk88apbll9ly1476kngd7f7z27i3b3zxpbb3064f8yaw8"; + }; + }; "buffer-crc32-0.2.3" = { name = "buffer-crc32"; packageName = "buffer-crc32"; @@ -112,6 +94,78 @@ let sha1 = "bb54519e95d107cbd2400e76d0cab1467336d921"; }; }; + "bytes-1.0.0" = { + name = "bytes"; + packageName = "bytes"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz"; + sha1 = "3569ede8ba34315fab99c3e92cb04c7220de1fa8"; + }; + }; + "combined-stream-0.0.7" = { + name = "combined-stream"; + packageName = "combined-stream"; + version = "0.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz"; + sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f"; + }; + }; + "commander-2.1.0" = { + name = "commander"; + packageName = "commander"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.1.0.tgz"; + sha1 = "d121bbae860d9992a3d517ba96f56588e47c6781"; + }; + }; + "concat-map-0.0.1" = { + name = "concat-map"; + packageName = "concat-map"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + }; + }; + "cookie-0.1.2" = { + name = "cookie"; + packageName = "cookie"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie/-/cookie-0.1.2.tgz"; + sha1 = "72fec3d24e48a3432073d90c12642005061004b1"; + }; + }; + "cookie-signature-1.0.4" = { + name = "cookie-signature"; + packageName = "cookie-signature"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.4.tgz"; + sha1 = "0edd22286e3a111b9a2a70db363e925e867f6aca"; + }; + }; + "cryptiles-0.2.2" = { + name = "cryptiles"; + packageName = "cryptiles"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"; + sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c"; + }; + }; + "ctype-0.5.3" = { + name = "ctype"; + packageName = "ctype"; + version = "0.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"; + sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f"; + }; + }; "debug-1.0.4" = { name = "debug"; packageName = "debug"; @@ -121,6 +175,42 @@ let sha1 = "5b9c256bd54b6ec02283176fa8a0ede6d154cbf8"; }; }; + "delayed-stream-0.0.5" = { + name = "delayed-stream"; + packageName = "delayed-stream"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"; + sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f"; + }; + }; + "depd-0.4.4" = { + name = "depd"; + packageName = "depd"; + version = "0.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/depd/-/depd-0.4.4.tgz"; + sha1 = "07091fae75f97828d89b4a02a2d4778f0e7c0662"; + }; + }; + "destroy-1.0.3" = { + name = "destroy"; + packageName = "destroy"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz"; + sha1 = "b433b4724e71fd8551d9885174851c5fc377e2c9"; + }; + }; + "ee-first-1.0.5" = { + name = "ee-first"; + packageName = "ee-first"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/ee-first/-/ee-first-1.0.5.tgz"; + sha1 = "8c9b212898d8cd9f1a9436650ce7be202c9e9ff0"; + }; + }; "escape-html-1.0.1" = { name = "escape-html"; packageName = "escape-html"; @@ -139,6 +229,159 @@ let sha1 = "da05bbc4f5f4a30c84ce1d91f3c154007c4e9daa"; }; }; + "forever-agent-0.5.2" = { + name = "forever-agent"; + packageName = "forever-agent"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"; + sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130"; + }; + }; + "form-data-0.1.4" = { + name = "form-data"; + packageName = "form-data"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz"; + sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12"; + }; + }; + "fresh-0.2.2" = { + name = "fresh"; + packageName = "fresh"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fresh/-/fresh-0.2.2.tgz"; + sha1 = "9731dcf5678c7faeb44fb903c4f72df55187fa77"; + }; + }; + "fs.realpath-1.0.0" = { + name = "fs.realpath"; + packageName = "fs.realpath"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; + sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + }; + }; + "fstream-0.1.31" = { + name = "fstream"; + packageName = "fstream"; + version = "0.1.31"; + src = fetchurl { + url = "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz"; + sha1 = "7337f058fbbbbefa8c9f561a28cab0849202c988"; + }; + }; + "glob-7.1.2" = { + name = "glob"; + packageName = "glob"; + version = "7.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz"; + sha512 = "08vjxzixc9dwc1hn5pd60yyij98krk2pr758aiga97r02ncvaqx1hidi95wk470k1v84gg4alls9bm52m77174z128bgf13b61x951h"; + }; + }; + "graceful-fs-3.0.11" = { + name = "graceful-fs"; + packageName = "graceful-fs"; + version = "3.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.11.tgz"; + sha1 = "7613c778a1afea62f25c630a086d7f3acbbdd818"; + }; + }; + "hawk-1.0.0" = { + name = "hawk"; + packageName = "hawk"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz"; + sha1 = "b90bb169807285411da7ffcb8dd2598502d3b52d"; + }; + }; + "hoek-0.9.1" = { + name = "hoek"; + packageName = "hoek"; + version = "0.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"; + sha1 = "3d322462badf07716ea7eb85baf88079cddce505"; + }; + }; + "http-signature-0.10.1" = { + name = "http-signature"; + packageName = "http-signature"; + version = "0.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz"; + sha1 = "4fbdac132559aa8323121e540779c0a012b27e66"; + }; + }; + "iconv-lite-0.4.4" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.4.tgz"; + sha1 = "e95f2e41db0735fc21652f7827a5ee32e63c83a8"; + }; + }; + "inflight-1.0.6" = { + name = "inflight"; + packageName = "inflight"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; + sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + }; + }; + "inherits-2.0.3" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; + sha1 = "633c2c83e3da42a502f52466022480f4208261de"; + }; + }; + "ipaddr.js-0.1.2" = { + name = "ipaddr.js"; + packageName = "ipaddr.js"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-0.1.2.tgz"; + sha1 = "6a1fd3d854f5002965c34d7bbcd9b4a8d4b0467e"; + }; + }; + "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"; + }; + }; + "media-typer-0.2.0" = { + name = "media-typer"; + packageName = "media-typer"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/media-typer/-/media-typer-0.2.0.tgz"; + sha1 = "d8a065213adfeaa2e76321a2b6dda36ff6335984"; + }; + }; + "merge-descriptors-0.0.2" = { + name = "merge-descriptors"; + packageName = "merge-descriptors"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-0.0.2.tgz"; + sha1 = "c36a52a781437513c57275f39dd9d317514ac8c7"; + }; + }; "methods-1.1.0" = { name = "methods"; packageName = "methods"; @@ -148,6 +391,132 @@ let sha1 = "5dca4ee12df52ff3b056145986a8f01cbc86436f"; }; }; + "mime-1.2.11" = { + name = "mime"; + packageName = "mime"; + version = "1.2.11"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; + sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; + }; + }; + "mime-types-1.0.2" = { + name = "mime-types"; + packageName = "mime-types"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"; + sha1 = "995ae1392ab8affcbfcb2641dd054e943c0d5dce"; + }; + }; + "minimatch-3.0.4" = { + name = "minimatch"; + packageName = "minimatch"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; + sha512 = "1879a3j85h92ypvb7lpv1dqpcxl49rqnbgs5la18zmj1yqhwl60c2m74254wbr5pp3znckqpkg9dvjyrz6hfz8b9vag5a3j910db4f8"; + }; + }; + "minimist-0.0.8" = { + name = "minimist"; + packageName = "minimist"; + version = "0.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; + sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; + }; + }; + "mkdirp-0.5.1" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; + sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; + }; + }; + "ms-0.6.2" = { + name = "ms"; + packageName = "ms"; + version = "0.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"; + sha1 = "d89c2124c6fdc1353d65a8b77bf1aac4b193708c"; + }; + }; + "nan-1.0.0" = { + name = "nan"; + packageName = "nan"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nan/-/nan-1.0.0.tgz"; + sha1 = "ae24f8850818d662fcab5acf7f3b95bfaa2ccf38"; + }; + }; + "natives-1.1.1" = { + name = "natives"; + packageName = "natives"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/natives/-/natives-1.1.1.tgz"; + sha512 = "08a9lf00d2pkqmdi6ipp00pjin0gwl6fh283cjdjbayaz834lppwrw19kn4s642kwa46bfcway3033j6rbqd96iy86qrzrfgz35mr7i"; + }; + }; + "negotiator-0.4.7" = { + name = "negotiator"; + packageName = "negotiator"; + version = "0.4.7"; + src = fetchurl { + url = "https://registry.npmjs.org/negotiator/-/negotiator-0.4.7.tgz"; + sha1 = "a4160f7177ec806738631d0d3052325da42abdc8"; + }; + }; + "node-uuid-1.4.8" = { + name = "node-uuid"; + packageName = "node-uuid"; + version = "1.4.8"; + src = fetchurl { + url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz"; + sha1 = "b040eb0923968afabf8d32fb1f17f1167fdab907"; + }; + }; + "oauth-sign-0.3.0" = { + name = "oauth-sign"; + packageName = "oauth-sign"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz"; + sha1 = "cb540f93bb2b22a7d5941691a288d60e8ea9386e"; + }; + }; + "on-finished-2.1.0" = { + name = "on-finished"; + packageName = "on-finished"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/on-finished/-/on-finished-2.1.0.tgz"; + sha1 = "0c539f09291e8ffadde0c8a25850fb2cedc7022d"; + }; + }; + "once-1.4.0" = { + name = "once"; + packageName = "once"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; + sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + }; + }; + "options-0.0.6" = { + name = "options"; + packageName = "options"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/options/-/options-0.0.6.tgz"; + sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f"; + }; + }; "parseurl-1.3.2" = { name = "parseurl"; packageName = "parseurl"; @@ -157,6 +526,15 @@ let sha1 = "fc289d4ed8993119460c156253262cdc8de65bf3"; }; }; + "path-is-absolute-1.0.1" = { + name = "path-is-absolute"; + packageName = "path-is-absolute"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; + sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + }; + }; "path-to-regexp-0.1.3" = { name = "path-to-regexp"; packageName = "path-to-regexp"; @@ -175,6 +553,33 @@ let sha1 = "c7c566d5eb4e3fad67eeb9c77c5558ccc39b88a8"; }; }; + "punycode-1.4.1" = { + name = "punycode"; + packageName = "punycode"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"; + sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; + }; + }; + "qs-0.6.6" = { + name = "qs"; + packageName = "qs"; + version = "0.6.6"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-0.6.6.tgz"; + sha1 = "6e015098ff51968b8a3c819001d5f2c89bc4b107"; + }; + }; + "qs-2.2.2" = { + name = "qs"; + packageName = "qs"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-2.2.2.tgz"; + sha1 = "dfe783f1854b1ac2b3ade92775ad03e27e03218c"; + }; + }; "range-parser-1.0.0" = { name = "range-parser"; packageName = "range-parser"; @@ -184,6 +589,24 @@ let sha1 = "a4b264cfe0be5ce36abe3765ac9c2a248746dbc0"; }; }; + "raw-body-1.3.0" = { + name = "raw-body"; + packageName = "raw-body"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/raw-body/-/raw-body-1.3.0.tgz"; + sha1 = "978230a156a5548f42eef14de22d0f4f610083d1"; + }; + }; + "rimraf-2.6.2" = { + name = "rimraf"; + packageName = "rimraf"; + version = "2.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz"; + sha512 = "3kmrqh8xli7rzfm8wc6j9lp0c6vml172iv3z088an9xlwl1xvkvh3fn92za66ms4c9yww80qa5kan31k1z1ypqvkchmh1mznb09xdwn"; + }; + }; "send-0.8.5" = { name = "send"; packageName = "send"; @@ -202,294 +625,6 @@ let sha1 = "819fb37ae46bd02dd520b77fcf7fd8f5112f9782"; }; }; - "vary-0.1.0" = { - name = "vary"; - packageName = "vary"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vary/-/vary-0.1.0.tgz"; - sha1 = "df0945899e93c0cc5bd18cc8321d9d21e74f6176"; - }; - }; - "cookie-0.1.2" = { - name = "cookie"; - packageName = "cookie"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/cookie/-/cookie-0.1.2.tgz"; - sha1 = "72fec3d24e48a3432073d90c12642005061004b1"; - }; - }; - "fresh-0.2.2" = { - name = "fresh"; - packageName = "fresh"; - version = "0.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/fresh/-/fresh-0.2.2.tgz"; - sha1 = "9731dcf5678c7faeb44fb903c4f72df55187fa77"; - }; - }; - "cookie-signature-1.0.4" = { - name = "cookie-signature"; - packageName = "cookie-signature"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.4.tgz"; - sha1 = "0edd22286e3a111b9a2a70db363e925e867f6aca"; - }; - }; - "merge-descriptors-0.0.2" = { - name = "merge-descriptors"; - packageName = "merge-descriptors"; - version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-0.0.2.tgz"; - sha1 = "c36a52a781437513c57275f39dd9d317514ac8c7"; - }; - }; - "utils-merge-1.0.0" = { - name = "utils-merge"; - packageName = "utils-merge"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"; - sha1 = "0294fb922bb9375153541c4f7096231f287c8af8"; - }; - }; - "negotiator-0.4.7" = { - name = "negotiator"; - packageName = "negotiator"; - version = "0.4.7"; - src = fetchurl { - url = "https://registry.npmjs.org/negotiator/-/negotiator-0.4.7.tgz"; - sha1 = "a4160f7177ec806738631d0d3052325da42abdc8"; - }; - }; - "ms-0.6.2" = { - name = "ms"; - packageName = "ms"; - version = "0.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"; - sha1 = "d89c2124c6fdc1353d65a8b77bf1aac4b193708c"; - }; - }; - "ipaddr.js-0.1.2" = { - name = "ipaddr.js"; - packageName = "ipaddr.js"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-0.1.2.tgz"; - sha1 = "6a1fd3d854f5002965c34d7bbcd9b4a8d4b0467e"; - }; - }; - "destroy-1.0.3" = { - name = "destroy"; - packageName = "destroy"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz"; - sha1 = "b433b4724e71fd8551d9885174851c5fc377e2c9"; - }; - }; - "mime-1.2.11" = { - name = "mime"; - packageName = "mime"; - version = "1.2.11"; - src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; - sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; - }; - }; - "qs-0.6.6" = { - name = "qs"; - packageName = "qs"; - version = "0.6.6"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-0.6.6.tgz"; - sha1 = "6e015098ff51968b8a3c819001d5f2c89bc4b107"; - }; - }; - "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"; - }; - }; - "forever-agent-0.5.2" = { - name = "forever-agent"; - packageName = "forever-agent"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"; - sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130"; - }; - }; - "node-uuid-1.4.8" = { - name = "node-uuid"; - packageName = "node-uuid"; - version = "1.4.8"; - src = fetchurl { - url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz"; - sha1 = "b040eb0923968afabf8d32fb1f17f1167fdab907"; - }; - }; - "tough-cookie-2.3.3" = { - name = "tough-cookie"; - packageName = "tough-cookie"; - version = "2.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz"; - sha1 = "0b618a5565b6dea90bf3425d04d55edc475a7561"; - }; - }; - "form-data-0.1.4" = { - name = "form-data"; - packageName = "form-data"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz"; - sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12"; - }; - }; - "tunnel-agent-0.3.0" = { - name = "tunnel-agent"; - packageName = "tunnel-agent"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.3.0.tgz"; - sha1 = "ad681b68f5321ad2827c4cfb1b7d5df2cfe942ee"; - }; - }; - "http-signature-0.10.1" = { - name = "http-signature"; - packageName = "http-signature"; - version = "0.10.1"; - src = fetchurl { - url = "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz"; - sha1 = "4fbdac132559aa8323121e540779c0a012b27e66"; - }; - }; - "oauth-sign-0.3.0" = { - name = "oauth-sign"; - packageName = "oauth-sign"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz"; - sha1 = "cb540f93bb2b22a7d5941691a288d60e8ea9386e"; - }; - }; - "hawk-1.0.0" = { - name = "hawk"; - packageName = "hawk"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz"; - sha1 = "b90bb169807285411da7ffcb8dd2598502d3b52d"; - }; - }; - "aws-sign2-0.5.0" = { - name = "aws-sign2"; - packageName = "aws-sign2"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"; - sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63"; - }; - }; - "punycode-1.4.1" = { - name = "punycode"; - packageName = "punycode"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"; - sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; - }; - }; - "combined-stream-0.0.7" = { - name = "combined-stream"; - packageName = "combined-stream"; - version = "0.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz"; - sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f"; - }; - }; - "async-0.9.2" = { - name = "async"; - packageName = "async"; - version = "0.9.2"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-0.9.2.tgz"; - sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d"; - }; - }; - "delayed-stream-0.0.5" = { - name = "delayed-stream"; - packageName = "delayed-stream"; - version = "0.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"; - sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f"; - }; - }; - "assert-plus-0.1.5" = { - name = "assert-plus"; - packageName = "assert-plus"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"; - sha1 = "ee74009413002d84cec7219c6ac811812e723160"; - }; - }; - "asn1-0.1.11" = { - name = "asn1"; - packageName = "asn1"; - version = "0.1.11"; - src = fetchurl { - url = "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"; - sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7"; - }; - }; - "ctype-0.5.3" = { - name = "ctype"; - packageName = "ctype"; - version = "0.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"; - sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f"; - }; - }; - "hoek-0.9.1" = { - name = "hoek"; - packageName = "hoek"; - version = "0.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"; - sha1 = "3d322462badf07716ea7eb85baf88079cddce505"; - }; - }; - "boom-0.4.2" = { - name = "boom"; - packageName = "boom"; - version = "0.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"; - sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b"; - }; - }; - "cryptiles-0.2.2" = { - name = "cryptiles"; - packageName = "cryptiles"; - version = "0.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"; - sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c"; - }; - }; "sntp-0.2.4" = { name = "sntp"; packageName = "sntp"; @@ -499,186 +634,6 @@ let sha1 = "fb885f18b0f3aad189f824862536bceeec750900"; }; }; - "block-stream-0.0.9" = { - name = "block-stream"; - packageName = "block-stream"; - version = "0.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz"; - sha1 = "13ebfe778a03205cfe03751481ebb4b3300c126a"; - }; - }; - "fstream-0.1.31" = { - name = "fstream"; - packageName = "fstream"; - version = "0.1.31"; - src = fetchurl { - url = "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz"; - sha1 = "7337f058fbbbbefa8c9f561a28cab0849202c988"; - }; - }; - "inherits-2.0.3" = { - name = "inherits"; - packageName = "inherits"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; - sha1 = "633c2c83e3da42a502f52466022480f4208261de"; - }; - }; - "graceful-fs-3.0.11" = { - name = "graceful-fs"; - packageName = "graceful-fs"; - version = "3.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.11.tgz"; - sha1 = "7613c778a1afea62f25c630a086d7f3acbbdd818"; - }; - }; - "mkdirp-0.5.1" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "0.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; - sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; - }; - }; - "rimraf-2.6.2" = { - name = "rimraf"; - packageName = "rimraf"; - version = "2.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz"; - sha512 = "3kmrqh8xli7rzfm8wc6j9lp0c6vml172iv3z088an9xlwl1xvkvh3fn92za66ms4c9yww80qa5kan31k1z1ypqvkchmh1mznb09xdwn"; - }; - }; - "natives-1.1.0" = { - name = "natives"; - packageName = "natives"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/natives/-/natives-1.1.0.tgz"; - sha1 = "e9ff841418a6b2ec7a495e939984f78f163e6e31"; - }; - }; - "minimist-0.0.8" = { - name = "minimist"; - packageName = "minimist"; - version = "0.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; - sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; - }; - }; - "glob-7.1.2" = { - name = "glob"; - packageName = "glob"; - version = "7.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz"; - sha512 = "08vjxzixc9dwc1hn5pd60yyij98krk2pr758aiga97r02ncvaqx1hidi95wk470k1v84gg4alls9bm52m77174z128bgf13b61x951h"; - }; - }; - "fs.realpath-1.0.0" = { - name = "fs.realpath"; - packageName = "fs.realpath"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; - sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; - }; - }; - "inflight-1.0.6" = { - name = "inflight"; - packageName = "inflight"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; - sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; - }; - }; - "minimatch-3.0.4" = { - name = "minimatch"; - packageName = "minimatch"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; - sha512 = "1879a3j85h92ypvb7lpv1dqpcxl49rqnbgs5la18zmj1yqhwl60c2m74254wbr5pp3znckqpkg9dvjyrz6hfz8b9vag5a3j910db4f8"; - }; - }; - "once-1.4.0" = { - name = "once"; - packageName = "once"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; - sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; - }; - }; - "path-is-absolute-1.0.1" = { - name = "path-is-absolute"; - packageName = "path-is-absolute"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; - sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; - }; - }; - "wrappy-1.0.2" = { - name = "wrappy"; - packageName = "wrappy"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; - sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; - }; - }; - "brace-expansion-1.1.8" = { - name = "brace-expansion"; - packageName = "brace-expansion"; - version = "1.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz"; - sha1 = "c07b211c7c952ec1f8efd51a77ef0d1d3990a292"; - }; - }; - "balanced-match-1.0.0" = { - name = "balanced-match"; - packageName = "balanced-match"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"; - sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; - }; - }; - "concat-map-0.0.1" = { - name = "concat-map"; - packageName = "concat-map"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; - sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; - }; - }; - "commander-2.1.0" = { - name = "commander"; - packageName = "commander"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.1.0.tgz"; - sha1 = "d121bbae860d9992a3d517ba96f56588e47c6781"; - }; - }; - "nan-1.0.0" = { - name = "nan"; - packageName = "nan"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-1.0.0.tgz"; - sha1 = "ae24f8850818d662fcab5acf7f3b95bfaa2ccf38"; - }; - }; "tinycolor-0.0.1" = { name = "tinycolor"; packageName = "tinycolor"; @@ -688,13 +643,58 @@ let sha1 = "320b5a52d83abb5978d81a3e887d4aefb15a6164"; }; }; - "options-0.0.6" = { - name = "options"; - packageName = "options"; - version = "0.0.6"; + "tough-cookie-2.3.4" = { + name = "tough-cookie"; + packageName = "tough-cookie"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/options/-/options-0.0.6.tgz"; - sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f"; + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz"; + sha512 = "0ncm6j3cjq1f26mzjf04k9bkw1b08w53s4qa3a11c1bdj4pgnqv1422c1xs5jyy6y1psppjx52fhagq5zkjkgrcpdkxcdiry96r77jd"; + }; + }; + "tunnel-agent-0.3.0" = { + name = "tunnel-agent"; + packageName = "tunnel-agent"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.3.0.tgz"; + sha1 = "ad681b68f5321ad2827c4cfb1b7d5df2cfe942ee"; + }; + }; + "type-is-1.3.2" = { + name = "type-is"; + packageName = "type-is"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/type-is/-/type-is-1.3.2.tgz"; + sha1 = "4f2a5dc58775ca1630250afc7186f8b36309d1bb"; + }; + }; + "utils-merge-1.0.0" = { + name = "utils-merge"; + packageName = "utils-merge"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"; + sha1 = "0294fb922bb9375153541c4f7096231f287c8af8"; + }; + }; + "vary-0.1.0" = { + name = "vary"; + packageName = "vary"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vary/-/vary-0.1.0.tgz"; + sha1 = "df0945899e93c0cc5bd18cc8321d9d21e74f6176"; + }; + }; + "wrappy-1.0.2" = { + name = "wrappy"; + packageName = "wrappy"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; + sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; }; }; }; @@ -711,14 +711,14 @@ in dependencies = [ sources."bytes-1.0.0" sources."depd-0.4.4" + sources."ee-first-1.0.5" sources."iconv-lite-0.4.4" sources."media-typer-0.2.0" + sources."mime-types-1.0.2" sources."on-finished-2.1.0" sources."qs-2.2.2" sources."raw-body-1.3.0" sources."type-is-1.3.2" - sources."ee-first-1.0.5" - sources."mime-types-1.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -727,6 +727,7 @@ in license = "MIT"; }; production = true; + bypassCache = false; }; "express-~4.8.3" = nodeEnv.buildNodePackage { name = "express"; @@ -739,12 +740,24 @@ in dependencies = [ sources."accepts-1.0.7" sources."buffer-crc32-0.2.3" + sources."cookie-0.1.2" + sources."cookie-signature-1.0.4" sources."debug-1.0.4" sources."depd-0.4.4" + sources."destroy-1.0.3" + sources."ee-first-1.0.5" sources."escape-html-1.0.1" sources."finalhandler-0.1.0" + sources."fresh-0.2.2" + sources."ipaddr.js-0.1.2" sources."media-typer-0.2.0" + sources."merge-descriptors-0.0.2" sources."methods-1.1.0" + sources."mime-1.2.11" + sources."mime-types-1.0.2" + sources."ms-0.6.2" + sources."negotiator-0.4.7" + sources."on-finished-2.1.0" sources."parseurl-1.3.2" sources."path-to-regexp-0.1.3" sources."proxy-addr-1.0.1" @@ -753,20 +766,8 @@ in sources."send-0.8.5" sources."serve-static-1.5.4" sources."type-is-1.3.2" - sources."vary-0.1.0" - sources."cookie-0.1.2" - sources."fresh-0.2.2" - sources."cookie-signature-1.0.4" - sources."merge-descriptors-0.0.2" sources."utils-merge-1.0.0" - sources."mime-types-1.0.2" - sources."negotiator-0.4.7" - sources."ms-0.6.2" - sources."ipaddr.js-0.1.2" - sources."destroy-1.0.3" - sources."mime-1.2.11" - sources."on-finished-2.1.0" - sources."ee-first-1.0.5" + sources."vary-0.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -775,6 +776,7 @@ in license = "MIT"; }; production = true; + bypassCache = false; }; "request-~2.34.0" = nodeEnv.buildNodePackage { name = "request"; @@ -785,29 +787,29 @@ in sha1 = "b5d8b9526add4a2d4629f4d417124573996445ae"; }; dependencies = [ - sources."qs-0.6.6" - sources."json-stringify-safe-5.0.1" - sources."forever-agent-0.5.2" - sources."node-uuid-1.4.8" - sources."mime-1.2.11" - sources."tough-cookie-2.3.3" - sources."form-data-0.1.4" - sources."tunnel-agent-0.3.0" - sources."http-signature-0.10.1" - sources."oauth-sign-0.3.0" - sources."hawk-1.0.0" - sources."aws-sign2-0.5.0" - sources."punycode-1.4.1" - sources."combined-stream-0.0.7" - sources."async-0.9.2" - sources."delayed-stream-0.0.5" - sources."assert-plus-0.1.5" sources."asn1-0.1.11" - sources."ctype-0.5.3" - sources."hoek-0.9.1" + sources."assert-plus-0.1.5" + sources."async-0.9.2" + sources."aws-sign2-0.5.0" sources."boom-0.4.2" + sources."combined-stream-0.0.7" sources."cryptiles-0.2.2" + sources."ctype-0.5.3" + sources."delayed-stream-0.0.5" + sources."forever-agent-0.5.2" + sources."form-data-0.1.4" + sources."hawk-1.0.0" + sources."hoek-0.9.1" + sources."http-signature-0.10.1" + sources."json-stringify-safe-5.0.1" + sources."mime-1.2.11" + sources."node-uuid-1.4.8" + sources."oauth-sign-0.3.0" + sources."punycode-1.4.1" + sources."qs-0.6.6" sources."sntp-0.2.4" + sources."tough-cookie-2.3.4" + sources."tunnel-agent-0.3.0" ]; buildInputs = globalBuildInputs; meta = { @@ -816,6 +818,7 @@ in license = "Apache, Version 2.0"; }; production = true; + bypassCache = false; }; "tar-~0.1.19" = nodeEnv.buildNodePackage { name = "tar"; @@ -826,24 +829,24 @@ in sha1 = "42940bae5b5f22c74483699126f9f3f27449cb13"; }; dependencies = [ + sources."balanced-match-1.0.0" sources."block-stream-0.0.9" - sources."fstream-0.1.31" - sources."inherits-2.0.3" - sources."graceful-fs-3.0.11" - sources."mkdirp-0.5.1" - sources."rimraf-2.6.2" - sources."natives-1.1.0" - sources."minimist-0.0.8" - sources."glob-7.1.2" + sources."brace-expansion-1.1.11" + sources."concat-map-0.0.1" sources."fs.realpath-1.0.0" + sources."fstream-0.1.31" + sources."glob-7.1.2" + sources."graceful-fs-3.0.11" sources."inflight-1.0.6" + sources."inherits-2.0.3" sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + sources."natives-1.1.1" sources."once-1.4.0" sources."path-is-absolute-1.0.1" + sources."rimraf-2.6.2" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.8" - sources."balanced-match-1.0.0" - sources."concat-map-0.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -852,6 +855,7 @@ in license = "BSD"; }; production = true; + bypassCache = false; }; "ws-~0.4.32" = nodeEnv.buildNodePackage { name = "ws"; @@ -864,8 +868,8 @@ in dependencies = [ sources."commander-2.1.0" sources."nan-1.0.0" - sources."tinycolor-0.0.1" sources."options-0.0.6" + sources."tinycolor-0.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -873,5 +877,6 @@ in homepage = https://github.com/einaros/ws; }; production = true; + bypassCache = false; }; } \ No newline at end of file diff --git a/pkgs/applications/editors/zed/node.nix b/pkgs/applications/editors/zed/node.nix index ff0bf1eb805..75bc6ec109c 100644 --- a/pkgs/applications/editors/zed/node.nix +++ b/pkgs/applications/editors/zed/node.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.3.0. Do not edit! +# This file has been generated by node2nix 1.5.3. Do not edit! {pkgs ? import { inherit system; @@ -8,6 +8,7 @@ let nodeEnv = import ../../../development/node-packages/node-env.nix { inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile; inherit nodejs; + libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; in import ./node-packages.nix { diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index 987b544c556..b236e55c8fc 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, flex, bison, pkgconfig, zlib, libtiff, libpng, fftw , cairo, readline, ffmpeg, makeWrapper, wxGTK30, netcdf, blas -, proj, gdal, geos, sqlite, postgresql, mysql, python2Packages +, proj, gdal, geos, sqlite, postgresql, mysql, python2Packages, libLAS }: stdenv.mkDerivation { @@ -12,9 +12,14 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite cairo - readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql mysql.connector-c blas ] + readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql mysql.connector-c blas + libLAS ] ++ (with python2Packages; [ python dateutil wxPython30 numpy ]); + # On Darwin the installer tries to symlink the help files into a system + # directory + patches = [] ++ stdenv.lib.optional stdenv.isDarwin [ ./no_symbolic_links.patch ]; + configureFlags = [ "--with-proj-share=${proj}/share/proj" "--without-opengl" @@ -29,6 +34,7 @@ stdenv.mkDerivation { "--with-mysql-includes=${mysql.connector-c}/include/mysql" "--with-mysql-libs=${mysql.connector-c}/lib/mysql" "--with-blas" + "--with-liblas=${libLAS}/bin/liblas-config" ]; /* Ensures that the python script run at build time are actually executable; diff --git a/pkgs/applications/gis/grass/no_symbolic_links.patch b/pkgs/applications/gis/grass/no_symbolic_links.patch new file mode 100644 index 00000000000..ef09b97b703 --- /dev/null +++ b/pkgs/applications/gis/grass/no_symbolic_links.patch @@ -0,0 +1,37 @@ +diff --git a/include/Make/Install.make b/include/Make/Install.make +index 0aba138..8ba74bc 100644 +--- a/include/Make/Install.make ++++ b/include/Make/Install.make +@@ -116,11 +116,6 @@ real-install: | $(INST_DIR) $(UNIX_BIN) + -$(INSTALL) config.status $(INST_DIR)/config.status + -$(CHMOD) -R a+rX $(INST_DIR) 2>/dev/null + +-ifneq ($(findstring darwin,$(ARCH)),) +- @# enable OSX Help Viewer +- @/bin/ln -sfh "$(INST_DIR)/docs/html" /Library/Documentation/Help/GRASS-$(GRASS_VERSION_MAJOR).$(GRASS_VERSION_MINOR) +-endif +- + $(INST_DIR) $(UNIX_BIN): + $(MAKE_DIR_CMD) $@ + +diff --git a/macosx/app/build_html_user_index.sh b/macosx/app/build_html_user_index.sh +index 04e63eb..c9d9c2c 100755 +--- a/macosx/app/build_html_user_index.sh ++++ b/macosx/app/build_html_user_index.sh +@@ -140,7 +140,6 @@ else + # echo "$BASENAME $SHORTDESC" >> $FULLINDEX + # make them local to user to simplify page links + echo "$BASENAME $SHORTDESC" >> $FULLINDEX +- ln -sf "$HTMLDIRG/$i" global_$i + done + done + fi +@@ -183,8 +182,3 @@ echo " + " > $i.html + done + +-# add Help Viewer links in user docs folder +- +-mkdir -p $HOME/Library/Documentation/Help/ +-ln -sfh ../../GRASS/$GRASS_MMVER/Modules/docs/html $HOME/Library/Documentation/Help/GRASS-$GRASS_MMVER-addon +-ln -sfh $GISBASE/docs/html $HOME/Library/Documentation/Help/GRASS-$GRASS_MMVER diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index c2a09a507cc..21ee4297599 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "qgis-2.18.16"; + name = "qgis-2.18.17"; buildInputs = [ gdal qt4 flex openssl bison proj geos xlibsWrapper sqlite gsl qwt qscintilla fcgi libspatialindex libspatialite postgresql qjson qca2 txt2tags ] ++ @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://qgis.org/downloads/${name}.tar.bz2"; - sha256 = "0d880m013kzi4qiyr27yjx6hzpb652slp66gyqgw9ziw03wy12c9"; + sha256 = "1nxwl5lwibbiz9v3qaw3px7iyxg113zr4j8d99yj07mhk2ap082y"; }; cmakeFlags = stdenv.lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}"; diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index be3a369c28b..4bbc34bb7bb 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ImageMagick"; - repo = "ImageMagick"; + repo = "ImageMagick6"; rev = cfg.version; inherit (cfg) sha256; }; diff --git a/pkgs/applications/graphics/ao/default.nix b/pkgs/applications/graphics/ao/default.nix index d415df1bae8..f51777bdbf7 100644 --- a/pkgs/applications/graphics/ao/default.nix +++ b/pkgs/applications/graphics/ao/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus ; # Some parts can be extracted and used under LGPL2+ maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; + broken = true; # 2018-04-10 }; } diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix index adb1ec29237..eaaabe8fd39 100644 --- a/pkgs/applications/graphics/meshlab/default.nix +++ b/pkgs/applications/graphics/meshlab/default.nix @@ -61,5 +61,6 @@ in stdenv.mkDerivation { license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; + broken = true; # 2018-04-11 }; } diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix index 8c3a8bc894b..675c4e6a49e 100644 --- a/pkgs/applications/graphics/nomacs/default.nix +++ b/pkgs/applications/graphics/nomacs/default.nix @@ -18,12 +18,12 @@ }: stdenv.mkDerivation rec { - version = "3.6.1"; + version = "3.8.1"; src = fetchFromGitHub { owner = "nomacs"; repo = "nomacs"; rev = version; - sha256 = "0yli05hhmd57v3mynq78nmr15rbpm0vadv273pavmcnayv86yl44"; + sha256 = "1irms980d7acdqrfn8isw55vgc4d9n26ff86887vk7xfvxs0ayla"; }; name = "nomacs-${version}"; @@ -34,8 +34,6 @@ stdenv.mkDerivation rec { sourceRoot=$(echo */ImageLounge) ''; - patches = [./fix-appdata-install.patch]; - nativeBuildInputs = [cmake pkgconfig wrapGAppsHook]; diff --git a/pkgs/applications/graphics/nomacs/fix-appdata-install.patch b/pkgs/applications/graphics/nomacs/fix-appdata-install.patch deleted file mode 100644 index cdeed56f496..00000000000 --- a/pkgs/applications/graphics/nomacs/fix-appdata-install.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/cmake/UnixBuildTarget.cmake b/cmake/UnixBuildTarget.cmake -index 3521056a..34f99ed9 100644 ---- a/cmake/UnixBuildTarget.cmake -+++ b/cmake/UnixBuildTarget.cmake -@@ -80,7 +80,7 @@ install(FILES ${NOMACS_QM} DESTINATION share/nomacs/translations) - # manpage - install(FILES Readme/nomacs.1 DESTINATION share/man/man1) - # appdata --install(FILES nomacs.appdata.xml DESTINATION /usr/share/appdata/) -+install(FILES nomacs.appdata.xml DESTINATION share/appdata/) - - # "make dist" target - string(TOLOWER ${PROJECT_NAME} CPACK_PACKAGE_NAME) diff --git a/pkgs/applications/graphics/qscreenshot/default.nix b/pkgs/applications/graphics/qscreenshot/default.nix index c4f4f6472ed..fafc76a76ff 100644 --- a/pkgs/applications/graphics/qscreenshot/default.nix +++ b/pkgs/applications/graphics/qscreenshot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dos2unix, which, qt }: +{ stdenv, fetchurl, dos2unix, which, qt, Carbon }: stdenv.mkDerivation rec { name = "qscreenshot-1.0"; @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1spj5fg2l8p5bk81xsv6hqn1kcrdiy54w19jsfb7g5i94vcb1pcx"; }; - buildInputs = [ dos2unix which qt ]; + buildInputs = [ dos2unix which qt ] + ++ stdenv.lib.optional stdenv.isDarwin Carbon; # Remove carriage returns that cause /bin/sh to abort preConfigure = '' diff --git a/pkgs/applications/graphics/rapcad/default.nix b/pkgs/applications/graphics/rapcad/default.nix index c8327b9bca1..b300c0071fa 100644 --- a/pkgs/applications/graphics/rapcad/default.nix +++ b/pkgs/applications/graphics/rapcad/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.raskin ]; platforms = platforms.linux; description = ''Constructive solid geometry package''; + broken = true; # 2018-04-11 }; } diff --git a/pkgs/applications/misc/apvlv/default.nix b/pkgs/applications/misc/apvlv/default.nix index f1d84a91972..eb35eb9cf73 100644 --- a/pkgs/applications/misc/apvlv/default.nix +++ b/pkgs/applications/misc/apvlv/default.nix @@ -36,6 +36,11 @@ stdenv.mkDerivation rec { url = "https://github.com/naihe2010/apvlv/commit/4c7a583e8431964def482e5471f02e6de8e62a7b.patch"; sha256 = "1dszm120lwm90hcg5zmd4vr6pjyaxc84qmb7k0fr59mmb3qif62j"; }) + # fix build with gcc7 + (fetchpatch { + url = "https://github.com/naihe2010/apvlv/commit/a3a895772a27d76dab0c37643f0f4c73f9970e62.patch"; + sha256 = "1fpc7wr1ajilvwi5gjsy5g9jcx4bl03gp5dmajg90ljqbhwz2bfi"; + }) ]; installPhase = '' @@ -58,7 +63,7 @@ stdenv.mkDerivation rec { ''; license = licenses.lgpl2; - platforms = platforms.unix; + platforms = platforms.linux; maintainers = [ maintainers.ardumont ]; }; diff --git a/pkgs/applications/misc/bb/default.nix b/pkgs/applications/misc/bb/default.nix index 3d04b53dcde..0689843af61 100644 --- a/pkgs/applications/misc/bb/default.nix +++ b/pkgs/applications/misc/bb/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { description = "AA-lib demo"; license = licenses.gpl2; maintainers = [ maintainers.rnhmjoj ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/confclerk/default.nix b/pkgs/applications/misc/confclerk/default.nix index de18a211c45..7781f0df853 100644 --- a/pkgs/applications/misc/confclerk/default.nix +++ b/pkgs/applications/misc/confclerk/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation { homepage = http://www.toastfreeware.priv.at/confclerk; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ ehmry ]; - inherit (qt4.meta) platforms; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/cpp-ethereum/default.nix b/pkgs/applications/misc/cpp-ethereum/default.nix index 857254c3cb0..33b16e3242c 100644 --- a/pkgs/applications/misc/cpp-ethereum/default.nix +++ b/pkgs/applications/misc/cpp-ethereum/default.nix @@ -80,5 +80,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ artuuge ]; platforms = platforms.linux; + broken = true; # 2018-04-10 }; } diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index caf40ef5faf..002d8fc8f23 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "dbeaver-ce-${version}"; - version = "4.3.3"; + version = "5.0.3"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.jkiss.org/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "063h2za2m33b4k9s756lwicxwszzsqr2sqr2gi4ai05dqkgkw951"; + sha256 = "0pk40jzmd23cv690a8wslxbb4xp4msq2zwh7xm0hvs64ykm9a581"; }; installPhase = '' diff --git a/pkgs/applications/misc/dmenu/default.nix b/pkgs/applications/misc/dmenu/default.nix index 8ef4f3ae897..9727b27c3df 100644 --- a/pkgs/applications/misc/dmenu/default.nix +++ b/pkgs/applications/misc/dmenu/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "dmenu-4.7"; src = fetchurl { - url = "http://dl.suckless.org/tools/${name}.tar.gz"; + url = "https://dl.suckless.org/tools/${name}.tar.gz"; sha256 = "1fgph549i0yw62x02jhfc8qmqk2rnzcnm46bxq6jig1cvkw3amm7"; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A generic, highly customizable, and efficient menu for the X Window System"; - homepage = http://tools.suckless.org/dmenu; + homepage = https://tools.suckless.org/dmenu; license = licenses.mit; maintainers = with maintainers; [ viric pSub ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 40fc10a5673..425203be01c 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -2,22 +2,13 @@ python3Packages.buildPythonApplication rec { name = "electrum-${version}"; - version = "3.0.6"; + version = "3.1.1"; src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "01dnqiazjl2avrmdiq68absjvcfv24446y759z2s9dwk8ywzjkrg"; + sha256 = "0ds3p7cjbavsbizm04rhzl8s59czynynpx1jvg367mwbi6gng59i"; }; - patches = [ - # Trezor compat patch should be included in electrum > 3.0.6 - (fetchpatch { - name = "trezor-compat.patch"; - url = "https://patch-diff.githubusercontent.com/raw/spesmilo/electrum/pull/3621.patch"; - sha256 = "1bk1r2ikhnvw1fpfh71y4za2lnskcbkv50k8ynjxi5slx2wrfpl0"; - }) - ]; - propagatedBuildInputs = with python3Packages; [ dnspython ecdsa diff --git a/pkgs/applications/misc/gkrellm/default.nix b/pkgs/applications/misc/gkrellm/default.nix index b9cbf8064a0..b4fac899f66 100644 --- a/pkgs/applications/misc/gkrellm/default.nix +++ b/pkgs/applications/misc/gkrellm/default.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation rec { homepage = http://gkrellm.srcbox.net; license = licenses.gpl3Plus; maintainers = [ ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/gosmore/default.nix b/pkgs/applications/misc/gosmore/default.nix index 8936d3f222f..464e0ba5334 100644 --- a/pkgs/applications/misc/gosmore/default.nix +++ b/pkgs/applications/misc/gosmore/default.nix @@ -22,6 +22,9 @@ stdenv.mkDerivation { prePatch = '' sed -e '/curl.types.h/d' -i *.{c,h,hpp,cpp} ''; + + patches = [ ./pointer_int_comparison.patch ]; + patchFlags = [ "-p1" "--binary" ]; # patch has dos style eol meta = with stdenv.lib; { description = "Open Street Map viewer"; diff --git a/pkgs/applications/misc/gosmore/pointer_int_comparison.patch b/pkgs/applications/misc/gosmore/pointer_int_comparison.patch new file mode 100644 index 00000000000..4a715b6d859 --- /dev/null +++ b/pkgs/applications/misc/gosmore/pointer_int_comparison.patch @@ -0,0 +1,11 @@ +--- blah_/jni/gosmore.cpp 1970-01-01 01:00:01.000000000 +0100 ++++ /dev/stdin 2018-03-18 00:21:08.474217132 +0100 +@@ -1273,7 +1273,7 @@ + if (deg[i] < -180 || deg[i] > 180) break; + if (i == 0 && (strncasecmp (t, "lat", 3) == 0 || + strncasecmp (t, "lon", 3) == 0)) { // lat=-25.7 lon=28.2 +- for (t += 3; t != '\0' && !isalnum (*t); t++) {} ++ for (t += 3; *t != '\0' && !isalnum (*t); t++) {} + } + if (i == 1) { // Success ! + //printf ("%lf %lf %u\n", deg[lonFirst ? 1 : 0], deg[lonFirst ? 0 : 1], diff --git a/pkgs/applications/misc/gv/default.nix b/pkgs/applications/misc/gv/default.nix index 3fad634b18b..b13e7ae5232 100644 --- a/pkgs/applications/misc/gv/default.nix +++ b/pkgs/applications/misc/gv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, Xaw3d, ghostscriptX, perl }: +{ stdenv, fetchurl, Xaw3d, ghostscriptX, perl, pkgconfig, libiconv }: let name = "gv-3.7.4"; @@ -11,7 +11,18 @@ stdenv.mkDerivation { sha256 = "0q8s43z14vxm41pfa8s5h9kyyzk1fkwjhkiwbf2x70alm6rv6qi1"; }; - buildInputs = [ Xaw3d ghostscriptX perl ]; + configureFlags = stdenv.lib.optionals stdenv.isDarwin [ + "--enable-SIGCHLD-fallback" + ]; + + buildInputs = [ + Xaw3d + ghostscriptX + perl + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + pkgconfig + libiconv + ]; patchPhase = '' sed 's|\|${ghostscriptX}/bin/gs|g' -i "src/"*.in @@ -32,6 +43,6 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/misc/jgmenu/default.nix b/pkgs/applications/misc/jgmenu/default.nix index e87288d7128..ffb898b265c 100644 --- a/pkgs/applications/misc/jgmenu/default.nix +++ b/pkgs/applications/misc/jgmenu/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/johanmalm/jgmenu; description = "Small X11 menu intended to be used with openbox and tint2"; license = licenses.gpl2; - platforms = platforms.unix; + platforms = platforms.linux; maintainers = [ maintainers.romildo ]; }; } diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index b536dffb708..6c14c93c83d 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "josm-${version}"; - version = "13478"; + version = "13576"; src = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "1mc1zdcnlm14ky820cj61sid6aiq9k11kj6vzlqskvgqazc60xj4"; + sha256 = "0pw7srvds8zs53ibvj779vj505h2gfrn7xqx13hkbacdg441jkd4"; }; buildInputs = [ jre8 makeWrapper ]; diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index 4daa1938aba..0e1aecaab1d 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -14,6 +14,7 @@ , yubikey-personalization , libXi , qtx11extras +, qtmacextras , withKeePassBrowser ? true , withKeePassSSHAgent ? true @@ -25,17 +26,27 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "keepassxc-${version}"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "keepassxreboot"; repo = "keepassxc"; rev = "${version}"; - sha256 = "1zch1qbqgphhp2p2kvjlah8s337162m69yf4y00kcnfb3539ii5f"; + sha256 = "1xlg8zb22c2f1pi2has4f4qwggd0m2z254f0d6jrgz368x4g3p87"; }; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-old-style-cast"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang [ + "-Wno-old-style-cast" + "-Wno-error" + "-D__BIG_ENDIAN__=${if stdenv.isBigEndian then "1" else "0"}" + ]; + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace CMakeLists.txt \ + --replace "/usr/local/bin" "../bin" \ + --replace "/usr/local/share/man" "../share/man" + ''; + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-rpath ${libargon2}/lib"; patches = [ ./darwin.patch ]; cmakeFlags = [ @@ -72,7 +83,7 @@ stdenv.mkDerivation rec { qtx11extras yubikey-personalization zlib - ]; + ] ++ stdenv.lib.optional stdenv.isDarwin qtmacextras; postInstall = optionalString stdenv.isDarwin '' # Make it work without Qt in PATH. diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix index 76d23f1a8f0..19a45e7d17b 100644 --- a/pkgs/applications/misc/masterpdfeditor/default.nix +++ b/pkgs/applications/misc/masterpdfeditor/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, glibc, sane-backends, qtbase, qtsvg, libXext, libX11, libXdmcp, libXau, libxcb }: let - version = "4.3.61"; + version = "4.3.82"; in stdenv.mkDerivation { name = "masterpdfeditor-${version}"; src = fetchurl { url = "http://get.code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz"; - sha256 = "1g6mx8nch6ypf78h6xsb673wim19wn5ni5840armzg0pvi3sfknm"; + sha256 = "0bfqnpg2p5jxygcahqqljyb0gd2z28hj5n1j9g1x7px8f7wwiwl4"; }; libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index b0d8ba3bb08..1b510221d12 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -39,6 +39,48 @@ in stdenv.mkDerivation rec { url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=26527eef77b3e51c2258c8e40845bfbc015e405d;hp=ab98356f959c7a6e94b1ec10f78dd2c33ed3f3e7"; sha256 = "1brcc029s5zmd6ya0d9qk3mh9qwx5g6vhsf1j8h879092sya5627"; }) + (fetchpatch { + # Bugs 698804/698810/698811, 698819: Keep PDF object numbers below limit. + name = "CVE-2017-17858.patch"; + url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=55c3f68d638ac1263a386e0aaa004bb6e8bde731"; + sha256 = "1bf683d59i5009cv1hhmwmrp2rsb75cbf98qd44dk39cpvq8ydwv"; + }) + (fetchpatch { + # Bug 698825: Do not drop borrowed colorspaces. + name = "CVE-2018-1000051.patch"; + url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=321ba1de287016b0036bf4a56ce774ad11763384"; + sha256 = "0jbcc9j565q5y305pi888qzlp83zww6nhkqbsmkk91gim958zikm"; + }) + (fetchpatch { + # Bug 698908 preprecondition: Add portable pseudo-random number generator based on the lrand48 family. + name = "CVE-2018-6187.0.1.patch"; + url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=2d5b4683e912d6e6e1f1e2ca5aa0297beb3e6807"; + sha256 = "028bxinbjs5gg9myjr3vs366qxg9l2iyba2j3pxkxsh1851hj728"; + }) + (fetchpatch { + # Bug 698908 precondition: Fix "being able to search for redacted text" bug. + name = "CVE-2018-6187.0.2.patch"; + url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=25593f4f9df0c4a9b9adaa84aaa33fe2a89087f6"; + sha256 = "195y69c3f8yqxcsa0bxrmxbdc3fx1dzvz8v66i56064mjj0mx04s"; + }) + (fetchpatch { + # Bug 698908: Resize object use and renumbering lists after repair. + name = "CVE-2018-6187.1.patch"; + url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=3e30fbb7bf5efd88df431e366492356e7eb969ec"; + sha256 = "0wzbqj750h06q1wa6vxbpv5a5q9pfg0cxjdv88yggkrjb3vrkd9j"; + }) + (fetchpatch { + # Bug 698908: Plug PDF object leaks when decimating pages in pdfposter. + name = "CVE-2018-6187.2.patch"; + url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=a71e7c85a9f2313cde20d4479cd727a5f5518ed2"; + sha256 = "1pcjkq8lg6l2m0186rl79lilg79crgdvz9hrmm3w60gy2gxkgksc"; + }) + (fetchpatch { + # Bug 698916: Indirect object numbers must be in range. + name = "CVE-2018-6192.patch"; + url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=5e411a99604ff6be5db9e273ee84737204113299"; + sha256 = "134zc07fp0p1mwqa8xrkq3drg4crajzf1hjf4mdwmcy1jfj2pfhj"; + }) ] # Use shared libraries to decrease size diff --git a/pkgs/applications/misc/netsurf/libcss/default.nix b/pkgs/applications/misc/netsurf/libcss/default.nix index 02bb593ce71..e97452249bc 100644 --- a/pkgs/applications/misc/netsurf/libcss/default.nix +++ b/pkgs/applications/misc/netsurf/libcss/default.nix @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { "NSSHARED=${buildsystem}/share/netsurf-buildsystem" ]; + NIX_CFLAGS_COMPILE=[ "-Wno-error=implicit-fallthrough" ]; + meta = with stdenv.lib; { homepage = http://www.netsurf-browser.org/; description = "Cascading Style Sheets library for netsurf browser"; diff --git a/pkgs/applications/misc/nixnote2/default.nix b/pkgs/applications/misc/nixnote2/default.nix index 971da8ba048..4ac152c2669 100644 --- a/pkgs/applications/misc/nixnote2/default.nix +++ b/pkgs/applications/misc/nixnote2/default.nix @@ -24,8 +24,14 @@ mkDerivation rec { --replace '#include ' '#include ' done + substituteInPlace help/about.html --replace '__VERSION__' '${version}' + substituteInPlace nixnote.cpp --replace 'tidyProcess.start("tidy' 'tidyProcess.start("${html-tidy}/bin/tidy' ''; + + postInstal = '' + cp images/windowIcon.png $out/share/pixmaps/nixnote2.png + ''; meta = with stdenv.lib; { description = "An unofficial client of Evernote"; diff --git a/pkgs/applications/misc/oneko/default.nix b/pkgs/applications/misc/oneko/default.nix index 4655b059b33..58e80e7f726 100644 --- a/pkgs/applications/misc/oneko/default.nix +++ b/pkgs/applications/misc/oneko/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { homepage = "http://www.daidouji.com/oneko/"; license = licenses.publicDomain; maintainers = [ maintainers.xaverdh ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/overmind/default.nix b/pkgs/applications/misc/overmind/default.nix new file mode 100644 index 00000000000..46e00a97990 --- /dev/null +++ b/pkgs/applications/misc/overmind/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildGoPackage, fetchFromGitHub, tmux, makeWrapper }: + +buildGoPackage rec { + name = "overmind-${version}"; + version = "1.1.1"; + goPackagePath = "github.com/DarthSim/overmind"; + + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram "$bin/bin/overmind" --prefix PATH : "${stdenv.lib.makeBinPath [ tmux ]}" + ''; + + src = fetchFromGitHub { + owner = "DarthSim"; + repo = "overmind"; + rev = "v${version}"; + sha256 = "0gdsbm54ln07jv1kgg53fiavx18xxw4f21lfcdl74ijk6bx4jbzv"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/DarthSim/; + description = "Process manager for Procfile-based applications and tmux"; + license = with licenses; [ mit ]; + maintainers = [ maintainers.adisbladis ]; + }; +} diff --git a/pkgs/applications/misc/posterazor/default.nix b/pkgs/applications/misc/posterazor/default.nix index 1347840ee67..6cb00fb1525 100644 --- a/pkgs/applications/misc/posterazor/default.nix +++ b/pkgs/applications/misc/posterazor/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { homepage = http://posterazor.sourceforge.net/; description = "Cuts a raster image into pieces which can afterwards be printed out and assembled to a poster"; maintainers = [ stdenv.lib.maintainers.madjar ]; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/rofi/config.patch b/pkgs/applications/misc/rofi/config.patch new file mode 100644 index 00000000000..46982d51e00 --- /dev/null +++ b/pkgs/applications/misc/rofi/config.patch @@ -0,0 +1,54 @@ +diff --git a/script/rofi-theme-selector b/script/rofi-theme-selector +index 0646e4bc..f827dbfe 100755 +--- a/script/rofi-theme-selector ++++ b/script/rofi-theme-selector +@@ -42,34 +42,7 @@ function find_themes() + DIRS=${XDG_DATA_DIRS} + OLDIFS=${IFS} + IFS=: +- if [ -z "${XDG_DATA_DIRS}" ] +- then +- echo "XDG_DATA_DIRS needs to be set for this script to function correctly." +- echo -n "Using dirs from \$PATH: " +- DIRS= +- # Iterate over items in $PATH +- for p in ${PATH}; do +- # Remove trailing / if exists. +- x=${p%/} +- # remove both /bin and /sbin and /games from end +- x=${x%/bin} +- x=${x%/sbin} +- x=${x%/games} +- # Add /share +- x=${x}/share +- # Check if entry exists Prepend : so :${x}: matches nicely +- case ":${DIRS}" in +- *$x:*);; +- *) DIRS+="$x:";; +- esac +- done +- # Remove trailing : +- DIRS=${DIRS%:} +- echo "${DIRS}" +- fi +- # Add user dir. +- DIRS+=":${HOME}/.local/share/" +- DIRS+=":${HOME}/.config/" ++ DIRS+=":%ROFIOUT%/" + for p in ${DIRS}; do + p=${p%/} + TD=${p}/rofi/themes +@@ -164,7 +137,12 @@ Current theme: ${CUR}""" + ### + function set_theme() + { +- CDIR="${HOME}/.config/rofi/" ++ if [ -d "${XDG_CONFIG_HOME}" ]; then ++ CDIR="${XDG_CONFIG_HOME}/rofi/" ++ else ++ CDIR="${HOME}/.config/rofi/" ++ fi ++ + if [ ! -d "${CDIR}" ] + then + mkdir -p ${CDIR} diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix index bdf14c03bcc..734adf3eb58 100644 --- a/pkgs/applications/misc/rofi/default.nix +++ b/pkgs/applications/misc/rofi/default.nix @@ -4,25 +4,33 @@ }: stdenv.mkDerivation rec { - version = "1.4.2"; + version = "1.5.0"; name = "rofi-${version}"; src = fetchurl { url = "https://github.com/DaveDavenport/rofi/releases/download/${version}/${name}.tar.gz"; - sha256 = "0ys7grazqz5hw3nx2393df54ykcd5gw0zn66kik5fvzijpg3qfcx"; + sha256 = "0h068wqf0n6gmil2g3lh263pm7spkp4k5rxbnfp52n8izqgyf7al"; }; + # config.patch may be removed in the future - https://github.com/DaveDavenport/rofi/pull/781 + patches = [ ./config.patch ]; + preConfigure = '' patchShebangs "script" # root not present in build /etc/passwd sed -i 's/~root/~nobody/g' test/helper-expand.c ''; + postFixup = '' + substituteInPlace "$out"/bin/rofi-theme-selector \ + --replace "%ROFIOUT%" "$out/share" + ''; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ libxkbcommon pango cairo git bison flex librsvg check libstartup_notification libxcb xcbutil xcbutilwm xcbutilxrm which ]; - doCheck = true; + doCheck = false; meta = with stdenv.lib; { description = "Window switcher, run dialog and dmenu replacement"; diff --git a/pkgs/applications/misc/rofi/nix.patch b/pkgs/applications/misc/rofi/nix.patch new file mode 100644 index 00000000000..bba57ca563e --- /dev/null +++ b/pkgs/applications/misc/rofi/nix.patch @@ -0,0 +1,41 @@ +diff --git a/script/rofi-theme-selector b/script/rofi-theme-selector +index 0646e4bc..f82e5ad9 100755 +--- a/script/rofi-theme-selector ++++ b/script/rofi-theme-selector +@@ -42,34 +42,8 @@ function find_themes() + DIRS=${XDG_DATA_DIRS} + OLDIFS=${IFS} + IFS=: +- if [ -z "${XDG_DATA_DIRS}" ] +- then +- echo "XDG_DATA_DIRS needs to be set for this script to function correctly." +- echo -n "Using dirs from \$PATH: " +- DIRS= +- # Iterate over items in $PATH +- for p in ${PATH}; do +- # Remove trailing / if exists. +- x=${p%/} +- # remove both /bin and /sbin and /games from end +- x=${x%/bin} +- x=${x%/sbin} +- x=${x%/games} +- # Add /share +- x=${x}/share +- # Check if entry exists Prepend : so :${x}: matches nicely +- case ":${DIRS}" in +- *$x:*);; +- *) DIRS+="$x:";; +- esac +- done +- # Remove trailing : +- DIRS=${DIRS%:} +- echo "${DIRS}" +- fi +- # Add user dir. +- DIRS+=":${HOME}/.local/share/" +- DIRS+=":${HOME}/.config/" ++ ++ DIRS+=":%ROFIOUT%/" + for p in ${DIRS}; do + p=${p%/} + TD=${p}/rofi/themes diff --git a/pkgs/applications/misc/sent/default.nix b/pkgs/applications/misc/sent/default.nix index 24e76500a6a..9bbae33b3e4 100644 --- a/pkgs/applications/misc/sent/default.nix +++ b/pkgs/applications/misc/sent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, farbfeld, libX11, libXft +{ stdenv, fetchurl, farbfeld, libX11, libXft, makeWrapper , patches ? [] }: stdenv.mkDerivation rec { @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0cxysz5lp25mgww73jl0mgip68x7iyvialyzdbriyaff269xxwvv"; }; - buildInputs = [ farbfeld libX11 libXft ]; + buildInputs = [ libX11 libXft ]; + nativeBuildInputs = [ makeWrapper ]; # unpacking doesn't create a directory sourceRoot = "."; @@ -17,6 +18,9 @@ stdenv.mkDerivation rec { inherit patches; installFlags = [ "PREFIX=$(out)" ]; + postInstall = '' + wrapProgram "$out/bin/sent" --prefix PATH : "${farbfeld}/bin" + ''; meta = with stdenv.lib; { description = "A simple plaintext presentation tool"; diff --git a/pkgs/applications/misc/slade/default.nix b/pkgs/applications/misc/slade/default.nix index 712b5a7e750..fc6be074a07 100644 --- a/pkgs/applications/misc/slade/default.nix +++ b/pkgs/applications/misc/slade/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { description = "Doom editor"; homepage = http://slade.mancubus.net/; license = licenses.gpl2; - platforms = platforms.linux; + platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/applications/misc/slade/git.nix b/pkgs/applications/misc/slade/git.nix index 29e01da1b5b..9ee30d347b0 100644 --- a/pkgs/applications/misc/slade/git.nix +++ b/pkgs/applications/misc/slade/git.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { description = "Doom editor"; homepage = http://slade.mancubus.net/; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; [ ertes ]; }; } diff --git a/pkgs/applications/misc/spacefm/default.nix b/pkgs/applications/misc/spacefm/default.nix index 1e4e72c4e48..3d6e3ff7cfc 100644 --- a/pkgs/applications/misc/spacefm/default.nix +++ b/pkgs/applications/misc/spacefm/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "spacefm-${version}"; - version = "1.0.5"; + version = "1.0.6"; src = fetchFromGitHub { owner = "IgnorantGuru"; repo = "spacefm"; rev = "${version}"; - sha256 = "06askkrwls09d1x382zjrmnvcm0ghfgz4cms2qbhdkazfyy0ff65"; + sha256 = "089r6i40lxcwzp60553b18f130asspnzqldlpii53smz52kvpirx"; }; configureFlags = [ diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix index 59e67fc65e2..4b6c0009385 100644 --- a/pkgs/applications/misc/st/default.nix +++ b/pkgs/applications/misc/st/default.nix @@ -8,7 +8,7 @@ in stdenv.mkDerivation rec { name = "st-0.7"; src = fetchurl { - url = "http://dl.suckless.org/st/${name}.tar.gz"; + url = "https://dl.suckless.org/st/${name}.tar.gz"; sha256 = "f7870d906ccc988926eef2cc98950a99cc78725b685e934c422c03c1234e6000"; }; diff --git a/pkgs/applications/misc/timewarrior/default.nix b/pkgs/applications/misc/timewarrior/default.nix index b2dcd418fb2..42f3d1646c5 100644 --- a/pkgs/applications/misc/timewarrior/default.nix +++ b/pkgs/applications/misc/timewarrior/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { homepage = https://tasktools.org/projects/timewarrior.html; license = licenses.mit; maintainers = with maintainers; [ matthiasbeyer mrVanDalo ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/applications/misc/veracrypt/default.nix b/pkgs/applications/misc/veracrypt/default.nix index 201e2bcc6ac..1c5c4d1dcaa 100644 --- a/pkgs/applications/misc/veracrypt/default.nix +++ b/pkgs/applications/misc/veracrypt/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "veracrypt-${version}"; - version = "1.21"; + version = "1.22"; src = fetchurl { url = "https://launchpad.net/veracrypt/trunk/${version}/+download/VeraCrypt_${version}_Source.tar.bz2"; - sha256 = "0n036znmwnv70wy8r2j3b55bx2z3cch5fr83vnwjvzyyp0j7swa4"; + sha256 = "0w5qyxnx03vn93ach1kb995w2mdg43s82gf1isbk206sxp00qk4y"; }; unpackPhase = diff --git a/pkgs/applications/misc/wmname/default.nix b/pkgs/applications/misc/wmname/default.nix index fe0348cad21..68f6c4df159 100644 --- a/pkgs/applications/misc/wmname/default.nix +++ b/pkgs/applications/misc/wmname/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "wmname-0.1"; src = fetchurl { - url = "http://dl.suckless.org/tools/${name}.tar.gz"; + url = "https://dl.suckless.org/tools/${name}.tar.gz"; sha256 = "559ad188b2913167dcbb37ecfbb7ed474a7ec4bbcb0129d8d5d08cb9208d02c5"; }; diff --git a/pkgs/applications/misc/workrave/default.nix b/pkgs/applications/misc/workrave/default.nix index 0394fa83d4a..6e92e98481e 100644 --- a/pkgs/applications/misc/workrave/default.nix +++ b/pkgs/applications/misc/workrave/default.nix @@ -1,39 +1,30 @@ -{ stdenv, fetchFromGitHub, fetchpatch -, autoconf, automake, gettext, intltool, libtool, pkgconfig +{ stdenv, fetchFromGitHub, wrapGAppsHook +, autoconf, autoconf-archive, automake, gettext, intltool, libtool, pkgconfig , libICE, libSM, libXScrnSaver, libXtst, cheetah -, glib, glibmm, gtkmm2, atk, pango, pangomm, cairo, cairomm -, dbus, dbus-glib, GConf, gconfmm, gdome2, gstreamer, libsigcxx }: +, gobjectIntrospection, glib, glibmm, gtkmm3, atk, pango, pangomm, cairo +, cairomm , dbus, dbus-glib, gdome2, gstreamer, gst-plugins-base +, gst-plugins-good, libsigcxx }: stdenv.mkDerivation rec { name = "workrave-${version}"; - version = "1.10.7"; + version = "1.10.20"; src = let in fetchFromGitHub { - sha256 = "1mxg882rfih7xzadrpj51m9r33f6s3rzwv61nfwi94vzd68qjnxb"; + sha256 = "099a87zkrkmsgfz9isrfm89dh545x52891jh6qxmn19h6wwsi941"; rev = with stdenv.lib; "v" + concatStringsSep "_" (splitString "." version); repo = "workrave"; owner = "rcaelers"; }; - patches = [ - # Building with gtk{,mm}3 works just fine, but let's be conservative for once: - (fetchpatch { - name = "workrave-fix-compilation-with-gtk2.patch"; - url = "https://github.com/rcaelers/workrave/commit/" - + "271efdcd795b3592bfede8b1af2162af4b1f0f26.patch"; - sha256 = "1a3d4jj8516m3m24bl6y8alanl1qnyzv5dv1hz5v3hjgk89fj6rk"; - }) - ]; - nativeBuildInputs = [ - autoconf automake gettext intltool libtool pkgconfig + autoconf autoconf-archive automake gettext intltool libtool pkgconfig wrapGAppsHook ]; buildInputs = [ libICE libSM libXScrnSaver libXtst cheetah - glib glibmm gtkmm2 atk pango pangomm cairo cairomm - dbus dbus-glib GConf gconfmm gdome2 gstreamer libsigcxx + gobjectIntrospection glib glibmm gtkmm3 atk pango pangomm cairo cairomm + dbus dbus-glib gdome2 gstreamer gst-plugins-base gst-plugins-good libsigcxx ]; preConfigure = "./autogen.sh"; diff --git a/pkgs/applications/misc/xmr-stak/default.nix b/pkgs/applications/misc/xmr-stak/default.nix index c985f601447..51fd2ee8064 100644 --- a/pkgs/applications/misc/xmr-stak/default.nix +++ b/pkgs/applications/misc/xmr-stak/default.nix @@ -1,19 +1,24 @@ -{ stdenv, lib, fetchFromGitHub, cmake, libuv, libmicrohttpd, openssl +{ stdenv, stdenvGcc6, lib +, fetchFromGitHub, cmake, libuv, libmicrohttpd, openssl , opencl-headers, ocl-icd, hwloc, cudatoolkit , devDonationLevel ? "0.0" , cudaSupport ? false -, openclSupport ? false +, openclSupport ? true }: -stdenv.mkDerivation rec { +let + stdenv' = if cudaSupport then stdenvGcc6 else stdenv; +in + +stdenv'.mkDerivation rec { name = "xmr-stak-${version}"; - version = "2.2.0"; + version = "2.4.3"; src = fetchFromGitHub { owner = "fireice-uk"; repo = "xmr-stak"; - rev = "v${version}"; - sha256 = "0n21y37d8khgfk9965mrhnh6y5ag7w0s6as1fmf76yx6vajvajsn"; + rev = "${version}"; + sha256 = "0plks4yyd9gjnfg7sfsgsvdgczkbghf5xjwb8bzv01f0fndn10r1"; }; NIX_CFLAGS_COMPILE = "-O3"; diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix new file mode 100644 index 00000000000..42d9e448991 --- /dev/null +++ b/pkgs/applications/misc/xmrig/default.nix @@ -0,0 +1,33 @@ +{ stdenv, lib, fetchFromGitHub, cmake, libuv, libmicrohttpd +, donateLevel ? 0 +}: + +stdenv.mkDerivation rec { + name = "xmrig-${version}"; + version = "2.5.2"; + + src = fetchFromGitHub { + owner = "xmrig"; + repo = "xmrig"; + rev = "v${version}"; + sha256 = "1jc6vzqdl85pmiw5qv9b148kfw4k4wxn90ggylxfpfdv7czamh2c"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ libuv libmicrohttpd ]; + + postPatch = '' + substituteInPlace src/donate.h --replace "kDonateLevel = 5;" "kDonateLevel = ${toString donateLevel};" + ''; + + installPhase = '' + install -vD xmrig $out/bin/xmrig + ''; + + meta = with lib; { + description = "Monero (XMR) CPU miner"; + homepage = "https://github.com/xmrig/xmrig"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ fpletz ]; + }; +} diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix index 3b05c9be451..3cb416a5f7c 100644 --- a/pkgs/applications/misc/xpdf/default.nix +++ b/pkgs/applications/misc/xpdf/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + postInstall = stdenv.lib.optionalString (stdenv.isDarwin && enableGUI) '' wrapProgram $out/bin/xpdf \ --set QT_PLUGIN_PATH ${qtbase.bin}/${qtbase.qtPluginPrefix}:${qtsvg.bin}/${qtbase.qtPluginPrefix} ''; diff --git a/pkgs/applications/misc/yakuake/default.nix b/pkgs/applications/misc/yakuake/default.nix index 0eb33c845c3..676cfc12eb0 100644 --- a/pkgs/applications/misc/yakuake/default.nix +++ b/pkgs/applications/misc/yakuake/default.nix @@ -20,12 +20,12 @@ mkDerivation rec { pname = "yakuake"; - version = "3.0.4"; + version = "3.0.5"; name = "${pname}-${version}"; src = fetchurl { url = "http://download.kde.org/stable/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "1q31p1cqhz8b2bikqjrr7fww86kaq723ib4ys2zwablfa1ybbqhh"; + sha256 = "021a9mnghffv2mrdl987mn7wbg8bk6bnf6xz8kn2nwsqxp9kpqh8"; }; buildInputs = [ diff --git a/pkgs/applications/misc/yate/default.nix b/pkgs/applications/misc/yate/default.nix index bd891ff8493..61c7b11f208 100644 --- a/pkgs/applications/misc/yate/default.nix +++ b/pkgs/applications/misc/yate/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { preConfigure = '' sed -i 's@,/dev/null@@' configure + patchShebangs configure ''; # --unresolved-symbols=ignore-in-shared-libs makes ld no longer find --library=yate? Why? @@ -35,7 +36,7 @@ stdenv.mkDerivation rec { # OpenH323 and PWlib (licensed under MPL). license = ["GPL" "MPL"]; maintainers = [ lib.maintainers.marcweber ]; - platforms = lib.platforms.linux; + platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 1291e5c4e91..b591d5d7ba0 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -12,7 +12,7 @@ , utillinux, alsaLib , bison, gperf , glib, gtk2, gtk3, dbus-glib -, libXScrnSaver, libXcursor, libXtst, libGLU_combined +, libXScrnSaver, libXcursor, libXtst, libGLU_combined , protobuf, speechd, libXdamage, cups , ffmpeg, harfbuzz, harfbuzz-icu, libxslt, libxml2 @@ -139,28 +139,30 @@ let patches = [ ./patches/nix_plugin_paths_52.patch - # To enable ChromeCast, go to chrome://flags and set "Load Media Router Component Extension" to Enabled - # Fixes Chromecast: https://bugs.chromium.org/p/chromium/issues/detail?id=734325 - ./patches/fix_network_api_crash.patch # As major versions are added, you can trawl the gentoo and arch repos at # https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/ # https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/chromium # for updated patches and hints about build flags - # (gentooPatch "" "0000000000000000000000000000000000000000000000000000000000000000") - ] ++ optionals (versionRange "64" "65") [ - (gentooPatch "chromium-cups-r0.patch" "0hyjlfh062c8h54j4b27y4dq5yzd4w6mxzywk3s02yf6cj3cbkrl") - (gentooPatch "chromium-angle-r0.patch" "0izdrqwsyr48117dhvwdsk8c6dkrnq2njida1q4mb1lagvwbz7gc") - # missing ninja dep https://github.com/NixOS/nixpkgs/issues/35296#issuecomment-368666833 - (githubPatch "b1e3cfd4f9bfe43a1e08c5670b51c8c80d3e6372" "17vih86rpsy282r8ikrf2q5gfjdwqzvyn8859i75xzvl8agyhbaa") - ] ++ optionals (versionRange "65" "66") [ - #(gentooPatch "chromium-gcc-r0.patch" "127xdwabizn5gz8rf1qsw62i7m0b5bsfjqxv4kdbsnizmjanddf8") - #(gentooPatch "chromium-memcpy-r0.patch" "1d3vra59wjg2lva7ddv55ff6l57mk9k50llsplr0b7vxk0lh0ps5") - (gentooPatch "chromium-webrtc-r0.patch" "0qj5b4w9kav51ylpdf38vm5w7p2gx4qp8p45vrfggp7miicg9cmw") - #(gentooPatch "chromium-vulkan-r0.patch" "1wphsbc6kyck5qanbc4bv14iw2s67fvp1c0kwz29a2avzkz19s84") - #(gentooPatch "chromium-ffmpeg-r0.patch" "0j58g24j6n6vpy6v9wwv34x0dd43m52wg0xcrfkzp72km9wiahff") - #(gentooPatch "" "0000000000000000000000000000000000000000000000000000000000000000") - ] ++ optional enableWideVine ./patches/widevine.patch; + ] ++ optionals (versionRange "66" "67") [ + (gentooPatch "chromium-webrtc-r0.patch" "0wp4zivbv2wpgiwmiznbq1aw4w98mvwjvdy36cpfmnvr8yw430pd") + (gentooPatch "chromium-ffmpeg-r1.patch" "1k8agaqsvg0w0s6s5wh346ih02cc86vr0vwyshw2q9vafa0jvmq4") + # GCC 7 fixes + (githubPatch "f64fadcd79aebe5ed893ecbf258d1123609d28f8" "1h255w1v327r08cnifs19s4bwmkinqjmdmbwihddc5dyl43sjnvv") + (githubPatch "ede5178322ccd297b0ad82ae4c59119ceaab9ea5" "0rsal0dy0yhgs4lhn8h1vy1s77xcssy4f5wals7hvrz5m08jqizj") + (githubPatch "7d721f438acb38db556ae9a9e6e8b718bd503216" "13lzvxm63zq3rd8p387ylq4bm9wr4r09vk2w4p81f838pf0v1kbj") + (githubPatch "ba4141e451f4e0b1b19410b1b503bd32e150df06" "1cjxw1f9fin6z12b0mcxnxf2mdjb0n3chwz7mgvmp9yij8qhqnxj") + (githubPatch "b34ed1e6524479d61ee944ebf6ca7389ea47e563" "1s13zw93nsyr259dzck6gbhg4x46qg5sg14djf4bvrrc6hlkiczw") + (githubPatch "4f2b52281ce1649ea8347489443965ad33262ecc" "1g59izkicn9cpcphamdgrijs306h5b9i7i4pmy134asn1ifiax5z") + (fetchpatch { + ## see https://groups.google.com/a/chromium.org/forum/#!msg/chromium-packagers/So-ojMYOQdI/K66hndtdCAAJ + url = "https://bazaar.launchpad.net/~chromium-team/chromium-browser/bionic-stable/download/head:/addmissingblinktools-20180416203514-02f50sz15c2mn6ei-1/add-missing-blink-tools.patch"; + sha256 = "0dc4cmd05qjqyihrd4qb34kz0jlapjgah8bzgnvxf9m4791w062z"; + }) + ] ++ optional enableWideVine ./patches/widevine.patch + ++ optionals (stdenv.isAarch64 && versionRange "65" "66") [ + ./patches/skia_buildfix.patch + ]; postPatch = '' # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 1f6eb7c178f..1458a181656 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -90,7 +90,7 @@ in stdenv.mkDerivation { mkdir -p "$out/bin" eval makeWrapper "${browserBinary}" "$out/bin/chromium" \ - ${commandLineArgs} \ + --add-flags ${escapeShellArg (escapeShellArg commandLineArgs)} \ ${concatMapStringsSep " " getWrapperFlags chromium.plugins.enabled} ed -v -s "$out/bin/chromium" << EOF diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r4.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r4.patch deleted file mode 100644 index cb978d58a06..00000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r4.patch +++ /dev/null @@ -1,98 +0,0 @@ ---- a/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h -+++ b/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h -@@ -63,7 +63,7 @@ class WTF_EXPORT ArrayBufferContents { - allocation_length_(0), - data_(data), - data_length_(0), -- kind_(AllocationKind::kNormal), -+ kind_(WTF::ArrayBufferContents::AllocationKind::kNormal), - deleter_(deleter) {} - DataHandle(void* allocation_base, - size_t allocation_length, -@@ -94,11 +94,11 @@ class WTF_EXPORT ArrayBufferContents { - reinterpret_cast(allocation_base_) + - allocation_length_); - switch (kind_) { -- case AllocationKind::kNormal: -+ case WTF::ArrayBufferContents::AllocationKind::kNormal: - DCHECK(deleter_); - deleter_(data_); - return; -- case AllocationKind::kReservation: -+ case WTF::ArrayBufferContents::AllocationKind::kReservation: - ReleaseReservedMemory(allocation_base_, allocation_length_); - return; - } ---- a/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.orig 2017-08-15 12:45:59.433532111 +0000 -+++ b/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc 2017-08-15 17:52:59.691328825 +0000 -@@ -10,7 +10,7 @@ - - #include "webrtc/modules/audio_processing/aec3/aec_state.h" - --#include -+#include - #include - #include - ---- a/gpu/ipc/common/mailbox_struct_traits.h -+++ b/gpu/ipc/common/mailbox_struct_traits.h -@@ -15,7 +15,7 @@ namespace mojo { - template <> - struct StructTraits { - static base::span name(const gpu::Mailbox& mailbox) { -- return mailbox.name; -+ return base::make_span(mailbox.name); - } - static bool Read(gpu::mojom::MailboxDataView data, gpu::Mailbox* out); - }; ---- a/services/viz/public/cpp/compositing/filter_operation_struct_traits.h -+++ b/services/viz/public/cpp/compositing/filter_operation_struct_traits.h -@@ -134,7 +134,7 @@ struct StructTraits { - static base::span matrix(const cc::FilterOperation& operation) { - if (operation.type() != cc::FilterOperation::COLOR_MATRIX) - return base::span(); -- return operation.matrix(); -+ return base::make_span(operation.matrix()); - } - - static base::span shape( ---- a/services/viz/public/cpp/compositing/quads_struct_traits.h -+++ b/services/viz/public/cpp/compositing/quads_struct_traits.h -@@ -303,7 +303,7 @@ struct StructTraits { - static base::span vertex_opacity(const viz::DrawQuad& input) { - const viz::TextureDrawQuad* quad = - viz::TextureDrawQuad::MaterialCast(&input); -- return quad->vertex_opacity; -+ return base::make_span(quad->vertex_opacity); - } - - static bool y_flipped(const viz::DrawQuad& input) { ---- a/third_party/WebKit/Source/platform/exported/WebCORS.cpp -+++ b/third_party/WebKit/Source/platform/exported/WebCORS.cpp -@@ -480,7 +480,7 @@ WebString AccessControlErrorString( - } - default: - NOTREACHED(); -- return ""; -+ return WebString(); - } - } - -@@ -512,7 +512,7 @@ WebString PreflightErrorString(const PreflightStatus status, - } - default: - NOTREACHED(); -- return ""; -+ return WebString(); - } - } - -@@ -533,7 +533,7 @@ WebString RedirectErrorString(const RedirectStatus status, - } - default: - NOTREACHED(); -- return ""; -+ return WebString(); - } - } - diff --git a/pkgs/applications/networking/browsers/chromium/patches/constexpr-fix.patch b/pkgs/applications/networking/browsers/chromium/patches/constexpr-fix.patch deleted file mode 100644 index 9f187752ea6..00000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/constexpr-fix.patch +++ /dev/null @@ -1,98 +0,0 @@ -From aab2cc3a20af9ebe9ddb8dfd15089f131f95817f Mon Sep 17 00:00:00 2001 -From: Tomas Popela -Date: Fri, 20 Oct 2017 14:06:42 +0200 -Subject: [PATCH] Fix the build of base/numerics with GCC - -Initialize the uninitialized variables where the build is failing. - -BUG=776705 - -Change-Id: I5782e18086a752b3676f8738930bf0553f3f97ad ---- - base/numerics/checked_math_impl.h | 6 +++--- - base/numerics/clamped_math_impl.h | 10 +++++----- - 2 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/base/numerics/checked_math_impl.h b/base/numerics/checked_math_impl.h -index 2926b37b5e..e083389ebf 100644 ---- a/base/numerics/checked_math_impl.h -+++ b/base/numerics/checked_math_impl.h -@@ -67,7 +67,7 @@ struct CheckedAddOp::value) { - presult = static_cast(x) + static_cast(y); -@@ -127,7 +127,7 @@ struct CheckedSubOp::value) { - presult = static_cast(x) - static_cast(y); -@@ -183,7 +183,7 @@ struct CheckedMulOp::is_supported) { - // The fast op may be available with the promoted type. -diff --git a/base/numerics/clamped_math_impl.h b/base/numerics/clamped_math_impl.h -index 7b5e4346f2..303a7e945a 100644 ---- a/base/numerics/clamped_math_impl.h -+++ b/base/numerics/clamped_math_impl.h -@@ -87,7 +87,7 @@ struct ClampedAddOp(IsValueNegative(y)); -- V result; -+ V result = {}; - return BASE_NUMERICS_LIKELY((CheckedAddOp::Do(x, y, &result))) - ? result - : saturated; -@@ -114,7 +114,7 @@ struct ClampedSubOp(!IsValueNegative(y)); -- V result; -+ V result = {}; - return BASE_NUMERICS_LIKELY((CheckedSubOp::Do(x, y, &result))) - ? result - : saturated; -@@ -136,7 +136,7 @@ struct ClampedMulOp::is_supported) - return ClampedMulFastOp::template Do(x, y); - -- V result; -+ V result = {}; - const V saturated = - CommonMaxOrMin(IsValueNegative(x) ^ IsValueNegative(y)); - return BASE_NUMERICS_LIKELY((CheckedMulOp::Do(x, y, &result))) -@@ -156,7 +156,7 @@ struct ClampedDivOp::type; - template - static constexpr V Do(T x, U y) { -- V result; -+ V result = {}; - if (BASE_NUMERICS_LIKELY((CheckedDivOp::Do(x, y, &result)))) - return result; - // Saturation goes to max, min, or NaN (if x is zero). -@@ -176,7 +176,7 @@ struct ClampedModOp::type; - template - static constexpr V Do(T x, U y) { -- V result; -+ V result = {}; - return BASE_NUMERICS_LIKELY((CheckedModOp::Do(x, y, &result))) - ? result - : x; --- -2.14.2 - diff --git a/pkgs/applications/networking/browsers/chromium/patches/fix_network_api_crash.patch b/pkgs/applications/networking/browsers/chromium/patches/fix_network_api_crash.patch deleted file mode 100644 index 093598465c4..00000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/fix_network_api_crash.patch +++ /dev/null @@ -1,77 +0,0 @@ -Index: extensions/browser/api/networking_private/networking_private_linux.cc -=================================================================== ---- a/extensions/browser/api/networking_private/networking_private_linux.cc.orig 2016-05-05 03:01:50.000000000 +0200 -+++ b/extensions/browser/api/networking_private/networking_private_linux.cc 2016-05-10 16:16:42.431052917 +0200 -@@ -215,12 +215,14 @@ void NetworkingPrivateLinux::GetState( - std::unique_ptr network_properties( - new base::DictionaryValue); - -+ std::string* erp = error.get(); -+ base::DictionaryValue* npp = network_properties.get(); - // Runs GetCachedNetworkProperties on |dbus_thread|. - dbus_thread_.task_runner()->PostTaskAndReply( - FROM_HERE, base::Bind(&NetworkingPrivateLinux::GetCachedNetworkProperties, - base::Unretained(this), guid, -- base::Unretained(network_properties.get()), -- base::Unretained(error.get())), -+ base::Unretained(npp), -+ base::Unretained(erp)), - base::Bind(&GetCachedNetworkPropertiesCallback, base::Passed(&error), - base::Passed(&network_properties), success_callback, - failure_callback)); -@@ -301,11 +303,12 @@ void NetworkingPrivateLinux::GetNetworks - - // Runs GetAllWiFiAccessPoints on the dbus_thread and returns the - // results back to OnAccessPointsFound where the callback is fired. -+ NetworkMap* nmp = network_map.get(); - dbus_thread_.task_runner()->PostTaskAndReply( - FROM_HERE, - base::Bind(&NetworkingPrivateLinux::GetAllWiFiAccessPoints, - base::Unretained(this), configured_only, visible_only, limit, -- base::Unretained(network_map.get())), -+ base::Unretained(nmp)), - base::Bind(&NetworkingPrivateLinux::OnAccessPointsFound, - base::Unretained(this), base::Passed(&network_map), - success_callback, failure_callback)); -@@ -321,11 +324,12 @@ bool NetworkingPrivateLinux::GetNetworks - // Runs GetAllWiFiAccessPoints on the dbus_thread and returns the - // results back to SendNetworkListChangedEvent to fire the event. No - // callbacks are used in this case. -+ NetworkMap* nmp = network_map.get(); - dbus_thread_.task_runner()->PostTaskAndReply( - FROM_HERE, base::Bind(&NetworkingPrivateLinux::GetAllWiFiAccessPoints, - base::Unretained(this), false /* configured_only */, - false /* visible_only */, 0 /* limit */, -- base::Unretained(network_map.get())), -+ base::Unretained(nmp)), - base::Bind(&NetworkingPrivateLinux::OnAccessPointsFoundViaScan, - base::Unretained(this), base::Passed(&network_map))); - -@@ -506,11 +510,12 @@ void NetworkingPrivateLinux::StartConnec - - std::unique_ptr error(new std::string); - -+ std::string* erp = error.get(); - // Runs ConnectToNetwork on |dbus_thread|. - dbus_thread_.task_runner()->PostTaskAndReply( - FROM_HERE, - base::Bind(&NetworkingPrivateLinux::ConnectToNetwork, -- base::Unretained(this), guid, base::Unretained(error.get())), -+ base::Unretained(this), guid, base::Unretained(erp)), - base::Bind(&OnNetworkConnectOperationCompleted, base::Passed(&error), - success_callback, failure_callback)); - } -@@ -524,11 +529,12 @@ void NetworkingPrivateLinux::StartDiscon - - std::unique_ptr error(new std::string); - -+ std::string* erp = error.get(); - // Runs DisconnectFromNetwork on |dbus_thread|. - dbus_thread_.task_runner()->PostTaskAndReply( - FROM_HERE, - base::Bind(&NetworkingPrivateLinux::DisconnectFromNetwork, -- base::Unretained(this), guid, base::Unretained(error.get())), -+ base::Unretained(this), guid, base::Unretained(erp)), - base::Bind(&OnNetworkConnectOperationCompleted, base::Passed(&error), - success_callback, failure_callback)); - } diff --git a/pkgs/applications/networking/browsers/chromium/patches/include-math-for-round.patch b/pkgs/applications/networking/browsers/chromium/patches/include-math-for-round.patch deleted file mode 100644 index 530493dcd0f..00000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/include-math-for-round.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 7f90e2cceda0458cf56026eb6ccffb961a47804b Mon Sep 17 00:00:00 2001 -From: Raphael Kubo da Costa -Date: Fri, 13 Oct 2017 15:49:32 +0200 -Subject: [PATCH] IWYU: Include math.h for round(3). - -math.h was being implicitly included, which can break the build with -alternative libc implementations. - -Bug: None -Change-Id: I969b320b65d0f44abb33d3e1036cfbcb859a4952 -Reviewed-on: https://webrtc-review.googlesource.com/9384 -Reviewed-by: Tommi -Commit-Queue: Raphael Kubo da Costa (rakuco) -Cr-Commit-Position: refs/heads/master@{#20292} ---- - p2p/base/port.cc | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/third_party/webrtc/p2p/base/port.cc b/third_party/webrtc/p2p/base/port.cc -index a1b478d11..81aa0aadb 100644 ---- a/third_party/webrtc/p2p/base/port.cc -+++ b/third_party/webrtc/p2p/base/port.cc -@@ -10,6 +10,8 @@ - - #include "p2p/base/port.h" - -+#include -+ - #include - #include - --- -2.15.0 - diff --git a/pkgs/applications/networking/browsers/chromium/patches/skia_buildfix.patch b/pkgs/applications/networking/browsers/chromium/patches/skia_buildfix.patch new file mode 100644 index 00000000000..5348b9ac905 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/skia_buildfix.patch @@ -0,0 +1,22 @@ +Index: chromium-browser-65.0.3325.73/third_party/skia/src/jumper/SkJumper_stages.cpp +=================================================================== +--- chromium-browser-65.0.3325.73.orig/third_party/skia/src/jumper/SkJumper_stages.cpp ++++ chromium-browser-65.0.3325.73/third_party/skia/src/jumper/SkJumper_stages.cpp +@@ -666,7 +666,7 @@ SI F approx_powf(F x, F y) { + } + + SI F from_half(U16 h) { +-#if defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. ++#if defined(JUMPER_IS_NEON) && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. + return vcvt_f32_f16(h); + + #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512) +@@ -686,7 +686,7 @@ SI F from_half(U16 h) { + } + + SI U16 to_half(F f) { +-#if defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. ++#if defined(JUMPER_IS_NEON) && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. + return vcvt_f16_f32(f); + + #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512) diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index bac4a361a19..f0862aebafe 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -98,12 +98,12 @@ let flash = stdenv.mkDerivation rec { name = "flashplayer-ppapi-${version}"; - version = "28.0.0.161"; + version = "29.0.0.140"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/" + "${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "0xhfr2mqmg71dxnsq4x716hzkryj2dmmlzgyi8hf7s999p7x8djw"; + sha256 = "1p0jr7s6vyzxw1mhbrl5yx092z2wpvfw0jjw127gs576z0zwamwh"; stripRoot = false; }; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index bca9e1c9a1c..d55cc12c165 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "1kdv6r3cmy7lqynnk4ylkn81x91wkv2k3hqh41sb50h65s7h9b3y"; - sha256bin64 = "18bralcc4frapglcfa5az3z8i74calrblf4zzavisvpkmnil7ypa"; - version = "65.0.3325.88"; + sha256 = "1mlfavs0m0lf60s42krqxqiyx73hdfd4r1mkjwv31p2gchsa7ibp"; + sha256bin64 = "067gpmiwnpdaqarkz740plg0ixpp7642xf4qqkq32w9v8flx3y57"; + version = "66.0.3359.117"; }; dev = { - sha256 = "1ykg5c3bayv6pwz74dglxcmbsalz6p04c3r0y15xkw2iyv5jjcam"; - sha256bin64 = "1phw755ra3pckvhapm26amr6b3652k8f7sxanjyq118zkpga21w2"; - version = "66.0.3350.0"; + sha256 = "0058g5dm5nfm7wdpd9y4fn0dmi8bq013l0ky5fsn4j7msm55rrg5"; + sha256bin64 = "1ag8kg3jjv6jsxdjq33h4ksqhhhfaz5aqw9jaaqhfma908c5mc9y"; + version = "67.0.3396.10"; }; stable = { - sha256 = "0q0q1whspmzyln04gxhgl3jd2vrgb4imh8r9qw6c06i3b63j3l2z"; - sha256bin64 = "1sq8mmdw32n00swm4q9q5q3vw6q5sp8yiaxag4rbzvxkfnr3vi4g"; - version = "64.0.3282.186"; + sha256 = "1mlfavs0m0lf60s42krqxqiyx73hdfd4r1mkjwv31p2gchsa7ibp"; + sha256bin64 = "1ycfq6pqk7a9kyqf2112agcxav360rxbqqdc1yil0qkmz51i9zdg"; + version = "66.0.3359.117"; }; } diff --git a/pkgs/applications/networking/browsers/dwb/default.nix b/pkgs/applications/networking/browsers/dwb/default.nix deleted file mode 100644 index ec585e53fd2..00000000000 --- a/pkgs/applications/networking/browsers/dwb/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, fetchgit, pkgconfig, makeWrapper, libsoup, webkitgtk24x-gtk2, gtk2, gnutls -, json_c, m4, glib-networking, gsettings-desktop-schemas, dconf }: - -stdenv.mkDerivation { - name = "dwb-2016-03-21"; - - src = fetchgit { - url = "https://bitbucket.org/portix/dwb"; - rev = "7fb82bc1db36a5d1d2436088c9b58054d2c51f96"; - sha256 = "1wg7pslcx7z4fw595a3nbnygxy2bwfj0h377i48mxhddvl3wzzbq"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ makeWrapper gsettings-desktop-schemas libsoup - webkitgtk24x-gtk2 gtk2 gnutls json_c m4 ]; - - # There are Xlib and gtk warnings therefore I have set Wno-error - makeFlags = ''PREFIX=$(out) GTK=2 CPPFLAGS="-Wno-error"''; - - preFixup='' - wrapProgram "$out/bin/dwb" \ - --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules:${stdenv.lib.getLib dconf}/lib/gio/modules" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" - wrapProgram "$out/bin/dwbem" \ - --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" - ''; - - meta = with stdenv.lib; { - homepage = http://portix.bitbucket.org/dwb/; - description = "A lightweight web browser based on the webkit web browser engine and the gtk toolkit"; - platforms = platforms.mesaPlatforms; - maintainers = with maintainers; [ pSub ]; - license = licenses.gpl3; - }; -} diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 0fbe6d749c2..3dd7d9e8e65 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,965 +1,975 @@ { - version = "58.0.2"; + version = "59.0.2"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ach/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ach/firefox-59.0.2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "4f974e90d5db09a02c61a634f7309ba479f8699d1d61f4c21a7bb6ae5f520332292031ce0988605f8e727da5161de1b3a055da59d5f8bf220c1b369f9c453f17"; + sha512 = "6242d81b96456c52a25af82049ffae548f7b5e14e47e2e643cea94f338e10027270d67b13c27a4a77fddc378b1e0869b5a0f897b9b269fecbe1d55336dfa4718"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/af/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/af/firefox-59.0.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "d821bf5c1fa1bc38f64195d1bfbc7ce5205b50139710fde6e1db37c4a429a0df16ede8411a618d8e339f369dac699a38651c3aec9952d7c20fb84e1eaf1f59de"; + sha512 = "e2aa156326a38c4ac55b4ebcbcd460ce64d5e9abc210bd53d484cb97bded59bd73045fb7b3099ff3301f0262938ce8b4b90f5b0f807f73d9b7637a826a5055d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/an/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/an/firefox-59.0.2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "7238e49735bab7983a478c217b128d7cc8b07e90fc5e2739eaf07e35be054a354c5c0006bae6fdb29ef71855c33ea531e84c1617832412315eb2e07ad7310d14"; + sha512 = "2946fdb675ac86e32e91b3a6cf4c26d14a5c977f22a587315a1c5a03db69f84efcd5057d7bd7f8b37e7433f53d915e9e9e5ab0c9d35739ce82e1c3183b1c4d5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ar/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ar/firefox-59.0.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "f505930eed9262e595a8969dc86ed43c04f32ba62301b2fa8d1246ef956f3075d5633112e6129707ddb02d3047b93a5c9f5ce16f958a06ad928c59d64c8a1e75"; + sha512 = "2d497f930358fdd36ae5e708bd73e151461497f8715b11efd5a2b6c23b71fbf985faeeb2bfa5cc2816982e81f27091705f849923cb724078764b50fa684374f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/as/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/as/firefox-59.0.2.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "e1b876dee0ac09a391c53f066f5bf56fa6b0b4bcb389beb0844670a7f14ff422a230f58389f3c3d2a1f8b7486fe528a7abbe3b6abfb86c330ea13cab0cc67a7f"; + sha512 = "a1d51a99f8a5b47668c74414372d11120160f264762a3bfb988be2aaeb958ad5d3897472618a86a4a8422850c46f2895cf426fe9d064938c263bca96a9592eb4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ast/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ast/firefox-59.0.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "1c47fae696cfcbdd4f7fbbc8ddeacbfa1ae1b9a624bec9f512527b99c7ddd63c99fd55b60ae9a3ea1104fb5b943c8c029b19b93e6426de793788c2a5354a0d57"; + sha512 = "dcd450fb49cce376f27e8135f8c27400af1c2cf139120602c000091231703db2cac791c82de157c9335fb09050cd4e4ee6013da3068b1527dcd9e0aedda16c5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/az/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/az/firefox-59.0.2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "5c3bab4ba81967b957c14152f6461ccb129396562ece07a34644f88b67185f9d6639ce3bd709a463816efe531c6e8bf3aa6414828feb37ae54564d1c9ae237fc"; + sha512 = "fb004315a6ad15cc9ccb6d3b36901c4c495ea21fe146df3869711fc7ae8fb625a109fc416079e85163e79524bb987b366b2d057cd0808d0dfc61f78910fbef96"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/be/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/be/firefox-59.0.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "8c719a8fcaef9f2f3ae50d0ecd999972649b5814c1bab45a418c474b6090bbcb47d58a32012f3ccb6c785ca9a1c76cb2f69e370714e1533349806c3db0364dd5"; + sha512 = "ba51003823e74734726f655cfd20fe968ebe5feacd0c985f7c8b2cf9766d7b68fe74dafc8baa0605b8fb46b22312a593218c5a57fdfabddea6a51491de74cc13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/bg/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/bg/firefox-59.0.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "b871aa3dc5e4721174e73081e4c551f802a16cb54690ea1850e549c37c1160000b9eb0e312fe03e43d8e254cfc063d971625624a6d0d7a8de14f731d1e139135"; + sha512 = "f9df1a70c569f853b94c912d8cdbc7cf98a57eda9d461777f9f94c776f4db0a70b6093478ae1e7c87e80f37cfc5a39af3d2b37897ca60496f0d00ac9b45c1713"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/bn-BD/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/bn-BD/firefox-59.0.2.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "53cfa7aa2bcdebb6770d1d993d71a0fd039eb540884d0dbe3d0fc953260a850bcdf72b20eb67d11630aafa9f282cab279776fa9d5cb45aeb7280dfd064b0199b"; + sha512 = "85758a1ac327b067a59358d3faa0663244a24a4769ac0dfe03bf9dddd5a680503ea4bc9313294d9771bc7e4f3341904c68e0059d912b563aba8061dd0b6cc793"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/bn-IN/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/bn-IN/firefox-59.0.2.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "a47f5c6bb46f6f4a2af27a8dd1556339ba5efd1b2c23494b0913033580dc735097eeefd58a6c0253d74c8fab30fa628d106a0f4111b0b5af5f98b1dd2d9d111d"; + sha512 = "895d63b62be42947e955ce426e03f7f8cbf8333d77fd3ff4ca6623db18cc740fb1ea6c41aefbc75aa79d60fca2f00b75f1b2e6b5b0bb1ddcec61f9c0772dedfb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/br/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/br/firefox-59.0.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "b4dade4de1e40f8ef6c1af9fa260f7e06bbae6790a87813032c35317fa462f15905fa8b66c8b08bae640186f1fe6d10c15c87d64085d6fd23e5dd7a33cb9326d"; + sha512 = "e62f445437a07f9fa070335328064355715d2e5ef81e5572f04a8644f47dd1c8cf8a3a7ac6fa88038c4e996229ab695e692aa1c0b0b3becf214579aaa76a5569"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/bs/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/bs/firefox-59.0.2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "d32cd117524343cf451b30526466b84f84a7ab99f6e716ccff5c1c7e768003409723df93ee8839ca00d3e0a52cd9cba270f78033124809e4d18942bae9c736e0"; + sha512 = "d3adea6061daa0fd54d5cd7d9d8a00f8b88db8ed36545f9fcaee7520c1cfe58534d1fb57e8297fdc8b4f348bd6c728891f6a88f1d4d36f59a7f2ffbe0e4eb229"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ca/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ca/firefox-59.0.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "c4063632526c6936e71e50a898077568cf678a8f9275258311bda91ca0a150b7c30b19b86cb12bbf786624675ed3f383ba21b52545b36f8ef7032ef9001136e1"; + sha512 = "5bab1fe909680ff6eacf8fadc9aba7786d801379a2e79e5da04e973a3a218de8807c3d08f7641be554fd49c592028949e30b262fcda52413303d9044e161a60e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/cak/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/cak/firefox-59.0.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "cb1f2142d698226ff881e9b3a1037ddbea1bc3ffca8ae98a7526bc3a6b728a3e30957196d809d523a638d7482db3e60b774de8f7f274c76982962026cebc0b9c"; + sha512 = "f54a09501c7311890542d91b0ec96dfa5cb634685af4ef0fcc69e633157183f0c5ef906a205fadba6e132c9ee657f7161879a83ea382bbe400694e92c065de64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/cs/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/cs/firefox-59.0.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "8b17ed6a66081f445319a6e329710350f79751388e1cc6eb6f5945e0c0e6145053904ee2a1c1a562407299518eb8d97a52d86a0d4807f8711ee3ba6521f23820"; + sha512 = "28f17b2ef72356a058976da30960af1c8d4f2a02a946aec57b3671d71887573a98375eecca4a2f0f21b37bcbe0dd189ce4ee17ccb9af8fc60d63e9bd20ca44b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/cy/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/cy/firefox-59.0.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "a679e779b6afda954fde1bfdf079eca62e4541bb5c0398e8fe797e3ab8341922c279d1eb5d4f237995d01d39261f9b6f814540532c646558b10cef178870d5bb"; + sha512 = "36c8a1ac125a55db15d0bf7c8d8fed1ca3b0031a9421437b683adf7691fca281a499af6812cccd608e65bbcda3e1e94469b16ead2a9093708c8c2daf4ea7d588"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/da/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/da/firefox-59.0.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "81771c6a78ff9349ac8086dce32900544d0a8b79eca55a61bc1efde34788a77fd41607c43403bf1df18f2f6aee8b61460e113ee301c2888494a970600fb4a371"; + sha512 = "fd8c669362fcf945b6280d103d1b9524741993db8d38b78e494ae14106309999d09f4b13d55b8521612cac9e5dad622ef361fa16f197389405ff620b3eeac467"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/de/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/de/firefox-59.0.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "cef7eebf9dd55af3d7245161c6f41153b99cefdb73e71c5cfaab1d8f1037c8da7ee2f36836e51416c36f7a7472b113bab23fa6a35ce30269733889ecd4aa1d5d"; + sha512 = "32cbc3d054628a11959ccc7b553fdcf98f863a86373307bf8f558a78482de0161e533b71cbfc03142b0ac7aded506e53e821213e42c574d28132fd2f98a753e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/dsb/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/dsb/firefox-59.0.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "986c25e9f994ab766f4017f664304c03cc0a26c8ea50f892d48ff571322aeaa6b76eb1f4c7f1133a68783a9f55ce0e56a6cc599fb6eae0431e5bccec639504d9"; + sha512 = "4e7c2f6b980dd4872850f7dfcc068c7e40a8bc896e27ede759029bf0324e1189e605ffdd2291d2e6a4a0c61e56bff6cd760b77e232209127e9a90a38b012e4fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/el/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/el/firefox-59.0.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "8d352b56ef049e2bb94952ebaca276dbfa4d7ea34ad368907406b67391d618e8aa2f908c19f3c7210220237d3721021686bc8fa0702c748680035a48b9ff2c4e"; + sha512 = "ecf743c23ef70e92e1f7ddfd2f1862b5b60b446f0e1020778a79ec11af94ce5f03ffea9b0b7048a7ee0861602d5c32f4f4bc8cd4b7171ae306987e1ca9993ddf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/en-GB/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/en-GB/firefox-59.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "318a67d7d875a350e561a2a4e0f2d6278ce3a9f7e2db9ce307c58b5a2ffd40753edbfce01438c7b02421efa84129f95caf3887ca2929271ce5fe95f9321db11a"; + sha512 = "ddec1dfcf976f93d1eb310ccacd9e04dac8e0b075d37b54be1402531d12c11ee9dce2be7d0bfa92c9b654192c71781fd2631cad24c8153275e786552b9ab11e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/en-US/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/en-US/firefox-59.0.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "71f5d1d3779eab4025ab57aef1795f9d6c509a50c5397df6a8ec741584d441acb9f7cbf8c8c002cb367c9c42b72dd6d29710fcf0cfead3a4525f2ccf39f3b930"; + sha512 = "3257084102282621f15207af04e6dcbb98887b13a8be911069572c151d8ad96f90e7c083e571b4ecd4d4d4ff3bfeee1dc539042d8e5bc6a0fbd7f36c427da402"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/en-ZA/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/en-ZA/firefox-59.0.2.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "07604a360c8a932fdc161b4c2762e953812eef7cca765db29bcf0514027a8db3c22bbd879de6a1222eadbfb817540ef55e136df0df858a21c55ab4150cb3d5a4"; + sha512 = "35d2f29daddfb6ba439b160644869bf806ce7a2e36c26d4dc9ef2ff2eb5079e0bda9095edd727fca9c64c3be5a5646e56892bd7ff76b2c67300c1ec7f074d98f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/eo/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/eo/firefox-59.0.2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "cdcb32f4b5e14a11033f62ec7e4ba00fab689dde93978cec405d55a497fb6a59a9c06839e04b8cd550557d37f1801bc6f9a9440e4a59f3d4b32cd2a27ddbac9c"; + sha512 = "867ac54d47f2266ad357d1666c9206c00e45d7184f6b3a0199c2474b63829ad1d41e95491d2c977885e878d36e2d7e93d215c53e629886e7cb04abc198a06e42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/es-AR/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/es-AR/firefox-59.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "aaf28d1b93d1eba50eafdc112f51fe261a0a38bb9e28ba4d86c12cb1f509d5fb375986e7a7e7a81483aa64bcf16f09620ff325674c29738ff62335d8ad1d1c7b"; + sha512 = "3d577099cb28dd4c4d1349141a715783215510d015f7b2b02739d530222ece5229ab3e6cfe481be4e9d1d17c40aaacac10af9d9c2be37f7956620924e56c87e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/es-CL/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/es-CL/firefox-59.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "f30c318fa51c551fc03bf9f962cad8fce4795094d1389c1a35096e8e229fd1d78dae43cfb6c01f2600e7f5fd8efd02345f2c18578e3bc0378fedb947abf5904a"; + sha512 = "821738beffdb260b6b3d8b5c3a1395b6b7d58db6b05a744899c0eb83a291855152f5055c3ca6d9a460bd032d5e72829198cb72dedfcf6614aafe1d7b8189dc26"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/es-ES/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/es-ES/firefox-59.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "08fc4a475fdf2e91550de0b5127df679f4011cc79af6125fb117aec44f97936f794fc0135fd381abaae4370b7343c200308e0cc659828fa8f8e665f39c4109cd"; + sha512 = "10ae818fd27acc38a5386d06cd7d890d4eaa44407fe6334b81cdbe3f43ded90be72e749f075e165105e9a6f02e08014aabd7cd783860d6790b67eb2889718e5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/es-MX/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/es-MX/firefox-59.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "baf9277fe32334b88be4bb6aa5b714e86d6d316866088173d0bfb221ab989708e3b67dfdd934c0df80ddbbcef8b2d78c35b33b1420332b094442b31aa62b6ca7"; + sha512 = "239d3c287eeface29994c8c2bb9bacd739d638cb277e18e57dc729e35cc0c11f6c7168673c110206f3e931c850bfebaf1a26d4f690d8f3ff6f85a61147522941"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/et/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/et/firefox-59.0.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "eed1be0068e6efba0130658c7fe5104ca0fd9c7485da0715113ac82665a153836e6d0eed083c91a89b4f8c11eec0fe2c0f8ef161f2bf7f565b6689f5978a454a"; + sha512 = "824b63c3c596191f1f1c60734bbed70058cb9bf71959dbba759a2b2e75a76d0b0c50ead203c093d568a18bb622372ae112ac22da0a33e4cfe89e5a42d7329b04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/eu/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/eu/firefox-59.0.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "d0bd609308813d99a79b393dc4fe0960da01ab032ada1d4c2933c89acdc7a1016ac25ca67205aa29106ca12b34fe7dee42316ed457a4e0cee9fc43e3acc2011e"; + sha512 = "01e0991d3a1926f41708353bd98e3aa00d3cc71dc7635b9cce52c3699aa5ee670818db76e9d82de4afce338165fa01bb0e88c3e8b86ab2d92d1b8d3845183510"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/fa/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/fa/firefox-59.0.2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "cde046bc147e860c40f979f8fe1bb39cc3391939f2b04f572d6db5a61be8be9574c1ddde1a400d16c06c2c6dd87a9b19830f2591809439820a27349d10860801"; + sha512 = "726100abc12832418c5cdc15b9e9083d88d72a70a0f6a1a567ce781173a554cc4495da0e53539185e6ec27143bae98e952a5002dea91fceaa5f8d8e51b6d6a2d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ff/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ff/firefox-59.0.2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "047d9b2af90da36699cec77ba419db42cf6ac63fd3d9185150973fa6aaa20cb4bf23538e50154f03bb3edee4f16985baa4332e247ccf7d756f358f81afb2c329"; + sha512 = "1a0d97e27008ff5f3bf3fe85cb14c303320a3015cf928b2ea4c2e115a5a1cfd809743d801157f53d6ffdfcc359c3738f2e2a0e12e5ca7ac8e3f2b93253654e8f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/fi/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/fi/firefox-59.0.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "5c2955e5c1e54bc0b2bfa08051ec61745765b7d9c970c7ea905e41d4ccb22b32caa3011a64a152d997db1f0b6451b10116060914c601aaa7a240f23cecff166c"; + sha512 = "ba0278c06463d0ef44308f46326a3fb9dfc0cc4243086dd9acb856e54465ad672bcfac68afd9ff81d08a1d0c924a044e0ac5afb299be9d06b657c159f6c8ceec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/fr/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/fr/firefox-59.0.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "e32448bc068d0c816c16ec1b4c53d462da430ca7ebca484dd363253e9d47277a0eb40ef0291b58e7dadd3457f49fd69d452c2e7728e45a1473472a2523c24028"; + sha512 = "bd8ca7884937574f0d6b4dc5399771135778aef06bd09aac275ca11c2a8dff580be45ffbea5ceb58f8baa7d7007587aa07c3ddedd407f0852c1a3940e7ccfc8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/fy-NL/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/fy-NL/firefox-59.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "9501fc459c883b3d7c3299243288aa5210755d78238af2f6d79e15104ba575b4a7cffebc9c067dc23bbc0941bc5f4a786909a194bac9f1f59244715f8b3cea2c"; + sha512 = "9e5fa467a99cd7a9ab102eb2a50ef14a4402d03ad3dec5b6d511c7da3843e779b1492b1ba22cc72f83070ff88353ffdbf1a9d26636462c0e3bdaa6dccd6a6200"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ga-IE/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ga-IE/firefox-59.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "d7696ae4b38bfdcd93ffc6796bb2fdd6b952a5892a4a753b0a0717c0448ff59263516896dac2830aabc7b2df5719856f077450d29a48e25fec77bde00cb25d4a"; + sha512 = "1226faa2c14196824f31da863aca7d076972a47d71a971847c09c66d268d07a9aa2677fa0a7e8f11f149b77261636d62c39e7a382db3abb2917bbbac74330d45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/gd/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/gd/firefox-59.0.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "ebe7526f32d43572538bde521b4df30aff91eb1a30148e20a164cfa044d7391bd7259486c72e68f9c110745e9013f36fa8c1f5be7519551c303cfdb06d4b6008"; + sha512 = "eb0dd803b7ba91574a044503d2edbf633e08c834f8eaa5e546975d91ac7254b3fd4357710fe4627d742a2ea3e64f568a5ef1a893363c516f958e4a153f528f12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/gl/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/gl/firefox-59.0.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "a071ecc811b90c102dd5c7b4174d6cd65e7e07bed16566e71740cc3d29446757f220330910aa3a321809de3417a64641ee74b788bd27975c7ad75cc4e777116a"; + sha512 = "e789fdf2452043165df90c83ce4bc0ca641366ffe5f89026bb763480973073d79c097313b744c3b2017be3d80f690d18459d1b8969538ce310b802163a2eec45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/gn/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/gn/firefox-59.0.2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "1bc8f57884cd4af64e1a99defaca501561d84a70aaa3f4ee71c3c1497a4829248e2f5fea5b09c89eaf8d3701fd4f9753bdb50f6133850d2baa1708e942d8281a"; + sha512 = "c368f07013b7b4fcc74e88d68a07d5d0a1fb5133991fb343d5b1a86145108e14a762962f3a3d5c7188d8cd75188cba7f26bee5555d3a5e7cfb9741e2e11ed42a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/gu-IN/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/gu-IN/firefox-59.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "230b2c609b5ff96385b93ece8ac197910fe332ca76300dada12a0687b025ee7781ded47bb1a13816bb2fbd6c7e250bd0af8f4b40dd78c1d75a77a66391d7bccf"; + sha512 = "34795309248224a31ef64cef9ff335f357505684f38edc06b9365dc0da98c5b96aa38f21e317e5f0cff0d3d3fa94ef7f8aea6c27f67501aeac68c3112b63cc43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/he/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/he/firefox-59.0.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "f52add938bcf862c8d417709298eae9e502aa5845d01a349b9a8d29ab790ed342b7bbbe615fee6db7e939150a15a2e46895d162544ce4028806bd68c0c832186"; + sha512 = "05e21abbec43babe818f28f2f12e55159e413b0e6e0871fee76f50c380085ea129620864642d3d26e80e039a50a8434015ed348c51341b6d87190c627b90bb82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/hi-IN/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/hi-IN/firefox-59.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "10406b782c3343fcb63420cf98690ac6eb1eaf9024eff226066587c356edf32006e288e8ce6373f6fc1475dd08c30da2b38cd284ccfd610c33c3726c91dc7691"; + sha512 = "f6964340a688305ac3855efa57280e3b5eb64f22e11445d76fe28edbe04216318a16c1fd02009b8a66ccc2ec689d8e0bc374e485bc03e964dd5b65ad27e535e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/hr/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/hr/firefox-59.0.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "8fdfd613b9ee56a9da8f8c1ed1e9c9a6ece04bbffb1dc197120c9d3aeef2c36d9d660a44539f4c1820273be91dcc30d89652a9d9ecabe9bfa88b146fdaef18a0"; + sha512 = "e0966ea4bfa256eb3a255eab7c89fc9073789512941311863199d96db4014f657acbd1e403a6a4dfc8165dc39d54fb1f9ef48790e942eadaf90f0cb7ffe15ef4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/hsb/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/hsb/firefox-59.0.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "4e1cce7f55a3b66b21c0f8f16661855b2946a403d6f29e3725aa300fce49bc065dd7719b9203e79b3ead73dc92220a40d2f99d9079eecc8ae44a38b87086394d"; + sha512 = "e8ac60e1b925e7530884777a4ae05037e5c577fe6dc834ff8a007f473846b052290787d3d2f0c19b56e573385b6471336208d360c4c13a3ea3dd686429c28fe2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/hu/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/hu/firefox-59.0.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "b636ff6691834dbab712be03bd3dfa92f8a0bcf5e4807ef77e81d0a602acfd1f5df37e0c5a2237518305e4a9150fa592204f84e93ef83273f84a4ec34f65d3f2"; + sha512 = "737634b022794a37223779592ec948015a90c6c96c952acff5821c3af9c060e7fc60c988f17d87d5faa822fb860e6697e233601c7fb910ab5596935fce12ba49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/hy-AM/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/hy-AM/firefox-59.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "909f565a687d6676175105584b2042af8cea66a2da1a2d529954c1a3f5f98807f655a20b1b16d1d80a9af05c02997d543055bd2edcffaec4fb0df0da6e610ab7"; + sha512 = "53d3a10011e8cbd22bbe86c6ed256775de580f7b8094ce30d8337268362cffa2df85267fe11432f659a012047a164a63d1c143014c0dd26ff865760119223f5c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/id/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ia/firefox-59.0.2.tar.bz2"; + locale = "ia"; + arch = "linux-x86_64"; + sha512 = "5d1ba2fa31d3c5ee692d3bf8ae0995ab166ea0c31044e056b4806bca141d34f93ed5117630c311c072d22cf65d12efefa812203a8237464cc9a285c236439810"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/id/firefox-59.0.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "1338acae5fb5d477f51d09c8e49bf29ea4a7ac1a86d2b8bbfd431af2faa7a2db19fe5ae61650127c0f10a40b37a464bf7c67e4a4d2930bdb0dd04160013f5ead"; + sha512 = "b94a086208cff6fa7b4b3f7eb4d681e77d2042ef1c6b21af322ef7316b8551344aa72c3d7a39b86826b8c6d69f847b9d20f60143a048ee28db88847dedfd1d37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/is/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/is/firefox-59.0.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "6bf296d0e64ded43518b30f2b064cc99ddad031e8ff6129a6a9bda4736e93cfee1d2a9c0df96e86754762cc0ef38fa9cf7d79caf154c1db8c5ba57d88abfce0c"; + sha512 = "9767dcbe58dd91364b313f4b7b8f85e1768148080ff97220fa1dfb3dc8d5a69e6fb8fbd607a92411d5f4adbfb856c101bc80f922b0b1ce8b63a79039e84c329b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/it/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/it/firefox-59.0.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "c46ab44a51aa21b23b50763a6f35c5418a03a847584a1aad3560f62a828d2f859c912ead26d1a1206cfde73d411bad31bc87f19c5203850712bae911dc86fa44"; + sha512 = "f8ffccb521f97f0f18f70a0cd2cecc1c31162072bbbd929a1952823275d7b7d07f36e64bf6811e1aaba64b880c432b1dd342483b9ad5a594971a0bd068c45197"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ja/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ja/firefox-59.0.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "4765ad23e91c8599b6d1144533b7b24cac68b77a91c197e6e505a3be0bdb74f60bec2c49b7e7338ba994619d3969c00e5b9c7ba872da4958be37ab69b772d786"; + sha512 = "bd97cbffe8c4c1ca0fd8e44615a6e04dc5929c8ab896952911a04da3796a9132f797a4e32ee262af7a2d8bad294a30e11349731306d86ad18200715408337437"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ka/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ka/firefox-59.0.2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "2a8aee12fead92872c5c94a319926aec87a95e891fa280588737b66814aa7378c5d7240a3c5f50145ff23c7673767037160d043b655b2a96ccdded6015254f4f"; + sha512 = "1b5a69053263a0571227e614e0ed05ca1cf8bfd7a6294fb82778c2bc99b209fc68b7d644cafa223686ae2a54ee125036a91a3a847a753c194982c0f2327b3b49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/kab/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/kab/firefox-59.0.2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "6518ac1276db195c2435160e619dbc1ec7494e51b06971fe409f46ead4af6367567a99356f6b5e353c024a8b9e51d2c2f99983d50709fba2e12342b0084c39f8"; + sha512 = "33805bf3976c9ff6699767ef69336f06eb86f08b540b54b33c8997b6af42eaac6be7b9dc8f29d3099ca9530209516ef84e819fcf98f3a7bef3e8d47be8d372b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/kk/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/kk/firefox-59.0.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "2d515605c00f1cf2e76b26dfba3d4fbca00da18bddc5ed39f66d15568b15a2bbee0f1676d2b1b5058e11399ecb3e7cc593ff040757fce76d82ca859ca7b9ce81"; + sha512 = "c2bc89ceadb7ea2c81ee2b4d72bfbeac8a34cd1838f0c2201d7ef0c819e597b87a935a0e6be0831b997ecd290e286de7a1c9b903a10daaa5dfc0fdec2309b260"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/km/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/km/firefox-59.0.2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "6bcba0015fd5753f7ab6725197fc164723d64de0790927115a0c06d0d1d92fd39bd41d83ffe59a5e9eaec48224c24e39f26cab3ac1bef6265eff8ad9a70c46c5"; + sha512 = "cb1919f31651b38a77683850077cccd73c27496e1f9b4354accfc35f294d479b92549ebbfa173fdfadf95b03bbb45cf1baa0c8a4e51f132448ffb9fb2293a67b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/kn/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/kn/firefox-59.0.2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "5fbbffed20a48328d2b199626a9810dfa6bf9cc84f358d429e7986d813c1ffa37fc95eb20a37b10bbf728e4bddd3ce8635c096b7fc4a4dabe462a32606a6dd96"; + sha512 = "4293747292be73ccf60a19744120f9cc13b45a7be0c5de4243dacb5a2258eb88391d6dc6b240420ca5097ff5f5e2d5d36240289f6a5c51ba7d0fd31729d342fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ko/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ko/firefox-59.0.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "2e7f5b385fb65b167ef1784288a68fdde29a3345ade9eb873a6e07a340c5bf76df5769c7771fbf9049eb31bfc5978e20c143a2e753614237b25a065e0735313d"; + sha512 = "1a4723d890649ae29e9030ed2fe3208e44ed10adbe35c25877003a6adc21e033278874241bf5fc971b93f94d33fb4b503dda438153a8bc80b187b584841423ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/lij/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/lij/firefox-59.0.2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "fe436e3ab07f3b139460ff385e73147572a1becbda1ccacc0da6a6cf1c49ab3e1424e9b9d8e26a14a2748e5ac9b0c67fc8970f14f5d64975ace3c6e9949f702a"; + sha512 = "564260546bc6436dc47ebe6b413abad6d2d25dd7a64d9b5ddbd52fdec49af951b9ce26f3aeccc330aa9601605bec7b3b1f8701668d2b01ee06a228f723600fc1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/lt/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/lt/firefox-59.0.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "b6e3d248f7a76c4a202c767710151067031e34a08ebcc460f4d6bd95fb395533414d6267daa1d9d8172097aa4ae0155ae693e027757c93b1cba50ad9a94f3cc4"; + sha512 = "0aa6b9bb99ae8284f7287def5048af21372d03211a279f2226de7a739523fe189b3e06e207660be7ab35751b5ccc6aaa1b53dc293417971300a4a8e7cc162b6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/lv/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/lv/firefox-59.0.2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "7bd3844aedf8112d396f07e1d57ec915e48bec1c375c8489057d7a3f2aa5f93c738d2d361848b977243b95b79a821848c2b27b3117a26fce9054d26e4621522e"; + sha512 = "f63955b57e40d2d49d5d1b276ad5b2bdd5122daf476c560dc64e82afa36e4a649e384957c69609e74ff96935004ddbd45c8043a27991d082e59e0f42e7221aac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/mai/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/mai/firefox-59.0.2.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "d5e6a53c7744ab267404d9107665e6f55acf584c11123d0e9b4a82f6572ef815fb87f52ce9e0be9352ed7c4af901819fa186ed57e4a313349ddee680727b0343"; + sha512 = "7e857033b14656e972ecbb6f60454cc63f79a9c775bb1fdc669f44af3bde4e1d04ceac3f7028eaab17fccd8136c417d937009b6fc0e80c45200b279660924bd5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/mk/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/mk/firefox-59.0.2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "7c49cc95a233c4662265e3fe57e87f4320ed120309599f0f78655a9e70b87ae36dad915afad2445cbf55c84e906c3fd2df4b7f84db59323f4629f662f6f2af31"; + sha512 = "8f7bf3418145af3ab47372af8e131b4a8b350dcfa8a7f74720a96812563327a4e4816976c2fd655fbaced91fadeb98489bf0fd043e103e5e0923b9c2ee408188"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ml/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ml/firefox-59.0.2.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "d1aed7e78433d3b427c215ed0b2c8455a8a0374bd4e2d88d7dca59c2a3d0402ce1670f1dc1c8675cf7953416fd4be584df59ab646783240f3aef14cb9474c91c"; + sha512 = "b9e65dd54f8b4c1da28f6079938320f9943ff94ea0a0a7857192805ff84b53e7de6b762d05f8a66b6dee9f8586623932c5cac7163db2829fe41a13b3c73c27a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/mr/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/mr/firefox-59.0.2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "3244354a154372149da8b0564645ac5b827176c6eb79a88a2a182d2ae7a5e320fc1f843c1576eee86dec62d2866f6648403bc9c687322eade1f943717b655771"; + sha512 = "80e20cc4d30dd2ce2a7d5c40b4c98271a0c0834cff7bf201c3db8df4bece056becbe71dce7056d24b837d16889cb15ec73be7e853384d88447d9d00eada4fcd6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ms/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ms/firefox-59.0.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "3f753476dcd5f128d7a660dfb9e1003f706ba2b2a135df629bdd68c8580e9bd47f23b5fe3ef77136c8e6611f434bc502f96eef4b7f7d6185ce7630bfd1f32e24"; + sha512 = "ab4e6a3c244a7e1c4683f58252d02865cc9e8be51a2fe189d8bf555c968260dde63af130a491a8c3b093776a1d1d6b883e32b4054c19a20a9d1856685b4cbe35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/my/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/my/firefox-59.0.2.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "b83f6807c08c08e7245bc1c5309e2bb2d3d434a577f672a9ea9e95017b61993acbd0df9c339a4fff4c5e65c589d939c57477ba206194e7d09ff140a8882d2e52"; + sha512 = "aef82a1dff4adc9d93c967ca4fa3e4601772e8b748c3d41a08d2893667bc661a0c640b02450bfa647d35b9c097919ce90a4a4034f83cf4ec51d2341651205aab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/nb-NO/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/nb-NO/firefox-59.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "e59931df86dff00b3ee55f93b01e4828a60de0f693de412c4825dfe7957c0bda8b9644040657036d5228fd7b6f4e3a93273d561f14fc5e9d3d81cc5c708f0f84"; + sha512 = "edd9601c678f8f551fa379d7f3c31d2e4c68434d9d3401b40f2945622e6c844993fcf3aaf010ec5b3bc13eb8c8cbe951d76b66a908b4824526b8da368361a347"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ne-NP/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ne-NP/firefox-59.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "4dc88c6895264f50639e17eddd5df76de7689208d6094b0d4a51586fa45b359a0ebddc2d58cffbb952cda0a3c199ca287dac278f2a9cd517b923c60398fea449"; + sha512 = "6d7a5d81e0551e675d8dee4be7fc0b8a39afb37b74949d408f197562bb8d7866706dd1b9fad60de4410cac9bc91a4ecdb92aa75a60b2fc2e2b7cc51fc9e46c60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/nl/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/nl/firefox-59.0.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "30f623d07fba2688b8f4c4958817ca208bb8981d1c5a64a232568c301aa8b95dec9406bc064b5c629c357381b5c41bcaed9d652d7e25b3a4f537717d79302361"; + sha512 = "3d4c3714c7d1c7d4865bace3827df94068bf0cfa4037af130cb7ce0a5f6cf7eaa0e37d091fb36758b13f52a5307288e5480ddcae50bd8645cec527481c03d7f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/nn-NO/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/nn-NO/firefox-59.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "ddb85b71a86ad20a363edbdc9e0e79f6c485b4da02cb803142a717d297e58c10a4ada476a57dee01d5834246a53051b9e65b95eafae081b5b43648b2ac914acd"; + sha512 = "753e792e3402a5b75043899a5f50f5926ce31d2439ee1eed16193932e962338cddd974194ac94f7aa1ef0df548d95f901a50988abbf9f3e9820f89ac372e39d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/or/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/or/firefox-59.0.2.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "8161a5ccf70f5b370d1bdfb9b849a2761eb4c25f6d821d39e63f45cd29d9be82be81f523bdb9b1f1b2ea134a8672b9153ff14ece3af6ed7e5a2339c9a43d71a7"; + sha512 = "ac0068afcdd2b6bf5416298e1be065387606bb0b79cffa364aeef9011535ca5c155d1d28fec0715a648f065628efd2c847f47785ac7f27415ceda1902da1add8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/pa-IN/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/pa-IN/firefox-59.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "fc0424027788746b0c8b68c553b7d989e60af2a29e4fa733bea440f31d277c1e64fba06a74c915986dfb3c8da13405689121a8771fb0a47f091e27185cfd7a28"; + sha512 = "fe77072b374c34f5026de80ffae16fd4b30705969a795079ef9e81dcf66dddddfe01287dd44bb4f0001427935671d2753d22a8b80469f9c4e896e215400dd9f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/pl/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/pl/firefox-59.0.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "f39a26cbc41739b250bb92bf2daf6ba835639e5751e1dd0893013e1541ec43de7e747b3ec754894a56362263b3ace8d5f105ace5654c30657ad9e44195cd42ee"; + sha512 = "e4b05ab04418e65880f989d642478023bde4ba5ce17627f806b223d19005b4e6825d8a9d5c532c878a397b3cbd8220c4aa4c2627b17b83fd6f4acc395c0a1923"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/pt-BR/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/pt-BR/firefox-59.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "2d3fb878c286a750fa10413545f0d2ce5efeebea5f8c4192dd5b53131edcaa6a54940f242ea002d9a79f41a14e70095cc79526773dc95d3550bc0e0291185a5f"; + sha512 = "9d67c1264b90dc58ac62fa094792955b75724791b7941354d5836cecf2c5c13ec279cad12f93287e524f0f0dfc2302f68f7585dd783998630007dac806f7e2d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/pt-PT/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/pt-PT/firefox-59.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "a2eb5b43c3d87ea8193fdb1f0ecb0e1a317a71f10af4f3184484536dfc1f7f09fdfb498bbf073f68847f7c2cbf9383adf9ad9e92371c8a835e4e3651a0546ce7"; + sha512 = "a241e003b6d1a3537b5232fc793aa6dce194433028987753bbeaa5c21cdec58b326e12bd4136656cb35bae3cdece5dac100f912151aeee7548420de2d3875e93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/rm/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/rm/firefox-59.0.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "8dd38ae11781013a03fae2b3cd5fc1b033c45050ed4245fca2302e1818135f1e754cb6c8ecbc535d253104ebafc0792dbabe78f7f336f12297b7b4b8c4a9f2a3"; + sha512 = "87ada5bbfeb43e3a42f1eaa44c58e025f66ddce965e1c97de8ca0df190ca18106eacd2d1f28c959a104e79df583672206c047eb79c51a32f431f8cb6fd68bccb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ro/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ro/firefox-59.0.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "e9958818254c1b5577a83960e1136541c8ebf2cd4f43ba06d73c2e40990fb6da958aeb423c640ae988057d3782db145ba8e8cd7816b8aac8dfb7f58c2eb0060a"; + sha512 = "97c5d69e1e40bcb779ce058820b0a4afa4000b3c12170c63ecff1ad4b5994f71ddf36c49536280edefb971fafa6be52a3b436a405ca9a1762aa08d2cd61022c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ru/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ru/firefox-59.0.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "abcd9a548335648d84ed3856a89275c62ef7d883e18d52dca053b4d8f80deff8fdab7336a2aa9382e55e110ded2d4bd9cf147b3f482f3b0ebb972ac696562645"; + sha512 = "74fb10b42eef3a2391aeab0e3dd1ce463b58cadba5c42e2fc8a5e0bdb1f9df122aec65a662c9ecb8a14b1ee76bb060c64de93f116a37d207b4cc0887ecc0e2bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/si/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/si/firefox-59.0.2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "53a7b139ba28103b88359eb450c033fbc8bd3a0c95048aadbd058e505ec85b652054968304d113826a5fcdb6abcb47e8498d9750023a899fd83d5c0dc8b3ed63"; + sha512 = "d63503345ef7896e9d9a3ecfc80395b6ced67c38b02c19f7afcf94a9efde01f3ac53f1d581b8151d78eed6c7f8eb69f9edccaa3be49133aa3abf2a1eb759a02e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/sk/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/sk/firefox-59.0.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "05d4f52e87bf24884caa888c14dbb6e46bce2de967fa4524090df63b2d9f2f4f82b926842544d2ce7ee46f0196a62e8dbe26e7b07176f5c13886ab2a1b2cd184"; + sha512 = "1020baafadd4a1de8118bbdf4e281c704595730937d3aca9c8185a6ada54f4a72b8efcc7c493200c32a6a11e7121ef52d7aace68c47784eb5d17ed7fdda32d60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/sl/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/sl/firefox-59.0.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "655b4fae25e42cd1678e49b555508ddba2da83a24f04d7d66f5d25a124fa2818368adc851258dd78915a2998272cf8e7bb7a5e918e01228e735d3ad0caa8edc8"; + sha512 = "a93e20498b5b3a2b5d19197bbeb48c4502217e44a25c48372f8855a49f762e89438262ccf5dde1fea24af1199bc8cc5c935b1bc886e0bb581d698d10a59d60e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/son/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/son/firefox-59.0.2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "cb555d1465c5ce0a7db10e5117081e682425aaf00221b93a66d23ca9217cb2cd2b3835007961f572a39d93a02d12f9a62acc75f1ce3d8c3bd6cd057afd750f79"; + sha512 = "24411644b553e6f3c305b8a893a7bcd4ed59568a6fb7001b999be114a3e88f30d40ac6f3351c28b3287bd2a9e6aec461c54433caa45fdd349aea07e83401fc2f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/sq/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/sq/firefox-59.0.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "5afe4996a2c66d220d038cc041fba4a3bb5e411c0d1c4962b2a3f28ee16c5f23d1d8609a7d492a10b16d508c2781b7bdfb884d810ae5d8c5fdadee8120a34659"; + sha512 = "40ec8fdcc4fcec937a710e5d19077243d0ff5cd832bd20365817e4f4ff1cae5eeb2a664906ce7f60a5184fb053735df5825ffddce41276797fcce3a11548f4db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/sr/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/sr/firefox-59.0.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "641e3173693e73018154f5f3fdeefc0b0fdc0b1939ccac19b73769476a8827b7244a4088cc83fc651694e9c82fa5231b114fc05c80371469e63926494906aa83"; + sha512 = "e538596cf0de4a9d8af4e801d7c17d00c1e63c56775cef0d087a77e320cda2269cca74f0c73f679208a184c6cbf4b20c56d1d222e8846f15fc4a91c16ae3ea5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/sv-SE/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/sv-SE/firefox-59.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "873f11216e002fc9eb4bd6389774c21d1f3aa17baf0f38770c18db541b30334a84cf2c33b478d009227b1ef48a7c45183d7df9991878daee78c139f6964c8b3a"; + sha512 = "3466f482ec04f5e8827f437c9456908f04e78c67ffd299b841f2f82cdc2c38a61a566c8d85405312c144aa5c45698b5f6e81190aaee739adf4384f95c81f9e76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ta/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ta/firefox-59.0.2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "1d91749d41fdd5d5f3988803563e083f3d65ed6c70fed197f38fffa7847c10d2b0f355fd46a1fb7f84d8c94dce096d2b84ff692fc6f5f33be4ee1dc63a4efcd0"; + sha512 = "7598994ca03afb1c2933b640298453a618d140791fe20255789081babb0d9788c4f3ab34d5ede82e1d688f5dc0486fa0f842f1d125dc5a955580d14b1efb6489"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/te/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/te/firefox-59.0.2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "2b779beaee906278903dc12bf679f0d8ed51d622a1f790a956d039faa71c11abf1b4d462527e330dfb92dabd87aaaa70b3d84a295f21e1a701b4a308c85dc821"; + sha512 = "759be69dcd9b795f7b1b8192928e27799061d83d86e0234cd2a1fdda0d922a7a9d958b19655bbe976d409297f2e2fb2d2a6a525f90f77fa53071d510ffdc6438"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/th/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/th/firefox-59.0.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "82bf20ace51794807f6460ae4142869fc2efb1b4bcef66cc5d68fe8812d4cb89578a45cfe0cb7927c45ab0d1e057f30d4388093678213187bbbb6f209babad2c"; + sha512 = "a46d7eae4a2670615e100707ec3e340d48502b63d6f6f98d4a3140c1bc9d0826b44001bd8ef940c4e786ba5d3f8a00e350faa18d30fcc7663f9c29f20e7a20fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/tr/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/tr/firefox-59.0.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "65766e0207ea300dae4d95023ddc732cf5f59662a894689e87620e6e08a3f658234293b666467eb1f76afffda29716b128d72286b1c9cd68cf574f7121b71792"; + sha512 = "ec5ecf9c76315d1fdc508c94023cdd60edaeba44ef6ee49859ba0689413819f11f54c9ba787000a166b0fd7f628e3c2b42f42c9014f9e7823da257d0abe88cba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/uk/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/uk/firefox-59.0.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "01aab08b333c16ac7156ca35580fc6502aaccdc269c6be29e20ea3ecf97104a3d0214d16bb65f1e3e7aab5b17ef3c637d948a2767594c36ab920c7086e11607d"; + sha512 = "430cbe8281803ca0a4e124fb62a8d2dcafb751ae20441e22dbfd45e544cf906371eef4889f16df5c1be91a4eafa193303e053f75ff15fbe82a836df3ef19a5ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ur/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ur/firefox-59.0.2.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "b282916667060259bb90452d08a2bb65cb1225cc45494c2c18c4982e710abbd345744b08bb9c2bd200073c2b470c3b3bddf7f9b6d652563e3c4a8cf6a6248391"; + sha512 = "b293eaea548f8d1e96087e111e96fa35940254477599a3c2aec9bbe005347cdcfdcd79f9e3e6d22829fe52b091d6d18dc04ce768724f9709a6e397838974c45a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/uz/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/uz/firefox-59.0.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "9339ec640a3d4920fba39e69520477d9c00cdda5f1617067f19fb13b1c17cabd1cf1917001a49604686cd835839adcf3f206dcde14e7c4a98d579c7d8a19386d"; + sha512 = "dc0a6b771469b89cca470a50afe47c642fe6bae284599c876c51c2c5834147cec435508c101f33d76d1e4ce5760f52f3a59592495c82db314de426a9602097ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/vi/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/vi/firefox-59.0.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "c318398809637623e4ecb187f4b531bfc1b9abe093cfecfefe2faa75990dad09b505d8f88e2556476c92cdfda491161af8e7fc27c68c8bbedf5d4abee8eda941"; + sha512 = "6f7b9acc584e41be34b884da9b9f2d7aae602958cbac9843d73dada11d1a584101e603f9111c24983dc3ca0b70462091cbcf755c93b7811469b179aa2b3ecc60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/xh/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/xh/firefox-59.0.2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "08caf6844c3900624093ada61c92f7c74dc5533818745b8e85b15a093b640eda9686bb0d5d86cfec0c90df49e782c942693d4e0a169b7cdfecfd13827ae27ea8"; + sha512 = "7623715582708bf3e18ce924aa6e1d0fc6c8bf38503691d3ede092070860db3a116b2f39ee1e467d286e0566bad594679b489b39d2c5b5885321982689b8a56a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/zh-CN/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/zh-CN/firefox-59.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "3046e58285f220ef7ecaea81c44063b8573f59ffc64dc12f698a184ad2f11bed3a4cb5d03a2bc105083b0fd84335d7477f81d3eac4bb28b961d38d9c886a9376"; + sha512 = "9d0e41df6cf6a7244c4aa29913ac664c67463ad50b91ffa1e7e345601eaeba76d8553523b322ae477ef0f0c5fce55ad2e1cf5bfc5fd777d9433ebedcd2474d98"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/zh-TW/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/zh-TW/firefox-59.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "cc453128e4720181d147552fe2452b5142b959e3e0cfd3e340159def69be169d272980066f9a34206da5f815ea54b8e4a062bf95ec4b1cd7ec7b3b83e2ae13b8"; + sha512 = "c65832ecb353527c6b9e11dacccc9e3d1cbfbb16db1872c8afb4472f632a0e2b4f994af43144e430aa8c8ba6aa6a579d3c024c9111fcbfa6531a4b2b7377414c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ach/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ach/firefox-59.0.2.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "c26386414dd416bee1e4fe505da524a4c1de34ba8c25b2978a20c66a09f8e3c7339dfc4b5fa00f0d2c052fea1574e5ef1a5d74e67d39c7e717b54439d7dbb852"; + sha512 = "468b25a5e90b385514b0f486bc3fd09a1e7c8c7230b8e31b04dc4bd18027396078b525fc5b51c9747e642d1bc60be49a7e2cfafafd528d95f08033abd12b0757"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/af/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/af/firefox-59.0.2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "a8c4485e579f127882c0f00a4a90bff5d02bee5f28642257bfe0d6638fe9156ab10a00dfd48052aa4995dcecbe10b7247f1d4e6d9b424bf06e431a782b46b95c"; + sha512 = "a3b92e792d1ef58e029fc097eb354940094c8a94da97dd39b1f69610ffdb9a1a6527b01da2b6716c6c199d85886b6e05aa084bab30f8a2d0ba33ad4c2f6c36ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/an/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/an/firefox-59.0.2.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "29e91d4e5ff020241ac81b810b893bdea9fc194090c78fc857d507d7bec8651f15a3c70f3fc245f0d5faa21a3cc44b6327c1a32444eeff3ae4d93a723e230e16"; + sha512 = "9fcb76d123b657b9eb7c62c53c703ea27afa2f41b5107cd67dc01923ffb9dc6d3f334f5d801058f05925b18afea289eac03dfc3c2b188bd2059f4dd0c40710fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ar/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ar/firefox-59.0.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "d1d936284a12f1718b69b279334aecd49a68e5dbabc65a5ade2af277ac7b8ea342ba4b580df95040ae057525d28a7c1852222ab2bd273c2aae74409a5533f74b"; + sha512 = "eee65b88c2269081dd04fbb37d360b0738e6527581e60dfef60093719a3a15b44d0d594321b4865a35784d2f378e8d86f308736d8be76c1cb7d39152b916bbc8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/as/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/as/firefox-59.0.2.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "49f8e1e8cbe6910a9fc8a812b3dcb7e694c2785fca1c65639d70a5d0fc82dcda9630a1e311df9bdf148d684c2173c761b6aa3926a425730dc35fe99b14124992"; + sha512 = "f2e54d00258b6f1c55bd8a1deed5e9c9b1e6f1579447ad832f348b50bec8fce66e50c78b2ee6e05c885359a6b2b1f9d298e907fe99478536967103708143f24a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ast/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ast/firefox-59.0.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "a01eb17a9952055aedc3eb29126a826ef812c75f5f5b5a22af3125ab37b63e3e0ad6de0a5f68d0a5bf0b3d1c8fb1f721d4331f1afd30b6a3ee94a502d5931ff1"; + sha512 = "4f23798708447a4a3801b392a2ac27207df7d2b722291d3836163b3900c7745404399cb700873cf6afa70121c429ba31bbd8b0b1f597e8c91b2f970d0d6421e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/az/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/az/firefox-59.0.2.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "7117993a67c2d0f3c0438afcbd87f22ce141063dbc66a1fea997f5145603f8e9d28b62473add81475bdfbad350d6e683d0c483ec2287f0a47f4e9b3bfbe92ec7"; + sha512 = "2f12c45870d5ac1a6baea455bda954cf3b112b0a3b46249a23b7cfc064c6eb00cf0ed2952deb220777cc084fa2345368b95388e143dad6e45042e7863c6c3038"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/be/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/be/firefox-59.0.2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "9b3486fdb08f0aae375a74701e7904dc13b1e4db7a1489c4538d523bd4af91b882b9785fc4fbc3da2f6ac67745216ffaf7c48c173f840288c6e39b2fb8e78b62"; + sha512 = "f70af6a6f464b6098802e65226b198f670e5d9ecb2fd56f9c375cabec1e602211c4cf7d80e430f961bb56694cb1d546aa116c7a5aaeb06d13319ed41e3e69ddb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/bg/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/bg/firefox-59.0.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "a917bd437926c8854786b4169ddb2a132bf4ca0e51c17a99a3cb814a1c1fa7fbc7c2ca46a0c7c91ada117ce4b2e89c955e1d60502c6eaefc9c57e0011459609e"; + sha512 = "87377e96a52ed8866be4a3e6ee9c20c6d8acfaaccb53de0d2a4fd553060166c20b3677a2cd3322523f3b3f7d03618e6a6c27e485113184698207cd4b88b7e699"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/bn-BD/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/bn-BD/firefox-59.0.2.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "51032301e619fdf9e9ac99c52f771e39425e9e8f063f71c491f0802f02993bda668e0e18196f4d10125ffc66fec760df0f98c19713f8b54b5b05c502067fa4ff"; + sha512 = "0d275fdd76d8ee85615f67a11ef46bbf8b718c54a09cf6f3c7f2336098e0bc282caf429a4b228e31e7c3622be41f41384af174da9fa856fe36dc46271f55ed1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/bn-IN/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/bn-IN/firefox-59.0.2.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "b76ea76976ade5df4866c2c54bef553924ec9d3bc229cc7513530ca81c4c4e118bbbbadbea8a64f27a061d0ccb061d7ec0e1a398a428892a2c59761b0a7392e6"; + sha512 = "b77374481f21f37e246eb325ee41202fed9916ce36065a88f51e28fe5a015e2df341417b3420d2bff0df93437a56adb4e1fae0422bb094918a19157c655fa34d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/br/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/br/firefox-59.0.2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "7ba73fb0068862700bf64248987796837c44bb59ffec052638956fe205bb52780bf2ce9bc6b1a5347b173255e893de8b9380dbbb245d8a3552dfd1a6fb73f7cf"; + sha512 = "ba071fe6a668ebc7c00baec930a568a90d03c866a0b5f0011b25e8427f40fd32d54fd770e94610da43775a882eb27eff6359c67d65670fa0fc6179e788cd1394"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/bs/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/bs/firefox-59.0.2.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "5f2aa4be25f279212541716777012f87f5e65a57deb3b4dd84d4187d84db80ef3f8dede2adf971dae1fd9f4e6398db81f956f59df2f51f35f1893f581266fe0f"; + sha512 = "de70dff3aa71422c96e17e637bd56c18d4b74c8cf1ef5834f1f077249f6d7d1e95703f55063737b464916b2aa87eb4469d197e3fe772d168d184e72979712e65"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ca/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ca/firefox-59.0.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "2995ed991ab118d5e318f085a340113a0e71801cb2b781890dec674bf3a8142b9bd8b0bc23ee23bed72b1b7bdc7f0181abd4f4d23fc88b7930f710934d2943c0"; + sha512 = "e197d847b044a9ff4e09b67c64a2e4bca5eb2a1770ed4cd9ba965342106b7ec809950d611367308fe2c556c4b413640f050cbbaa00532402d71b59d51c4b60c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/cak/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/cak/firefox-59.0.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "dce6a70f1c59b01a2d3ac65c6f44adb9baa8e483dba84989e40d7388f9ffaea894e3107cc4a82ba6aa730770c681bd73b50d0ae2f248477f0b63192c45f142d6"; + sha512 = "a716ff884d1d5260b9ed830877223eff731ad301c1349c9f1dcfea5b9dbed0770269c27aa8a336516270386c4b896a87721e3a5e433e92bd579e0d88311271e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/cs/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/cs/firefox-59.0.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "3c84b185de63520d430ef541cc95290868fb8ccb09829ef8887ee0559fc5da8182e890155e3d1bf4e82966c82837d05253fdf2d2115f376c4bb0d09c21cef339"; + sha512 = "d66e5f440b2bcece18013499129462ed20d85d9b27ec803ed27bb7d4302d2369331b2320970d256b6e61ba77d93e362171ed012843ec926047c281223218a25a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/cy/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/cy/firefox-59.0.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "1561488521608643f3ce97da23052b8e968c1b8ad7ca38b966fd088368932976be0f503942ef65617248d3ae572afa4ecda3499c427845de32572d163d577c9e"; + sha512 = "87c2c1056bb56b5fc3d1fa9aaf8a1d99a5ad5558016b3953d0dd1f7c70b989863fd1d66f6a8d7a0d14fff351dee8f436b89d5dc593e610721068fe187055aca4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/da/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/da/firefox-59.0.2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "fda58e6fbf5243d5fed1b386ac8014efefa856ea3f8cdfca4e723f646dda2a8825356818bc8f06183a57337a5449ae3907bb3ac4c81bd7f9590d94bbc32749a2"; + sha512 = "6243867a2a5a7a30176c4698888e7998c35ad84790a75a86808e6490f013990890a8137579928573564ac7dadaee6efe921579423773a0c25aa57db17a216eeb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/de/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/de/firefox-59.0.2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "d56395a97002f31ead2523179eec912dea7035a86c80a8788b21f272c6e6ac4095caff5520feed261f5ab5a2a2366cd12e223b23d276e01d1ef318b8c15db860"; + sha512 = "d21c6a44def103db09a072ad72fc42d3876fee9095c5b660fd491084301e2d3bbe383b4c7f9419d666dbf280bec59743a034b4f576cd618142dc7f498fc69e5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/dsb/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/dsb/firefox-59.0.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "97538fdf8a2a1cc3c485210583d9c80db10b2d599d2b34bfffd5e3b29c092a8573f100cee5c69dbbc69fe67ba6e2c648715fbb9271704dc26e6b2fa98a8512c3"; + sha512 = "34446bdb17e81da9ec3689eac248b2ca0fb11ceff7a153bb502a5e0d62a16d2d4a090f9a29e4ff61ae1f87ec68f2fef94be53895a409678d14ad99331058495c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/el/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/el/firefox-59.0.2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "4a12302d67b830098e74ecc5a2e785829c1602dfc3cdc20c1e4be5a2e58854128a68ef9fe459dc4baf7f1f87e8ac2a065061a259c9625f09098b364c6d12a393"; + sha512 = "f5d73ccbe24e30eed81546b6132dc70f08feaac68dffb749ecd7af14052b343aaa4de7bf0ff73924b28b4c5b86c29ca1f6a69caf85ee77d4c4088b925547825b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/en-GB/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/en-GB/firefox-59.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "0ef9e96b43154f3b6d8e620183c092d38b8a5dfd7b762416b090e2754baee4564f6876bba9765cbf7499f5c658f2d352bb45769d852a683fd528573b53eff2d8"; + sha512 = "4dbf56a7aa86341c2d08b799d76c7e0dde04d418539657f74e18a088df29d390ee10b60c1b9625bdf46ffc4f458b6ca3e86aa93b1a2d948f10b7d7bb6ac250d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/en-US/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/en-US/firefox-59.0.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "05046233531db36a9c9c16cf6247401ec662254e8e1b896abf557bb2f4043ee2ec1f83a04c9b1199877d66b50b41d47bef1ebe6236e21998406616b8251001ca"; + sha512 = "15e93c9d069d0e4761520cefa508fdd7e06cca979ddb9cfa1762d70d104f5758fdccfecb531c6099f9372f112abc88dd273a29a67f720cbfa1be5c440378363e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/en-ZA/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/en-ZA/firefox-59.0.2.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "7ff1777a3aab71e9bdac1d41f777837cf91ca5f9ae353e6289812899fd10a4f58c13938cef0f33cb3d3a0e80b42c70034f7af22783e0b22495fe279cc497fa5a"; + sha512 = "772ca9b0318e1175e455d2243ea537a5bfab8d84541a7ee306b3670084240b9eb165935f41ef874650c3b1f5e4632ad2d5c0bce3f29a05a0676ed3ddf133cbd0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/eo/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/eo/firefox-59.0.2.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "3b4a8b0fb29abbebb224cbdc4dd9ca62457d88394f653388915898fba9eed6d1cbed43f6b8fb7bebbf18963d368fbea6aeef5bf681c14d2d5e09747fbd42fbe1"; + sha512 = "cc3c98e80c343b065ac8f6af6875d1b2146113303ebaac42c5866d03ff254aebab2cafe398aa1fe38ef8c9d4fb8ece87345e09114145e06a2a7d6c783f1ef601"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/es-AR/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/es-AR/firefox-59.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "9409072b8aaffe4ed914832d0b545fefd20b9930e0529c38255f19a0ad524b66127d9704eae2b8623696560fb78169aa66d1b5bde358885dad4d00e010189841"; + sha512 = "fea909cd16c4558ed05602cab2c3a22186d727da969143b77deb9515ef4d87dd41e59e7fc6a322e924f0b809b6205f37297576106a50b5896b4920cdab2e4749"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/es-CL/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/es-CL/firefox-59.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "0bcdfe996b3a8f4810d464bbca0690d12f6262032a21e0716f86f793faa4e707d3c308e79aac5657d619ebca204d5f67667c6d3d09e405e887c338a859ea1faf"; + sha512 = "5015cdb3a1d803abed9a143fca7a118a239e37a38a65898de7ae60981066113f270260fe8e9b83822385115c2b5e378cc58ed68949ef6297e0f7fc1e28c9c8e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/es-ES/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/es-ES/firefox-59.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "1f2aa1ec1c97cfdaff07b7aabf75b5e1bfc628fd8ee71c988af5471e570574453889a7bf40f9d3a4ec06889a4672518c986c3bc6fd35d7436d45c5c74507d801"; + sha512 = "81fe49a2f31913c030cb801180daf730855dedc5f6adbd39d7d1d8a4b359a3aeee063d7fef0ce35641f163f5f8c965603bc549a1ae3b2458682c390d16a0faf0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/es-MX/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/es-MX/firefox-59.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "366dc93d1e6508b00987163e44ac2d6fd318bc9c80487a13d581926be7d3a88a6fbc6438effcefcfbe6a1a9794f2a692c385fec7503ea96feeabc5fe10cc7a4b"; + sha512 = "24bff972bb2f27530b18cb7a640f2f85190977725cd82b1e86c1b47578f1d3058fcb7387d19cb2e1dece49b72c17048829bf6a66aabee2592a4b9503e3c4e546"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/et/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/et/firefox-59.0.2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "82b25a2e1ab4d61d89f5944495f69fcc7db33b3a7bb7822758b588ea7c3fe9ce3d728ba838760b93975cc52b105de77cd980d20997f642839680a20ccd5e1d4f"; + sha512 = "d60b637f9d78a2b9e53dbab8e6db27aafa701af3cde841e056158d3de53d1c0c1032c5381f7c388edf59b1476078e0dc8166e82f39f7c006fc28c5d897f0e1b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/eu/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/eu/firefox-59.0.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "6eacc4b6069f6bda6b08fca871c7cf08bd666f974bedff6c511652801e3718ef60ab97425c8ce6d1cf5aaac1b5b9a62990ab086ebfd9e76f646d491a19325b34"; + sha512 = "47ed51fa6f27e8b7bd9dd0c3556af3d85e6b004d5c6a5868db8c844ba97a06eba4d3998295058ef92c4a49dad31fca0a3c24b19603e1fafccbf6b7d461596080"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/fa/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/fa/firefox-59.0.2.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "e3f4c57555c415a4d3830a6751c5444e07987fdf85ed0e122312bc4bfd0fbaf841cda7aeeb6aa161d48070844aaab316ffc163755481479f5d421ab8967aac15"; + sha512 = "8919e1daf708630e397200f09b3e9810b3aa40feb87769af5e1f0ae44ab49c63fcda1982cae5ac4753c600164b34f533054e055293a87e5a8fcf55809cda61c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ff/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ff/firefox-59.0.2.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "695b44de161563727097da1d969c0a98fdbda51613ae8631a757410a502ab25038a9c356338b1178f7d35e0110e9772b3e2fb705e20d81787317b528ffd709c0"; + sha512 = "b0a6f5a974750f3ee5b485872d1e7c51a3d894c4118de139b718e85eab94624be302ce2603233fdc3a75df3f12242d4d57c9a96ca1f429bf9e0613d2b299ee86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/fi/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/fi/firefox-59.0.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "1227a6e57a68c0ffc60f6d9eda20a41fe70e7da130bc705fa15e428539e0380e1f65739e791ec699f216588ba54e558ddb6242862396837229c3ef3b028a6346"; + sha512 = "7dc300de36cd860d566a9b84de0ce2c4fdd5eeda4bf641a45e40779e98087c7dc881d2c623c99f8551c08bc84b98b1ab4547ab8144b1a22795710f57112285c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/fr/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/fr/firefox-59.0.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "c15980e0a1b4b9709416d362e36a3dab26502af4788b7c74d68e0ebd2f3ada6039d10af1e1d49885604c4c3b41356519e53c278f04b14729502d8044bc106384"; + sha512 = "ff793e4873e8895259b2657d613513404953d27d81bcb0c26ac97c3c2ef2c1ed8db3ec909ecb744dcaa7d194b4fa0660885daf96932270f1382742dd55e0f5b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/fy-NL/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/fy-NL/firefox-59.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "dd38e22a986b558aea005900c2da53cbf28ea68a77bff428aea6ebaa09318439232cc2d5c8d0599fd8512ee4ca2488080297ffa61f2cac9547fd5257a01abd3f"; + sha512 = "cbb9bf54a401aad2bc8bb869f8680ee4c00e5ae206ca9b7db732c955ee256e4ad226ccb8ffa320cb3e08aaaa787032b3dbed06aad548e733ba43ec87ddb52bb9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ga-IE/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ga-IE/firefox-59.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "97ff02536814db1310bcf53adac31fd9e84a5e39d58f9d81dc2f70d40e6b608c450dbdb38edc83abbaeb0535f1a1c0b1511c77a161e6d0ec22b8cde71501be08"; + sha512 = "bdfc3de17be432cb55219bf3f2a3d1371f3fe4776f452a0fb37ce4f5259fadb46487778ec63f6065dfec2cce43758be2e5ed8c5f75394f1604f3318e96f56363"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/gd/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/gd/firefox-59.0.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "7e8d8dc8c341ab3990b550392f92029b70f6d947119de13843e11a8067c2edcd10a02dc088396beb52b1d069e8f42732db8c514f822706de3f309061e649caa8"; + sha512 = "008548e75853625b690bd92e60cea25c1d9b302f7f78f42fdb4536413c10b8203f337c8384b45c3c9b729e6541f57a22e12ba264594ccfa82742373df571ebff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/gl/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/gl/firefox-59.0.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "31b57462e13e43e31e0e9073b353e1f5a3c32ffcf5c5fded188a1a61a973510479d5e04dc26437eba5445baca51f82311ee9470e3bed9a6309d40cd456da4763"; + sha512 = "212ce344a4592ff36006e4671c29b7a4734e513d5267c4ed0e7c50c6d0b794547cb042d543feeb55a48ced69bf001670683df159354f152f9d45786cc7184c03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/gn/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/gn/firefox-59.0.2.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "d54e50b52870747013ba457d205fd9d2632302309b9850171b968d66dc537357bf747e322420e70e5c029532b053e557da86076a25fe8c5f1a3491acc9906b37"; + sha512 = "6f60fe0c208b6447b4ee9f8c550805f070f4b3209632de91fd0a60853cdba70aa9e6653a29429ea4686dff3ccfe5dcc5a1fedd6495c7d7c38b623f31c2cfe19d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/gu-IN/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/gu-IN/firefox-59.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "d18427e64b54eb6aa1a1ee7ebfe4bdc3b219af28e7cedde55ae384d475ba88b83b9c6fe701ff849aeec32f8e6b184f2e3f910b407a9d200fd45ceaa18fc7d61f"; + sha512 = "0ec6bdefeffbbd52655d332b9c21be2b372f6ee260684cd28216679aa1af267d0408d5ba641a5dcee145b80c357936a090700427520f9ee7d712e20eec13c57f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/he/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/he/firefox-59.0.2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "a7ac2db737ddeb870bbd136f8dea08306e8bc7158d7e880655cf15541ed26382086d270a6ff2bbfb332fcc3e53c7348a403bb889aa8ae5dd1cc6fd1b7844e768"; + sha512 = "2a4a76c674fd53eed5a73f3ef5d143138752e9d52db5c69d56fd5d0dff1c19349afba6987c4736d53391bc602245c1d4ac9f5c9b60a0c1d561f4162c859ae3b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/hi-IN/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/hi-IN/firefox-59.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "18263b33d5fff4154db809fed79fc2ae20590cc2ad609e2abe90b036420bcd38fda629c613750432ca4c06684c772cf567368ba2bf098719b501e329e55caf51"; + sha512 = "34d932f073e803678990098623149dc0ea427a70ed3e604651fb622a87404ddaf25c3a79503f4e343315101704f5cd1db058a262ed47ae02eba85f102a64f780"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/hr/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/hr/firefox-59.0.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "f75aa782b03335b0197cbea1446cca56cedeb4be0282dff8bc0f1d6f6c8bf596113edcab650b6c8b7bf5a9ffe6bd14e0e29f2e82002a5c720cbf82f9dfca1b08"; + sha512 = "474f5d71087f8eb2646750bb6a14c993b2d3708234a09b4ecee7b43e2ed75a8b9d249749f16408751a019b9a32ed8be57c5d61f9fdc36ad0f1e7aa7b5863ab9f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/hsb/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/hsb/firefox-59.0.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "c0b987b299ba764ff5418be38e68c52b7caaf61480edc34d575ef58807b5289fabc25cb22d7d87dc8ba708d6fa4157d46237e0a31dafcbbe5f463fc945a620e5"; + sha512 = "9b9127af72f9f4d780714c41a54d26ac3e8065c8ec42e0ed1318013896a3e8d920786713c79ba626f4930c92d44f2acad72ac600b5735122470fa3e3ea317965"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/hu/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/hu/firefox-59.0.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "58c7c346d0fdb16efee21d8802d3bc668ff4fd9497ceef1b7a96cb8bff01df647c32819a5606891e2b7a9283677bfa9624e33423f7ed1a9c6acd1c19414276fb"; + sha512 = "cec7b19e6e3fc11708c4b67105b191433880b53da8316fc8fa4d6af9eea23cf17423bbfa2f6283490815ee5c7ab33ba8e66ee7bdc201e3eef39808db34d572e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/hy-AM/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/hy-AM/firefox-59.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "79e733f8be50ce4cab74d80dd8e4ea667ac9b2973bce27fc1f70a37b879e19b52ee423c2b360433d1e5e15a4143050e7943a3bdcbf709bc34e89302bb0ad7f35"; + sha512 = "4c25802601dadbac82dc260e329db69dff3b69d1eb9237fff76ae6de98a00a79dde0702d4cecfe67016a26e2a7ea4b1f15ce70eb82f422ea3bb8afb9810313bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/id/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ia/firefox-59.0.2.tar.bz2"; + locale = "ia"; + arch = "linux-i686"; + sha512 = "99b3d9c4533d376ee7a9f8fd364b9b44a8f0b9f235346a60755f144fae4550a6d51993952736b58e28ed3d07a549cd1d2da5223d7af28f187c78b41959e5d733"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/id/firefox-59.0.2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "5f49f449fd68cd4513ccbb541d3884e190b2a9897ba6267f348f4e7df9415a63e58a254d18f116cecd33f0e34a9022f4e34472bf2486e29b0ff17702f4790e0b"; + sha512 = "27275c8e2deb6716c8492fbc4ff56b8a2061be51101a2a7085c0a4bdf35c0bfec77af1f650236d13096ad204b93df695d5ab238ff6c312f9092f4d8adbc8d431"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/is/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/is/firefox-59.0.2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "6c5028ec47a18d9de6bfb4d99d54815b174ed51ccb74f84e0e1d69ad10940847d4655eb76b13281296575fdbb972d32df34e8e9849c8db4fd46a6dac4b4f0d62"; + sha512 = "54b6be973aab07231843455b3e0adf8f7dbc19ecd1e484795af7d6a3e346ae717621d0950297379c88a955bd75af0a19497f55015cc624609510fc3ff7b8355e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/it/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/it/firefox-59.0.2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "dd4e79563c63cfcd76906dad9b28162bc9df443964a10fb0be7c2a201621d394d45ace33dbdf85d7acd040175528d58da243333d06ced80bfa96f8c6226aa3de"; + sha512 = "bea36ccf3c3202bb41d09ef07cf4a30d8f3b7d64a96e4955f1e62c6ce1c252726991bb3dbd1d41b840ad7d626ca2abc83eca59a1997325d0f54231daea95ff06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ja/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ja/firefox-59.0.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "472f544038dce535691db40eae8cb06dcd77a468059a261cfe04186bedb4403ca209efd51a5b5efdedca323f70f4a69140614d13380fae0e01b49c85e5fffb8c"; + sha512 = "bfc409fd6487ff113045732d1826589f8020597958cad12d2b821f496eeb53e65cd4e1b1d002527f6255350254b60a96d9d04c47bcde8bac89483b04270f5b86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ka/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ka/firefox-59.0.2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "8337bbc594e6d7c0f862a99b8ad67fa7b86e55d372c5db850657eb7952f9abe2640c7bccf69568790099c8f9e7dcda65ecb28bbf2c18eeeb6760f3274f343513"; + sha512 = "f62ff3d950324b140238dc9e521e6a038a64dcc22c2679b36b59900b0f58b15d774084fdea7a1f82125a7d09d1b5c831808424e63612aac9e0a61320f6a3e4f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/kab/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/kab/firefox-59.0.2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "8d46fdff00c65f503f87b1d478b71621a2051c7ea7c24747f0793f6f6b7ebccaa39e8a61b35299078e2b49f07a17f7c4f744c97ee3767f598503faf7bae4a17d"; + sha512 = "573b7cbca69294ac56fd714308caed1549dbaff2c3716887765cf968c20d0ed37b1e0f2849af2481ef237d7c617c6641c42ecf0337fb0fc18afba82c89def034"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/kk/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/kk/firefox-59.0.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "617ce9bd37cd1ef36251cae9a0738ab93bfc4eeac2f54912011343905047ea5d181c25fc891b8abe178f3632189fe62c38ea00910a1c4bea3d47907c0a2caa07"; + sha512 = "0503e33fc8716dd94c455a0a6201334ad2bbe1f3ad9cbce057d69ec77d65bdda48a126464335cee62117b3638be636e8f2908a003951dd2866908c964a9f889d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/km/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/km/firefox-59.0.2.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "38ee6522276cd186ae63053fb15978f6eb5bfa8b2e78b3f2e4233d58ef53ac32307c936c454eb76e86e9f5d4845632a7b58e6209851a775c93629d0bad1473d5"; + sha512 = "15797d366faf6f4daa60191e4c91cd9feab242e0879204ae8114ca5824a78fc42941c79d190526e1387ec28d2c150d008d4f69c78c450fa6c6aa9d3cbbd151c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/kn/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/kn/firefox-59.0.2.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "462349b1bf91686f8212deb580166a3e0ca5dafb947c74b9786809626af68e43c4ac6e51c8351d028acb3c86d1f687ea9f94cf34c9b5085801c242d136a19383"; + sha512 = "53908d7a78feb6b4ac8365aeacfa7cc845af5f324b57e0fed6bce78eb4298b316ccad268d022e9adc409eb9be49b9777c7f01197dad4ab79746b8805877c1706"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ko/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ko/firefox-59.0.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "78e8eb72d89173676a0b65d7295f37b656791595c4def454604a83ad76e2fdf8ce40976bc91ee17219a320242e9a41568157f3754719ab9f9e0a7ce6cb4f66ff"; + sha512 = "ee4bc8ffdbd1a329df5dac2580122d883895418b93c69146206ae4e516ba1e5e993b23870ff487fb26df198b3ad73b708f9cd1f8c3f6a9f60dab73dea6ecd373"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/lij/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/lij/firefox-59.0.2.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "f51136d2e8e29af14aee4cc20e3fba6546effa40c681d3831a9ced7008a845e27e9bb80ada996d0d77c2c9ecc0825f6c7bbf1063797f71a153fe298be06e7da4"; + sha512 = "a3e92d13e071ec8e76c9a4b946fadc146664263b5176ecd56dc6d412d4a0b8165b67c6be568805455e2179dacb2dc9d5d917981e3b6d52b8ce994d4062d7aae5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/lt/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/lt/firefox-59.0.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "e1ba1b26612c2622853987fb802c4fd5e7433481b6721950813f76b6463b1320484383b25574733d75c5c4e547b52b3ad9d8687c1a28b511b07bacb9186f22f0"; + sha512 = "47c6066bea50fa958812ac3389efa3408b2c35ace30c99d9ffb91ae037f1a2444933eb081992b97e3419554ef6ede9aff7c445b5262a59a324e7c1301059f149"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/lv/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/lv/firefox-59.0.2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "894b82ffe22425e1c95c4e148c7dd58f5b14e2ec11a5a27594e0a00b8d5d57364080caf4da38f73c0af3962600d0051f6d6d436687f485cc178e6eab1d5733d7"; + sha512 = "090db495b0e0883e0e378d992a855aee03e2f2fa02ea257522485742e5a879ca42231029c2e36b8a8c31425e343ea0fcc2568a9a961752ca709737c3b3bc32ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/mai/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/mai/firefox-59.0.2.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "7240f90b5a4b6cd68135b3436fa796de0e799316b8abc06c1c62bbe22ef9b6ae38bdcf1c60a5df97354ec5b0b69f64635ad6a88321a34a6b15e035bbee19fd53"; + sha512 = "b073c397f8d5196e14d0bbd45485532ac11cd01c42fba883c6d2f3b8f831b6cd6ce095f44e279b17ec60a12e48b776004edbc22ab76fde69af875842a48fb2c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/mk/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/mk/firefox-59.0.2.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "30769e066f1c0cc71f0e5139c893b3e887f4618640b762b666f85c208fc8bdddc53afd7f0beb0421e9c84f82a6b332321840c93ecc9635dff784185f2122527c"; + sha512 = "eb20befd569cf18a9bd8455d56d152e48b194e6703cc21457af6407348f5db0405d9fa6a7b503b8c72c96b9cda953c3e0167e5803f6f62947751e042562ad427"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ml/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ml/firefox-59.0.2.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "6c3f77d4fd7fbc05b7812eff2e8c5ebb75d4fd97a1cb8797260da5d2e53e10def88cfe107131097e6b72968b4c827b998abc42df0443c24330be3a0b0622b715"; + sha512 = "d91c916c45e9ac2abeb655bb318030553139294859701ad99cbaed1c946a24b71ebe63b7efc2d66f995cefe09b7d04bc5bda17784713d8e4a5f27702c4ac7797"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/mr/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/mr/firefox-59.0.2.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "60d8c8824ee7b414ada656310218cc87ad347b36e7192196b2d5c6a5e0958f9786589a3c3f896f1a99b19aa2419431e6aaafaf69b877240872f9ea89178ea699"; + sha512 = "9d925c4828a427bc77631b28ffd6857f5adc38266731be58e283aa99b2fb4ed304ab464b32f33bce4ce1506c13c76947264891eabd7e63dfdbd020605bb1e8c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ms/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ms/firefox-59.0.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "114c337fdceec43c1482ee60467526d7fc422f720400e2cd66259cb11c1aed46fc800b1b3fc32ca5e08ad85667bdff31cb31ecd19f66e63d29bdf8696f8e4477"; + sha512 = "2e0f463f9db9f6c0e44e354ea495cc06f5dda8c92af586745744434c112073f4f46eab7576d1e26c93a7a8b739deb09930b10cca01eea70f6bc245a44d58fa74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/my/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/my/firefox-59.0.2.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "430ed92df431653d7c2f3750c6a7e3987424d9bc49359dcbe6f9c2b66c601e263cdb26f2428c9a1948de78ea51a78e0f1e6fc1538c4cdbc39a126c76050ea51d"; + sha512 = "3e279289928231a02436cb344f1629b990b220c22df04e4cd3583a4995e59901a0062763e246e8cbc44ec696c7a94eb8e25ab7534a9f32b957f1332228af9b7f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/nb-NO/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/nb-NO/firefox-59.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "c0b00789726e8020a5d8f853b73280720ba650f81cb4559e17578c862ab3d45aadd6a1948ff26e502bacd34d8c0cffa8d46ad6fd35d968ddcb4f8300dfcf44b8"; + sha512 = "abf3048155dff62d4225471531568292410bae499f10a7f51caa493bf3c66d45a30fd3fe62db2bc21447259aa75e024681abd8b1f8567fd7647202b7399b256e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ne-NP/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ne-NP/firefox-59.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "b90dc1fd628689c45f06800b3cadee034d6da54a3695959a927ac0466ba70378f4197bc5b17b39d9572a8369897aebb589d1ce7d2dcc0972a371100938704f9c"; + sha512 = "a0a9a872bb6f92cc1f5fbf17e8ffa06fe841d5c0f50bfc543779caf10726e1a0a18bd003aef9619b25110b5a37510375de077461c3fab276cd58b319f4107a1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/nl/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/nl/firefox-59.0.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "ab802fa78343b4a2074d2a09187cc96b66c03a26d26f21eb158e90b30bbbafe6dd40d563c9a65c3b6c99f79edcca3615e1322dd9a4fe3ddf1ea527ae41b4b25d"; + sha512 = "0b0a0b5df01a72c4a433938dd8f750c60594e393108564ba20745205fa87e30231e8518e28bedb770d5b988c3684ea80f27f7de28d864a26da69fda3a5c39617"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/nn-NO/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/nn-NO/firefox-59.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "4ca2889f2e0a7f19ff1e1f7fa95ef692188f78289e1830df5c72e27db761f599dc1022ce1f9b8c8f30eab92aa70381a1e721deff07fe130b1685e968cd3aaa68"; + sha512 = "0a8c474d2e0103dad61e7efbfe8bdabcf246395e7abc213a6b195aff79ae28d843c4dbcfcdbb1740c6d49e2329a1afbbde8e798dc50044be4924450c7f024396"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/or/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/or/firefox-59.0.2.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "f2da13fc423beccb7044af1b8ad8ae5b8728aeff5ad0bccf52625936b59040aa6db6fd8fec112be8cfa0baf5448ff4b9d0e179b35302c235e6b4dae01500660d"; + sha512 = "3b97c26b98859f1fa6e8cd682908c46fcfac7bc4aa6d6e8b0495bcdd4e1ddb53f924d4436499dcf0f059ab24d516439c2c8b4881c938d74ebb7c0e2b30911a14"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/pa-IN/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/pa-IN/firefox-59.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "ab193a72db52ab2208f7c6b5b5eca4756231cc31a7fc9f6adf434169ece5df5cca8800c952bca285f989dd2b5c8d7f825b0a0e99d2fa6a698a70a11fc63b1602"; + sha512 = "978e0143198910d4c8c47764f7fce401cace00018318e5deb71a22666d7f94df735304354dd07ec2ca4386898ed4c15c8cd3efb1104dd054a4c1c11661b7619a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/pl/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/pl/firefox-59.0.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "31954e6be8bc114fab04c45f5ffa1f38c74ca147d790bf63130dac4fbc6f8213cf485216d5f50ceb87e60d587fbdb82fe7034c04182017b8120ec6995a9278a1"; + sha512 = "618f2dd7460090dd0b1c0edff4b33d5ae51f1298f20ec5ccf845e5e6e5e4128c55b937496257ef49064806a720b5c8326cedca9764702824391447a83ed2118c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/pt-BR/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/pt-BR/firefox-59.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "5cfe1e7d703cfa42a1033df3509db3e91788160079c9396d55356b3c7f0b848b59e6a8f704866dd14f2f0714e89830ad541da615c7d4209249ccc46b01eb11ee"; + sha512 = "7e12f0f18562fb628b994df2e2c2a9bac4fe85ad593a0de37f3e1c3b1dce60406d2f28606aec5cf84ecec05570b38e7dd95d6f348dbadee09bf27ac34d52b47e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/pt-PT/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/pt-PT/firefox-59.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "124ce2632b461e53b2cd3474e4fbcb92554006bee72498356886a451800a15d91ffe32ac87451b61d32e6f9d60b04dd14f4ba081a535124c7e2816edc11ac287"; + sha512 = "80d9c00f741ab177a5d0ffd94a8462077240c07a56dfb49213e222264224d5df5f4f964dac55d097b0ba9d658dd42ed50761ca86fc087c29cc4ef9d2972956ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/rm/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/rm/firefox-59.0.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "847f41ff0293f82425bfba1af30deb4858c066f738f0f9d3db5303092406358e9b11f6207ed732903b860f60c1c1b1f622c5c1d2113eed073d70d039dac4a6bd"; + sha512 = "9ef01b038cb0971b41fbb19d250db4ca96adc31f0a9cf8b7197ebe700acfab69b2dae35f2c3487ae1983df0793cacd5a7aca7d9fdec8b7fa94cb245ff1308338"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ro/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ro/firefox-59.0.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "ccd5ac724cd810dec2e1ddb3e48139d9f5768d56ded09c0e6576c0dae898df310a4c5815635f646c0aa91caaad696c0ec6338bf21dacde33b4675f320fb4bca8"; + sha512 = "d60ec8a9bddaabdae7b210c7b8f4229b10ae1080a89a3a661b6ffbffae479c81ec8f620b82655d92a792e31d4f1fad9477d195005dfdc803a7f3998d4a091413"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ru/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ru/firefox-59.0.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "d003f707e4a481ddaeab11dffccbc46d0d7173afb081a5007b3efbb6e1ce8d081a4eb23017b87d7e22fc3741e117bdcddbd2393b578bae2d07a2c2c2bbe2d0a9"; + sha512 = "8a42c89e4a0ac8f26421450637c2781c2dac2fd4469080f5d17a86cbbaa2c1cae56cc641797e6c1efb1576467c2d9e960b8a486f4b79556eba1d8a099d82e567"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/si/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/si/firefox-59.0.2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "80e0e8c1ee6483a5b70140e4a6c0eb694f24dbce0a638700866ea8759063bba3f42c33ffaf465c7e8266fc764fe2983a2d6b098356dc6f4420eff9089c22331a"; + sha512 = "230b155c90db9c05a8f896357c1cb2baca0f96cada2a62fced73caa94a49116459b4ae42a4f61ce03dd08d9ce03541067a5cc64a53ad17cd63debbfe645a2614"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/sk/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/sk/firefox-59.0.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "9aec4b3085ac757137a8ead6829bee1ae26cc02a494f60a3aa44daa56f5cbe1201c7588a60682b3bdccccad75782bade43d092352c015213e5f16212f9fb2800"; + sha512 = "1072c117830b85c54e7c1ead8ca552e92ce0c1971f26a28d27490802ceeb15fc105323599fd768a8ecd94597b3f51f8efdfb3e91743395c19b52a152ffb383d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/sl/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/sl/firefox-59.0.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "2dc5d855eaedd125f8a3d828d85bc12ae47123f2f4be2bbf1e262c678cbd2607ee48c61e6fa70402da5e7ad549e2580e7d9a0a696e89ac5fee1da2154443f289"; + sha512 = "5580f6777ce0acd2d47af993a8bec2e23ef16d77e6fb653147637e1efa08e82006a41108b94b213e7bb6d57b9dc27e8cc2bc1f0a26e9c2cf766e9c82dcc673d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/son/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/son/firefox-59.0.2.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "7a1c4f86a4e459e80725b250b3a54be7c78397bd909c7a2081723571378578b7e672af380305ff9dae714e911fb209833833fd7cb3fb8a850f9d6a3b14f41cba"; + sha512 = "0f930af28da8a3643d424dc957643682909d86f83d2cde87656abb33fd5d9c5277a46cf46d4ed28a790eaa0b5681f48cc43a2184c8273cb85c821359d07ad46e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/sq/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/sq/firefox-59.0.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "45d20dcd82c6648c0429dfa0009aaf2d807efb7e9468ded4491a04dced5957d3bc9c1491c09c7f85ea63991283e2c38b2c906ebb338dffba1d0db4748e56246a"; + sha512 = "08589b3b4bfb670a912045614bb408a856b48aee4184b98e475101b1ff0ce3f6659c13ae4ffeb981e28f0b7243ba6b340065224dae0cef85e6f5877b0b150db0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/sr/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/sr/firefox-59.0.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "799f0548e18cbf77a6daf6ec0f9c12e904fde3235e9d8a5564e06df45bc037f4a04de0f5bfb9e74f9fa7053e8fc7b39b5c55b03dba5e78cf4e1400c033077f5f"; + sha512 = "2abe8a5c502564823ffeaf59925d6749463e4aa0fcb0732f0c68acd8243b5a1bf5a71834fd9e519df8aa4b7b32fe69336ed9976b1ffb2ca67068cbe47f9b6987"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/sv-SE/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/sv-SE/firefox-59.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "c2c693ab974b4c26a0c786955cff61f3b0689bd272b00fe4cbdbd7701a57481724f0ebf8aeb8427c7b50f4419875e9ca10d79c534c0e3ca8db132bcf6436e013"; + sha512 = "ff79a7639d654cc2714f75e619c0c6c5862c1e4216fe7e2eeaf3876c47e16a6555dfa28e9be6b8215fe9e308e4c8753c5d70bcc6f3979c8a70fd7330652126ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ta/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ta/firefox-59.0.2.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "0771a9cbb44102291142fab34dbfd704461da5c6c013b48c1ee22cd7cc92ebfaad7ccac5b87bf764489d66e8cec2e4056e9fcd62c3ddb734753a48022f7f8914"; + sha512 = "fb4d4c6def12ffe32eb9517858488921f1c77380f3d1d35a8652ebe7b9e14429709debffa6dd6a1008fee71c664fd8f582db1052a203dc1d7c10ba418222f7fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/te/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/te/firefox-59.0.2.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "699d8d52cc8e1bac02fbca3caa6504a028100d76fc9fe2492dfe214c5a96f0d3425bf541d2873133dd00e501dcc9d27894e613c44fc3cf9adedc0e08104524f6"; + sha512 = "ae97d60ac98c6cd9bad620a7c5dba8d51bdb2b035132daa0d915d1fc1e04802a25137bbbac82009ec51c0d858346e2f5c43f9981c48e991cc094cf11711fdeef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/th/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/th/firefox-59.0.2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "13cf7e1740ab2f508983617ce27f991db8049070061cb4d31299b372a801abf7292edd185fafc73dd58c46d009c32a6b5103a77834b2ddb0cc420cd98f747e9b"; + sha512 = "695fae213cc6705ec130c4dc08dd1c28f6ad605e0a2d0e92deef13737cc2780cd420dd883dc5153bf9cd174e1740effbc817054b16417fed90d04be04f21ab24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/tr/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/tr/firefox-59.0.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "a3439d157762eddcc1c09c4b687028b97004ac49144a3f26ea2a05a8eccc0a8b04659147ae7e8972ac16299d262586cc1d0c1bc69e5a309a0c82086cf61202ac"; + sha512 = "f79e1f5027a84b772358d25f0441744036f60da7de5c0b26428ebd81900977e70d2c36b454e73f7026b7e20c058830502c92bdb8cc7d55c3ab40df43b7380d31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/uk/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/uk/firefox-59.0.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "7767a4549265131e29a142c6f2a914b8699f2042a9da5831192668300acc564fbfe94009b3ea33a7bedc469a7585029685fa91dc752b46d7d7be5425776bc7c4"; + sha512 = "30b7661e84a875ff356284a87d1dc00a9e8fc1c03c953c471d785445e78cf4568450fec97bb16a1c63b092931719119510f33f55f02ff56e38adf4fb3be3f2c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ur/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ur/firefox-59.0.2.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "b85f5c3067cf897079ff1de7c0de84756fb2224f703ec6825108efff52bed3a6e780b8410a58ed756e926a6033cd10c888743642f997b9c9d7390096c3b5e7c9"; + sha512 = "9ef6fed1bea2857fc60e22eb9a87db8261316ba0852a3c5d35d65c3ead474ae34ee532588e25942f76be2f13a341c9bd9b672e5b192db1d3ccfee3f6a6787b83"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/uz/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/uz/firefox-59.0.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "3febb16ceabdcf7395196f1aef6c5ecc6a09f45e63485207816e95dd5ec0ac9729c3644b8afa75d68241ad203459239bd7f5693c6d8aa7e59afb1a1f661015ff"; + sha512 = "ab75b5c8e81b6bfc12b07b4fb2872cf2297c7249c352f5b66d95d867698f3e9a601f273e708bcb8855505eaba87b384e2b62f9d0b85e5976acf1c948e5e5a3e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/vi/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/vi/firefox-59.0.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "d117eca28279af133e2dde8dc25d3f7c4dcdc97f683f4570aa9cb8965200dfd8799271958ed6113b9bee488fc3e17d772b1aa4a4d657a49f72914890752af13c"; + sha512 = "d08e244d22c92c0e64c1104d5bbaaa19fa3b0d8f7a3616ae0df71d8f141039f1e7e87480f52d319f57d545f58c7095da643d4bac150e47c3e595b27cb793076f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/xh/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/xh/firefox-59.0.2.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "4ce7c4627a7db67ebe85ddb134cadca8cc4ecd3a01d8895dcb8b691f85e01911818404cc7243b4f5e1df0133a204a1ce5289168cae0b7e1b0b2674a659fc6684"; + sha512 = "b956f01619afc421ed23ac644af51f62fa9f5cffcd7f5b6bf640014d1326583f8ba871e4e4f5cf8e81ab0a2b46335b5e921243e71ed16d51b2c89f0a7d1a1280"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/zh-CN/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/zh-CN/firefox-59.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "d0a73f00af50d70b055a1b2e89dc942b56d8d6e3a297407060a88a994dfcbd52fd60ec221e3afd9b6036500d27d861415ab0b25ceb443210321823e4e3b189e2"; + sha512 = "80f3c557a7fa2d51f5ba2d07adef2bd6980a4cd256b95702ee4fac2967d039476ea3b828ce951b354be9fea9508ecae2ea12a8b29f8feb0101b2101d741bf633"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/zh-TW/firefox-58.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/zh-TW/firefox-59.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "a855e8de90b5b26e8d4fed05b48c5efd6626c9d793f30c1f0b71d9b062a4e253b8c417a44e581ea8edd7babf5bd536b4384dd494dbb2fa36d7f585e555cdd655"; + sha512 = "50668a428310083cd175ce0dd9d09742866143d56efb0b13d11de1905d5b1d9f61e441bf1364e518aa87ebc790a335cc3b69d2438d3a4f92b4802345b8a443fa"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index a70b554c850..e8e1862d7f8 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -221,7 +221,7 @@ stdenv.mkDerivation (rec { postInstall = '' # For grsecurity kernels - paxmark m $out/lib/firefox-[0-9]*/{firefox,firefox-bin,plugin-container} + paxmark m $out/lib/firefox*/{firefox,firefox-bin,plugin-container} # Remove SDK cruft. FIXME: move to a separate output? rm -rf $out/share/idl $out/include $out/lib/firefox-devel-* @@ -233,8 +233,8 @@ stdenv.mkDerivation (rec { postFixup = '' # Fix notifications. LibXUL uses dlopen for this, unfortunately; see #18712. patchelf --set-rpath "${lib.getLib libnotify - }/lib:$(patchelf --print-rpath "$out"/lib/firefox-*/libxul.so)" \ - "$out"/lib/firefox-*/libxul.so + }/lib:$(patchelf --print-rpath "$out"/lib/firefox*/libxul.so)" \ + "$out"/lib/firefox*/libxul.so ''; doInstallCheck = true; diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 44f4b014d70..a72e6711fe9 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -6,29 +6,16 @@ rec { firefox = common rec { pname = "firefox"; - version = "58.0.2"; + version = "59.0.2"; src = fetchurl { - url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "ff748780492fc66b3e44c7e7641f16206e4c09514224c62d37efac2c59877bdf428a3670bfb50407166d7b505d4e2ea020626fd776b87f6abb6bc5d2e54c773f"; + url = "https://hg.mozilla.org/releases/mozilla-release/archive/239e434d6d2b8e1e2b697c3416d1e96d48fe98e5.tar.bz2"; + sha512 = "3kfh224sfc9ig4733frnskcs49xzjkrs00lxllsvx1imm6f4sf117mqlvc7bhgrn8ldiqn6vaa5g6gd9b7awkk1g975bbzk9namb3yv"; }; patches = [ ./no-buildconfig.patch ./env_var_for_system_dir.patch - - # https://bugzilla.mozilla.org/show_bug.cgi?id=1430274 - # Scheduled for firefox 59 - (fetchpatch { - url = "https://bug1430274.bmoattachments.org/attachment.cgi?id=8943426"; - sha256 = "12yfss3k61yilrb337dh2rffy5hh83d2f16gqrf5i56r9c33f7hf"; - }) - - # https://bugzilla.mozilla.org/show_bug.cgi?id=1388981 - # Should have been fixed in firefox 57 - ] ++ lib.optional stdenv.isi686 (fetchpatch { - url = "https://hg.mozilla.org/mozilla-central/raw-rev/15517c5a5d37"; - sha256 = "1ba487p3hk4w2w7qqfxgv1y57vp86b8g3xhav2j20qd3j3phbbn7"; - }); + ]; meta = { description = "A web browser built from Firefox source tree"; @@ -43,14 +30,24 @@ rec { firefox-esr = common rec { pname = "firefox-esr"; - version = "52.6.0esr"; + version = "52.7.3esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "cf583df34272b7ff8841c3b093ca0819118f9c36d23c6f9b3135db298e84ca022934bcd189add6473922b199b47330c0ecf14c303ab4177c03dbf26e64476fa4"; + sha512 = "31y3qrslg61724vmly6gr1lqcrqgpkh3zsl8riax45gizfcp3qbgkvmd5wwfn9fiwjqi6ww3i08j51wxrfxcxznv7c6qzsvzzc30mgw"; }; - patches = - [ ./env_var_for_system_dir.patch ]; + patches = [ + ./env_var_for_system_dir.patch + ] + # The following patch is only required on ARM platforms and should be + # included for the next ESR release >= 52.7.3esr + ++ lib.optional stdenv.isAarch32 + (fetchpatch { + name = "CVE-2018-5147-tremor.patch"; + url = https://hg.mozilla.org/releases/mozilla-esr52/rev/5cd5586a2f48; + sha256 = "0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73"; + }) + ; meta = firefox.meta // { description = "A web browser built from Firefox Extended Support Release source tree"; diff --git a/pkgs/applications/networking/browsers/firefox/update.nix b/pkgs/applications/networking/browsers/firefox/update.nix index 0f465122806..3fbf8b7ff03 100644 --- a/pkgs/applications/networking/browsers/firefox/update.nix +++ b/pkgs/applications/networking/browsers/firefox/update.nix @@ -22,7 +22,7 @@ writeScript "update-${attrPath}" '' # - removes trailing slash # - sorts everything with semver in mind # - picks up latest release - version=`xidel -q $url --extract "//a" | \ + version=`xidel $url --extract "//a" | \ grep "^[0-9.]*${versionSuffix}/$" | \ sed s/[/]$// | \ sort --version-sort | \ diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index eaa05726f1c..d2d26190ce0 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, patchelf, bash +{ stdenv, fetchurl, patchelf, makeWrapper # Linked dynamic libraries. , glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, gconf, nss, nspr @@ -72,7 +72,7 @@ in stdenv.mkDerivation rec { src = chromium.upstream-info.binary; buildInputs = [ - patchelf + patchelf makeWrapper # needed for GSETTINGS_SCHEMAS_PATH gsettings-desktop-schemas glib gtk @@ -120,14 +120,11 @@ in stdenv.mkDerivation rec { mv "$icon_file" "$logo_output_path/google-$appname.png" done - cat > $exe << EOF - #!${bash}/bin/sh - export LD_LIBRARY_PATH=$rpath\''${LD_LIBRARY_PATH:+:\$LD_LIBRARY_PATH} - export PATH=$binpath\''${PATH:+:\$PATH} - export XDG_DATA_DIRS=$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH\''${XDG_DATA_DIRS:+:}\$XDG_DATA_DIRS - $out/share/google/$appname/google-$appname ${commandLineArgs} "\$@" - EOF - chmod +x $exe + makeWrapper "$out/share/google/$appname/google-$appname" "$exe" \ + --prefix LD_LIBRARY_PATH : "$rpath" \ + --prefix PATH : "$binpath" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ + --add-flags ${escapeShellArg commandLineArgs} for elf in $out/share/google/$appname/{chrome,chrome-sandbox,nacl_helper}; do patchelf --set-rpath $rpath $elf diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index dc9c3358552..162dd88054c 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -73,25 +73,25 @@ let in stdenv.mkDerivation rec { name = "flashplayer-${version}"; - version = "28.0.0.161"; + version = "29.0.0.140"; src = fetchurl { url = if debug then - "https://fpdownload.macromedia.com/pub/flashplayer/updaters/28/flash_player_npapi_linux_debug.${arch}.tar.gz" + "https://fpdownload.macromedia.com/pub/flashplayer/updaters/29/flash_player_npapi_linux_debug.${arch}.tar.gz" else "https://fpdownload.adobe.com/get/flashplayer/pdc/${version}/flash_player_npapi_linux.${arch}.tar.gz"; sha256 = if debug then if arch == "x86_64" then - "0dsgq39c2d0kkdcd9j4nddqn3qiq5pvm2r67ji4m4wyv9chn518m" + "0bj0d899dswfbkbrm08c381yzm0hlqdv53sgbl2z9zj4x8rqyi3p" else - "0x26qi9qr01rppji5l4nwvmrhmq6qy83dsppbb7jqjmgyvknq5jd" + "16as2dydgqip6qlg13jh83sd4lb2cgrny4ibqg7jlx1d1a1i0jwh" else if arch == "x86_64" then - "1s62gx2a9q962w3gc847x2xwlzkq4dkzbmvf74x5k5c2k2l9hhg0" + "10s6j5izsy2v2ljljcv2vk898jg9xmp6zqqazmj07zy7m5vywfi7" else - "1m5pcgz2w9f3jkm3hpvysc8ap20y458xnba7j51d7h7fjy6md89x"; + "0xk8a2brpzfxi87mqqfv8l5xi5j9x71cy0ik64dzwcq7ka16gpz1"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index 4528dd70cbd..42d7aa2f56f 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -55,19 +55,19 @@ let in stdenv.mkDerivation rec { name = "flashplayer-standalone-${version}"; - version = "28.0.0.161"; + version = "29.0.0.140"; src = fetchurl { url = if debug then - "https://fpdownload.macromedia.com/pub/flashplayer/updaters/28/flash_player_sa_linux_debug.x86_64.tar.gz" + "https://fpdownload.macromedia.com/pub/flashplayer/updaters/29/flash_player_sa_linux_debug.x86_64.tar.gz" else - "https://fpdownload.macromedia.com/pub/flashplayer/updaters/28/flash_player_sa_linux.x86_64.tar.gz"; + "https://fpdownload.macromedia.com/pub/flashplayer/updaters/29/flash_player_sa_linux.x86_64.tar.gz"; sha256 = if debug then - "0934vs3c51fjz9pr846wg9xn7h2qybswayfkhz0pnzcfnng2rrf1" + "1gvfm4z46m2y39fswpzhx18dlwcxwwy5mins3kx2m425dgp76zd5" else - "0pwi7pbfldiqiwc7yfy7psyr93679r025vjxmiybs2ap69vly4v0"; + "08a21c0l47w97xhwiby8j5055kl37ld5insfd459gz92d3f145fl"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 2f9170eff87..426d91d3455 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -29,13 +29,13 @@ let in python3Packages.buildPythonApplication rec { name = "qutebrowser-${version}${versionPostfix}"; namePrefix = ""; - version = "1.1.1"; + version = "1.2.0"; versionPostfix = ""; # the release tarballs are different from the git checkout! src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${name}.tar.gz"; - sha256 = "09fa77rg1yrl8cksavxmgm9z2246s4d8wjbkl5jm1gsam345f7mz"; + sha256 = "0za0iiljs86y2n4znwk8cgn948xcv8iv80a9qfm87zl18y3ashly"; }; # Needs tox diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 299ec43a8b9..8a8abb42f55 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -98,7 +98,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "7.5"; + version = "7.5.3"; lang = "en-US"; @@ -108,7 +108,7 @@ let "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - sha256 = "1ia8qv5hj7zrrli5d9qf65s3rlrls0whrx3q96lw63x2gn05nwv7"; + sha256 = "0vgw1qsd6rqbbgnsw9zwcv5m308abh7wp1p12mp8g04xndxnzw0d"; }; "i686-linux" = fetchurl { @@ -116,7 +116,7 @@ let "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - sha256 = "1sw1n7jsagyl5cjs265x3k9jzh0j0yh767ixcy17vif5f9dfyzak"; + sha256 = "0scjy51zmyn7za0gii0dvndq06slip64nd0ik2cjyq232agvbxmr"; }; }; in diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 090fc98566d..71b0ee45daa 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, removeReferencesTo, which, go, go-bindata, makeWrapper, rsync +{ stdenv, lib, fetchFromGitHub, fetchpatch, removeReferencesTo, which, go_1_9, go-bindata, makeWrapper, rsync , iptables, coreutils , components ? [ "cmd/kubeadm" @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { sha256 = "1dmq2g138h7fsswmq4l47b44gsl9anmm3ywqyi7y48f1rkvc11mk"; }; - buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ]; + buildInputs = [ removeReferencesTo makeWrapper which go_1_9 rsync go-bindata ]; outputs = ["out" "man" "pause"]; @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - mkdir -p "$out/bin" "$out/share/bash-completion/completions" "$man/share/man" "$pause/bin" + mkdir -p "$out/bin" "$out/share/bash-completion/completions" "$out/share/zsh/site-functions" "$man/share/man" "$pause/bin" cp _output/local/go/bin/* "$out/bin/" cp build/pause/pause "$pause/bin/pause" @@ -66,10 +66,11 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/kube-addons --set "KUBECTL_BIN" "$out/bin/kubectl" $out/bin/kubectl completion bash > $out/share/bash-completion/completions/kubectl + $out/bin/kubectl completion zsh > $out/share/zsh/site-functions/_kubectl ''; preFixup = '' - find $out/bin $pause/bin -type f -exec remove-references-to -t ${go} '{}' + + find $out/bin $pause/bin -type f -exec remove-references-to -t ${go_1_9} '{}' + ''; meta = { diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix index 68c66d78de1..961c0afc5c5 100644 --- a/pkgs/applications/networking/cluster/mesos/default.nix +++ b/pkgs/applications/networking/cluster/mesos/default.nix @@ -4,6 +4,7 @@ , leveldb, glog, perf, utillinux, libnl, iproute, openssl, libevent , ethtool, coreutils, which, iptables, maven , bash, autoreconfHook +, withJava ? !stdenv.isDarwin }: let @@ -46,11 +47,13 @@ in stdenv.mkDerivation rec { autoreconfHook ]; buildInputs = [ - makeWrapper curl sasl jdk + makeWrapper curl sasl python wrapPython boto setuptools leveldb - subversion apr glog openssl libevent maven + subversion apr glog openssl libevent ] ++ lib.optionals stdenv.isLinux [ libnl + ] ++ lib.optionals withJava [ + jdk maven ]; propagatedBuildInputs = [ @@ -181,6 +184,7 @@ in stdenv.mkDerivation rec { "--with-libevent=${libevent.dev}" "--with-protobuf=${pythonProtobuf.protobuf}" "PROTOBUF_JAR=${mavenRepo}/com/google/protobuf/protobuf-java/3.3.0/protobuf-java-3.3.0.jar" + (if withJava then "--enable-java" else "--disable-java") ] ++ lib.optionals stdenv.isLinux [ "--with-network-isolator" "--with-nl=${libnl.dev}" @@ -190,16 +194,6 @@ in stdenv.mkDerivation rec { rm -rf $out/var rm $out/bin/*.sh - mkdir -p $out/share/java - cp src/java/target/mesos-*.jar $out/share/java - - MESOS_NATIVE_JAVA_LIBRARY=$out/lib/libmesos${stdenv.hostPlatform.extensions.sharedLibrary} - - mkdir -p $out/nix-support - touch $out/nix-support/setup-hook - echo "export MESOS_NATIVE_JAVA_LIBRARY=$MESOS_NATIVE_JAVA_LIBRARY" >> $out/nix-support/setup-hook - echo "export MESOS_NATIVE_LIBRARY=$MESOS_NATIVE_JAVA_LIBRARY" >> $out/nix-support/setup-hook - # Inspired by: pkgs/development/python-modules/generic/default.nix pushd src/python mkdir -p $out/lib/${python.libPrefix}/site-packages @@ -218,6 +212,16 @@ in stdenv.mkDerivation rec { --old-and-unmanageable \ --prefix="$out" popd + '' + stdenv.lib.optionalString withJava '' + mkdir -p $out/share/java + cp src/java/target/mesos-*.jar $out/share/java + + MESOS_NATIVE_JAVA_LIBRARY=$out/lib/libmesos${stdenv.hostPlatform.extensions.sharedLibrary} + + mkdir -p $out/nix-support + touch $out/nix-support/setup-hook + echo "export MESOS_NATIVE_JAVA_LIBRARY=$MESOS_NATIVE_JAVA_LIBRARY" >> $out/nix-support/setup-hook + echo "export MESOS_NATIVE_LIBRARY=$MESOS_NATIVE_JAVA_LIBRARY" >> $out/nix-support/setup-hook ''; postFixup = '' @@ -248,6 +252,6 @@ in stdenv.mkDerivation rec { license = licenses.asl20; description = "A cluster manager that provides efficient resource isolation and sharing across distributed applications, or frameworks"; maintainers = with maintainers; [ cstrahan kevincox offline ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index d27693823a6..53b24552d37 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -15,15 +15,15 @@ let # instead, we download localkube ourselves and shove it into the minikube binary. The versions URL that minikube uses is # currently https://storage.googleapis.com/minikube/k8s_releases.json - localkube-version = "1.9.0"; + localkube-version = "1.10.0"; localkube-binary = fetchurl { url = "https://storage.googleapis.com/minikube/k8sReleases/v${localkube-version}/localkube-linux-amd64"; - sha256 = "1z5c061mx2flg6hq05d00bvkn722gxv8y9rfpjyk23nk697k31fh"; + sha256 = "02lkl2g274689h07pkcwnxn04swy6aa3f2z77n421mx38bbq2kpd"; }; in buildGoPackage rec { pname = "minikube"; name = "${pname}-${version}"; - version = "0.25.0"; + version = "0.26.0"; goPackagePath = "k8s.io/minikube"; @@ -31,7 +31,7 @@ in buildGoPackage rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "0nsdi8mr8p69z696ksfb5ahzqqnvjn4a2z6cp0kyby8sakcjhsby"; + sha256 = "1wc2gvmgb59yh0ldm2plvh6s8mvxvysrxp6w75z16ii86jmi3wr6"; }; patches = [ diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index fdc97733c77..3f7e0650e0d 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -1,12 +1,24 @@ -{ stdenv, fetchFromGitHub, which, buildGoPackage, utillinux, coreutils }: +{ stdenv, lib, fetchFromGitHub, fetchpatch, removeReferencesTo, which, go_1_9, go-bindata, makeWrapper, rsync +, iptables, coreutils, kerberos, clang +, components ? [ + "cmd/oc" + "cmd/openshift" + ] +}: + +with lib; let - version = "3.6.0"; + version = "3.9.0"; ver = stdenv.lib.elemAt (stdenv.lib.splitString "." version); versionMajor = ver 0; versionMinor = ver 1; versionPatch = ver 2; -in buildGoPackage rec { + gitCommit = "191fece"; + # version is in vendor/k8s.io/kubernetes/pkg/version/base.go + k8sversion = "v1.9.1"; + k8sgitcommit = "a0ce1bc657"; +in stdenv.mkDerivation rec { name = "openshift-origin-${version}"; inherit version; @@ -14,40 +26,41 @@ in buildGoPackage rec { owner = "openshift"; repo = "origin"; rev = "v${version}"; - sha256 = "08bdqvsjl6c7dmllyz8n4akb7gyn91znvbph5cgmmk1bhskycy1r"; - }; + sha256 = "06k0zilfyvll7z34yirraslgpwgah9k6y5i6wgi7f00a79k76k78"; +}; - buildInputs = [ which ]; + # go > 1.10 + # [FATAL] [14:44:02+0000] Please install Go version go1.9 or use PERMISSIVE_GO=y to bypass this check. + buildInputs = [ removeReferencesTo makeWrapper which go_1_9 rsync go-bindata kerberos clang ]; + + outputs = [ "out" ]; - goPackagePath = null; patchPhase = '' patchShebangs ./hack - substituteInPlace pkg/bootstrap/docker/host/host.go \ - --replace 'nsenter --mount=/rootfs/proc/1/ns/mnt findmnt' \ - 'nsenter --mount=/rootfs/proc/1/ns/mnt ${utillinux}/bin/findmnt' - - substituteInPlace pkg/bootstrap/docker/host/host.go \ - --replace 'nsenter --mount=/rootfs/proc/1/ns/mnt mount' \ - 'nsenter --mount=/rootfs/proc/1/ns/mnt ${utillinux}/bin/mount' - - substituteInPlace pkg/bootstrap/docker/host/host.go \ - --replace 'nsenter --mount=/rootfs/proc/1/ns/mnt mkdir' \ - 'nsenter --mount=/rootfs/proc/1/ns/mnt ${utillinux}/bin/mount' ''; buildPhase = '' - cd go/src/origin-v${version}-src # Openshift build require this variables to be set # unless there is a .git folder which is not the case with fetchFromGitHub - export OS_GIT_VERSION=v${version} - export OS_GIT_MAJOR=${versionMajor} - export OS_GIT_MINOR=${versionMinor} - make build + echo "OS_GIT_VERSION=v${version}" >> os-version-defs + echo "OS_GIT_MAJOR=${versionMajor}" >> os-version-defs + echo "OS_GIT_MINOR=${versionMinor}" >> os-version-defs + echo "OS_GIT_PATCH=${versionPatch}" >> os-version-defs + echo "OS_GIT_COMMIT=${gitCommit}" >> os-version-defs + echo "KUBE_GIT_VERSION=${k8sversion}" >> os-version-defs + echo "KUBE_GIT_COMMIT=${k8sgitcommit}" >> os-version-defs + export OS_VERSION_FILE="os-version-defs" + export CC=clang + make all WHAT='${concatStringsSep " " components}' ''; installPhase = '' - mkdir -p "$bin/bin" - cp -a "_output/local/bin/$(go env GOOS)/$(go env GOARCH)/"* "$bin/bin/" + mkdir -p "$out/bin" + cp -a "_output/local/bin/$(go env GOOS)/$(go env GOARCH)/"* "$out/bin/" + ''; + + preFixup = '' + find $out/bin -type f -exec remove-references-to -t ${go_1_9} '{}' + ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/cluster/taktuk/default.nix b/pkgs/applications/networking/cluster/taktuk/default.nix index 313e1af707b..1510dc575cc 100644 --- a/pkgs/applications/networking/cluster/taktuk/default.nix +++ b/pkgs/applications/networking/cluster/taktuk/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, perl , openssh}: stdenv.mkDerivation rec { - version = "3.7.5"; + version = "3.7.7"; name = "taktuk-${version}"; buildInputs = [ perl ]; src = fetchurl { url = "https://gforge.inria.fr/frs/download.php/33412/${name}.tar.gz"; - sha256 = "d96ef6c63d77f32339066f143ef7e0bc00041e10724254bf15787746ad1f1070"; + sha256 = "0w0h3ynlcxvq2nzm8hkj20g0805ww3vkw53g0qwj7wvp7p3gcvnr"; }; preBuild = '' diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 890fe231cbf..88dd2f6756e 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -100,8 +100,8 @@ in rec { terraform_0_10-full = terraform_0_10.withPlugins lib.attrValues; terraform_0_11 = pluggable (generic { - version = "0.11.3"; - sha256 = "0637x7jcm62pdnivmh4rggly6dmlvdh3jpsd1z4vba15gbm203nz"; + version = "0.11.6"; + sha256 = "17kd3ln1i40qb8fll5918rvgackzf1ibmr7li1p9vky4ki3iwr0l"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); diff --git a/pkgs/applications/networking/enhanced-ctorrent/default.nix b/pkgs/applications/networking/enhanced-ctorrent/default.nix index fedbfeb957c..2cfde73a01a 100644 --- a/pkgs/applications/networking/enhanced-ctorrent/default.nix +++ b/pkgs/applications/networking/enhanced-ctorrent/default.nix @@ -1,13 +1,26 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { version = "dnh3.3.2"; name = "enhanced-ctorrent"; + src = fetchurl { url = "http://www.rahul.net/dholmes/ctorrent/ctorrent-dnh3.3.2.tar.gz"; sha256 = "0qs8waqwllk56i3yy3zhncy7nsnhmf09a494p5siz4vm2k4ncwy8"; }; + # These patches come from Debian and fix CVE-2009-1759. + patches = [ + (fetchpatch { + url = "https://sources.debian.org/data/main/c/ctorrent/1.3.4.dnh3.3.2-5/debian/patches/cve-security-fix.diff"; + sha256 = "1qkzzm8sfspbcs10azmmif4qcr7pr8r38dsa2py84lsjm1yi3kls"; + }) + (fetchpatch { + url = "https://sources.debian.org/data/main/c/ctorrent/1.3.4.dnh3.3.2-5/debian/patches/FTBFS-fix.diff"; + sha256 = "1m3zh96xwqjjzsbg62f7kx0miams58nys1f484qhdn870b5x9p06"; + }) + ]; + meta = { description = "BitTorrent client written in C++"; longDescription = '' diff --git a/pkgs/applications/networking/errbot/default.nix b/pkgs/applications/networking/errbot/default.nix index 8664e38a8ed..feb6a0ab126 100644 --- a/pkgs/applications/networking/errbot/default.nix +++ b/pkgs/applications/networking/errbot/default.nix @@ -15,7 +15,9 @@ pythonPackages.buildPythonApplication rec { postPatch = '' substituteInPlace setup.py \ - --replace dnspython3 dnspython + --replace dnspython3 dnspython \ + --replace 'cryptography<2.1.0' cryptography \ + --replace 'pyOpenSSL<17.3.0' pyOpenSSL ''; # tests folder is not included in release diff --git a/pkgs/applications/networking/feedreaders/newsbeuter/default.nix b/pkgs/applications/networking/feedreaders/newsbeuter/default.nix deleted file mode 100644 index b681f74ed22..00000000000 --- a/pkgs/applications/networking/feedreaders/newsbeuter/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ stdenv, fetchurl, sqlite, curl, pkgconfig, libxml2, stfl, json-c-0-11, ncurses -, gettext, libiconv, makeWrapper, perl, fetchpatch }: - -stdenv.mkDerivation rec { - name = "newsbeuter-2.9"; - - src = fetchurl { - url = "http://www.newsbeuter.org/downloads/${name}.tar.gz"; - sha256 = "1j1x0hgwxz11dckk81ncalgylj5y5fgw5bcmp9qb5hq9kc0vza3l"; - - }; - - buildInputs - # use gettext instead of libintlOrEmpty so we have access to the msgfmt - # command - = [ pkgconfig sqlite curl libxml2 stfl json-c-0-11 ncurses gettext perl libiconv ] - ++ stdenv.lib.optional stdenv.isDarwin makeWrapper; - - preBuild = '' - sed -i -e 110,114d config.sh - sed -i "1 s%^.*$%#!${perl}/bin/perl%" txt2h.pl - export LDFLAGS=-lncursesw - ''; - - patches = [ - (fetchpatch { - url = "https://github.com/akrennmair/newsbeuter/commit/cdacfbde9fe3ae2489fc96d35dfb7d263ab03f50.patch"; - sha256 = "1lhvn63cqjpikwsr6zzndb1p5y140vvphlg85fazwx4xpzd856d9"; - }) - (fetchpatch { - url = "https://github.com/akrennmair/newsbeuter/commit/33577f842d9b74c119f3cebda95ef8652304db81.patch"; - sha256 = "1kwhp6k14gk1hclgsr9w47qg7hs60p23zsl6f6vw13mczp2naqlb"; - }) - # https://github.com/akrennmair/newsbeuter/issues/598 / CVE-2017-14500 - (fetchpatch { - url = "https://github.com/akrennmair/newsbeuter/commit/26f5a4350f3ab5507bb8727051c87bb04660f333.patch"; - sha256 = "1jjxj4z3s4f1n8rfpwyd42a40gjnziykqas6a26s1lsdkklnbp6q"; - }) - # https://github.com/akrennmair/newsbeuter/issues/591 / CVE-2017-12904 - (fetchpatch { - url = "https://github.com/akrennmair/newsbeuter/commit/d1460189f6f810ca9a3687af7bc43feb7f2af2d9.patch"; - sha256 = "1a8k73ckziszsbdwdhcmkfvlmgy955gssg9v4sqvg20v91l5rmai"; - }) - ]; - - installFlags = [ "DESTDIR=$(out)" "prefix=" ]; - - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' - for prog in $out/bin/*; do - wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${stfl}/lib" - done - ''; - - meta = { - homepage = http://www.newsbeuter.org; - description = "An open-source RSS/Atom feed reader for text terminals"; - maintainers = with stdenv.lib.maintainers; [ lovek323 ]; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 585e0c847da..9a71f8911c2 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -1,80 +1,72 @@ -{ lib -, fetchFromGitHub -, python -, transmission -, deluge -, config +{ lib, python +, delugeSupport ? true, deluge ? null }: -with python.pkgs; +assert delugeSupport -> deluge != null; + +# Flexget have been a trouble maker in the past, +# if you see flexget breaking when updating packages, don't worry. +# The current state is that we have no active maintainers for this package. +# -- Mic92 + +let + python' = python.override { inherit packageOverrides; }; + + packageOverrides = self: super: { + sqlalchemy = super.sqlalchemy.overridePythonAttrs (old: rec { + version = "1.1.10"; + src = old.src.override { + inherit version; + sha256 = "1lvb14qclrx0qf6qqx8a8hkx5akk5lk3dvcqz8760v9hya52pnfv"; + }; + }); + }; + +in + +with python'.pkgs; buildPythonApplication rec { - version = "2.10.82"; - name = "FlexGet-${version}"; + pname = "FlexGet"; + version = "2.13.5"; - src = fetchFromGitHub { - owner = "Flexget"; - repo = "Flexget"; - rev = version; - sha256 = "15508ihswfjbkzhf1f0qhn2ar1aiibz2ggp5d6r33icy8xwhpv09"; + src = fetchPypi { + inherit pname version; + sha256 = "1lkmxwy7k4zlcqpigwk8skc2zi8a70vrw21pz80wvmf9yg0wc9z9"; }; - doCheck = true; - # test_regexp requires that HOME exist, test_filesystem requires a - # unicode-capable filesystem (and setting LC_ALL doesn't work). - # setlocale: LC_ALL: cannot change locale (en_US.UTF-8) postPatch = '' - substituteInPlace requirements.txt \ - --replace "chardet==3.0.3" "chardet" \ - --replace "rebulk==0.8.2" "rebulk" \ - --replace "cherrypy==10.2.2" "cherrypy" \ - --replace "portend==1.8" "portend" \ - --replace "sqlalchemy==1.1.10" "sqlalchemy" \ - --replace "zxcvbn-python==4.4.15" "zxcvbn-python" \ - --replace "flask-cors==3.0.2" "flask-cors" \ - --replace "certifi==2017.4.17" "certifi" \ - --replace "apscheduler==3.3.1" "apscheduler" \ - --replace "path.py==10.3.1" "path.py" \ - --replace "tempora==1.8" "tempora" \ - --replace "cheroot==5.5.0" "cheroot" \ - --replace "six==1.10.0" "six" \ - --replace "aniso8601==1.2.1" "aniso8601" + # remove dependency constraints + sed 's/==\([0-9]\.\?\)\+//' -i requirements.txt ''; - checkPhase = '' - export HOME=. - py.test --disable-pytest-warnings -k "not test_quality_failures \ - and not test_group_quality \ - and not crash_report \ - and not test_multi_episode \ - and not test_double_episodes \ - and not test_inject_force \ - and not test_double_prefered \ - and not test_double \ - and not test_non_ascii" - ''; + # ~400 failures + doCheck = false; - buildInputs = [ pytest mock vcrpy pytest-catchlog boto3 ]; propagatedBuildInputs = [ - feedparser sqlalchemy pyyaml chardet - beautifulsoup4 html5lib PyRSS2Gen pynzb - rpyc jinja2 jsonschema requests dateutil jsonschema + feedparser sqlalchemy pyyaml + chardet beautifulsoup4 html5lib + PyRSS2Gen pynzb rpyc jinja2 + jsonschema requests dateutil pathpy guessit_2_0 APScheduler terminaltables colorclass - cherrypy flask flask-restful flask-restplus - flask-compress flask_login flask-cors - pyparsing safe future zxcvbn-python - werkzeug tempora cheroot rebulk portend + cherrypy flask flask-restful + flask-restplus flask-compress + flask_login flask-cors safe + pyparsing future zxcvbn-python + werkzeug tempora cheroot rebulk + portend transmissionrpc aniso8601 + babelfish certifi click futures + idna itsdangerous markupsafe + plumbum pytz six tzlocal urllib3 + webencodings werkzeug zxcvbn-python ] ++ lib.optional (pythonOlder "3.4") pathlib - # enable deluge and transmission plugin support, if they're installed - ++ lib.optional (config.deluge or false) deluge - ++ lib.optional (transmission != null) transmissionrpc; + ++ lib.optional delugeSupport deluge; - meta = { - homepage = https://flexget.com/; + meta = with lib; { + homepage = https://flexget.com/; description = "Multipurpose automation tool for content like torrents"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ domenkozar tari ]; - broken = true; # as of 2018-02-09 + license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 810422dcd3f..fd253c389a2 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -13,13 +13,13 @@ }: stdenv.mkDerivation rec { - name = "dino-unstable-2018-02-11"; + name = "dino-unstable-2018-03-10"; src = fetchFromGitHub { owner = "dino"; repo = "dino"; - rev = "5436d716c0f508eb8ab70f322da862f996ce421e"; - sha256 = "0yxkhl9xm5f0j2i9vxgyabpa5fwja0329fmg0878mqsm89nzz3am"; + rev = "4ccdc1d0920a93b313d81b4014b6f45efb49b1fe"; + sha256 = "0d9698zi09s107zva6cgip7xxmdby0zfmqvka4n0khxrsnii5awq"; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 42c51049557..2f5ea071568 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -22,7 +22,8 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "gajim-${version}"; - version = "0.16.9"; + majorVersion = "0.16"; + version = "${majorVersion}.9"; src = fetchurl { name = "${name}.tar.bz2"; @@ -31,6 +32,18 @@ stdenv.mkDerivation rec { sha256 = "121dh906zya9n7npyk7b5xama0z3ycy9jl7l5jm39pc86h1winh3"; }; + # Needed for Plugin Installer + release = fetchurl { + url = "https://gajim.org/downloads/${majorVersion}/gajim-${version}.tar.bz2"; + sha256 = "0v08zdvpqaig0wxpxn1l8rsj3wr3fqvnagn8cnvch17vfqv9gcr1"; + }; + + postUnpack = '' + tar -xaf $release + cp -r ${name}/plugins/plugin_installer gajim-${name}-*/plugins + rm -rf ${name} + ''; + patches = let # An attribute set of revisions to apply from the upstream repository. cherries = { diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index e24ea5e6fb3..dd1ce2264d5 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -4,7 +4,7 @@ let - version = "4.30.3.1670"; + version = "4.30.4.1672"; rpath = stdenv.lib.makeLibraryPath [ xdg_utils @@ -44,7 +44,7 @@ let if stdenv.system == "x86_64-linux" then fetchurl { url = "https://atlassian.artifactoryonline.com/atlassian/hipchat-apt-client/pool/HipChat4-${version}-Linux.deb"; - sha256 = "0alqzay6bvi7ybrrdk5r0xkg4sx6qjsqbgmr16bkqxncxhb215ay"; + sha256 = "1xrwndhbyhcmjcg8h1ib8lp1g51f7jxdhc6p7776zmhlfw94n3rx"; } else throw "HipChat is not supported on ${stdenv.system}"; diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index 74dc36bc7ac..327b02b2352 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, glib, openssl, expat, libmesode -, ncurses, libotr, curl, readline, libuuid +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, openssl +, glibcLocales, expect, ncurses, libotr, curl, readline, libuuid +, cmocka, libmicrohttpd, stabber, expat, libmesode , autoAwaySupport ? false, libXScrnSaver ? null, libX11 ? null , notifySupport ? false, libnotify ? null, gdk_pixbuf ? null @@ -20,18 +21,22 @@ stdenv.mkDerivation rec { name = "profanity-${version}"; version = "0.5.1"; - src = fetchurl { - url = "http://www.profanity.im/profanity-${version}.tar.gz"; - sha256 = "1f7ylw3mhhnii52mmk40hyc4kqhpvjdr3hmsplzkdhsfww9kflg3"; + src = fetchFromGitHub { + owner = "boothj5"; + repo = "profanity"; + rev = "${version}"; + sha256 = "1ppr02wivhlrqr62r901clnycna8zpn6kr7n5rw8y3zfw21ny17z"; }; + patches = [ ./patches/packages-osx.patch ./patches/undefined-macros.patch ]; + enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ autoreconfHook glibcLocales pkgconfig ]; buildInputs = [ - readline libuuid libmesode - glib openssl expat ncurses libotr curl + expect readline libuuid glib openssl expat ncurses libotr + curl libmesode cmocka libmicrohttpd stabber ] ++ optionals autoAwaySupport [ libXScrnSaver libX11 ] ++ optionals notifySupport [ libnotify gdk_pixbuf ] ++ optionals traySupport [ gnome2.gtk ] @@ -45,6 +50,20 @@ stdenv.mkDerivation rec { ++ optionals pgpSupport [ "--enable-pgp" ] ++ optionals pythonPluginSupport [ "--enable-python-plugins" ]; + preAutoreconf = '' + mkdir m4 + ''; + + doCheck = true; + + LC_ALL = "en_US.utf8"; + + NIX_CFLAGS_COMPILE = [ ] + ++ optionals pythonPluginSupport [ "-I${python}/include/${python.libPrefix}" ]; + + LDFLAGS = [ ] + ++ optionals pythonPluginSupport [ "-L${python}/lib" "-lpython${python.majorVersion}m" ]; + meta = { description = "A console based XMPP client"; longDescription = '' diff --git a/pkgs/applications/networking/instant-messengers/profanity/patches/packages-osx.patch b/pkgs/applications/networking/instant-messengers/profanity/patches/packages-osx.patch new file mode 100644 index 00000000000..77bfc5e78bd --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/profanity/patches/packages-osx.patch @@ -0,0 +1,11 @@ +diff --git a/configure.ac b/configure.ac +index 1e55b1cc..0832a387 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -22,7 +22,6 @@ AC_CANONICAL_HOST + PLATFORM="unknown" + AS_CASE([$host_os], + [freebsd*], [PLATFORM="freebsd"], +- [darwin*], [PLATFORM="osx"], + [cygwin], [PLATFORM="cygwin"], + [PLATFORM="nix"]) diff --git a/pkgs/applications/networking/instant-messengers/profanity/patches/undefined-macros.patch b/pkgs/applications/networking/instant-messengers/profanity/patches/undefined-macros.patch new file mode 100644 index 00000000000..9ef4e7bebe5 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/profanity/patches/undefined-macros.patch @@ -0,0 +1,40 @@ +diff --git a/configure.ac b/configure.ac +index 1e55b1cc..0832a387 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -83,12 +81,12 @@ elif test "x$enable_python_plugins" != xno; then + AM_CONDITIONAL([BUILD_PYTHON_API], [true]) + AC_DEFINE([HAVE_PYTHON], [1], [Python support]) + else +- if test "x$enable_python_plugins" = xyes; then +- AC_MSG_ERROR([Python not found, cannot enable Python plugins.]) +- else +- AM_CONDITIONAL([BUILD_PYTHON_API], [false]) +- AC_MSG_NOTICE([Python development package not found, Python plugin support disabled.]) +- fi ++ AS_IF( ++ [test "x$enable_python_plugins" = xyes], ++ [], ++ [AM_CONDITIONAL([BUILD_PYTHON_API], [false]) ++ AC_MSG_NOTICE([Python development package not found, Python plugin support disabled.])] ++ ) + fi + AS_IF([test "x$PLATFORM" = xosx], [rm -f Python.framework]) + else +@@ -107,7 +105,7 @@ else + [AM_CONDITIONAL([BUILD_C_API], [true]) LIBS="$LIBS -ldl" AC_DEFINE([HAVE_C], [1], [C support])], + [AS_IF( + [test "x$enable_c_plugins" = xyes], +- [AC_MSG_ERROR([dl library needed to run C plugins])], ++ [], + [AM_CONDITIONAL([BUILD_C_API], [false])]) + ]) + else +@@ -116,7 +114,6 @@ else + fi + + # threading +-ACX_PTHREAD([], [AC_MSG_ERROR([pthread is required])]) + LIBS="$PTHREAD_LIBS $LIBS" + CFLAGS="$CFLAGS $PTHREAD_CFLAGS" + AS_IF([test "x$PTHREAD_CC" != x], [ CC="$PTHREAD_CC" ]) diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 87b2ee22381..fc8a601f1be 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -6,7 +6,7 @@ let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.16.0.4"; + version = "8.18.0.6"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -57,7 +57,7 @@ let if stdenv.system == "x86_64-linux" then fetchurl { url = "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"; - sha256 = "1qc5qd07r768q9wkr2fq1q731hslh21i8rs41jb6pbn3ai65mxf5"; + sha256 = "193icz1s385d25qzm5vx58h66m4hfwwmkavn0p3w6631gj617hig"; } else throw "Skype for linux is not supported on ${stdenv.system}"; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 67b116274a2..c150b1e55bd 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, fetchgit, fetchpatch -, pkgconfig, gyp, cmake, makeWrapper +, pkgconfig, gyp, cmake, wrapGAppsHook , qtbase, qtimageformats, gtk3, libappindicator-gtk3, libnotify , dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 }: @@ -36,7 +36,7 @@ mkDerivation rec { substituteInPlace Telegram/SourceFiles/platform/linux/linux_libnotify.cpp --replace '"notify"' '"${libnotify}/lib/libnotify.so"' ''; - nativeBuildInputs = [ pkgconfig gyp cmake makeWrapper ]; + nativeBuildInputs = [ pkgconfig gyp cmake wrapGAppsHook ]; buildInputs = [ qtbase qtimageformats gtk3 libappindicator-gtk3 @@ -112,11 +112,16 @@ mkDerivation rec { for icon_size in 16 32 48 64 128 256 512; do install -Dm644 "../../../Telegram/Resources/art/icon''${icon_size}.png" "$out/share/icons/hicolor/''${icon_size}x''${icon_size}/apps/telegram-desktop.png" done + ''; - # This is necessary to run Telegram in a pure environment. - wrapProgram $out/bin/telegram-desktop \ - --prefix QT_PLUGIN_PATH : "${qtbase}/${qtbase.qtPluginPrefix}" \ + preFixup = '' + gappsWrapperArgs+=( + --prefix QT_PLUGIN_PATH : "${qtbase}/${qtbase.qtPluginPrefix}" --set XDG_RUNTIME_DIR "XDG-RUNTIME-DIR" + ) + ''; + + postFixup = '' sed -i $out/bin/telegram-desktop \ -e "s,'XDG-RUNTIME-DIR',\"\''${XDG_RUNTIME_DIR:-/run/user/\$(id --user)}\"," ''; @@ -124,7 +129,7 @@ mkDerivation rec { meta = with lib; { description = "Telegram Desktop messaging app"; license = licenses.gpl3; - platforms = platforms.linux; + platforms = [ "x86_64-linux" "i686-linux" ]; homepage = https://desktop.telegram.org/; maintainers = with maintainers; [ abbradar garbas primeos ]; }; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix index 1b9ccb98d0f..2d880bef753 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix @@ -2,11 +2,11 @@ , sqlite, libsoup, libnice, gnutls}: stdenv.mkDerivation rec { - name = "telepathy-gabble-0.18.3"; + name = "telepathy-gabble-0.18.4"; src = fetchurl { - url = "${meta.homepage}/releases/telepathy-gabble/${name}.tar.gz"; - sha256 = "1hl9k6jwn2afwwv7br16wfw5szdhwxqziba47xd8vjwvgrh19iwf"; + url = "http://telepathy.freedesktop.org/releases/telepathy-gabble/${name}.tar.gz"; + sha256 = "174nlkqm055vrhv11gy73m20jbsggcb0ddi51c7s9m3j5ibr2p0i"; }; nativeBuildInputs = [ pkgconfig libxslt ]; diff --git a/pkgs/applications/networking/irc/bip/default.nix b/pkgs/applications/networking/irc/bip/default.nix index a79df085e6b..7c40a4e12a6 100644 --- a/pkgs/applications/networking/irc/bip/default.nix +++ b/pkgs/applications/networking/irc/bip/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }) ]; - NIX_CFLAGS_COMPILE = "-Wno-error=unused-result"; + NIX_CFLAGS_COMPILE = [ "-Wno-error=unused-result" "-Wno-error=duplicate-decl-specifier" ]; meta = { description = "An IRC proxy (bouncer)"; diff --git a/pkgs/applications/networking/irc/ii/default.nix b/pkgs/applications/networking/irc/ii/default.nix index 15f9def1151..4807f3419d1 100644 --- a/pkgs/applications/networking/irc/ii/default.nix +++ b/pkgs/applications/networking/irc/ii/default.nix @@ -2,9 +2,9 @@ stdenv.mkDerivation rec { name = "ii-1.8"; - + src = fetchurl { - url = "http://dl.suckless.org/tools/${name}.tar.gz"; + url = "https://dl.suckless.org/tools/${name}.tar.gz"; sha256 = "1lk8vjl7i8dcjh4jkg8h8bkapcbs465sy8g9c0chfqsywbmf3ndr"; }; diff --git a/pkgs/applications/networking/irc/sic/default.nix b/pkgs/applications/networking/irc/sic/default.nix index 975715ed7fc..cf72bef62b1 100644 --- a/pkgs/applications/networking/irc/sic/default.nix +++ b/pkgs/applications/networking/irc/sic/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { makeFlags = "PREFIX=$(out)"; src = fetchurl { - url = "http://dl.suckless.org/tools/sic-${version}.tar.gz"; + url = "https://dl.suckless.org/tools/sic-${version}.tar.gz"; sha256 = "ac07f905995e13ba2c43912d7a035fbbe78a628d7ba1c256f4ca1372fb565185"; }; diff --git a/pkgs/applications/networking/mailreaders/lumail/default.nix b/pkgs/applications/networking/mailreaders/lumail/default.nix index 2c1678e994f..79deab46912 100644 --- a/pkgs/applications/networking/mailreaders/lumail/default.nix +++ b/pkgs/applications/networking/mailreaders/lumail/default.nix @@ -1,20 +1,42 @@ -{ stdenv, fetchurl, pkgconfig, lua5_2, file, ncurses, gmime, pcre-cpp -, perl, perlPackages }: +{ stdenv, fetchurl, pkgconfig, lua, file, ncurses, gmime, pcre-cpp +, perl, perlPackages, makeWrapper +, debugBuild ? false +, alternativeGlobalConfigFilePath ? null +}: let - version = "2.9"; + version = "3.1"; + binaryName = if debugBuild then "lumail2-debug" else "lumail2"; + alternativeConfig = builtins.toFile "lumail2.lua" + (builtins.readFile alternativeGlobalConfigFilePath); + + globalConfig = if isNull alternativeGlobalConfigFilePath then '' + mkdir -p $out/etc/lumail2 + cp global.config.lua $out/etc/lumail2.lua + for n in ./lib/*.lua; do + cp "$n" $out/etc/lumail2/ + done + '' else '' + ln -s ${alternativeConfig} $out/etc/lumail2.lua + ''; + + getPath = type : "${lua}/lib/?.${type};"; + luaPath = getPath "lua"; + luaCPath = getPath "so"; in stdenv.mkDerivation { name = "lumail-${version}"; src = fetchurl { url = "https://lumail.org/download/lumail-${version}.tar.gz"; - sha256 = "1rni5lbic36v4cd1r0l28542x0hlmfqkl6nac79gln491in2l2sc"; + sha256 = "0vj7p7f02m3w8wb74ilajcwznc4ai4h2ikkz9ildy0c00aqsi5w4"; }; - nativeBuildInputs = [ pkgconfig ]; + enableParallelBuilding = true; + + nativeBuildInputs = [ pkgconfig makeWrapper ]; buildInputs = [ - lua5_2 file ncurses gmime pcre-cpp + lua file ncurses gmime pcre-cpp perl perlPackages.JSON perlPackages.NetIMAPClient ]; @@ -29,16 +51,26 @@ stdenv.mkDerivation { sed -e "s|^#\!\(.*/perl.*\)$|#\!\1$perlFlags|" -i perl.d/imap-proxy ''; + buildFlags = if debugBuild then "lumail2-debug" else ""; + + installPhase = '' + mkdir -p $out/bin || true + install -m755 ${binaryName} $out/bin/ + '' + + globalConfig + + '' + wrapProgram $out/bin/${binaryName} \ + --prefix LUA_PATH : "${luaPath}" \ + --prefix LUA_CPATH : "${luaCPath}" + ''; + makeFlags = [ "LVER=lua" "PREFIX=$(out)" "SYSCONFDIR=$(out)/etc" + "LUMAIL_LIBS=$(out)/etc/lumail2" ]; - postInstall = '' - cp lumail2.user.lua $out/etc/lumail2/ - ''; - meta = with stdenv.lib; { description = "Console-based email client"; homepage = https://lumail.org/; diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index ea7e7ee282d..c50553cb680 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -79,7 +79,7 @@ in stdenv.mkDerivation rec { postInstall = '' cp ${muttWrapper} $out/bin/mutt - wrapProgram "$out/bin/neomutt" --prefix PATH : "$out/lib/neomutt" + wrapProgram "$out/bin/neomutt" --prefix PATH : "$out/libexec/neomutt" ''; doCheck = true; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 0ae1777a839..24b16744ff6 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,595 +1,595 @@ { - version = "52.6.0"; + version = "52.7.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/ar/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ar/thunderbird-52.7.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "fa4cc97701d7a44e2256149497a72a7057f3b677163b85029a9721fa03b4b518fa8c3564ad727824faf3c81242bc7dfe673f7fbbe1bb2b92aea16b779df8d6f5"; + sha512 = "af887818b7859b8bfc87e0ac7ff26c1fbb98a50968d18d174bce37c2132a5957a8c5153f0364aa3ec0f636831313dd3bac6512dd6e7f932ed5cc99ed2016e9b5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/ast/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ast/thunderbird-52.7.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "f40ae6c5f72ad797b42c6ada1302eebf63b649bfa2d5838cea7371ad92de8e1eaaa79cd115993d96dd873bca996b12fb20c8f4f40ee4db144cc2bbd5a27ef182"; + sha512 = "dcf8ab98558b7d2b8e5d2a97406eb13cc93900fcd60502ea4d8469179d08c55d91e66c7b99a024fbc6705e339750b41d9537d4d81f53f8d1f83461b986a6487a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/be/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/be/thunderbird-52.7.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "768453738bda8b0040d3b4cb21b1695dacaa54cacac5ec3130d5e4ebeea4e0ad8303ff2860fe5cfe5915df951aabe2f8a069b979abdc8ab8eb161811d93a8558"; + sha512 = "021f531995db9a0993e830fa8f1da6089d0703424dd8993c23e59939091f58c4baae5ecb6cf51770ff73743c227129ac3215ec46d7181d88cd52a39b2e0e41ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/bg/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/bg/thunderbird-52.7.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "dbe67671831f90f739a7af794578270f1177ce7e54727c78e6b74d6bc400ca3cff2ed4174b5b38b73ad1ebab0d9d0df34fd6e3ee769cf96e99f4fd84ff69d018"; + sha512 = "a60f13e7b2760e19592e99eef1bc52593cabcf1b70b7803dd4262b2743e3c755cb4381ccaf1e75f41d4360897dcac3edd7e79648a6f4e81da4a1e83d67bb3ffe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/bn-BD/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/bn-BD/thunderbird-52.7.0.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "4d7aa1a03c1ec122150611270502fc209406703f0081e4e6ed212d07b327adc67c49db2891b1b62799c48218935200c5f671615a159a900f4d838250ab578798"; + sha512 = "a73074fa5dfaf121b8f12e86dfc29189e9700a71a868f68a70ccd17c47df3a8512700893f981e065c5c20f9432ca764f3c59d4726a2c6abf3fd25530eca0d9a5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/br/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/br/thunderbird-52.7.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "9e229670bb1a4263a1922b5c4d6329209d95aed8f92264977c8c9d1de81c89440666602fad19b686fe214e8847e305d531046fc00a77347393d3d38be31f7f1e"; + sha512 = "28f4bff69059dbd1077641e888b234b0db95feb11bcb1db1ed047f3ab12282b9f95138835cca5f7eeb87a15ec1057b60587cadcb5fd658fbbe4c556d7eeed47a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/ca/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ca/thunderbird-52.7.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "0a905562d18452535a6cc05b945467e40c4ab8dd80d13ea07de293e02477cf5ac1c49546213e236f8266aaccc923ed261f1702b38289f2e165d818bb7e55b218"; + sha512 = "a9e45eda2b36bb12321140854e685fe4e203c7f56c1c8184a776c38d984f8381c6553cb5f601677f8e0e74ad497a040a18f5f392b99bdbe9535e19aa9afdcb7c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/cs/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/cs/thunderbird-52.7.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "3a2417f8b8396e0bd9c1b900f1547ea631683d35cf1e089698641dfd62672824a5594c8bae1ceed6d9fa4adb646da1b027a3c0378687b86ecd2351e4db227d22"; + sha512 = "2c0f60ccc5c9a9fd66526af3aedbe2749f35a5fa7509c93b7b60d9babb1b4968eac6bff48d042ac8112793fe2825467de4d0efc42afda19547e8c6803b723119"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/cy/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/cy/thunderbird-52.7.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "6f705e71057c5f4016ffc60ffd0dc114f462785eb139da474412fd6164c761d89f7faf08ffdc93cc746b0d3df1b57024d69c20303d867bb3ffdd2739869bc075"; + sha512 = "611ffc3d156ce4cedec0679bd9af3e8376dca5b20af2457a75d83dac7c71640a23a6cd544c190551480d6b37bcb9a9ec91342c2bca95cf10acb642d067056a04"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/da/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/da/thunderbird-52.7.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "4f981281b63ed48e58bee4b7702389dca2bf5497cc74e8603945b25c7ce18e73b7b0ec006df8e48ea5ca8d57c6b874e7cbdeb2f43e214cbb0b99cc7983556790"; + sha512 = "0b858b5be09e038983a21715f58a215ea70fd811f7c8acd4ddb89611dd5590599339ab26913865b2ba75f4538cc95bd3e38e28646c281c041b0b08002aef033a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/de/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/de/thunderbird-52.7.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "4553f9b771e4ee907e2e379eb87ac62143df34cd3777e8dadd74b46839c6cb79f8fec87b4bd48fefdd21a4837611637897232895278ef3bb0337f816c37ce685"; + sha512 = "cfcdbaec0a026ab246d45e00232f5d5f3f240f4957bbe41d70cfb421be438cbf8986920784d4d0350a274284b39ec42c20d33883f3f7fabf3b51df3a062fac15"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/dsb/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/dsb/thunderbird-52.7.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "cfb64b6eddcbe54a701c5bca339225bec63e96dc2b1d3d2e358b32820239a970913415e8248ed8852be77d1e64741ab4746476e51a1fb9e9d6510cd6eabcfcb4"; + sha512 = "52ef4b0dda8fe163675d46e7233b935b38a5899763012b0b9befb1ddd015f0a8d265de2adb4924856a4bc7753b3eaac2dc7861c5b75d8b231e667d29a583d673"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/el/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/el/thunderbird-52.7.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "4761f016a202abfafd3d249ccca8d05b8697645eb820cb45b1567476cd806c49e9a13d9c5ff28df5c226e1f787abd698cbc610df28e03b5f0d70ad43b90a0ae4"; + sha512 = "ab92343651598eea5f8010829bde589eb88a795ad0a3d0dbd1a5889d162b966e0e9bdf7bd32f49c59eb49b29261a075da1f4e75de49f87aa3fbf95796281062a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/en-GB/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/en-GB/thunderbird-52.7.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "a310e79e4da7a79a0c9d48db19b68e197fa71e4ff3d3b1c1178206ff0bbe883623d97ded1268a8512f370dbb232b8534e503d42bb6fc70583b78e78deb27fcd5"; + sha512 = "1b0e11a1f8daba6a57ac619d764a60e9af6874cf7468c9487e55cc4be7c981d9dd375931b8956ee307754eb846900d4831c313fbdd3eba4658eaf77940e4436e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/en-US/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/en-US/thunderbird-52.7.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "10c1147b8509876d3b278df8d362cfb3279086d51ad40de1ffc8814878ba28b051940b347b4ca1a67bad8090ba488426403b219b2add070b704fac200ad4c283"; + sha512 = "a8f4cb2238c3bf0ea6e4f8b444991bf0d6a4fe42cf7c0e38ae3738167900ac52debc0daf8bf4d7fb1e63326626072fc498db6b227337eab82ea48f2fcd561334"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/es-AR/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/es-AR/thunderbird-52.7.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "77753858bcba266c6ea44f12eefc5a8fd1b6a7ef39b2e778e01490ff290046415e6a75a56a104dae12b1a6cfc69b179d13f6cf5b80ef20e8120864b7e9447d1f"; + sha512 = "adddbaee6899434a0eb1fb955cd99c33786dc9c7376f1e84bb8036ed41d5731c48917ddd5d677a9dcefe3e7f382bcbbd51921afe1e6e119a4d32fe2cf9ae23cf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/es-ES/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/es-ES/thunderbird-52.7.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "f9228ef15899197a8defc67cfa8f51e17aa3f2e5b1e8b79cef8b221a012e47b74d5a91dc82ba1a53e97f1518b4d60f08220f870427751c9ee1c477600cfb3a38"; + sha512 = "aaafff39c8f5566056f5339310c8f633e48f78c57d2b4730a13377aa5c09e9698295e59e7b137def2706a3dbff9b48710e25a0db24e60dec75c06f9d0713cead"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/et/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/et/thunderbird-52.7.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "37cdd026fe48f84b19adf63c6bb642fd2efa72a95125fbf5e2761623c920549c045589dc53892a828bc759630e8cfd1afad5825af7d51d6c7c5fc495e450f401"; + sha512 = "8eab1f67c3f56a39e21734cfefd11e84fea60fdbd3e470c1e777b607535923c451d7318c2bd7958435ae137928e14f97559781458d8bd6cb2e1e88d47dabfc2d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/eu/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/eu/thunderbird-52.7.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "4827d5f30c5a9bda1aaf5836250d43b41d38d2f882cae61a097c5ae753a7d429a7486d8a47991173ebea15bb70cfdd6b1d4ee4c1e7696b41e9e047786f320b0f"; + sha512 = "be2dd281a0a219e031cc485c21341d259aeeb56d34f79a9db82033d1e17647cf8c8617a2fcbc6a46b2025842a46f1117e43ca769a449a64577df691bdfa18801"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/fi/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/fi/thunderbird-52.7.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "9e40fdfa10cfb24e4983834d72c831b5e94d8a05e51e45e989564c558af6d5c91710da1a63f5a21042da2cca9a4b310a52c1c212db02bcbe77d5579ba600d9fc"; + sha512 = "21535608a1197744f9385b3eca5c7dbef8f3a05f9639b5011f8abf0bbc0143db17954ca4ce1bfc9ba1f5c4659a4a0a74351e30e5f57c1d416d7bf11273211f61"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/fr/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/fr/thunderbird-52.7.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "362d689566ac6ad74adcbccb188ca958af5d308090cc13f268be8608f4b20917ed0b1ccc33fd344b6b4434ed2a8a62c212cc25dc85f52f7ab20e0355df06a370"; + sha512 = "ddda6457d4bd737778105d0bc7086e64ba58d9fb23a083977b456873fafd3170df495a2d81fa19c6b12a06d32e448a2cd224263f4773c0d165226c6f56cfbcec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/fy-NL/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/fy-NL/thunderbird-52.7.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "90b553cf697bc488e7f91eca2b9fceda94da72d49ff561af9a2f59dbe830a1ea29a49c9be8c544e1c83503a1902076a2badd7b35656372a18899f579d9455de6"; + sha512 = "aa3844d3d17a8fdc201e55352f52fa7805328e9f0b105b729cc8cbcde117885a6a6671d343469e7fad61fd9a5ebd8d87faec8f4a214744771ec4d2b43015c975"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/ga-IE/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ga-IE/thunderbird-52.7.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "8fa91ed0e71961e0850f6acd69ffec0876e4b8f72d19b170429c10bd00681095bf816f7c028afa2f01eb5c32f27b6f8272b1a1e3340bdc87ccc9477bb100fbf1"; + sha512 = "30e88160a0c19fa58d6d86f916a86d95362bb8b8d073b1ac0e17608c0c5bd9ac040402dc950579602f5124e40a814e582ad98cf0853ecd8c7b11a7418bf0441d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/gd/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/gd/thunderbird-52.7.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "8653c7664694898222e1dc292bdc244a6a2bc900b240a7fed30ea5cce47e7fc5524afe7b67795d15f0eafb250a5218ae5f8fa8236b7c6e91e15c3c74808a798c"; + sha512 = "7458c820056c89b15988424325785ef4e525c2fb970b6c7c04d8c3e8b09cf7a3592e16b5c15862c84bcf95e2b399e37874f2c099c61bbc76293e4d5d8ed5980d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/gl/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/gl/thunderbird-52.7.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "22e5454c0af357e030dda5a84347eb154524d0337fae6389102ffb0073ff33997dacac9b40dede462f55ea30c1bb4da65cc8e272271611f42ddd80b5ab9dae05"; + sha512 = "6be48b4ac248cff0842a5b78023dcb9787588c74ce1db89bb03a9a99ac0a2ac24a6949ae125219e99caf93260574d1c84355ca8f0f9c76ed15731d8a4950c98c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/he/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/he/thunderbird-52.7.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "51bddbb2a254849b6dcbfaf1f2faae13454bbb71472c7c95d279b5f83a6b29b1b063d904f02f13295fa32e6b33867856341994db9a2201d8f358b006c0c7752b"; + sha512 = "3dca324d7b3b00a2cc98f8949165d178be7bd68b118ae66383a0d3705925e3f6bda14aa25475886c1f9810cd15a48a79e81924b8ebccfb528ad4bd21e36ebf8e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/hr/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/hr/thunderbird-52.7.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "a08e2a71ac92e317944f09b2f03bbcfc32122493ebc0800534b6f3c714d4af0c431caf97be1818bc284826b88f08db3e4392f0c2b89ac7adba587f2f450cf804"; + sha512 = "23d5b2b0cb48fd274856a60dd9f916d294c8ec133771ff624e88cbdec214182c443ed5fd2d424475ed748113f84b74c732092f51061571104b1a62c301affabe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/hsb/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/hsb/thunderbird-52.7.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "9539a6c48e60c4c773b735afa6ee544ceceffdca76ceeedd90973145f7deb23f2e449901cdc75190b5bd510537e70fd948775dc66caef8a7b95fc31843cbdb66"; + sha512 = "7360e964d5322e433014eb10f369f27a6e4ff688ed441671ddaaa3526b70d212509c16624ca854e988ca581d0f60ccf31db1bb49b5c93521a5d07e697be84a4c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/hu/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/hu/thunderbird-52.7.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "d4d0fca22d430ec037bdf5cf8ccbce99df3cab22e4e6a2c3fb040cd1db960903e503ff2c8f633aa1f037a590b0a48134d949c1c4899de429a0533175fbb4a61b"; + sha512 = "5aaaf22f17015026a32c3648323fbca16b3845c0f52ebfd3414c11e1d7cd1a0e72a8319e924b9eea67bd9c1448b87585709d3b99a8783ed580e11020a762eb31"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/hy-AM/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/hy-AM/thunderbird-52.7.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "362ddd92ceec22ac93d95d721c1806ff0270fccf33f0cc4452ee147b3388f071b6d5aa27a0e7548a35a50453d55be2532d7fde19be611b9f0ecd741b5de59e1f"; + sha512 = "7159dcfddf5981e1ddec5ac11613a7b30c513e0319249f08196ec88fe3e2256b52f3e1e418e46e276c1f35195f15d778b83d27e3186b2b8571e0b374844f6248"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/id/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/id/thunderbird-52.7.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "29ba391bbd9b8984850f056d856bcf90c0ac816fb8b831416e5a96f36e9b2dd0517cb5f1caf37998f75f024f3fbdd3b989ca6d4973ded22cbd15568a7b249531"; + sha512 = "9cf647ea244bcd046f73cfcca97c5b5f2dc3f5b0991d6edb100b4c4263ab75d8b5d07a418b906b66b50d9c4f29360637ff4ce605dbed7bd85c9b624d33331ae6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/is/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/is/thunderbird-52.7.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "2303d0d74e112bc4f86e6d73fb63fabe8f10aa3486a9d2f61fe16b0b0525bc7b6091c94e27f0ccb548b47bf808c937b83a4609c5c0cd0bd0fc6556c18dc08661"; + sha512 = "d567dd894926e7a5288da3f7a2837ded333772c799acf6f27489327b3e50236561dd0a9d04e3623d23a6d00e7b35c7b8572c611bf1e767b4f43f7d5164ea3787"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/it/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/it/thunderbird-52.7.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "d3d9e95728063bd4e4742619c8ec27d4a0cdc34941ef8e6e3af71f19d59b4db6661366a81f1df7fd1de3a2ce995a1232f39744a825493a0c456d5257d02f7cf0"; + sha512 = "e3511d7fed2617cb6cd59b1b56189a5f70db7f98cf889ce0be31d6931d0500a61b7d6a7f9907009bdaf37ad968b50aebae0930467cd5b0b70a6d2caaf89bc5ea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/ja/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ja/thunderbird-52.7.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "1d64a298e5b0ec9eaac8f8972ae975a98a5bcbc4823abd59a6cbab251ddcb5ba76263bdae0b55dac15455d8b7d9c8bda71cc54ea0fe67aea5efa5552973be94b"; + sha512 = "0a4cac4b246542a42534e2b028a84cfef470c884143a08c489b56906a1d167ef66de82d326874e49d22a64c259aeac21b76f4cc2b20acf2885040db35decbc41"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/kab/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/kab/thunderbird-52.7.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "1b351b01ea540b809cad198912853b3f74bc9cb52c33b7fe4ab586f921ea4a2486f28e855d2be95398af6abad2911c5fd3f0ab16938edea85596689799b452b1"; + sha512 = "9b6939d454dd5f0635d6fa3cd78d57d4c3461df67108a9c20a85cded552bffb68ca9f8e9af037150a0cb31588fcc663a0f1a8b91183fd257eec5e144516b5ca6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/ko/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ko/thunderbird-52.7.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "d9895da7e3099c5d9389308ae6982a77387cd7d61c07ec16e4511c00fc3b18bd025b95c6f05a94cd5e990eb9472816bd4af0a1bbe3605561f2bfe2b9f9b207e8"; + sha512 = "c965abf90339a3b8dbaffacd61b33729a0312052ced29cd8300cd5dbb577b7b663a314a5d27528f9e03ca55753ee96b392ae745558e59eeebec80857dcf34b3c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/lt/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/lt/thunderbird-52.7.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "8791ae3c0ee4745449b1690f69de0665f7854288188f1570e4c876b1f936e790d651bb1f9ecfcfe99f01f49026d534e667f262c72290894368579313b8a59615"; + sha512 = "f8724c9f29d2965e23a90156586ea85721b5c5693c56fbc5932ee367c87a4531fdd318968cb38046f748dd60f4ef0ebb4636a2034f061e3e5926826aaccff410"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/nb-NO/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/nb-NO/thunderbird-52.7.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "be2e537c4dabfc6070f180205787712317ea3bf1befebb5d99d0be562aac60f728635ab665b6813776d985ff5c5d10e72658dbe20c6441722113ca8f9cf00553"; + sha512 = "87bd58ae4dcd766c0b3403e578c41ddc46b5801bd743747a23802770099ce37f55daed7beca134835f0f16939784d7d082b8d6903fdcc993cec56846b1d55c5c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/nl/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/nl/thunderbird-52.7.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "20bc3bd3105880541b2dae20b703191cdb499dc7778fe874da5ae9b0b1626d72075631e256bc0c2fee1c4d1d27424cc6168c419afa8bec8a00d5904ae0678f12"; + sha512 = "3f332437788bd314e8a19fe3263631c2000cdaf30505129b37693fbf499fac3d15736b51d2838e49daad8e9225094a92bf3638fee6a6e33f2cfff6357f1a1597"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/nn-NO/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/nn-NO/thunderbird-52.7.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "2437751b998ee2898bbb8f8187adcbd102d29fc54054fb04efef2e0f7f308c864215bb8468ac42975bbd18c6e4a0c8903e5784a4d203df3643029cff696c2540"; + sha512 = "4bd2918e59a87ad0afcba3e82640a0c729fdf672c1d977cce62f3bb7d92e14e008c83fc362a5c162090a3d4c0a5608262f5859ced2327274231ff534b6768694"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/pa-IN/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/pa-IN/thunderbird-52.7.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "925ffbbd7d9e301c52b60963bced66af8b97a7b24275d73ca923f0d757164faf4ba7c69003286d74a69f1ed328e94347ba63c6ca7e13f47f42b7529af9de5ee6"; + sha512 = "f0c448cf25471b1aa4387208a8d0bd7e41531fca86dc7118f4467d2db101835af3be9ba79713bcbd8d8556895efe4a2af68606df18fbd506734359950e00ebe9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/pl/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/pl/thunderbird-52.7.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "27dfc79cfcfaea36ee50b2249e8e2a5195e9dd2f755b0f9d3274af2e4cb3d0d5214a4065e08678bbfcae4b51f0a0c2c4b4385c2a199a5b65035ac895de08bd63"; + sha512 = "5f9bbd0a1be4d0ac5c50c281ae75025f4b12d8781a73463876f26861c9289c51165cb68ab4438401ded5ea484477c1fe862f5d57430624bc11871f0b36e2c50c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/pt-BR/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/pt-BR/thunderbird-52.7.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "b600e2e3dc931ba2db5e4bf36187f971c7c1c710f8535d59c999a9685f551454a6e39f80cf70374aeac41ddace2f80fbe68bcda1675b80c5cc39dd8fccf7625f"; + sha512 = "afb4ed9a2739e0d590ace16f4dc8c4b1d19d05537fcdbd1f23e404218387d2c016715a074b630885a903588b8bd4a8329190d6ddb9231805a8538b4199513a6d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/pt-PT/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/pt-PT/thunderbird-52.7.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "3ca5ed7c487ca11ef2fc743e8a66eeaa05d2585d2fab0ca40b0d965e10e43d1216de358eb61921578fcdc72b69766f8fe24beb3c548ed47c705ab84a30941c34"; + sha512 = "d907bee397dcfac8763c7dfd18d5bdb5bd99afbef554a98f625c36aedde922fa03c5f79e46acca4ecb07f9adf6eb59c869b1694c68e88ed759e04abab13a210d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/rm/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/rm/thunderbird-52.7.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "2d9e51a01175549c712c5bd1e95e08012ed9494a0f6fa5ffec8ee1c311279a6826cee99488a72d86f2cd98d9d9d6d20ef886bd4f69d100a2b589ef8dfc887335"; + sha512 = "61c70149b717b193e541e49614027a5cc5c4f5a0a4642bb5445843b2c53165ae29088773498245de3e8d3324c26d6d96cd225d9e3e2e491f06d0b60586f23d2e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/ro/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ro/thunderbird-52.7.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "8cfd1503ef3f4a9b4765d6c3fcc3a44aaa2fa557fc2a698452d10b037fdfcca09c462b455c4088b69aa89c153f14b1621d3c87c942a7bbb4627f95bbf0a37738"; + sha512 = "d9d604216c4805fbaa0444c5f61c7e1f8dc5609adde7bd8fc301e4ff0577b73a255cc95aa07f13543ce82b5487212b9b0e4284be47b2eb897a5c1880ed9fcaa5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/ru/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ru/thunderbird-52.7.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "74d611abaa10d04be342139e19b7f724516a91de07a5f4ae4c4cd3ad927accb5e6668830040defa20878ec1fc884bc983d084729ebcd1fd453c7082a627329ec"; + sha512 = "e385a46635372660a304d4cceb86be56d2a07b767a4eb17b131d67eb33494c878ed4e4cf3da3a1a198a9f3cab7c541161e325cbd9d5957c8af56d2a62118ffec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/si/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/si/thunderbird-52.7.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "292b5da1ea566ebeae2756b659b1f2ad40a4dc57517da926b3f8263a219e734d197d9aa55ce91582bd8818e0434d2a6b3bc40892d0cbd4715fcac50e3aebf7f3"; + sha512 = "952e89769e201e9320929f0562f27ca2de25a7bf4f0098964df6974831ef342f228de0278dd2de55a0d11c36804d04f42b9c9714f2c1ad44f5d68da1ae184d54"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/sk/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/sk/thunderbird-52.7.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "a5f6466d7ff0ceed4fa25c446925e398cd91c29d705ea1e28166bec09834b1f3ac61722823828d97d17b1ce7ac2e67aa98c3d5d94806b7a470d29c5722f37d9b"; + sha512 = "827243b12ae2eafbb0da9673f914e26755dd3a54931e41a85ce89ab236b56bdf4ac4c256769865928509be4b998dac4a4924895ba583192d95b7271788185822"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/sl/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/sl/thunderbird-52.7.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "9167d416f7552b55f8551146a3073757bea4106fea2004ad4303809f0532b85d37fea449ed09f0d162cbda2f429d869b90b5ef14f29784f418c63085a7c9b5b1"; + sha512 = "d4063aa855abd1701feb078471e628728e3bb61e8799ac186c75b325b4db14a81734befe4782d75cd07170cceaa37b83de90d1d1ba73f950f7f76e24265cf49f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/sq/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/sq/thunderbird-52.7.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "aceb16a89f40243f56611d726a47b15bc6b0e5c1177a4beda6b147749299640742dd9d5f64384e88f4fc065c5f5ab80a7456a81ed63331a99a60e1e2e8b76a08"; + sha512 = "a90f3446a0a759fd9cdac2ea0251c676539f5dea56099d0e515fdcac72e881f54a95506f257da91b87d4be547b4377cfe8a7345e5087ff63d24e8bd2fc6742bb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/sr/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/sr/thunderbird-52.7.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "c0cefc58703c51d169686bb6c25477ea3116fc9691e0bf971d2a141ee8e93e4e1853911189c2b49d331d8b04c70e3c154083a05179c93a22b043a70918808ba3"; + sha512 = "f313d71b58efbe34f96ecdccb0ed14977899b6038d2a5d0d7c3138881a7668e8282e4c927f106fdfd1d74774404734e57d97d0004086997ace4ca53921321adb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/sv-SE/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/sv-SE/thunderbird-52.7.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "179429292f73320f33d3cfbdd4b55b65117c8b8f60abadbf8c28537ab1e6e7664f7e2fa1b20ecdb201d7d535a9974638a7c22c2f5ba0fabea580509bd35d2a3e"; + sha512 = "0889f3c2917b01211dbb5d28262726a3dd077dfd5327fe1f3dd4742cd45aab9ab8d7bfeb141a5a2c120239c522182e46a263ad0d6cb8c2d71d4c9c004d734a68"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/ta-LK/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ta-LK/thunderbird-52.7.0.tar.bz2"; locale = "ta-LK"; arch = "linux-x86_64"; - sha512 = "ccc1e3b1ca1e2a762c840c5e52b33cb3c05b75195576e95f7d28abe53aa6438d83eb185664797be9a0726f51416b4cc70877a4d6e01282d426459820eac59b01"; + sha512 = "49bd7127f1412a48aa7e66bbd2957cbdb4f02d4f43cf856b8b796562e945a1016852d695773351b30b65ee0d2d4b65c9aff4c347e9a5c2b64bc3818cce65ae54"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/tr/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/tr/thunderbird-52.7.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "55b14f94b1824df5e05d8c8f8c1a86a3d9667123dfb7b86723888ffeab93b8b0ed8dde082c3db0ee33446052e81b6f282e4ac3ae9a2a51ef25e01c6ffc93ad1d"; + sha512 = "6b50781107d219c7a86bce30b51c5e791627fd6305d1573d4fda98321e8476c3978a3b8d388005bb6d05ceb0ed0c6c119f9baf1d057b1f6d533d0e42baa90a51"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/uk/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/uk/thunderbird-52.7.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "94047ef1efc45fcd228012a8833ca1d6d5540ba0549a5f598ca420564e85dd0bfe4995968ba241d57b588db542f6c33445459c77b40eb3b568f66d3ef8e4e91b"; + sha512 = "58e7e921d7d2ad46237ff66bf0f2cb0de448f68668968b56779ee874d0a9eb29ffc46876b6aab4a0c30e4aba597039c73939e6d454c8feb56cbb6b4215791016"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/vi/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/vi/thunderbird-52.7.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "f30ab0cc3b6d4322d9d65150da1b247db12305f8a39acef383048118f30a757ca380134f0f12c238432a23f5d70d173e53e24f46af158ccdcf5eac516267840c"; + sha512 = "5a2bee3035e76deb55d24d5043967e51dbb9d79dbc7cdb5dd9f59cfa2311391fc25017f08c709e7d33a5fa7ca0d8ae375ba074ae382a67f46b04e36eed504f53"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/zh-CN/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/zh-CN/thunderbird-52.7.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "4dd0923c8258dec6de71aad216dffb2945852f2d6ad20e104599a43a13e7c48bdaaa70a7afb35e3699bbaffc9a69623d6d24e299f1a0e75f604ba9bad96647ea"; + sha512 = "73983afdd0e07a394029f64f1fba5f24ae0bce80ef7f9fa3f5374af3b5e6a094bb41d7428a252396b433ca59a092e5d19b20eeefc5867d68bef00a1894437159"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/zh-TW/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/zh-TW/thunderbird-52.7.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "39264550d88ad4fbc247b9bb61015b2c0a9e75ffc19ec34e1d7053995e2fcfd65721140f2f4486fe959e67484c6ca6305e997c77b59b98e60e9e979c60e320f7"; + sha512 = "71ba36ffb59a94191ffd6bd24a00d3e35422601310b70a6f411b8ad0175d7f67efe9ccb8d0a2a7c1d47263d5d1cbd0a4f790ef54cd174875d0c0bafa86481457"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/ar/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ar/thunderbird-52.7.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "b801148b9eccf4425710ff3c5430795d873448ee068dec8e8343ec9094d8c04e317dd0cf6e2d3b69029459d980b841470365441e26d8f71503d9c6f03a52d0fa"; + sha512 = "fc69ea6bc9393f55e247a78eb747c4ae6ae0c30efad8188d50eb52f4bc3f2e47e328788cf329966e8184b468a58bb923fdfdc736ff7b7b37cbbfa31bc619e065"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/ast/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ast/thunderbird-52.7.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "7368be5dab56f03635d3bc06f1d1871893dd8a694388baa90a44cef5f88717a705daeb2230dae8c2bfaf8b40e1f7987aeefc729b4e77ec1055726b0944276c79"; + sha512 = "74a6ed4829522c0ac7a4411ab4d269f557391c53d1313eb1b70bb6e3fbba30217343945e60d46bb7c5fcfb20a40b2e6bc0c40cb66bb72259be4f9ad78796bedd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/be/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/be/thunderbird-52.7.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "a39137149f5800b5ea612382b86840b095fd09e38d06ffaeb4a2f5e242b47cac828ffb87c9870a9ebc75b9bd26b0499c2899d5b778267dc6842d21afaab0e7bf"; + sha512 = "ba645d2eaf0eaf90a0c1f2f24aa87c6783405fab00b2608aa1e3f88f1f81877c4927e93e2090509b9e06c8e2655a4aa731bed47ecf8992bf12b9c5dcb189c0eb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/bg/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/bg/thunderbird-52.7.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "2314afbb259a561e98bffe3d30aaac571b8f7f54de2246af78a012fcbee19fda15c8a921221ebea738fb09be07a1139f5edc14f1f9f55945a63e08c625a6bf52"; + sha512 = "62dabdc80e0e3d46b42c69462d18964e584b54fee80bd632c0a3be19fceabf6bbcb80ee6b200472e52998f90252a7e62355cfa9d7d8ba3b3bd0f7bf247557c59"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/bn-BD/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/bn-BD/thunderbird-52.7.0.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "e8cd137f04521293ea60c8f8557b4482baf1d7936c9fca1ea7426ea8a99cae48f3e441a81cf1a779034595eb755009db512f29d31c8ada11391cea0f3962d61d"; + sha512 = "11acf4d6546aa3b3b1ee3159fb54e0769617664155d1dde4ec7d5af28335e90b428559b80e570d2b1829153f2edf8472e37e8e2cbf1d72567258e0c76aab4704"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/br/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/br/thunderbird-52.7.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "0715d8eda4c144c35b5583bdce6eac058788b761949bcb79f156ba4931c380e33f7810fed55e283e02c5af2d555df471c48383d1ace21da7f88c3b0a8e97213b"; + sha512 = "1056f78922c277ba64e3dad8e41ebed516495d41c07be4026271a2ca97d314218ce5a46c8b29be38645507a9f2070663cc6bb5deb194ee2d57df01809cb2d3ac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/ca/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ca/thunderbird-52.7.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "21ec148ddfef69ead9f1b367dce4d6a93a7f1d31fb691035d40132cd4955a66f162a44f0e5b0caaae8cfdb76b0842cd78a630cb6a7949e839611d98d58776a47"; + sha512 = "f50bdc6d1bdfbe4bbfd8aa8ce3938e2ca6963d0fbc0fd47d23505158bccfe328195e45c0215dfcd354847e5e3a0897941790a7cc1f1db31ec29cbfaa1cae7a33"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/cs/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/cs/thunderbird-52.7.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "f2c7c86db91332b9f38ab4ae732ca44c7f7bfa32e3b8123f7ba9662fe9f74b9f01a58ca63a9954b45aad05272baca385797679103c29a95dcf248fe8cdac5a53"; + sha512 = "7d8c6d9be08bff6fcea06a994c637ea83576377975476edc01dbb152c8cc8768b00bab4295d5f13ca01451344aa64af6ad227e359f3d11bcc0228b31fd13c1f8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/cy/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/cy/thunderbird-52.7.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "f0bdfa8373fc87faa567720c4c998f08ba836f8c26a59e38e92bd641e7efd42010530575bdfe1fa7bc78b7688380eafc274b8954f2a59e60912713afacd42789"; + sha512 = "8bc583a05e872f36df9512ffd5c06cafcee81c632358b5bb13d8a920689b030e8ed4996bfc265c074d5d7959a1e75c7180900b51adb30ff3181de496cd34a4eb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/da/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/da/thunderbird-52.7.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "80dc629b815c4ec98026f0ee5c2b7f754bc9bf0e5d026775866f502ca55b826ce071470a8713ae98089bf2208e5b0d0771a20307db5351b4af78169bd8efc1ee"; + sha512 = "ccef5bffe4a807d55924ebc8b36f0065891f03520fbb015547da1264997e95cb9e919aa5af838686af070715ffb314ddf6abda0e99e1e06657a2ea6fbc956441"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/de/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/de/thunderbird-52.7.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "bd66cf808f3d5ba73dfb0d314050c5d4ddc59966abc84e904cde2dd73c20086dcbd580c1a0bff4d1dee7ae940e38a53b9a37ed75e05758ff9da799f2ae1f7aab"; + sha512 = "02061b7572ad3b784a28926da15abea9fd9c93b4df9c40a5435190e6d872d356b6001cf0666e4cef0696da32c76e64cadfbeca28f6f894b1b230033d451fe105"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/dsb/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/dsb/thunderbird-52.7.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "58e50c2d6c2d42fcd34273ead868753373e054602ab1ea7e9ea9d5ed15b8ae15e6b654fe81b6a56942f1cd4eb3778d11897fc2b9e34e789aff7d83b47bd3c100"; + sha512 = "458785317a61ff0fba04524b13cd72e22d4cdeee69bb99c849f4b12385a19f3236b586ab6a12cf9c8042a444553d1a3f82bef1f51fa9cd11639ec3911eff0013"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/el/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/el/thunderbird-52.7.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "40888eca974a5e9dab7459c790b7e589906da72ca9ea64fa690225d876310239faeff8925366b5fc559a5793efcac01696f22886c9ecbd5dfad5661083b8e63d"; + sha512 = "5b8fdd6a65b4057eff462c5ae8cee366ced8ee482892c0457a6fbc52303b8dad96437230f18f560a3bef3f392eec43194b89715071b559623ada47fd031680a5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/en-GB/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/en-GB/thunderbird-52.7.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "5a418b8f6b857a4554cddb81b36b5f4885ba694ff08b3b5f3c342491637587719578738eac9abee2735e8d0fa1ab216ee9bb5cce67955c4b7c30c3a063b95477"; + sha512 = "0c32a412f9c7ad9195e113ab994ed8e0d80a14bcfdd70b3fc51399eca7e34241a265a7d81d5cdeb8a7217a0c694ebceed45c3b038de0656ee3a03bfde1887b3b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/en-US/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/en-US/thunderbird-52.7.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "628a5f50871bf44c59e1d8983f520d5ede9f22bff15eb4b03673dc6d4b0f72c84247a5e29ba67e871be449825dde8090a6e9a50501e434bbc17d86aeb846e1cf"; + sha512 = "f7f8bf3f74052310987b546bba0f986abcfd65e53125c2cbde4bc4744e27de054f21eba8080313c28c9c3b44de1d773e4471facc9b71f520b6085c32cfe721c2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/es-AR/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/es-AR/thunderbird-52.7.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "595419a4c26c8974ada3e9856dcabe863666133a98d5730a1a295f1edc414d1d0b3a159afc94bd927c934d44e9b4ed4282d4211948bcbe8b6d744948e7b48e02"; + sha512 = "0187b3cb9b91d43d6faf217dca8566429103f2bb3c04bfb59e842da9c464cfba3f542be3789bf0fd46e6ca4c355d632f50b16b01667671e41231b8ca8d5b75d4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/es-ES/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/es-ES/thunderbird-52.7.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "898a14402ab621fb81b563c039db3ae343173cb39872ca6a2985f6a279af7ffaca404af179cef3adb48285b05e24b372c1e8a1918557280ecd10a4368b540f27"; + sha512 = "876de2da5068acdb546d5091c64bf3edc4269a3e6dde2c2d928cd05439570773db4272819fcf8e12c63f94cdc41f0721412e108f078d1cd11501dc31966ee3d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/et/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/et/thunderbird-52.7.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "b2ce107034b87b9e4459add9e1d6777e58f52465f81720d1a6276dbe0c341c92984fa9979ec8da0544f4699cf98a097098ed14759c38e47a0f9ea4aba6916907"; + sha512 = "2ff7a791390e955cb2489c685504b5a118396d99d225e616e9bbc09b4f7be70d7a2f1a925d5cdc38b944e2476904604356d9e3e0dbc497258a133ec80ab499cb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/eu/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/eu/thunderbird-52.7.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "a401cb39dd18e83cbe64de9c527ce4d72a951f32c5150a88bb509487f3ed4364624354a6571d41ee18f1061841cfe9bb704bf355893fab6cc44d94f660a5e0b7"; + sha512 = "bef88a12c122f2d275e1fa24a92f5cc6fbc11534414ebd151e7d53d95d1c5ab06045270221ceb46629160eafd60bc1fd8a8928c13915493c83db231785507c21"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/fi/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/fi/thunderbird-52.7.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "d87a4ff14023c2a20241a920d2fac288d76124ba3734ffcae664cbf46ba3a3d54fe42979c243e6ae231f7b5aa54dfe9c82ad87f3839714aa8a21409a6e87221d"; + sha512 = "d2c1be7209706fa96dc20af9c30be61557e0bf82da575c7b95fa8b5d2fc7ac6b7b2101bdf0db169694fde66cd1da60edcd4b505b849b1949ee72f12d7dbef200"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/fr/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/fr/thunderbird-52.7.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "5bd14acb63b044b2aa6f2f75fc365b6d65012a504ac3735cd2d72097b65aa61662007e06857f7288329c39517af01e694d19be5498bf4b718fb9b2510c8ed313"; + sha512 = "194711b687ec4ededcb9140c7c1c3e1a0ccb47759cd00ba56819a3a7d9be66f9a7a29e2a91db0b1d573d584953871a37781877f43e734a8e39599dc6e8027622"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/fy-NL/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/fy-NL/thunderbird-52.7.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "13baa3c5bf0c24474f6f31291b54ff9c846bc3a6056bf43a74f3e5ad4919879adeadfe583151f55cc721e8aaa0b9011cc8e9c3a402d2fc363b4b2ab97f5aef76"; + sha512 = "7b9ef6651166e66c6abb88b79628a0c51f576f2ccf2dc5eaefd1c01100a492ca9fe1657aa2d6745079e0f422e0f2692d24389577b47248ec6713817e51543c6e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/ga-IE/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ga-IE/thunderbird-52.7.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "632cc17bb0e9a5ee4e651cde51f71eb6efb6eac35297126ca3c7397e4bbd407f583b70a2aa5cdb4345276b493f3d8161cd376a443b37be3ba6b2782b7d6a534b"; + sha512 = "801af21d297c95505afb3bb6cc79edf72057ffbb9ee9da56c1f283043e6df921239a4ac8eb3d7442286b27265d3462569f79e29adc88b7674f7e9d8396ff3109"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/gd/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/gd/thunderbird-52.7.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "03b3f6ab1fa5edd9f4c37f1d2ed9ba7a34e4b3d714bdf238f7e4ed8e8c65c432fff5a2815a1993ac8f221a997dab2b0ee22dea46d5a8b566bad35ae1cc9a4f46"; + sha512 = "f778ff74408d3d9c7ba9c62cfa2c9447932b15446801df1c5363cf7c2059e1aa89539c1270fadbfc482c42b5c1845376e2fe037741fc267461d0b22f8edaf859"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/gl/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/gl/thunderbird-52.7.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "36398fa1d04ee096c1e2fa1420ca375dc7ff135ff63343e20c916b6ecb03b2adc6e30d26e66ee6ab38cd816d928e8c628a55bb3f6cf921bf7691b6092700200b"; + sha512 = "ce541ef081ee8f8946f71b07a820ec31c4241730e565a8bf781a844a79fbfb0258d2f0d371ae3f4690067b6c520a103f4df996e8085d2a8afb997a4f1fefd288"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/he/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/he/thunderbird-52.7.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "f819c1bc97298445f3d3d5ef91470a7ff370a5db5e4884e8c2590e06bbfbf9a33c7d1cb9919379a6aa654e47f49b6f9e127584eeb29cb14f2e73efc01d4f8ee7"; + sha512 = "ec3cef4bd411f6604e1ec3486272208aaa41b1154dad1473c6fbb483ec2d3960aaadc11cb592777f49571bba35a0812f4f0a14c0edf9eb8a7b1fc70d56fcd4a1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/hr/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/hr/thunderbird-52.7.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "bdebf02084d98a6279c27d914935e4e8486d86cb27475e99983ab0cd8166f78c82b6815528f7afc10e6aae8f0859c393f6f42b7d1a081925b1fe2053f309052f"; + sha512 = "f27bd94723f65c4972ee41cf6a9397098cfbf9097e3eeb06b7b41d50b4f0143711fcd0ad59a04f23ab9acb42d3f9515900c067f9532366ae3333ecae2a54f965"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/hsb/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/hsb/thunderbird-52.7.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "b0db8f59739e0ead2d0ec64bf00f6b62854b2b55b34db04e31c27db14b3b67e6af3bc9d857fb528e4e6115e3e1f2da75b685b17a33cf9ea976cca7ef5ebecb56"; + sha512 = "7caad57604b9d83e64e8e30e03e89c4661e8d81d2ce833a6908e2d662d4d6c7ffbbb8b071e8657fabb0ebc0c0f84b07617ac878c9bbcfb400b711654e36f66d7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/hu/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/hu/thunderbird-52.7.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "10ca02217736663a1fb44e20430bf2ac3a76fb5f87e57e539361ba12361c2f79aa3892fac02c4365890c6506eb86bde8fc955dd126eeddefb7b27813050d1861"; + sha512 = "382d79b8513ad28f06233af3473c2fef995d72c9913f64adce5a86528ae0ead883e94f91b4d394cf30541e690da5aad77dc48b8c2a4a84ea6c5fef86c22a4159"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/hy-AM/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/hy-AM/thunderbird-52.7.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "a0240daee40e6d8cd76d81bfbc4bd47052f9e20a00b8c687806633eb72e16d9393a6005c16f5391d2caa5a55fb7e0b7e12d1097fe140d6fd664e3ca40358b597"; + sha512 = "3a4e5878e4fcc9c493cf1de1393da8efe85ff86d96702f57f085da42cac990290b054a3998e96cce69dca17ada849301a6724fd6ae245bf4aa396db5ce76aac4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/id/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/id/thunderbird-52.7.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "4450789df3c0176cde9adac0f8b075ca64690c0278b6da9de4040faefa35a9c915de1daec1e1b1ccae2d80c8d55f664c8535d9cc31ade68ef8081fc3f102e992"; + sha512 = "dca16b2c0b5034e1be2831a1992ca47f6a7c614382e781e86095df11f34193f13868bdd7f972f54e72d7f844cb24172057155d5457fc6ec98ee476ed01d8899c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/is/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/is/thunderbird-52.7.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "9ad56f873a0138d55a34b6058681c9edb185734c3b358aa1ffd91161403cba5fa0a2d02d858fe45ebbb2e991c0a8da1bfcb6516c9836e26a3aec7e2160f292a4"; + sha512 = "181868826a0da43deeb2ef68a307ba195fa7a470651d4a08e904bde994320e832a04c44fa355cdaa94bd4c8258471e6849cf06dae8284d43f43defc7a3976816"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/it/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/it/thunderbird-52.7.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "242f2c9b2a7821bbd6601f4aeccbfe8f9c31556a061c0200b1139ce28c613c3781fa0ece4c9674c19a2283f647b2804820f29e26cba9ecfdc53a6b05964e2762"; + sha512 = "88c906753878c7b8b0a3d60de21813017ae6ba63b6be9c5d24b6072f1a4aa3a1cc01e56433f960c02f33317cb113266200fbeedc397cd3a5587aa592fdaaacfb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/ja/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ja/thunderbird-52.7.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "1686f8cfc156744f2e9c02afa19ca00ac29db0e6f9b07900aae9b068928ff30431350ddb75824918df5a64e076d88b312f1055b74db44ec7cb909d505d2c013d"; + sha512 = "0e53d3f877793afa9c3ecb48f73640ff3974633bd28ce036b96c7ed29f3b9a4af47e1fca89da9d594c879f534e7c4dc27ca05ece8ec33909fe2dfd57800b3a11"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/kab/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/kab/thunderbird-52.7.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "cadfcf6a02732831411f180d0363d3c3cb08e31d7d108b5f55d14bb75b6c48a744b40ec2a964f659904fde4c5e82ea8b89651db55406e5327db41c6f15f74416"; + sha512 = "feeef278ab269f6e33b479b38f32004a5ece2a37ed2aad97c87e68dd0a8195ffe3428ac9dce0a3e72349d3c136b6b5bfdc25916bc57f4fa043eecffc64bafc3c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/ko/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ko/thunderbird-52.7.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "4b4e6bc229049210695536a0e12d685995bf439ab8b2b7879142c93cc749882ed79b98063fabd4df97503e771f585cbfc1590b2a3815a6121a7e43417addaaad"; + sha512 = "c138dcbb692780cc1598906a630e90c8102d6a562f922ee28bc88e25624eb88aea20bf3d6fa6b87719f2a9fda0962bc413ce7e6d07147efb47dee7fd670a5c76"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/lt/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/lt/thunderbird-52.7.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "5d73c90f57e50500debfccb555183cb616ac9d893a19ee29fe22f4823085bd62aea156fd5c0f0f6ff49291636c4d90af253096416aeb87982da5455bf548a40b"; + sha512 = "96e5cbd33b57fe02134aac190347f0ac37fdb9f847ad74a44f59004cb739579b9309442605e3c9c2693bbc484372505aeff9378bb7bccfe8e1432da7a5508ff4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/nb-NO/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/nb-NO/thunderbird-52.7.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "0adf9e6b10010ea5cce216a510e53fc5dc9c2066eceacf3c3c6bda7526b3bfef1083b130c08432dc59f09e02e19f0c4a5b885cb43627771aec00d78828377eb6"; + sha512 = "913a731cf2c063be645cca94ea4beab6601e2536baad9369f9804af663e7b1a024024ff2b5befda1ac8169db0e8cf9ce5c9ca5d0ce650fe629e606c221776e8a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/nl/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/nl/thunderbird-52.7.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "372e39c33a78e70d628fc1bc1a9719b3d902d67eead4e47091b40913a4aa76dac63db003cae8113f7d194cc6fd24cad13c4e87aefd1d6bf425434835c983ca7a"; + sha512 = "79ceea0143319e4b883d2c59949fe3ddc62af70e9fe6653b745fedd2e683aaaf4c6f10d55688b83085abcd36672242f21ea0c592930cdcc7cfef7e32dcc72230"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/nn-NO/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/nn-NO/thunderbird-52.7.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "1c66f021fbdf85e1aaed26e5a6d3abcbc9d71e91126bca10a6f8b62b10abf3927a44ae559136478fd9628dfe3409c4edd83f3336302c84fb0b6be6d4031dbb3a"; + sha512 = "c524517c417b977e9e8c3b0d3b9a8f1b256c68360f70e61ba4d1b2f887fe550222843de1f9c42081db935e27b3ec63ed8b1a1b5658f48f9534eb787d4fc28d54"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/pa-IN/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/pa-IN/thunderbird-52.7.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "aba5a6804f08eb303e71aba94b11116f253dd19dd31e10c05ad5469800378ffef678a90a8a33db2da516bb55ea2d1d1b5537c3c11ff9132ce9ce890fb4e8e413"; + sha512 = "10e8c6a1faf395371421387ec1cc6891d8e0bc9f69f37f2e4fc414dd9a5e4c10246f279e15804280a550ab7acc265b8a3691ef1d089459cb58cbf06896f88806"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/pl/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/pl/thunderbird-52.7.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "19559239283420bac401dfefec812bbc18d33483380c44f217b70d9412b3d93f9ab3c2f5d9d518191fd891316e9ccb5b21f901676026f7ad2414a4541d584f98"; + sha512 = "13afd039d50bc7c6ead72e9d69f5dd6dafa0fc2b5d1f18a207a15192cda4473ca8706386eba98b522667cd036ded38bfcb67fb3dd8c2e50629c3db9a1243c3e6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/pt-BR/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/pt-BR/thunderbird-52.7.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "64ada0291a3da9713eb81cd05ddbcddd70379bf07a14e019580bbb7b5fea4976ad7aeae87a651da070139e975bb52f66271ed3124eeada4d6a90f4afed948d3f"; + sha512 = "9c024bfa1733d144ff4fa58e7ce8a2127528d7fe05e64142a3b1d8a0fdaeda1b1c02998089fd219804571cae4072db984a74a40c4a22bcc18dfb68c849aa37cc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/pt-PT/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/pt-PT/thunderbird-52.7.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "ce57a764ee2a529d7e37b6d620cf7c3825f7af1cc04da0502d64d2a7fb577a27a171a4f5d589c3f5e738192241776be4119d45958b2d77fbe3ae4f82279ab380"; + sha512 = "ed4d7117bc87cb2ec6df65667f554a83f2fcddbf4eafd6a587082ad42cab69fab5c1d9fc36e132660911840fe85dcc18ab4b23e83b9b57317b900db820483b40"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/rm/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/rm/thunderbird-52.7.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "04bc57c8360be5917fe2e05b6b672fab614ea5a6ff150c83242ee20e89756f2f24afa096249fad5f2795c47e570815281bce70449385efc5e510c64204e5f7cb"; + sha512 = "d1e1e48c47866b89e05c975cc6d4d70120173066457a4c05de1ab9222dee87b0d562959c63afbe024681b0a3f9f8cb3c836f2f0a0e910507e5211a430b1f9bab"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/ro/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ro/thunderbird-52.7.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "86c790e5b3faeface66d001ea9e56006ac2955883337204e5f79764cdf74860df210688f8467c9f7b0051c9efd5cdbc5c98b615656155b99361bbba656254a47"; + sha512 = "c1929be134d8127433eb4b26468379a631456681a6dc3d98bf9ec313576a4c951d5fa7f08ae2d3bc5e8563eecda0a71c412c62a970a0cec618e06d5cdcbc46fa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/ru/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ru/thunderbird-52.7.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "cbf316a94b64d02ee83fdafddbb60daac5157ea11c57889703bde88e3c4baec720dde515e9864f021cbb39e6945a33ccf909623fda0abe542e07b11eab8154d4"; + sha512 = "aa7893b8ea0f44f625afca61adc5942dfaf2eadc6cc7ead569a3536ad827a9b4f88f225dd01a9c5e375eb24a9940de6f65413ab6d93ec2bd736f0bca711739a3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/si/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/si/thunderbird-52.7.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "cf0dddbe01bddd623ce5052f0a72dee9da4eb5de1932d0a0a656baba55c79eaec51387e37f74c1a1a754ee71def8c972af5dda5a5bf9e78c19a2c11c1cc42e57"; + sha512 = "ed425325419e0598e3cc5abd0d2b2898ef781c4be847aa8d9c93596f6dca0b718cb7035479d4013d3213b97a440dea2560549619c3ca330df9bda7b287cea673"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/sk/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/sk/thunderbird-52.7.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "5c70a7e8a47e44a47eac2d00526c4c8da340121c1fc8c136b3b40cbe0809548e9cde6d6dc76d1ad679d7bdedefdaf3fc373b2c124cca6b36a9cdb9f4e6da939a"; + sha512 = "bd576b29abe39634c864a27f5ab8d59ada34bfd069a7eb9fbe6af1cd79f2e0fdd61ab4fe06cc3944a92b06634bde9faa68ad6d56399085999df5e7827dd121bd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/sl/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/sl/thunderbird-52.7.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "9bbaf000fd2c1fe28f0f64c31c7736a2595399788498ae8be8fdac8dabc709efeacd8fb1f6ae8a095c130ff7620e1b7c6e909959b9c724b7bde736049664357c"; + sha512 = "98abc990d644a991abd9f513e205556974905c82c93e0fe8171608ec4d1aac7883ecdab5bf86ed287f43e6c5e45661b79ad012a4dda7b1e5cf6c3411dce7ea2c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/sq/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/sq/thunderbird-52.7.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "6f8d71fa87777b11f5ebf14c6811ce9a0c2c380db5b7f3fe774219cc60bea6d4f59de8a3dd193d855725c3a0e5470b36dc0538f94539d637be14de5d8e480c7b"; + sha512 = "d45920069f8c0808b4965118be5ba6e4cf36b99bac9add6d1ac2e20051e95ebf09eaaa9ac559515803b655a61608bb4afab0d69d720ca74f57ec5a643b151f24"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/sr/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/sr/thunderbird-52.7.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "0bbcd2a98f767a8836d054a97c797a0ea7eac5c08fed9177189474e47e8dc50d395735c0eaf8c6e839ac608084c6e533a3b20fda5e69ad74ada53636f1181359"; + sha512 = "7d77124de3cdd684f13fb824a0bcf7a9440ec7c626ba34deeb04478950bfc908494bc97de5f2d8d8dc0b0abfaa3f7c88b3948a10b7fd31de092702c755cacf25"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/sv-SE/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/sv-SE/thunderbird-52.7.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "22cc597657e44124162a6b8693022bd4086e3b4e0f9e42342c997bd333e1182163f0ca0c67d91cbb5e18c45605c877eb69d00372c86a9378ed2e7846547f3964"; + sha512 = "e16fdb819ca8ae5c8392eae50115d6b6853678c002de3a18fff25ae0e7e7fa2af06dab17a6a2dff31440608373a5268197efedeaf36f0012c2763080f4b51cc5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/ta-LK/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ta-LK/thunderbird-52.7.0.tar.bz2"; locale = "ta-LK"; arch = "linux-i686"; - sha512 = "902832bf66b2efd39cf038e9361bf0ee8f9682e73a42895ccf6bb637eeabb8d4d5e8b3b3d28bfa52e537ad1babee6bbb8d033c538a61880920ace6a4a7cadf95"; + sha512 = "3c8429d8a31771452e108c0a7b16070138ea1e82aa16536bad4d7570117f0790045e9a34fb9f7546eb3d749e0d94b2a1a7a65b93198909189cbd2f1bf872af94"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/tr/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/tr/thunderbird-52.7.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "70dbb015aa4acf35d5cba0e9d8916bed2603c7e44574c98e98e56edfb68db3ab572402fda5c809d838c51a2e3f135cd3b86f2dde44acd2e1ae2f12cecc276655"; + sha512 = "effe30bec8c4b0fc1428681888ea1e0a79eefa1f60fc3964e08142d00c6db065ff9a2acf989765497520f27504b4ea3c8104a084f63abe4358d165c5bfecc680"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/uk/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/uk/thunderbird-52.7.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "9fd85a4f4366caea3409cca47df70d2f028c7d85c248ebbe5e7e92005d98d45947639fae2aac8a145e4cad12cc92e368b9f86de4623a7d1a35e0485fb35cff97"; + sha512 = "92cca4a0b9ac66bd4c0e14d0c04a162dbe2a3aac3a9fa95e26e6eef8ef1716fc21832967323ca5b46df19b28843de6e4781ea323120bac37a9821745f7ca9af7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/vi/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/vi/thunderbird-52.7.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "205b22a39b795946f019cbb9e8c1813a0ca9f59551c9ea30c661fbe43bbf1d87069dd3992e71c83226b2559cdb4db2186b37120c847367b6a4e1b16aba24510f"; + sha512 = "b470364cac631fe944e7c06a27299e8ddf65605aaa1550d0736ab6088e38cf008d224b920111a17f6d87aceda3b95ad0ebb01351ed2339680530629a70fca1b9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/zh-CN/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/zh-CN/thunderbird-52.7.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "d1a9247b1db70ddba4f0cf80af7b8606e6bf006b31d3e771a4047dd7ccd121114bab900c38c02f36c4b60636caae75047f153bafd06aacf1b546c3d8af01806a"; + sha512 = "1840d47835805c0ab854dde0a08fed90c785377d14b8f53b303fbd65bc5dc8e967146ae5d26ef4a0693df89679cff27ccbad0cabde27356dff97701fd3c91579"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/zh-TW/thunderbird-52.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/zh-TW/thunderbird-52.7.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "a92b42e7e1869ad91d8343072d508df6bb8e67ddf7d929d4911457c5bba04fc1ec7d3218685954a4ded7ecf819bfbef975813fb2bbb9d1da60444b83f1f0fdb9"; + sha512 = "aaaef2821bb128218a6c9bbf07b1f017574f39a20664e0e82a396ddebeb4b2ac754fa1ece956ab70b1f55ef5e2a750d612cd6ebbd2a747d28f9c24a5b994c730"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index e2b023cc2a8..27fb0a40ff9 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -22,11 +22,11 @@ let wrapperTool = if enableGTK3 then wrapGAppsHook else makeWrapper; in stdenv.mkDerivation rec { name = "thunderbird-${version}"; - version = "52.6.0"; + version = "52.7.0"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "80742c95ed61d1cb2e72b71bb23bdd211a40240ab4393e9f028a38f902547372084a8f56445e2394484be088a7b9801405f3d6618fb2742601cc968bf34427f0"; + sha512 = "875ad6f2b030c65d248ecec4f4a5b51767c3ee7944ac72893237efd2af50145ec2e4a9efa8d60807b78bcfb8189969e5a67d15124710e8b0091f639cddfbfe21"; }; # New sed no longer tolerates this mistake. diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index 965a8ec58dc..0b8a584fc6a 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -6,13 +6,13 @@ let pname = "liferea"; - version = "1.12.1"; + version = "1.12.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.bz2"; - sha256 = "14qx3x2xjcnydc4ma8vdac63phas7jzwbjl4b9r5hf6vxv3mpvdq"; + sha256 = "18mz1drp6axvjbr9jdw3i0ijl3l2m191198p4c93qnm7g96ldh15"; }; nativeBuildInputs = [ wrapGAppsHook python3Packages.wrapPython intltool pkgconfig ]; diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index f61b887cd87..6ed5e63cd0f 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -49,6 +49,6 @@ stdenv.mkDerivation rec { homepage = https://nextcloud.com; license = licenses.gpl2; maintainers = with maintainers; [ caugner ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/offrss/default.nix b/pkgs/applications/networking/offrss/default.nix index af6a4dfddc1..d499916c7b6 100644 --- a/pkgs/applications/networking/offrss/default.nix +++ b/pkgs/applications/networking/offrss/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation { description = "Offline RSS/Atom reader"; license="AGPLv3+"; maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; all; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/p2p/soulseekqt/default.nix b/pkgs/applications/networking/p2p/soulseekqt/default.nix new file mode 100644 index 00000000000..315106ea852 --- /dev/null +++ b/pkgs/applications/networking/p2p/soulseekqt/default.nix @@ -0,0 +1,55 @@ +{ stdenv +, fetchurl +, dbus +, expat, zlib, fontconfig +, libpng, libX11, libxcb, libXau, libXdmcp, freetype, libbsd +}: + +with stdenv.lib; +let + libPath = makeLibraryPath + [ stdenv.cc.cc dbus libX11 zlib libX11 libxcb libXau libXdmcp freetype fontconfig libbsd ]; + + version = "2016-1-17"; + + mainbin = "SoulseekQt-" + (version) +"-"+ (if stdenv.is64bit then "64bit" else "32bit"); + srcs = { + "i686-linux" = fetchurl { + url = "https://www.dropbox.com/s/kebk1b5ib1m3xxw/${mainbin}.tgz"; + sha256 = "0r9rhnfslkgbw3l7fnc0rcfqjh58amgh5p33kwam0qvn1h1frnir"; + }; + + "x86_64-linux" = fetchurl { + url = "https://www.dropbox.com/s/7qh902qv2sxyp6p/${mainbin}.tgz"; + sha256 = "05l3smpdvw8xdhv4v8a28j0yi1kvzhrha2ck23g4bl7x9wkay4cc"; + }; + }; + +in stdenv.mkDerivation rec { + + name = "soulseekqt-${version}"; + inherit version; + src = srcs."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}"); + + sourceRoot = "."; + buildPhase = ":"; # nothing to build + + installPhase = '' + mkdir -p $out/bin + cp ${mainbin} $out/bin/soulseekqt + ''; + + fixupPhase = '' + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath ${libPath} \ + $out/bin/soulseekqt + ''; + + meta = with stdenv.lib; { + description = "Official Qt SoulSeek client"; + homepage = http://www.soulseekqt.net; + license = licenses.unfree; + maintainers = [ maintainers.genesis ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix index 00332754c26..51a37d3152b 100644 --- a/pkgs/applications/networking/remote/citrix-receiver/default.nix +++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix @@ -69,18 +69,29 @@ let x86hash = "4c68723b0327cf6f12da824056fce2b7853c38e6163a48c9d222b93dd8da75b6"; x64suffix = "10276927"; x86suffix = "10276925"; - homepage = https://www.citrix.com/downloads/citrix-receiver/legacy-receiver-for-linux/receiver-for-linux-137.html; + homepage = https://www.citrix.com/downloads/citrix-receiver/legacy-receiver-for-linux/receiver-for-linux-137.html; }; "13.8.0" = { - major = "13"; - minor = "8"; - patch = "0"; - x64hash = "FDF5991CCD52B2B98289D7B2FB46D492D3E4032846D4AFA52CAA0F8AC0578931"; - x86hash = "E0CFB43312BF79F753514B11F7B8DE4529823AE4C92D1B01E8A2C34F26AC57E7"; + major = "13"; + minor = "8"; + patch = "0"; + x64hash = "FDF5991CCD52B2B98289D7B2FB46D492D3E4032846D4AFA52CAA0F8AC0578931"; + x86hash = "E0CFB43312BF79F753514B11F7B8DE4529823AE4C92D1B01E8A2C34F26AC57E7"; x64suffix = "10299729"; x86suffix = "10299729"; - homepage = https://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-latest.html; + homepage = https://www.citrix.com/downloads/citrix-receiver/legacy-receiver-for-linux/receiver-for-linux-138.html; + }; + + "13.9.0" = { + major = "13"; + minor = "9"; + patch = "0"; + x64hash = "00l18s7i9yky3ddabwljwsf7fx4cjgjn9hfd74j0x1v4gl078nl9"; + x86hash = "117fwynpxfnrw98933y8z8v2q4g6ycs1sngvpbki2qj09bjkwmag"; + x64suffix = "102"; + x86suffix = "102"; + homepage = https://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-latest.html; }; }; diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index 59ae225210c..872d9b018ff 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -1,9 +1,9 @@ { stdenv, lib, fetchFromGitHub, cmake, pkgconfig -, alsaLib, ffmpeg_2, glib, openssl, pcre, zlib +, alsaLib, ffmpeg, glib, openssl, pcre, zlib , libX11, libXcursor, libXdamage, libXext, libXi, libXinerama, libXrandr, libXrender, libXv , libxkbcommon, libxkbfile , wayland -, gstreamer, gst-plugins-base, gst-plugins-good +, gstreamer, gst-plugins-base, gst-plugins-good, libunwind, orc , libpulseaudio ? null , cups ? null , pcsclite ? null @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { name = "freerdp-${version}"; - version = "2.0.0-rc1"; + version = "2.0.0-rc2"; src = fetchFromGitHub { owner = "FreeRDP"; repo = "FreeRDP"; rev = version; - sha256 = "0m28n3mq3ax0j6j3ai4pnlx3shg2ap0md0bxlqkhfv6civ9r11nn"; + sha256 = "01cm9g4xqihnnc5d2w1zs8gabkv59p7fyjwi1cwpzv6s198xwbfs"; }; # outputs = [ "bin" "out" "dev" ]; @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { ''; buildInputs = with lib; [ - alsaLib cups ffmpeg_2 glib openssl pcre pcsclite libpulseaudio zlib - gstreamer gst-plugins-base gst-plugins-good + alsaLib cups ffmpeg glib openssl pcre pcsclite libpulseaudio zlib + gstreamer gst-plugins-base gst-plugins-good libunwind orc libX11 libXcursor libXdamage libXext libXi libXinerama libXrandr libXrender libXv libxkbcommon libxkbfile wayland diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index 4ff649dbf2a..041a8cf0741 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -16,13 +16,13 @@ in stdenv.mkDerivation rec { name = "teamviewer-${version}"; - version = "12.0.85001"; + version = "12.0.90041"; src = fetchurl { # There is a 64-bit package, but it has no differences apart from Debian dependencies. # Generic versioned packages (teamviewer_${version}_i386.tar.xz) are not available for some reason. url = "https://dl.tvcdn.de/download/version_12x/teamviewer_${version}_i386.deb"; - sha256 = "01vzky22gisjxa4ihaygkb7jwhl4z9ldd9lli8fc863nxxbrawks"; + sha256 = "19gf68xadayncrbpkk3v05xm698zavv8mz8ia6jhadrh5s6i0bwg"; }; unpackPhase = '' diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/pkgs/applications/networking/resilio-sync/default.nix index 5e94106a48f..46de1d532dd 100644 --- a/pkgs/applications/networking/resilio-sync/default.nix +++ b/pkgs/applications/networking/resilio-sync/default.nix @@ -9,13 +9,13 @@ let in stdenv.mkDerivation rec { name = "resilio-sync-${version}"; - version = "2.5.2"; + version = "2.5.12"; src = fetchurl { url = "https://download-cdn.resilio.com/${version}/linux-${arch}/resilio-sync_${arch}.tar.gz"; sha256 = { - "x86_64-linux" = "15gji5zqs1py92bpwvvq0r1spl0yynbrsnh4ajphwq17bqys3192"; - "i686-linux" = "1y67bd63b95va7g2676rgp2clvcy09pnmivy00r2w46y7kwwwbj8"; + "x86_64-linux" = "176gf5704wh22kqig8n0gg83048w71grw7h37k2qvxjaf4vypnc7"; + "i686-linux" = "15m2s2cqrkpb7ladbwimbs9agqb4ww9jr4gf0ifjwzm2grv5ffnh"; }.${stdenv.system}; }; diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index e47a6ba6be3..3e637fa0f1c 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { description = "Desktop client for Seafile, the Next-generation Open Source Cloud Storage"; license = licenses.asl20; platforms = platforms.linux; - maintainers = [ maintainers.calrama ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/networking/spideroak/default.nix b/pkgs/applications/networking/spideroak/default.nix index d6fe0d9114c..4f91a2b24e9 100644 --- a/pkgs/applications/networking/spideroak/default.nix +++ b/pkgs/applications/networking/spideroak/default.nix @@ -4,16 +4,16 @@ }: let - arch = if stdenv.system == "x86_64-linux" then "x86_64" - else if stdenv.system == "i686-linux" then "i386" + arch = if stdenv.system == "x86_64-linux" then "x64" + else if stdenv.system == "i686-linux" then "x86" else throw "Spideroak client for: ${stdenv.system} not supported!"; interpreter = if stdenv.system == "x86_64-linux" then "ld-linux-x86-64.so.2" else if stdenv.system == "i686-linux" then "ld-linux.so.2" else throw "Spideroak client for: ${stdenv.system} not supported!"; - sha256 = if stdenv.system == "x86_64-linux" then "0k87rn4aj0v79rz9jvwspnwzmh031ih0y74ra88nc8kl8j6b6gjm" - else if stdenv.system == "i686-linux" then "1wbxfikj8f7rx26asswqrfp9vpk8w5941s21y1pnaff2gcac8m3z" + sha256 = if stdenv.system == "x86_64-linux" then "993e01986e3657d6fa979b8d0f45ac25b8223c18f75555016a9f92e651e91b1f" + else if stdenv.system == "i686-linux" then "d12c09c3a01bfa48bdecc8763bbf2c7f10b71cea5bcecc177dad031ba79bc83d" else throw "Spideroak client for: ${stdenv.system} not supported!"; ldpath = stdenv.lib.makeLibraryPath [ @@ -21,14 +21,14 @@ let libX11 libXext libXrender zlib ]; - version = "6.1.9"; + version = "7.0.1"; in stdenv.mkDerivation { name = "spideroak-${version}"; src = fetchurl { - name = "spideroak-${version}-${arch}"; - url = "https://spideroak.com/getbuild?platform=slackware&arch=${arch}&version=${version}"; + name = "SpiderOakONE-${version}-slack_tar_${arch}.tgz"; + url = "https://spideroak.com/release/spideroak/slack_tar_${arch}"; inherit sha256; }; diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index 71df7a0fb1e..aa2a971b15f 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "rclone-${version}"; - version = "1.39"; + version = "1.40"; goPackagePath = "github.com/ncw/rclone"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "ncw"; repo = "rclone"; rev = "v${version}"; - sha256 = "1x9qxhqkbyd7kd52ai9p996ppslh73xarn5w4ljaa97wwm5vwwsg"; + sha256 = "01q9g5g4va1s91xzvxpq8lj9jcrbl66cik383cpxwmcv04qcqgw9"; }; outputs = [ "bin" "out" "man" ]; diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 64c0b31a2a4..531a1d5d0a1 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -3,14 +3,14 @@ let common = { stname, target, patches ? [], postInstall ? "" }: stdenv.mkDerivation rec { - version = "0.14.44"; + version = "0.14.46"; name = "${stname}-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "1gdkx6lbzmdz2hqc9slbq41rwgkxmdisnj0iywx4mppmc2b4v6wh"; + sha256 = "0lv8n5id40iy2gfccy8g45fjzlnbnvi7nlvj25pri22dq2bd5svm"; }; inherit patches; diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index f4e59d1ca04..28b85936a28 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -2,10 +2,10 @@ , hicolor-icon-theme, libsoup, gnome3 }: stdenv.mkDerivation rec { - name = "homebank-5.1.7"; + name = "homebank-5.1.8"; src = fetchurl { url = "http://homebank.free.fr/public/${name}.tar.gz"; - sha256 = "19szz86jxya8v4r3pa5czng9q2kn5hhbk273x1wqvdv40z0577jp"; + sha256 = "0fzjmwz2pgi0nw49xljp1za3vp67kjh88gf688d9ig4wc2ygr0qh"; }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 7da7a6bf734..89af45814bf 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -269,7 +269,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ wrapGAppsHook ]; passthru = { - inherit srcs; + inherit srcs jdk; }; requiredSystemFeatures = [ "big-parallel" ]; diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index 8726d5130d7..861214c70ca 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -261,7 +261,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ wrapGAppsHook ]; passthru = { - inherit srcs; + inherit srcs jdk; }; requiredSystemFeatures = [ "big-parallel" ]; diff --git a/pkgs/applications/office/libreoffice/wrapper.nix b/pkgs/applications/office/libreoffice/wrapper.nix new file mode 100644 index 00000000000..8566bd76e1e --- /dev/null +++ b/pkgs/applications/office/libreoffice/wrapper.nix @@ -0,0 +1,16 @@ +{ libreoffice, runCommand, dbus, bash }: +let + jdk = libreoffice.jdk; +in +(runCommand "${libreoffice.name}" { + inherit dbus libreoffice jdk bash; +} '' + mkdir -p "$out/bin" + ln -s "${libreoffice}/share" "$out/share" + substituteAll "${./wrapper.sh}" "$out/bin/soffice" + chmod a+x "$out/bin/soffice" + + for i in $(ls "${libreoffice}/bin/"); do + test "$i" = "soffice" || ln -s soffice "$out/bin/$(basename "$i")" + done +'') // { inherit libreoffice dbus; } diff --git a/pkgs/applications/office/libreoffice/wrapper.sh b/pkgs/applications/office/libreoffice/wrapper.sh new file mode 100644 index 00000000000..591b4251506 --- /dev/null +++ b/pkgs/applications/office/libreoffice/wrapper.sh @@ -0,0 +1,27 @@ +#!@bash@/bin/bash +export JAVA_HOME="${JAVA_HOME:-@jdk@}" +export SAL_USE_VCLPLUGIN="${SAL_USE_VCLPLUGIN:-gen}" + +if uname | grep Linux > /dev/null && + ! ( test -n "$DBUS_SESSION_BUS_ADDRESS" && + test -n "$DBUS_SYSTEM_BUS_ADDRESS" ); then + dbus_tmp_dir="/run/user/$(id -u)/libreoffice-dbus" + mkdir "$dbus_tmp_dir" + dbus_socket_dir="$(mktemp -d -p "$dbus_tmp_dir")" + cat "@dbus@/share/dbus-1/system.conf" | + grep -v '[<]user[>]messagebus' > "$dbus_socket_dir/system.conf" + if test -z "$DBUS_SESSION_BUS_ADDRESS"; then + "@dbus@"/bin/dbus-daemon --nopidfile --nofork --config-file "@dbus@"/share/dbus-1/session.conf --address "unix:path=$dbus_socket_dir/session" >&2 & + export DBUS_SESSION_BUS_ADDRESS="unix:path=$dbus_socket_dir/session" + fi + if test -z "$DBUS_SYSTEM_BUS_ADDRESS"; then + "@dbus@"/bin/dbus-daemon --nopidfile --nofork --config-file "$dbus_socket_dir/system.conf" --address "unix:path=$dbus_socket_dir/system" >&2 & + export DBUS_SYSTEM_BUS_ADDRESS="unix:path=$dbus_socket_dir/system" + fi +fi + +"@libreoffice@/bin/$(basename "$0")" "$@" +code="$?" + +test -n "$dbus_socket_dir" && rm -rf "$dbus_socket_dir" +exit "$code" diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix index 48b278cc1df..9f7048f3646 100644 --- a/pkgs/applications/office/zim/default.nix +++ b/pkgs/applications/office/zim/default.nix @@ -9,11 +9,11 @@ python2Packages.buildPythonApplication rec { name = "zim-${version}"; - version = "0.67"; + version = "0.68"; src = fetchurl { url = "http://zim-wiki.org/downloads/${name}.tar.gz"; - sha256 = "1gdbzy9qyzj3rn9fsl0ss7lbk9kyka99656bphx2dah694yyyz5k"; + sha256 = "05fzb24a2s3pm89zb6gwa48wb925an5i652klx8yk9pn23h1h5fr"; }; propagatedBuildInputs = with python2Packages; [ pyGtkGlade pyxdg pygobject2 ]; diff --git a/pkgs/applications/science/logic/aspino/default.nix b/pkgs/applications/science/logic/aspino/default.nix index ee9e580a7b8..5e1a448a7cf 100644 --- a/pkgs/applications/science/logic/aspino/default.nix +++ b/pkgs/applications/science/logic/aspino/default.nix @@ -1,34 +1,46 @@ -{ stdenv, fetchFromGitHub, zlib, boost, glucose }: +{ stdenv, fetchurl, fetchFromGitHub, zlib, boost, glucose }: + +let + glucose' = fetchurl { + url = "http://www.labri.fr/perso/lsimon/downloads/softwares/glucose-syrup.tgz"; + sha256 = "0bq5l2jabhdfhng002qfk0mcj4pfi1v5853x3c7igwfrgx0jmfld"; + }; +in + stdenv.mkDerivation rec { - name = "aspino-2016-01-31"; + name = "aspino-unstable-2017-03-09"; src = fetchFromGitHub { owner = "alviano"; repo = "aspino"; - rev = "d28579b5967988b88bce6d9964a8f0a926286e9c"; - sha256 = "0r9dnkq3rldv5hhnmycmzqyg23hv5w3g3i5a00a8zalnzfiyirnq"; + rev = "e31c3b4e5791a454e6602439cb26bd98d23c4e78"; + sha256 = "0annsjs2prqmv1lbs0lxr7yclfzh47xg9zyiq6mdxcc02rxsi14f"; }; buildInputs = [ zlib boost ]; - patchPhase = '' + postPatch = '' substituteInPlace Makefile \ --replace "GCC = g++" "GCC = c++" + + patchShebangs . ''; preBuild = '' - cp ${glucose.src} patches/glucose-syrup.tgz + cp ${glucose'} patches/glucose-syrup.tgz ./bootstrap.sh ''; installPhase = '' + runHook preInstall mkdir -p $out/bin install -m0755 build/release/{aspino,fairino-{bs,ls,ps},maxino-2015-{k16,kdyn}} $out/bin + runHook postInstall ''; meta = with stdenv.lib; { description = "SAT/PseudoBoolean/MaxSat/ASP solver using glucose"; - maintainers = with maintainers; [ gebner ]; + maintainers = with maintainers; [ gebner ma27 ]; platforms = platforms.unix; license = licenses.asl20; homepage = http://alviano.net/software/maxino/; diff --git a/pkgs/applications/science/logic/picosat/default.nix b/pkgs/applications/science/logic/picosat/default.nix index db252f97916..638996e853b 100644 --- a/pkgs/applications/science/logic/picosat/default.nix +++ b/pkgs/applications/science/logic/picosat/default.nix @@ -19,6 +19,9 @@ stdenv.mkDerivation rec { configurePhase = "./configure.sh --shared --trace"; + makeFlags = stdenv.lib.optional stdenv.isDarwin + "SONAME=-Wl,-install_name,$(out)/lib/libpicosat.so"; + installPhase = '' mkdir -p $out/bin $out/lib $out/share $out/include/picosat cp picomus picomcs picosat picogcnf "$out"/bin diff --git a/pkgs/applications/science/logic/potassco/clingo.nix b/pkgs/applications/science/logic/potassco/clingo.nix index a73feba97b6..6bf19a2a2f4 100644 --- a/pkgs/applications/science/logic/potassco/clingo.nix +++ b/pkgs/applications/science/logic/potassco/clingo.nix @@ -1,23 +1,26 @@ -{stdenv, fetchurl, cmake}: +{ stdenv, fetchzip, cmake }: + stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "clingo"; version = "5.2.2"; - src = fetchurl { - url = "https://github.com/potassco/clingo/releases/v${version}.tar.gz"; - sha256 = "1kxzb385g8p9mqm1x9wvjrigifa09w6vj0wl7kradibm5qagh7ns"; + src = fetchzip { + url = "https://github.com/potassco/clingo/archive/v${version}.tar.gz"; + sha256 = "04rjwpna37gzm8vxr09z3z6ay8y8cxbjd8lga7xvqfpn2l178zjm"; }; buildInputs = []; nativeBuildInputs = [cmake]; + cmakeFlags = [ "-DCLINGO_BUILD_WITH_PYTHON=OFF" ]; + meta = { inherit version; description = "ASP system to ground and solve logic programs"; license = stdenv.lib.licenses.mit; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; homepage = "https://potassco.org/"; downloadPage = "https://github.com/potassco/clingo/releases/"; }; diff --git a/pkgs/applications/science/logic/symbiyosys/default.nix b/pkgs/applications/science/logic/symbiyosys/default.nix index e8feaa0acc4..a367386e417 100644 --- a/pkgs/applications/science/logic/symbiyosys/default.nix +++ b/pkgs/applications/science/logic/symbiyosys/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { homepage = https://symbiyosys.readthedocs.io/; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/science/machine-learning/shogun/default.nix b/pkgs/applications/science/machine-learning/shogun/default.nix index ae272284bcd..495ecdb58ee 100644 --- a/pkgs/applications/science/machine-learning/shogun/default.nix +++ b/pkgs/applications/science/machine-learning/shogun/default.nix @@ -47,6 +47,10 @@ stdenv.mkDerivation rec { ++ (optional (opencvSupport) "-DOpenCV=ON") ; + # Previous attempts to fix parallel builds (see patch above) were not entirely successful. + # Sporadic build failures still exist. Dislable parallel builds for now. + enableParallelBuilding = false; + meta = with stdenv.lib; { description = "A toolbox which offers a wide range of efficient and unified machine learning methods"; homepage = "http://shogun-toolbox.org/"; diff --git a/pkgs/applications/science/machine-learning/torch/torch-distro.nix b/pkgs/applications/science/machine-learning/torch/torch-distro.nix index 91adb5283fd..a4247eac627 100644 --- a/pkgs/applications/science/machine-learning/torch/torch-distro.nix +++ b/pkgs/applications/science/machine-learning/torch/torch-distro.nix @@ -131,6 +131,7 @@ let name = "sundown"; src = "${distro_src}/pkg/sundown"; rockspec = "rocks/${name}-scm-1.rockspec"; + meta.broken = true; # 2018-04-11 }; cwrap = buildLuaRocks rec { @@ -289,6 +290,7 @@ let rev = "1e9e4f1e0bf589a0ed39f58acc185ec5e213d207"; sha256 = "1i1fpy9v6r4w3lrmz7bmf5ppq65925rv90gx39b3pykfmn0hcb9c"; }; + meta.broken = true; # 2018-04-11 }; luuid = stdenv.mkDerivation rec { diff --git a/pkgs/applications/science/math/bcal/default.nix b/pkgs/applications/science/math/bcal/default.nix index baede83f651..8db4bd157df 100644 --- a/pkgs/applications/science/math/bcal/default.nix +++ b/pkgs/applications/science/math/bcal/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "bcal-${version}"; - version = "1.7"; + version = "1.8"; src = fetchFromGitHub { owner = "jarun"; repo = "bcal"; rev = "v${version}"; - sha256 = "08cqp2jysvy743gmwpzkbqhybsb49n65r63z3if53m3y59qg4aw8"; + sha256 = "0jdn46wzwq7yn3x6p1xyqarp52pcr0ghnfhkm7nyxv734g1abw7r"; }; nativeBuildInputs = [ python3Packages.pytest ]; @@ -20,14 +20,13 @@ stdenv.mkDerivation rec { python3 -m pytest test.py ''; - makeFlags = [ "CC=cc" ]; installFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; meta = { description = "Storage conversion and expression calculator"; homepage = https://github.com/jarun/bcal; license = licenses.gpl3; - platforms = [ "x86_64-darwin" "x86_64-linux" ]; + platforms = [ "aarch64-linux" "x86_64-darwin" "x86_64-linux" ]; maintainers = with maintainers; [ jfrankenau ]; }; } diff --git a/pkgs/applications/science/math/giac/default.nix b/pkgs/applications/science/math/giac/default.nix index e29ff24e250..6acaa406744 100644 --- a/pkgs/applications/science/math/giac/default.nix +++ b/pkgs/applications/science/math/giac/default.nix @@ -9,11 +9,11 @@ assert enableGUI -> libGLU_combined != null && xorg != null && fltk != null; stdenv.mkDerivation rec { name = "${attr}-${version}"; attr = if enableGUI then "giac-with-xcas" else "giac"; - version = "1.4.9"; + version = "1.4.9-59"; src = fetchurl { - url = "https://www-fourier.ujf-grenoble.fr/~parisse/giac/giac-${version}.tar.bz2"; - sha256 = "1n7xxgpqrsq7cv5wgcmgag6jvxw5wijkf1yv1r5aizlf1rc7dhai"; + url = "https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/giac_${version}.tar.gz"; + sha256 = "0dv5p5y6gkrsmz3xa7fw87rjyabwdwk09mqb09kb7gai9n9dgayk"; }; postPatch = '' diff --git a/pkgs/applications/science/misc/motu-client/default.nix b/pkgs/applications/science/misc/motu-client/default.nix index 0d5c79fde90..0994bb1ca38 100644 --- a/pkgs/applications/science/misc/motu-client/default.nix +++ b/pkgs/applications/science/misc/motu-client/default.nix @@ -1,11 +1,11 @@ { python27Packages, fetchurl, lib } : python27Packages.buildPythonApplication rec { - name = "motu-client-${version}"; - version = "1.4.00"; + pname = "motu-client"; + version = "1.5.00"; src = fetchurl { url = "https://github.com/quiet-oceans/motuclient-setuptools/archive/${version}.tar.gz"; - sha256 = "0v0h90mylhaamd1vm4nc64q63vmlafhijm47hs0xfam33y1q2yvb"; + sha256 = "1iqsws3wa2gpb36ms21xmaxfi83i8p8cdya4cxpn4r47c8mz74x8"; }; meta = with lib; { diff --git a/pkgs/applications/science/misc/openmvg/default.nix b/pkgs/applications/science/misc/openmvg/default.nix index fb3b0a29724..b139f30b3d1 100644 --- a/pkgs/applications/science/misc/openmvg/default.nix +++ b/pkgs/applications/science/misc/openmvg/default.nix @@ -46,5 +46,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.mpl20; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ mdaiter ]; + broken = true; # 2018-04-11 }; } diff --git a/pkgs/applications/science/misc/openmvs/default.nix b/pkgs/applications/science/misc/openmvs/default.nix index 177f8ca2564..ef539ac9c8d 100644 --- a/pkgs/applications/science/misc/openmvs/default.nix +++ b/pkgs/applications/science/misc/openmvs/default.nix @@ -3,14 +3,13 @@ , gmp, mpfr, glog, google-gflags, libjpeg_turbo }: stdenv.mkDerivation rec { - name = "openmvs-unstable-2017-05-01"; + name = "openmvs-unstable-2018-05-26"; src = fetchFromGitHub { owner = "cdcseacave"; repo = "openmvs"; - - rev = "a3b360016660a1397f6eb6c070c2c19bbb4c7590"; - sha256 = "170ff4ipix2kqq5rhb1yrrcvc79im9qgp5hiwsdr23xxzdl21221"; + rev = "939033c55b50478339084431aac2c2318041afad"; + sha256 = "12dgkwwfdp24581y3i41gsd1k9hq0aw917q0ja5s0if4qbmc8pni"; }; buildInputs = [ eigen opencv ceres-solver cgal boost vcg gmp mpfr glog google-gflags libjpeg_turbo ]; diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix index 087969fe61a..95462c02eb5 100644 --- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchgit, git, espeak, SDL2, udev, doxygen, cmake , qtbase, qtlocation, qtserialport, qtdeclarative, qtconnectivity, qtxmlpatterns -, qtsvg, qtquick1, qtquickcontrols, qtgraphicaleffects, qmake +, qtsvg, qtquick1, qtquickcontrols, qtgraphicaleffects, qmake, qtspeech , makeWrapper, lndir , gst_all_1, qt-gstreamer1, pkgconfig, glibc }: stdenv.mkDerivation rec { name = "qgroundcontrol-${version}"; - version = "3.2.7"; + version = "3.3.0"; qtInputs = [ qtbase qtlocation qtserialport qtdeclarative qtconnectivity qtxmlpatterns qtsvg - qtquick1 qtquickcontrols qtgraphicaleffects + qtquick1 qtquickcontrols qtgraphicaleffects qtspeech ]; gstInputs = with gst_all_1; [ @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = "https://github.com/mavlink/qgroundcontrol.git"; rev = "refs/tags/v${version}"; - sha256 = "1sla3sgj2p3h87d7kcaj53f8z5xzyadvsqlqzgh4d2n1f7sikdc5"; + sha256 = "0abjm0wywp24qlgg9w8g35ijprjg5csq4fgba9caaiwvmpfbhmpw"; fetchSubmodules = true; }; diff --git a/pkgs/applications/search/catfish/default.nix b/pkgs/applications/search/catfish/default.nix index 79af80ea75f..adf0f51fc4c 100644 --- a/pkgs/applications/search/catfish/default.nix +++ b/pkgs/applications/search/catfish/default.nix @@ -61,7 +61,7 @@ pythonPackages.buildPythonApplication rec { options. ''; license = licenses.gpl2Plus; - platforms = platforms.unix; + platforms = platforms.linux; maintainers = [ maintainers.romildo ]; }; } diff --git a/pkgs/applications/version-management/bazaar/default.nix b/pkgs/applications/version-management/bazaar/default.nix index 47d667a0c06..72e010fd283 100644 --- a/pkgs/applications/version-management/bazaar/default.nix +++ b/pkgs/applications/version-management/bazaar/default.nix @@ -1,4 +1,5 @@ { stdenv, fetchurl, python2Packages +, fetchpatch , withSFTP ? true }: @@ -17,8 +18,15 @@ python2Packages.buildPythonApplication rec { propagatedBuildInputs = [] ++ stdenv.lib.optionals withSFTP [ python2Packages.paramiko ]; - # Bazaar can't find the certificates alone - patches = [ ./add_certificates.patch ]; + patches = [ + # Bazaar can't find the certificates alone + ./add_certificates.patch + (fetchpatch { + url = "https://bazaar.launchpad.net/~brz/brz/trunk/revision/6754"; + sha256 = "0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73"; + name = "CVE-2017-14176.patch"; + }) + ]; postPatch = '' substituteInPlace bzrlib/transport/http/_urllib2_wrappers.py \ --subst-var-by certPath /etc/ssl/certs/ca-certificates.crt diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix index 3c7d0a86be0..d890001489f 100644 --- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, openssl, zlib, asciidoc, libxml2, libxslt , docbook_xml_xslt, pkgconfig, luajit , gzip, bzip2, xz +, python, wrapPython, pygments, markdown }: stdenv.mkDerivation rec { @@ -20,10 +21,11 @@ stdenv.mkDerivation rec { sha256 = "0wc64dzcxrzgi6kwcljz6y3cwm3ajdgf6aws7g58azbhvl1jk04l"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ] ++ [ python wrapPython ]; buildInputs = [ openssl zlib asciidoc libxml2 libxslt docbook_xml_xslt luajit ]; + pythonPath = [ pygments markdown ]; postPatch = '' sed -e 's|"gzip"|"${gzip}/bin/gzip"|' \ @@ -50,6 +52,8 @@ stdenv.mkDerivation rec { a2x --no-xmllint -f manpage cgitrc.5.txt mkdir -p "$out/share/man/man5" cp cgitrc.5 "$out/share/man/man5" + + wrapPythonProgramsIn "$out/lib/cgit/filters" "$out $pythonPath" ''; meta = { diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index e5e36e998ac..dc861fd9c19 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -117,11 +117,14 @@ rec { git = gitSVN; }; - svn_all_fast_export = libsForQt5.callPackage ./svn-all-fast-export { }; + svn-all-fast-export = libsForQt5.callPackage ./svn-all-fast-export { }; tig = callPackage ./tig { }; topGit = callPackage ./topgit { }; transcrypt = callPackage ./transcrypt { }; + + # aliases + svn_all_fast_export = svn-all-fast-export; } diff --git a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix index fbafc5257d7..2dfa61952a5 100644 --- a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix +++ b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix @@ -17,8 +17,8 @@ stdenv.mkDerivation { patches = [ (fetchpatch { name = "pr40.patch"; - sha256 = "1qndhk5csf7kddk3giailx7r0cdipq46lj73nkcws43n4n93synk"; - url = https://github.com/svn-all-fast-export/svn2git/pull/40.diff; + sha256 = "0mwncklzncsifql9zlxlbj3clsif5p2v1xs8nmxrw44mqvaysjw3"; + url = https://github.com/svn-all-fast-export/svn2git/compare/f00d5a5...flokli:nixos-20180326.patch; }) ]; @@ -31,8 +31,6 @@ stdenv.mkDerivation { "SVN_INCLUDE=${subversion.dev}/include/subversion-1" ]; - installPhase = "make install INSTALL_ROOT=$out"; - meta = with stdenv.lib; { homepage = https://github.com/svn-all-fast-export/svn2git; description = "A fast-import based converter for an svn repo to git repos"; diff --git a/pkgs/applications/version-management/git-review/default.nix b/pkgs/applications/version-management/git-review/default.nix index c9251b987e9..21ceccf9f35 100644 --- a/pkgs/applications/version-management/git-review/default.nix +++ b/pkgs/applications/version-management/git-review/default.nix @@ -2,7 +2,7 @@ pythonPackages.buildPythonApplication rec { name = "git-review-${version}"; - version = "1.25.0"; + version = "1.26.0"; # Manually set version because prb wants to get it from the git # upstream repository (and we are installing from tarball instead) @@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication rec { src = fetchurl rec { url = "https://github.com/openstack-infra/git-review/archive/${version}.tar.gz"; - sha256 = "aa594690ed586041a524d6e5ae76152cbd53d4f03a98b20b213d15cecbe128ce"; + sha256 = "106nk6p7byf5vi68b2fvmwma5nk7qrv39nfj9p1bfxmb1gjdixhc"; }; propagatedBuildInputs = with pythonPackages; [ pbr requests setuptools ]; diff --git a/pkgs/applications/version-management/git-sizer/default.nix b/pkgs/applications/version-management/git-sizer/default.nix new file mode 100644 index 00000000000..a0d7382de34 --- /dev/null +++ b/pkgs/applications/version-management/git-sizer/default.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + pname = "git-sizer"; + name = "${pname}-${version}"; + version = "1.0.0"; + + goPackagePath = "github.com/github/git-sizer"; + + src = fetchFromGitHub { + owner = "github"; + repo = pname; + rev = "v${version}"; + sha256 = "11rvqpsyl41ph0fgm62k5q2p33zgnwj1jd91rd4lkaarpcd1sg5h"; + }; + + meta = with lib; { + description = "Compute various size metrics for a Git repository"; + license = licenses.mit; + maintainers = with maintainers; [ matthewbauer ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/version-management/gitaly/Gemfile b/pkgs/applications/version-management/gitaly/Gemfile index 2aaf872d109..2b95446161b 100644 --- a/pkgs/applications/version-management/gitaly/Gemfile +++ b/pkgs/applications/version-management/gitaly/Gemfile @@ -1,11 +1,18 @@ source 'https://rubygems.org' gem 'github-linguist', '~> 4.7.0', require: 'linguist' -gem 'gitaly-proto', '~> 0.59.0', require: 'gitaly' -gem 'activesupport' +gem 'gitlab-markup', '~> 1.6.2' +gem 'gitaly-proto', '~> 0.83.0', require: 'gitaly' +gem 'activesupport', '~> 5.0.2' +gem 'rdoc', '~> 4.2' gem 'gollum-lib', '~> 4.2', require: false gem 'gollum-rugged_adapter', '~> 0.4.4', require: false +gem 'grpc', '~> 1.8.0' + +# Locked until https://github.com/google/protobuf/issues/4210 is closed +gem 'google-protobuf', '= 3.5.1' group :development, :test do gem 'gitlab-styles', '~> 2.0.0', require: false + gem 'rspec', require: false end diff --git a/pkgs/applications/version-management/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitaly/Gemfile.lock index f4e4ab10883..cb53bb10122 100644 --- a/pkgs/applications/version-management/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitaly/Gemfile.lock @@ -1,23 +1,23 @@ GEM remote: https://rubygems.org/ specs: - activesupport (5.0.0.1) + activesupport (5.0.6) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (~> 0.7) minitest (~> 5.1) tzinfo (~> 1.1) - addressable (2.5.1) - public_suffix (~> 2.0, >= 2.0.2) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) ast (2.3.0) charlock_holmes (0.7.5) concurrent-ruby (1.0.5) diff-lcs (1.3) escape_utils (1.1.1) - faraday (0.12.2) + faraday (0.14.0) multipart-post (>= 1.2, < 3) gemojione (3.3.0) json - gitaly-proto (0.59.0) + gitaly-proto (0.83.0) google-protobuf (~> 3.1) grpc (~> 1.0) github-linguist (4.7.6) @@ -31,6 +31,7 @@ GEM diff-lcs (~> 1.1) mime-types (>= 1.16) posix-spawn (~> 0.3) + gitlab-markup (1.6.3) gitlab-styles (2.0.0) rubocop (~> 0.49) rubocop-gitlab-security (~> 0.1.0) @@ -48,21 +49,24 @@ GEM gollum-rugged_adapter (0.4.4) mime-types (>= 1.15) rugged (~> 0.25) - google-protobuf (3.4.0.2) - googleauth (0.5.3) + google-protobuf (3.5.1) + googleapis-common-protos-types (1.0.1) + google-protobuf (~> 3.0) + googleauth (0.6.2) faraday (~> 0.12) - jwt (~> 1.4) + jwt (>= 1.4, < 3.0) logging (~> 2.0) memoist (~> 0.12) multi_json (~> 1.11) os (~> 0.9) signet (~> 0.7) - grpc (1.6.0) + grpc (1.8.7) google-protobuf (~> 3.1) - googleauth (~> 0.5.1) + googleapis-common-protos-types (~> 1.0.0) + googleauth (>= 0.5.1, < 0.7) i18n (0.8.1) json (2.1.0) - jwt (1.5.6) + jwt (2.1.0) little-plugger (1.1.4) logging (2.2.2) little-plugger (~> 1.1) @@ -73,7 +77,7 @@ GEM mime-types-data (3.2016.0521) mini_portile2 (2.3.0) minitest (5.9.1) - multi_json (1.12.1) + multi_json (1.13.1) multipart-post (2.0.0) nokogiri (1.8.1) mini_portile2 (~> 2.3.0) @@ -83,11 +87,25 @@ GEM ast (~> 2.2) posix-spawn (0.3.13) powerpack (0.1.1) - public_suffix (2.0.5) + public_suffix (3.0.1) rainbow (2.2.2) rake rake (12.1.0) + rdoc (4.3.0) rouge (2.2.1) + rspec (3.6.0) + rspec-core (~> 3.6.0) + rspec-expectations (~> 3.6.0) + rspec-mocks (~> 3.6.0) + rspec-core (3.6.0) + rspec-support (~> 3.6.0) + rspec-expectations (3.6.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.6.0) + rspec-mocks (3.6.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.6.0) + rspec-support (3.6.0) rubocop (0.50.0) parallel (~> 1.10) parser (>= 2.3.3.1, < 3.0) @@ -103,10 +121,10 @@ GEM rugged (0.26.0) sanitize (2.1.0) nokogiri (>= 1.4.4) - signet (0.7.3) + signet (0.8.1) addressable (~> 2.3) faraday (~> 0.9) - jwt (~> 1.5) + jwt (>= 1.5, < 3.0) multi_json (~> 1.10) stringex (2.7.1) thread_safe (0.3.6) @@ -118,12 +136,17 @@ PLATFORMS ruby DEPENDENCIES - activesupport - gitaly-proto (~> 0.59.0) + activesupport (~> 5.0.2) + gitaly-proto (~> 0.83.0) github-linguist (~> 4.7.0) + gitlab-markup (~> 1.6.2) gitlab-styles (~> 2.0.0) gollum-lib (~> 4.2) gollum-rugged_adapter (~> 0.4.4) + google-protobuf (= 3.5.1) + grpc (~> 1.8.0) + rdoc (~> 4.2) + rspec BUNDLED WITH - 1.16.0 + 1.16.1 diff --git a/pkgs/applications/version-management/gitaly/default.nix b/pkgs/applications/version-management/gitaly/default.nix index 43ac470dcd4..7a8ba0fda74 100644 --- a/pkgs/applications/version-management/gitaly/default.nix +++ b/pkgs/applications/version-management/gitaly/default.nix @@ -7,14 +7,14 @@ let gemdir = ./.; }; in buildGoPackage rec { - version = "0.59.2"; + version = "0.81.0"; name = "gitaly-${version}"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "08f109rw3qxdr93l0kl8wxmrvn846a6vdkssvrp2zr40yn9wif7m"; + sha256 = "01sw5y201xbd21k9r7xmzqiiypb924ac95nqqfhzplqnssa98n9y"; }; goPackagePath = "gitlab.com/gitlab-org/gitaly"; diff --git a/pkgs/applications/version-management/gitaly/gemset.nix b/pkgs/applications/version-management/gitaly/gemset.nix index 81bb334085a..efe78621662 100644 --- a/pkgs/applications/version-management/gitaly/gemset.nix +++ b/pkgs/applications/version-management/gitaly/gemset.nix @@ -3,19 +3,19 @@ dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vgjr48yiynwf9rh2nsxa8w134na0805l40chf9g9scii9k70rj9"; + sha256 = "0g85lqq0smj71g8a2dxb54ajjzw59c9snana4p61knryc83q3yg6"; type = "gem"; }; - version = "5.0.0.1"; + version = "5.0.6"; }; addressable = { dependencies = ["public_suffix"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i8q32a4gr0zghxylpyy7jfqwxvwrivsxflg9mks6kx92frh75mh"; + sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk"; type = "gem"; }; - version = "2.5.1"; + version = "2.5.2"; }; ast = { source = { @@ -61,10 +61,10 @@ dependencies = ["multipart-post"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "157c4cmb5g1b3ny6k9qf9z57rfijl54fcq3hnqqf6g31g1m096b2"; + sha256 = "1c3x3s8vb5nf7inyfvhdxwa4q3swmnacpxby6pish5fgmhws7zrr"; type = "gem"; }; - version = "0.12.2"; + version = "0.14.0"; }; gemojione = { dependencies = ["json"]; @@ -79,10 +79,10 @@ dependencies = ["google-protobuf" "grpc"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s86126iqhbmkix6zs357ixlc1syyxmwk2blaimsav7f0x9swy82"; + sha256 = "0z3asy104q36sshq9zhmgcm32sg8qr8jvy0mi19nakkq7prrkwqv"; type = "gem"; }; - version = "0.59.0"; + version = "0.83.0"; }; github-linguist = { dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"]; @@ -110,6 +110,14 @@ }; version = "2.8.2"; }; + gitlab-markup = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pvx257azpr00yvb74lgjpgnj72nwyd29l9a18280rgmp4cjniki"; + type = "gem"; + }; + version = "1.6.3"; + }; gitlab-styles = { dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-rspec"]; source = { @@ -149,28 +157,37 @@ google-protobuf = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1jh8axm5m75rvdf2i3s24pmi7p613armh9vk3p1d0ryfx159mqkl"; + sha256 = "0s8ijd9wdrkqwsb6nasrsv7f9i5im2nyax7f7jlb5y9vh8nl98qi"; type = "gem"; }; - version = "3.4.0.2"; + version = "3.5.1"; + }; + googleapis-common-protos-types = { + dependencies = ["google-protobuf"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yf10s7w8wpa49hc86z7z2fkn9yz7j2njz0n8xmqb24ji090z4ck"; + type = "gem"; + }; + version = "1.0.1"; }; googleauth = { dependencies = ["faraday" "jwt" "logging" "memoist" "multi_json" "os" "signet"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xpmvrzhczak25nm0k3r9aa083lmfnzi94mir3g1xyrgzz66vxli"; + sha256 = "08z4zfj9cwry13y8c2w5p4xylyslxxjq4wahd95bk1ddl5pknd4f"; type = "gem"; }; - version = "0.5.3"; + version = "0.6.2"; }; grpc = { - dependencies = ["google-protobuf" "googleauth"]; + dependencies = ["google-protobuf" "googleapis-common-protos-types" "googleauth"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "056ipqai887x5jpbgcc215kdi0lfqjzcjbx3hx11cjrfww01zc52"; + sha256 = "02b80pyg4rgkiafyh1jqnfh6xp9abpd1x0a9c2h98f0851scw28b"; type = "gem"; }; - version = "1.6.0"; + version = "1.8.7"; }; i18n = { source = { @@ -191,10 +208,10 @@ jwt = { source = { remotes = ["https://rubygems.org"]; - sha256 = "124zz1142bi2if7hl5pcrcamwchv4icyr5kaal9m2q6wqbdl6aw4"; + sha256 = "1w0kaqrbl71cq9sbnixc20x5lqah3hs2i93xmhlfdg2y3by7yzky"; type = "gem"; }; - version = "1.5.6"; + version = "2.1.0"; }; little-plugger = { source = { @@ -257,10 +274,10 @@ multi_json = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1wpc23ls6v2xbk3l1qncsbz16npvmw8p0b38l8czdzri18mp51xk"; + sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv"; type = "gem"; }; - version = "1.12.1"; + version = "1.13.1"; }; multipart-post = { source = { @@ -323,10 +340,10 @@ public_suffix = { source = { remotes = ["https://rubygems.org"]; - sha256 = "040jf98jpp6w140ghkhw2hvc1qx41zvywx5gj7r2ylr1148qnj7q"; + sha256 = "0mvzd9ycjw8ydb9qy3daq3kdzqs2vpqvac4dqss6ckk4rfcjc637"; type = "gem"; }; - version = "2.0.5"; + version = "3.0.1"; }; rainbow = { dependencies = ["rake"]; @@ -345,6 +362,14 @@ }; version = "12.1.0"; }; + rdoc = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13ba2mhqqcsp3k97x3iz9x29xk26rv4561lfzzzibcy41vvj1n4c"; + type = "gem"; + }; + version = "4.3.0"; + }; rouge = { source = { remotes = ["https://rubygems.org"]; @@ -353,6 +378,50 @@ }; version = "2.2.1"; }; + rspec = { + dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nd50hycab2a2vdah9lxi585g8f63jxjvmzmxqyln51grxwx9hzb"; + type = "gem"; + }; + version = "3.6.0"; + }; + rspec-core = { + dependencies = ["rspec-support"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18np8wyw2g79waclpaacba6nd7x60ixg07ncya0j0qj1z9b37grd"; + type = "gem"; + }; + version = "3.6.0"; + }; + rspec-expectations = { + dependencies = ["diff-lcs" "rspec-support"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "028ifzf9mqp3kxx40q1nbwj40g72g9zk0wr78l146phblkv96w0a"; + type = "gem"; + }; + version = "3.6.0"; + }; + rspec-mocks = { + dependencies = ["diff-lcs" "rspec-support"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nv6jkxy24sag1i9w9wi3850k6skk2fm6yhcrgnmlz6vmwxvizp8"; + type = "gem"; + }; + version = "3.6.0"; + }; + rspec-support = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "050paqqpsml8w88nf4a15zbbj3vvm471zpv73sjfdnz7w21wnypb"; + type = "gem"; + }; + version = "3.6.0"; + }; rubocop = { dependencies = ["parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"]; source = { @@ -409,10 +478,10 @@ dependencies = ["addressable" "faraday" "jwt" "multi_json"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "149668991xqibvm8kvl10kzy891yd6f994b4gwlx6c3vl24v5jq6"; + sha256 = "0js81lxqirdza8gf2f6avh11fny49ygmxfi1qx7jp8l9wrhznbkv"; type = "gem"; }; - version = "0.7.3"; + version = "0.8.1"; }; stringex = { source = { diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index f09d02ab022..8fcc3e7e927 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -7,13 +7,13 @@ with stdenv.lib; buildGoPackage rec { name = "gitea-${version}"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "go-gitea"; repo = "gitea"; rev = "v${version}"; - sha256 = "11gzb6x8zixmkm57x8hdncmdbbvppzld3yf7p7m0abigg8zyybsj"; + sha256 = "0ikkpvarp6mzsqk56ihw72fbv7r98g5v5i83rxq8dk709fdqplm6"; }; patches = [ ./static-root-path.patch ]; @@ -43,7 +43,7 @@ buildGoPackage rec { meta = { description = "Git with a cup of tea"; - homepage = http://gitea.io; + homepage = https://gitea.io; license = licenses.mit; maintainers = [ maintainers.disassembler ]; }; diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index ba525bacbc9..1e29b458a31 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -7,18 +7,21 @@ with stdenv.lib; +let + curlWithGnuTls = curl.override { gnutlsSupport = true; sslSupport = false; }; +in stdenv.mkDerivation rec { name = "gitkraken-${version}"; - version = "3.3.4"; + version = "3.4.0"; src = fetchurl { url = "https://release.gitkraken.com/linux/v${version}.deb"; - sha256 = "1djrbpm1f258cicf65ddvndpxi1izmnc12253k1zwl77z4jjbwls"; + sha256 = "0jj3a02bz30xa7p4migyhvxd9s0cllymsp1rdh2pbh40p79g1fp1"; }; libPath = makeLibraryPath [ stdenv.cc.cc.lib - curl + curlWithGnuTls udev libX11 libXext diff --git a/pkgs/applications/version-management/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab-shell/default.nix index ab0ff74f03f..ca5b8a84fbf 100644 --- a/pkgs/applications/version-management/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab-shell/default.nix @@ -1,14 +1,14 @@ { stdenv, ruby, bundler, fetchFromGitLab, go }: stdenv.mkDerivation rec { - version = "5.10.2"; + version = "6.0.3"; name = "gitlab-shell-${version}"; srcs = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "16lwnzsppql7pkf8fka6cwkghdr57g225zvln9ii29w7nzz1hvaf"; + sha256 = "073y41d9sqy6l6dxbiml6c13fq98qcb0jf86w9slld1mcw19cmrk"; }; buildInputs = [ ruby bundler go ]; @@ -30,29 +30,9 @@ stdenv.mkDerivation rec { # code by default which doesn't work in nixos because it's a # read-only filesystem postPatch = '' - substituteInPlace lib/gitlab_config.rb --replace\ - "File.join(ROOT_PATH, 'config.yml')"\ - "ENV['GITLAB_SHELL_CONFIG_PATH']" - - # Note that we're running gitlab-shell from current-system/sw - # because otherwise updating gitlab-shell won't be reflected in - # the hardcoded path of the authorized-keys file: - substituteInPlace lib/gitlab_keys.rb --replace\ - "\"#{ROOT_PATH}/bin/gitlab-shell"\ - "\"GITLAB_SHELL_CONFIG_PATH=#{ENV['GITLAB_SHELL_CONFIG_PATH']} /run/current-system/sw/bin/gitlab-shell" - - # We're setting GITLAB_SHELL_CONFIG_PATH in the ssh authorized key - # environment because we need it in gitlab_configrb - # . unsetenv_others will remove that so we're not doing it for - # now. - # - # TODO: Are there any security implications? The commit adding - # unsetenv_others didn't mention anything... - # - # Kernel::exec({'PATH' => ENV['PATH'], 'LD_LIBRARY_PATH' => ENV['LD_LIBRARY_PATH'], 'GL_ID' => ENV['GL_ID']}, *args, unsetenv_others: true) - substituteInPlace lib/gitlab_shell.rb --replace\ - " *args, unsetenv_others: true)"\ - " *args)" + substituteInPlace lib/gitlab_config.rb --replace \ + "File.join(ROOT_PATH, 'config.yml')" \ + "'/run/gitlab/shell-config.yml'" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/version-management/gitlab-shell/fixes.patch b/pkgs/applications/version-management/gitlab-shell/fixes.patch index 1c694266e47..b0ee31cf39d 100644 --- a/pkgs/applications/version-management/gitlab-shell/fixes.patch +++ b/pkgs/applications/version-management/gitlab-shell/fixes.patch @@ -1,12 +1,11 @@ diff --git a/support/go_build.rb b/support/go_build.rb -index 82f94d2..40ba35e 100644 +index 30a6b71..46b4dfa 100644 --- a/support/go_build.rb +++ b/support/go_build.rb -@@ -25,9 +25,8 @@ module GoBuild - def run!(env, cmd) +@@ -26,8 +26,8 @@ module GoBuild raise "env must be a hash" unless env.is_a?(Hash) raise "cmd must be an array" unless cmd.is_a?(Array) -- + - if !system(env, *cmd) - abort "command failed: #{env.inspect} #{cmd.join(' ')}" - end diff --git a/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch index f28e74b88c5..bc1aa858386 100644 --- a/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch +++ b/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch @@ -1,30 +1,3 @@ -diff --git a/lib/gitlab_projects.rb b/lib/gitlab_projects.rb -index 0b11ce3..ffc3faf 100644 ---- a/lib/gitlab_projects.rb -+++ b/lib/gitlab_projects.rb -@@ -8,7 +8,7 @@ require_relative 'gitlab_metrics' - require_relative 'gitlab_metrics' - - class GitlabProjects -- GLOBAL_HOOKS_DIRECTORY = File.join(ROOT_PATH, 'hooks') -+ GLOBAL_HOOKS_DIRECTORY = ENV['GITLAB_SHELL_HOOKS_PATH'] || File.join(ROOT_PATH, 'hooks') - - # Project name is a directory name for repository with .git at the end - # It may be namespaced or not. Like repo.git or gitlab/repo.git -diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb -index e7d0254..181ec8a 100644 ---- a/lib/gitlab_shell.rb -+++ b/lib/gitlab_shell.rb -@@ -188,7 +188,8 @@ class GitlabShell - end - - # We use 'chdir: ROOT_PATH' to let the next executable know where config.yml is. -- Kernel::exec(env, *args, unsetenv_others: true, chdir: ROOT_PATH) -+ # Except we don't, because we're already in the right directory on nixos ! -+ Kernel::exec(env, *args, unsetenv_others: true) - end - - def api diff --git a/go/internal/config/config.go b/go/internal/config/config.go index c57b4de..88cfc95 100644 --- a/go/internal/config/config.go @@ -34,7 +7,21 @@ index c57b4de..88cfc95 100644 cfg.RootDir = dir - configBytes, err := ioutil.ReadFile(path.Join(cfg.RootDir, configFile)) -+ configBytes, err := ioutil.ReadFile(os.Getenv("GITLAB_SHELL_CONFIG_PATH")) ++ configBytes, err := ioutil.ReadFile("/run/gitlab/shell-config.yml") if err != nil { return nil, err } +diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb +index 1452f95..2b40327 100644 +--- a/lib/gitlab_shell.rb ++++ b/lib/gitlab_shell.rb +@@ -180,7 +180,8 @@ class GitlabShell + end + + # We use 'chdir: ROOT_PATH' to let the next executable know where config.yml is. +- Kernel::exec(env, *args, unsetenv_others: true, chdir: ROOT_PATH) ++ # Except we don't, because we're already in the right directory on nixos! ++ Kernel::exec(env, *args, unsetenv_others: true) + end + + def api diff --git a/pkgs/applications/version-management/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab-workhorse/default.nix index c43b5ab2a1b..6bb696406c9 100644 --- a/pkgs/applications/version-management/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab-workhorse/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitLab, git, go }: stdenv.mkDerivation rec { - version = "3.3.1"; + version = "3.6.0"; name = "gitlab-workhorse-${version}"; srcs = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-workhorse"; rev = "v${version}"; - sha256 = "19x9ryp99xygj39kq2r756rahh9mxp6j83hxvv09y33vgz64y8xh"; + sha256 = "1vcxm9m82m1dcc86r29k5v8cp3zvpby4kszbkavl3frm3ws0w9lz"; }; buildInputs = [ git go ]; diff --git a/pkgs/applications/version-management/gitlab/Gemfile b/pkgs/applications/version-management/gitlab/Gemfile index 916314f42f9..97d40857e11 100644 --- a/pkgs/applications/version-management/gitlab/Gemfile +++ b/pkgs/applications/version-management/gitlab/Gemfile @@ -12,7 +12,7 @@ gem 'sprockets', '~> 3.7.0' gem 'default_value_for', '~> 3.0.0' # Supported DBs -gem 'mysql2', '~> 0.4.5', group: :mysql +gem 'mysql2', '~> 0.4.10', group: :mysql gem 'pg', '~> 0.18.2', group: :postgres gem 'rugged', '~> 0.26.0' @@ -25,7 +25,7 @@ gem 'devise', '~> 4.2' gem 'doorkeeper', '~> 4.2.0' gem 'doorkeeper-openid_connect', '~> 1.2.0' gem 'omniauth', '~> 1.4.2' -gem 'omniauth-auth0', '~> 1.4.1' +gem 'omniauth-auth0', '~> 2.0.0' gem 'omniauth-azure-oauth2', '~> 0.0.9' gem 'omniauth-cas3', '~> 1.1.4' gem 'omniauth-facebook', '~> 4.0.0' @@ -69,7 +69,15 @@ gem 'net-ldap' # Git Wiki # Required manually in config/initializers/gollum.rb to control load order +# Before updating this gem, check if +# https://github.com/gollum/gollum-lib/pull/292 has been merged. +# If it has, then remove the monkey patch for update_page, rename_page and raw_data_in_committer +# in config/initializers/gollum.rb gem 'gollum-lib', '~> 4.2', require: false + +# Before updating this gem, check if +# https://github.com/gollum/rugged_adapter/pull/28 has been merged. +# If it has, then remove the monkey patch for tree_entry in config/initializers/gollum.rb gem 'gollum-rugged_adapter', '~> 0.4.4', require: false # Language detection @@ -78,7 +86,7 @@ gem 'github-linguist', '~> 4.7.0', require: 'linguist' # API gem 'grape', '~> 1.0' gem 'grape-entity', '~> 0.6.0' -gem 'rack-cors', '~> 0.4.0', require: 'rack/cors' +gem 'rack-cors', '~> 1.0.0', require: 'rack/cors' # Disable strong_params so that Mash does not respond to :permitted? gem 'hashie-forbidden_attributes' @@ -111,7 +119,7 @@ gem 'google-api-client', '~> 0.13.6' gem 'unf', '~> 0.1.4' # Seed data -gem 'seed-fu', '2.3.6' # Upgrade to > 2.3.7 once https://github.com/mbleigh/seed-fu/issues/123 is solved +gem 'seed-fu', '~> 2.3.7' # Markdown and HTML processing gem 'html-pipeline', '~> 1.11.0' @@ -128,7 +136,7 @@ gem 'asciidoctor-plantuml', '0.0.7' gem 'rouge', '~> 2.0' gem 'truncato', '~> 0.7.9' gem 'bootstrap_form', '~> 2.7.0' -gem 'nokogiri', '~> 1.8.1' +gem 'nokogiri', '~> 1.8.2' # Diffs gem 'diffy', '~> 3.1.0' @@ -229,6 +237,9 @@ gem 'charlock_holmes', '~> 0.7.5' # Faster JSON gem 'oj', '~> 2.17.4' +# Faster blank +gem 'fast_blank' + # Parse time & duration gem 'chronic', '~> 0.10.2' gem 'chronic_duration', '~> 0.10.6' @@ -263,7 +274,7 @@ gem 'gettext_i18n_rails', '~> 1.8.0' gem 'gettext_i18n_rails_js', '~> 1.2.0' gem 'gettext', '~> 3.2.2', require: false, group: :development -gem 'batch-loader' +gem 'batch-loader', '~> 1.2.1' # Perf bar gem 'peek', '~> 1.0.1' @@ -283,7 +294,7 @@ group :metrics do gem 'influxdb', '~> 0.2', require: false # Prometheus - gem 'prometheus-client-mmap', '~> 0.7.0.beta43' + gem 'prometheus-client-mmap', '~> 0.9.1' gem 'raindrops', '~> 0.18' end @@ -311,14 +322,14 @@ group :development, :test do gem 'fuubar', '~> 2.2.0' gem 'database_cleaner', '~> 1.5.0' - gem 'factory_girl_rails', '~> 4.7.0' + gem 'factory_bot_rails', '~> 4.8.2' gem 'rspec-rails', '~> 3.6.0' gem 'rspec-retry', '~> 0.4.5' gem 'spinach-rails', '~> 0.2.1' gem 'spinach-rerun-reporter', '~> 0.0.2' gem 'rspec_profiling', '~> 0.0.5' gem 'rspec-set', '~> 0.1.3' - gem 'rspec-parameterized' + gem 'rspec-parameterized', require: false # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) gem 'minitest', '~> 5.7.0' @@ -334,13 +345,15 @@ group :development, :test do gem 'spring-commands-rspec', '~> 1.0.4' gem 'spring-commands-spinach', '~> 1.1.0' - gem 'rubocop', '~> 0.49.1', require: false - gem 'rubocop-rspec', '~> 1.15.1', require: false - gem 'rubocop-gitlab-security', '~> 0.1.0', require: false - gem 'scss_lint', '~> 0.54.0', require: false + gem 'gitlab-styles', '~> 2.3', require: false + # Pin these dependencies, otherwise a new rule could break the CI pipelines + gem 'rubocop', '~> 0.52.1' + gem 'rubocop-rspec', '~> 1.22.1' + + gem 'scss_lint', '~> 0.56.0', require: false gem 'haml_lint', '~> 0.26.0', require: false gem 'simplecov', '~> 0.14.0', require: false - gem 'flay', '~> 2.8.0', require: false + gem 'flay', '~> 2.10.0', require: false gem 'bundler-audit', '~> 0.5.0', require: false gem 'benchmark-ips', '~> 2.3.0', require: false @@ -379,9 +392,6 @@ gem 'ruby-prof', '~> 0.16.2' # OAuth gem 'oauth2', '~> 1.4' -# Soft deletion -gem 'paranoia', '~> 2.3.1' - # Health check gem 'health_check', '~> 2.6.0' @@ -400,16 +410,20 @@ group :ed25519 do end # Gitaly GRPC client -gem 'gitaly-proto', '~> 0.59.0', require: 'gitaly' +gem 'gitaly-proto', '~> 0.84.0', require: 'gitaly' +# Locked until https://github.com/google/protobuf/issues/4210 is closed +gem 'google-protobuf', '= 3.5.1' gem 'toml-rb', '~> 0.3.15', require: false # Feature toggles -gem 'flipper', '~> 0.10.2' -gem 'flipper-active_record', '~> 0.10.2' +gem 'flipper', '~> 0.11.0' +gem 'flipper-active_record', '~> 0.11.0' +gem 'flipper-active_support_cache_store', '~> 0.11.0' # Structured logging gem 'lograge', '~> 0.5' gem 'grape_logging', '~> 1.7' -gem 'activerecord-nulldb-adapter' +# Asset synchronization +gem 'asset_sync', '~> 2.2.0' diff --git a/pkgs/applications/version-management/gitlab/Gemfile.lock b/pkgs/applications/version-management/gitlab/Gemfile.lock index c8915e9172c..4022e289611 100644 --- a/pkgs/applications/version-management/gitlab/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/Gemfile.lock @@ -33,8 +33,6 @@ GEM activemodel (= 4.2.10) activesupport (= 4.2.10) arel (~> 6.0) - activerecord-nulldb-adapter (0.3.7) - activerecord (>= 2.0.0) activerecord_sane_schema_dumper (0.2) rails (>= 4, < 5) activesupport (4.2.10) @@ -60,6 +58,11 @@ GEM asciidoctor (1.5.3) asciidoctor-plantuml (0.0.7) asciidoctor (~> 1.5) + asset_sync (2.2.0) + activemodel (>= 4.1.0) + fog-core + mime-types (>= 2.99) + unf ast (2.3.0) atomic (1.1.99) attr_encrypted (3.0.3) @@ -75,7 +78,7 @@ GEM thread_safe (~> 0.3, >= 0.3.1) babosa (1.0.2) base32 (0.3.2) - batch-loader (1.1.1) + batch-loader (1.2.1) bcrypt (3.1.11) bcrypt_pbkdf (1.0.0) benchmark-ips (2.3.0) @@ -192,10 +195,10 @@ GEM excon (0.57.1) execjs (2.6.0) expression_parser (0.9.0) - factory_girl (4.7.0) + factory_bot (4.8.2) activesupport (>= 3.0.0) - factory_girl_rails (4.7.0) - factory_girl (~> 4.7.0) + factory_bot_rails (4.8.2) + factory_bot (~> 4.8.2) railties (>= 3.0.0) faraday (0.12.2) multipart-post (>= 1.2, < 3) @@ -204,18 +207,22 @@ GEM faraday_middleware-multi_json (0.0.6) faraday_middleware multi_json + fast_blank (1.0.0) fast_gettext (1.4.0) ffaker (2.4.0) ffi (1.9.18) - flay (2.8.1) + flay (2.10.0) erubis (~> 2.7.0) path_expander (~> 1.0) ruby_parser (~> 3.0) sexp_processor (~> 4.0) - flipper (0.10.2) - flipper-active_record (0.10.2) + flipper (0.11.0) + flipper-active_record (0.11.0) activerecord (>= 3.2, < 6) - flipper (~> 0.10.2) + flipper (~> 0.11.0) + flipper-active_support_cache_store (0.11.0) + activesupport (>= 3.2, < 6) + flipper (~> 0.11.0) flowdock (0.7.1) httparty (~> 0.7) multi_json @@ -278,7 +285,7 @@ GEM po_to_json (>= 1.0.0) rails (>= 3.2.0) gherkin-ruby (0.3.2) - gitaly-proto (0.59.0) + gitaly-proto (0.84.0) google-protobuf (~> 3.1) grpc (~> 1.0) github-linguist (4.7.6) @@ -297,6 +304,10 @@ GEM mime-types (>= 1.16) posix-spawn (~> 0.3) gitlab-markup (1.6.3) + gitlab-styles (2.3.2) + rubocop (~> 0.51) + rubocop-gitlab-security (~> 0.1.0) + rubocop-rspec (~> 1.19) gitlab_omniauth-ldap (2.0.4) net-ldap (~> 0.16) omniauth (~> 1.3) @@ -329,7 +340,9 @@ GEM mime-types (~> 3.0) representable (~> 3.0) retriable (>= 2.0, < 4.0) - google-protobuf (3.4.1.1) + google-protobuf (3.5.1) + googleapis-common-protos-types (1.0.1) + google-protobuf (~> 3.0) googleauth (0.5.3) faraday (~> 0.12) jwt (~> 1.4) @@ -356,9 +369,10 @@ GEM rake grape_logging (1.7.0) grape - grpc (1.4.5) + grpc (1.8.3) google-protobuf (~> 3.1) - googleauth (~> 0.5.1) + googleapis-common-protos-types (~> 1.0.0) + googleauth (>= 0.5.1, < 0.7) haml (4.0.7) tilt haml_lint (0.26.0) @@ -495,11 +509,11 @@ GEM mustermann (1.0.0) mustermann-grape (1.0.0) mustermann (~> 1.0.0) - mysql2 (0.4.5) + mysql2 (0.4.10) net-ldap (0.16.0) net-ssh (4.1.0) netrc (0.11.0) - nokogiri (1.8.1) + nokogiri (1.8.2) mini_portile2 (~> 2.3.0) numerizer (0.1.1) oauth (0.5.1) @@ -515,8 +529,8 @@ GEM omniauth (1.4.2) hashie (>= 1.2, < 4) rack (>= 1.0, < 3) - omniauth-auth0 (1.4.1) - omniauth-oauth2 (~> 1.1) + omniauth-auth0 (2.0.0) + omniauth-oauth2 (~> 1.4) omniauth-authentiq (0.3.1) omniauth-oauth2 (~> 1.3, >= 1.3.1) omniauth-azure-oauth2 (0.0.9) @@ -569,14 +583,12 @@ GEM rubypants (~> 0.2) orm_adapter (0.5.0) os (0.9.6) - parallel (1.12.0) - paranoia (2.3.1) - activerecord (>= 4.0, < 5.2) + parallel (1.12.1) parser (2.4.0.2) ast (~> 2.3) parslet (1.5.0) blankslate (~> 2.0) - path_expander (1.0.1) + path_expander (1.0.2) peek (1.0.1) concurrent-ruby (>= 0.9.0) concurrent-ruby-ext (>= 0.9.0) @@ -624,7 +636,7 @@ GEM parser unparser procto (0.0.3) - prometheus-client-mmap (0.7.0.beta43) + prometheus-client-mmap (0.9.1) pry (0.10.4) coderay (~> 1.1.0) method_source (~> 0.8.1) @@ -641,7 +653,7 @@ GEM rack (>= 0.4) rack-attack (4.4.1) rack - rack-cors (0.4.0) + rack-cors (1.0.2) rack-oauth2 (1.2.3) activesupport (>= 2.3) attr_required (>= 0.0.5) @@ -685,6 +697,9 @@ GEM rake raindrops (0.18.0) rake (12.3.0) + rb-fsevent (0.10.2) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) rblineprof (0.3.6) debugger-ruby_core_source (~> 1.3) rbnacl (4.0.2) @@ -698,7 +713,7 @@ GEM json recursive-open-struct (1.0.0) redcarpet (3.4.0) - redis (3.3.3) + redis (3.3.5) redis-actionpack (5.0.2) actionpack (>= 4.0, < 6) redis-rack (>= 1, < 3) @@ -771,21 +786,21 @@ GEM pg rails sqlite3 - rubocop (0.49.1) + rubocop (0.52.1) parallel (~> 1.10) - parser (>= 2.3.3.1, < 3.0) + parser (>= 2.4.0.2, < 3.0) powerpack (~> 0.1) - rainbow (>= 1.99.1, < 3.0) + rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) - rubocop-gitlab-security (0.1.0) - rubocop (>= 0.47.1) - rubocop-rspec (1.15.1) - rubocop (>= 0.42.0) + rubocop-gitlab-security (0.1.1) + rubocop (>= 0.51) + rubocop-rspec (1.22.1) + rubocop (>= 0.52.1) ruby-fogbugz (0.2.1) crack (~> 0.4) ruby-prof (0.16.2) - ruby-progressbar (1.8.1) + ruby-progressbar (1.9.0) ruby-saml (1.4.1) nokogiri (>= 1.5.10) ruby_parser (3.9.0) @@ -799,7 +814,11 @@ GEM safe_yaml (1.0.4) sanitize (2.1.0) nokogiri (>= 1.4.4) - sass (3.4.22) + sass (3.5.5) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) sass-rails (5.0.6) railties (>= 4.0.0, < 6) sass (~> 3.1) @@ -809,11 +828,11 @@ GEM sawyer (0.8.1) addressable (>= 2.3.5, < 2.6) faraday (~> 0.8, < 1.0) - scss_lint (0.54.0) + scss_lint (0.56.0) rake (>= 0.9, < 13) - sass (~> 3.4.20) + sass (~> 3.5.3) securecompare (1.0.0) - seed-fu (2.3.6) + seed-fu (2.3.7) activerecord (>= 3.1) activesupport (>= 3.1) select2-rails (3.5.9.3) @@ -829,11 +848,11 @@ GEM rack shoulda-matchers (3.1.2) activesupport (>= 4.0.0) - sidekiq (5.0.4) + sidekiq (5.0.5) concurrent-ruby (~> 1.0) connection_pool (~> 2.2, >= 2.2.0) rack-protection (>= 1.5.0) - redis (~> 3.3, >= 3.3.3) + redis (>= 3.3.4, < 5) sidekiq-cron (0.6.0) rufus-scheduler (>= 3.3.0) sidekiq (>= 4.2.1) @@ -969,7 +988,6 @@ PLATFORMS DEPENDENCIES RedCloth (~> 4.3.2) ace-rails-ap (~> 4.1.0) - activerecord-nulldb-adapter activerecord_sane_schema_dumper (= 0.2) acts-as-taggable-on (~> 4.0) addressable (~> 2.5.2) @@ -978,11 +996,12 @@ DEPENDENCIES asana (~> 0.6.0) asciidoctor (~> 1.5.2) asciidoctor-plantuml (= 0.0.7) + asset_sync (~> 2.2.0) attr_encrypted (~> 3.0.0) awesome_print (~> 1.2.0) babosa (~> 1.0.2) base32 (~> 0.3.0) - batch-loader + batch-loader (~> 1.2.1) bcrypt_pbkdf (~> 1.0) benchmark-ips (~> 2.3.0) better_errors (~> 2.1.0) @@ -1014,12 +1033,14 @@ DEPENDENCIES dropzonejs-rails (~> 0.7.1) email_reply_trimmer (~> 0.1) email_spec (~> 1.6.0) - factory_girl_rails (~> 4.7.0) + factory_bot_rails (~> 4.8.2) faraday (~> 0.12) + fast_blank ffaker (~> 2.4) - flay (~> 2.8.0) - flipper (~> 0.10.2) - flipper-active_record (~> 0.10.2) + flay (~> 2.10.0) + flipper (~> 0.11.0) + flipper-active_record (~> 0.11.0) + flipper-active_support_cache_store (~> 0.11.0) fog-aliyun (~> 0.2.0) fog-aws (~> 1.4) fog-core (~> 1.44) @@ -1035,15 +1056,17 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.2.0) - gitaly-proto (~> 0.59.0) + gitaly-proto (~> 0.84.0) github-linguist (~> 4.7.0) gitlab-flowdock-git-hook (~> 1.0.1) gitlab-markup (~> 1.6.2) + gitlab-styles (~> 2.3) gitlab_omniauth-ldap (~> 2.0.4) gollum-lib (~> 4.2) gollum-rugged_adapter (~> 0.4.4) gon (~> 6.1.0) google-api-client (~> 0.13.6) + google-protobuf (= 3.5.1) gpgme grape (~> 1.0) grape-entity (~> 0.6.0) @@ -1075,15 +1098,15 @@ DEPENDENCIES method_source (~> 0.8) minitest (~> 5.7.0) mousetrap-rails (~> 1.4.6) - mysql2 (~> 0.4.5) + mysql2 (~> 0.4.10) net-ldap net-ssh (~> 4.1.0) - nokogiri (~> 1.8.1) + nokogiri (~> 1.8.2) oauth2 (~> 1.4) octokit (~> 4.6.2) oj (~> 2.17.4) omniauth (~> 1.4.2) - omniauth-auth0 (~> 1.4.1) + omniauth-auth0 (~> 2.0.0) omniauth-authentiq (~> 0.3.1) omniauth-azure-oauth2 (~> 0.0.9) omniauth-cas3 (~> 1.1.4) @@ -1098,7 +1121,6 @@ DEPENDENCIES omniauth-twitter (~> 1.2.0) omniauth_crowd (~> 2.2.0) org-ruby (~> 0.9.12) - paranoia (~> 2.3.1) peek (~> 1.0.1) peek-gc (~> 0.0.2) peek-host (~> 1.0.0) @@ -1110,11 +1132,11 @@ DEPENDENCIES peek-sidekiq (~> 1.0.3) pg (~> 0.18.2) premailer-rails (~> 1.9.7) - prometheus-client-mmap (~> 0.7.0.beta43) + prometheus-client-mmap (~> 0.9.1) pry-byebug (~> 3.4.1) pry-rails (~> 0.3.4) rack-attack (~> 4.4.1) - rack-cors (~> 0.4.0) + rack-cors (~> 1.0.0) rack-oauth2 (~> 1.2.1) rack-proxy (~> 0.6.0) rails (= 4.2.10) @@ -1141,9 +1163,8 @@ DEPENDENCIES rspec-retry (~> 0.4.5) rspec-set (~> 0.1.3) rspec_profiling (~> 0.0.5) - rubocop (~> 0.49.1) - rubocop-gitlab-security (~> 0.1.0) - rubocop-rspec (~> 1.15.1) + rubocop (~> 0.52.1) + rubocop-rspec (~> 1.22.1) ruby-fogbugz (~> 0.2.1) ruby-prof (~> 0.16.2) ruby_parser (~> 3.8) @@ -1151,8 +1172,8 @@ DEPENDENCIES rugged (~> 0.26.0) sanitize (~> 2.0) sass-rails (~> 5.0.6) - scss_lint (~> 0.54.0) - seed-fu (= 2.3.6) + scss_lint (~> 0.56.0) + seed-fu (~> 2.3.7) select2-rails (~> 3.5.9) selenium-webdriver (~> 3.5) sentry-raven (~> 2.5.3) @@ -1194,4 +1215,4 @@ DEPENDENCIES wikicloth (= 0.8.1) BUNDLED WITH - 1.16.0 + 1.16.1 diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index d13e6139582..1c3d1928a8b 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -18,11 +18,11 @@ let }; }; - version = "10.3.4"; + version = "10.5.6"; gitlabDeb = fetchurl { url = "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/jessie/gitlab-ce_${version}-ce.0_amd64.deb/download"; - sha256 = "0b6508hcahvhfpxyrqs05kz9a7c1wv658asm6a7ccish6hnwcica"; + sha256 = "1kml7iz4q9g5gcfqqarivlnkmkmq9250wgm95yi4rgzynb5jndd0"; }; in @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { owner = "gitlabhq"; repo = "gitlabhq"; rev = "v${version}"; - sha256 = "0cvp4wwkc04qffsq738867j31igwzj7zlmahdl24yddbmpa5x8r1"; + sha256 = "059h63jn552fcir2dgsjv85zv1ihbyiwzws4h2j15mwj2cdpjkh0"; }; buildInputs = [ @@ -43,7 +43,6 @@ stdenv.mkDerivation rec { patches = [ ./remove-hardcoded-locations.patch - ./nulladapter.patch ./fix-36783.patch ]; @@ -59,6 +58,8 @@ stdenv.mkDerivation rec { substituteInPlace app/controllers/admin/background_jobs_controller.rb \ --replace "ps -U" "${procps}/bin/ps -U" + sed -i '/ask_to_continue/d' lib/tasks/gitlab/two_factor.rake + # required for some gems: cat > config/database.yml < 1.0.3' - -diff --git a/Gemfile.lock b/Gemfile.lock -index 38944248f9..08ce4486ba 100644 ---- a/Gemfile.lock -+++ b/Gemfile.lock -@@ -33,6 +33,8 @@ GEM - activemodel (= 4.2.8) - activesupport (= 4.2.8) - arel (~> 6.0) -+ activerecord-nulldb-adapter (0.3.7) -+ activerecord (>= 2.0.0) - activerecord_sane_schema_dumper (0.2) - rails (>= 4, < 5) - activesupport (4.2.8) -@@ -963,6 +965,7 @@ PLATFORMS - DEPENDENCIES - RedCloth (~> 4.3.2) - ace-rails-ap (~> 4.1.0) -+ activerecord-nulldb-adapter - activerecord_sane_schema_dumper (= 0.2) - acts-as-taggable-on (~> 4.0) - addressable (~> 2.5.2) diff --git a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch index acc615c63ca..7a2bfea0c10 100644 --- a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch +++ b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch @@ -1,8 +1,8 @@ diff --git a/config/environments/production.rb b/config/environments/production.rb -index c5cbfcf64c..e40f10e25f 100644 +index c5cbfcf64c..4d01f6fab8 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb -@@ -70,14 +70,16 @@ Rails.application.configure do +@@ -70,10 +70,10 @@ Rails.application.configure do config.action_mailer.delivery_method = :sendmail # Defaults to: @@ -11,23 +11,17 @@ index c5cbfcf64c..e40f10e25f 100644 - # # arguments: '-i -t' - # # } + config.action_mailer.sendmail_settings = { -+ location: '/run/wrappers/bin/sendmail', ++ location: '/usr/sbin/sendmail', + arguments: '-i -t' + } config.action_mailer.perform_deliveries = true config.action_mailer.raise_delivery_errors = true - config.eager_load = true - - config.allow_concurrency = false -+ -+ config.active_record.dump_schema_after_migration = false - end diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example -index 0b33783869..cd4e41d9bd 100644 +index bd696a7f2c..44e3863736 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example -@@ -574,7 +574,7 @@ production: &base +@@ -590,7 +590,7 @@ production: &base # CAUTION! # Use the default values unless you really know what you are doing git: @@ -37,10 +31,10 @@ index 0b33783869..cd4e41d9bd 100644 ## Webpack settings # If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb -index 8ddf8e4d2e..559cf9adf7 100644 +index 0bea8a4f4b..290248547b 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb -@@ -252,7 +252,7 @@ Settings.gitlab['user'] ||= 'git' +@@ -255,7 +255,7 @@ Settings.gitlab['user'] ||= 'git' Settings.gitlab['user_home'] ||= begin Etc.getpwnam(Settings.gitlab['user']).dir rescue ArgumentError # no user configured @@ -49,7 +43,7 @@ index 8ddf8e4d2e..559cf9adf7 100644 end Settings.gitlab['time_zone'] ||= nil Settings.gitlab['signup_enabled'] ||= true if Settings.gitlab['signup_enabled'].nil? -@@ -491,7 +491,7 @@ Settings.backup['upload']['storage_class'] ||= nil +@@ -507,7 +507,7 @@ Settings.backup['upload']['storage_class'] ||= nil # Git # Settings['git'] ||= Settingslogic.new({}) @@ -58,29 +52,42 @@ index 8ddf8e4d2e..559cf9adf7 100644 # Important: keep the satellites.path setting until GitLab 9.0 at # least. This setting is fed to 'rm -rf' in +diff --git a/lib/api/api.rb b/lib/api/api.rb +index e953f3d2ec..3a8d9f076b 100644 +--- a/lib/api/api.rb ++++ b/lib/api/api.rb +@@ -2,7 +2,7 @@ module API + class API < Grape::API + include APIGuard + +- LOG_FILENAME = Rails.root.join("log", "api_json.log") ++ LOG_FILENAME = File.join(ENV["GITLAB_LOG_PATH"], "api_json.log") + + NO_SLASH_URL_PART_REGEX = %r{[^/]+} + PROJECT_ENDPOINT_REQUIREMENTS = { id: NO_SLASH_URL_PART_REGEX }.freeze diff --git a/lib/gitlab/logger.rb b/lib/gitlab/logger.rb -index 59b21149a9..4f4a39a06c 100644 +index a42e312b5d..ccaab9229e 100644 --- a/lib/gitlab/logger.rb +++ b/lib/gitlab/logger.rb -@@ -26,7 +26,7 @@ +@@ -26,7 +26,7 @@ module Gitlab end def self.full_log_path - Rails.root.join("log", file_name) -+ File.join(ENV["GITLAB_LOG_PATH"], file_name) ++ File.join(ENV["GITLAB_LOG_PATH"], file_name) end def self.cache_key diff --git a/lib/gitlab/uploads_transfer.rb b/lib/gitlab/uploads_transfer.rb -index b5f4124052..f72c556983 100644 +index 7d7400bdab..cb25211d44 100644 --- a/lib/gitlab/uploads_transfer.rb +++ b/lib/gitlab/uploads_transfer.rb @@ -1,7 +1,7 @@ module Gitlab class UploadsTransfer < ProjectTransfer def root_dir -- File.join(CarrierWave.root, FileUploader.base_dir) -+ ENV['GITLAB_UPLOADS_PATH'] || File.join(CarrierWave.root, FileUploader.base_dir) +- FileUploader.root ++ ENV['GITLAB_UPLOADS_PATH'] || FileUploader.root end end end @@ -98,7 +105,7 @@ index 3e0c436d6e..28cefc5514 100644 end end diff --git a/lib/system_check/app/uploads_directory_exists_check.rb b/lib/system_check/app/uploads_directory_exists_check.rb -index 7026d0ba07..6d88b8b9fb 100644 +index 7026d0ba07..c56e1f7ed9 100644 --- a/lib/system_check/app/uploads_directory_exists_check.rb +++ b/lib/system_check/app/uploads_directory_exists_check.rb @@ -4,12 +4,13 @@ module SystemCheck @@ -113,7 +120,7 @@ index 7026d0ba07..6d88b8b9fb 100644 + uploads_dir = ENV['GITLAB_UPLOADS_PATH'] || Rails.root.join('public/uploads') try_fixing_it( - "sudo -u #{gitlab_user} mkdir #{Rails.root}/public/uploads" -+ "sudo -u #{gitlab_user} mkdir #{uploads_dir}" ++ "sudo -u #{gitlab_user} mkdir #{uploads_dir}" ) for_more_information( see_installation_guide_section 'GitLab' @@ -143,14 +150,3 @@ index b276a81eac..070e3ebd81 100644 end end end ---- a/lib/api/api.rb 1970-01-01 01:00:01.000000000 +0100 -+++ b/lib/api/api.rb 2017-09-28 19:37:24.953605705 +0200 -@@ -2,7 +2,7 @@ - class API < Grape::API - include APIGuard - -- LOG_FILENAME = Rails.root.join("log", "api_json.log") -+ LOG_FILENAME = File.join(ENV["GITLAB_LOG_PATH"], "api_json.log") - - use GrapeLogging::Middleware::RequestLogger, - logger: Logger.new(LOG_FILENAME), diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix index a86a7f96e09..508c8b3fb6d 100644 --- a/pkgs/applications/version-management/gogs/default.nix +++ b/pkgs/applications/version-management/gogs/default.nix @@ -7,13 +7,13 @@ with stdenv.lib; buildGoPackage rec { name = "gogs-${version}"; - version = "0.11.29"; + version = "0.11.34"; src = fetchFromGitHub { owner = "gogits"; repo = "gogs"; rev = "v${version}"; - sha256 = "1xn1b4dxf7r8kagps3yvp31zskfxn50k1gfic9abl4kjwpwk78c0"; + sha256 = "15xwcw3k7wbahdgp796gly79qkka21p7kvm84zfjgcsjjri0kdnz"; }; patches = [ ./static-root-path.patch ]; diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix index de2394cd4a1..99ed7378745 100644 --- a/pkgs/applications/video/avidemux/default.nix +++ b/pkgs/applications/video/avidemux/default.nix @@ -79,7 +79,8 @@ stdenv.mkDerivation rec { homepage = http://fixounet.free.fr/avidemux/; description = "Free video editor designed for simple video editing tasks"; maintainers = with maintainers; [ viric abbradar ma27 ]; - platforms = platforms.linux; + # "CPU not supported" errors on AArch64 + platforms = [ "i686-linux" "x86_64-linux" ]; license = licenses.gpl2; }; } diff --git a/pkgs/applications/video/avxsynth/default.nix b/pkgs/applications/video/avxsynth/default.nix index 06dcaf31b44..3a595da96d0 100644 --- a/pkgs/applications/video/avxsynth/default.nix +++ b/pkgs/applications/video/avxsynth/default.nix @@ -38,5 +38,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ codyopel viric ]; platforms = platforms.linux; + broken = true; # 2018-04-10 }; } diff --git a/pkgs/applications/video/dvb-apps/default.nix b/pkgs/applications/video/dvb-apps/default.nix index 8ceb7875be4..1e671b4ea7b 100644 --- a/pkgs/applications/video/dvb-apps/default.nix +++ b/pkgs/applications/video/dvb-apps/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation { homepage = https://linuxtv.org/; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl2; + broken = true; # 2018-04-10 }; } diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix index 6f7ebb8c20a..1be4fc252fd 100644 --- a/pkgs/applications/video/mythtv/default.nix +++ b/pkgs/applications/video/mythtv/default.nix @@ -1,27 +1,32 @@ -{ stdenv, fetchurl, which, qt4, xlibsWrapper, libpulseaudio, fftwSinglePrec -, lame, zlib, libGLU_combined, alsaLib, freetype, perl, pkgconfig -, libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm, libXmu -, yasm, libuuid, taglib, libtool, autoconf, automake, file +{ stdenv, fetchFromGitHub, which, qtbase, qtwebkit, qtscript, xlibsWrapper +, libpulseaudio, fftwSinglePrec , lame, zlib, libGLU_combined, alsaLib, freetype +, perl, pkgconfig , libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm +, libXmu , yasm, libuuid, taglib, libtool, autoconf, automake, file, exiv2 +, linuxHeaders }: stdenv.mkDerivation rec { name = "mythtv-${version}"; - version = "0.27.4"; + version = "29.1"; - src = fetchurl { - url = "https://github.com/MythTV/mythtv/archive/v${version}.tar.gz"; - sha256 = "0nrn4fbkkzh43n7jgbv21i92sb4z4yacwj9yj6m3hjbffzy4ywqz"; + src = fetchFromGitHub { + owner = "MythTV"; + repo = "mythtv"; + rev = "v${version}"; + sha256 = "0pjxv4bmq8h285jsr02svgaa03614arsyk12fn9d4rndjsi2cc3x"; }; - sourceRoot = "${name}/mythtv"; + setSourceRoot = ''sourceRoot=$(echo */mythtv)''; buildInputs = [ - freetype qt4 lame zlib xlibsWrapper libGLU_combined perl alsaLib libpulseaudio fftwSinglePrec - libX11 libXv libXrandr libXvMC libXmu libXinerama libXxf86vm libXmu - libuuid taglib + freetype qtbase qtwebkit qtscript lame zlib xlibsWrapper libGLU_combined + perl alsaLib libpulseaudio fftwSinglePrec libX11 libXv libXrandr libXvMC + libXmu libXinerama libXxf86vm libXmu libuuid taglib exiv2 ]; nativeBuildInputs = [ pkgconfig which yasm libtool autoconf automake file ]; + configureFlags = [ "--dvb-path=${linuxHeaders}/include" ]; + meta = with stdenv.lib; { homepage = https://www.mythtv.org/; description = "Open Source DVR"; diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix index 02a19c935e7..f84e2e83761 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot.nix @@ -8,13 +8,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "libopenshot-${version}"; - version = "0.1.7"; + version = "0.1.9"; src = fetchFromGitHub { owner = "OpenShot"; repo = "libopenshot"; rev = "v${version}"; - sha256 = "1dk40qild8d3s99p2kkm0mjvxfxrz2wns7ij1brzqmcdnaxqdhlp"; + sha256 = "0c7q5cfnp481ysyvgzznvix7j4licq9knwrb83g3xqs4cx573xr3"; }; patchPhase = '' diff --git a/pkgs/applications/video/peek/default.nix b/pkgs/applications/video/peek/default.nix index 9858edf8238..515684c2298 100644 --- a/pkgs/applications/video/peek/default.nix +++ b/pkgs/applications/video/peek/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, gettext, libxml2, pkgconfig, txt2man, vala, wrapGAppsHook -, gsettings-desktop-schemas, gtk3, keybinder3 +, gsettings-desktop-schemas, gtk3, keybinder3, ffmpeg }: stdenv.mkDerivation rec { @@ -13,6 +13,10 @@ stdenv.mkDerivation rec { sha256 = "1ihmq914g2h5iw86bigkkblzqimr50yq6z883lzq656xkcayd8gh"; }; + preConfigure = '' + gappsWrapperArgs+=(--prefix PATH : ${stdenv.lib.makeBinPath [ ffmpeg ]}) + ''; + nativeBuildInputs = [ cmake gettext pkgconfig libxml2.bin txt2man vala wrapGAppsHook ]; buildInputs = [ gsettings-desktop-schemas gtk3 keybinder3 ]; diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index fcf569a762a..ee4ea4346e4 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -1,11 +1,13 @@ -{ stdenv, edk2, nasm, iasl, seabios, openssl, secureBoot ? false }: +{ stdenv, lib, edk2, nasm, iasl, seabios, openssl, secureBoot ? false }: let - targetArch = if stdenv.isi686 then - "Ia32" + projectDscPath = if stdenv.isi686 then + "OvmfPkg/OvmfPkgIa32.dsc" else if stdenv.isx86_64 then - "X64" + "OvmfPkg/OvmfPkgX64.dsc" + else if stdenv.isAarch64 then + "ArmVirtPkg/ArmVirtQemu.dsc" else throw "Unsupported architecture"; @@ -14,7 +16,7 @@ let src = edk2.src; in -stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" { +stdenv.mkDerivation (edk2.setup projectDscPath { name = "OVMF-${version}"; inherit src; @@ -36,28 +38,45 @@ stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" { ln -sv "$file" . done - ${if (seabios == false) then '' - ln -sv ${src}/OvmfPkg . - '' else '' + ${if stdenv.isAarch64 then '' + ln -sv ${src}/ArmPkg . + ln -sv ${src}/ArmPlatformPkg . + ln -sv ${src}/ArmVirtPkg . + ln -sv ${src}/EmbeddedPkg . + ln -sv ${src}/OvmfPkg . + '' else if seabios != null then '' cp -r ${src}/OvmfPkg . chmod +w OvmfPkg/Csm/Csm16 cp ${seabios}/Csm16.bin OvmfPkg/Csm/Csm16/Csm16.bin - ''} - - ${if (secureBoot == true) then '' - ln -sv ${src}/SecurityPkg . - ln -sv ${src}/CryptoPkg . - '' else '' - ''} - ''; - - buildPhase = if (seabios == false) then '' - build ${if secureBoot then "-DSECURE_BOOT_ENABLE=TRUE" else ""} '' else '' - build -D CSM_ENABLE -D FD_SIZE_2MB ${if secureBoot then "-DSECURE_BOOT_ENABLE=TRUE" else ""} + ln -sv ${src}/OvmfPkg . + ''} + + ${lib.optionalString secureBoot '' + ln -sv ${src}/SecurityPkg . + ln -sv ${src}/CryptoPkg . + ''} + ''; + + buildPhase = if stdenv.isAarch64 then '' + build -n $NIX_BUILD_CORES + '' else if seabios == null then '' + build -n $NIX_BUILD_CORES ${lib.optionalString secureBoot "-DSECURE_BOOT_ENABLE=TRUE"} + '' else '' + build -n $NIX_BUILD_CORES -D CSM_ENABLE -D FD_SIZE_2MB ${lib.optionalString secureBoot "-DSECURE_BOOT_ENABLE=TRUE"} ''; - postFixup = '' + postFixup = if stdenv.isAarch64 then '' + mkdir -vp $fd/FV + mkdir -vp $fd/AAVMF + mv -v $out/FV/QEMU_{EFI,VARS}.fd $fd/FV + + # Uses Fedora dir layout: https://src.fedoraproject.org/cgit/rpms/edk2.git/tree/edk2.spec + # FIXME: why is it different from Debian dir layout? https://anonscm.debian.org/cgit/pkg-qemu/edk2.git/tree/debian/rules + dd of=$fd/AAVMF/QEMU_EFI-pflash.raw if=/dev/zero bs=1M count=64 + dd of=$fd/AAVMF/QEMU_EFI-pflash.raw if=$fd/FV/QEMU_EFI.fd conv=notrunc + dd of=$fd/AAVMF/vars-template-pflash.raw if=/dev/zero bs=1M count=64 + '' else '' mkdir -vp $OUTPUT_FD/FV mv -v $out/FV/OVMF{,_CODE,_VARS}.fd $OUTPUT_FD/FV ''; @@ -68,6 +87,6 @@ stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" { description = "Sample UEFI firmware for QEMU and KVM"; homepage = https://sourceforge.net/apps/mediawiki/tianocore/index.php?title=OVMF; license = stdenv.lib.licenses.bsd2; - platforms = ["x86_64-linux" "i686-linux"]; + platforms = ["x86_64-linux" "i686-linux" "aarch64-linux"]; }; }) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index af15240dc12..61899d12974 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -195,28 +195,28 @@ rec { }); # Get revisions from - # https://github.com/docker/docker-ce/blob/v${version}/components/engine/hack/dockerfile/binaries-commits + # https://github.com/docker/docker-ce/tree/v${version}/components/engine/hack/dockerfile/install/* - docker_17_12 = dockerGen rec { - version = "17.12.1-ce"; - rev = "7390fc6103da41cf98ae66cfac80fa143268bf60"; # git commit - sha256 = "14pz5yqsjypjb6xiq828jrg9aq7wajrrf3mnd9109lw224p03d8i"; - runcRev = "9f9c96235cc97674e935002fc3d78361b696a69e"; - runcSha256 = "18f8vqdbf685dd777pjh8jzpxafw2vapqh4m43xgyi7lfwa0gsln"; - containerdRev = "9b55aab90508bd389d7654c4baf173a981477d55"; - containerdSha256 = "0kfafqi66yp4qy738pl11f050hfrx9m4kc670qpx7fmf9ii7q6p2"; + docker_18_03 = dockerGen rec { + version = "18.03.0-ce"; + rev = "0520e243029d1361649afb0706a1c5d9a1c012b8"; # git commit + sha256 = "0dq7kf30k6p5m9qrzskfx0rxsx22f7yvxzij6vv1g70pggzacs4g"; + runcRev = "4fc53a81fb7c994640722ac585fa9ca548971871"; + runcSha256 = "1ikqw39jn8dzb4snc4pcg3z85jb67ivskdhx028k17ss29bf4062"; + containerdRev = "cfd04396dc68220d1cecbe686a6cc3aa5ce3667c"; + containerdSha256 = "1x6mmk69jksh4m9rjd8qwpp0qc7jmimpkq9pw9237p0v63p9yci0"; tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; }; - docker_18_02 = dockerGen rec { - version = "18.02.0-ce"; - rev = "fc4de447b563498eb4da89f56fb858bbe761d91b"; # git commit - sha256 = "1025cwv2niiwg5pc30nb1qky1raisvd9ix2qw6rdib232hwq9k8m"; - runcRev = "9f9c96235cc97674e935002fc3d78361b696a69e"; - runcSha256 = "18f8vqdbf685dd777pjh8jzpxafw2vapqh4m43xgyi7lfwa0gsln"; - containerdRev = "9b55aab90508bd389d7654c4baf173a981477d55"; - containerdSha256 = "0kfafqi66yp4qy738pl11f050hfrx9m4kc670qpx7fmf9ii7q6p2"; + docker_18_04 = dockerGen rec { + version = "18.04.0-ce"; + rev = "3d479c0af67cb9ea43a9cfc1bf2ef097e06a3470"; # git commit + sha256 = "1askbk8b92cdv7vlm688g2f1v2xjhmx77578318x76dydfql3jfl"; + runcRev = "4fc53a81fb7c994640722ac585fa9ca548971871"; + runcSha256 = "1ikqw39jn8dzb4snc4pcg3z85jb67ivskdhx028k17ss29bf4062"; + containerdRev = "773c489c9c1b21a6d78b5c538cd395416ec50f88"; + containerdSha256 = "0k1zjn0mpd7q3p5srxld2fr4k6ijzbk0r34r6w69sh0d0rd2fvbs"; tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; }; diff --git a/pkgs/applications/virtualization/virtualbox/HostServices-SharedClipboard-x11-stub.cpp-use-RT_NOR.patch b/pkgs/applications/virtualization/virtualbox/HostServices-SharedClipboard-x11-stub.cpp-use-RT_NOR.patch deleted file mode 100644 index 7abe62a59cb..00000000000 --- a/pkgs/applications/virtualization/virtualbox/HostServices-SharedClipboard-x11-stub.cpp-use-RT_NOR.patch +++ /dev/null @@ -1,153 +0,0 @@ -From 9ac54c606b581847a170ac2fe525419aff2e5341 Mon Sep 17 00:00:00 2001 -From: Florian Klink -Date: Wed, 6 Dec 2017 23:58:20 +0100 -Subject: [PATCH] HostServices/SharedClipboard/x11-stub.cpp: use RT_NOREF - rather than NOREF - -Currently, build process fails when configuring with --build-headless like this: - -``` -kBuild: Compiling VBoxSharedClipboard - /tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/service.cpp -kBuild: Compiling VBoxSharedClipboard - /tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp -/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:58:29: error: macro "NOREF" passed 2 arguments, but takes just 1 - NOREF(pClient, fHeadless); - ^ -/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:94:30: error: macro "NOREF" passed 2 arguments, but takes just 1 - NOREF(pClient, u32Formats); - ^ -/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:110:37: error: macro "NOREF" passed 4 arguments, but takes just 1 - NOREF(pClient, u32Format, pv, cb); - ^ -/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:128:37: error: macro "NOREF" passed 4 arguments, but takes just 1 - NOREF(pClient, pv, cb, u32Format); - ^ -/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp: In function 'int vboxClipboardConnect(VBOXCLIPBOARDCLIENTDATA*, bool)': -/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:58:5: error: 'NOREF' was not declared in this scope - NOREF(pClient, fHeadless); - ^~~~~ -/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:55:52: warning: unused parameter 'pClient' [-Wunused-parameter] - int vboxClipboardConnect (VBOXCLIPBOARDCLIENTDATA *pClient, - ^~~~~~~ -/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:56:32: warning: unused parameter 'fHeadless' [-Wunused-parameter] - bool fHeadless) - ^~~~~~~~~ -/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp: In function 'void vboxClipboardFormatAnnounce(VBOXCLIPBOARDCLIENTDATA*, uint32_t)': -/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:94:5: error: 'NOREF' was not declared in this scope - NOREF(pClient, u32Formats); - ^~~~~ -/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:91:60: warning: unused parameter 'pClient' [-Wunused-parameter] - void vboxClipboardFormatAnnounce (VBOXCLIPBOARDCLIENTDATA *pClient, - ^~~~~~~ -/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:92:44: warning: unused parameter 'u32Formats' [-Wunused-parameter] - uint32_t u32Formats) - ^~~~~~~~~~ -/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp: In function 'int vboxClipboardReadData(VBOXCLIPBOARDCLIENTDATA*, uint32_t, void*, uint32_t, uint32_t*)': -/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:110:5: error: 'NOREF' was not declared in this scope - NOREF(pClient, u32Format, pv, cb); - ^~~~~ -/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:107:53: warning: unused parameter 'pClient' [-Wunused-parameter] - int vboxClipboardReadData (VBOXCLIPBOARDCLIENTDATA *pClient, uint32_t u32Format, - ^~~~~~~ -/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:107:71: warning: unused parameter 'u32Format' [-Wunused-parameter] - int vboxClipboardReadData (VBOXCLIPBOARDCLIENTDATA *pClient, uint32_t u32Format, - ^~~~~~~~~ -/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:108:34: warning: unused parameter 'pv' [-Wunused-parameter] - void *pv, uint32_t cb, uint32_t *pcbActual) - ^~ -/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:108:47: warning: unused parameter 'cb' [-Wunused-parameter] - void *pv, uint32_t cb, uint32_t *pcbActual) - ^~ -/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp: In function 'void vboxClipboardWriteData(VBOXCLIPBOARDCLIENTDATA*, void*, uint32_t, uint32_t)': -/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:128:5: error: 'NOREF' was not declared in this scope - NOREF(pClient, pv, cb, u32Format); - ^~~~~ -/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:125:55: warning: unused parameter 'pClient' [-Wunused-parameter] - void vboxClipboardWriteData (VBOXCLIPBOARDCLIENTDATA *pClient, void *pv, - ^~~~~~~ -/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:125:70: warning: unused parameter 'pv' [-Wunused-parameter] - void vboxClipboardWriteData (VBOXCLIPBOARDCLIENTDATA *pClient, void *pv, - ^~ -/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:126:39: warning: unused parameter 'cb' [-Wunused-parameter] - uint32_t cb, uint32_t u32Format) - ^~ -/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp:126:52: warning: unused parameter 'u32Format' [-Wunused-parameter] - uint32_t cb, uint32_t u32Format) - ^~~~~~~~~ -kmk: *** [/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/out/linux.amd64/release/obj/VBoxSharedClipboard/x11-stub.o] Error 1 -The failing command: -@g++ -c -O2 -g -pipe -pedantic -Wshadow -Wall -Wextra -Wno-missing-field-initializers -Wno-unused -Wno-trigraphs -fdiagnostics-show-option -Wno-unused-parameter -Wlogical-op -Wno-variadic-macros --Wno-long-long -Wunused-variable -Wunused-function -Wunused-label -Wunused-parameter -Wno-overloaded-virtual -Wno-variadic-macros -O2 -mtune=generic -fno-omit-frame-pointer -fno-strict-aliasing --fvisibility=hidden -DVBOX_HAVE_VISIBILITY_HIDDEN -DRT_USE_VISIBILITY_DEFAULT -fvisibility-inlines-hidden -fPIC -m64 --I/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/out/linux.amd64/release/obj/VBoxSharedClipboard/dtrace -I/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/include --I/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/out/linux.amd64/release -DVBOX -DVBOX_OSE -DVBOX_WITH_64_BITS_GUESTS -DVBOX_WITH_REM -DVBOX_WITH_RAW_MODE -DRT_OS_LINUX -D_FILE_OFFSET_BITS=64 --DRT_ARCH_AMD64 -D__AMD64__ -DVBOX_WITH_DEBUGGER -DVBOX_WITH_HARDENING -DRTPATH_APP_PRIVATE=\"/nix/store/fqjnpbzq25ffpkpk6hsl3x19ydin2pp1-virtualbox-5.2.2/share/virtualbox\" --DRTPATH_APP_PRIVATE_ARCH=\"/nix/store/fqjnpbzq25ffpkpk6hsl3x19ydin2pp1-virtualbox-5.2.2/libexec/virtualbox\" --DRTPATH_APP_PRIVATE_ARCH_TOP=\"/nix/store/fqjnpbzq25ffpkpk6hsl3x19ydin2pp1-virtualbox-5.2.2/share/virtualbox\" --DRTPATH_SHARED_LIBS=\"/nix/store/fqjnpbzq25ffpkpk6hsl3x19ydin2pp1-virtualbox-5.2.2/libexec/virtualbox\" -DRTPATH_APP_DOCS=\"/nix/store/fqjnpbzq25ffpkpk6hsl3x19ydin2pp1-virtualbox-5.2.2/doc\" --DIN_RING3 -DHC_ARCH_BITS=64 -DGC_ARCH_BITS=64 -DVBOX_WITH_DTRACE -DVBOX_WITH_DTRACE_R3 -DPIC -DVBOX_WITH_HGCM --Wp,-MD,/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/out/linux.amd64/release/obj/VBoxSharedClipboard/x11-stub.o.dep --Wp,-MT,/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/out/linux.amd64/release/obj/VBoxSharedClipboard/x11-stub.o -Wp,-MP -o -/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/out/linux.amd64/release/obj/VBoxSharedClipboard/x11-stub.o -/tmp/nix-build-virtualbox-5.2.2.drv-0/VirtualBox-5.2.2/src/VBox/HostServices/SharedClipboard/x11-stub.cpp -``` - -This seems to be caused by the usage of NOREF in -src/VBox/HostServices/SharedClipboard/x11-stub.cpp, so use RT_NOREFN -instead. - -Signed-off-by: Florian Klink ---- - src/VBox/HostServices/SharedClipboard/x11-stub.cpp | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/VBox/HostServices/SharedClipboard/x11-stub.cpp b/src/VBox/HostServices/SharedClipboard/x11-stub.cpp -index d890215..57ba883 100644 ---- a/src/VBox/HostServices/SharedClipboard/x11-stub.cpp -+++ b/src/VBox/HostServices/SharedClipboard/x11-stub.cpp -@@ -55,7 +55,7 @@ void vboxClipboardDestroy (void) - int vboxClipboardConnect (VBOXCLIPBOARDCLIENTDATA *pClient, - bool fHeadless) - { -- NOREF(pClient, fHeadless); -+ RT_NOREF2(pClient, fHeadless); - LogFlowFunc(("called, returning VINF_SUCCESS.\n")); - return VINF_SUCCESS; - } -@@ -77,7 +77,7 @@ int vboxClipboardSync (VBOXCLIPBOARDCLIENTDATA * /* pClient */) - */ - void vboxClipboardDisconnect (VBOXCLIPBOARDCLIENTDATA *pClient) - { -- NOREF(pClient); -+ RT_NOREF1(pClient); - LogFlowFunc(("called, returning.\n")); - } - -@@ -91,7 +91,7 @@ void vboxClipboardDisconnect (VBOXCLIPBOARDCLIENTDATA *pClient) - void vboxClipboardFormatAnnounce (VBOXCLIPBOARDCLIENTDATA *pClient, - uint32_t u32Formats) - { -- NOREF(pClient, u32Formats); -+ RT_NOREF2(pClient, u32Formats); - LogFlowFunc(("called, returning.\n")); - } - -@@ -107,7 +107,7 @@ void vboxClipboardFormatAnnounce (VBOXCLIPBOARDCLIENTDATA *pClient, - int vboxClipboardReadData (VBOXCLIPBOARDCLIENTDATA *pClient, uint32_t u32Format, - void *pv, uint32_t cb, uint32_t *pcbActual) - { -- NOREF(pClient, u32Format, pv, cb); -+ RT_NOREF4(pClient, u32Format, pv, cb); - LogFlowFunc(("called, returning VINF_SUCCESS.\n")); - /* No data available. */ - *pcbActual = 0; -@@ -125,6 +125,6 @@ int vboxClipboardReadData (VBOXCLIPBOARDCLIENTDATA *pClient, uint32_t u32Format, - void vboxClipboardWriteData (VBOXCLIPBOARDCLIENTDATA *pClient, void *pv, - uint32_t cb, uint32_t u32Format) - { -- NOREF(pClient, pv, cb, u32Format); -+ RT_NOREF4(pClient, pv, cb, u32Format); - LogFlowFunc(("called, returning.\n")); - } --- -2.15.0 - diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 38509d299d9..29cb7c192b5 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -21,10 +21,10 @@ let buildType = "release"; # Manually sha256sum the extensionPack file, must be hex! # Do not forget to update the hash in ./guest-additions/default.nix! - extpack = "70584a70b666e9332ae2c6be0e64da4b8e3a27124801156577f205750bdde4f5"; - extpackRev = "120293"; - main = "1rx45ivwk89ghjc5zdd7c7j92w0w3930xj7l1zhwrvshxs454w7y"; - version = "5.2.6"; + extpack = "355ea5fe047f751534720c65398b44290d53f389e0f5f66818f3f36746631d26"; + extpackRev = "121009"; + main = "ee2759d47b0b4ac81b8b671c9485c87fb2db12c097b3e7e69b94c1291a8084e8"; + version = "5.2.8"; # See https://github.com/NixOS/nixpkgs/issues/672 for details extensionPack = requireFile rec { @@ -94,8 +94,6 @@ in stdenv.mkDerivation { patches = optional enableHardening ./hardened.patch - # https://www.virtualbox.org/pipermail/vbox-dev/2017-December/014888.html - ++ optional headless [ ./HostServices-SharedClipboard-x11-stub.cpp-use-RT_NOR.patch ] ++ [ ./qtx11extras.patch ]; diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index f82eec07a29..96e8404b3ef 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "1px9jp6lv7ff7kn4ns5r4dq7xl4wiz3h4ckgdhgvxs040njpdzy5"; + sha256 = "04q8d2dxhkkqbghqidcwv6mx57fqpp92smh7gnaxb7vqqskb9dl0"; }; KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; diff --git a/pkgs/applications/virtualization/xen/4.5.nix b/pkgs/applications/virtualization/xen/4.5.nix index 48f74ce72e5..bb6209ce47f 100644 --- a/pkgs/applications/virtualization/xen/4.5.nix +++ b/pkgs/applications/virtualization/xen/4.5.nix @@ -39,6 +39,10 @@ in callPackage (import ./generic.nix (rec { version = "4.5.5"; + meta = { + knownVulnerabilities = [ "Security support ended in January 2018" ]; + }; + src = fetchurl { url = "https://downloads.xenproject.org/release/xen/${version}/xen-${version}.tar.gz"; sha256 = "1y74ms4yc3znf8jc3fgyq94va2y0pf7jh8m9pfqnpgklywqnw8g2"; diff --git a/pkgs/applications/virtualization/xen/4.8.nix b/pkgs/applications/virtualization/xen/4.8.nix index be6c4e3fcc7..8dedb6a4d05 100644 --- a/pkgs/applications/virtualization/xen/4.8.nix +++ b/pkgs/applications/virtualization/xen/4.8.nix @@ -29,6 +29,18 @@ let xsa = import ./xsa-patches.nix { inherit fetchpatch; }; + xenlockprofpatch = (fetchpatch { + name = "xenlockprof-gcc7.patch"; + url = "https://xenbits.xen.org/gitweb/?p=xen.git;a=patch;h=f49fa658b53580cf2ad354d2bf1796766cc11222"; + sha256 = "1lvzfvkqirknivm8q4cg5byfqz49s16zjk65fkwl3kwb03chky70"; + }); + + xenpmdpatch = (fetchpatch { + name = "xenpmd-gcc7.patch"; + url = "https://xenbits.xen.org/gitweb/?p=xen.git;a=patch;h=2d78f78a14528752266982473c07118f1bc336e3"; + sha256 = "1ki295pymbcfc64sjb9wqfwpv19p8vwgmnxankada3vm4fxg2rhq"; + }); + qemuDeps = [ udev pciutils xorg.libX11 SDL pixman acl glusterfs spice-protocol usbredir alsaLib @@ -158,6 +170,14 @@ callPackage (import ./generic.nix (rec { XSA_249 XSA_250 XSA_251_48 + XSA_252_49 + # 253: 4.8 not affected + # 254: no patch supplied by xen project (Meltdown/Spectre) + XSA_255_49_1 + XSA_255_49_2 + XSA_256_48 + xenlockprofpatch + xenpmdpatch ]; # Fix build on Glibc 2.24. diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix index 9efcc45be35..b9971639a89 100644 --- a/pkgs/applications/virtualization/xen/generic.nix +++ b/pkgs/applications/virtualization/xen/generic.nix @@ -221,6 +221,7 @@ stdenv.mkDerivation (rec { done ''; + # TODO(@oxij): Stop referencing args here meta = { homepage = http://www.xen.org/; description = "Xen hypervisor and related components" @@ -231,5 +232,5 @@ stdenv.mkDerivation (rec { + withXenfiles (name: x: ''* ${name}: ${x.meta.description or "(No description)"}.''); platforms = [ "x86_64-linux" ]; maintainers = with stdenv.lib.maintainers; [ eelco tstrobel oxij ]; - }; + } // (config.meta or {}); } // removeAttrs config [ "xenfiles" "buildInputs" "patches" "postPatch" "meta" ]) diff --git a/pkgs/applications/virtualization/xen/packages.nix b/pkgs/applications/virtualization/xen/packages.nix index 4b5f15c8ff4..226dfe8af98 100644 --- a/pkgs/applications/virtualization/xen/packages.nix +++ b/pkgs/applications/virtualization/xen/packages.nix @@ -2,7 +2,7 @@ , stdenv, overrideCC, gcc49 }: -# TODO on new Xen version: generalize this to generate [vanilla slim +# TODO(@oxij) on new Xen version: generalize this to generate [vanilla slim # light] for each ./.nix. rec { @@ -103,8 +103,8 @@ rec { }; }; - xen-vanilla = xen_4_5-vanilla; - xen-slim = xen_4_5-slim; - xen-light = xen_4_5-light; + xen-vanilla = xen_4_8-vanilla; + xen-slim = xen_4_8-slim; + xen-light = xen_4_8-light; } diff --git a/pkgs/applications/virtualization/xen/xsa-patches.nix b/pkgs/applications/virtualization/xen/xsa-patches.nix index 8f8cc459a24..668ba70343f 100644 --- a/pkgs/applications/virtualization/xen/xsa-patches.nix +++ b/pkgs/applications/virtualization/xen/xsa-patches.nix @@ -863,5 +863,34 @@ in rec { sha256 = "079wi0j6iydid2zj7k584w2c393kgh588w7sjz2nn4039qn8k9mq"; }) ]; + # 4.8 + XSA_252_49 = [ + (xsaPatch { + name = "252-4.9"; + sha256 = "03sbn90nlkk5ba1n168rxjkc7x3mqj7rfqvspbwblmwikfbnms2n"; + }) + ]; + # 4.8 + XSA_255_49_1= [ + (xsaPatch { + name = "255-4.9-1"; + sha256 = "0gbin7yxbkq40lvm3gvj1vffavvbng3zpd2m8l1kqyz0rv4vm9zc"; + }) + ]; + # 4.8 + XSA_255_49_2= [ + (xsaPatch { + name = "255-4.9-2"; + sha256 = "0fyg5nnyfpfr80qq83pr64zjp5w1nx94bdblzsjap8gaqcahyr12"; + }) + ]; + # 4.8 + XSA_256_48= [ + (xsaPatch { + name = "256-4.8"; + sha256 = "1w84f717kxwx0h3rw18r4f8pl0l1h5xlj5fy80sr0ws4xkp1qdn4"; + }) + ]; + } diff --git a/pkgs/applications/window-managers/dwm/default.nix b/pkgs/applications/window-managers/dwm/default.nix index 76352753db1..f18afb93527 100644 --- a/pkgs/applications/window-managers/dwm/default.nix +++ b/pkgs/applications/window-managers/dwm/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { inherit name; src = fetchurl { - url = "http://dl.suckless.org/dwm/${name}.tar.gz"; + url = "https://dl.suckless.org/dwm/${name}.tar.gz"; sha256 = "1zkmwb6df6m254shx06ly90c0q4jl70skk1pvkixpb7hcxhwbxn2"; }; diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 19aa89a7f7e..9c24df004f3 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "i3-${version}"; - version = "4.14.1"; + version = "4.15"; src = fetchurl { url = "http://i3wm.org/downloads/${name}.tar.bz2"; - sha256 = "1cazmfbbx6n8c81h6x6pdayq3mxs2ml3adz165z8vapkc72kl1nh"; + sha256 = "09jk70hsdxab24lqvj2f30ijrkbv3f6q9xi5dcsax1dw3x6m4z91"; }; nativeBuildInputs = [ which pkgconfig makeWrapper ]; diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix index ffd1d995e87..3329b3b69e0 100644 --- a/pkgs/applications/window-managers/icewm/default.nix +++ b/pkgs/applications/window-managers/icewm/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { homepage = http://www.icewm.org/; license = licenses.lgpl2; maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix index e7427fa7763..117d4fe1d6a 100644 --- a/pkgs/applications/window-managers/stumpwm/default.nix +++ b/pkgs/applications/window-managers/stumpwm/default.nix @@ -99,5 +99,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ the-kenny ]; platforms = platforms.linux; + broken = true; # 2018-04-11 }; } diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index d643e2dd218..89e7b9dd088 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { name = "sway-${version}"; - version = "0.15.1"; + version = "0.15.2"; src = fetchFromGitHub { owner = "swaywm"; repo = "sway"; rev = version; - sha256 = "00prns3dnafd19ap774p8v994i3p185ji0dnp2xxbkgh2z7sbwpi"; + sha256 = "1p9j5gv85lsgj4z28qja07dqyvqk41w6mlaflvvm9yxafx477g5n"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/tabbed/default.nix b/pkgs/applications/window-managers/tabbed/default.nix index 279ba68eae8..5e1098e9706 100644 --- a/pkgs/applications/window-managers/tabbed/default.nix +++ b/pkgs/applications/window-managers/tabbed/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "tabbed-20160425"; src = fetchgit { - url = http://git.suckless.org/tabbed; + url = https://git.suckless.org/tabbed; rev = "bc236142fa72d2f9d6b5c790d3f3a9a9168a7164"; sha256 = "1fiv57g3jnlhnb6zrzl3n6lnpn2s9s0sd7bcv7r1nb3grwy7icri"; }; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = http://tools.suckless.org/tabbed; + homepage = https://tools.suckless.org/tabbed; description = "Simple generic tabbed fronted to xembed aware applications"; license = licenses.mit; maintainers = with maintainers; [ viric vrthra ]; diff --git a/pkgs/applications/window-managers/velox/dmenu.nix b/pkgs/applications/window-managers/velox/dmenu.nix index 182a290e0ee..01360e5af0b 100644 --- a/pkgs/applications/window-managers/velox/dmenu.nix +++ b/pkgs/applications/window-managers/velox/dmenu.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "A generic, highly customizable, and efficient menu for the X Window System"; - homepage = http://tools.suckless.org/dmenu; + homepage = https://tools.suckless.org/dmenu; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ ]; platforms = with stdenv.lib.platforms; all; diff --git a/pkgs/applications/window-managers/velox/st.nix b/pkgs/applications/window-managers/velox/st.nix index 49ce57469bd..2d73df65046 100644 --- a/pkgs/applications/window-managers/velox/st.nix +++ b/pkgs/applications/window-managers/velox/st.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://st.suckless.org/; + homepage = https://st.suckless.org/; license = licenses.mit; maintainers = with maintainers; [ ]; platforms = with platforms; linux; diff --git a/pkgs/applications/window-managers/xmonad-log-applet/default.nix b/pkgs/applications/window-managers/xmonad-log-applet/default.nix index def5766e5ee..f2acf03958b 100644 --- a/pkgs/applications/window-managers/xmonad-log-applet/default.nix +++ b/pkgs/applications/window-managers/xmonad-log-applet/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, glib, dbus-glib , desktopSupport , gtk2, gnome2_panel, GConf2 -, libxfce4util, xfce4panel +, libxfce4util, xfce4-panel }: assert desktopSupport == "gnome2" || desktopSupport == "gnome3" || desktopSupport == "xfce4"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ++ optionals (desktopSupport == "gnome2") [ gtk2 gnome2_panel GConf2 ] # TODO: no idea where to find libpanelapplet-4.0 ++ optionals (desktopSupport == "gnome3") [ ] - ++ optionals (desktopSupport == "xfce4") [ gtk2 libxfce4util xfce4panel ] + ++ optionals (desktopSupport == "xfce4") [ gtk2 libxfce4util xfce4-panel ] ; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/build-support/build-fhs-userenv/env.nix b/pkgs/build-support/build-fhs-userenv/env.nix index da8a86b68f5..d951fb9ab06 100644 --- a/pkgs/build-support/build-fhs-userenv/env.nix +++ b/pkgs/build-support/build-fhs-userenv/env.nix @@ -52,11 +52,14 @@ let export LOCALE_ARCHIVE='/usr/lib/locale/locale-archive' export LD_LIBRARY_PATH='/run/opengl-driver/lib:/run/opengl-driver-32/lib:/usr/lib:/usr/lib32' export PATH='/run/wrappers/bin:/usr/bin:/usr/sbin' + export TZDIR='/etc/zoneinfo' # Force compilers and other tools to look in default search paths + unset NIX_ENFORCE_PURITY export NIX_CC_WRAPPER_${stdenv.cc.infixSalt}_TARGET_HOST=1 export NIX_CFLAGS_COMPILE='-idirafter /usr/include' - export NIX_LDFLAGS_BEFORE='-L/usr/lib -L/usr/lib32' + export NIX_CFLAGS_LINK='-L/usr/lib -L/usr/lib32' + export NIX_LDFLAGS='-L/usr/lib -L/usr/lib32' export PKG_CONFIG_PATH=/usr/lib/pkgconfig export ACLOCAL_PATH=/usr/share/aclocal diff --git a/pkgs/build-support/build-setupcfg/default.nix b/pkgs/build-support/build-setupcfg/default.nix new file mode 100644 index 00000000000..bc6482f0a88 --- /dev/null +++ b/pkgs/build-support/build-setupcfg/default.nix @@ -0,0 +1,25 @@ +# Build a python package from info made available by setupcfg2nix. +# +# * src: The source of the package. +# * info: The package information generated by setupcfg2nix. +# * meta: Standard nixpkgs metadata. +# * application: Whether this package is a python library or an +# application which happens to be written in python. +# * doCheck: Whether to run the test suites. +pythonPackages: +{ src, info, meta ? {}, application ? false, doCheck ? true }: let + build = if application + then pythonPackages.buildPythonApplication + else pythonPackages.buildPythonPackage; +in build { + inherit (info) pname version; + + inherit src meta doCheck; + + nativeBuildInputs = map (p: pythonPackages.${p}) ( + (info.setup_requires or []) ++ + (if doCheck then (info.tests_require or []) else [])); + + propagatedBuildInputs = map (p: pythonPackages.${p}) + (info.install_requires or []); +} diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index c40b096e208..e5cbcd7455f 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -44,8 +44,8 @@ rec { cp ${./tarsum.go} tarsum.go export GOPATH=$(pwd) - mkdir src - ln -sT ${docker.src}/components/engine/pkg/tarsum src/tarsum + mkdir -p src/github.com/docker/docker/pkg + ln -sT ${docker.src}/components/engine/pkg/tarsum src/github.com/docker/docker/pkg/tarsum go build cp tarsum $out @@ -212,7 +212,7 @@ rec { postMount = '' echo "Packing raw image..." - tar -C mnt --mtime="@$SOURCE_DATE_EPOCH" -cf $out . + tar -C mnt --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" -cf $out . ''; }; @@ -277,7 +277,7 @@ rec { # Tar up the layer and throw it into 'layer.tar'. echo "Packing layer..." mkdir $out - tar -C layer --mtime="@$SOURCE_DATE_EPOCH" --owner=${toString uid} --group=${toString gid} -cf $out/layer.tar . + tar -C layer --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" --owner=${toString uid} --group=${toString gid} -cf $out/layer.tar . # Compute a checksum of the tarball. echo "Computing layer checksum..." @@ -359,7 +359,7 @@ rec { echo "Packing layer..." mkdir $out - tar -C layer --mtime="@$SOURCE_DATE_EPOCH" -cf $out/layer.tar . + tar -C layer --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" -cf $out/layer.tar . # Compute the tar checksum and add it to the output json. echo "Computing checksum..." @@ -484,12 +484,22 @@ rec { # Record the contents of the tarball with ls_tar. ls_tar temp/layer.tar >> baseFiles + # Append nix/store directory to the layer so that when the layer is loaded in the + # image /nix/store has read permissions for non-root users. + # nix/store is added only if the layer has /nix/store paths in it. + if [ $(wc -l < $layerClosure) -gt 1 ] && [ $(grep -c -e "^/nix/store$" baseFiles) -eq 0 ]; then + mkdir -p nix/store + chmod -R 555 nix + echo "./nix" >> layerFiles + echo "./nix/store" >> layerFiles + fi + # Get the files in the new layer which were *not* present in # the old layer, and record them as newFiles. comm <(sort -n baseFiles|uniq) \ <(sort -n layerFiles|uniq|grep -v ${layer}) -1 -3 > newFiles # Append the new files to the layer. - tar -rpf temp/layer.tar --mtime="@$SOURCE_DATE_EPOCH" \ + tar -rpf temp/layer.tar --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" \ --owner=0 --group=0 --no-recursion --files-from newFiles echo "Adding meta..." @@ -537,7 +547,7 @@ rec { chmod -R a-w image echo "Cooking the image..." - tar -C image --mtime="@$SOURCE_DATE_EPOCH" --owner=0 --group=0 --xform s:'./':: -c . | pigz -nT > $out + tar -C image --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" --owner=0 --group=0 --xform s:'./':: -c . | pigz -nT > $out echo "Finished." ''; diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index 691d4bb74db..315440349b6 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -116,4 +116,12 @@ rec { Env = [ "NIX_PAGER=cat" ]; }; }; + + # 7. example of adding something on top of an image pull by our + # dockerTools chain. + onTopOfPulledImage = buildImage { + name = "onTopOfPulledImage"; + fromImage = nixFromDockerHub; + contents = [ pkgs.hello ]; + }; } diff --git a/pkgs/build-support/docker/tarsum.go b/pkgs/build-support/docker/tarsum.go index ad33bbac75b..f91a90bdbda 100644 --- a/pkgs/build-support/docker/tarsum.go +++ b/pkgs/build-support/docker/tarsum.go @@ -5,7 +5,7 @@ import ( "io" "io/ioutil" "os" - "tarsum" + "github.com/docker/docker/pkg/tarsum" ) func main() { diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index d612db64c12..b0d3f373a46 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -129,7 +129,7 @@ rec { samba = [ https://www.samba.org/ftp/ - http://ftp.riken.jp/net/samba + http://www.samba.org/ftp/ ]; # BitlBee mirrors, see https://www.bitlbee.org/main.php/mirrors.html . diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 83ef146de5f..f407ba25bf8 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -4,7 +4,7 @@ let inherit stdenv cacert git rust cargo-vendor; }; in -{ name, cargoSha256 ? null +{ name, cargoSha256 ? "unset" , src ? null , srcs ? null , sourceRoot ? null @@ -17,7 +17,7 @@ in , cargoVendorDir ? null , ... } @ args: -assert cargoVendorDir == null -> cargoSha256 != null; +assert cargoVendorDir == null -> cargoSha256 != "unset"; let lib = stdenv.lib; diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index 9664abeb465..d092efb556e 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -170,6 +170,7 @@ rec { *** _EOF_ + exit 1 ''; }; diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 8ab1fbc8873..8e8b88a9bd2 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -3,7 +3,7 @@ , img ? pkgs.stdenv.platform.kernelTarget , storeDir ? builtins.storeDir , rootModules ? - [ "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_balloon" "virtio_rng" "ext4" "unix" "9p" "9pnet_virtio" ] + [ "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_balloon" "virtio_rng" "ext4" "unix" "9p" "9pnet_virtio" "crc32c_generic" ] ++ pkgs.lib.optional (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) "rtc_cmos" }: @@ -941,8 +941,8 @@ rec { }; ubuntu1710i386 = { - name = "ubuntu-17.10-xenial-i386"; - fullName = "Ubuntu 17.10 Xenial (i386)"; + name = "ubuntu-17.10-artful-i386"; + fullName = "Ubuntu 17.10 Artful (i386)"; packagesLists = [ (fetchurl { url = mirror://ubuntu/dists/artful/main/binary-i386/Packages.xz; diff --git a/pkgs/data/fonts/babelstone-han/default.nix b/pkgs/data/fonts/babelstone-han/default.nix index b33295f89b2..acfcc918104 100644 --- a/pkgs/data/fonts/babelstone-han/default.nix +++ b/pkgs/data/fonts/babelstone-han/default.nix @@ -1,16 +1,16 @@ {stdenv, fetchzip}: let - version = "10.0.2"; + version = "11.0.0"; in fetchzip { name = "babelstone-han-${version}"; - url = http://www.babelstone.co.uk/Fonts/7932/BabelStoneHan.zip; + url = http://www.babelstone.co.uk/Fonts/3902/BabelStoneHan.zip; postFetch = '' mkdir -p $out/share/fonts/truetype unzip $downloadedFile '*.ttf' -d $out/share/fonts/truetype ''; - sha256 = "17r5cf028v66yzjf9qbncn4rchv2xxkl2adxr35ppg1l7zssz9v6"; + sha256 = "1w3v69lacsy0nha20rkbs6f0dskf5xm6p250qx4a1m69d4a1gx7v"; meta = with stdenv.lib; { description = "Unicode CJK font with over 32600 Han characters"; diff --git a/pkgs/data/fonts/emojione/default.nix b/pkgs/data/fonts/emojione/default.nix index 560aed970bb..9d4c1e22e14 100644 --- a/pkgs/data/fonts/emojione/default.nix +++ b/pkgs/data/fonts/emojione/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { description = "Open source emoji set"; homepage = http://emojione.com/; license = licenses.cc-by-40; - platforms = platforms.all; + platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index 91af84c4224..d6f5507bf69 100644 --- a/pkgs/data/misc/cacert/default.nix +++ b/pkgs/data/misc/cacert/default.nix @@ -9,8 +9,8 @@ let certdata2pem = fetchurl { name = "certdata2pem.py"; - url = "https://anonscm.debian.org/cgit/collab-maint/ca-certificates.git/plain/mozilla/certdata2pem.py?h=debian/20160104"; - sha256 = "0bw11mgfrf19qziyvdnq22kirp0nn54lfsanrg5h6djs6ig1c2im"; + url = "https://anonscm.debian.org/cgit/collab-maint/ca-certificates.git/plain/mozilla/certdata2pem.py?h=debian/20170717"; + sha256 = "1d4q27j1gss0186a5m8bs5dk786w07ccyq0qi6xmd2zr1a8q16wy"; }; in diff --git a/pkgs/data/misc/scowl/default.nix b/pkgs/data/misc/scowl/default.nix index 5e4d17bcc8f..e54dc3fa9fe 100644 --- a/pkgs/data/misc/scowl/default.nix +++ b/pkgs/data/misc/scowl/default.nix @@ -1,4 +1,7 @@ -{stdenv, fetchFromGitHub, unzip, zip, perl, aspell, dos2unix, singleWordlist ? null}: +{ stdenv, fetchFromGitHub, unzip, zip, libiconv, perl, aspell, dos2unix +, singleWordlist ? null +}: + stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "scowl"; @@ -11,10 +14,15 @@ stdenv.mkDerivation rec { sha256 = "16mgk6scbw8i38g63kh60bsnzgzfs8gvvz2n5jh4x5didbwly8nz"; }; - buildInputs = []; - nativeBuildInputs = [unzip zip perl aspell dos2unix]; + postPatch = '' + substituteInPlace scowl/src/Makefile \ + --replace g++ c++ + ''; - NIX_CFLAGS_COMPILE = " -Wno-narrowing "; + nativeBuildInputs = [ unzip zip perl aspell dos2unix ]; + buildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv; + + NIX_CFLAGS_COMPILE = "-Wno-narrowing"; preConfigure = '' patchShebangs . @@ -34,8 +42,8 @@ stdenv.mkDerivation rec { installPhase = if singleWordlist == null then '' eval "$preInstall" - mkdir -p "$out/share/scowl" - mkdir -p "$out/lib" "$out/share/hunspell" "$out/share/myspell" + mkdir -p "$out/share/scowl" + mkdir -p "$out/lib" "$out/share/hunspell" "$out/share/myspell" mkdir -p "$out/share/dict" cp -r scowl/speller/aspell "$out/lib/aspell" diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index b79b04565fe..8317445c64c 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -203,10 +203,6 @@ let inherit gnome3; }; - networkmanager-pptp = pkgs.networkmanager-pptp.override { - inherit gnome3; - }; - networkmanager-vpnc = pkgs.networkmanager-vpnc.override { inherit gnome3; }; @@ -430,7 +426,6 @@ let networkmanager_l2tp = networkmanager-l2tp; # added 2018-02-25 networkmanager_openconnect = networkmanager-openconnect; # added 2018-02-25 networkmanager_openvpn = networkmanager-openvpn; # added 2018-02-25 - networkmanager_pptp = networkmanager-pptp; # added 2018-02-25 networkmanager_vpnc = networkmanager-vpnc; # added 2018-02-25 yelp_xsl = yelp-xsl; # added 2018-02-25 yelp_tools = yelp-tools; # added 2018-02-25 diff --git a/pkgs/desktops/lxde/core/lxtask/default.nix b/pkgs/desktops/lxde/core/lxtask/default.nix index ef95f6035b2..dbed065190e 100644 --- a/pkgs/desktops/lxde/core/lxtask/default.nix +++ b/pkgs/desktops/lxde/core/lxtask/default.nix @@ -10,11 +10,13 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig intltool ]; - + buildInputs = [ gtk3 ]; configureFlags = [ "--enable-gtk3" ]; + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; + meta = { description = "Lightweight and desktop independent task manager"; longDescription = '' @@ -24,7 +26,7 @@ stdenv.mkDerivation rec { Desktop Environment, it's totally desktop independent and only requires pure gtk+. ''; - homepage = https://wiki.lxde.org/en/LXTask; + homepage = https://wiki.lxde.org/en/LXTask; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.romildo ]; diff --git a/pkgs/desktops/lxqt/base/libqtxdg/default.nix b/pkgs/desktops/lxqt/base/libqtxdg/default.nix index 966566db7c8..7938e4fd9a1 100644 --- a/pkgs/desktops/lxqt/base/libqtxdg/default.nix +++ b/pkgs/desktops/lxqt/base/libqtxdg/default.nix @@ -16,7 +16,11 @@ stdenv.mkDerivation rec { buildInputs = [ qt5.qtbase qt5.qtsvg ]; preConfigure = '' - cmakeFlags+=" -DQTXDGX_ICONENGINEPLUGIN_INSTALL_PATH=$out/$qtPluginPrefix" + cmakeFlagsArray+=( + "-DQTXDGX_ICONENGINEPLUGIN_INSTALL_PATH=$out/$qtPluginPrefix" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + "-DCMAKE_INSTALL_LIBDIR=lib" + ) ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/mate/mate-calc/default.nix b/pkgs/desktops/mate/mate-calc/default.nix index efe8adae678..4bf7671229a 100644 --- a/pkgs/desktops/mate/mate-calc/default.nix +++ b/pkgs/desktops/mate/mate-calc/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "Calculator for the MATE desktop"; homepage = http://mate-desktop.org; license = [ licenses.gpl2Plus ]; - platforms = platforms.unix; + platforms = platforms.linux; maintainers = [ maintainers.romildo ]; }; } diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix index 93ad93b07b9..7291b475fe1 100644 --- a/pkgs/desktops/mate/mate-icon-theme/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme/default.nix @@ -12,18 +12,18 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool iconnamingutils ]; buildInputs = [ librsvg hicolor-icon-theme ]; - + postInstall = '' for theme in "$out"/share/icons/*; do "${gtk3.out}/bin/gtk-update-icon-cache" "$theme" done ''; - + meta = { description = "Icon themes from MATE"; homepage = http://mate-desktop.org; license = stdenv.lib.licenses.lgpl3; - platforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.romildo ]; }; } diff --git a/pkgs/desktops/xfce/applications/orage.nix b/pkgs/desktops/xfce/applications/orage.nix index f376b743c82..812630e17d0 100644 --- a/pkgs/desktops/xfce/applications/orage.nix +++ b/pkgs/desktops/xfce/applications/orage.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool bison flex ]; buildInputs = [ gtk libical dbus-glib libnotify popt xfce.libxfce4util - xfce.xfce4panel ]; + xfce.xfce4-panel ]; preFixup = "rm $out/share/icons/hicolor/icon-theme.cache "; diff --git a/pkgs/desktops/xfce/applications/parole.nix b/pkgs/desktops/xfce/applications/parole.nix index 3b27456d78a..3951c9deedc 100644 --- a/pkgs/desktops/xfce/applications/parole.nix +++ b/pkgs/desktops/xfce/applications/parole.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, makeWrapper, pkgconfig, intltool, gst_all_1 , gtk, dbus-glib, libxfce4ui, libxfce4util, xfconf -, taglib, libnotify +, taglib, libnotify, hicolor-icon-theme , withGstPlugins ? true }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = [ - makeWrapper + makeWrapper hicolor-icon-theme gtk dbus-glib libxfce4ui libxfce4util xfconf taglib libnotify ] ++ (with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav]); diff --git a/pkgs/desktops/xfce/applications/xfce4-mixer.nix b/pkgs/desktops/xfce/applications/xfce4-mixer.nix index 05a5fa4a6fc..93a7fad4918 100644 --- a/pkgs/desktops/xfce/applications/xfce4-mixer.nix +++ b/pkgs/desktops/xfce/applications/xfce4-mixer.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, intltool, makeWrapper , glib, gstreamer, gst-plugins-base, gtk -, libxfce4util, libxfce4ui, xfce4panel, xfconf, libunique ? null +, libxfce4util, libxfce4ui, xfce4-panel, xfconf, libunique ? null , pulseaudioSupport ? false, gst-plugins-good }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig intltool glib gstreamer gtk - libxfce4util libxfce4ui xfce4panel xfconf libunique makeWrapper + libxfce4util libxfce4ui xfce4-panel xfconf libunique makeWrapper ] ++ gst_plugins; postInstall = diff --git a/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix b/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix index 4c855b8ddeb..28c586382b4 100644 --- a/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix +++ b/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, xfce4panel, libxfce4util, gtk, libsoup +{ stdenv, fetchurl, pkgconfig, intltool, xfce4-panel, libxfce4util, gtk, libsoup , makeWrapper, glib-networking, exo, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - xfce4panel libxfce4util gtk libsoup exo hicolor-icon-theme glib-networking + xfce4-panel libxfce4util gtk libsoup exo hicolor-icon-theme glib-networking ]; meta = { diff --git a/pkgs/desktops/xfce/core/thunar-build.nix b/pkgs/desktops/xfce/core/thunar-build.nix index bf44fc0adbb..5f8cc71de85 100644 --- a/pkgs/desktops/xfce/core/thunar-build.nix +++ b/pkgs/desktops/xfce/core/thunar-build.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, intltool , gtk, dbus-glib, libstartup_notification, libnotify, libexif, pcre, udev -, exo, libxfce4util, xfconf, xfce4panel, wrapGAppsHook +, exo, libxfce4util, xfconf, xfce4-panel, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ intltool gtk dbus-glib libstartup_notification libnotify libexif pcre udev - exo libxfce4util xfconf xfce4panel + exo libxfce4util xfconf xfce4-panel ]; # TODO: optionality? diff --git a/pkgs/desktops/xfce/core/thunar.nix b/pkgs/desktops/xfce/core/thunar.nix index 037a3f947fb..83e3a2879d7 100644 --- a/pkgs/desktops/xfce/core/thunar.nix +++ b/pkgs/desktops/xfce/core/thunar.nix @@ -1,4 +1,4 @@ -{ stdenv, buildEnv, runCommand, makeWrapper, lndir, thunar-build +{ stdenv, buildEnv, runCommand, makeWrapper, lndir, thunar-bare , thunarPlugins ? [] }: @@ -6,7 +6,7 @@ with stdenv.lib; let - build = thunar-build; + build = thunar-bare; replaceLnExeListWithWrapped = exeDir: exeNameList: mkWrapArgs: '' exeDir="${exeDir}" @@ -50,7 +50,7 @@ runCommand name { } (let buildWithPlugins = buildEnv { - name = "thunar-build-with-plugins"; + name = "thunar-bare-with-plugins"; paths = [ build ] ++ thunarPlugins; }; diff --git a/pkgs/desktops/xfce/core/xfce4-panel.nix b/pkgs/desktops/xfce/core/xfce4-panel.nix index 26548f6daa4..009416dea6c 100644 --- a/pkgs/desktops/xfce/core/xfce4-panel.nix +++ b/pkgs/desktops/xfce/core/xfce4-panel.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui , libxfce4ui_gtk3, libwnck, exo, garcon, xfconf, libstartup_notification -, makeWrapper, xfce4mixer, hicolor-icon-theme +, makeWrapper, xfce4-mixer, hicolor-icon-theme , withGtk3 ? false, gtk3, gettext, glib-networking }: let @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig intltool gtk libxfce4util exo libwnck garcon xfconf libstartup_notification makeWrapper hicolor-icon-theme - ] ++ xfce4mixer.gst_plugins + ] ++ xfce4-mixer.gst_plugins ++ optional withGtk3 gtk3; propagatedBuildInputs = [ (if withGtk3 then libxfce4ui_gtk3 else libxfce4ui) ]; diff --git a/pkgs/desktops/xfce/core/xfce4-power-manager.nix b/pkgs/desktops/xfce/core/xfce4-power-manager.nix index 9425c4d8884..ffcc67bf0e9 100644 --- a/pkgs/desktops/xfce/core/xfce4-power-manager.nix +++ b/pkgs/desktops/xfce/core/xfce4-power-manager.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, pkgconfig, intltool, glib, gtk, dbus-glib, upower, xfconf -, libxfce4ui, libxfce4util, libnotify, xfce4panel, hicolor-icon-theme +, libxfce4ui, libxfce4util, libnotify, xfce4-panel, hicolor-icon-theme , withGtk3 ? false, gtk3, libxfce4ui_gtk3, xfce4panel_gtk3 }: let p_name = "xfce4-power-manager"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ] ++ (if withGtk3 then [ gtk3 libxfce4ui_gtk3 xfce4panel_gtk3 ] - else [ gtk libxfce4ui xfce4panel ]); + else [ gtk libxfce4ui xfce4-panel ]); postPatch = lib.optionalString withGtk3 '' substituteInPlace configure --replace gio-2.0 gio-unix-2.0 diff --git a/pkgs/desktops/xfce/core/xfce4-session.nix b/pkgs/desktops/xfce/core/xfce4-session.nix index 73939d53587..2d5a169a215 100644 --- a/pkgs/desktops/xfce/core/xfce4-session.nix +++ b/pkgs/desktops/xfce/core/xfce4-session.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, intltool, gtk, polkit -, libxfce4util, libxfce4ui, xfce4panel, libwnck, dbus-glib, xfconf, libglade, xorg +, libxfce4util, libxfce4ui, xfce4-panel, libwnck, dbus-glib, xfconf, libglade, xorg , hicolor-icon-theme }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig intltool gtk libxfce4util libxfce4ui libwnck dbus-glib - xfconf xfce4panel libglade xorg.iceauth xorg.libSM + xfconf xfce4-panel libglade xorg.iceauth xorg.libSM polkit hicolor-icon-theme ]; #TODO: upower-glib, gconf (assistive?), gnome keyring diff --git a/pkgs/desktops/xfce/core/xfdesktop.nix b/pkgs/desktops/xfce/core/xfdesktop.nix index 491185ff2c0..48585b4004b 100644 --- a/pkgs/desktops/xfce/core/xfdesktop.nix +++ b/pkgs/desktops/xfce/core/xfdesktop.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui -, libwnck, xfconf, libglade, xfce4panel, thunar, exo, garcon, libnotify +, libwnck, xfconf, libglade, xfce4-panel, thunar, exo, garcon, libnotify , hicolor-icon-theme }: let p_name = "xfdesktop"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig intltool gtk libxfce4util libxfce4ui libwnck xfconf - libglade xfce4panel thunar exo garcon libnotify hicolor-icon-theme + libglade xfce4-panel thunar exo garcon libnotify hicolor-icon-theme ]; patches = [(fetchpatch { diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin.nix index 0dcdcda6994..c64e8770d25 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk}: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}: with stdenv.lib; stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; + buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ]; preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; meta = { diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin.nix index 6614d746b68..236c71c66d5 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xproto, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk}: +{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xproto, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}: with stdenv.lib; stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; + buildInputs = [ intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ]; preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; meta = { diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix index c0c8519d63a..0a309c433e9 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk}: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}: with stdenv.lib; stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool ]; - buildInputs = [ libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; + buildInputs = [ libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix index fb8b1bae83d..c5487198f97 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xproto, libxfce4util, xfce4panel, libxfce4ui, xfconf, gtk}: +{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xproto, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk}: with stdenv.lib; stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4panel xfconf gtk ]; + buildInputs = [ intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4-panel xfconf gtk ]; preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; meta = { diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin.nix index 0905a9bb16a..c6317010031 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, libxfcegui4, xfce4panel +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, libxfcegui4, xfce4-panel , gtk }: with stdenv.lib; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libxfce4util libxfcegui4 xfce4panel gtk ]; + buildInputs = [ intltool libxfce4util libxfcegui4 xfce4-panel gtk ]; meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix index b6d0fc12db3..8210fc62ccb 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk}: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}: with stdenv.lib; stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; + buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ]; meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix index 438be7e8494..621b4266d10 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ python2 vala gtk2 pythonPackages.wrapPython ] - ++ (with xfce; [ libxfce4util xfce4panel xfconf xfce4_dev_tools ]) + ++ (with xfce; [ libxfce4util xfce4-panel xfconf xfce4-dev-tools ]) ++ pythonPath; postPatch = '' diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix index a5cfc3659f6..0d99c2053df 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk}: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}: with stdenv.lib; stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; + buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ]; meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix index 81bff06500b..3a79f67068c 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk}: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}: with stdenv.lib; stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; + buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ]; meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix index 4f4f882d67b..6d0f8ee73a4 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk}: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}: with stdenv.lib; stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; + buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ]; meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix index c6252a48bff..039ac144094 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk}: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}: with stdenv.lib; stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; + buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ]; meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix index ea17c960b2e..cac09d0ad35 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, autoreconfHook, gnome2, - libgtop, libxfce4ui, libxfce4util, xfce4panel, lm_sensors + libgtop, libxfce4ui, libxfce4util, xfce4-panel, lm_sensors }: stdenv.mkDerivation rec { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { libgtop libxfce4ui libxfce4util - xfce4panel + xfce4-panel lm_sensors ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix index 2b43eaca4c0..80153332934 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk, exo, gnutls, libgcrypt }: with stdenv.lib; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel + buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk exo gnutls libgcrypt ]; meta = { diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix index 6f16561d41d..8a602b8b4a1 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk, exo }: with stdenv.lib; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel + buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk exo ]; meta = { diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix index e81289f26f6..66179996df6 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgconfig, fetchFromGitHub, python2, vala, gtk2, libwnck, libxfce4util, xfce4panel }: +{ stdenv, pkgconfig, fetchFromGitHub, python2, vala, gtk2, libwnck, libxfce4util, xfce4-panel }: stdenv.mkDerivation rec { ver = "0.3.1"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ python2 vala gtk2 libwnck libxfce4util xfce4panel ]; + buildInputs = [ python2 vala gtk2 libwnck libxfce4util xfce4-panel ]; postPatch = '' substituteInPlace src/preferences.vala --replace 'Environment.get_system_data_dirs()' "{ \"$out/share\" }" diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin.nix index 9650cafedec..a843f0223c4 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk}: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}: with stdenv.lib; stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; + buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ]; preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; meta = { diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix index c8c9c7735a9..d61dae6bdd5 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk, libunique }: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk, libunique }: with stdenv.lib; stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk libunique ]; + buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk libunique ]; meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix index 3314d313ad2..5a4dfee76fc 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, gnome2, libxfce4ui, - libxfce4util, xfce4panel, libnotify, lm_sensors, hddtemp, netcat-gnu + libxfce4util, xfce4-panel, libnotify, lm_sensors, hddtemp, netcat-gnu }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { gnome2.gtk libxfce4ui libxfce4util - xfce4panel + xfce4-panel libnotify lm_sensors hddtemp diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix index 34677db81d1..698d4aae532 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, gtk}: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk}: with stdenv.lib; stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel gtk ]; + buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel gtk ]; meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix index 17dcb10c9d1..1ba4340fcb5 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk}: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel +, libxfce4ui, libxfcegui4, xfconf, gtk, hicolor-icon-theme }: with stdenv.lib; stdenv.mkDerivation rec { @@ -12,8 +13,8 @@ stdenv.mkDerivation rec { }; name = "${p_name}-${ver_maj}.${ver_min}"; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf - gtk ]; + buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf + gtk hicolor-icon-theme ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix index 3c0d1a488f8..96ef08cbeb7 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, glib, exo, pcre -, libxfce4util, xfce4panel, libxfce4ui, xfconf, gtk }: +, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk }: with stdenv.lib; stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool glib exo pcre libxfce4util libxfce4ui xfce4panel xfconf gtk ]; + buildInputs = [ intltool glib exo pcre libxfce4util libxfce4ui xfce4-panel xfconf gtk ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix index 0af0e62244f..03f062532ea 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk, libxml2, libsoup, upower, -libxfce4ui, libxfce4util, xfce4panel }: +libxfce4ui, libxfce4util, xfce4-panel }: stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = [ gtk libxml2 libsoup upower libxfce4ui libxfce4util - xfce4panel ]; + xfce4-panel ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix index 92564c4eb68..c29758452ae 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, intltool, libxfce4util, libxfcegui4 -, xfce4panel, gtk, exo, garcon }: +, xfce4-panel, gtk, exo, garcon }: with stdenv.lib; stdenv.mkDerivation rec { @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig intltool ]; - buildInputs = [ libxfce4util libxfcegui4 xfce4panel gtk exo garcon ]; + buildInputs = [ libxfce4util libxfcegui4 xfce4-panel gtk exo garcon ]; enableParallelBuilding = true; preFixup = '' substituteInPlace $out/bin/xfce4-popup-whiskermenu \ - --replace $out/bin/xfce4-panel ${xfce4panel.out}/bin/xfce4-panel + --replace $out/bin/xfce4-panel ${xfce4-panel.out}/bin/xfce4-panel ''; meta = { diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix index 32b2e651462..8798851579d 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, intltool, python3, imagemagick, libwnck, gtk2 -, exo, libxfce4ui, libxfce4util, xfce4panel, xfconf, xfce4_dev_tools }: +, exo, libxfce4ui, libxfce4util, xfce4-panel, xfconf, xfce4-dev-tools }: stdenv.mkDerivation rec { p_name = "xfce4-windowck-plugin"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ intltool python3 imagemagick libwnck gtk2 - exo libxfce4ui libxfce4util xfce4panel xfconf xfce4_dev_tools ]; + exo libxfce4ui libxfce4util xfce4-panel xfconf xfce4-dev-tools ]; preConfigure = '' ./autogen.sh diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin.nix index 453c09cfc70..307d2e81bf2 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, libxfce4ui, xfce4panel +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, libxfce4ui, xfce4-panel , garcon, gtk, libxklavier, librsvg, libwnck }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel garcon + buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel garcon gtk libxklavier librsvg libwnck ]; meta = { diff --git a/pkgs/desktops/xfce/thunar-plugins/archive/default.nix b/pkgs/desktops/xfce/thunar-plugins/archive/default.nix index 8ff4a74e6bf..9783e6c9228 100644 --- a/pkgs/desktops/xfce/thunar-plugins/archive/default.nix +++ b/pkgs/desktops/xfce/thunar-plugins/archive/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, xfce4_dev_tools +{ stdenv, fetchFromGitHub, pkgconfig, xfce4-dev-tools , gtk , thunarx-2-dev , exo, libxfce4util, libxfce4ui @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - xfce4_dev_tools + xfce4-dev-tools thunarx-2-dev exo gtk libxfce4util libxfce4ui xfconf udev libnotify diff --git a/pkgs/development/compilers/avian/default.nix b/pkgs/development/compilers/avian/default.nix index 3d58e75200c..4dc384f70a3 100644 --- a/pkgs/development/compilers/avian/default.nix +++ b/pkgs/development/compilers/avian/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, zlib, jdk }: +{ stdenv, fetchFromGitHub, zlib, jdk, CoreServices, Foundation }: stdenv.mkDerivation rec { name = "avian-${version}"; @@ -11,10 +11,16 @@ stdenv.mkDerivation rec { sha256 = "1j2y45cpqk3x6a743mgpg7z3ivwm7qc9jy6xirvay7ah1qyxmm48"; }; - buildInputs = [ - zlib - jdk - ]; + buildInputs = [ zlib jdk ] + ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Foundation ]; + + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error"; + + postPatch = '' + substituteInPlace makefile \ + --replace 'g++' 'c++' \ + --replace 'gcc' 'cc' + ''; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix index 087f7470021..f3a4ff74aa0 100644 --- a/pkgs/development/compilers/ccl/default.nix +++ b/pkgs/development/compilers/ccl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gcc, glibc, m4, coreutils }: +{ stdenv, fetchurl, bootstrap_cmds, coreutils, glibc, m4 }: let options = rec { @@ -27,19 +27,11 @@ let runtime = "dx86cl64"; kernel = "darwinx8664"; }; - i686-darwin = { - arch = "darwinx86"; - sha256 = x86_64-darwin.sha256; - runtime = "dx86cl"; - kernel = "darwinx8632"; - }; armv6l-linux = armv7l-linux; }; - cfg = options.${stdenv.system}; + cfg = options."${stdenv.system}" or (throw "missing source url for platform ${stdenv.system}"); in -assert builtins.hasAttr stdenv.system options; - stdenv.mkDerivation rec { name = "ccl-${version}"; version = "1.11.5"; @@ -49,7 +41,7 @@ stdenv.mkDerivation rec { sha256 = cfg.sha256; }; - buildInputs = if stdenv.isDarwin then [ m4 ] else [ gcc glibc m4 ]; + buildInputs = if stdenv.isDarwin then [ bootstrap_cmds m4 ] else [ glibc m4 ]; CCL_RUNTIME = cfg.runtime; CCL_KERNEL = cfg.kernel; @@ -58,7 +50,6 @@ stdenv.mkDerivation rec { substituteInPlace lisp-kernel/${CCL_KERNEL}/Makefile \ --replace "M4 = gm4" "M4 = m4" \ --replace "dtrace" "/usr/sbin/dtrace" \ - --replace "mig" "/usr/bin/mig" \ --replace "/bin/rm" "${coreutils}/bin/rm" \ --replace "/bin/echo" "${coreutils}/bin/echo" diff --git a/pkgs/development/compilers/coreclr/default.nix b/pkgs/development/compilers/coreclr/default.nix index 0681e8210a6..3861501d399 100644 --- a/pkgs/development/compilers/coreclr/default.nix +++ b/pkgs/development/compilers/coreclr/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { name = "coreclr-${version}"; - version = "2.0.0"; + version = "2.0.7"; src = fetchFromGitHub { owner = "dotnet"; repo = "coreclr"; rev = "v${version}"; - sha256 = "16z58ix8kmk8csfy5qsqz8z30czhrap2vb8s8vdflmbcfnq31jcw"; + sha256 = "0pzkrfgqywhpijbx7j1v4lxa6270h6whymb64jdkp7yj56ipqh2n"; }; patches = [ @@ -34,12 +34,20 @@ stdenv.mkDerivation rec { url = https://github.com/dotnet/coreclr/commit/a8f83b615708c529b112898e7d2fbc3f618b26ee.patch; sha256 = "047ph5gip4z2h7liwdxsmpnlaq0sd3hliaw4nyqjp647m80g3ffq"; }) + (fetchpatch { + # clang 5 + url = https://github.com/dotnet/coreclr/commit/9b22e1a767dee38f351001c5601f56d78766a43e.patch; + sha256 = "1w1lxw5ryvhq8m5m0kv880c4bh6y9xdgypkr76sqbh3v568yghzg"; + }) ]; - buildInputs = [ + nativeBuildInputs = [ which cmake clang + ]; + + buildInputs = [ llvmPackages.llvm llvmPackages.lldb libunwind @@ -68,7 +76,8 @@ stdenv.mkDerivation rec { buildPhase = '' runHook preBuild - ./build.sh $BuildArch $BuildType + # disable -Werror which can potentially breaks with every compiler upgrade + ./build.sh $BuildArch $BuildType cmakeargs "-DCLR_CMAKE_WARNINGS_ARE_ERRORS=OFF" runHook postBuild ''; diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix index 4b87beb0879..1dc4430dc6a 100644 --- a/pkgs/development/compilers/edk2/default.nix +++ b/pkgs/development/compilers/edk2/default.nix @@ -7,6 +7,8 @@ targetArch = if stdenv.isi686 then "IA32" else if stdenv.isx86_64 then "X64" +else if stdenv.isAarch64 then + "AARCH64" else throw "Unsupported architecture"; @@ -48,7 +50,7 @@ edk2 = stdenv.mkDerivation { homepage = https://sourceforge.net/projects/edk2/; license = stdenv.lib.licenses.bsd2; branch = "UDK2017"; - platforms = ["x86_64-linux" "i686-linux"]; + platforms = ["x86_64-linux" "i686-linux" "aarch64-linux"]; }; passthru = { @@ -58,13 +60,20 @@ edk2 = stdenv.mkDerivation { configurePhase = '' mkdir -v Conf - sed -e 's|Nt32Pkg/Nt32Pkg.dsc|${projectDscPath}|' -e \ - 's|MYTOOLS|GCC49|' -e 's|IA32|${targetArch}|' -e 's|DEBUG|RELEASE|'\ - < ${edk2}/BaseTools/Conf/target.template > Conf/target.txt - sed -e 's|DEFINE GCC48_IA32_PREFIX = /usr/bin/|DEFINE GCC48_IA32_PREFIX = ""|' \ + + cp ${edk2}/BaseTools/Conf/target.template Conf/target.txt + sed -i Conf/target.txt \ + -e 's|Nt32Pkg/Nt32Pkg.dsc|${projectDscPath}|' \ + -e 's|MYTOOLS|GCC49|' \ + -e 's|IA32|${targetArch}|' \ + -e 's|DEBUG|RELEASE|'\ + + cp ${edk2}/BaseTools/Conf/tools_def.template Conf/tools_def.txt + sed -i Conf/tools_def.txt \ + -e 's|DEFINE GCC48_IA32_PREFIX = /usr/bin/|DEFINE GCC48_IA32_PREFIX = ""|' \ -e 's|DEFINE GCC48_X64_PREFIX = /usr/bin/|DEFINE GCC48_X64_PREFIX = ""|' \ - -e 's|DEFINE UNIX_IASL_BIN = /usr/bin/iasl|DEFINE UNIX_IASL_BIN = ${iasl}/bin/iasl|' \ - < ${edk2}/BaseTools/Conf/tools_def.template > Conf/tools_def.txt + -e 's|DEFINE UNIX_IASL_BIN = /usr/bin/iasl|DEFINE UNIX_IASL_BIN = ${iasl}/bin/iasl|' + export WORKSPACE="$PWD" export EFI_SOURCE="$PWD/EdkCompatibilityPkg" ln -sv ${edk2}/BaseTools BaseTools diff --git a/pkgs/development/compilers/gambit/bootstrap.nix b/pkgs/development/compilers/gambit/bootstrap.nix index 7376aec2750..05e804a1f74 100644 --- a/pkgs/development/compilers/gambit/bootstrap.nix +++ b/pkgs/development/compilers/gambit/bootstrap.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { description = "Optimizing Scheme to C compiler, bootstrap step"; homepage = "http://gambitscheme.org"; license = stdenv.lib.licenses.lgpl2; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin fare ]; }; } diff --git a/pkgs/development/compilers/gambit/default.nix b/pkgs/development/compilers/gambit/default.nix index 95e8dba762a..83e02b14708 100644 --- a/pkgs/development/compilers/gambit/default.nix +++ b/pkgs/development/compilers/gambit/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { description = "Optimizing Scheme to C compiler"; homepage = "http://gambitscheme.org"; license = stdenv.lib.licenses.lgpl2; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin fare ]; }; } diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix index 8cee08c0926..5042b13e267 100644 --- a/pkgs/development/compilers/gcc/4.5/default.nix +++ b/pkgs/development/compilers/gcc/4.5/default.nix @@ -417,6 +417,7 @@ stdenv.mkDerivation ({ # gnatboot is not available out of linux platforms, so we disable the darwin build # for the gnat (ada compiler). platforms = stdenv.lib.platforms.linux ++ optionals (langAda == false) [ "i686-darwin" ]; + broken = langAda; }; } @@ -466,7 +467,7 @@ stdenv.mkDerivation ({ license = stdenv.lib.licenses.gpl2Plus; description = "Complete VHDL simulator, using the GCC technology (gcc ${version})"; maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + platforms = ["i686-linux" "x86_64-linux"]; }; }) diff --git a/pkgs/development/compilers/gerbil/default.nix b/pkgs/development/compilers/gerbil/default.nix index c1a411120d0..555dbbfe460 100644 --- a/pkgs/development/compilers/gerbil/default.nix +++ b/pkgs/development/compilers/gerbil/default.nix @@ -85,7 +85,7 @@ EOF description = "Gerbil Scheme"; homepage = "https://github.com/vyzo/gerbil"; license = stdenv.lib.licenses.lgpl2; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ fare ]; }; } diff --git a/pkgs/development/compilers/ghc/8.2.1-binary.nix b/pkgs/development/compilers/ghc/8.2.1-binary.nix index c0bc2a9dd73..c88d2a8685a 100644 --- a/pkgs/development/compilers/ghc/8.2.1-binary.nix +++ b/pkgs/development/compilers/ghc/8.2.1-binary.nix @@ -158,5 +158,6 @@ stdenv.mkDerivation rec { passthru = { targetPrefix = ""; }; meta.license = stdenv.lib.licenses.bsd3; - meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "armv7l-linux" "aarch64-linux"]; + # AArch64 should work in theory but eventually some builds start segfaulting + meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "armv7l-linux" /* "aarch64-linux" */]; } diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index b2a1aafe613..192ff1ba207 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -4,6 +4,7 @@ # build-tools , bootPkgs, alex, happy, hscolour , autoconf, autoreconfHook, automake, coreutils, fetchurl, fetchpatch, perl, python3, sphinx +, runCommand , libffi, libiconv ? null, ncurses @@ -89,6 +90,7 @@ stdenv.mkDerivation rec { url = "https://git.haskell.org/ghc.git/commitdiff_plain/2fc8ce5f0c8c81771c26266ac0b150ca9b75c5f3"; sha256 = "03253ci40np1v6k0wmi4aypj3nmj3rdyvb1k6rwqipb30nfc719f"; }) + (import ./abi-depends-determinism.nix { inherit fetchpatch runCommand; }) ] ++ stdenv.lib.optional deterministicProfiling (fetchpatch { # Backport of https://phabricator.haskell.org/D4388 for more determinism url = "https://github.com/shlevy/ghc/commit/fec1b8d3555c447c0d8da0e96b659be67c8bb4bc.patch"; diff --git a/pkgs/development/compilers/ghc/8.4.1.nix b/pkgs/development/compilers/ghc/8.4.1.nix index f232e0b4728..8f398458fd5 100644 --- a/pkgs/development/compilers/ghc/8.4.1.nix +++ b/pkgs/development/compilers/ghc/8.4.1.nix @@ -4,6 +4,7 @@ # build-tools , bootPkgs, alex, happy , autoconf, automake, coreutils, fetchgit, fetchpatch, perl, python3 +, runCommand , libffi, libiconv ? null, ncurses @@ -15,7 +16,7 @@ , # If enabled, GHC will be built with the GPL-free but slower integer-simple # library instead of the faster but GPLed integer-gmp library. - enableIntegerSimple ? false, gmp ? null + enableIntegerSimple ? false, gmp ? null, m4 , # If enabled, use -fPIC when compiling static libs. enableRelocatedStaticLibs ? targetPlatform != hostPlatform @@ -24,7 +25,7 @@ # platform). Static libs are always built. enableShared ? true -, version ? "8.4.0.20180224" +, version ? "8.4.1" , # Whether to backport https://phabricator.haskell.org/D4388 for # deterministic profiling symbol names, at the cost of a slightly # non-standard GHC API @@ -77,15 +78,17 @@ stdenv.mkDerivation rec { src = fetchgit { url = "git://git.haskell.org/ghc.git"; - rev = "a1e15c8f59092ef2d11be7966bd20688d8dc01e6"; - sha256 = "1pimf5ryl76r3vwnc2n0qzk4yh7zckp2r2g5rlz8nbddsws2v893"; + rev = "0a3e2f324dbd525d626ebd3d97e8ffa1cf2f0ffb"; + sha256 = "1m51khnmf8gw203d8kh6y4ivh0acb2wiqqnb950yfbg2a2k7bcfi"; }; enableParallelBuilding = true; outputs = [ "out" "doc" ]; - patches = stdenv.lib.optional deterministicProfiling + patches = [ + (import ./abi-depends-determinism.nix { inherit fetchpatch runCommand; }) + ] ++ stdenv.lib.optional deterministicProfiling (fetchpatch { # https://phabricator.haskell.org/D4388 for more determinism url = "https://github.com/shlevy/ghc/commit/8b2dbd869d1a64de3e99fa8b1c9bb1140eee7099.patch"; sha256 = "0hxpiwhbg64rsyjdr4psh6dwyp58b96mad3adccvfr0x8hc6ba2m"; @@ -149,7 +152,7 @@ stdenv.mkDerivation rec { # masss-rebuild. crossConfig = true; - nativeBuildInputs = [ ghc perl autoconf automake happy alex python3 ]; + nativeBuildInputs = [ ghc perl autoconf automake m4 happy alex python3 ]; # For building runtime libs depsBuildTarget = toolsForTarget; diff --git a/pkgs/development/compilers/ghc/abi-depends-determinism.nix b/pkgs/development/compilers/ghc/abi-depends-determinism.nix new file mode 100644 index 00000000000..bc803b74617 --- /dev/null +++ b/pkgs/development/compilers/ghc/abi-depends-determinism.nix @@ -0,0 +1,12 @@ +# https://phabricator.haskell.org/D4159 to fix non-determinism in +# cached abi-depends fields in package databases, modified to only +# contain hunks that exist in distribution tarballs. +{ fetchpatch, runCommand }: let + base = fetchpatch rec { # Non-determinism in cached abi-depends fields + # Originally https://phabricator-files.haskell.org/file/data/4pqrbo5b62sifktfbrls/PHID-FILE-4g4zjiqlfxmmlaos7lz7/D4159.diff + url = "http://tarballs.nixos.org/sha256/${sha256}"; + name = "D4159.diff"; + sha256 = "0b8a08sisf1swmarm6nh9rgw7cpzi2rwdzvrd6ny49c7wk0f7x4b"; + }; +in runCommand base.name {} + "sed -n '/utils\\/ghc-pkg/,$p' ${base} >$out" diff --git a/pkgs/development/compilers/go/1.10.nix b/pkgs/development/compilers/go/1.10.nix index b22bfb2bd10..e7782810812 100644 --- a/pkgs/development/compilers/go/1.10.nix +++ b/pkgs/development/compilers/go/1.10.nix @@ -25,13 +25,13 @@ in stdenv.mkDerivation rec { name = "go-${version}"; - version = "1.10"; + version = "1.10.1"; src = fetchFromGitHub { owner = "golang"; repo = "go"; rev = "go${version}"; - sha256 = "1dzs1mz3zxgg1qyi2lrlxdz1lsvazxvmj9cb69pgqnwjlh3jpw0l"; + sha256 = "1wqwy52ibb343a4v7b9q26xa6r5jk4khfxd90wbpcayws8cxly8m"; }; # perl is used for testing go vet diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix index 955d9029d38..be97add2ded 100644 --- a/pkgs/development/compilers/go/1.9.nix +++ b/pkgs/development/compilers/go/1.9.nix @@ -25,13 +25,13 @@ in stdenv.mkDerivation rec { name = "go-${version}"; - version = "1.9.4"; + version = "1.9.5"; src = fetchFromGitHub { owner = "golang"; repo = "go"; rev = "go${version}"; - sha256 = "15d9lfiy1cjfz6nqnig5884ykqckx58cynd1bva1xna7bwcwwp2r"; + sha256 = "15dx1b71xv7b265gqk9nv02pirggpw7d83apikhrza2qkj64ydd0"; }; # perl is used for testing go vet diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix index 604474e01fe..5ffb7b92b26 100644 --- a/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -7,13 +7,13 @@ let drv = stdenv.mkDerivation rec { pname = "jetbrainsjdk"; - version = "152b1036.1"; + version = "152b1136.20"; name = pname + "-" + version; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbsdk8u${version}_linux_x64.tar.gz"; - sha256 = "1768f02i3dxdbxn8n29d522h8v0mkgnhpb8ixzq5p54vwjmfl6md"; + sha256 = "0sqr8f3z062kwcxh3dxnan45ldas438blbc69z0pypbhc8c2sk2b"; } else throw "unsupported system: ${stdenv.system}"; diff --git a/pkgs/development/compilers/julia/0.5.nix b/pkgs/development/compilers/julia/0.5.nix index 0cf933ee4d2..cff6c1c446f 100644 --- a/pkgs/development/compilers/julia/0.5.nix +++ b/pkgs/development/compilers/julia/0.5.nix @@ -42,7 +42,7 @@ let rmathVersion = "0.1"; rmath-julia = fetchurl { url = "https://api.github.com/repos/JuliaLang/Rmath-julia/tarball/v${rmathVersion}"; - sha256 = "0ai5dhjc43zcvangz123ryxmlbm51s21rg13bllwyn98w67arhb4"; + sha256 = "1qyps217175qhid46l8f5i1v8i82slgp23ia63x2hzxwfmx8617p"; }; virtualenvVersion = "15.0.0"; diff --git a/pkgs/development/compilers/julia/0.6.nix b/pkgs/development/compilers/julia/0.6.nix index 6acb192933e..6fad8e5259c 100644 --- a/pkgs/development/compilers/julia/0.6.nix +++ b/pkgs/development/compilers/julia/0.6.nix @@ -42,7 +42,7 @@ let rmathVersion = "0.1"; rmath-julia = fetchurl { url = "https://api.github.com/repos/JuliaLang/Rmath-julia/tarball/v${rmathVersion}"; - sha256 = "0ai5dhjc43zcvangz123ryxmlbm51s21rg13bllwyn98w67arhb4"; + sha256 = "1qyps217175qhid46l8f5i1v8i82slgp23ia63x2hzxwfmx8617p"; }; virtualenvVersion = "15.0.0"; @@ -172,10 +172,14 @@ stdenv.mkDerivation rec { ''; postInstall = '' - for prog in "$out/bin/julia" "$out/bin/julia-debug"; do - wrapProgram "$prog" \ - --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH:$out/lib/julia" \ - --prefix PATH : "${stdenv.lib.makeBinPath [ curl ]}" + # Symlink shared libraries from LD_LIBRARY_PATH into lib/julia, + # as using a wrapper with LD_LIBRARY_PATH causes segmentation + # faults when program returns an error: + # $ julia -e 'throw(Error())' + find $(echo $LD_LIBRARY_PATH | sed 's|:| |g') -maxdepth 1 -name '*.${if stdenv.isDarwin then "dylib" else "so"}*' | while read lib; do + if [[ ! -e $out/lib/julia/$(basename $lib) ]]; then + ln -sv $lib $out/lib/julia/$(basename $lib) + fi done ''; diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index 63252084b5d..b5a3a8c6be2 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -42,7 +42,7 @@ let rmathVersion = "0.1"; rmath-julia = fetchurl { url = "https://api.github.com/repos/JuliaLang/Rmath-julia/tarball/v${rmathVersion}"; - sha256 = "0ai5dhjc43zcvangz123ryxmlbm51s21rg13bllwyn98w67arhb4"; + sha256 = "1qyps217175qhid46l8f5i1v8i82slgp23ia63x2hzxwfmx8617p"; }; in @@ -164,6 +164,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ raskin ]; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; - broken = stdenv.isi686; + #broken = stdenv.isi686; + broken = true; # 2018-04-10 }; } diff --git a/pkgs/development/compilers/julia/git.nix b/pkgs/development/compilers/julia/git.nix index 19519823f37..4b9a369e8d2 100644 --- a/pkgs/development/compilers/julia/git.nix +++ b/pkgs/development/compilers/julia/git.nix @@ -40,7 +40,7 @@ let rmathVersion = "0.1"; rmath-julia = fetchurl { url = "https://api.github.com/repos/JuliaLang/Rmath-julia/tarball/v${rmathVersion}"; - sha256 = "0ai5dhjc43zcvangz123ryxmlbm51s21rg13bllwyn98w67arhb4"; + sha256 = "1qyps217175qhid46l8f5i1v8i82slgp23ia63x2hzxwfmx8617p"; }; virtualenvVersion = "15.0.0"; diff --git a/pkgs/development/compilers/llvm/3.4/llvm.nix b/pkgs/development/compilers/llvm/3.4/llvm.nix index 27047e7d941..30f2dba2883 100644 --- a/pkgs/development/compilers/llvm/3.4/llvm.nix +++ b/pkgs/development/compilers/llvm/3.4/llvm.nix @@ -90,6 +90,6 @@ in stdenv.mkDerivation rec { homepage = http://llvm.org/; license = stdenv.lib.licenses.ncsa; maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ]; - platforms = stdenv.lib.platforms.all; + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin"]; }; } diff --git a/pkgs/development/compilers/llvm/3.5/llvm.nix b/pkgs/development/compilers/llvm/3.5/llvm.nix index 00b2548d56e..4d0cb8930f5 100644 --- a/pkgs/development/compilers/llvm/3.5/llvm.nix +++ b/pkgs/development/compilers/llvm/3.5/llvm.nix @@ -98,7 +98,7 @@ in stdenv.mkDerivation rec { homepage = http://llvm.org/; license = stdenv.lib.licenses.ncsa; maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ]; - platforms = stdenv.lib.platforms.all; + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin"]; }; } diff --git a/pkgs/development/compilers/llvm/4/cmdline-help.patch b/pkgs/development/compilers/llvm/4/cmdline-help.patch new file mode 100644 index 00000000000..a693719c2cf --- /dev/null +++ b/pkgs/development/compilers/llvm/4/cmdline-help.patch @@ -0,0 +1,39 @@ +From c7a9aa3a697c81432786a5583bf973771c7be15e Mon Sep 17 00:00:00 2001 +From: Don Hinton +Date: Wed, 12 Jul 2017 01:15:46 +0000 +Subject: [PATCH] Fix minor typo introduced in r276404 + +Summary: +A space was added between '-' and 'help' when emitting help output. + +See https://reviews.llvm.org/D22621 for details. + +Reviewers: MaggieYi, vsk + +Reviewed By: vsk + +Subscribers: llvm-commits + +Differential Revision: https://reviews.llvm.org/D35283 + +git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@307745 91177308-0d34-0410-b5e6-96231b3b80d8 +--- + lib/Support/CommandLine.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/Support/CommandLine.cpp b/lib/Support/CommandLine.cpp +index 3889902eea5..79defa5c36c 100644 +--- a/lib/Support/CommandLine.cpp ++++ b/lib/Support/CommandLine.cpp +@@ -1236,7 +1236,7 @@ bool CommandLineParser::ParseCommandLineOptions(int argc, + << ": Not enough positional command line arguments specified!\n" + << "Must specify at least " << NumPositionalRequired + << " positional argument" << (NumPositionalRequired > 1 ? "s" : "") +- << ": See: " << argv[0] << " - help\n"; ++ << ": See: " << argv[0] << " -help\n"; + } + + ErrorParsing = true; +-- +2.14.0 + diff --git a/pkgs/development/compilers/llvm/4/lldb.nix b/pkgs/development/compilers/llvm/4/lldb.nix index 5ffc346a479..325149fc19b 100644 --- a/pkgs/development/compilers/llvm/4/lldb.nix +++ b/pkgs/development/compilers/llvm/4/lldb.nix @@ -41,6 +41,11 @@ stdenv.mkDerivation { "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic ]; + # Add missing include to fix error when using std::bind + prePatch = '' + sed -i -e '30i#include ' include/lldb/Utility/TaskPool.h + ''; + enableParallelBuilding = true; postInstall = '' diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix index 7fd94316d73..bc8453f743a 100644 --- a/pkgs/development/compilers/llvm/4/llvm.nix +++ b/pkgs/development/compilers/llvm/4/llvm.nix @@ -78,11 +78,15 @@ in stdenv.mkDerivation (rec { substituteInPlace lib/esan/esan_sideline_linux.cpp \ --replace 'struct sigaltstack' 'stack_t' ) + '' + # Fix extra space printed in commandline help sometimes, "- help" + '' + patch -p1 -i ${./cmdline-help.patch} '' + stdenv.lib.optionalString stdenv.isAarch64 '' patch -p0 < ${../aarch64.patch} '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' patch -p1 -i ${../TLI-musl.patch} patch -p1 -i ${./dynamiclibrary-musl.patch} + patch -p1 -i ${./sanitizers-nongnu.patch} -d projects/compiler-rt ''; # hacky fix: created binaries need to be run before installation @@ -118,9 +122,6 @@ in stdenv.mkDerivation (rec { "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}" - - "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" - "-DCOMPILER_RT_BUILD_XRAY=OFF" ]; postBuild = '' diff --git a/pkgs/development/compilers/llvm/4/sanitizers-nongnu.patch b/pkgs/development/compilers/llvm/4/sanitizers-nongnu.patch new file mode 100644 index 00000000000..5bd858f8ae7 --- /dev/null +++ b/pkgs/development/compilers/llvm/4/sanitizers-nongnu.patch @@ -0,0 +1,368 @@ +From dac4d3912378069b44340204e5fc6237aa1baf94 Mon Sep 17 00:00:00 2001 +From: Matthias Maier +Date: Fri, 5 May 2017 17:47:39 +0000 +Subject: [PATCH] Musl patches + +Ported to compiler-rt-sanitizers-4.0.0. Taken from + + https://gist.githubusercontent.com/pwaller/2337f3290f12634cad3e3730cff0a6c1/raw/83c87a8585e2f9662494db5662e5361beb093c26/nongnu.patch +--- + lib/asan/asan_linux.cc | 4 +-- + lib/interception/interception_linux.cc | 2 +- + lib/interception/interception_linux.h | 2 +- + lib/msan/msan_linux.cc | 2 +- + .../sanitizer_common_interceptors_ioctl.inc | 4 +-- + lib/sanitizer_common/sanitizer_common_syscalls.inc | 2 +- + lib/sanitizer_common/sanitizer_linux_libcdep.cc | 12 +++---- + lib/sanitizer_common/sanitizer_platform.h | 7 ++++ + .../sanitizer_platform_interceptors.h | 2 +- + .../sanitizer_platform_limits_posix.cc | 39 +++++++++++++--------- + lib/tsan/rtl/tsan_platform_linux.cc | 2 +- + 11 files changed, 46 insertions(+), 32 deletions(-) + +diff --git a/lib/asan/asan_linux.cc b/lib/asan/asan_linux.cc +index c051573dd..e295f6004 100644 +--- a/lib/asan/asan_linux.cc ++++ b/lib/asan/asan_linux.cc +@@ -39,7 +39,7 @@ + #include + #endif + +-#if SANITIZER_ANDROID || SANITIZER_FREEBSD ++#if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_NONGNU + #include + extern "C" void* _DYNAMIC; + #else +@@ -80,7 +80,7 @@ void AsanApplyToGlobals(globals_op_fptr op, const void *needle) { + UNIMPLEMENTED(); + } + +-#if SANITIZER_ANDROID ++#if SANITIZER_ANDROID || SANITIZER_NONGNU + // FIXME: should we do anything for Android? + void AsanCheckDynamicRTPrereqs() {} + void AsanCheckIncompatibleRT() {} +diff --git a/lib/interception/interception_linux.cc b/lib/interception/interception_linux.cc +index 6e908ac01..8f23d9adc 100644 +--- a/lib/interception/interception_linux.cc ++++ b/lib/interception/interception_linux.cc +@@ -24,7 +24,7 @@ bool GetRealFunctionAddress(const char *func_name, uptr *func_addr, + return real == wrapper; + } + +-#if !defined(__ANDROID__) // android does not have dlvsym ++#if !defined(__ANDROID__) && !SANITIZER_NONGNU // android does not have dlvsym + void *GetFuncAddrVer(const char *func_name, const char *ver) { + return dlvsym(RTLD_NEXT, func_name, ver); + } +diff --git a/lib/interception/interception_linux.h b/lib/interception/interception_linux.h +index 27a66c882..3b559a303 100644 +--- a/lib/interception/interception_linux.h ++++ b/lib/interception/interception_linux.h +@@ -34,7 +34,7 @@ void *GetFuncAddrVer(const char *func_name, const char *ver); + (::__interception::uptr) & (func), \ + (::__interception::uptr) & WRAP(func)) + +-#if !defined(__ANDROID__) // android does not have dlvsym ++#if !defined(__ANDROID__) && !SANITIZER_NONGNU // android does not have dlvsym + #define INTERCEPT_FUNCTION_VER_LINUX_OR_FREEBSD(func, symver) \ + (::__interception::real_##func = (func##_f)( \ + unsigned long)::__interception::GetFuncAddrVer(#func, symver)) +diff --git a/lib/msan/msan_linux.cc b/lib/msan/msan_linux.cc +index 0a687f620..0852d97d7 100644 +--- a/lib/msan/msan_linux.cc ++++ b/lib/msan/msan_linux.cc +@@ -13,7 +13,7 @@ + //===----------------------------------------------------------------------===// + + #include "sanitizer_common/sanitizer_platform.h" +-#if SANITIZER_FREEBSD || SANITIZER_LINUX ++#if SANITIZER_FREEBSD || SANITIZER_LINUX && !SANITIZER_NONGNU + + #include "msan.h" + #include "msan_thread.h" +diff --git a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc +index 4ed9afedf..64f584e93 100644 +--- a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc ++++ b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc +@@ -100,7 +100,7 @@ static void ioctl_table_fill() { + _(SIOCGETVIFCNT, WRITE, struct_sioc_vif_req_sz); + #endif + +-#if SANITIZER_LINUX ++#if SANITIZER_LINUX && !SANITIZER_NONGNU + // Conflicting request ids. + // _(CDROMAUDIOBUFSIZ, NONE, 0); + // _(SNDCTL_TMR_CONTINUE, NONE, 0); +@@ -361,7 +361,7 @@ static void ioctl_table_fill() { + _(VT_WAITACTIVE, NONE, 0); + #endif + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE + _(CYGETDEFTHRESH, WRITE, sizeof(int)); + _(CYGETDEFTIMEOUT, WRITE, sizeof(int)); +diff --git a/lib/sanitizer_common/sanitizer_common_syscalls.inc b/lib/sanitizer_common/sanitizer_common_syscalls.inc +index 469c8eb7e..24f87867d 100644 +--- a/lib/sanitizer_common/sanitizer_common_syscalls.inc ++++ b/lib/sanitizer_common/sanitizer_common_syscalls.inc +@@ -2038,7 +2038,7 @@ POST_SYSCALL(setrlimit)(long res, long resource, void *rlim) { + } + } + +-#if !SANITIZER_ANDROID ++#if !SANITIZER_ANDROID && !SANITIZER_NONGNU + PRE_SYSCALL(prlimit64)(long pid, long resource, const void *new_rlim, + void *old_rlim) { + if (new_rlim) PRE_READ(new_rlim, struct_rlimit64_sz); +diff --git a/lib/sanitizer_common/sanitizer_linux_libcdep.cc b/lib/sanitizer_common/sanitizer_linux_libcdep.cc +index f99f0b594..3a773a94e 100644 +--- a/lib/sanitizer_common/sanitizer_linux_libcdep.cc ++++ b/lib/sanitizer_common/sanitizer_linux_libcdep.cc +@@ -152,7 +152,7 @@ bool SanitizerGetThreadName(char *name, int max_len) { + #endif + } + +-#if !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO ++#if !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO && !SANITIZER_NONGNU + static uptr g_tls_size; + + #ifdef __i386__ +@@ -180,11 +180,11 @@ void InitTlsSize() { + } + #else + void InitTlsSize() { } +-#endif // !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO ++#endif // !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO && !SANITIZER_NONGNU + + #if (defined(__x86_64__) || defined(__i386__) || defined(__mips__) \ + || defined(__aarch64__) || defined(__powerpc64__) || defined(__s390__)) \ +- && SANITIZER_LINUX && !SANITIZER_ANDROID ++ && SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + // sizeof(struct pthread) from glibc. + static atomic_uintptr_t kThreadDescriptorSize; + +@@ -338,7 +338,7 @@ uptr ThreadSelf() { + + #if !SANITIZER_GO + static void GetTls(uptr *addr, uptr *size) { +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + # if defined(__x86_64__) || defined(__i386__) || defined(__s390__) + *addr = ThreadSelf(); + *size = GetTlsSize(); +@@ -364,7 +364,7 @@ static void GetTls(uptr *addr, uptr *size) { + *addr = (uptr) dtv[2]; + *size = (*addr == 0) ? 0 : ((uptr) segbase[0] - (uptr) dtv[2]); + } +-#elif SANITIZER_ANDROID ++#elif SANITIZER_ANDROID || SANITIZER_NONGNU + *addr = 0; + *size = 0; + #else +@@ -375,7 +375,7 @@ static void GetTls(uptr *addr, uptr *size) { + + #if !SANITIZER_GO + uptr GetTlsSize() { +-#if SANITIZER_FREEBSD || SANITIZER_ANDROID ++#if SANITIZER_FREEBSD || SANITIZER_ANDROID || SANITIZER_NONGNU + uptr addr, size; + GetTls(&addr, &size); + return size; +diff --git a/lib/sanitizer_common/sanitizer_platform.h b/lib/sanitizer_common/sanitizer_platform.h +index d9a8e8df1..fe01c5744 100644 +--- a/lib/sanitizer_common/sanitizer_platform.h ++++ b/lib/sanitizer_common/sanitizer_platform.h +@@ -162,6 +162,13 @@ + # define SANITIZER_PPC64V2 0 + #endif + ++ ++#if defined(__linux__) && !defined(__GLIBC__) ++# define SANITIZER_NONGNU 1 ++#else ++# define SANITIZER_NONGNU 0 ++#endif ++ + // By default we allow to use SizeClassAllocator64 on 64-bit platform. + // But in some cases (e.g. AArch64's 39-bit address space) SizeClassAllocator64 + // does not work well and we need to fallback to SizeClassAllocator32. +diff --git a/lib/sanitizer_common/sanitizer_platform_interceptors.h b/lib/sanitizer_common/sanitizer_platform_interceptors.h +index 62875d11a..212e6e882 100644 +--- a/lib/sanitizer_common/sanitizer_platform_interceptors.h ++++ b/lib/sanitizer_common/sanitizer_platform_interceptors.h +@@ -23,7 +23,7 @@ + # define SI_NOT_WINDOWS 0 + #endif + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + # define SI_LINUX_NOT_ANDROID 1 + #else + # define SI_LINUX_NOT_ANDROID 0 +diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc +index 683f019d7..fd4880962 100644 +--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc ++++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc +@@ -14,6 +14,8 @@ + + #include "sanitizer_platform.h" + ++#define _LINUX_SYSINFO_H ++ + #if SANITIZER_LINUX || SANITIZER_FREEBSD || SANITIZER_MAC + // Tests in this file assume that off_t-dependent data structures match the + // libc ABI. For example, struct dirent here is what readdir() function (as +@@ -139,12 +141,14 @@ typedef struct user_fpregs elf_fpregset_t; + + #if SANITIZER_LINUX && !SANITIZER_ANDROID + #include +-#include ++# if !SANITIZER_NONGNU ++# include ++# endif + #include +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include + #if HAVE_RPC_XDR_H + # include + #elif HAVE_TIRPC_RPC_XDR_H +@@ -160,7 +164,8 @@ typedef struct user_fpregs elf_fpregset_t; + # include + #endif + #include +-#include ++// #include ++#include + #include + #include + #include +@@ -252,7 +257,7 @@ namespace __sanitizer { + unsigned struct_itimerspec_sz = sizeof(struct itimerspec); + #endif // SANITIZER_LINUX || SANITIZER_FREEBSD + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + unsigned struct_ustat_sz = sizeof(struct ustat); + unsigned struct_rlimit64_sz = sizeof(struct rlimit64); + unsigned struct_statvfs64_sz = sizeof(struct statvfs64); +@@ -310,7 +315,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(ElfW(Phdr)); + unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + #endif + +-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID ++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU + int glob_nomatch = GLOB_NOMATCH; + int glob_altdirfunc = GLOB_ALTDIRFUNC; + #endif +@@ -404,7 +409,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + unsigned struct_termios_sz = sizeof(struct termios); + unsigned struct_winsize_sz = sizeof(struct winsize); + +-#if SANITIZER_LINUX ++#if SANITIZER_LINUX && !SANITIZER_NONGNU + unsigned struct_arpreq_sz = sizeof(struct arpreq); + unsigned struct_cdrom_msf_sz = sizeof(struct cdrom_msf); + unsigned struct_cdrom_multisession_sz = sizeof(struct cdrom_multisession); +@@ -454,7 +459,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + unsigned struct_vt_mode_sz = sizeof(struct vt_mode); + #endif // SANITIZER_LINUX || SANITIZER_FREEBSD + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct); + unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor); + #if EV_VERSION > (0x010000) +@@ -822,7 +827,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + unsigned IOCTL_VT_WAITACTIVE = VT_WAITACTIVE; + #endif // SANITIZER_LINUX || SANITIZER_FREEBSD + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH; + unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT; + unsigned IOCTL_CYGETMON = CYGETMON; +@@ -985,7 +990,7 @@ CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phdr); + CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phnum); + #endif // SANITIZER_LINUX || SANITIZER_FREEBSD + +-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID ++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU + CHECK_TYPE_SIZE(glob_t); + CHECK_SIZE_AND_OFFSET(glob_t, gl_pathc); + CHECK_SIZE_AND_OFFSET(glob_t, gl_pathv); +@@ -1019,6 +1024,7 @@ CHECK_TYPE_SIZE(iovec); + CHECK_SIZE_AND_OFFSET(iovec, iov_base); + CHECK_SIZE_AND_OFFSET(iovec, iov_len); + ++#if !SANITIZER_NONGNU + CHECK_TYPE_SIZE(msghdr); + CHECK_SIZE_AND_OFFSET(msghdr, msg_name); + CHECK_SIZE_AND_OFFSET(msghdr, msg_namelen); +@@ -1032,6 +1038,7 @@ CHECK_TYPE_SIZE(cmsghdr); + CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_len); + CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_level); + CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_type); ++#endif + + COMPILER_CHECK(sizeof(__sanitizer_dirent) <= sizeof(dirent)); + CHECK_SIZE_AND_OFFSET(dirent, d_ino); +@@ -1134,7 +1141,7 @@ CHECK_SIZE_AND_OFFSET(mntent, mnt_passno); + + CHECK_TYPE_SIZE(ether_addr); + +-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID ++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU + CHECK_TYPE_SIZE(ipc_perm); + # if SANITIZER_FREEBSD + CHECK_SIZE_AND_OFFSET(ipc_perm, key); +@@ -1195,7 +1202,7 @@ CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_dstaddr); + CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_data); + #endif + +-#if SANITIZER_LINUX ++#if SANITIZER_LINUX && !SANITIZER_NONGNU + COMPILER_CHECK(sizeof(__sanitizer_mallinfo) == sizeof(struct mallinfo)); + #endif + +@@ -1245,7 +1252,7 @@ COMPILER_CHECK(__sanitizer_XDR_DECODE == XDR_DECODE); + COMPILER_CHECK(__sanitizer_XDR_FREE == XDR_FREE); + #endif + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + COMPILER_CHECK(sizeof(__sanitizer_FILE) <= sizeof(FILE)); + CHECK_SIZE_AND_OFFSET(FILE, _flags); + CHECK_SIZE_AND_OFFSET(FILE, _IO_read_ptr); +@@ -1264,7 +1271,7 @@ CHECK_SIZE_AND_OFFSET(FILE, _chain); + CHECK_SIZE_AND_OFFSET(FILE, _fileno); + #endif + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + COMPILER_CHECK(sizeof(__sanitizer__obstack_chunk) <= sizeof(_obstack_chunk)); + CHECK_SIZE_AND_OFFSET(_obstack_chunk, limit); + CHECK_SIZE_AND_OFFSET(_obstack_chunk, prev); +diff --git a/lib/tsan/rtl/tsan_platform_linux.cc b/lib/tsan/rtl/tsan_platform_linux.cc +index 3313288a7..103c7b6b9 100644 +--- a/lib/tsan/rtl/tsan_platform_linux.cc ++++ b/lib/tsan/rtl/tsan_platform_linux.cc +@@ -287,7 +287,7 @@ void InitializePlatform() { + // This is required to properly "close" the fds, because we do not see internal + // closes within glibc. The code is a pure hack. + int ExtractResolvFDs(void *state, int *fds, int nfd) { +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + int cnt = 0; + __res_state *statp = (__res_state*)state; + for (int i = 0; i < MAXNS && cnt < nfd; i++) { +-- +2.16.2 + diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix index f574eb05f92..ac575a0bf7a 100644 --- a/pkgs/development/compilers/llvm/5/llvm.nix +++ b/pkgs/development/compilers/llvm/5/llvm.nix @@ -79,6 +79,7 @@ in stdenv.mkDerivation (rec { substituteInPlace unittests/Support/CMakeLists.txt \ --replace "add_subdirectory(DynamicLibrary)" "" rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp + patch -p1 -i ${./sanitizers-nongnu.patch} -d projects/compiler-rt ''; # hacky fix: created binaries need to be run before installation @@ -114,9 +115,6 @@ in stdenv.mkDerivation (rec { "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}" - - "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" - "-DCOMPILER_RT_BUILD_XRAY=OFF" ]; postBuild = '' diff --git a/pkgs/development/compilers/llvm/5/sanitizers-nongnu.patch b/pkgs/development/compilers/llvm/5/sanitizers-nongnu.patch new file mode 100644 index 00000000000..c9ddfe45c89 --- /dev/null +++ b/pkgs/development/compilers/llvm/5/sanitizers-nongnu.patch @@ -0,0 +1,370 @@ +From 3e1fcb7d4909db8f0f7dd0109b2eee20115c8be3 Mon Sep 17 00:00:00 2001 +From: "Jory A. Pratt" +Date: Sat, 9 Sep 2017 08:31:15 -0500 +Subject: [PATCH] Ported to compiler-rt-sanitizers-5.0.0. Taken from + +https://gist.githubusercontent.com/pwaller/2337f3290f12634cad3e3730cff0a6c1/raw/83c87a8585e2f9662494db5662e5361beb093c26/nongnu.patch +Signed-off-by: Jory A. Pratt + +Taken from gentoo-musl project, with a few additional minor fixes. +--- + lib/asan/asan_linux.cc | 4 +-- + lib/interception/interception_linux.cc | 2 +- + lib/interception/interception_linux.h | 2 +- + lib/msan/msan_linux.cc | 2 +- + .../sanitizer_common_interceptors_ioctl.inc | 4 +-- + lib/sanitizer_common/sanitizer_common_syscalls.inc | 2 +- + lib/sanitizer_common/sanitizer_linux_libcdep.cc | 12 +++---- + lib/sanitizer_common/sanitizer_platform.h | 7 ++++ + .../sanitizer_platform_interceptors.h | 2 +- + .../sanitizer_platform_limits_posix.cc | 40 +++++++++++++--------- + lib/tsan/rtl/tsan_platform_linux.cc | 2 +- + 11 files changed, 47 insertions(+), 32 deletions(-) + +diff --git a/lib/asan/asan_linux.cc b/lib/asan/asan_linux.cc +index 6d47ba432..c58dd4864 100644 +--- a/lib/asan/asan_linux.cc ++++ b/lib/asan/asan_linux.cc +@@ -39,7 +39,7 @@ + #include + #endif + +-#if SANITIZER_ANDROID || SANITIZER_FREEBSD ++#if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_NONGNU + #include + extern "C" void* _DYNAMIC; + #else +@@ -86,7 +86,7 @@ void AsanApplyToGlobals(globals_op_fptr op, const void *needle) { + UNIMPLEMENTED(); + } + +-#if SANITIZER_ANDROID ++#if SANITIZER_ANDROID || SANITIZER_NONGNU + // FIXME: should we do anything for Android? + void AsanCheckDynamicRTPrereqs() {} + void AsanCheckIncompatibleRT() {} +diff --git a/lib/interception/interception_linux.cc b/lib/interception/interception_linux.cc +index 6e908ac01..76c1688ce 100644 +--- a/lib/interception/interception_linux.cc ++++ b/lib/interception/interception_linux.cc +@@ -24,7 +24,7 @@ bool GetRealFunctionAddress(const char *func_name, uptr *func_addr, + return real == wrapper; + } + +-#if !defined(__ANDROID__) // android does not have dlvsym ++#if !defined(__ANDROID__) && defined(__GLIBC__) // android does not have dlvsym + void *GetFuncAddrVer(const char *func_name, const char *ver) { + return dlvsym(RTLD_NEXT, func_name, ver); + } +diff --git a/lib/interception/interception_linux.h b/lib/interception/interception_linux.h +index 27a66c882..f60c38991 100644 +--- a/lib/interception/interception_linux.h ++++ b/lib/interception/interception_linux.h +@@ -34,7 +34,7 @@ void *GetFuncAddrVer(const char *func_name, const char *ver); + (::__interception::uptr) & (func), \ + (::__interception::uptr) & WRAP(func)) + +-#if !defined(__ANDROID__) // android does not have dlvsym ++#if !defined(__ANDROID__) && !SANITIZER_NONGNU // android does not have dlvsym + #define INTERCEPT_FUNCTION_VER_LINUX_OR_FREEBSD(func, symver) \ + (::__interception::real_##func = (func##_f)( \ + unsigned long)::__interception::GetFuncAddrVer(#func, symver)) +diff --git a/lib/msan/msan_linux.cc b/lib/msan/msan_linux.cc +index 0a687f620..0852d97d7 100644 +--- a/lib/msan/msan_linux.cc ++++ b/lib/msan/msan_linux.cc +@@ -13,7 +13,7 @@ + //===----------------------------------------------------------------------===// + + #include "sanitizer_common/sanitizer_platform.h" +-#if SANITIZER_FREEBSD || SANITIZER_LINUX ++#if SANITIZER_FREEBSD || SANITIZER_LINUX && !SANITIZER_NONGNU + + #include "msan.h" + #include "msan_thread.h" +diff --git a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc +index 4ed9afedf..64f584e93 100644 +--- a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc ++++ b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc +@@ -100,7 +100,7 @@ static void ioctl_table_fill() { + _(SIOCGETVIFCNT, WRITE, struct_sioc_vif_req_sz); + #endif + +-#if SANITIZER_LINUX ++#if SANITIZER_LINUX && !SANITIZER_NONGNU + // Conflicting request ids. + // _(CDROMAUDIOBUFSIZ, NONE, 0); + // _(SNDCTL_TMR_CONTINUE, NONE, 0); +@@ -361,7 +361,7 @@ static void ioctl_table_fill() { + _(VT_WAITACTIVE, NONE, 0); + #endif + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE + _(CYGETDEFTHRESH, WRITE, sizeof(int)); + _(CYGETDEFTIMEOUT, WRITE, sizeof(int)); +diff --git a/lib/sanitizer_common/sanitizer_common_syscalls.inc b/lib/sanitizer_common/sanitizer_common_syscalls.inc +index 469c8eb7e..24f87867d 100644 +--- a/lib/sanitizer_common/sanitizer_common_syscalls.inc ++++ b/lib/sanitizer_common/sanitizer_common_syscalls.inc +@@ -2038,7 +2038,7 @@ POST_SYSCALL(setrlimit)(long res, long resource, void *rlim) { + } + } + +-#if !SANITIZER_ANDROID ++#if !SANITIZER_ANDROID && !SANITIZER_NONGNU + PRE_SYSCALL(prlimit64)(long pid, long resource, const void *new_rlim, + void *old_rlim) { + if (new_rlim) PRE_READ(new_rlim, struct_rlimit64_sz); +diff --git a/lib/sanitizer_common/sanitizer_linux_libcdep.cc b/lib/sanitizer_common/sanitizer_linux_libcdep.cc +index 52196db12..045d9331f 100644 +--- a/lib/sanitizer_common/sanitizer_linux_libcdep.cc ++++ b/lib/sanitizer_common/sanitizer_linux_libcdep.cc +@@ -148,7 +148,7 @@ bool SanitizerGetThreadName(char *name, int max_len) { + #endif + } + +-#if !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO ++#if !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO && !SANITIZER_NONGNU + static uptr g_tls_size; + + #ifdef __i386__ +@@ -176,11 +176,11 @@ void InitTlsSize() { + } + #else + void InitTlsSize() { } +-#endif // !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO ++#endif // !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO && !SANITIZER_NONGNU + + #if (defined(__x86_64__) || defined(__i386__) || defined(__mips__) \ + || defined(__aarch64__) || defined(__powerpc64__) || defined(__s390__) \ +- || defined(__arm__)) && SANITIZER_LINUX && !SANITIZER_ANDROID ++ || defined(__arm__)) && SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + // sizeof(struct pthread) from glibc. + static atomic_uintptr_t kThreadDescriptorSize; + +@@ -335,7 +335,7 @@ uptr ThreadSelf() { + + #if !SANITIZER_GO + static void GetTls(uptr *addr, uptr *size) { +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + # if defined(__x86_64__) || defined(__i386__) || defined(__s390__) + *addr = ThreadSelf(); + *size = GetTlsSize(); +@@ -362,7 +362,7 @@ static void GetTls(uptr *addr, uptr *size) { + *addr = (uptr) dtv[2]; + *size = (*addr == 0) ? 0 : ((uptr) segbase[0] - (uptr) dtv[2]); + } +-#elif SANITIZER_ANDROID ++#elif SANITIZER_ANDROID || SANITIZER_NONGNU + *addr = 0; + *size = 0; + #else +@@ -373,7 +373,7 @@ static void GetTls(uptr *addr, uptr *size) { + + #if !SANITIZER_GO + uptr GetTlsSize() { +-#if SANITIZER_FREEBSD || SANITIZER_ANDROID ++#if SANITIZER_FREEBSD || SANITIZER_ANDROID || SANITIZER_NONGNU + uptr addr, size; + GetTls(&addr, &size); + return size; +diff --git a/lib/sanitizer_common/sanitizer_platform.h b/lib/sanitizer_common/sanitizer_platform.h +index 396f7c934..5af6f1ed5 100644 +--- a/lib/sanitizer_common/sanitizer_platform.h ++++ b/lib/sanitizer_common/sanitizer_platform.h +@@ -175,6 +175,13 @@ + # define SANITIZER_ARM 0 + #endif + ++ ++#if defined(__linux__) && !defined(__GLIBC__) ++# define SANITIZER_NONGNU 1 ++#else ++# define SANITIZER_NONGNU 0 ++#endif ++ + // By default we allow to use SizeClassAllocator64 on 64-bit platform. + // But in some cases (e.g. AArch64's 39-bit address space) SizeClassAllocator64 + // does not work well and we need to fallback to SizeClassAllocator32. +diff --git a/lib/sanitizer_common/sanitizer_platform_interceptors.h b/lib/sanitizer_common/sanitizer_platform_interceptors.h +index 0380cee92..0a39abbd0 100644 +--- a/lib/sanitizer_common/sanitizer_platform_interceptors.h ++++ b/lib/sanitizer_common/sanitizer_platform_interceptors.h +@@ -31,7 +31,7 @@ + # define SI_POSIX 0 + #endif + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + # define SI_LINUX_NOT_ANDROID 1 + #else + # define SI_LINUX_NOT_ANDROID 0 +diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc +index 83f4fd22f..fa8c1b8bd 100644 +--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc ++++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc +@@ -14,6 +14,9 @@ + + #include "sanitizer_platform.h" + ++// Workaround musl <--> linux conflicting definition of 'struct sysinfo' ++#define _LINUX_SYSINFO_H ++ + #if SANITIZER_LINUX || SANITIZER_FREEBSD || SANITIZER_MAC + // Tests in this file assume that off_t-dependent data structures match the + // libc ABI. For example, struct dirent here is what readdir() function (as +@@ -138,12 +141,14 @@ typedef struct user_fpregs elf_fpregset_t; + + #if SANITIZER_LINUX && !SANITIZER_ANDROID + #include +-#include ++# if !SANITIZER_NONGNU ++# include ++# endif + #include +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include + #if HAVE_RPC_XDR_H + # include + #elif HAVE_TIRPC_RPC_XDR_H +@@ -159,7 +164,8 @@ typedef struct user_fpregs elf_fpregset_t; + # include + #endif + #include +-#include ++// #include ++#include + #include + #include + #include +@@ -251,7 +257,7 @@ namespace __sanitizer { + unsigned struct_itimerspec_sz = sizeof(struct itimerspec); + #endif // SANITIZER_LINUX || SANITIZER_FREEBSD + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + unsigned struct_ustat_sz = sizeof(struct ustat); + unsigned struct_rlimit64_sz = sizeof(struct rlimit64); + unsigned struct_statvfs64_sz = sizeof(struct statvfs64); +@@ -309,7 +315,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(ElfW(Phdr)); + unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + #endif + +-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID ++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU + int glob_nomatch = GLOB_NOMATCH; + int glob_altdirfunc = GLOB_ALTDIRFUNC; + #endif +@@ -403,7 +409,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + unsigned struct_termios_sz = sizeof(struct termios); + unsigned struct_winsize_sz = sizeof(struct winsize); + +-#if SANITIZER_LINUX ++#if SANITIZER_LINUX && !SANITIZER_NONGNU + unsigned struct_arpreq_sz = sizeof(struct arpreq); + unsigned struct_cdrom_msf_sz = sizeof(struct cdrom_msf); + unsigned struct_cdrom_multisession_sz = sizeof(struct cdrom_multisession); +@@ -453,7 +459,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + unsigned struct_vt_mode_sz = sizeof(struct vt_mode); + #endif // SANITIZER_LINUX || SANITIZER_FREEBSD + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct); + unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor); + #if EV_VERSION > (0x010000) +@@ -821,7 +827,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + unsigned IOCTL_VT_WAITACTIVE = VT_WAITACTIVE; + #endif // SANITIZER_LINUX || SANITIZER_FREEBSD + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH; + unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT; + unsigned IOCTL_CYGETMON = CYGETMON; +@@ -976,7 +982,7 @@ CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phdr); + CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phnum); + #endif // SANITIZER_LINUX || SANITIZER_FREEBSD + +-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID ++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU + CHECK_TYPE_SIZE(glob_t); + CHECK_SIZE_AND_OFFSET(glob_t, gl_pathc); + CHECK_SIZE_AND_OFFSET(glob_t, gl_pathv); +@@ -1010,6 +1016,7 @@ CHECK_TYPE_SIZE(iovec); + CHECK_SIZE_AND_OFFSET(iovec, iov_base); + CHECK_SIZE_AND_OFFSET(iovec, iov_len); + ++#if !SANITIZER_NONGNU + CHECK_TYPE_SIZE(msghdr); + CHECK_SIZE_AND_OFFSET(msghdr, msg_name); + CHECK_SIZE_AND_OFFSET(msghdr, msg_namelen); +@@ -1023,6 +1030,7 @@ CHECK_TYPE_SIZE(cmsghdr); + CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_len); + CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_level); + CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_type); ++#endif + + COMPILER_CHECK(sizeof(__sanitizer_dirent) <= sizeof(dirent)); + CHECK_SIZE_AND_OFFSET(dirent, d_ino); +@@ -1125,7 +1133,7 @@ CHECK_SIZE_AND_OFFSET(mntent, mnt_passno); + + CHECK_TYPE_SIZE(ether_addr); + +-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID ++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU + CHECK_TYPE_SIZE(ipc_perm); + # if SANITIZER_FREEBSD + CHECK_SIZE_AND_OFFSET(ipc_perm, key); +@@ -1186,7 +1194,7 @@ CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_dstaddr); + CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_data); + #endif + +-#if SANITIZER_LINUX ++#if SANITIZER_LINUX && !SANITIZER_NONGNU + COMPILER_CHECK(sizeof(__sanitizer_mallinfo) == sizeof(struct mallinfo)); + #endif + +@@ -1236,7 +1244,7 @@ COMPILER_CHECK(__sanitizer_XDR_DECODE == XDR_DECODE); + COMPILER_CHECK(__sanitizer_XDR_FREE == XDR_FREE); + #endif + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + COMPILER_CHECK(sizeof(__sanitizer_FILE) <= sizeof(FILE)); + CHECK_SIZE_AND_OFFSET(FILE, _flags); + CHECK_SIZE_AND_OFFSET(FILE, _IO_read_ptr); +@@ -1255,7 +1263,7 @@ CHECK_SIZE_AND_OFFSET(FILE, _chain); + CHECK_SIZE_AND_OFFSET(FILE, _fileno); + #endif + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + COMPILER_CHECK(sizeof(__sanitizer__obstack_chunk) <= sizeof(_obstack_chunk)); + CHECK_SIZE_AND_OFFSET(_obstack_chunk, limit); + CHECK_SIZE_AND_OFFSET(_obstack_chunk, prev); +diff --git a/lib/tsan/rtl/tsan_platform_linux.cc b/lib/tsan/rtl/tsan_platform_linux.cc +index ead1e5704..2c020e3fe 100644 +--- a/lib/tsan/rtl/tsan_platform_linux.cc ++++ b/lib/tsan/rtl/tsan_platform_linux.cc +@@ -284,7 +284,7 @@ void InitializePlatform() { + // This is required to properly "close" the fds, because we do not see internal + // closes within glibc. The code is a pure hack. + int ExtractResolvFDs(void *state, int *fds, int nfd) { +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + int cnt = 0; + struct __res_state *statp = (struct __res_state*)state; + for (int i = 0; i < MAXNS && cnt < nfd; i++) { +-- +2.16.2 + diff --git a/pkgs/development/compilers/llvm/6/clang/default.nix b/pkgs/development/compilers/llvm/6/clang/default.nix new file mode 100644 index 00000000000..919efdc8ef9 --- /dev/null +++ b/pkgs/development/compilers/llvm/6/clang/default.nix @@ -0,0 +1,108 @@ +{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, release_version, clang-tools-extra_src, python +, fixDarwinDylibNames +, enableManpages ? false +}: + +let + gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; + self = stdenv.mkDerivation ({ + name = "clang-${version}"; + + unpackPhase = '' + unpackFile ${fetch "cfe" "0cnznvfyl3hgbg8gj58pmwf0pvd2sv5k3ccbivy6q6ggv7c6szg0"} + mv cfe-${version}* clang + sourceRoot=$PWD/clang + unpackFile ${clang-tools-extra_src} + mv clang-tools-extra-* $sourceRoot/tools/extra + ''; + + nativeBuildInputs = [ cmake python ] + ++ stdenv.lib.optional enableManpages python.pkgs.sphinx; + + buildInputs = [ libedit libxml2 llvm ] + ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + + cmakeFlags = [ + "-DCMAKE_CXX_FLAGS=-std=c++11" + ] ++ stdenv.lib.optionals enableManpages [ + "-DCLANG_INCLUDE_DOCS=ON" + "-DLLVM_ENABLE_SPHINX=ON" + "-DSPHINX_OUTPUT_MAN=ON" + "-DSPHINX_OUTPUT_HTML=OFF" + "-DSPHINX_WARNINGS_AS_ERRORS=OFF" + ] + # Maybe with compiler-rt this won't be needed? + ++ stdenv.lib.optional stdenv.isLinux "-DGCC_INSTALL_PREFIX=${gcc}" + ++ stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include"; + + patches = [ ./purity.patch ]; + + postPatch = '' + sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \ + -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' \ + lib/Driver/ToolChains/*.cpp + + # Patch for standalone doc building + sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt + '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp + ''; + + outputs = [ "out" "lib" "python" ]; + + # Clang expects to find LLVMgold in its own prefix + # Clang expects to find sanitizer libraries in its own prefix + postInstall = '' + ln -sv ${llvm}/lib/LLVMgold.so $out/lib + ln -sv ${llvm}/lib/clang/${release_version}/lib $out/lib/clang/${release_version}/ + ln -sv $out/bin/clang $out/bin/cpp + + # Move libclang to 'lib' output + moveToOutput "lib/libclang.*" "$lib" + substituteInPlace $out/lib/cmake/clang/ClangTargets-release.cmake \ + --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." + + mkdir -p $python/bin $python/share/clang/ + mv $out/bin/{git-clang-format,scan-view} $python/bin + if [ -e $out/bin/set-xcode-analyzer ]; then + mv $out/bin/set-xcode-analyzer $python/bin + fi + mv $out/share/clang/*.py $python/share/clang + rm $out/bin/c-index-test + ''; + + enableParallelBuilding = true; + + passthru = { + isClang = true; + inherit llvm; + } // stdenv.lib.optionalAttrs stdenv.isLinux { + inherit gcc; + }; + + meta = { + description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; + homepage = http://llvm.org/; + license = stdenv.lib.licenses.ncsa; + platforms = stdenv.lib.platforms.all; + }; + } // stdenv.lib.optionalAttrs enableManpages { + name = "clang-manpages-${version}"; + + buildPhase = '' + make docs-clang-man + ''; + + installPhase = '' + mkdir -p $out/share/man/man1 + # Manually install clang manpage + cp docs/man/*.1 $out/share/man/man1/ + ''; + + outputs = [ "out" ]; + + doCheck = false; + + meta.description = "man page for Clang ${version}"; + }); +in self diff --git a/pkgs/development/compilers/llvm/6/clang/purity.patch b/pkgs/development/compilers/llvm/6/clang/purity.patch new file mode 100644 index 00000000000..b30d0d0b5d5 --- /dev/null +++ b/pkgs/development/compilers/llvm/6/clang/purity.patch @@ -0,0 +1,30 @@ +From 4add81bba40dcec62c4ea4481be8e35ac53e89d8 Mon Sep 17 00:00:00 2001 +From: Will Dietz +Date: Thu, 18 May 2017 11:56:12 -0500 +Subject: [PATCH] "purity" patch for 5.0 + +--- + lib/Driver/ToolChains/Gnu.cpp | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp +index fe3c0191bb..c6a482bece 100644 +--- a/lib/Driver/ToolChains/Gnu.cpp ++++ b/lib/Driver/ToolChains/Gnu.cpp +@@ -494,13 +494,6 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA, + if (!Args.hasArg(options::OPT_static)) { + if (Args.hasArg(options::OPT_rdynamic)) + CmdArgs.push_back("-export-dynamic"); +- +- if (!Args.hasArg(options::OPT_shared)) { +- const std::string Loader = +- D.DyldPrefix + ToolChain.getDynamicLinker(Args); +- CmdArgs.push_back("-dynamic-linker"); +- CmdArgs.push_back(Args.MakeArgString(Loader)); +- } + } + + CmdArgs.push_back("-o"); +-- +2.11.0 + diff --git a/pkgs/development/compilers/llvm/6/compiler-rt-codesign.patch b/pkgs/development/compilers/llvm/6/compiler-rt-codesign.patch new file mode 100644 index 00000000000..8f4c76bca1e --- /dev/null +++ b/pkgs/development/compilers/llvm/6/compiler-rt-codesign.patch @@ -0,0 +1,155 @@ +From 3dec5f3475a26aeb4678627795c4b67c6b7b4785 Mon Sep 17 00:00:00 2001 +From: Will Dietz +Date: Tue, 19 Sep 2017 13:13:06 -0500 +Subject: [PATCH] remove codesign use on Apple, disable ios sim testing that + needs it + +--- + cmake/Modules/AddCompilerRT.cmake | 8 ------ + test/asan/CMakeLists.txt | 52 --------------------------------------- + test/tsan/CMakeLists.txt | 47 ----------------------------------- + 3 files changed, 107 deletions(-) + +diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake +index bc5fb9ff7..b64eb4246 100644 +--- a/cmake/Modules/AddCompilerRT.cmake ++++ b/cmake/Modules/AddCompilerRT.cmake +@@ -210,14 +210,6 @@ function(add_compiler_rt_runtime name type) + set_target_properties(${libname} PROPERTIES IMPORT_PREFIX "") + set_target_properties(${libname} PROPERTIES IMPORT_SUFFIX ".lib") + endif() +- if(APPLE) +- # Ad-hoc sign the dylibs +- add_custom_command(TARGET ${libname} +- POST_BUILD +- COMMAND codesign --sign - $ +- WORKING_DIRECTORY ${COMPILER_RT_LIBRARY_OUTPUT_DIR} +- ) +- endif() + endif() + install(TARGETS ${libname} + ARCHIVE DESTINATION ${COMPILER_RT_LIBRARY_INSTALL_DIR} +diff --git a/test/asan/CMakeLists.txt b/test/asan/CMakeLists.txt +index 8bfc15b5c..f23d0f71a 100644 +--- a/test/asan/CMakeLists.txt ++++ b/test/asan/CMakeLists.txt +@@ -83,58 +83,6 @@ foreach(arch ${ASAN_TEST_ARCH}) + endif() + endforeach() + +-# iOS and iOS simulator test suites +-# These are not added into "check-all", in order to run these tests, use +-# "check-asan-iossim-x86_64" and similar. They also require that an extra env +-# variable to select which iOS device or simulator to use, e.g.: +-# SANITIZER_IOSSIM_TEST_DEVICE_IDENTIFIER="iPhone 6" +-if(APPLE) +- set(EXCLUDE_FROM_ALL ON) +- +- set(ASAN_TEST_TARGET_CC ${COMPILER_RT_TEST_COMPILER}) +- set(ASAN_TEST_IOS "1") +- pythonize_bool(ASAN_TEST_IOS) +- set(ASAN_TEST_DYNAMIC True) +- +- foreach(arch ${DARWIN_iossim_ARCHS}) +- set(ASAN_TEST_IOSSIM "1") +- pythonize_bool(ASAN_TEST_IOSSIM) +- set(ASAN_TEST_TARGET_ARCH ${arch}) +- set(ASAN_TEST_TARGET_CFLAGS "-arch ${arch} -isysroot ${DARWIN_iossim_SYSROOT} ${COMPILER_RT_TEST_COMPILER_CFLAGS}") +- set(ASAN_TEST_CONFIG_SUFFIX "-${arch}-iossim") +- get_bits_for_arch(${arch} ASAN_TEST_BITS) +- string(TOUPPER ${arch} ARCH_UPPER_CASE) +- set(CONFIG_NAME "IOSSim${ARCH_UPPER_CASE}Config") +- configure_lit_site_cfg( +- ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in +- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg +- ) +- add_lit_testsuite(check-asan-iossim-${arch} "AddressSanitizer iOS Simulator ${arch} tests" +- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/ +- DEPENDS ${ASAN_TEST_DEPS}) +- endforeach() +- +- foreach (arch ${DARWIN_ios_ARCHS}) +- set(ASAN_TEST_IOSSIM "0") +- pythonize_bool(ASAN_TEST_IOSSIM) +- set(ASAN_TEST_TARGET_ARCH ${arch}) +- set(ASAN_TEST_TARGET_CFLAGS "-arch ${arch} -isysroot ${DARWIN_ios_SYSROOT} ${COMPILER_RT_TEST_COMPILER_CFLAGS}") +- set(ASAN_TEST_CONFIG_SUFFIX "-${arch}-ios") +- get_bits_for_arch(${arch} ASAN_TEST_BITS) +- string(TOUPPER ${arch} ARCH_UPPER_CASE) +- set(CONFIG_NAME "IOS${ARCH_UPPER_CASE}Config") +- configure_lit_site_cfg( +- ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in +- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg +- ) +- add_lit_testsuite(check-asan-ios-${arch} "AddressSanitizer iOS ${arch} tests" +- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/ +- DEPENDS ${ASAN_TEST_DEPS}) +- endforeach() +- +- set(EXCLUDE_FROM_ALL OFF) +-endif() +- + # Add unit tests. + if(COMPILER_RT_INCLUDE_TESTS) + set(ASAN_TEST_DYNAMIC False) +diff --git a/test/tsan/CMakeLists.txt b/test/tsan/CMakeLists.txt +index a68908612..cde0accb5 100644 +--- a/test/tsan/CMakeLists.txt ++++ b/test/tsan/CMakeLists.txt +@@ -42,53 +42,6 @@ foreach(arch ${TSAN_TEST_ARCH}) + list(APPEND TSAN_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}) + endforeach() + +-# iOS and iOS simulator test suites +-# These are not added into "check-all", in order to run these tests, use +-# "check-tsan-iossim-x86_64" and similar. They also require an extra environment +-# variable to select which iOS device or simulator to use, e.g.: +-# SANITIZER_IOSSIM_TEST_DEVICE_IDENTIFIER="iPhone 6" +-if(APPLE) +- set(EXCLUDE_FROM_ALL ON) +- +- set(TSAN_TEST_TARGET_CC ${COMPILER_RT_TEST_COMPILER}) +- set(TSAN_TEST_IOS "1") +- pythonize_bool(TSAN_TEST_IOS) +- +- set(arch "x86_64") +- set(TSAN_TEST_IOSSIM "1") +- pythonize_bool(TSAN_TEST_IOSSIM) +- set(TSAN_TEST_TARGET_ARCH ${arch}) +- set(TSAN_TEST_TARGET_CFLAGS "-arch ${arch} -isysroot ${DARWIN_iossim_SYSROOT} ${COMPILER_RT_TEST_COMPILER_CFLAGS}") +- set(TSAN_TEST_CONFIG_SUFFIX "-${arch}-iossim") +- string(TOUPPER ${arch} ARCH_UPPER_CASE) +- set(CONFIG_NAME "IOSSim${ARCH_UPPER_CASE}Config") +- configure_lit_site_cfg( +- ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in +- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg +- ) +- add_lit_testsuite(check-tsan-iossim-${arch} "ThreadSanitizer iOS Simulator ${arch} tests" +- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/ +- DEPENDS ${TSAN_TEST_DEPS}) +- +- set(arch "arm64") +- set(TSAN_TEST_IOSSIM "0") +- pythonize_bool(TSAN_TEST_IOSSIM) +- set(TSAN_TEST_TARGET_ARCH ${arch}) +- set(TSAN_TEST_TARGET_CFLAGS "-arch ${arch} -isysroot ${DARWIN_ios_SYSROOT} ${COMPILER_RT_TEST_COMPILER_CFLAGS}") +- set(TSAN_TEST_CONFIG_SUFFIX "-${arch}-ios") +- string(TOUPPER ${arch} ARCH_UPPER_CASE) +- set(CONFIG_NAME "IOS${ARCH_UPPER_CASE}Config") +- configure_lit_site_cfg( +- ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in +- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg +- ) +- add_lit_testsuite(check-tsan-ios-${arch} "ThreadSanitizer iOS Simulator ${arch} tests" +- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/ +- DEPENDS ${TSAN_TEST_DEPS}) +- +- set(EXCLUDE_FROM_ALL OFF) +-endif() +- + if(COMPILER_RT_INCLUDE_TESTS) + configure_lit_site_cfg( + ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.site.cfg.in +-- +2.14.1 + diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix new file mode 100644 index 00000000000..cfa9e9e15fc --- /dev/null +++ b/pkgs/development/compilers/llvm/6/default.nix @@ -0,0 +1,78 @@ +{ lowPrio, newScope, stdenv, targetPlatform, cmake, libstdcxxHook +, libxml2, python2, isl, fetchurl, overrideCC, wrapCC, ccWrapperFun +, darwin +}: + +let + callPackage = newScope (self // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; }); + + release_version = "6.0.0"; + version = release_version; # differentiating these is important for rc's + + fetch = name: sha256: fetchurl { + url = "http://releases.llvm.org/${release_version}/${name}-${version}.src.tar.xz"; + inherit sha256; + }; + + compiler-rt_src = fetch "compiler-rt" "16m7rvh3w6vq10iwkjrr1nn293djld3xm62l5zasisaprx117k6h"; + clang-tools-extra_src = fetch "clang-tools-extra" "1ll9v6r29xfdiywbn9iss49ad39ah3fk91wiv0sr6k6k9i544fq5"; + + # Add man output without introducing extra dependencies. + overrideManOutput = drv: + let drv-manpages = drv.override { enableManpages = true; }; in + drv // { man = drv-manpages.out; /*outputs = drv.outputs ++ ["man"];*/ }; + + llvm = callPackage ./llvm.nix { + inherit compiler-rt_src stdenv; + }; + + clang-unwrapped = callPackage ./clang { + inherit clang-tools-extra_src stdenv; + }; + + self = { + llvm = overrideManOutput llvm; + clang-unwrapped = overrideManOutput clang-unwrapped; + + libclang = self.clang-unwrapped.lib; + llvm-manpages = lowPrio self.llvm.man; + clang-manpages = lowPrio self.clang-unwrapped.man; + + clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang; + + libstdcxxClang = ccWrapperFun { + cc = self.clang-unwrapped; + /* FIXME is this right? */ + inherit (stdenv.cc) bintools libc nativeTools nativeLibc; + extraPackages = [ libstdcxxHook ]; + }; + + libcxxClang = ccWrapperFun { + cc = self.clang-unwrapped; + /* FIXME is this right? */ + inherit (stdenv.cc) bintools libc nativeTools nativeLibc; + extraPackages = [ self.libcxx self.libcxxabi ]; + }; + + stdenv = stdenv.override (drv: { + allowedRequisites = null; + cc = self.clang; + }); + + libcxxStdenv = stdenv.override (drv: { + allowedRequisites = null; + cc = self.libcxxClang; + }); + + lld = callPackage ./lld.nix {}; + + lldb = callPackage ./lldb.nix {}; + + libcxx = callPackage ./libc++ {}; + + libcxxabi = callPackage ./libc++abi.nix {}; + + openmp = callPackage ./openmp.nix {}; + }; + +in self diff --git a/pkgs/development/compilers/llvm/6/libc++/default.nix b/pkgs/development/compilers/llvm/6/libc++/default.nix new file mode 100644 index 00000000000..3c6c009a58f --- /dev/null +++ b/pkgs/development/compilers/llvm/6/libc++/default.nix @@ -0,0 +1,51 @@ +{ lib, stdenv, fetch, cmake, python, llvm, libcxxabi, fixDarwinDylibNames, version }: + +stdenv.mkDerivation rec { + name = "libc++-${version}"; + + src = fetch "libcxx" "1n8d0iadkk9fdpplvxkdgrgh2szc6msrx1mpdjpmilz9pn3im4vh"; + + postUnpack = '' + unpackFile ${libcxxabi.src} + export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include" + ''; + + # on next rebuild, this can be replaced with optionals; for now set to null to avoid + # patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [ + patches = if stdenv.hostPlatform.isMusl then [ + ../../libcxx-0001-musl-hacks.patch + ] else null; + + prePatch = '' + substituteInPlace lib/CMakeLists.txt --replace "/usr/lib/libc++" "\''${LIBCXX_LIBCXXABI_LIB_PATH}/libc++" + ''; + + preConfigure = '' + # Get headers from the cxxabi source so we can see private headers not installed by the cxxabi package + cmakeFlagsArray=($cmakeFlagsArray -DLIBCXX_CXX_ABI_INCLUDE_PATHS="$LIBCXXABI_INCLUDE_DIR") + '' + lib.optionalString stdenv.hostPlatform.isMusl '' + patchShebangs utils/cat_files.py + ''; + nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl python; + + buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + + cmakeFlags = [ + "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" + "-DLIBCXX_LIBCPPABI_VERSION=2" + "-DLIBCXX_CXX_ABI=libcxxabi" + ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1"; + + enableParallelBuilding = true; + + linkCxxAbi = stdenv.isLinux; + + setupHook = ./setup-hook.sh; + + meta = { + homepage = http://libcxx.llvm.org/; + description = "A new implementation of the C++ standard library, targeting C++11"; + license = with stdenv.lib.licenses; [ ncsa mit ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/development/compilers/llvm/6/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/6/libc++/setup-hook.sh new file mode 100644 index 00000000000..9022fced6ec --- /dev/null +++ b/pkgs/development/compilers/llvm/6/libc++/setup-hook.sh @@ -0,0 +1,3 @@ +linkCxxAbi="@linkCxxAbi@" +export NIX_CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1" +export NIX_CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" diff --git a/pkgs/development/compilers/llvm/6/libc++abi.nix b/pkgs/development/compilers/llvm/6/libc++abi.nix new file mode 100644 index 00000000000..05fab16c25c --- /dev/null +++ b/pkgs/development/compilers/llvm/6/libc++abi.nix @@ -0,0 +1,49 @@ +{ stdenv, cmake, fetch, libcxx, libunwind, llvm, version }: + +stdenv.mkDerivation { + name = "libc++abi-${version}"; + + src = fetch "libcxxabi" "06v4dnqh6q0r3p5h2jznlgb69lg79126lzb2s0lcw1k38b2xkili"; + + nativeBuildInputs = [ cmake ]; + buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; + + postUnpack = '' + unpackFile ${libcxx.src} + unpackFile ${llvm.src} + export cmakeFlags="-DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_PATH=$PWD/$(ls -d libcxx-*)" + '' + stdenv.lib.optionalString stdenv.isDarwin '' + export TRIPLE=x86_64-apple-darwin + '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch} + ''; + + installPhase = if stdenv.isDarwin + then '' + for file in lib/*.dylib; do + # this should be done in CMake, but having trouble figuring out + # the magic combination of necessary CMake variables + # if you fancy a try, take a look at + # http://www.cmake.org/Wiki/CMake_RPATH_handling + install_name_tool -id $out/$file $file + done + make install + install -d 755 $out/include + install -m 644 ../include/*.h $out/include + '' + else '' + install -d -m 755 $out/include $out/lib + install -m 644 lib/libc++abi.so.1.0 $out/lib + install -m 644 ../include/cxxabi.h $out/include + ln -s libc++abi.so.1.0 $out/lib/libc++abi.so + ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1 + ''; + + meta = { + homepage = http://libcxxabi.llvm.org/; + description = "A new implementation of low level support for a standard C++ library"; + license = with stdenv.lib.licenses; [ ncsa mit ]; + maintainers = with stdenv.lib.maintainers; [ vlstill ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/development/compilers/llvm/6/lld.nix b/pkgs/development/compilers/llvm/6/lld.nix new file mode 100644 index 00000000000..4997f0a7c94 --- /dev/null +++ b/pkgs/development/compilers/llvm/6/lld.nix @@ -0,0 +1,33 @@ +{ stdenv +, fetch +, cmake +, libxml2 +, llvm +, python +, version +}: + +stdenv.mkDerivation { + name = "lld-${version}"; + + src = fetch "lld" "02qfkjkjq0snmf8dw9c255xkh8dg06ndny1x470300pk7j1lm33b"; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ llvm libxml2 ]; + + outputs = [ "out" "dev" ]; + + enableParallelBuilding = true; + + postInstall = '' + moveToOutput include "$dev" + moveToOutput lib "$dev" + ''; + + meta = { + description = "The LLVM Linker"; + homepage = http://lld.llvm.org/; + license = stdenv.lib.licenses.ncsa; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/compilers/llvm/6/lldb.nix b/pkgs/development/compilers/llvm/6/lldb.nix new file mode 100644 index 00000000000..eb565a93ef6 --- /dev/null +++ b/pkgs/development/compilers/llvm/6/lldb.nix @@ -0,0 +1,56 @@ +{ stdenv +, fetch +, cmake +, zlib +, ncurses +, swig +, which +, libedit +, libxml2 +, llvm +, clang-unwrapped +, python +, version +, darwin +}: + +stdenv.mkDerivation { + name = "lldb-${version}"; + + src = fetch "lldb" "0m6l2ks4banfmdh7xy7l77ri85kmzavgfy81gkc4gl6wg8flrxa6"; + + postPatch = '' + # Fix up various paths that assume llvm and clang are installed in the same place + sed -i 's,".*ClangConfig.cmake","${clang-unwrapped}/lib/cmake/clang/ClangConfig.cmake",' \ + cmake/modules/LLDBStandalone.cmake + sed -i 's,".*tools/clang/include","${clang-unwrapped}/include",' \ + cmake/modules/LLDBStandalone.cmake + sed -i 's,"$.LLVM_LIBRARY_DIR.",${llvm}/lib ${clang-unwrapped}/lib,' \ + cmake/modules/LLDBStandalone.cmake + ''; + + nativeBuildInputs = [ cmake python which swig ]; + buildInputs = [ ncurses zlib libedit libxml2 llvm ] + ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ]; + + CXXFLAGS = "-fno-rtti"; + hardeningDisable = [ "format" ]; + + cmakeFlags = [ + "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic + ]; + + enableParallelBuilding = true; + + postInstall = '' + mkdir -p $out/share/man/man1 + cp ../docs/lldb.1 $out/share/man/man1/ + ''; + + meta = with stdenv.lib; { + description = "A next-generation high-performance debugger"; + homepage = http://llvm.org/; + license = licenses.ncsa; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/compilers/llvm/6/llvm-outputs.patch b/pkgs/development/compilers/llvm/6/llvm-outputs.patch new file mode 100644 index 00000000000..40096fa3497 --- /dev/null +++ b/pkgs/development/compilers/llvm/6/llvm-outputs.patch @@ -0,0 +1,26 @@ +diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp +index 94d426b..37f7794 100644 +--- a/tools/llvm-config/llvm-config.cpp ++++ b/tools/llvm-config/llvm-config.cpp +@@ -333,6 +333,21 @@ int main(int argc, char **argv) { + ActiveIncludeOption = "-I" + ActiveIncludeDir; + } + ++ /// Nix-specific multiple-output handling: override ActiveLibDir if --link-shared ++ if (!IsInDevelopmentTree) { ++ bool WantShared = true; ++ for (int i = 1; i < argc; ++i) { ++ StringRef Arg = argv[i]; ++ if (Arg == "--link-shared") ++ WantShared = true; ++ else if (Arg == "--link-static") ++ WantShared = false; // the last one wins ++ } ++ ++ if (WantShared) ++ ActiveLibDir = std::string("@lib@") + "/lib" + LLVM_LIBDIR_SUFFIX; ++ } ++ + /// We only use `shared library` mode in cases where the static library form + /// of the components provided are not available; note however that this is + /// skipped if we're run from within the build dir. However, once installed, diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix new file mode 100644 index 00000000000..307b2e3a3f2 --- /dev/null +++ b/pkgs/development/compilers/llvm/6/llvm.nix @@ -0,0 +1,182 @@ +{ stdenv +, fetch +, fetchpatch +, cmake +, python +, libffi +, libbfd +, libxml2 +, valgrind +, ncurses +, version +, release_version +, zlib +, compiler-rt_src +, libcxxabi +, debugVersion ? false +, enableManpages ? false +, enableSharedLibraries ? true +, darwin +}: + +let + src = fetch "llvm" "0224xvfg6h40y5lrbnb9qaq3grmdc5rg00xq03s1wxjfbf8krx8z"; + + # Used when creating a version-suffixed symlink of libLLVM.dylib + shortVersion = with stdenv.lib; + concatStringsSep "." (take 2 (splitString "." release_version)); +in stdenv.mkDerivation (rec { + name = "llvm-${version}"; + + unpackPhase = '' + unpackFile ${src} + mv llvm-${version}* llvm + sourceRoot=$PWD/llvm + unpackFile ${compiler-rt_src} + mv compiler-rt-* $sourceRoot/projects/compiler-rt + ''; + + outputs = [ "out" "python" ] + ++ stdenv.lib.optional enableSharedLibraries "lib"; + + nativeBuildInputs = [ cmake python ] + ++ stdenv.lib.optional enableManpages python.pkgs.sphinx; + + buildInputs = [ libxml2 libffi ] + ++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi ]; + + propagatedBuildInputs = [ ncurses zlib ]; + + # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks + # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra + # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd + # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by + # a flag and turn the flag off during the stdenv build. + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace ./projects/compiler-rt/cmake/config-ix.cmake \ + --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' + + substituteInPlace cmake/modules/AddLLVM.cmake \ + --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir INSTALL_NAME_DIR "$lib/lib")" \ + --replace 'set(_install_rpath "@loader_path/../lib" ''${extra_libdir})' "" + '' + # Patch llvm-config to return correct library path based on --link-{shared,static}. + + stdenv.lib.optionalString (enableSharedLibraries) '' + substitute '${./llvm-outputs.patch}' ./llvm-outputs.patch --subst-var lib + patch -p1 < ./llvm-outputs.patch + '' + '' + # FileSystem permissions tests fail with various special bits + substituteInPlace unittests/Support/CMakeLists.txt \ + --replace "Path.cpp" "" + rm unittests/Support/Path.cpp + + # Revert compiler-rt commit that makes codesign mandatory + patch -p1 -i ${./compiler-rt-codesign.patch} -d projects/compiler-rt + '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + patch -p1 -i ${../TLI-musl.patch} + substituteInPlace unittests/Support/CMakeLists.txt \ + --replace "add_subdirectory(DynamicLibrary)" "" + rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp + patch -p1 -i ${./sanitizers-nongnu.patch} -d projects/compiler-rt + ''; + + # hacky fix: created binaries need to be run before installation + preBuild = '' + mkdir -p $out/ + ln -sv $PWD/lib $out + ''; + + cmakeFlags = with stdenv; [ + "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}" + "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc + "-DLLVM_BUILD_TESTS=ON" + "-DLLVM_ENABLE_FFI=ON" + "-DLLVM_ENABLE_RTTI=ON" + "-DCOMPILER_RT_INCLUDE_TESTS=OFF" # FIXME: requires clang source code + ] + ++ stdenv.lib.optional enableSharedLibraries + "-DLLVM_LINK_LLVM_DYLIB=ON" + ++ stdenv.lib.optionals enableManpages [ + "-DLLVM_BUILD_DOCS=ON" + "-DLLVM_ENABLE_SPHINX=ON" + "-DSPHINX_OUTPUT_MAN=ON" + "-DSPHINX_OUTPUT_HTML=OFF" + "-DSPHINX_WARNINGS_AS_ERRORS=OFF" + ] + ++ stdenv.lib.optional (!isDarwin) + "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" + ++ stdenv.lib.optionals (isDarwin) [ + "-DLLVM_ENABLE_LIBCXX=ON" + "-DCAN_TARGET_i386=false" + ] + ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ + "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" + "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" + "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}" + ]; + + postBuild = '' + rm -fR $out + + paxmark m bin/{lli,llvm-rtdyld} + paxmark m unittests/ExecutionEngine/MCJIT/MCJITTests + paxmark m unittests/ExecutionEngine/Orc/OrcJITTests + paxmark m unittests/Support/SupportTests + paxmark m bin/lli-child-target + ''; + + preCheck = '' + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib + ''; + + postInstall = '' + mkdir -p $python/share + mv $out/share/opt-viewer $python/share/opt-viewer + '' + + stdenv.lib.optionalString enableSharedLibraries '' + moveToOutput "lib/libLLVM-*" "$lib" + moveToOutput "lib/libLLVM${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib" + substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ + --replace "\''${_IMPORT_PREFIX}/lib/libLLVM-" "$lib/lib/libLLVM-" + '' + + stdenv.lib.optionalString (stdenv.isDarwin && enableSharedLibraries) '' + substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ + --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib" + ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib + ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib + ''; + + doCheck = stdenv.isLinux && (!stdenv.isi686); + + checkTarget = "check-all"; + + enableParallelBuilding = true; + + passthru.src = src; + + meta = { + description = "Collection of modular and reusable compiler and toolchain technologies"; + homepage = http://llvm.org/; + license = stdenv.lib.licenses.ncsa; + maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric dtzWill ]; + platforms = stdenv.lib.platforms.all; + }; +} // stdenv.lib.optionalAttrs enableManpages { + name = "llvm-manpages-${version}"; + + buildPhase = '' + make docs-llvm-man + ''; + + propagatedBuildInputs = []; + + installPhase = '' + make -C docs install + ''; + + outputs = [ "out" ]; + + doCheck = false; + + meta.description = "man pages for LLVM ${version}"; +}) diff --git a/pkgs/development/compilers/llvm/6/openmp.nix b/pkgs/development/compilers/llvm/6/openmp.nix new file mode 100644 index 00000000000..091e378af2a --- /dev/null +++ b/pkgs/development/compilers/llvm/6/openmp.nix @@ -0,0 +1,26 @@ +{ stdenv +, fetch +, cmake +, zlib +, llvm +, perl +, version +}: + +stdenv.mkDerivation { + name = "openmp-${version}"; + + src = fetch "openmp" "1z1qghx6drdvnlp406q1cp3mgikxxmwymcwzaxbv18vxbw6ha3kw"; + + nativeBuildInputs = [ cmake perl ]; + buildInputs = [ llvm ]; + + enableParallelBuilding = true; + + meta = { + description = "Components required to build an executable OpenMP program"; + homepage = http://openmp.llvm.org/; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/compilers/llvm/6/sanitizers-nongnu.patch b/pkgs/development/compilers/llvm/6/sanitizers-nongnu.patch new file mode 100644 index 00000000000..39a9bbbd207 --- /dev/null +++ b/pkgs/development/compilers/llvm/6/sanitizers-nongnu.patch @@ -0,0 +1,377 @@ +From 8c74f8274369f527f2ada3772f4a0b406cb481ec Mon Sep 17 00:00:00 2001 +From: "Jory A. Pratt" +Date: Sat, 9 Sep 2017 08:31:15 -0500 +Subject: [PATCH] Ported to 6.0, taken from gentoo-musl project. + +------ +Ported to compiler-rt-sanitizers-5.0.0. Taken from + +https://gist.githubusercontent.com/pwaller/2337f3290f12634cad3e3730cff0a6c1/raw/83c87a8585e2f9662494db5662e5361beb093c26/nongnu.patch +Signed-off-by: Jory A. Pratt + +Taken from gentoo-musl project, with a few additional minor fixes. +--- + lib/asan/asan_linux.cc | 4 +-- + lib/interception/interception_linux.cc | 2 +- + lib/interception/interception_linux.h | 3 +- + lib/msan/msan_linux.cc | 2 +- + .../sanitizer_common_interceptors_ioctl.inc | 4 +-- + lib/sanitizer_common/sanitizer_common_syscalls.inc | 2 +- + lib/sanitizer_common/sanitizer_linux_libcdep.cc | 10 +++--- + lib/sanitizer_common/sanitizer_platform.h | 6 ++++ + .../sanitizer_platform_interceptors.h | 4 +-- + .../sanitizer_platform_limits_posix.cc | 40 +++++++++++++--------- + lib/tsan/rtl/tsan_platform_linux.cc | 2 +- + 11 files changed, 46 insertions(+), 33 deletions(-) + +diff --git a/lib/asan/asan_linux.cc b/lib/asan/asan_linux.cc +index 625f32d40..73cf77aca 100644 +--- a/lib/asan/asan_linux.cc ++++ b/lib/asan/asan_linux.cc +@@ -46,7 +46,7 @@ + #include + #endif + +-#if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_SOLARIS ++#if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_SOLARIS || SANITIZER_NONGNU + #include + extern "C" void* _DYNAMIC; + #elif SANITIZER_NETBSD +@@ -139,7 +139,7 @@ void AsanApplyToGlobals(globals_op_fptr op, const void *needle) { + UNIMPLEMENTED(); + } + +-#if SANITIZER_ANDROID ++#if SANITIZER_ANDROID || SANITIZER_NONGNU + // FIXME: should we do anything for Android? + void AsanCheckDynamicRTPrereqs() {} + void AsanCheckIncompatibleRT() {} +diff --git a/lib/interception/interception_linux.cc b/lib/interception/interception_linux.cc +index c991550a4..2b706418b 100644 +--- a/lib/interception/interception_linux.cc ++++ b/lib/interception/interception_linux.cc +@@ -43,7 +43,7 @@ bool GetRealFunctionAddress(const char *func_name, uptr *func_addr, + } + + // Android and Solaris do not have dlvsym +-#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS ++#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_NONGNU + void *GetFuncAddrVer(const char *func_name, const char *ver) { + return dlvsym(RTLD_NEXT, func_name, ver); + } +diff --git a/lib/interception/interception_linux.h b/lib/interception/interception_linux.h +index 98fe51b85..c13302b98 100644 +--- a/lib/interception/interception_linux.h ++++ b/lib/interception/interception_linux.h +@@ -35,8 +35,7 @@ void *GetFuncAddrVer(const char *func_name, const char *ver); + (::__interception::uptr) & (func), \ + (::__interception::uptr) & WRAP(func)) + +-// Android and Solaris do not have dlvsym +-#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS ++#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_NONGNU + #define INTERCEPT_FUNCTION_VER_LINUX_OR_FREEBSD(func, symver) \ + (::__interception::real_##func = (func##_f)( \ + unsigned long)::__interception::GetFuncAddrVer(#func, symver)) +diff --git a/lib/msan/msan_linux.cc b/lib/msan/msan_linux.cc +index 4e6321fcb..4d50feb82 100644 +--- a/lib/msan/msan_linux.cc ++++ b/lib/msan/msan_linux.cc +@@ -13,7 +13,7 @@ + //===----------------------------------------------------------------------===// + + #include "sanitizer_common/sanitizer_platform.h" +-#if SANITIZER_FREEBSD || SANITIZER_LINUX || SANITIZER_NETBSD ++#if SANITIZER_FREEBSD || (SANITIZER_LINUX && !SANITIZER_NONGNU) || SANITIZER_NETBSD + + #include "msan.h" + #include "msan_thread.h" +diff --git a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc +index 24e7548a5..20259b1d6 100644 +--- a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc ++++ b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc +@@ -102,7 +102,7 @@ static void ioctl_table_fill() { + _(SIOCGETVIFCNT, WRITE, struct_sioc_vif_req_sz); + #endif + +-#if SANITIZER_LINUX ++#if SANITIZER_LINUX && !SANITIZER_NONGNU + // Conflicting request ids. + // _(CDROMAUDIOBUFSIZ, NONE, 0); + // _(SNDCTL_TMR_CONTINUE, NONE, 0); +@@ -363,7 +363,7 @@ static void ioctl_table_fill() { + _(VT_WAITACTIVE, NONE, 0); + #endif + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE + _(CYGETDEFTHRESH, WRITE, sizeof(int)); + _(CYGETDEFTIMEOUT, WRITE, sizeof(int)); +diff --git a/lib/sanitizer_common/sanitizer_common_syscalls.inc b/lib/sanitizer_common/sanitizer_common_syscalls.inc +index 469c8eb7e..24f87867d 100644 +--- a/lib/sanitizer_common/sanitizer_common_syscalls.inc ++++ b/lib/sanitizer_common/sanitizer_common_syscalls.inc +@@ -2038,7 +2038,7 @@ POST_SYSCALL(setrlimit)(long res, long resource, void *rlim) { + } + } + +-#if !SANITIZER_ANDROID ++#if !SANITIZER_ANDROID && !SANITIZER_NONGNU + PRE_SYSCALL(prlimit64)(long pid, long resource, const void *new_rlim, + void *old_rlim) { + if (new_rlim) PRE_READ(new_rlim, struct_rlimit64_sz); +diff --git a/lib/sanitizer_common/sanitizer_linux_libcdep.cc b/lib/sanitizer_common/sanitizer_linux_libcdep.cc +index 56fdfc870..a932d5db1 100644 +--- a/lib/sanitizer_common/sanitizer_linux_libcdep.cc ++++ b/lib/sanitizer_common/sanitizer_linux_libcdep.cc +@@ -174,7 +174,7 @@ bool SanitizerGetThreadName(char *name, int max_len) { + } + + #if !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO && \ +- !SANITIZER_NETBSD && !SANITIZER_SOLARIS ++ !SANITIZER_NETBSD && !SANITIZER_SOLARIS && !SANITIZER_NONGNU + static uptr g_tls_size; + + #ifdef __i386__ +@@ -207,7 +207,7 @@ void InitTlsSize() { } + + #if (defined(__x86_64__) || defined(__i386__) || defined(__mips__) \ + || defined(__aarch64__) || defined(__powerpc64__) || defined(__s390__) \ +- || defined(__arm__)) && SANITIZER_LINUX && !SANITIZER_ANDROID ++ || defined(__arm__)) && SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + // sizeof(struct pthread) from glibc. + static atomic_uintptr_t kThreadDescriptorSize; + +@@ -391,7 +391,7 @@ int GetSizeFromHdr(struct dl_phdr_info *info, size_t size, void *data) { + + #if !SANITIZER_GO + static void GetTls(uptr *addr, uptr *size) { +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + # if defined(__x86_64__) || defined(__i386__) || defined(__s390__) + *addr = ThreadSelf(); + *size = GetTlsSize(); +@@ -432,7 +432,7 @@ static void GetTls(uptr *addr, uptr *size) { + *addr = (uptr)tcb->tcb_dtv[1]; + } + } +-#elif SANITIZER_ANDROID ++#elif SANITIZER_ANDROID || SANITIZER_NONGNU + *addr = 0; + *size = 0; + #elif SANITIZER_SOLARIS +@@ -448,7 +448,7 @@ static void GetTls(uptr *addr, uptr *size) { + #if !SANITIZER_GO + uptr GetTlsSize() { + #if SANITIZER_FREEBSD || SANITIZER_ANDROID || SANITIZER_NETBSD || \ +- SANITIZER_SOLARIS ++ SANITIZER_SOLARIS || SANITIZER_NONGNU + uptr addr, size; + GetTls(&addr, &size); + return size; +diff --git a/lib/sanitizer_common/sanitizer_platform.h b/lib/sanitizer_common/sanitizer_platform.h +index 334903c26..fc2afac2c 100644 +--- a/lib/sanitizer_common/sanitizer_platform.h ++++ b/lib/sanitizer_common/sanitizer_platform.h +@@ -195,6 +195,12 @@ + # define SANITIZER_SOLARIS32 0 + #endif + ++#if defined(__linux__) && !defined(__GLIBC__) ++# define SANITIZER_NONGNU 1 ++#else ++# define SANITIZER_NONGNU 0 ++#endif ++ + // By default we allow to use SizeClassAllocator64 on 64-bit platform. + // But in some cases (e.g. AArch64's 39-bit address space) SizeClassAllocator64 + // does not work well and we need to fallback to SizeClassAllocator32. +diff --git a/lib/sanitizer_common/sanitizer_platform_interceptors.h b/lib/sanitizer_common/sanitizer_platform_interceptors.h +index b99ac4480..628d226a1 100644 +--- a/lib/sanitizer_common/sanitizer_platform_interceptors.h ++++ b/lib/sanitizer_common/sanitizer_platform_interceptors.h +@@ -38,7 +38,7 @@ + # include "sanitizer_platform_limits_solaris.h" + #endif + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + # define SI_LINUX_NOT_ANDROID 1 + #else + # define SI_LINUX_NOT_ANDROID 0 +@@ -291,7 +291,7 @@ + (SI_FREEBSD || SI_MAC || SI_LINUX_NOT_ANDROID) + #define SANITIZER_INTERCEPT_ETHER_R (SI_FREEBSD || SI_LINUX_NOT_ANDROID) + #define SANITIZER_INTERCEPT_SHMCTL \ +- (SI_NETBSD || SI_SOLARIS || ((SI_FREEBSD || SI_LINUX_NOT_ANDROID) && \ ++ (SI_NETBSD || SI_SOLARIS || ((SI_FREEBSD || SI_LINUX_NOT_ANDROID || SANITIZER_NONGNU) && \ + SANITIZER_WORDSIZE == 64)) // NOLINT + #define SANITIZER_INTERCEPT_RANDOM_R SI_LINUX_NOT_ANDROID + #define SANITIZER_INTERCEPT_PTHREAD_ATTR_GET SI_POSIX +diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc +index f12e8206a..8880197b0 100644 +--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc ++++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc +@@ -14,6 +14,9 @@ + + #include "sanitizer_platform.h" + ++// Workaround musl <--> linux conflicting definition of 'struct sysinfo' ++#define _LINUX_SYSINFO_H ++ + #if SANITIZER_LINUX || SANITIZER_FREEBSD || SANITIZER_MAC + // Tests in this file assume that off_t-dependent data structures match the + // libc ABI. For example, struct dirent here is what readdir() function (as +@@ -138,12 +141,14 @@ typedef struct user_fpregs elf_fpregset_t; + + #if SANITIZER_LINUX && !SANITIZER_ANDROID + #include +-#include ++# if !SANITIZER_NONGNU ++# include ++# endif + #include +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include + #if HAVE_RPC_XDR_H + # include + #elif HAVE_TIRPC_RPC_XDR_H +@@ -159,7 +164,8 @@ typedef struct user_fpregs elf_fpregset_t; + # include + #endif + #include +-#include ++// #include ++#include + #include + #include + #include +@@ -252,7 +258,7 @@ namespace __sanitizer { + unsigned struct_itimerspec_sz = sizeof(struct itimerspec); + #endif // SANITIZER_LINUX || SANITIZER_FREEBSD + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + unsigned struct_ustat_sz = sizeof(struct ustat); + unsigned struct_rlimit64_sz = sizeof(struct rlimit64); + unsigned struct_statvfs64_sz = sizeof(struct statvfs64); +@@ -311,7 +317,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(ElfW(Phdr)); + unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + #endif + +-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID ++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU + int glob_nomatch = GLOB_NOMATCH; + int glob_altdirfunc = GLOB_ALTDIRFUNC; + #endif +@@ -405,7 +411,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + unsigned struct_termios_sz = sizeof(struct termios); + unsigned struct_winsize_sz = sizeof(struct winsize); + +-#if SANITIZER_LINUX ++#if SANITIZER_LINUX && !SANITIZER_NONGNU + unsigned struct_arpreq_sz = sizeof(struct arpreq); + unsigned struct_cdrom_msf_sz = sizeof(struct cdrom_msf); + unsigned struct_cdrom_multisession_sz = sizeof(struct cdrom_multisession); +@@ -455,7 +461,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + unsigned struct_vt_mode_sz = sizeof(struct vt_mode); + #endif // SANITIZER_LINUX || SANITIZER_FREEBSD + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct); + unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor); + #if EV_VERSION > (0x010000) +@@ -823,7 +829,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + unsigned IOCTL_VT_WAITACTIVE = VT_WAITACTIVE; + #endif // SANITIZER_LINUX || SANITIZER_FREEBSD + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH; + unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT; + unsigned IOCTL_CYGETMON = CYGETMON; +@@ -978,7 +984,7 @@ CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phdr); + CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phnum); + #endif // SANITIZER_LINUX || SANITIZER_FREEBSD + +-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID ++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU + CHECK_TYPE_SIZE(glob_t); + CHECK_SIZE_AND_OFFSET(glob_t, gl_pathc); + CHECK_SIZE_AND_OFFSET(glob_t, gl_pathv); +@@ -1012,6 +1018,7 @@ CHECK_TYPE_SIZE(iovec); + CHECK_SIZE_AND_OFFSET(iovec, iov_base); + CHECK_SIZE_AND_OFFSET(iovec, iov_len); + ++#if !SANITIZER_NONGNU + CHECK_TYPE_SIZE(msghdr); + CHECK_SIZE_AND_OFFSET(msghdr, msg_name); + CHECK_SIZE_AND_OFFSET(msghdr, msg_namelen); +@@ -1025,6 +1032,7 @@ CHECK_TYPE_SIZE(cmsghdr); + CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_len); + CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_level); + CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_type); ++#endif + + COMPILER_CHECK(sizeof(__sanitizer_dirent) <= sizeof(dirent)); + CHECK_SIZE_AND_OFFSET(dirent, d_ino); +@@ -1127,7 +1135,7 @@ CHECK_SIZE_AND_OFFSET(mntent, mnt_passno); + + CHECK_TYPE_SIZE(ether_addr); + +-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID ++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU + CHECK_TYPE_SIZE(ipc_perm); + # if SANITIZER_FREEBSD + CHECK_SIZE_AND_OFFSET(ipc_perm, key); +@@ -1188,7 +1196,7 @@ CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_dstaddr); + CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_data); + #endif + +-#if SANITIZER_LINUX ++#if SANITIZER_LINUX && !SANITIZER_NONGNU + COMPILER_CHECK(sizeof(__sanitizer_mallinfo) == sizeof(struct mallinfo)); + #endif + +@@ -1238,7 +1246,7 @@ COMPILER_CHECK(__sanitizer_XDR_DECODE == XDR_DECODE); + COMPILER_CHECK(__sanitizer_XDR_FREE == XDR_FREE); + #endif + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + COMPILER_CHECK(sizeof(__sanitizer_FILE) <= sizeof(FILE)); + CHECK_SIZE_AND_OFFSET(FILE, _flags); + CHECK_SIZE_AND_OFFSET(FILE, _IO_read_ptr); +@@ -1257,7 +1265,7 @@ CHECK_SIZE_AND_OFFSET(FILE, _chain); + CHECK_SIZE_AND_OFFSET(FILE, _fileno); + #endif + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + COMPILER_CHECK(sizeof(__sanitizer__obstack_chunk) <= sizeof(_obstack_chunk)); + CHECK_SIZE_AND_OFFSET(_obstack_chunk, limit); + CHECK_SIZE_AND_OFFSET(_obstack_chunk, prev); +diff --git a/lib/tsan/rtl/tsan_platform_linux.cc b/lib/tsan/rtl/tsan_platform_linux.cc +index e14d5f575..389a3bc88 100644 +--- a/lib/tsan/rtl/tsan_platform_linux.cc ++++ b/lib/tsan/rtl/tsan_platform_linux.cc +@@ -285,7 +285,7 @@ void InitializePlatform() { + // This is required to properly "close" the fds, because we do not see internal + // closes within glibc. The code is a pure hack. + int ExtractResolvFDs(void *state, int *fds, int nfd) { +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + int cnt = 0; + struct __res_state *statp = (struct __res_state*)state; + for (int i = 0; i < MAXNS && cnt < nfd; i++) { +-- +2.16.2 + diff --git a/pkgs/development/compilers/manticore/default.nix b/pkgs/development/compilers/manticore/default.nix index 795830e0e70..2c8fe186612 100644 --- a/pkgs/development/compilers/manticore/default.nix +++ b/pkgs/development/compilers/manticore/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchFromGitHub, coreutils, autoreconfHook, smlnj }: let - rev = "592a5714595b4448b646a7d49df04c285668c2f8"; + rev= "f8e08c89dd98b7b8dba318d245dcd4abd3328ae2"; in stdenv.mkDerivation rec { name = "manticore-${version}"; - version = "2014.08.18"; + version = "2017.08.22"; src = fetchFromGitHub { - owner = "rrnewton"; - repo = "manticore_temp_mirror"; - sha256 = "1snwlm9a31wfgvzb80y7r7yvc6n0k0bi675lqwzll95as7cdswwi"; + owner = "ManticoreProject"; + repo = "manticore"; + sha256 = "06icq0qdzwyzbsyms53blxpb9i26n2vn7ci8p9xvvnq687hxhr73"; inherit rev; }; @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { mkdir -p $out cd $out unpackFile $src - mv manticore_temp_mirror-${rev}-src repo_checkout + mv source repo_checkout cd repo_checkout chmod u+w . -R ''; diff --git a/pkgs/development/compilers/opendylan/default.nix b/pkgs/development/compilers/opendylan/default.nix index 773ab9f473f..95f4dc5b215 100644 --- a/pkgs/development/compilers/opendylan/default.nix +++ b/pkgs/development/compilers/opendylan/default.nix @@ -2,18 +2,18 @@ {stdenv, fetchgit, boehmgc, mps, gnused, opendylan-bootstrap, autoconf, automake, perl, makeWrapper, gcc }: stdenv.mkDerivation { - name = "opendylan-2013.2"; + name = "opendylan-2016.1pre"; src = fetchgit { url = https://github.com/dylan-lang/opendylan; - rev = "ce9b14dab6cb9ffedc69fae8c6df524c0c79abd3"; - sha256 = "17jvhv0y63fj25ma05k70b7phcwgjyna5qkrirk48z3xapb8bknd"; + rev = "cd9a8395586d33cc43a8611c1dc0513e69ee82dd"; + sha256 = "00r1dm7mjy5p4hfm13vc4b6qryap40zinia3y15rhvalc3i2np4b"; fetchSubmodules = true; }; buildInputs = (if stdenv.system == "i686-linux" then [ mps ] else [ boehmgc ]) ++ [ opendylan-bootstrap boehmgc gnused autoconf automake perl makeWrapper - ] ; + ]; preConfigure = if stdenv.system == "i686-linux" then '' mkdir -p $TMPDIR/mps diff --git a/pkgs/development/compilers/openjdk/10.nix b/pkgs/development/compilers/openjdk/10.nix new file mode 100644 index 00000000000..796d4fcebfb --- /dev/null +++ b/pkgs/development/compilers/openjdk/10.nix @@ -0,0 +1,202 @@ +{ stdenv, lib, fetchurl, bash, cpio, pkgconfig, file, which, unzip, zip, cups, freetype +, alsaLib, bootjdk, cacert, perl, liberation_ttf, fontconfig, zlib, lndir +, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor +, libjpeg, giflib +, setJavaClassPath +, minimal ? false +, enableGnome2 ? true, gtk2, gnome_vfs, glib, GConf +}: + +let + + /** + * The JRE libraries are in directories that depend on the CPU. + */ + architecture = + if stdenv.system == "i686-linux" then + "i386" + else "amd64"; + + update = "10"; + build = "46"; + repover = "jdk-${update}+${build}"; + paxflags = if stdenv.isi686 then "msp" else "m"; + + openjdk10 = stdenv.mkDerivation { + name = "openjdk-${update}-b${build}"; + + src = fetchurl { + url = "http://hg.openjdk.java.net/jdk-updates/jdk10u/archive/${repover}.tar.gz"; + sha256 = "1a2cjad816qilsigkq035rqzfhzmq5vaz1klilrrws456flbsjlg"; + }; + + outputs = [ "out" "jre" ]; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ + cpio file which unzip zip perl bootjdk zlib cups freetype alsaLib + libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst + libXi libXinerama libXcursor lndir fontconfig + ] ++ lib.optionals (!minimal && enableGnome2) [ + gtk2 gnome_vfs GConf glib + ]; + + patches = [ + ./fix-java-home-jdk10.patch + ./read-truststore-from-env-jdk10.patch + ./currency-date-range-jdk10.patch + ] ++ lib.optionals (!minimal && enableGnome2) [ + ./swing-use-gtk-jdk10.patch + ]; + + preConfigure = '' + chmod +x configure + substituteInPlace configure --replace /bin/bash "${bash}/bin/bash" + + configureFlagsArray=( + "--with-boot-jdk=${bootjdk.home}" + "--with-update-version=${update}" + "--with-build-number=${build}" + "--with-milestone=fcs" + "--enable-unlimited-crypto" + "--disable-debug-symbols" + "--disable-freetype-bundling" + "--with-zlib=system" + "--with-giflib=system" + "--with-stdc++lib=dynamic" + + # glibc 2.24 deprecated readdir_r so we need this + # See https://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg49006.html + "--with-extra-cflags=-Wno-error=deprecated-declarations -Wno-error=format-contains-nul -Wno-error=unused-result" + '' + + lib.optionalString minimal "\"--enable-headless-only\"" + + ");" + # https://bugzilla.redhat.com/show_bug.cgi?id=1306558 + # https://github.com/JetBrains/jdk8u/commit/eaa5e0711a43d64874111254d74893fa299d5716 + + stdenv.lib.optionalString stdenv.cc.isGNU '' + NIX_CFLAGS_COMPILE+=" -fno-lifetime-dse -fno-delete-null-pointer-checks -std=gnu++98 -Wno-error" + ''; + + NIX_LDFLAGS= lib.optionals (!minimal) [ + "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" + ] ++ lib.optionals (!minimal && enableGnome2) [ + "-lgtk-x11-2.0" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2" + ]; + + buildFlags = [ "all" ]; + + installPhase = '' + mkdir -p $out/lib/openjdk $out/share $jre/lib/openjdk + + cp -av build/*/images/jdk/* $out/lib/openjdk + + # Remove some broken manpages. + rm -rf $out/lib/openjdk/man/ja* + + # Mirror some stuff in top-level. + mkdir $out/include $out/share/man + ln -s $out/lib/openjdk/include/* $out/include/ + ln -s $out/lib/openjdk/man/* $out/share/man/ + + # jni.h expects jni_md.h to be in the header search path. + ln -s $out/include/linux/*_md.h $out/include/ + + # Copy the JRE to a separate output and setup fallback fonts + cp -av build/*/images/jre $jre/lib/openjdk/ + mkdir $out/lib/openjdk/jre + ${lib.optionalString (!minimal) '' + mkdir -p $jre/lib/openjdk/jre/lib/fonts/fallback + lndir ${liberation_ttf}/share/fonts/truetype $jre/lib/openjdk/jre/lib/fonts/fallback + ''} + + # Remove crap from the installation. + rm -rf $out/lib/openjdk/demo + ${lib.optionalString minimal '' + for d in $out/lib/openjdk/lib $jre/lib/openjdk/jre/lib; do + rm ''${d}/{libjsound,libjsoundalsa,libawt*,libfontmanager}.so + done + ''} + + lndir $jre/lib/openjdk/jre $out/lib/openjdk/jre + + # Set PaX markings + exes=$(file $out/lib/openjdk/bin/* $jre/lib/openjdk/jre/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//') + echo "to mark: *$exes*" + for file in $exes; do + echo "marking *$file*" + paxmark ${paxflags} "$file" + done + + # Remove duplicate binaries. + for i in $(cd $out/lib/openjdk/bin && echo *); do + if [ "$i" = java ]; then continue; fi + if cmp -s $out/lib/openjdk/bin/$i $jre/lib/openjdk/jre/bin/$i; then + ln -sfn $jre/lib/openjdk/jre/bin/$i $out/lib/openjdk/bin/$i + fi + done + + ln -s $out/lib/openjdk/bin $out/bin + ln -s $jre/lib/openjdk/jre/bin $jre/bin + ln -s $jre/lib/openjdk/jre $out/jre + ''; + + # FIXME: this is unnecessary once the multiple-outputs branch is merged. + preFixup = '' + prefix=$jre stripDirs "$stripDebugList" "''${stripDebugFlags:--S}" + patchELF $jre + propagatedBuildInputs+=" $jre" + + # Propagate the setJavaClassPath setup hook from the JRE so that + # any package that depends on the JRE has $CLASSPATH set up + # properly. + mkdir -p $jre/nix-support + #TODO or printWords? cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040 + echo -n "${setJavaClassPath}" > $jre/nix-support/propagated-build-inputs + + # Set JAVA_HOME automatically. + mkdir -p $out/nix-support + cat < $out/nix-support/setup-hook + if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out/lib/openjdk; fi + EOF + ''; + + postFixup = '' + # Build the set of output library directories to rpath against + LIBDIRS="" + for output in $outputs; do + LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS" + done + + # Add the local library paths to remove dependencies on the bootstrap + for output in $outputs; do + OUTPUTDIR=$(eval echo \$$output) + BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) + echo "$BINLIBS" | while read i; do + patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true + patchelf --shrink-rpath "$i" || true + done + done + + # Test to make sure that we don't depend on the bootstrap + for output in $outputs; do + if grep -q -r '${bootjdk}' $(eval echo \$$output); then + echo "Extraneous references to ${bootjdk} detected" + exit 1 + fi + done + ''; + + meta = with stdenv.lib; { + homepage = http://openjdk.java.net/; + license = licenses.gpl2; + description = "The open-source Java Development Kit"; + maintainers = with maintainers; [ edwtjo ]; + platforms = ["i686-linux" "x86_64-linux"]; + }; + + passthru = { + inherit architecture; + home = "${openjdk10}/lib/openjdk"; + }; + }; +in openjdk10 diff --git a/pkgs/development/compilers/openjdk/currency-date-range-jdk10.patch b/pkgs/development/compilers/openjdk/currency-date-range-jdk10.patch new file mode 100644 index 00000000000..e058eff0746 --- /dev/null +++ b/pkgs/development/compilers/openjdk/currency-date-range-jdk10.patch @@ -0,0 +1,13 @@ +--- ./make/jdk/src/classes/build/tools/generatecurrencydata/GenerateCurrencyData.java ++++ ./make/jdk/src/classes/build/tools/generatecurrencydata/GenerateCurrencyData.java +@@ -281,8 +281,8 @@ + checkCurrencyCode(newCurrency); + String timeString = currencyInfo.substring(4, length - 4); + long time = format.parse(timeString).getTime(); +- if (Math.abs(time - System.currentTimeMillis()) > ((long) 10) * 365 * 24 * 60 * 60 * 1000) { +- throw new RuntimeException("time is more than 10 years from present: " + time); ++ if (Math.abs(time - System.currentTimeMillis()) > ((long) 20) * 365 * 24 * 60 * 60 * 1000) { ++ throw new RuntimeException("time is more than 20 years from present: " + time); + } + specialCaseCutOverTimes[specialCaseCount] = time; + specialCaseOldCurrencies[specialCaseCount] = oldCurrency; diff --git a/pkgs/development/compilers/openjdk/fix-java-home-jdk10.patch b/pkgs/development/compilers/openjdk/fix-java-home-jdk10.patch new file mode 100644 index 00000000000..c037fde2972 --- /dev/null +++ b/pkgs/development/compilers/openjdk/fix-java-home-jdk10.patch @@ -0,0 +1,14 @@ +--- a/src/hotspot/os/linux/os_linux.cpp 2017-07-04 23:09:02.533972226 -0400 ++++ b/src/hotspot/os/linux/os_linux.cpp 2017-07-04 23:07:52.118338845 -0400 +@@ -2270,8 +2270,5 @@ + assert(ret, "cannot locate libjvm"); + char *rp = NULL; + if (ret && dli_fname[0] != '\0') { +- rp = os::Posix::realpath(dli_fname, buf, buflen); +- } +- if (rp == NULL) { +- return; ++ snprintf(buf, buflen, "%s", dli_fname); + } + + if (Arguments::sun_java_launcher_is_altjvm()) { diff --git a/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk10.patch b/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk10.patch new file mode 100644 index 00000000000..b5abc1d794d --- /dev/null +++ b/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk10.patch @@ -0,0 +1,20 @@ +--- a/src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java 2017-06-26 21:48:25.000000000 -0400 ++++ b/src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java 2017-07-05 20:45:57.491295030 -0400 +@@ -71,6 +71,7 @@ + * + * The preference of the default trusted KeyStore is: + * javax.net.ssl.trustStore ++ * system environment variable JAVAX_NET_SSL_TRUSTSTORE + * jssecacerts + * cacerts + */ +@@ -144,6 +145,9 @@ + String temporaryName = ""; + File temporaryFile = null; + long temporaryTime = 0L; ++ if (storePropName == null){ ++ storePropName = System.getenv("JAVAX_NET_SSL_TRUSTSTORE"); ++ } + if (!"NONE".equals(storePropName)) { + String[] fileNames = + new String[] {storePropName, defaultStore}; diff --git a/pkgs/development/compilers/openjdk/swing-use-gtk-jdk10.patch b/pkgs/development/compilers/openjdk/swing-use-gtk-jdk10.patch new file mode 100644 index 00000000000..b9258c500db --- /dev/null +++ b/pkgs/development/compilers/openjdk/swing-use-gtk-jdk10.patch @@ -0,0 +1,24 @@ +--- a/src/java.desktop/share/classes/javax/swing/UIManager.java ++++ b/src/java.desktop/share/classes/javax/swing/UIManager.java +@@ -607,11 +607,9 @@ + if (osType == OSInfo.OSType.WINDOWS) { + return "com.sun.java.swing.plaf.windows.WindowsLookAndFeel"; + } else { +- String desktop = AccessController.doPrivileged(new GetPropertyAction("sun.desktop")); + Toolkit toolkit = Toolkit.getDefaultToolkit(); +- if ("gnome".equals(desktop) && +- toolkit instanceof SunToolkit && +- ((SunToolkit) toolkit).isNativeGTKAvailable()) { ++ if (toolkit instanceof SunToolkit && ++ ((SunToolkit) toolkit).isNativeGTKAvailable()) { + // May be set on Linux and Solaris boxs. + return "com.sun.java.swing.plaf.gtk.GTKLookAndFeel"; + } +@@ -1341,7 +1339,7 @@ + lafName = (String) lafData.remove("defaultlaf"); + } + if (lafName == null) { +- lafName = getCrossPlatformLookAndFeelClassName(); ++ lafName = getSystemLookAndFeelClassName(); + } + lafName = swingProps.getProperty(defaultLAFKey, lafName); diff --git a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix index 5bafa70af9f..bdd367ef352 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix @@ -1,11 +1,11 @@ import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "161"; + patchVersion = "171"; downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; - sha256.i686-linux = "1p6p93msn3bsg9775rq171kd4160w4w8z57p0qpjdjycfix62sfg"; - sha256.x86_64-linux = "07h2wah80qr78y0f821z12lbdmsv90xbckdn3glnj2riwfh5dg3d"; - sha256.armv7l-linux = "0mngw2lnhx3hzgp444advybhjn5hjk3mi14y72km4kp03gh82a7x"; - sha256.aarch64-linux = "18l5fny7yxhpj5c935rnlq4pvwadyr5zkid6yh9x87frl401shy7"; + sha256.i686-linux = "0dh5r02v40pinway952fflw2r0i1xi67hmyb87c278qfp4jn929p"; + sha256.x86_64-linux = "10jr4z0bw9wcws5xgc4qkw101cadfx5bkyvcnc4l3v5axwvjipdn"; + sha256.armv7l-linux = "1bqivmp1wfnypgg5bsfzi25yzl7vd2xncfap9mi8jn63aj633dw0"; + sha256.aarch64-linux = "1016lf3g1syjsl29m58s2s2w9nkj4jkvxhqg4s35vy41cs2v77j7"; jceName = "jce_policy-8.zip"; jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html; sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk"; diff --git a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix index 78d5a6f2c40..901eea0f8f1 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix @@ -1,11 +1,11 @@ import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "162"; + patchVersion = "172"; downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; - sha256.i686-linux = "097vlvvj1vr7815rgarf5x97lagi4q0kai0x4lvd4y3wrzdqikzf"; - sha256.x86_64-linux = "0mq2d0lj53gzn4qqdjdgbwl0h857k2rnsnr2hkmvihnrgza85v38"; - sha256.armv7l-linux = "0xzsgdmpgs1n1g70hgly0mpxflhjrmq3vxwx8gl0kmqdiv4hqwjp"; - sha256.aarch64-linux = "19ykcsmvkf7sdq2lqwvyi60nhb8v7f88dqjycimrsar9y4r7skf8"; + sha256.i686-linux = "0csskx8xis0dr1948j76fgrwwsj4gzdbjqfi7if4v4j62b9i0hqa"; + sha256.x86_64-linux = "0inkx73rwv7cvn9lqcr3hmnm0sr89h1fh29yamikb4dn02a0p818"; + sha256.armv7l-linux = "1576cb0rlc42dsnmh388gy1wjas7ac6g135s8h74x8sm4b56qpln"; + sha256.aarch64-linux = "0zpkmq8zxmpifawj611fg67srki63haz02rm6xwfc5qm2lxx5g6s"; jceName = "jce_policy-8.zip"; jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html; sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk"; diff --git a/pkgs/development/compilers/purescript/psc-package/default.nix b/pkgs/development/compilers/purescript/psc-package/default.nix index 451722aea06..d94179e16fe 100644 --- a/pkgs/development/compilers/purescript/psc-package/default.nix +++ b/pkgs/development/compilers/purescript/psc-package/default.nix @@ -4,13 +4,13 @@ with lib; mkDerivation rec { pname = "psc-package"; - version = "0.2.5"; + version = "0.3.2"; src = fetchFromGitHub { owner = "purescript"; repo = pname; rev = "v${version}"; - sha256 = "15g0l8g8l6m5x4f73w68r9iav091x12b3wjxh0rx3ggnj093g6j1"; + sha256 = "1zpzcyh82xl0grvgcj8b7yzh053i9z94kbym5qrv413pcx7w50cm"; }; isLibrary = false; diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index dd15580c11b..b1c733d5519 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -20,11 +20,15 @@ in rec { configureFlags = [ "--release-channel=stable" ]; + # 1. Upstream is not running tests on aarch64: + # see https://github.com/rust-lang/rust/issues/49807#issuecomment-380860567 + # So we do the same. + # 2. Tests run out of memory for i686 + doCheck = !stdenv.isAarch64 && !stdenv.isi686; + patches = [ ./patches/0001-Disable-fragile-tests-libstd-net-tcp-on-Darwin-Linux.patch - ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch - # https://github.com/rust-lang/rust/issues/45410 - ++ stdenv.lib.optional stdenv.isAarch64 ./patches/aarch64-disable-test_loading_cosine.patch; + ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; }; diff --git a/pkgs/development/compilers/rust/patches/aarch64-disable-test_loading_cosine.patch b/pkgs/development/compilers/rust/patches/aarch64-disable-test_loading_cosine.patch deleted file mode 100644 index bafab0e9ef7..00000000000 --- a/pkgs/development/compilers/rust/patches/aarch64-disable-test_loading_cosine.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/librustc_metadata/dynamic_lib.rs b/src/librustc_metadata/dynamic_lib.rs -index 1b42fa0..92256dc 100644 ---- a/src/librustc_metadata/dynamic_lib.rs -+++ b/src/librustc_metadata/dynamic_lib.rs -@@ -80,6 +80,7 @@ mod tests { - use std::mem; - - #[test] -+ #[ignore] - fn test_loading_cosine() { - if cfg!(windows) { - return diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 92b149865fa..685fe3bf208 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -55,6 +55,7 @@ stdenv.mkDerivation { RUSTFLAGS = "-Ccodegen-units=10"; # We need rust to build rust. If we don't provide it, configure will try to download it. + # Reference: https://github.com/rust-lang/rust/blob/master/src/bootstrap/configure.py configureFlags = configureFlags ++ [ "--enable-local-rust" "--local-rust-root=${rustPlatform.rust.rustc}" "--enable-rpath" ] ++ [ "--enable-vendor" ] @@ -102,8 +103,7 @@ stdenv.mkDerivation { # Useful debugging parameter # export VERBOSE=1 - '' - + optionalString stdenv.isDarwin '' + '' + optionalString stdenv.isDarwin '' # Disable all lldb tests. # error: Can't run LLDB test because LLDB's python path is not set rm -vr src/test/debuginfo/* diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix index 7622fbb9d18..bfbd9d05d05 100644 --- a/pkgs/development/compilers/scala/default.nix +++ b/pkgs/development/compilers/scala/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }: stdenv.mkDerivation rec { - name = "scala-2.12.4"; + name = "scala-2.12.5"; src = fetchurl { url = "http://www.scala-lang.org/files/archive/${name}.tgz"; - sha256 = "089a54qj8psh4jxqbrrwk5zahw13fyqq24l87s3031xa675a0m4m"; + sha256 = "18bah2n3jfvc3cb10n4b3d6pwm3rwlqp7lrfvafjxccmlklzyqdj"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/sdcc/default.nix b/pkgs/development/compilers/sdcc/default.nix index 7383f39f6cb..ec93ba79d44 100644 --- a/pkgs/development/compilers/sdcc/default.nix +++ b/pkgs/development/compilers/sdcc/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, bison, flex, boost, texinfo, gputils ? null }: stdenv.mkDerivation rec { - version = "3.6.0"; + version = "3.7.0"; name = "sdcc-${version}"; src = fetchurl { url = "mirror://sourceforge/sdcc/sdcc-src-${version}.tar.bz2"; - sha256 = "0x53gh5yrrfjvlnkk29mjn8hq4v52alrsf7c8nsyzzq13sqwwpg8"; + sha256 = "13llvx0j3v5qa7qd4fh7nix4j3alpd3ccprxvx163c4q8q4lfkc5"; }; # TODO: remove this comment when gputils != null is tested diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index 063fd71c043..f8186cfbaa5 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -35,14 +35,18 @@ stdenv.mkDerivation rec { buildInputs = [ tcl readline libffi python3 bison flex ]; patchPhase = '' + substituteInPlace ../yosys-abc/Makefile \ + --replace 'CC := gcc' "" substituteInPlace ./Makefile \ + --replace 'CXX = clang' "" \ + --replace 'ABCMKARGS = CC="$(CXX)"' 'ABCMKARGS =' \ --replace 'echo UNKNOWN' 'echo ${substring 0 10 (elemAt srcs 0).rev}' ''; preBuild = '' chmod -R u+w ../yosys-abc ln -s ../yosys-abc abc - make config-gcc + make config-${if stdenv.cc.isClang or false then "clang" else "gcc"} echo 'ABCREV := default' >> Makefile.conf makeFlags="PREFIX=$out $makeFlags" ''; @@ -61,6 +65,6 @@ stdenv.mkDerivation rec { homepage = http://www.clifford.at/yosys/; license = stdenv.lib.licenses.isc; maintainers = with stdenv.lib.maintainers; [ shell thoughtpolice ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/compilers/zig/default.nix b/pkgs/development/compilers/zig/default.nix index cffc683f9e7..44d1f7bfe4a 100644 --- a/pkgs/development/compilers/zig/default.nix +++ b/pkgs/development/compilers/zig/default.nix @@ -1,17 +1,18 @@ -{ stdenv, fetchFromGitHub, cmake, llvmPackages }: +{ stdenv, fetchFromGitHub, cmake, llvmPackages, libxml2 }: stdenv.mkDerivation rec { - version = "0.1.1"; + version = "0.2.0"; name = "zig-${version}"; src = fetchFromGitHub { owner = "zig-lang"; repo = "zig"; rev = "${version}"; - sha256 = "01yqjyi25f99bfmxxwyh45k7j84z0zg7n9jl8gg0draf96mzdh06"; + sha256 = "0lym28z9mj6hfiq78x1fsd8y89h8xyfc1jgqyazi1g9r72427n07"; }; - buildInputs = [ cmake llvmPackages.clang-unwrapped llvmPackages.llvm ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ llvmPackages.clang-unwrapped llvmPackages.llvm libxml2 ]; cmakeFlags = [ "-DZIG_LIBC_INCLUDE_DIR=${stdenv.cc.libc_dev}/include" @@ -26,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Programming languaged designed for robustness, optimality, and clarity"; - homepage = http://ziglang.org/; + homepage = https://ziglang.org/; license = licenses.mit; platforms = platforms.unix; maintainers = [ maintainers.andrewrk ]; diff --git a/pkgs/development/compilers/zulu/default.nix b/pkgs/development/compilers/zulu/default.nix index 040af83ece2..908aa29e178 100644 --- a/pkgs/development/compilers/zulu/default.nix +++ b/pkgs/development/compilers/zulu/default.nix @@ -4,11 +4,11 @@ , swingSupport ? true }: let - version = "9.0.0.15"; - openjdk = "9.0.0"; + version = "10.1+11"; + openjdk = "10"; - sha256_linux = "0s9vr135yhdnxqds4hfafyrlh33j6g78v6l1v0ap2y6yqgabh9qi"; - sha256_darwin = "104w1msrwijf8dv3n65hjinp7i47z6ygzjipdzqriqam2zljxn4b"; + sha256_linux = "0g51n2zc7inal29n5ly3mrrfj15c7vl87zb6b2r1q67n4mnbrgm8"; + sha256_darwin = "1c5ib136nv6gz7ij31mg15nhzrl6zr7kp8spm17zwm1ib82bc73y"; platform = if stdenv.isDarwin then "macosx" else "linux"; hash = if stdenv.isDarwin then sha256_darwin else sha256_linux; diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index a6d83fc770c..77c2687e291 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -98,7 +98,7 @@ go.stdenv.mkDerivation ( rmdir goPath '') + (lib.optionalString (extraSrcPaths != []) '' - ${rsync}/bin/rsync -a ${lib.concatMapStrings (p: "${p}/src") extraSrcPaths} go + ${rsync}/bin/rsync -a ${lib.concatMapStringsSep " " (p: "${p}/src") extraSrcPaths} go '') + '' export GOPATH=$NIX_BUILD_TOP/go:$GOPATH diff --git a/pkgs/development/guile-modules/guile-fibers/default.nix b/pkgs/development/guile-modules/guile-fibers/default.nix index 5f82a93c513..cfb56790221 100644 --- a/pkgs/development/guile-modules/guile-fibers/default.nix +++ b/pkgs/development/guile-modules/guile-fibers/default.nix @@ -23,6 +23,6 @@ in stdenv.mkDerivation { homepage = https://github.com/wingo/fibers; license = licenses.lgpl3Plus; maintainers = with maintainers; [ vyp ]; - platforms = platforms.all; + platforms = platforms.linux; }; } diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 6d95805ddb6..3d050ca00f5 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -37,7 +37,7 @@ self: super: { hackage-security = dontCheck super.hackage-security; # Link statically to avoid runtime dependency on GHC. - jailbreak-cabal = (disableSharedExecutables super.jailbreak-cabal).override { Cabal = self.Cabal_1_20_0_4; }; + jailbreak-cabal = disableSharedExecutables super.jailbreak-cabal; # enable using a local hoogle with extra packagages in the database # nix-shell -p "haskellPackages.hoogleLocal { packages = with haskellPackages; [ mtl lens ]; }" @@ -102,6 +102,7 @@ self: super: { # Test suite doesn't terminate hzk = dontCheck super.hzk; + # Tests require a Kafka broker running locally haskakafka = dontCheck super.haskakafka; @@ -603,12 +604,12 @@ self: super: { ''; doCheck = false; # https://github.com/chrisdone/hindent/issues/299 })).override { - haskell-src-exts = self.haskell-src-exts_1_20_1; + haskell-src-exts = self.haskell-src-exts_1_20_2; }; # Need newer versions of their dependencies than the ones we have in LTS-10.x. - cabal2nix = super.cabal2nix.override { hpack = self.hpack_0_27_0; }; - hlint = super.hlint.overrideScope (self: super: { haskell-src-exts = self.haskell-src-exts_1_20_1; }); + cabal2nix = super.cabal2nix.overrideScope (self: super: { hpack = self.hpack_0_27_0; hackage-db = self.hackage-db_2_0_1; }); + hlint = super.hlint.overrideScope (self: super: { haskell-src-exts = self.haskell-src-exts_1_20_2; }); # https://github.com/bos/configurator/issues/22 configurator = dontCheck super.configurator; @@ -847,14 +848,14 @@ self: super: { # Hoogle needs newer versions than lts-10 provides. lambdabot-haskell-plugins # depends on Hoogle and therefore needs to use the same version. hoogle = super.hoogle.override { - haskell-src-exts = self.haskell-src-exts_1_20_1; + haskell-src-exts = self.haskell-src-exts_1_20_2; http-conduit = self.http-conduit_2_3_0; }; lambdabot-haskell-plugins = super.lambdabot-haskell-plugins.override { haskell-src-exts-simple = self.haskell-src-exts-simple_1_20_0_0; }; haskell-src-exts-simple_1_20_0_0 = super.haskell-src-exts-simple_1_20_0_0.override { - haskell-src-exts = self.haskell-src-exts_1_20_1; + haskell-src-exts = self.haskell-src-exts_1_20_2; }; # These packages depend on each other, forming an infinite loop. @@ -915,17 +916,6 @@ self: super: { # https://github.com/bos/text-icu/issues/32 text-icu = dontCheck super.text-icu; - # https://github.com/strake/lenz.hs/issues/2 - lenz = - let patch = pkgs.fetchpatch - { url = https://github.com/strake/lenz.hs/commit/4b9b79104759b9c6b24484455e1eb0d962eb3cff.patch; - sha256 = "02i0w9i55a4r251wgjzl5vbk6m2qhilwl7bfp5jwmf22z66sglyn"; - }; - in overrideCabal super.lenz (drv: - { patches = (drv.patches or []) ++ [ patch ]; - editedCabalFile = null; - }); - # https://github.com/haskell/cabal/issues/4969 haddock-library_1_4_4 = dontHaddock super.haddock-library_1_4_4; haddock-api = super.haddock-api.override { haddock-library = self.haddock-library_1_4_4; }; @@ -936,18 +926,18 @@ self: super: { # https://github.com/Twinside/Juicy.Pixels/issues/149 JuicyPixels = dontHaddock super.JuicyPixels; - # armv7l fixes. - happy = if pkgs.stdenv.isAarch32 then dontCheck super.happy else super.happy; # Similar to https://ghc.haskell.org/trac/ghc/ticket/13062 - hashable = if pkgs.stdenv.isAarch32 then dontCheck super.hashable else super.hashable; # https://github.com/tibbe/hashable/issues/95 - servant-docs = if pkgs.stdenv.isAarch32 then dontCheck super.servant-docs else super.servant-docs; - servant-swagger = if pkgs.stdenv.isAarch32 then dontCheck super.servant-swagger else super.servant-swagger; - swagger2 = if pkgs.stdenv.isAarch32 then dontHaddock (dontCheck super.swagger2) else super.swagger2; + # aarch64 and armv7l fixes. + happy = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.happy else super.happy; # Similar to https://ghc.haskell.org/trac/ghc/ticket/13062 + hashable = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.hashable else super.hashable; # https://github.com/tibbe/hashable/issues/95 + servant-docs = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.servant-docs else super.servant-docs; + servant-swagger = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.servant-swagger else super.servant-swagger; + swagger2 = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontHaddock (dontCheck super.swagger2) else super.swagger2; # Tries to read a file it is not allowed to in the test suite load-env = dontCheck super.load-env; - # Sporadically OOMs even with 16G - ChasingBottoms = dontCheck super.ChasingBottoms; + # Use latest version to support newer QuickCheck and base libraries. + ChasingBottoms = self.ChasingBottoms_1_3_1_4; # Add support for https://github.com/haskell-hvr/multi-ghc-travis. multi-ghc-travis = self.callPackage ../tools/haskell/multi-ghc-travis {}; @@ -1006,4 +996,16 @@ self: super: { # Needs older hlint hpio = dontCheck super.hpio; + # Needs turtle >=1.5.0, which we use by default in lts-10.x. + changelogged = super.changelogged.override { turtle = self.turtle_1_5_4; }; + + # Avoid GHC compiler crash a la https://ghc.haskell.org/trac/ghc/ticket/5361. + SHA = appendPatch super.SHA (pkgs.fetchpatch { + url = https://github.com/GaloisInc/SHA/commit/c258350e953c3de2f98c5625ac3857f1a6863afc.patch; + sha256 = "1485bbjca1wqbh3c9yqj85kmq8j7zxq79y5isxypy3r6wjpr3g6b"; + }); + + # https://github.com/strake/lenz-template.hs/issues/1 + lenz-template = doJailbreak super.lenz-template; + } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix index 30be6a031d4..757c1d8c32d 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -35,9 +35,6 @@ self: super: { unix = null; xhtml = null; - # jailbreak-cabal can use the native Cabal library. - jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; }; - # https://github.com/bmillwood/applicative-quoters/issues/6 applicative-quoters = appendPatch super.applicative-quoters (pkgs.fetchpatch { url = "https://patch-diff.githubusercontent.com/raw/bmillwood/applicative-quoters/pull/7.patch"; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix index 4538d8471c0..f14f0b0ebd1 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix @@ -86,4 +86,28 @@ self: super: { # https://github.com/purescript/purescript/issues/3189 purescript = doJailbreak (super.purescript); + # Needs text >=1.2.3.0 && <1.3, which is not the default yet. + Cabal_2_2_0_0 = super.Cabal_2_2_0_0.overrideScope (self: super: { + text = self.text_1_2_3_0; + }); + + # These packages need Cabal 2.2.x, which is not the default. + distribution-nixpkgs = super.distribution-nixpkgs.overrideScope (self: super: { + Cabal = self.Cabal_2_2_0_0; + text = self.text_1_2_3_0; + }); + hackage-db_2_0_1 = super.hackage-db_2_0_1.overrideScope (self: super: { + Cabal = self.Cabal_2_2_0_0; + text = self.text_1_2_3_0; + }); + cabal2nix = super.cabal2nix.overrideScope (self: super: { + Cabal = self.Cabal_2_2_0_0; + text = self.text_1_2_3_0; + }); + stylish-cabal = dontHaddock (dontCheck (super.stylish-cabal.overrideScope (self: super: { + Cabal = self.Cabal_2_2_0_0; + text = self.text_1_2_3_0; + haddock-library = dontHaddock (dontCheck self.haddock-library_1_5_0_1); + }))); + } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index bad0d642b06..5aa62342b77 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -60,11 +60,16 @@ self: super: { doCheck = false; }); + ## Needs bump to a versioned attribute + ## Setup: Encountered missing dependencies: + ## free >=4.9 && <5 + either = super.either_5; + ## Needs bump to a versioned attribute ## • Could not deduce (Semigroup (IterT m a)) ## arising from the superclasses of an instance declaration ## from the context: (Monad m, Monoid a) - free = super.free_5; + free = super.free_5_0_1; ## Needs bump to a versioned attribute ## Setup: Encountered missing dependencies: @@ -125,6 +130,11 @@ self: super: { doCheck = false; }); + ## Needs bump to a versioned attribute + ## Setup: Encountered missing dependencies: + ## doctest >=0.7 && <0.14 + turtle = super.turtle_1_5_4; + ## Needs bump to a versioned attribute ## Module ‘Data.Semigroup’ does not export ‘Monoid(..)’ ## | @@ -323,6 +333,7 @@ self: super: { rev = "b7195f160795a081adbb9013810d843f1ba5e062"; sha256 = "1g351fdpsvn2lbqiy9bg2s0wwrdccb8q1zh7gvpsx5nnj24b1c00"; }; + jailbreak = true; # https://github.com/lpsmith/blaze-builder/issues/12 }); ## Unmerged. PR: https://github.com/wrengr/bytestring-trie/pull/3 @@ -441,6 +452,7 @@ self: super: { rev = "34f4593a520176a917b74b8c7fcbbfbd72fb8178"; sha256 = "1aiklvf08w1hx2jn9n3sm61mfvdx4fkabszkjliapih2yjpmi3hq"; }; + jailbreak = true; # base >=4 && <4.11 }); ## Unmerged. PR: https://github.com/vincenthz/hs-securemem/pull/12 @@ -576,12 +588,6 @@ self: super: { jailbreak = true; }); - ChasingBottoms = overrideCabal super.ChasingBottoms (drv: { - ## Setup: Encountered missing dependencies: - ## QuickCheck >=2.3 && <2.11, base >=4.2 && <4.11 - jailbreak = true; - }); - deepseq-generics = overrideCabal super.deepseq-generics (drv: { ## Setup: Encountered missing dependencies: ## base >=4.5 && <4.11 @@ -752,4 +758,52 @@ self: super: { jailbreak = true; }); + # https://github.com/haskell/HTTP/pull/114 + HTTP = self.HTTP_4000_3_10; + HTTP_4000_3_10 = dontCheck super.HTTP_4000_3_10; + + # Older versions don't compile. + haddock-library = self.haddock-library_1_5_0_1; + haddock-library_1_5_0_1 = dontHaddock (dontCheck super.haddock-library_1_5_0_1); + + # https://github.com/phadej/tree-diff/issues/15 + tree-diff = doJailbreak super.tree-diff; + + # https://github.com/jgm/doctemplates/issues/2 + doctemplates = appendPatch super.doctemplates (pkgs.fetchpatch + { url = https://github.com/jgm/doctemplates/commit/3f8bb8feb19ed86b881bc09d963026db9d98df21.patch; + sha256 = "0xmjljh8c90qlzp6wn39iy23pj2j0d4m4r1hxs22zps6qdwk5s6d"; + }); + + # https://github.com/bitemyapp/esqueleto/issues/77 + esqueleto = markBrokenVersion "2.5.3" super.esqueleto; + + # https://github.com/haskell-pkg-janitors/haskell-src/issues/5 + haskell-src = markBrokenVersion "1.0.2.0" super.haskell-src; + + # Older versions don't compile. + hackage-db = super.hackage-db_2_0_1; + + # https://github.com/RazvanRanca/GenericPretty/issues/2 + GenericPretty = appendPatch super.GenericPretty (pkgs.fetchpatch + { url = https://github.com/RazvanRanca/GenericPretty/pull/3.patch; + sha256 = "1dpdqsjmy9j9b6md5r9jyhbxnxjd51nmfb5in01j10iqzhj9j51k"; + } + ); + + # https://github.com/haskell/hackage-security/issues/211 + hackage-security = doJailbreak super.hackage-security; + + # https://github.com/pikajude/stylish-cabal/issues/6 + stylish-cabal = dontHaddock super.stylish-cabal; + + # https://github.com/treeowl/boxes/issues/29 + boxes = appendPatch super.boxes (pkgs.fetchpatch + { url = https://github.com/asr/boxes/commit/f03e16cb8677a9d85687c641fe27a87e6fd94d54.patch; + sha256 = "179vkn6jimiy64dwyam04x8v981l3pfrq3ig97600vnkns3v8i6a"; + }); + + # https://bitbucket.org/IchUndNichtDu/haskell-setlocale/issues/1/please-allow-base-412-from-ghc-841 + setlocale = doJailbreak super.setlocale; + } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 179578a0e64..2e4821725ad 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -1337,7 +1337,6 @@ default-package-overrides: - ixset-typed ==0.3.1.1 - ix-shapable ==0.1.0 - jack ==0.7.1.3 - - jailbreak-cabal ==1.3.2 - javascript-extras ==0.3.2.0 - jmacro ==0.6.14 - jmacro-rpc ==0.3.2 @@ -2834,6 +2833,7 @@ dont-distribute-packages: cusparse: [ i686-linux, x86_64-linux, x86_64-darwin ] gloss-raster-accelerate: [ i686-linux, x86_64-linux, x86_64-darwin ] libnvvm: [ i686-linux, x86_64-linux, x86_64-darwin ] + matlab: [ i686-linux, x86_64-linux, x86_64-darwin ] nvvm: [ i686-linux, x86_64-linux, x86_64-darwin ] Obsidian: [ i686-linux, x86_64-linux, x86_64-darwin ] patch-image: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2914,9 +2914,6 @@ dont-distribute-packages: AC-MiniTest: [ i686-linux, x86_64-linux, x86_64-darwin ] AC-Terminal: [ i686-linux, x86_64-linux, x86_64-darwin ] AC-VanillaArray: [ i686-linux, x86_64-linux, x86_64-darwin ] - accelerate-fourier: [ i686-linux, x86_64-linux, x86_64-darwin ] - accelerate-llvm-native: [ i686-linux, x86_64-linux, x86_64-darwin ] - accelerate-llvm: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-random: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-typelits: [ i686-linux, x86_64-linux, x86_64-darwin ] accentuateus: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2965,8 +2962,6 @@ dont-distribute-packages: AERN-Real: [ i686-linux, x86_64-linux, x86_64-darwin ] AERN-RnToRm-Plot: [ i686-linux, x86_64-linux, x86_64-darwin ] AERN-RnToRm: [ i686-linux, x86_64-linux, x86_64-darwin ] - aern2-mp: [ i686-linux, x86_64-linux, x86_64-darwin ] - aern2-real: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-applicative: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-bson: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-diff: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2974,7 +2969,6 @@ dont-distribute-packages: aeson-flowtyped: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-native: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-prefix: [ i686-linux, x86_64-linux, x86_64-darwin ] - aeson-quick: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-schema: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-smart: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2985,7 +2979,6 @@ dont-distribute-packages: affection: [ i686-linux, x86_64-linux, x86_64-darwin ] affine-invariant-ensemble-mcmc: [ i686-linux, x86_64-linux, x86_64-darwin ] afv: [ i686-linux, x86_64-linux, x86_64-darwin ] - ag-pictgen: [ i686-linux, x86_64-linux, x86_64-darwin ] Agata: [ i686-linux, x86_64-linux, x86_64-darwin ] Agda-executable: [ i686-linux, x86_64-linux, x86_64-darwin ] agda-server: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3027,7 +3020,6 @@ dont-distribute-packages: amazon-emailer-client-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] amazon-emailer: [ i686-linux, x86_64-linux, x86_64-darwin ] amazon-products: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-s3-streaming: [ i686-linux, x86_64-linux, x86_64-darwin ] amby: [ i686-linux, x86_64-linux, x86_64-darwin ] AMI: [ i686-linux, x86_64-linux, x86_64-darwin ] ampersand: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3057,7 +3049,6 @@ dont-distribute-packages: anydbm: [ i686-linux, x86_64-linux, x86_64-darwin ] aosd: [ i686-linux, x86_64-linux, x86_64-darwin ] apelsin: [ i686-linux, x86_64-linux, x86_64-darwin ] - api-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] api-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] apiary-authenticate: [ i686-linux, x86_64-linux, x86_64-darwin ] apiary-clientsession: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3083,13 +3074,11 @@ dont-distribute-packages: applicative-fail: [ i686-linux, x86_64-linux, x86_64-darwin ] applicative-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] applicative-splice: [ i686-linux, x86_64-linux, x86_64-darwin ] - apply-refact: [ i686-linux, x86_64-linux, x86_64-darwin ] approx-rand-test: [ i686-linux, x86_64-linux, x86_64-darwin ] ApproxFun-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] approximate: [ i686-linux, x86_64-linux, x86_64-darwin ] arb-fft: [ i686-linux, x86_64-linux, x86_64-darwin ] arbb-vm: [ i686-linux, x86_64-linux, x86_64-darwin ] - arbtt: [ i686-linux, x86_64-linux, x86_64-darwin ] archiver: [ i686-linux, x86_64-linux, x86_64-darwin ] archlinux-web: [ i686-linux, x86_64-linux, x86_64-darwin ] archlinux: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3103,7 +3092,6 @@ dont-distribute-packages: ariadne: [ i686-linux, x86_64-linux, x86_64-darwin ] arion: [ i686-linux, x86_64-linux, x86_64-darwin ] arith-encode: [ i686-linux, x86_64-linux, x86_64-darwin ] - arithmoi: [ i686-linux, x86_64-linux, x86_64-darwin ] armada: [ i686-linux, x86_64-linux, x86_64-darwin ] arpa: [ i686-linux, x86_64-linux, x86_64-darwin ] arpack: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3126,6 +3114,7 @@ dont-distribute-packages: assimp: [ i686-linux, x86_64-linux, x86_64-darwin ] astrds: [ i686-linux, x86_64-linux, x86_64-darwin ] astview: [ i686-linux, x86_64-linux, x86_64-darwin ] + async-combinators: [ i686-linux, x86_64-linux, x86_64-darwin ] async-manager: [ i686-linux, x86_64-linux, x86_64-darwin ] asynchronous-exceptions: [ i686-linux, x86_64-linux, x86_64-darwin ] aterm-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3135,23 +3124,21 @@ dont-distribute-packages: atmos-dimensional-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] atndapi: [ i686-linux, x86_64-linux, x86_64-darwin ] atom-msp430: [ i686-linux, x86_64-linux, x86_64-darwin ] - atomic-modify: [ i686-linux, x86_64-linux, x86_64-darwin ] atomic-primops-foreign: [ i686-linux, x86_64-linux, x86_64-darwin ] atomic-primops-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] atomo: [ i686-linux, x86_64-linux, x86_64-darwin ] atp-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] ats-format: [ i686-linux, x86_64-linux, x86_64-darwin ] ats-pkg: [ i686-linux, x86_64-linux, x86_64-darwin ] + ats-storable: [ i686-linux, x86_64-linux, x86_64-darwin ] attic-schedule: [ i686-linux, x86_64-linux, x86_64-darwin ] AttoBencode: [ i686-linux, x86_64-linux, x86_64-darwin ] AttoJson: [ i686-linux, x86_64-linux, x86_64-darwin ] attoparsec-csv: [ i686-linux, x86_64-linux, x86_64-darwin ] - attoparsec-ip: [ i686-linux, x86_64-linux, x86_64-darwin ] attoparsec-iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ] attoparsec-text-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] attoparsec-text: [ i686-linux, x86_64-linux, x86_64-darwin ] attoparsec-trans: [ i686-linux, x86_64-linux, x86_64-darwin ] - attoparsec-uri: [ i686-linux, x86_64-linux, x86_64-darwin ] attosplit: [ i686-linux, x86_64-linux, x86_64-darwin ] Attrac: [ i686-linux, x86_64-linux, x86_64-darwin ] atuin: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3371,8 +3358,6 @@ dont-distribute-packages: blockhash: [ i686-linux, x86_64-linux, x86_64-darwin ] Blogdown: [ i686-linux, x86_64-linux, x86_64-darwin ] blogination: [ i686-linux, x86_64-linux, x86_64-darwin ] - BlogLiterately-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] - BlogLiterately: [ i686-linux, x86_64-linux, x86_64-darwin ] bloodhound-amazonka-auth: [ i686-linux, x86_64-linux, x86_64-darwin ] bloomfilter-redis: [ i686-linux, x86_64-linux, x86_64-darwin ] blubber-server: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3383,7 +3368,6 @@ dont-distribute-packages: blunt: [ i686-linux, x86_64-linux, x86_64-darwin ] bno055-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] board-games: [ i686-linux, x86_64-linux, x86_64-darwin ] - bogocopy: [ i686-linux, x86_64-linux, x86_64-darwin ] bogre-banana: [ i686-linux, x86_64-linux, x86_64-darwin ] bolt: [ i686-linux, x86_64-linux, x86_64-darwin ] bond-haskell-compiler: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3391,7 +3375,6 @@ dont-distribute-packages: bond: [ i686-linux, x86_64-linux, x86_64-darwin ] bookkeeper-permissions: [ i686-linux, x86_64-linux, x86_64-darwin ] bookkeeper: [ i686-linux, x86_64-linux, x86_64-darwin ] - bookkeeping-jp: [ i686-linux, x86_64-linux, x86_64-darwin ] Bookshelf: [ i686-linux, x86_64-linux, x86_64-darwin ] boomslang: [ i686-linux, x86_64-linux, x86_64-darwin ] borel: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3408,14 +3391,12 @@ dont-distribute-packages: bricks-syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] bricks: [ i686-linux, x86_64-linux, x86_64-darwin ] brillig: [ i686-linux, x86_64-linux, x86_64-darwin ] - brittany: [ i686-linux, x86_64-linux, x86_64-darwin ] broccoli: [ i686-linux, x86_64-linux, x86_64-darwin ] broker-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] bson-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] bson-generics: [ i686-linux, x86_64-linux, x86_64-darwin ] btree-concurrent: [ i686-linux, x86_64-linux, x86_64-darwin ] btree: [ i686-linux, x86_64-linux, x86_64-darwin ] - buchhaltung: [ i686-linux, x86_64-linux, x86_64-darwin ] buffer-builder-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] buffer: [ i686-linux, x86_64-linux, x86_64-darwin ] buffon: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3434,11 +3415,8 @@ dont-distribute-packages: buster: [ i686-linux, x86_64-linux, x86_64-darwin ] butterflies: [ i686-linux, x86_64-linux, x86_64-darwin ] bytable: [ i686-linux, x86_64-linux, x86_64-darwin ] - bytestring-arbitrary: [ i686-linux, x86_64-linux, x86_64-darwin ] bytestring-class: [ i686-linux, x86_64-linux, x86_64-darwin ] bytestring-csv: [ i686-linux, x86_64-linux, x86_64-darwin ] - bytestring-plain: [ i686-linux, x86_64-linux, x86_64-darwin ] - bytestring-progress: [ i686-linux, x86_64-linux, x86_64-darwin ] bytestring-read: [ i686-linux, x86_64-linux, x86_64-darwin ] bytestring-rematch: [ i686-linux, x86_64-linux, x86_64-darwin ] bytestring-strict-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3460,21 +3438,18 @@ dont-distribute-packages: cabal-ghc-dynflags: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-ghci: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-graphdeps: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabal-helper: [ i686-linux, x86_64-linux, x86_64-darwin ] Cabal-ide-backend: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-info: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-install-bundle: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-install-ghc72: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-install-ghc74: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-lenses: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabal-meta: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-mon: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-nirvana: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-progdeps: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-query: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-setup: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-sort: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabal-src: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-test: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-upload: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal2arch: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3503,10 +3478,10 @@ dont-distribute-packages: call: [ i686-linux, x86_64-linux, x86_64-darwin ] camfort: [ i686-linux, x86_64-linux, x86_64-darwin ] campfire: [ i686-linux, x86_64-linux, x86_64-darwin ] + canon: [ i686-linux, x86_64-linux, x86_64-darwin ] canonical-filepath: [ i686-linux, x86_64-linux, x86_64-darwin ] canteven-http: [ i686-linux, x86_64-linux, x86_64-darwin ] canteven-listen-http: [ i686-linux, x86_64-linux, x86_64-darwin ] - canteven-log: [ i686-linux, x86_64-linux, x86_64-darwin ] canteven-parsedate: [ i686-linux, x86_64-linux, x86_64-darwin ] cantor: [ i686-linux, x86_64-linux, x86_64-darwin ] cao: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3540,19 +3515,16 @@ dont-distribute-packages: casr-logbook: [ i686-linux, x86_64-linux, x86_64-darwin ] cassandra-cql: [ i686-linux, x86_64-linux, x86_64-darwin ] cassandra-thrift: [ i686-linux, x86_64-linux, x86_64-darwin ] - cassava-megaparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] cassava-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] Cassava: [ i686-linux, x86_64-linux, x86_64-darwin ] cassy: [ i686-linux, x86_64-linux, x86_64-darwin ] castle: [ i686-linux, x86_64-linux, x86_64-darwin ] casui: [ i686-linux, x86_64-linux, x86_64-darwin ] - catamorphism: [ i686-linux, x86_64-linux, x86_64-darwin ] Catana: [ i686-linux, x86_64-linux, x86_64-darwin ] catch-fd: [ i686-linux, x86_64-linux, x86_64-darwin ] categorical-algebra: [ i686-linux, x86_64-linux, x86_64-darwin ] category-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] category-traced: [ i686-linux, x86_64-linux, x86_64-darwin ] - category: [ i686-linux, x86_64-linux, x86_64-darwin ] catnplus: [ i686-linux, x86_64-linux, x86_64-darwin ] cayley-client: [ i686-linux, x86_64-linux, x86_64-darwin ] cblrepo: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3572,7 +3544,6 @@ dont-distribute-packages: cef: [ i686-linux, x86_64-linux, x86_64-darwin ] ceilometer-common: [ i686-linux, x86_64-linux, x86_64-darwin ] cellrenderer-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] - celtchar: [ i686-linux, x86_64-linux, x86_64-darwin ] cerberus: [ i686-linux, x86_64-linux, x86_64-darwin ] cereal-derive: [ i686-linux, x86_64-linux, x86_64-darwin ] cereal-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3644,6 +3615,7 @@ dont-distribute-packages: clash-multisignal: [ i686-linux, x86_64-linux, x86_64-darwin ] clash-prelude-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] clash-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] + Clash-Royale-Hack-Cheats: [ i686-linux, x86_64-linux, x86_64-darwin ] clash-systemverilog: [ i686-linux, x86_64-linux, x86_64-darwin ] clash-verilog: [ i686-linux, x86_64-linux, x86_64-darwin ] clash-vhdl: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3651,17 +3623,10 @@ dont-distribute-packages: ClassLaws: [ i686-linux, x86_64-linux, x86_64-darwin ] classy-parallel: [ i686-linux, x86_64-linux, x86_64-darwin ] ClassyPrelude: [ i686-linux, x86_64-linux, x86_64-darwin ] - clckwrks-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] clckwrks-dot-com: [ i686-linux, x86_64-linux, x86_64-darwin ] clckwrks-plugin-bugs: [ i686-linux, x86_64-linux, x86_64-darwin ] - clckwrks-plugin-ircbot: [ i686-linux, x86_64-linux, x86_64-darwin ] - clckwrks-plugin-mailinglist: [ i686-linux, x86_64-linux, x86_64-darwin ] - clckwrks-plugin-media: [ i686-linux, x86_64-linux, x86_64-darwin ] - clckwrks-plugin-page: [ i686-linux, x86_64-linux, x86_64-darwin ] - clckwrks-theme-bootstrap: [ i686-linux, x86_64-linux, x86_64-darwin ] clckwrks-theme-clckwrks: [ i686-linux, x86_64-linux, x86_64-darwin ] clckwrks-theme-geo-bootstrap: [ i686-linux, x86_64-linux, x86_64-darwin ] - clckwrks: [ i686-linux, x86_64-linux, x86_64-darwin ] cld2: [ i686-linux, x86_64-linux, x86_64-darwin ] clean-unions: [ i686-linux, x86_64-linux, x86_64-darwin ] Clean: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3716,13 +3681,11 @@ dont-distribute-packages: cognimeta-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] coin: [ i686-linux, x86_64-linux, x86_64-darwin ] coinbase-exchange: [ i686-linux, x86_64-linux, x86_64-darwin ] - coincident-root-loci: [ i686-linux, x86_64-linux, x86_64-darwin ] colada: [ i686-linux, x86_64-linux, x86_64-darwin ] colchis: [ i686-linux, x86_64-linux, x86_64-darwin ] collada-output: [ i686-linux, x86_64-linux, x86_64-darwin ] collada-types: [ i686-linux, x86_64-linux, x86_64-darwin ] collapse-util: [ i686-linux, x86_64-linux, x86_64-darwin ] - collection-json: [ i686-linux, x86_64-linux, x86_64-darwin ] collections-api: [ i686-linux, x86_64-linux, x86_64-darwin ] collections-base-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] collections: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3730,11 +3693,10 @@ dont-distribute-packages: colorless-http-client: [ i686-linux, x86_64-linux, x86_64-darwin ] colorless-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] colorless: [ i686-linux, x86_64-linux, x86_64-darwin ] + colour-space: [ i686-linux, x86_64-linux, x86_64-darwin ] coltrane: [ i686-linux, x86_64-linux, x86_64-darwin ] columbia: [ i686-linux, x86_64-linux, x86_64-darwin ] com: [ i686-linux, x86_64-linux, x86_64-darwin ] - combinat-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] - combinat: [ i686-linux, x86_64-linux, x86_64-darwin ] combinator-interactive: [ i686-linux, x86_64-linux, x86_64-darwin ] combinatorial-problems: [ i686-linux, x86_64-linux, x86_64-darwin ] Combinatorrent: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3767,7 +3729,6 @@ dont-distribute-packages: composite-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] composite-opaleye: [ i686-linux, x86_64-linux, x86_64-darwin ] composition-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] - compressed: [ i686-linux, x86_64-linux, x86_64-darwin ] compression: [ i686-linux, x86_64-linux, x86_64-darwin ] compstrat: [ i686-linux, x86_64-linux, x86_64-darwin ] comptrans: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3781,9 +3742,7 @@ dont-distribute-packages: concurrent-buffer: [ i686-linux, x86_64-linux, x86_64-darwin ] Concurrent-Cache: [ i686-linux, x86_64-linux, x86_64-darwin ] concurrent-dns-cache: [ i686-linux, x86_64-linux, x86_64-darwin ] - concurrent-machines: [ i686-linux, x86_64-linux, x86_64-darwin ] concurrent-state: [ i686-linux, x86_64-linux, x86_64-darwin ] - concurrent-utilities: [ i686-linux, x86_64-linux, x86_64-darwin ] Concurrential: [ i686-linux, x86_64-linux, x86_64-darwin ] ConcurrentUtils: [ i686-linux, x86_64-linux, x86_64-darwin ] Condor: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3800,7 +3759,7 @@ dont-distribute-packages: conduit-zstd: [ i686-linux, x86_64-linux, x86_64-darwin ] conf: [ i686-linux, x86_64-linux, x86_64-darwin ] conffmt: [ i686-linux, x86_64-linux, x86_64-darwin ] - config-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] + confide: [ i686-linux, x86_64-linux, x86_64-darwin ] config-select: [ i686-linux, x86_64-linux, x86_64-darwin ] ConfigFileTH: [ i686-linux, x86_64-linux, x86_64-darwin ] Configger: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3817,9 +3776,7 @@ dont-distribute-packages: const-math-ghc-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] constrained-monads: [ i686-linux, x86_64-linux, x86_64-darwin ] constraint-manip: [ i686-linux, x86_64-linux, x86_64-darwin ] - constraint: [ i686-linux, x86_64-linux, x86_64-darwin ] ConstraintKinds: [ i686-linux, x86_64-linux, x86_64-darwin ] - constructible: [ i686-linux, x86_64-linux, x86_64-darwin ] constructive-algebra: [ i686-linux, x86_64-linux, x86_64-darwin ] consul-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] Consumer: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3834,7 +3791,6 @@ dont-distribute-packages: continuum-client: [ i686-linux, x86_64-linux, x86_64-darwin ] continuum: [ i686-linux, x86_64-linux, x86_64-darwin ] Contract: [ i686-linux, x86_64-linux, x86_64-darwin ] - control-dotdotdot: [ i686-linux, x86_64-linux, x86_64-darwin ] control-event: [ i686-linux, x86_64-linux, x86_64-darwin ] control-monad-attempt: [ i686-linux, x86_64-linux, x86_64-darwin ] control-monad-exception-monadsfd: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3848,7 +3804,6 @@ dont-distribute-packages: convert: [ i686-linux, x86_64-linux, x86_64-darwin ] convertible-ascii: [ i686-linux, x86_64-linux, x86_64-darwin ] convertible-text: [ i686-linux, x86_64-linux, x86_64-darwin ] - coordinate: [ i686-linux, x86_64-linux, x86_64-darwin ] copilot-cbmc: [ i686-linux, x86_64-linux, x86_64-darwin ] copilot-language: [ i686-linux, x86_64-linux, x86_64-darwin ] copilot-libraries: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3871,7 +3826,6 @@ dont-distribute-packages: couchdb-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] CouchDB: [ i686-linux, x86_64-linux, x86_64-darwin ] countable-inflections: [ i686-linux, x86_64-linux, x86_64-darwin ] - courier: [ i686-linux, x86_64-linux, x86_64-darwin ] court: [ i686-linux, x86_64-linux, x86_64-darwin ] coverage: [ i686-linux, x86_64-linux, x86_64-darwin ] cparsing: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3899,7 +3853,6 @@ dont-distribute-packages: craze: [ i686-linux, x86_64-linux, x86_64-darwin ] crc16: [ i686-linux, x86_64-linux, x86_64-darwin ] crc: [ i686-linux, x86_64-linux, x86_64-darwin ] - crdt: [ i686-linux, x86_64-linux, x86_64-darwin ] creatur: [ i686-linux, x86_64-linux, x86_64-darwin ] credential-store: [ i686-linux, x86_64-linux, x86_64-darwin ] credentials-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3921,6 +3874,7 @@ dont-distribute-packages: crypto-cipher-benchmarks: [ i686-linux, x86_64-linux, x86_64-darwin ] crypto-classical: [ i686-linux, x86_64-linux, x86_64-darwin ] crypto-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + crypto-multihash: [ i686-linux, x86_64-linux, x86_64-darwin ] crypto-random-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] crypto-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] cryptocompare: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3936,14 +3890,12 @@ dont-distribute-packages: cspmchecker: [ i686-linux, x86_64-linux, x86_64-darwin ] cspretty: [ i686-linux, x86_64-linux, x86_64-darwin ] css: [ i686-linux, x86_64-linux, x86_64-darwin ] - csv-to-qif: [ i686-linux, x86_64-linux, x86_64-darwin ] ctemplate: [ i686-linux, x86_64-linux, x86_64-darwin ] ctkl: [ i686-linux, x86_64-linux, x86_64-darwin ] ctpl: [ i686-linux, x86_64-linux, x86_64-darwin ] cube: [ i686-linux, x86_64-linux, x86_64-darwin ] cudd: [ i686-linux, x86_64-linux, x86_64-darwin ] currency-convert: [ i686-linux, x86_64-linux, x86_64-darwin ] - curry-base: [ i686-linux, x86_64-linux, x86_64-darwin ] curry-frontend: [ i686-linux, x86_64-linux, x86_64-darwin ] curry: [ i686-linux, x86_64-linux, x86_64-darwin ] CurryDB: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3952,7 +3904,6 @@ dont-distribute-packages: curves: [ i686-linux, x86_64-linux, x86_64-darwin ] custom-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] CV: [ i686-linux, x86_64-linux, x86_64-darwin ] - cyclotomic: [ i686-linux, x86_64-linux, x86_64-darwin ] cypher: [ i686-linux, x86_64-linux, x86_64-darwin ] d3js: [ i686-linux, x86_64-linux, x86_64-darwin ] DAG-Tournament: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3982,6 +3933,7 @@ dont-distribute-packages: data-accessor-monads-fd: [ i686-linux, x86_64-linux, x86_64-darwin ] data-accessor-monads-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] data-base: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-basic: [ i686-linux, x86_64-linux, x86_64-darwin ] data-concurrent-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] data-construction: [ i686-linux, x86_64-linux, x86_64-darwin ] data-cycle: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3994,17 +3946,11 @@ dont-distribute-packages: data-fin-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] data-fin: [ i686-linux, x86_64-linux, x86_64-darwin ] data-flagset: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-foldapp: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-forest: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-interval: [ i686-linux, x86_64-linux, x86_64-darwin ] data-ivar: [ i686-linux, x86_64-linux, x86_64-darwin ] data-kiln: [ i686-linux, x86_64-linux, x86_64-darwin ] data-layer: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-lens-fd: [ i686-linux, x86_64-linux, x86_64-darwin ] data-lens-ixset: [ i686-linux, x86_64-linux, x86_64-darwin ] data-lens-template: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-list-zigzag: [ i686-linux, x86_64-linux, x86_64-darwin ] data-map-multikey: [ i686-linux, x86_64-linux, x86_64-darwin ] data-nat: [ i686-linux, x86_64-linux, x86_64-darwin ] data-object-json: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4014,8 +3960,8 @@ dont-distribute-packages: data-repr: [ i686-linux, x86_64-linux, x86_64-darwin ] data-result: [ i686-linux, x86_64-linux, x86_64-darwin ] data-rev: [ i686-linux, x86_64-linux, x86_64-darwin ] - Data-Rope: [ i686-linux, x86_64-linux, x86_64-darwin ] data-rope: [ i686-linux, x86_64-linux, x86_64-darwin ] + Data-Rope: [ i686-linux, x86_64-linux, x86_64-darwin ] data-rtuple: [ i686-linux, x86_64-linux, x86_64-darwin ] data-spacepart: [ i686-linux, x86_64-linux, x86_64-darwin ] data-store: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4111,10 +4057,8 @@ dont-distribute-packages: dhall-check: [ i686-linux, x86_64-linux, x86_64-darwin ] dhcp-lease-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-boolean: [ i686-linux, x86_64-linux, x86_64-darwin ] - diagrams-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-graphviz: [ i686-linux, x86_64-linux, x86_64-darwin ] - diagrams-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-haddock: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-hsqml: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-html5: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4122,10 +4066,8 @@ dont-distribute-packages: diagrams-pdf: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-pgf: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-qrcode: [ i686-linux, x86_64-linux, x86_64-darwin ] - diagrams-rasterific: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-tikz: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-wx: [ i686-linux, x86_64-linux, x86_64-darwin ] - dib: [ i686-linux, x86_64-linux, x86_64-darwin ] dice-entropy-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] dice2tex: [ i686-linux, x86_64-linux, x86_64-darwin ] dicom: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4134,17 +4076,9 @@ dont-distribute-packages: DifferenceLogic: [ i686-linux, x86_64-linux, x86_64-darwin ] DifferentialEvolution: [ i686-linux, x86_64-linux, x86_64-darwin ] difftodo: [ i686-linux, x86_64-linux, x86_64-darwin ] - digestive-bootstrap: [ i686-linux, x86_64-linux, x86_64-darwin ] digestive-foundation-lucid: [ i686-linux, x86_64-linux, x86_64-darwin ] - digestive-functors-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] - digestive-functors-blaze: [ i686-linux, x86_64-linux, x86_64-darwin ] - digestive-functors-happstack: [ i686-linux, x86_64-linux, x86_64-darwin ] digestive-functors-heist: [ i686-linux, x86_64-linux, x86_64-darwin ] digestive-functors-hsp: [ i686-linux, x86_64-linux, x86_64-darwin ] - digestive-functors-lucid: [ i686-linux, x86_64-linux, x86_64-darwin ] - digestive-functors-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] - digestive-functors-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] - digestive-functors: [ i686-linux, x86_64-linux, x86_64-darwin ] digitalocean-kzs: [ i686-linux, x86_64-linux, x86_64-darwin ] DigitalOcean: [ i686-linux, x86_64-linux, x86_64-darwin ] dimensional-codata: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4185,7 +4119,6 @@ dont-distribute-packages: distributed-process-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-fsm: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-lifted: [ i686-linux, x86_64-linux, x86_64-darwin ] - distributed-process-p2p: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-platform: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-registry: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-supervisor: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4210,6 +4143,7 @@ dont-distribute-packages: docidx: [ i686-linux, x86_64-linux, x86_64-darwin ] dockercook: [ i686-linux, x86_64-linux, x86_64-darwin ] doctest-discover-configurator: [ i686-linux, x86_64-linux, x86_64-darwin ] + doctest-discover: [ i686-linux, x86_64-linux, x86_64-darwin ] doctest-driver-gen: [ i686-linux, x86_64-linux, x86_64-darwin ] DocTest: [ i686-linux, x86_64-linux, x86_64-darwin ] docvim: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4296,7 +4230,6 @@ dont-distribute-packages: eccrypto: [ i686-linux, x86_64-linux, x86_64-darwin ] ecdsa: [ i686-linux, x86_64-linux, x86_64-darwin ] ecma262: [ i686-linux, x86_64-linux, x86_64-darwin ] - ecstasy: [ i686-linux, x86_64-linux, x86_64-darwin ] ecu: [ i686-linux, x86_64-linux, x86_64-darwin ] eddie: [ i686-linux, x86_64-linux, x86_64-darwin ] edenmodules: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4308,17 +4241,15 @@ dont-distribute-packages: editline: [ i686-linux, x86_64-linux, x86_64-darwin ] EditTimeReport: [ i686-linux, x86_64-linux, x86_64-darwin ] EEConfig: [ i686-linux, x86_64-linux, x86_64-darwin ] - effect-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] effective-aspects-mzv: [ i686-linux, x86_64-linux, x86_64-darwin ] effective-aspects: [ i686-linux, x86_64-linux, x86_64-darwin ] egison-quote: [ i686-linux, x86_64-linux, x86_64-darwin ] ehaskell: [ i686-linux, x86_64-linux, x86_64-darwin ] ehs: [ i686-linux, x86_64-linux, x86_64-darwin ] eibd-client-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] - either-list-functions: [ i686-linux, x86_64-linux, x86_64-darwin ] + Eight-Ball-Pool-Hack-Cheats: [ i686-linux, x86_64-linux, x86_64-darwin ] EitherT: [ i686-linux, x86_64-linux, x86_64-darwin ] ekg-elastic: [ i686-linux, x86_64-linux, x86_64-darwin ] - ekg-elasticsearch: [ i686-linux, x86_64-linux, x86_64-darwin ] ekg-influxdb: [ i686-linux, x86_64-linux, x86_64-darwin ] ekg-log: [ i686-linux, x86_64-linux, x86_64-darwin ] ekg-prometheus-adapter: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4326,12 +4257,10 @@ dont-distribute-packages: ekg-rrd: [ i686-linux, x86_64-linux, x86_64-darwin ] elevator: [ i686-linux, x86_64-linux, x86_64-darwin ] elision: [ i686-linux, x86_64-linux, x86_64-darwin ] - elm-bridge: [ i686-linux, x86_64-linux, x86_64-darwin ] elm-websocket: [ i686-linux, x86_64-linux, x86_64-darwin ] elocrypt: [ i686-linux, x86_64-linux, x86_64-darwin ] elsa: [ i686-linux, x86_64-linux, x86_64-darwin ] emacs-keys: [ i686-linux, x86_64-linux, x86_64-darwin ] - email-header: [ i686-linux, x86_64-linux, x86_64-darwin ] email-postmark: [ i686-linux, x86_64-linux, x86_64-darwin ] email-validator: [ i686-linux, x86_64-linux, x86_64-darwin ] email: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4347,9 +4276,7 @@ dont-distribute-packages: encoding: [ i686-linux, x86_64-linux, x86_64-darwin ] engine-io-growler: [ i686-linux, x86_64-linux, x86_64-darwin ] engine-io-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] - engine-io-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] engine-io-yesod: [ i686-linux, x86_64-linux, x86_64-darwin ] - engine-io: [ i686-linux, x86_64-linux, x86_64-darwin ] entangle: [ i686-linux, x86_64-linux, x86_64-darwin ] EnumContainers: [ i686-linux, x86_64-linux, x86_64-darwin ] enumerate-function: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4390,13 +4317,14 @@ dont-distribute-packages: etc: [ i686-linux, x86_64-linux, x86_64-darwin ] Eternal10Seconds: [ i686-linux, x86_64-linux, x86_64-darwin ] eternal: [ i686-linux, x86_64-linux, x86_64-darwin ] + eternity-timestamped: [ i686-linux, x86_64-linux, x86_64-darwin ] + eternity: [ i686-linux, x86_64-linux, x86_64-darwin ] Etherbunny: [ i686-linux, x86_64-linux, x86_64-darwin ] ethereum-analyzer-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] ethereum-analyzer-webui: [ i686-linux, x86_64-linux, x86_64-darwin ] ethereum-analyzer: [ i686-linux, x86_64-linux, x86_64-darwin ] ethereum-client-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] ethereum-merkle-patricia-db: [ i686-linux, x86_64-linux, x86_64-darwin ] - ety: [ i686-linux, x86_64-linux, x86_64-darwin ] euphoria: [ i686-linux, x86_64-linux, x86_64-darwin ] eurofxref: [ i686-linux, x86_64-linux, x86_64-darwin ] Euterpea: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4410,7 +4338,6 @@ dont-distribute-packages: eventstore: [ i686-linux, x86_64-linux, x86_64-darwin ] every-bit-counts: [ i686-linux, x86_64-linux, x86_64-darwin ] ewe: [ i686-linux, x86_64-linux, x86_64-darwin ] - ex-pool: [ i686-linux, x86_64-linux, x86_64-darwin ] exact-cover: [ i686-linux, x86_64-linux, x86_64-darwin ] exact-real-positional: [ i686-linux, x86_64-linux, x86_64-darwin ] exact-real: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4428,7 +4355,6 @@ dont-distribute-packages: exinst-bytes: [ i686-linux, x86_64-linux, x86_64-darwin ] exinst-deepseq: [ i686-linux, x86_64-linux, x86_64-darwin ] exinst-hashable: [ i686-linux, x86_64-linux, x86_64-darwin ] - exinst: [ i686-linux, x86_64-linux, x86_64-darwin ] exists: [ i686-linux, x86_64-linux, x86_64-darwin ] exp-extended: [ i686-linux, x86_64-linux, x86_64-darwin ] expand: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4441,17 +4367,14 @@ dont-distribute-packages: explicit-sharing: [ i686-linux, x86_64-linux, x86_64-darwin ] explore: [ i686-linux, x86_64-linux, x86_64-darwin ] exposed-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] - expressions-z3: [ i686-linux, x86_64-linux, x86_64-darwin ] extcore: [ i686-linux, x86_64-linux, x86_64-darwin ] extemp: [ i686-linux, x86_64-linux, x86_64-darwin ] extended-categories: [ i686-linux, x86_64-linux, x86_64-darwin ] - extended-reals: [ i686-linux, x86_64-linux, x86_64-darwin ] extensible-data: [ i686-linux, x86_64-linux, x86_64-darwin ] extensible-effects: [ i686-linux, x86_64-linux, x86_64-darwin ] Extra: [ i686-linux, x86_64-linux, x86_64-darwin ] extract-dependencies: [ i686-linux, x86_64-linux, x86_64-darwin ] extractelf: [ i686-linux, x86_64-linux, x86_64-darwin ] - extralife: [ i686-linux, x86_64-linux, x86_64-darwin ] ez-couch: [ i686-linux, x86_64-linux, x86_64-darwin ] faceted: [ i686-linux, x86_64-linux, x86_64-darwin ] Facts: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4468,7 +4391,6 @@ dont-distribute-packages: fast-arithmetic: [ i686-linux, x86_64-linux, x86_64-darwin ] fast-combinatorics: [ i686-linux, x86_64-linux, x86_64-darwin ] fast-nats: [ i686-linux, x86_64-linux, x86_64-darwin ] - fast-tagsoup: [ i686-linux, x86_64-linux, x86_64-darwin ] fastbayes: [ i686-linux, x86_64-linux, x86_64-darwin ] fastcgi: [ i686-linux, x86_64-linux, x86_64-darwin ] fastedit: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4477,22 +4399,19 @@ dont-distribute-packages: FastxPipe: [ i686-linux, x86_64-linux, x86_64-darwin ] fathead-util: [ i686-linux, x86_64-linux, x86_64-darwin ] fault-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] - fay-base: [ i686-linux, x86_64-linux, x86_64-darwin ] fay-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] fay-dom: [ i686-linux, x86_64-linux, x86_64-darwin ] fay-geoposition: [ i686-linux, x86_64-linux, x86_64-darwin ] fay-hsx: [ i686-linux, x86_64-linux, x86_64-darwin ] fay-jquery: [ i686-linux, x86_64-linux, x86_64-darwin ] - fay-ref: [ i686-linux, x86_64-linux, x86_64-darwin ] fay-simplejson: [ i686-linux, x86_64-linux, x86_64-darwin ] fay-text: [ i686-linux, x86_64-linux, x86_64-darwin ] - fay-uri: [ i686-linux, x86_64-linux, x86_64-darwin ] - fay: [ i686-linux, x86_64-linux, x86_64-darwin ] fb-persistent: [ i686-linux, x86_64-linux, x86_64-darwin ] fbmessenger-api: [ i686-linux, x86_64-linux, x86_64-darwin ] fca: [ i686-linux, x86_64-linux, x86_64-darwin ] fcache: [ i686-linux, x86_64-linux, x86_64-darwin ] fcd: [ i686-linux, x86_64-linux, x86_64-darwin ] + fcg: [ i686-linux, x86_64-linux, x86_64-darwin ] fckeditor: [ i686-linux, x86_64-linux, x86_64-darwin ] fclabels-monadlib: [ i686-linux, x86_64-linux, x86_64-darwin ] FComp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4528,10 +4447,7 @@ dont-distribute-packages: filediff: [ i686-linux, x86_64-linux, x86_64-darwin ] FileManip: [ i686-linux, x86_64-linux, x86_64-darwin ] FileManipCompat: [ i686-linux, x86_64-linux, x86_64-darwin ] - filepath-crypto: [ i686-linux, x86_64-linux, x86_64-darwin ] filepath-io-access: [ i686-linux, x86_64-linux, x86_64-darwin ] - FilePather: [ i686-linux, x86_64-linux, x86_64-darwin ] - filepather: [ i686-linux, x86_64-linux, x86_64-darwin ] Files: [ i686-linux, x86_64-linux, x86_64-darwin ] filestore: [ i686-linux, x86_64-linux, x86_64-darwin ] filesystem-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4545,7 +4461,6 @@ dont-distribute-packages: Finance-Quote-Yahoo: [ i686-linux, x86_64-linux, x86_64-darwin ] Finance-Treasury: [ i686-linux, x86_64-linux, x86_64-darwin ] find-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - finite-field: [ i686-linux, x86_64-linux, x86_64-darwin ] FiniteMap: [ i686-linux, x86_64-linux, x86_64-darwin ] firefly-example: [ i686-linux, x86_64-linux, x86_64-darwin ] first-and-last: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4564,7 +4479,6 @@ dont-distribute-packages: fixer: [ i686-linux, x86_64-linux, x86_64-darwin ] fixfile: [ i686-linux, x86_64-linux, x86_64-darwin ] fixie: [ i686-linux, x86_64-linux, x86_64-darwin ] - fizzbuzz-as-a-service: [ i686-linux, x86_64-linux, x86_64-darwin ] fizzbuzz: [ i686-linux, x86_64-linux, x86_64-darwin ] flac-picture: [ i686-linux, x86_64-linux, x86_64-darwin ] flac: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4580,7 +4494,6 @@ dont-distribute-packages: Flippi: [ i686-linux, x86_64-linux, x86_64-darwin ] flite: [ i686-linux, x86_64-linux, x86_64-darwin ] floating-bits: [ i686-linux, x86_64-linux, x86_64-darwin ] - flock: [ i686-linux, x86_64-linux, x86_64-darwin ] flow-er: [ i686-linux, x86_64-linux, x86_64-darwin ] flow2dot: [ i686-linux, x86_64-linux, x86_64-darwin ] flowdock-api: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4595,7 +4508,6 @@ dont-distribute-packages: FModExRaw: [ i686-linux, x86_64-linux, x86_64-darwin ] fn-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] foldl-incremental: [ i686-linux, x86_64-linux, x86_64-darwin ] - foldl-statistics: [ i686-linux, x86_64-linux, x86_64-darwin ] folds-common: [ i686-linux, x86_64-linux, x86_64-darwin ] follower: [ i686-linux, x86_64-linux, x86_64-darwin ] foma: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4622,6 +4534,7 @@ dont-distribute-packages: formura: [ i686-linux, x86_64-linux, x86_64-darwin ] ForSyDe: [ i686-linux, x86_64-linux, x86_64-darwin ] forth-hll: [ i686-linux, x86_64-linux, x86_64-darwin ] + Fortnite-Hack-Cheats-Free-V-Bucks-Generator: [ i686-linux, x86_64-linux, x86_64-darwin ] fortytwo: [ i686-linux, x86_64-linux, x86_64-darwin ] foscam-directory: [ i686-linux, x86_64-linux, x86_64-darwin ] foscam-filename: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4699,7 +4612,6 @@ dont-distribute-packages: gact: [ i686-linux, x86_64-linux, x86_64-darwin ] game-probability: [ i686-linux, x86_64-linux, x86_64-darwin ] gameclock: [ i686-linux, x86_64-linux, x86_64-darwin ] - Gamgine: [ i686-linux, x86_64-linux, x86_64-darwin ] Ganymede: [ i686-linux, x86_64-linux, x86_64-darwin ] garepinoh: [ i686-linux, x86_64-linux, x86_64-darwin ] gargoyle-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4782,13 +4694,11 @@ dont-distribute-packages: ghc-dup: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-events-analyze: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-events-parallel: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghc-exactprint: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-generic-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-imported-from: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-justdoit: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-man-completion: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-mod: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghc-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-pkg-autofix: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-pkg-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-session: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4835,8 +4745,8 @@ dont-distribute-packages: Gifcurry: [ i686-linux, x86_64-linux, x86_64-darwin ] ginsu: [ i686-linux, x86_64-linux, x86_64-darwin ] gipeda: [ i686-linux, x86_64-linux, x86_64-darwin ] - GiST: [ i686-linux, x86_64-linux, x86_64-darwin ] gist: [ i686-linux, x86_64-linux, x86_64-darwin ] + GiST: [ i686-linux, x86_64-linux, x86_64-darwin ] git-all: [ i686-linux, x86_64-linux, x86_64-darwin ] git-checklist: [ i686-linux, x86_64-linux, x86_64-darwin ] git-config: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4852,12 +4762,9 @@ dont-distribute-packages: git-vogue: [ i686-linux, x86_64-linux, x86_64-darwin ] gitdo: [ i686-linux, x86_64-linux, x86_64-darwin ] github-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] - gitHUD: [ i686-linux, x86_64-linux, x86_64-darwin ] gitignore: [ i686-linux, x86_64-linux, x86_64-darwin ] gitit: [ i686-linux, x86_64-linux, x86_64-darwin ] - gitlib-cmdline: [ i686-linux, x86_64-linux, x86_64-darwin ] gitlib-cross: [ i686-linux, x86_64-linux, x86_64-darwin ] - gitlib-libgit2: [ i686-linux, x86_64-linux, x86_64-darwin ] gitlib-s3: [ i686-linux, x86_64-linux, x86_64-darwin ] gitlib-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] gitson: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4870,7 +4777,6 @@ dont-distribute-packages: glazier-react: [ i686-linux, x86_64-linux, x86_64-darwin ] GLFW-b-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] GLFW-OGL: [ i686-linux, x86_64-linux, x86_64-darwin ] - GLFW-task: [ i686-linux, x86_64-linux, x86_64-darwin ] gli: [ i686-linux, x86_64-linux, x86_64-darwin ] glicko: [ i686-linux, x86_64-linux, x86_64-darwin ] glider-nlp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4965,8 +4871,6 @@ dont-distribute-packages: graphics-formats-collada: [ i686-linux, x86_64-linux, x86_64-darwin ] graphicsFormats: [ i686-linux, x86_64-linux, x86_64-darwin ] graphicstools: [ i686-linux, x86_64-linux, x86_64-darwin ] - graphmod: [ i686-linux, x86_64-linux, x86_64-darwin ] - graphql-api: [ i686-linux, x86_64-linux, x86_64-darwin ] graphtype: [ i686-linux, x86_64-linux, x86_64-darwin ] graql: [ i686-linux, x86_64-linux, x86_64-darwin ] grasp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4998,7 +4902,6 @@ dont-distribute-packages: gssapi-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] gssapi: [ i686-linux, x86_64-linux, x86_64-darwin ] gstorable: [ i686-linux, x86_64-linux, x86_64-darwin ] - gstreamer: [ i686-linux, x86_64-linux, x86_64-darwin ] GTALib: [ i686-linux, x86_64-linux, x86_64-darwin ] gtfs: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk-mac-integration: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5059,7 +4962,6 @@ dont-distribute-packages: hackage-proxy: [ i686-linux, x86_64-linux, x86_64-darwin ] hackage-repo-tool: [ i686-linux, x86_64-linux, x86_64-darwin ] hackage-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - hackage-whatsnew: [ i686-linux, x86_64-linux, x86_64-darwin ] hackage2hwn: [ i686-linux, x86_64-linux, x86_64-darwin ] hackage2twitter: [ i686-linux, x86_64-linux, x86_64-darwin ] hackager: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5075,7 +4977,6 @@ dont-distribute-packages: haddocset: [ i686-linux, x86_64-linux, x86_64-darwin ] hadolint: [ i686-linux, x86_64-linux, x86_64-darwin ] hadoop-formats: [ i686-linux, x86_64-linux, x86_64-darwin ] - hadoop-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] hadoop-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] haggis: [ i686-linux, x86_64-linux, x86_64-darwin ] Haggressive: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5112,7 +5013,6 @@ dont-distribute-packages: hampp: [ i686-linux, x86_64-linux, x86_64-darwin ] hamsql: [ i686-linux, x86_64-linux, x86_64-darwin ] hamtmap: [ i686-linux, x86_64-linux, x86_64-darwin ] - hamtsolo: [ i686-linux, x86_64-linux, x86_64-darwin ] hamusic: [ i686-linux, x86_64-linux, x86_64-darwin ] handa-gdata: [ i686-linux, x86_64-linux, x86_64-darwin ] handsy: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5133,7 +5033,6 @@ dont-distribute-packages: happs-tutorial: [ i686-linux, x86_64-linux, x86_64-darwin ] HAppS-Util: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-auth: [ i686-linux, x86_64-linux, x86_64-darwin ] - happstack-authenticate: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-clientsession: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-data: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5300,9 +5199,9 @@ dont-distribute-packages: HaskRel: [ i686-linux, x86_64-linux, x86_64-darwin ] haskus-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] haskus-system-build: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskus-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] haslo: [ i686-linux, x86_64-linux, x86_64-darwin ] hasloGUI: [ i686-linux, x86_64-linux, x86_64-darwin ] + hasmin: [ i686-linux, x86_64-linux, x86_64-darwin ] hasparql-client: [ i686-linux, x86_64-linux, x86_64-darwin ] hasql-backend: [ i686-linux, x86_64-linux, x86_64-darwin ] hasql-class: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5366,8 +5265,8 @@ dont-distribute-packages: hdaemonize-buildfix: [ i686-linux, x86_64-linux, x86_64-darwin ] hdbc-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] HDBC-mysql: [ i686-linux, x86_64-linux, x86_64-darwin ] - hdbc-postgresql-hstore: [ i686-linux, x86_64-linux, x86_64-darwin ] HDBC-postgresql-hstore: [ i686-linux, x86_64-linux, x86_64-darwin ] + hdbc-postgresql-hstore: [ i686-linux, x86_64-linux, x86_64-darwin ] hdbi-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] hdbi-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] hdbi-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5484,13 +5383,11 @@ dont-distribute-packages: hgeometric: [ i686-linux, x86_64-linux, x86_64-darwin ] hgeometry: [ i686-linux, x86_64-linux, x86_64-darwin ] hgeos: [ i686-linux, x86_64-linux, x86_64-darwin ] - hgettext: [ i686-linux, x86_64-linux, x86_64-darwin ] hgis: [ i686-linux, x86_64-linux, x86_64-darwin ] hgithub: [ i686-linux, x86_64-linux, x86_64-darwin ] hgom: [ i686-linux, x86_64-linux, x86_64-darwin ] hgopher: [ i686-linux, x86_64-linux, x86_64-darwin ] HGraphStorage: [ i686-linux, x86_64-linux, x86_64-darwin ] - hgrep: [ i686-linux, x86_64-linux, x86_64-darwin ] hgrib: [ i686-linux, x86_64-linux, x86_64-darwin ] hharp: [ i686-linux, x86_64-linux, x86_64-darwin ] HHDL: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5575,11 +5472,10 @@ dont-distribute-packages: hmeap-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] hmeap: [ i686-linux, x86_64-linux, x86_64-darwin ] hmenu: [ i686-linux, x86_64-linux, x86_64-darwin ] - hmep: [ i686-linux, x86_64-linux, x86_64-darwin ] hmk: [ i686-linux, x86_64-linux, x86_64-darwin ] hmm-hmatrix: [ i686-linux, x86_64-linux, x86_64-darwin ] - hmm: [ i686-linux, x86_64-linux, x86_64-darwin ] HMM: [ i686-linux, x86_64-linux, x86_64-darwin ] + hmm: [ i686-linux, x86_64-linux, x86_64-darwin ] hMollom: [ i686-linux, x86_64-linux, x86_64-darwin ] hmp3: [ i686-linux, x86_64-linux, x86_64-darwin ] Hmpf: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5594,7 +5490,6 @@ dont-distribute-packages: hob: [ i686-linux, x86_64-linux, x86_64-darwin ] hobbes: [ i686-linux, x86_64-linux, x86_64-darwin ] hocilib: [ i686-linux, x86_64-linux, x86_64-darwin ] - hocker: [ i686-linux, x86_64-linux, x86_64-darwin ] hodatime: [ i686-linux, x86_64-linux, x86_64-darwin ] HODE: [ i686-linux, x86_64-linux, x86_64-darwin ] Hoed: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5604,7 +5499,6 @@ dont-distribute-packages: hogre-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] hogre: [ i686-linux, x86_64-linux, x86_64-darwin ] hois: [ i686-linux, x86_64-linux, x86_64-darwin ] - hol: [ i686-linux, x86_64-linux, x86_64-darwin ] hold-em: [ i686-linux, x86_64-linux, x86_64-darwin ] hole: [ i686-linux, x86_64-linux, x86_64-darwin ] Holumbus-Distribution: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5655,10 +5549,8 @@ dont-distribute-packages: HPath: [ i686-linux, x86_64-linux, x86_64-darwin ] hpc-tracer: [ i686-linux, x86_64-linux, x86_64-darwin ] hpdft: [ i686-linux, x86_64-linux, x86_64-darwin ] - hpg: [ i686-linux, x86_64-linux, x86_64-darwin ] HPhone: [ i686-linux, x86_64-linux, x86_64-darwin ] HPi: [ i686-linux, x86_64-linux, x86_64-darwin ] - hpio: [ i686-linux, x86_64-linux, x86_64-darwin ] hplaylist: [ i686-linux, x86_64-linux, x86_64-darwin ] HPlot: [ i686-linux, x86_64-linux, x86_64-darwin ] hpodder: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5672,6 +5564,7 @@ dont-distribute-packages: hPushover: [ i686-linux, x86_64-linux, x86_64-darwin ] hpygments: [ i686-linux, x86_64-linux, x86_64-darwin ] hpylos: [ i686-linux, x86_64-linux, x86_64-darwin ] + hquantlib: [ i686-linux, x86_64-linux, x86_64-darwin ] hR: [ i686-linux, x86_64-linux, x86_64-darwin ] hranker: [ i686-linux, x86_64-linux, x86_64-darwin ] HRay: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5768,7 +5661,6 @@ dont-distribute-packages: hslackbuilder: [ i686-linux, x86_64-linux, x86_64-darwin ] hslibsvm: [ i686-linux, x86_64-linux, x86_64-darwin ] hslinks: [ i686-linux, x86_64-linux, x86_64-darwin ] - HSlippyMap: [ i686-linux, x86_64-linux, x86_64-darwin ] hslogger-reader: [ i686-linux, x86_64-linux, x86_64-darwin ] hslogstash: [ i686-linux, x86_64-linux, x86_64-darwin ] hsluv-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5877,8 +5769,6 @@ dont-distribute-packages: hugs2yc: [ i686-linux, x86_64-linux, x86_64-darwin ] hulk: [ i686-linux, x86_64-linux, x86_64-darwin ] HulkImport: [ i686-linux, x86_64-linux, x86_64-darwin ] - human-parse: [ i686-linux, x86_64-linux, x86_64-darwin ] - human-text: [ i686-linux, x86_64-linux, x86_64-darwin ] hums: [ i686-linux, x86_64-linux, x86_64-darwin ] hunch: [ i686-linux, x86_64-linux, x86_64-darwin ] HUnit-Diff: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5887,7 +5777,6 @@ dont-distribute-packages: hunp: [ i686-linux, x86_64-linux, x86_64-darwin ] hunt-searchengine: [ i686-linux, x86_64-linux, x86_64-darwin ] hunt-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - hup: [ i686-linux, x86_64-linux, x86_64-darwin ] hurdle: [ i686-linux, x86_64-linux, x86_64-darwin ] hurriyet: [ i686-linux, x86_64-linux, x86_64-darwin ] husky: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5896,17 +5785,13 @@ dont-distribute-packages: huzzy: [ i686-linux, x86_64-linux, x86_64-darwin ] hVOIDP: [ i686-linux, x86_64-linux, x86_64-darwin ] hw-kafka-avro: [ i686-linux, x86_64-linux, x86_64-darwin ] - hw-kafka-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - hw-kafka-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + hw-xml: [ i686-linux, x86_64-linux, x86_64-darwin ] hwall-auth-iitk: [ i686-linux, x86_64-linux, x86_64-darwin ] hweblib: [ i686-linux, x86_64-linux, x86_64-darwin ] hwhile: [ i686-linux, x86_64-linux, x86_64-darwin ] hworker-ses: [ i686-linux, x86_64-linux, x86_64-darwin ] hworker: [ i686-linux, x86_64-linux, x86_64-darwin ] hws: [ i686-linux, x86_64-linux, x86_64-darwin ] - hwsl2-bytevector: [ i686-linux, x86_64-linux, x86_64-darwin ] - hwsl2-reducers: [ i686-linux, x86_64-linux, x86_64-darwin ] - hwsl2: [ i686-linux, x86_64-linux, x86_64-darwin ] HXMPP: [ i686-linux, x86_64-linux, x86_64-darwin ] hxmppc: [ i686-linux, x86_64-linux, x86_64-darwin ] hxournal: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5949,7 +5834,6 @@ dont-distribute-packages: iban: [ i686-linux, x86_64-linux, x86_64-darwin ] IcoGrid: [ i686-linux, x86_64-linux, x86_64-darwin ] icon-fonts: [ i686-linux, x86_64-linux, x86_64-darwin ] - iconv-typed: [ i686-linux, x86_64-linux, x86_64-darwin ] ide-backend-common: [ i686-linux, x86_64-linux, x86_64-darwin ] ide-backend-server: [ i686-linux, x86_64-linux, x86_64-darwin ] ide-backend: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5959,7 +5843,6 @@ dont-distribute-packages: identifiers: [ i686-linux, x86_64-linux, x86_64-darwin ] idiii: [ i686-linux, x86_64-linux, x86_64-darwin ] idna2008: [ i686-linux, x86_64-linux, x86_64-darwin ] - idna: [ i686-linux, x86_64-linux, x86_64-darwin ] IDynamic: [ i686-linux, x86_64-linux, x86_64-darwin ] ieee-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] iException: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5972,29 +5855,16 @@ dont-distribute-packages: igrf: [ i686-linux, x86_64-linux, x86_64-darwin ] ihaskell-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] ihaskell-basic: [ i686-linux, x86_64-linux, x86_64-darwin ] - ihaskell-blaze: [ i686-linux, x86_64-linux, x86_64-darwin ] - ihaskell-charts: [ i686-linux, x86_64-linux, x86_64-darwin ] - ihaskell-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] ihaskell-display: [ i686-linux, x86_64-linux, x86_64-darwin ] - ihaskell-gnuplot: [ i686-linux, x86_64-linux, x86_64-darwin ] - ihaskell-hatex: [ i686-linux, x86_64-linux, x86_64-darwin ] - ihaskell-inline-r: [ i686-linux, x86_64-linux, x86_64-darwin ] - ihaskell-juicypixels: [ i686-linux, x86_64-linux, x86_64-darwin ] - ihaskell-magic: [ i686-linux, x86_64-linux, x86_64-darwin ] ihaskell-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] - ihaskell-plot: [ i686-linux, x86_64-linux, x86_64-darwin ] ihaskell-rlangqq: [ i686-linux, x86_64-linux, x86_64-darwin ] - ihaskell-widgets: [ i686-linux, x86_64-linux, x86_64-darwin ] - ihaskell: [ i686-linux, x86_64-linux, x86_64-darwin ] ihttp: [ i686-linux, x86_64-linux, x86_64-darwin ] illuminate: [ i686-linux, x86_64-linux, x86_64-darwin ] - imagemagick: [ i686-linux, x86_64-linux, x86_64-darwin ] imagepaste: [ i686-linux, x86_64-linux, x86_64-darwin ] imap: [ i686-linux, x86_64-linux, x86_64-darwin ] imapget: [ i686-linux, x86_64-linux, x86_64-darwin ] imbib: [ i686-linux, x86_64-linux, x86_64-darwin ] imgurder: [ i686-linux, x86_64-linux, x86_64-darwin ] - imm: [ i686-linux, x86_64-linux, x86_64-darwin ] imparse: [ i686-linux, x86_64-linux, x86_64-darwin ] imperative-edsl-vhdl: [ i686-linux, x86_64-linux, x86_64-darwin ] imperative-edsl: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6037,7 +5907,6 @@ dont-distribute-packages: intel-aes: [ i686-linux, x86_64-linux, x86_64-darwin ] interleavableGen: [ i686-linux, x86_64-linux, x86_64-darwin ] interleavableIO: [ i686-linux, x86_64-linux, x86_64-darwin ] - interlude-l: [ i686-linux, x86_64-linux, x86_64-darwin ] internetmarke: [ i686-linux, x86_64-linux, x86_64-darwin ] intero: [ i686-linux, x86_64-linux, x86_64-darwin ] interpol: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6048,6 +5917,8 @@ dont-distribute-packages: introduction: [ i686-linux, x86_64-linux, x86_64-darwin ] intset: [ i686-linux, x86_64-linux, x86_64-darwin ] invertible-hlist: [ i686-linux, x86_64-linux, x86_64-darwin ] + invertible-hxt: [ i686-linux, x86_64-linux, x86_64-darwin ] + invertible: [ i686-linux, x86_64-linux, x86_64-darwin ] io-capture: [ i686-linux, x86_64-linux, x86_64-darwin ] io-reactive: [ i686-linux, x86_64-linux, x86_64-darwin ] ion: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6057,7 +5928,6 @@ dont-distribute-packages: iothread: [ i686-linux, x86_64-linux, x86_64-darwin ] iotransaction: [ i686-linux, x86_64-linux, x86_64-darwin ] ip2location: [ i686-linux, x86_64-linux, x86_64-darwin ] - ip: [ i686-linux, x86_64-linux, x86_64-darwin ] ipatch: [ i686-linux, x86_64-linux, x86_64-darwin ] ipc: [ i686-linux, x86_64-linux, x86_64-darwin ] ipopt-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6068,13 +5938,11 @@ dont-distribute-packages: irc-fun-client: [ i686-linux, x86_64-linux, x86_64-darwin ] irc-fun-color: [ i686-linux, x86_64-linux, x86_64-darwin ] Irc: [ i686-linux, x86_64-linux, x86_64-darwin ] - ircbot: [ i686-linux, x86_64-linux, x86_64-darwin ] iri: [ i686-linux, x86_64-linux, x86_64-darwin ] iridium: [ i686-linux, x86_64-linux, x86_64-darwin ] iron-mq: [ i686-linux, x86_64-linux, x86_64-darwin ] ironforge: [ i686-linux, x86_64-linux, x86_64-darwin ] irt: [ i686-linux, x86_64-linux, x86_64-darwin ] - is: [ i686-linux, x86_64-linux, x86_64-darwin ] isdicom: [ i686-linux, x86_64-linux, x86_64-darwin ] isevaluated: [ i686-linux, x86_64-linux, x86_64-darwin ] ismtp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6138,7 +6006,6 @@ dont-distribute-packages: JsContracts: [ i686-linux, x86_64-linux, x86_64-darwin ] jsmw: [ i686-linux, x86_64-linux, x86_64-darwin ] json-api: [ i686-linux, x86_64-linux, x86_64-darwin ] - json-assertions: [ i686-linux, x86_64-linux, x86_64-darwin ] json-ast-json-encoder: [ i686-linux, x86_64-linux, x86_64-darwin ] json-ast-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] json-b: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6147,14 +6014,12 @@ dont-distribute-packages: json-encoder: [ i686-linux, x86_64-linux, x86_64-darwin ] json-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] json-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] - json-feed: [ i686-linux, x86_64-linux, x86_64-darwin ] json-incremental-decoder: [ i686-linux, x86_64-linux, x86_64-darwin ] json-litobj: [ i686-linux, x86_64-linux, x86_64-darwin ] json-pointer-hasql: [ i686-linux, x86_64-linux, x86_64-darwin ] json-python: [ i686-linux, x86_64-linux, x86_64-darwin ] json-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] json-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] - json-sop: [ i686-linux, x86_64-linux, x86_64-darwin ] json-togo: [ i686-linux, x86_64-linux, x86_64-darwin ] json-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] json-tracer: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6180,7 +6045,9 @@ dont-distribute-packages: JunkDB: [ i686-linux, x86_64-linux, x86_64-darwin ] JuPyTer-notebook: [ i686-linux, x86_64-linux, x86_64-darwin ] jupyter: [ i686-linux, x86_64-linux, x86_64-darwin ] + jvm-batching: [ i686-linux, x86_64-linux, x86_64-darwin ] jvm-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] + jvm-streaming: [ i686-linux, x86_64-linux, x86_64-darwin ] JYU-Utils: [ i686-linux, x86_64-linux, x86_64-darwin ] kafka-client: [ i686-linux, x86_64-linux, x86_64-darwin ] kafka-device-glut: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6190,8 +6057,8 @@ dont-distribute-packages: kafka-device-vrpn: [ i686-linux, x86_64-linux, x86_64-darwin ] kafka-device: [ i686-linux, x86_64-linux, x86_64-darwin ] kaleidoscope: [ i686-linux, x86_64-linux, x86_64-darwin ] - Kalman: [ i686-linux, x86_64-linux, x86_64-darwin ] kalman: [ i686-linux, x86_64-linux, x86_64-darwin ] + Kalman: [ i686-linux, x86_64-linux, x86_64-darwin ] kangaroo: [ i686-linux, x86_64-linux, x86_64-darwin ] kansas-lava-cores: [ i686-linux, x86_64-linux, x86_64-darwin ] kansas-lava-papilio: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6206,7 +6073,6 @@ dont-distribute-packages: kd-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] kdesrc-build-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] kdt: [ i686-linux, x86_64-linux, x86_64-darwin ] - keera-hails-i18n: [ i686-linux, x86_64-linux, x86_64-darwin ] keera-hails-mvc-environment-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] keera-hails-mvc-model-lightmodel: [ i686-linux, x86_64-linux, x86_64-darwin ] keera-hails-mvc-model-protectedmodel: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6238,7 +6104,6 @@ dont-distribute-packages: kif-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] kit: [ i686-linux, x86_64-linux, x86_64-darwin ] kmeans-par: [ i686-linux, x86_64-linux, x86_64-darwin ] - kmeans-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] kmp-dfa: [ i686-linux, x86_64-linux, x86_64-darwin ] knead-arithmetic: [ i686-linux, x86_64-linux, x86_64-darwin ] knead: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6269,9 +6134,7 @@ dont-distribute-packages: lambda-toolbox: [ i686-linux, x86_64-linux, x86_64-darwin ] lambda2js: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdaBase: [ i686-linux, x86_64-linux, x86_64-darwin ] - lambdabot-haskell-plugins: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdabot-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] - lambdabot: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdacms-core: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdacms-media: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdacube-bullet: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6296,6 +6159,7 @@ dont-distribute-packages: lambdiff: [ i686-linux, x86_64-linux, x86_64-darwin ] lame-tester: [ i686-linux, x86_64-linux, x86_64-darwin ] lame: [ i686-linux, x86_64-linux, x86_64-darwin ] + lang: [ i686-linux, x86_64-linux, x86_64-darwin ] language-ats: [ i686-linux, x86_64-linux, x86_64-darwin ] language-bash: [ i686-linux, x86_64-linux, x86_64-darwin ] language-boogie: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6317,7 +6181,6 @@ dont-distribute-packages: language-ninja: [ i686-linux, x86_64-linux, x86_64-darwin ] language-objc: [ i686-linux, x86_64-linux, x86_64-darwin ] language-pig: [ i686-linux, x86_64-linux, x86_64-darwin ] - language-puppet: [ i686-linux, x86_64-darwin ] language-python-colour: [ i686-linux, x86_64-linux, x86_64-darwin ] language-python-test: [ i686-linux, x86_64-linux, x86_64-darwin ] language-python: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6336,7 +6199,6 @@ dont-distribute-packages: latex-formulae-hakyll: [ i686-linux, x86_64-linux, x86_64-darwin ] latex-formulae-image: [ i686-linux, x86_64-linux, x86_64-darwin ] latex-formulae-pandoc: [ i686-linux, x86_64-linux, x86_64-darwin ] - latex-function-tables: [ i686-linux, x86_64-linux, x86_64-darwin ] LATS: [ i686-linux, x86_64-linux, x86_64-darwin ] launchpad-control: [ i686-linux, x86_64-linux, x86_64-darwin ] layers-game: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6350,7 +6212,6 @@ dont-distribute-packages: lazysplines: [ i686-linux, x86_64-linux, x86_64-darwin ] LazyVault: [ i686-linux, x86_64-linux, x86_64-darwin ] lcs: [ i686-linux, x86_64-linux, x86_64-darwin ] - LDAP: [ i686-linux, x86_64-linux, x86_64-darwin ] ldapply: [ i686-linux, x86_64-linux, x86_64-darwin ] ldif: [ i686-linux, x86_64-linux, x86_64-darwin ] leaf: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6358,7 +6219,6 @@ dont-distribute-packages: leapseconds: [ i686-linux, x86_64-linux, x86_64-darwin ] learn-physics-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] learn-physics: [ i686-linux, x86_64-linux, x86_64-darwin ] - Learning: [ i686-linux, x86_64-linux, x86_64-darwin ] leetify: [ i686-linux, x86_64-linux, x86_64-darwin ] legion-discovery-client: [ i686-linux, x86_64-linux, x86_64-darwin ] legion-discovery: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6367,7 +6227,6 @@ dont-distribute-packages: leksah-server: [ i686-linux, x86_64-linux, x86_64-darwin ] lendingclub: [ i686-linux, x86_64-linux, x86_64-darwin ] lens-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] - lens-properties: [ i686-linux, x86_64-linux, x86_64-darwin ] lens-text-encoding: [ i686-linux, x86_64-linux, x86_64-darwin ] lens-time: [ i686-linux, x86_64-linux, x86_64-darwin ] lens-tutorial: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6399,7 +6258,6 @@ dont-distribute-packages: liblinear-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] libltdl: [ i686-linux, x86_64-linux, x86_64-darwin ] libmolude: [ i686-linux, x86_64-linux, x86_64-darwin ] - libmpd: [ i686-linux, x86_64-linux, x86_64-darwin ] liboath-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] liboleg: [ i686-linux, x86_64-linux, x86_64-darwin ] libpafe: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6409,7 +6267,6 @@ dont-distribute-packages: libtagc: [ i686-linux, x86_64-linux, x86_64-darwin ] libxls: [ i686-linux, x86_64-linux, x86_64-darwin ] libxml-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] - libxml: [ i686-linux, x86_64-linux, x86_64-darwin ] libxslt: [ i686-linux, x86_64-linux, x86_64-darwin ] LibZip: [ i686-linux, x86_64-linux, x86_64-darwin ] lifted-protolude: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6477,7 +6334,6 @@ dont-distribute-packages: llvm-general-quote: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-general: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-hs-pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] - llvm-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-ht: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-pkg-config: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6486,7 +6342,6 @@ dont-distribute-packages: lmdb-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] lmonad-yesod: [ i686-linux, x86_64-linux, x86_64-darwin ] lmonad: [ i686-linux, x86_64-linux, x86_64-darwin ] - load-balancing: [ i686-linux, x86_64-linux, x86_64-darwin ] local-search: [ i686-linux, x86_64-linux, x86_64-darwin ] located-monad-logger: [ i686-linux, x86_64-linux, x86_64-darwin ] loch: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6505,7 +6360,6 @@ dont-distribute-packages: LogicGrowsOnTrees-network: [ i686-linux, x86_64-linux, x86_64-darwin ] LogicGrowsOnTrees-processes: [ i686-linux, x86_64-linux, x86_64-darwin ] LogicGrowsOnTrees: [ i686-linux, x86_64-linux, x86_64-darwin ] - logict-state: [ i686-linux, x86_64-linux, x86_64-darwin ] logplex-parse: [ i686-linux, x86_64-linux, x86_64-darwin ] lojban: [ i686-linux, x86_64-linux, x86_64-darwin ] lojbanParser: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6529,7 +6383,6 @@ dont-distribute-packages: loris: [ i686-linux, x86_64-linux, x86_64-darwin ] loshadka: [ i686-linux, x86_64-linux, x86_64-darwin ] lostcities: [ i686-linux, x86_64-linux, x86_64-darwin ] - loup: [ i686-linux, x86_64-linux, x86_64-darwin ] lowgl: [ i686-linux, x86_64-linux, x86_64-darwin ] lp-diagrams-svg: [ i686-linux, x86_64-linux, x86_64-darwin ] ls-usb: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6540,7 +6393,6 @@ dont-distribute-packages: lua-bc: [ i686-linux, x86_64-linux, x86_64-darwin ] luachunk: [ i686-linux, x86_64-linux, x86_64-darwin ] luautils: [ i686-linux, x86_64-linux, x86_64-darwin ] - lucid-colonnade: [ i686-linux, x86_64-linux, x86_64-darwin ] lucid-svg: [ i686-linux, x86_64-linux, x86_64-darwin ] lucienne: [ i686-linux, x86_64-linux, x86_64-darwin ] Lucu: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6607,7 +6459,8 @@ dont-distribute-packages: manatee: [ i686-linux, x86_64-linux, x86_64-darwin ] mandulia: [ i686-linux, x86_64-linux, x86_64-darwin ] mangopay: [ i686-linux, x86_64-linux, x86_64-darwin ] - map-exts: [ i686-linux, x86_64-linux, x86_64-darwin ] + manifold-random: [ i686-linux, x86_64-linux, x86_64-darwin ] + manifolds: [ i686-linux, x86_64-linux, x86_64-darwin ] Mapping: [ i686-linux, x86_64-linux, x86_64-darwin ] mappy: [ i686-linux, x86_64-linux, x86_64-darwin ] mapquest-api: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6615,18 +6468,15 @@ dont-distribute-packages: markdown-kate: [ i686-linux, x86_64-linux, x86_64-darwin ] markdown2svg: [ i686-linux, x86_64-linux, x86_64-darwin ] markov-processes: [ i686-linux, x86_64-linux, x86_64-darwin ] - markup: [ i686-linux, x86_64-linux, x86_64-darwin ] marmalade-upload: [ i686-linux, x86_64-linux, x86_64-darwin ] marquise: [ i686-linux, x86_64-linux, x86_64-darwin ] mars: [ i686-linux, x86_64-linux, x86_64-darwin ] - marvin: [ i686-linux, x86_64-linux, x86_64-darwin ] masakazu-bot: [ i686-linux, x86_64-linux, x86_64-darwin ] MASMGen: [ i686-linux, x86_64-linux, x86_64-darwin ] master-plan: [ i686-linux, x86_64-linux, x86_64-darwin ] matchers: [ i686-linux, x86_64-linux, x86_64-darwin ] mathblog: [ i686-linux, x86_64-linux, x86_64-darwin ] mathlink: [ i686-linux, x86_64-linux, x86_64-darwin ] - matlab: [ i686-linux, x86_64-linux, x86_64-darwin ] matplotlib: [ i686-linux, x86_64-linux, x86_64-darwin ] matsuri: [ i686-linux, x86_64-linux, x86_64-darwin ] matterhorn: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6640,7 +6490,6 @@ dont-distribute-packages: MaybeT-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] MaybeT: [ i686-linux, x86_64-linux, x86_64-darwin ] MazesOfMonad: [ i686-linux, x86_64-linux, x86_64-darwin ] - MBot: [ i686-linux, x86_64-linux, x86_64-darwin ] mbox-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] MC-Fold-DP: [ i686-linux, x86_64-linux, x86_64-darwin ] mcl: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6659,8 +6508,8 @@ dont-distribute-packages: mecab: [ i686-linux, x86_64-linux, x86_64-darwin ] mech: [ i686-linux, x86_64-linux, x86_64-darwin ] Mecha: [ i686-linux, x86_64-linux, x86_64-darwin ] - Mechs: [ i686-linux, x86_64-linux, x86_64-darwin ] mechs: [ i686-linux, x86_64-linux, x86_64-darwin ] + Mechs: [ i686-linux, x86_64-linux, x86_64-darwin ] mediabus-fdk-aac: [ i686-linux, x86_64-linux, x86_64-darwin ] mediabus-rtp: [ i686-linux, x86_64-linux, x86_64-darwin ] mediabus: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6668,9 +6517,6 @@ dont-distribute-packages: mediawiki2latex: [ i686-linux, x86_64-linux, x86_64-darwin ] mediawiki: [ i686-linux, x86_64-linux, x86_64-darwin ] medium-sdk-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - mellon-core: [ i686-linux, x86_64-linux, x86_64-darwin ] - mellon-gpio: [ i686-linux, x86_64-linux, x86_64-darwin ] - mellon-web: [ i686-linux, x86_64-linux, x86_64-darwin ] melody: [ i686-linux, x86_64-linux, x86_64-darwin ] memcache-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] memcache-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6737,6 +6583,7 @@ dont-distribute-packages: mmtl-base: [ i686-linux, x86_64-linux, x86_64-darwin ] mmtl: [ i686-linux, x86_64-linux, x86_64-darwin ] moan: [ i686-linux, x86_64-linux, x86_64-darwin ] + Mobile-Legends-Hack-Cheats: [ i686-linux, x86_64-linux, x86_64-darwin ] modelicaparser: [ i686-linux, x86_64-linux, x86_64-darwin ] modsplit: [ i686-linux, x86_64-linux, x86_64-darwin ] modular-arithmetic: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6752,7 +6599,6 @@ dont-distribute-packages: monad-atom: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-classes-logging: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-classes: [ i686-linux, x86_64-linux, x86_64-darwin ] - monad-codec: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-dijkstra: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-exception: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6761,16 +6607,13 @@ dont-distribute-packages: monad-lgbt: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-log: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-lrs: [ i686-linux, x86_64-linux, x86_64-darwin ] - monad-memo: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-mersenne-random: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-open: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-ran: [ i686-linux, x86_64-linux, x86_64-darwin ] - monad-resumption: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-state: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-ste: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-stlike-io: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-stlike-stm: [ i686-linux, x86_64-linux, x86_64-darwin ] - monad-task: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-tx: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-unify: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-wrap: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6840,7 +6683,6 @@ dont-distribute-packages: mtgoxapi: [ i686-linux, x86_64-linux, x86_64-darwin ] mtl-evil-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] mtl-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] - mtl-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] mtlx: [ i686-linux, x86_64-linux, x86_64-darwin ] mtp: [ i686-linux, x86_64-linux, x86_64-darwin ] MuCheck-Hspec: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6853,7 +6695,6 @@ dont-distribute-packages: mulang: [ i686-linux, x86_64-linux, x86_64-darwin ] multext-east-msd: [ i686-linux, x86_64-linux, x86_64-darwin ] multi-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ] - multi-instance: [ i686-linux, x86_64-linux, x86_64-darwin ] multiaddr: [ i686-linux, x86_64-linux, x86_64-darwin ] multifile: [ i686-linux, x86_64-linux, x86_64-darwin ] multifocal: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6887,7 +6728,6 @@ dont-distribute-packages: mutable-iter: [ i686-linux, x86_64-linux, x86_64-darwin ] MutationOrder: [ i686-linux, x86_64-linux, x86_64-darwin ] mute-unmute: [ i686-linux, x86_64-linux, x86_64-darwin ] - mvar-lock: [ i686-linux, x86_64-linux, x86_64-darwin ] mvc-updates: [ i686-linux, x86_64-linux, x86_64-darwin ] mvc: [ i686-linux, x86_64-linux, x86_64-darwin ] mvclient: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6895,6 +6735,8 @@ dont-distribute-packages: mxnet-nn: [ i686-linux, x86_64-linux, x86_64-darwin ] mxnet-nnvm: [ i686-linux, x86_64-linux, x86_64-darwin ] mxnet: [ i686-linux, x86_64-linux, x86_64-darwin ] + my-package-testing: [ i686-linux, x86_64-linux, x86_64-darwin ] + my-test-docs: [ i686-linux, x86_64-linux, x86_64-darwin ] myanimelist-export: [ i686-linux, x86_64-linux, x86_64-darwin ] mybitcoin-sci: [ i686-linux, x86_64-linux, x86_64-darwin ] myo: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6910,9 +6752,9 @@ dont-distribute-packages: mystem: [ i686-linux, x86_64-linux, x86_64-darwin ] myTestlll: [ i686-linux, x86_64-linux, x86_64-darwin ] mzv: [ i686-linux, x86_64-linux, x86_64-darwin ] + n-ary-functor: [ i686-linux, x86_64-linux, x86_64-darwin ] nagios-plugin-ekg: [ i686-linux, x86_64-linux, x86_64-darwin ] nakadi-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - namecoin-update: [ i686-linux, x86_64-linux, x86_64-darwin ] named-lock: [ i686-linux, x86_64-linux, x86_64-darwin ] NameGenerator: [ i686-linux, x86_64-linux, x86_64-darwin ] namelist: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6941,7 +6783,6 @@ dont-distribute-packages: neko-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] Neks: [ i686-linux, x86_64-linux, x86_64-darwin ] nemesis-titan: [ i686-linux, x86_64-linux, x86_64-darwin ] - nemesis: [ i686-linux, x86_64-linux, x86_64-darwin ] nerf: [ i686-linux, x86_64-linux, x86_64-darwin ] nero-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] nero-warp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6988,7 +6829,6 @@ dont-distribute-packages: network-voicetext: [ i686-linux, x86_64-linux, x86_64-darwin ] network-wai-router: [ i686-linux, x86_64-linux, x86_64-darwin ] network-websocket: [ i686-linux, x86_64-linux, x86_64-darwin ] - networked-game: [ i686-linux, x86_64-linux, x86_64-darwin ] neural-network-blashs: [ i686-linux, x86_64-linux, x86_64-darwin ] neural-network-hmatrix: [ i686-linux, x86_64-linux, x86_64-darwin ] neural: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7003,15 +6843,12 @@ dont-distribute-packages: NGrams: [ i686-linux, x86_64-linux, x86_64-darwin ] niagra: [ i686-linux, x86_64-linux, x86_64-darwin ] nibblestring: [ i686-linux, x86_64-linux, x86_64-darwin ] - nice-html: [ i686-linux, x86_64-linux, x86_64-darwin ] nicovideo-translator: [ i686-linux, x86_64-linux, x86_64-darwin ] nikepub: [ i686-linux, x86_64-linux, x86_64-darwin ] nimber: [ i686-linux, x86_64-linux, x86_64-darwin ] Ninjas: [ i686-linux, x86_64-linux, x86_64-darwin ] nirum: [ i686-linux, x86_64-linux, x86_64-darwin ] nitro: [ i686-linux, x86_64-linux, x86_64-darwin ] - nix-deploy: [ i686-linux, x86_64-linux, x86_64-darwin ] - nix-diff: [ i686-linux, x86_64-linux, x86_64-darwin ] nix-eval: [ i686-linux, x86_64-linux, x86_64-darwin ] nixfromnpm: [ i686-linux, x86_64-linux, x86_64-darwin ] nkjp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7022,7 +6859,6 @@ dont-distribute-packages: nntp: [ i686-linux, x86_64-linux, x86_64-darwin ] no-role-annots: [ i686-linux, x86_64-linux, x86_64-darwin ] noether: [ i686-linux, x86_64-linux, x86_64-darwin ] - nofib-analyse: [ i686-linux, x86_64-linux, x86_64-darwin ] nofib-analyze: [ i686-linux, x86_64-linux, x86_64-darwin ] noise: [ i686-linux, x86_64-linux, x86_64-darwin ] Nomyx-Core: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7032,7 +6868,6 @@ dont-distribute-packages: Nomyx: [ i686-linux, x86_64-linux, x86_64-darwin ] non-empty-zipper: [ i686-linux, x86_64-linux, x86_64-darwin ] NonEmptyList: [ i686-linux, x86_64-linux, x86_64-darwin ] - nonfree: [ i686-linux, x86_64-linux, x86_64-darwin ] nonlinear-optimization-ad: [ i686-linux, x86_64-linux, x86_64-darwin ] nonlinear-optimization: [ i686-linux, x86_64-linux, x86_64-darwin ] noodle: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7045,7 +6880,6 @@ dont-distribute-packages: notzero: [ i686-linux, x86_64-linux, x86_64-darwin ] np-linear: [ i686-linux, x86_64-linux, x86_64-darwin ] nptools: [ i686-linux, x86_64-linux, x86_64-darwin ] - ntha: [ i686-linux, x86_64-linux, x86_64-darwin ] ntrip-client: [ i686-linux, x86_64-linux, x86_64-darwin ] NTRU: [ i686-linux, x86_64-linux, x86_64-darwin ] null-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7088,16 +6922,16 @@ dont-distribute-packages: odpic-raw: [ i686-linux, x86_64-linux, x86_64-darwin ] off-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] OGL: [ i686-linux, x86_64-linux, x86_64-darwin ] - ogmarkup: [ i686-linux, x86_64-linux, x86_64-darwin ] ohloh-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] oi: [ i686-linux, x86_64-linux, x86_64-darwin ] oidc-client: [ i686-linux, x86_64-linux, x86_64-darwin ] ois-input-manager: [ i686-linux, x86_64-linux, x86_64-darwin ] old-version: [ i686-linux, x86_64-linux, x86_64-darwin ] olwrapper: [ i686-linux, x86_64-linux, x86_64-darwin ] + om-elm: [ i686-linux, x86_64-linux, x86_64-darwin ] omaketex: [ i686-linux, x86_64-linux, x86_64-darwin ] - Omega: [ i686-linux, x86_64-linux, x86_64-darwin ] omega: [ i686-linux, x86_64-linux, x86_64-darwin ] + Omega: [ i686-linux, x86_64-linux, x86_64-darwin ] omnicodec: [ i686-linux, x86_64-linux, x86_64-darwin ] omnifmt: [ i686-linux, x86_64-linux, x86_64-darwin ] on-a-horse: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7136,9 +6970,7 @@ dont-distribute-packages: OpenVG: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenVGRaw: [ i686-linux, x86_64-linux, x86_64-darwin ] Operads: [ i686-linux, x86_64-linux, x86_64-darwin ] - opn: [ i686-linux, x86_64-linux, x86_64-darwin ] optimal-blocks: [ i686-linux, x86_64-linux, x86_64-darwin ] - optimization: [ i686-linux, x86_64-linux, x86_64-darwin ] optimusprime: [ i686-linux, x86_64-linux, x86_64-darwin ] optional: [ i686-linux, x86_64-linux, x86_64-darwin ] optparse-applicative-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7151,6 +6983,7 @@ dont-distribute-packages: order-statistic-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] order-statistics: [ i686-linux, x86_64-linux, x86_64-darwin ] orders: [ i686-linux, x86_64-linux, x86_64-darwin ] + Ordinary: [ i686-linux, x86_64-linux, x86_64-darwin ] ordrea: [ i686-linux, x86_64-linux, x86_64-darwin ] organize-imports: [ i686-linux, x86_64-linux, x86_64-darwin ] orgmode: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7166,6 +6999,7 @@ dont-distribute-packages: oso2pdf: [ i686-linux, x86_64-linux, x86_64-darwin ] ot: [ i686-linux, x86_64-linux, x86_64-darwin ] otp-authenticator: [ i686-linux, x86_64-linux, x86_64-darwin ] + overload: [ i686-linux, x86_64-linux, x86_64-darwin ] overloaded-records: [ i686-linux, x86_64-linux, x86_64-darwin ] overture: [ i686-linux, x86_64-linux, x86_64-darwin ] pack: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7173,6 +7007,7 @@ dont-distribute-packages: package-vt: [ i686-linux, x86_64-linux, x86_64-darwin ] packed-dawg: [ i686-linux, x86_64-linux, x86_64-darwin ] packed-multikey-map: [ i686-linux, x86_64-linux, x86_64-darwin ] + packed: [ i686-linux, x86_64-linux, x86_64-darwin ] packedstring: [ i686-linux, x86_64-linux, x86_64-darwin ] packman: [ i686-linux, x86_64-linux, x86_64-darwin ] packunused: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7180,12 +7015,9 @@ dont-distribute-packages: padKONTROL: [ i686-linux, x86_64-linux, x86_64-darwin ] pagarme: [ i686-linux, x86_64-linux, x86_64-darwin ] PageIO: [ i686-linux, x86_64-linux, x86_64-darwin ] - pagure-hook-receiver: [ i686-linux, x86_64-linux, x86_64-darwin ] Paillier: [ i686-linux, x86_64-linux, x86_64-darwin ] panda: [ i686-linux, x86_64-linux, x86_64-darwin ] - pandoc-crossref: [ i686-linux, x86_64-linux, x86_64-darwin ] pandoc-csv2table: [ i686-linux, x86_64-linux, x86_64-darwin ] - pandoc-emphasize-code: [ i686-linux, x86_64-linux, x86_64-darwin ] pandoc-include-code: [ i686-linux, x86_64-linux, x86_64-darwin ] pandoc-include: [ i686-linux, x86_64-linux, x86_64-darwin ] pandoc-japanese-filters: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7235,7 +7067,6 @@ dont-distribute-packages: pasta: [ i686-linux, x86_64-linux, x86_64-darwin ] pastis: [ i686-linux, x86_64-linux, x86_64-darwin ] pasty: [ i686-linux, x86_64-linux, x86_64-darwin ] - patat: [ i686-linux, x86_64-linux, x86_64-darwin ] patches-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] Pathfinder: [ i686-linux, x86_64-linux, x86_64-darwin ] pathfindingcore: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7271,9 +7102,8 @@ dont-distribute-packages: perdure: [ i686-linux, x86_64-linux, x86_64-darwin ] peregrin: [ i686-linux, x86_64-linux, x86_64-darwin ] perf: [ i686-linux, x86_64-linux, x86_64-darwin ] - perfect-hash-generator: [ i686-linux, x86_64-linux, x86_64-darwin ] - PerfectHash: [ i686-linux, x86_64-linux, x86_64-darwin ] perfecthash: [ i686-linux, x86_64-linux, x86_64-darwin ] + PerfectHash: [ i686-linux, x86_64-linux, x86_64-darwin ] periodic: [ i686-linux, x86_64-linux, x86_64-darwin ] perm: [ i686-linux, x86_64-linux, x86_64-darwin ] permute: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7286,7 +7116,6 @@ dont-distribute-packages: persistent-map: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-mysql-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-protobuf: [ i686-linux, x86_64-linux, x86_64-darwin ] - persistent-redis: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-relational-record: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-test: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-zookeeper: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7322,6 +7151,7 @@ dont-distribute-packages: pictikz: [ i686-linux, x86_64-linux, x86_64-darwin ] piet: [ i686-linux, x86_64-linux, x86_64-darwin ] pinchot: [ i686-linux, x86_64-linux, x86_64-darwin ] + pinpon: [ i686-linux, x86_64-linux, x86_64-darwin ] Pipe: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-attoparsec-streaming: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-bgzf: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7337,7 +7167,6 @@ dont-distribute-packages: pipes-files: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-illumina: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-io: [ i686-linux, x86_64-linux, x86_64-darwin ] - pipes-kafka: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-key-value-csv: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-lzma: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-network-tls: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7350,7 +7179,6 @@ dont-distribute-packages: pipes-sqlite-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-transduce: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-zeromq4: [ i686-linux, x86_64-linux, x86_64-darwin ] - pipes-zlib: [ i686-linux, x86_64-linux, x86_64-darwin ] pisigma: [ i686-linux, x86_64-linux, x86_64-darwin ] Piso: [ i686-linux, x86_64-linux, x86_64-darwin ] pit: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7372,13 +7200,9 @@ dont-distribute-packages: plot-gtk-ui: [ i686-linux, x86_64-linux, x86_64-darwin ] Plot-ho-matic: [ i686-linux, x86_64-linux, x86_64-darwin ] plot-lab: [ i686-linux, x86_64-linux, x86_64-darwin ] - plot-light: [ i686-linux, x86_64-linux, x86_64-darwin ] - ploton: [ i686-linux, x86_64-linux, x86_64-darwin ] PlslTools: [ i686-linux, x86_64-linux, x86_64-darwin ] plugins-auto: [ i686-linux, x86_64-linux, x86_64-darwin ] plugins-multistage: [ i686-linux, x86_64-linux, x86_64-darwin ] - plugins: [ i686-linux, x86_64-linux, x86_64-darwin ] - plumbers: [ i686-linux, x86_64-linux, x86_64-darwin ] png-file: [ i686-linux, x86_64-linux, x86_64-darwin ] pngload-fixed: [ i686-linux, x86_64-linux, x86_64-darwin ] pngload: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7386,7 +7210,6 @@ dont-distribute-packages: pocket: [ i686-linux, x86_64-linux, x86_64-darwin ] point-octree: [ i686-linux, x86_64-linux, x86_64-darwin ] pointfree-fancy: [ i686-linux, x86_64-linux, x86_64-darwin ] - pointfree: [ i686-linux, x86_64-linux, x86_64-darwin ] pointless-lenses: [ i686-linux, x86_64-linux, x86_64-darwin ] pointless-rewrite: [ i686-linux, x86_64-linux, x86_64-darwin ] pokemon-go-protobuf-types: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7430,7 +7253,6 @@ dont-distribute-packages: postgresql-named: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-orm: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-query: [ i686-linux, x86_64-linux, x86_64-darwin ] - postgresql-schema: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-simple-bind: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-simple-opts: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-simple-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7448,13 +7270,11 @@ dont-distribute-packages: potoki-core: [ i686-linux, x86_64-linux, x86_64-darwin ] potoki: [ i686-linux, x86_64-linux, x86_64-darwin ] powerpc: [ i686-linux, x86_64-linux, x86_64-darwin ] - powerqueue-distributed: [ i686-linux, x86_64-linux, x86_64-darwin ] PPrinter: [ i686-linux, x86_64-linux, x86_64-darwin ] pqc: [ i686-linux, x86_64-linux, x86_64-darwin ] pqueue-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] practice-room: [ i686-linux, x86_64-linux, x86_64-darwin ] praglude: [ i686-linux, x86_64-linux, x86_64-darwin ] - preamble: [ i686-linux, x86_64-linux, x86_64-darwin ] precis: [ i686-linux, x86_64-linux, x86_64-darwin ] pred-trie: [ i686-linux, x86_64-linux, x86_64-darwin ] prednote-test: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7477,9 +7297,7 @@ dont-distribute-packages: Printf-TH: [ i686-linux, x86_64-linux, x86_64-darwin ] priority-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] PriorityChansConverger: [ i686-linux, x86_64-linux, x86_64-darwin ] - private-hackage-uploader: [ i686-linux, x86_64-linux, x86_64-darwin ] ProbabilityMonads: [ i686-linux, x86_64-linux, x86_64-darwin ] - probable: [ i686-linux, x86_64-linux, x86_64-darwin ] proc: [ i686-linux, x86_64-linux, x86_64-darwin ] process-iterio: [ i686-linux, x86_64-linux, x86_64-darwin ] process-leksah: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7492,10 +7310,8 @@ dont-distribute-packages: procrastinating-variable: [ i686-linux, x86_64-linux, x86_64-darwin ] procstat: [ i686-linux, x86_64-linux, x86_64-darwin ] producer: [ i686-linux, x86_64-linux, x86_64-darwin ] - product: [ i686-linux, x86_64-linux, x86_64-darwin ] prof2dot: [ i686-linux, x86_64-linux, x86_64-darwin ] prof2pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] - progress-meter: [ i686-linux, x86_64-linux, x86_64-darwin ] progress: [ i686-linux, x86_64-linux, x86_64-darwin ] progressbar: [ i686-linux, x86_64-linux, x86_64-darwin ] progression: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7518,7 +7334,6 @@ dont-distribute-packages: proto-lens-combinators: [ i686-linux, x86_64-linux, x86_64-darwin ] proto-lens-protobuf-types: [ i686-linux, x86_64-linux, x86_64-darwin ] protobuf-native: [ i686-linux, x86_64-linux, x86_64-darwin ] - protobuf: [ i686-linux, x86_64-linux, x86_64-darwin ] protocol-buffers-descriptor-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] protocol-buffers-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] protolude-lifted: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7528,7 +7343,6 @@ dont-distribute-packages: proxy-mapping: [ i686-linux, x86_64-linux, x86_64-darwin ] psc-ide: [ i686-linux, x86_64-linux, x86_64-darwin ] ptr: [ i686-linux, x86_64-linux, x86_64-darwin ] - publicsuffixlist: [ i686-linux, x86_64-linux, x86_64-darwin ] publicsuffixlistcreate: [ i686-linux, x86_64-linux, x86_64-darwin ] pubnub: [ i686-linux, x86_64-linux, x86_64-darwin ] pubsub: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7547,14 +7361,11 @@ dont-distribute-packages: pure-priority-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] pure-zlib: [ i686-linux, x86_64-linux, x86_64-darwin ] purescript-bundle-fast: [ i686-linux, x86_64-linux, x86_64-darwin ] - purescript: [ i686-linux, x86_64-linux, x86_64-darwin ] push-notify-apn: [ i686-linux, x86_64-linux, x86_64-darwin ] push-notify-ccs: [ i686-linux, x86_64-linux, x86_64-darwin ] push-notify-general: [ i686-linux, x86_64-linux, x86_64-darwin ] push-notify: [ i686-linux, x86_64-linux, x86_64-darwin ] - pushbullet-types: [ i686-linux, x86_64-linux, x86_64-darwin ] pusher-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - pusher-http-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] pushme: [ i686-linux, x86_64-linux, x86_64-darwin ] putlenses: [ i686-linux, x86_64-linux, x86_64-darwin ] puzzle-draw-cmdline: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7601,7 +7412,6 @@ dont-distribute-packages: quickcheck-relaxng: [ i686-linux, x86_64-linux, x86_64-darwin ] quickcheck-rematch: [ i686-linux, x86_64-linux, x86_64-darwin ] quickcheck-report: [ i686-linux, x86_64-linux, x86_64-darwin ] - quickcheck-string-random: [ i686-linux, x86_64-linux, x86_64-darwin ] quickcheck-webdriver: [ i686-linux, x86_64-linux, x86_64-darwin ] QuickPlot: [ i686-linux, x86_64-linux, x86_64-darwin ] quickpull: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7646,13 +7456,13 @@ dont-distribute-packages: random-effin: [ i686-linux, x86_64-linux, x86_64-darwin ] random-hypergeometric: [ i686-linux, x86_64-linux, x86_64-darwin ] random-stream: [ i686-linux, x86_64-linux, x86_64-darwin ] + random-string: [ i686-linux, x86_64-linux, x86_64-darwin ] RandomDotOrg: [ i686-linux, x86_64-linux, x86_64-darwin ] range-space: [ i686-linux, x86_64-linux, x86_64-darwin ] Range: [ i686-linux, x86_64-linux, x86_64-darwin ] rangemin: [ i686-linux, x86_64-linux, x86_64-darwin ] rank2classes: [ i686-linux, x86_64-linux, x86_64-darwin ] Ranka: [ i686-linux, x86_64-linux, x86_64-darwin ] - rapid-term: [ i686-linux, x86_64-linux, x86_64-darwin ] rasa-example-config: [ i686-linux, x86_64-linux, x86_64-darwin ] rasa-ext-bufs: [ i686-linux, x86_64-linux, x86_64-darwin ] rasa-ext-cmd: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7667,14 +7477,13 @@ dont-distribute-packages: rasa: [ i686-linux, x86_64-linux, x86_64-darwin ] rascal: [ i686-linux, x86_64-linux, x86_64-darwin ] Rasenschach: [ i686-linux, x86_64-linux, x86_64-darwin ] - rattletrap: [ i686-linux, x86_64-linux, x86_64-darwin ] raven-haskell-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] raw-feldspar: [ i686-linux, x86_64-linux, x86_64-darwin ] rawr: [ i686-linux, x86_64-linux, x86_64-darwin ] raz: [ i686-linux, x86_64-linux, x86_64-darwin ] razom-text-util: [ i686-linux, x86_64-linux, x86_64-darwin ] rbr: [ i686-linux, x86_64-linux, x86_64-darwin ] - rcu: [ i686-linux, x86_64-linux, x86_64-darwin ] + rc: [ i686-linux, x86_64-linux, x86_64-darwin ] rdf4h: [ i686-linux, x86_64-linux, x86_64-darwin ] rdioh: [ i686-linux, x86_64-linux, x86_64-darwin ] react-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7705,10 +7514,9 @@ dont-distribute-packages: record: [ i686-linux, x86_64-linux, x86_64-darwin ] records-th: [ i686-linux, x86_64-linux, x86_64-darwin ] records: [ i686-linux, x86_64-linux, x86_64-darwin ] - recursion-schemes-ext: [ i686-linux, x86_64-linux, x86_64-darwin ] recursors: [ i686-linux, x86_64-linux, x86_64-darwin ] - reddit: [ i686-linux, x86_64-linux, x86_64-darwin ] redHandlers: [ i686-linux, x86_64-linux, x86_64-darwin ] + redland: [ i686-linux, x86_64-linux, x86_64-darwin ] reduce-equations: [ i686-linux, x86_64-linux, x86_64-darwin ] reedsolomon: [ i686-linux, x86_64-linux, x86_64-darwin ] reenact: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7727,7 +7535,6 @@ dont-distribute-packages: reflex-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex: [ i686-linux, x86_64-linux, x86_64-darwin ] reformat: [ i686-linux, x86_64-linux, x86_64-darwin ] - refresht: [ i686-linux, x86_64-linux, x86_64-darwin ] refurb: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-deriv: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-dfa: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7758,7 +7565,6 @@ dont-distribute-packages: regular-xmlpickler: [ i686-linux, x86_64-linux, x86_64-darwin ] regular: [ i686-linux, x86_64-linux, x86_64-darwin ] reheat: [ i686-linux, x86_64-linux, x86_64-darwin ] - rehoo: [ i686-linux, x86_64-linux, x86_64-darwin ] rei: [ i686-linux, x86_64-linux, x86_64-darwin ] reified-records: [ i686-linux, x86_64-linux, x86_64-darwin ] reify: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7813,7 +7619,6 @@ dont-distribute-packages: respond: [ i686-linux, x86_64-linux, x86_64-darwin ] rest-example: [ i686-linux, x86_64-linux, x86_64-darwin ] restful-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] - restless-git: [ i686-linux, x86_64-linux, x86_64-darwin ] RESTng: [ i686-linux, x86_64-linux, x86_64-darwin ] restricted-workers: [ i686-linux, x86_64-linux, x86_64-darwin ] restyle: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7836,9 +7641,7 @@ dont-distribute-packages: RichConditional: [ i686-linux, x86_64-linux, x86_64-darwin ] ridley-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] ridley: [ i686-linux, x86_64-linux, x86_64-darwin ] - riemann: [ i686-linux, x86_64-linux, x86_64-darwin ] riff: [ i686-linux, x86_64-linux, x86_64-darwin ] - rio: [ i686-linux, x86_64-linux, x86_64-darwin ] riot: [ i686-linux, x86_64-linux, x86_64-darwin ] ripple-federation: [ i686-linux, x86_64-linux, x86_64-darwin ] ripple: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7872,15 +7675,12 @@ dont-distribute-packages: roller: [ i686-linux, x86_64-linux, x86_64-darwin ] RollingDirectory: [ i686-linux, x86_64-linux, x86_64-darwin ] rope: [ i686-linux, x86_64-linux, x86_64-darwin ] - rosa: [ i686-linux, x86_64-linux, x86_64-darwin ] rose-trees: [ i686-linux, x86_64-linux, x86_64-darwin ] rose-trie: [ i686-linux, x86_64-linux, x86_64-darwin ] roshask: [ i686-linux, x86_64-linux, x86_64-darwin ] rosmsg-bin: [ i686-linux, x86_64-linux, x86_64-darwin ] rosmsg: [ i686-linux, x86_64-linux, x86_64-darwin ] - rospkg: [ i686-linux, x86_64-linux, x86_64-darwin ] rosso: [ i686-linux, x86_64-linux, x86_64-darwin ] - rotating-log: [ i686-linux, x86_64-linux, x86_64-darwin ] rounding: [ i686-linux, x86_64-linux, x86_64-darwin ] roundtrip-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] roundtrip-xml: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7895,7 +7695,6 @@ dont-distribute-packages: rsagl-math: [ i686-linux, x86_64-linux, x86_64-darwin ] rsagl: [ i686-linux, x86_64-linux, x86_64-darwin ] rspp: [ i686-linux, x86_64-linux, x86_64-darwin ] - rss-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] rss2irc: [ i686-linux, x86_64-linux, x86_64-darwin ] rss: [ i686-linux, x86_64-linux, x86_64-darwin ] RtMidi: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7913,7 +7712,6 @@ dont-distribute-packages: runtime-arbitrary: [ i686-linux, x86_64-linux, x86_64-darwin ] rws: [ i686-linux, x86_64-linux, x86_64-darwin ] RxHaskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - s-cargot-letbind: [ i686-linux, x86_64-linux, x86_64-darwin ] SableCC2Hs: [ i686-linux, x86_64-linux, x86_64-darwin ] safe-freeze: [ i686-linux, x86_64-linux, x86_64-darwin ] safe-globals: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7922,7 +7720,6 @@ dont-distribute-packages: safe-plugins: [ i686-linux, x86_64-linux, x86_64-darwin ] safe-printf: [ i686-linux, x86_64-linux, x86_64-darwin ] safecopy-migrate: [ i686-linux, x86_64-linux, x86_64-darwin ] - safecopy-store: [ i686-linux, x86_64-linux, x86_64-darwin ] safeint: [ i686-linux, x86_64-linux, x86_64-darwin ] safepath: [ i686-linux, x86_64-linux, x86_64-darwin ] safer-file-handles-bytestring: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7961,7 +7758,6 @@ dont-distribute-packages: scenegraph: [ i686-linux, x86_64-linux, x86_64-darwin ] scgi: [ i686-linux, x86_64-linux, x86_64-darwin ] schedevr: [ i686-linux, x86_64-linux, x86_64-darwin ] - schedule-planner: [ i686-linux, x86_64-linux, x86_64-darwin ] schedyield: [ i686-linux, x86_64-linux, x86_64-darwin ] scholdoc-citeproc: [ i686-linux, x86_64-linux, x86_64-darwin ] scholdoc-texmath: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7980,7 +7776,6 @@ dont-distribute-packages: scotty-fay: [ i686-linux, x86_64-linux, x86_64-darwin ] scotty-format: [ i686-linux, x86_64-linux, x86_64-darwin ] scotty-hastache: [ i686-linux, x86_64-linux, x86_64-darwin ] - scotty-resource: [ i686-linux, x86_64-linux, x86_64-darwin ] scotty-session: [ i686-linux, x86_64-linux, x86_64-darwin ] scotty-view: [ i686-linux, x86_64-linux, x86_64-darwin ] scp-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8008,6 +7803,7 @@ dont-distribute-packages: secrm: [ i686-linux, x86_64-linux, x86_64-darwin ] sednaDBXML: [ i686-linux, x86_64-linux, x86_64-darwin ] selectors: [ i686-linux, x86_64-linux, x86_64-darwin ] + SelectSequencesFromMSA: [ i686-linux, x86_64-linux, x86_64-darwin ] selenium-server: [ i686-linux, x86_64-linux, x86_64-darwin ] selenium: [ i686-linux, x86_64-linux, x86_64-darwin ] selinux: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8020,11 +7816,9 @@ dont-distribute-packages: semiring: [ i686-linux, x86_64-linux, x86_64-darwin ] semver-range: [ i686-linux, x86_64-linux, x86_64-darwin ] sendgrid-v3: [ i686-linux, x86_64-linux, x86_64-darwin ] - sensei: [ i686-linux, x86_64-linux, x86_64-darwin ] sensenet: [ i686-linux, x86_64-linux, x86_64-darwin ] sentence-jp: [ i686-linux, x86_64-linux, x86_64-darwin ] sentry: [ i686-linux, x86_64-linux, x86_64-darwin ] - separated: [ i686-linux, x86_64-linux, x86_64-darwin ] seqaid: [ i686-linux, x86_64-linux, x86_64-darwin ] SeqAlign: [ i686-linux, x86_64-linux, x86_64-darwin ] seqid-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8040,45 +7834,38 @@ dont-distribute-packages: servant-auth-client: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-auth-hmac: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-auth-token-acid: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-auth-token-api: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-auth-token-leveldb: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-auth-token-persistent: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-auth-token-rocksdb: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-auth-token: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-client-core: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-csharp: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-db-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-db: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-ekg: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-github-webhook: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-haxl-client: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-jquery: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-match: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-matrix-param: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-mock: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-pool: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-proto-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-pushbullet-client: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-py: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-router: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-ruby: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-smsc-ru: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-xml: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-zeppelin-client: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-zeppelin-server: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-zeppelin-swagger: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-zeppelin: [ i686-linux, x86_64-linux, x86_64-darwin ] server-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] + serverless-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] serversession-frontend-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] services: [ i686-linux, x86_64-linux, x86_64-darwin ] ses-html-snaplet: [ i686-linux, x86_64-linux, x86_64-darwin ] SessionLogger: [ i686-linux, x86_64-linux, x86_64-darwin ] sessions: [ i686-linux, x86_64-linux, x86_64-darwin ] - sessiontypes-distributed: [ i686-linux, x86_64-linux, x86_64-darwin ] set-with: [ i686-linux, x86_64-linux, x86_64-darwin ] setgame: [ i686-linux, x86_64-linux, x86_64-darwin ] sets: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8105,10 +7892,8 @@ dont-distribute-packages: shake-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] shake-minify: [ i686-linux, x86_64-linux, x86_64-darwin ] shake-pack: [ i686-linux, x86_64-linux, x86_64-darwin ] - shake-path: [ i686-linux, x86_64-linux, x86_64-darwin ] shake-persist: [ i686-linux, x86_64-linux, x86_64-darwin ] shaker: [ i686-linux, x86_64-linux, x86_64-darwin ] - shakers: [ i686-linux, x86_64-linux, x86_64-darwin ] shakespeare-babel: [ i686-linux, x86_64-linux, x86_64-darwin ] shakespeare-sass: [ i686-linux, x86_64-linux, x86_64-darwin ] shapely-data: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8120,9 +7905,6 @@ dont-distribute-packages: Shellac-editline: [ i686-linux, x86_64-linux, x86_64-darwin ] shellish: [ i686-linux, x86_64-linux, x86_64-darwin ] shellmate-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] - shelltestrunner: [ i686-linux, x86_64-linux, x86_64-darwin ] - shelly-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] - shelly: [ i686-linux, x86_64-linux, x86_64-darwin ] shikensu: [ i686-linux, x86_64-linux, x86_64-darwin ] shoap: [ i686-linux, x86_64-linux, x86_64-darwin ] shopify: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8135,8 +7917,6 @@ dont-distribute-packages: sibe: [ i686-linux, x86_64-linux, x86_64-darwin ] sifflet-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] sifflet: [ i686-linux, x86_64-linux, x86_64-darwin ] - sigma-ij: [ i686-linux, x86_64-linux, x86_64-darwin ] - sign: [ i686-linux, x86_64-linux, x86_64-darwin ] signals: [ i686-linux, x86_64-linux, x86_64-darwin ] signed-multiset: [ i686-linux, x86_64-linux, x86_64-darwin ] silvi: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8148,6 +7928,7 @@ dont-distribute-packages: simple-config: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-css: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-download: [ i686-linux, x86_64-linux, x86_64-darwin ] + simple-effects: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-eval: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-firewire: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-form: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8179,7 +7960,6 @@ dont-distribute-packages: singnal: [ i686-linux, x86_64-linux, x86_64-darwin ] sink: [ i686-linux, x86_64-linux, x86_64-darwin ] siphon: [ i686-linux, x86_64-linux, x86_64-darwin ] - siren-json: [ i686-linux, x86_64-linux, x86_64-darwin ] sirkel: [ i686-linux, x86_64-linux, x86_64-darwin ] sitepipe: [ i686-linux, x86_64-linux, x86_64-darwin ] sixfiguregroup: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8200,7 +7980,6 @@ dont-distribute-packages: slot-lambda: [ i686-linux, x86_64-linux, x86_64-darwin ] sloth: [ i686-linux, x86_64-linux, x86_64-darwin ] smallarray: [ i686-linux, x86_64-linux, x86_64-darwin ] - smallcaps: [ i686-linux, x86_64-linux, x86_64-darwin ] smallcheck-laws: [ i686-linux, x86_64-linux, x86_64-darwin ] smallcheck-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] smallcheck-series: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8210,6 +7989,7 @@ dont-distribute-packages: smartconstructor: [ i686-linux, x86_64-linux, x86_64-darwin ] smartGroup: [ i686-linux, x86_64-linux, x86_64-darwin ] smartword: [ i686-linux, x86_64-linux, x86_64-darwin ] + smcdel: [ i686-linux, x86_64-linux, x86_64-darwin ] sme: [ i686-linux, x86_64-linux, x86_64-darwin ] smerdyakov: [ i686-linux, x86_64-linux, x86_64-darwin ] smiles: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8229,13 +8009,11 @@ dont-distribute-packages: snap-auth-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-blaze-clay: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-configuration-utilities: [ i686-linux, x86_64-linux, x86_64-darwin ] - snap-cors: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-error-collector: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-loader-dynamic: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-predicates: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-routes: [ i686-linux, x86_64-linux, x86_64-darwin ] - snap-templates: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-testing: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-web-routes: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8290,14 +8068,12 @@ dont-distribute-packages: snmp: [ i686-linux, x86_64-linux, x86_64-darwin ] snorkels: [ i686-linux, x86_64-linux, x86_64-darwin ] snow-white: [ i686-linux, x86_64-linux, x86_64-darwin ] - snowball: [ i686-linux, x86_64-linux, x86_64-darwin ] snowflake-core: [ i686-linux, x86_64-linux, x86_64-darwin ] snowflake-server: [ i686-linux, x86_64-linux, x86_64-darwin ] Snusmumrik: [ i686-linux, x86_64-linux, x86_64-darwin ] SoccerFun: [ i686-linux, x86_64-linux, x86_64-darwin ] SoccerFunGL: [ i686-linux, x86_64-linux, x86_64-darwin ] sock2stream: [ i686-linux, x86_64-linux, x86_64-darwin ] - socket-io: [ i686-linux, x86_64-linux, x86_64-darwin ] socket-sctp: [ i686-linux, x86_64-linux, x86_64-darwin ] socketed: [ i686-linux, x86_64-linux, x86_64-darwin ] socketio: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8334,7 +8110,6 @@ dont-distribute-packages: spelling-suggest: [ i686-linux, x86_64-linux, x86_64-darwin ] sphero: [ i686-linux, x86_64-linux, x86_64-darwin ] sphinx-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] - sphinx: [ i686-linux, x86_64-linux, x86_64-darwin ] sphinxesc: [ i686-linux, x86_64-linux, x86_64-darwin ] spice: [ i686-linux, x86_64-linux, x86_64-darwin ] SpinCounter: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8368,7 +8143,6 @@ dont-distribute-packages: sqlvalue-list: [ i686-linux, x86_64-linux, x86_64-darwin ] sqsd-local: [ i686-linux, x86_64-linux, x86_64-darwin ] squeal-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] - squeeze: [ i686-linux, x86_64-linux, x86_64-darwin ] srcinst: [ i686-linux, x86_64-linux, x86_64-darwin ] sscan: [ i686-linux, x86_64-linux, x86_64-darwin ] sscgi: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8411,14 +8185,13 @@ dont-distribute-packages: stateful-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] static-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] static-tensor: [ i686-linux, x86_64-linux, x86_64-darwin ] + static-text: [ i686-linux, x86_64-linux, x86_64-darwin ] statistics-dirichlet: [ i686-linux, x86_64-linux, x86_64-darwin ] statistics-fusion: [ i686-linux, x86_64-linux, x86_64-darwin ] statistics-hypergeometric-genvar: [ i686-linux, x86_64-linux, x86_64-darwin ] stats: [ i686-linux, x86_64-linux, x86_64-darwin ] statsd-client: [ i686-linux, x86_64-linux, x86_64-darwin ] statsd: [ i686-linux, x86_64-linux, x86_64-darwin ] - staversion: [ i686-linux, x86_64-linux, x86_64-darwin ] - stb-image-redux: [ i686-linux, x86_64-linux, x86_64-darwin ] stb-truetype: [ i686-linux, x86_64-linux, x86_64-darwin ] stdata: [ i686-linux, x86_64-linux, x86_64-darwin ] stdf: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8452,12 +8225,10 @@ dont-distribute-packages: stream-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] stream: [ i686-linux, x86_64-linux, x86_64-darwin ] streamed: [ i686-linux, x86_64-linux, x86_64-darwin ] - streaming-cassava: [ i686-linux, x86_64-linux, x86_64-darwin ] streaming-concurrency: [ i686-linux, x86_64-linux, x86_64-darwin ] - streaming-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] streaming-eversion: [ i686-linux, x86_64-linux, x86_64-darwin ] streaming-osm: [ i686-linux, x86_64-linux, x86_64-darwin ] - streaming-postgresql-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] + streaming-pcap: [ i686-linux, x86_64-linux, x86_64-darwin ] streaming-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] strelka: [ i686-linux, x86_64-linux, x86_64-darwin ] StrictBench: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8465,14 +8236,12 @@ dont-distribute-packages: string-isos: [ i686-linux, x86_64-linux, x86_64-darwin ] string-typelits: [ i686-linux, x86_64-linux, x86_64-darwin ] stringlike: [ i686-linux, x86_64-linux, x86_64-darwin ] - stringprep: [ i686-linux, x86_64-linux, x86_64-darwin ] stripe: [ i686-linux, x86_64-linux, x86_64-darwin ] structural-induction: [ i686-linux, x86_64-linux, x86_64-darwin ] structural-traversal: [ i686-linux, x86_64-linux, x86_64-darwin ] structured-mongoDB: [ i686-linux, x86_64-linux, x86_64-darwin ] structures: [ i686-linux, x86_64-linux, x86_64-darwin ] stt: [ i686-linux, x86_64-linux, x86_64-darwin ] - stunclient: [ i686-linux, x86_64-linux, x86_64-darwin ] stunts: [ i686-linux, x86_64-linux, x86_64-darwin ] stutter: [ i686-linux, x86_64-linux, x86_64-darwin ] stylized: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8480,7 +8249,6 @@ dont-distribute-packages: subhask: [ i686-linux, x86_64-linux, x86_64-darwin ] subleq-toolchain: [ i686-linux, x86_64-linux, x86_64-darwin ] submark: [ i686-linux, x86_64-linux, x86_64-darwin ] - successors: [ i686-linux, x86_64-linux, x86_64-darwin ] suffix-array: [ i686-linux, x86_64-linux, x86_64-darwin ] suffixarray: [ i686-linux, x86_64-linux, x86_64-darwin ] SuffixStructures: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8500,8 +8268,9 @@ dont-distribute-packages: superrecord: [ i686-linux, x86_64-linux, x86_64-darwin ] supervisor: [ i686-linux, x86_64-linux, x86_64-darwin ] supplemented: [ i686-linux, x86_64-linux, x86_64-darwin ] - SVG2Q: [ i686-linux, x86_64-linux, x86_64-darwin ] + sv: [ i686-linux, x86_64-linux, x86_64-darwin ] svg2q: [ i686-linux, x86_64-linux, x86_64-darwin ] + SVG2Q: [ i686-linux, x86_64-linux, x86_64-darwin ] svgutils: [ i686-linux, x86_64-linux, x86_64-darwin ] svm-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] svndump: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8517,9 +8286,7 @@ dont-distribute-packages: sylvia: [ i686-linux, x86_64-linux, x86_64-darwin ] sym-plot: [ i686-linux, x86_64-linux, x86_64-darwin ] sym: [ i686-linux, x86_64-linux, x86_64-darwin ] - symantic-grammar: [ i686-linux, x86_64-linux, x86_64-darwin ] symantic-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] - symantic: [ i686-linux, x86_64-linux, x86_64-darwin ] symengine-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] symengine: [ i686-linux, x86_64-linux, x86_64-darwin ] sync-mht: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8536,10 +8303,8 @@ dont-distribute-packages: syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] SyntaxMacros: [ i686-linux, x86_64-linux, x86_64-darwin ] syntaxnet-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - synthesizer-alsa: [ i686-linux, x86_64-linux, x86_64-darwin ] synthesizer-filter: [ i686-linux, x86_64-linux, x86_64-darwin ] synthesizer-llvm: [ i686-linux, x86_64-linux, x86_64-darwin ] - synthesizer-midi: [ i686-linux, x86_64-linux, x86_64-darwin ] synthesizer: [ i686-linux, x86_64-linux, x86_64-darwin ] sys-process: [ i686-linux, x86_64-linux, x86_64-darwin ] Sysmon: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8563,7 +8328,6 @@ dont-distribute-packages: Tablify: [ i686-linux, x86_64-linux, x86_64-darwin ] tablize: [ i686-linux, x86_64-linux, x86_64-darwin ] tabloid: [ i686-linux, x86_64-linux, x86_64-darwin ] - taffybar: [ i686-linux, x86_64-linux, x86_64-darwin ] tag-bits: [ i686-linux, x86_64-linux, x86_64-darwin ] tagged-exception-core: [ i686-linux, x86_64-linux, x86_64-darwin ] tagged-list: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8654,7 +8418,6 @@ dont-distribute-packages: test-sandbox-hunit: [ i686-linux, x86_64-linux, x86_64-darwin ] test-shouldbe: [ i686-linux, x86_64-linux, x86_64-darwin ] test-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] - testbench: [ i686-linux, x86_64-linux, x86_64-darwin ] TestExplode: [ i686-linux, x86_64-linux, x86_64-darwin ] testloop: [ i686-linux, x86_64-linux, x86_64-darwin ] testpack: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8668,20 +8431,16 @@ dont-distribute-packages: text-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] text-generic-pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] text-icu-normalized: [ i686-linux, x86_64-linux, x86_64-darwin ] - text-icu-translit: [ i686-linux, x86_64-linux, x86_64-darwin ] - text-icu: [ i686-linux, x86_64-linux, x86_64-darwin ] text-json-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] text-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] text-markup: [ i686-linux, x86_64-linux, x86_64-darwin ] text-normal: [ i686-linux, x86_64-linux, x86_64-darwin ] text-position: [ i686-linux, x86_64-linux, x86_64-darwin ] - text-regex-replace: [ i686-linux, x86_64-linux, x86_64-darwin ] text-register-machine: [ i686-linux, x86_64-linux, x86_64-darwin ] text-time: [ i686-linux, x86_64-linux, x86_64-darwin ] text-xml-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] text-xml-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] text-zipper-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] - text1: [ i686-linux, x86_64-linux, x86_64-darwin ] textmatetags: [ i686-linux, x86_64-linux, x86_64-darwin ] textocat-api: [ i686-linux, x86_64-linux, x86_64-darwin ] textual: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8696,7 +8455,6 @@ dont-distribute-packages: th-instance-reification: [ i686-linux, x86_64-linux, x86_64-darwin ] th-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] th-kinds-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] - th-printf: [ i686-linux, x86_64-linux, x86_64-darwin ] th-sccs: [ i686-linux, x86_64-linux, x86_64-darwin ] th-traced: [ i686-linux, x86_64-linux, x86_64-darwin ] th-typegraph: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8710,10 +8468,9 @@ dont-distribute-packages: thimk: [ i686-linux, x86_64-linux, x86_64-darwin ] Thingie: [ i686-linux, x86_64-linux, x86_64-darwin ] thorn: [ i686-linux, x86_64-linux, x86_64-darwin ] - threadscope: [ i686-linux, x86_64-linux, x86_64-darwin ] threepenny-gui-contextmenu: [ i686-linux, x86_64-linux, x86_64-darwin ] - thrift: [ i686-linux, x86_64-linux, x86_64-darwin ] Thrift: [ i686-linux, x86_64-linux, x86_64-darwin ] + thrift: [ i686-linux, x86_64-linux, x86_64-darwin ] throttled-io-loop: [ i686-linux, x86_64-linux, x86_64-darwin ] tibetan-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] tic-tac-toe: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8779,7 +8536,7 @@ dont-distribute-packages: touched: [ i686-linux, x86_64-linux, x86_64-darwin ] Tournament: [ i686-linux, x86_64-linux, x86_64-darwin ] toxcore: [ i686-linux, x86_64-linux, x86_64-darwin ] - toysolver: [ i686-linux, x86_64-linux, x86_64-darwin ] + toxiproxy-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] tpar: [ i686-linux, x86_64-linux, x86_64-darwin ] tpb: [ i686-linux, x86_64-linux, x86_64-darwin ] trace-call: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8793,6 +8550,7 @@ dont-distribute-packages: trajectory: [ i686-linux, x86_64-linux, x86_64-darwin ] transactional-events: [ i686-linux, x86_64-linux, x86_64-darwin ] transf: [ i686-linux, x86_64-linux, x86_64-darwin ] + transfer-db: [ i686-linux, x86_64-linux, x86_64-darwin ] transformations: [ i686-linux, x86_64-linux, x86_64-darwin ] TransformeR: [ i686-linux, x86_64-linux, x86_64-darwin ] transformers-compose: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8834,7 +8592,6 @@ dont-distribute-packages: tsparse: [ i686-linux, x86_64-linux, x86_64-darwin ] tsuntsun: [ i686-linux, x86_64-linux, x86_64-darwin ] tsvsql: [ i686-linux, x86_64-linux, x86_64-darwin ] - tttool: [ i686-linux, x86_64-linux, x86_64-darwin ] tuntap: [ i686-linux, x86_64-linux, x86_64-darwin ] tup-functor: [ i686-linux, x86_64-linux, x86_64-darwin ] tuple-gen: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8843,9 +8600,7 @@ dont-distribute-packages: tuple-morph: [ i686-linux, x86_64-linux, x86_64-darwin ] tupleinstances: [ i686-linux, x86_64-linux, x86_64-darwin ] turing-machines: [ i686-linux, x86_64-linux, x86_64-darwin ] - turingMachine: [ i686-linux, x86_64-linux, x86_64-darwin ] tweak: [ i686-linux, x86_64-linux, x86_64-darwin ] - twee: [ i686-linux, x86_64-linux, x86_64-darwin ] tweet-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] twentefp-eventloop-graphics: [ i686-linux, x86_64-linux, x86_64-darwin ] twentefp-eventloop-trees: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8881,7 +8636,6 @@ dont-distribute-packages: type-level-natural-number-induction: [ i686-linux, x86_64-linux, x86_64-darwin ] type-level-natural-number-operations: [ i686-linux, x86_64-linux, x86_64-darwin ] type-list: [ i686-linux, x86_64-linux, x86_64-darwin ] - type-map: [ i686-linux, x86_64-linux, x86_64-darwin ] type-ord-spine-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ] type-ord: [ i686-linux, x86_64-linux, x86_64-darwin ] type-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8909,8 +8663,6 @@ dont-distribute-packages: uber: [ i686-linux, x86_64-linux, x86_64-darwin ] uberlast: [ i686-linux, x86_64-linux, x86_64-darwin ] uconv: [ i686-linux, x86_64-linux, x86_64-darwin ] - udbus-model: [ i686-linux, x86_64-linux, x86_64-darwin ] - udbus: [ i686-linux, x86_64-linux, x86_64-darwin ] udp-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] uhc-light: [ i686-linux, x86_64-linux, x86_64-darwin ] uhc-util: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8937,12 +8689,8 @@ dont-distribute-packages: unicode-symbols: [ i686-linux, x86_64-linux, x86_64-darwin ] uniform-io: [ i686-linux, x86_64-linux, x86_64-darwin ] union-map: [ i686-linux, x86_64-linux, x86_64-darwin ] - unique-logic-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] - unique-logic: [ i686-linux, x86_64-linux, x86_64-darwin ] uniqueid: [ i686-linux, x86_64-linux, x86_64-darwin ] units-attoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] - units-defs: [ i686-linux, x86_64-linux, x86_64-darwin ] - units: [ i686-linux, x86_64-linux, x86_64-darwin ] unittyped: [ i686-linux, x86_64-linux, x86_64-darwin ] universe-th: [ i686-linux, x86_64-linux, x86_64-darwin ] unix-fcntl: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8974,7 +8722,6 @@ dont-distribute-packages: urldecode: [ i686-linux, x86_64-linux, x86_64-darwin ] urldisp-happstack: [ i686-linux, x86_64-linux, x86_64-darwin ] UrlDisp: [ i686-linux, x86_64-linux, x86_64-darwin ] - urlpath: [ i686-linux, x86_64-linux, x86_64-darwin ] URLT: [ i686-linux, x86_64-linux, x86_64-darwin ] urn-random: [ i686-linux, x86_64-linux, x86_64-darwin ] urn: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8988,15 +8735,9 @@ dont-distribute-packages: utc: [ i686-linux, x86_64-linux, x86_64-darwin ] utf8-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] UTFTConverter: [ i686-linux, x86_64-linux, x86_64-darwin ] - uu-cco-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] - uu-cco-hut-parsing: [ i686-linux, x86_64-linux, x86_64-darwin ] uu-options: [ i686-linux, x86_64-linux, x86_64-darwin ] - uuagc-bootstrap: [ i686-linux, x86_64-linux, x86_64-darwin ] - uuagc-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ] uuagc-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] - uuagc: [ i686-linux, x86_64-linux, x86_64-darwin ] uuid-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] - uulib: [ i686-linux, x86_64-linux, x86_64-darwin ] uvector-algorithms: [ i686-linux, x86_64-linux, x86_64-darwin ] uvector: [ i686-linux, x86_64-linux, x86_64-darwin ] v4l2-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9038,13 +8779,11 @@ dont-distribute-packages: vector-space-map: [ i686-linux, x86_64-linux, x86_64-darwin ] vector-space-opengl: [ i686-linux, x86_64-linux, x86_64-darwin ] vector-static: [ i686-linux, x86_64-linux, x86_64-darwin ] - vectortiles: [ i686-linux, x86_64-linux, x86_64-darwin ] Verba: [ i686-linux, x86_64-linux, x86_64-darwin ] verbalexpressions: [ i686-linux, x86_64-linux, x86_64-darwin ] verdict-json: [ i686-linux, x86_64-linux, x86_64-darwin ] verdict: [ i686-linux, x86_64-linux, x86_64-darwin ] verilog: [ i686-linux, x86_64-linux, x86_64-darwin ] - vgrep: [ i686-linux, x86_64-linux, x86_64-darwin ] vicinity: [ i686-linux, x86_64-linux, x86_64-darwin ] views: [ i686-linux, x86_64-linux, x86_64-darwin ] vigilance: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9055,7 +8794,6 @@ dont-distribute-packages: vinyl-json: [ i686-linux, x86_64-linux, x86_64-darwin ] vinyl-operational: [ i686-linux, x86_64-linux, x86_64-darwin ] vinyl-plus: [ i686-linux, x86_64-linux, x86_64-darwin ] - vinyl-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] vinyl-vectors: [ i686-linux, x86_64-linux, x86_64-darwin ] virthualenv: [ i686-linux, x86_64-linux, x86_64-darwin ] vision: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9072,12 +8810,12 @@ dont-distribute-packages: vty-menu: [ i686-linux, x86_64-linux, x86_64-darwin ] vty-ui-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] vty-ui: [ i686-linux, x86_64-linux, x86_64-darwin ] + vulkan-api: [ i686-linux, x86_64-linux, x86_64-darwin ] vulkan: [ i686-linux, x86_64-linux, x86_64-darwin ] wacom-daemon: [ i686-linux, x86_64-linux, x86_64-darwin ] waddle: [ i686-linux, x86_64-linux, x86_64-darwin ] wahsp: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-devel: [ i686-linux, x86_64-linux, x86_64-darwin ] - wai-digestive-functors: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-dispatch: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-frontend-monadcgi: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-git-http: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9103,10 +8841,8 @@ dont-distribute-packages: wai-middleware-preprocessor: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-route: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-static-caching: [ i686-linux, x86_64-linux, x86_64-darwin ] - wai-middleware-verbs: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-responsible: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-router: [ i686-linux, x86_64-linux, x86_64-darwin ] - wai-routes: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-session-mysql: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-session-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-session-tokyocabinet: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9115,7 +8851,6 @@ dont-distribute-packages: wai-throttler: [ i686-linux, x86_64-linux, x86_64-darwin ] waitra: [ i686-linux, x86_64-linux, x86_64-darwin ] waldo: [ i686-linux, x86_64-linux, x86_64-darwin ] - warc: [ i686-linux, x86_64-linux, x86_64-darwin ] warp-dynamic: [ i686-linux, x86_64-linux, x86_64-darwin ] warp-static: [ i686-linux, x86_64-linux, x86_64-darwin ] warp-tls-uid: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9130,6 +8865,7 @@ dont-distribute-packages: web-css: [ i686-linux, x86_64-linux, x86_64-darwin ] web-encodings: [ i686-linux, x86_64-linux, x86_64-darwin ] web-fpco: [ i686-linux, x86_64-linux, x86_64-darwin ] + web-inv-route: [ i686-linux, x86_64-linux, x86_64-darwin ] web-mongrel2: [ i686-linux, x86_64-linux, x86_64-darwin ] web-output: [ i686-linux, x86_64-linux, x86_64-darwin ] web-push: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9150,7 +8886,6 @@ dont-distribute-packages: webdriver-snoy: [ i686-linux, x86_64-linux, x86_64-darwin ] WeberLogic: [ i686-linux, x86_64-linux, x86_64-darwin ] webfinger-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - webify: [ i686-linux, x86_64-linux, x86_64-darwin ] webkit-javascriptcore: [ i686-linux, x86_64-linux, x86_64-darwin ] Webrexp: [ i686-linux, x86_64-linux, x86_64-darwin ] webserver: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9188,7 +8923,6 @@ dont-distribute-packages: WMSigner: [ i686-linux, x86_64-linux, x86_64-darwin ] wobsurv: [ i686-linux, x86_64-linux, x86_64-darwin ] woffex: [ i686-linux, x86_64-linux, x86_64-darwin ] - wolf: [ i686-linux, x86_64-linux, x86_64-darwin ] word2vec-model: [ i686-linux, x86_64-linux, x86_64-darwin ] WordAlignment: [ i686-linux, x86_64-linux, x86_64-darwin ] Wordlint: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9277,14 +9011,11 @@ dont-distribute-packages: xmms2-client-glib: [ i686-linux, x86_64-linux, x86_64-darwin ] xmms2-client: [ i686-linux, x86_64-linux, x86_64-darwin ] XMMS: [ i686-linux, x86_64-linux, x86_64-darwin ] - xmobar: [ i686-linux, x86_64-linux, x86_64-darwin ] xmonad-bluetilebranch: [ i686-linux, x86_64-linux, x86_64-darwin ] xmonad-contrib-bluetilebranch: [ i686-linux, x86_64-linux, x86_64-darwin ] xmonad-contrib-gpl: [ i686-linux, x86_64-linux, x86_64-darwin ] xmonad-eval: [ i686-linux, x86_64-linux, x86_64-darwin ] - xmonad-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] xmonad-vanessa: [ i686-linux, x86_64-linux, x86_64-darwin ] - xmonad-wallpaper: [ i686-linux, x86_64-linux, x86_64-darwin ] xmonad-windownames: [ i686-linux, x86_64-linux, x86_64-darwin ] xmpipe: [ i686-linux, x86_64-linux, x86_64-darwin ] XMPP: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9315,7 +9046,6 @@ dont-distribute-packages: yamlkeysdiff: [ i686-linux, x86_64-linux, x86_64-darwin ] yampa-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] yampa-glfw: [ i686-linux, x86_64-linux, x86_64-darwin ] - yampa-glut: [ i686-linux, x86_64-linux, x86_64-darwin ] yampa-sdl2: [ i686-linux, x86_64-linux, x86_64-darwin ] yampa2048: [ i686-linux, x86_64-linux, x86_64-darwin ] yandex-translate: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9337,7 +9067,6 @@ dont-distribute-packages: yesod-auth-deskcom: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-hmac-keccak: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-kerberos: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-auth-ldap-mediocre: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-ldap-native: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-ldap: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-oauth: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9358,7 +9087,6 @@ dont-distribute-packages: yesod-job-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-links: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-mangopay: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-markdown: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-media-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-paginate: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-pagination: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9368,7 +9096,6 @@ dont-distribute-packages: yesod-pure: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-purescript: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-raml-bin: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-raml-docs: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-raml-mock: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-recaptcha: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-routes-typescript: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9377,7 +9104,6 @@ dont-distribute-packages: yesod-s3: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-sass: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-session-redis: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-tableview: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-test-json: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-text-markdown: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-tls: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9404,7 +9130,6 @@ dont-distribute-packages: yuuko: [ i686-linux, x86_64-linux, x86_64-darwin ] yxdb-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] z3-encoding: [ i686-linux, x86_64-linux, x86_64-darwin ] - z3: [ i686-linux, x86_64-linux, x86_64-darwin ] zabt: [ i686-linux, x86_64-linux, x86_64-darwin ] zampolit: [ i686-linux, x86_64-linux, x86_64-darwin ] zasni-gerna: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9441,7 +9166,6 @@ dont-distribute-packages: zoom-cache: [ i686-linux, x86_64-linux, x86_64-darwin ] zoom-refs: [ i686-linux, x86_64-linux, x86_64-darwin ] zoom: [ i686-linux, x86_64-linux, x86_64-darwin ] - Zora: [ i686-linux, x86_64-linux, x86_64-darwin ] zsh-battery: [ i686-linux, x86_64-linux, x86_64-darwin ] zstd: [ i686-linux, x86_64-linux, x86_64-darwin ] zuramaru: [ i686-linux, x86_64-linux, x86_64-darwin ] diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 28ccb81f2dc..199b9c17654 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -58,9 +58,8 @@ self: super: builtins.intersectAttrs super { # CUDA needs help finding the SDK headers and libraries. cuda = overrideCabal super.cuda (drv: { extraLibraries = (drv.extraLibraries or []) ++ [pkgs.linuxPackages.nvidia_x11]; - configureFlags = (drv.configureFlags or []) ++ - pkgs.lib.optional pkgs.stdenv.is64bit "--extra-lib-dirs=${pkgs.cudatoolkit}/lib64" ++ [ - "--extra-lib-dirs=${pkgs.cudatoolkit}/lib" + configureFlags = (drv.configureFlags or []) ++ [ + "--extra-lib-dirs=${pkgs.cudatoolkit.lib}/lib" "--extra-include-dirs=${pkgs.cudatoolkit}/include" ]; preConfigure = '' diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 01e2eef58cb..fbb24abf84b 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -34,8 +34,8 @@ in , enableStaticLibraries ? true , extraLibraries ? [], librarySystemDepends ? [], executableSystemDepends ? [] , homepage ? "http://hackage.haskell.org/package/${pname}" -, platforms ? ghc.meta.platforms -, hydraPlatforms ? platforms +, platforms ? with stdenv.lib.platforms; unix ++ windows # GHC can cross-compile +, hydraPlatforms ? null , hyperlinkSource ? true , isExecutable ? false, isLibrary ? !isExecutable , jailbreak ? false @@ -403,7 +403,7 @@ stdenv.mkDerivation ({ // optionalAttrs broken { inherit broken; } // optionalAttrs (description != "") { inherit description; } // optionalAttrs (maintainers != []) { inherit maintainers; } - // optionalAttrs (hydraPlatforms != platforms) { inherit hydraPlatforms; } + // optionalAttrs (hydraPlatforms != null) { inherit hydraPlatforms; } ; } diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 6a54b9df52e..6200e113f03 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1836,7 +1836,6 @@ self: { homepage = "http://byorgey.wordpress.com/blogliterately/"; description = "A tool for posting Haskelly articles to blogs"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "BlogLiterately-diagrams" = callPackage @@ -1857,7 +1856,6 @@ self: { executableHaskellDepends = [ base BlogLiterately ]; description = "Include images in blog posts with inline diagrams code"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Blogdown" = callPackage @@ -2491,24 +2489,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "Cabal_2_0_1_1" = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers - , deepseq, directory, filepath, pretty, process, QuickCheck, tagged - , tasty, tasty-hunit, tasty-quickcheck, time, unix + "Cabal_2_2_0_0" = callPackage + ({ mkDerivation, array, base, base-compat, base-orphans, binary + , bytestring, containers, deepseq, Diff, directory, filepath + , integer-logarithms, mtl, optparse-applicative, parsec, pretty + , process, QuickCheck, tagged, tar, tasty, tasty-golden + , tasty-hunit, tasty-quickcheck, text, time, transformers + , tree-diff, unix }: mkDerivation { pname = "Cabal"; - version = "2.0.1.1"; - sha256 = "06rx6jxikqrdf7k6pmam5cvhwnagq6njmb9qm5777nrz278ccaw0"; + version = "2.2.0.0"; + sha256 = "0bq4zgfvwlqjgsnph61pllvwhfmn8z224ycplqziyxc3zmwb3a96"; revision = "1"; - editedCabalFile = "17ydppw8x5cx5whrs44yxirh7xgcaa6gzvxmlgqnbalcf8wkj23l"; + editedCabalFile = "1fa2lvwj1b0yj06k8pb3smdhdyl94dxy9ac9jqmmj9cdv8msrb8x"; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath - pretty process time unix + mtl parsec pretty process text time transformers unix ]; testHaskellDepends = [ - array base containers directory filepath pretty QuickCheck tagged - tasty tasty-hunit tasty-quickcheck + array base base-compat base-orphans bytestring containers deepseq + Diff directory filepath integer-logarithms optparse-applicative + pretty process QuickCheck tagged tar tasty tasty-golden tasty-hunit + tasty-quickcheck text tree-diff ]; doCheck = false; homepage = "http://www.haskell.org/cabal/"; @@ -2814,6 +2817,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ChasingBottoms_1_3_1_4" = callPackage + ({ mkDerivation, array, base, containers, mtl, QuickCheck, random + , syb + }: + mkDerivation { + pname = "ChasingBottoms"; + version = "1.3.1.4"; + sha256 = "06cynx6hcbfpky7qq3b3mjjgwbnaxkwin3znbwq4b9ikiw0ng633"; + libraryHaskellDepends = [ + base containers mtl QuickCheck random syb + ]; + testHaskellDepends = [ + array base containers mtl QuickCheck random syb + ]; + description = "For testing partial and infinite values"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "CheatSheet" = callPackage ({ mkDerivation, base, containers, directory }: mkDerivation { @@ -2905,6 +2927,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "spam"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ClassLaws" = callPackage @@ -2973,6 +2996,24 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "ClustalParser_1_2_2" = callPackage + ({ mkDerivation, base, cmdargs, either-unwrap, hspec, parsec, text + , vector + }: + mkDerivation { + pname = "ClustalParser"; + version = "1.2.2"; + sha256 = "1x6ag9knvc18pwvm3cdj936pn8k2nbd54n3ii44r7b7kjcb7cgk6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base parsec text vector ]; + executableHaskellDepends = [ base cmdargs either-unwrap ]; + testHaskellDepends = [ base hspec parsec text ]; + description = "Libary for parsing Clustal tools output"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Coadjute" = callPackage ({ mkDerivation, array, base, bytestring, bytestring-csv , containers, directory, fgl, filepath, mtl, old-time, pretty @@ -4808,6 +4849,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "spam"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "EitherT" = callPackage @@ -5519,7 +5561,6 @@ self: { homepage = "https://github.com/tonymorris/filepather"; description = "Functions on System.FilePath"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "FileSystem" = callPackage @@ -5860,6 +5901,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "spam"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Foster" = callPackage @@ -6067,17 +6109,18 @@ self: { }) {}; "GLFW" = callPackage - ({ mkDerivation, base, libX11, mesa, OpenGL }: + ({ mkDerivation, base, libGL, libX11, libXext, libXfixes, OpenGL }: mkDerivation { pname = "GLFW"; version = "0.5.2.5"; sha256 = "029sw2sykr6plffkrmigv5mj2aklllmgi021is5ybsbqv0mxgh9p"; libraryHaskellDepends = [ base OpenGL ]; - librarySystemDepends = [ libX11 mesa ]; + librarySystemDepends = [ libGL libX11 libXext libXfixes ]; homepage = "http://haskell.org/haskellwiki/GLFW"; description = "A Haskell binding for GLFW"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs.xorg) libX11; mesa = null;}; + }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; + inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXfixes;}; "GLFW-OGL" = callPackage ({ mkDerivation, base, libX11, libXrandr, mtl, OGL }: @@ -6140,20 +6183,19 @@ self: { homepage = "http://github.com/ninegua/GLFW-task"; description = "GLFW utility functions to use together with monad-task"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GLHUI" = callPackage - ({ mkDerivation, base, libX11, mesa }: + ({ mkDerivation, base, libGL, libX11 }: mkDerivation { pname = "GLHUI"; version = "1.1.0"; sha256 = "043xw36hrwzc6xdr5vlydbsv5m8675vnk8pfxycr7qixzwljn0aa"; libraryHaskellDepends = [ base ]; - librarySystemDepends = [ libX11 mesa ]; + librarySystemDepends = [ libGL libX11 ]; description = "Open OpenGL context windows in X11 with libX11"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs.xorg) libX11; mesa = null;}; + }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11;}; "GLM" = callPackage ({ mkDerivation, aeson, base, bytestring, interpolate, lens, mtl @@ -6198,17 +6240,17 @@ self: { }) {}; "GLURaw" = callPackage - ({ mkDerivation, base, freeglut, mesa, OpenGLRaw, transformers }: + ({ mkDerivation, base, libGL, libGLU, OpenGLRaw, transformers }: mkDerivation { pname = "GLURaw"; version = "2.0.0.3"; sha256 = "1vncyxaqyc7apw42wkpyxinyvzgzcnx6x858x4z15h5qq70ghb2q"; libraryHaskellDepends = [ base OpenGLRaw transformers ]; - librarySystemDepends = [ freeglut mesa ]; + librarySystemDepends = [ libGL libGLU ]; homepage = "http://www.haskell.org/haskellwiki/Opengl"; description = "A raw binding for the OpenGL graphics system"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) freeglut; mesa = null;}; + }) {inherit (pkgs) libGL; inherit (pkgs) libGLU;}; "GLUT" = callPackage ({ mkDerivation, array, base, containers, OpenGL, StateVar @@ -6380,7 +6422,6 @@ self: { ]; description = "Some kind of game library or set of utilities"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Ganymede" = callPackage @@ -6552,6 +6593,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "GenericPretty_1_2_2" = callPackage + ({ mkDerivation, base, ghc-prim, pretty }: + mkDerivation { + pname = "GenericPretty"; + version = "1.2.2"; + sha256 = "0g5frpzq8hr2wqbf91cxcyxqqsw06p1w9f1sm3k6v1hz13kpmspf"; + libraryHaskellDepends = [ base ghc-prim pretty ]; + homepage = "https://github.com/RazvanRanca/GenericPretty"; + description = "A generic, derivable, haskell pretty printer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "GenussFold" = callPackage ({ mkDerivation, ADPfusion, ansi-wl-pprint, base, bytestring , cmdargs, containers, data-default, FormalGrammars, lens, mtl @@ -8606,7 +8660,6 @@ self: { homepage = "https://github.com/apeyroux/HSlippyMap"; description = "OpenStreetMap Slippy Map"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HSmarty" = callPackage @@ -8769,6 +8822,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "HTTP_4000_3_10" = callPackage + ({ mkDerivation, array, base, bytestring, case-insensitive, conduit + , conduit-extra, deepseq, http-types, httpd-shed, HUnit, mtl + , network, network-uri, parsec, pureMD5, split, test-framework + , test-framework-hunit, time, wai, warp + }: + mkDerivation { + pname = "HTTP"; + version = "4000.3.10"; + sha256 = "12cy8yn06cm9xqcnvvk0s0yh6w67r6bxs8wn37q97y0b6fjiwdfj"; + libraryHaskellDepends = [ + array base bytestring mtl network network-uri parsec time + ]; + testHaskellDepends = [ + base bytestring case-insensitive conduit conduit-extra deepseq + http-types httpd-shed HUnit mtl network network-uri pureMD5 split + test-framework test-framework-hunit wai warp + ]; + homepage = "https://github.com/haskell/HTTP"; + description = "A library for client-side HTTP"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "HTTP-Simple" = callPackage ({ mkDerivation, base, HTTP, network }: mkDerivation { @@ -10143,6 +10220,26 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {inherit (pkgs) openssl;}; + "HsOpenSSL_0_11_4_13" = callPackage + ({ mkDerivation, base, bytestring, Cabal, integer-gmp, network + , openssl, time + }: + mkDerivation { + pname = "HsOpenSSL"; + version = "0.11.4.13"; + sha256 = "0izzgyjd0s9whqllwyg8gv2xnsfax9sf8j47zq1d2vmk7mpx2p0j"; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ + base bytestring integer-gmp network time + ]; + librarySystemDepends = [ openssl ]; + testHaskellDepends = [ base bytestring ]; + homepage = "https://github.com/vshabanov/HsOpenSSL"; + description = "Partial OpenSSL binding for Haskell"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) openssl;}; + "HsOpenSSL-x509-system" = callPackage ({ mkDerivation, base, bytestring, HsOpenSSL, unix }: mkDerivation { @@ -10919,6 +11016,8 @@ self: { pname = "JuicyPixels-extra"; version = "0.3.0"; sha256 = "08hf3dklz3zaczbffq11z1yjk3hqf53rnz3g9n989ndw8ybkm865"; + revision = "1"; + editedCabalFile = "17y0d11hgdnzcgv7q7zl3wic2w2xhqn123vzfsdivncgdgqlvy0c"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base JuicyPixels ]; testHaskellDepends = [ base hspec JuicyPixels ]; @@ -11290,7 +11389,6 @@ self: { homepage = "https://github.com/ezyang/ldap-haskell"; description = "Haskell binding for C LDAP API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) openldap;}; "LParse" = callPackage @@ -11628,7 +11726,6 @@ self: { homepage = "https://github.com/masterdezign/Learning#readme"; description = "The most frequently used machine learning tools"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Level0" = callPackage @@ -12096,7 +12193,6 @@ self: { libraryHaskellDepends = [ base bytestring hidapi mtl ]; description = "Haskell interface for controlling the mBot educational robot"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "MC-Fold-DP" = callPackage @@ -12572,6 +12668,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "spam"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Modulo" = callPackage @@ -13990,7 +14087,7 @@ self: { }) {}; "OpenGLRaw" = callPackage - ({ mkDerivation, base, bytestring, containers, fixed, half, mesa + ({ mkDerivation, base, bytestring, containers, fixed, half, libGL , text, transformers }: mkDerivation { @@ -14000,11 +14097,11 @@ self: { libraryHaskellDepends = [ base bytestring containers fixed half text transformers ]; - librarySystemDepends = [ mesa ]; + librarySystemDepends = [ libGL ]; homepage = "http://www.haskell.org/haskellwiki/Opengl"; description = "A raw binding for the OpenGL graphics system"; license = stdenv.lib.licenses.bsd3; - }) {mesa = null;}; + }) {inherit (pkgs) libGL;}; "OpenGLRaw21" = callPackage ({ mkDerivation, OpenGLRaw }: @@ -14173,6 +14270,7 @@ self: { homepage = "https://github.com/MarisaKirisame/Ordinary#readme"; description = "A Programming Language in Construction"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "PArrows" = callPackage @@ -16628,8 +16726,8 @@ self: { }: mkDerivation { pname = "SelectSequencesFromMSA"; - version = "1.0.3"; - sha256 = "0i2nzwv0czg1igyfiyk5n748j15fcavn84dwxibiqf48wzjz9gsc"; + version = "1.0.4"; + sha256 = "0rr8gxkypjg347fna0q5aqjllvc95477n3xy63cvs0bn8v5vq9z5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -16640,8 +16738,9 @@ self: { executableHaskellDepends = [ base cmdargs directory either-unwrap ]; - description = "SelectSequences is a tool for selection of a represenative subset of sequences from a multiple sequence alignment in clustal format"; + description = "Selects a representative subset of sequences from multiple sequence alignment"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Semantique" = callPackage @@ -16704,15 +16803,18 @@ self: { }) {}; "ShellCheck" = callPackage - ({ mkDerivation, base, containers, directory, json, mtl, parsec - , process, QuickCheck, regex-tdfa + ({ mkDerivation, base, Cabal, containers, directory, json, mtl + , parsec, process, QuickCheck, regex-tdfa }: mkDerivation { pname = "ShellCheck"; version = "0.4.7"; sha256 = "0z0dlx4s0j5v627cvns5qdq1r6kcka5nif8g62hdria29lk5aj8q"; + revision = "1"; + editedCabalFile = "0fbrysx6wb9kmlzbfyjcb7107rnf0rjldlszaqnpib33vwd7l1hx"; isLibrary = true; isExecutable = true; + setupHaskellDepends = [ base Cabal process ]; libraryHaskellDepends = [ base containers directory json mtl parsec process QuickCheck regex-tdfa @@ -16723,7 +16825,7 @@ self: { testHaskellDepends = [ base containers directory json mtl parsec QuickCheck regex-tdfa ]; - homepage = "http://www.shellcheck.net/"; + homepage = "https://www.shellcheck.net/"; description = "Shell script analysis tool"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -20046,7 +20148,6 @@ self: { homepage = "http://github.com/bgwines/zora"; description = "Graphing library wrapper + assorted useful functions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Zwaluw" = callPackage @@ -20572,6 +20673,32 @@ self: { homepage = "http://hub.darcs.net/thielema/accelerate-fourier/"; description = "Fast Fourier transform and convolution using the Accelerate framework"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "accelerate-fourier_1_0_0_4" = callPackage + ({ mkDerivation, accelerate, accelerate-arithmetic + , accelerate-llvm-native, accelerate-utility, base, containers + , criterion, QuickCheck, transformers, utility-ht + }: + mkDerivation { + pname = "accelerate-fourier"; + version = "1.0.0.4"; + sha256 = "1263ximbciszb6cij232vxsxfj5rj7n77l88fd7vh6ayx7rrr45m"; + libraryHaskellDepends = [ + accelerate accelerate-arithmetic accelerate-utility base containers + QuickCheck transformers utility-ht + ]; + testHaskellDepends = [ + accelerate accelerate-arithmetic accelerate-utility base QuickCheck + utility-ht + ]; + benchmarkHaskellDepends = [ + accelerate accelerate-arithmetic accelerate-llvm-native + accelerate-utility base criterion utility-ht + ]; + homepage = "http://hub.darcs.net/thielema/accelerate-fourier/"; + description = "Fast Fourier transform and convolution using the Accelerate framework"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -20632,7 +20759,6 @@ self: { ]; description = "Accelerate backend component generating LLVM IR"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "accelerate-llvm-native" = callPackage @@ -20655,7 +20781,6 @@ self: { libraryToolDepends = [ c2hs ]; description = "Accelerate backend for multicore CPUs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "accelerate-llvm-ptx" = callPackage @@ -21813,7 +21938,6 @@ self: { homepage = "https://github.com/michalkonecny/aern2"; description = "Multi-precision floats via MPFR"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aern2-real" = callPackage @@ -21838,7 +21962,6 @@ self: { homepage = "https://github.com/michalkonecny/aern2"; description = "Exact real numbers via Cauchy sequences and MPFR"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson_0_7_0_6" = callPackage @@ -21903,6 +22026,40 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "aeson_1_3_0_0" = callPackage + ({ mkDerivation, attoparsec, base, base-compat, base-orphans + , base16-bytestring, bytestring, containers, deepseq, directory + , dlist, filepath, generic-deriving, ghc-prim, hashable + , hashable-time, HUnit, integer-logarithms, QuickCheck + , quickcheck-instances, scientific, tagged, template-haskell + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text, th-abstraction, time, time-locale-compat + , unordered-containers, uuid-types, vector + }: + mkDerivation { + pname = "aeson"; + version = "1.3.0.0"; + sha256 = "1glrwccp5hi9zn8d34761zinvpmbd4dsbgzqg2qxk6glp928phna"; + libraryHaskellDepends = [ + attoparsec base base-compat bytestring containers deepseq dlist + ghc-prim hashable scientific tagged template-haskell text + th-abstraction time time-locale-compat unordered-containers + uuid-types vector + ]; + testHaskellDepends = [ + attoparsec base base-compat base-orphans base16-bytestring + bytestring containers directory dlist filepath generic-deriving + ghc-prim hashable hashable-time HUnit integer-logarithms QuickCheck + quickcheck-instances scientific tagged template-haskell + test-framework test-framework-hunit test-framework-quickcheck2 text + time time-locale-compat unordered-containers uuid-types vector + ]; + homepage = "https://github.com/bos/aeson"; + description = "Fast JSON parsing and encoding"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "aeson-applicative" = callPackage ({ mkDerivation, aeson, base, text, unordered-containers }: mkDerivation { @@ -22003,6 +22160,8 @@ self: { pname = "aeson-compat"; version = "0.3.7.1"; sha256 = "1jya3lm9imclhb8qqihv39hhb62vvs3qpws7pc5fc23vwg0hsx2r"; + revision = "1"; + editedCabalFile = "0zm4i3n8n2xj53ymb8cd1d7bnsgna5064198ackj1xjh8zsaarz6"; libraryHaskellDepends = [ aeson attoparsec attoparsec-iso8601 base base-compat bytestring containers exceptions hashable scientific tagged text time @@ -22274,8 +22433,8 @@ self: { ({ mkDerivation, aeson, base, hspec, lens, lens-aeson, text }: mkDerivation { pname = "aeson-picker"; - version = "0.1.0.2"; - sha256 = "0m14ykp894s8nbg89v2f83yyb344ypxwchmyww0nq0mcpzk3v95b"; + version = "0.1.0.3"; + sha256 = "0ipkl5plyhbkld3i6jrlzy9y1kpvb69gy1nqb45rbnjbdxafslpk"; libraryHaskellDepends = [ aeson base lens lens-aeson text ]; testHaskellDepends = [ base hspec text ]; homepage = "https://github.com/ozzzzz/aeson-picker#readme"; @@ -22386,7 +22545,6 @@ self: { homepage = "https://github.com/libscott/aeson-quick"; description = "Quick JSON extractions with Aeson"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-schema" = callPackage @@ -22697,7 +22855,6 @@ self: { homepage = "https://github.com/UU-ComputerScience/ag-pictgen"; description = "Attribute Grammar picture generation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "agda-server" = callPackage @@ -25677,7 +25834,6 @@ self: { homepage = "https://github.com/Axman6/amazonka-s3-streaming#readme"; description = "Provides conduits to upload data to S3 using the Multipart API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-sdb" = callPackage @@ -26612,8 +26768,8 @@ self: { pname = "ansi-pretty"; version = "0.1.2.1"; sha256 = "1ill2dlzbxn97smkzdqcjfx9z3fw7pgwvz6w36d92n8p7zwik23h"; - revision = "3"; - editedCabalFile = "046w5nybk8fyhicw5wy7qchbx9k4sib189afj2gysrsblj0ki864"; + revision = "4"; + editedCabalFile = "0yp5wihvl22vfcr0x22xdbvrk79hcahx1kyfpwpvv0jkahc5c03q"; libraryHaskellDepends = [ aeson ansi-wl-pprint array base bytestring containers generics-sop nats scientific semigroups tagged text time unordered-containers @@ -26988,7 +27144,6 @@ self: { homepage = "https://github.com/intolerable/api-builder"; description = "Library for easily building REST API wrappers in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "api-field-json-th" = callPackage @@ -27662,7 +27817,6 @@ self: { ]; description = "Perform refactorings specified by the refact library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "apportionment" = callPackage @@ -27830,7 +27984,6 @@ self: { homepage = "http://arbtt.nomeata.de/"; description = "Automatic Rule-Based Time Tracker"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "arcgrid" = callPackage @@ -28243,7 +28396,6 @@ self: { homepage = "https://github.com/cartazio/arithmoi"; description = "Efficient basic number-theoretic functions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "armada" = callPackage @@ -29108,6 +29260,7 @@ self: { homepage = "https://github.com/serokell/async-combinators"; description = "Async combinators"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "async-dejafu" = callPackage @@ -29550,7 +29703,6 @@ self: { homepage = "https://github.com/chris-martin/atomic-modify"; description = "A typeclass for mutable references that have an atomic modify operation"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "atomic-primops" = callPackage @@ -29565,6 +29717,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "atomic-primops_0_8_2" = callPackage + ({ mkDerivation, base, ghc-prim, primitive }: + mkDerivation { + pname = "atomic-primops"; + version = "0.8.2"; + sha256 = "0cyr2x6xqz6s233znrz9rnrfj56m9bmnawwnka0lsqqy1hp8gy37"; + libraryHaskellDepends = [ base ghc-prim primitive ]; + homepage = "https://github.com/rrnewton/haskell-lockfree/wiki"; + description = "A safe approach to CAS and other atomic ops in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "atomic-primops-foreign" = callPackage ({ mkDerivation, base, bits-atomic, HUnit, test-framework , test-framework-hunit, time @@ -29700,28 +29865,28 @@ self: { "ats-pkg" = callPackage ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring, bzlib , Cabal, cli-setup, composition-prelude, containers, dependency - , dhall, directory, file-embed, filemanip, http-client - , http-client-tls, lzma, microlens, microlens-th - , optparse-applicative, parallel-io, process, shake, shake-ats - , shake-ext, tar, temporary, text, unix, zip-archive, zlib + , dhall, directory, file-embed, filemanip, hashable, http-client + , http-client-tls, lens, lzma, mtl, optparse-applicative + , parallel-io, process, shake, shake-ats, shake-ext, tar, temporary + , text, unix, zip-archive, zlib }: mkDerivation { pname = "ats-pkg"; - version = "2.7.0.10"; - sha256 = "15snn30g5hkwp0yv5iz84qx363d26lsy4via9l5h7qr2dahy8rkx"; + version = "2.7.1.0"; + sha256 = "0lpyvcj5cki19fs9022yb1wzwis6a89f3i4s03rcll0lvshmxd2q"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cli-setup ]; libraryHaskellDepends = [ ansi-wl-pprint base binary bytestring bzlib Cabal composition-prelude containers dependency dhall directory - file-embed filemanip http-client http-client-tls lzma microlens - microlens-th parallel-io process shake shake-ats shake-ext tar text - unix zip-archive zlib + file-embed filemanip hashable http-client http-client-tls lens lzma + mtl parallel-io process shake shake-ats shake-ext tar text unix + zip-archive zlib ]; executableHaskellDepends = [ - base composition-prelude directory microlens optparse-applicative - shake shake-ats temporary text + base composition-prelude directory lens optparse-applicative shake + shake-ats temporary text ]; homepage = "https://github.com/vmchale/atspkg#readme"; description = "A build tool for ATS"; @@ -29762,6 +29927,7 @@ self: { homepage = "https://github.com//ats-generic#readme"; description = "Marshal ATS types into Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "attempt" = callPackage @@ -29983,7 +30149,6 @@ self: { homepage = "https://github.com/athanclark/attoparsec-ip#readme"; description = "Parse IP data types with attoparsec"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "attoparsec-iso8601" = callPackage @@ -30121,7 +30286,6 @@ self: { homepage = "https://github.com/athanclark/attoparsec-uri#readme"; description = "URI parser / printer using attoparsec"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "attoparsec-uri_0_0_4" = callPackage @@ -32255,6 +32419,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "base-orphans_0_7" = callPackage + ({ mkDerivation, base, ghc-prim, hspec, hspec-discover, QuickCheck + }: + mkDerivation { + pname = "base-orphans"; + version = "0.7"; + sha256 = "057f9npnqk71ccfh95djfkpd54dzazphj06grwxa3fyhwcwxrb8a"; + libraryHaskellDepends = [ base ghc-prim ]; + testHaskellDepends = [ base hspec QuickCheck ]; + testToolDepends = [ hspec-discover ]; + homepage = "https://github.com/haskell-compat/base-orphans#readme"; + description = "Backwards-compatible orphan instances for base"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "base-prelude" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -32401,6 +32581,8 @@ self: { pname = "base64-bytestring-type"; version = "1"; sha256 = "0h74c0qhf4n0pamrl29ha5hgf940bay0dhl8rifaw4l03z8rn0bl"; + revision = "1"; + editedCabalFile = "06glza5pqw1s3xpk8va36q1b1bfcirkkrcq9pfd8x12lhjjnsxxr"; libraryHaskellDepends = [ aeson base base-compat base64-bytestring binary bytestring cereal deepseq hashable QuickCheck text @@ -33174,6 +33356,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bench_1_0_9" = callPackage + ({ mkDerivation, base, criterion, optparse-applicative, process + , silently, text, turtle + }: + mkDerivation { + pname = "bench"; + version = "1.0.9"; + sha256 = "0c58m6w0xci76h97p7dkzcnxn8l9drsl9gz5gihhfzdxiardahrw"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base criterion optparse-applicative process silently text turtle + ]; + homepage = "http://github.com/Gabriel439/bench"; + description = "Command-line benchmark tool"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "benchmark-function" = callPackage ({ mkDerivation, base, process, random, time }: mkDerivation { @@ -34038,8 +34239,8 @@ self: { pname = "binary-orphans"; version = "0.1.8.0"; sha256 = "1k6067wn9zki7xvbslvxx8cq1wrmz3kjb3q3x8mxycc9v765fxgi"; - revision = "1"; - editedCabalFile = "1zgp08sikp71k9llcplkdrfhh2gn43gk7hx81nslixl5s91a1j9q"; + revision = "2"; + editedCabalFile = "1kvrp3dfqx49lkvjvglv18r7yzb165wisg953yih9sgksm02pxf5"; libraryHaskellDepends = [ aeson base binary case-insensitive hashable scientific tagged text text-binary time unordered-containers vector @@ -34437,9 +34638,10 @@ self: { }) {esound = null;}; "bindings-GLFW" = callPackage - ({ mkDerivation, base, bindings-DSL, HUnit, libX11, libXcursor - , libXext, libXfixes, libXi, libXinerama, libXrandr, libXxf86vm - , mesa, template-haskell, test-framework, test-framework-hunit + ({ mkDerivation, base, bindings-DSL, HUnit, libGL, libX11 + , libXcursor, libXext, libXfixes, libXi, libXinerama, libXrandr + , libXxf86vm, template-haskell, test-framework + , test-framework-hunit }: mkDerivation { pname = "bindings-GLFW"; @@ -34447,19 +34649,19 @@ self: { sha256 = "1xmmwxbjpxwndiacrh2mk3lih6cs8d83ax07vg5sgyp5d7qigvik"; libraryHaskellDepends = [ base bindings-DSL template-haskell ]; librarySystemDepends = [ - libX11 libXcursor libXext libXfixes libXi libXinerama libXrandr - libXxf86vm mesa + libGL libX11 libXcursor libXext libXfixes libXi libXinerama + libXrandr libXxf86vm ]; testHaskellDepends = [ base HUnit test-framework test-framework-hunit ]; description = "Low-level bindings to GLFW OpenGL library"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXcursor; - inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXfixes; - inherit (pkgs.xorg) libXi; inherit (pkgs.xorg) libXinerama; - inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXxf86vm; - mesa = null;}; + }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; + inherit (pkgs.xorg) libXcursor; inherit (pkgs.xorg) libXext; + inherit (pkgs.xorg) libXfixes; inherit (pkgs.xorg) libXi; + inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr; + inherit (pkgs.xorg) libXxf86vm;}; "bindings-K8055" = callPackage ({ mkDerivation, base, K8055D }: @@ -36419,8 +36621,8 @@ self: { pname = "blank-canvas"; version = "0.6.2"; sha256 = "1qhdvxia8wlnv0ss9dsrxdfw3qsf376ypnpsijz7vxkj9dmzyq84"; - revision = "1"; - editedCabalFile = "0zc84pjrmb2xpsvavvf950vrwyd6nlfj3x2hi930wq1kjm7pr4ps"; + revision = "3"; + editedCabalFile = "0fanap927iszy3vkymkjcmzd74gripbbp222zcmzl5gkn3l4g931"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base base-compat base64-bytestring bytestring colour @@ -36562,6 +36764,8 @@ self: { pname = "blaze-builder"; version = "0.4.0.2"; sha256 = "1m33y6p5xldni8p4fzg8fmsyqvkfmnimdamr1xjnsmgm3dkf9lws"; + revision = "1"; + editedCabalFile = "1n8z1zcvrslsa9dvflx8528hsialmnljl1zzdjf1azs24xdq2npm"; libraryHaskellDepends = [ base bytestring deepseq text ]; testHaskellDepends = [ base bytestring HUnit QuickCheck test-framework @@ -37331,7 +37535,6 @@ self: { homepage = "https://github.com/phlummox/bogocopy"; description = "Copy a directory tree, making zero-size sparse copies of big files"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bogre-banana" = callPackage @@ -37551,7 +37754,6 @@ self: { homepage = "https://github.com/arowM/haskell-bookkeeping-jp#readme"; description = "Helper functions for Japanese bookkeeping"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bool-extras" = callPackage @@ -37988,12 +38190,27 @@ self: { pname = "boxes"; version = "0.1.4"; sha256 = "1n7xiplzd3s1a39nizwjcgsh3wi2348mp21c3fk19v98ialfjgjf"; + revision = "1"; + editedCabalFile = "073kkci1pm6rci7mnq9v006679jk41bfzc0jfi7my4c7idwd1ijd"; libraryHaskellDepends = [ base split ]; testHaskellDepends = [ base QuickCheck split ]; description = "2D text pretty-printing library"; license = stdenv.lib.licenses.bsd3; }) {}; + "boxes_0_1_5" = callPackage + ({ mkDerivation, base, QuickCheck, split }: + mkDerivation { + pname = "boxes"; + version = "0.1.5"; + sha256 = "1hsnmw95i58d4bkpxby3ddsj1cawypw4mdyb18m393s5i8p7iq9q"; + libraryHaskellDepends = [ base split ]; + testHaskellDepends = [ base QuickCheck split ]; + description = "2D text pretty-printing library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bpann" = callPackage ({ mkDerivation, base, random, split }: mkDerivation { @@ -38415,7 +38632,6 @@ self: { homepage = "https://github.com/lspitzner/brittany/"; description = "Haskell source code formatter"; license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "brittany_0_9_0_1" = callPackage @@ -38731,7 +38947,6 @@ self: { homepage = "http://johannesgerer.com/buchhaltung"; description = "Automates most of your plain text accounting data entry in ledger format"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "buffer" = callPackage @@ -39244,6 +39459,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bv-sized" = callPackage + ({ mkDerivation, base, parameterized-utils }: + mkDerivation { + pname = "bv-sized"; + version = "0.1.0.0"; + sha256 = "07na5cg1w0ybydsvm4i7gdz7ghas6j7a4n8gzpd4sywfvrbirp21"; + libraryHaskellDepends = [ base parameterized-utils ]; + homepage = "https://github.com/benjaminselfridge/bv-sized"; + description = "a BitVector datatype that is parameterized by the vector width"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "byline" = callPackage ({ mkDerivation, ansi-terminal, base, colour, containers , exceptions, haskeline, mtl, terminfo-hs, text, transformers @@ -39401,7 +39628,6 @@ self: { homepage = "https://github.com/tsuraan/bytestring-arbitrary"; description = "Arbitrary instances for ByteStrings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bytestring-builder" = callPackage @@ -39485,8 +39711,8 @@ self: { }: mkDerivation { pname = "bytestring-encodings"; - version = "0.1.0.0"; - sha256 = "070n1203shbfkimkrxr5xs5znpljbb61v7npwp9lgfpj4h8gyaq7"; + version = "0.1.0.1"; + sha256 = "09lx8d92dhd4gicz8pbpj19k2iaig1yl4lksqpxiqgxzybwqn0rc"; libraryHaskellDepends = [ base bytestring ghc-prim ]; testHaskellDepends = [ base bytestring hedgehog ]; benchmarkHaskellDepends = [ base bytestring gauge text ]; @@ -39582,15 +39808,14 @@ self: { homepage = "https://github.com/hvr/bytestring-plain"; description = "Plain byte strings ('ForeignPtr'-less 'ByteString's)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bytestring-progress" = callPackage ({ mkDerivation, base, bytestring, terminal-progress-bar, time }: mkDerivation { pname = "bytestring-progress"; - version = "1.0.8"; - sha256 = "0zqb9aanlwq2ddcn7n8xar73fjb04xvfym7k5pjah2cs1lh3cv8l"; + version = "1.0.9"; + sha256 = "1gqcr15956zzldsc3rvds3ybd43907bv69cw3i7a1c0nfz60zg70"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring terminal-progress-bar time @@ -39598,7 +39823,6 @@ self: { homepage = "http://github.com/acw/bytestring-progress"; description = "A library for tracking the consumption of a lazy ByteString"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bytestring-read" = callPackage @@ -39926,6 +40150,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) mosquitto;}; + "c-storable" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "c-storable"; + version = "0.2"; + sha256 = "03ynlm6nbm2hsqp0bpcqj3kp1hbg2pnif44zrgj8rda8dmsczm9j"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/elaforge/c-storable"; + description = "CStorable class"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "c-storable-deriving" = callPackage ({ mkDerivation, base, ghc-prim }: mkDerivation { @@ -40295,6 +40532,8 @@ self: { pname = "cabal-doctest"; version = "1.0.6"; sha256 = "0bgd4jdmzxq5y465r4sf4jv2ix73yvblnr4c9wyazazafddamjny"; + revision = "1"; + editedCabalFile = "1bk85avgc93yvcggwbk01fy8nvg6753wgmaanhkry0hz55h7mpld"; libraryHaskellDepends = [ base Cabal directory filepath ]; homepage = "https://github.com/phadej/cabal-doctest"; description = "A Setup.hs helper for doctests running"; @@ -40399,7 +40638,6 @@ self: { doCheck = false; description = "Simple interface to some of Cabal's configuration state, mainly used by ghc-mod"; license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-info" = callPackage @@ -40591,7 +40829,6 @@ self: { homepage = "http://www.yesodweb.com/"; description = "build multiple packages at once"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-mon" = callPackage @@ -40792,7 +41029,6 @@ self: { homepage = "https://github.com/yesodweb/cabal-src"; description = "Alternative install procedure to avoid the diamond dependency issue"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-test" = callPackage @@ -40978,8 +41214,8 @@ self: { }: mkDerivation { pname = "cabal2nix"; - version = "2.8.2"; - sha256 = "0m3k8prp13n6n74ghy2m05bj2c940nscjnv6h8g45ygxid8jvxc8"; + version = "2.9"; + sha256 = "1n6r27i4njiidij228r9fdb45pmsiidan6pxs2is2vsl8k9d65c7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -41687,6 +41923,7 @@ self: { homepage = "https://github.com/grandpascorpion/canon"; description = "Massive Number Arithmetic"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "canonical-filepath" = callPackage @@ -41762,7 +41999,6 @@ self: { homepage = "https://github.com/SumAll/haskell-canteven-log"; description = "A canteven way of setting up logging for your program"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "canteven-parsedate" = callPackage @@ -42298,6 +42534,18 @@ self: { maintainers = with stdenv.lib.maintainers; [ jb55 ]; }) {}; + "caseof" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "caseof"; + version = "0.0.1"; + sha256 = "1j8r8ldaxgyvka3zpqfl8qp0mbwrnh1s1xl5fgx3jjzqxlisfdp3"; + libraryHaskellDepends = [ base template-haskell ]; + homepage = "https://github.com/chrisdone/caseof#readme"; + description = "Combinators for casing on constructors"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cases" = callPackage ({ mkDerivation, attoparsec, base, base-prelude, criterion, HTF , HUnit, loch-th, mwc-random, placeholders, QuickCheck, rerebase @@ -42672,7 +42920,6 @@ self: { homepage = "https://github.com/stackbuilders/cassava-megaparsec"; description = "Megaparsec parser of CSV files that plays nicely with Cassava"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cassava-records" = callPackage @@ -42821,7 +43068,6 @@ self: { homepage = "https://github.com/frerich/catamorphism"; description = "A package exposing a helper function for generating catamorphisms"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "catch-fd" = callPackage @@ -42870,7 +43116,6 @@ self: { libraryHaskellDepends = [ alg base ]; description = "Categorical types and classes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "category-extras" = callPackage @@ -43268,7 +43513,6 @@ self: { homepage = "https://nest.pijul.com/lthms/celtchar"; description = "A tool to build a novel"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cerberus" = callPackage @@ -43837,8 +44081,8 @@ self: { }: mkDerivation { pname = "changelogged"; - version = "0.1.0"; - sha256 = "1krf1wkb4khmwvapnhh0shvf51475j9i2g22fcfl1hjahyqmk6lj"; + version = "0.2.0"; + sha256 = "05viyx641zwxf222gvhyhs5dclwbylp7s32n7h3zzja4bycf03f2"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -43855,7 +44099,7 @@ self: { unordered-containers ]; homepage = "https://github.com/GetShopTV/changelogged#readme"; - description = "Tool to manage project publishing history"; + description = "Changelog manager for Git projects"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -44128,6 +44372,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "chatwork_0_1_3_1" = callPackage + ({ mkDerivation, aeson, aeson-casing, base, bytestring, connection + , data-default-class, hspec, http-api-data, http-client + , http-client-tls, http-types, req, servant-server, text, warp + }: + mkDerivation { + pname = "chatwork"; + version = "0.1.3.1"; + sha256 = "0wsr84yk8l9s8fpb6fg4vbjyzlvy0608qply1h12zi09b5zr149i"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-casing base bytestring connection data-default-class + http-api-data http-client http-client-tls http-types req text + ]; + executableHaskellDepends = [ + aeson aeson-casing base bytestring connection data-default-class + http-api-data http-client http-client-tls http-types req text + ]; + testHaskellDepends = [ + aeson aeson-casing base bytestring connection data-default-class + hspec http-api-data http-client http-client-tls http-types req + servant-server text warp + ]; + homepage = "https://github.com/matsubara0507/chatwork#readme"; + description = "The ChatWork API in Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cheapskate" = callPackage ({ mkDerivation, base, blaze-html, bytestring, containers , data-default, deepseq, mtl, syb, text, uniplate, xss-sanitize @@ -45372,6 +45646,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "clang-compilation-database_0_1_0_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, text }: + mkDerivation { + pname = "clang-compilation-database"; + version = "0.1.0.1"; + sha256 = "1a0wvk82k65b5lscsvg5p41shpz98rahq44d5vyf8wclfshh2ihi"; + libraryHaskellDepends = [ aeson base bytestring text ]; + testHaskellDepends = [ aeson base bytestring ]; + homepage = "https://github.com/lambdageek/clang-compilation-database"; + description = "JSON Compilation Database Format encoding and decoding"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "clang-pure" = callPackage ({ mkDerivation, base, bytestring, clang, containers, contravariant , inline-c, microlens, microlens-contra, singletons, stm @@ -45833,6 +46121,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "clay_0_13_0" = callPackage + ({ mkDerivation, base, hspec, hspec-expectations, mtl, text }: + mkDerivation { + pname = "clay"; + version = "0.13.0"; + sha256 = "0kyg5ifrjdvd7rxzsa6jjfyv9xx8amlfzbmrfwksrqla2nxqyljl"; + libraryHaskellDepends = [ base mtl text ]; + testHaskellDepends = [ base hspec hspec-expectations mtl text ]; + homepage = "http://fvisser.nl/clay"; + description = "CSS preprocessor as embedded Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "clckwrks" = callPackage ({ mkDerivation, acid-state, aeson, aeson-qq, attoparsec, base , blaze-html, bytestring, cereal, containers, directory, filepath @@ -45865,7 +46167,6 @@ self: { homepage = "http://www.clckwrks.com/"; description = "A secure, reliable content management system (CMS) and blogging platform"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) openssl;}; "clckwrks-cli" = callPackage @@ -45884,7 +46185,6 @@ self: { homepage = "http://www.clckwrks.com/"; description = "a command-line interface for adminstrating some aspects of clckwrks"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clckwrks-dot-com" = callPackage @@ -45959,7 +46259,6 @@ self: { homepage = "http://www.clckwrks.com/"; description = "ircbot plugin for clckwrks"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clckwrks-plugin-mailinglist" = callPackage @@ -45985,7 +46284,6 @@ self: { homepage = "http://www.clckwrks.com/"; description = "mailing list plugin for clckwrks"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clckwrks-plugin-media" = callPackage @@ -46010,7 +46308,6 @@ self: { homepage = "http://clckwrks.com/"; description = "media plugin for clckwrks"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clckwrks-plugin-page" = callPackage @@ -46036,7 +46333,6 @@ self: { homepage = "http://www.clckwrks.com/"; description = "support for CMS/Blogging in clckwrks"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clckwrks-theme-bootstrap" = callPackage @@ -46055,7 +46351,6 @@ self: { homepage = "http://www.clckwrks.com/"; description = "simple bootstrap based template for clckwrks"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clckwrks-theme-clckwrks" = callPackage @@ -47641,7 +47936,6 @@ self: { homepage = "http://code.haskell.org/~bkomuves/"; description = "Equivariant CSM classes of coincident root loci"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "colada" = callPackage @@ -47773,7 +48067,6 @@ self: { homepage = "https://github.com/alunduil/collection-json.hs"; description = "Collection+JSON—Hypermedia Type Tools"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "collections" = callPackage @@ -48031,6 +48324,7 @@ self: { homepage = "https://github.com/leftaroundabout/colour-space"; description = "Instances of the manifold-classes for colour types"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "coltrane" = callPackage @@ -48180,7 +48474,6 @@ self: { homepage = "http://code.haskell.org/~bkomuves/"; description = "Generate and manipulate various combinatorial objects"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "combinat-diagrams" = callPackage @@ -48198,7 +48491,6 @@ self: { homepage = "http://code.haskell.org/~bkomuves/"; description = "Graphical representations for various combinatorial objects"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "combinator-interactive" = callPackage @@ -49124,7 +49416,6 @@ self: { homepage = "http://github.com/ekmett/compressed/"; description = "Compressed containers and reducers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "compression" = callPackage @@ -49614,7 +49905,6 @@ self: { benchmarkHaskellDepends = [ base machines time ]; description = "Concurrent networked stream transducers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "concurrent-output" = callPackage @@ -49717,7 +50007,6 @@ self: { homepage = "-"; description = "More utilities and broad-used datastructures for concurrency"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "concurrentoutput" = callPackage @@ -50356,6 +50645,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "confide" = callPackage + ({ mkDerivation, base, deiko-config, exceptions, tasty, tasty-hunit + , text + }: + mkDerivation { + pname = "confide"; + version = "0.1.0.3"; + sha256 = "0agq5naldbs1lwpw9nf5jldzrqh6pbc1n5vn5cb3kk7rj7j1a8ik"; + libraryHaskellDepends = [ base deiko-config exceptions text ]; + testHaskellDepends = [ base deiko-config tasty tasty-hunit text ]; + homepage = "https://github.com/amilkov3/confide"; + description = "derive typeclass instances for decoding types from HOCON conf"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "config-ini" = callPackage ({ mkDerivation, base, containers, directory, hedgehog, ini , megaparsec, text, transformers, unordered-containers @@ -50408,7 +50713,6 @@ self: { homepage = "https://github.com/protoben/config-parser"; description = "Parse config files using parsec and generate parse errors on unhandled keys"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "config-schema" = callPackage @@ -50417,10 +50721,8 @@ self: { }: mkDerivation { pname = "config-schema"; - version = "0.5.0.0"; - sha256 = "108gjzafzc5hv1vilnxagf65bh2xia2rfwxcjw6axzzhw5lszgli"; - revision = "1"; - editedCabalFile = "03py056v8wvabykx95h5z52g0a5sxglmvvk67wvr94ig8161gbjc"; + version = "0.5.0.1"; + sha256 = "18zdq0w65cs2zy8p0pvb0jfqffcyxq9km1c2h5fvky8c689lp0gp"; libraryHaskellDepends = [ base config-value containers free kan-extensions pretty semigroupoids text transformers @@ -50451,8 +50753,8 @@ self: { ({ mkDerivation, alex, array, base, happy, pretty, text }: mkDerivation { pname = "config-value"; - version = "0.6.3"; - sha256 = "0c7ghasn06m4mlhk3lg5pxpssbsr4l88ibi6vzvp8ylbqha0b3gn"; + version = "0.6.3.1"; + sha256 = "0gfr9qcw8a7y1y9cn6635y8fgvrpkmcqx31bn2a070rbrmk3757z"; libraryHaskellDepends = [ array base pretty text ]; libraryToolDepends = [ alex happy ]; homepage = "https://github.com/glguy/config-value"; @@ -50939,7 +51241,6 @@ self: { libraryHaskellDepends = [ base category ]; description = "Reified constraints"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "constraint-classes" = callPackage @@ -51016,7 +51317,6 @@ self: { homepage = "http://andersk.mit.edu/haskell/constructible/"; description = "Exact computation with constructible real numbers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "constructive-algebra" = callPackage @@ -51292,8 +51592,8 @@ self: { ({ mkDerivation, base, criterion, hspec, recursion-schemes }: mkDerivation { pname = "continued-fraction"; - version = "0.1.0.6"; - sha256 = "04vv2qnpz2pfkizrx8layf3z9kfjkika15ha5kpm0av52d405fiz"; + version = "0.1.0.7"; + sha256 = "04cg0xb634c915mx83vx1vh3l898i27pz309nz6h4jikp99skcs9"; libraryHaskellDepends = [ base recursion-schemes ]; testHaskellDepends = [ base hspec ]; benchmarkHaskellDepends = [ base criterion ]; @@ -51400,7 +51700,6 @@ self: { homepage = "https://github.com/erisco/control-dotdotdot"; description = "Haskell operator `g ... f = \x1 .. xn -> g (f x1 .. xn)`."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "control-event" = callPackage @@ -51854,7 +52153,6 @@ self: { homepage = "https://github.com/NICTA/coordinate"; description = "A representation of latitude and longitude"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "copilot" = callPackage @@ -52311,6 +52609,8 @@ self: { pname = "country"; version = "0.1.4"; sha256 = "027i4ncnsyii41wfndn369xmlbkp4vvcrx7m7cdb07n4wlcpz0bl"; + revision = "1"; + editedCabalFile = "0sjzrld5qa2wn66zgf25w5h41179mcmsjvndn1j8kl20bfsiwhvh"; libraryHaskellDepends = [ aeson attoparsec base bytestring ghc-prim hashable primitive scientific text unordered-containers @@ -52359,7 +52659,6 @@ self: { homepage = "http://github.com/hargettp/courier"; description = "A message-passing library for simplifying network applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "court" = callPackage @@ -53061,7 +53360,6 @@ self: { homepage = "https://github.com/cblp/crdt#readme"; description = "Conflict-free replicated data types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "creatur" = callPackage @@ -53247,6 +53545,8 @@ self: { pname = "critbit"; version = "0.2.0.0"; sha256 = "1xdgaj73ffvj1q1kyi62bifbazmzgamfwzdbdz0c339axw5dga82"; + revision = "1"; + editedCabalFile = "0sfhyrdhnm3803v0yg4ch976nn19hpgwwrlmfdnxnc9agn8m1ja1"; libraryHaskellDepends = [ array base bytestring deepseq text vector ]; @@ -53735,6 +54035,7 @@ self: { homepage = "https://github.com/mseri/crypto-multihash#crypto-multihash"; description = "Multihash library on top of cryptonite crypto library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "crypto-numbers" = callPackage @@ -53940,8 +54241,8 @@ self: { }: mkDerivation { pname = "cryptocompare"; - version = "0.1.0"; - sha256 = "0ghdaf5m3axxzxbq3zm9klrnzh354maf82389aryskglr9l11fv4"; + version = "0.1.1"; + sha256 = "1cqnhg1ww79k3f6yisdir1fqiil13niv002p5s2kir9ks5phybni"; libraryHaskellDepends = [ aeson base bytestring containers directory exceptions http-conduit MissingH text time transformers unordered-containers @@ -54084,6 +54385,8 @@ self: { pname = "cryptohash-sha256"; version = "0.11.101.0"; sha256 = "1p85vajcgw9hmq8zsz9krzx0vxh7aggwbg5w9ws8w97avcsn8xaj"; + revision = "1"; + editedCabalFile = "19birnmwga1yh82l4jqc3fygqkqcf5y8dlldnxfswngkzc3rvwp3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring ]; @@ -54630,7 +54933,6 @@ self: { homepage = "http://mrvandalo.github.io/csv-to-qif/"; description = "A small program that will read csv files and create qif files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ctemplate" = callPackage @@ -54817,6 +55119,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cuda_0_9_0_2" = callPackage + ({ mkDerivation, base, bytestring, c2hs, Cabal, directory, filepath + , pretty, template-haskell + }: + mkDerivation { + pname = "cuda"; + version = "0.9.0.2"; + sha256 = "0l7dpvpr6k0nm7fardga2cyc9ivvv67yndnxpmixifrhdsbm8hvc"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal directory filepath ]; + libraryHaskellDepends = [ + base bytestring filepath template-haskell + ]; + libraryToolDepends = [ c2hs ]; + executableHaskellDepends = [ base pretty ]; + homepage = "https://github.com/tmcdonell/cuda"; + description = "FFI binding to the CUDA interface for programming NVIDIA GPUs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cudd" = callPackage ({ mkDerivation, array, base, c2hs, cudd, mtl, transformers }: mkDerivation { @@ -54904,22 +55228,21 @@ self: { "curl-runnings" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, cmdargs - , http-conduit, text, unordered-containers, yaml + , directory, hspec, hspec-expectations, http-conduit, text + , unordered-containers, yaml }: mkDerivation { pname = "curl-runnings"; - version = "0.1.0"; - sha256 = "055hislas8i417482x40ldvlwif9dihhrspb2fnwv0017gmhbjvf"; + version = "0.2.0"; + sha256 = "0ss98dn39aaa3q2rvf8qf7w638hwwwb2g20p9grw2n9ki0k76i3n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson aeson-pretty base bytestring http-conduit text - unordered-containers + aeson aeson-pretty base bytestring directory hspec + hspec-expectations http-conduit text unordered-containers yaml ]; - executableHaskellDepends = [ - aeson base bytestring cmdargs text yaml - ]; - testHaskellDepends = [ base ]; + executableHaskellDepends = [ base cmdargs text ]; + testHaskellDepends = [ base directory hspec hspec-expectations ]; homepage = "https://github.com/aviaviavi/curl-runnings#readme"; description = "A framework for declaratively writing curl based API tests"; license = stdenv.lib.licenses.mit; @@ -55037,7 +55360,6 @@ self: { homepage = "http://curry-language.org"; description = "Functions for manipulating Curry programs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "curry-frontend" = callPackage @@ -55254,7 +55576,6 @@ self: { ]; description = "A subfield of the complex numbers for exact calculation"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cypher" = callPackage @@ -56034,27 +56355,29 @@ self: { }) {}; "data-basic" = callPackage - ({ mkDerivation, aeson, base, basic, binary, bytestring, cases + ({ mkDerivation, aeson, attoparsec, base, binary, bytestring, cases , containers, hssqlppp, lens, lens-aeson, mtl, overload - , postgresql-simple, simple-effects, string-conv, template-haskell - , text, time + , postgresql-simple, scientific, simple-effects, simple-logging + , string-conv, template-haskell, text, time }: mkDerivation { pname = "data-basic"; - version = "0.2.0.3"; - sha256 = "0xmc9cj22nw90c4l9ava7da14d2y3pvip81admgjx8cqgz93255k"; + version = "0.3.0.0"; + sha256 = "0ssixfnkgxd132pp6mlpgrkbwqbkrx5zn4ayd7br9ncjvpj2j0gr"; libraryHaskellDepends = [ - aeson base binary bytestring cases containers hssqlppp lens - lens-aeson mtl overload postgresql-simple simple-effects - string-conv template-haskell text time + aeson attoparsec base binary bytestring cases containers hssqlppp + lens lens-aeson mtl overload postgresql-simple scientific + simple-effects simple-logging string-conv template-haskell text + time + ]; + testHaskellDepends = [ + aeson base lens postgresql-simple string-conv time ]; - testHaskellDepends = [ base basic lens postgresql-simple time ]; homepage = "https://gitlab.com/haskell-hr/basic"; description = "A database library with a focus on ease of use, type safety and useful error messages"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {basic = null;}; + }) {}; "data-binary-ieee754" = callPackage ({ mkDerivation, base, binary }: @@ -56747,7 +57070,6 @@ self: { homepage = "https://github.com/erisco/data-foldapp"; description = "Fold function applications. Framework for variadic functions."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-forest" = callPackage @@ -56761,7 +57083,6 @@ self: { homepage = "https://github.com/chris-martin/data-forest"; description = "A simple multi-way tree data structure"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-fresh" = callPackage @@ -56848,7 +57169,6 @@ self: { ]; description = "Interval datatype, interval arithmetic and interval-based containers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-inttrie" = callPackage @@ -56947,7 +57267,6 @@ self: { homepage = "http://github.com/roconnor/data-lens/"; description = "Used to be Haskell 98 Lenses"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-lens-fd" = callPackage @@ -56962,7 +57281,6 @@ self: { homepage = "http://github.com/roconnor/data-lens-fd/"; description = "Lenses"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-lens-ixset" = callPackage @@ -57026,7 +57344,6 @@ self: { homepage = "https://github.com/erisco/data-list-zigzag"; description = "A list but with a balanced enumeration of Cartesian product"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-map-multikey" = callPackage @@ -57375,6 +57692,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "data-serializer_0_3_4" = callPackage + ({ mkDerivation, base, binary, bytestring, cereal, data-endian + , parsers, semigroups, split, tasty, tasty-quickcheck + }: + mkDerivation { + pname = "data-serializer"; + version = "0.3.4"; + sha256 = "1ijy8l5lxmm8wpzx4h2vh9q21zz66xgh979s32aa4b16l9m1b4z7"; + libraryHaskellDepends = [ + base binary bytestring cereal data-endian parsers semigroups split + ]; + testHaskellDepends = [ + base binary bytestring cereal tasty tasty-quickcheck + ]; + homepage = "https://github.com/mvv/data-serializer"; + description = "Common API for serialization libraries"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "data-size" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, text }: mkDerivation { @@ -57785,8 +58122,8 @@ self: { }: mkDerivation { pname = "datarobot"; - version = "0.1.1"; - sha256 = "1dcr0jnd7wgxplzfgbkbv79civ80iqzlz2nvp3s6hv5zyzbf2pm9"; + version = "1.0.0"; + sha256 = "0ia74i013drj1mwgpq2dv2ayscs2z4hd7amcbzgxrp1b1j2mkhvj"; libraryHaskellDepends = [ aeson base bytestring exceptions microlens network-uri safe scientific string-conversions text unordered-containers vector wreq @@ -59319,14 +59656,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "dejafu_1_1_0_2" = callPackage + "dejafu_1_3_0_1" = callPackage ({ mkDerivation, base, concurrency, containers, deepseq, exceptions , leancheck, profunctors, random, ref-fd, transformers }: mkDerivation { pname = "dejafu"; - version = "1.1.0.2"; - sha256 = "11gkiy3dh7a9qjg53zilmll0hk61bq68j76s7b31ylwadv437jcm"; + version = "1.3.0.1"; + sha256 = "1qw5ab57fa3phidfzslymxxxi29vcbssc6g8rk9pv07ah6hpccn5"; libraryHaskellDepends = [ base concurrency containers deepseq exceptions leancheck profunctors random ref-fd transformers @@ -60207,12 +60544,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall_1_10_0" = callPackage + "dhall_1_11_0" = callPackage ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base , base16-bytestring, bytestring, case-insensitive, containers - , contravariant, cryptohash, deepseq, directory, exceptions + , contravariant, cryptonite, deepseq, directory, exceptions , filepath, haskeline, http-client, http-client-tls - , insert-ordered-containers, lens-family-core, mtl + , insert-ordered-containers, lens-family-core, memory, mtl , optparse-generic, parsers, prettyprinter , prettyprinter-ansi-terminal, repline, scientific, tasty , tasty-hunit, text, text-format, transformers, trifecta @@ -60220,17 +60557,17 @@ self: { }: mkDerivation { pname = "dhall"; - version = "1.10.0"; - sha256 = "1z9z9f0qw0p7nywpgamkgfz3h3ikhkshrphsviz94vwhnrflq1wf"; + version = "1.11.0"; + sha256 = "1vfraj97vj6jc9ysz3svibadhwrd7q0p3wjlvp6vaackiprfbinf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-wl-pprint base base16-bytestring bytestring case-insensitive - containers contravariant cryptohash directory exceptions filepath + containers contravariant cryptonite directory exceptions filepath http-client http-client-tls insert-ordered-containers - lens-family-core parsers prettyprinter prettyprinter-ansi-terminal - scientific text text-format transformers trifecta - unordered-containers vector + lens-family-core memory parsers prettyprinter + prettyprinter-ansi-terminal scientific text text-format + transformers trifecta unordered-containers vector ]; executableHaskellDepends = [ ansi-terminal base haskeline mtl optparse-generic prettyprinter @@ -60267,20 +60604,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall-bash_1_0_9" = callPackage + "dhall-bash_1_0_10" = callPackage ({ mkDerivation, base, bytestring, containers, dhall , insert-ordered-containers, neat-interpolation, optparse-generic - , shell-escape, text, text-format, trifecta, vector + , shell-escape, text, text-format, trifecta }: mkDerivation { pname = "dhall-bash"; - version = "1.0.9"; - sha256 = "1knnljzh7gccma1xbj3ahrj6cyqfp7lisiv51nnwpxizb7vdfnx0"; + version = "1.0.10"; + sha256 = "0phi5z7rmbxjj83mps0lcpmcv320k8mrfpigls46smv7srmhsla1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring containers dhall insert-ordered-containers - neat-interpolation shell-escape text text-format vector + neat-interpolation shell-escape text text-format ]; executableHaskellDepends = [ base bytestring dhall optparse-generic text trifecta @@ -60328,17 +60665,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall-json_1_0_11" = callPackage + "dhall-json_1_0_12" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, dhall - , optparse-generic, text, trifecta, vector, yaml + , optparse-generic, text, trifecta, yaml }: mkDerivation { pname = "dhall-json"; - version = "1.0.11"; - sha256 = "14jkf3j9iwnhkyz4wl6lvvci8ad21s20rk9kr7hr3fcmzv39alwf"; + version = "1.0.12"; + sha256 = "174ssff7fcxgr13w8mcls7w4fy5xzywh8qb55zj9qragj4bkyjab"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ aeson base dhall text vector ]; + libraryHaskellDepends = [ aeson base dhall text ]; executableHaskellDepends = [ aeson aeson-pretty base bytestring dhall optparse-generic text trifecta yaml @@ -60370,20 +60707,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall-nix_1_1_0" = callPackage + "dhall-nix_1_1_1" = callPackage ({ mkDerivation, base, containers, data-fix, dhall, hnix , insert-ordered-containers, neat-interpolation, optparse-generic - , scientific, text, text-format, trifecta, vector + , scientific, text, text-format, trifecta }: mkDerivation { pname = "dhall-nix"; - version = "1.1.0"; - sha256 = "0g2wyr79krbfdv1z6c8w78kz3w1y0jbx8778qgxbjp70inkwq5gl"; + version = "1.1.1"; + sha256 = "01cdz8kjmm0ncdyq616mg6hjq7cwq5648cnrp6ggps5zc1d71176"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers data-fix dhall hnix insert-ordered-containers - neat-interpolation scientific text text-format vector + neat-interpolation scientific text text-format ]; executableHaskellDepends = [ base dhall hnix optparse-generic text trifecta @@ -60406,12 +60743,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall-text_1_0_6" = callPackage + "dhall-text_1_0_7" = callPackage ({ mkDerivation, base, dhall, optparse-generic, text }: mkDerivation { pname = "dhall-text"; - version = "1.0.6"; - sha256 = "0r08x1s75qsfmn6gnfm0ikh80cq3dbgj7bp4jb8f5pz7p2azh72v"; + version = "1.0.7"; + sha256 = "11jp5yz11f701phzz74zf3spqhgmrdiq8ldbi96xmfjqhwnc9kmj"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base dhall optparse-generic text ]; @@ -60545,7 +60882,6 @@ self: { homepage = "http://projects.haskell.org/diagrams"; description = "hint-based build service for the diagrams graphics EDSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-cairo" = callPackage @@ -60701,7 +61037,6 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "Backend for rendering diagrams directly to GTK windows"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-haddock" = callPackage @@ -60932,7 +61267,6 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "Rasterific backend for diagrams"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-reflex" = callPackage @@ -61079,7 +61413,6 @@ self: { ]; description = "A simple, forward build system"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dice" = callPackage @@ -61386,7 +61719,6 @@ self: { ]; description = "Speed up form designing using digestive functors and bootstrap"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digestive-foundation-lucid" = callPackage @@ -61426,7 +61758,6 @@ self: { homepage = "http://github.com/jaspervdj/digestive-functors"; description = "A practical formlet library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digestive-functors-aeson" = callPackage @@ -61449,7 +61780,6 @@ self: { homepage = "http://github.com/ocharles/digestive-functors-aeson"; description = "Run digestive-functors forms against JSON"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digestive-functors-blaze" = callPackage @@ -61466,7 +61796,6 @@ self: { homepage = "http://github.com/jaspervdj/digestive-functors"; description = "Blaze frontend for the digestive-functors library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digestive-functors-happstack" = callPackage @@ -61483,7 +61812,6 @@ self: { homepage = "http://github.com/jaspervdj/digestive-functors"; description = "Happstack backend for the digestive-functors library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digestive-functors-heist" = callPackage @@ -61528,7 +61856,6 @@ self: { homepage = "https://github.com/athanclark/digestive-functors-lucid"; description = "Lucid frontend for the digestive-functors library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digestive-functors-scotty" = callPackage @@ -61548,7 +61875,6 @@ self: { homepage = "https://github.com/mmartin/digestive-functors-scotty"; description = "Scotty backend for the digestive-functors library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digestive-functors-snap" = callPackage @@ -61566,7 +61892,6 @@ self: { homepage = "http://github.com/jaspervdj/digestive-functors"; description = "Snap backend for the digestive-functors library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digit" = callPackage @@ -61657,6 +61982,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dimensional_1_1" = callPackage + ({ mkDerivation, base, criterion, deepseq, doctest, exact-pi, Glob + , hspec, ieee754, numtype-dk, QuickCheck, semigroups + , template-haskell, vector + }: + mkDerivation { + pname = "dimensional"; + version = "1.1"; + sha256 = "05jy0xs1nmxz7x3b589313hqk317838crhd974knm5k73jf8h99s"; + libraryHaskellDepends = [ + base deepseq exact-pi ieee754 numtype-dk semigroups vector + ]; + testHaskellDepends = [ + base doctest Glob hspec QuickCheck template-haskell + ]; + benchmarkHaskellDepends = [ base criterion deepseq ]; + homepage = "https://github.com/bjornbm/dimensional/"; + description = "Statically checked physical dimensions, using Type Families and Data Kinds"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dimensional-codata" = callPackage ({ mkDerivation, base, dimensional, numtype-dk }: mkDerivation { @@ -62736,7 +63083,6 @@ self: { homepage = "https://bitbucket.org/dpwiz/distributed-process-p2p/"; description = "Peer-to-peer node discovery for Cloud Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-process-platform" = callPackage @@ -63007,18 +63353,17 @@ self: { "distribution-nixpkgs" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers - , deepseq, doctest, hspec, language-nix, lens, pretty, process - , split + , deepseq, hspec, language-nix, lens, pretty, process, split }: mkDerivation { pname = "distribution-nixpkgs"; - version = "1.1"; - sha256 = "15m881mrhpqg1xjdjz65ym8pajp1nijrcvb6dx3vv55430cjw1qx"; + version = "1.1.1"; + sha256 = "1694crd3l9cyc0c5xvqmx62154519g2cnpzc5qmlypwrk258bssm"; libraryHaskellDepends = [ aeson base bytestring Cabal containers deepseq language-nix lens pretty process split ]; - testHaskellDepends = [ base deepseq doctest hspec lens ]; + testHaskellDepends = [ base deepseq hspec lens ]; homepage = "https://github.com/peti/distribution-nixpkgs#readme"; description = "Types and functions to manipulate the Nixpkgs distribution"; license = stdenv.lib.licenses.bsd3; @@ -63359,6 +63704,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dns_3_0_2" = callPackage + ({ mkDerivation, async, attoparsec, auto-update, base + , base64-bytestring, binary, bytestring, conduit, conduit-extra + , containers, cryptonite, doctest, hspec, iproute, mtl, network + , psqueues, QuickCheck, safe, time, word8 + }: + mkDerivation { + pname = "dns"; + version = "3.0.2"; + sha256 = "193j67jnhxkih3gbfzdx9cpzvqryk4kzc3yhl1yagdg16shrba7i"; + libraryHaskellDepends = [ + async attoparsec auto-update base base64-bytestring binary + bytestring conduit conduit-extra containers cryptonite iproute mtl + network psqueues safe time + ]; + testHaskellDepends = [ + base bytestring doctest hspec iproute QuickCheck 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 @@ -63696,6 +64065,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "doctemplates_0_2_2" = callPackage + ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring + , containers, hspec, parsec, scientific, text, unordered-containers + , vector + }: + mkDerivation { + pname = "doctemplates"; + version = "0.2.2"; + sha256 = "1bfi33r48ifgrnj2iyx9d39vadzaq4ssqmf1k3cal5q0ywiw2srz"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base blaze-html blaze-markup bytestring containers parsec + scientific text unordered-containers vector + ]; + testHaskellDepends = [ aeson base hspec text ]; + homepage = "https://github.com/jgm/doctemplates#readme"; + description = "Pandoc-style document templates"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "doctest" = callPackage ({ mkDerivation, base, base-compat, code-page, deepseq, directory , filepath, ghc, ghc-paths, hspec, HUnit, mockery, process @@ -63775,6 +64165,7 @@ self: { homepage = "http://github.com/karun012/doctest-discover"; description = "Easy way to run doctests via cabal"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "doctest-discover-configurator" = callPackage @@ -65818,6 +66209,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "easytest" = callPackage + ({ mkDerivation, async, base, containers, mtl, random, stm, text }: + mkDerivation { + pname = "easytest"; + version = "0.1"; + sha256 = "0wjimph83n5fvqgh85ng255qgw3yvagvv7ky1a9lz2blhzb02hh7"; + libraryHaskellDepends = [ + async base containers mtl random stm text + ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/joelburget/easytest"; + description = "Simple, expressive testing library"; + license = stdenv.lib.licenses.mit; + }) {}; + "ebeats" = callPackage ({ mkDerivation, base, time }: mkDerivation { @@ -65969,7 +66375,6 @@ self: { homepage = "http://github.com/isovector/ecstasy/"; description = "A GHC.Generics based entity component system."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ecu" = callPackage @@ -66306,7 +66711,6 @@ self: { libraryHaskellDepends = [ base type-level-sets ]; description = "Embeds effect systems and program logics into Haskell using graded monads and parameterised monads"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "effective-aspects" = callPackage @@ -66589,7 +66993,6 @@ self: { homepage = "https://github.com/chris-martin/either-list-functions#readme"; description = "Functions involving lists of Either"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "either-unwrap" = callPackage @@ -66740,7 +67143,6 @@ self: { homepage = "https://github.com/cdodev/ekg-elasticsearch"; description = "Push metrics to elasticsearch"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ekg-influxdb" = callPackage @@ -67048,7 +67450,6 @@ self: { homepage = "https://github.com/agrafix/elm-bridge"; description = "Derive Elm types and Json code from Haskell types, using aeson's options"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "elm-build-lib" = callPackage @@ -67508,7 +67909,6 @@ self: { homepage = "http://github.com/knrafto/email-header"; description = "Parsing and rendering of email and MIME headers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "email-postmark" = callPackage @@ -67544,6 +67944,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "email-validate_2_3_2_3" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, doctest, hspec + , QuickCheck, template-haskell + }: + mkDerivation { + pname = "email-validate"; + version = "2.3.2.3"; + sha256 = "1alz5j2bz7x3cwlksdxdynzgcrbbf7jyxmgh61n0wmqnav509y96"; + libraryHaskellDepends = [ + attoparsec base bytestring template-haskell + ]; + testHaskellDepends = [ base bytestring doctest hspec QuickCheck ]; + homepage = "https://github.com/Porges/email-validate-hs"; + description = "Email address validation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "email-validate-json" = callPackage ({ mkDerivation, aeson, base, email-validate, text }: mkDerivation { @@ -67882,7 +68300,6 @@ self: { homepage = "http://github.com/ocharles/engine.io"; description = "A Haskell implementation of Engine.IO"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "engine-io-growler" = callPackage @@ -67940,7 +68357,6 @@ self: { homepage = "http://github.com/ocharles/engine.io"; description = "An @engine-io@ @ServerAPI@ that is compatible with @Wai@"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "engine-io-yesod" = callPackage @@ -68003,16 +68419,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "entropy_0_4" = callPackage + "entropy_0_4_1_1" = callPackage ({ mkDerivation, base, bytestring, Cabal, directory, filepath , process, unix }: mkDerivation { pname = "entropy"; - version = "0.4"; - sha256 = "0h8icprikafidq4x88crz5phfgp6zgmxq4awam2dhs0z2fswd9wc"; - revision = "1"; - editedCabalFile = "1hx5yxzypi708zlg1almqhfasfgmaisrv44fr0i8ldvvqxf5slza"; + version = "0.4.1.1"; + sha256 = "1ahz5g148l6sax3dy505na2513i99c7bxix68jja5kbx4f271zcf"; setupHaskellDepends = [ base Cabal directory filepath process ]; libraryHaskellDepends = [ base bytestring unix ]; homepage = "https://github.com/TomMD/entropy"; @@ -68509,16 +68923,16 @@ self: { }) {}; "equational-reasoning" = callPackage - ({ mkDerivation, base, containers, singletons, template-haskell - , th-desugar, th-extras, void + ({ mkDerivation, base, containers, semigroups, singletons + , template-haskell, th-desugar, th-extras, void }: mkDerivation { pname = "equational-reasoning"; - version = "0.5.0.0"; - sha256 = "0qskw6dhnr6x7zpfaj246gyiml6w3196ci08i98cl8n2xkyn6n4c"; + version = "0.5.1.0"; + sha256 = "11203rdw4q9s5ramhmr2hdimgwin3zwjas8csxqxxldkv3x9a05l"; libraryHaskellDepends = [ - base containers singletons template-haskell th-desugar th-extras - void + base containers semigroups singletons template-haskell th-desugar + th-extras void ]; description = "Proof assistant for Haskell using DataKinds & PolyKinds"; license = stdenv.lib.licenses.bsd3; @@ -69101,8 +69515,8 @@ self: { }: mkDerivation { pname = "eternity"; - version = "0.1"; - sha256 = "04pcfnr1vl1s85gi2bqqca3frwjljw3307mw2psh8aa9h9qrf21b"; + version = "0.1.1"; + sha256 = "0vl5vyysshbrb4vcf4r85w0n46vlfgpspj6nk7jl054099vsv58f"; libraryHaskellDepends = [ attoparsec base cereal directory foldl potoki potoki-cereal text ]; @@ -69113,6 +69527,7 @@ self: { homepage = "https://github.com/metrix-ai/eternity"; description = "Native event-sourcing database"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "eternity-timestamped" = callPackage @@ -69121,8 +69536,8 @@ self: { }: mkDerivation { pname = "eternity-timestamped"; - version = "0.2.2"; - sha256 = "0lijphsgfjgpqxg5qfy50fds8vpjd9yywzlz5yqmi1q8q5yyh02f"; + version = "0.2.3"; + sha256 = "1c7qil02diisnpv5vihh76l32l4c912s806z8p7p1jhv4wb13f8z"; libraryHaskellDepends = [ attoparsec base cereal directory eternity foldl generic-random hashable potoki QuickCheck text time @@ -69130,6 +69545,7 @@ self: { homepage = "https://github.com/metrix-ai/eternity-timestamped"; description = "Automatic timestamping for Eternity"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ether" = callPackage @@ -69366,7 +69782,6 @@ self: { ]; description = "Random etymology online entry"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "euler" = callPackage @@ -69946,7 +70361,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "eventstore_1_1_1" = callPackage + "eventstore_1_1_2" = callPackage ({ mkDerivation, aeson, array, async, base, bifunctors, bytestring , cereal, clock, connection, containers, dns, dotnet-timespan , ekg-core, exceptions, fast-logger, hashable, http-client @@ -69958,8 +70373,8 @@ self: { }: mkDerivation { pname = "eventstore"; - version = "1.1.1"; - sha256 = "1cvn53nf6igcg3a2sdvihd857vdrhrkcj1bzrbzaixkrxqcyhn9y"; + version = "1.1.2"; + sha256 = "1f2pqmsppln3p0zfw35hck5784np9hhs3f5f6h6j12k43gyj3847"; libraryHaskellDepends = [ aeson array base bifunctors bytestring cereal clock connection containers dns dotnet-timespan ekg-core exceptions fast-logger @@ -70041,7 +70456,6 @@ self: { homepage = "https://github.com/kim/ex-pool"; description = "Another fork of resource-pool, with a MonadIO and MonadCatch constraint"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "exact-combinatorics" = callPackage @@ -70440,7 +70854,6 @@ self: { homepage = "https://github.com/k0001/exinst"; description = "Dependent pairs and their instances"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "exinst-aeson" = callPackage @@ -70848,14 +71261,16 @@ self: { }: mkDerivation { pname = "expressions-z3"; - version = "0.1.2"; - sha256 = "0q3fnljdsqh1937a8s9a62cmcg1nc787725jp0j32jlmbwwhkfyv"; + version = "0.1.3"; + sha256 = "1hb44k4558lwsx3z02lgmf1i24ajjlbyqbc88lzgjh3vswfahsj8"; libraryHaskellDepends = [ base containers expressions singletons transformers z3 ]; + testHaskellDepends = [ + base containers expressions singletons transformers z3 + ]; description = "Encode and Decode expressions from Z3 ASTs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "extcore" = callPackage @@ -70929,7 +71344,6 @@ self: { homepage = "https://github.com/msakai/extended-reals/"; description = "Extension of real numbers with positive/negative infinities"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "extensible" = callPackage @@ -70953,6 +71367,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "extensible_0_4_8" = callPackage + ({ mkDerivation, aeson, base, bytestring, cassava, comonad + , constraints, deepseq, ghc-prim, hashable, lens, monad-skeleton + , mtl, primitive, profunctors, QuickCheck, semigroups, StateVar + , tagged, template-haskell, text, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "extensible"; + version = "0.4.8"; + sha256 = "1bm7yqshaknnd50yf6bgb6qxl2lv21pqxhb674v3ifpwx1swrkm2"; + libraryHaskellDepends = [ + aeson base bytestring cassava comonad constraints deepseq ghc-prim + hashable monad-skeleton mtl primitive profunctors QuickCheck + semigroups StateVar tagged template-haskell text transformers + unordered-containers vector + ]; + testHaskellDepends = [ base lens QuickCheck template-haskell ]; + homepage = "https://github.com/fumieval/extensible"; + description = "Extensible, efficient, optics-friendly data types and effects"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "extensible-data" = callPackage ({ mkDerivation, base, data-lens, hashable, template-haskell , unordered-containers @@ -71136,7 +71574,6 @@ self: { homepage = "https://github.com/wuest/haskell-extralife-api"; description = "API Client for ExtraLife team and user data"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "extrapolate" = callPackage @@ -71648,7 +72085,6 @@ self: { homepage = "https://github.com/vshabanov/fast-tagsoup"; description = "Fast parsing and extracting information from (possibly malformed) HTML/XML documents"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fast-tagsoup-utf8-only" = callPackage @@ -71818,48 +72254,47 @@ self: { }) {}; "fay" = 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 - , optparse-applicative, process, safe, sourcemap, split, spoon, syb - , text, time, transformers, transformers-compat + ({ mkDerivation, aeson, base, base-compat, bytestring, Cabal + , containers, data-default, data-lens-light, directory, filepath + , ghc-paths, haskell-src-exts, language-ecmascript, mtl, mtl-compat + , optparse-applicative, process, safe, shakespeare, sourcemap + , split, spoon, syb, text, time, transformers, transformers-compat , traverse-with-class, uniplate, unordered-containers, utf8-string , vector }: mkDerivation { pname = "fay"; - version = "0.23.2.0"; - sha256 = "1fhdznpqyrgk2m239qdq6zxsdhx3qhciq8fi2ka7s6l7h9z277dw"; + version = "0.24.0.0"; + sha256 = "1my71a3cmd637ch5jwsdpyvfx6vsi2vnvshbrwmcx9ya1xm6x7z2"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ aeson base base-compat bytestring containers data-default data-lens-light directory filepath ghc-paths haskell-src-exts - language-ecmascript mtl mtl-compat process safe sourcemap split - spoon syb text time transformers transformers-compat - traverse-with-class uniplate unordered-containers utf8-string - vector + language-ecmascript mtl mtl-compat process safe shakespeare + sourcemap split spoon syb text time transformers + transformers-compat traverse-with-class uniplate + unordered-containers utf8-string vector ]; executableHaskellDepends = [ base mtl optparse-applicative split ]; homepage = "https://github.com/faylang/fay/wiki"; description = "A compiler for Fay, a Haskell subset that compiles to JavaScript"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fay-base" = callPackage ({ mkDerivation, base, fay }: mkDerivation { pname = "fay-base"; - version = "0.21.0.0"; - sha256 = "1sj6baw63xzv6hcqmka29hvack00fal3zlp5b97qca56lbh7yhbf"; + version = "0.21.1.0"; + sha256 = "1i19q04a4z3aix8njw5im8ixkw7l53xfhff0rrgx3ibnf9jy752z"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base fay ]; homepage = "https://github.com/faylang/fay/"; description = "The base package for Fay"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fay-builder" = callPackage @@ -71947,7 +72382,6 @@ self: { homepage = "https://github.com/A1kmm/fay-ref"; description = "Like IORef but for Fay"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fay-simplejson" = callPackage @@ -71989,7 +72423,6 @@ self: { homepage = "https://github.com/faylang/fay-uri"; description = "Persistent FFI bindings for using jsUri in Fay"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fb" = callPackage @@ -72023,6 +72456,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fb_1_2_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base16-bytestring + , base64-bytestring, bytestring, cereal, conduit, conduit-extra + , containers, crypto-api, cryptohash, cryptohash-cryptoapi + , data-default, hspec, http-client, http-conduit, http-types, HUnit + , monad-logger, old-locale, QuickCheck, resourcet, text, time + , transformers, transformers-base, unliftio, unliftio-core + , unordered-containers + }: + mkDerivation { + pname = "fb"; + version = "1.2.0"; + sha256 = "04ppg1qhm93w5j6arv7ykp0vf85nfwhv6dkpyji34c0nalqzyx6l"; + libraryHaskellDepends = [ + aeson attoparsec base base16-bytestring base64-bytestring + bytestring cereal conduit conduit-extra crypto-api cryptohash + cryptohash-cryptoapi data-default http-client http-conduit + http-types monad-logger old-locale resourcet text time transformers + transformers-base unliftio unliftio-core unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring conduit containers data-default hspec + http-conduit HUnit QuickCheck resourcet text time transformers + unliftio + ]; + homepage = "https://github.com/psibi/fb"; + description = "Bindings to Facebook's API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fb-persistent" = callPackage ({ mkDerivation, base, cereal, fb, persistent, text, time }: mkDerivation { @@ -72132,6 +72596,7 @@ self: { isExecutable = true; description = "TBA"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fckeditor" = callPackage @@ -72155,6 +72620,8 @@ self: { pname = "fclabels"; version = "2.0.3.3"; sha256 = "1q62p41bj991s7i15ciayw1v1xq8szn4bls50p65lfy2dnj7554s"; + revision = "1"; + editedCabalFile = "0fs17vv85ybl3ws8k25sg758vq49l19vhn4asm8r6q5j9xic2kvl"; libraryHaskellDepends = [ base mtl template-haskell transformers ]; testHaskellDepends = [ base HUnit mtl template-haskell transformers @@ -73271,7 +73738,6 @@ self: { ]; description = "Reversable and secure encoding of object ids as filepaths"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "filepath-io-access" = callPackage @@ -73301,7 +73767,6 @@ self: { homepage = "https://github.com/tonymorris/filepather"; description = "Functions on System.FilePath"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fileplow" = callPackage @@ -73631,7 +74096,6 @@ self: { ]; description = "Finite Fields"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "finite-typelits" = callPackage @@ -74238,7 +74702,6 @@ self: { homepage = "https://github.com/chris-martin/fizzbuzz-as-a-service"; description = "FizzBuzz as a service"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "flac" = callPackage @@ -74656,7 +75119,6 @@ self: { homepage = "http://github.com/hesselink/flock"; description = "Wrapper for flock(2)"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "flow" = callPackage @@ -75305,7 +75767,6 @@ self: { homepage = "http://github.com/Data61/foldl-statistics#readme"; description = "Statistical functions from the statistics package implemented as Folds"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "foldl-transduce" = callPackage @@ -75727,6 +76188,8 @@ self: { pname = "forma"; version = "0.2.0"; sha256 = "05rd0v908imlfvp5m3lb5mc629790yyazsj79rpx0svhnxgsgl00"; + revision = "1"; + editedCabalFile = "1hqay7gjhnlxya08qwmxnwriy958awafvyi7rws6wla5m1cq0wr6"; libraryHaskellDepends = [ aeson base containers data-default-class mtl text unordered-containers @@ -76446,7 +76909,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "free_5" = callPackage + "free_5_0_1" = callPackage ({ mkDerivation, base, bifunctors, comonad, containers , distributive, exceptions, mtl, profunctors, semigroupoids , semigroups, template-haskell, transformers, transformers-base @@ -76454,10 +76917,8 @@ self: { }: mkDerivation { pname = "free"; - version = "5"; - sha256 = "1s4avwm4lnscmxv3fy0zws3vbg61sczgxm1m3cdnqxp95bd6p4c7"; - revision = "1"; - editedCabalFile = "13kxrs6097cwh80hawdmdrz4l5cqmrwkxh667spx8hx390102ddf"; + version = "5.0.1"; + sha256 = "16b29r9f9j7wpd99zbspkxq22rm6r2shqv1isa1ipqfbzn9bap5p"; libraryHaskellDepends = [ base bifunctors comonad containers distributive exceptions mtl profunctors semigroupoids semigroups template-haskell transformers @@ -76665,14 +77126,15 @@ self: { }) {}; "free-vector-spaces" = callPackage - ({ mkDerivation, base, lens, linear, MemoTrie, vector, vector-space + ({ mkDerivation, base, lens, linear, MemoTrie, pragmatic-show + , vector, vector-space }: mkDerivation { pname = "free-vector-spaces"; - version = "0.1.4.0"; - sha256 = "057l1fnkqyqnjbhzjz2jjlcrsmkcv2gd16gb5n3j99crw97s62xj"; + version = "0.1.5.0"; + sha256 = "0rf6yhjcd2x4yj2jvyl6yc8x55a2hqhj5mxzg4f24734agh720z1"; libraryHaskellDepends = [ - base lens linear MemoTrie vector vector-space + base lens linear MemoTrie pragmatic-show vector vector-space ]; homepage = "https://github.com/leftaroundabout/free-vector-spaces"; description = "Instantiate the classes from the vector-space package with types from linear"; @@ -77306,6 +77768,7 @@ self: { homepage = "https://github.com/fpco/fsnotify-conduit#readme"; description = "Get filesystem notifications as a stream of events"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fst" = callPackage @@ -77811,8 +78274,8 @@ self: { pname = "functor-classes-compat"; version = "1"; sha256 = "0vrnl5crr7d2wsm4ryx26g98j23dpk7x5p31xrbnckd78i7zj4gg"; - revision = "1"; - editedCabalFile = "04blby010250gyg0v7nwdr9hwzvkapmfy9xn5522h8jmb3yygh8l"; + revision = "2"; + editedCabalFile = "07ldwmqfwi2lgnmia5bb0885664a54g2q55f91swgafb11n0csqg"; libraryHaskellDepends = [ base containers hashable unordered-containers vector ]; @@ -80406,14 +80869,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ghc-boot_8_2_2" = callPackage + "ghc-boot_8_4_1" = callPackage ({ mkDerivation, base, binary, bytestring, directory, filepath , ghc-boot-th }: mkDerivation { pname = "ghc-boot"; - version = "8.2.2"; - sha256 = "0fwpfsdx584mcvavj1m961rnaryif9a0yibhlw0b2i59g3ca8f6g"; + version = "8.4.1"; + sha256 = "0abgzvqra66hi61bn901dlk0r0n4s2fg6y7d8w2k2a6w437vgzdd"; libraryHaskellDepends = [ base binary bytestring directory filepath ghc-boot-th ]; @@ -80422,12 +80885,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ghc-boot-th_8_2_2" = callPackage + "ghc-boot-th_8_4_1" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "ghc-boot-th"; - version = "8.2.2"; - sha256 = "0pdgimqqn1w04qw504bgcji74wj5wmxpwgj5w3wdrid47sr2d3kc"; + version = "8.4.1"; + sha256 = "0l9fv1sp4dbq1ssw0l55riw9zpcii8fz75i0yj0vlihccf10lbj9"; libraryHaskellDepends = [ base ]; description = "Shared functionality between GHC and the @template-haskell@ library"; license = stdenv.lib.licenses.bsd3; @@ -80659,7 +81122,6 @@ self: { ]; description = "ExactPrint for GHC"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-gc-tune" = callPackage @@ -80935,7 +81397,6 @@ self: { homepage = "https://github.com/gibiansky/IHaskell"; description = "Haskell source parser from GHC"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-paths" = callPackage @@ -81325,15 +81786,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ghci_8_2_2" = callPackage + "ghci_8_4_1" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , deepseq, filepath, ghc-boot, ghc-boot-th, template-haskell , transformers, unix }: mkDerivation { pname = "ghci"; - version = "8.2.2"; - sha256 = "0j6aq2scjv0fpr5b60ac46r1n2hrcgbkrhv31yfnallwlwyqz5zn"; + version = "8.4.1"; + sha256 = "0jlnzkwj4xxs57c0zi3rcy96rksqakx65a7m8xq04055ip388sws"; libraryHaskellDepends = [ array base binary bytestring containers deepseq filepath ghc-boot ghc-boot-th template-haskell transformers unix @@ -82225,8 +82686,8 @@ self: { }: mkDerivation { pname = "gi-gtk"; - version = "3.0.19"; - sha256 = "1qcivdbwa3g05dzgzd3jnzha33j5jm06gp2ml9fma0d1160dqa2g"; + version = "3.0.20"; + sha256 = "0k3rbr8jajkhgmrdpv7fy4xk2kfx3b6cgm8wgfba8m8wkz1s1l7s"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf @@ -83250,7 +83711,6 @@ self: { homepage = "http://github.com/gbataille/gitHUD#readme"; description = "More efficient replacement to the great git-radar"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gitcache" = callPackage @@ -83543,8 +84003,8 @@ self: { }: mkDerivation { pname = "github-webhooks"; - version = "0.9.0"; - sha256 = "1gzks7l39il0g9maj2hkfwpz8rnrnmc05fhcsr27a6c08962gn0f"; + version = "0.9.1"; + sha256 = "1h4wqix0rgsq7n3dv3nraqa3sbf5hgavq5k9dymfnw68qz5ii68b"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring cryptonite deepseq deepseq-generics memory text time vector @@ -83657,7 +84117,6 @@ self: { ]; description = "Gitlib repository backend that uses the git command-line tool"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gitlib-cross" = callPackage @@ -83705,7 +84164,6 @@ self: { ]; description = "Libgit2 backend for gitlib"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gitlib-s3" = callPackage @@ -83902,7 +84360,7 @@ self: { "gl" = callPackage ({ mkDerivation, base, Cabal, containers, directory, filepath - , fixed, half, hxt, mesa, transformers + , fixed, half, hxt, libGL, transformers }: mkDerivation { pname = "gl"; @@ -83914,10 +84372,10 @@ self: { libraryHaskellDepends = [ base containers fixed half transformers ]; - librarySystemDepends = [ mesa ]; + librarySystemDepends = [ libGL ]; description = "Complete OpenGL raw bindings"; license = stdenv.lib.licenses.bsd3; - }) {mesa = null;}; + }) {inherit (pkgs) libGL;}; "gl-capture" = callPackage ({ mkDerivation, base, bytestring, OpenGL }: @@ -86695,6 +87153,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "google-server-api" = callPackage + ({ mkDerivation, aeson, aeson-casing, base, base64-bytestring + , bytestring, HsOpenSSL, http-api-data, http-client + , http-client-tls, mime-mail, monad-control, monad-logger, mtl, RSA + , servant, servant-client, text, time, transformers + , transformers-base, unix-time, unordered-containers, wai + , wai-extra, warp + }: + mkDerivation { + pname = "google-server-api"; + version = "0.2.0.0"; + sha256 = "1hwaxvmz3x4dhdzsfz1gjnp34jyln875bjwapvj885v1vis5jyk1"; + libraryHaskellDepends = [ + aeson aeson-casing base base64-bytestring bytestring HsOpenSSL + http-api-data http-client http-client-tls mime-mail monad-control + monad-logger mtl RSA servant servant-client text time transformers + transformers-base unix-time unordered-containers wai wai-extra warp + ]; + homepage = "https://github.com/arowM/haskell-google-server-api#readme"; + description = "Google APIs for server to server applications"; + license = stdenv.lib.licenses.mit; + }) {}; + "google-static-maps" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytedump , bytestring, cryptonite, double-conversion, http-client @@ -87792,7 +88273,6 @@ self: { homepage = "http://github.com/yav/graphmod/wiki"; description = "Present the module dependencies of a program as a \"dot\" graph"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "graphql" = callPackage @@ -87833,7 +88313,6 @@ self: { homepage = "https://github.com/haskell-graphql/graphql-api#readme"; description = "GraphQL API"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "graphs" = callPackage @@ -88310,6 +88789,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "groundhog_0_8_0_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring + , blaze-builder, bytestring, containers, monad-control, mtl + , resourcet, safe-exceptions, scientific, text, time, transformers + , transformers-base, transformers-compat + }: + mkDerivation { + pname = "groundhog"; + version = "0.8.0.1"; + sha256 = "0qrv2rpw1nqn28j6mcmwn0sjmfsfg5gj68sq5dcydh247q1acp5r"; + libraryHaskellDepends = [ + aeson attoparsec base base64-bytestring blaze-builder bytestring + containers monad-control mtl resourcet safe-exceptions scientific + text time transformers transformers-base transformers-compat + ]; + homepage = "http://github.com/lykahb/groundhog"; + description = "Type-safe datatype-database mapping library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "groundhog-converters" = callPackage ({ mkDerivation, aeson, base, bimap, bytestring, containers , groundhog, groundhog-sqlite, groundhog-th, tasty, tasty-hunit @@ -88370,6 +88870,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "groundhog-mysql_0_8_0_1" = callPackage + ({ mkDerivation, base, bytestring, containers, groundhog + , monad-control, monad-logger, mysql, mysql-simple, resource-pool + , resourcet, text, time, transformers + }: + mkDerivation { + pname = "groundhog-mysql"; + version = "0.8.0.1"; + sha256 = "0h4sckj7hrhlnrfa9639kr9id8rf11ragadsj9rxils1vn4cn35r"; + libraryHaskellDepends = [ + base bytestring containers groundhog monad-control monad-logger + mysql mysql-simple resource-pool resourcet text time transformers + ]; + description = "MySQL backend for the groundhog library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "groundhog-postgresql" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring , containers, groundhog, monad-control, postgresql-libpq @@ -88389,6 +88907,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "groundhog-postgresql_0_8_0_3" = callPackage + ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring + , containers, groundhog, monad-control, postgresql-libpq + , postgresql-simple, resource-pool, resourcet, text, time + , transformers, vector + }: + mkDerivation { + pname = "groundhog-postgresql"; + version = "0.8.0.3"; + sha256 = "0iz21awiblzir01r6p77qnlvqsb8j87x5y11g1q2spnafzj4wlpl"; + libraryHaskellDepends = [ + aeson attoparsec base blaze-builder bytestring containers groundhog + monad-control postgresql-libpq postgresql-simple resource-pool + resourcet text time transformers vector + ]; + description = "PostgreSQL backend for the groundhog library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "groundhog-sqlite" = callPackage ({ mkDerivation, base, bytestring, containers, direct-sqlite , groundhog, monad-control, resource-pool, resourcet, text @@ -88406,6 +88944,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "groundhog-sqlite_0_8_0_1" = callPackage + ({ mkDerivation, base, bytestring, containers, direct-sqlite + , groundhog, monad-control, resource-pool, resourcet, text + , transformers, unordered-containers + }: + mkDerivation { + pname = "groundhog-sqlite"; + version = "0.8.0.1"; + sha256 = "1y6cfnyrrq61vv793crfb7yd21yn0gqmx7j7c9sg8665l34wq2jp"; + libraryHaskellDepends = [ + base bytestring containers direct-sqlite groundhog monad-control + resource-pool resourcet text transformers unordered-containers + ]; + description = "Sqlite3 backend for the groundhog library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "groundhog-th" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, groundhog , template-haskell, text, time, unordered-containers, yaml @@ -88493,6 +89049,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "grouped-list_0_2_1_5" = callPackage + ({ mkDerivation, base, containers, criterion, deepseq, pointed + , QuickCheck, tasty, tasty-quickcheck + }: + mkDerivation { + pname = "grouped-list"; + version = "0.2.1.5"; + sha256 = "18y3v4jjrj1vrf3q8ki3yamb1n2sm8azp0cnaylpd6xslyr08yv5"; + libraryHaskellDepends = [ base containers deepseq pointed ]; + testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ]; + benchmarkHaskellDepends = [ base criterion ]; + homepage = "https://github.com/Daniel-Diaz/grouped-list/blob/master/README.md"; + description = "Grouped lists. Equal consecutive elements are grouped."; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "groupoid" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -88731,7 +89304,6 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the GStreamer open source multimedia framework"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gst-plugins-base; inherit (pkgs) gstreamer;}; "gt-tools" = callPackage @@ -90450,6 +91022,8 @@ self: { pname = "hackage-db"; version = "2.0"; sha256 = "09xza82g45nv3gxmryqd2mns4bm8hr6d7hzr7nqdi6zq46s0lfgq"; + revision = "1"; + editedCabalFile = "1zsdy9c0gngl8k690311zchd3lhl7h64arab77p7v9j5bradziiq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -90465,6 +91039,27 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; + "hackage-db_2_0_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, Cabal, containers + , directory, filepath, tar, time, utf8-string + }: + mkDerivation { + pname = "hackage-db"; + version = "2.0.1"; + sha256 = "13ggj72i8dxwh3qwznnqxbr00nvsbapyyhzx5zybfacddnpw3aph"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring Cabal containers directory filepath tar time + utf8-string + ]; + homepage = "https://github.com/peti/hackage-db#readme"; + description = "Access Hackage's package database via Data.Map"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ peti ]; + }) {}; + "hackage-diff" = callPackage ({ mkDerivation, ansi-terminal, async, attoparsec, base, Cabal , cpphs, directory, filepath, haskell-src-exts, HTTP, mtl, process @@ -90721,7 +91316,6 @@ self: { homepage = "https://github.com/stepcut/hackage-whatsnew"; description = "Check for differences between working directory and hackage"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hackage2hwn" = callPackage @@ -90967,8 +91561,8 @@ self: { ({ mkDerivation, base, filepath, haddock-api, hspec }: mkDerivation { pname = "haddock"; - version = "2.18.1"; - sha256 = "1gg1nl38f2h93xci4pa4zgb5wvcpwv0mab0balmzzgnd4amk3jgv"; + version = "2.19.0.1"; + sha256 = "1g1j9j0hf2yhyyh0gwz6bzbvfvliqz9x8a8hnkmwghm7w3xa6sb7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base haddock-api ]; @@ -91052,16 +91646,18 @@ self: { }: mkDerivation { pname = "haddock-api"; - version = "2.18.1"; - sha256 = "1q0nf86h6b466yd3bhng8sklm0kqc8bak4k6d4dcc57j3wf2gak8"; - revision = "1"; - editedCabalFile = "0ncxba7bppgap3vaxv07cyq2q4wsb860xv83znj4dgksvr64xl7y"; + version = "2.19.0.1"; + sha256 = "0c6i7sljp7myz25d90gyw68a90i5jcrkajkxcciikp2hjirfaas3"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base bytestring Cabal containers deepseq directory filepath ghc ghc-boot ghc-paths haddock-library transformers xhtml ]; - testHaskellDepends = [ base containers ghc hspec QuickCheck ]; + testHaskellDepends = [ + array base bytestring Cabal containers deepseq directory filepath + ghc ghc-boot ghc-paths haddock-library hspec QuickCheck + transformers xhtml + ]; testToolDepends = [ hspec-discover ]; homepage = "http://www.haskell.org/haddock/"; description = "A documentation-generation tool for Haskell libraries"; @@ -91143,17 +91739,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haddock-library_1_4_5" = callPackage - ({ mkDerivation, base, base-compat, bytestring, deepseq, hspec - , hspec-discover, QuickCheck, transformers + "haddock-library_1_5_0_1" = callPackage + ({ mkDerivation, base, base-compat, bytestring, containers, deepseq + , directory, filepath, hspec, hspec-discover, optparse-applicative + , QuickCheck, transformers, tree-diff }: mkDerivation { pname = "haddock-library"; - version = "1.4.5"; - sha256 = "0dmpxj6fgv9js90cxlf4yhrclh8kwmn8dm4llwhiyzmiddanjjy9"; - libraryHaskellDepends = [ base bytestring deepseq transformers ]; + version = "1.5.0.1"; + sha256 = "1cmbg8l5xrwpliclwy3l057raypjqy0hsg1h1743ahaj8gq10b7z"; + libraryHaskellDepends = [ + base bytestring containers deepseq transformers + ]; testHaskellDepends = [ - base base-compat bytestring deepseq hspec QuickCheck transformers + base base-compat bytestring containers deepseq directory filepath + hspec optparse-applicative QuickCheck transformers tree-diff ]; testToolDepends = [ hspec-discover ]; homepage = "http://www.haskell.org/haddock/"; @@ -91269,7 +91869,6 @@ self: { homepage = "http://github.com/jystic/hadoop-rpc"; description = "Use the Hadoop RPC interface from Haskell"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hadoop-tools" = callPackage @@ -92381,7 +92980,6 @@ self: { homepage = "https://github.com/tfc/hamtsolo#readme"; description = "Intel AMT serial-over-lan (SOL) client"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hamusic" = callPackage @@ -92675,6 +93273,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hapistrano_0_3_5_3" = callPackage + ({ mkDerivation, aeson, async, base, directory, filepath + , formatting, gitrev, hspec, mtl, optparse-applicative, path + , path-io, process, stm, temporary, time, transformers, yaml + }: + mkDerivation { + pname = "hapistrano"; + version = "0.3.5.3"; + sha256 = "04f7fiy4zdsl2pxb6yxq91lqgvyw0qwr9ky5sxsxj4nx40inv4d1"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base filepath formatting gitrev mtl path process time transformers + ]; + executableHaskellDepends = [ + aeson async base formatting gitrev optparse-applicative path + path-io stm yaml + ]; + testHaskellDepends = [ + base directory filepath hspec mtl path path-io process temporary + ]; + homepage = "https://github.com/stackbuilders/hapistrano"; + description = "A deployment library for Haskell applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "happindicator" = callPackage ({ mkDerivation, array, base, bytestring, containers, glib, gtk , gtk2hs-buildtools, libappindicator-gtk2, mtl @@ -92844,7 +93470,6 @@ self: { homepage = "http://www.happstack.com/"; description = "Happstack Authentication Library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happstack-clientsession" = callPackage @@ -93381,8 +94006,8 @@ self: { pname = "happy"; version = "1.19.9"; sha256 = "138xpxdb7x62lpmgmb6b3v3vgdqqvqn4273jaap3mjmc2gla709y"; - revision = "1"; - editedCabalFile = "1lm706nv64cvfi3ccg7hc3217642sg0z9f9xz2ivbpzvzwwn8gj6"; + revision = "2"; + editedCabalFile = "1zxi8zfwiwxidrhr0yj5srpzp32z66sld9xv0k4yz7046rkl3577"; isLibrary = false; isExecutable = true; setupHaskellDepends = [ base Cabal directory filepath ]; @@ -93967,6 +94592,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hashable_1_2_7_0" = callPackage + ({ mkDerivation, base, bytestring, criterion, deepseq, ghc-prim + , HUnit, integer-gmp, QuickCheck, random, siphash, test-framework + , test-framework-hunit, test-framework-quickcheck2, text, unix + }: + mkDerivation { + pname = "hashable"; + version = "1.2.7.0"; + sha256 = "1gra8gq3kb7b2sd845h55yxlrfqx3ii004c6vjhga8v0b30fzdgc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring deepseq ghc-prim integer-gmp text + ]; + testHaskellDepends = [ + base bytestring ghc-prim HUnit QuickCheck random test-framework + test-framework-hunit test-framework-quickcheck2 text unix + ]; + benchmarkHaskellDepends = [ + base bytestring criterion ghc-prim integer-gmp siphash text + ]; + homepage = "http://github.com/tibbe/hashable"; + description = "A class for types that can be converted to a hash value"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hashable-extras" = callPackage ({ mkDerivation, base, bifunctors, bytestring, directory, doctest , filepath, hashable, transformers, transformers-compat @@ -94745,18 +95397,19 @@ self: { "haskell-docs" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring, Cabal , containers, cryptohash, directory, filepath, ghc, ghc-paths - , haddock-api, monad-loops, process, text, unordered-containers + , haddock-api, haddock-library, monad-loops, process, text + , unordered-containers }: mkDerivation { pname = "haskell-docs"; - version = "4.2.7"; - sha256 = "1mb32kxn7p7xsvs3l32bj0igrmc1563ay9v40da2fmxnx3v1aap8"; + version = "4.2.8"; + sha256 = "00a93rva9mpg0wf3fj0h9l4ljz566vx1dv9hh4xhc5n1zqijycpz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base base16-bytestring bytestring Cabal containers cryptohash - directory filepath ghc ghc-paths haddock-api monad-loops process - text unordered-containers + directory filepath ghc ghc-paths haddock-api haddock-library + monad-loops process text unordered-containers ]; executableHaskellDepends = [ base ghc text ]; testHaskellDepends = [ base ]; @@ -95608,15 +96261,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "haskell-src-exts_1_20_1" = callPackage + "haskell-src-exts_1_20_2" = callPackage ({ mkDerivation, array, base, containers, cpphs, directory , filepath, ghc-prim, happy, mtl, pretty, pretty-show, smallcheck , tasty, tasty-golden, tasty-smallcheck }: mkDerivation { pname = "haskell-src-exts"; - version = "1.20.1"; - sha256 = "1jsjl9hja2dpcfq4mzlfpwyr6axwnwgacfb7aa070kz4lbygzaa8"; + version = "1.20.2"; + sha256 = "1sm3z4v1p5yffg01ldgavz71s3bvfhjfa13k428rk14bpkl8crlz"; libraryHaskellDepends = [ array base cpphs ghc-prim pretty ]; libraryToolDepends = [ happy ]; testHaskellDepends = [ @@ -95824,6 +96477,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haskell-tools-ast_1_0_1_1" = callPackage + ({ mkDerivation, base, classyplate, ghc, mtl, pretty, references + , template-haskell, uniplate + }: + mkDerivation { + pname = "haskell-tools-ast"; + version = "1.0.1.1"; + sha256 = "0ckszqvl843g1gywhc7sj2s4wr58ng2cqyxi0kihdbfq7xmk943b"; + libraryHaskellDepends = [ + base classyplate ghc mtl pretty references template-haskell + uniplate + ]; + homepage = "https://github.com/nboldi/haskell-tools"; + description = "Haskell AST for efficient tooling"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-ast-fromghc" = callPackage ({ mkDerivation, base, bytestring, containers, ghc , haskell-tools-ast, mtl, references, safe, split, template-haskell @@ -95896,6 +96567,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haskell-tools-backend-ghc_1_0_1_1" = callPackage + ({ mkDerivation, base, bytestring, containers, ghc, ghc-boot-th + , haskell-tools-ast, mtl, references, safe, split, template-haskell + , transformers, uniplate + }: + mkDerivation { + pname = "haskell-tools-backend-ghc"; + version = "1.0.1.1"; + sha256 = "05bn79ysb2bw42hid2ksqddqidimvqsx09nr771wf1ha7qapksmq"; + libraryHaskellDepends = [ + base bytestring containers ghc ghc-boot-th haskell-tools-ast mtl + references safe split template-haskell transformers uniplate + ]; + homepage = "https://github.com/nboldi/haskell-tools"; + description = "Creating the Haskell-Tools AST from GHC's representations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-builtin-refactorings" = callPackage ({ mkDerivation, base, Cabal, containers, directory, either , filepath, ghc, ghc-paths, haskell-tools-ast @@ -95928,6 +96618,39 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-tools-builtin-refactorings_1_0_1_1" = callPackage + ({ mkDerivation, aeson, base, Cabal, classyplate, containers + , deepseq, directory, either, filepath, ghc, ghc-paths + , haskell-tools-ast, haskell-tools-backend-ghc + , haskell-tools-prettyprint, haskell-tools-refactor + , haskell-tools-rewrite, minisat-solver, mtl, references, split + , tasty, tasty-hunit, template-haskell, time, transformers + , uniplate + }: + mkDerivation { + pname = "haskell-tools-builtin-refactorings"; + version = "1.0.1.1"; + sha256 = "00yp1gvfvg3c2fa9ndnqphxbnsrshifida3247yafd7q9hhgd7q8"; + libraryHaskellDepends = [ + aeson base Cabal classyplate containers deepseq directory filepath + ghc ghc-paths haskell-tools-ast haskell-tools-backend-ghc + haskell-tools-prettyprint haskell-tools-refactor + haskell-tools-rewrite minisat-solver mtl references split + template-haskell transformers uniplate + ]; + testHaskellDepends = [ + base Cabal containers directory either filepath ghc ghc-paths + haskell-tools-ast haskell-tools-backend-ghc + haskell-tools-prettyprint haskell-tools-refactor + haskell-tools-rewrite mtl references split tasty tasty-hunit + template-haskell time transformers uniplate + ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "Refactoring Tool for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-cli" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , directory, filepath, ghc, ghc-paths, Glob @@ -95965,6 +96688,43 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-tools-cli_1_0_1_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , directory, filepath, ghc, ghc-paths, Glob + , haskell-tools-builtin-refactorings, haskell-tools-daemon + , haskell-tools-refactor, knob, mtl, optparse-applicative, process + , references, split, strict, tasty, tasty-hunit, time + }: + mkDerivation { + pname = "haskell-tools-cli"; + version = "1.0.1.1"; + sha256 = "1fr4hzhlbwxna326dkzc92x1scjrf2yjgx8rhn5r76afay5w0wj9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers directory filepath ghc ghc-paths + haskell-tools-builtin-refactorings haskell-tools-daemon + haskell-tools-refactor mtl references split strict + ]; + executableHaskellDepends = [ + base directory filepath Glob haskell-tools-builtin-refactorings + haskell-tools-daemon mtl optparse-applicative process split + ]; + testHaskellDepends = [ + base bytestring directory filepath + haskell-tools-builtin-refactorings knob tasty tasty-hunit + ]; + benchmarkHaskellDepends = [ + aeson base bytestring criterion directory filepath + haskell-tools-builtin-refactorings haskell-tools-daemon knob split + time + ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "Command-line frontend for Haskell-tools Refact"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-daemon" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers , deepseq, Diff, directory, filepath, fswatch, ghc, ghc-paths, Glob @@ -96000,6 +96760,41 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-tools-daemon_1_0_1_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, Cabal, containers + , deepseq, Diff, directory, filepath, fswatch, ghc, ghc-paths, Glob + , haskell-tools-builtin-refactorings, haskell-tools-prettyprint + , haskell-tools-refactor, HUnit, mtl, network, optparse-applicative + , pretty, process, references, split, strict, tasty, tasty-hunit + , template-haskell + }: + mkDerivation { + pname = "haskell-tools-daemon"; + version = "1.0.1.1"; + sha256 = "0r48z9vkkgzgvlryfri6dzivf090pkjv52k517z9wvis3jxhqi7i"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring Cabal containers deepseq Diff directory + filepath fswatch ghc ghc-paths haskell-tools-builtin-refactorings + haskell-tools-prettyprint haskell-tools-refactor mtl network + optparse-applicative pretty process references split strict + template-haskell + ]; + executableHaskellDepends = [ + base directory filepath haskell-tools-builtin-refactorings + ]; + testHaskellDepends = [ + aeson base bytestring directory filepath ghc Glob + haskell-tools-builtin-refactorings HUnit network process tasty + tasty-hunit + ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "Background process for Haskell-tools that editors can connect to"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-debug" = callPackage ({ mkDerivation, base, filepath, ghc, ghc-paths, haskell-tools-ast , haskell-tools-backend-ghc, haskell-tools-builtin-refactorings @@ -96025,6 +96820,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-tools-debug_1_0_1_1" = callPackage + ({ mkDerivation, base, classyplate, criterion, filepath, ghc + , ghc-paths, haskell-tools-ast, haskell-tools-backend-ghc + , haskell-tools-builtin-refactorings, haskell-tools-prettyprint + , haskell-tools-refactor, mtl, references, split, template-haskell + , uniplate + }: + mkDerivation { + pname = "haskell-tools-debug"; + version = "1.0.1.1"; + sha256 = "1ml4rbkcajgwssi1a0jgbbqnnci9f74w90zj9cxdxxkkck4fkypl"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base classyplate criterion filepath ghc ghc-paths haskell-tools-ast + haskell-tools-backend-ghc haskell-tools-builtin-refactorings + haskell-tools-prettyprint haskell-tools-refactor mtl references + split template-haskell uniplate + ]; + executableHaskellDepends = [ base ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "Debugging Tools for Haskell-tools"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-demo" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, ghc, ghc-paths, haskell-tools-ast @@ -96057,6 +96878,38 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-tools-demo_1_0_1_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , filepath, ghc, ghc-paths, haskell-tools-ast + , haskell-tools-backend-ghc, haskell-tools-builtin-refactorings + , haskell-tools-prettyprint, haskell-tools-refactor, http-types + , HUnit, mtl, network, references, tasty, tasty-hunit, transformers + , wai, wai-websockets, warp, websockets + }: + mkDerivation { + pname = "haskell-tools-demo"; + version = "1.0.1.1"; + sha256 = "01fkl2xkq7v3mkm5dzfpfz53i2js68xhc3gvkc1lv8mg92zymfbb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers directory filepath ghc ghc-paths + haskell-tools-ast haskell-tools-backend-ghc + haskell-tools-builtin-refactorings haskell-tools-prettyprint + haskell-tools-refactor http-types mtl references transformers wai + wai-websockets warp websockets + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + aeson base bytestring directory filepath HUnit network tasty + tasty-hunit websockets + ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "A web-based demo for Haskell-tools Refactor"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-experimental-refactorings" = callPackage ({ mkDerivation, base, Cabal, containers, directory, either , filepath, ghc, ghc-paths, haskell-tools-ast @@ -96067,8 +96920,8 @@ self: { }: mkDerivation { pname = "haskell-tools-experimental-refactorings"; - version = "1.0.0.4"; - sha256 = "0mzwvs33snv3a3dvhkd1mnidkifip21rj2y44k9dcwdhfzcz6xbl"; + version = "1.0.1.1"; + sha256 = "0dyiixq7rdzjczzfv57b7f2859r4nmxrk68vq0flkazjqh9w08yb"; libraryHaskellDepends = [ base Cabal containers directory filepath ghc ghc-paths haskell-tools-ast haskell-tools-backend-ghc @@ -96105,6 +96958,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haskell-tools-prettyprint_1_0_1_1" = callPackage + ({ mkDerivation, base, containers, ghc, haskell-tools-ast, mtl + , references, split, text, uniplate + }: + mkDerivation { + pname = "haskell-tools-prettyprint"; + version = "1.0.1.1"; + sha256 = "0j1ral0azwgxj550yf1jyyxprv0wb0cgd7sfk3dh52caqfwchi2p"; + libraryHaskellDepends = [ + base containers ghc haskell-tools-ast mtl references split text + uniplate + ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "Pretty printing of Haskell-Tools AST"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-refactor" = callPackage ({ mkDerivation, base, Cabal, containers, directory, filepath, ghc , ghc-paths, haskell-tools-ast, haskell-tools-backend-ghc @@ -96126,6 +96997,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haskell-tools-refactor_1_0_1_1" = callPackage + ({ mkDerivation, aeson, base, Cabal, containers, directory, either + , filepath, ghc, ghc-paths, haskell-tools-ast + , haskell-tools-backend-ghc, haskell-tools-prettyprint + , haskell-tools-rewrite, mtl, old-time, polyparse, references + , split, tasty, tasty-hunit, template-haskell, time, transformers + , uniplate + }: + mkDerivation { + pname = "haskell-tools-refactor"; + version = "1.0.1.1"; + sha256 = "1s0nd1swxqiip5hq13ys9f6vbj22mw1c5dh5m9360md163hvvlw2"; + libraryHaskellDepends = [ + aeson base Cabal containers directory filepath ghc ghc-paths + haskell-tools-ast haskell-tools-backend-ghc + haskell-tools-prettyprint haskell-tools-rewrite mtl references + split template-haskell transformers uniplate + ]; + testHaskellDepends = [ + base Cabal containers directory either filepath ghc ghc-paths + haskell-tools-ast haskell-tools-backend-ghc + haskell-tools-prettyprint haskell-tools-rewrite mtl old-time + polyparse references split tasty tasty-hunit template-haskell time + transformers uniplate + ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "Refactoring Tool for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-rewrite" = callPackage ({ mkDerivation, base, containers, directory, filepath, ghc , haskell-tools-ast, haskell-tools-prettyprint, mtl, references @@ -96148,6 +97050,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haskell-tools-rewrite_1_0_1_1" = callPackage + ({ mkDerivation, base, containers, directory, filepath, ghc + , haskell-tools-ast, haskell-tools-prettyprint, mtl, references + , tasty, tasty-hunit + }: + mkDerivation { + pname = "haskell-tools-rewrite"; + version = "1.0.1.1"; + sha256 = "11psrwb8hmxian29n9y9301mlkfhx3y2nb06ml9808yrzpbwg1m2"; + libraryHaskellDepends = [ + base containers ghc haskell-tools-ast haskell-tools-prettyprint mtl + references + ]; + testHaskellDepends = [ + base directory filepath haskell-tools-ast haskell-tools-prettyprint + tasty tasty-hunit + ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "Facilities for generating new parts of the Haskell-Tools AST"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tor" = callPackage ({ mkDerivation, array, asn1-encoding, asn1-types, async , attoparsec, base, base64-bytestring, binary, bytestring, cereal @@ -96774,8 +97699,8 @@ self: { }: mkDerivation { pname = "haskelzinc"; - version = "0.3.1.0"; - sha256 = "0k3rsqassxjjwxn0cs2g8jl7hl3qmvdvrfdcclc3bf9pjf93jvwh"; + version = "0.3.1.1"; + sha256 = "0dz9sd2i6m4d2jj76zl6yfaynnzj8ihhfis6602cqh37ngxgkxqj"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers directory filepath parsec pretty process @@ -97406,7 +98331,6 @@ self: { homepage = "http://www.haskus.org/system"; description = "Haskus utility modules"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskyapi" = callPackage @@ -97504,6 +98428,7 @@ self: { homepage = "https://github.com/contivero/hasmin#readme"; description = "CSS Minifier"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hasparql-client" = callPackage @@ -98457,7 +99382,7 @@ self: { }) {}; "hayland" = callPackage - ({ mkDerivation, base, data-flags, mesa, process, template-haskell + ({ mkDerivation, base, data-flags, libGL, process, template-haskell , time, wayland, xml }: mkDerivation { @@ -98469,13 +99394,13 @@ self: { libraryHaskellDepends = [ base data-flags process template-haskell time xml ]; - librarySystemDepends = [ mesa wayland ]; + librarySystemDepends = [ libGL wayland ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base process xml ]; description = "Haskell bindings for the C Wayland library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) {mesa = null; inherit (pkgs) wayland;}; + }) {inherit (pkgs) libGL; inherit (pkgs) wayland;}; "hayoo-cli" = callPackage ({ mkDerivation, aeson, base, bytestring, http-conduit, http-types @@ -101470,7 +102395,6 @@ self: { ]; description = "Bindings to libintl.h (gettext, bindtextdomain)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hgis" = callPackage @@ -101545,6 +102469,8 @@ self: { pname = "hgmp"; version = "0.1.1"; sha256 = "1hisbcpz47x2lbqf8vzwis7qw7xhvx22lv7dcyhm9vsmsh5741dr"; + revision = "1"; + editedCabalFile = "14hbr8r0pjgjv2pv9any7yqrvw2qyg7z1fk89d4sh0wd6isvgjqj"; libraryHaskellDepends = [ base ghc-prim integer-gmp ]; testHaskellDepends = [ base QuickCheck ]; homepage = "https://code.mathr.co.uk/hgmp"; @@ -101605,7 +102531,6 @@ self: { homepage = "https://github.com/thumphries/hgrep"; description = "Search Haskell source code from the command line"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hgrev" = callPackage @@ -103529,7 +104454,7 @@ self: { pname = "hlibsass"; version = "0.1.6.1"; sha256 = "0j88b1fm0al8w7h6sdw89jpsfs8aplj9q050k41gaib44r7hl4iy"; - configureFlags = [ "-fexternallibsass" ]; + configureFlags = [ "-fexternalLibsass" ]; setupHaskellDepends = [ base Cabal directory ]; libraryHaskellDepends = [ base ]; librarySystemDepends = [ libsass ]; @@ -104092,7 +105017,6 @@ self: { homepage = "https://github.com/masterdezign/hmep#readme"; description = "HMEP Multi Expression Programming – a genetic programming variant"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hmidi" = callPackage @@ -104627,7 +105551,6 @@ self: { homepage = "https://github.com/awakesecurity/hocker#readme"; description = "Interact with the docker registry and generate nix build instructions"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hodatime" = callPackage @@ -104837,7 +105760,6 @@ self: { ]; description = "Higher order logic"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hold-em" = callPackage @@ -105383,6 +106305,8 @@ self: { pname = "hookup"; version = "0.2"; sha256 = "17sj62b78a22alq9hpsrjcri5yxz7yzxdar521yd6x7jv3xxpix2"; + revision = "1"; + editedCabalFile = "1g4zijk8f4rff0g2y0m0308zmnwsbx0a3swbx8i8gvfd6v1g4cf6"; libraryHaskellDepends = [ base bytestring HsOpenSSL HsOpenSSL-x509-system network socks ]; @@ -106037,8 +106961,8 @@ self: { "hp2any-graph" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath - , freeglut, GLUT, hp2any-core, mesa, network, OpenGL, parseargs - , process + , freeglut, GLUT, hp2any-core, libGL, libGLU, network, OpenGL + , parseargs, process }: mkDerivation { pname = "hp2any-graph"; @@ -106051,12 +106975,13 @@ self: { base bytestring containers directory filepath GLUT hp2any-core network OpenGL parseargs process ]; - executableSystemDepends = [ freeglut mesa ]; + executableSystemDepends = [ freeglut libGL libGLU ]; homepage = "http://www.haskell.org/haskellwiki/Hp2any"; description = "Real-time heap graphing utility and profile stream server with a reusable graphing module"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) freeglut; mesa = null;}; + }) {inherit (pkgs) freeglut; inherit (pkgs) libGL; + inherit (pkgs) libGLU;}; "hp2any-manager" = callPackage ({ mkDerivation, array, base, bytestring, cairo, containers @@ -106490,7 +107415,6 @@ self: { homepage = "https://darcs.alokat.org/hpg"; description = "a simple password generator"; license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hpio" = callPackage @@ -106521,7 +107445,6 @@ self: { homepage = "https://github.com/quixoftic/hpio#readme"; description = "Monads for GPIO in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hplayground" = callPackage @@ -106632,18 +107555,18 @@ self: { "hpqtypes-extras" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, containers - , cryptohash, exceptions, fields-json, hpqtypes, lifted-base - , log-base, monad-control, mtl, safe, tasty, tasty-hunit, text - , text-show, transformers + , cryptohash, data-default, exceptions, fields-json, hpqtypes + , lifted-base, log-base, monad-control, mtl, safe, tasty + , tasty-hunit, text, text-show, transformers }: mkDerivation { pname = "hpqtypes-extras"; - version = "1.5.0.1"; - sha256 = "022732jsji79a1bb805gh6pcif9ismivs2dwgwks0fb5i9hviilm"; + version = "1.6.0.0"; + sha256 = "1cp4dnamc0gia8xsf9f6hp8gfmhkfrfs8ijjcl9dqaka87m4hkmx"; libraryHaskellDepends = [ - base base16-bytestring bytestring containers cryptohash exceptions - fields-json hpqtypes lifted-base log-base monad-control mtl safe - text text-show + base base16-bytestring bytestring containers cryptohash + data-default exceptions fields-json hpqtypes lifted-base log-base + monad-control mtl safe text text-show ]; testHaskellDepends = [ base exceptions hpqtypes lifted-base log-base monad-control tasty @@ -106878,6 +107801,7 @@ self: { homepage = "http://github.com/paulrzcz/hquantlib.git"; description = "HQuantLib is a port of essencial parts of QuantLib to Haskell"; license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hquery" = callPackage @@ -107980,8 +108904,8 @@ self: { ({ mkDerivation, base, containers, directory, filepath, process }: mkDerivation { pname = "hsc2hs"; - version = "0.68.2"; - sha256 = "061ns6ig52pcjwi9cgdcasya4cgm3zlb5s2mzq9p01vw4iy702gn"; + version = "0.68.3"; + sha256 = "0q46l4mvclw7lys53zljgrcj142rbwzk5zc2djk2qj956ah1i25h"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -109180,6 +110104,8 @@ self: { pname = "hslua-aeson"; version = "0.3.0.1"; sha256 = "0h4l38bag7kd4d66iprv9hj36q8czqsxr5v6xgmn91wz4cadb42w"; + revision = "1"; + editedCabalFile = "02p97fsn7g6n0l5i9k0mrffqhw2a3y74vi0zaynsl224r4vwqsbp"; libraryHaskellDepends = [ aeson base hashable hslua scientific text unordered-containers vector @@ -109199,6 +110125,8 @@ self: { pname = "hslua-module-text"; version = "0.1.2.1"; sha256 = "0bcfpb1dhnxp0gr376ai4w7vczr9zrjl1r3r6w7kcxivfkwq9cxf"; + revision = "1"; + editedCabalFile = "0vajlsd7y6pwa08635q0cx8z5c1c55bk7fvavw7g2vmyvxqjzx6n"; libraryHaskellDepends = [ base hslua text ]; testHaskellDepends = [ base hslua tasty tasty-hunit text ]; homepage = "https://github.com/hslua/hslua-module-test"; @@ -111192,6 +112120,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hsyslog-udp_0_2_1" = callPackage + ({ mkDerivation, base, bytestring, hspec, hsyslog, network, text + , time, unix + }: + mkDerivation { + pname = "hsyslog-udp"; + version = "0.2.1"; + sha256 = "0133yr6cg7z1ix6dqskjzi36d62803549vdbpg9a29lb49kl1yv3"; + libraryHaskellDepends = [ + base bytestring hsyslog network text time unix + ]; + testHaskellDepends = [ base hspec time ]; + homepage = "https://github.com/ThoughtLeadr/hsyslog-udp"; + description = "Log to syslog over a network via UDP"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hszephyr" = callPackage ({ mkDerivation, base, bytestring, com_err, mtl, time, zephyr }: mkDerivation { @@ -111436,8 +112382,8 @@ self: { pname = "html-entity-map"; version = "0.1.0.0"; sha256 = "0k1l1pbmrfmh44v9cc9ka01bx9xm1x4jabbl675fc5c57v1h0dlq"; - revision = "1"; - editedCabalFile = "1y2w3jmdxwa8lfj1gr4ln98v1474bw1cjsdfpmbaphcjj9bjg0sg"; + revision = "2"; + editedCabalFile = "1ycg39ys6zzfi6j88l03gdyyzwjpfzzlzy7dbs6i8p1l70ywizfr"; libraryHaskellDepends = [ base text unordered-containers ]; benchmarkHaskellDepends = [ base criterion text unordered-containers @@ -112428,18 +113374,18 @@ self: { ({ mkDerivation, async, base, blaze-builder, bytestring , bytestring-lexing, case-insensitive, conduit, conduit-extra , connection, hspec, http-client, http-conduit, http-types, mtl - , network, QuickCheck, random, resourcet, text, tls, transformers - , vault, wai, wai-conduit, warp, warp-tls + , network, QuickCheck, random, resourcet, streaming-commons, text + , tls, transformers, vault, wai, wai-conduit, warp, warp-tls }: mkDerivation { pname = "http-proxy"; - version = "0.1.0.5"; - sha256 = "1n4l31vaq0ch4w7krycvbdycn7v6q0cnr9qm3ll4v3g0kbqy81j4"; + version = "0.1.0.6"; + sha256 = "0ixj9bcz8pw6rgdlzbp7p12v43vrkajbmr5b8fnsmzwcz6s3i3zg"; libraryHaskellDepends = [ async base blaze-builder bytestring bytestring-lexing case-insensitive conduit conduit-extra http-client http-conduit - http-types mtl network resourcet text tls transformers wai - wai-conduit warp warp-tls + http-types mtl network resourcet streaming-commons text tls + transformers wai wai-conduit warp warp-tls ]; testHaskellDepends = [ async base blaze-builder bytestring bytestring-lexing @@ -113042,7 +113988,6 @@ self: { homepage = "https://github.com/chris-martin/human"; description = "A lawless typeclass for parsing text entered by humans"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "human-readable-duration" = callPackage @@ -113069,7 +114014,6 @@ self: { homepage = "https://github.com/chris-martin/human"; description = "A lawless typeclass for converting values to human-friendly text"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hums" = callPackage @@ -113133,12 +114077,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hunit-dejafu_1_0_1_2" = callPackage + "hunit-dejafu_1_1_0_1" = callPackage ({ mkDerivation, base, dejafu, exceptions, HUnit }: mkDerivation { pname = "hunit-dejafu"; - version = "1.0.1.2"; - sha256 = "1lnw8rr0lf43rzsv3c5knm96kpnsxmpijqh7njhrgbx9wzy81mg7"; + version = "1.1.0.1"; + sha256 = "16jaq5wxh2gzkj2kacb5zv9w8y7a75fm0acj7r2sspwg4d7kkmar"; libraryHaskellDepends = [ base dejafu exceptions HUnit ]; homepage = "https://github.com/barrucadu/dejafu"; description = "Deja Fu support for the HUnit test framework"; @@ -113321,7 +114265,6 @@ self: { homepage = "https://github.com/phlummox/hup"; description = "Upload packages or documentation to a hackage server"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hurdle" = callPackage @@ -113795,7 +114738,6 @@ self: { homepage = "https://github.com/haskell-works/hw-kafka-client"; description = "Kafka bindings for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) rdkafka;}; "hw-kafka-conduit" = callPackage @@ -113820,7 +114762,6 @@ self: { homepage = "https://github.com/haskell-works/hw-kafka-conduit"; description = "Conduit bindings for hw-kafka-client"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-mquery" = callPackage @@ -114045,6 +114986,7 @@ self: { homepage = "http://github.com/haskell-works/hw-xml#readme"; description = "Conduits for tokenizing streams"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hwall-auth-iitk" = callPackage @@ -114189,7 +115131,6 @@ self: { homepage = "https://github.com/srijs/hwsl2"; description = "Hashing with SL2"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hwsl2-bytevector" = callPackage @@ -114202,7 +115143,6 @@ self: { homepage = "https://github.com/srijs/hwsl2-haskell-bytevector"; description = "A hashed byte-vector based on algebraic hashes and finger trees"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hwsl2-reducers" = callPackage @@ -114217,7 +115157,6 @@ self: { homepage = "https://github.com/srijs/hwsl2-reducers"; description = "Semigroup and Reducer instances for Data.Hash.SL2"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hx" = callPackage @@ -115466,7 +116405,6 @@ self: { homepage = "https://github.com/adinapoli/iconv-typed#readme"; description = "Type safe iconv wrapper"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ide-backend" = callPackage @@ -115637,8 +116575,8 @@ self: { pname = "identicon"; version = "0.2.2"; sha256 = "0qzj2063sh7phbqyxqxf96avz1zcwd1ry06jdqxwkg55q3yb8y9n"; - revision = "2"; - editedCabalFile = "0shj211pvba5cfgs1vy9f8jd84by8j4mprk4yvhv4ia1kl6dq4mr"; + revision = "3"; + editedCabalFile = "0vya6zm3nnbdv3wmj3dwqwwjgsagql8q17078knhjddv2lm8m49q"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring JuicyPixels ]; testHaskellDepends = [ @@ -115731,7 +116669,6 @@ self: { libraryHaskellDepends = [ base punycode stringprep text ]; description = "Implements IDNA (RFC 3490)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "idna2008" = callPackage @@ -116079,7 +117016,6 @@ self: { homepage = "http://github.com/gibiansky/IHaskell"; description = "A Haskell backend kernel for the IPython project"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ihaskell-aeson" = callPackage @@ -116122,7 +117058,6 @@ self: { homepage = "http://www.github.com/gibiansky/ihaskell"; description = "IHaskell display instances for blaze-html types"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ihaskell-charts" = callPackage @@ -116140,7 +117075,6 @@ self: { homepage = "http://www.github.com/gibiansky/ihaskell"; description = "IHaskell display instances for charts types"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ihaskell-diagrams" = callPackage @@ -116158,7 +117092,6 @@ self: { homepage = "http://www.github.com/gibiansky/ihaskell"; description = "IHaskell display instances for diagram types"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ihaskell-display" = callPackage @@ -116184,7 +117117,6 @@ self: { homepage = "http://www.github.com/gibiansky/ihaskell"; description = "IHaskell display instance for Gnuplot (from gnuplot package)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ihaskell-hatex" = callPackage @@ -116197,7 +117129,6 @@ self: { homepage = "http://www.github.com/gibiansky/IHaskell"; description = "IHaskell display instances for hatex"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ihaskell-inline-r" = callPackage @@ -116216,7 +117147,6 @@ self: { homepage = "https://tweag.github.io/HaskellR/"; description = "Embed R quasiquotes and plots in IHaskell notebooks"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ihaskell-juicypixels" = callPackage @@ -116232,7 +117162,6 @@ self: { homepage = "http://www.github.com/gibiansky/ihaskell"; description = "IHaskell - IHaskellDisplay instances of the image types of the JuicyPixels package"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ihaskell-magic" = callPackage @@ -116250,7 +117179,6 @@ self: { homepage = "http://www.github.com/gibiansky/IHaskell"; description = "IHaskell display instances for bytestrings"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ihaskell-parsec" = callPackage @@ -116280,7 +117208,6 @@ self: { homepage = "http://www.github.com/gibiansky/ihaskell"; description = "IHaskell display instance for Plot (from plot package)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ihaskell-rlangqq" = callPackage @@ -116317,7 +117244,6 @@ self: { homepage = "http://www.github.com/gibiansky/IHaskell"; description = "IPython standard widgets for IHaskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ihs" = callPackage @@ -116441,7 +117367,6 @@ self: { testPkgconfigDepends = [ imagemagick ]; description = "bindings to imagemagick library"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) imagemagick;}; "imagepaste" = callPackage @@ -116694,7 +117619,6 @@ self: { homepage = "https://github.com/k0ral/imm"; description = "Execute arbitrary actions for each unread element of RSS/Atom feeds"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "immortal" = callPackage @@ -117555,7 +118479,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "influxdb_1_3_0" = callPackage + "influxdb_1_3_0_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal , cabal-doctest, clock, containers, doctest, foldl, http-client , http-types, HUnit, lens, mtl, network, optional-args, QuickCheck @@ -117564,8 +118488,8 @@ self: { }: mkDerivation { pname = "influxdb"; - version = "1.3.0"; - sha256 = "1spvddqc3p9c292bcpp92xx4xzw8qc91y9jg63lzpdm0fmfx8k0l"; + version = "1.3.0.1"; + sha256 = "08i7bflcmvg5s4r5hv1xxd5niyq5irnawnjwmbz7w3ys0ink1bfl"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -117909,8 +118833,8 @@ self: { pname = "insert-ordered-containers"; version = "0.2.1.0"; sha256 = "1612f455dw37da9g7bsd1s5kyi84mnr1ifnjw69892amyimi47fp"; - revision = "4"; - editedCabalFile = "0ls5rm5hg2lqp2m6bfssa30y72x8xyyl7izvwr3w804dpa9fvwrm"; + revision = "5"; + editedCabalFile = "13m83jdnxxykkc8fi2fa5qmy2mpsg3w9yphbl8cxdhmj8566pr7c"; libraryHaskellDepends = [ aeson base base-compat hashable lens semigroupoids semigroups text transformers unordered-containers @@ -118215,6 +119139,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "integer-logarithms_1_0_2_1" = callPackage + ({ mkDerivation, array, base, ghc-prim, integer-gmp, QuickCheck + , smallcheck, tasty, tasty-hunit, tasty-quickcheck + , tasty-smallcheck + }: + mkDerivation { + pname = "integer-logarithms"; + version = "1.0.2.1"; + sha256 = "1wj8kgjg5bn2yrs4zh9qfjv85cx6w998j9pi39yrbv305944mb9j"; + libraryHaskellDepends = [ array base ghc-prim integer-gmp ]; + testHaskellDepends = [ + base QuickCheck smallcheck tasty tasty-hunit tasty-quickcheck + tasty-smallcheck + ]; + homepage = "https://github.com/phadej/integer-logarithms"; + description = "Integer logarithms"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "integer-pure" = callPackage ({ mkDerivation }: mkDerivation { @@ -118339,15 +119283,14 @@ self: { }: mkDerivation { pname = "interlude-l"; - version = "0.2.0.1"; - sha256 = "0jrmxph2m0ql48k6l743dhk4hdjxpdm7qqflwk2n3pw58ffajsk8"; + version = "0.3.0.0"; + sha256 = "0aa26cgap70ji6qjy555039i8zrynibmfsxpdpkww6pqj3hwrc93"; libraryHaskellDepends = [ aeson base exceptions lens monad-control MonadRandom mtl protolude string-conv text transformers witherable ]; description = "Prelude replacement based on protolude"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "intern" = callPackage @@ -118457,6 +119400,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "interpolate_0_2_0" = callPackage + ({ mkDerivation, base, base-compat, bytestring, haskell-src-meta + , hspec, QuickCheck, quickcheck-instances, template-haskell, text + }: + mkDerivation { + pname = "interpolate"; + version = "0.2.0"; + sha256 = "1gkaj98yz363v38fv78sqby236mp8yqwqcilx7kr2b9z0w3204bf"; + libraryHaskellDepends = [ base haskell-src-meta template-haskell ]; + testHaskellDepends = [ + base base-compat bytestring haskell-src-meta hspec QuickCheck + quickcheck-instances template-haskell text + ]; + homepage = "https://github.com/sol/interpolate#readme"; + description = "String interpolation done right"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "interpolatedstring-perl6" = callPackage ({ mkDerivation, base, bytestring, haskell-src-meta , template-haskell, text @@ -118735,6 +119697,8 @@ self: { pname = "invariant"; version = "0.5"; sha256 = "1zz9a5irmpma5qchvvp7qin1s7cfnhvpg3b452xxysgbxvmcmfw0"; + revision = "1"; + editedCabalFile = "04sxa2jfv613ff3fxpnk0cn31f6fr80gzr7va47nrc0abp34vd7y"; libraryHaskellDepends = [ array base bifunctors comonad containers contravariant ghc-prim profunctors semigroups StateVar stm tagged template-haskell @@ -118763,6 +119727,7 @@ self: { testHaskellDepends = [ base QuickCheck transformers ]; description = "bidirectional arrows, bijective functions, and invariant functors"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "invertible-hlist" = callPackage @@ -118788,6 +119753,7 @@ self: { ]; description = "invertible transformer instances for HXT Picklers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "invertible-syntax" = callPackage @@ -118931,7 +119897,7 @@ self: { pname = "io-streams"; version = "1.5.0.1"; sha256 = "12rcdg2d70644bvn838fxcjkssqj8pssnx5y657si5rijcbkgjsx"; - configureFlags = [ "-fnointeractivetests" ]; + configureFlags = [ "-fNoInteractiveTests" ]; libraryHaskellDepends = [ attoparsec base bytestring bytestring-builder network primitive process text time transformers vector zlib-bindings @@ -119119,7 +120085,6 @@ self: { homepage = "https://github.com/andrewthad/haskell-ip#readme"; description = "Library for IP and MAC addresses"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ip-quoter" = callPackage @@ -119383,7 +120348,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "irc-client_1_1_0_1" = callPackage + "irc-client_1_1_0_2" = callPackage ({ mkDerivation, base, bytestring, conduit, connection, containers , contravariant, exceptions, irc-conduit, irc-ctcp, mtl , network-conduit-tls, old-locale, profunctors, stm, stm-chans @@ -119391,8 +120356,8 @@ self: { }: mkDerivation { pname = "irc-client"; - version = "1.1.0.1"; - sha256 = "01p3p6x1ww5hcwq25nr7czm5z8xiz3sr998krdwfj94nl6z4n2ag"; + version = "1.1.0.2"; + sha256 = "1y9camx7vwpgr2qvqnkzk7rz9k0wkxrb35wflar4g9k0q6xqp2mi"; libraryHaskellDepends = [ base bytestring conduit connection containers contravariant exceptions irc-conduit irc-ctcp mtl network-conduit-tls old-locale @@ -119463,8 +120428,8 @@ self: { pname = "irc-core"; version = "2.3.0"; sha256 = "08nbdnszdakbam1x0fps3n3ziqv21d8ndhmrc7za69pm97wkicjf"; - revision = "1"; - editedCabalFile = "1cqc9as84bckjh6yjcfh3pkj11sw35bkj848wzcv6qwjcn8kvcv9"; + revision = "2"; + editedCabalFile = "1pynqcahr66yq9h0ykdv1lz7jshn8zw0n9ggmycvsybw27ci10xn"; libraryHaskellDepends = [ attoparsec base base64-bytestring bytestring hashable primitive text time vector @@ -119619,7 +120584,6 @@ self: { homepage = "https://github.com/stepcut/ircbot"; description = "A library for writing IRC bots"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ircbouncer" = callPackage @@ -119759,7 +120723,6 @@ self: { testHaskellDepends = [ base template-haskell ]; description = "Generic pattern predicates"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "isdicom" = callPackage @@ -120673,13 +121636,13 @@ self: { ({ mkDerivation, base, Cabal }: mkDerivation { pname = "jailbreak-cabal"; - version = "1.3.2"; - sha256 = "1x2h54sx4ycik34q8f9g698xc2b7fai18918cd08qx7w7ny8nai1"; + version = "1.3.3"; + sha256 = "076h7nbf94zfwvfijcpv03r3s2nyynb2y9v354m4bxqz3anhib3b"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base Cabal ]; homepage = "https://github.com/peti/jailbreak-cabal#readme"; - description = "Strip version restrictions from build dependencies in Cabal files"; + description = "Strip version restrictions from Cabal files"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; @@ -121718,7 +122681,6 @@ self: { homepage = "http://github.com/ocharles/json-assertions.git"; description = "Test that your (Aeson) JSON encoding matches your expectations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "json-ast" = callPackage @@ -121939,7 +122901,6 @@ self: { homepage = "https://github.com/tfausak/json-feed#readme"; description = "JSON Feed"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "json-fu" = callPackage @@ -122122,8 +123083,8 @@ self: { pname = "json-rpc-client"; version = "0.2.5.0"; sha256 = "177lrw5m9dxdk6mcay0f92rwyih8q7znwb8m6da6r3zsn30gajak"; - revision = "3"; - editedCabalFile = "0hi2im3k7hpz3rasap90fvik3x5ibb7dd38sr1zsy7wsjkhk7zs4"; + revision = "4"; + editedCabalFile = "1vdfhhbk020bpdg6x8lx21w5aykzzfk9k119cd4px9hm6r77grcy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -122170,8 +123131,8 @@ self: { pname = "json-rpc-server"; version = "0.2.6.0"; sha256 = "1xfcxbwri9a5p3xxbc4kvr1kqdnm4c1axd8kgb8dglabffbrk7hn"; - revision = "2"; - editedCabalFile = "1avwnzq355m14wbv76zqjp789nr3kgnk130m8m69r5icgmlal2w6"; + revision = "3"; + editedCabalFile = "1bn1w9vwif05hjdprc354if3mccaw9gari233x0l6p35188idmsc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -122226,7 +123187,6 @@ self: { ]; description = "Generics JSON (de)serialization using generics-sop"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "json-state" = callPackage @@ -122838,6 +123798,7 @@ self: { homepage = "http://github.com/tweag/inline-java/tree/master/jvm-batching#readme"; description = "Provides batched marshalling of values between Java and Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jvm-binary" = callPackage @@ -122900,6 +123861,7 @@ self: { homepage = "http://github.com/tweag/inline-java/tree/master/jvm-streaming#readme"; description = "Expose Java iterators as streams from the streaming package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jwt" = callPackage @@ -123213,6 +124175,8 @@ self: { pname = "kanji"; version = "3.1.0"; sha256 = "0l1fbznzw6z8cpcrkmchabwf7zfhb3zj18s323xlxiq3537bxjz4"; + revision = "2"; + editedCabalFile = "0n88shf40v4jiqyj24dv1ha8m6s8mja4x5yrh8427byf2s80780c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -123240,8 +124204,8 @@ self: { pname = "kansas-comet"; version = "0.4"; sha256 = "1q9rffh6589a5am8mvfzxzwws34vg08rdjxggfabhmg9y9jla6hz"; - revision = "11"; - editedCabalFile = "0l56snbdxbcwrmh7gna4237873d366dfbwp59a4wq1s51clhmb4z"; + revision = "13"; + editedCabalFile = "0qdj3giwfjic87xln1lkrfa9dw8yj31s7x3dsr7n1343jcap2m7n"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base containers data-default-class scotty stm text time @@ -123462,6 +124426,39 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "katip-elasticsearch_0_4_1_0" = callPackage + ({ mkDerivation, aeson, async, base, bloodhound, bytestring + , containers, criterion, deepseq, enclosed-exceptions, exceptions + , http-client, http-types, katip, lens, lens-aeson + , quickcheck-instances, random, retry, scientific, semigroups, stm + , stm-chans, tagged, tasty, tasty-hunit, tasty-quickcheck, text + , time, transformers, unordered-containers, uuid, vector + }: + mkDerivation { + pname = "katip-elasticsearch"; + version = "0.4.1.0"; + sha256 = "19gpgxg8wz5zdx8a0sspbdk9ypjcrclni0da6sh1hz80yydcfzb1"; + libraryHaskellDepends = [ + aeson async base bloodhound bytestring enclosed-exceptions + exceptions http-client http-types katip retry scientific semigroups + stm stm-chans text time transformers unordered-containers uuid + ]; + testHaskellDepends = [ + aeson base bloodhound bytestring containers http-client http-types + katip lens lens-aeson quickcheck-instances scientific stm tagged + tasty tasty-hunit tasty-quickcheck text time transformers + unordered-containers vector + ]; + benchmarkHaskellDepends = [ + aeson base bloodhound criterion deepseq random text + unordered-containers uuid + ]; + homepage = "https://github.com/Soostone/katip"; + description = "ElasticSearch scribe for the Katip logging framework"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "katip-rollbar" = callPackage ({ mkDerivation, aeson, async, base, hostname, http-client, katip , rollbar-hs, stm-chans, text, time @@ -123781,7 +124778,6 @@ self: { homepage = "http://www.keera.es/blog/community/"; description = "Rapid Gtk Application Development - I18N"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "keera-hails-mvc-controller" = callPackage @@ -124175,8 +125171,8 @@ self: { pname = "keycode"; version = "0.2.2"; sha256 = "046k8d1h5wwadf5z4pppjkc3g7v2zxlzb06s1xgixc42y5y41yan"; - revision = "1"; - editedCabalFile = "0pyh8cadgw8pn9xdg8lbvsh108i84iaynia8j42qmgmls2zakvja"; + revision = "2"; + editedCabalFile = "0g19sjk2sh1w9ahn93dnvjkim4mqapq0plmdd37179qfgi49qnp8"; libraryHaskellDepends = [ base containers ghc-prim template-haskell ]; @@ -124551,7 +125547,6 @@ self: { homepage = "http://github.com/alpmestan/kmeans-vector"; description = "An implementation of the kmeans clustering algorithm based on the vector package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "kmp-dfa" = callPackage @@ -124980,8 +125975,8 @@ self: { }: mkDerivation { pname = "labsat"; - version = "0.0.0"; - sha256 = "0ps5m31bwfrm7398i7kngrbvsjva7zvyb3cbj7sqk828j72abg9y"; + version = "0.0.5"; + sha256 = "02c6bx1pwjcqni8nx7899mk3mzzfrpdpxjiwnkizzianrzmwz0mw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -125350,7 +126345,6 @@ self: { homepage = "https://wiki.haskell.org/Lambdabot"; description = "Lambdabot is a development tool and advanced IRC bot"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdabot-core" = callPackage @@ -125404,7 +126398,6 @@ self: { homepage = "https://wiki.haskell.org/Lambdabot"; description = "Lambdabot Haskell plugins"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdabot-irc-plugins" = callPackage @@ -125919,6 +126912,7 @@ self: { homepage = "语.ml"; description = "A Lisp"; license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "language-asn1" = callPackage @@ -125938,17 +126932,17 @@ self: { "language-ats" = callPackage ({ mkDerivation, alex, ansi-wl-pprint, array, base , composition-prelude, containers, criterion, deepseq, happy, hspec - , hspec-dirstream, microlens, microlens-th, mtl, recursion-schemes - , system-filepath, transformers + , hspec-dirstream, lens, recursion-schemes, system-filepath + , transformers }: mkDerivation { pname = "language-ats"; - version = "1.2.0.1"; - sha256 = "000jhj5jjsccn7x6j76wl07y6ydszy3gcn4mg6bcg2p0spdvc0vr"; + version = "1.2.0.2"; + sha256 = "1hbngljls19a9mr6gz5qm80ibx8z75ky0s5gn57nmlsf8pazkfvz"; enableSeparateDataOutput = true; libraryHaskellDepends = [ ansi-wl-pprint array base composition-prelude containers deepseq - microlens microlens-th mtl recursion-schemes transformers + lens recursion-schemes transformers ]; libraryToolDepends = [ alex happy ]; testHaskellDepends = [ @@ -126441,6 +127435,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "language-java_0_2_9" = callPackage + ({ mkDerivation, alex, array, base, directory, filepath, mtl + , parsec, pretty, tasty, tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "language-java"; + version = "0.2.9"; + sha256 = "03hrj8hgyjmw2fvvk4ik30fdmbi3hndpkvf1bqcnpzqy5anwh58x"; + libraryHaskellDepends = [ array base parsec pretty ]; + libraryToolDepends = [ alex ]; + testHaskellDepends = [ + base directory filepath mtl tasty tasty-hunit tasty-quickcheck + ]; + homepage = "http://github.com/vincenthz/language-java"; + description = "Java source manipulation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "language-java-classfile" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , data-binary-ieee754, data-flags, deepseq, language-java, LibZip @@ -126766,7 +127779,6 @@ self: { homepage = "http://lpuppet.banquise.net/"; description = "Tools to parse and evaluate the Puppet DSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "x86_64-linux" ]; }) {}; "language-python" = callPackage @@ -127261,7 +128273,6 @@ self: { homepage = "https://github.com/unitb/latex-function-tables"; description = "Function table specifications in latex"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lattices" = callPackage @@ -127302,6 +128313,8 @@ self: { pname = "lattices"; version = "1.7.1"; sha256 = "0bcv28dazaz0n166jbd579vim0hr4c20rmg0s34284fdr6p50m3x"; + revision = "1"; + editedCabalFile = "1h68xxzy90i7nggyh67f4744zk9a4zv4lb5ag9dwp126acvg2c9n"; libraryHaskellDepends = [ base base-compat containers deepseq hashable semigroupoids tagged universe-base universe-reverse-instances unordered-containers @@ -128146,8 +129159,8 @@ self: { pname = "lens"; version = "4.16"; sha256 = "16wz3s62zmnmis7xs9jahyc7b75090b96ayk98c3gvzmpg7bx54z"; - revision = "2"; - editedCabalFile = "1iwp8shnis8gk01ys9bp3bn5khsi6mp0ji9b18qkg1mpp7nvggcq"; + revision = "3"; + editedCabalFile = "0zkjys731g07brc4ky29245jrdx1r8l468k5fh9hlwd0dx9d4996"; setupHaskellDepends = [ base Cabal cabal-doctest filepath ]; libraryHaskellDepends = [ array base base-orphans bifunctors bytestring call-stack comonad @@ -128217,8 +129230,8 @@ self: { pname = "lens-aeson"; version = "1.0.2"; sha256 = "1k028ycmhz7mnjlrap88fqix4nmmpyy6b88m16kv77d3r8sz04a3"; - revision = "2"; - editedCabalFile = "1nynlx0jyn5hfsjmzdd9pdj95hnfc6r7gfb3isdqs05ma8dihaws"; + revision = "3"; + editedCabalFile = "160zpz85p8qfg6scqp2cbg3w9lbv89hkxcvmyk6la34v9d439lm0"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson attoparsec base bytestring lens scientific text @@ -128340,7 +129353,6 @@ self: { homepage = "http://github.com/ekmett/lens/"; description = "QuickCheck properties for lens"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lens-regex" = callPackage @@ -129222,7 +130234,6 @@ self: { homepage = "http://github.com/vimus/libmpd-haskell#readme"; description = "An MPD client library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "libnotify" = callPackage @@ -129551,7 +130562,6 @@ self: { librarySystemDepends = [ libxml2 ]; description = "Binding to libxml2"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libxml2;}; "libxml-enumerator" = callPackage @@ -129658,6 +130668,8 @@ self: { pname = "lift-generics"; version = "0.1.2"; sha256 = "0kk05dp6n93jgxq4x1lrckjrca6lrwa7qklr3vpzc6iyrlbvv7qf"; + revision = "1"; + editedCabalFile = "02hg33ikmwl81zsw8fgppix740rdc3h8fv6nr9b9h37vizhs50zw"; libraryHaskellDepends = [ base generic-deriving ghc-prim template-haskell ]; @@ -129691,15 +130703,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "lifted-async_0_10_0" = callPackage + "lifted-async_0_10_0_1" = callPackage ({ mkDerivation, async, base, constraints, criterion, deepseq , HUnit, lifted-base, monad-control, mtl, tasty, tasty-hunit , tasty-th, transformers-base }: mkDerivation { pname = "lifted-async"; - version = "0.10.0"; - sha256 = "0w6xgyw2d3mcv8n7wnnma5dx2slz2ngis5k45x68dh7nv1azzs37"; + version = "0.10.0.1"; + sha256 = "1cf44j2jr2svp8g03hzf3xfmjlh7xcd40ra1k7dv6vzyzwb5p4hd"; libraryHaskellDepends = [ async base constraints lifted-base monad-control transformers-base ]; @@ -131611,6 +132623,31 @@ self: { homepage = "http://github.com/llvm-hs/llvm-hs/"; description = "General purpose LLVM bindings"; license = stdenv.lib.licenses.bsd3; + }) {llvm-config = null;}; + + "llvm-hs_6_0_0" = callPackage + ({ mkDerivation, array, attoparsec, base, bytestring, Cabal + , containers, exceptions, llvm-config, llvm-hs-pure, mtl + , pretty-show, QuickCheck, tasty, tasty-hunit, tasty-quickcheck + , template-haskell, temporary, transformers, utf8-string + }: + mkDerivation { + pname = "llvm-hs"; + version = "6.0.0"; + sha256 = "1hll3s40bbrzyylyfnh0w907cpkbxx6qn3a6wv7kfi107zfx2rgd"; + setupHaskellDepends = [ base Cabal containers ]; + libraryHaskellDepends = [ + array attoparsec base bytestring containers exceptions llvm-hs-pure + mtl template-haskell transformers utf8-string + ]; + libraryToolDepends = [ llvm-config ]; + testHaskellDepends = [ + base bytestring containers llvm-hs-pure mtl pretty-show QuickCheck + tasty tasty-hunit tasty-quickcheck temporary transformers + ]; + homepage = "http://github.com/llvm-hs/llvm-hs/"; + description = "General purpose LLVM bindings"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {llvm-config = null;}; @@ -131658,6 +132695,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "llvm-hs-pure_6_0_0" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers, fail + , hspec, mtl, tasty, tasty-hunit, tasty-quickcheck + , template-haskell, text, transformers, unordered-containers + }: + mkDerivation { + pname = "llvm-hs-pure"; + version = "6.0.0"; + sha256 = "005414p1jv5nyf3awiybksc1paf092a9070x23l2y6fvd9jhy0sl"; + revision = "1"; + editedCabalFile = "05idczj2c9iv3kb7fyfhc0ypfsmcjkf9n46w24ivarjbs8fykrb3"; + libraryHaskellDepends = [ + attoparsec base bytestring containers fail mtl template-haskell + transformers unordered-containers + ]; + testHaskellDepends = [ + base bytestring containers hspec mtl tasty tasty-hunit + tasty-quickcheck text transformers unordered-containers + ]; + homepage = "http://github.com/llvm-hs/llvm-hs/"; + description = "Pure Haskell LLVM functionality (no FFI)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "llvm-ht" = callPackage ({ mkDerivation, base, bytestring, directory, mtl, process , type-level @@ -131884,7 +132946,6 @@ self: { homepage = "https://github.com/SumAll/haskell-load-balancing"; description = "Client-side load balancing utilities"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "load-env" = callPackage @@ -132338,7 +133399,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "log-warper_1_8_10" = callPackage + "log-warper_1_8_10_1" = callPackage ({ mkDerivation, aeson, ansi-terminal, async, base, containers , data-default, deepseq, directory, filepath, fmt, hspec , hspec-discover, HUnit, lifted-async, markdown-unlit, microlens @@ -132349,8 +133410,8 @@ self: { }: mkDerivation { pname = "log-warper"; - version = "1.8.10"; - sha256 = "0wl1i68xnvla6fzgxfkqbk6hhqx9h0yp4br30y0fzwyk8p5v4l37"; + version = "1.8.10.1"; + sha256 = "0chwqn8pdlfhlixl3z9a6gvx86vxmq92v325z0fsamwzb7hhcf52"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -132559,6 +133620,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "logging-effect-extra-handler_1_1_3" = callPackage + ({ mkDerivation, base, exceptions, logging-effect, time + , wl-pprint-text + }: + mkDerivation { + pname = "logging-effect-extra-handler"; + version = "1.1.3"; + sha256 = "0pxsnah1v2d0zk5x3w8whifb0f78shhn0kpg5iq00ggpwg6x686i"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base exceptions logging-effect time wl-pprint-text + ]; + executableHaskellDepends = [ base logging-effect wl-pprint-text ]; + homepage = "https://github.com/jship/logging-effect-extra#readme"; + description = "Handy logging handler combinators"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "logging-facade" = callPackage ({ mkDerivation, base, call-stack, hspec, transformers }: mkDerivation { @@ -132679,7 +133760,6 @@ self: { homepage = "https://github.com/atzedijkstra/logict-state"; description = "Library for logic programming based on haskell package logict"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "logplex-parse" = callPackage @@ -132984,6 +134064,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "long-double" = callPackage + ({ mkDerivation, base, integer-gmp }: + mkDerivation { + pname = "long-double"; + version = "0.1"; + sha256 = "072yfv1kv83k8qc9apks2czr9p6znk46bbbjmsdbcpzyb8byh64j"; + libraryHaskellDepends = [ base integer-gmp ]; + homepage = "https://code.mathr.co.uk/long-double"; + description = "FFI bindings for C long double"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "longboi" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -133222,7 +134314,6 @@ self: { homepage = "https://github.com/swift-nav/loup"; description = "Amazon Simple Workflow Service Wrapper for Work Pools"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lowgl" = callPackage @@ -133591,7 +134682,6 @@ self: { homepage = "https://github.com/andrewthad/colonnade#readme"; description = "Helper functions for using lucid with colonnade"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lucid-extras" = callPackage @@ -134414,19 +135504,20 @@ self: { }: mkDerivation { pname = "madlang"; - version = "4.0.0.4"; - sha256 = "1rfax7s4sc63943izc1r0gk848ji0kxsjgsb81i2f6dc5860xkz9"; + version = "4.0.1.0"; + sha256 = "08nw11l8vpazyfny3f8alyb9r268wlh3q24032q34sk1n5d92pcl"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cli-setup ]; libraryHaskellDepends = [ ansi-wl-pprint base binary composition-prelude containers directory file-embed http-client http-client-tls megaparsec MonadRandom mtl - optparse-applicative random-shuffle recursion-schemes - recursion-schemes-ext tar template-haskell text th-lift-instances - titlecase zip-archive zlib + random-shuffle recursion-schemes recursion-schemes-ext tar + template-haskell text th-lift-instances titlecase zip-archive zlib + ]; + executableHaskellDepends = [ + base directory megaparsec optparse-applicative text ]; - executableHaskellDepends = [ base ]; testHaskellDepends = [ base hspec hspec-megaparsec text ]; benchmarkHaskellDepends = [ base criterion megaparsec text ]; homepage = "https://hub.darcs.net/vmchale/madlang"; @@ -135298,6 +136389,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "mandrill_0_5_3_3" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, blaze-html + , bytestring, containers, email-validate, http-client + , http-client-tls, http-types, lens, mtl, old-locale, QuickCheck + , raw-strings-qq, tasty, tasty-hunit, tasty-quickcheck, text, time + , unordered-containers + }: + mkDerivation { + pname = "mandrill"; + version = "0.5.3.3"; + sha256 = "0hhyif8lqq16i25bvpz7z54n2rmnq9q198pjdm4vssh02597lnn8"; + libraryHaskellDepends = [ + aeson base base64-bytestring blaze-html bytestring containers + email-validate http-client http-client-tls http-types lens mtl + old-locale QuickCheck text time unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring QuickCheck raw-strings-qq tasty tasty-hunit + tasty-quickcheck text + ]; + description = "Library for interfacing with the Mandrill JSON API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mandulia" = callPackage ({ mkDerivation, array, base, bytestring, containers, directory , filepath, GLUT, hslua, time @@ -135373,6 +136489,7 @@ self: { homepage = "https://github.com/leftaroundabout/manifolds"; description = "Sampling random points on general manifolds"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "manifolds" = callPackage @@ -135400,6 +136517,7 @@ self: { homepage = "https://github.com/leftaroundabout/manifolds"; description = "Coordinate-free hypersurfaces"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "manifolds-core" = callPackage @@ -135427,7 +136545,6 @@ self: { homepage = "http://github.com/charles-cooper/map-exts#readme"; description = "Extensions to Data.Map"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "map-syntax" = callPackage @@ -135438,8 +136555,8 @@ self: { pname = "map-syntax"; version = "0.2.0.2"; sha256 = "12jdv9myffpkhhrwm5kzhbqzbxfb0rb4fvww33d0yq4s6sk9b3xi"; - revision = "1"; - editedCabalFile = "0k27w9bw4lri2nfm7s7v7gq49mr0him5g2dsc0wha5kzj4gmy87q"; + revision = "2"; + editedCabalFile = "12b3pbrd70xpx634ngl4dcvda5p9494wq6mc8s1wv4624hwlgja6"; libraryHaskellDepends = [ base containers mtl ]; testHaskellDepends = [ base containers deepseq hspec HUnit mtl QuickCheck transformers @@ -135698,7 +136815,6 @@ self: { ]; description = "Abstraction for HTML-embedded content"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "markup_4_0_4" = callPackage @@ -135855,7 +136971,6 @@ self: { homepage = "https://marvin.readthedocs.io"; description = "A framework for modular, portable chat bots"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "marvin-interpolate" = callPackage @@ -137188,6 +138303,8 @@ self: { pname = "megaparsec"; version = "6.4.1"; sha256 = "0w0kw8g7c6c3sp0fpgfqjc2w032dv9s7jnyn1dx71hk5mifh2h6y"; + revision = "1"; + editedCabalFile = "1r7isvrj7k34bsl7snd14wjvc64vx01dmbkm17ycik3lhllscfif"; libraryHaskellDepends = [ base bytestring case-insensitive containers deepseq mtl parser-combinators scientific text transformers @@ -137234,7 +138351,6 @@ self: { homepage = "https://github.com/quixoftic/mellon#readme"; description = "Control physical access devices"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mellon-gpio" = callPackage @@ -137247,7 +138363,6 @@ self: { homepage = "https://github.com/quixoftic/mellon#readme"; description = "GPIO support for mellon"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mellon-web" = callPackage @@ -137287,7 +138402,6 @@ self: { homepage = "https://github.com/quixoftic/mellon#readme"; description = "A REST web service for Mellon controllers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "melody" = callPackage @@ -138135,6 +139249,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "microlens_0_4_9" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "microlens"; + version = "0.4.9"; + sha256 = "1zsisv6vlkphqw8rdi6c6phm6k3izc0n6vj1z1b6my7r8zyshlia"; + libraryHaskellDepends = [ base ]; + homepage = "http://github.com/aelve/microlens"; + description = "A tiny lens library with no dependencies. If you're writing an app, you probably want microlens-platform, not this."; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "microlens-aeson" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, microlens , scientific, tasty, tasty-hunit, text, unordered-containers @@ -138157,6 +139284,33 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "microlens-aeson_2_3_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion + , deepseq, hashable, lens, lens-aeson, microlens, scientific, tasty + , tasty-hunit, text, unordered-containers, vector + }: + mkDerivation { + pname = "microlens-aeson"; + version = "2.3.0"; + sha256 = "1iahlh505jrlpd9ndkr5asfnzdpp6m6m2lm44ds15461py485wpj"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring deepseq hashable microlens + scientific text unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring deepseq hashable microlens tasty tasty-hunit + text unordered-containers vector + ]; + benchmarkHaskellDepends = [ + aeson base bytestring criterion deepseq hashable lens lens-aeson + microlens text unordered-containers vector + ]; + homepage = "http://github.com/fosskers/microlens-aeson/"; + description = "Law-abiding lenses for Aeson, using microlens"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "microlens-contra" = callPackage ({ mkDerivation, base, contravariant, microlens }: mkDerivation { @@ -138198,6 +139352,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "microlens-ghc_0_4_9" = callPackage + ({ mkDerivation, array, base, bytestring, containers, microlens + , transformers + }: + mkDerivation { + pname = "microlens-ghc"; + version = "0.4.9"; + sha256 = "0wdwra9s7gllw0i7sf7d371h6d5qwlk6jrvhdm8hafj4fxagafma"; + libraryHaskellDepends = [ + array base bytestring containers microlens transformers + ]; + homepage = "http://github.com/aelve/microlens"; + description = "microlens + array, bytestring, containers, transformers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "microlens-mtl" = callPackage ({ mkDerivation, base, microlens, mtl, transformers , transformers-compat @@ -138231,6 +139402,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "microlens-platform_0_3_10" = callPackage + ({ mkDerivation, base, hashable, microlens, microlens-ghc + , microlens-mtl, microlens-th, text, unordered-containers, vector + }: + mkDerivation { + pname = "microlens-platform"; + version = "0.3.10"; + sha256 = "1d4nhmgf9jq0ixc7qhwm7aaw3xdr0nalw58d0ydsydgf02cyazwv"; + libraryHaskellDepends = [ + base hashable microlens microlens-ghc microlens-mtl microlens-th + text unordered-containers vector + ]; + homepage = "http://github.com/aelve/microlens"; + description = "Feature-complete microlens"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "microlens-th" = callPackage ({ mkDerivation, base, containers, microlens, template-haskell }: mkDerivation { @@ -138245,6 +139434,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "microlens-th_0_4_2" = callPackage + ({ mkDerivation, base, containers, microlens, template-haskell + , th-abstraction, transformers + }: + mkDerivation { + pname = "microlens-th"; + version = "0.4.2"; + sha256 = "16962h9qxjw6mv7nqn2xz7kclfgllla52illrzpri738wnf2nwsd"; + libraryHaskellDepends = [ + base containers microlens template-haskell th-abstraction + transformers + ]; + testHaskellDepends = [ base microlens ]; + homepage = "http://github.com/aelve/microlens"; + description = "Automatic generation of record lenses for microlens"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "micrologger" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hspec, lens , text, text-format, time, transformers @@ -138302,6 +139510,8 @@ self: { pname = "microstache"; version = "1.0.1.1"; sha256 = "0851sqr1ppdj6m822635pa3j6qzdf25gyrhkjs25zdry6518bsax"; + revision = "1"; + editedCabalFile = "1var5mgzvkxl9s78hbxylkvv67z7fnbs5rb1l9q0cqxyw85cbr6j"; libraryHaskellDepends = [ aeson base bytestring containers deepseq directory filepath parsec text transformers unordered-containers vector @@ -139219,15 +140429,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "miso_0_13_0_0" = callPackage + "miso_0_14_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, http-api-data , http-types, lucid, network-uri, servant, servant-lucid, text , transformers, vector }: mkDerivation { pname = "miso"; - version = "0.13.0.0"; - sha256 = "1sv8q5f1nkvsxk365k8njmaggi1hyp47q539is2n2xhwmsysxwla"; + version = "0.14.0.0"; + sha256 = "16qi1wcijncjjrjdwxs90jn3xclw1cgb0j1gby1w9d457ys6hmnx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -139444,7 +140654,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "mmark_0_0_5_5" = callPackage + "mmark_0_0_5_6" = callPackage ({ mkDerivation, aeson, base, case-insensitive, containers , criterion, data-default-class, deepseq, dlist, email-validate , foldl, hashable, hspec, hspec-megaparsec, html-entity-map, lucid @@ -139454,8 +140664,8 @@ self: { }: mkDerivation { pname = "mmark"; - version = "0.0.5.5"; - sha256 = "1j1ci1zwnp7q6bnk1cqz5g2zx4c02yr8s87v9wf8j898bky8cgwj"; + version = "0.0.5.6"; + sha256 = "0d0jxxj0b1jy9mym6389dmm6biiw8kzdh06zj2j0gsjczn2n60zw"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base case-insensitive containers data-default-class deepseq @@ -139483,6 +140693,8 @@ self: { pname = "mmark-cli"; version = "0.0.3.0"; sha256 = "0nb17k23bs21qi7a888qp81w682ax2qvih9fbvdkdh6c2n6yklrp"; + revision = "1"; + editedCabalFile = "0rzz4m7z02m6rmigmmpgqhik1d7kc0i4mri0gpj1i3j7a59p7s1q"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -139732,8 +140944,8 @@ self: { pname = "modern-uri"; version = "0.2.1.0"; sha256 = "06lqkx91s0lvkamxxf070l990kh8g0c5f5yshh2lffjbk5zclnp6"; - revision = "1"; - editedCabalFile = "1rir55ccx5y377mdl7hfzk2n31nv18mdfxw6a0l2jjw7y0w5kpyi"; + revision = "2"; + editedCabalFile = "1xhm5vi9y9y0mzmyqac29d13pvm3d28glmqcd7ps9lf9fjrrpp6k"; libraryHaskellDepends = [ base bytestring containers contravariant deepseq exceptions megaparsec mtl profunctors QuickCheck reflection tagged @@ -140142,7 +141354,6 @@ self: { homepage = "https://github.com/kawu/monad-codec"; description = "Monadic conversion between complex data structures and unique integers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-connect" = callPackage @@ -140266,8 +141477,8 @@ self: { }: mkDerivation { pname = "monad-finally"; - version = "0.1.0.1"; - sha256 = "0qam9qsm3cqk2r9x4jhmgg6c9kshf3aja765x0apgc0j9rk8zpyq"; + version = "0.1.1"; + sha256 = "0f2bb8l00vqsswsckc6zgnzl372jg1w7c1zgpcj8fq8bnvia23hb"; libraryHaskellDepends = [ base monad-abort-fd monad-control transformers transformers-abort transformers-base transformers-compat @@ -140582,7 +141793,6 @@ self: { homepage = "https://github.com/EduardSergeev/monad-memo"; description = "Memoization monad transformer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-mersenne-random" = callPackage @@ -140850,7 +142060,6 @@ self: { homepage = "https://github.com/igraves/resumption_monads"; description = "Resumption and reactive resumption monads for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-skeleton" = callPackage @@ -140984,7 +142193,6 @@ self: { homepage = "http://github.com/ninegua/monad-task"; description = "A monad transformer that turns event processing into co-routine programming"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-time" = callPackage @@ -142034,6 +143242,39 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "morte_1_6_16" = callPackage + ({ mkDerivation, alex, array, base, binary, code-page, containers + , criterion, deepseq, Earley, http-client, http-client-tls + , microlens, microlens-mtl, mtl, optparse-applicative, pipes + , QuickCheck, system-fileio, system-filepath, tasty, tasty-hunit + , tasty-quickcheck, text, text-format, transformers + }: + mkDerivation { + pname = "morte"; + version = "1.6.16"; + sha256 = "1k7j9dvl3m8l77r9m8d02nm9dxkr17y57d58x49icvk7bq0ij29x"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base binary containers deepseq Earley http-client + http-client-tls microlens microlens-mtl pipes system-fileio + system-filepath text text-format transformers + ]; + libraryToolDepends = [ alex ]; + executableHaskellDepends = [ + base code-page optparse-applicative text text-format + ]; + testHaskellDepends = [ + base mtl QuickCheck system-filepath tasty tasty-hunit + tasty-quickcheck text transformers + ]; + benchmarkHaskellDepends = [ base criterion system-filepath text ]; + description = "A bare-bones calculus of constructions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mosaico-lib" = callPackage ({ mkDerivation, base, base-unicode-symbols, colour, diagrams-cairo , diagrams-core, diagrams-gtk, diagrams-lib, glib, gtk, JuicyPixels @@ -142742,7 +143983,6 @@ self: { libraryHaskellDepends = [ base transformers ]; description = "Monad Transformer Library with Type Families"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mtl-unleashed" = callPackage @@ -142987,7 +144227,6 @@ self: { homepage = "https://github.com/chris-martin/multi-instance#readme"; description = "Typeclasses augmented with a phantom type parameter"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "multi-trie" = callPackage @@ -143940,7 +145179,6 @@ self: { homepage = "https://github.com/chris-martin/mvar-lock"; description = "A trivial lock based on MVar"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mvc" = callPackage @@ -144106,8 +145344,8 @@ self: { }: mkDerivation { pname = "mxnet-nn"; - version = "0.0.1.1"; - sha256 = "16clpl3sn4cf106hjigsyhgh15l9269yg838qarvbpigppkgb2sv"; + version = "0.0.1.2"; + sha256 = "0w5ri77ccav65dza3a4aanzvylcwscs4rf4yqylc12w03xh0rshp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -144161,6 +145399,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "spam"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "my-test-docs" = callPackage @@ -144185,6 +145424,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "spam"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "myTestlll" = callPackage @@ -144533,6 +145773,7 @@ self: { homepage = "https://github.com/gelisam/n-ary-functor"; description = "An n-ary version of Functor"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "n-m" = callPackage @@ -144706,7 +145947,6 @@ self: { executableHaskellDepends = [ base text ]; description = "Tool to keep namecoin names updated and well"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "named" = callPackage @@ -144965,8 +146205,8 @@ self: { }) {}; "nanovg" = callPackage - ({ mkDerivation, base, bytestring, c2hs, containers, freeglut, GLEW - , hspec, inline-c, mesa, QuickCheck, text, vector + ({ mkDerivation, base, bytestring, c2hs, containers, GLEW, hspec + , inline-c, libGL, libGLU, QuickCheck, text, vector }: mkDerivation { pname = "nanovg"; @@ -144977,14 +146217,14 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring containers text vector ]; - librarySystemDepends = [ freeglut GLEW mesa ]; + librarySystemDepends = [ GLEW libGL libGLU ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ base containers hspec inline-c QuickCheck ]; homepage = "https://github.com/cocreature/nanovg-hs"; description = "Haskell bindings for nanovg"; license = stdenv.lib.licenses.isc; hydraPlatforms = stdenv.lib.platforms.none; - }) {GLEW = null; inherit (pkgs) freeglut; mesa = null;}; + }) {GLEW = null; inherit (pkgs) libGL; inherit (pkgs) libGLU;}; "nanq" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers @@ -145535,7 +146775,6 @@ self: { homepage = "http://github.com/nfjinjing/nemesis"; description = "a task management tool for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nemesis-titan" = callPackage @@ -145658,10 +146897,8 @@ self: { }: mkDerivation { pname = "nested-routes"; - version = "8.0.1"; - sha256 = "19m1aqhyzs86gdskv93lgr1rfgqy3spxz4sv21ych1mw719q0lzl"; - isLibrary = true; - isExecutable = true; + version = "8.1.0"; + sha256 = "1cd88ma1naw998ask0pc1whnyczrc5b9dp6n1maanc027f7rfn66"; libraryHaskellDepends = [ attoparsec base bifunctors bytestring errors exceptions extractable-singleton hashable hashtables monad-control-aligned mtl @@ -145670,12 +146907,14 @@ self: { wai-middleware-verbs wai-transformers ]; testHaskellDepends = [ - attoparsec base bytestring composition-extra errors exceptions - hashable hashtables HSet hspec hspec-wai http-types mtl poly-arity - pred-set pred-trie regex-compat semigroups tasty tasty-hspec text + attoparsec base bifunctors bytestring composition-extra errors + exceptions extractable-singleton hashable hashtables HSet hspec + hspec-wai http-types monad-control-aligned mtl poly-arity pred-set + pred-trie regex-compat semigroups tasty tasty-hspec text transformers tries unordered-containers wai-middleware-content-type wai-middleware-verbs wai-transformers ]; + homepage = "https://github.com/athanclark/nested-routes#readme"; description = "Declarative, compositional Wai responses"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -146106,6 +147345,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "netwire-input_0_0_7" = callPackage + ({ mkDerivation, base, deepseq, netwire }: + mkDerivation { + pname = "netwire-input"; + version = "0.0.7"; + sha256 = "1f9xxlcpy2brqn5hv0mdc428fav402jsqa1b8h4s8b09qa3v1ii9"; + libraryHaskellDepends = [ base deepseq netwire ]; + homepage = "https://www.github.com/Mokosha/netwire-input"; + description = "Input handling abstractions for netwire"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "netwire-input-glfw" = callPackage ({ mkDerivation, base, containers, GLFW-b, mtl, netwire-input, stm }: @@ -147189,7 +148441,6 @@ self: { ]; description = "Networked-game support library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "neural" = callPackage @@ -147559,7 +148810,6 @@ self: { homepage = "https://github.com/mikeplus64/nice-html#readme"; description = "A fast and nice HTML templating library with distinct compilation/rendering phases"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nicify" = callPackage @@ -147748,7 +148998,6 @@ self: { homepage = "https://github.com/awakesecurity/nix-deploy#readme"; description = "Deploy Nix-built software to a NixOS machine"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nix-derivation" = callPackage @@ -147791,7 +149040,6 @@ self: { homepage = "https://github.com/Gabriel439/nix-diff"; description = "Explain why two Nix derivations differ"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nix-eval" = callPackage @@ -148051,7 +149299,6 @@ self: { homepage = "https://ghc.haskell.org/trac/ghc/wiki/Building/RunningNoFib"; description = "Parse and compare nofib runs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nofib-analyze" = callPackage @@ -148320,6 +149567,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "nonce_1_0_6" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, entropy, text + , transformers, unliftio, unliftio-core + }: + mkDerivation { + pname = "nonce"; + version = "1.0.6"; + sha256 = "0nnx295vvkq0yygq8g5n6l167zaj0rdflf71hwph4clr4isk9dwn"; + libraryHaskellDepends = [ + base base64-bytestring bytestring entropy text transformers + unliftio unliftio-core + ]; + homepage = "https://github.com/prowdsponsor/nonce"; + description = "Generate cryptographic nonces"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "nondeterminism" = callPackage ({ mkDerivation, base, containers, mtl, tasty, tasty-hunit }: mkDerivation { @@ -148353,7 +149618,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Free structures sans laws"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nonlinear-optimization" = callPackage @@ -148426,8 +149690,8 @@ self: { pname = "normalization-insensitive"; version = "2.0.1"; sha256 = "00nbha984yg4lxnpkyd3q0gbywf7xn5z5ixy3cr9ksn05w6blm1v"; - revision = "1"; - editedCabalFile = "1zaqbgrfy33y2d9ix178mhyysyffsia0hbmg77gcjmvv32b44m6j"; + revision = "2"; + editedCabalFile = "0djclsv0vzd56139ddzhykbwb3ny9mf8k2pryp8w33h9i4hv7axc"; libraryHaskellDepends = [ base bytestring deepseq hashable text unicode-transforms ]; @@ -148719,7 +149983,6 @@ self: { homepage = "https://github.com/zjhmale/ntha"; description = "A tiny statically typed functional programming language"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nthable" = callPackage @@ -148838,8 +150101,8 @@ self: { }: mkDerivation { pname = "number-length"; - version = "0.1.0.1"; - sha256 = "1ig9d1rgd5k9fxqmrdxi7mq6fgnxla7ba1083di1lxcakanll0kc"; + version = "0.2.0.0"; + sha256 = "1jrlq7qdi7lcpkqqv9qafcgci2gc8rb3f3lv177s8narfdprx2hz"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base HUnit QuickCheck test-framework test-framework-hunit @@ -149441,15 +150704,15 @@ self: { "o-clock" = callPackage ({ mkDerivation, base, deepseq, doctest, gauge, ghc-prim, Glob , hedgehog, markdown-unlit, tasty, tasty-hedgehog, tasty-hspec - , tiempo, time-units, transformers, type-spec + , tiempo, time-units, type-spec }: mkDerivation { pname = "o-clock"; - version = "0.1.0"; - sha256 = "18rqy00hkqqqbhmsgkhza9blm2fl6kb29fs78ifkr2hqsya17fh6"; + version = "0.1.1"; + sha256 = "1adksq9s86gqxvn74qpa22w4fciq8k8j5v3qh0cas2rwabxqdr00"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base ghc-prim transformers ]; + libraryHaskellDepends = [ base ghc-prim ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base doctest Glob hedgehog markdown-unlit tasty tasty-hedgehog @@ -149510,25 +150773,24 @@ self: { "oauthenticated" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder - , bytestring, case-insensitive, crypto-random, cryptohash - , exceptions, hspec, hspec-expectations, http-client - , http-client-tls, http-types, mtl, network, network-uri, text - , time, transformers + , bytestring, case-insensitive, cryptonite, exceptions, hspec + , hspec-expectations, http-client, http-client-tls, http-types + , memory, mtl, network, network-uri, text, time, transformers }: mkDerivation { pname = "oauthenticated"; - version = "0.2.0.0"; - sha256 = "01rfx9zc1d9pwqc66axkrl2bi0jnyw4l39kn0nh4q8j63laszc1h"; + version = "0.2.1.0"; + sha256 = "08njax7jchkmha1angh98v0p3haxn8zj12lajl5npcmzlihd0k6l"; libraryHaskellDepends = [ aeson base base64-bytestring blaze-builder bytestring - case-insensitive crypto-random cryptohash exceptions http-client - http-types mtl network network-uri text time transformers + case-insensitive cryptonite exceptions http-client http-types + memory mtl network network-uri text time transformers ]; testHaskellDepends = [ aeson base base64-bytestring blaze-builder bytestring - case-insensitive crypto-random cryptohash exceptions hspec - hspec-expectations http-client http-client-tls http-types mtl - network network-uri text time transformers + case-insensitive cryptonite exceptions hspec hspec-expectations + http-client http-client-tls http-types memory mtl network + network-uri text time transformers ]; homepage = "https://github.com/tel/oauthenticated.git#readme"; description = "Simple OAuth for http-client"; @@ -149799,8 +151061,8 @@ self: { }) {}; "oculus" = callPackage - ({ mkDerivation, base, either, libX11, libXinerama, mesa, monads-tf - , ovr, systemd, transformers, vect-floating + ({ mkDerivation, base, either, libGL, libX11, libXinerama + , monads-tf, ovr, systemd, transformers, vect-floating }: mkDerivation { pname = "oculus"; @@ -149809,13 +151071,13 @@ self: { libraryHaskellDepends = [ base either monads-tf transformers vect-floating ]; - librarySystemDepends = [ libX11 libXinerama mesa ovr systemd ]; + librarySystemDepends = [ libGL libX11 libXinerama ovr systemd ]; homepage = "http://github.com/cpdurham/oculus"; description = "Oculus Rift ffi providing head tracking data"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXinerama; - mesa = null; ovr = null; systemd = null;}; + }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; + inherit (pkgs.xorg) libXinerama; ovr = null; systemd = null;}; "odbc" = callPackage ({ mkDerivation }: @@ -149928,7 +151190,6 @@ self: { homepage = "https://nest.pijul.com/lthms/ogmarkup"; description = "A lightweight markup language for story writers"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ohloh-hs" = callPackage @@ -150091,6 +151352,7 @@ self: { homepage = "https://github.com/owensmurray/om-elm"; description = "Haskell utilities for building embedded Elm programs"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "omaketex" = callPackage @@ -150268,6 +151530,20 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "one-line-aeson-text" = callPackage + ({ mkDerivation, aeson, base, doctest, text, unordered-containers + }: + mkDerivation { + pname = "one-line-aeson-text"; + version = "0.1.0.0"; + sha256 = "026qycb9nvc2v648p2cc74h6xqczkv9mvpawq54zx4r3vlc4lppn"; + libraryHaskellDepends = [ aeson base text unordered-containers ]; + testHaskellDepends = [ base doctest ]; + homepage = "https://github.com/typeclasses/one-line-aeson-text"; + description = "Pretty-printing short Aeson values as text"; + license = stdenv.lib.licenses.asl20; + }) {}; + "one-liner" = callPackage ({ mkDerivation, base, bifunctors, contravariant, ghc-prim, HUnit , profunctors, tagged, transformers @@ -150447,8 +151723,8 @@ self: { pname = "opaleye"; version = "0.6.0.0"; sha256 = "0prwlxp96qpnhdm34slwhp3j8hj961xl99xkl6fbrxgxxjngfg1q"; - revision = "1"; - editedCabalFile = "0hkgrksap5hn0xq86bq9rsm3h9a6vamh6la77z10fdxv7m3xjxf3"; + revision = "2"; + editedCabalFile = "1zhb7i4za87ixxwwh792drvydr0ln9krwkml1mmdz38a9s0zyhn6"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring case-insensitive contravariant postgresql-simple pretty product-profunctors @@ -151471,7 +152747,6 @@ self: { homepage = "http://github.com/akc/opn"; description = "Open files or URLs using associated programs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "optimal-blocks" = callPackage @@ -151514,7 +152789,6 @@ self: { homepage = "http://github.com/bgamari/optimization"; description = "Numerical optimization"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "optimusprime" = callPackage @@ -152310,14 +153584,15 @@ self: { }: mkDerivation { pname = "overload"; - version = "0.1.0.4"; - sha256 = "16sry2c4wrly3y3k47gry53klxf4kvbym6fybb8f7z9hqffx18a9"; + version = "0.1.0.5"; + sha256 = "046lxmcrk072l08rxbbzb883gd7cffxx76l3x29h78d10aai6cac"; libraryHaskellDepends = [ base simple-effects template-haskell th-expand-syns ]; homepage = "https://gitlab.com/LukaHorvat/overload"; description = "Finite overloading"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "overloaded-records" = callPackage @@ -152461,6 +153736,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "packed" = callPackage + ({ mkDerivation, base, containers, gauge, ghc-prim, hedgehog + , primitive, tasty, tasty-hedgehog, tasty-hunit + }: + mkDerivation { + pname = "packed"; + version = "0.1.0"; + sha256 = "1isacbh8w24awsh3nn7djcnmy8am4s4i5npsidnqm5qgcqikpfh8"; + libraryHaskellDepends = [ base ghc-prim primitive ]; + testHaskellDepends = [ + base containers ghc-prim hedgehog tasty tasty-hedgehog tasty-hunit + ]; + benchmarkHaskellDepends = [ base gauge ]; + homepage = "https://github.com/andrewthad/bytearray#readme"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "packed-dawg" = callPackage ({ mkDerivation, base, binary, criterion, deepseq, HUnit, mtl , QuickCheck, tasty, tasty-hunit, tasty-quickcheck @@ -152726,7 +154019,6 @@ self: { homepage = "https://pagure.io/pagure-hook-receiver"; description = "Receive hooks from pagure and do things with them"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "paint" = callPackage @@ -153027,7 +154319,6 @@ self: { homepage = "https://github.com/lierdakil/pandoc-crossref#readme"; description = "Pandoc filter for cross-references"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pandoc-csv2table" = callPackage @@ -153070,7 +154361,6 @@ self: { homepage = "https://github.com/owickstrom/pandoc-emphasize-code"; description = "A Pandoc filter for emphasizing code in fenced blocks"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pandoc-filter-graphviz" = callPackage @@ -154913,7 +156203,6 @@ self: { homepage = "http://github.com/jaspervdj/patat"; description = "Terminal-based presentations using Pandoc"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "patch-combinators" = callPackage @@ -156249,7 +157538,6 @@ self: { homepage = "https://github.com/kostmo/perfect-hash-generator#readme"; description = "Perfect minimal hashing implementation in native Haskell"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "perfecthash" = callPackage @@ -156420,6 +157708,8 @@ self: { pname = "persistent"; version = "2.7.1"; sha256 = "079r6b1rvvwgagznxwf4j5i29jpqrvnck545ig004v2853r6x2f2"; + revision = "1"; + editedCabalFile = "0ag2fd1iaiwiviskr5qzhgq7a0vr5x7vjq9zi75j25lahrqxxfm1"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html blaze-markup bytestring conduit containers exceptions fast-logger http-api-data @@ -156873,7 +158163,6 @@ self: { ]; description = "Backend for persistent library using Redis"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "persistent-refs" = callPackage @@ -156993,6 +158282,31 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; + "persistent-template_2_5_4" = callPackage + ({ mkDerivation, aeson, aeson-compat, base, bytestring, containers + , ghc-prim, hspec, http-api-data, monad-control, monad-logger + , path-pieces, persistent, QuickCheck, tagged, template-haskell + , text, transformers, unordered-containers + }: + mkDerivation { + pname = "persistent-template"; + version = "2.5.4"; + sha256 = "008afcy7zbw7bzp9jww8gdldb51kfm0fg4p0x4xcp61gx4679bjc"; + libraryHaskellDepends = [ + aeson aeson-compat base bytestring containers ghc-prim + http-api-data monad-control monad-logger path-pieces persistent + tagged template-haskell text transformers unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring hspec persistent QuickCheck text transformers + ]; + homepage = "http://www.yesodweb.com/book/persistent"; + description = "Type-safe, non-relational, multi-backend persistence"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ psibi ]; + }) {}; + "persistent-test" = callPackage ({ mkDerivation, aeson, aeson-compat, attoparsec, base , base64-bytestring, blaze-builder, blaze-html, blaze-markup @@ -157998,6 +159312,33 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "pinboard_0_9_12_9" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, hspec + , http-client, http-client-tls, http-types, monad-logger, mtl + , network, profunctors, QuickCheck, random, safe-exceptions + , semigroups, text, time, transformers, unordered-containers + , vector + }: + mkDerivation { + pname = "pinboard"; + version = "0.9.12.9"; + sha256 = "0h2w2ah7cqv0blb2pcdlzd4ww1f92x5ixr5ksqdqdcyzij2pbmbn"; + libraryHaskellDepends = [ + aeson base bytestring containers http-client http-client-tls + http-types monad-logger mtl network profunctors random + safe-exceptions text time transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers hspec mtl QuickCheck + safe-exceptions semigroups text time transformers + unordered-containers + ]; + homepage = "https://github.com/jonschoning/pinboard"; + description = "Access to the Pinboard API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pinch" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq , ghc-prim, hashable, hspec, hspec-discover, QuickCheck, text @@ -158119,6 +159460,7 @@ self: { homepage = "https://github.com/quixoftic/pinpon#readme"; description = "A gateway for various cloud notification services"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipe-enumerator" = callPackage @@ -158770,7 +160112,6 @@ self: { homepage = "https://github.com/boothead/pipes-kafka"; description = "Kafka in the Pipes ecosystem"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-key-value-csv" = callPackage @@ -159236,7 +160577,6 @@ self: { homepage = "https://github.com/k0001/pipes-zlib"; description = "Zlib and GZip compression and decompression for Pipes streams"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pisigma" = callPackage @@ -159773,7 +161113,6 @@ self: { homepage = "https://github.com/ocramz/plot-light"; description = "A lightweight plotting library, exporting to SVG"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "plotfont" = callPackage @@ -159823,7 +161162,6 @@ self: { homepage = "https://github.com/ishiy1993/ploton#readme"; description = "A useful cli tool to draw figures"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "plots" = callPackage @@ -159878,7 +161216,6 @@ self: { homepage = "https://github.com/stepcut/plugins"; description = "Dynamic linking for Haskell and C objects"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "plugins-auto" = callPackage @@ -159926,7 +161263,6 @@ self: { libraryHaskellDepends = [ base template-haskell ]; description = "Pointless plumbing combinators"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ply-loader" = callPackage @@ -160142,7 +161478,6 @@ self: { ]; description = "Tool for refactoring expressions into pointfree form"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pointfree-fancy" = callPackage @@ -161151,8 +162486,8 @@ self: { }: mkDerivation { pname = "posix-socket"; - version = "0.2"; - sha256 = "0ivgvpdjwiwniw7xbmlab7myhy5a631liq4864plhkrkm3hcp44y"; + version = "0.3"; + sha256 = "0al0am4nnzaiknxhlfid1qafh5kh15vl13ba1w0bivcsiyfb62in"; libraryHaskellDepends = [ base bytestring data-default-class data-flags network-ip transformers-base unix @@ -161396,11 +162731,14 @@ self: { }) {}; "postgresql-libpq" = callPackage - ({ mkDerivation, base, bytestring, postgresql, unix }: + ({ mkDerivation, base, bytestring, Cabal, postgresql, unix }: mkDerivation { pname = "postgresql-libpq"; version = "0.9.4.0"; sha256 = "15laa8m6i4girhr0i3xscgsl30iqj61mx5vbl67wasb8rwx0pi82"; + revision = "1"; + editedCabalFile = "0s1xyl25jn3miysc7i61wf2klm7blnczb0yhnf7hmv3ilpfsqghy"; + setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring unix ]; librarySystemDepends = [ postgresql ]; homepage = "https://github.com/lpsmith/postgresql-libpq"; @@ -161507,7 +162845,6 @@ self: { homepage = "https://github.com/mfine/postgresql-schema"; description = "PostgreSQL Schema Management"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "postgresql-simple" = callPackage @@ -161930,15 +163267,17 @@ self: { ({ mkDerivation, attoparsec, base, base-prelude, bytestring , directory, foldl, hashable, potoki-core, profunctors, QuickCheck , quickcheck-instances, random, rerebase, tasty, tasty-hunit - , tasty-quickcheck, text, unagi-chan, unordered-containers, vector + , tasty-quickcheck, text, transformers, unagi-chan + , unordered-containers, vector }: mkDerivation { pname = "potoki"; - version = "0.9"; - sha256 = "1sxzxg1dpm3280x5vp47pc6faik9dpfn7qp4pwvbkvwq90l32pv8"; + version = "0.10.3"; + sha256 = "0q4pdmikv395gk9ahiild76g3gh9sa924w57dmlc2ly6gqk01mhh"; libraryHaskellDepends = [ attoparsec base base-prelude bytestring directory foldl hashable - potoki-core profunctors text unagi-chan unordered-containers vector + potoki-core profunctors text transformers unagi-chan + unordered-containers vector ]; testHaskellDepends = [ attoparsec QuickCheck quickcheck-instances random rerebase tasty @@ -161956,8 +163295,8 @@ self: { }: mkDerivation { pname = "potoki-cereal"; - version = "0.1.4"; - sha256 = "0502ipxxdlmk4akc2fpsij3y91fi6q3rhrlzm3bf4kl5jfddvz7s"; + version = "0.1.5"; + sha256 = "1p24iv5mymyrw8q8y4k6zhzq3qd8z62ai0sfx2mh29in4s1y508y"; libraryHaskellDepends = [ base base-prelude bytestring cereal potoki potoki-core text ]; @@ -162289,7 +163628,6 @@ self: { homepage = "https://github.com/swift-nav/preamble"; description = "Yet another prelude"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "precis" = callPackage @@ -162915,6 +164253,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pretty-simple_2_1_0_0" = callPackage + ({ mkDerivation, ansi-terminal, base, containers, criterion + , doctest, Glob, mtl, parsec, text, transformers + }: + mkDerivation { + pname = "pretty-simple"; + version = "2.1.0.0"; + sha256 = "1jiq9l2zlgk3yzy6mif84fdzvwx3vzzbsh9zvwdph12zxa2y4b68"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base containers mtl parsec text transformers + ]; + testHaskellDepends = [ base doctest Glob ]; + benchmarkHaskellDepends = [ base criterion ]; + homepage = "https://github.com/cdepillabout/pretty-simple"; + description = "pretty printer for data types with a 'Show' instance"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pretty-sop" = callPackage ({ mkDerivation, base, generics-sop, pretty-show }: mkDerivation { @@ -163467,7 +164826,6 @@ self: { executableHaskellDepends = [ base directory shelly text ]; description = "Upload a package to the public or private hackage, building its docs"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "privileged-concurrency" = callPackage @@ -163537,7 +164895,6 @@ self: { homepage = "http://github.com/alpmestan/probable"; description = "Easy and reasonably efficient probabilistic programming and random generation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "proc" = callPackage @@ -163568,7 +164925,7 @@ self: { libraryHaskellDepends = [ attoparsec base bytestring network unix ]; - description = "Parse /proc/net/ tcp,tcp6,udp,udp6"; + description = "Parse /proc/net/{tcp,tcp6,udp,udp6}"; license = stdenv.lib.licenses.mit; }) {}; @@ -163881,7 +165238,6 @@ self: { libraryHaskellDepends = [ base category ]; description = "Product category"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "product-isomorphic" = callPackage @@ -164030,6 +165386,8 @@ self: { pname = "profunctors"; version = "5.2.2"; sha256 = "0s1pwjidbn761xk43pmzyvn99hm3psdifjd78ylki7f97aiyd0g9"; + revision = "1"; + editedCabalFile = "1g6fvxq2npnyi8wv9mvwy35an68lrm5bf7xmx9x61mbwdxb6d0cg"; libraryHaskellDepends = [ base base-orphans bifunctors comonad contravariant distributive semigroups tagged transformers @@ -164061,7 +165419,6 @@ self: { homepage = "https://github.com/esoeylemez/progress-meter"; description = "Live diagnostics for concurrent activity"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "progress-reporting" = callPackage @@ -164765,7 +166122,6 @@ self: { homepage = "https://github.com/alphaHeavy/protobuf"; description = "Google Protocol Buffers via GHC.Generics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "protobuf-native" = callPackage @@ -165329,7 +166685,6 @@ self: { homepage = "https://github.com/litherum/publicsuffixlist"; description = "Is a given string a domain suffix?"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "publicsuffixlistcreate" = callPackage @@ -165800,7 +167155,6 @@ self: { homepage = "http://www.purescript.org/"; description = "PureScript Programming Language Compiler"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "purescript-bridge" = callPackage @@ -166004,7 +167358,6 @@ self: { ]; description = "Datatypes used by the Pushbullet APIs"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pusher-haskell" = callPackage @@ -166048,7 +167401,6 @@ self: { homepage = "https://github.com/pusher-community/pusher-http-haskell"; description = "Haskell client library for the Pusher HTTP API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pusher-ws" = callPackage @@ -167238,6 +168590,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "quickcheck-instances_0_3_18" = callPackage + ({ mkDerivation, array, base, base-compat, bytestring + , case-insensitive, containers, hashable, old-time, QuickCheck + , scientific, tagged, text, time, transformers, transformers-compat + , unordered-containers, uuid-types, vector + }: + mkDerivation { + pname = "quickcheck-instances"; + version = "0.3.18"; + sha256 = "1bh1pzz5fdcqvzdcirqxna6fnjms02min5md716299g5niz46w55"; + libraryHaskellDepends = [ + array base base-compat bytestring case-insensitive containers + hashable old-time QuickCheck scientific tagged text time + transformers transformers-compat unordered-containers uuid-types + vector + ]; + testHaskellDepends = [ + base containers QuickCheck tagged uuid-types + ]; + homepage = "https://github.com/phadej/qc-instances"; + description = "Common quickcheck instances"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "quickcheck-io" = callPackage ({ mkDerivation, base, HUnit, QuickCheck }: mkDerivation { @@ -167443,7 +168820,6 @@ self: { homepage = "https://github.com/hiratara/hs-string-random#readme"; description = "Helper to build generators with Text.StringRandom"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quickcheck-text" = callPackage @@ -168298,6 +169674,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "rakuten_0_1_1_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, connection, constraints + , data-default-class, extensible, hspec, http-api-data, http-client + , http-client-tls, http-types, lens, req, servant-server, text + , warp + }: + mkDerivation { + pname = "rakuten"; + version = "0.1.1.0"; + sha256 = "13m8rg805aw5rj2a5j16yj06k5ws99ssl89r5s62xlq6lbzhc84c"; + libraryHaskellDepends = [ + aeson base bytestring connection constraints data-default-class + extensible http-api-data http-client http-client-tls http-types + lens req text + ]; + testHaskellDepends = [ + aeson base bytestring connection constraints data-default-class + extensible hspec http-api-data http-client http-client-tls + http-types lens req servant-server text warp + ]; + homepage = "https://github.com/matsubara0507/rakuten#readme"; + description = "The Rakuten API in Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ralist" = callPackage ({ mkDerivation, base, criterion, deepseq, hspec }: mkDerivation { @@ -168602,6 +170004,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "random-string" = callPackage + ({ mkDerivation, base, base16-bytestring, base58-bytestring + , base64-bytestring, bytestring, entropy + }: + mkDerivation { + pname = "random-string"; + version = "0.1.0.1"; + sha256 = "0gmb5i5sykwfr1l4b2isn9j92pzxgalbxkf9dnhs14pj3i6ygl80"; + libraryHaskellDepends = [ + base base16-bytestring base58-bytestring base64-bytestring + bytestring entropy + ]; + description = "Generate a random base 16, 58, or 64 string"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "random-strings" = callPackage ({ mkDerivation, base, containers, mtl, QuickCheck, random }: mkDerivation { @@ -168854,7 +170273,6 @@ self: { homepage = "https://github.com/esoeylemez/rapid-term"; description = "External terminal support for rapid"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rasa" = callPackage @@ -169259,7 +170677,6 @@ self: { homepage = "https://github.com/tfausak/rattletrap#readme"; description = "Parse and generate Rocket League replays"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rattletrap_4_0_5" = callPackage @@ -169511,6 +170928,7 @@ self: { homepage = "https://github.com/masterdezign/rc#readme"; description = "Reservoir Computing, fast RNNs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rclient" = callPackage @@ -169555,7 +170973,6 @@ self: { homepage = "http://github.com/ekmett/rcu/"; description = "Read-Copy-Update for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rdf" = callPackage @@ -169918,7 +171335,7 @@ self: { pname = "reactive-banana-wx"; version = "1.1.1.0"; sha256 = "1yzymc6qpjj8d0fal09vxy2yicbrgrg42khylbbsrzmdgqfnf3kr"; - configureFlags = [ "-f-buildexamples" ]; + configureFlags = [ "-f-buildExamples" ]; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -170532,8 +171949,8 @@ self: { pname = "recursion-schemes"; version = "5.0.2"; sha256 = "1lmayskniljw3lxk64apvshn9h90gwfpflgxilfivsqhrjxnaj9s"; - revision = "1"; - editedCabalFile = "1mmq9dx0dgws4dbmij76snj91dv6czigs1kchi0vy01hplsb0wks"; + revision = "2"; + editedCabalFile = "13l08kal330r1nln13q6qn60mcs0iwcz0hx23na743xllha76nnl"; libraryHaskellDepends = [ base base-orphans bifunctors comonad free semigroups template-haskell transformers transformers-compat @@ -170562,7 +171979,6 @@ self: { homepage = "https://hub.darcs.net/vmchale/recursion-schemes-ext#readme"; description = "Amateur addenda to recursion-schemes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "recursive-line-count" = callPackage @@ -170650,7 +172066,6 @@ self: { homepage = "https://github.com/intolerable/reddit"; description = "Library for interfacing with Reddit's API"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "redis" = callPackage @@ -170762,6 +172177,7 @@ self: { libraryPkgconfigDepends = [ raptor2 redland ]; description = "Redland RDF library bindings"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {raptor2 = null; redland = null;}; "redo" = callPackage @@ -171409,7 +172825,6 @@ self: { homepage = "https://github.com/konn/refresht#readme"; description = "Environment Monad with automatic resource refreshment"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "refty" = callPackage @@ -171799,6 +173214,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "regex-tdfa_1_2_3" = callPackage + ({ mkDerivation, array, base, bytestring, containers, ghc-prim, mtl + , parsec, regex-base + }: + mkDerivation { + pname = "regex-tdfa"; + version = "1.2.3"; + sha256 = "1n80ssz9k73s444b4hda6fhp1vyzg0fc5fvz0309fi9dh6xpxcc9"; + libraryHaskellDepends = [ + array base bytestring containers ghc-prim mtl parsec regex-base + ]; + homepage = "https://github.com/ChrisKuklewicz/regex-tdfa"; + description = "Replaces/Enhances Text.Regex"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "regex-tdfa-pipes" = callPackage ({ mkDerivation, array, base, lens, monads-tf, pipes, regex-base , regex-tdfa @@ -172245,7 +173677,6 @@ self: { homepage = "https://github.com/jwiegley/rehoo"; description = "Rebuild default.hoo from many .hoo files in the current directory"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rei" = callPackage @@ -173318,8 +174749,8 @@ self: { pname = "req"; version = "1.0.0"; sha256 = "1s2yd61pw316llxyap7qwi18vrqxl6hhsmbgr79chjv5g119c087"; - revision = "1"; - editedCabalFile = "18bs1mcr454dgczzv8ahxps5lhba8wgls34cccg5aqdfhglprphk"; + revision = "2"; + editedCabalFile = "08yr09gfpml94ny6jmps2hn13bsb7r37rdn92gr2kmbryb188d1l"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson authenticate-oauth base blaze-builder bytestring @@ -173988,7 +175419,6 @@ self: { homepage = "https://github.com/lessrest/restless-git"; description = "Easy Git repository serialization"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "restricted-workers" = callPackage @@ -174631,7 +176061,6 @@ self: { homepage = "https://github.com/tel/riemann-hs"; description = "A Riemann client for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "riff" = callPackage @@ -174692,7 +176121,6 @@ self: { homepage = "https://github.com/commercialhaskell/rio#readme"; description = "A standard library for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "riot" = callPackage @@ -175190,6 +176618,7 @@ self: { homepage = "http://github.com/serokell/rocksdb-haskell"; description = "Haskell bindings to RocksDB"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) rocksdb;}; "roguestar" = callPackage @@ -175445,7 +176874,6 @@ self: { ]; description = "Query the namecoin blockchain"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rose-trees" = callPackage @@ -175596,7 +177024,6 @@ self: { homepage = "https://github.com/RoboticsHS/rospkg#readme"; description = "ROS package system information"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rosso" = callPackage @@ -175642,7 +177069,6 @@ self: { homepage = "http://github.com/Soostone/rotating-log"; description = "Size-limited, concurrent, automatically-rotating log writer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "roundRobin" = callPackage @@ -176006,7 +177432,6 @@ self: { ]; description = "Streaming parser/renderer for the RSS standard"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rss2irc" = callPackage @@ -176453,7 +177878,6 @@ self: { homepage = "https://github.com/GaloisInc/s-cargot-letbind"; description = "Enables let-binding and let-expansion for s-cargot defined S-expressions"; license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "s-expression" = callPackage @@ -176500,12 +177924,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "safe_0_3_16" = callPackage + "safe_0_3_17" = callPackage ({ mkDerivation, base, deepseq, QuickCheck }: mkDerivation { pname = "safe"; - version = "0.3.16"; - sha256 = "0xar4gh32izxl2a102xpgjrhppin7hqa837pv3fswmlj51cfb2k8"; + version = "0.3.17"; + sha256 = "0p3yaf5slvyz1cyy51jq64c5rlp8yzwim8iy2dlnk42if4gc9ibr"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base deepseq QuickCheck ]; homepage = "https://github.com/ndmitchell/safe#readme"; @@ -176784,7 +178208,6 @@ self: { homepage = "https://github.com/NCrashed/safecopy"; description = "Binary serialization with version control"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "safeint" = callPackage @@ -177545,6 +178968,34 @@ self: { license = stdenv.lib.licenses.lgpl3; }) {}; + "sbp_2_3_9" = callPackage + ({ mkDerivation, aeson, array, base, base64-bytestring + , basic-prelude, binary, binary-conduit, bytestring, conduit + , conduit-extra, data-binary-ieee754, lens, lens-aeson, monad-loops + , resourcet, tasty, tasty-hunit, template-haskell, text, yaml + }: + mkDerivation { + pname = "sbp"; + version = "2.3.9"; + sha256 = "180krzjl9p1apm54qnna9xkj9451kah1ndix7c7g0if492a75qd6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson array base base64-bytestring basic-prelude binary bytestring + data-binary-ieee754 lens lens-aeson monad-loops template-haskell + text + ]; + executableHaskellDepends = [ + aeson base basic-prelude binary-conduit bytestring conduit + conduit-extra resourcet yaml + ]; + testHaskellDepends = [ base basic-prelude tasty tasty-hunit ]; + homepage = "https://github.com/swift-nav/libsbp"; + description = "SwiftNav's SBP Library"; + license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sbp2udp" = callPackage ({ mkDerivation, base, basic-prelude, binary, binary-conduit , bytestring, conduit, conduit-extra, network, optparse-generic @@ -177972,7 +179423,6 @@ self: { ]; description = "Find the ideal lesson layout"; license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "schedyield" = callPackage @@ -178375,8 +179825,8 @@ self: { pname = "scotty"; version = "0.11.0"; sha256 = "1vc6lc8q1cqqq67y78c70sw2jim8ps7bgp85a2gjgwfc6z4h68l9"; - revision = "9"; - editedCabalFile = "0cdvv4qsda5rkdj93400i8n3lzkxmz9xci7i38pri9axmics28qa"; + revision = "10"; + editedCabalFile = "0y0ll3nn3n6n1ry2mvqm1g28a688hpba8kaw30m17p7fnv0m7368"; libraryHaskellDepends = [ aeson base blaze-builder bytestring case-insensitive data-default-class fail http-types monad-control mtl nats network @@ -178536,7 +179986,6 @@ self: { homepage = "https://github.com/taphu/scotty-resource"; description = "A Better way of modeling web resources"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scotty-rest" = callPackage @@ -178874,6 +180323,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) SDL2;}; + "sdl2_2_4_0" = callPackage + ({ mkDerivation, base, bytestring, exceptions, linear, SDL2 + , StateVar, text, transformers, vector + }: + mkDerivation { + pname = "sdl2"; + version = "2.4.0"; + sha256 = "1wnkr4p58yrhzfkn2f2x4km4pnnwb9rmj0r0m0fflx4407cb1hf4"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring exceptions linear StateVar text transformers vector + ]; + librarySystemDepends = [ SDL2 ]; + libraryPkgconfigDepends = [ SDL2 ]; + description = "Both high- and low-level bindings to the SDL library (version 2.0.4+)."; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) SDL2;}; + "sdl2-cairo" = callPackage ({ mkDerivation, base, cairo, linear, sdl2 }: mkDerivation { @@ -179643,8 +181113,8 @@ self: { pname = "semigroupoids"; version = "5.2.1"; sha256 = "006jys6kvckkmbnhf4jc51sh64hamkz464mr8ciiakybrfvixr3r"; - revision = "3"; - editedCabalFile = "0wzcnpz8pyjk823vqnq5s8krsb8i6cw573hcschpd9x5ynq4li70"; + revision = "4"; + editedCabalFile = "0izc33v2n2321hc4ssr1b8fj85i91ca6c99w1qhdqnnp1sank7sk"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base base-orphans bifunctors comonad containers contravariant @@ -179889,7 +181359,6 @@ self: { homepage = "https://github.com/hspec/sensei#readme"; description = "Automatically run Hspec tests on file modifications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sensenet" = callPackage @@ -179999,7 +181468,6 @@ self: { homepage = "https://github.com/qfpl/separated"; description = "A data type with elements separated by values"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "seqaid" = callPackage @@ -180761,7 +182229,6 @@ self: { homepage = "https://github.com/ncrashed/servant-auth-token#readme"; description = "Servant based API and server for token based authorisation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-auth-token-acid" = callPackage @@ -180802,7 +182269,6 @@ self: { homepage = "https://github.com/ncrashed/servant-auth-token-api#readme"; description = "Servant based API for token based authorisation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-auth-token-leveldb" = callPackage @@ -180826,7 +182292,6 @@ self: { homepage = "https://github.com/ncrashed/servant-auth-token#readme"; description = "Leveldb backend for servant-auth-token server"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-auth-token-persistent" = callPackage @@ -180848,7 +182313,6 @@ self: { homepage = "https://github.com/ncrashed/servant-auth-token#readme"; description = "Persistent backend for servant-auth-token server"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-auth-token-rocksdb" = callPackage @@ -181394,7 +182858,6 @@ self: { homepage = "https://github.com/tsani/servant-github-webhook"; description = "Servant combinators to facilitate writing GitHub webhooks"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-haxl-client" = callPackage @@ -181513,6 +182976,33 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "servant-kotlin_0_1_1_0" = callPackage + ({ mkDerivation, aeson, base, containers, directory, formatting + , hspec, http-api-data, lens, servant, servant-foreign, shelly + , text, time, wl-pprint-text + }: + mkDerivation { + pname = "servant-kotlin"; + version = "0.1.1.0"; + sha256 = "14z1vf4mj041ydps7nyfs0bmdpq0vb18xfscsq3i1f5hfr9swj50"; + libraryHaskellDepends = [ + base containers directory formatting lens servant servant-foreign + text time wl-pprint-text + ]; + testHaskellDepends = [ + aeson base containers directory formatting hspec http-api-data lens + servant servant-foreign text time wl-pprint-text + ]; + benchmarkHaskellDepends = [ + aeson base containers directory formatting http-api-data lens + servant servant-foreign shelly text time wl-pprint-text + ]; + homepage = "https://github.com/matsubara0507/servant-kotlin#readme"; + description = "Automatically derive Kotlin class to query servant webservices"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-lucid" = callPackage ({ mkDerivation, base, http-media, lucid, servant }: mkDerivation { @@ -181610,7 +183100,6 @@ self: { homepage = "http://haskell-servant.readthedocs.org/"; description = "Derive a mock server for free from your servant API types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-mock_0_8_4" = callPackage @@ -181851,7 +183340,6 @@ self: { ]; description = "Bindings to the Pushbullet API using servant-client"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-py" = callPackage @@ -181982,7 +183470,6 @@ self: { homepage = "https://github.com/joneshf/servant-ruby#readme"; description = "Generate a Ruby client from a Servant API with Net::HTTP"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-ruby_0_7_0_0" = callPackage @@ -182190,6 +183677,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-static-th_0_2_0_1" = callPackage + ({ mkDerivation, base, blaze-html, bytestring, containers + , directory, doctest, filepath, Glob, hspec-wai, http-media + , semigroups, servant, servant-blaze, servant-server, tasty + , tasty-hspec, tasty-hunit, template-haskell, text, wai + }: + mkDerivation { + pname = "servant-static-th"; + version = "0.2.0.1"; + sha256 = "1np3sh8jcil63kd56smlkcxqg25zsn01s4dx0d1i4cmc610nb33l"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base blaze-html bytestring containers directory filepath http-media + semigroups servant servant-blaze servant-server template-haskell + text + ]; + testHaskellDepends = [ + base blaze-html bytestring directory doctest filepath Glob + hspec-wai servant servant-blaze servant-server tasty tasty-hspec + tasty-hunit wai + ]; + homepage = "https://github.com/cdepillabout/servant-static-th"; + description = "Embed a directory of static files in your Servant server"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-subscriber" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, blaze-builder , bytestring, case-insensitive, containers, directory, filepath @@ -182342,6 +183857,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "servant-xml" = callPackage + ({ mkDerivation, base, bytestring, http-media, servant, xmlbf + , xmlbf-xeno + }: + mkDerivation { + pname = "servant-xml"; + version = "1.0.1"; + sha256 = "09rxvrxxmj62rscvddza8rygx4zv06k975j99yz7ymggmimhwaig"; + libraryHaskellDepends = [ + base bytestring http-media servant xmlbf xmlbf-xeno + ]; + homepage = "https://github.com/fosskers/servant-xml"; + description = "Servant support for the XML Content-Type"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-yaml" = callPackage ({ mkDerivation, aeson, base, base-compat, bytestring, http-media , servant, servant-server, wai, warp, yaml @@ -182468,27 +184000,29 @@ self: { }) {}; "serverless-haskell" = callPackage - ({ mkDerivation, aeson, aeson-casing, amazonka-core - , amazonka-kinesis, amazonka-s3, base, bytestring, hspec - , hspec-discover, lens, raw-strings-qq, text, time, unix + ({ mkDerivation, aeson, aeson-casing, aeson-extra, amazonka-core + , amazonka-kinesis, amazonka-s3, base, bytestring, case-insensitive + , hspec, hspec-discover, lens, raw-strings-qq, text, time, unix , unordered-containers }: mkDerivation { pname = "serverless-haskell"; - version = "0.4.1"; - sha256 = "1r0amp80g3lz31l1hb138dyqfh29nb7f0yq20xzh4hccr600liw1"; + version = "0.4.2"; + sha256 = "1cdpcin060qz5wicf8jqxayi2vjrhapybg401m3rw914s452safw"; libraryHaskellDepends = [ - aeson aeson-casing amazonka-core amazonka-kinesis amazonka-s3 base - bytestring lens text time unix unordered-containers + aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis + amazonka-s3 base bytestring case-insensitive lens text time unix + unordered-containers ]; testHaskellDepends = [ - aeson aeson-casing amazonka-core amazonka-kinesis amazonka-s3 base - bytestring hspec hspec-discover lens raw-strings-qq text time unix - unordered-containers + aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis + amazonka-s3 base bytestring case-insensitive hspec hspec-discover + lens raw-strings-qq text time unix unordered-containers ]; homepage = "https://github.com/seek-oss/serverless-haskell#readme"; description = "Deploying Haskell code onto AWS Lambda using Serverless"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "serversession" = callPackage @@ -182751,6 +184285,8 @@ self: { pname = "sessiontypes"; version = "0.1.2"; sha256 = "1xjf3yjapz9ipjkqhm8fljgbj6fww3iyl1mx1kjwh18s6b9ymq5s"; + revision = "1"; + editedCabalFile = "0qd48i92nn5yhp1lzs5vvvcmq5db785nr736y2yxgi7z4pk80r84"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -182772,6 +184308,8 @@ self: { pname = "sessiontypes-distributed"; version = "0.1.1"; sha256 = "0fi263sdpshzjwc51h9rqgg0zj7f5a6igrfj9487lbdgaz1cb1ya"; + revision = "1"; + editedCabalFile = "0r4xn7p21xwdimzpdd5jqjawds9mhniqzmg84bfipcpm3mwhjq5x"; libraryHaskellDepends = [ base binary bytestring distributed-process distributed-static exceptions rank1dynamic sessiontypes @@ -182782,7 +184320,6 @@ self: { homepage = "https://github.com/Ferdinand-vW/sessiontypes-distributed#readme"; description = "Session types distributed"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "set-cover" = callPackage @@ -183369,15 +184906,15 @@ self: { }) {}; "shake-ats" = callPackage - ({ mkDerivation, base, binary, dependency, directory, hs2ats - , language-ats, microlens, shake, shake-ext, text + ({ mkDerivation, base, binary, dependency, directory, hashable + , hs2ats, language-ats, lens, shake, shake-ext, text }: mkDerivation { pname = "shake-ats"; - version = "1.5.0.7"; - sha256 = "07ipqnzgk7ligq4xsddv7ab5z3gn67vsba6p2lkf9faqhwx91bi9"; + version = "1.5.0.9"; + sha256 = "1fjbdik7a2izl8sbxnv1i36h55df0v7w23pn7ivk1p18mgljc9lf"; libraryHaskellDepends = [ - base binary dependency directory hs2ats language-ats microlens + base binary dependency directory hashable hs2ats language-ats lens shake shake-ext text ]; homepage = "https://github.com/vmchale/shake-ats#readme"; @@ -183404,17 +184941,17 @@ self: { }) {}; "shake-ext" = callPackage - ({ mkDerivation, base, Cabal, composition-prelude, directory, mtl - , shake, template-haskell, text + ({ mkDerivation, base, Cabal, composition-prelude, cpphs, directory + , shake, template-haskell }: mkDerivation { pname = "shake-ext"; - version = "2.7.0.2"; - sha256 = "1r9grv3r06w7ldddn1gq8dbylfi2nnq0xg66ks9z6r0c087l4xp1"; + version = "2.7.0.3"; + sha256 = "0j1558a43bz7jqbbhn0myjwd9nrd6mnn4r26ix5wqhnsgfpxcw1j"; libraryHaskellDepends = [ - base Cabal composition-prelude directory mtl shake template-haskell - text + base Cabal composition-prelude directory shake template-haskell ]; + libraryToolDepends = [ cpphs ]; homepage = "https://hub.darcs.net/vmchale/shake-ext"; description = "Helper functions for linting with shake"; license = stdenv.lib.licenses.bsd3; @@ -183494,7 +185031,6 @@ self: { homepage = "http://cs-syd.eu"; description = "path alternatives to shake functions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shake-persist" = callPackage @@ -183552,8 +185088,8 @@ self: { }: mkDerivation { pname = "shakers"; - version = "0.0.41"; - sha256 = "0djg61fv6g0xskk72a06kva70a6zvdwlsfhdnw6fsk69h0vlidrc"; + version = "0.0.42"; + sha256 = "020j1j5lpl5x0hxgscy1skx1fqw77w184h86rvgkq1kli7pp9kpk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -183563,7 +185099,6 @@ self: { homepage = "https://github.com/swift-nav/shakers"; description = "Shake helpers"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shakespeare" = callPackage @@ -184002,7 +185537,6 @@ self: { homepage = "https://github.com/simonmichael/shelltestrunner"; description = "Easy, repeatable testing of CLI programs/commands"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shelly" = callPackage @@ -184033,6 +185567,36 @@ self: { homepage = "https://github.com/yesodweb/Shelly.hs"; description = "shell-like (systems) programming in Haskell"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "shelly_1_7_1" = callPackage + ({ mkDerivation, async, base, bytestring, containers, directory + , enclosed-exceptions, exceptions, filepath, hspec, HUnit + , lifted-async, lifted-base, monad-control, mtl, process + , system-fileio, system-filepath, text, time, transformers + , transformers-base, unix-compat + }: + mkDerivation { + pname = "shelly"; + version = "1.7.1"; + sha256 = "068gabny23r9qs2fnn5vjyy77zi59c323ypmnmd71w7qwyfa2pl8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base bytestring containers directory enclosed-exceptions + exceptions lifted-async lifted-base monad-control mtl process + system-fileio system-filepath text time transformers + transformers-base unix-compat + ]; + testHaskellDepends = [ + async base bytestring containers directory enclosed-exceptions + exceptions filepath hspec HUnit lifted-async lifted-base + monad-control mtl process system-fileio system-filepath text time + transformers transformers-base unix-compat + ]; + homepage = "https://github.com/yesodweb/Shelly.hs"; + description = "shell-like (systems) programming in Haskell"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -184051,7 +185615,6 @@ self: { homepage = "https://github.com/yesodweb/Shelly.hs"; description = "shelly features that require extra dependencies"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shentong" = callPackage @@ -184595,7 +186158,6 @@ self: { homepage = "http://code.haskell.org/~bkomuves/"; description = "Thom polynomials of second order Thom-Boardman singularities"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sign" = callPackage @@ -184618,7 +186180,6 @@ self: { ]; description = "Arithmetic over signs and sets of signs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "signal" = callPackage @@ -184914,23 +186475,24 @@ self: { }) {}; "simple-effects" = callPackage - ({ mkDerivation, array, base, criterion, exceptions, list-t - , monad-control, MonadRandom, mtl, text, transformers - , transformers-base + ({ mkDerivation, array, async, base, bytestring, criterion + , exceptions, list-t, monad-control, MonadRandom, mtl, text + , transformers, transformers-base }: mkDerivation { pname = "simple-effects"; - version = "0.9.0.1"; - sha256 = "1n5jr909g410zfy0vk4pvl5phy981hhxsx61hcm6p99f0vdybcwx"; + version = "0.10.0.0"; + sha256 = "00hspcdh7si0bykfdyxclklv622izl8jm6nwic4z5j15rmqa62b7"; libraryHaskellDepends = [ - array base exceptions list-t monad-control MonadRandom mtl text - transformers transformers-base + array async base bytestring exceptions list-t monad-control + MonadRandom mtl text transformers transformers-base ]; testHaskellDepends = [ base ]; benchmarkHaskellDepends = [ base criterion mtl transformers ]; homepage = "https://gitlab.com/LukaHorvat/simple-effects"; description = "A simple effect system that integrates with MTL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simple-eval" = callPackage @@ -185097,8 +186659,8 @@ self: { }: mkDerivation { pname = "simple-logging"; - version = "0.2.0.2"; - sha256 = "1a917vvwnzmv9jqrrmk6knv8wfrxwkbal6gxp24a2xkiqcjpgbjw"; + version = "0.2.0.3"; + sha256 = "12ayxv1j2zzql01gka1p8m7pixjh6f87r5hamz3ydcyzn4vrl5j1"; libraryHaskellDepends = [ aeson base bytestring directory exceptions filepath hscolour iso8601-time lens mtl simple-effects string-conv text time uuid @@ -185733,6 +187295,8 @@ self: { pname = "singleton-bool"; version = "0.1.3"; sha256 = "1i29dl0f45rk280qfrcjcfbkshb7h3y0s2ndw2d7drwlcbl4p2if"; + revision = "1"; + editedCabalFile = "0wpwwqgrfgzi6cf4j1jpxwi8b30s80zch2xzcgzcmjmaai7kgc1n"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/phadej/singleton-bool#readme"; description = "Type level booleans"; @@ -185913,7 +187477,6 @@ self: { homepage = "https://github.com/alunduil/siren-json.hs"; description = "Siren Tools for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sirkel" = callPackage @@ -186278,7 +187841,7 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "skylighting_0_7_0_1" = callPackage + "skylighting_0_7_0_2" = callPackage ({ mkDerivation, aeson, ansi-terminal, attoparsec, base , base64-bytestring, binary, blaze-html, bytestring , case-insensitive, colour, containers, directory, filepath, hxt @@ -186287,8 +187850,8 @@ self: { }: mkDerivation { pname = "skylighting"; - version = "0.7.0.1"; - sha256 = "0f1527pjfgmb9dxlgrs2wl0zq9vbxishjm7m3h4gyajk2nfw5dw3"; + version = "0.7.0.2"; + sha256 = "16l7sz5a5g0x9jh6v5v8has37lc29dz142zxkidd6ri25izs5bph"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -186313,8 +187876,8 @@ self: { }: mkDerivation { pname = "skylighting-core"; - version = "0.7.0.1"; - sha256 = "06kfpb49wql0b11c2cqypccw75l5vj1a6dck333p6bds2xbk83qn"; + version = "0.7.0.2"; + sha256 = "0j35rsrbnmarhnwqyd8ap64h7yjkqyc1faj599hfyymmy1vqahyf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -186493,8 +188056,8 @@ self: { }: mkDerivation { pname = "slate"; - version = "0.8.0.0"; - sha256 = "096v0aai5c7adpa5y15yscs6w8c7c0vz667a0ibr33m0rmnyiqlm"; + version = "0.8.1.0"; + sha256 = "1dzk9xcif3g14qqksj7h343ka3b19fcgijbnhmivpgjdgychkyk2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -186682,8 +188245,8 @@ self: { pname = "slug"; version = "0.1.7"; sha256 = "1pkxcb2ip4mb6szmqz3g7m3m8qfrvknjr5ii0wnd0icbzm1q4vyp"; - revision = "1"; - editedCabalFile = "0xy0zcrnfpdbkhks15p1g2zxl7zmfb0b5511mfcsvzxl9q8salf6"; + revision = "2"; + editedCabalFile = "0kvx1igj6fs9wrwkh68m19f5pxw1x46d489zgj6f5ah5w8wfxp2h"; libraryHaskellDepends = [ aeson base exceptions http-api-data path-pieces persistent QuickCheck text @@ -186729,7 +188292,6 @@ self: { ]; description = "Flatten camel case text in LaTeX files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "smallcheck" = callPackage @@ -186934,6 +188496,7 @@ self: { homepage = "https://github.com/jrclogic/SMCDEL"; description = "Symbolic Model Checking for Dynamic Epistemic Logic"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sme" = callPackage @@ -186994,6 +188557,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "smoothie_0_4_2_8" = callPackage + ({ mkDerivation, aeson, base, linear, text, vector }: + mkDerivation { + pname = "smoothie"; + version = "0.4.2.8"; + sha256 = "0fy0rygg2r73zfcgxmamlz1xfbpfxbljxcwjx9rnp0c8v9aq2m2s"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ aeson base linear text vector ]; + homepage = "https://github.com/phaazon/smoothie"; + description = "Smooth curves via several interpolation modes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "smsaero" = callPackage ({ mkDerivation, aeson, base, containers, http-api-data , http-client, servant, servant-client, servant-docs, text, time @@ -187393,7 +188970,6 @@ self: { homepage = "https://github.com/ocharles/snap-cors"; description = "Add CORS headers to Snap applications"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snap-elm" = callPackage @@ -187617,7 +189193,6 @@ self: { homepage = "http://snapframework.com/"; description = "Scaffolding CLI for the Snap Framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snap-testing" = callPackage @@ -188717,7 +190292,6 @@ self: { homepage = "http://hub.darcs.net/dag/snowball"; description = "Bindings to the Snowball library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snowflake" = callPackage @@ -188939,7 +190513,6 @@ self: { ]; homepage = "http://github.com/ocharles/engine.io"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "socket-sctp" = callPackage @@ -189664,6 +191237,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "sparse-linear-algebra_0_2_9_7" = callPackage + ({ mkDerivation, base, containers, exceptions, hspec + , matrix-market-attoparsec, mtl, mwc-random, primitive, QuickCheck + , scientific, transformers, vector, vector-algorithms, vector-space + }: + mkDerivation { + pname = "sparse-linear-algebra"; + version = "0.2.9.7"; + sha256 = "0sskv1bbn1q19jh508wk1d898jwzlsf7662v4crrppmb6k6cq1zq"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base containers exceptions mtl transformers vector + vector-algorithms vector-space + ]; + testHaskellDepends = [ + base containers exceptions hspec matrix-market-attoparsec mtl + mwc-random primitive QuickCheck scientific vector-space + ]; + homepage = "https://github.com/ocramz/sparse-linear-algebra"; + description = "Numerical computation in native Haskell"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sparse-linear-algebra" = callPackage ({ mkDerivation, base, containers, exceptions, hspec , matrix-market-attoparsec, mtl, mwc-random, primitive, QuickCheck @@ -189999,7 +191596,6 @@ self: { homepage = "https://github.com/gregwebs/haskell-sphinx-client"; description = "Haskell bindings to the Sphinx full-text searching daemon"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sphinx-cli" = callPackage @@ -190708,24 +192304,24 @@ self: { }) {inherit (pkgs) openssl;}; "sqlcli" = callPackage - ({ mkDerivation, base, transformers }: + ({ mkDerivation, base, logging, text, transformers }: mkDerivation { pname = "sqlcli"; - version = "0.1.0.0"; - sha256 = "1xkq7pjvmhb4gc85val4fnd6jsbx7dmybq842r40vdbbxj8swh5v"; - libraryHaskellDepends = [ base transformers ]; + version = "0.2.0.0"; + sha256 = "164p1frqcazzhcwd1b5n1y890nigai79s1qg8vkailfvnzdxffvq"; + libraryHaskellDepends = [ base logging text transformers ]; homepage = "http://hub.darcs.net/mihaigiurgeanu/sqlcli"; description = "Sql Call-Level Interface bindings for Haskell"; license = stdenv.lib.licenses.bsd3; }) {}; "sqlcli-odbc" = callPackage - ({ mkDerivation, base, sqlcli }: + ({ mkDerivation, base, logging, sqlcli }: mkDerivation { pname = "sqlcli-odbc"; - version = "0.1.0.1"; - sha256 = "176jz0y435rdg1cg03a9aa2jd1a26gi5id9d3fbm91wv6fyjj6lm"; - libraryHaskellDepends = [ base sqlcli ]; + version = "0.2.0.0"; + sha256 = "1zq1rgj32w72arhplqfiygflg8gablpm1alppd3y03wki1gnrd95"; + libraryHaskellDepends = [ base logging sqlcli ]; homepage = "https://hub.darcs.com/mihaigiurgeanu/sqlcli-odbc"; description = "Specific ODBC definitions to be used by SQL CLI clients"; license = stdenv.lib.licenses.bsd3; @@ -190886,7 +192482,6 @@ self: { homepage = "http://functionalley.eu/Squeeze/squeeze.html"; description = "A file-packing application"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sr-extra" = callPackage @@ -191272,8 +192867,8 @@ self: { pname = "stache"; version = "1.2.1"; sha256 = "0fqipjyin2hpklm0gaab4qhcfj9gzkpb2g948sqzf1n6alkxvyvb"; - revision = "1"; - editedCabalFile = "18h31a8bd7v96lc9q0ai7sblnxg3y55s1053jqdixi3y7lz3jh79"; + revision = "3"; + editedCabalFile = "0r7qx7h3lz6v5fvfkky7crw5ms8vszx0d8xlkr94xa9n7mxbndh3"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers deepseq directory filepath @@ -191928,19 +193523,22 @@ self: { }) {}; "stagen" = callPackage - ({ mkDerivation, aeson, base, blaze-html, bytestring, data-default - , directory, filemanip, lucid, markdown, mtl, optparse-applicative - , parallel, parsec, text + ({ mkDerivation, aeson, base, base-compat, blaze-html, bytestring + , data-default, directory, feed, filemanip, json-feed, lucid + , markdown, mtl, network-uri, optparse-applicative, parallel + , parsec, text, text-conversions, time, xml, xml-conduit, xml-types }: mkDerivation { pname = "stagen"; - version = "0.1.0"; - sha256 = "0cd0639ms4vcdvjvhn8l0893d5nv51kzg3ky0xd9bnmjr8f0wpzm"; + version = "0.2.1"; + sha256 = "14gyak2gg05xbrx93bl1x7jfy2rwmzczpvip7h21bysqk964rh8j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base blaze-html bytestring data-default directory filemanip - lucid markdown mtl optparse-applicative parallel parsec text + aeson base base-compat blaze-html bytestring data-default directory + feed filemanip json-feed lucid markdown mtl network-uri + optparse-applicative parallel parsec text text-conversions time xml + xml-conduit xml-types ]; executableHaskellDepends = [ base ]; description = "Static site generator"; @@ -192355,6 +193953,7 @@ self: { homepage = "https://github.com/dzhus/static-text#readme"; description = "Lists, Texts, ByteStrings and Vectors of statically known length"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "staticanalysis" = callPackage @@ -192379,6 +193978,8 @@ self: { pname = "statistics"; version = "0.14.0.2"; sha256 = "0y27gafkib0x0fn39qfn2rkgsfrm09ng35sbb5dwr7rclhnxz59l"; + revision = "1"; + editedCabalFile = "0gg7hq8qvbnhp7lnrykh401ggr51izffylgdmy6nip2a81q9dxi0"; libraryHaskellDepends = [ aeson base base-orphans binary deepseq erf math-functions monad-par mwc-random primitive vector vector-algorithms @@ -192543,8 +194144,8 @@ self: { }: mkDerivation { pname = "staversion"; - version = "0.2.1.2"; - sha256 = "01ag624x240ybnapc49vcsiw5kz4n1v3csn1572phdav6dlpap35"; + version = "0.2.1.3"; + sha256 = "1sd36j3f7s8dlz2g6w1yir19yys4pn28arw4nlpknpm7dzm6vs1g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -192560,7 +194161,6 @@ self: { homepage = "https://github.com/debug-ito/staversion"; description = "What version is the package X in stackage lts-Y.ZZ?"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stb-image" = callPackage @@ -192586,7 +194186,6 @@ self: { homepage = "https://github.com/typedrat/stb-image-redux#readme"; description = "Image loading and writing microlibrary"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stb-truetype" = callPackage @@ -192797,8 +194396,8 @@ self: { }: mkDerivation { pname = "stitch"; - version = "0.4.0.0"; - sha256 = "0xxdj4k4ci0gkvnnvb1rl0v31pjv209yyz88dzpdpr5x58i19hbj"; + version = "0.5.0.0"; + sha256 = "0dk9h9arldzwsfg8cad374w7lipi4w43ady7dsmima4jyg4724h9"; libraryHaskellDepends = [ base containers text transformers ]; testHaskellDepends = [ base Cabal hspec text ]; benchmarkHaskellDepends = [ base criterion ]; @@ -192831,11 +194430,14 @@ self: { }) {}; "stm-chans" = callPackage - ({ mkDerivation, base, stm }: + ({ mkDerivation, base, Cabal, stm }: mkDerivation { pname = "stm-chans"; version = "3.0.0.4"; sha256 = "0f27sp09yha43xk9q55sc185jyjs5h7gq2dhsyx6bm9kz9dzqi13"; + revision = "1"; + editedCabalFile = "0v9axxcfszqdmf3dhjxy34ybh22x3r5c48mdnbvjh5i5lp7g7vp2"; + setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base stm ]; homepage = "http://code.haskell.org/~wren/"; description = "Additional types of channels for STM"; @@ -193473,15 +195075,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stratosphere_0_17_0" = callPackage + "stratosphere_0_18_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , hashable, hspec, hspec-discover, lens, template-haskell, text , unordered-containers }: mkDerivation { pname = "stratosphere"; - version = "0.17.0"; - sha256 = "1824fgv3jm25wa3sk53v7j76jpq8kqh9fm3jfpp8hlzwnb57zni9"; + version = "0.18.0"; + sha256 = "0av7ys8ysmcx51qzf9lw6pg8bn6jixm440ahds56ayxam57q4ix5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -193691,6 +195293,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "streaming_0_2_1_0" = callPackage + ({ mkDerivation, base, containers, ghc-prim, mmorph, mtl + , semigroups, transformers, transformers-base + }: + mkDerivation { + pname = "streaming"; + version = "0.2.1.0"; + sha256 = "0xah2cn12dxqc54wa5yxx0g0b9n0xy0czc0c32awql63qhw5w7g1"; + libraryHaskellDepends = [ + base containers ghc-prim mmorph mtl semigroups transformers + transformers-base + ]; + homepage = "https://github.com/haskell-streaming/streaming"; + description = "an elementary streaming prelude and general stream type"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "streaming-binary" = callPackage ({ mkDerivation, base, binary, bytestring, hspec, streaming , streaming-bytestring @@ -193751,7 +195371,6 @@ self: { ]; description = "Cassava support for the streaming ecosystem"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "streaming-commons" = callPackage @@ -193838,7 +195457,6 @@ self: { testHaskellDepends = [ base conduit hspec streaming ]; description = "Bidirectional support between the streaming and conduit libraries"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "streaming-eversion" = callPackage @@ -193923,6 +195541,7 @@ self: { homepage = "https://github.com/fosskers/streaming-pcap"; description = "Stream packets via libpcap"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "streaming-png" = callPackage @@ -193961,7 +195580,6 @@ self: { ]; description = "Stream postgresql-query results using the streaming library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "streaming-utils" = callPackage @@ -194420,12 +196038,15 @@ self: { }) {}; "string-qq" = callPackage - ({ mkDerivation, base, template-haskell }: + ({ mkDerivation, base, Cabal, process, template-haskell }: mkDerivation { pname = "string-qq"; version = "0.0.2"; sha256 = "0662m3i5xrdrr95w829bszkhp88mj9iy1zya54vk2sl5hz9wlmwp"; + revision = "1"; + editedCabalFile = "1flc6mr1nnv8mx69cy1ilwk5gxsidcns82vjdg8dcs8z5axg95kp"; enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal process ]; libraryHaskellDepends = [ base template-haskell ]; description = "QuasiQuoter for non-interpolated strings, texts and bytestrings"; license = stdenv.lib.licenses.publicDomain; @@ -194589,7 +196210,6 @@ self: { ]; description = "Implements the \"StringPrep\" algorithm"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "strings" = callPackage @@ -194874,6 +196494,8 @@ self: { pname = "structs"; version = "0.1.1"; sha256 = "0hdajhvd6i81dchdyd42fa17pm53jd7g3irqjfardbbmjx0sqq6z"; + revision = "1"; + editedCabalFile = "16ws2j3bhwawf6z1ipraiz73yvg65dg5l7hvj1lgbrqvn5lqizj3"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base deepseq ghc-prim primitive template-haskell @@ -195050,7 +196672,6 @@ self: { ]; description = "RFC 5389: Session Traversal Utilities for NAT (STUN) client"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stunts" = callPackage @@ -195104,26 +196725,26 @@ self: { }) {}; "stylish-cabal" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, Cabal, containers, deepseq - , hlint, hspec, hspec-core, hspec-expectations-pretty-diff - , optparse-applicative, split + ({ mkDerivation, ansi-wl-pprint, base, base-compat, bytestring + , Cabal, containers, data-default, deepseq, haddock-library, hspec + , hspec-core, microlens, microlens-th, mtl, optparse-applicative + , split, template-haskell, utf8-string }: mkDerivation { pname = "stylish-cabal"; - version = "0.2.0.0"; - sha256 = "1ldnr0bpl0iaflng2715j02wfk8ksigzms15v7118860wyw2mvyi"; + version = "0.4.0.0"; + sha256 = "1357yrnzyc7rhd98dz33m84yckzs2djrlv8dmh5a2p97s31gcp03"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-wl-pprint base Cabal deepseq split + ansi-wl-pprint base base-compat Cabal containers data-default + deepseq haddock-library hspec hspec-core microlens microlens-th mtl + split template-haskell utf8-string ]; executableHaskellDepends = [ - ansi-wl-pprint base optparse-applicative - ]; - testHaskellDepends = [ - ansi-wl-pprint base Cabal containers hlint hspec hspec-core - hspec-expectations-pretty-diff + base base-compat bytestring optparse-applicative ]; + testHaskellDepends = [ base base-compat bytestring hspec ]; description = "Format Cabal files"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -195417,7 +197038,6 @@ self: { homepage = "https://github.com/nomeata/haskell-successors"; description = "An applicative functor to manage successors"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "suffix-array" = callPackage @@ -195910,6 +197530,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "sv" = callPackage + ({ mkDerivation, ansi-wl-pprint, attoparsec, base, bifunctors + , bytestring, charset, containers, contravariant, deepseq, hedgehog + , lens, mtl, parsec, parsers, profunctors, readable, semigroupoids + , semigroups, tasty, tasty-hedgehog, tasty-hunit, text + , transformers, trifecta, utf8-string, validation, vector, void + }: + mkDerivation { + pname = "sv"; + version = "0.1"; + sha256 = "0rd4jf4qqfc66xxddvaa37fjmpmmjzb7n928gclds0xibzm9ls7s"; + libraryHaskellDepends = [ + ansi-wl-pprint attoparsec base bifunctors bytestring charset + containers contravariant deepseq lens mtl parsec parsers + profunctors readable semigroupoids semigroups text transformers + trifecta utf8-string validation vector void + ]; + testHaskellDepends = [ + ansi-wl-pprint base bytestring contravariant hedgehog lens parsers + semigroupoids semigroups tasty tasty-hedgehog tasty-hunit text + trifecta utf8-string validation vector + ]; + homepage = "https://github.com/qfpl/sv"; + description = "Encode and decode separated values (CSV, PSV, ...)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "svg-builder" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, hashable, text , unordered-containers @@ -196279,6 +197927,33 @@ self: { license = "LGPL"; }) {}; + "swish_0_9_2_0" = callPackage + ({ mkDerivation, base, containers, directory, filepath, hashable + , HUnit, intern, mtl, network-uri, old-locale, polyparse + , semigroups, test-framework, test-framework-hunit, text, time + }: + mkDerivation { + pname = "swish"; + version = "0.9.2.0"; + sha256 = "0lgd71qa4fs9zzrapi0mkgsdlip5kxjkhz1v1xj6ifaaq8f2f8jp"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base containers directory filepath hashable intern mtl network-uri + old-locale polyparse semigroups text time + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base containers hashable HUnit network-uri old-locale semigroups + test-framework test-framework-hunit text time + ]; + homepage = "https://bitbucket.org/doug_burke/swish/wiki/Home"; + description = "A semantic web toolkit"; + license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sws" = callPackage ({ mkDerivation, base, bytestring, cryptonite, directory, filepath , hourglass, http-types, network, resourcet, transformers, wai @@ -196458,7 +198133,6 @@ self: { ]; description = "Library for Typed Tagless-Final Higher-Order Composable DSL"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "symantic-document" = callPackage @@ -196486,7 +198160,6 @@ self: { ]; description = "Library for symantic grammars"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "symantic-lib" = callPackage @@ -196944,7 +198617,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Synthesizer"; description = "Control synthesizer effects via ALSA/MIDI"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "synthesizer-core" = callPackage @@ -197095,7 +198767,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Synthesizer"; description = "Render audio signals from MIDI files or realtime messages"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sys-auth-smbclient" = callPackage @@ -197196,6 +198867,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "system-error" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "system-error"; + version = "1.0.0"; + sha256 = "1hig7m7arrj6hmgix8abkidy6wf1a4a4y72k81csq90kv5jhynxk"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/heroin-moose/system-error"; + description = "Error reporting functions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "system-extra" = callPackage ({ mkDerivation, base, bytestring, directory, hspec, process , QuickCheck @@ -197815,7 +199498,6 @@ self: { homepage = "http://github.com/travitch/taffybar"; description = "A desktop bar similar to xmobar, but with more GUI"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {gtk2 = pkgs.gnome2.gtk;}; "tag-bits" = callPackage @@ -198510,6 +200192,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tar_0_5_1_0" = callPackage + ({ mkDerivation, array, base, bytestring, bytestring-handle + , containers, criterion, deepseq, directory, filepath, QuickCheck + , tasty, tasty-quickcheck, time + }: + mkDerivation { + pname = "tar"; + version = "0.5.1.0"; + sha256 = "0s2brvaxg5fki2jdkccmnpssiy6a3wjh24p6a3dkkdvjcixnk7f8"; + libraryHaskellDepends = [ + array base bytestring containers deepseq directory filepath time + ]; + testHaskellDepends = [ + array base bytestring bytestring-handle containers deepseq + directory filepath QuickCheck tasty tasty-quickcheck time + ]; + benchmarkHaskellDepends = [ + array base bytestring containers criterion deepseq directory + filepath time + ]; + description = "Reading, writing and manipulating \".tar\" archive files."; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tar-conduit" = callPackage ({ mkDerivation, base, bytestring, conduit-combinators }: mkDerivation { @@ -198720,14 +200427,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "tasty_1_0_1" = callPackage + "tasty_1_0_1_1" = callPackage ({ mkDerivation, ansi-terminal, async, base, clock, containers, mtl , optparse-applicative, stm, tagged, unbounded-delays, unix }: mkDerivation { pname = "tasty"; - version = "1.0.1"; - sha256 = "1jf53dd7ilwqfj27ndx2dgs76a7s0saakqxm9cr6bb42a0jnzqij"; + version = "1.0.1.1"; + sha256 = "1czfvgm3wb9dlxccr7h49929m6rag7rc6q5hlj9yw0l4lm0hv4hs"; libraryHaskellDepends = [ ansi-terminal async base clock containers mtl optparse-applicative stm tagged unbounded-delays unix @@ -198790,12 +200497,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "tasty-dejafu_1_0_1_1" = callPackage + "tasty-dejafu_1_1_0_1" = callPackage ({ mkDerivation, base, dejafu, random, tagged, tasty }: mkDerivation { pname = "tasty-dejafu"; - version = "1.0.1.1"; - sha256 = "0khdm4v22n86vz3qgv9wi6yfd3yi61br089sxffhfwvr9g3fxjlf"; + version = "1.1.0.1"; + sha256 = "0yqaplhwdyfg2wddz0yhzy6c7akpkhi0nkm62171wxfapzpjbbrk"; libraryHaskellDepends = [ base dejafu random tagged tasty ]; homepage = "https://github.com/barrucadu/dejafu"; description = "Deja Fu support for the Tasty test framework"; @@ -199839,12 +201546,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "template-haskell_2_12_0_0" = callPackage + "template-haskell_2_13_0_0" = callPackage ({ mkDerivation, base, ghc-boot-th, pretty }: mkDerivation { pname = "template-haskell"; - version = "2.12.0.0"; - sha256 = "0lbmqagknkdrj9mwqdd5p12ay78wk0g509g75a243jrbm46i6dar"; + version = "2.13.0.0"; + sha256 = "0j61d0xnlsywgn33k72a6dmnp9i93zjn0gba1fhxs9qwdb1xcfk3"; libraryHaskellDepends = [ base ghc-boot-th pretty ]; description = "Support library for Template Haskell"; license = stdenv.lib.licenses.bsd3; @@ -201071,7 +202778,6 @@ self: { ]; description = "Create tests and benchmarks together"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "testing-feat" = callPackage @@ -201330,6 +203036,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "text-all_0_4_2" = callPackage + ({ mkDerivation, base, bytestring, text, text-format, utf8-string + }: + mkDerivation { + pname = "text-all"; + version = "0.4.2"; + sha256 = "0mh2dwd0b732jcg2bak04iwrb34cy28hq2dppb8pp5r5a0g4925g"; + libraryHaskellDepends = [ + base bytestring text text-format utf8-string + ]; + homepage = "http://github.com/aelve/text-all"; + description = "Everything Data.Text related in one package"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "text-and-plots" = callPackage ({ mkDerivation, base, blaze-html, bytestring, containers, markdown , text, unordered-containers @@ -201523,7 +203245,6 @@ self: { homepage = "https://github.com/bos/text-icu"; description = "Bindings to the ICU library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) icu;}; "text-icu-normalized" = callPackage @@ -201567,7 +203288,6 @@ self: { ]; description = "ICU transliteration"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) icu;}; "text-json-qq" = callPackage @@ -201603,6 +203323,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "text-latin1_0_3_1" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, data-checked + , hashable, semigroups, text + }: + mkDerivation { + pname = "text-latin1"; + version = "0.3.1"; + sha256 = "1wxbv6m567n3330baw2k0xxd50nhn2k6w3lgmpk6zq7x1jp84x3c"; + libraryHaskellDepends = [ + base bytestring case-insensitive data-checked hashable semigroups + text + ]; + homepage = "https://github.com/mvv/text-latin1"; + description = "Latin-1 (including ASCII) utility functions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "text-ldap" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers, dlist , memory, QuickCheck, quickcheck-simple, random, transformers @@ -201719,8 +203457,8 @@ self: { pname = "text-metrics"; version = "0.3.0"; sha256 = "18mzxwkdvjp31r720ai9bnxr638qq8x3a2v408bz0d8f0rsayx1q"; - revision = "1"; - editedCabalFile = "0jl0vlx9y0n7x4j5zspx6zmbbnmlf5p2bg6v9k2afdfc02fmhasm"; + revision = "2"; + editedCabalFile = "1371qwwmq8w4p6zg0z43qnrpf9yb8yadnw97ka56mx4jlagrdm8n"; libraryHaskellDepends = [ base containers text vector ]; testHaskellDepends = [ base hspec QuickCheck text ]; benchmarkHaskellDepends = [ base criterion deepseq text weigh ]; @@ -201830,7 +203568,6 @@ self: { ]; description = "Easy replacement when using text-icu regexes"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-region" = callPackage @@ -201946,8 +203683,8 @@ self: { pname = "text-show"; version = "3.7.1"; sha256 = "0gbf3cpxz92v4jphmwvz93il7m38qkwirfnk5453517k2s84s899"; - revision = "1"; - editedCabalFile = "1f30i7b45hq3m1hb7b6m8kc1fwz4i697m17wwiabjsyzbx4qiv98"; + revision = "3"; + editedCabalFile = "1bc2ja8yciymck9bhydwhxqvdscdvj584k25bvm6hgjqy847bz2c"; libraryHaskellDepends = [ array base base-compat bifunctors bytestring bytestring-builder containers contravariant generic-deriving ghc-boot-th ghc-prim @@ -201973,6 +203710,45 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "text-show_3_7_2" = callPackage + ({ mkDerivation, array, base, base-compat, base-orphans, bifunctors + , bytestring, bytestring-builder, containers, contravariant + , criterion, deepseq, deriving-compat, generic-deriving + , ghc-boot-th, ghc-prim, hspec, hspec-discover, integer-gmp, nats + , QuickCheck, quickcheck-instances, semigroups, tagged + , template-haskell, text, th-abstraction, th-lift, transformers + , transformers-compat, void + }: + mkDerivation { + pname = "text-show"; + version = "3.7.2"; + sha256 = "0gb7y83w81zvfi7szb62d17w0qi7ca7ybri81adqk141c3cxc83s"; + libraryHaskellDepends = [ + array base base-compat bifunctors bytestring bytestring-builder + containers contravariant generic-deriving ghc-boot-th ghc-prim + integer-gmp nats semigroups tagged template-haskell text + th-abstraction th-lift transformers transformers-compat void + ]; + testHaskellDepends = [ + array base base-compat base-orphans bifunctors bytestring + bytestring-builder containers contravariant deriving-compat + generic-deriving ghc-boot-th ghc-prim hspec integer-gmp nats + QuickCheck quickcheck-instances semigroups tagged template-haskell + text th-lift transformers transformers-compat void + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + array base base-compat bifunctors bytestring bytestring-builder + containers contravariant criterion deepseq generic-deriving + ghc-boot-th ghc-prim integer-gmp nats semigroups tagged + template-haskell text th-lift transformers transformers-compat void + ]; + homepage = "https://github.com/RyanGlScott/text-show"; + description = "Efficient conversion of values into Text"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "text-show-instances" = callPackage ({ mkDerivation, base, base-compat, bifunctors, binary, bytestring , containers, directory, generic-deriving, ghc-boot-th, ghc-prim @@ -202148,7 +203924,6 @@ self: { homepage = "https://github.com/qfpl/text1"; description = "Non-empty values of `Data.Text`."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "textPlot" = callPackage @@ -202690,7 +204465,6 @@ self: { homepage = "https://github.com/pikajude/th-printf"; description = "Compile-time printf"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "th-reify-compat" = callPackage @@ -202976,8 +204750,8 @@ self: { pname = "these"; version = "0.7.4"; sha256 = "0jl8ippnsy5zmy52cvpn252hm2g7xqp1zb1xcrbgr00pmdxpvwyw"; - revision = "5"; - editedCabalFile = "1jx0p6z91nz5dagw4bcvb7lr9a15ahjnx0nhyv8cmd8p056m5515"; + revision = "6"; + editedCabalFile = "16dglq7aj28ag4h11m4ym8lm3jjq5kx3y0bycbhqm4q9xpnwfvfb"; libraryHaskellDepends = [ aeson base bifunctors binary containers data-default-class deepseq hashable keys mtl profunctors QuickCheck semigroupoids transformers @@ -203209,7 +204983,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/ThreadScope"; description = "A graphical tool for profiling parallel Haskell programs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "threefish" = callPackage @@ -205625,6 +207398,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {toxcore = null;}; + "toxiproxy-haskell" = callPackage + ({ mkDerivation, aeson, base, containers, hspec, http-client + , process, servant, servant-client, silently, text, time + }: + mkDerivation { + pname = "toxiproxy-haskell"; + version = "0.2.1.0"; + sha256 = "0c0xrl2ynk3b31ja4bh2pfmf8zhb4fxlazj7l07477f1yws7vqla"; + libraryHaskellDepends = [ + aeson base containers http-client servant servant-client text + ]; + testHaskellDepends = [ + base containers hspec http-client process servant servant-client + silently time + ]; + homepage = "https://github.com/jpittis/toxiproxy-haskell#readme"; + description = "Client library for Toxiproxy: a TCP failure testing proxy"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "toysolver" = callPackage ({ mkDerivation, array, base, bytestring, bytestring-builder, clock , containers, criterion, data-default, data-default-class @@ -205675,7 +207469,6 @@ self: { homepage = "https://github.com/msakai/toysolver/"; description = "Assorted decision procedures for SAT, SMT, Max-SAT, PB, MIP, etc"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tpar" = callPackage @@ -205858,6 +207651,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "trackit" = callPackage + ({ mkDerivation, base, brick, fsnotify, mtl, optparse-generic + , process, process-extras, stm, text, time, vty + }: + mkDerivation { + pname = "trackit"; + version = "0.1"; + sha256 = "0dcf3h140pwvyrfb0x6b4brp9bpr2p1krd1pvl014jvqak4q2q7d"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base brick fsnotify mtl optparse-generic process process-extras stm + text time vty + ]; + description = "A command-line tool for live monitoring"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "tracy" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -205949,6 +207760,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "transfer-db" = callPackage + ({ mkDerivation, aeson, base, bytestring, cassava, clock + , console-program, containers, cpu, hspec, logging, monad-control + , QuickCheck, sqlcli, sqlcli-odbc, stm, store, store-core + , temporary, text, th-utilities, time, transformers, yaml + }: + mkDerivation { + pname = "transfer-db"; + version = "0.3.1.0"; + sha256 = "0gmgn78p0gfpm8iqkziz50yrx59lkj6m11lnawyfi55dxjjcwqgf"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring clock containers logging monad-control sqlcli + sqlcli-odbc stm store store-core temporary text th-utilities time + transformers + ]; + executableHaskellDepends = [ + aeson base bytestring cassava clock console-program containers + logging monad-control sqlcli sqlcli-odbc stm time transformers yaml + ]; + testHaskellDepends = [ + base bytestring cpu hspec QuickCheck sqlcli store time transformers + ]; + homepage = "http://hub.darcs.net/mihaigiurgeanu/transfer-db"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "transformations" = callPackage ({ mkDerivation, base, containers, criterion, mtl, multirec, parsec , QuickCheck, regular, template-haskell @@ -206148,6 +207988,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "transformers-fix" = callPackage + ({ mkDerivation, base, transformers }: + mkDerivation { + pname = "transformers-fix"; + version = "1.0"; + sha256 = "02aapq88k81q9r6wmvmg9zjyrmz9qzi4gss75p18lkc4dgrzzlb5"; + libraryHaskellDepends = [ base transformers ]; + homepage = "https://github.com/thumphries/transformers-fix"; + description = "Monad transformer for evaluating to a fixpoint"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "transformers-free" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -207248,7 +209100,6 @@ self: { homepage = "https://github.com/entropia/tip-toi-reveng"; description = "Working with files for the Tiptoi® pen"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tubes" = callPackage @@ -207487,7 +209338,6 @@ self: { homepage = "https://github.com/sanjorgek/turingMachine"; description = "An implementation of Turing Machine and Automaton"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "turkish-deasciifier" = callPackage @@ -207626,7 +209476,6 @@ self: { homepage = "http://github.com/nick8325/twee"; description = "An equational theorem prover"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "twee-lib" = callPackage @@ -208529,9 +210378,10 @@ self: { ({ mkDerivation, base, containers, template-haskell }: mkDerivation { pname = "type-interpreter"; - version = "0.0.0"; - sha256 = "1nma1zrk11p5i6xbnsnlhb9h0xvixq784lymbb6i3ijabl4v2ksg"; + version = "0.1.0"; + sha256 = "1s9w9sml4crnd40vly0fvfbf2n0cgyv0fdqfsh66n2x5ymsvqp4x"; libraryHaskellDepends = [ base containers template-haskell ]; + testHaskellDepends = [ base template-haskell ]; description = "Interpreter for Template Haskell types"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -208700,7 +210550,6 @@ self: { homepage = "https://github.com/Lysxia/type-map"; description = "Type-indexed maps"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "type-natural" = callPackage @@ -209485,8 +211334,8 @@ self: { }: mkDerivation { pname = "udbus"; - version = "0.2.1"; - sha256 = "0a7kksh99nll91q41z4xgrcwc8pnfm0p71bxw6yymcd7yb0v09fk"; + version = "0.2.3"; + sha256 = "1ifl280n2ib26j4h7h46av6k7ms0j1n2wy4shbqk5xli5bbj3k9n"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -209497,7 +211346,6 @@ self: { homepage = "http://github.com/vincenthz/hs-udbus"; description = "Small DBus implementation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "udbus-model" = callPackage @@ -209512,7 +211360,6 @@ self: { homepage = "http://github.com/vincenthz/hs-udbus"; description = "Model API for udbus introspection and definitions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "udcode" = callPackage @@ -209642,8 +211489,8 @@ self: { pname = "uhttpc"; version = "0.1.1.0"; sha256 = "1knf8r8zq8nnidmbj1blazjxkpngczs55jjx0phnnxlc026ppynb"; - revision = "2"; - editedCabalFile = "02fzrhc3599am6nm9prm6q4anmwlgzjc2wx3hqf027z9i65zfhdq"; + revision = "3"; + editedCabalFile = "1s35m2mrcaamj0293yb78ya185fzm71zdx0jq62im7rc5fdhfiry"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -209855,6 +211702,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "unbound-generics_0_3_2" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, containers, contravariant + , criterion, deepseq, exceptions, mtl, profunctors, QuickCheck + , tasty, tasty-hunit, tasty-quickcheck, template-haskell + , transformers, transformers-compat + }: + mkDerivation { + pname = "unbound-generics"; + version = "0.3.2"; + sha256 = "1g691ijcn7yxmn7w0zmd4h9w8nr578jifg3yhlyckka2jm97f20g"; + libraryHaskellDepends = [ + ansi-wl-pprint base containers contravariant deepseq exceptions mtl + profunctors template-haskell transformers transformers-compat + ]; + testHaskellDepends = [ + base mtl QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ base criterion deepseq ]; + homepage = "http://github.com/lambdageek/unbound-generics"; + description = "Support for programming with names and binders using GHC Generics"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "unbounded-delays" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -210443,7 +212314,6 @@ self: { homepage = "http://hub.darcs.net/thielema/unique-logic/"; description = "Solve simple simultaneous equations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unique-logic-tf" = callPackage @@ -210463,7 +212333,6 @@ self: { homepage = "http://hub.darcs.net/thielema/unique-logic-tf/"; description = "Solve simple simultaneous equations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uniqueid" = callPackage @@ -210541,7 +212410,6 @@ self: { homepage = "https://github.com/goldfirere/units"; description = "A domain-specific type system for dimensional analysis"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "units-attoparsec" = callPackage @@ -210571,7 +212439,6 @@ self: { homepage = "http://github.com/goldfirere/units-defs"; description = "Definitions for use with the units package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "units-parser" = callPackage @@ -210984,8 +212851,8 @@ self: { }: mkDerivation { pname = "unjson"; - version = "0.15.0.0"; - sha256 = "0ib7y7a4ham90hzy5anrhry7c1w8c847v39ygjj8556pq6j47nyg"; + version = "0.15.1.0"; + sha256 = "1k61lak22snr7fimpr7pjri33rg0gm1hhfn253bwlz3pvpn85vmp"; libraryHaskellDepends = [ aeson attoparsec base bytestring containers free hashable invariant pretty primitive scientific text time unordered-containers vector @@ -211101,6 +212968,8 @@ self: { pname = "unordered-containers"; version = "0.2.8.0"; sha256 = "1a7flszhhgyjn0nm9w7cm26jbf6vyx9ij1iij4sl11pjkwsqi8d4"; + revision = "1"; + editedCabalFile = "0bllj6rg1ab468ilxzhnafjx2qzqx1bshlf207rk9yhszw801awj"; libraryHaskellDepends = [ base deepseq hashable ]; testHaskellDepends = [ base ChasingBottoms containers hashable HUnit QuickCheck @@ -211587,6 +213456,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "uri-bytestring-aeson_0_1_0_5" = callPackage + ({ mkDerivation, aeson, base, bytestring, text, uri-bytestring }: + mkDerivation { + pname = "uri-bytestring-aeson"; + version = "0.1.0.5"; + sha256 = "1rcy3afmm1faapnw5y4pbxn4m0h2bp2pa51g3r8lh6gffk1xi9x3"; + libraryHaskellDepends = [ + aeson base bytestring text uri-bytestring + ]; + homepage = "https://github.com/reactormonk/uri-bytestring-aeson"; + description = "Aeson instances for URI Bytestring"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "uri-conduit" = callPackage ({ mkDerivation, base, bytestring, conduit, containers, deepseq , failure, monad-control, network, system-fileio, system-filepath @@ -211843,7 +213727,6 @@ self: { ]; description = "Painfully simple URL deployment"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "urlpath_8_0_1" = callPackage @@ -212261,7 +214144,6 @@ self: { homepage = "https://github.com/UU-ComputerScience/uu-cco"; description = "Utilities for compiler construction: example programs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uu-cco-hut-parsing" = callPackage @@ -212274,7 +214156,6 @@ self: { homepage = "https://github.com/UU-ComputerScience/uu-cco"; description = "Utilities for compiler construction: Feedback wrapper around parser in uulib"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uu-cco-uu-parsinglib" = callPackage @@ -212360,7 +214241,6 @@ self: { homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome"; description = "Attribute Grammar System of Universiteit Utrecht"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uuagc-bootstrap" = callPackage @@ -212384,7 +214264,6 @@ self: { homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome"; description = "Attribute Grammar System of Universiteit Utrecht"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uuagc-cabal" = callPackage @@ -212401,7 +214280,6 @@ self: { homepage = "https://github.com/UU-ComputerScience/uuagc"; description = "Cabal plugin for UUAGC"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uuagc-diagrams" = callPackage @@ -212565,7 +214443,6 @@ self: { homepage = "https://github.com/UU-ComputerScience/uulib"; description = "Haskell Utrecht Tools Library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uvector" = callPackage @@ -213577,6 +215454,8 @@ self: { pname = "vector-binary-instances"; version = "0.2.4"; sha256 = "1y236jb72iab9ska1mc48z6yb0xgwmj45laaqdyjxksd84z7hbrb"; + revision = "1"; + editedCabalFile = "196frl4akhfk7xf1nxzn8lmq99dxhzhsimanswn9yy7ym8zhki4i"; libraryHaskellDepends = [ base binary vector ]; testHaskellDepends = [ base binary tasty tasty-quickcheck vector ]; benchmarkHaskellDepends = [ @@ -213965,7 +215844,6 @@ self: { homepage = "https://github.com/fosskers/vectortiles"; description = "GIS Vector Tiles, as defined by Mapbox"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vectortiles_1_3_0" = callPackage @@ -213978,6 +215856,8 @@ self: { pname = "vectortiles"; version = "1.3.0"; sha256 = "1hvnk2b3g6dm58az7wyl8bcq4h8s0fkz0v0pig9gpad5smkmgjk0"; + revision = "1"; + editedCabalFile = "04h85s069i8sgh382h0j4vx6zlx15yi3q7xmb7pnq8vhfamszsaq"; libraryHaskellDepends = [ base bytestring containers deepseq hashable protocol-buffers protocol-buffers-descriptor text transformers unordered-containers @@ -214125,8 +216005,8 @@ self: { }: mkDerivation { pname = "vgrep"; - version = "0.2.1.0"; - sha256 = "0k74bpi995wqxmin6h7bx3yjiwh403c708yjp19igbw1971irxjr"; + version = "0.2.2.0"; + sha256 = "11kcf59c1raqj4mwwjhr9435sqilgxgmryq1kimgra2j64ldyl3k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -214144,7 +216024,6 @@ self: { homepage = "http://github.com/fmthoma/vgrep#readme"; description = "A pager for grep"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vhd" = callPackage @@ -214220,6 +216099,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "viewprof_0_0_0_14" = callPackage + ({ mkDerivation, base, brick, containers, directory, ghc-prof, lens + , scientific, text, vector, vector-algorithms, vty + }: + mkDerivation { + pname = "viewprof"; + version = "0.0.0.14"; + sha256 = "19x112bpc7fw3dqfpgp0bi6cw01vr8csfyqixi68128ij3b6csm0"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base brick containers directory ghc-prof lens scientific text + vector vector-algorithms vty + ]; + homepage = "https://github.com/maoe/viewprof"; + description = "Text-based interactive GHC .prof viewer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "views" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { @@ -214457,7 +216356,6 @@ self: { homepage = "https://github.com/marcinmrotek/vinyl-utils"; description = "Utilities for vinyl"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vinyl-vectors" = callPackage @@ -214821,6 +216719,8 @@ self: { pname = "vty"; version = "5.19.2"; sha256 = "158afcgzcwq7ybjw7jk28q799xzpns47m1l4sivc3wrrfklqh7xz"; + revision = "1"; + editedCabalFile = "16xg3m7rfg9rf2z9q0ns7f3gyi1acyw21d3bvr6fy4b9v1ngxsdq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -214856,6 +216756,8 @@ self: { pname = "vty"; version = "5.20"; sha256 = "0l9xlk4z8xlkd7qzhzkj4l0qb2gwl27mabr2hhkpz3yfv7z6j0a3"; + revision = "1"; + editedCabalFile = "01awxbjxls9v9jh7d7mic7lzmaabsx8g9lqks8fbrjixhka321fl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -214975,6 +216877,7 @@ self: { homepage = "https://github.com/achirkin/genvulkan#readme"; description = "Low-level low-overhead vulkan api bindings"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {vulkan = null;}; "wacom-daemon" = callPackage @@ -215257,7 +217160,6 @@ self: { homepage = "https://github.com/singpolyma/wai-digestive-functors"; description = "Helpers to bind digestive-functors onto wai requests"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-dispatch" = callPackage @@ -216240,7 +218142,6 @@ self: { ]; description = "Route different middleware responses based on the incoming HTTP verb"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-predicates" = callPackage @@ -216353,7 +218254,6 @@ self: { homepage = "https://ajnsit.github.io/wai-routes/"; description = "Typesafe URLs for Wai applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-routing" = callPackage @@ -216800,7 +218700,6 @@ self: { homepage = "http://github.com/bgamari/warc"; description = "A parser for the Web Archive (WARC) format"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "warp" = callPackage @@ -216816,6 +218715,8 @@ self: { pname = "warp"; version = "3.2.13"; sha256 = "0964l8xcbdqnrz0mnk0b732n66i7q8grwzzax96mqbh15ps5nfcj"; + revision = "1"; + editedCabalFile = "0i8x4hv5j5l3lz2m0abxik05xq1lzcilw8mhw5f5paiar6csqmg7"; libraryHaskellDepends = [ array async auto-update base blaze-builder bytestring bytestring-builder case-insensitive containers ghc-prim hashable @@ -216839,7 +218740,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "warp_3_2_17" = callPackage + "warp_3_2_18" = callPackage ({ mkDerivation, array, async, auto-update, base, blaze-builder , bytestring, case-insensitive, containers, directory, doctest , gauge, ghc-prim, hashable, hspec, http-client, http-date @@ -216849,8 +218750,8 @@ self: { }: mkDerivation { pname = "warp"; - version = "3.2.17"; - sha256 = "1frdwc7icadizbwlp0b1gxq95h9a6ds9cdq9rzqqsn4yq2jcbirb"; + version = "3.2.18"; + sha256 = "0xlwbch06q9mjv36ki79z06n49na48326bawgw1vsz5afcyrlj34"; libraryHaskellDepends = [ array async auto-update base blaze-builder bytestring case-insensitive containers ghc-prim hashable http-date http-types @@ -217270,6 +219171,7 @@ self: { testHaskellDepends = [ base bytestring HUnit network-uri text ]; description = "Composable, reversible, efficient web routing based on invertible invariants and bijections"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "web-mongrel2" = callPackage @@ -217820,7 +219722,6 @@ self: { homepage = "http://github.com/ananthakumaran/webify"; description = "webfont generator"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "webkit" = callPackage @@ -218043,6 +219944,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "websockets-simple_0_1_0" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, every, exceptions + , hspec, monad-control, profunctors, stm, tasty, tasty-hspec + , transformers, wai-transformers, websockets + }: + mkDerivation { + pname = "websockets-simple"; + version = "0.1.0"; + sha256 = "0jxqgnrmchn3sabyz0f2733cgvay0ksasc9qnil9kvj0z3n2h4zz"; + libraryHaskellDepends = [ + aeson async base bytestring every exceptions monad-control + profunctors stm transformers wai-transformers websockets + ]; + testHaskellDepends = [ + aeson async base bytestring every exceptions hspec monad-control + profunctors stm tasty tasty-hspec transformers wai-transformers + websockets + ]; + homepage = "https://github.com/athanclark/websockets-simple#readme"; + description = "Composable websockets clients"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "websockets-snap" = callPackage ({ mkDerivation, base, bytestring, bytestring-builder, io-streams , mtl, snap-core, snap-server, websockets @@ -219087,7 +221012,6 @@ self: { homepage = "https://github.com/swift-nav/wolf"; description = "Amazon Simple Workflow Service Wrapper"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "woot" = callPackage @@ -219213,19 +221137,21 @@ self: { }: mkDerivation { pname = "wordchoice"; - version = "0.1.2.4"; - sha256 = "1y36bkzy7msl0dn0zfji8wh38bark4hn68znichwmashpbaymm3r"; + version = "0.1.2.6"; + sha256 = "16x595vv9fbq6j634a8wqnd1agmzbv09372sc99lq1a997crmq2w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base binary bytestring Chart Chart-diagrams composition-prelude - containers directory Glob lens optparse-applicative pandoc - system-filepath text transformers + containers directory Glob lens pandoc system-filepath text + transformers + ]; + executableHaskellDepends = [ + base binary bytestring containers directory lens + optparse-applicative text ]; - executableHaskellDepends = [ base ]; testHaskellDepends = [ base ]; benchmarkHaskellDepends = [ base criterion pandoc text ]; - homepage = "https://github.com/githubuser/wordchoice#readme"; description = "Get word counts and distributions"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -219865,8 +221791,8 @@ self: { }: mkDerivation { pname = "ws"; - version = "0.0.2"; - sha256 = "1wl6ap3kv90fwi03dd7vi2qmih4irqj2lc25y8x4s2h9ks38qy9w"; + version = "0.0.3"; + sha256 = "01awmbs6dmf9crhp6vvwzh8pjqyjpgjgxzcy62nh52s959snwc9m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -220490,8 +222416,8 @@ self: { ({ mkDerivation, base, containers, mtl, pretty, xml }: mkDerivation { pname = "xcb-types"; - version = "0.8.0"; - sha256 = "02ym42r556ibzh7s937blgmkfpb6bqrgz100vwccyljwrwddzdbd"; + version = "0.9.0"; + sha256 = "14bxm6djq4571w313q0qj3v2mfrb2ji2cy0sgl5fh5bsbk2m5i3g"; libraryHaskellDepends = [ base containers mtl pretty xml ]; homepage = "http://community.haskell.org/~aslatter/code/xcb-types"; description = "Parses XML files used by the XCB project"; @@ -220506,8 +222432,8 @@ self: { }: mkDerivation { pname = "xcffib"; - version = "0.5.1"; - sha256 = "13dpi3g53mj2la9n2igidcnb4376nqkv9z09nx0g2yq6hix7ng8x"; + version = "0.6.0"; + sha256 = "1cwwj68lfz51npkll4w024555rq9ra86xh4j9ksd1fqgadzf4rwn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -220793,12 +222719,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "xhtml_3000_2_2" = callPackage + "xhtml_3000_2_2_1" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "xhtml"; - version = "3000.2.2"; - sha256 = "0z34m5jfvjyzqjr81kk6mp2dyf0iay5zl8xlzwl3k5zdfl5hsz74"; + version = "3000.2.2.1"; + sha256 = "0939kwpinq6l4n3nyvd1gzyl7f83gymw0wzqndlgy1yc7q0nkj2w"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/haskell/xhtml"; description = "An XHTML combinator library"; @@ -221968,7 +223894,7 @@ self: { homepage = "http://xmobar.org"; description = "A Minimalistic Text Based Status Bar"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs.xorg) libXpm; inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXrender; inherit (pkgs) wirelesstools;}; @@ -222129,7 +224055,6 @@ self: { homepage = "https://github.com/xmonad/xmonad-extras"; description = "Third party extensions for xmonad with wacky dependencies"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xmonad-screenshot" = callPackage @@ -222188,7 +224113,6 @@ self: { libraryHaskellDepends = [ base magic mtl random unix xmonad ]; description = "xmonad wallpaper extension"; license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xmonad-windownames" = callPackage @@ -223012,8 +224936,8 @@ self: { pname = "yampa-canvas"; version = "0.2.2"; sha256 = "0g1yvb6snnsbvy2f74lrlqff5zgnvfh2f6r8xdwxi61dk71qsz0n"; - revision = "2"; - editedCabalFile = "1wl5g0mrxkpkdlhjizh7m9z33pdygb460zxjm6qrcy90naywchqj"; + revision = "3"; + editedCabalFile = "1vh3v5hrd1y1m491g4h9p3c767h7kg3ffgi20vrafrg8i0r7hg3w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base blank-canvas stm time Yampa ]; @@ -223057,22 +224981,21 @@ self: { homepage = "https://github.com/ony/yampa-glut"; description = "Connects Yampa and GLUT"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yampa-sdl2" = callPackage - ({ mkDerivation, base, colour, linear, sdl2, sdl2-gfx, StateVar - , stm, text, Yampa + ({ mkDerivation, base, data-memocombinators, linear, sdl2, StateVar + , text, vector, Yampa }: mkDerivation { pname = "yampa-sdl2"; - version = "0.0.3.1"; - sha256 = "07wz2473i9z5rxpi6mb1m19fdps7fxl50hbp60b8ihbf2mck1br7"; + version = "0.1.0.2"; + sha256 = "17wcfb04dvdfcx8s21f36g4s3j3mvxgdfvm468gqqj3d3ks22zgp"; libraryHaskellDepends = [ - base colour linear sdl2 sdl2-gfx StateVar stm text Yampa + base data-memocombinators linear sdl2 StateVar text vector Yampa ]; testHaskellDepends = [ - base colour linear sdl2 sdl2-gfx StateVar stm text Yampa + base data-memocombinators linear sdl2 StateVar text vector Yampa ]; homepage = "https://github.com/Simre1/YampaSDL2#readme"; description = "Yampa and SDL2 made easy"; @@ -223701,6 +225624,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "yesod-auth-fb_1_9_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit, fb, http-conduit + , resourcet, shakespeare, text, time, transformers, unliftio, wai + , yesod-auth, yesod-core, yesod-fb + }: + mkDerivation { + pname = "yesod-auth-fb"; + version = "1.9.0"; + sha256 = "1hj6xb7rv28dz8jzygckqg5m5igy78zx0gpc6zmp7g5j0dvinxg8"; + libraryHaskellDepends = [ + aeson base bytestring conduit fb http-conduit resourcet shakespeare + text time transformers unliftio wai yesod-auth yesod-core yesod-fb + ]; + homepage = "https://github.com/psibi/yesod-auth-fb"; + description = "Authentication backend for Yesod using Facebook"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-auth-hashdb" = callPackage ({ mkDerivation, aeson, base, basic-prelude, bytestring, containers , hspec, http-conduit, http-types, monad-logger, network-uri @@ -223823,7 +225765,6 @@ self: { ]; description = "Very simlple LDAP auth for yesod"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-auth-ldap-native" = callPackage @@ -223881,26 +225822,26 @@ self: { }) {}; "yesod-auth-oauth2" = callPackage - ({ mkDerivation, aeson, authenticate, base, bytestring, hoauth2 - , hspec, http-client, http-conduit, http-types, lifted-base - , microlens, network-uri, random, text, transformers - , uri-bytestring, vector, yesod-auth, yesod-core, yesod-form + ({ mkDerivation, aeson, base, bytestring, errors, hoauth2, hspec + , http-client, http-conduit, http-types, microlens, random + , safe-exceptions, text, transformers, uri-bytestring, yesod-auth + , yesod-core }: mkDerivation { pname = "yesod-auth-oauth2"; - version = "0.3.1"; - sha256 = "0lgn72kvhvxr77243fikkvyd1gz7iw9lw7azvw2cdd6lwgn3p73i"; + version = "0.4.0.1"; + sha256 = "0gwl2inbjzwmxdwx51r30yd32xa17rivzmsdf6jnim5q0gyzdh4j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson authenticate base bytestring hoauth2 http-client http-conduit - http-types lifted-base microlens network-uri random text - transformers uri-bytestring vector yesod-auth yesod-core yesod-form + aeson base bytestring errors hoauth2 http-client http-conduit + http-types microlens random safe-exceptions text transformers + uri-bytestring yesod-auth yesod-core ]; testHaskellDepends = [ base hspec uri-bytestring ]; homepage = "http://github.com/thoughtbot/yesod-auth-oauth2"; description = "OAuth 2.0 authentication plugins"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.mit; }) {}; "yesod-auth-pam" = callPackage @@ -224460,6 +226401,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "yesod-fb_0_5_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit, crypto-api, fb + , http-client-tls, http-conduit, text, wai, yesod-core + }: + mkDerivation { + pname = "yesod-fb"; + version = "0.5.0"; + sha256 = "1ns113f2ylim1b3r2dgwgc65yfy6qxjh9miqfz2fx29fq4250dyy"; + libraryHaskellDepends = [ + aeson base bytestring conduit crypto-api fb http-client-tls + http-conduit text wai yesod-core + ]; + homepage = "https://github.com/psibi/yesod-fb"; + description = "Useful glue functions between the fb library and Yesod"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-form" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html , blaze-markup, byteable, bytestring, containers, data-default @@ -224728,8 +226687,8 @@ self: { }: mkDerivation { pname = "yesod-markdown"; - version = "0.12.2"; - sha256 = "0bakc1znfqpjmm2yw7sd1gsqkq47bpr3alz6d2fp280qdxjb7hsx"; + version = "0.12.3"; + sha256 = "10vnip7yifq3li4jwql5pzrdaqf1z2bb4h99rf1iqzvd3b8mqq30"; libraryHaskellDepends = [ base blaze-html blaze-markup bytestring directory pandoc persistent shakespeare text xss-sanitize yesod-core yesod-form @@ -224738,7 +226697,6 @@ self: { homepage = "http://github.com/pbrisbin/yesod-markdown"; description = "Tools for using markdown in a yesod application"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-media-simple" = callPackage @@ -225093,7 +227051,6 @@ self: { ]; description = "A html documentation generator library for RAML"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-raml-mock" = callPackage @@ -225443,7 +227400,6 @@ self: { libraryHaskellDepends = [ base hamlet persistent yesod ]; description = "Table view for Yesod applications"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-test" = callPackage @@ -226372,8 +228328,8 @@ self: { }: mkDerivation { pname = "yst"; - version = "0.6.0.1"; - sha256 = "03x6f5zvmgppr1hkg0lxrapgnlk9s7i974d1gzscs1nvsi426bqb"; + version = "0.7"; + sha256 = "1dvny64v5v3qrahymn647jsjjdraa0mrkpvmqiwihh8n9xbnq1s7"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -226565,7 +228521,6 @@ self: { homepage = "http://bitbucket.org/iago/z3-haskell"; description = "Bindings for the Z3 Theorem Prover"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {gomp = null; inherit (pkgs) z3;}; "z3-encoding" = callPackage @@ -227307,6 +229262,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) zlib;}; + "zlib_0_6_2" = callPackage + ({ mkDerivation, base, bytestring, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck, zlib + }: + mkDerivation { + pname = "zlib"; + version = "0.6.2"; + sha256 = "1vbzf0awb6zb456xf48za1kl22018646cfzq4frvxgb9ay97vk0d"; + libraryHaskellDepends = [ base bytestring ]; + librarySystemDepends = [ zlib ]; + testHaskellDepends = [ + base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + description = "Compression and decompression in the gzip and zlib formats"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) zlib;}; + "zlib-bindings" = callPackage ({ mkDerivation, base, bytestring, hspec, QuickCheck, zlib }: mkDerivation { diff --git a/pkgs/development/haskell-modules/hie-packages.nix b/pkgs/development/haskell-modules/hie-packages.nix deleted file mode 100644 index 3f08f64b1e1..00000000000 --- a/pkgs/development/haskell-modules/hie-packages.nix +++ /dev/null @@ -1,502 +0,0 @@ -{ pkgs, stdenv, callPackage }: self: -let src = pkgs.fetchFromGitHub - { owner = "haskell"; - repo = "haskell-ide-engine"; - rev = "3ec8e93e9ca751cf282556998851ffa65f32e06b"; - sha256 = "1wzqzvsa39c1cngmmjryqrq4vqdg6d4wp5wdf17vp96ljvz1cczw"; - }; - cabal-helper-src = pkgs.fetchgit - { url = "https://gitlab.com/dxld/cabal-helper.git"; - rev = "4bfc6b916fcc696a5d82e7cd35713d6eabcb0533"; - sha256 = "1a8231as0wdvi0q73ha9lc0qrx23kmcwf910qaicvmdar5p2b15m"; - }; - ghc-dump-tree-src = pkgs.fetchgit - { url = "https://gitlab.com/alanz/ghc-dump-tree.git"; - rev = "50f8b28fda675cca4df53909667c740120060c49"; - sha256 = "0v3r81apdqp91sv7avy7f0s3im9icrakkggw8q5b7h0h4js6irqj"; - }; - ghc-mod-src = pkgs.fetchFromGitHub - { owner = "wz1000"; - repo = "ghc-mod"; - rev = "03c91ea53b6389e7a1fcf4e471171aa3d6c8de41"; - sha256 = "11iic93klsh5izp8v4mhl7vnnlib821cfhdymlpg4drx7zbm9il6"; - }; - HaRe-src = pkgs.fetchgit - { url = "https://gitlab.com/alanz/HaRe.git"; - rev = "e325975450ce89d790ed3f92de3ef675967d9538"; - sha256 = "0z7r3l4j5a1brz7zb2rgd985m58rs0ki2p59y1l9i46fcy8r9y4g"; - }; - cabal-helper = self.cabal-helper_hie; - haddock-library = self.haddock-library_1_4_4; - hoogle = self.hoogle_5_0_14; - ghc-dump-tree = self.ghc-dump-tree_hie; - ghc-mod = self.ghc-mod_hie; - HaRe = self.HaRe_hie; -in - { ### Overrides required by hie - cabal-helper_hie = callPackage - ({ mkDerivation, base, bytestring, Cabal, cabal-install, containers - , directory, exceptions, filepath, ghc-prim, mtl, process - , semigroupoids, template-haskell, temporary, transformers - , unix, unix-compat, utf8-string - }: - mkDerivation { - pname = "cabal-helper"; - version = "0.8.0.0"; - src = cabal-helper-src; - isLibrary = true; - isExecutable = true; - jailbreak = true; - setupHaskellDepends = [ base Cabal directory filepath ]; - libraryHaskellDepends = [ - base Cabal directory filepath ghc-prim mtl process semigroupoids - transformers unix unix-compat - ]; - executableHaskellDepends = [ - base bytestring Cabal containers directory exceptions filepath - ghc-prim mtl process template-haskell temporary transformers unix - unix-compat utf8-string - ]; - testHaskellDepends = [ - base bytestring Cabal directory exceptions filepath ghc-prim mtl - process template-haskell temporary transformers unix unix-compat - utf8-string - ]; - testToolDepends = [ cabal-install ]; - postInstall = - '' - libexec="$out/libexec/$(basename $out/lib/ghc*/*ghc*)/$name" - mkdir -p "$libexec" - ln -sv $out/bin/cabal-helper-wrapper "$libexec" - ''; - doCheck = false; - description = "Simple interface to some of Cabal's configuration state, mainly used by ghc-mod"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - ghc-dump-tree_hie = callPackage - ({ mkDerivation, aeson, base, bytestring, ghc, optparse-applicative - , pretty, pretty-show, process, unordered-containers - , vector - }: - mkDerivation { - pname = "ghc-dump-tree"; - version = "0.2.0.1"; - src = ghc-dump-tree-src; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring ghc pretty pretty-show process - unordered-containers vector - ]; - executableHaskellDepends = [ - aeson base bytestring ghc optparse-applicative pretty pretty-show - process unordered-containers vector - ]; - homepage = "https://github.com/edsko/ghc-dump-tree"; - description = "Dump GHC's parsed, renamed, and type checked ASTs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - ghc-mod-core = callPackage - ({ mkDerivation, base, binary, bytestring, Cabal, cabal-helper - , containers, deepseq, directory, djinn-ghc, extra, fclabels - , filepath, fingertree, ghc, ghc-boot, ghc-paths, ghc-syb-utils - , haskell-src-exts, hlint, monad-control, monad-journal, mtl - , old-time, optparse-applicative, pipes, process, safe, semigroups - , split, syb, template-haskell, temporary, text, time - , transformers, transformers-base - }: - mkDerivation { - pname = "ghc-mod-core"; - version = "5.9.0.0"; - src = "${ghc-mod-src}/core"; - setupHaskellDepends = [ - base Cabal containers directory filepath process template-haskell - transformers - ]; - libraryHaskellDepends = [ - base binary bytestring cabal-helper containers deepseq directory - djinn-ghc extra fclabels filepath fingertree ghc ghc-boot ghc-paths - ghc-syb-utils haskell-src-exts hlint monad-control monad-journal - mtl old-time optparse-applicative pipes process safe semigroups - split syb template-haskell temporary text time transformers - transformers-base - ]; - homepage = "https://github.com/DanielG/ghc-mod"; - description = "Happy Haskell Hacking"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) { inherit cabal-helper; }; - ghc-mod_hie = callPackage - ({ mkDerivation, base, binary, bytestring, Cabal, cabal-doctest - , cabal-helper, containers, criterion, deepseq, directory - , djinn-ghc, doctest, extra, fclabels, filepath, ghc, ghc-boot - , ghc-mod-core, ghc-paths, ghc-syb-utils, haskell-src-exts, hlint - , hspec, monad-control, monad-journal, mtl, old-time - , optparse-applicative, pipes, process, safe, semigroups, shelltest - , split, syb, template-haskell, temporary, text, time - , transformers, transformers-base - }: - mkDerivation { - pname = "ghc-mod"; - version = "5.9.0.0"; - src = ghc-mod-src; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - setupHaskellDepends = [ - base Cabal cabal-doctest containers directory filepath process - template-haskell transformers - ]; - libraryHaskellDepends = [ - base binary bytestring cabal-helper containers deepseq directory - djinn-ghc extra fclabels filepath ghc ghc-boot ghc-mod-core - ghc-paths ghc-syb-utils haskell-src-exts hlint monad-control - monad-journal mtl old-time optparse-applicative pipes process safe - semigroups split syb template-haskell temporary text time - transformers transformers-base - ]; - executableHaskellDepends = [ - base binary deepseq directory fclabels filepath ghc ghc-mod-core - monad-control mtl old-time optparse-applicative process semigroups - split time - ]; - testHaskellDepends = [ - base cabal-helper containers directory doctest fclabels filepath - ghc ghc-boot ghc-mod-core hspec monad-journal mtl process split - temporary transformers - ]; - testToolDepends = [ shelltest ]; - # Doesn't work with our doctest - doCheck = false; - benchmarkHaskellDepends = [ - base criterion directory filepath ghc-mod-core temporary - ]; - homepage = "https://github.com/DanielG/ghc-mod"; - description = "Happy Haskell Hacking"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) { shelltest = null; inherit cabal-helper; }; - HaRe_hie = callPackage - ({ mkDerivation, attoparsec, base, base-prelude, Cabal, cabal-helper - , case-insensitive, containers, conversion - , conversion-case-insensitive, conversion-text, Diff, directory - , filepath, foldl, ghc, ghc-exactprint, ghc-mod-core, ghc-syb-utils - , gitrev, hslogger, hspec, HUnit, monad-control, mtl - , optparse-applicative, optparse-simple, parsec, stdenv - , Strafunski-StrategyLib, syb, syz, turtle - }: - mkDerivation { - pname = "HaRe"; - version = "0.8.4.1"; - src = HaRe-src; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base cabal-helper containers directory filepath ghc ghc-exactprint - ghc-mod-core ghc-syb-utils hslogger monad-control mtl - Strafunski-StrategyLib syb syz - ]; - executableHaskellDepends = [ - base Cabal ghc-mod-core gitrev mtl optparse-applicative - optparse-simple - ]; - testHaskellDepends = [ - attoparsec base base-prelude cabal-helper case-insensitive - containers conversion conversion-case-insensitive conversion-text - Diff directory filepath foldl ghc ghc-exactprint ghc-mod-core - ghc-syb-utils hslogger hspec HUnit monad-control mtl parsec - Strafunski-StrategyLib syb syz turtle - ]; - # Test directory doesn't exist - doCheck = false; - homepage = "https://github.com/RefactoringTools/HaRe/wiki"; - description = "the Haskell Refactorer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) { inherit cabal-helper; }; - ### hie packages - haskell-ide-engine = callPackage - ({ mkDerivation, aeson, async, base, bytestring, Cabal, cabal-install - , containers, data-default, Diff, directory, either, ekg, filepath, ghc - , ghc-mod-core, gitrev, haskell-lsp, hie-apply-refact, hie-base - , hie-brittany, hie-build-plugin, hie-eg-plugin-async - , hie-example-plugin2, hie-ghc-mod, hie-ghc-tree, hie-haddock - , hie-hare, hie-hoogle, hie-plugin-api, hoogle, hoogleLocal, hslogger, hspec - , lens, mtl, optparse-simple, QuickCheck, quickcheck-instances - , sorted-list, stm, text, time, transformers - , unordered-containers, vector, vinyl, yaml, yi-rope - }: - mkDerivation { - pname = "haskell-ide-engine"; - version = "0.1.0.0"; - inherit src; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson async base bytestring Cabal containers data-default directory - either filepath ghc ghc-mod-core gitrev haskell-lsp - hie-apply-refact hie-base hie-brittany hie-ghc-mod hie-haddock - hie-hare hie-hoogle hie-plugin-api hslogger lens mtl - optparse-simple sorted-list stm text transformers - unordered-containers vector yi-rope - ]; - executableHaskellDepends = [ - base Cabal containers directory ekg ghc-mod-core gitrev haskell-lsp - hie-apply-refact hie-build-plugin hie-eg-plugin-async - hie-example-plugin2 hie-ghc-mod hie-ghc-tree hie-hare hie-hoogle - hie-plugin-api hslogger optparse-simple stm text time transformers - unordered-containers vinyl - ]; - testHaskellDepends = [ - aeson base containers Diff directory filepath ghc-mod-core - haskell-lsp hie-apply-refact hie-base hie-eg-plugin-async - hie-example-plugin2 hie-ghc-mod hie-ghc-tree hie-hare hie-hoogle - hie-plugin-api hoogle hslogger hspec QuickCheck - quickcheck-instances stm text transformers unordered-containers - vector vinyl yaml - ]; - - preCheck = - '' - export HOME=$NIX_BUILD_TOP/home - mkdir -p $HOME/.hoogle - ln -sv ${hoogleLocal}/share/doc/hoogle/default.hoo $HOME/.hoogle/default-haskell-${hoogle.version}.hoo - ''; - # https://github.com/haskell/haskell-ide-engine/issues/425 - # The disabled tests do work in a local nix-shell with cabal available. - patches = [ ./patches/hie-testsuite.patch ]; - homepage = "http://github.com/githubuser/haskell-ide-engine#readme"; - description = "Provide a common engine to power any Haskell IDE"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) { inherit hoogle; hoogleLocal = (self.hoogleLocal {}).override { inherit hoogle; }; }; - hie-apply-refact = callPackage - ({ mkDerivation, aeson, apply-refact, base, either, extra, ghc-mod - , ghc-mod-core, haskell-src-exts, hie-base, hie-plugin-api, hlint - , text, transformers - }: - mkDerivation { - pname = "hie-apply-refact"; - version = "0.1.0.0"; - inherit src; - postUnpack = "sourceRoot=source/hie-apply-refact"; - libraryHaskellDepends = [ - aeson apply-refact base either extra ghc-mod ghc-mod-core - haskell-src-exts hie-base hie-plugin-api hlint text transformers - ]; - description = "Haskell IDE Apply Refact plugin"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) { inherit ghc-mod; }; - hie-base = callPackage - ({ mkDerivation, aeson, base, haskell-lsp, text }: - mkDerivation { - pname = "hie-base"; - version = "0.1.0.0"; - inherit src; - preUnpack = "sourceRoot=source/hie-base"; - libraryHaskellDepends = [ aeson base haskell-lsp text ]; - description = "Haskell IDE API base types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - hie-brittany = callPackage - ({ mkDerivation, aeson, base, brittany, ghc-mod, ghc-mod-core - , haskell-lsp, hie-plugin-api, lens, text - }: - mkDerivation { - pname = "hie-brittany"; - version = "0.1.0.0"; - inherit src; - postUnpack = "sourceRoot=source/hie-brittany"; - libraryHaskellDepends = [ - aeson base brittany ghc-mod ghc-mod-core haskell-lsp hie-plugin-api - lens text - ]; - description = "Haskell IDE Hoogle plugin"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) { inherit ghc-mod; }; - hie-build-plugin = callPackage - ({ mkDerivation, aeson, base, bytestring, Cabal, cabal-helper - , containers, directory, filepath, haskell-lsp, hie-plugin-api - , process, stm, text, transformers, yaml - }: - mkDerivation { - pname = "hie-build-plugin"; - version = "0.1.0.0"; - inherit src; - postUnpack = "sourceRoot=source/hie-build-plugin"; - libraryHaskellDepends = [ - aeson base bytestring Cabal cabal-helper containers directory - filepath haskell-lsp hie-plugin-api process stm text transformers - yaml - ]; - description = "Haskell IDE build plugin"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) { inherit cabal-helper; }; - hie-eg-plugin-async = callPackage - ({ mkDerivation, base, ghc-mod-core, hie-plugin-api, stm - , text - }: - mkDerivation { - pname = "hie-eg-plugin-async"; - version = "0.1.0.0"; - inherit src; - postUnpack = "sourceRoot=source/hie-eg-plugin-async"; - libraryHaskellDepends = [ - base ghc-mod-core hie-plugin-api stm text - ]; - description = "Haskell IDE example plugin, using async processes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - hie-example-plugin2 = callPackage - ({ mkDerivation, base, hie-plugin-api, text }: - mkDerivation { - pname = "hie-example-plugin2"; - version = "0.1.0.0"; - inherit src; - postUnpack = "sourceRoot=source/hie-example-plugin2"; - libraryHaskellDepends = [ base hie-plugin-api text ]; - description = "Haskell IDE example plugin"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - hie-ghc-mod = callPackage - ({ mkDerivation, aeson, base, containers, ghc, ghc-mod, ghc-mod-core - , hie-base, hie-plugin-api, text, transformers - }: - mkDerivation { - pname = "hie-ghc-mod"; - version = "0.1.0.0"; - inherit src; - postUnpack = "sourceRoot=source/hie-ghc-mod"; - libraryHaskellDepends = [ - aeson base containers ghc ghc-mod ghc-mod-core hie-base - hie-plugin-api text transformers - ]; - description = "Haskell IDE ghc-mod plugin"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) { inherit ghc-mod; }; - hie-ghc-tree = callPackage - ({ mkDerivation, aeson, base, ghc-dump-tree, ghc-mod, ghc-mod-core - , hie-base, hie-plugin-api, text - }: - mkDerivation { - pname = "hie-ghc-tree"; - version = "0.1.0.0"; - inherit src; - postUnpack = "sourceRoot=source/hie-ghc-tree"; - libraryHaskellDepends = [ - aeson base ghc-dump-tree ghc-mod ghc-mod-core hie-base - hie-plugin-api text - ]; - description = "Haskell IDE GHC Tree plugin"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) { inherit ghc-dump-tree ghc-mod; }; - hie-haddock = callPackage - ({ mkDerivation, aeson, base, containers, directory, either - , filepath, ghc, ghc-exactprint, ghc-mod, ghc-mod-core, haddock-api - , haddock-library, HaRe, haskell-lsp, hie-base, hie-ghc-mod - , hie-hare, hie-plugin-api, lens, monad-control, mtl, text - , transformers - }: - mkDerivation { - pname = "hie-haddock"; - version = "0.1.0.0"; - inherit src; - postUnpack = "sourceRoot=source/hie-haddock"; - libraryHaskellDepends = [ - aeson base containers directory either filepath ghc ghc-exactprint - ghc-mod ghc-mod-core haddock-api haddock-library HaRe haskell-lsp - hie-base hie-ghc-mod hie-hare hie-plugin-api lens monad-control mtl - text transformers - ]; - description = "Haskell IDE Haddock plugin"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) { inherit haddock-library HaRe ghc-mod; }; - hie-hare = callPackage - ({ mkDerivation, aeson, base, containers, Diff, either, ghc - , ghc-exactprint, ghc-mod, ghc-mod-core, HaRe, haskell-lsp - , hie-base, hie-ghc-mod, hie-plugin-api, lens, monad-control, mtl - , text, transformers - }: - mkDerivation { - pname = "hie-hare"; - version = "0.1.0.0"; - inherit src; - postUnpack = "sourceRoot=source/hie-hare"; - libraryHaskellDepends = [ - aeson base containers Diff either ghc ghc-exactprint ghc-mod - ghc-mod-core HaRe haskell-lsp hie-base hie-ghc-mod hie-plugin-api - lens monad-control mtl text transformers - ]; - description = "Haskell IDE HaRe plugin"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) { inherit ghc-mod HaRe; }; - hie-hoogle = callPackage - ({ mkDerivation, aeson, base, directory, filepath, ghc-mod - , ghc-mod-core, hie-plugin-api, hoogle, tagsoup, text - }: - mkDerivation { - pname = "hie-hoogle"; - version = "0.1.0.0"; - inherit src; - postUnpack = "sourceRoot=source/hie-hoogle"; - libraryHaskellDepends = [ - aeson base directory filepath ghc-mod ghc-mod-core hie-plugin-api - hoogle tagsoup text - ]; - description = "Haskell IDE Hoogle plugin"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) { inherit ghc-mod hoogle; }; - hie-plugin-api = callPackage - ({ mkDerivation, aeson, base, containers, Diff, directory, either - , filepath, fingertree, ghc, ghc-mod-core, haskell-lsp, hie-base - , hslogger, lifted-base, monad-control, mtl, stdenv, stm, syb, text - , time, transformers, unordered-containers - }: - mkDerivation { - pname = "hie-plugin-api"; - version = "0.1.0.0"; - inherit src; - postUnpack = "sourceRoot=source/hie-plugin-api"; - libraryHaskellDepends = [ - aeson base containers Diff directory either filepath fingertree ghc - ghc-mod-core haskell-lsp hie-base hslogger lifted-base - monad-control mtl stm syb text time transformers - unordered-containers - ]; - description = "Haskell IDE API for plugin communication"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - } diff --git a/pkgs/development/haskell-modules/initial-packages.nix b/pkgs/development/haskell-modules/initial-packages.nix index 8e8712d9096..6ab7da96911 100644 --- a/pkgs/development/haskell-modules/initial-packages.nix +++ b/pkgs/development/haskell-modules/initial-packages.nix @@ -1,2 +1,2 @@ args@{ pkgs, stdenv, callPackage }: self: - (import ./hie-packages.nix args self) // (import ./hackage-packages.nix args self) + (import ./hackage-packages.nix args self) diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 2a96c66dced..57b5ecff9ab 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -107,7 +107,7 @@ let inherit packages; }; - haskellSrc2nix = { name, src, sha256 ? null }: + haskellSrc2nix = { name, src, sha256 ? null, extraCabal2nixOptions ? "" }: let sha256Arg = if isNull sha256 then "--sha256=" else ''--sha256="${sha256}"''; in pkgs.buildPackages.stdenv.mkDerivation { @@ -120,7 +120,7 @@ let installPhase = '' export HOME="$TMP" mkdir -p "$out" - cabal2nix --compiler=${ghc.haskellCompilerName} --system=${stdenv.system} ${sha256Arg} "${src}" > "$out/default.nix" + cabal2nix --compiler=${ghc.haskellCompilerName} --system=${stdenv.system} ${sha256Arg} "${src}" ${extraCabal2nixOptions} > "$out/default.nix" ''; }; @@ -136,13 +136,26 @@ let src = "${component}/${name}.cabal"; }; + # Adds a nix file as an input to the haskell derivation it + # produces. This is useful for callHackage / callCabal2nix to + # prevent the generated default.nix from being garbage collected + # (requiring it to be frequently rebuilt), which can be an + # annoyance. + callPackageKeepDeriver = src: args: + overrideCabal (self.callPackage src args) (orig: { + preConfigure = '' + # Generated from ${src} + ${orig.preConfigure or ""} + ''; + }); + in package-set { inherit pkgs stdenv callPackage; } self // { inherit mkDerivation callPackage haskellSrc2nix hackage2nix; inherit (haskellLib) packageSourceOverrides; - callHackage = name: version: self.callPackage (self.hackage2nix name version); + callHackage = name: version: callPackageKeepDeriver (self.hackage2nix name version); # Creates a Haskell package from a source package by calling cabal2nix on the source. callCabal2nix = name: src: args: let @@ -155,10 +168,8 @@ in package-set { inherit pkgs stdenv callPackage; } self // { then pkgs.lib.cleanSourceWith { inherit src filter; } else src; }; - in overrideCabal (self.callPackage expr args) (orig: { + in overrideCabal (callPackageKeepDeriver expr args) (orig: { inherit src; - preConfigure = - "# Generated from ${expr}\n${orig.preConfigure or ""}"; }); # : { root : Path @@ -188,6 +199,52 @@ in package-set { inherit pkgs stdenv callPackage; } self // { }; in withPackages (packages ++ [ hoogle ]); + # Returns a derivation whose environment contains a GHC with only + # the dependencies of packages listed in `packages`, not the + # packages themselves. Using nix-shell on this derivation will + # give you an environment suitable for developing the listed + # packages with an incremental tool like cabal-install. + # + # # default.nix + # with import {}; + # haskellPackages.extend (haskell.lib.packageSourceOverrides { + # frontend = ./frontend; + # backend = ./backend; + # common = ./common; + # }) + # + # # shell.nix + # (import ./.).shellFor { + # packages = p: [p.frontend p.backend p.common]; + # withHoogle = true; + # } + # + # -- cabal.project + # packages: + # frontend/ + # backend/ + # common/ + # + # bash$ nix-shell --run "cabal new-build all" + shellFor = { packages, withHoogle ? false, ... } @ args: + let + selected = packages self; + packageInputs = builtins.map (p: p.override { mkDerivation = haskellLib.extractBuildInputs p.compiler; }) selected; + haskellInputs = + builtins.filter + (input: pkgs.lib.all (p: input.outPath != p.outPath) selected) + (pkgs.lib.concatMap (p: p.haskellBuildInputs) packageInputs); + systemInputs = pkgs.lib.concatMap (p: p.systemBuildInputs) packageInputs; + withPackages = if withHoogle then self.ghcWithHoogle else self.ghcWithPackages; + mkDrvArgs = builtins.removeAttrs args ["packages" "withHoogle"]; + in pkgs.stdenv.mkDerivation (mkDrvArgs // { + name = "ghc-shell-for-packages"; + nativeBuildInputs = [(withPackages (_: haskellInputs))] ++ mkDrvArgs.nativeBuildInputs or []; + buildInputs = systemInputs ++ mkDrvArgs.buildInputs or []; + phases = ["installPhase"]; + installPhase = "echo $nativeBuildInputs $buildInputs > $out"; + }); + ghc = ghc // { withPackages = self.ghcWithPackages; withHoogle = self.ghcWithHoogle; diff --git a/pkgs/development/idris-modules/README.md b/pkgs/development/idris-modules/README.md index 005ed360285..80b7ccefbcf 100644 --- a/pkgs/development/idris-modules/README.md +++ b/pkgs/development/idris-modules/README.md @@ -1,39 +1 @@ -Idris packages -============== - -This directory contains build rules for idris packages. In addition, -it contains several functions to build and compose those packages. -Everything is exposed to the user via the `idrisPackages` attribute. - -callPackage ------------- - -This is like the normal nixpkgs callPackage function, specialized to -idris packages. - -builtins ---------- - -This is a list of all of the libraries that come packaged with Idris -itself. - -build-idris-package --------------------- - -A function to build an idris package. Its sole argument is a set like -you might pass to `stdenv.mkDerivation`, except `build-idris-package` -sets several attributes for you. See `build-idris-package.nix` for -details. - -build-builtin-package ----------------------- - -A version of `build-idris-package` specialized to builtin libraries. -Mostly for internal use. - -with-packages -------------- - -Bundle idris together with a list of packages. Because idris currently -only supports a single directory in its library path, you must include -all desired libraries here, including `prelude` and `base`. \ No newline at end of file +Moved to [/doc/languages-frameworks/idris.section.md](/doc/languages-frameworks/idris.section.md) diff --git a/pkgs/development/idris-modules/default.nix b/pkgs/development/idris-modules/default.nix index 35ee20e9622..4309039f498 100644 --- a/pkgs/development/idris-modules/default.nix +++ b/pkgs/development/idris-modules/default.nix @@ -50,8 +50,6 @@ lightyear = callPackage ./lightyear.nix {}; - optparse = callPackage ./optparse.nix {}; - wl-pprint = callPackage ./wl-pprint.nix {}; specdris = callPackage ./specdris.nix {}; diff --git a/pkgs/development/idris-modules/wl-pprint.nix b/pkgs/development/idris-modules/wl-pprint.nix index 7e6d77a19a2..9ecf0591805 100644 --- a/pkgs/development/idris-modules/wl-pprint.nix +++ b/pkgs/development/idris-modules/wl-pprint.nix @@ -6,14 +6,14 @@ , idris }: build-idris-package { - pkName = "wl-pprint"; - version = "2016-09-28"; + name = "wl-pprint"; + version = "2017-03-13"; src = fetchFromGitHub { owner = "shayan-najd"; repo = "wl-pprint"; - rev = "4cc88a0865620a3b997863e4167d3b98e1a41b52"; - sha256 = "1yxxh366k5njad75r0xci2q5c554cddvzgrwk43b0xn8rq0vm11x"; + rev = "97590d1679b3db07bb430783988b4cba539e9947"; + sha256 = "0ifp76cqg340jkkzanx69vg76qivv53vh1lzv9zkp5f49prkwl5d"; }; # The tests for this package fail. We should attempt to enable them when diff --git a/pkgs/development/interpreters/erlang/R18.nix b/pkgs/development/interpreters/erlang/R18.nix index 967940ca184..ee524feb4c6 100644 --- a/pkgs/development/interpreters/erlang/R18.nix +++ b/pkgs/development/interpreters/erlang/R18.nix @@ -12,8 +12,8 @@ let }; in mkDerivation rec { - version = "18.3.4.7"; - sha256 = "1l66vzbb1vidrmf6gr84l34kgrpb9k7z2170bac4c6aviah9r02l"; + version = "18.3.4.8"; + sha256 = "16c0h25hh5yvkv436ks5jbd7qmxzb6ndvk64mr404347a20iib0g"; patches = [ rmAndPwdPatch diff --git a/pkgs/development/interpreters/erlang/R19.nix b/pkgs/development/interpreters/erlang/R19.nix index aa8c941eb93..d0ba1912e9a 100644 --- a/pkgs/development/interpreters/erlang/R19.nix +++ b/pkgs/development/interpreters/erlang/R19.nix @@ -1,8 +1,8 @@ { mkDerivation, fetchurl, fetchpatch }: mkDerivation rec { - version = "19.3.6.4"; - sha256 = "1w0h3wj2h58m3jrfgw56xab2352na3i9ccrbpfs4420dn7igf071"; + version = "19.3.6.6"; + sha256 = "05l81gig0hmr951pjvwknc9x2qvpm95ph9z072hn4jqg13rzbgvg"; patches = [ # macOS 10.13 crypto fix from OTP-20.1.2 diff --git a/pkgs/development/interpreters/erlang/R20.nix b/pkgs/development/interpreters/erlang/R20.nix index 8e955349f2d..42aaed0b659 100644 --- a/pkgs/development/interpreters/erlang/R20.nix +++ b/pkgs/development/interpreters/erlang/R20.nix @@ -1,8 +1,8 @@ { mkDerivation, fetchurl }: mkDerivation rec { - version = "20.2.2"; - sha256 = "1cns1qcmmr00nyvcvcj4p4n2gvliyjynlwfqc7qzpkjjnkb7fzl6"; + version = "20.3.2"; + sha256 = "0cd7rz32cxghxb2q7g3p52sxbhwqn4pkjlf28hy1dms6q7f85zv1"; prePatch = '' substituteInPlace configure.in --replace '`sw_vers -productVersion`' '10.10' diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index 1d2b79074fb..6ea3ac73a4b 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -65,9 +65,9 @@ in stdenv.mkDerivation ({ ''; postPatch = '' - ${postPatch} - patchShebangs make + + ${postPatch} ''; preConfigure = '' @@ -88,9 +88,9 @@ in stdenv.mkDerivation ({ # (PDFs are generated only when fop is available). postInstall = '' - ${postInstall} - ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call + + ${postInstall} ''; # Some erlang bin/ scripts run sed and awk diff --git a/pkgs/development/interpreters/gnu-apl/default.nix b/pkgs/development/interpreters/gnu-apl/default.nix index 2f5ce0e7635..599126d2eff 100644 --- a/pkgs/development/interpreters/gnu-apl/default.nix +++ b/pkgs/development/interpreters/gnu-apl/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchurl, readline, gettext, ncurses }: -with stdenv.lib; stdenv.mkDerivation rec { name = "gnu-apl-${version}"; version = "1.7"; @@ -13,9 +12,10 @@ stdenv.mkDerivation rec { buildInputs = [ readline gettext ncurses ]; # Needed with GCC 7 - NIX_CFLAGS_COMPILE = "-Wno-error=int-in-bool-context"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-error=int-in-bool-context" + + stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=null-dereference"; - patchPhase = optionalString stdenv.isDarwin '' + patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace src/LApack.cc --replace "malloc.h" "malloc/malloc.h" ''; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { find $out/share/doc/support-files -name 'Makefile*' -delete ''; - meta = { + meta = with stdenv.lib; { description = "Free interpreter for the APL programming language"; homepage = http://www.gnu.org/software/apl/; license = licenses.gpl3Plus; diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index c13d862267f..ce3ce584434 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -18,11 +18,11 @@ let in stdenv.mkDerivation rec { - version = "4.2.1"; + version = "4.2.2"; name = "octave-${version}"; src = fetchurl { url = "mirror://gnu/octave/${name}.tar.gz"; - sha256 = "0frk0nk3aaic8hj3g45h11rnz3arp7pjsq0frbx50sspk1iqzhl0"; + sha256 = "0vkjfrpv7aikcn73bxqkph1qrhrdx7jqy193n8d8lwp7v2al7f3p"; }; buildInputs = [ gfortran readline ncurses perl flex texinfo qhull diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index e87d4e89a46..edbb26a3bdd 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -353,7 +353,7 @@ in { }; php72 = generic { - version = "7.2.3"; - sha256 = "14mzsp6ysjgc7f6vl0z0j996qf8n75yh0aga121dsr571fn5lwsa"; + version = "7.2.4"; + sha256 = "1wvy8jdd1l5hmdqgw7lq2ynkim3mxfsx8q7vp4il1jadfq6qlr8i"; }; } diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index 61f17a959bd..98e5b4b1da0 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -60,6 +60,8 @@ let ./properly-detect-curses.patch + ] ++ optionals (x11Support && stdenv.isDarwin) [ + ./use-correct-tcl-tk-on-darwin.patch ] ++ optionals stdenv.isLinux [ # Disable the use of ldconfig in ctypes.util.find_library (since @@ -174,7 +176,8 @@ in stdenv.mkDerivation { LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; inherit (mkPaths buildInputs) C_INCLUDE_PATH LIBRARY_PATH; - NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-msse2"; + NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-msse2" + + optionalString hostPlatform.isMusl " -DTHREAD_STACK_SIZE=0x100000"; DETERMINISTIC_BUILD = 1; setupHook = python-setup-hook sitePackages; diff --git a/pkgs/development/interpreters/python/cpython/2.7/use-correct-tcl-tk-on-darwin.patch b/pkgs/development/interpreters/python/cpython/2.7/use-correct-tcl-tk-on-darwin.patch new file mode 100644 index 00000000000..b73f62b97ec --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/2.7/use-correct-tcl-tk-on-darwin.patch @@ -0,0 +1,48 @@ +diff --git a/setup.py b/setup.py +index 2779658..902d0eb 100644 +--- a/setup.py ++++ b/setup.py +@@ -1699,9 +1699,6 @@ class PyBuildExt(build_ext): + # Rather than complicate the code below, detecting and building + # AquaTk is a separate method. Only one Tkinter will be built on + # Darwin - either AquaTk, if it is found, or X11 based Tk. +- if (host_platform == 'darwin' and +- self.detect_tkinter_darwin(inc_dirs, lib_dirs)): +- return + + # Assume we haven't found any of the libraries or include files + # The versions with dots are used on Unix, and the versions without +@@ -1747,22 +1744,6 @@ class PyBuildExt(build_ext): + if dir not in include_dirs: + include_dirs.append(dir) + +- # Check for various platform-specific directories +- if host_platform == 'sunos5': +- include_dirs.append('/usr/openwin/include') +- added_lib_dirs.append('/usr/openwin/lib') +- elif os.path.exists('/usr/X11R6/include'): +- include_dirs.append('/usr/X11R6/include') +- added_lib_dirs.append('/usr/X11R6/lib64') +- added_lib_dirs.append('/usr/X11R6/lib') +- elif os.path.exists('/usr/X11R5/include'): +- include_dirs.append('/usr/X11R5/include') +- added_lib_dirs.append('/usr/X11R5/lib') +- else: +- # Assume default location for X11 +- include_dirs.append('/usr/X11/include') +- added_lib_dirs.append('/usr/X11/lib') +- + # If Cygwin, then verify that X is installed before proceeding + if host_platform == 'cygwin': + x11_inc = find_file('X11/Xlib.h', [], include_dirs) +@@ -1786,10 +1767,6 @@ class PyBuildExt(build_ext): + if host_platform in ['aix3', 'aix4']: + libs.append('ld') + +- # Finally, link with the X11 libraries (not appropriate on cygwin) +- if host_platform != "cygwin": +- libs.append('X11') +- + ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'], + define_macros=[('WITH_APPINIT', 1)] + defs, + include_dirs = include_dirs, diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix index 4c0979ca0e3..797a5be40ff 100644 --- a/pkgs/development/interpreters/python/cpython/3.4/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix @@ -67,6 +67,8 @@ in stdenv.mkDerivation { patches = [ ./no-ldconfig.patch ./ld_library_path.patch + ] ++ optionals (x11Support && stdenv.isDarwin) [ + ./use-correct-tcl-tk-on-darwin.patch ]; postPatch = '' @@ -103,6 +105,9 @@ in stdenv.mkDerivation { ${optionalString stdenv.isDarwin '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2" export MACOSX_DEPLOYMENT_TARGET=10.6 + '' + + optionalString stdenv.hostPlatform.isMusl '' + export NIX_CFLAGS_COMPILE+=" -DTHREAD_STACK_SIZE=0x100000" ''} ''; diff --git a/pkgs/development/interpreters/python/cpython/3.4/use-correct-tcl-tk-on-darwin.patch b/pkgs/development/interpreters/python/cpython/3.4/use-correct-tcl-tk-on-darwin.patch new file mode 100644 index 00000000000..b73f62b97ec --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/3.4/use-correct-tcl-tk-on-darwin.patch @@ -0,0 +1,48 @@ +diff --git a/setup.py b/setup.py +index 2779658..902d0eb 100644 +--- a/setup.py ++++ b/setup.py +@@ -1699,9 +1699,6 @@ class PyBuildExt(build_ext): + # Rather than complicate the code below, detecting and building + # AquaTk is a separate method. Only one Tkinter will be built on + # Darwin - either AquaTk, if it is found, or X11 based Tk. +- if (host_platform == 'darwin' and +- self.detect_tkinter_darwin(inc_dirs, lib_dirs)): +- return + + # Assume we haven't found any of the libraries or include files + # The versions with dots are used on Unix, and the versions without +@@ -1747,22 +1744,6 @@ class PyBuildExt(build_ext): + if dir not in include_dirs: + include_dirs.append(dir) + +- # Check for various platform-specific directories +- if host_platform == 'sunos5': +- include_dirs.append('/usr/openwin/include') +- added_lib_dirs.append('/usr/openwin/lib') +- elif os.path.exists('/usr/X11R6/include'): +- include_dirs.append('/usr/X11R6/include') +- added_lib_dirs.append('/usr/X11R6/lib64') +- added_lib_dirs.append('/usr/X11R6/lib') +- elif os.path.exists('/usr/X11R5/include'): +- include_dirs.append('/usr/X11R5/include') +- added_lib_dirs.append('/usr/X11R5/lib') +- else: +- # Assume default location for X11 +- include_dirs.append('/usr/X11/include') +- added_lib_dirs.append('/usr/X11/lib') +- + # If Cygwin, then verify that X is installed before proceeding + if host_platform == 'cygwin': + x11_inc = find_file('X11/Xlib.h', [], include_dirs) +@@ -1786,10 +1767,6 @@ class PyBuildExt(build_ext): + if host_platform in ['aix3', 'aix4']: + libs.append('ld') + +- # Finally, link with the X11 libraries (not appropriate on cygwin) +- if host_platform != "cygwin": +- libs.append('X11') +- + ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'], + define_macros=[('WITH_APPINIT', 1)] + defs, + include_dirs = include_dirs, diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix index a8519a76a23..6dbf9a09cf5 100644 --- a/pkgs/development/interpreters/python/cpython/3.5/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix @@ -67,6 +67,8 @@ in stdenv.mkDerivation { patches = [ ./no-ldconfig.patch ./ld_library_path.patch + ] ++ optionals (x11Support && stdenv.isDarwin) [ + ./use-correct-tcl-tk-on-darwin.patch ]; postPatch = '' @@ -97,6 +99,9 @@ in stdenv.mkDerivation { ${optionalString stdenv.isDarwin '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2" export MACOSX_DEPLOYMENT_TARGET=10.6 + '' + + optionalString stdenv.hostPlatform.isMusl '' + export NIX_CFLAGS_COMPILE+=" -DTHREAD_STACK_SIZE=0x100000" ''} ''; diff --git a/pkgs/development/interpreters/python/cpython/3.5/use-correct-tcl-tk-on-darwin.patch b/pkgs/development/interpreters/python/cpython/3.5/use-correct-tcl-tk-on-darwin.patch new file mode 100644 index 00000000000..b73f62b97ec --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/3.5/use-correct-tcl-tk-on-darwin.patch @@ -0,0 +1,48 @@ +diff --git a/setup.py b/setup.py +index 2779658..902d0eb 100644 +--- a/setup.py ++++ b/setup.py +@@ -1699,9 +1699,6 @@ class PyBuildExt(build_ext): + # Rather than complicate the code below, detecting and building + # AquaTk is a separate method. Only one Tkinter will be built on + # Darwin - either AquaTk, if it is found, or X11 based Tk. +- if (host_platform == 'darwin' and +- self.detect_tkinter_darwin(inc_dirs, lib_dirs)): +- return + + # Assume we haven't found any of the libraries or include files + # The versions with dots are used on Unix, and the versions without +@@ -1747,22 +1744,6 @@ class PyBuildExt(build_ext): + if dir not in include_dirs: + include_dirs.append(dir) + +- # Check for various platform-specific directories +- if host_platform == 'sunos5': +- include_dirs.append('/usr/openwin/include') +- added_lib_dirs.append('/usr/openwin/lib') +- elif os.path.exists('/usr/X11R6/include'): +- include_dirs.append('/usr/X11R6/include') +- added_lib_dirs.append('/usr/X11R6/lib64') +- added_lib_dirs.append('/usr/X11R6/lib') +- elif os.path.exists('/usr/X11R5/include'): +- include_dirs.append('/usr/X11R5/include') +- added_lib_dirs.append('/usr/X11R5/lib') +- else: +- # Assume default location for X11 +- include_dirs.append('/usr/X11/include') +- added_lib_dirs.append('/usr/X11/lib') +- + # If Cygwin, then verify that X is installed before proceeding + if host_platform == 'cygwin': + x11_inc = find_file('X11/Xlib.h', [], include_dirs) +@@ -1786,10 +1767,6 @@ class PyBuildExt(build_ext): + if host_platform in ['aix3', 'aix4']: + libs.append('ld') + +- # Finally, link with the X11 libraries (not appropriate on cygwin) +- if host_platform != "cygwin": +- libs.append('X11') +- + ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'], + define_macros=[('WITH_APPINIT', 1)] + defs, + include_dirs = include_dirs, diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix index fb58d0871ec..cc8f6228f62 100644 --- a/pkgs/development/interpreters/python/cpython/3.6/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix @@ -27,7 +27,7 @@ with stdenv.lib; let majorVersion = "3.6"; - minorVersion = "4"; + minorVersion = "5"; minorVersionSuffix = ""; pythonVersion = majorVersion; version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; @@ -51,7 +51,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz"; - sha256 = "1fna7g8jxzl4kd2pqmmqhva5724c5m920x3fsrpsgskaylmr76qm"; + sha256 = "19l7inxm056jjw33zz97z0m02hsi7jnnx5kyb76abj5ml4xhad7l"; }; NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s"; @@ -69,6 +69,8 @@ in stdenv.mkDerivation { patches = [ ./no-ldconfig.patch + ] ++ optionals (x11Support && stdenv.isDarwin) [ + ./use-correct-tcl-tk-on-darwin.patch ]; postPatch = '' @@ -120,6 +122,9 @@ in stdenv.mkDerivation { ${optionalString stdenv.isDarwin '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2" export MACOSX_DEPLOYMENT_TARGET=10.6 + '' + + optionalString stdenv.hostPlatform.isMusl '' + export NIX_CFLAGS_COMPILE+=" -DTHREAD_STACK_SIZE=0x100000" ''} ''; diff --git a/pkgs/development/interpreters/python/cpython/3.6/use-correct-tcl-tk-on-darwin.patch b/pkgs/development/interpreters/python/cpython/3.6/use-correct-tcl-tk-on-darwin.patch new file mode 100644 index 00000000000..b73f62b97ec --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/3.6/use-correct-tcl-tk-on-darwin.patch @@ -0,0 +1,48 @@ +diff --git a/setup.py b/setup.py +index 2779658..902d0eb 100644 +--- a/setup.py ++++ b/setup.py +@@ -1699,9 +1699,6 @@ class PyBuildExt(build_ext): + # Rather than complicate the code below, detecting and building + # AquaTk is a separate method. Only one Tkinter will be built on + # Darwin - either AquaTk, if it is found, or X11 based Tk. +- if (host_platform == 'darwin' and +- self.detect_tkinter_darwin(inc_dirs, lib_dirs)): +- return + + # Assume we haven't found any of the libraries or include files + # The versions with dots are used on Unix, and the versions without +@@ -1747,22 +1744,6 @@ class PyBuildExt(build_ext): + if dir not in include_dirs: + include_dirs.append(dir) + +- # Check for various platform-specific directories +- if host_platform == 'sunos5': +- include_dirs.append('/usr/openwin/include') +- added_lib_dirs.append('/usr/openwin/lib') +- elif os.path.exists('/usr/X11R6/include'): +- include_dirs.append('/usr/X11R6/include') +- added_lib_dirs.append('/usr/X11R6/lib64') +- added_lib_dirs.append('/usr/X11R6/lib') +- elif os.path.exists('/usr/X11R5/include'): +- include_dirs.append('/usr/X11R5/include') +- added_lib_dirs.append('/usr/X11R5/lib') +- else: +- # Assume default location for X11 +- include_dirs.append('/usr/X11/include') +- added_lib_dirs.append('/usr/X11/lib') +- + # If Cygwin, then verify that X is installed before proceeding + if host_platform == 'cygwin': + x11_inc = find_file('X11/Xlib.h', [], include_dirs) +@@ -1786,10 +1767,6 @@ class PyBuildExt(build_ext): + if host_platform in ['aix3', 'aix4']: + libs.append('ld') + +- # Finally, link with the X11 libraries (not appropriate on cygwin) +- if host_platform != "cygwin": +- libs.append('X11') +- + ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'], + define_macros=[('WITH_APPINIT', 1)] + defs, + include_dirs = include_dirs, diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index 658c5aebe5c..da271db2ff0 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -5,31 +5,37 @@ with pythonPackages; -stdenv.mkDerivation { - name = "renpy-6.99.12.4"; +stdenv.mkDerivation rec { + name = "renpy-${version}"; + version = "6.99.14"; - meta = { + meta = with stdenv.lib; { description = "Ren'Py Visual Novel Engine"; homepage = http://renpy.org/; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; - # This is an ancient version, last updated in 2014 (3d59f42ce); it fails to - # build with the most recent pygame version, and fails to run with 1.9.1. - broken = true; + license = licenses.mit; + platforms = platforms.linux; }; src = fetchurl { - url = "http://www.renpy.org/dl/6.99.12.4/renpy-6.99.12.4-source.tar.bz2"; - sha256 = "035342rr39zp7krp08z0xhcl73gqbqyilshgmljq0ynfrxxckn35"; + url = "https://www.renpy.org/dl/${version}/renpy-${version}-source.tar.bz2"; + sha256 = "00r1l9rd9wj8zfh279n7sak894xxhxqp3rcwg41g0md8yfiysc4h"; }; + patches = [ + ./launcherenv.patch + ]; + + postPatch = '' + substituteInPlace launcher/game/choose_directory.rpy --replace /usr/bin/python ${python.interpreter} + ''; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - python cython wrapPython + python cython wrapPython tkinter SDL2 libpng ffmpeg freetype glew libGLU_combined fribidi zlib pygame_sdl2 glib ]; - pythonPath = [ pygame_sdl2 ]; + pythonPath = [ pygame_sdl2 tkinter ]; RENPY_DEPS_INSTALL = stdenv.lib.concatStringsSep "::" (map (path: "${path}") [ SDL2 SDL2.dev libpng ffmpeg ffmpeg.out freetype glew.dev glew.out libGLU_combined fribidi zlib @@ -41,7 +47,9 @@ stdenv.mkDerivation { installPhase = '' mkdir -p $out/share/renpy - cp -r renpy renpy.py $out/share/renpy + cp -vr * $out/share/renpy + rm -rf $out/share/renpy/module + python module/setup.py install --prefix=$out --install-lib=$out/share/renpy/module makeWrapper ${python}/bin/python $out/bin/renpy \ diff --git a/pkgs/development/interpreters/renpy/launcherenv.patch b/pkgs/development/interpreters/renpy/launcherenv.patch new file mode 100644 index 00000000000..85a6c6439b9 --- /dev/null +++ b/pkgs/development/interpreters/renpy/launcherenv.patch @@ -0,0 +1,14 @@ +# The launcher game starts projects in a separate python process +# with the -E flag, which prevents the nix set PYTHONPATH envvar +# from taking effect, preventing the loading of pygame_sdl2 +--- a/launcher/game/project.rpy ++++ b/launcher/game/project.rpy +@@ -239,7 +239,7 @@ + raise Exception("Python interpreter not found: %r", executables) + + # Put together the basic command line. +- cmd = [ executable, "-EO", sys.argv[0] ] ++ cmd = [ executable, "-O", sys.argv[0] ] + + cmd.append(self.path) + cmd.extend(args) diff --git a/pkgs/development/libraries/LASzip/default.nix b/pkgs/development/libraries/LASzip/default.nix index df9d126ad71..384178d2c8d 100644 --- a/pkgs/development/libraries/LASzip/default.nix +++ b/pkgs/development/libraries/LASzip/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { homepage = http://www.laszip.org; license = stdenv.lib.licenses.lgpl2; maintainers = [ stdenv.lib.maintainers.michelk ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index a752fbcbcdd..a3e0558e0c2 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -23,6 +23,9 @@ stdenv.mkDerivation rec { sha256 = "005d993xcac8236fpvd1iawkz4wqjybkpn8dbwaliqz5jfkidlyn"; }; + # make: *** No rule to make target 'build/*.lo', needed by 'build/libSDL.la'. Stop. + postPatch = "patchShebangs ./configure"; + outputs = [ "out" "dev" ]; outputBin = "dev"; # sdl-config diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index f87e1d5067d..a037cd7dcfa 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -26,11 +26,11 @@ let in stdenv.mkDerivation rec { name = "SDL2-${version}"; - version = "2.0.7"; + version = "2.0.8"; src = fetchurl { url = "http://www.libsdl.org/release/${name}.tar.gz"; - sha256 = "0pjdpxla5kh1w1b0shxrx97a116vyy31njxi0jhyvqhk8d6cfdgf"; + sha256 = "1v4js1gkr75hzbxzhwzzif0sf9g07234sd23x1vdaqc661bprizd"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/SDL2_gfx/default.nix b/pkgs/development/libraries/SDL2_gfx/default.nix index a630e9cead8..04ec3f9652c 100644 --- a/pkgs/development/libraries/SDL2_gfx/default.nix +++ b/pkgs/development/libraries/SDL2_gfx/default.nix @@ -1,12 +1,13 @@ { stdenv, darwin, fetchurl, SDL2 }: stdenv.mkDerivation rec { - name = "SDL2_gfx-${version}"; - version = "1.0.1"; + name = "${pname}-${version}"; + pname = "SDL2_gfx"; + version = "1.0.4"; src = fetchurl { - url = "mirror://sourceforge/sdl2gfx/${name}.tar.gz"; - sha256 = "16jrijzdp095qf416zvj9gs2fqqn6zkyvlxs5xqybd0ip37cp6yn"; + url = "http://www.ferzkopp.net/Software/${pname}/${name}.tar.gz"; + sha256 = "0qk2ax7f7grlxb13ba0ll3zlm8780s7j8fmrhlpxzjgdvldf1q33"; }; buildInputs = [ SDL2 ] @@ -35,10 +36,9 @@ stdenv.mkDerivation rec { code. Its is written in plain C and can be used in C++ code. ''; - homepage = https://sourceforge.net/projects/sdlgfx/; + homepage = http://www.ferzkopp.net/wordpress/2016/01/02/sdl_gfx-sdl2_gfx/; license = licenses.zlib; - - maintainers = with maintainers; [ bjg ]; + maintainers = with maintainers; [ cpages ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/SDL2_image/default.nix b/pkgs/development/libraries/SDL2_image/default.nix index 91b4a563da0..b0f2d0e8b8d 100644 --- a/pkgs/development/libraries/SDL2_image/default.nix +++ b/pkgs/development/libraries/SDL2_image/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "SDL2_image-${version}"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { url = "http://www.libsdl.org/projects/SDL_image/release/${name}.tar.gz"; - sha256 = "1s3ciydixrgv34vlf45ak5syq5nlfaqf19wf162lbz4ixxd0gpvj"; + sha256 = "0s13dmakn21q6yw8avl67d4zkxzl1wap6l5nwf6cvzrmlxfw441m"; }; buildInputs = [ SDL2 libpng libjpeg libtiff libungif libXpm zlib ] @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { homepage = http://www.libsdl.org/projects/SDL_image/; platforms = platforms.unix; license = licenses.zlib; + maintainers = with maintainers; [ cpages ]; }; } diff --git a/pkgs/development/libraries/Xaw3d/default.nix b/pkgs/development/libraries/Xaw3d/default.nix index 07d256f4f57..eea18cd5638 100644 --- a/pkgs/development/libraries/Xaw3d/default.nix +++ b/pkgs/development/libraries/Xaw3d/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation { meta = { description = "3D widget set based on the Athena Widget set"; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/accountsservice/default.nix b/pkgs/development/libraries/accountsservice/default.nix index d1b3b9b9827..f12dfb4635b 100644 --- a/pkgs/development/libraries/accountsservice/default.nix +++ b/pkgs/development/libraries/accountsservice/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "accountsservice-${version}"; - version = "0.6.45"; + version = "0.6.46"; src = fetchurl { url = "http://www.freedesktop.org/software/accountsservice/accountsservice-${version}.tar.xz"; - sha256 = "09pg25ir7kjigvp2cxd9fkfw8c8ql8vrswfvymg9zmbmma9w43zv"; + sha256 = "09ddndbha2wh22a0k5150d2wy0v8k8zj3vmbdijyirqwhf5vjr8q"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; diff --git a/pkgs/development/libraries/agda/pretty/default.nix b/pkgs/development/libraries/agda/pretty/default.nix index 25e6ff6667f..0e4f1da6e14 100644 --- a/pkgs/development/libraries/agda/pretty/default.nix +++ b/pkgs/development/libraries/agda/pretty/default.nix @@ -21,5 +21,6 @@ agda.mkDerivation (self: rec { license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; maintainers = with maintainers; [ fuuzetsu ]; + broken = true; # 2018-04-11 }; }) diff --git a/pkgs/development/libraries/audio/jamomacore/default.nix b/pkgs/development/libraries/audio/jamomacore/default.nix index 7057b020d42..4e316ff1c99 100644 --- a/pkgs/development/libraries/audio/jamomacore/default.nix +++ b/pkgs/development/libraries/audio/jamomacore/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.magnetophon ]; platforms = stdenv.lib.platforms.linux; + broken = true; # 2018-04-10 }; } diff --git a/pkgs/development/libraries/cmark/default.nix b/pkgs/development/libraries/cmark/default.nix index 5fdd1edfd97..6c73bd01603 100644 --- a/pkgs/development/libraries/cmark/default.nix +++ b/pkgs/development/libraries/cmark/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - doCheck = true; + doCheck = !stdenv.isDarwin; checkPhase = '' export LD_LIBRARY_PATH=$(readlink -f ./src) CTEST_OUTPUT_ON_FAILURE=1 make test diff --git a/pkgs/development/libraries/cpp-gsl/default.nix b/pkgs/development/libraries/cpp-gsl/default.nix index ecd86354ee8..833275c72bd 100644 --- a/pkgs/development/libraries/cpp-gsl/default.nix +++ b/pkgs/development/libraries/cpp-gsl/default.nix @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0h8py468bvxnydkjs352d7a9s8hk0ihc7msjkcnzj2d7nzp5nsc1"; }; + NIX_CFLAGS_COMPILE = "-Wno-error=sign-conversion"; nativeBuildInputs = [ cmake catch ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index 68398e93764..7a9e3991aad 100644 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/pkgs/development/libraries/cyrus-sasl/default.nix @@ -22,7 +22,8 @@ stdenv.mkDerivation rec { patches = [ ./missing-size_t.patch # https://bugzilla.redhat.com/show_bug.cgi?id=906519 - (fetchpatch { # CVE-2013-4122 + (fetchpatch { + name = "CVE-2013-4122.patch"; url = "http://sourceforge.net/projects/miscellaneouspa/files/glibc217/cyrus-sasl-2.1.26-glibc217-crypt.diff"; sha256 = "05l7dh1w9d5fvzg0pjwzqh0fy4ah8y5cv6v67s4ssbq8xwd4pkf2"; }) diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix index 53ec9949f17..eaae1f7ecda 100644 --- a/pkgs/development/libraries/dlib/default.nix +++ b/pkgs/development/libraries/dlib/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { homepage = http://www.dlib.net; license = licenses.boost; maintainers = with maintainers; [ christopherpoole ]; - platforms = platforms.all; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/double-conversion/default.nix b/pkgs/development/libraries/double-conversion/default.nix index c656220f760..7a33559cbc7 100644 --- a/pkgs/development/libraries/double-conversion/default.nix +++ b/pkgs/development/libraries/double-conversion/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ stdenv, lib, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { name = "double-conversion-${version}"; @@ -15,6 +15,11 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; + # Case sensitivity issue + preConfigure = lib.optionalString stdenv.isDarwin '' + rm BUILD + ''; + enableParallelBuilding = true; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/exempi/default.nix b/pkgs/development/libraries/exempi/default.nix index 96f4af3226b..1f58fd698da 100644 --- a/pkgs/development/libraries/exempi/default.nix +++ b/pkgs/development/libraries/exempi/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, expat, zlib, boost, libiconv, darwin }: stdenv.mkDerivation rec { - name = "exempi-2.4.4"; + name = "exempi-2.4.5"; src = fetchurl { url = "http://libopenraw.freedesktop.org/download/${name}.tar.bz2"; - sha256 = "1c1xxiw9lazdaz4zvrnvcy9pif9l1wib7zy91m48i7a4bnf9mmd2"; + sha256 = "07i29xmg8bqriviaf4vi1mwha4lrw85kfla29cfym14fp3z8aqa0"; }; configureFlags = [ diff --git a/pkgs/development/libraries/farbfeld/default.nix b/pkgs/development/libraries/farbfeld/default.nix index 3f309f06630..452892ba4d7 100644 --- a/pkgs/development/libraries/farbfeld/default.nix +++ b/pkgs/development/libraries/farbfeld/default.nix @@ -1,18 +1,22 @@ -{ stdenv, fetchgit, libpng, libjpeg }: +{ stdenv, fetchgit, makeWrapper, file, libpng, libjpeg }: stdenv.mkDerivation rec { name = "farbfeld-${version}"; version = "3"; src = fetchgit { - url = "http://git.suckless.org/farbfeld"; + url = "https://git.suckless.org/farbfeld"; rev = "refs/tags/${version}"; sha256 = "1k9cnw2zk9ywcn4hibf7wgi4czwyxhgjdmia6ghpw3wcz8vi71xl"; }; buildInputs = [ libpng libjpeg ]; + nativeBuildInputs = [ makeWrapper ]; installFlags = "PREFIX=/ DESTDIR=$(out)"; + postInstall = '' + wrapProgram "$out/bin/2ff" --prefix PATH : "${file}/bin" + ''; meta = with stdenv.lib; { description = "Suckless image format with conversion tools"; diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index 9c4116c8f0b..1109582ad64 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -39,7 +39,8 @@ stdenv.mkDerivation rec { # additionally required for the glibc-2.25 patch; avoid requiring gperf postPatch = '' sed s/CHAR_WIDTH/CHARWIDTH/g -i src/fcobjshash.{h,gperf} - touch src/* + sleep 2 + touch src/fcobjshash.h ''; outputs = [ "bin" "dev" "lib" "out" ]; # $out contains all the config diff --git a/pkgs/development/libraries/gflags/default.nix b/pkgs/development/libraries/gflags/default.nix index d79b7691335..f9fc4366b7e 100644 --- a/pkgs/development/libraries/gflags/default.nix +++ b/pkgs/development/libraries/gflags/default.nix @@ -7,4 +7,13 @@ stdenv.mkDerivation sha256 = "03lxc2ah8i392kh1naq99iip34k4fpv22kwflyx3byd2ssycs9xf"; }; nativeBuildInputs = [ cmake ]; + # for case-insensitive filesystems + prePatch = "mv BUILD BUILD.bazel"; + + meta = with stdenv.lib; { + description = "C++ library that implements commandline flags processing"; + homepage = "https://github.com/gflags/gflags"; + license = licenses.bsd3; + platforms = platforms.unix; + }; } diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 5179ce4a9a8..9ee61666d85 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -1,5 +1,21 @@ /* Build configuration used to build glibc, Info files, and locale - information. */ + information. + + Note that this derivation has multiple outputs and does not respect the + standard convention of putting the executables into the first output. The + first output is `lib` so that the libraries provided by this derivation + can be accessed directly, e.g. + + "${pkgs.glibc}/lib/ld-linux-x86_64.so.2" + + The executables are put into `bin` output and need to be referenced via + the `bin` attribute of the main package, e.g. + + "${pkgs.glibc.bin}/bin/ldd". + + The executables provided by glibc typically include `ldd`, `locale`, `iconv` + but the exact set depends on the library version and the configuration. +*/ { stdenv, lib , buildPlatform, hostPlatform diff --git a/pkgs/development/libraries/glm/default.nix b/pkgs/development/libraries/glm/default.nix index 803f08a7a11..319a0359c58 100644 --- a/pkgs/development/libraries/glm/default.nix +++ b/pkgs/development/libraries/glm/default.nix @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { # fetch newer version of platform.h which correctly supports gcc 7.3 gcc7PlatformPatch = fetchurl { - url = "https://raw.githubusercontent.com/g-truc/glm/dd48b56e44d699a022c69155c8672caacafd9e8a/glm/simd/platform.h"; - sha256 = "0y91hlbgn5va7ijg5mz823gqkq9hqxl00lwmdwnf8q2g086rplzw"; + url = "https://raw.githubusercontent.com/g-truc/glm/384dab02e45a8ad3c1a3fa0906e0d5682c5b27b9/glm/simd/platform.h"; + sha256 = "0ym0sgwznxhfyi014xs55x3ql7r65fjs34sqb5jiaffkdhkqgzia"; }; postPatch = '' @@ -27,6 +27,10 @@ stdenv.mkDerivation rec { cp ${gcc7PlatformPatch} glm/simd/platform.h ''; + NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.isDarwin [ + "-DGLM_COMPILER=0" + ]; + postInstall = '' mkdir -p $doc/share/doc/glm cp -rv $NIX_BUILD_TOP/$sourceRoot/doc/* $doc/share/doc/glm diff --git a/pkgs/development/libraries/globalplatform/default.nix b/pkgs/development/libraries/globalplatform/default.nix index 5b55a09db62..3ef279616f7 100644 --- a/pkgs/development/libraries/globalplatform/default.nix +++ b/pkgs/development/libraries/globalplatform/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { homepage = https://sourceforge.net/p/globalplatform/wiki/Home/; description = "Library for interacting with smart card devices"; license = licenses.gpl3; - platforms = platforms.all; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/godot_headers/default.nix b/pkgs/development/libraries/godot_headers/default.nix new file mode 100644 index 00000000000..940882b1742 --- /dev/null +++ b/pkgs/development/libraries/godot_headers/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub }: +stdenv.mkDerivation rec { + name = "godot_headers"; + version = "2018-02-09"; + src = fetchFromGitHub { + owner = "GodotNativeTools"; + repo = "godot_headers"; + rev = "51bca3bf5d917341f3e15076c5a9191f8a5118ae"; + sha256 = "0z562pqm8y8wldmfiya72cvwwpvcfznpl0wypagw50v0f41ilywh"; + }; + buildPhase = "true"; + installPhase = '' + mkdir $out + cp -r . $out/include + ''; + meta = { + homepage = "https://github.com/GodotNativeTools/godot_headers/"; + description = "Headers for the Godot API supplied by the GDNative module"; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.twey ]; + }; +} diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix index afd6391d719..f1eed726eb2 100644 --- a/pkgs/development/libraries/gsl/default.nix +++ b/pkgs/development/libraries/gsl/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { ./disable-fma.patch # http://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html ]; - doCheck = stdenv.system != "i686-linux"; # https://lists.gnu.org/archive/html/bug-gsl/2015-11/msg00012.html + # https://lists.gnu.org/archive/html/bug-gsl/2015-11/msg00012.html + doCheck = stdenv.system != "i686-linux" && stdenv.system != "aarch64-linux"; meta = { description = "The GNU Scientific Library, a large numerical library"; diff --git a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix index bee80cb24ec..14e27ab6068 100644 --- a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix +++ b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "C++ interface for GStreamer"; homepage = https://gstreamer.freedesktop.org/bindings/cplusplus.html; license = licenses.lgpl21Plus; - platforms = platforms.unix; + platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; }; diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index d2b32502d1d..843a93a4a32 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -12,14 +12,14 @@ assert cupsSupport -> cups != null; with stdenv.lib; let - version = "3.22.26"; + version = "3.22.28"; in stdenv.mkDerivation rec { name = "gtk+3-${version}"; src = fetchurl { url = "mirror://gnome/sources/gtk+/${gnome3.versionBranch version}/gtk+-${version}.tar.xz"; - sha256 = "61eef0d320e541976e2dfe445729f12b5ade53050ee9de6184235cb60cd4b967"; + sha256 = "d299612b018cfed7b2c689168ab52b668023708e17c335eb592260d186f15e1f"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/herqq/default.nix b/pkgs/development/libraries/herqq/default.nix index 8f1aadc3a26..75dd8693d2c 100644 --- a/pkgs/development/libraries/herqq/default.nix +++ b/pkgs/development/libraries/herqq/default.nix @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { sha256 = "1w674rbwbhpirq70gp9rk6p068j36rwn112fx3nz613wgw63x84m"; }; - meta = { + meta = with stdenv.lib; { homepage = http://herqq.org; description = "A software library for building UPnP devices and control points"; - inherit (qt5.qtbase.meta) platforms; + platforms = platforms.linux; maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/hpx/default.nix b/pkgs/development/libraries/hpx/default.nix index 6b08a0fd86f..edb1dc01aa8 100644 --- a/pkgs/development/libraries/hpx/default.nix +++ b/pkgs/development/libraries/hpx/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "hpx-${version}"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "STEllAR-GROUP"; repo = "hpx"; rev = "${version}"; - sha256 = "0k79gw4c0v4i7ps1hw6x4m7svxbfml5xm6ly7p00dvg7z9521zsk"; + sha256 = "0xlhnycmpy2jgiqyzpwmkdrl6drf46ywdsl0qm4vksvjxqfgk9z3"; }; buildInputs = [ boost hwloc gperftools ]; diff --git a/pkgs/development/libraries/ignition-transport/generic.nix b/pkgs/development/libraries/ignition-transport/generic.nix index 8206338fb08..aee6782dc01 100644 --- a/pkgs/development/libraries/ignition-transport/generic.nix +++ b/pkgs/development/libraries/ignition-transport/generic.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { license = licenses.asl20; maintainers = with maintainers; [ pxc ]; platforms = platforms.all; + broken = true; # 2018-04-10 }; } diff --git a/pkgs/development/libraries/iniparser/default.nix b/pkgs/development/libraries/iniparser/default.nix index e586b30393e..8beda8663c5 100644 --- a/pkgs/development/libraries/iniparser/default.nix +++ b/pkgs/development/libraries/iniparser/default.nix @@ -13,6 +13,11 @@ stdenv.mkDerivation rec { patches = ./no-usr.patch; + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace Makefile \ + --replace -Wl,-soname= -Wl,-install_name, + ''; + doCheck = true; preCheck = "patchShebangs test/make-tests.sh"; diff --git a/pkgs/development/libraries/itk/default.nix b/pkgs/development/libraries/itk/default.nix index 3865aa226f9..bb90ec4831a 100644 --- a/pkgs/development/libraries/itk/default.nix +++ b/pkgs/development/libraries/itk/default.nix @@ -1,20 +1,13 @@ { stdenv, fetchurl, fetchpatch, cmake, libX11, libuuid, xz, vtk }: stdenv.mkDerivation rec { - name = "itk-4.11.0"; + name = "itk-4.12.2"; src = fetchurl { - url = mirror://sourceforge/itk/InsightToolkit-4.11.0.tar.xz; - sha256 = "0axvyds0gads5914g0m70z5q16gzghr0rk0hy3qjpf1k9bkxvcq6"; + url = mirror://sourceforge/itk/InsightToolkit-4.12.2.tar.xz; + sha256 = "1qw9mxbh083siljygahl4gdfv91xvfd8hfl7ghwii19f60xrvn2w"; }; - # Clang 4 dislikes signed comparisons of pointers against integers. Should no longer be - # necessary once we get past ITK 4.11. - patches = [ (fetchpatch { - url = "https://github.com/InsightSoftwareConsortium/ITK/commit/d1407a55910ad9c232f3d241833cfd2e59024946.patch"; - sha256 = "0h851afkv23fwgkibjss30fkbz4nkfg6rmmm4pfvkwpml23gzz7s"; - }) ]; - cmakeFlags = [ "-DBUILD_TESTING=OFF" "-DBUILD_EXAMPLES=OFF" diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix index af543c4e197..d374c935a2a 100644 --- a/pkgs/development/libraries/jasper/default.nix +++ b/pkgs/development/libraries/jasper/default.nix @@ -11,6 +11,15 @@ stdenv.mkDerivation rec { sha256 = "0aarg8nbik9wrm7fx0451sbm5ypfdfr6i169pxzi354mpdp8gg7f"; }; + patches = [ + (fetchpatch { + name = "CVE-2018-9055.patch"; + url = "http://paste.opensuse.org/view/raw/330751ce"; + sha256 = "0m798m6c4v9yyhql7x684j5kppcm6884n1rrb9ljz8p9aqq2jqnm"; + }) + ]; + + # newer reconf to recognize a multiout flag nativeBuildInputs = [ cmake ]; propagatedBuildInputs = [ libjpeg ]; diff --git a/pkgs/development/libraries/json-c/0.11.nix b/pkgs/development/libraries/json-c/0.11.nix deleted file mode 100644 index 8c4eab9ede6..00000000000 --- a/pkgs/development/libraries/json-c/0.11.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation rec { - name = "json-c-0.11"; - src = fetchurl { - url = "https://github.com/json-c/json-c/archive/json-c-0.11-20130402.tar.gz"; - sha256 = "1m8fy7lbahv1r7yqbhw4pl057sxmmgjihm1fsvc3h66710s2i24r"; - }; - - NIX_CFLAGS_COMPILE = [ "-Wno-error=implicit-fallthrough" ]; - - meta = with stdenv.lib; { - description = "A JSON implementation in C"; - homepage = https://github.com/json-c/json-c/wiki; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; - - longDescription = '' - JSON-C implements a reference counting object model that allows you to - easily construct JSON objects in C, output them as JSON formatted strings - and parse JSON formatted strings back into the C representation of JSON - objects. - ''; - }; -} diff --git a/pkgs/development/libraries/languagemachines/frog.nix b/pkgs/development/libraries/languagemachines/frog.nix index 725bc714db2..1a73a46d287 100644 --- a/pkgs/development/libraries/languagemachines/frog.nix +++ b/pkgs/development/libraries/languagemachines/frog.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, automake, autoconf, libtool, pkgconfig, autoconf-archive +, automake, autoconf, bzip2, libtar, libtool, pkgconfig, autoconf-archive , libxml2, icu , languageMachines }: @@ -14,7 +14,7 @@ stdenv.mkDerivation { src = fetchurl { inherit (release) url sha256; name = "frog-${release.version}.tar.gz"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ automake autoconf libtool autoconf-archive + buildInputs = [ automake autoconf bzip2 libtar libtool autoconf-archive libxml2 icu languageMachines.ticcutils languageMachines.timbl diff --git a/pkgs/development/libraries/languagemachines/libfolia.nix b/pkgs/development/libraries/languagemachines/libfolia.nix index d5c232ae776..a6f5adb9559 100644 --- a/pkgs/development/libraries/languagemachines/libfolia.nix +++ b/pkgs/development/libraries/languagemachines/libfolia.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl , automake, autoconf, libtool, pkgconfig, autoconf-archive -, libxml2, icu +, libxml2, icu, bzip2, libtar , languageMachines }: let @@ -13,7 +13,7 @@ stdenv.mkDerivation { src = fetchurl { inherit (release) url sha256; name = "libfolia-${release.version}.tar.gz"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ automake autoconf libtool autoconf-archive libxml2 icu languageMachines.ticcutils ]; + buildInputs = [ automake autoconf bzip2 libtool autoconf-archive libtar libxml2 icu languageMachines.ticcutils ]; preConfigure = "sh bootstrap.sh"; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/languagemachines/mbt.nix b/pkgs/development/libraries/languagemachines/mbt.nix index 2ffabac1ede..3bc78a96a06 100644 --- a/pkgs/development/libraries/languagemachines/mbt.nix +++ b/pkgs/development/libraries/languagemachines/mbt.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, automake, autoconf, libtool, pkgconfig, autoconf-archive +, automake, autoconf, bzip2, libtar, libtool, pkgconfig, autoconf-archive , libxml2 , languageMachines }: @@ -14,7 +14,7 @@ stdenv.mkDerivation { src = fetchurl { inherit (release) url sha256; name = "mbt-${release.version}.tar.gz"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ automake autoconf libtool autoconf-archive + buildInputs = [ automake autoconf bzip2 libtar libtool autoconf-archive libxml2 languageMachines.ticcutils languageMachines.timbl diff --git a/pkgs/development/libraries/languagemachines/timbl.nix b/pkgs/development/libraries/languagemachines/timbl.nix index d12c970d4dc..3ab38a9e84a 100644 --- a/pkgs/development/libraries/languagemachines/timbl.nix +++ b/pkgs/development/libraries/languagemachines/timbl.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl , automake, autoconf, libtool, pkgconfig, autoconf-archive -, libxml2 +, libxml2, bzip2, libtar , languageMachines }: @@ -14,7 +14,7 @@ stdenv.mkDerivation { src = fetchurl { inherit (release) url sha256; name = "timbl-${release.version}.tar.gz"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ automake autoconf libtool autoconf-archive + buildInputs = [ automake autoconf bzip2 libtar libtool autoconf-archive libxml2 languageMachines.ticcutils ]; diff --git a/pkgs/development/libraries/languagemachines/timblserver.nix b/pkgs/development/libraries/languagemachines/timblserver.nix index 7a07e9f33a8..ee1579540c3 100644 --- a/pkgs/development/libraries/languagemachines/timblserver.nix +++ b/pkgs/development/libraries/languagemachines/timblserver.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, automake, autoconf, libtool, pkgconfig, autoconf-archive +, automake, autoconf, bzip2, libtar, libtool, pkgconfig, autoconf-archive , libxml2 , languageMachines }: @@ -14,7 +14,7 @@ stdenv.mkDerivation { src = fetchurl { inherit (release) url sha256; name = "timblserver-${release.version}.tar.gz"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ automake autoconf libtool autoconf-archive + buildInputs = [ automake autoconf bzip2 libtar libtool autoconf-archive libxml2 languageMachines.ticcutils languageMachines.timbl diff --git a/pkgs/development/libraries/languagemachines/ucto.nix b/pkgs/development/libraries/languagemachines/ucto.nix index 5c12a2142cc..8f917c2265d 100644 --- a/pkgs/development/libraries/languagemachines/ucto.nix +++ b/pkgs/development/libraries/languagemachines/ucto.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl , automake, autoconf, libtool, pkgconfig, autoconf-archive -, libxml2, icu +, libxml2, icu, bzip2, libtar , languageMachines }: @@ -14,8 +14,8 @@ stdenv.mkDerivation { src = fetchurl { inherit (release) url sha256; name = "ucto-${release.version}.tar.gz"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ automake autoconf libtool autoconf-archive - icu libxml2 + buildInputs = [ automake autoconf bzip2 libtool autoconf-archive + icu libtar libxml2 languageMachines.ticcutils languageMachines.libfolia languageMachines.uctodata diff --git a/pkgs/development/libraries/leveldb/default.nix b/pkgs/development/libraries/leveldb/default.nix index 3ff2ca0b0ee..2b50c09af5c 100644 --- a/pkgs/development/libraries/leveldb/default.nix +++ b/pkgs/development/libraries/leveldb/default.nix @@ -15,7 +15,12 @@ stdenv.mkDerivation rec { make all leveldbutil libmemenv.a ''; - installPhase = " + installPhase = (stdenv.lib.optionalString stdenv.isDarwin '' + for file in *.dylib*; do + install_name_tool -id $out/lib/$file $file + done + '') + # XXX consider removing above after transition to cmake in the next release + " mkdir -p $out/{bin,lib,include} cp -r include $out diff --git a/pkgs/development/libraries/libLAS/default.nix b/pkgs/development/libraries/libLAS/default.nix index 20531adcd1c..aafcf86e4a6 100644 --- a/pkgs/development/libraries/libLAS/default.nix +++ b/pkgs/development/libraries/libLAS/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, cmake, gdal, libgeotiff, libtiff, LASzip }: +{ stdenv, fetchurl, boost, cmake, gdal, libgeotiff, libtiff, LASzip, fixDarwinDylibNames }: stdenv.mkDerivation rec { name = "libLAS-1.8.1"; @@ -9,14 +9,22 @@ stdenv.mkDerivation rec { sha256 = "0xjfxb3ydvr2258ji3spzyf81g9caap19ql2pk91wiivqsc4mnws"; }; - buildInputs = [ boost cmake gdal libgeotiff libtiff LASzip ]; + buildInputs = [ boost cmake gdal libgeotiff libtiff LASzip ] + ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + cmakeFlags = [ + "-DGDAL_CONFIG=${gdal}/bin/gdal-config" + ]; + + postFixup = stdenv.lib.optionalString stdenv.isDarwin '' + install_name_tool -change "@rpath/liblas.3.dylib" "$out/lib/liblas.3.dylib" $out/lib/liblas_c.dylib + ''; meta = { description = "LAS 1.0/1.1/1.2 ASPRS LiDAR data translation toolset"; homepage = http://www.liblas.org; license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.michelk ]; }; } diff --git a/pkgs/development/libraries/libatomic_ops/default.nix b/pkgs/development/libraries/libatomic_ops/default.nix index 714e9361440..c22fb8a2cba 100644 --- a/pkgs/development/libraries/libatomic_ops/default.nix +++ b/pkgs/development/libraries/libatomic_ops/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { description = ''A library for semi-portable access to hardware-provided atomic memory update operations''; license = stdenv.lib.licenses.gpl2Plus ; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; + platforms = with stdenv.lib.platforms; unix ++ windows; }; } diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index a069894f6c8..317768518c3 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, yasm, bzip2, zlib, perl +{ stdenv, fetchurl, pkgconfig, yasm, bzip2, zlib, perl, bash , mp3Support ? true, lame ? null , speexSupport ? true, speex ? null , theoraSupport ? true, libtheora ? null @@ -45,7 +45,11 @@ let ++ optional (vpxSupport && hasPrefix "0.8." version) ./vpxenc-0.8.17-libvpx-1.5.patch ; - preConfigure = "patchShebangs doc/texi2pod.pl"; + postPatch = '' + patchShebangs . + # another shebang was hidden in a here document text + substituteInPlace ./configure --replace "#! /bin/sh" "#!${bash}/bin/sh" + ''; configureFlags = assert stdenv.lib.all (x: x!=null) buildInputs; @@ -71,8 +75,8 @@ let ++ optional freetypeSupport "--enable-libfreetype" ; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ lame yasm zlib bzip2 SDL ] + nativeBuildInputs = [ pkgconfig perl ]; + buildInputs = [ lame yasm zlib bzip2 SDL bash ] ++ [ perl ] # for install-man target ++ optional mp3Support lame ++ optional speexSupport speex @@ -95,6 +99,7 @@ let # alltools to build smaller tools, incl. aviocat, ismindex, qt-faststart, etc. buildFlags = "all alltools install-man"; + postInstall = '' moveToOutput bin "$bin" # alltools target compiles an executable in tools/ for every C diff --git a/pkgs/development/libraries/libcdio-paranoia/default.nix b/pkgs/development/libraries/libcdio-paranoia/default.nix index b3aa2b19906..48e632ba52d 100644 --- a/pkgs/development/libraries/libcdio-paranoia/default.nix +++ b/pkgs/development/libraries/libcdio-paranoia/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, libcdio, pkgconfig }: +{ stdenv, fetchFromGitHub, autoreconfHook, libcdio, pkgconfig, + libiconv, IOKit, DiskArbitration}: stdenv.mkDerivation { name = "libcdio-paranoia-0.94+2"; @@ -11,7 +12,14 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ libcdio ]; + buildInputs = [ libcdio ] ++ + stdenv.lib.optionals stdenv.isDarwin [ libiconv IOKit DiskArbitration ]; + + propagatedBuildInputs = stdenv.lib.optional stdenv.isDarwin DiskArbitration; + + configureFlags = stdenv.lib.optionals stdenv.isDarwin [ + "--disable-ld-version-script" + ]; meta = with stdenv.lib; { description = "CD paranoia on top of libcdio"; diff --git a/pkgs/development/libraries/libcdio/default.nix b/pkgs/development/libraries/libcdio/default.nix index 6817d1a888c..bb81721feea 100644 --- a/pkgs/development/libraries/libcdio/default.nix +++ b/pkgs/development/libraries/libcdio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libcddb, pkgconfig, ncurses, help2man, libiconv }: +{ stdenv, fetchurl, libcddb, pkgconfig, ncurses, help2man, libiconv, Carbon, IOKit }: stdenv.mkDerivation rec { name = "libcdio-2.0.0"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libcddb ncurses help2man ] - ++ stdenv.lib.optional stdenv.isDarwin libiconv; + ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Carbon IOKit ]; # Disabled due to several spurious test failures. # doCheck = true; diff --git a/pkgs/development/libraries/libconfuse/default.nix b/pkgs/development/libraries/libconfuse/default.nix index d92492eb7f8..29398ac8aac 100644 --- a/pkgs/development/libraries/libconfuse/default.nix +++ b/pkgs/development/libraries/libconfuse/default.nix @@ -15,7 +15,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = true; + # On darwin the tests depend on the installed libraries because of install_name. + doInstallCheck = true; + installCheckTarget = "check"; meta = with stdenv.lib; { inherit (src.meta) homepage; diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 45a71759d45..8d6ad90b7c6 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, valgrind-light }: stdenv.mkDerivation rec { - name = "libdrm-2.4.89"; + name = "libdrm-2.4.90"; src = fetchurl { url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2"; - sha256 = "629f9782aabbb4809166de5f24d26fe0766055255038f16935602d89f136a02e"; + sha256 = "db37ec8f1dbaa2c192ad9903c8d0988b858ae88031e96f169bf76aaf705db68b"; }; outputs = [ "out" "dev" "bin" ]; diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/development/libraries/libdwarf/default.nix index 4bb91878bd3..6057dae4be2 100644 --- a/pkgs/development/libraries/libdwarf/default.nix +++ b/pkgs/development/libraries/libdwarf/default.nix @@ -1,11 +1,13 @@ { stdenv, fetchurl, libelf }: let - version = "20170709"; + version = "20180129"; src = fetchurl { url = "http://www.prevanders.net/libdwarf-${version}.tar.gz"; - sha512 = "afff6716ef1af5d8aae2b887f36b9a6547fb576770bc6f630b82725ed1e59cbd" - + "387779aa729bbd1a5ae026a25ac76aacf64b038cd898b2419a8676f9aa8c59f1"; + # Upstream displays this hash broken into three parts: + sha512 = "02f8024bb9959c91a1fe322459f7587a589d096595" + + "6d643921a173e6f9e0a184db7aef66f0fd2548d669" + + "5be7f9ee368f1cc8940cea4ddda01ff99d28bbf1fe58"; }; meta = { homepage = https://www.prevanders.net/dwarf.html; diff --git a/pkgs/development/libraries/libdynd/default.nix b/pkgs/development/libraries/libdynd/default.nix index 8deec094866..93ece69cf05 100644 --- a/pkgs/development/libraries/libdynd/default.nix +++ b/pkgs/development/libraries/libdynd/default.nix @@ -15,6 +15,12 @@ stdenv.mkDerivation { "-DDYND_BUILD_BENCHMARKS=OFF" ]; + # added to fix build with gcc7 + NIX_CFLAGS_COMPILE = [ + "-Wno-error=implicit-fallthrough" + "-Wno-error=nonnull" + ]; + buildInputs = [ cmake ]; outputs = [ "out" "dev" ]; @@ -24,5 +30,6 @@ stdenv.mkDerivation { description = "C++ dynamic ndarray library, with Python exposure."; homepage = http://libdynd.org; license = licenses.bsd2; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix index e14f4cbf5d6..871437f1908 100644 --- a/pkgs/development/libraries/libevent/default.nix +++ b/pkgs/development/libraries/libevent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, findutils +{ stdenv, fetchurl, findutils, fixDarwinDylibNames , sslSupport? true, openssl }: @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [] ++ stdenv.lib.optional sslSupport openssl ++ stdenv.lib.optional stdenv.isCygwin findutils + ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames ; postInstall = stdenv.lib.optionalString sslSupport '' diff --git a/pkgs/development/libraries/libftdi/1.x.nix b/pkgs/development/libraries/libftdi/1.x.nix index 8b75f85852e..d54b05b1c82 100644 --- a/pkgs/development/libraries/libftdi/1.x.nix +++ b/pkgs/development/libraries/libftdi/1.x.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { description = "A library to talk to FTDI chips using libusb"; homepage = https://www.intra2net.com/en/developer/libftdi/; license = with licenses; [ lgpl2 gpl2 ]; - platforms = platforms.linux; + platforms = with platforms; linux ++ darwin; maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/development/libraries/libftdi/default.nix b/pkgs/development/libraries/libftdi/default.nix index fff760c5519..f90e741a57e 100644 --- a/pkgs/development/libraries/libftdi/default.nix +++ b/pkgs/development/libraries/libftdi/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "libftdi-0.20"; - + src = fetchurl { url = "http://www.intra2net.com/en/developer/libftdi/download/${name}.tar.gz"; sha256 = "13l39f6k6gff30hsgh0wa2z422g9pyl91rh8a8zz6f34k2sxaxii"; @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { description = "A library to talk to FTDI chips using libusb"; homepage = https://www.intra2net.com/en/developer/libftdi/; license = stdenv.lib.licenses.lgpl21; - platforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libgroove/default.nix b/pkgs/development/libraries/libgroove/default.nix index ac6c9d297cc..bd5a5f06851 100644 --- a/pkgs/development/libraries/libgroove/default.nix +++ b/pkgs/development/libraries/libgroove/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1la9d9kig50mc74bxvhx6hzqv0nrci9aqdm4k2j4q0s1nlfgxipd"; }; + patches = [ ./no-warnings-as-errors.patch ]; + buildInputs = [ cmake libav SDL2 chromaprint libebur128 ]; meta = with stdenv.lib; { @@ -18,6 +20,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/andrewrk/libgroove; license = licenses.mit; platforms = platforms.unix; - maintainers = [ maintainers.andrewrk ]; + maintainers = with maintainers; [ andrewrk ma27 ]; }; } diff --git a/pkgs/development/libraries/libgroove/no-warnings-as-errors.patch b/pkgs/development/libraries/libgroove/no-warnings-as-errors.patch new file mode 100644 index 00000000000..86a8a935769 --- /dev/null +++ b/pkgs/development/libraries/libgroove/no-warnings-as-errors.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a1e8541..6bc9c30 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -135,8 +135,8 @@ configure_file ( + "${PROJECT_BINARY_DIR}/config.h" + ) + +-set(LIB_CFLAGS "${C99_C_FLAGS} -pedantic -Werror -Wall -Werror=strict-prototypes -Werror=old-style-definition -Werror=missing-prototypes -D_REENTRANT -D_POSIX_C_SOURCE=200809L") +-set(EXAMPLE_CFLAGS "${C99_C_FLAGS} -pedantic -Werror -Wall -g") ++set(LIB_CFLAGS "${C99_C_FLAGS} -pedantic -Wall -Werror=strict-prototypes -Werror=old-style-definition -Werror=missing-prototypes -D_REENTRANT -D_POSIX_C_SOURCE=200809L") ++set(EXAMPLE_CFLAGS "${C99_C_FLAGS} -pedantic -Wall -g") + set(EXAMPLE_INCLUDES "${PROJECT_SOURCE_DIR}") + + add_library(groove SHARED ${LIBGROOVE_SOURCES} ${LIBGROOVE_HEADERS}) diff --git a/pkgs/development/libraries/libhttpseverywhere/default.nix b/pkgs/development/libraries/libhttpseverywhere/default.nix index f39cc2574c9..c674b155fd1 100644 --- a/pkgs/development/libraries/libhttpseverywhere/default.nix +++ b/pkgs/development/libraries/libhttpseverywhere/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { doCheck = true; - checkPhase = "./httpseverywhere_test"; + checkPhase = "(cd test && ./httpseverywhere_test)"; outputs = [ "out" "devdoc" ]; diff --git a/pkgs/development/libraries/libimobiledevice/default.nix b/pkgs/development/libraries/libimobiledevice/default.nix index cef9cc0af6b..d1b779627c6 100644 --- a/pkgs/development/libraries/libimobiledevice/default.nix +++ b/pkgs/development/libraries/libimobiledevice/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { patches = [ ./disable_sslv3.patch - (fetchpatch { # CVE-2016-5104 + (fetchpatch { + name = "CVE-2016-5104.patch"; url = "https://github.com/libimobiledevice/libimobiledevice/commit/df1f5c4d70d0c19ad40072f5246ca457e7f9849e.patch"; sha256 = "06ygb9aqcvm4v08wrldsddjgyqv5bkpq6lxzq2a1nwqp9mq4a4k1"; }) diff --git a/pkgs/development/libraries/libnfs/default.nix b/pkgs/development/libraries/libnfs/default.nix index d9149a1fbac..2955aaebc01 100644 --- a/pkgs/development/libraries/libnfs/default.nix +++ b/pkgs/development/libraries/libnfs/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=tautological-compare"; + enableParallelBuilding = true; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libpar2/default.nix b/pkgs/development/libraries/libpar2/default.nix index 6d7606428f6..cf97744069b 100644 --- a/pkgs/development/libraries/libpar2/default.nix +++ b/pkgs/development/libraries/libpar2/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { patches = [ ./libpar2-0.4-external-verification.patch ]; + CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11"; + meta = { homepage = http://parchive.sourceforge.net/; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/development/libraries/libqglviewer/default.nix b/pkgs/development/libraries/libqglviewer/default.nix index eef9e05ca03..e68c5052beb 100644 --- a/pkgs/development/libraries/libqglviewer/default.nix +++ b/pkgs/development/libraries/libqglviewer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, qmake4Hook }: +{ stdenv, fetchurl, qt4, qmake4Hook, AGL }: stdenv.mkDerivation rec { name = "libqglviewer-2.6.3"; @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "00jdkyk4wg1356c3ar6nk3hyp494ya3yvshq9m57kfmqpn3inqdy"; }; - buildInputs = [ qt4 qmake4Hook ]; + buildInputs = [ qt4 qmake4Hook ] + ++ stdenv.lib.optional stdenv.isDarwin AGL; postPatch = '' diff --git a/pkgs/development/libraries/libs3/default.nix b/pkgs/development/libraries/libs3/default.nix index 2d8b2a3b5f1..540d84dc244 100644 --- a/pkgs/development/libraries/libs3/default.nix +++ b/pkgs/development/libraries/libs3/default.nix @@ -1,17 +1,20 @@ { stdenv, fetchFromGitHub, curl, libxml2 }: stdenv.mkDerivation { - name = "libs3-2015-04-23"; + name = "libs3-2017-06-01"; src = fetchFromGitHub { owner = "bji"; repo = "libs3"; - rev = "11a4e976c28ba525e7d61fbc3867c345a2af1519"; - sha256 = "0xjjwyw14sk9am6s2m25hxi55vmsrc2yiawd6ln2lvg59xjcr48i"; + rev = "fd8b149044e429ad30dc4c918f0713cdd40aadd2"; + sha256 = "0a4c9rsd3wildssvnvph6cd11adn0p3rd4l02z03lvxkjhm20gw3"; }; buildInputs = [ curl libxml2 ]; + # added to fix build with gcc7, review on update + NIX_CFLAGS_COMPILE = [ "-Wno-error=format-truncation" ]; + DESTDIR = "\${out}"; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libsearpc/default.nix b/pkgs/development/libraries/libsearpc/default.nix index 3898071c858..fae6dc82fcf 100644 --- a/pkgs/development/libraries/libsearpc/default.nix +++ b/pkgs/development/libraries/libsearpc/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec description = "A simple and easy-to-use C language RPC framework (including both server side & client side) based on GObject System"; license = stdenv.lib.licenses.lgpl3; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.calrama ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/libtar/default.nix b/pkgs/development/libraries/libtar/default.nix index 992bad020ea..8123bf7ba84 100644 --- a/pkgs/development/libraries/libtar/default.nix +++ b/pkgs/development/libraries/libtar/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { description = "C library for manipulating POSIX tar files"; homepage = http://www.feep.net/libtar/; license = licenses.bsd3; - platforms = platforms.linux; + platforms = with platforms; linux ++ darwin; maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix index 8d1f5115bdf..e3be66e8b1c 100644 --- a/pkgs/development/libraries/libunistring/default.nix +++ b/pkgs/development/libraries/libunistring/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libunistring-${version}"; - version = "0.9.8"; + version = "0.9.9"; src = fetchurl { url = "mirror://gnu/libunistring/${name}.tar.gz"; - sha256 = "1x9wnpzg7vxyjpnzab6vw0afbcijfbd57qrrkqrppynh0nyz54mp"; + sha256 = "0jm8pr469y7ybb90ll8k1585rciqm8ckzif0laipqhp5z440rsgm"; }; outputs = [ "out" "dev" "info" "doc" ]; diff --git a/pkgs/development/libraries/libusbmuxd/default.nix b/pkgs/development/libraries/libusbmuxd/default.nix index 3e8beef3c9d..3d15b698b48 100644 --- a/pkgs/development/libraries/libusbmuxd/default.nix +++ b/pkgs/development/libraries/libusbmuxd/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { }; patches = [ - (fetchpatch { # CVE-2016-5104 + (fetchpatch { + name = "CVE-2016-5104.patch"; url = "https://github.com/libimobiledevice/libusbmuxd/commit/4397b3376dc4e4cb1c991d0aed61ce6482614196.patch"; sha256 = "0cl3vys7bkwbdzf64d0rz3zlqpfc30w4l7j49ljv01agh42ywhgk"; }) diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 59fd95eefee..e8877c7f54b 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -2,14 +2,14 @@ , ApplicationServices, CoreServices }: stdenv.mkDerivation rec { - version = "1.19.1"; + version = "1.19.2"; name = "libuv-${version}"; src = fetchFromGitHub { owner = "libuv"; repo = "libuv"; rev = "v${version}"; - sha256 = "020jap4xvjns1rgb2kvpf1nib3f2d5fyqh04afgkk32hiag0kn66"; + sha256 = "118r8wigm65107fm7kzfz7gc4awy8xxg0knvwnshx1j40ks08x9z"; }; postPatch = let diff --git a/pkgs/development/libraries/libva/1.0.0.nix b/pkgs/development/libraries/libva/1.0.0.nix new file mode 100644 index 00000000000..031ac781651 --- /dev/null +++ b/pkgs/development/libraries/libva/1.0.0.nix @@ -0,0 +1,36 @@ +{ stdenv, lib, fetchurl, libX11, pkgconfig, libXext, libdrm, libXfixes, wayland, libffi +, mesa_noglu +, minimal ? true, libva +}: + +stdenv.mkDerivation rec { + name = "libva-${version}"; + version = "1.7.3"; + + src = fetchurl { + url = "http://www.freedesktop.org/software/vaapi/releases/libva/${name}.tar.bz2"; + sha256 = "1ndrf136rlw03xag7j1xpmf9015d1h0dpnv6v587jnh6k2a17g12"; + }; + + outputs = [ "bin" "dev" "out" ]; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ libdrm ] + ++ lib.optionals (!minimal) [ libva libX11 libXext libXfixes wayland libffi mesa_noglu ]; + # TODO: share libs between minimal and !minimal - perhaps just symlink them + + configureFlags = + [ "--with-drivers-path=${mesa_noglu.driverLink}/lib/dri" ] ++ + lib.optionals (!minimal) [ "--enable-glx" ]; + + installFlags = [ "dummy_drv_video_ladir=$(out)/lib/dri" ]; + + meta = with stdenv.lib; { + homepage = http://www.freedesktop.org/wiki/Software/vaapi; + license = licenses.mit; + description = "VAAPI library: Video Acceleration API"; + platforms = platforms.unix; + maintainers = with maintainers; [ garbas ]; + }; +} diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix index f59237ee164..2f9bca5ed95 100644 --- a/pkgs/development/libraries/libvorbis/default.nix +++ b/pkgs/development/libraries/libvorbis/default.nix @@ -1,26 +1,16 @@ { stdenv, fetchurl, libogg, pkgconfig, fetchpatch }: stdenv.mkDerivation rec { - name = "libvorbis-1.3.5"; + name = "libvorbis-1.3.6"; src = fetchurl { url = "http://downloads.xiph.org/releases/vorbis/${name}.tar.xz"; - sha256 = "1lg1n3a6r41492r7in0fpvzc7909mc5ir9z0gd3qh2pz4yalmyal"; + sha256 = "05dlzjkdpv46zb837wysxqyn8l636x3dw8v8ymlrwz2fg1dbn05g"; }; outputs = [ "out" "dev" "doc" ]; patches = [ - (fetchpatch { - url = "https://github.com/xiph/vorbis/commit/a79ec216cd119069c68b8f3542c6a425a74ab993.patch"; - sha256 = "0xhsa96n3dlh2l85bxpz4b9m78mfxfgi2ibhjp77110a0nvkjr6h"; - name = "CVE-2017-14633"; - }) - (fetchpatch { - url = "https://github.com/xiph/vorbis/commit/c1c2831fc7306d5fbd7bc800324efd12b28d327f.patch"; - sha256 = "17lb86105im6fc0h0cx5sn94p004jsdbbs2vj1m9ll6z9yb4rxwc"; - name = "CVE-2017-14632"; - }) (fetchpatch { url = "https://gitlab.xiph.org/xiph/vorbis/uploads/a68cf70fa10c8081a633f77b5c6576b7/0001-CVE-2017-14160-make-sure-we-don-t-overflow.patch"; sha256 = "0v21p59cb3z77ch1v6q5dcrd733h91f3m8ifnd7kkkr8gzn17d5x"; diff --git a/pkgs/development/libraries/libyubikey/default.nix b/pkgs/development/libraries/libyubikey/default.nix index aa2c8131392..5b10e62deee 100644 --- a/pkgs/development/libraries/libyubikey/default.nix +++ b/pkgs/development/libraries/libyubikey/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { homepage = http://opensource.yubico.com/yubico-c/; description = "C library for manipulating Yubico YubiKey One-Time Passwords (OTPs)"; license = licenses.bsd2; - maintainers = with maintainers; [ calrama wkennington ]; + maintainers = with maintainers; [ wkennington ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libzdb/default.nix b/pkgs/development/libraries/libzdb/default.nix index a5799f79b56..162962c2ac3 100644 --- a/pkgs/development/libraries/libzdb/default.nix +++ b/pkgs/development/libraries/libzdb/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec description = "A small, easy to use Open Source Database Connection Pool Library"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.calrama ]; + maintainers = [ ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix index f5660e93d79..f2a8d75a9cb 100644 --- a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix +++ b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix @@ -48,5 +48,6 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; + broken = true; # 2018-02-16 }; } diff --git a/pkgs/development/libraries/luaffi/darwin.patch b/pkgs/development/libraries/luaffi/darwin.patch new file mode 100644 index 00000000000..50db81b776d --- /dev/null +++ b/pkgs/development/libraries/luaffi/darwin.patch @@ -0,0 +1,17 @@ +diff --git a/Makefile b/Makefile +index b2b5f2c..b690a5d 100644 +--- a/Makefile ++++ b/Makefile +@@ -18,10 +18,10 @@ test: + if [ `uname` = "Darwin" ]; then $(MAKE) test_macosx; else $(MAKE) test_posix; fi + + macosx: +- $(MAKE) posix "SOCC=MACOSX_DEPLOYMENT_TARGET=10.3 $(CC) -dynamiclib -single_module -undefined dynamic_lookup $(SOCFLAGS)" ++ $(MAKE) posix "SOCC= $(CC) -dynamiclib -single_module -undefined dynamic_lookup -Wl,-install_name,$(PREFIX)/lib/$(MODSO) $(SOCFLAGS)" + + test_macosx: +- $(MAKE) test_posix "SOCC=MACOSX_DEPLOYMENT_TARGET=10.3 $(CC) -dynamiclib -single_module -undefined dynamic_lookup $(SOCFLAGS)" ++ $(MAKE) test_posix "SOCC= $(CC) -dynamiclib -single_module -undefined dynamic_lookup -Wl,-install_name,$(PREFIX)/lib/$(MODSO) $(SOCFLAGS)" + + posix: $(MODSO) test_cdecl.so + diff --git a/pkgs/development/libraries/luaffi/default.nix b/pkgs/development/libraries/luaffi/default.nix index 1e4cf11d1fa..065562ac82e 100644 --- a/pkgs/development/libraries/luaffi/default.nix +++ b/pkgs/development/libraries/luaffi/default.nix @@ -12,9 +12,9 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ lua ]; - patches = [ - ./makefile-errors.patch - ]; + patches = [ ./darwin.patch ./makefile-errors.patch ]; + + makeFlags = [ "PREFIX=$(out)" ]; installPhase = '' mkdir -p $out/lib diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 67500216800..02df93f802a 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -66,7 +66,7 @@ let in let - version = "17.3.3"; + version = "17.3.6"; branch = head (splitString "." version); driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32"; in @@ -81,7 +81,7 @@ stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" ]; - sha256 = "16rpm4rwmzd4kdgipa1gw262jqg3346gih0y3bsc3bgn1vgcbfj1"; + sha256 = "e5915680d44ac9d05defdec529db7459ac9edd441c9845266eff2e2d3e57fbf8"; }; prePatch = "patchShebangs ."; diff --git a/pkgs/development/libraries/mps/default.nix b/pkgs/development/libraries/mps/default.nix index 5a841f165ca..aac9dc7f727 100644 --- a/pkgs/development/libraries/mps/default.nix +++ b/pkgs/development/libraries/mps/default.nix @@ -12,6 +12,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ sqlite ]; + # needed for 1.116.0 to build with gcc7 + NIX_CFLAGS_COMPILE = [ + "-Wno-implicit-fallthrough" + ]; + + meta = { description = "A flexible memory management and garbage collection library"; homepage = "https://www.ravenbrook.com/project/mps"; diff --git a/pkgs/development/libraries/mysocketw/default.nix b/pkgs/development/libraries/mysocketw/default.nix index 379848b0cb0..6ec288f985b 100644 --- a/pkgs/development/libraries/mysocketw/default.nix +++ b/pkgs/development/libraries/mysocketw/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, openssl}: +{ stdenv, fetchurl, openssl }: stdenv.mkDerivation rec { name = "mysocketw-031026"; @@ -9,11 +9,14 @@ stdenv.mkDerivation rec { patches = [ ./gcc.patch ]; - configurePhase = '' - sed -i s,/usr/local,$out, Makefile.conf + buildInputs = [ openssl ]; + + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace src/Makefile \ + --replace -Wl,-soname, -Wl,-install_name,$out/lib/ ''; - buildInputs = [ openssl ]; + makeFlags = [ "PREFIX=$(out)" "CXX=c++" ]; meta = { description = "Cross platform (Linux/FreeBSD/Unix/Win32) streaming socket C++"; diff --git a/pkgs/development/libraries/ndn-cxx/default.nix b/pkgs/development/libraries/ndn-cxx/default.nix index ee7d4765fb2..1040cb9a934 100644 --- a/pkgs/development/libraries/ndn-cxx/default.nix +++ b/pkgs/development/libraries/ndn-cxx/default.nix @@ -45,5 +45,6 @@ stdenv.mkDerivation { license = licenses.lgpl3; platforms = stdenv.lib.platforms.unix; maintainers = [ maintainers.sjmackenzie ]; + broken = true; # 2018-04-11 }; } diff --git a/pkgs/development/libraries/nix-plugins/4.nix b/pkgs/development/libraries/nix-plugins/4.nix new file mode 100644 index 00000000000..c4a30f52b05 --- /dev/null +++ b/pkgs/development/libraries/nix-plugins/4.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, nix, cmake, pkgconfig, boost }: +let version = "4.0.4"; in +stdenv.mkDerivation { + name = "nix-plugins-${version}"; + + src = fetchFromGitHub { + owner = "shlevy"; + repo = "nix-plugins"; + rev = version; + sha256 = "02lz62n55pvqin4x44qlxb5knrapyckmj9k8ggk4qxgb36368ifn"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ nix boost ]; + + meta = { + description = "Collection of miscellaneous plugins for the nix expression language"; + homepage = https://github.com/shlevy/nix-plugins; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index ccb04024f64..17805f32afb 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl , CoreServices ? null }: -let version = "4.17"; in +let version = "4.18"; in stdenv.mkDerivation { name = "nspr-${version}"; src = fetchurl { url = "mirror://mozilla/nspr/releases/v${version}/src/nspr-${version}.tar.gz"; - sha256 = "158hdn285dsb5rys8wl1wi32dd1axwhqq0r8fwny4aj157m0l2jr"; + sha256 = "0d7vr3wrgp73qbywrvdkikk8vq1s1n9vhf62db80g1zqkg05g5mq"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/nss/85_security_load.patch b/pkgs/development/libraries/nss/85_security_load.patch index 7687ea9bedb..132d5a96b29 100644 --- a/pkgs/development/libraries/nss/85_security_load.patch +++ b/pkgs/development/libraries/nss/85_security_load.patch @@ -13,10 +13,10 @@ diff -ru -x '*~' -x '*.orig' -x '*.rej' nss/cmd/shlibsign/shlibsign.c nss/cmd/sh diff -ru -x '*~' -x '*.orig' -x '*.rej' nss/coreconf/config.mk nss/coreconf/config.mk --- nss/coreconf/config.mk 2017-01-04 15:24:24.000000000 +0100 +++ nss/coreconf/config.mk 2017-01-24 14:43:47.989432372 +0100 -@@ -208,3 +208,6 @@ - # exported symbols, which causes problem when NSS is built as part of Mozilla. - # So we add a NSS_SSL_ENABLE_ZLIB variable to allow Mozilla to turn this off. - NSS_SSL_ENABLE_ZLIB = 1 +@@ -202,3 +202,6 @@ + + # Hide old, deprecated, TLS cipher suite names when building NSS + DEFINES += -DSSL_DISABLE_DEPRECATED_CIPHER_SUITE_NAMES + +# Nix specific stuff. +DEFINES += -DNIX_NSS_LIBDIR=\"$(out)/lib/\" diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index a8f36af5df5..8662b956ce2 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -2,6 +2,12 @@ let + # Fix aarch64 build, shouldn't be needed after 3.35 + aarch64Patch = fetchurl { + url = https://hg.mozilla.org/projects/nss/raw-rev/74e679158d1b; + sha256 = "1lhs4h32mb2al3z461yylk227nid769di1pdjr7p0kqm2z1qm3jq"; + }; + nssPEM = fetchurl { url = http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz; sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw"; @@ -9,11 +15,11 @@ let in stdenv.mkDerivation rec { name = "nss-${version}"; - version = "3.34.1"; + version = "3.35"; src = fetchurl { - url = "mirror://mozilla/security/nss/releases/NSS_3_34_1_RTM/src/${name}.tar.gz"; - sha256 = "186x33wsk4mzjz7dzbn8p0py9a0nzkgzpfkdv4rlyy5gghv5vhd3"; + url = "mirror://mozilla/security/nss/releases/NSS_3_35_RTM/src/${name}.tar.gz"; + sha256 = "1ypn68z9ncbbshi3184ywrhx5i846lyd72gps1grzqzdkgh7s4pl"; }; buildInputs = [ perl zlib sqlite ] @@ -23,6 +29,8 @@ in stdenv.mkDerivation rec { prePatch = '' xz -d < ${nssPEM} | patch -p1 + '' + stdenv.lib.optionalString stdenv.isAarch64 '' + (cd nss && patch -p1 < ${aarch64Patch}) ''; patches = diff --git a/pkgs/development/libraries/ntbtls/default.nix b/pkgs/development/libraries/ntbtls/default.nix index b095c0366ad..a33b4996f33 100644 --- a/pkgs/development/libraries/ntbtls/default.nix +++ b/pkgs/development/libraries/ntbtls/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libgpgerror, libgcrypt, libksba, zlib }: +{ stdenv, fetchurl, gettext, libgpgerror, libgcrypt, libksba, zlib }: with stdenv.lib; @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { outputs = [ "dev" "out" ]; - buildInputs = [ libgcrypt libgpgerror libksba zlib ]; + buildInputs = [ libgcrypt libgpgerror libksba zlib ] + ++ stdenv.lib.optional stdenv.isDarwin gettext; postInstall = '' moveToOutput "bin/ntbtls-config" $dev diff --git a/pkgs/development/libraries/openexrid-unstable/default.nix b/pkgs/development/libraries/openexrid-unstable/default.nix index d8198357c64..099bd8d1e97 100644 --- a/pkgs/development/libraries/openexrid-unstable/default.nix +++ b/pkgs/development/libraries/openexrid-unstable/default.nix @@ -16,6 +16,11 @@ stdenv.mkDerivation rec patches = [ ./openexrid.patch ]; + postPatch = '' + substituteInPlace openexrid/makefile \ + --replace g++ c++ + ''; + NIX_CFLAGS_COMPILE=''-I${ilmbase.dev}/include/OpenEXR -I${openexr.dev}/include/OpenEXR -I${openfx.dev}/include/OpenFX @@ -38,7 +43,7 @@ stdenv.mkDerivation rec find $out mv $out/include $dev/ mv $out/lib $lib/ - ''; + ''; meta = with stdenv.lib; { description = "OpenEXR files able to isolate any object of a CG image with a perfect antialiazing"; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index af6a540b97c..5a9052222cb 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -113,20 +113,13 @@ let in { openssl_1_0_2 = common { - version = "1.0.2n"; - sha256 = "1zm82pyq5a9jm10q6iv7d3dih3xwjds4x30fqph3k317byvsn2rp"; + version = "1.0.2o"; + sha256 = "0kcy13l701054nhpbd901mz32v1kn4g311z0nifd83xs2jbmqgzc"; }; openssl_1_1_0 = common { - version = "1.1.0g"; - sha256 = "1bvka2wf33w2vxv7yw578nnjqyhz2b3chvfb0l4k2ffscw950kfy"; - patches = [ - (fetchpatch { - name = "CVE-2017-3738.patch"; - url = "https://github.com/openssl/openssl/commit/563066.patch"; - sha256 = "0ni9fwpxf8raw8b58pfa15akbqmxx4q64v0ldsm4b9dqhbxf8mkz"; - }) - ]; + version = "1.1.0h"; + sha256 = "05x509lccqjscgyi935z809pwfm708islypwhmjnb6cyvrn64daq"; }; } diff --git a/pkgs/development/libraries/openvdb/default.nix b/pkgs/development/libraries/openvdb/default.nix index f9540d2c4d2..8ed383c887b 100644 --- a/pkgs/development/libraries/openvdb/default.nix +++ b/pkgs/development/libraries/openvdb/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec LOG4CPLUS_LIB= BLOSC_INCLUDE_DIR=${c-blosc}/include/ BLOSC_LIB_DIR=${c-blosc}/lib/ - ''; + ''; installFlags = ''DESTDIR=$(out)''; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec description = "An open framework for voxel"; homepage = "http://www.openvdb.org"; maintainers = [ maintainers.guibou ]; - platforms = platforms.all; + platforms = platforms.linux; license = licenses.mpl20; }; } diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix index 5d533d4250a..c13b659f792 100644 --- a/pkgs/development/libraries/physics/rivet/default.nix +++ b/pkgs/development/libraries/physics/rivet/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2"; - sha256 = "1mvsa3v8d1pl2fj1dcdf8sikzm1yb2jcl0q34fyfsjw2cisxpv5f"; + sha256 = "007rwal8wx2k9gs0r6kym6ix0siz0x9l55q9myq41siirpf2jcpv"; }; patches = [ diff --git a/pkgs/development/libraries/protobuf/3.5.nix b/pkgs/development/libraries/protobuf/3.5.nix new file mode 100644 index 00000000000..db9cb6f0371 --- /dev/null +++ b/pkgs/development/libraries/protobuf/3.5.nix @@ -0,0 +1,6 @@ +{ callPackage, lib, ... }: + +lib.overrideDerivation (callPackage ./generic-v3.nix { + version = "3.5.1.1"; + sha256 = "1h4xydr5j2zg1888ncn8a1jvqq8fgpgckrmjg6lqzy9jpkvqvfdk"; +}) (attrs: { NIX_CFLAGS_COMPILE = "-Wno-error"; }) diff --git a/pkgs/development/libraries/ptlib/default.nix b/pkgs/development/libraries/ptlib/default.nix index f980a14aa41..ae60a6f69d6 100644 --- a/pkgs/development/libraries/ptlib/default.nix +++ b/pkgs/development/libraries/ptlib/default.nix @@ -24,12 +24,16 @@ stdenv.mkDerivation rec { (fetchpatch { url = http://sources.debian.net/data/main/p/ptlib/2.10.11~dfsg-2.1/debian/patches/no-sslv3; sha256 = "172s1dnnrl54p9sf1nl7s475sm78rpw3p8jxi0pdx6izzl8hcdr0"; }) - (fetchpatch { url = http://sources.debian.net/data/main/p/ptlib/2.10.11~dfsg-2.1/debian/patches/gcc-5_support; - sha256 = "0pf2yj0150r4cnc6nv65mclrm3dillqh1xjk7m6gsjnk9b96i5d4"; - }) ./ptlib-2.10.11-glibc-2.26.patch ]; + # fix typedef clashes with unixODBC>=2.3.5 + postPatch = '' + substituteInPlace include/ptlib/unix/ptlib/contain.h \ + --replace "typedef uintptr_t UINT" "typedef unsigned int UINT" \ + --replace "typedef wchar_t WCHAR" "typedef unsigned short WCHAR" + ''; + meta = with stdenv.lib; { description = "Portable Tools from OPAL VoIP"; maintainers = [ maintainers.raskin ]; diff --git a/pkgs/development/libraries/qca-qt5/default.nix b/pkgs/development/libraries/qca-qt5/default.nix index ee27d89f563..6e190a656f6 100644 --- a/pkgs/development/libraries/qca-qt5/default.nix +++ b/pkgs/development/libraries/qca-qt5/default.nix @@ -11,6 +11,10 @@ stdenv.mkDerivation rec { buildInputs = [ openssl qtbase ]; nativeBuildInputs = [ cmake pkgconfig ]; + # Without this patch cmake fails with a "No known features for CXX compiler" + # error on darwin + patches = stdenv.lib.optional stdenv.isDarwin ./move-project.patch ; + # tells CMake to use this CA bundle file if it is accessible preConfigure = ''export QC_CERTSTORE_PATH=/etc/ssl/certs/ca-certificates.crt''; @@ -22,6 +26,6 @@ stdenv.mkDerivation rec { homepage = http://delta.affinix.com/qca; maintainers = with maintainers; [ ttuegel ]; license = licenses.lgpl21Plus; - platforms = with platforms; linux; + platforms = with platforms; unix; }; } diff --git a/pkgs/development/libraries/qca-qt5/move-project.patch b/pkgs/development/libraries/qca-qt5/move-project.patch new file mode 100644 index 00000000000..2a109a3aa3c --- /dev/null +++ b/pkgs/development/libraries/qca-qt5/move-project.patch @@ -0,0 +1,19 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 453fd8a..5f6ee11 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -6,13 +6,13 @@ if(NOT CMAKE_INSTALL_PREFIX) + unset(CMAKE_INSTALL_PREFIX CACHE) + endif(NOT CMAKE_INSTALL_PREFIX) + +-project(qca) + + if(NOT APPLE) + cmake_minimum_required(VERSION 2.8.12) + else() + cmake_minimum_required(VERSION 3.0) + endif() ++project(qca) + + set(QCA_LIB_MAJOR_VERSION "2") + set(QCA_LIB_MINOR_VERSION "1") diff --git a/pkgs/development/libraries/qt-5/5.10/default.nix b/pkgs/development/libraries/qt-5/5.10/default.nix index 2ff9a46bc77..a45e055e60b 100644 --- a/pkgs/development/libraries/qt-5/5.10/default.nix +++ b/pkgs/development/libraries/qt-5/5.10/default.nix @@ -37,7 +37,9 @@ let srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; }; patches = { - qtbase = [ ./qtbase.patch ] ++ optional stdenv.isDarwin ./qtbase-darwin.patch; + qtbase = [ ./qtbase.patch ] ++ + optionals stdenv.isDarwin [ ./qtbase-darwin.patch + ./restore-pc-files.patch ]; qtdeclarative = [ ./qtdeclarative.patch ]; qtscript = [ ./qtscript.patch ]; qtserialport = [ ./qtserialport.patch ]; @@ -88,6 +90,7 @@ let qtscript = callPackage ../modules/qtscript.nix {}; qtsensors = callPackage ../modules/qtsensors.nix {}; qtserialport = callPackage ../modules/qtserialport.nix {}; + qtspeech = callPackage ../modules/qtspeech.nix {}; qtsvg = callPackage ../modules/qtsvg.nix {}; qttools = callPackage ../modules/qttools.nix {}; qttranslations = callPackage ../modules/qttranslations.nix {}; diff --git a/pkgs/development/libraries/qt-5/5.10/restore-pc-files.patch b/pkgs/development/libraries/qt-5/5.10/restore-pc-files.patch new file mode 100644 index 00000000000..a2355549d4a --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.10/restore-pc-files.patch @@ -0,0 +1,15 @@ +Partially reverts . + +diff --git i/mkspecs/features/qt_module.prf w/mkspecs/features/qt_module.prf +index bb28af97..36bb6483 100644 +--- i/mkspecs/features/qt_module.prf ++++ w/mkspecs/features/qt_module.prf +@@ -245,7 +245,7 @@ load(qt_installs) + load(qt_targets) + + # this builds on top of qt_common +-!internal_module:!lib_bundle:if(unix|mingw) { ++!internal_module:if(unix|mingw) { + CONFIG += create_pc + QMAKE_PKGCONFIG_DESTDIR = pkgconfig + host_build: \ \ No newline at end of file diff --git a/pkgs/development/libraries/qt-5/modules/qtlocation.nix b/pkgs/development/libraries/qt-5/modules/qtlocation.nix index 008583ebaf9..e8952e29cba 100644 --- a/pkgs/development/libraries/qt-5/modules/qtlocation.nix +++ b/pkgs/development/libraries/qt-5/modules/qtlocation.nix @@ -1,4 +1,4 @@ -{ qtModule, qtbase, qtmultimedia }: +{ stdenv, qtModule, qtbase, qtmultimedia }: qtModule { name = "qtlocation"; @@ -6,4 +6,11 @@ qtModule { outputs = [ "bin" "out" "dev" ]; # Linking with -lclipper fails with parallel build enabled enableParallelBuilding = false; + qmakeFlags = stdenv.lib.optional stdenv.isDarwin [ + # boost uses std::auto_ptr which has been disabled in clang with libcxx + # This flag re-enables this feature + # https://libcxx.llvm.org/docs/UsingLibcxx.html#c-17-specific-configuration-macros + "QMAKE_CXXFLAGS+=-D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR" + ]; + } diff --git a/pkgs/development/libraries/qt-5/modules/qtspeech.nix b/pkgs/development/libraries/qt-5/modules/qtspeech.nix new file mode 100644 index 00000000000..7b4b19ccab5 --- /dev/null +++ b/pkgs/development/libraries/qt-5/modules/qtspeech.nix @@ -0,0 +1,7 @@ +{ qtModule }: + +qtModule { + name = "qtspeech"; + qtInputs = [ ]; + outputs = [ "out" "dev" "bin" ]; +} diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix index 5085d9bf5ef..8667f272cf7 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix +++ b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "qtstyleplugin-kvantum-${version}"; - version = "0.10.4"; + version = "0.10.6"; src = fetchFromGitHub { owner = "tsujan"; repo = "Kvantum"; - rev = "0527bb03f2252269fd382e11181a34ca72c96b4b"; - sha256 = "0ky44s1fgqxraywagx1mv07yz76ppgiz3prq447db78wkwqg2d8p"; + rev = "a6daa1a6df3c5d4abc7ea39ef7028ddea2addbf6"; + sha256 = "1zns4x95h0ydiwx8yw0bmyg4lc2sy7annmdrg66sx753x3177zxp"; }; nativeBuildInputs = [ qmake qttools ]; @@ -16,15 +16,16 @@ stdenv.mkDerivation rec { postUnpack = "sourceRoot=\${sourceRoot}/Kvantum"; - postInstall= '' - mkdir -p $out/$qtPluginPrefix/styles - mv $NIX_QT5_TMP/$qtPluginPrefix/styles/libkvantum.so $out/$qtPluginPrefix/styles/libkvantum.so + postPatch = '' + # Fix plugin dir + substituteInPlace style/style.pro \ + --replace "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix" ''; meta = with stdenv.lib; { description = "SVG-based Qt5 theme engine plus a config tool and extra themes"; homepage = "https://github.com/tsujan/Kvantum"; - license = licenses.gpl2; + license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.bugworm ]; }; diff --git a/pkgs/development/libraries/rabbitmq-c/default.nix b/pkgs/development/libraries/rabbitmq-c/default.nix index 13c0198ba50..c841d82ccce 100644 --- a/pkgs/development/libraries/rabbitmq-c/default.nix +++ b/pkgs/development/libraries/rabbitmq-c/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { description = "RabbitMQ C AMQP client library"; homepage = https://github.com/alanxz/rabbitmq-c; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/rapidjson/default.nix b/pkgs/development/libraries/rapidjson/default.nix index 5e9a11d4251..8e6b3b44491 100644 --- a/pkgs/development/libraries/rapidjson/default.nix +++ b/pkgs/development/libraries/rapidjson/default.nix @@ -13,6 +13,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig cmake ]; + # detected by gcc7 + NIX_CFLAGS_COMPILE = [ "-Wno-error=implicit-fallthrough" ]; + meta = with lib; { description = "Fast JSON parser/generator for C++ with both SAX/DOM style API"; homepage = "http://rapidjson.org/"; diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix index bb43a49235b..8e1ea9cd5c1 100644 --- a/pkgs/development/libraries/rdkafka/default.nix +++ b/pkgs/development/libraries/rdkafka/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, zlib, perl, pkgconfig, python }: +{ stdenv, fetchFromGitHub, zlib, perl, pkgconfig, python, openssl }: stdenv.mkDerivation rec { name = "rdkafka-${version}"; @@ -12,12 +12,10 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ zlib perl python ]; + buildInputs = [ zlib perl python openssl ]; NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow"; - configureFlags = stdenv.lib.optionals stdenv.isDarwin [ "--disable-ssl" ]; - postPatch = '' patchShebangs . ''; diff --git a/pkgs/development/libraries/schroedinger/default.nix b/pkgs/development/libraries/schroedinger/default.nix index d8e67baa13d..2309719c2bd 100644 --- a/pkgs/development/libraries/schroedinger/default.nix +++ b/pkgs/development/libraries/schroedinger/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation { homepage = http://diracvideo.org/; maintainers = [ maintainers.spwhitt ]; license = [ licenses.mpl11 licenses.lgpl2 licenses.mit ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/science/math/caffe2/default.nix b/pkgs/development/libraries/science/math/caffe2/default.nix index b055acba9f1..916bf122b3c 100644 --- a/pkgs/development/libraries/science/math/caffe2/default.nix +++ b/pkgs/development/libraries/science/math/caffe2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, config, fetchFromGitHub +{ stdenv, lib, config, fetchFromGitHub, fetchpatch , cmake , glog, google-gflags, gtest , protobuf, snappy @@ -56,6 +56,8 @@ let }; dst = "pybind11"; }; + + ccVersion = (builtins.parseDrvName stdenv.cc.name).version; in stdenv.mkDerivation rec { @@ -84,7 +86,9 @@ stdenv.mkDerivation rec { ; propagatedBuildInputs = [ numpy future six python-protobuf pydot ]; - patches = lib.optional stdenv.cc.isClang [ ./update_clang_cvtsh_bugfix.patch ]; + patches = lib.optional (stdenv.cc.isGNU && lib.versionAtLeast ccVersion "7.0.0") [ + ./fix_compilation_on_gcc7.patch + ] ++ lib.optional stdenv.cc.isClang [ ./update_clang_cvtsh_bugfix.patch ]; cmakeFlags = [ ''-DBUILD_TEST=OFF'' ''-DBUILD_PYTHON=ON'' @@ -133,7 +137,7 @@ stdenv.mkDerivation rec { algorithms. You can bring your creations to scale using the power of GPUs in the cloud or to the masses on mobile with Caffe2's cross-platform libraries. ''; - platforms = with stdenv.lib.platforms; linux ++ darwin; + platforms = with stdenv.lib.platforms; linux; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [ yuriaisaka ]; }; diff --git a/pkgs/development/libraries/science/math/caffe2/fix_compilation_on_gcc7.patch b/pkgs/development/libraries/science/math/caffe2/fix_compilation_on_gcc7.patch new file mode 100644 index 00000000000..f319f20233a --- /dev/null +++ b/pkgs/development/libraries/science/math/caffe2/fix_compilation_on_gcc7.patch @@ -0,0 +1,46 @@ +diff --git a/caffe2/operators/recurrent_network_op.cc b/caffe2/operators/recurrent_network_op.cc +index dd4fded..5995e8a 100644 +--- a/caffe2/operators/recurrent_network_op.cc ++++ b/caffe2/operators/recurrent_network_op.cc +@@ -1,4 +1,4 @@ +-#include "recurrent_network_op.h" ++#include "caffe2/operators/recurrent_network_op.h" + #include "caffe2/core/workspace.h" + + namespace caffe2 { +diff --git a/caffe2/operators/recurrent_network_op.h b/caffe2/operators/recurrent_network_op.h +index 55328e5..ea898bc 100644 +--- a/caffe2/operators/recurrent_network_op.h ++++ b/caffe2/operators/recurrent_network_op.h +@@ -762,8 +762,8 @@ class AccumulateInputGradientOp : public Operator { + USE_OPERATOR_CONTEXT_FUNCTIONS; + + bool RunOnDevice() override { +- const auto t = +- OperatorBase::Input>(0).template data()[0]; ++ const auto& t0 = OperatorBase::Input>(0); ++ const auto t = t0.template data()[0]; + auto& og = Input(1); + auto* g = Output(0); + +diff --git a/caffe2/queue/queue_ops.h b/caffe2/queue/queue_ops.h +index f2c0a33..642343f 100644 +--- a/caffe2/queue/queue_ops.h ++++ b/caffe2/queue/queue_ops.h +@@ -17,13 +17,10 @@ class CreateBlobsQueueOp final : public Operator { + name(operator_def.output().Get(0)) {} + + bool RunOnDevice() override { +- const auto capacity = +- OperatorBase::template GetSingleArgument("capacity", 1); +- const auto numBlobs = +- OperatorBase::template GetSingleArgument("num_blobs", 1); ++ const auto capacity = GetSingleArgument("capacity", 1); ++ const auto numBlobs = GetSingleArgument("num_blobs", 1); + const auto enforceUniqueName = +- OperatorBase::template GetSingleArgument( +- "enforce_unique_name", false); ++ GetSingleArgument("enforce_unique_name", false); + const auto fieldNames = + OperatorBase::template GetRepeatedArgument("field_names"); + CAFFE_ENFORCE_EQ(this->OutputSize(), 1); diff --git a/pkgs/development/libraries/science/math/clblas/default.nix b/pkgs/development/libraries/science/math/clblas/default.nix index 40b02d30341..7a653a58eb2 100644 --- a/pkgs/development/libraries/science/math/clblas/default.nix +++ b/pkgs/development/libraries/science/math/clblas/default.nix @@ -7,6 +7,7 @@ , python , ocl-icd , opencl-headers +, Accelerate, CoreGraphics, CoreVideo, OpenCL , gtest }: @@ -40,11 +41,19 @@ stdenv.mkDerivation rec { gfortran blas python - ocl-icd - opencl-headers boost gtest - ]; + ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ + ocl-icd + opencl-headers + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + Accelerate + CoreGraphics + CoreVideo + ]; + propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ + OpenCL + ]; enableParallelBuilding = true; @@ -56,7 +65,7 @@ stdenv.mkDerivation rec { ''; license = licenses.asl20; maintainers = with maintainers; [ artuuge ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 07d2a04c5e2..5ac0bcd1d7d 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -60,7 +60,7 @@ let TARGET = "ATHLON"; DYNAMIC_ARCH = "1"; CC = "gcc"; - USE_OPENMP = "1"; + USE_OPENMP = if stdenv.hostPlatform.isMusl then "0" else "1"; }; }; in diff --git a/pkgs/development/libraries/science/math/petsc/default.nix b/pkgs/development/libraries/science/math/petsc/default.nix index efedbe725af..e1ce4b49747 100644 --- a/pkgs/development/libraries/science/math/petsc/default.nix +++ b/pkgs/development/libraries/science/math/petsc/default.nix @@ -16,6 +16,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ blas gfortran.cc.lib liblapack python ]; + prePatch = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace config/install.py \ + --replace /usr/bin/install_name_tool install_name_tool + ''; + preConfigure = '' patchShebangs . configureFlagsArray=( diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index 05ddde9ddef..b2fdf1b8098 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -1,8 +1,29 @@ { stdenv, fetchurl, pkgconfig, spice-protocol, gettext, celt_0_5_1 , openssl, libpulseaudio, pixman, gobjectIntrospection, libjpeg_turbo, zlib , cyrus_sasl, python2Packages, autoreconfHook, usbredir, libsoup -, polkit, acl, usbutils, vala -, gtk3, epoxy }: +, withPolkit ? true, polkit, acl, usbutils +, vala, gtk3, epoxy }: + +# If this package is built with polkit support (withPolkit=true), +# usb redirection reqires spice-client-glib-usb-acl-helper to run setuid root. +# The helper confirms via polkit that the user has an active session, +# then adds a device acl entry for that user. +# Example NixOS config to create a setuid wrapper for the helper: +# security.wrappers.spice-client-glib-usb-acl-helper.source = +# "${pkgs.spice-gtk}/bin/spice-client-glib-usb-acl-helper"; +# On non-NixOS installations, make a setuid copy of the helper +# outside the store and adjust PATH to find the setuid version. + +# If this package is built without polkit support (withPolkit=false), +# usb redirection requires read-write access to usb devices. +# This can be granted by adding users to a custom group like "usb" +# and using a udev rule to put all usb devices in that group. +# Example NixOS config: +# users.groups.usb = {}; +# users.users.dummy.extraGroups = [ "usb" ]; +# services.udev.extraRules = '' +# KERNEL=="*", SUBSYSTEMS=="usb", MODE="0664", GROUP="usb" +# ''; with stdenv.lib; @@ -16,11 +37,16 @@ in stdenv.mkDerivation rec { sha256 = "1vknp72pl6v6nf3dphhwp29hk6gv787db2pmyg4m312z2q0hwwp9"; }; + postPatch = '' + # get rid of absolute path to helper in store so we can use a setuid wrapper + substituteInPlace src/usb-acl-helper.c \ + --replace 'ACL_HELPER_PATH"/' '"' + ''; + buildInputs = [ spice-protocol celt_0_5_1 openssl libpulseaudio pixman gobjectIntrospection libjpeg_turbo zlib cyrus_sasl python pygtk usbredir gtk3 epoxy - polkit acl usbutils - ]; + ] ++ optionals withPolkit [ polkit acl usbutils ] ; nativeBuildInputs = [ pkgconfig gettext libsoup autoreconfHook vala ]; @@ -36,16 +62,6 @@ in stdenv.mkDerivation rec { "--with-gtk3" ]; - # usb redirection needs spice-client-glib-usb-acl-helper to run setuid root - # the helper then uses polkit to check access - # in nixos, enable this with - # security.wrappers.spice-client-glib-usb-acl-helper.source = - # "${pkgs.spice_gtk}/bin/spice-client-glib-usb-acl-helper.real"; - postFixup = '' - mv $out/bin/spice-client-glib-usb-acl-helper $out/bin/spice-client-glib-usb-acl-helper.real - ln -sf /run/wrappers/bin/spice-client-glib-usb-acl-helper $out/bin/spice-client-glib-usb-acl-helper - ''; - dontDisableStatic = true; # Needed by the coroutine test enableParallelBuilding = true; diff --git a/pkgs/development/libraries/tremor/default.nix b/pkgs/development/libraries/tremor/default.nix index 5e08a61cd1b..5609f1d67d1 100644 --- a/pkgs/development/libraries/tremor/default.nix +++ b/pkgs/development/libraries/tremor/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchsvn, autoreconfHook, pkgconfig, libogg }: +{ stdenv, fetchgit, autoreconfHook, pkgconfig, libogg }: stdenv.mkDerivation rec { - name = "tremor-svn-${src.rev}"; + name = "tremor-unstable-2018-03-16"; - src = fetchsvn { - url = http://svn.xiph.org/trunk/Tremor; - rev = "17866"; - sha256 = "161411cbefa1527da7a8fc087e78d8e21d19143d3a6eb42fb281e5026aad7568"; + src = fetchgit { + url = https://git.xiph.org/tremor.git; + rev = "562307a4a7082e24553f3d2c55dab397a17c4b4f"; + sha256 = "0m07gq4zfgigsiz8b518xyb19v7qqp76qmp7lb262825vkqzl3zq"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index 3246c23ab02..099794f6623 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -156,10 +156,12 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ which ]; - buildInputs = [ readline python icu patchelf ] - ++ stdenv.lib.optionals stdenv.isDarwin [ cctools ]; + buildInputs = [ readline python icu ] + ++ stdenv.lib.optional stdenv.isDarwin cctools + ++ stdenv.lib.optional stdenv.isLinux patchelf; - NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow -Wno-error=unused-function -Wno-error=attributes"; + NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow -Wno-error=unused-function -Wno-error=attributes" + + stdenv.lib.optionalString stdenv.cc.isClang " -Wno-error=unused-lambda-capture"; buildFlags = [ "LINK=c++" diff --git a/pkgs/development/libraries/webkitgtk/2.18.nix b/pkgs/development/libraries/webkitgtk/2.20.nix similarity index 56% rename from pkgs/development/libraries/webkitgtk/2.18.nix rename to pkgs/development/libraries/webkitgtk/2.20.nix index cecac45a3dc..f83aea198f9 100644 --- a/pkgs/development/libraries/webkitgtk/2.18.nix +++ b/pkgs/development/libraries/webkitgtk/2.20.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, perl, python2, ruby, bison, gperf, cmake -, pkgconfig, gettext, gobjectIntrospection, libnotify, gnutls +{ stdenv, fetchurl, perl, python2, ruby, bison, gperf, cmake, ninja +, pkgconfig, gettext, gobjectIntrospection, libnotify, gnutls, libgcrypt , gtk3, wayland, libwebp, enchant, xlibs, libxkbcommon, epoxy, at-spi2-core , libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs, pcre, nettle, libtasn1, p11-kit , libidn, libedit, readline, libGLU_combined, libintlOrEmpty , enableGeoLocation ? true, geoclue2, sqlite , enableGtk2Plugins ? false, gtk2 ? null -, gst-plugins-base, gst-plugins-bad +, gst-plugins-base, gst-plugins-bad, woff2 }: assert enableGeoLocation -> geoclue2 != null; @@ -15,7 +15,7 @@ assert stdenv.isDarwin -> !enableGtk2Plugins; with stdenv.lib; stdenv.mkDerivation rec { name = "webkitgtk-${version}"; - version = "2.18.6"; + version = "2.20.1"; meta = { description = "Web content rendering engine, GTK+ port"; @@ -26,48 +26,35 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ ]; }; - postConfigure = optionalString stdenv.isDarwin '' - substituteInPlace Source/WebKit2/CMakeFiles/WebKit2.dir/link.txt \ - --replace "../../lib/libWTFGTK.a" "" - substituteInPlace Source/JavaScriptCore/CMakeFiles/JavaScriptCore.dir/link.txt \ - --replace "../../lib/libbmalloc.a" "" - sed -i "s|[\./]*\.\./lib/lib[^\.]*\.a||g" \ - Source/JavaScriptCore/CMakeFiles/LLIntOffsetsExtractor.dir/link.txt \ - Source/JavaScriptCore/shell/CMakeFiles/jsc.dir/link.txt \ - Source/JavaScriptCore/shell/CMakeFiles/testb3.dir/link.txt \ - Source/WebKit2/CMakeFiles/DatabaseProcess.dir/link.txt \ - Source/WebKit2/CMakeFiles/NetworkProcess.dir/link.txt \ - Source/WebKit2/CMakeFiles/webkit2gtkinjectedbundle.dir/link.txt \ - Source/WebKit2/CMakeFiles/WebProcess.dir/link.txt - substituteInPlace Source/JavaScriptCore/CMakeFiles/JavaScriptCore.dir/link.txt \ - --replace "../../lib/libWTFGTK.a" "-Wl,-all_load ../../lib/libWTFGTK.a" - ''; - src = fetchurl { url = "http://webkitgtk.org/releases/${name}.tar.xz"; - sha256 = "0g5cpdijjv5hlrbi4i4dh97yrh5apnyvm90wpr9f84hgyk12r4ck"; + sha256 = "0nc9dj05dbk31ciip08b3rdsfja7ckc5mgagrj030fafza2k5r23"; }; - # see if we can clean this up.... - - patches = [ ./finding-harfbuzz-icu.patch ] - ++ optionals stdenv.isDarwin [ - ./PR-152650-2.patch - ./PR-153138.patch - ./PR-157554.patch - ./PR-157574.patch + patches = optionals stdenv.isDarwin [ + ## TODO add necessary patches for Darwin ]; + postPatch = '' + patchShebangs . + ''; + + postConfigure = '' + # A stopgap for a non-deterministic build failure when using only one core + # Upstream bug: https://bugs.webkit.org/show_bug.cgi?id=183788#c4 + ninja JavaScriptCoreForwardingHeaders WTFForwardingHeaders + ''; + cmakeFlags = [ "-DPORT=GTK" "-DUSE_LIBHYPHEN=0" + "-DENABLE_INTROSPECTION=ON" ] ++ optional (!enableGtk2Plugins) "-DENABLE_PLUGIN_PROCESS_GTK2=OFF" ++ optional stdenv.isLinux "-DENABLE_GLES2=ON" ++ optionals stdenv.isDarwin [ "-DUSE_SYSTEM_MALLOC=ON" "-DUSE_ACCELERATE=0" - "-DENABLE_INTROSPECTION=ON" "-DENABLE_MINIBROWSER=OFF" "-DENABLE_VIDEO=ON" "-DENABLE_QUARTZ_TARGET=ON" @@ -82,12 +69,12 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl"; nativeBuildInputs = [ - cmake perl python2 ruby bison gperf + cmake ninja perl python2 ruby bison gperf pkgconfig gettext gobjectIntrospection ]; buildInputs = libintlOrEmpty ++ [ - libwebp enchant libnotify gnutls pcre nettle libidn + libwebp enchant libnotify gnutls pcre nettle libidn libgcrypt woff2 libxml2 libsecret libxslt harfbuzz libpthreadstubs libtasn1 p11-kit sqlite gst-plugins-base gst-plugins-bad libxkbcommon epoxy at-spi2-core ] ++ optional enableGeoLocation geoclue2 @@ -100,7 +87,5 @@ stdenv.mkDerivation rec { libsoup gtk3 ]; - enableParallelBuilding = true; - outputs = [ "out" "dev" ]; } diff --git a/pkgs/development/libraries/webkitgtk/PR-152650-2.patch b/pkgs/development/libraries/webkitgtk/PR-152650-2.patch deleted file mode 100644 index f87b8ee73e2..00000000000 --- a/pkgs/development/libraries/webkitgtk/PR-152650-2.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 4607ea0a569b3c527ae8dce341ab55eb0d69d8f7 Mon Sep 17 00:00:00 2001 -From: Jeremy Huddleston Sequoia -Date: Tue, 8 Mar 2016 17:26:23 -0800 -Subject: [PATCH 2/2] [GTK][Mac] Enable support for gtk-doc on Mac - -https://bugs.webkit.org/show_bug.cgi?id=152650 - -Signed-off-by: Jeremy Huddleston Sequoia ---- - ChangeLog | 10 ++++++++++ - Source/PlatformGTK.cmake | 2 +- - Source/cmake/OptionsGTK.cmake | 5 ----- - 3 files changed, 11 insertions(+), 6 deletions(-) - -diff --git a/Source/PlatformGTK.cmake b/Source/PlatformGTK.cmake -index af4d2e3..0b11b56 100644 ---- a/Source/PlatformGTK.cmake -+++ b/Source/PlatformGTK.cmake -@@ -34,7 +34,7 @@ endmacro() - add_gtkdoc_generator("docs-build.stamp" "") - if (ENABLE_GTKDOC) - add_custom_target(gtkdoc ALL DEPENDS "${CMAKE_BINARY_DIR}/docs-build.stamp") --elseif (NOT ENABLED_COMPILER_SANITIZERS AND NOT CMAKE_CROSSCOMPILING AND NOT APPLE) -+elseif (NOT ENABLED_COMPILER_SANITIZERS AND NOT CMAKE_CROSSCOMPILING) - add_custom_target(gtkdoc DEPENDS "${CMAKE_BINARY_DIR}/docs-build.stamp") - - # Add a default build step which check that documentation does not have any warnings -diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake -index 6b01f1a..b443d10 100644 ---- a/Source/cmake/OptionsGTK.cmake -+++ b/Source/cmake/OptionsGTK.cmake -@@ -424,11 +424,6 @@ if (CMAKE_CROSSCOMPILING) - set(ENABLE_INTROSPECTION OFF) - endif () - --# Override the cached variable, gtk-doc does not really work when building on Mac. --if (APPLE) -- set(ENABLE_GTKDOC OFF) --endif () -- - set(DERIVED_SOURCES_WEBKITGTK_DIR ${DERIVED_SOURCES_DIR}/webkitgtk) - set(DERIVED_SOURCES_WEBKITGTK_API_DIR ${DERIVED_SOURCES_WEBKITGTK_DIR}/webkit) - set(DERIVED_SOURCES_WEBKIT2GTK_DIR ${DERIVED_SOURCES_DIR}/webkit2gtk) -diff --git a/Tools/gtk/gtkdoc.py b/Tools/gtk/gtkdoc.py -index 4c8237b..a628ae0 100644 ---- a/Tools/gtk/gtkdoc.py -+++ b/Tools/gtk/gtkdoc.py -@@ -322,6 +322,11 @@ class GTKDoc(object): - env['RUN'] = 'LD_LIBRARY_PATH="%s:%s" ' % (self.library_path, current_ld_library_path) - else: - env['RUN'] = 'LD_LIBRARY_PATH="%s" ' % self.library_path -+ current_dyld_library_path = env.get('DYLD_LIBRARY_PATH') -+ if current_ld_library_path: -+ env['RUN'] = 'DYLD_LIBRARY_PATH="%s:%s" ' % (self.library_path, current_dyld_library_path) -+ else: -+ env['RUN'] = 'DYLD_LIBRARY_PATH="%s" ' % self.library_path - - if ldflags: - env['LDFLAGS'] = '%s %s' % (ldflags, env.get('LDFLAGS', '')) --- -2.7.2 - diff --git a/pkgs/development/libraries/webkitgtk/PR-153138.patch b/pkgs/development/libraries/webkitgtk/PR-153138.patch deleted file mode 100644 index 833921f6806..00000000000 --- a/pkgs/development/libraries/webkitgtk/PR-153138.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 07886d9eacb7587dd52a9bcae10c1fc8ab56a910 Mon Sep 17 00:00:00 2001 -From: Jeremy Huddleston Sequoia -Date: Fri, 15 Jan 2016 11:53:07 -0800 -Subject: [PATCH] https://bugs.webkit.org/show_bug.cgi?id=153138 - -Signed-off-by: Jeremy Huddleston Sequoia ---- - Source/JavaScriptCore/bytecode/StructureStubInfo.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/Source/JavaScriptCore/bytecode/StructureStubInfo.cpp b/Source/JavaScriptCore/bytecode/StructureStubInfo.cpp -index 1e4b4f5..9b27aed 100644 ---- a/Source/JavaScriptCore/bytecode/StructureStubInfo.cpp -+++ b/Source/JavaScriptCore/bytecode/StructureStubInfo.cpp -@@ -26,6 +26,8 @@ - #include "config.h" - #include "StructureStubInfo.h" - -+#include "JSCellInlines.h" -+ - #include "JSObject.h" - #include "PolymorphicAccess.h" - #include "Repatch.h" --- -2.7.0 - diff --git a/pkgs/development/libraries/webkitgtk/PR-157554.patch b/pkgs/development/libraries/webkitgtk/PR-157554.patch deleted file mode 100644 index 615e805c92c..00000000000 --- a/pkgs/development/libraries/webkitgtk/PR-157554.patch +++ /dev/null @@ -1,33 +0,0 @@ -https://bugs.webkit.org/show_bug.cgi?id=157554 - ---- a/Source/WTF/wtf/OSRandomSource.cpp -+++ b/Source/WTF/wtf/OSRandomSource.cpp -@@ -29,7 +29,7 @@ - #include - #include - --#if !OS(DARWIN) && OS(UNIX) -+#if OS(UNIX) && !(OS(DARWIN) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070) - #include - #include - #include -@@ -46,7 +46,7 @@ - - namespace WTF { - --#if !OS(DARWIN) && OS(UNIX) -+#if OS(UNIX) && !(OS(DARWIN) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070) - NEVER_INLINE NO_RETURN_DUE_TO_CRASH static void crashUnableToOpenURandom() - { - CRASH(); -@@ -60,8 +56,8 @@ NEVER_INLINE NO_RETURN_DUE_TO_CRASH static void crashUnableToReadFromURandom() - - void cryptographicallyRandomValuesFromOS(unsigned char* buffer, size_t length) - { --#if OS(DARWIN) -- RELEASE_ASSERT(!CCRandomCopyBytes(kCCRandomDefault, buffer, length)); -+#if OS(DARWIN) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070 -+ return arc4random_buf(buffer, length); - #elif OS(UNIX) - int fd = open("/dev/urandom", O_RDONLY, 0); - if (fd < 0) diff --git a/pkgs/development/libraries/webkitgtk/PR-157574.patch b/pkgs/development/libraries/webkitgtk/PR-157574.patch deleted file mode 100644 index d9b0795afa5..00000000000 --- a/pkgs/development/libraries/webkitgtk/PR-157574.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff --git a/Source/JavaScriptCore/API/WebKitAvailability.h b/Source/JavaScriptCore/API/WebKitAvailability.h -index ab53183..1310dec 100644 ---- a/Source/JavaScriptCore/API/WebKitAvailability.h -+++ b/Source/JavaScriptCore/API/WebKitAvailability.h -@@ -27,57 +27,12 @@ - #define __WebKitAvailability__ - - #if defined(__APPLE__) -- --#include - #include -- --#if !TARGET_OS_IPHONE && __MAC_OS_X_VERSION_MIN_REQUIRED < 101100 --/* To support availability macros that mention newer OS X versions when building on older OS X versions, -- we provide our own definitions of the underlying macros that the availability macros expand to. We're -- free to expand the macros as no-ops since frameworks built on older OS X versions only ship bundled with -- an application rather than as part of the system. --*/ -- --#ifndef __NSi_10_10 // Building from trunk rather than SDK. --#define __NSi_10_10 introduced=10.0 // Use 10.0 to indicate that everything is available. --#endif -- --#ifndef __NSi_10_11 // Building from trunk rather than SDK. --#define __NSi_10_11 introduced=10.0 // Use 10.0 to indicate that everything is available. --#endif -- --#ifndef __NSi_10_12 // Building from trunk rather than SDK. --#define __NSi_10_12 introduced=10.0 // Use 10.0 to indicate that everything is available. --#endif -- --#ifndef __AVAILABILITY_INTERNAL__MAC_10_9 --#define __AVAILABILITY_INTERNAL__MAC_10_9 --#endif -- --#ifndef __AVAILABILITY_INTERNAL__MAC_10_10 --#define __AVAILABILITY_INTERNAL__MAC_10_10 - #endif - --#ifndef AVAILABLE_MAC_OS_X_VERSION_10_9_AND_LATER --#define AVAILABLE_MAC_OS_X_VERSION_10_9_AND_LATER --#endif -- --#ifndef AVAILABLE_MAC_OS_X_VERSION_10_10_AND_LATER --#define AVAILABLE_MAC_OS_X_VERSION_10_10_AND_LATER --#endif -- --#endif /* __MAC_OS_X_VERSION_MIN_REQUIRED <= 101100 */ -- --#if defined(BUILDING_GTK__) - #undef CF_AVAILABLE - #define CF_AVAILABLE(_mac, _ios) - #undef CF_ENUM_AVAILABLE - #define CF_ENUM_AVAILABLE(_mac, _ios) --#endif -- --#else --#define CF_AVAILABLE(_mac, _ios) --#define CF_ENUM_AVAILABLE(_mac, _ios) --#endif - - #endif /* __WebKitAvailability__ */ diff --git a/pkgs/development/libraries/webkitgtk/finding-harfbuzz-icu.patch b/pkgs/development/libraries/webkitgtk/finding-harfbuzz-icu.patch deleted file mode 100644 index 14d58ef04f6..00000000000 --- a/pkgs/development/libraries/webkitgtk/finding-harfbuzz-icu.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- webkitgtk-2.6.1.orig/Source/cmake/FindHarfBuzz.cmake 2014-10-09 01:54:38.000000000 +0800 -+++ webkitgtk-2.6.1/Source/cmake/FindHarfBuzz.cmake 2014-10-15 13:41:29.832290412 +0800 -@@ -34,21 +34,39 @@ - - pkg_check_modules(PC_HARFBUZZ harfbuzz>=0.9.7) - --find_path(HARFBUZZ_INCLUDE_DIRS NAMES hb.h -- HINTS ${PC_HARFBUZZ_INCLUDE_DIRS} ${PC_HARFBUZZ_INCLUDEDIR} --) -- --find_library(HARFBUZZ_LIBRARIES NAMES harfbuzz -- HINTS ${PC_HARFBUZZ_LIBRARY_DIRS} ${PC_HARFBUZZ_LIBDIR} --) -- - # HarfBuzz 0.9.18 split ICU support into a separate harfbuzz-icu library. - if ("${PC_HARFBUZZ_VERSION}" VERSION_GREATER "0.9.17") - pkg_check_modules(PC_HARFBUZZ_ICU harfbuzz-icu>=0.9.18 REQUIRED) -- find_library(HARFBUZZ_ICU_LIBRARIES NAMES harfbuzz-icu -+ -+ find_path(HARFBUZZ_ICU_INCLUDEDIR NAMES hb-icu.h -+ HINTS ${PC_HARFBUZZ_ICU_INCLUDE_DIRS} ${PC_HARFBUZZ_INCLUDEDIR} -+ ) -+ -+ find_library(HARFBUZZ_ICU_LIBRARY NAMES harfbuzz-icu - HINTS ${PC_HARFBUZZ_ICU_LIBRARY_DIRS} ${PC_HARFBUZZ_ICU_LIBDIR} - ) -- list(APPEND HARFBUZZ_LIBRARIES "${HARFBUZZ_ICU_LIBRARIES}") -+ -+ find_library(HARFBUZZ_LIBRARY NAMES harfbuzz -+ HINTS ${PC_HARFBUZZ_LIBRARY_DIRS} ${PC_HARFBUZZ_LIBDIR} -+ ) -+ -+ set(HARFBUZZ_INCLUDE_DIRS -+ ${PC_HARFBUZZ_INCLUDE_DIRS} ${HARFBUZZ_ICU_INCLUDEDIR} -+ CACHE INTERNAL "" -+ ) -+ -+ set(HARFBUZZ_LIBRARIES -+ ${HARFBUZZ_LIBRARY} ${HARFBUZZ_ICU_LIBRARY} -+ CACHE INTERNAL "" -+ ) -+else () -+ find_path(HARFBUZZ_INCLUDE_DIRS NAMES hb.h -+ HINTS ${PC_HARFBUZZ_INCLUDE_DIRS} ${PC_HARFBUZZ_INCLUDEDIR} -+ ) -+ -+ find_library(HARFBUZZ_LIBRARIES NAMES harfbuzz -+ HINTS ${PC_HARFBUZZ_LIBRARY_DIRS} ${PC_HARFBUZZ_LIBDIR} -+ ) - endif () - - include(FindPackageHandleStandardArgs) diff --git a/pkgs/development/libraries/webkitgtk/gstreamergl-2.17.patch b/pkgs/development/libraries/webkitgtk/gstreamergl-2.17.patch deleted file mode 100644 index 7c47db52aba..00000000000 --- a/pkgs/development/libraries/webkitgtk/gstreamergl-2.17.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git i/Source/cmake/OptionsGTK.cmake w/Source/cmake/OptionsGTK.cmake -index d3577a8..9620dc0 100644 ---- i/Source/cmake/OptionsGTK.cmake -+++ w/Source/cmake/OptionsGTK.cmake -@@ -94,7 +94,7 @@ WEBKIT_OPTION_DEFINE(USE_LIBSECRET "Whether to enable the persistent credential - - # Private options specific to the GTK+ port. Changing these options is - # completely unsupported. They are intended for use only by WebKit developers. --WEBKIT_OPTION_DEFINE(USE_GSTREAMER_GL "Whether to enable support for GStreamer GL" PRIVATE ON) -+WEBKIT_OPTION_DEFINE(USE_GSTREAMER_GL "Whether to enable support for GStreamer GL" PRIVATE OFF) - WEBKIT_OPTION_DEFINE(USE_GSTREAMER_MPEGTS "Whether to enable support for MPEG-TS" PRIVATE OFF) - WEBKIT_OPTION_DEFINE(USE_REDIRECTED_XCOMPOSITE_WINDOW "Whether to use a Redirected XComposite Window for accelerated compositing in X11." PRIVATE ON) - diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index a5ec872c360..664c08ddb2f 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -45,5 +45,8 @@ in stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ primeos ]; + # Marked as broken until the first official/stable release (upstream + # request). See #38344 for the public discussion. + broken = true; }; } diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix index 98621bb781e..309d9be274d 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -4,13 +4,13 @@ , withMesa ? true, libGLU ? null, libGL ? null , compat24 ? false, compat26 ? true, unicode ? true , withGtk2 ? true -, withWebKit ? false, webkitgtk24x-gtk2 ? null, webkitgtk218x ? null +, withWebKit ? false, webkitgtk24x-gtk2 ? null, webkitgtk ? null , AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null }: assert withMesa -> libGLU != null && libGL != null; -assert withWebKit -> (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk218x) != null; +assert withWebKit -> (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk) != null; with stdenv.lib; @@ -31,7 +31,7 @@ stdenv.mkDerivation { [ (if withGtk2 then gtk2 else gtk3) libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst-plugins-base GConf ] ++ optional withMesa libGLU - ++ optional withWebKit (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk218x) + ++ optional withWebKit (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk) ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/xalanc/default.nix b/pkgs/development/libraries/xalanc/default.nix index 28575f4c5d5..aeb741dbae7 100644 --- a/pkgs/development/libraries/xalanc/default.nix +++ b/pkgs/development/libraries/xalanc/default.nix @@ -13,12 +13,11 @@ in stdenv.mkDerivation rec { sha256 = "0a3a2b15vpacnqgpp6fiy1pwyc8q6ywzvyb5445f6wixfdspypjg"; }; - # TODO: should we really be putting outputs in $out/usr? I'd expect -P$out below configurePhase = '' export XALANCROOT=`pwd`/c cd `pwd`/c - mkdir -p $out/usr - ./runConfigure -p ${platform} -c cc -x c++ -P$out/usr + mkdir -p $out + ./runConfigure -p ${platform} -c cc -x c++ -P$out ''; buildInputs = [ xercesc getopt ]; diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix index 6f296bb40b9..0d86c862891 100644 --- a/pkgs/development/libraries/xgboost/default.nix +++ b/pkgs/development/libraries/xgboost/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { description = "Scalable, Portable and Distributed Gradient Boosting (GBDT, GBRT or GBM) Library"; homepage = https://github.com/dmlc/xgboost; license = licenses.asl20; - platforms = platforms.linux; + platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/development/libraries/xmlrpc-c/default.nix b/pkgs/development/libraries/xmlrpc-c/default.nix index 0b5f08bdf9b..caf8cd269a1 100644 --- a/pkgs/development/libraries/xmlrpc-c/default.nix +++ b/pkgs/development/libraries/xmlrpc-c/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { # /doc/COPYING also lists "Expat license", # "ABYSS Web Server License" and "Python 1.5.2 License" license = licenses.bsd3; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/development/libraries/zziplib/default.nix b/pkgs/development/libraries/zziplib/default.nix index 07a6f7ef088..d43c481c859 100644 --- a/pkgs/development/libraries/zziplib/default.nix +++ b/pkgs/development/libraries/zziplib/default.nix @@ -1,21 +1,26 @@ -{ fetchurl, stdenv, perl, python2, zip, xmlto, zlib }: +{ docbook_xml_dtd_412, fetchurl, stdenv, perl, python2, zip, xmlto, zlib }: stdenv.mkDerivation rec { name = "zziplib-${version}"; - version = "0.13.67"; + version = "0.13.68"; src = fetchurl { url = "https://github.com/gdraheim/zziplib/archive/v${version}.tar.gz"; - sha256 = "0802kdxwxx9zanpwb4w4wfi3blwhv0ri05mzdgd35j5sva5ify0j"; + sha256 = "0chhl6m02562z6c4hjy568mh11pbq2qngw6g2x924ajr8sdr2q4l"; }; - patchPhase = '' + postPatch = '' sed -i -e s,--export-dynamic,, configure ''; - buildInputs = [ perl python2 zip xmlto zlib ]; + # TODO: still an issue: https://github.com/gdraheim/zziplib/issues/27 - doCheck = true; + buildInputs = [ docbook_xml_dtd_412 perl python2 zip xmlto zlib ]; + + # tests are broken (https://github.com/gdraheim/zziplib/issues/20), + # and test/zziptests.py requires network access + # (https://github.com/gdraheim/zziplib/issues/24) + doCheck = false; meta = with stdenv.lib; { description = "Library to extract data from files archived in a zip file"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix index 0c12f169cf7..111d9952749 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix @@ -158,4 +158,9 @@ $out/lib/common-lisp/query-fs" deps = pkgs.lib.filter (x: x.name != quicklisp-to-nix-packages.buildnode-xhtml.name) x.deps; parasites = pkgs.lib.filter (x: x!= "buildnode-test") x.parasites; }; + postmodern = x: { + overrides = y : (x.overrides y) // { + meta.broken = true; # 2018-04-10 + }; + }; } diff --git a/pkgs/development/misc/avr/gcc/default.nix b/pkgs/development/misc/avr/gcc/default.nix index 0bfa6d1f238..8d1eb43c934 100644 --- a/pkgs/development/misc/avr/gcc/default.nix +++ b/pkgs/development/misc/avr/gcc/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation { description = "GNU Compiler Collection, version ${version} for AVR microcontrollers"; homepage = http://gcc.gnu.org; license = licenses.gpl3Plus; - platforms = platforms.unix; + platforms = platforms.linux; maintainers = with maintainers; [ mguentner ]; }; } diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix index 4079adaef51..83bd941e5ff 100644 --- a/pkgs/development/mobile/titaniumenv/build-app.nix +++ b/pkgs/development/mobile/titaniumenv/build-app.nix @@ -15,39 +15,17 @@ let abiVersions = androidAbiVersions; useGoogleAPIs = true; }; - + deleteKeychain = '' security default-keychain -s login.keychain security delete-keychain $keychainName rm -f $HOME/lock-keychain ''; - - # On macOS, the java executable shows an -unoffical postfix in the version - # number. This confuses the build script's version detector. - # We fix this by creating a wrapper that strips it out of the output. - - javaVersionFixWrapper = stdenv.mkDerivation { - name = "javaVersionFixWrapper"; - buildCommand = '' - mkdir -p $out/bin - cat > $out/bin/javac <&1 | sed "s|-unofficial||" | sed "s|-u60|_60|" >&2 - else - exec ${jdk}/bin/javac "\$@" - fi - EOF - chmod +x $out/bin/javac - ''; - }; in stdenv.mkDerivation { name = stdenv.lib.replaceChars [" "] [""] name; inherit src; - + buildInputs = [ nodejs titanium alloy jdk python which file ] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") xcodewrapper; buildPhase = '' @@ -74,19 +52,19 @@ stdenv.mkDerivation { ${if target == "android" then '' - ${stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") '' - # Hack to make version detection work with OpenJDK on macOS - export PATH=${javaVersionFixWrapper}/bin:$PATH - export JAVA_HOME=${javaVersionFixWrapper} - javac -version - ''} - titanium config --config-file $TMPDIR/config.json --no-colors android.sdkPath ${androidsdkComposition}/libexec export PATH=$(echo ${androidsdkComposition}/libexec/tools):$(echo ${androidsdkComposition}/libexec/build-tools/android-*):$PATH - + export GRADLE_USER_HOME=$TMPDIR/gradle + ${if release then - ''titanium build --config-file $TMPDIR/config.json --no-colors --force --platform android --target dist-playstore --keystore ${androidKeyStore} --alias ${androidKeyAlias} --store-password ${androidKeyStorePassword} --output-dir $out'' + '' + ${stdenv.lib.optionalString stdenv.isDarwin '' + # Signing the app does not work with OpenJDK on macOS, use host SDK instead + export JAVA_HOME="$(/usr/libexec/java_home -v 1.8)" + ''} + titanium build --config-file $TMPDIR/config.json --no-colors --force --platform android --target dist-playstore --keystore ${androidKeyStore} --alias ${androidKeyAlias} --store-password ${androidKeyStorePassword} --output-dir $out + '' else ''titanium build --config-file $TMPDIR/config.json --no-colors --force --platform android --target emulator --build-only -B foo --output $out''} '' diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/pkgs/development/mobile/titaniumenv/default.nix index 031fe3b18c6..6765a9cc5c3 100644 --- a/pkgs/development/mobile/titaniumenv/default.nix +++ b/pkgs/development/mobile/titaniumenv/default.nix @@ -1,4 +1,4 @@ -{pkgs, pkgs_i686, xcodeVersion ? "9.2", xcodeBaseDir ? "/Applications/Xcode.app", tiVersion ? "6.3.1.GA"}: +{pkgs, pkgs_i686, xcodeVersion ? "9.2", xcodeBaseDir ? "/Applications/Xcode.app", tiVersion ? "7.1.0.GA"}: rec { androidenv = pkgs.androidenv; @@ -10,6 +10,7 @@ rec { titaniumsdk = let titaniumSdkFile = if tiVersion == "6.3.1.GA" then ./titaniumsdk-6.3.nix + else if tiVersion == "7.1.0.GA" then ./titaniumsdk-7.1.nix else throw "Titanium version not supported: "+tiVersion; in import titaniumSdkFile { diff --git a/pkgs/development/mobile/titaniumenv/examples/default.nix b/pkgs/development/mobile/titaniumenv/examples/default.nix index 5753c8d7da9..78f91dd39fb 100644 --- a/pkgs/development/mobile/titaniumenv/examples/default.nix +++ b/pkgs/development/mobile/titaniumenv/examples/default.nix @@ -2,7 +2,7 @@ , systems ? [ "x86_64-linux" "x86_64-darwin" ] , xcodeVersion ? "9.2" , xcodeBaseDir ? "/Applications/Xcode.app" -, tiVersion ? "6.3.1.GA" +, tiVersion ? "7.1.0.GA" , rename ? false , newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? "", iosVersion ? "11.2" , enableWirelessDistribution ? false, installURL ? null diff --git a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix index 5849ee368c1..70ab1b168c4 100644 --- a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix +++ b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix @@ -1,4 +1,4 @@ -{ titaniumenv, fetchgit, target, androidPlatformVersions ? [ "25" "26" ], tiVersion ? "6.3.1.GA", release ? false +{ titaniumenv, fetchgit, target, androidPlatformVersions ? [ "25" "26" ], tiVersion ? "7.1.0.GA", release ? false , rename ? false, stdenv ? null, newBundleId ? null, iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? null, iosCertificatePassword ? null, iosVersion ? "11.2" , enableWirelessDistribution ? false, installURL ? null }: @@ -7,9 +7,9 @@ assert rename -> (stdenv != null && newBundleId != null && iosMobileProvisioning let src = fetchgit { - url = https://github.com/appcelerator/KitchenSink.git; - rev = "ec9edebf35030f61368000a8a9071dd7a0773884"; - sha256 = "3e020004b73c9c2386f2672fdf9203083295f1524f5e504a07842e062de181c8"; + url = https://github.com/appcelerator/kitchensink-v2.git; + rev = "94364df2ef60a80bd354a4273e3cb5f4c5185537"; + sha256 = "0q4gzidpsq401frkngy4yk5kqvm8dz00ls74bw3fnpvg4714d6gf"; }; # Rename the bundle id to something else @@ -18,7 +18,6 @@ let inherit src; buildPhase = '' sed -i -e "s|com.appcelerator.kitchensink|${newBundleId}|" tiapp.xml - sed -i -e "s|com.appcelerator.kitchensink|${newBundleId}|" manifest ''; installPhase = '' mkdir -p $out diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-7.1.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-7.1.nix new file mode 100644 index 00000000000..61c23a6d0b3 --- /dev/null +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-7.1.nix @@ -0,0 +1,102 @@ +{stdenv, fetchurl, unzip, makeWrapper, python, jdk}: + +let + # Gradle is a build system that bootstraps itself. This is what it actually + # downloads in the bootstrap phase. + gradleAllZip = fetchurl { + url = http://services.gradle.org/distributions/gradle-4.1-all.zip; + sha256 = "1rcrh263vq7a0is800y5z36jj97p67c6zpqzzfcbr7r0qaxb61sw"; + }; + + # A Titanium-Android build requires proguard plugins. We create a fake + # repository so that Gradle does not attempt to download them in the builder. + # Since there are only 3 plugins required, this is still (sort of) manageable + # without a generator. + proguardVersion = "5.3.3"; + + proguardGradlePOM = fetchurl { + url = "https://repo1.maven.org/maven2/net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.pom"; + sha256 = "03v9zm3ykfkyb5cs5ald07ph103fh68d5c33rv070r29p71dwszj"; + }; + proguardGradleJAR = fetchurl { + url = "https://repo1.maven.org/maven2/net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.jar"; + sha256 = "0shhpsjfc5gam15jnv1hk718v5c7vi7dwdc3gvmnid6dc85kljzk"; + }; + proguardParentPOM = fetchurl { + url = "https://repo1.maven.org/maven2/net/sf/proguard/proguard-parent/${proguardVersion}/proguard-parent-${proguardVersion}.pom"; + sha256 = "0mv0zbwyw8xa4mkc5kw69y5xqashkz9gp123akfvh9f6152l3202"; + }; + proguardBasePOM = fetchurl { + url = "https://repo1.maven.org/maven2/net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.pom"; + sha256 = "1jnr6zsxfimb8wglqlwa6rrdc3g3nqf1dyw0k2dq9cj0q4pgn7p5"; + }; + proguardBaseJAR = fetchurl { + url = "https://repo1.maven.org/maven2/net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.jar"; + sha256 = "11nwdb9y84cghcx319nsjjf9m035s4s1184zrhzpvaxq2wvqhbhx"; + }; + + # Put the download plugins in a fake Maven repository + fakeMavenRepo = stdenv.mkDerivation { + name = "fake-maven-repo"; + buildCommand = '' + mkdir -p $out + cd $out + mkdir -p net/sf/proguard/proguard-gradle/${proguardVersion} + cp ${proguardGradlePOM} net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.pom + cp ${proguardGradleJAR} net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.jar + mkdir -p net/sf/proguard/proguard-parent/${proguardVersion} + cp ${proguardParentPOM} net/sf/proguard/proguard-parent/${proguardVersion}/proguard-parent-${proguardVersion}.pom + mkdir -p net/sf/proguard/proguard-base/${proguardVersion} + cp ${proguardBasePOM} net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.pom + cp ${proguardBaseJAR} net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.jar + ''; + }; +in +stdenv.mkDerivation { + name = "mobilesdk-7.1.0.GA"; + src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { + url = http://builds.appcelerator.com/mobile/7_1_X/mobilesdk-7.1.0.v20180314133955-linux.zip; + sha256 = "18b3jnr65sdn5wj191bcl48gvhyklxmighxakv4vrz1fb59kyvqn"; + } + else if stdenv.system == "x86_64-darwin" then fetchurl { + url = http://builds.appcelerator.com/mobile/7_1_X/mobilesdk-7.1.0.v20180314133955-osx.zip; + sha256 = "1f62616biwsw1fqxz2sq7lpa6bsfjazffliplyf5dpnh298cnc1m"; + } + else throw "Platform: ${stdenv.system} not supported!"; + + buildInputs = [ unzip makeWrapper ]; + + buildCommand = '' + mkdir -p $out + cd $out + (yes y | unzip $src) || true + + # Rename ugly version number + cd mobilesdk/* + mv * 7.1.0.GA + cd * + + # Patch bundled gradle build infrastructure to make shebangs work + patchShebangs android/templates/gradle + + # Substitute the gradle-all zip URL by a local file to prevent downloads from happening while building an Android app + sed -i -e "s|distributionUrl=|#distributionUrl=|" android/templates/gradle/gradle/wrapper/gradle-wrapper.properties + cp ${gradleAllZip} android/templates/gradle/gradle/wrapper/gradle-4.1-all.zip + echo "distributionUrl=gradle-4.1-all.zip" >> android/templates/gradle/gradle/wrapper/gradle-wrapper.properties + + # Patch maven central repository with our own local directory. This prevents the builder from downloading Maven artifacts + sed -i -e 's|mavenCentral()|maven { url "${fakeMavenRepo}" }|' android/templates/build/proguard.gradle + + # Patch some executables + + ${if stdenv.system == "i686-linux" then + '' + patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 android/titanium_prep.linux32 + '' + else if stdenv.system == "x86_64-linux" then + '' + patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 android/titanium_prep.linux64 + '' + else ""} + ''; +} diff --git a/pkgs/development/mobile/xcodeenv/build-app.nix b/pkgs/development/mobile/xcodeenv/build-app.nix index d208f26ab67..a94f2745894 100644 --- a/pkgs/development/mobile/xcodeenv/build-app.nix +++ b/pkgs/development/mobile/xcodeenv/build-app.nix @@ -12,6 +12,7 @@ , certificateFile ? null , certificatePassword ? null , provisioningProfile ? null +, signMethod ? null , generateIPA ? false , generateXCArchive ? false , enableWirelessDistribution ? false @@ -21,7 +22,7 @@ , title ? null }: -assert release -> codeSignIdentity != null && certificateFile != null && certificatePassword != null && provisioningProfile != null; +assert release -> codeSignIdentity != null && certificateFile != null && certificatePassword != null && provisioningProfile != null && signMethod != null; assert enableWirelessDistribution -> installURL != null && bundleId != null && version != null && title != null; let @@ -82,13 +83,34 @@ stdenv.mkDerivation { # Do the building export LD=clang # To avoid problem with -isysroot parameter that is unrecognized by the stock ld. Comparison with an impure build shows that it uses clang instead. Ugly, but it works - xcodebuild -target ${_target} -configuration ${_configuration} ${stdenv.lib.optionalString (scheme != null) "-scheme ${scheme}"} -sdk ${_sdk} TARGETED_DEVICE_FAMILY="1, 2" ONLY_ACTIVE_ARCH=NO CONFIGURATION_TEMP_DIR=$TMPDIR CONFIGURATION_BUILD_DIR=$out ${if generateXCArchive then "archive" else ""} ${xcodeFlags} ${if release then ''"CODE_SIGN_IDENTITY=${codeSignIdentity}" PROVISIONING_PROFILE=$PROVISIONING_PROFILE OTHER_CODE_SIGN_FLAGS="--keychain $HOME/Library/Keychains/$keychainName-db"'' else ""} + xcodebuild -target ${_target} -configuration ${_configuration} ${stdenv.lib.optionalString (scheme != null) "-scheme ${scheme}"} -sdk ${_sdk} TARGETED_DEVICE_FAMILY="1, 2" ONLY_ACTIVE_ARCH=NO CONFIGURATION_TEMP_DIR=$TMPDIR CONFIGURATION_BUILD_DIR=$out ${if generateIPA || generateXCArchive then "-archivePath \"${name}.xcarchive\" archive" else ""} ${if release then ''PROVISIONING_PROFILE=$PROVISIONING_PROFILE OTHER_CODE_SIGN_FLAGS="--keychain $HOME/Library/Keychains/$keychainName-db"'' else ""} ${xcodeFlags} ${stdenv.lib.optionalString release '' ${stdenv.lib.optionalString generateIPA '' + # Create export plist file + cat > "${name}.plist" < + + + + provisioningProfiles + + ${bundleId} + $PROVISIONING_PROFILE + + method + ${signMethod} + ${stdenv.lib.optionalString (signMethod == "enterprise" || signMethod == "ad-hoc") '' + compileBitcode + + ''} + + + EOF + # Produce an IPA file - xcrun -sdk iphoneos PackageApplication -v $out/*.app -o "$out/${name}.ipa" - + xcodebuild -exportArchive -archivePath "${name}.xcarchive" -exportOptionsPlist "${name}.plist" -exportPath $out + # Add IPA to Hydra build products mkdir -p $out/nix-support echo "file binary-dist \"$(echo $out/*.ipa)\"" > $out/nix-support/hydra-build-products @@ -99,6 +121,10 @@ stdenv.mkDerivation { echo "doc install \"$out/$appname.html\"" >> $out/nix-support/hydra-build-products ''} ''} + ${stdenv.lib.optionalString generateXCArchive '' + mkdir -p $out + mv "${name}.xcarchive" $out + ''} # Delete our temp keychain ${deleteKeychain} diff --git a/pkgs/development/node-packages/README.md b/pkgs/development/node-packages/README.md index 17a203ed12b..9760285a915 100644 --- a/pkgs/development/node-packages/README.md +++ b/pkgs/development/node-packages/README.md @@ -1,51 +1 @@ -Node.js packages -================ -The `pkgs/development/node-packages` folder contains a generated collection of -[NPM packages](https://npmjs.com/) that can be installed with the Nix package -manager. - -As a rule of thumb, the package set should only provide *end user* software -packages, such as command-line utilities. Libraries should only be added to the -package set if there is a non-NPM package that requires it. - -When it is desired to use NPM libraries in a development project, use the -`node2nix` generator directly on the `package.json` configuration file of the -project. - -The package set also provides support for multiple Node.js versions. The policy -is that a new package should be added to the collection for the latest stable LTS -release (which is currently 6.x), unless there is an explicit reason to support -a different release. - -If your package uses native addons, you need to examine what kind of native -build system it uses. Here are some examples: - -* `node-gyp` -* `node-gyp-builder` -* `node-pre-gyp` - -After you have identified the correct system, you need to override your package -expression while adding in build system as a build input. For example, `dat` -requires `node-gyp-build`, so we override its expression in `default-v6.nix`: - -```nix -dat = nodePackages.dat.override (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-gyp-build ]; -}); -``` - -To add a package from NPM to nixpkgs: - - 1. Modify `pkgs/development/node-packages/node-packages-v6.json` to add, update - or remove package entries. (Or `pkgs/development/node-packages/node-packages-v4.json` - for packages depending on Node.js 4.x) - 2. Run the script: `(cd pkgs/development/node-packages && ./generate.sh)`. - 3. Build your new package to test your changes: - `cd /path/to/nixpkgs && nix-build -A nodePackages.`. - To build against a specific Node.js version (e.g. 4.x): - `nix-build -A nodePackages_4_x.` - 4. Add and commit all modified and generated files. - -For more information about the generation process, consult the -[README.md](https://github.com/svanderburg/node2nix) file of the `node2nix` -tool. +Moved to [/doc/languages-frameworks/node.section.md](/doc/languages-frameworks/node.section.md) diff --git a/pkgs/development/node-packages/composition-v6.nix b/pkgs/development/node-packages/composition-v6.nix index fa4d7268f01..2252bab3a79 100644 --- a/pkgs/development/node-packages/composition-v6.nix +++ b/pkgs/development/node-packages/composition-v6.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.5.2. Do not edit! +# This file has been generated by node2nix 1.5.3. Do not edit! {pkgs ? import { inherit system; @@ -8,6 +8,7 @@ let nodeEnv = import ./node-env.nix { inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile; inherit nodejs; + libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; in import ./node-packages-v6.nix { diff --git a/pkgs/development/node-packages/composition-v8.nix b/pkgs/development/node-packages/composition-v8.nix index a83df852ce2..96266105942 100644 --- a/pkgs/development/node-packages/composition-v8.nix +++ b/pkgs/development/node-packages/composition-v8.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.5.2. Do not edit! +# This file has been generated by node2nix 1.5.3. Do not edit! {pkgs ? import { inherit system; @@ -8,6 +8,7 @@ let nodeEnv = import ./node-env.nix { inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile; inherit nodejs; + libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; in import ./node-packages-v8.nix { diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix index 15bc6c638d9..fc118a788ea 100644 --- a/pkgs/development/node-packages/node-env.nix +++ b/pkgs/development/node-packages/node-env.nix @@ -1,6 +1,6 @@ # This file originates from node2nix -{stdenv, nodejs, python2, utillinux, runCommand, writeTextFile}: +{stdenv, nodejs, python2, utillinux, libtool, runCommand, writeTextFile}: let python = if nodejs ? python then nodejs.python else python2; @@ -316,7 +316,10 @@ let in stdenv.lib.makeOverridable stdenv.mkDerivation (builtins.removeAttrs args [ "dependencies" ] // { name = "node-${name}-${version}"; - buildInputs = [ tarWrapper python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ args.buildInputs or []; + buildInputs = [ tarWrapper python nodejs ] + ++ stdenv.lib.optional (stdenv.isLinux) utillinux + ++ stdenv.lib.optional (stdenv.isDarwin) libtool + ++ args.buildInputs or []; dontStrip = args.dontStrip or true; # Striping may fail a build for some package deployments inherit dontNpmInstall preRebuild; @@ -413,7 +416,10 @@ let nodeDependencies = stdenv.mkDerivation { name = "node-dependencies-${name}-${version}"; - buildInputs = [ tarWrapper python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ args.buildInputs or []; + buildInputs = [ tarWrapper python nodejs ] + ++ stdenv.lib.optional (stdenv.isLinux) utillinux + ++ stdenv.lib.optional (stdenv.isDarwin) libtool + ++ args.buildInputs or []; includeScript = includeDependencies { inherit dependencies; }; pinpointDependenciesScript = pinpointDependenciesOfPackage args; diff --git a/pkgs/development/node-packages/node-packages-v6.json b/pkgs/development/node-packages/node-packages-v6.json index ad9d79fd88e..d96241a0808 100644 --- a/pkgs/development/node-packages/node-packages-v6.json +++ b/pkgs/development/node-packages/node-packages-v6.json @@ -73,7 +73,7 @@ , "npm-check-updates" , "nsp" , "ocaml-language-server" -, "parsoid" +, { "parsoid": "git://github.com/abbradar/parsoid#stable" } , "peerflix" , "peerflix-server" , "phantomjs" @@ -102,6 +102,7 @@ , "typings" , "uglify-js" , "ungit" +, "vue-cli" , "webdrvr" , "webpack" , "web-ext" diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index ebea0df1362..5071b4edeab 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -1,34 +1,43 @@ -# This file has been generated by node2nix 1.5.2. Do not edit! +# This file has been generated by node2nix 1.5.3. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: let sources = { - "@browserify/acorn5-object-spread-5.0.1" = { - name = "_at_browserify_slash_acorn5-object-spread"; - packageName = "@browserify/acorn5-object-spread"; - version = "5.0.1"; + "@cliqz-oss/firefox-client-0.3.1" = { + name = "_at_cliqz-oss_slash_firefox-client"; + packageName = "@cliqz-oss/firefox-client"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@browserify/acorn5-object-spread/-/acorn5-object-spread-5.0.1.tgz"; - sha512 = "0l47lh2pz596qayh9mmg2x2zjvjm6phj6llj4465cc420fpsjpwbm4i67mkc7d3iylilxhrcs9mlyqm2cpc79xqvrm3f4hy70zr8l5h"; + url = "https://registry.npmjs.org/@cliqz-oss/firefox-client/-/firefox-client-0.3.1.tgz"; + sha512 = "0mzrszrx3b26v168dxy14mafp9dnczzl10yrdg203q46xcasi6a668yg2zf3nlzmf4klylfkbca3b3amd0646barp0nkh1zkfi97vs4"; }; }; - "@ionic/cli-framework-0.1.2" = { + "@cliqz-oss/node-firefox-connect-1.2.1" = { + name = "_at_cliqz-oss_slash_node-firefox-connect"; + packageName = "@cliqz-oss/node-firefox-connect"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@cliqz-oss/node-firefox-connect/-/node-firefox-connect-1.2.1.tgz"; + sha512 = "2f8l9alm034f4mrp2shf3pgcvm1m9lvbw2n5jpjnnmk6mn36qmwz4hjnrky279z4wnphgr2wv1vksn57w6ncl3cfr13nzv93s435wiv"; + }; + }; + "@ionic/cli-framework-0.1.3" = { name = "_at_ionic_slash_cli-framework"; packageName = "@ionic/cli-framework"; - version = "0.1.2"; + version = "0.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-0.1.2.tgz"; - sha512 = "265kszf17mdz60zpfrj5i47lqwwgp6h1b7i8vymig1pnlqd3lnljibxvd2d1rfa3827ks435k9wws458z3dk7fyq8wfmzmv8fk9qjhh"; + url = "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-0.1.3.tgz"; + sha512 = "0l4lpl9477wf6i2xzqqqv5lmrmnyf82n0rbww6ynaszyb6cl38m2dpbz4xv0ksy5mayjyfkq6nj7mjzh4cvak12zfwp4cgrrai6ybkg"; }; }; - "@ionic/cli-utils-1.19.1" = { + "@ionic/cli-utils-1.19.2" = { name = "_at_ionic_slash_cli-utils"; packageName = "@ionic/cli-utils"; - version = "1.19.1"; + version = "1.19.2"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/cli-utils/-/cli-utils-1.19.1.tgz"; - sha512 = "3anhsxw0zyzi9j4kfnqxg2h4fxqjyw6pabb75z5b17hmksmjcyy6psic9fziyrgllp5rqksadqdzbkbb6lrviclhiz26sj8f7gjfi8r"; + url = "https://registry.npmjs.org/@ionic/cli-utils/-/cli-utils-1.19.2.tgz"; + sha512 = "10fl86bf0p911b7w0dnz2q3b8092c50h6x8kf79lwg8bg3jnmnmvz0i868xhf7qnawyaikhqdf5nifpb42f9jr3x0mxgmp4ppdwadlx"; }; }; "@ionic/discover-0.4.0" = { @@ -85,22 +94,22 @@ let sha512 = "2fv2qaz90rp6ib2s45ix0p3a4bd6yl6k94k1kkhw7w4s2aa5mqc6chppkf6pfvsz1l6phh7y0xswyfyzjgny7qzascch8c7ws20a0r4"; }; }; - "@types/node-8.9.4" = { + "@types/node-8.10.1" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "8.9.4"; + version = "8.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-8.9.4.tgz"; - sha512 = "0fc7dnkm8mxih1kx7dpxdjp9432wwn2hj9k3rs6ipmyac7x4d73kjxhkinlv9wzmzpxkz8n0cp6zykl8nvb4ksh3gycwhm7mbgw6avm"; + url = "https://registry.npmjs.org/@types/node/-/node-8.10.1.tgz"; + sha512 = "0idg6lra5659kj2sbfhfp209bsxbg7s2gxkg6pa566grjw498iida3f0w1dd2cbzh1zw7q6zdww3q19ikq789mbqkqpx990wx84iyjz"; }; }; - "@types/node-9.4.6" = { + "@types/node-9.6.1" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "9.4.6"; + version = "9.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-9.4.6.tgz"; - sha512 = "08j600qycq8wmra6zn9jvh2ifnkr90s08rcv3spjqc03mjapfm4bz009cm6xfqd7ipbsm7q6ymxccdnlw4gbyd3lyh21a4npqnjsd89"; + url = "https://registry.npmjs.org/@types/node/-/node-9.6.1.tgz"; + sha512 = "2sxvv78fkmdrpqq04pkyq69fkny1xj1abcp8ajkmmmfn1cs3jdiir545s9h1gsnxzls1iiigbzj8dlkimlqdfpbgdlm8h6pj2mlf2f7"; }; }; "@types/request-2.47.0" = { @@ -220,6 +229,15 @@ let sha512 = "38s4f3id97wsb0rg9nm9zvxyq0nvwrmrpa5dzvrkp36mf5ibs98b4z6lvsbrwzzs0sbcank6c7gpp06vcwp9acfhp41rzlhi3ybsxwy"; }; }; + "absolute-0.0.1" = { + name = "absolute"; + packageName = "absolute"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/absolute/-/absolute-0.0.1.tgz"; + sha1 = "c22822f87e1c939f579887504d9c109c4173829d"; + }; + }; "abstract-leveldown-0.12.4" = { name = "abstract-leveldown"; packageName = "abstract-leveldown"; @@ -256,13 +274,13 @@ let sha1 = "c3ca7434938648c3e0d9c1e328dd68b622c284ca"; }; }; - "accepts-1.3.4" = { + "accepts-1.3.5" = { name = "accepts"; packageName = "accepts"; - version = "1.3.4"; + version = "1.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/accepts/-/accepts-1.3.4.tgz"; - sha1 = "86246758c7dd6d21a6474ff084a4740ec05eb21f"; + url = "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz"; + sha1 = "eb777df6011723a3b14e8a72c0805c8e86746bd2"; }; }; "acorn-1.2.2" = { @@ -301,22 +319,13 @@ let sha1 = "105495ae5361d697bd195c825192e1ad7f253787"; }; }; - "acorn-5.5.0" = { + "acorn-5.5.3" = { name = "acorn"; packageName = "acorn"; - version = "5.5.0"; + version = "5.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-5.5.0.tgz"; - sha512 = "3zaj6p3hwrmg5i65dg7q0kk9224w6fd404k830k922wn3mn4x95c48zrmgg4n85xigg904syrzbh5nca94aaf4anfjpjm9vbpfgkfba"; - }; - }; - "acorn-dynamic-import-2.0.2" = { - name = "acorn-dynamic-import"; - packageName = "acorn-dynamic-import"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz"; - sha1 = "c752bd210bef679501b6c6cb7fc84f8f47158cc4"; + url = "https://registry.npmjs.org/acorn/-/acorn-5.5.3.tgz"; + sha512 = "0wmwifv9mm9gqcir9zbz5y1gl1rgwwprqh1f3csjydj8kf3byca7img3rh5b54kbnw3ik34bc6ynbnzsd01zmxrsfdvjv95hn84rpld"; }; }; "acorn-dynamic-import-3.0.0" = { @@ -382,13 +391,13 @@ let sha1 = "11c58e427b7e83d9ef2d77c9c3a2a60fbb0b6cc8"; }; }; - "adal-node-0.1.27" = { + "adal-node-0.1.28" = { name = "adal-node"; packageName = "adal-node"; - version = "0.1.27"; + version = "0.1.28"; src = fetchurl { - url = "https://registry.npmjs.org/adal-node/-/adal-node-0.1.27.tgz"; - sha1 = "42252337bc1d01aff6b3c26138a08a3d4f420b0e"; + url = "https://registry.npmjs.org/adal-node/-/adal-node-0.1.28.tgz"; + sha1 = "468c4bb3ebbd96b1270669f4b9cba4e0065ea485"; }; }; "adbkit-2.11.0" = { @@ -427,13 +436,13 @@ let sha1 = "6a7990437ca736d5e1288db92bd3266d5f5cb2aa"; }; }; - "addons-linter-0.35.0" = { + "addons-linter-0.41.0" = { name = "addons-linter"; packageName = "addons-linter"; - version = "0.35.0"; + version = "0.41.0"; src = fetchurl { - url = "https://registry.npmjs.org/addons-linter/-/addons-linter-0.35.0.tgz"; - sha1 = "85872cce58983ff339ced297dbff486c02ecd336"; + url = "https://registry.npmjs.org/addons-linter/-/addons-linter-0.41.0.tgz"; + sha512 = "1cdq1s3zaz5547yn12h23434f3g6jjchrjdwv7x0qbg38zilaix5x04ajy87pw94rs1mk6kkawa517whzjn0jd7kpx6nac75qw7rcwf"; }; }; "addr-to-ip-port-1.4.3" = { @@ -454,15 +463,6 @@ let sha512 = "27dii2i2aw9z3pw09110914532z5dfywxp8gbrfr14737cwy8m0jysam3abmfsbp8g51sd02ys57j5snwly3zfd0vrbli4109rni7ng"; }; }; - "addressparser-0.1.3" = { - name = "addressparser"; - packageName = "addressparser"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/addressparser/-/addressparser-0.1.3.tgz"; - sha1 = "9e9ab43d257e1ae784e1df5f580c9f5240f58874"; - }; - }; "addressparser-0.3.2" = { name = "addressparser"; packageName = "addressparser"; @@ -580,13 +580,22 @@ let sha1 = "73b5eeca3fab653e3d3f9422b341ad42205dc965"; }; }; - "ajv-6.2.0" = { + "ajv-6.3.0" = { name = "ajv"; packageName = "ajv"; - version = "6.2.0"; + version = "6.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.2.0.tgz"; - sha1 = "afac295bbaa0152449e522742e4547c1ae9328d2"; + url = "https://registry.npmjs.org/ajv/-/ajv-6.3.0.tgz"; + sha1 = "1650a41114ef00574cac10b8032d8f4c14812da7"; + }; + }; + "ajv-6.4.0" = { + name = "ajv"; + packageName = "ajv"; + version = "6.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-6.4.0.tgz"; + sha1 = "d3aff78e9277549771daf0164cff48482b754fc6"; }; }; "ajv-keywords-1.5.1" = { @@ -697,13 +706,13 @@ let sha1 = "3e75c037475217544ed763a8db5709fa9ae5bf9a"; }; }; - "ansi-diff-stream-1.2.0" = { + "ansi-diff-stream-1.2.1" = { name = "ansi-diff-stream"; packageName = "ansi-diff-stream"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-diff-stream/-/ansi-diff-stream-1.2.0.tgz"; - sha1 = "eb325c20ac3623ecd592011a9295d76d97de460e"; + url = "https://registry.npmjs.org/ansi-diff-stream/-/ansi-diff-stream-1.2.1.tgz"; + sha512 = "3lf59lflmnm783cbczclcms4qp42l79s7jbzx7xgz89rzk325nfj26bzd61g83lp250a3pjwh8q5w1khvfjkwn8rm9sm80dhbgsr8ix"; }; }; "ansi-escapes-1.4.0" = { @@ -715,13 +724,13 @@ let sha1 = "d3a8a83b319aa67793662b13e761c7911422306e"; }; }; - "ansi-escapes-3.0.0" = { + "ansi-escapes-3.1.0" = { name = "ansi-escapes"; packageName = "ansi-escapes"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.0.0.tgz"; - sha512 = "06szfav8g7xywvqsis16nnkjqs2snhv37r4m53l1ax8k2sahvqv9id2klam32jajqd08ylw8g9wbcjr971igx6vh8idan76drrjby9v"; + url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz"; + sha512 = "1bm72rs09dwjhfif8kqjxnpb5fgmcdgkn5483f11j6791s5161f2kvxy69pkgcq0jdws6kqfmr1bx5189lnvkzgkq851qs3gzq1n02j"; }; }; "ansi-gray-0.1.1" = { @@ -733,6 +742,15 @@ let sha1 = "2962cf54ec9792c48510a3deb524436861ef7251"; }; }; + "ansi-red-0.1.1" = { + name = "ansi-red"; + packageName = "ansi-red"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-red/-/ansi-red-0.1.1.tgz"; + sha1 = "8c638f9d1080800a353c9c28c8a81ca4705d946c"; + }; + }; "ansi-regex-0.2.1" = { name = "ansi-regex"; packageName = "ansi-regex"; @@ -796,13 +814,13 @@ let sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; }; }; - "ansi-styles-3.2.0" = { + "ansi-styles-3.2.1" = { name = "ansi-styles"; packageName = "ansi-styles"; - version = "3.2.0"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz"; - sha512 = "2x19fs1qvg7ifsdvii4g8kqpa5hir1lm0k0y0fz6dhm5c8gh4z9il4wqczl078p2ikmrav23dmj86cxy8y1j22k4mv59d8qq6c8wx1n"; + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz"; + sha512 = "2lgkskkj4c1fsnrksy0yffda0wss84p8lfiazdc7jli7iqnvrxkzbxjzpvx13lm28qw0zkawfxvz2bdiisc72ccy7hx8i8rm4iijgam"; }; }; "ansi-wrap-0.1.0" = { @@ -1390,13 +1408,13 @@ let sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"; }; }; - "ast-types-0.11.2" = { + "ast-types-0.11.3" = { name = "ast-types"; packageName = "ast-types"; - version = "0.11.2"; + version = "0.11.3"; src = fetchurl { - url = "https://registry.npmjs.org/ast-types/-/ast-types-0.11.2.tgz"; - sha512 = "1mfcrhzn37ray5i3fizrfm5gr1zijv6k1gy370v62smzd6j8d3irphhma9cs9kij7nwkgh5v60q53bfivpm2sscfxbdms9ywiqakgv8"; + url = "https://registry.npmjs.org/ast-types/-/ast-types-0.11.3.tgz"; + sha512 = "2lga5vgh6bz1vii6kfdy2k1g99arw9cikxx8705p9v92rqn7ksdvbzjvhgfdf4s21nbfafrxjh3hrr5jz2yq43dr4hw7hqdvgjnh3jw"; }; }; "ast-types-0.9.6" = { @@ -1498,15 +1516,6 @@ let sha1 = "612a4ab45ef42a70cde806bad86ee6db047e8385"; }; }; - "async-2.1.4" = { - name = "async"; - packageName = "async"; - version = "2.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.1.4.tgz"; - sha1 = "2d2160c7788032e4dd6cbe2502f1f9a2c8f6cde4"; - }; - }; "async-2.1.5" = { name = "async"; packageName = "async"; @@ -1516,6 +1525,15 @@ let sha1 = "e587c68580994ac67fc56ff86d3ac56bdbe810bc"; }; }; + "async-2.3.0" = { + name = "async"; + packageName = "async"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-2.3.0.tgz"; + sha1 = "1013d1051047dd320fe24e494d5c66ecaf6147d9"; + }; + }; "async-2.5.0" = { name = "async"; packageName = "async"; @@ -1561,13 +1579,13 @@ let sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; }; }; - "atob-2.0.3" = { + "atob-2.1.0" = { name = "atob"; packageName = "atob"; - version = "2.0.3"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/atob/-/atob-2.0.3.tgz"; - sha1 = "19c7a760473774468f20b2d2d03372ad7d4cbf5d"; + url = "https://registry.npmjs.org/atob/-/atob-2.1.0.tgz"; + sha512 = "0dyf7054n94f1pwp9chcy6vawgwd2wqp8jqrnvxl489jyxxbg46n2vkb5vfs5jqnkmh6kbyv4lpysrn13hzzh5q021frc6vrcgqms2a"; }; }; "atomic-batcher-1.0.2" = { @@ -1597,13 +1615,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.203.0" = { + "aws-sdk-2.218.1" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.203.0"; + version = "2.218.1"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.203.0.tgz"; - sha1 = "7573c1274a4350bd5d78a6db93c9eeab40940acb"; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.218.1.tgz"; + sha1 = "b4cf742cc0853bd7c868b388cbf0b4a1ef1abc12"; }; }; "aws-sign-0.2.0" = { @@ -1777,13 +1795,13 @@ let sha1 = "f63a6dad0355633d9347fb403f417fb195fe3b91"; }; }; - "azure-arm-network-4.0.1" = { + "azure-arm-network-5.1.0" = { name = "azure-arm-network"; packageName = "azure-arm-network"; - version = "4.0.1"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-network/-/azure-arm-network-4.0.1.tgz"; - sha1 = "577d8a2be2eb9e5298b561837405b2eaef283a19"; + url = "https://registry.npmjs.org/azure-arm-network/-/azure-arm-network-5.1.0.tgz"; + sha1 = "b2be4bfc27173b1cb7fc54425cbee27824f65b52"; }; }; "azure-arm-powerbiembedded-0.1.0" = { @@ -2299,15 +2317,6 @@ let sha1 = "d6400cac1c4c660976d90d07a04351d89395f5e8"; }; }; - "base64-js-1.2.0" = { - name = "base64-js"; - packageName = "base64-js"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/base64-js/-/base64-js-1.2.0.tgz"; - sha1 = "a39992d723584811982be5e290bb6a53d86700f1"; - }; - }; "base64-js-1.2.3" = { name = "base64-js"; packageName = "base64-js"; @@ -2479,6 +2488,15 @@ let sha512 = "1kvjv5hs1c53b5g2vghpnncn4zj397sa0vpbx1pzpn8ngq52s3xq9923gnl2kzkh1mhyrl277jrh87a766yks89qvz8b4jczr44xr9p"; }; }; + "bencode-2.0.0" = { + name = "bencode"; + packageName = "bencode"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bencode/-/bencode-2.0.0.tgz"; + sha512 = "3rdjlprrhprwwygnw5aik9pgi1xyr09yvgq3rbr4g3pl1v70mcc1k903x3vh9z782jly6vmnvp44nrskl5rhcxgfdwz19fl1b1qggf2"; + }; + }; "better-assert-1.0.2" = { name = "better-assert"; packageName = "better-assert"; @@ -2506,13 +2524,13 @@ let sha1 = "159a49b9a9714c1fb102f2e0ed1906fab6a450f4"; }; }; - "big-integer-1.6.26" = { + "big-integer-1.6.27" = { name = "big-integer"; packageName = "big-integer"; - version = "1.6.26"; + version = "1.6.27"; src = fetchurl { - url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.26.tgz"; - sha1 = "3af1672fa62daf2d5ecafacf6e5aa0d25e02c1c8"; + url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.27.tgz"; + sha512 = "2v5f59yjsa3hzwhk333s84nfl1x24w52h9hqpwbav0p5v5d5prkna0flw25ywccrrjziq3lylbl874qqikzljkyz2g6jjdqhlqhld9p"; }; }; "big.js-3.2.0" = { @@ -2677,13 +2695,13 @@ let sha1 = "fdca871a99713aa00d19e3bbba41c44787a65398"; }; }; - "bl-1.2.1" = { + "bl-1.2.2" = { name = "bl"; packageName = "bl"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-1.2.1.tgz"; - sha1 = "cac328f7bee45730d404b692203fcb590e172d5e"; + url = "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz"; + sha512 = "0810nalazir8szyxvbg53d7416j4a7xy94sdri37mwmnax9s9hx88mzky882sr9dv0is7w9fqlp7ys6ijr1z1imc2dnfxk8fri51jvv"; }; }; "blake2b-2.1.2" = { @@ -2920,13 +2938,13 @@ let sha1 = "4d67dc2602c0cc16dd9bce7ebf87e948290f5812"; }; }; - "bower-1.8.2" = { + "bower-1.8.4" = { name = "bower"; packageName = "bower"; - version = "1.8.2"; + version = "1.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/bower/-/bower-1.8.2.tgz"; - sha1 = "adf53529c8d4af02ef24fb8d5341c1419d33e2f7"; + url = "https://registry.npmjs.org/bower/-/bower-1.8.4.tgz"; + sha1 = "e7876a076deb8137f7d06525dc5e8c66db82f28a"; }; }; "bower-endpoint-parser-0.2.1" = { @@ -3064,13 +3082,13 @@ let sha1 = "51598408a13f4c9c5b20eba44554b2c0b0ae4074"; }; }; - "browser-pack-6.0.4" = { + "browser-pack-6.1.0" = { name = "browser-pack"; packageName = "browser-pack"; - version = "6.0.4"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/browser-pack/-/browser-pack-6.0.4.tgz"; - sha512 = "0ylgxzrsxs25v3c4mz5ggqawb8k3xb39ialqlflk1nadfk8wrig2g2ipkpnw6bf9zhdhmigkwqbbl8yssibcb6fgnbbqfgsnfgnz123"; + url = "https://registry.npmjs.org/browser-pack/-/browser-pack-6.1.0.tgz"; + sha512 = "1cav0iv5irfvilx6x14zbxil5m012hxan16cgyp9yjs6fqfg6fny2cdjimfwgil9ma8n4w8g8wv4yn843sz257p44vkbaz8qn1jxdks"; }; }; "browser-resolve-1.11.2" = { @@ -3082,13 +3100,13 @@ let sha1 = "8ff09b0a2c421718a1051c260b32e48f442938ce"; }; }; - "browser-stdout-1.3.0" = { + "browser-stdout-1.3.1" = { name = "browser-stdout"; packageName = "browser-stdout"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz"; - sha1 = "f351d32969d32fa5d7a5567154263d928ae3bd1f"; + url = "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz"; + sha512 = "21jjhrf3wdmzsfqgva5s7shs1wdmcdxsjvi75p8z7i0q2i6n3654gpxjqlhbnpmzm25cpkshyi8swy13017qkp9m7xnbgw0bwiia45a"; }; }; "browserify-13.3.0" = { @@ -3226,6 +3244,15 @@ let sha1 = "cf34fdcff081a189b589b4b3e5e9309cd6506c81"; }; }; + "buffer-3.6.0" = { + name = "buffer"; + packageName = "buffer"; + version = "3.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer/-/buffer-3.6.0.tgz"; + sha1 = "a72c936f77b96bf52f5f7e7b467180628551defb"; + }; + }; "buffer-4.9.1" = { name = "buffer"; packageName = "buffer"; @@ -3244,6 +3271,24 @@ let sha512 = "1ipkzdnq03rnxyl50wmzigdbd96lh0mgzffcab80yxl38x7k316kzs3h0w0bxdjj7vqh6dw3wgb7y3rsqab0ar4ky9rbh0r1f1i2hk2"; }; }; + "buffer-alloc-1.1.0" = { + name = "buffer-alloc"; + packageName = "buffer-alloc"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.1.0.tgz"; + sha1 = "05514d33bf1656d3540c684f65b1202e90eca303"; + }; + }; + "buffer-alloc-unsafe-0.1.1" = { + name = "buffer-alloc-unsafe"; + packageName = "buffer-alloc-unsafe"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-0.1.1.tgz"; + sha1 = "ffe1f67551dd055737de253337bfe853dfab1a6a"; + }; + }; "buffer-alloc-unsafe-1.0.0" = { name = "buffer-alloc-unsafe"; packageName = "buffer-alloc-unsafe"; @@ -3307,6 +3352,24 @@ let sha1 = "0353b54fd07fd9564170671ae6f66b9cf10d27f5"; }; }; + "buffer-fill-0.1.1" = { + name = "buffer-fill"; + packageName = "buffer-fill"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-fill/-/buffer-fill-0.1.1.tgz"; + sha512 = "3nny0zbpnaxp1544gp7lc53jvs1jgzpmp92cy939dik36bi8lvhrsh4g082lxdplwsma22cgg9q93dw5dnbn1ljqkh4fb2i6w3lq032"; + }; + }; + "buffer-from-1.0.0" = { + name = "buffer-from"; + packageName = "buffer-from"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.0.0.tgz"; + sha512 = "3252laq8prm41lgzlhmc7rdj99gwcvpf7cn6j686g4qmspnl3haid5khv9pc9cfjja9wb64nwfvgdwi2kpdf125xfg48aqapwssjxpk"; + }; + }; "buffer-indexof-1.1.1" = { name = "buffer-indexof"; packageName = "buffer-indexof"; @@ -3424,13 +3487,13 @@ let sha1 = "cb94faeb61c8696451db36534e1422f94f0aee88"; }; }; - "bulk-write-stream-1.1.3" = { + "bulk-write-stream-1.1.4" = { name = "bulk-write-stream"; packageName = "bulk-write-stream"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/bulk-write-stream/-/bulk-write-stream-1.1.3.tgz"; - sha1 = "d29ca385fbd53f357aee5bd3d3028732b62ae275"; + url = "https://registry.npmjs.org/bulk-write-stream/-/bulk-write-stream-1.1.4.tgz"; + sha512 = "2g3ccqw8k5vhdhnks27i954xglllw5gay8nvy3zgm2c7jpwnjc2imarwshx53pz54br6q4i4x2va4s80ixavafphhsykdhyzrvv1lhs"; }; }; "bunyan-1.5.1" = { @@ -3811,6 +3874,15 @@ let sha1 = "98cc890ca652dd2ef0e70b37925310ff9e90fc8b"; }; }; + "caw-2.0.1" = { + name = "caw"; + packageName = "caw"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/caw/-/caw-2.0.1.tgz"; + sha512 = "2wa0gi2wljxw00rvqz454sgdr8yy90z8lhprxjc1prwi695lnzrh6sk0qqhp63h9gmbldyvvzfvm8k1jk0sbv6icdawcss441jky3qa"; + }; + }; "ccount-1.0.2" = { name = "ccount"; packageName = "ccount"; @@ -3910,13 +3982,13 @@ let sha512 = "3fj8njcdcvyplivm2fj19lqw8qv7gb8v7gd6a223pmn8f3di4zwkhyb09vzlmw3pnk4ib88kp4cg8r9i5k5rskalzdfh1l23ljp6gh3"; }; }; - "chalk-2.3.1" = { + "chalk-2.3.2" = { name = "chalk"; packageName = "chalk"; - version = "2.3.1"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-2.3.1.tgz"; - sha512 = "3m0k6j50aridlrk1q8kf3cd1vcj6qcg2nx5yk8d0196hmw0c4a6y1h315p24l34yz0chfrcrkrsr12cixccfp5q7caw5803z6hkhia1"; + url = "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz"; + sha512 = "06jlrzx0nb92910rcfhx55n28jgvhc0qda49scnfyifnmc31dyfqsl5qqiwhsxkrhrc6c07x69q037f1pwg06kkfd1qdzaxz7dj7kk4"; }; }; "character-entities-1.2.1" = { @@ -3982,6 +4054,15 @@ let sha1 = "b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"; }; }; + "charenc-0.0.2" = { + name = "charenc"; + packageName = "charenc"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz"; + sha1 = "c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"; + }; + }; "check-error-1.0.2" = { name = "check-error"; packageName = "check-error"; @@ -4045,13 +4126,13 @@ let sha1 = "798e689778151c8076b4b360e5edd28cda2bb468"; }; }; - "chokidar-2.0.2" = { + "chokidar-2.0.3" = { name = "chokidar"; packageName = "chokidar"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-2.0.2.tgz"; - sha512 = "1kncf65ax274b43r63m0bfbap3j5ah7dn86niqwpzzw6ilvpc7yy0fan14k584lw8ycf4nl78n5gv3bpyr4jrk5j3v441ragk1qfzcp"; + url = "https://registry.npmjs.org/chokidar/-/chokidar-2.0.3.tgz"; + sha512 = "0r9sfr7gz91aphg4vk476c4z07gqq6wdyhlhk3brazjwfvqz9jqccl19qyrwiwijx0aw85jw0zhnfayapk9wzzcj9wcqp3dhrfj4vyd"; }; }; "chownr-0.0.2" = { @@ -4108,13 +4189,13 @@ let sha1 = "04a106672c18b085ab774d983dfa3ea138f22205"; }; }; - "ci-info-1.1.2" = { + "ci-info-1.1.3" = { name = "ci-info"; packageName = "ci-info"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/ci-info/-/ci-info-1.1.2.tgz"; - sha512 = "1jbmihk48iby72h0b6k4rvhrnaydml49qyjcb83ix310ivjzd4zmdk3yxx1ssn6ryjblm7xzaswnwj53rxwcyn1fr0jm7bzvhy8hcdr"; + url = "https://registry.npmjs.org/ci-info/-/ci-info-1.1.3.tgz"; + sha512 = "0p634fyx3kkll2blj5f5bjmz273d7ba201yi3jlrvy7p7lnmmi479d6s3khwmp9lnfrb314l4kw5dq40q60hzfnmfycqibzm3izrbs8"; }; }; "cint-8.2.1" = { @@ -4135,6 +4216,15 @@ let sha512 = "3cm9kdc1sv7pakzlhrc1pazdvg9lk4hv31lximwbcrgmwfzg6imxrndszgx9yzlizknfh2b73cr7b5mfcv50bldpyq6jr5s4zknsj1a"; }; }; + "circular-append-file-1.0.1" = { + name = "circular-append-file"; + packageName = "circular-append-file"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/circular-append-file/-/circular-append-file-1.0.1.tgz"; + sha512 = "294ys13wj7mq7c2sb6h20a25z98wv9mar62nliikcsnb55xyqqwy3hj2ghcmc71yrx61i9s15x0qy71sy9x6i0ghsaxf2akn2zcah05"; + }; + }; "circular-json-0.3.3" = { name = "circular-json"; packageName = "circular-json"; @@ -4180,13 +4270,13 @@ let sha1 = "bf1945e82fc808f55695e6ddeaec01400efd03ff"; }; }; - "clean-css-4.1.9" = { + "clean-css-4.1.11" = { name = "clean-css"; packageName = "clean-css"; - version = "4.1.9"; + version = "4.1.11"; src = fetchurl { - url = "https://registry.npmjs.org/clean-css/-/clean-css-4.1.9.tgz"; - sha1 = "35cee8ae7687a49b98034f70de00c4edd3826301"; + url = "https://registry.npmjs.org/clean-css/-/clean-css-4.1.11.tgz"; + sha1 = "2ecdf145aba38f54740f26cefd0ff3e03e125d6a"; }; }; "clean-stack-1.3.0" = { @@ -4261,13 +4351,13 @@ let sha1 = "7e673ee0dd39a611a486476e53f3c6b3941cb582"; }; }; - "cli-spinners-1.1.0" = { + "cli-spinners-1.3.0" = { name = "cli-spinners"; packageName = "cli-spinners"; - version = "1.1.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.1.0.tgz"; - sha1 = "f1847b168844d917a671eb9d147e3df497c90d06"; + url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.3.0.tgz"; + sha512 = "36fw6sfxv4nwbywjns5fvwflfdimmngjc44ri9xhmqq8cb64b0p19fk30m7ywhr9m9bac8a9jnkb22bs2h0bskv6y5spnqny6mzf6ka"; }; }; "cli-table-0.3.1" = { @@ -4432,13 +4522,13 @@ let sha1 = "c6126a90ad4f72dbf5acdb243cc37724fe93fc1f"; }; }; - "clone-1.0.3" = { + "clone-1.0.4" = { name = "clone"; packageName = "clone"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/clone/-/clone-1.0.3.tgz"; - sha1 = "298d7e2231660f40c003c2ed3140decf3f53085f"; + url = "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz"; + sha1 = "da309cc263df15994c688ca902179ca3c7cd7c7e"; }; }; "clone-2.1.1" = { @@ -4450,6 +4540,15 @@ let sha1 = "d217d1e961118e3ac9a4b8bba3285553bf647cdb"; }; }; + "clone-2.1.2" = { + name = "clone"; + packageName = "clone"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz"; + sha1 = "1b7f4b9f591f1e8f83670401600345a02887435f"; + }; + }; "clone-buffer-1.0.0" = { name = "clone-buffer"; packageName = "clone-buffer"; @@ -4468,13 +4567,13 @@ let sha1 = "348c61ae9cdbe0edfe053d91ff4cc521d790ede8"; }; }; - "clone-regexp-1.0.0" = { + "clone-regexp-1.0.1" = { name = "clone-regexp"; packageName = "clone-regexp"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/clone-regexp/-/clone-regexp-1.0.0.tgz"; - sha1 = "eae0a2413f55c0942f818c229fefce845d7f3b1c"; + url = "https://registry.npmjs.org/clone-regexp/-/clone-regexp-1.0.1.tgz"; + sha512 = "2dkam277bx7ajypbx3z8jrpigy0lqfflbj3ic5crhprjilxlfm8nh6xzpjm1p3n4ndx6pjw2pnm5shjirs2cj6lg7bnwnqiiksa7j0m"; }; }; "clone-response-1.0.2" = { @@ -4504,13 +4603,13 @@ let sha1 = "b3782dff8bb5474e18b9b6bf0fdfe782f8777680"; }; }; - "cloneable-readable-1.0.0" = { + "cloneable-readable-1.1.2" = { name = "cloneable-readable"; packageName = "cloneable-readable"; - version = "1.0.0"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.0.0.tgz"; - sha1 = "a6290d413f217a61232f95e458ff38418cfb0117"; + url = "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.2.tgz"; + sha512 = "2kg2ysl15s9cxgj62p43gzagfqf3kk2zqj4i6g3ckxs2b0fvx71blw7qy7v7gmy2pi9z9jsrc81v43kz7khagrvhlpwyv55vzibxbh6"; }; }; "cmd-shim-2.0.2" = { @@ -4558,6 +4657,33 @@ let sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"; }; }; + "co-from-stream-0.0.0" = { + name = "co-from-stream"; + packageName = "co-from-stream"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/co-from-stream/-/co-from-stream-0.0.0.tgz"; + sha1 = "1a5cd8ced77263946094fa39f2499a63297bcaf9"; + }; + }; + "co-fs-extra-1.2.1" = { + name = "co-fs-extra"; + packageName = "co-fs-extra"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/co-fs-extra/-/co-fs-extra-1.2.1.tgz"; + sha1 = "3b6ad77cf2614530f677b1cf62664f5ba756b722"; + }; + }; + "co-read-0.0.1" = { + name = "co-read"; + packageName = "co-read"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/co-read/-/co-read-0.0.1.tgz"; + sha1 = "f81b3eb8a86675fec51e3d883a7f564e873c9389"; + }; + }; "coa-2.0.1" = { name = "coa"; packageName = "coa"; @@ -4576,13 +4702,13 @@ let sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; }; }; - "codecs-1.2.0" = { + "codecs-1.2.1" = { name = "codecs"; packageName = "codecs"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/codecs/-/codecs-1.2.0.tgz"; - sha1 = "5148549e3d156c5fa053d7cbb419715a0cf43d16"; + url = "https://registry.npmjs.org/codecs/-/codecs-1.2.1.tgz"; + sha512 = "16fzwl2fvacbii9fby6i5cm2bz4ajaf4jdyffq1ggwnjbzjim0cbspymc9x9sf5whlzmknj7cybqaxvy5lmxlc99hm9sm6pj7wz3ya8"; }; }; "codepage-1.4.0" = { @@ -4630,13 +4756,13 @@ let sha1 = "4bc0373c164bc3291b4d368c829cf1a80a59dca0"; }; }; - "color-2.0.1" = { + "color-3.0.0" = { name = "color"; packageName = "color"; - version = "2.0.1"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/color/-/color-2.0.1.tgz"; - sha512 = "1gir7mfj6033amg78p7jvpj0nk2hw61hqd81r6x3a2qmgizbw3d89k0qk62680zhm9ypcx6c9p2cgwjvb8smxv0qgvblkwza9ah5ddr"; + url = "https://registry.npmjs.org/color/-/color-3.0.0.tgz"; + sha512 = "3xh3l9zhh6dav7pp5hy88kbb6c52j0pf331ywpp6w2jaf94w25fjn4am930775mskxy75cxl90fji17cym40ivslxxlpcrlxgkmsalc"; }; }; "color-convert-1.9.1" = { @@ -4711,6 +4837,15 @@ let sha1 = "168a4701756b6a7f51a12ce0c97bfa28c084ed63"; }; }; + "colors-1.2.1" = { + name = "colors"; + packageName = "colors"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/colors/-/colors-1.2.1.tgz"; + sha512 = "0m8vssxhc3xlx639gz68425ll6mqh0rib6yr7s2v2vg1hwnqka02zijxmg16iyvzmd5sbsczjs2mqs0n428pc1cgkgj439fsa9b1kxk"; + }; + }; "colour-0.7.1" = { name = "colour"; packageName = "colour"; @@ -4738,15 +4873,6 @@ let sha1 = "458c07e09e0d900fc28b70a3fec2dacd1d2cb7f6"; }; }; - "combine-source-map-0.7.2" = { - name = "combine-source-map"; - packageName = "combine-source-map"; - version = "0.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.7.2.tgz"; - sha1 = "0870312856b307a87cc4ac486f3a9a62aeccc09e"; - }; - }; "combine-source-map-0.8.0" = { name = "combine-source-map"; packageName = "combine-source-map"; @@ -4873,6 +4999,15 @@ let sha512 = "11j7mwxfdnhi3yfkhxjvfkg1mzdsi3wq7iygma6ksmj1f7hfs0z8rpfcysqmy85f67mqvzhda3w1lyy1jqxxm31k799sazbipm7b17r"; }; }; + "commander-2.15.1" = { + name = "commander"; + packageName = "commander"; + version = "2.15.1"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz"; + sha512 = "1mb8z6hhy74rfdgj3spmk52sdqa5bb2w5wp28z3md1daqcca4vbbsg66wz8hdhrv0fnnmf8yzdkmnw3c373vcccmyizzlnmbpsd6msn"; + }; + }; "commander-2.6.0" = { name = "commander"; packageName = "commander"; @@ -5013,7 +5148,7 @@ let packageName = "compression"; version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/compression/-/compression-1.5.2.tgz"; + url = "http://registry.npmjs.org/compression/-/compression-1.5.2.tgz"; sha1 = "b03b8d86e6f8ad29683cba8df91ddc6ffc77b395"; }; }; @@ -5022,7 +5157,7 @@ let packageName = "compression"; version = "1.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/compression/-/compression-1.7.2.tgz"; + url = "http://registry.npmjs.org/compression/-/compression-1.7.2.tgz"; sha1 = "aaffbcd6aaf854b44ebb280353d5ad1651f59a69"; }; }; @@ -5062,6 +5197,15 @@ let sha1 = "0aac662fd52be78964d5532f694784e70110acf7"; }; }; + "concat-stream-1.6.2" = { + name = "concat-stream"; + packageName = "concat-stream"; + version = "1.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz"; + sha512 = "05nnf80j9ls12y3cw2dfnc6rmand3ya5sx9cqn9dgg19ljzdnyfjjv8ig79xi73gr2y4rkfzn9wjip2zzwp5n2d49njd3ki2a1c3cfv"; + }; + }; "conf-1.4.0" = { name = "conf"; packageName = "conf"; @@ -5107,13 +5251,13 @@ let sha1 = "737a3a7036e9886102aa6099e47bb33ab1aba1a1"; }; }; - "configstore-3.1.1" = { + "configstore-3.1.2" = { name = "configstore"; packageName = "configstore"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/configstore/-/configstore-3.1.1.tgz"; - sha512 = "2zmidvkp20q25yv6a5d7k1daawdg0w6ppgayxzpwfhyvmgwybkkv7ni0j4b2j9c8wjn8z33zf5d4bjr8jywb5qixc75vypyy87n90z6"; + url = "https://registry.npmjs.org/configstore/-/configstore-3.1.2.tgz"; + sha512 = "2difdg3f56d584kfxl1zvm4ik5m3ln949m0q9sxq6ranzx2iwqa9zxqxy2l5i2lsm8jwmaiqkf7rc73gfnfip5m2qh8awd3s4ggknxy"; }; }; "connect-1.9.2" = { @@ -5269,6 +5413,15 @@ let sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; }; }; + "consolidate-0.14.5" = { + name = "consolidate"; + packageName = "consolidate"; + version = "0.14.5"; + src = fetchurl { + url = "https://registry.npmjs.org/consolidate/-/consolidate-0.14.5.tgz"; + sha1 = "5a25047bc76f73072667c8cb52c989888f494c63"; + }; + }; "constantinople-3.0.2" = { name = "constantinople"; packageName = "constantinople"; @@ -5341,12 +5494,12 @@ let sha512 = "1f4y61wc913jrnga7nny83gzf9l2488q6sl1ry9lbwgh5x5d3va0xcc0xrmjk6gdxl6d4r6rsk800xp5bazhjrx05yx1wpc8c8gg0w4"; }; }; - "content-type-git+https://github.com/wikimedia/content-type.git#master" = { + "content-type-git+https://github.com/wikimedia/content-type#master" = { name = "content-type"; packageName = "content-type"; version = "1.0.1"; src = fetchgit { - url = "https://github.com/wikimedia/content-type.git"; + url = "https://github.com/wikimedia/content-type"; rev = "47b2632d0a2ee79a7d67268e2f6621becd95d05b"; sha256 = "e583031138b98e2a09ce14dbd72afa0377201894092c941ef4cc07206c35ed04"; }; @@ -5369,13 +5522,13 @@ let sha1 = "bd727a7faed77e71ff3985ac93351a912733ad0f"; }; }; - "conventional-changelog-1.1.17" = { + "conventional-changelog-1.1.23" = { name = "conventional-changelog"; packageName = "conventional-changelog"; - version = "1.1.17"; + version = "1.1.23"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-1.1.17.tgz"; - sha512 = "325x3h1qn2q1cg3x4dlia7sjanlv2qsj9c0nq8pzvr5fcwmg9qmf3am30bk4c4yjikyvfgpsvnp8rrh937bywd5y4d410hwfn1hbwhn"; + url = "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-1.1.23.tgz"; + sha512 = "2775l94nr8rbnvhihkrwyszncc2g7z1kvbsqpbvni86h8072xvxngbba6yxzzw4dfs57ghklkh9l0ibjy17rl7ldrh6q9lpyd9xf8y8"; }; }; "conventional-changelog-angular-1.6.6" = { @@ -5387,67 +5540,67 @@ let sha512 = "0v02kj8l2ji18jmcgjqa0nqsfn4h9jklgy4g9brf1ppm0n8344in3xpmyc5y06i5k3jjxl8sv90cndh2fbg4fhn0wr1ric258ajgr5j"; }; }; - "conventional-changelog-atom-0.2.4" = { + "conventional-changelog-atom-0.2.8" = { name = "conventional-changelog-atom"; packageName = "conventional-changelog-atom"; - version = "0.2.4"; + version = "0.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-0.2.4.tgz"; - sha512 = "2b43fd5cpi069hsmfswl320lnpnvahmqmnrc9csk6qv0dq72nfj0jzafmbv5gsb3ds2ssr29lswwky61shy3n9hbxshq0qw3in6ds73"; + url = "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-0.2.8.tgz"; + sha512 = "3m1yhgjwbz0x993dfdw3g2n4svz4ym4k1snhg57iraw1418glgdwpz52j01300v8d1p6ldjjbrv7x3gqa08xcqq6inpkbhv2fmdk4zj"; }; }; - "conventional-changelog-cli-1.3.15" = { + "conventional-changelog-cli-1.3.21" = { name = "conventional-changelog-cli"; packageName = "conventional-changelog-cli"; - version = "1.3.15"; + version = "1.3.21"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-cli/-/conventional-changelog-cli-1.3.15.tgz"; - sha512 = "0b9w7fp4mrgs12s4hznwzp79m9lza4fsygvdyma6qnd53h699jscc7h6jwlhdf398h5rpf91y2x0gl38fxfb9ydicshmvy5qdsgc4yh"; + url = "https://registry.npmjs.org/conventional-changelog-cli/-/conventional-changelog-cli-1.3.21.tgz"; + sha512 = "1n93839r75vwj9fl4i3x3l06zc84kin92cp8nrlxksga9lqdpxc8b8i72wvi9jvwk0z6i29wisxdpiw6y7rrmdl13ch9f3k7jb43m9b"; }; }; - "conventional-changelog-codemirror-0.3.4" = { + "conventional-changelog-codemirror-0.3.8" = { name = "conventional-changelog-codemirror"; packageName = "conventional-changelog-codemirror"; - version = "0.3.4"; + version = "0.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.3.4.tgz"; - sha512 = "33091h0zm06gdwhcqi5c3xvcjl6fw8cj3wvis9hyl5gix1vl2wd2pifymgp7rag6dbyzilb0g5q3ak29dcsrdzizqzibk8m0hdfkkph"; + url = "https://registry.npmjs.org/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.3.8.tgz"; + sha512 = "24l71rg9rqfl9aa8fi3c1dc2iqxmdsh6ba8b9rwrrj7dg1gzfc5afw03rns5b1h6zld15942aqsjvwklwp6myzw3q1aakaps0m5jwfw"; }; }; - "conventional-changelog-core-2.0.5" = { + "conventional-changelog-core-2.0.10" = { name = "conventional-changelog-core"; packageName = "conventional-changelog-core"; - version = "2.0.5"; + version = "2.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-2.0.5.tgz"; - sha512 = "1agyx5rj0lbrky9ndhha25la98lh2h1lyli2r4r27r1p0pr48niwg04al4whnvcldh0592fmyrdgf8vqqp5n6xz3df43j6dkpnnrzcl"; + url = "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-2.0.10.tgz"; + sha512 = "19pvarpv78qfmlnsz11c8anrwfg1v04qmwrsrcnai8p3xmbzdyvp1znz9j23l0i6l26yabkd4b631wybnkgxr4qgwzgb9hvf8fhvz8l"; }; }; - "conventional-changelog-ember-0.3.6" = { + "conventional-changelog-ember-0.3.11" = { name = "conventional-changelog-ember"; packageName = "conventional-changelog-ember"; - version = "0.3.6"; + version = "0.3.11"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-0.3.6.tgz"; - sha512 = "24dx0snmkfhr4qi7vdq0aywjw9k23x68kaqh0gn92lca7j1268zbzr6vf00izx5g86kkjihlzgsgx8piyy1mnimn9nk7bj8pv2ka4w4"; + url = "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-0.3.11.tgz"; + sha512 = "1pm9wncjsfizvxzf84fp9ywdfm0znj0af0h2012ylazva8iis7zp4vph9ymrnd87kfmdv5gk2s0nsq8gqm6vxh87vbdykg640zczf0j"; }; }; - "conventional-changelog-eslint-1.0.4" = { + "conventional-changelog-eslint-1.0.9" = { name = "conventional-changelog-eslint"; packageName = "conventional-changelog-eslint"; - version = "1.0.4"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-1.0.4.tgz"; - sha512 = "3zk9p0rc8xns93flvpc0lnyfqdyv48yc3m2z71da07gj8fbmbrxs0px30xnlqzdwmbcz86i9fksxrcnqq9mhlwcfkwyzma396n4cxpp"; + url = "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-1.0.9.tgz"; + sha512 = "3nl1q7m2f7yf8fr40dpns2x6n9z3n8m4kd74fxn2z4d0v0dp2si3h2xbg339984wyfa1ina5w61n6q8n1pcybwjghyxjzbnb1yygkl7"; }; }; - "conventional-changelog-express-0.3.4" = { + "conventional-changelog-express-0.3.6" = { name = "conventional-changelog-express"; packageName = "conventional-changelog-express"; - version = "0.3.4"; + version = "0.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-express/-/conventional-changelog-express-0.3.4.tgz"; - sha512 = "3w3pm3dqwn8bj29809j0ivybw8vn2grnz486h9bm4kk9bn4849k9pxiqmx2ifpqf09hdl17fjk1xw320zz33wnvjzx78kbrpmpi9r9k"; + url = "https://registry.npmjs.org/conventional-changelog-express/-/conventional-changelog-express-0.3.6.tgz"; + sha512 = "3qvnznizyjsb4nxznraiw24wydli7ky95905792az7mgm4dpc0hhxg6l9n5jlx5saglig9sm2gi3i0grqy39plvkp8ikxar2as9a9fy"; }; }; "conventional-changelog-jquery-0.1.0" = { @@ -5468,49 +5621,49 @@ let sha1 = "0479eb443cc7d72c58bf0bcf0ef1d444a92f0e5c"; }; }; - "conventional-changelog-jshint-0.3.4" = { + "conventional-changelog-jshint-0.3.8" = { name = "conventional-changelog-jshint"; packageName = "conventional-changelog-jshint"; - version = "0.3.4"; + version = "0.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-jshint/-/conventional-changelog-jshint-0.3.4.tgz"; - sha512 = "0lzbgx3x2bfchxp8p4ppjavnp4yywjks3486yrxanq3skq0x5g4wnbhcf2viwm167mhn3aiawxygsxql5ww8md1xzssdrqb730fmnh9"; + url = "https://registry.npmjs.org/conventional-changelog-jshint/-/conventional-changelog-jshint-0.3.8.tgz"; + sha512 = "25274wd4xzrjinpfglybkna5wm74wnfqhyll32ixz8fnq43gg50b99ip2sj17nqd5x9a5l111d0922gqv9j93q2sdwrbzs8hr9m0zw6"; }; }; - "conventional-changelog-preset-loader-1.1.6" = { + "conventional-changelog-preset-loader-1.1.8" = { name = "conventional-changelog-preset-loader"; packageName = "conventional-changelog-preset-loader"; - version = "1.1.6"; + version = "1.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-1.1.6.tgz"; - sha512 = "12qk33piqbilkyrvin1vsjzp5pcvs7sschn5jry272r1hnv3x0jrwb1dlnik8vpp3zqai6n70h4ls55q2ch5n13a6g25c1hvhzwhqy9"; + url = "https://registry.npmjs.org/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-1.1.8.tgz"; + sha512 = "1rl5rdcffc9nr30wxf718hl5qkcnb5hi5d85rchw48v2gyjbw371910qcd9v7pwfc9isrg1xxg8npnq2lxnv31xjp6dlqdqh4rjqj9j"; }; }; - "conventional-changelog-writer-3.0.4" = { + "conventional-changelog-writer-3.0.9" = { name = "conventional-changelog-writer"; packageName = "conventional-changelog-writer"; - version = "3.0.4"; + version = "3.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-3.0.4.tgz"; - sha512 = "1ryw2mmza9y6bk5hs2ivhvp9p5hq7hhydhis2880w41dajr193zvccwhglp7js7j435d3i2d38i5aikydqg2r4jdc7753w4d22zyiqi"; + url = "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-3.0.9.tgz"; + sha512 = "3ypk00r7ddkzx8ayyzdss65167c8h4qgn7f0m2p7zif0sw55ljpbx07zr0hmw8rkyzq0dv7ydr5l14wa60c1fkja8n19ia936rrpllz"; }; }; - "conventional-commits-filter-1.1.5" = { + "conventional-commits-filter-1.1.6" = { name = "conventional-commits-filter"; packageName = "conventional-commits-filter"; - version = "1.1.5"; + version = "1.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-1.1.5.tgz"; - sha512 = "0dw3vksvzwig2hiiw1kky2p424136r2faa941bkcdy3ljhp7mgd9i8pz3vdccw23v51z7vhh1dkw7wg363qxg9kvcxr2lgwp1cgwgcs"; + url = "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-1.1.6.tgz"; + sha512 = "38pzjvxmmjg6y92qyskzpxngphp9s5lxy89ldq9mwx4dcy4n8am2d57j1w4gb7h2fkggbfy5744xrj7ycz2v5afr8hj892a4jsf1h19"; }; }; - "conventional-commits-parser-2.1.5" = { + "conventional-commits-parser-2.1.7" = { name = "conventional-commits-parser"; packageName = "conventional-commits-parser"; - version = "2.1.5"; + version = "2.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-2.1.5.tgz"; - sha512 = "2nb2s8hrbv3sl19xzz9x5pqgmm4kimrsaqlzs8xa2wzr0zg68090xnlq5ifcbmcm47fg5l9m63kkri248idzrvz2y689y3jbbmhz84d"; + url = "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-2.1.7.tgz"; + sha512 = "0ahfqxbkswm1pnbj477wz7kl2588dbg8skjz7xzyykv4w2bw9aal3idvs8kjchlv140s64jcfa2clli93phw4jk85wa09q4s9sim0q6"; }; }; "conventional-recommended-bump-1.2.1" = { @@ -5783,13 +5936,13 @@ let sha1 = "652294c14651db28fa93bd2d5ff2983a4f08c636"; }; }; - "core-js-2.5.3" = { + "core-js-2.5.4" = { name = "core-js"; packageName = "core-js"; - version = "2.5.3"; + version = "2.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-2.5.3.tgz"; - sha1 = "8acc38345824f16d8365b7c9b4259168e8ed603e"; + url = "https://registry.npmjs.org/core-js/-/core-js-2.5.4.tgz"; + sha1 = "f2c8bf181f2a80b92f360121429ce63a2f0aeae0"; }; }; "core-util-is-1.0.2" = { @@ -5972,6 +6125,15 @@ let sha1 = "7eeeed9eddc95e22c189382e34624044a89a5a6d"; }; }; + "crypt-0.0.2" = { + name = "crypt"; + packageName = "crypt"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz"; + sha1 = "88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"; + }; + }; "crypt3-0.2.0" = { name = "crypt3"; packageName = "crypt3"; @@ -6377,22 +6539,22 @@ let sha512 = "2lc9p062gaa2xrf07z14xqgid3rw5fg05ak3s13g3mrr5hf8zxmdvp3lq4wggj7k5pc2c43r3d4yyy7rfrqafsdm7hfisdda4zgsi1w"; }; }; - "dat-ignore-2.0.0" = { + "dat-ignore-2.1.1" = { name = "dat-ignore"; packageName = "dat-ignore"; - version = "2.0.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/dat-ignore/-/dat-ignore-2.0.0.tgz"; - sha512 = "1s78mv3ngs1v1cgpcp97y1xmns97m2r6gjkkrksl63j5d870vpsmmrhsfm1vw4q0dz4c1yfnfcpijlgbqai9c5d2zj1lz56rih0kxk8"; + url = "https://registry.npmjs.org/dat-ignore/-/dat-ignore-2.1.1.tgz"; + sha512 = "3ars15n4l3fgvnzah15zpfzirg66clg2a72d2qawg340ad1f0xbahxgzfj52q3ib48s6k7m4a8zcpv5n3pq2blkm1dhpyz1s9d9y44d"; }; }; - "dat-json-1.0.1" = { + "dat-json-1.0.2" = { name = "dat-json"; packageName = "dat-json"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/dat-json/-/dat-json-1.0.1.tgz"; - sha512 = "13nn20vg6jx1h8ypazv9zn236hvv29wwq52mdbbfl77zrg8d7syni933v2mm3y1jsk25c7dc2gs1876fz0yblniryncnbjxrf0aq0nq"; + url = "https://registry.npmjs.org/dat-json/-/dat-json-1.0.2.tgz"; + sha512 = "0i32dn4p0dmjbljm9csnrfibnrgljbqcqkiy5n2wn0mdqpklnv6k9imrv93c0j6p5hsrpnnpjdibhw6fyf5a3183g2wxd1zw5avx6hi"; }; }; "dat-link-resolve-2.1.0" = { @@ -6674,6 +6836,15 @@ let sha1 = "eb3913333458775cb84cd1a1fae062106bb87545"; }; }; + "decompress-4.2.0" = { + name = "decompress"; + packageName = "decompress"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decompress/-/decompress-4.2.0.tgz"; + sha1 = "7aedd85427e5a92dacfe55674a7c505e96d01f9d"; + }; + }; "decompress-response-3.3.0" = { name = "decompress-response"; packageName = "decompress-response"; @@ -6683,6 +6854,42 @@ let sha1 = "80a4dd323748384bfa248083622aedec982adff3"; }; }; + "decompress-tar-4.1.1" = { + name = "decompress-tar"; + packageName = "decompress-tar"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/decompress-tar/-/decompress-tar-4.1.1.tgz"; + sha512 = "18rwwdac0961cs2xpagx8sfqysxzcvvna1bfhjd8aamgm5k6mbcr88k0qp46z1fvypvk00sc27mv0n7885cfwi525gix96659l4rli5"; + }; + }; + "decompress-tarbz2-4.1.1" = { + name = "decompress-tarbz2"; + packageName = "decompress-tarbz2"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz"; + sha512 = "3s2l466xc70zvxrwsr1xr7x5sg9g9wh2wsvk81pxmhc0m73hwhfhhn63c53n6vkv8rlxs80gscrkpk8fc2mbh3j154cvbzm6wpk3kxk"; + }; + }; + "decompress-targz-4.1.1" = { + name = "decompress-targz"; + packageName = "decompress-targz"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/decompress-targz/-/decompress-targz-4.1.1.tgz"; + sha512 = "3gig705jrzdsihjnfij52kj17mgsclfn5vbzswqqdjd0ac4f0dy0afds02m4zm5jacnppavhydyy0rgd99prk8hkmbcisgbfxk3agz3"; + }; + }; + "decompress-unzip-4.0.1" = { + name = "decompress-unzip"; + packageName = "decompress-unzip"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-4.0.1.tgz"; + sha1 = "deaaccdfd14aeaf85578f733ae8210f9b4848f69"; + }; + }; "decompress-zip-0.3.0" = { name = "decompress-zip"; packageName = "decompress-zip"; @@ -6773,22 +6980,13 @@ let sha1 = "634780f2f8656ab771af8fa8431ed1ccee55c7b0"; }; }; - "deepmerge-1.5.2" = { + "deepmerge-2.1.0" = { name = "deepmerge"; packageName = "deepmerge"; - version = "1.5.2"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz"; - sha512 = "2sylzgq5rwi12ac5y4fbvyyhs128zlcrp1q1i0bkp27fvlg60hr1slxzckk22x2rzgmwsqqlvzyylm9v0gwzbsbprd3c1mg78c396gp"; - }; - }; - "deepmerge-2.0.1" = { - name = "deepmerge"; - packageName = "deepmerge"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/deepmerge/-/deepmerge-2.0.1.tgz"; - sha512 = "2qww1m640drvrkcyijaky5kpzdg7pqixb2qk3ms5r99p9ch6isv8a6h0yqwypsw42d1hlg3v7v1x4x7cy0v10pn87cms9vaqa4g10sl"; + url = "https://registry.npmjs.org/deepmerge/-/deepmerge-2.1.0.tgz"; + sha512 = "2zs0sn06vr11mwi2xg2vns26s07gajx2s94hnpfab8g6fl7wmnwbg14fvi2ificasppcmy8g2dh1xiijxg6r8gilkjhsz40lbdmkks3"; }; }; "default-browser-id-1.0.4" = { @@ -7070,13 +7268,13 @@ let sha512 = "259c687nsmq5ni5q79081s6lpd2srwn7xlwipxwbrqkq9bq0zsvwb0n1d99jc7c6kvpm95bhvvlncfb0l4hqy6vnlb5lrhwwmwyd8qz"; }; }; - "detective-5.0.2" = { + "detective-5.1.0" = { name = "detective"; packageName = "detective"; - version = "5.0.2"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/detective/-/detective-5.0.2.tgz"; - sha512 = "0q6jv51mrwjp7ws5xdfpi49rq6ywl0fcl70hllsxiyqy4c89k14v0g9fj5g4y690n8yqw9vxxq6zgnw8lpwbsdvlgyhdqz3xjhhnjrm"; + url = "https://registry.npmjs.org/detective/-/detective-5.1.0.tgz"; + sha512 = "1cm9sp1rl54d3y7v9nvw12kad47g5pcmbzf96s7kpm85j1cc79yc8qb8q0xjj71w32pgz2p4fym47sa851i5lswglmmiimgyflwqlac"; }; }; "di-0.0.1" = { @@ -7124,22 +7322,13 @@ let sha1 = "c9ce393a4b7cbd0b058a725c93df299027868ff9"; }; }; - "diff-3.3.1" = { + "diff-3.5.0" = { name = "diff"; packageName = "diff"; - version = "3.3.1"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/diff/-/diff-3.3.1.tgz"; - sha512 = "31pj7v5gg5igmvwzk6zxw1wbvwjg6m9sfl0h3bs1x4q6idcw98vr8z8wcqk2603q0blpqkmkxp659kjj91wksr03yr8xlh16djcg8rh"; - }; - }; - "diff-3.4.0" = { - name = "diff"; - packageName = "diff"; - version = "3.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/diff/-/diff-3.4.0.tgz"; - sha512 = "1qawya1qhgy4q0bgx0s9ryfz70ddrgyj33rdnnppzszi7x31iir66y7v89kc82lr7prkafrax9sa6w5ssxykqmcf1xw291864qnx5a2"; + url = "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz"; + sha512 = "32bkv3cfhax4x5zhiyfn63wjhqwkzsjiql3my8p3d9hvv020p8f9hdi7mpqixrkpgs0g9k15mn736s449yad9wq1plhxyhxb2sam3h3"; }; }; "diff2html-2.3.3" = { @@ -7187,13 +7376,13 @@ let sha1 = "4d5afc5187edba67ec6ab0e55f6422a0e2cb7338"; }; }; - "discovery-channel-5.4.7" = { + "discovery-channel-5.5.1" = { name = "discovery-channel"; packageName = "discovery-channel"; - version = "5.4.7"; + version = "5.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/discovery-channel/-/discovery-channel-5.4.7.tgz"; - sha512 = "3c8npbdr7r6725kkj76h5zy72l3gd8ndb3dy4dwbapxapfzccl9f6iy0zdy3wxywcfb6cc64w4mf089v00rcr1aqcjdlvn483pnzs78"; + url = "https://registry.npmjs.org/discovery-channel/-/discovery-channel-5.5.1.tgz"; + sha512 = "2zzy8n58w43cvmnascylmw3nppynm334nsjd85w329k8461lwif8xz8b5xqhx8grhpiawhhrri9nlf08ajxriiy4sn26gila509jj8h"; }; }; "discovery-swarm-4.4.2" = { @@ -7205,13 +7394,13 @@ let sha1 = "5d3160a46019e50e874195765df7d601ee55a813"; }; }; - "dispensary-0.12.0" = { + "dispensary-0.16.0" = { name = "dispensary"; packageName = "dispensary"; - version = "0.12.0"; + version = "0.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/dispensary/-/dispensary-0.12.0.tgz"; - sha1 = "cc491bbbfa66a57414c958c68582a4c8703ff159"; + url = "https://registry.npmjs.org/dispensary/-/dispensary-0.16.0.tgz"; + sha1 = "7173f2828380135e3c8eb9f61719fa038c0cd133"; }; }; "diveSync-0.3.0" = { @@ -7232,6 +7421,15 @@ let sha512 = "2hda8mbvxc2r10g5p9dsrjk3qdrp7gpk66ps0dikwzcdgn9bvsf8ih9k19kxw7wr299cm7hav2q6rjp5m76zyb6mb19bfa3g6zxyvmg"; }; }; + "dns-discovery-6.1.0" = { + name = "dns-discovery"; + packageName = "dns-discovery"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dns-discovery/-/dns-discovery-6.1.0.tgz"; + sha512 = "2qyx3fzq9h9x0m2l5b9226hx2vxpl7w3sgh352qfpa683zmjbzsm8x984jvfmrl3yzzipwg07p6dqdcm8ba3v19x5q1sdgfdhpssp9a"; + }; + }; "dns-equal-1.0.0" = { name = "dns-equal"; packageName = "dns-equal"; @@ -7259,6 +7457,15 @@ let sha512 = "19g682cvkba33mwrism28hibd2nv9xd16k5bj807jx3ih1cc7ff9dn8chmfjnqgglzl6lq3m3jarxng9vbarccgchd0aq118d15yk6i"; }; }; + "dns-packet-4.1.1" = { + name = "dns-packet"; + packageName = "dns-packet"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dns-packet/-/dns-packet-4.1.1.tgz"; + sha512 = "09adhjnzfiilwrksrckjrxcfi54gy5xgcsvkq24r98j0xh1asvl5iywj4p37s4l7drgysmdlkv95iki5c554gviaj4738fnlhgn42v3"; + }; + }; "dns-socket-1.6.3" = { name = "dns-socket"; packageName = "dns-socket"; @@ -7268,6 +7475,15 @@ let sha512 = "2g9g9jqx44qpiawlxfn1g647dqwwz2djjpy350c83d1z79d5wa21cknh1jz4wrwsjkvgn14vhmjjxqxf5n8fqq6fjyzw85aa7fk4rgy"; }; }; + "dns-socket-3.0.0" = { + name = "dns-socket"; + packageName = "dns-socket"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dns-socket/-/dns-socket-3.0.0.tgz"; + sha512 = "3yrr8f842jzbhkhbi8a5pgqasyqn03n74gq9l43qmr33ih6ms57kdl5ffkb6zpaaicgj2w8w7kdx4s4xh10aw3vz3k69zh9583s8i9k"; + }; + }; "dns-txt-2.0.2" = { name = "dns-txt"; packageName = "dns-txt"; @@ -7295,13 +7511,13 @@ let sha1 = "33dc69291eac3414f84871f2d59d77b6f6948be4"; }; }; - "doctoc-1.3.0" = { + "doctoc-1.3.1" = { name = "doctoc"; packageName = "doctoc"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/doctoc/-/doctoc-1.3.0.tgz"; - sha1 = "7f0839851dd58c808a2cae55d9504e012d08ee30"; + url = "https://registry.npmjs.org/doctoc/-/doctoc-1.3.1.tgz"; + sha1 = "f012e3603e3156254c2ef22ac88c7190f55426ba"; }; }; "doctrine-2.1.0" = { @@ -7349,13 +7565,13 @@ let sha1 = "073c697546ce0780ce23be4a28e293e40bc30c82"; }; }; - "dom-storage-2.0.2" = { + "dom-storage-2.1.0" = { name = "dom-storage"; packageName = "dom-storage"; - version = "2.0.2"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/dom-storage/-/dom-storage-2.0.2.tgz"; - sha1 = "ed17cbf68abd10e0aef8182713e297c5e4b500b0"; + url = "https://registry.npmjs.org/dom-storage/-/dom-storage-2.1.0.tgz"; + sha512 = "3ckwbdpfa94f4kv5vav65l1qm56bg54bs2wgz9x5nx64avazbg3p07w05mjbfw066clq69vmyfg1fcph5r99i74x18l95zkcp4nk943"; }; }; "dom-walk-0.1.1" = { @@ -7502,6 +7718,24 @@ let sha1 = "531319715b0e81ffcc22eb28478ba27643e12c6c"; }; }; + "download-5.0.3" = { + name = "download"; + packageName = "download"; + version = "5.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/download/-/download-5.0.3.tgz"; + sha1 = "63537f977f99266a30eb8a2a2fbd1f20b8000f7a"; + }; + }; + "download-git-repo-1.0.2" = { + name = "download-git-repo"; + packageName = "download-git-repo"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/download-git-repo/-/download-git-repo-1.0.2.tgz"; + sha512 = "21sjxnakbaz6gkw8lrk0dizw893hwawsrhaypkxph8cdf6v7gyxl8b4n82qh99v4zvzcbbxbc7ff8jzkkn91vmn0w381vzh9ypi801z"; + }; + }; "dreamopt-0.6.0" = { name = "dreamopt"; packageName = "dreamopt"; @@ -7565,13 +7799,13 @@ let sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"; }; }; - "duplexify-3.5.3" = { + "duplexify-3.5.4" = { name = "duplexify"; packageName = "duplexify"; - version = "3.5.3"; + version = "3.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/duplexify/-/duplexify-3.5.3.tgz"; - sha512 = "0c611ik2kv5wiqwfi5zjyx70dnw117lbr0wwqxqxc0hldnnfigiqyh5xr7x6267vs63jgvqkzvvwb3b1g37zkk3nx5dh5z8xbs07hl3"; + url = "https://registry.npmjs.org/duplexify/-/duplexify-3.5.4.tgz"; + sha512 = "2qcky919ps17a9ndimxvcqc73wlrcjmq8ppddbnl45xs9yqp1dmzzfaspfn63xzp14rl3dlk4g6y2ia71s6r9nggd0mb891hcni4di7"; }; }; "each-async-1.1.1" = { @@ -7764,6 +7998,15 @@ let sha1 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389"; }; }; + "enable-1.3.2" = { + name = "enable"; + packageName = "enable"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/enable/-/enable-1.3.2.tgz"; + sha1 = "9eba6837d16d0982b59f87d889bf754443d52931"; + }; + }; "encodeurl-1.0.2" = { name = "encodeurl"; packageName = "encodeurl"; @@ -7854,6 +8097,15 @@ let sha512 = "1qcg5b143cxb4gxa9jpj51c8q9ihwb0sscwqicgwrghmfg8y2phqjzhlaxjsrd6z8h1mpsxzy00s54w9lx6vd27f1mj9iqqk6ya4khg"; }; }; + "engine.io-3.2.0" = { + name = "engine.io"; + packageName = "engine.io"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io/-/engine.io-3.2.0.tgz"; + sha512 = "0mizbh339hvwkla9vy96m7jg92120wqm9af12ks998hrp2a0fzr3w0gxssjwhp0s0f3kyii24z1sz2x5xq9x3qb5cjn1q2h1fcf05lr"; + }; + }; "engine.io-client-1.3.1" = { name = "engine.io-client"; packageName = "engine.io-client"; @@ -7872,13 +8124,22 @@ let sha512 = "1kfc2cmjw891x0i9cm9alm93db5s40h3n4a3zcpjha7nrvz0s7ggzpp2x2v8zmnhp9278amjdm0j5lfkn3qxan7nanzhl4m4wgy1101"; }; }; - "engine.io-client-3.1.5" = { + "engine.io-client-3.1.6" = { name = "engine.io-client"; packageName = "engine.io-client"; - version = "3.1.5"; + version = "3.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.1.5.tgz"; - sha512 = "3ld2inpqkyy451a7lpf8kmaf76zrj9a50yg28z1d1znhnnj40g3cnrcq93690lknhb6mjv0k1nav2cbqx2p3aqqhmav7kippy0nzzs6"; + url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.1.6.tgz"; + sha512 = "1zfr0lycsgvwkxc8i4qhg5rjr59ss7p66nz3j1y1awmvzgy9myn0rqrpv2hrnm76qv9kmiiss0jpxaaz9xy0lkp7857npkfb6q8fyw6"; + }; + }; + "engine.io-client-3.2.1" = { + name = "engine.io-client"; + packageName = "engine.io-client"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.2.1.tgz"; + sha512 = "37x70wgsxmbz24ypn1nprgrmqrbjf5ln7xjivpw5q6rw91kj2mhjq81ai8v7zs6am25h2sajk341kid215gxrmy88iwwy2n5f9ip46b"; }; }; "engine.io-parser-1.0.6" = { @@ -7917,15 +8178,6 @@ let sha1 = "a115c32504b6302e85a76269d7a57ccdd962e359"; }; }; - "enhanced-resolve-3.4.1" = { - name = "enhanced-resolve"; - packageName = "enhanced-resolve"; - version = "3.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz"; - sha1 = "0421e339fd71419b3da13d129b3979040230476e"; - }; - }; "enhanced-resolve-4.0.0" = { name = "enhanced-resolve"; packageName = "enhanced-resolve"; @@ -8034,13 +8286,13 @@ let sha1 = "eaba64ca5d542a311ac945f582defc336165d9f4"; }; }; - "es-abstract-1.10.0" = { + "es-abstract-1.11.0" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.10.0"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.10.0.tgz"; - sha512 = "04nd5ylkfffc08vn5kjhz0saqh44nj19f5j3ahrrhf3zvc9da5rf6snnh63xv4gfhacjbax1jajzgqv4zpm77v806jf883a2w77zs7y"; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.11.0.tgz"; + sha512 = "2aaq6ivy5raj1a99db6gvw7qn2vs27h0pqvgpf2fqfm9avwqsirr8gs86yx7n36qysjw1vabz6mlc8dfpi6fmz9yqvk8kapz49jnx36"; }; }; "es-to-primitive-1.1.1" = { @@ -8052,13 +8304,13 @@ let sha1 = "45355248a88979034b6792e19bb81f2b7975dd0d"; }; }; - "es5-ext-0.10.39" = { + "es5-ext-0.10.42" = { name = "es5-ext"; packageName = "es5-ext"; - version = "0.10.39"; + version = "0.10.42"; src = fetchurl { - url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.39.tgz"; - sha512 = "3k07fsn3x64wphzrvb5bhv4r8drmvranrh43j8pn7rsnpyk8pia81vy1d4g3ix0ami3xs4crqxpanxff9dwfk7czrl4m5y72dk9fmh2"; + url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.42.tgz"; + sha512 = "1412ssfrx1kvraz8kp4x9lc1jzcdh2952vbmlimrfalmbjv44rh504ihb4fg5mjwx8ix1f1wii0a0qngwrfk4gl271mcywgp7b4x700"; }; }; "es5-ext-0.8.2" = { @@ -8268,22 +8520,22 @@ let sha1 = "c8fc6201c7f40dd08941b87c085767386a679acc"; }; }; - "eslint-4.15.0" = { + "eslint-4.19.0" = { name = "eslint"; packageName = "eslint"; - version = "4.15.0"; + version = "4.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-4.15.0.tgz"; - sha512 = "3l1j4qy0gqa8rkwpdsmkkbqcmbx23ym8h64d1bbj5i5ds5ks0g91myldzp0y25r6b3ba9646hy4i2jiad2jmm8h68z89i2larkvyhyc"; + url = "https://registry.npmjs.org/eslint/-/eslint-4.19.0.tgz"; + sha512 = "29dc1z24n3c60hfac5afy7rk3mqdch8hnn07fnb9314dbyk5ih2l1284vl3nsgsm5ja5w144nsgmipbycva47gwpl1qfsma5gjcpkdg"; }; }; - "eslint-4.18.1" = { + "eslint-4.19.1" = { name = "eslint"; packageName = "eslint"; - version = "4.18.1"; + version = "4.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-4.18.1.tgz"; - sha512 = "21i792qmqdz7dzm68ncjf4q3bi3c5kb1q103hkdp868mm9p7gd153hjzsq70mfyfx0vrjzna8x734xmpkp9himw32svf7j24jjrzx40"; + url = "https://registry.npmjs.org/eslint/-/eslint-4.19.1.tgz"; + sha512 = "0hw70vjlg6z0y9kf6vjr7g0w9hbm426fwvyzr88l62c5hd9mxrbw5v34b6zb31vbbyda3mkvcwgfnxgqaxvpn0wlrxr0va43pbzygbd"; }; }; "eslint-plugin-no-unsafe-innerhtml-1.0.16" = { @@ -8313,13 +8565,13 @@ let sha512 = "02hr99x8cnc80p9hn5si7mngqpzvvjkxmdv8sch68z0qpqwjdlx3j1w6d9rhr6wgcnqf1mrxyji8wvfddbf7xr13z2nzihv29gvyfdb"; }; }; - "espree-3.5.3" = { + "espree-3.5.4" = { name = "espree"; packageName = "espree"; - version = "3.5.3"; + version = "3.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-3.5.3.tgz"; - sha512 = "1cv3w3jgkm5sdaszxn172lhwgwr13w7sw75hmigqppmr9n2xx761r5cm32xhhg25ws8h00iy746qka5l85nm6sx5qci8iyfj00fsbb7"; + url = "https://registry.npmjs.org/espree/-/espree-3.5.4.tgz"; + sha512 = "3a07jjjp8g8mdayw3n9l0p0llw7cfipjifan2ccyn2vm1zyafrmv5cj11rc6qmk7ibbq1vc4xxc3sfr54qpgxmxiizj0ck63d1hh1y8"; }; }; "esprima-1.0.4" = { @@ -8367,13 +8619,13 @@ let sha1 = "633acdb40d9bd4db8a1c1d68c06a942959fad2b0"; }; }; - "esquery-1.0.0" = { + "esquery-1.0.1" = { name = "esquery"; packageName = "esquery"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/esquery/-/esquery-1.0.0.tgz"; - sha1 = "cfba8b57d7fba93f17298a8a006a04cda13d80fa"; + url = "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz"; + sha512 = "0s9lxfan3qbvpprj71ldy70x9sz4xkpakhr3pymkm13bx40px4kp4xcgipscn8m21qigddin5mkr52bicbm34g46dapyn68kikv4s2a"; }; }; "esrecurse-4.2.1" = { @@ -8462,7 +8714,7 @@ let packageName = "event-stream"; version = "0.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/event-stream/-/event-stream-0.5.3.tgz"; + url = "http://registry.npmjs.org/event-stream/-/event-stream-0.5.3.tgz"; sha1 = "b77b9309f7107addfeab63f0c0eafd8db0bd8c1c"; }; }; @@ -8471,7 +8723,7 @@ let packageName = "event-stream"; version = "3.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/event-stream/-/event-stream-3.1.5.tgz"; + url = "http://registry.npmjs.org/event-stream/-/event-stream-3.1.5.tgz"; sha1 = "6cba5a3ae02a7e4967d65ad04ef12502a2fff66c"; }; }; @@ -8480,7 +8732,7 @@ let packageName = "event-stream"; version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/event-stream/-/event-stream-3.2.2.tgz"; + url = "http://registry.npmjs.org/event-stream/-/event-stream-3.2.2.tgz"; sha1 = "f79f9984c07ee3fd9b44ffb3cd0422b13e24084d"; }; }; @@ -8489,7 +8741,7 @@ let packageName = "event-stream"; version = "3.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz"; + url = "http://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz"; sha1 = "4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571"; }; }; @@ -8781,6 +9033,15 @@ let sha1 = "e35c6dfe2d64b7dca0a5cd4f21781be3299e076c"; }; }; + "express-4.16.3" = { + name = "express"; + packageName = "express"; + version = "4.16.3"; + src = fetchurl { + url = "https://registry.npmjs.org/express/-/express-4.16.3.tgz"; + sha1 = "6af8a502350db3246ecc4becf6b5a34d22f7ed53"; + }; + }; "express-5.0.0-alpha.6" = { name = "express"; packageName = "express"; @@ -8907,13 +9168,13 @@ let sha1 = "12d7b0db850f7ff7e7081baf4005700060c4600b"; }; }; - "external-editor-2.1.0" = { + "external-editor-2.2.0" = { name = "external-editor"; packageName = "external-editor"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/external-editor/-/external-editor-2.1.0.tgz"; - sha512 = "366albydy3glqs8h6y7rdpdhmyffn7vaig5snw8cb1zmn22mgvfywr08jfbmqjiqc9pyjyaaqv6xz5sfy2j1y18590l4f8mji7j53hk"; + url = "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz"; + sha512 = "3sf897ajmkcp0j6rgd0jy6k95s9ck3j305yrr00kmckl8qdhswhbdd5g4m2fai03x8phs1vw2ahf9v7ym5ji4zfxydxyamiy61glabd"; }; }; "extglob-0.3.2" = { @@ -8943,15 +9204,6 @@ let sha1 = "5abbedc98c0d5202e3278727f9192d7e086c6be1"; }; }; - "extract-text-webpack-plugin-3.0.2" = { - name = "extract-text-webpack-plugin"; - packageName = "extract-text-webpack-plugin"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.2.tgz"; - sha512 = "10rc4hfyzf8n5b30q0fpawnbnr1cs33mmrz9466hhcxjzlz7ys44zbsr5kbvr1jn5nivcr91nmfhpq2mqi1wxmr19zsnimri5kwppvf"; - }; - }; "extract-zip-1.5.0" = { name = "extract-zip"; packageName = "extract-zip"; @@ -9159,13 +9411,13 @@ let sha1 = "8b5bcbd9ec327c5041bf9ab023fd6750f1177e65"; }; }; - "feedparser-1.1.3" = { + "feedparser-2.2.9" = { name = "feedparser"; packageName = "feedparser"; - version = "1.1.3"; + version = "2.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/feedparser/-/feedparser-1.1.3.tgz"; - sha1 = "0b725f6b4cbe4b26d518baec0d010ad020156c8b"; + url = "https://registry.npmjs.org/feedparser/-/feedparser-2.2.9.tgz"; + sha1 = "9138197dafdae05fcadde0036beeaf6066c2c5e9"; }; }; "fibers-1.0.15" = { @@ -9222,6 +9474,33 @@ let sha1 = "c392990c3e684783d838b8c84a45d8a048458361"; }; }; + "file-type-3.9.0" = { + name = "file-type"; + packageName = "file-type"; + version = "3.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz"; + sha1 = "257a078384d1db8087bc449d107d52a52672b9e9"; + }; + }; + "file-type-5.2.0" = { + name = "file-type"; + packageName = "file-type"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz"; + sha1 = "2ddbea7c73ffe36368dfae49dc338c058c2b8ad6"; + }; + }; + "file-type-6.2.0" = { + name = "file-type"; + packageName = "file-type"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/file-type/-/file-type-6.2.0.tgz"; + sha512 = "0xf8ry7jj1c5mvvp5qxidq3qcqxzdngx1q9r981ddq3wfcidwqd4h52hplv462hvm9frdl086advhfqfxbnvwm8ass3knby6l217xv0"; + }; + }; "file-uri-to-path-1.0.0" = { name = "file-uri-to-path"; packageName = "file-uri-to-path"; @@ -9240,6 +9519,24 @@ let sha1 = "c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"; }; }; + "filename-reserved-regex-2.0.0" = { + name = "filename-reserved-regex"; + packageName = "filename-reserved-regex"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz"; + sha1 = "abf73dfab735d045440abfea2d91f389ebbfa229"; + }; + }; + "filenamify-2.0.0" = { + name = "filenamify"; + packageName = "filenamify"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/filenamify/-/filenamify-2.0.0.tgz"; + sha1 = "bd162262c0b6e94bfbcdcf19a3bbb3764f785695"; + }; + }; "filesize-3.6.0" = { name = "filesize"; packageName = "filesize"; @@ -9330,6 +9627,15 @@ let sha1 = "ce0b6855b45853e791b2fcc680046d88253dd7f5"; }; }; + "finalhandler-1.1.1" = { + name = "finalhandler"; + packageName = "finalhandler"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz"; + sha512 = "2v4ymv7dvpxpnrid4cn8qni5k5l024zc2qzg8ipkbxwmqjbaiygbx0hvbnr0ywfy0is4ngyhp6ljgjh4wmk6fqc3hd3wyzxil798lb3"; + }; + }; "find-cache-dir-1.0.0" = { name = "find-cache-dir"; packageName = "find-cache-dir"; @@ -9438,15 +9744,6 @@ let sha1 = "b37dc844b76a2f5e7081e884f7c0ae344f153476"; }; }; - "firefox-client-0.3.0" = { - name = "firefox-client"; - packageName = "firefox-client"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/firefox-client/-/firefox-client-0.3.0.tgz"; - sha1 = "3794460f6eb6afcf41376addcbc7462e24a4cd8b"; - }; - }; "firefox-profile-1.1.0" = { name = "firefox-profile"; packageName = "firefox-profile"; @@ -9546,15 +9843,6 @@ let sha1 = "554440766da0a0d603999f433453f6c2fc6a75c1"; }; }; - "fluent-0.4.1" = { - name = "fluent"; - packageName = "fluent"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/fluent/-/fluent-0.4.1.tgz"; - sha512 = "2hrbkg2399py60vsz1k5xydrm5kwfh1f6fpgpbkrs9nni1xpq4isy8aif5jq5dakyksbf0yjx3sh7jl9f54c3r6jkf3amm3grxlbaxx"; - }; - }; "fluent-ffmpeg-2.1.2" = { name = "fluent-ffmpeg"; packageName = "fluent-ffmpeg"; @@ -9564,13 +9852,22 @@ let sha1 = "c952de2240f812ebda0aa8006d7776ee2acf7d74"; }; }; - "flush-write-stream-1.0.2" = { + "fluent-syntax-0.6.6" = { + name = "fluent-syntax"; + packageName = "fluent-syntax"; + version = "0.6.6"; + src = fetchurl { + url = "https://registry.npmjs.org/fluent-syntax/-/fluent-syntax-0.6.6.tgz"; + sha512 = "18dv619kjzc3fdahfc242r7lb27a3pjxx5xd8shascb9xb8c1zncsrbnj0an8qjsg1pwf0az7h7gv5v0g50b3pixznr7wk7d8yqfazj"; + }; + }; + "flush-write-stream-1.0.3" = { name = "flush-write-stream"; packageName = "flush-write-stream"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.2.tgz"; - sha1 = "c81b90d8746766f1a609a46809946c45dd8ae417"; + url = "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.3.tgz"; + sha512 = "0dycj5bh8djmx4lj5llrbg3cg0ynq32qn8pzk8zl9j8pm6nv5n1qzk4m7dq81q96ygzh8jl9chqh8826rrbl8maa9643fvl5lq5kabi"; }; }; "follow-redirects-0.0.3" = { @@ -9780,13 +10077,13 @@ let sha1 = "ef5491490f9433b705faa77249c99029ae348559"; }; }; - "formidable-1.1.1" = { + "formidable-1.2.1" = { name = "formidable"; packageName = "formidable"; - version = "1.1.1"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/formidable/-/formidable-1.1.1.tgz"; - sha1 = "96b8886f7c3c3508b932d6bd70c4d3a88f35f1a9"; + url = "https://registry.npmjs.org/formidable/-/formidable-1.2.1.tgz"; + sha512 = "1x0n2rfaiasdjbw1mm7s29z84f68c7iji7lb1gkxvpknvv6q7bwns7z55ijcf4vkh4kvis12rbgaaih49jf9lj53s30mllb1d35bkqn"; }; }; "forwarded-0.1.2" = { @@ -9942,6 +10239,15 @@ let sha1 = "cd3ce5f7e7cb6145883fcae3191e9877f8587950"; }; }; + "fs-extra-2.0.0" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-2.0.0.tgz"; + sha1 = "337352bded4a0b714f3eb84de8cea765e9d37600"; + }; + }; "fs-extra-2.1.2" = { name = "fs-extra"; packageName = "fs-extra"; @@ -10230,6 +10536,15 @@ let sha1 = "dd7ce7de187c06c8bf353796ac71e099f0980ebc"; }; }; + "get-proxy-2.1.0" = { + name = "get-proxy"; + packageName = "get-proxy"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-proxy/-/get-proxy-2.1.0.tgz"; + sha512 = "0kjf4p1krvzah7k5yngvvc39b7jnkzqlp3cdab8451zh1q4mxmav111dmycnadv28ja2wvcwvavjl7w550ja7qyw4dx976n0illhrnf"; + }; + }; "get-stdin-4.0.1" = { name = "get-stdin"; packageName = "get-stdin"; @@ -10248,6 +10563,15 @@ let sha1 = "122e161591e21ff4c52530305693f20e6393a398"; }; }; + "get-stream-2.3.1" = { + name = "get-stream"; + packageName = "get-stream"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz"; + sha1 = "5f38f93f346009666ee0150a054167f91bdd95de"; + }; + }; "get-stream-3.0.0" = { name = "get-stream"; packageName = "get-stream"; @@ -10275,13 +10599,13 @@ let sha1 = "dc15ca1c672387ca76bd37ac0a395ba2042a2c28"; }; }; - "getmac-1.2.1" = { + "getmac-1.4.1" = { name = "getmac"; packageName = "getmac"; - version = "1.2.1"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/getmac/-/getmac-1.2.1.tgz"; - sha1 = "0d095fd0627850043eac1dcfa0b120bbdc1426d1"; + url = "https://registry.npmjs.org/getmac/-/getmac-1.4.1.tgz"; + sha512 = "0r7zqgvfiv3r6zy8fms9gdcf3a1r46kpf8pm5x7vwrc27vgv69ra244s89k73hb9rna6r3s9v20yzbwjmz2c13gh3s0bbd07zq7w2lr"; }; }; "getpass-0.1.7" = { @@ -10302,13 +10626,22 @@ let sha1 = "2c5a6638d893934b9b55037d0ad82cb7004b2679"; }; }; - "git-raw-commits-1.3.4" = { + "git-clone-0.1.0" = { + name = "git-clone"; + packageName = "git-clone"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/git-clone/-/git-clone-0.1.0.tgz"; + sha1 = "0d76163778093aef7f1c30238f2a9ef3f07a2eb9"; + }; + }; + "git-raw-commits-1.3.6" = { name = "git-raw-commits"; packageName = "git-raw-commits"; - version = "1.3.4"; + version = "1.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-1.3.4.tgz"; - sha512 = "0yfkxk071bahnzw2h5ip6qb7mq76psfwiqs232gkzr91hc55kqw57pjn33j04h3xiwvgrikl20mbccisi006rxyh0lwfvj7bkivwwqv"; + url = "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-1.3.6.tgz"; + sha512 = "111718czypc8jr47xq3n5xvfwx6nib7y36bpb882id57sdhv49bfpdmkgxbrb524942rw3k6wq15128mlv4q8fbkh5g3wjhmgdhmyxj"; }; }; "git-remote-origin-url-2.0.0" = { @@ -10329,13 +10662,13 @@ let sha1 = "a0c2e3dd392abcf6b76962e27fc75fb3223449ce"; }; }; - "git-semver-tags-1.3.4" = { + "git-semver-tags-1.3.6" = { name = "git-semver-tags"; packageName = "git-semver-tags"; - version = "1.3.4"; + version = "1.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-1.3.4.tgz"; - sha512 = "0hhdj4992a96ys5i9k6pjbn99wwsabb92drxr0s7vzxyxlpydrvjzbb4rwdnsd0rm7h92420yr2f3khpakkp6ivgg09fp9hhgprkvax"; + url = "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-1.3.6.tgz"; + sha512 = "25114wyd4p8qn681l730d9s1wgh4kmvizin5361hx5qvpd82adi2fkjkvv289nk1vb6hx8q13ikhyc705hw8iag1b23zq37g4kfacfs"; }; }; "gitconfiglocal-1.0.0" = { @@ -10600,13 +10933,13 @@ let sha1 = "dbf743c6c14992593c655568cb66ed32c0122ebe"; }; }; - "globals-11.3.0" = { + "globals-11.4.0" = { name = "globals"; packageName = "globals"; - version = "11.3.0"; + version = "11.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-11.3.0.tgz"; - sha512 = "1vlgbj6gcsd9dshs7xldhg92zd62r3w51jf9x80qnn0y4llbl2ji5sl7ibmv7ysr0iv8hzid151n8zxhyi84rlnczysjhb6v4l5qjlj"; + url = "https://registry.npmjs.org/globals/-/globals-11.4.0.tgz"; + sha512 = "0fgjya5jfxjd8gzgpnpig973bbplfq2i5fkfpi5lxyjsi3988wq3by19ka2ql2j4a80l9bk5g5brq4vvd2hr61ak79pzwm5z24ycb0g"; }; }; "globals-9.18.0" = { @@ -10699,13 +11032,13 @@ let sha512 = "0phvycaq4yl6jjpyc9vwmgghfy7a6nnpynscpgpbx74zjaa5dbpl1ag0jf7jvimfk0vf6xfjqgh67xdlvi0ycgvp1kasajapjiqr5b3"; }; }; - "got-8.2.0" = { + "got-8.3.0" = { name = "got"; packageName = "got"; - version = "8.2.0"; + version = "8.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-8.2.0.tgz"; - sha512 = "01g5s6aqp4ikmpwhqvw4j7c4n4fq3v7nqaszr9kvwrx801gxzb70b3qx0pqsir2hqw2a7jfd1ja6v577hmmnblvz7c0h8spkal9s9l2"; + url = "https://registry.npmjs.org/got/-/got-8.3.0.tgz"; + sha512 = "2yzcsaq1ajn6bxgq2c4cmzbvysgdd88zypwa96yw57x2rb9gkbww5djfr8m8b1j0bal94khxaz98qjqjf9777ilh3c0l6w25pyp44wh"; }; }; "graceful-fs-1.2.3" = { @@ -10762,6 +11095,15 @@ let sha512 = "0w1lx3hms5mx84mlxsgpvjr42qba17wwqhma0np67c9l8smkd2nwx7gr8724a2q1z7x0hjdjnwzx81893mj2ax498wl7y1h4yl5pysy"; }; }; + "gray-matter-2.1.1" = { + name = "gray-matter"; + packageName = "gray-matter"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/gray-matter/-/gray-matter-2.1.1.tgz"; + sha1 = "3042d9adec2a1ded6a7707a9ed2380f8a17a430e"; + }; + }; "grouped-queue-0.3.3" = { name = "grouped-queue"; packageName = "grouped-queue"; @@ -11014,6 +11356,15 @@ let sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; }; }; + "has-generators-1.0.1" = { + name = "has-generators"; + packageName = "has-generators"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/has-generators/-/has-generators-1.0.1.tgz"; + sha1 = "a6a2e55486011940482e13e2c93791c449acf449"; + }; + }; "has-gulplog-0.1.0" = { name = "has-gulplog"; packageName = "has-gulplog"; @@ -11338,13 +11689,13 @@ let sha1 = "0f591b1b344bdcb3df59773f62fbbaf85bf4028b"; }; }; - "hosted-git-info-2.5.0" = { + "hosted-git-info-2.6.0" = { name = "hosted-git-info"; packageName = "hosted-git-info"; - version = "2.5.0"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz"; - sha512 = "355g980qsk8k9hkv60z58llbvpscjl5yqkh4wx719s8jcq2swzn4ynzinj8azmvdgs10r22wb297rmixh9vvsml55sbysdf2i8ipn54"; + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.6.0.tgz"; + sha512 = "1vi4baj130s7mladvb4rad9ka8nqzcwws9i1zaaplp0fdrmnfwjfbpq01cghha2c2frd2f900f07awglhbbyym0bpwmrph0hhhf11ll"; }; }; "hot-shots-4.8.0" = { @@ -11455,6 +11806,15 @@ let sha1 = "0a002cc85707192a7e7946ceedc11155f60ec736"; }; }; + "http-errors-1.6.3" = { + name = "http-errors"; + packageName = "http-errors"; + version = "1.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz"; + sha1 = "8b55680bb4be283a0b5bf4ea2e38580be1d9320d"; + }; + }; "http-headers-3.0.2" = { name = "http-headers"; packageName = "http-headers"; @@ -11473,13 +11833,13 @@ let sha1 = "29691b6fc58f4f7e81a3605dca82682b068e4430"; }; }; - "http-parser-js-0.4.10" = { + "http-parser-js-0.4.11" = { name = "http-parser-js"; packageName = "http-parser-js"; - version = "0.4.10"; + version = "0.4.11"; src = fetchurl { - url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.10.tgz"; - sha1 = "92c9c1374c35085f75db359ec56cc257cbb93fa4"; + url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.11.tgz"; + sha512 = "1y4az74zgv7jy1cav126lbrbvfqv30p7v3ijmj91ychbg0337k71cwy2n5dvmdfvwhgv3vxxzw2ymxlbj6wh1wf6aycb313c0xpj920"; }; }; "http-proxy-1.0.2" = { @@ -11608,13 +11968,13 @@ let sha1 = "35f7da6c48ce4ddbfa264891ac593ee5ff8671e6"; }; }; - "https-proxy-agent-2.1.1" = { + "https-proxy-agent-2.2.1" = { name = "https-proxy-agent"; packageName = "https-proxy-agent"; - version = "2.1.1"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.1.1.tgz"; - sha512 = "0rxbj60hs8fhs3i02lgb6ypcf9m9v8ybd4lfvfvpy0f1iyy54f1686lmv0rvkyxxihwvs4yizjgv8r8jksh385c4c9yjm3z8i0svbic"; + url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz"; + sha512 = "2arj581rpjpgky9cr5hh3asan2mh7825rwxy63mp02amw9w6vsi59bay0dwp72md28mmzrmahxc909v1r1ca6y6r3f5dryna95r7w0w"; }; }; "humanize-0.0.9" = { @@ -11635,31 +11995,31 @@ let sha1 = "a65b34459ad6367adbb3707a82a3c9f916167030"; }; }; - "humanize-string-1.0.1" = { + "humanize-string-1.0.2" = { name = "humanize-string"; packageName = "humanize-string"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/humanize-string/-/humanize-string-1.0.1.tgz"; - sha1 = "fce2d6c545efc25dea1f23235182c98da0180b42"; + url = "https://registry.npmjs.org/humanize-string/-/humanize-string-1.0.2.tgz"; + sha512 = "3bml62y8rmpga8wbcxfqm6izvc9xxlblx0vc08r778qa42jgw6fjif4i7f9bj2y98bz4xyimg5vfgch92j6i2l7zcwiq5za8l34cziw"; }; }; - "hypercore-6.12.2" = { + "hypercore-6.12.7" = { name = "hypercore"; packageName = "hypercore"; - version = "6.12.2"; + version = "6.12.7"; src = fetchurl { - url = "https://registry.npmjs.org/hypercore/-/hypercore-6.12.2.tgz"; - sha512 = "1s7l8r5bpiialz194g5kryp5bpcg8n0x0l7jfgynjiimi3pyn0lkcijijk20g5ibagfzi3jnrlyh1jp9ywbrys5inbwl83ra7a6qbr6"; + url = "https://registry.npmjs.org/hypercore/-/hypercore-6.12.7.tgz"; + sha512 = "28wgk53py46wrcp8h8xkirakbc3v64r1aaqnl0g0ivp9x7791wkga63mbjl0cdsa3yif0cvbp8djwcpzx0smfyyqkdz7skjdgsbg57j"; }; }; - "hypercore-protocol-6.5.2" = { + "hypercore-protocol-6.6.4" = { name = "hypercore-protocol"; packageName = "hypercore-protocol"; - version = "6.5.2"; + version = "6.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/hypercore-protocol/-/hypercore-protocol-6.5.2.tgz"; - sha512 = "03l77nma8ga06ywa469jzqgc13hjk9bg3w2cv95g3fwnqy2fvz8qpczcih65jscvk0ira5kpm3sk2vqh2whzzvnm19jlqrzi78v80n3"; + url = "https://registry.npmjs.org/hypercore-protocol/-/hypercore-protocol-6.6.4.tgz"; + sha512 = "0rxj8d4lp45q7v3wwwv23m7qi84vw3wvyafqiy9x5f9lqkynq8v8yajpq9bcnc935927qjnxajn8n0cyhg0fqjnpywlfyxgxczkndgm"; }; }; "hyperdrive-9.12.3" = { @@ -11761,6 +12121,15 @@ let sha1 = "c6019a7595f2cefca702eab694a010bcd9298d20"; }; }; + "ieee754-1.1.11" = { + name = "ieee754"; + packageName = "ieee754"; + version = "1.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.11.tgz"; + sha512 = "0g5x1ijy37vzfz46pnh03mxkmdb9d2qd9f8ncy49xj4j9xkks9p0x8s5hnyc7grwh6sryk118rd7w7wz6w0hzyw9agwnavvlc4g642n"; + }; + }; "ieee754-1.1.8" = { name = "ieee754"; packageName = "ieee754"; @@ -11797,6 +12166,15 @@ let sha1 = "48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09"; }; }; + "ignore-walk-3.0.1" = { + name = "ignore-walk"; + packageName = "ignore-walk"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz"; + sha512 = "2ajgs5klg786rkdxs37mbxn0p8ah2ai0nj0bjv5vbrfir4y0pvrhxxadv46s8g1hqkq5p3fjssys3n6qvz60p4jzjsgfq683lrnad8d"; + }; + }; "image-size-0.5.5" = { name = "image-size"; packageName = "image-size"; @@ -11959,13 +12337,13 @@ let sha512 = "1rjbvf1rg5ywhnba08sgagn2qf23lab330qrqmh7d891zap3xpxcyfyj1cblpf0f0rypglcfacybzyrpd4996aa1mbc820awa33k5j5"; }; }; - "init-package-json-1.10.1" = { + "init-package-json-1.10.3" = { name = "init-package-json"; packageName = "init-package-json"; - version = "1.10.1"; + version = "1.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/init-package-json/-/init-package-json-1.10.1.tgz"; - sha1 = "cd873a167796befb99612b28762a0b6393fd8f6a"; + url = "https://registry.npmjs.org/init-package-json/-/init-package-json-1.10.3.tgz"; + sha512 = "0kkcy07hj1ck8xmwspn6x32k4j1c6j88wr7wq2kxb6cx9rml0b8ncglglkhcz0r7k417fshknm2vzrqm188yp18gdny7gahm1fa596c"; }; }; "ink-0.3.1" = { @@ -11995,13 +12373,13 @@ let sha1 = "f9393471c18a79d1724f863fa38b586370ade2a5"; }; }; - "innertext-1.0.2" = { + "innertext-1.0.3" = { name = "innertext"; packageName = "innertext"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/innertext/-/innertext-1.0.2.tgz"; - sha1 = "11a197b3143a593636fba5d59213835e6954580a"; + url = "https://registry.npmjs.org/innertext/-/innertext-1.0.3.tgz"; + sha512 = "1ig0sy92zxyzynzi9d4g3wq1286sjs9xx6dpn10lmis6hpjh5266b0v8nzp2ry5x35ybfq9g60qjhy5pfyl26yzkbmv8vn8pv8kabk4"; }; }; "inquirer-0.10.1" = { @@ -12058,13 +12436,13 @@ let sha512 = "1wsmzzva3rfjb4bfks7ba2nvha9ziwgq2kag6xxibc5cc6mz19xbgj4fm3a7ghvfbfx4am0x13ibc8j2s5m3sv12nph44rq56gnvv47"; }; }; - "insert-module-globals-7.0.1" = { + "insert-module-globals-7.0.5" = { name = "insert-module-globals"; packageName = "insert-module-globals"; - version = "7.0.1"; + version = "7.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.0.1.tgz"; - sha1 = "c03bf4e01cb086d5b5e5ace8ad0afe7889d638c3"; + url = "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.0.5.tgz"; + sha512 = "3fk0jxs2s9i64hqs1y6ncl81nddpb2kr58myi8805mg9j3xgmn5svxmk8xwvm2358snahh9r0k1zmpv6512sq383zp4m6sc5an6s162"; }; }; "insight-0.8.4" = { @@ -12121,13 +12499,13 @@ let sha1 = "96fb0a936c12babd6ff1752a17d05616abd094c6"; }; }; - "invariant-2.2.3" = { + "invariant-2.2.4" = { name = "invariant"; packageName = "invariant"; - version = "2.2.3"; + version = "2.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/invariant/-/invariant-2.2.3.tgz"; - sha512 = "2s1gvqa56gnq2pkh0yy5ch3pb69dkwxr6myw9r3cc1c55xnrpiwzgc90ns4n9lij9slw0aayzm95k3x3rfrv0m7dnikq39hx0ylz7pd"; + url = "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz"; + sha512 = "0sa0bflh46zr7zqdifqk3a48bmqlmpikrnmwvgz8nx6979piw2m92qrn1g5xnpjzxn864y2jq3gl84jkws2dad3mlwr6s3fa10my4m6"; }; }; "invert-kv-1.0.0" = { @@ -12553,6 +12931,15 @@ let sha1 = "0dfd98f5a9111716dd535dda6492f67bf3d25a80"; }; }; + "is-mergeable-object-1.1.0" = { + name = "is-mergeable-object"; + packageName = "is-mergeable-object"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-mergeable-object/-/is-mergeable-object-1.1.0.tgz"; + sha512 = "03srgd19nl1p2b2ny8gamq5qvv4k124inq5fzkb1kqxdw9y45fr46g8awmpnx0hgwpfg0blysfms7r8n89sf5183hr2xd8x0l7q7z15"; + }; + }; "is-my-ip-valid-1.0.0" = { name = "is-my-ip-valid"; packageName = "is-my-ip-valid"; @@ -12571,6 +12958,15 @@ let sha512 = "29bla4943cs5dks8f307ykpgk5gihgjy158h8nspcxia85gb1lwaxpqywisr7621spdp8j5p4vd3zhfl2csdlihy06w9017b2r42610"; }; }; + "is-natural-number-4.0.1" = { + name = "is-natural-number"; + packageName = "is-natural-number"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-natural-number/-/is-natural-number-4.0.1.tgz"; + sha1 = "ab9d76e1db4ced51e35de0c72ebecf09f734cde8"; + }; + }; "is-negated-glob-1.0.0" = { name = "is-negated-glob"; packageName = "is-negated-glob"; @@ -12661,13 +13057,13 @@ let sha1 = "d225ec23132e89edd38fda767472e62e65f1106d"; }; }; - "is-path-in-cwd-1.0.0" = { + "is-path-in-cwd-1.0.1" = { name = "is-path-in-cwd"; packageName = "is-path-in-cwd"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz"; - sha1 = "6477582b8214d602346094567003be8a9eac04dc"; + url = "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz"; + sha512 = "1lrmbdvciajn2smq4j80qvp3gpkkzqddiyay3xgbzni3gi4vljkawyyw68i6h8m1jfdg4jy8l8c16rlfvr17pnfb314xw5q6m2pad8n"; }; }; "is-path-inside-1.0.1" = { @@ -12859,13 +13255,13 @@ let sha1 = "8a59117d932de1de00f245fcdd39ce43f1e939a6"; }; }; - "is-supported-regexp-flag-1.0.0" = { + "is-supported-regexp-flag-1.0.1" = { name = "is-supported-regexp-flag"; packageName = "is-supported-regexp-flag"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-supported-regexp-flag/-/is-supported-regexp-flag-1.0.0.tgz"; - sha1 = "8b520c85fae7a253382d4b02652e045576e13bb8"; + url = "https://registry.npmjs.org/is-supported-regexp-flag/-/is-supported-regexp-flag-1.0.1.tgz"; + sha512 = "0lrp2yp3bjcq9v1sxn5451bmmnj129aws8g0ym3a2s4wkc2y6ym591pym51dgs2xg7cpid087hvmnvqjr36pp6gm419ibhlqmwhkxyy"; }; }; "is-symbol-1.0.1" = { @@ -12913,13 +13309,13 @@ let sha512 = "2asak63h3kc1vackrpai7qfiv15ndr231w1yc753m1dy7fd6ywxsr0rvh88b9ppyxhmc373fqk89a0pw3dllv7m5nbbbcqzvmaskccs"; }; }; - "is-url-1.2.2" = { + "is-url-1.2.4" = { name = "is-url"; packageName = "is-url"; - version = "1.2.2"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/is-url/-/is-url-1.2.2.tgz"; - sha1 = "498905a593bf47cc2d9e7f738372bbf7696c7f26"; + url = "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz"; + sha512 = "31qfylxnpb1y8vczgi2nh57ayl7s5ppn8iskp21607l6ka7jxq409pf2mvspwnx6pj29b63ldayjgljsbhyc442gfc1i185dy5ccfr1"; }; }; "is-utf8-0.2.1" = { @@ -12994,6 +13390,15 @@ let sha1 = "a37d94ed9cda2d59865c9f76fe596ee1f338741e"; }; }; + "isarray-2.0.4" = { + name = "isarray"; + packageName = "isarray"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/isarray/-/isarray-2.0.4.tgz"; + sha512 = "1l996rw6ql1ypf4jvy0yhl3d08zislzsxc0lgbc4hh3kb4qzlxqv29d9nblq9ai6lkiwvxfgynknk8j6j9qm49jqlsnib924lx5gk0q"; + }; + }; "isbinaryfile-3.0.2" = { name = "isbinaryfile"; packageName = "isbinaryfile"; @@ -13111,13 +13516,13 @@ let sha1 = "9c80e538c12d3fb95c8d9bb9559fa0cc040405fd"; }; }; - "jaeger-client-3.9.1" = { + "jaeger-client-3.10.0" = { name = "jaeger-client"; packageName = "jaeger-client"; - version = "3.9.1"; + version = "3.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/jaeger-client/-/jaeger-client-3.9.1.tgz"; - sha1 = "27a7954cf390e279ba9ad503cfed01ce171b15a1"; + url = "https://registry.npmjs.org/jaeger-client/-/jaeger-client-3.10.0.tgz"; + sha1 = "ad0e830ead7aabad2601a52a7e463f0d942b0091"; }; }; "jed-1.1.1" = { @@ -13228,6 +13633,15 @@ let sha512 = "0h26sq1bwxc45bm0hvlcadrbk4bizzaw729wvw690ya7mpys45bqfzdqwhjkdrnq0i44dzxckykz4bix22jfdyfg1asybg3yzczjsrv"; }; }; + "js-yaml-3.11.0" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "3.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.11.0.tgz"; + sha512 = "0gka65n4d9gmcy0c8cy5h55r273dbxnw54gibp2nq5mmdmksjgb2nhcdfgfxs1wg3yayyrydn2v79fny7hdyq907dg87vmgjnsnr8mi"; + }; + }; "js2xmlparser-1.0.0" = { name = "js2xmlparser"; packageName = "js2xmlparser"; @@ -13291,15 +13705,6 @@ let sha1 = "1e60b0fef1bc0af67bc0d146dfdde5486cd615b4"; }; }; - "json-loader-0.5.7" = { - name = "json-loader"; - packageName = "json-loader"; - version = "0.5.7"; - src = fetchurl { - url = "https://registry.npmjs.org/json-loader/-/json-loader-0.5.7.tgz"; - sha512 = "3iwy9jwca9hg6h1k7cmcdlsygn2qzjv7w72fsrfjfpdrcyd4xc5fb11sf664rvnzrfmz24f19kvi3qawif4n63lggvpg5pv73qfrcs0"; - }; - }; "json-merge-patch-0.2.3" = { name = "json-merge-patch"; packageName = "json-merge-patch"; @@ -13309,13 +13714,13 @@ let sha1 = "fa2c6b5af87da77bae2966a589d52e23ed81fe40"; }; }; - "json-parse-better-errors-1.0.1" = { + "json-parse-better-errors-1.0.2" = { name = "json-parse-better-errors"; packageName = "json-parse-better-errors"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.1.tgz"; - sha512 = "05ndp7b03ikx2vqivfxlm6c73yagjyrdp22ay8z592pqxldbsm7hjzpa3asal2vys99lvirqar3ly3sb1ibhhngls4sqc4nwp2jj967"; + url = "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz"; + sha512 = "2pv1kaf7gjr0bhr2djaf1i88li7q3v5daz4zm4hz57i4h21jgryihxb5c2h0p0q1vrq1ffyg279hp0vjrg73shvxr5lir6plxjb5fls"; }; }; "json-parse-helpfulerror-1.0.3" = { @@ -13705,6 +14110,15 @@ let sha512 = "2dkl580azs1f5pj72mpygwdcc2mh4p355sxi84ki1w9c6k226nmjfglq5b7zgk5gmpfjammx5xliirzaf2nh9kyhqdb1xpvhjlic34j"; }; }; + "k-bucket-4.0.0" = { + name = "k-bucket"; + packageName = "k-bucket"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/k-bucket/-/k-bucket-4.0.0.tgz"; + sha512 = "04i173zw3l2aagsnywafmgs87wzhhkakvnhcfvxbnbmn7rz37rkqkryc8d6x8dccqlmvgawb2vhd49ms8s2wkbg3dh3qlffamzcpshk"; + }; + }; "k-rpc-3.7.0" = { name = "k-rpc"; packageName = "k-rpc"; @@ -13714,22 +14128,22 @@ let sha1 = "641f99b2825be34b6e7984f22b7962dc1a906c23"; }; }; - "k-rpc-4.2.1" = { + "k-rpc-4.3.1" = { name = "k-rpc"; packageName = "k-rpc"; - version = "4.2.1"; + version = "4.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/k-rpc/-/k-rpc-4.2.1.tgz"; - sha512 = "2nbjxg0x7jsa14zhvx68w1vri68hsxzbxz7b7ap76fdp0jkrgna2rq636yxnax04f3f8i2ambj2fpan6qli6vixmfryz78vrapdip8n"; + url = "https://registry.npmjs.org/k-rpc/-/k-rpc-4.3.1.tgz"; + sha512 = "0a7k7qcmcik3dwcjd6f0ngq3i3pdz1cc7xz9ck30gd65nd0ylmgx0kf6b686qd1kk32v3rcila2hdj12cnrjwrjqzs96vjqw5jhj04s"; }; }; - "k-rpc-socket-1.7.2" = { + "k-rpc-socket-1.8.0" = { name = "k-rpc-socket"; packageName = "k-rpc-socket"; - version = "1.7.2"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.7.2.tgz"; - sha512 = "02w1ih1lh86i5ap7c3dy2ml7g5a11r0w300iyxdf6v02qr0j1x3vf78hx5q9dgg3drifab018mgm851m457zzzi05i2z2r1s3zlflc3"; + url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.8.0.tgz"; + sha512 = "0pc9bjnmgfjcgh49lclvz5qnlkzypgirlx5ji2nx15vfn00gwczy5hvfahcxdzcdqsjlwh7q8jw4zj8abdk8qx2cwiqdw8fgg557zvz"; }; }; "kad-fs-0.0.4" = { @@ -13913,22 +14327,22 @@ let sha512 = "2qh1bqb9lj7l92pwcrwmpcanbyn65rmni3swyv6hrphn7xbaw8mkir3w67sf4ardk1iqvz9waalq2wf2rgpvvblhva2n2hssq6as6yr"; }; }; - "kuduscript-1.0.15" = { + "kuduscript-1.0.16" = { name = "kuduscript"; packageName = "kuduscript"; - version = "1.0.15"; + version = "1.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/kuduscript/-/kuduscript-1.0.15.tgz"; - sha1 = "2721f05aa6876534cd30d6ded9418651cadfaa21"; + url = "https://registry.npmjs.org/kuduscript/-/kuduscript-1.0.16.tgz"; + sha512 = "2pws4jvqqdysxbqb5bw1m67wklk7lrxl293q5w9cd58drz6jzs4qzgiy6gg7dzx9m2pgn9kqxns8pw445d68ncqk2nxpdcimnnsbszv"; }; }; - "labeled-stream-splicer-2.0.0" = { + "labeled-stream-splicer-2.0.1" = { name = "labeled-stream-splicer"; packageName = "labeled-stream-splicer"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.0.tgz"; - sha1 = "a52e1d138024c00b86b1c0c91f677918b8ae0a59"; + url = "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.1.tgz"; + sha512 = "0z3ssjaq1bx4j1dcysbbmsnq24zglv2gdsm3by6dr34w10jrlg06rrh3l7qa8a3ch7ag9gmkjfrw6m448sra299gz5rvg2ifsc7hbrh"; }; }; "last-one-wins-1.0.4" = { @@ -13994,15 +14408,6 @@ let sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"; }; }; - "lazy-cache-2.0.2" = { - name = "lazy-cache"; - packageName = "lazy-cache"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-2.0.2.tgz"; - sha1 = "b9190a4f913354694840859f8a8f7084d8822264"; - }; - }; "lazystream-1.0.0" = { name = "lazystream"; packageName = "lazystream"; @@ -14624,15 +15029,6 @@ let sha1 = "bec1024f85b1bd96cbea405b23c14ad6443a6f81"; }; }; - "lodash.endswith-4.2.1" = { - name = "lodash.endswith"; - packageName = "lodash.endswith"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.endswith/-/lodash.endswith-4.2.1.tgz"; - sha1 = "fed59ac1738ed3e236edd7064ec456448b37bc09"; - }; - }; "lodash.escape-3.2.0" = { name = "lodash.escape"; packageName = "lodash.escape"; @@ -14687,6 +15083,15 @@ let sha1 = "1a6a35eace401280c7f06dddec35165ab27e3e53"; }; }; + "lodash.get-4.4.2" = { + name = "lodash.get"; + packageName = "lodash.get"; + version = "4.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz"; + sha1 = "2d177f652fa31e939b4438d5341499dfa3825e99"; + }; + }; "lodash.groupby-4.6.0" = { name = "lodash.groupby"; packageName = "lodash.groupby"; @@ -14696,6 +15101,15 @@ let sha1 = "0b08a1dcf68397c397855c3239783832df7403d1"; }; }; + "lodash.has-4.5.2" = { + name = "lodash.has"; + packageName = "lodash.has"; + version = "4.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.has/-/lodash.has-4.5.2.tgz"; + sha1 = "d19f4dc1095058cccbe2b0cdf4ee0fe4aa37c862"; + }; + }; "lodash.isarguments-3.1.0" = { name = "lodash.isarguments"; packageName = "lodash.isarguments"; @@ -14723,15 +15137,6 @@ let sha1 = "415c4478f2bcc30120c22ce10ed3226f7d3e18e0"; }; }; - "lodash.isfunction-3.0.9" = { - name = "lodash.isfunction"; - packageName = "lodash.isfunction"; - version = "3.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz"; - sha512 = "0ki8njk33gc8ayf2vmnx2jrfdapwckm7dx2z4zn1ik07hwgwx5zb3fsi9mlamhg6rnj1qlvfwsbg2074x19x8gq60615fbr7lvdfah2"; - }; - }; "lodash.isplainobject-4.0.6" = { name = "lodash.isplainobject"; packageName = "lodash.isplainobject"; @@ -14885,15 +15290,6 @@ let sha1 = "edd14c824e2cc9c1e0b0a1b42bb5210516a42438"; }; }; - "lodash.startswith-4.2.1" = { - name = "lodash.startswith"; - packageName = "lodash.startswith"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.startswith/-/lodash.startswith-4.2.1.tgz"; - sha1 = "c598c4adce188a27e53145731cdc6c0e7177600c"; - }; - }; "lodash.template-3.6.2" = { name = "lodash.template"; packageName = "lodash.template"; @@ -14939,6 +15335,15 @@ let sha1 = "c23e91b710242ac70c37f1e1cda9274cc39bf2f4"; }; }; + "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"; + }; + }; "log-symbols-1.0.2" = { name = "log-symbols"; packageName = "log-symbols"; @@ -14993,13 +15398,13 @@ let sha1 = "0a0fc1d3fa3a5ec44fdc7b897beba2a4695cebee"; }; }; - "lokijs-1.5.2" = { + "lokijs-1.5.3" = { name = "lokijs"; packageName = "lokijs"; - version = "1.5.2"; + version = "1.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/lokijs/-/lokijs-1.5.2.tgz"; - sha1 = "75d43df21232f1d5479d191a69b6ebf61754a873"; + url = "https://registry.npmjs.org/lokijs/-/lokijs-1.5.3.tgz"; + sha1 = "6952722ffa3049a55a5e1c10ee4a0947a3e5e19b"; }; }; "long-2.4.0" = { @@ -15101,6 +15506,15 @@ let sha1 = "4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"; }; }; + "lowercase-keys-1.0.1" = { + name = "lowercase-keys"; + packageName = "lowercase-keys"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz"; + sha512 = "1a7qa1zn5zl1nf7i6w3299lc3biabfb0w2c30cl770l2dbldvi72nwvjdlinhx7j0ldip82sj710aprdjbmbg782i2pa3jpbgmy6qhv"; + }; + }; "lru-2.0.1" = { name = "lru"; packageName = "lru"; @@ -15164,22 +15578,13 @@ let sha1 = "71789b3b7f5399bec8565dda38aa30d2a097efee"; }; }; - "lru-cache-4.1.1" = { + "lru-cache-4.1.2" = { name = "lru-cache"; packageName = "lru-cache"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz"; - sha512 = "1xz91sizgyzh8plz5jx1labzpygapm6xy3qpxriaj00yvnhy4lnmhqcb20qln4lh80c5g3yzp4j5i6g63njq1r5sl9c0zlkh9xjk2xb"; - }; - }; - "lsmod-1.0.0" = { - name = "lsmod"; - packageName = "lsmod"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lsmod/-/lsmod-1.0.0.tgz"; - sha1 = "9a00f76dca36eb23fa05350afe1b585d4299e64b"; + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.2.tgz"; + sha512 = "1whynbvy3pbwcpkxk6rqhsymj2h3bh7p13nfhs9ch6hfx96vrh86j7vd4lqcaqjy5dhsfjps6sh2wqndh269wjz42khbh6339g9a1y2"; }; }; "ltgt-1.0.2" = { @@ -15443,13 +15848,13 @@ let sha1 = "0e2cba81390b0549a9153ec3b0d915b61c164be7"; }; }; - "marked-0.3.17" = { + "marked-0.3.19" = { name = "marked"; packageName = "marked"; - version = "0.3.17"; + version = "0.3.19"; src = fetchurl { - url = "https://registry.npmjs.org/marked/-/marked-0.3.17.tgz"; - sha512 = "2cw4hwy4hyxspppby5ww0sljhyg0nhlgy0aamqvf7nrhg4vyrgyp8ah52pz99rr8pvsjk3h9z9q8fhrlqaixw5kgk2si5yrr0v9n0pq"; + url = "https://registry.npmjs.org/marked/-/marked-0.3.19.tgz"; + sha512 = "2940np3jq9midbdw8mhfry1msy3572i2gj0y3z9c8z1dyrdhxg1rivcxhgihpqs6gihqnzgdhbgmgsabm2ch7gzbvf16dxacccrxbbr"; }; }; "matcher-collection-1.0.5" = { @@ -15461,6 +15866,15 @@ let sha512 = "1hfvbsx85xqrw6g0k7rkqwngl8b2nwj92ax10ilx3b4lma2mcp8q6zpvam1sffgqsssa9d13cj7prrzg5c00mf0c8q92w59m36ach4x"; }; }; + "md5-2.2.1" = { + name = "md5"; + packageName = "md5"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/md5/-/md5-2.2.1.tgz"; + sha1 = "53ab38d5fe3c8891ba465329ea23fac0540126f9"; + }; + }; "md5.js-1.3.4" = { name = "md5.js"; packageName = "md5.js"; @@ -15659,6 +16073,15 @@ let sha1 = "401fdec7ec21cdb9e03cd3d3021398da21b27085"; }; }; + "metalsmith-2.3.0" = { + name = "metalsmith"; + packageName = "metalsmith"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/metalsmith/-/metalsmith-2.3.0.tgz"; + sha1 = "833afbb5a2a6385e2d9ae3d935e39e33eaea5231"; + }; + }; "method-override-2.3.10" = { name = "method-override"; packageName = "method-override"; @@ -15740,13 +16163,13 @@ let sha1 = "86677c97d1720b363431d04d0d15293bd38c1565"; }; }; - "micromatch-3.1.9" = { + "micromatch-3.1.10" = { name = "micromatch"; packageName = "micromatch"; - version = "3.1.9"; + version = "3.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/micromatch/-/micromatch-3.1.9.tgz"; - sha512 = "3vfciram7xbwcwvhii8960vnvf3jczn092sfbfgx1vivk3scvkm9znjnbq2ppywg9h8i86d8vq3ha4c9a3jllaian0gcl7rrgm36lja"; + url = "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz"; + sha512 = "1r9rsac8gdslsplya0cnzyk6q0bh7m0wnxccdisacr5327k5k0v6f48dzp0022z8qqpzpvxw7sv1gzhvrqn6v5sz7qcvx37by1a8s1i"; }; }; "miller-rabin-4.0.1" = { @@ -16010,13 +16433,13 @@ let sha512 = "1slngp5z9rczjirv9lpdwiv1ap4xmp28jxl4r0i5hpds1khlm89qp70ziz8k5h2vwjph6srjqi3gb2yrwwsnnwli6p8yxvlyx7nn80p"; }; }; - "minipass-2.2.1" = { + "minipass-2.2.4" = { name = "minipass"; packageName = "minipass"; - version = "2.2.1"; + version = "2.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-2.2.1.tgz"; - sha512 = "3yy9s65iwrx5hndcqbxrks88xi9cf8hra6zalgf8xfr4ahpp31s0i8lv6jpyb42p0y7z55ac3390sbqxcgcvan3xls449agbjb98mmv"; + url = "https://registry.npmjs.org/minipass/-/minipass-2.2.4.tgz"; + sha512 = "3r74gps1yd2fabj46qd42hknvpkg4aqwg3cdz8xjn8aqww0rsk3nmbgh8p2h0rkjlpxihg1wnpfa4bmpgmnydlbhpb1rz5dcxcwhdc7"; }; }; "minizlib-1.1.0" = { @@ -16136,13 +16559,13 @@ let sha1 = "f1fa58899f3f452d788f1573401212a4ef898de5"; }; }; - "modify-values-1.0.0" = { + "modify-values-1.0.1" = { name = "modify-values"; packageName = "modify-values"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/modify-values/-/modify-values-1.0.0.tgz"; - sha1 = "e2b6cdeb9ce19f99317a53722f3dbf5df5eaaab2"; + url = "https://registry.npmjs.org/modify-values/-/modify-values-1.0.1.tgz"; + sha512 = "15hcc3355684n37j7979fs72xj57d71cpl1vbqf3n0nkj3mdairyl91q80xhrhrzlpbxc1yccvqqbh31zv7p4wmilcbl5vswg2rnpf5"; }; }; "module-deps-4.1.1" = { @@ -16154,13 +16577,13 @@ let sha1 = "23215833f1da13fd606ccb8087b44852dcb821fd"; }; }; - "module-deps-6.0.0" = { + "module-deps-6.0.2" = { name = "module-deps"; packageName = "module-deps"; - version = "6.0.0"; + version = "6.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/module-deps/-/module-deps-6.0.0.tgz"; - sha512 = "0ri32x2v7ywi8n4h92scc5pq6zlh7mmzbmk0gh2gsh3490w4d9islz1rs0in98cl2h5fl0dfx2dfcad0disnaiqflw46d24ja20raq4"; + url = "https://registry.npmjs.org/module-deps/-/module-deps-6.0.2.tgz"; + sha512 = "2zf8ycbhqnh9hc6zd3h5s1ii6bjg41z721ffg760j8i045vjjzpzzg542c02ylkic68p0skw1ss97lwphblcw8rip3ik29x9pglhq19"; }; }; "moment-2.1.0" = { @@ -16199,6 +16622,24 @@ let sha512 = "2zc9qgzsrnp9g4jm4qsb1g1h7w5zmnkz8690br52l83yr9kwhch0mh7r2vdhc706jkrqczia9wbrgkscz0x6k8cwmb3r5jifbpp47v2"; }; }; + "moment-2.21.0" = { + name = "moment"; + packageName = "moment"; + version = "2.21.0"; + src = fetchurl { + url = "https://registry.npmjs.org/moment/-/moment-2.21.0.tgz"; + sha512 = "02hkdlhchyx4dqrh4q7p3c0xggpygcf0pimjvm66sib8z87wkbndici8vp2r39b472zpmybrf85y2c92lbw3hng9j2kfifl33l7f9jc"; + }; + }; + "moment-2.22.0" = { + name = "moment"; + packageName = "moment"; + version = "2.22.0"; + src = fetchurl { + url = "https://registry.npmjs.org/moment/-/moment-2.22.0.tgz"; + sha512 = "1v5hxqrwy3yd5023aflf2r1nlkayx1sh9cjjyk3415lba199gkimbq72ba26j3rf2azc0zwhqcz86jh8garynvlh1zm6vr33w59fsyn"; + }; + }; "moment-2.6.0" = { name = "moment"; packageName = "moment"; @@ -16397,13 +16838,13 @@ let sha1 = "400515e05b1924889cb61a1ec6054290a68e1207"; }; }; - "ms-rest-2.3.1" = { + "ms-rest-2.3.2" = { name = "ms-rest"; packageName = "ms-rest"; - version = "2.3.1"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/ms-rest/-/ms-rest-2.3.1.tgz"; - sha512 = "34xikyld48lq65i6ngn4wf8gsnn2lllbd7fray2rsxihkz6azm7zsqs2fm9ng566fdy6mf6qj41lvvyl2xih7d5a074rkhxpwdf1w1m"; + url = "https://registry.npmjs.org/ms-rest/-/ms-rest-2.3.2.tgz"; + sha512 = "04bv4p3b4k2qz7h4yqhk163fm69yhip62hph9xa6ncx5icw06jkhyjgsag12f83l2d3f95541qfdpynv388s0jjyqn57d52l6nvbhp3"; }; }; "ms-rest-azure-1.15.7" = { @@ -16415,13 +16856,13 @@ let sha1 = "8bce09f053b1565dbaa8bd022ca40155c35b0fde"; }; }; - "ms-rest-azure-2.5.4" = { + "ms-rest-azure-2.5.5" = { name = "ms-rest-azure"; packageName = "ms-rest-azure"; - version = "2.5.4"; + version = "2.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-2.5.4.tgz"; - sha512 = "049vfg1l6jfzdn82m5shchi6zzlfk81csihlalwj1mm96j0dykbx885sbjyv3wr0iqwjwzp4i1x2kv750xvzvyljfqrlnh1kfhrq32b"; + url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-2.5.5.tgz"; + sha512 = "37sgjm2jqs7fnlzbxihq6sdxxd4w7m5nnkmvp5rrnq9ghsfbbk9pr1z4lm6my3yg06hhqgdyg7rnnzvds26yxjwic7d1g1ab1igjwrf"; }; }; "msgpack-1.0.2" = { @@ -16478,6 +16919,15 @@ let sha512 = "3m42kr8y2s1krl4gzb5xsa9v3h01xalvrgdkj99gyfaq7761asmj5m6kzm70mxb22125gia12g7rmarnzmh09403j8j2cyvx7jqjblf"; }; }; + "multicast-dns-7.0.0" = { + name = "multicast-dns"; + packageName = "multicast-dns"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.0.0.tgz"; + sha512 = "3z5r41v1y4fk8751g0s7ssgzpiaw7g3bwbnjk9gvdh5x3rijzpnlk03s0vlng9yx3f5j9h0zfy6rjfmh183gxyxh2y8y7hps977k806"; + }; + }; "multicast-dns-service-types-1.1.0" = { name = "multicast-dns-service-types"; packageName = "multicast-dns-service-types"; @@ -16496,6 +16946,15 @@ let sha512 = "2liv9lhcxrlp21524jzp1hxzbd07xmb7qlzma5qfn98bgn63ga0i5jalrhlz6qc08fd4jxh3hj2mi9wm14s95lip5x236052rv3i4rx"; }; }; + "multimatch-2.1.0" = { + name = "multimatch"; + packageName = "multimatch"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/multimatch/-/multimatch-2.1.0.tgz"; + sha1 = "9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b"; + }; + }; "multiparty-2.2.0" = { name = "multiparty"; packageName = "multiparty"; @@ -16532,6 +16991,15 @@ let sha1 = "2a8f2ddf70eed564dff2d57f1e1a137d9f05078b"; }; }; + "multistream-2.1.0" = { + name = "multistream"; + packageName = "multistream"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/multistream/-/multistream-2.1.0.tgz"; + sha1 = "625c267d5c44424ad6294788b5bb4da3dcb32f1d"; + }; + }; "muri-0.3.1" = { name = "muri"; packageName = "muri"; @@ -16676,6 +17144,15 @@ let sha1 = "020a7ccedc63fdee85f85967d5607849e74abbe8"; }; }; + "nan-2.10.0" = { + name = "nan"; + packageName = "nan"; + version = "2.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz"; + sha512 = "349rr7x0djrlkav4gbhkg355852ingn965r0kkch8rr4cwp7qki9676zpq8cq988yszzd2hld6szsbbnd1v6rghzf11abn1nyzlj1vc"; + }; + }; "nan-2.3.5" = { name = "nan"; packageName = "nan"; @@ -16703,15 +17180,6 @@ let sha1 = "e4ff34e6c95fdfb5aecc08de6596f43605a7db45"; }; }; - "nan-2.9.2" = { - name = "nan"; - packageName = "nan"; - version = "2.9.2"; - src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.9.2.tgz"; - sha512 = "1iwlv98jbkr46c7hy28crk2m89jiskrp4qfa5ysyacyq8dkbk4hii3cc61irf39b7n6wd9cjlaasmakv9dsknqhb3876zrvrbjvmmcn"; - }; - }; "nanoassert-1.1.0" = { name = "nanoassert"; packageName = "nanoassert"; @@ -16815,13 +17283,13 @@ let sha1 = "20a318c30cb45f71fe7adfbf7b21c99c1472ef11"; }; }; - "natives-1.1.1" = { + "natives-1.1.2" = { name = "natives"; packageName = "natives"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/natives/-/natives-1.1.1.tgz"; - sha512 = "08a9lf00d2pkqmdi6ipp00pjin0gwl6fh283cjdjbayaz834lppwrw19kn4s642kwa46bfcway3033j6rbqd96iy86qrzrfgz35mr7i"; + url = "https://registry.npmjs.org/natives/-/natives-1.1.2.tgz"; + sha512 = "246d44jpalvlcvk1ig1b2qc05fsgq8gy926xcl86bdnx663k8bh7pi4ny1pa7xr0bxydm33rhkvwzz3fjrrr7pkrjx0pmj44x5l1d75"; }; }; "natural-compare-1.4.0" = { @@ -16842,15 +17310,6 @@ let sha1 = "17b09581988979fddafe0201e931ba933c96cbb4"; }; }; - "ncname-1.0.0" = { - name = "ncname"; - packageName = "ncname"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ncname/-/ncname-1.0.0.tgz"; - sha1 = "5b57ad18b1ca092864ef62b0b1ed8194f383b71c"; - }; - }; "nconf-0.6.9" = { name = "nconf"; packageName = "nconf"; @@ -16977,12 +17436,12 @@ let sha1 = "2b327184e8992101177b28563fb5e7102acd0ca9"; }; }; - "negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access" = { + "negotiator-git+https://github.com/arlolra/negotiator#full-parse-access" = { name = "negotiator"; packageName = "negotiator"; version = "0.6.1"; src = fetchgit { - url = "https://github.com/arlolra/negotiator.git"; + url = "https://github.com/arlolra/negotiator"; rev = "0418ab4e9a665772b7e233564a4525c9d9a8ec3a"; sha256 = "243e90fbf6616ef39f3c71bbcd027799e35cbf2ef3f25203676f65b20f7f7394"; }; @@ -17113,13 +17572,13 @@ let sha1 = "1f1b916b56b9ea241c0135f97ced6940f556f292"; }; }; - "node-appc-0.2.41" = { + "node-appc-0.2.44" = { name = "node-appc"; packageName = "node-appc"; - version = "0.2.41"; + version = "0.2.44"; src = fetchurl { - url = "https://registry.npmjs.org/node-appc/-/node-appc-0.2.41.tgz"; - sha1 = "f68cf5acb607c4903e2f63024383ae95ba1fdc52"; + url = "https://registry.npmjs.org/node-appc/-/node-appc-0.2.44.tgz"; + sha512 = "01a44qwlfiqbz8hlpp7yywzw9xj04h937jnzmb94dany3bsh8z3shcn1579m0702h8ah3nayb17z63ahldj9rb6k75waf7qkamawgzh"; }; }; "node-cache-4.1.1" = { @@ -17149,15 +17608,6 @@ let sha512 = "0lz5m15w7qaks0a0s3dm0crsjrsd123dy00pn6qwcp50zfjykxkp22i5ymh6smlc0ags38nmdxlxw9yyq509azlv8kcdvdiq857h5in"; }; }; - "node-firefox-connect-1.2.0" = { - name = "node-firefox-connect"; - packageName = "node-firefox-connect"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-firefox-connect/-/node-firefox-connect-1.2.0.tgz"; - sha1 = "42403848313240c98514ef14b3302816fe3b84e1"; - }; - }; "node-forge-0.6.23" = { name = "node-forge"; packageName = "node-forge"; @@ -17167,22 +17617,22 @@ let sha1 = "f03cf65ebd5d4d9dd2f7becb57ceaf78ed94a2bf"; }; }; - "node-forge-0.7.2" = { + "node-forge-0.7.5" = { name = "node-forge"; packageName = "node-forge"; - version = "0.7.2"; + version = "0.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/node-forge/-/node-forge-0.7.2.tgz"; - sha512 = "2kc6a8y2fmpsmiddh9vkiy32kg6isg3igpfgpkvvkw48y5x2n3wwrxsi7zcjyxf2yakjygvim3gy74c077lrc0cm60f388diw2nhc2x"; + url = "https://registry.npmjs.org/node-forge/-/node-forge-0.7.5.tgz"; + sha512 = "0aq9ajngp210n97kmgnqyhil492amwhcn3b8bwxgsli9hq5qy4lh7qmncwbb1j0llrc4zalr0haj0fphrygz8kinzij848kcckx0rij"; }; }; - "node-gyp-build-3.2.2" = { + "node-gyp-build-3.3.0" = { name = "node-gyp-build"; packageName = "node-gyp-build"; - version = "3.2.2"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.2.2.tgz"; - sha512 = "34hwi28wvvh5nn8bv71n0fb83xjyk84jsn8j9zgkaqnfigpv2hk6fs9jaffsn7qi3yi4n7iwd9yjyagd1rh74ckzdf5s6l59b8vzidp"; + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.3.0.tgz"; + sha512 = "0vkilw1ghsjca0lrj9gsdgsi8wj4bvpfr25q1qzx1kp5hhvjdhapmvpmrd2hikwq9dxydw6sdvv0730wwvmsg36xqf0hgp9777l3ns8"; }; }; "node-int64-0.4.0" = { @@ -17239,40 +17689,40 @@ let sha512 = "2cwrivwc0ha272cly9r61bbb14kkl1s1hsmn53yr88b6pfjqj512nac6c5rphc6ak88v8gpl1f879qdd3v7386103zzr7miibpmbhis"; }; }; - "node-red-node-email-0.1.24" = { + "node-red-node-email-0.1.27" = { name = "node-red-node-email"; packageName = "node-red-node-email"; - version = "0.1.24"; + version = "0.1.27"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.24.tgz"; - sha1 = "ba12c72b01b39e33f375ccbf4321b163425e8fb2"; + url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.27.tgz"; + sha512 = "0r799aswbfv6f9rjdrh6bddfzwj1mpinlani8cwc7zbmipcf4dsyffmf3xghb3hpb15k26jvpb46f2ia8cff1vyn4i9h3jn5dnzflnc"; }; }; - "node-red-node-feedparser-0.1.8" = { + "node-red-node-feedparser-0.1.12" = { name = "node-red-node-feedparser"; packageName = "node-red-node-feedparser"; - version = "0.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-feedparser/-/node-red-node-feedparser-0.1.8.tgz"; - sha1 = "56cf6f69bc6d23557f8627ee63b74c1caa85c65b"; - }; - }; - "node-red-node-rbe-0.2.1" = { - name = "node-red-node-rbe"; - packageName = "node-red-node-rbe"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.2.1.tgz"; - sha512 = "3s12a0r8a6nzfqk1a1v1k5drczf4qpnia460l3rq4bixnl0k0fahc1hh4cqcw9rlzc59cz3p4dv19ixrwf2wc6nxixsyqz417li68wb"; - }; - }; - "node-red-node-twitter-0.1.12" = { - name = "node-red-node-twitter"; - packageName = "node-red-node-twitter"; version = "0.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-0.1.12.tgz"; - sha512 = "3h9isciksl33ajjzn4s0dp8s8m3zkijqc7rbw4v8glrhz5y3npbv8501sffak943jyd4k3dqalizv9giwaxqfd1760pkhbzh816y6j4"; + url = "https://registry.npmjs.org/node-red-node-feedparser/-/node-red-node-feedparser-0.1.12.tgz"; + sha512 = "2ymvmw9wh0rq14fbxg44p3wm1r34lmr7wvh8z40g4cssrpcmb43cc3wr94z9blxpnjmf9795b3slmd3s4283snm01q5z1jppa9kn2lk"; + }; + }; + "node-red-node-rbe-0.2.3" = { + name = "node-red-node-rbe"; + packageName = "node-red-node-rbe"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.2.3.tgz"; + sha512 = "06is8ig0mlp85dl5hjp86gp7hwahssfls65gbwcql3awygilv9zlgxngm4yrl54vmkyjk2dk5gbf78r6bm4jgm3qf07xdbwvcgjvqz7"; + }; + }; + "node-red-node-twitter-0.1.13" = { + name = "node-red-node-twitter"; + packageName = "node-red-node-twitter"; + version = "0.1.13"; + src = fetchurl { + url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-0.1.13.tgz"; + sha512 = "0wfkdalwxzyyivqxiwiba5j8pyis83lhipiwck2xrbks3w0x1ldf12fgnzx61kq64sdmzpczqwb7588ggh5drj64ymj88vwdbca0bd9"; }; }; "node-static-0.7.10" = { @@ -17581,13 +18031,31 @@ let sha1 = "5b1d577e4c8869d6c8603bc89e9cd1637303e46e"; }; }; - "npm-5.6.0" = { + "npm-5.7.1" = { name = "npm"; packageName = "npm"; - version = "5.6.0"; + version = "5.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-5.6.0.tgz"; - sha512 = "0nnr796ik5h8bsd3k9ygivivr3na2ksnf5iipf8dsnn20j10i9sgmhmsnzbimd2pqgjbrpp8gbpl2q7j5c7yjqjfirrh8xcc3v3gpws"; + url = "https://registry.npmjs.org/npm/-/npm-5.7.1.tgz"; + sha512 = "147xlh1d389j8yilssidlk7w8qgp1354y5p2bhv30a0m74vmfbl48859yfidij4ixbf0dhdmzkg6zz6viik2cskkrz4nw56zsz2nn5g"; + }; + }; + "npm-bundled-1.0.3" = { + name = "npm-bundled"; + packageName = "npm-bundled"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.3.tgz"; + sha512 = "0xk8ky1cjf8q2wkbgfzplpn04sm9xnl6i71dwnc29rfh8m2glan5nd6l4k3q7ikci7xpwfpcmyy3frr873zndjmhbr344grkyh3f907"; + }; + }; + "npm-conf-1.1.3" = { + name = "npm-conf"; + packageName = "npm-conf"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz"; + sha512 = "1rx44jzcf3byibrwmgyr0598hng4snjfj9bx29xm7bi5y1bqkbvb2krh8z0ccpzv3aps71qwrq55a56l1qkzlan118xyfn9j5nkh9v2"; }; }; "npm-keyword-5.0.0" = { @@ -17599,13 +18067,22 @@ let sha1 = "99b85aec29fcb388d2dd351f0013bf5268787e67"; }; }; - "npm-package-arg-5.1.2" = { + "npm-package-arg-6.0.0" = { name = "npm-package-arg"; packageName = "npm-package-arg"; - version = "5.1.2"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-5.1.2.tgz"; - sha512 = "36g1gm57qcvdgb4lm6ibl9pgma8lgx8l8i2jzap6w3v36wfzsqa7vb411zd26yp9rgcq23951vl5j6pac22qd5h9x7jm9raznnnr460"; + url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.0.0.tgz"; + sha512 = "15a1x3fjip5waxap8dbjkm88j0c2bcnay8pw14p74h1499wznynw2if91shrqlrbzwia09x4xiphp6wkxga5z8vf9k08bjarn1vn047"; + }; + }; + "npm-packlist-1.1.10" = { + name = "npm-packlist"; + packageName = "npm-packlist"; + version = "1.1.10"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.10.tgz"; + sha512 = "1c5z9bibdf07na26xffshagxk8gfnsbaav802dkvbrlgj4mixz4giji96yb1zs7p9yl9n28mlkhjp9jklq55j27c0i837vk507v8001"; }; }; "npm-registry-client-0.2.27" = { @@ -17617,13 +18094,13 @@ let sha1 = "8f338189d32769267886a07ad7b7fd2267446adf"; }; }; - "npm-registry-client-8.5.0" = { + "npm-registry-client-8.5.1" = { name = "npm-registry-client"; packageName = "npm-registry-client"; - version = "8.5.0"; + version = "8.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.5.0.tgz"; - sha512 = "1nwp5cfjmy4k14g6ziz7zpia8f66ximhrdhw49cj2w173bibq1sgc4d5w951ql5dqf0hcmia956ld9y7qs2q1fx6s2j446zhvdk0irn"; + url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.5.1.tgz"; + sha512 = "0g7abpykfqb1x17pajm1ndsh61n3ydyimv5npsjrn9hd1s72csxh7fzdn28gldz30n00wgb8rg9y8jfhxli3cnii61i5vl0cwbwdf7f"; }; }; "npm-run-path-1.0.0" = { @@ -17852,13 +18329,13 @@ let sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c"; }; }; - "object-hash-1.2.0" = { + "object-hash-1.3.0" = { name = "object-hash"; packageName = "object-hash"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/object-hash/-/object-hash-1.2.0.tgz"; - sha512 = "19310wpjhfybr8gslg93qybbsrf3fjlmdgsgvn7d9yim1nmpcgjn5az280w4p8spvhq1djly7naa9434166gcmbavv0xirg75gmcr5j"; + url = "https://registry.npmjs.org/object-hash/-/object-hash-1.3.0.tgz"; + sha512 = "2qnadlb3xqg732666500m9gssayfvlzrhipcl3hyw3qm1yhmvnz72slbmzlbfi8kgzl95a32a896f1lf175ql4jmn9f2j95pm1v74nk"; }; }; "object-keys-1.0.11" = { @@ -18046,7 +18523,7 @@ let packageName = "onetime"; version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz"; + url = "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz"; sha1 = "a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"; }; }; @@ -18122,13 +18599,13 @@ let sha1 = "6a341442f09d7d866bc11ed03de1e3828e3d6aab"; }; }; - "opentracing-0.14.1" = { + "opentracing-0.14.2" = { name = "opentracing"; packageName = "opentracing"; - version = "0.14.1"; + version = "0.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/opentracing/-/opentracing-0.14.1.tgz"; - sha1 = "40d278beea417660a35dd9d3ee76511ffa911dcd"; + url = "https://registry.npmjs.org/opentracing/-/opentracing-0.14.2.tgz"; + sha1 = "215c5cc0152483b8c5d74cec59308cf1cd595fb1"; }; }; "opn-4.0.2" = { @@ -18149,6 +18626,15 @@ let sha512 = "12iyalgghs3dj0pfb7rxa013x946169yfsjfd15fsfrx5kv80z2qh082x7v7d91hh7bf9vxcm4wqmyyj9ckk3gnvc7mw77j6fkwdpr5"; }; }; + "opn-5.3.0" = { + name = "opn"; + packageName = "opn"; + version = "5.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/opn/-/opn-5.3.0.tgz"; + sha512 = "3d5s5y22sx4wfswzs8fmhr7sarmjigs8qhmmyrkiplfda6kkfk3kv67fs8npdklf8zbc9hmx76zsxqfv4bn5qlpzbfq96nfyailg0kd"; + }; + }; "optimist-0.2.8" = { name = "optimist"; packageName = "optimist"; @@ -18392,6 +18878,15 @@ let sha512 = "35jir2yjv2l3v8aj062w0hfinzgwpb1sbhmaym8h4xn78j498naj7mkf4rpv74n5bfkysxb7l893l2yw3dpqk5dgb2yiwr8pcydjmj5"; }; }; + "p-cancelable-0.4.1" = { + name = "p-cancelable"; + packageName = "p-cancelable"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.1.tgz"; + sha512 = "02ipk9sgz2q0msm9h53lxbjvqprh9k6zj8q21dvczv6p6a5d4q5yqcmwj6xm0icmdc94n42plfmwlymnqn4f15pgci5j1zgq81vbmhw"; + }; + }; "p-finally-1.0.0" = { name = "p-finally"; packageName = "p-finally"; @@ -18689,13 +19184,13 @@ let sha1 = "32d4b6afde631420e5f415919a222b774b575707"; }; }; - "parse-torrent-file-4.0.3" = { + "parse-torrent-file-4.1.0" = { name = "parse-torrent-file"; packageName = "parse-torrent-file"; - version = "4.0.3"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/parse-torrent-file/-/parse-torrent-file-4.0.3.tgz"; - sha512 = "2shaz6cv4fgbmy1hq6hc59spkja51qg0vvx514r1nqsspdnsq6xzxabk0gs17x3n8s03y9mj8hx1xn5c0bkq9fvx59sxms2a4mlig9r"; + url = "https://registry.npmjs.org/parse-torrent-file/-/parse-torrent-file-4.1.0.tgz"; + sha512 = "2cxnv563f946k2ng808an4gcj7yi23drqv8agns3h69drrbv0rq47wdi0xjs0lsvi1i36i7l1wzaci4c4gzzfy8ghfmv4k06hpb5ph5"; }; }; "parse5-3.0.3" = { @@ -19121,22 +19616,22 @@ let sha512 = "30bb7vx0m1k1m3d1i1khgvmgddx3ahqgprs421ssrh5plpx50k5bazsj67gdi7qiknircqy59yxbclq95s2rnmk8ysgkqdpsddijfw2"; }; }; - "peer-wire-protocol-0.7.0" = { + "peer-wire-protocol-0.7.1" = { name = "peer-wire-protocol"; packageName = "peer-wire-protocol"; - version = "0.7.0"; + version = "0.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/peer-wire-protocol/-/peer-wire-protocol-0.7.0.tgz"; - sha1 = "6c015abf24b4877ed9eca3822b22d996078011da"; + url = "https://registry.npmjs.org/peer-wire-protocol/-/peer-wire-protocol-0.7.1.tgz"; + sha512 = "2dzhv7b379pzls7q7kd168h4ckh3gnfxcizknb8bvqrpxrm847vjc8c0vpn1b490k94sgl5yxndfiw30rply4phymrx6z2wyrmi7njp"; }; }; - "peer-wire-swarm-0.12.1" = { + "peer-wire-swarm-0.12.2" = { name = "peer-wire-swarm"; packageName = "peer-wire-swarm"; - version = "0.12.1"; + version = "0.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/peer-wire-swarm/-/peer-wire-swarm-0.12.1.tgz"; - sha1 = "51b75da99c335c64c9ba9ef99fe27a4a5951ff42"; + url = "https://registry.npmjs.org/peer-wire-swarm/-/peer-wire-swarm-0.12.2.tgz"; + sha512 = "3bchr23xpdvjf588f8qx52ylri5kcqnqi4lf4mgh3i0j8sk1cljvsikd47l09jk4v3drg500q3p5q01nm2z4xfj4fk5xxnbfkb9k1dh"; }; }; "peerflix-0.34.0" = { @@ -19157,12 +19652,12 @@ let sha1 = "cf8bafae6eddff4b5a7efb185269eaaf4610ddbd"; }; }; - "pegjs-git+https://github.com/tstarling/pegjs.git#fork" = { + "pegjs-git+https://github.com/tstarling/pegjs#fork" = { name = "pegjs"; packageName = "pegjs"; version = "0.8.0"; src = fetchgit { - url = "https://github.com/tstarling/pegjs.git"; + url = "https://github.com/tstarling/pegjs"; rev = "36d584bd7bbc564c86c058c5dfe8053b1fe1d584"; sha256 = "df0bf31b132e63beae73a28f1edfe0a2e9edf01660632c72834c682e2b484905"; }; @@ -19248,13 +19743,22 @@ let sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; }; }; - "pino-4.10.3" = { + "pino-4.14.0" = { name = "pino"; packageName = "pino"; - version = "4.10.3"; + version = "4.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/pino/-/pino-4.10.3.tgz"; - sha512 = "2kg8qqb15pav0a2f16xmj5iqzkx28d0c6i1ydy3vzn71hfv7b7kvsbv917bwj68bh8m2mgy9j0kj8j4npy14hg2h09q4h85sz8wm990"; + url = "https://registry.npmjs.org/pino/-/pino-4.14.0.tgz"; + sha512 = "1x3dsg8pg321khfaf3dd91ykkwhdn60wk169l3b2kp8wkbw242ld99qiv7cmbn76ccba75wdydv8mb2v4fg58lrfnn7jf5pvk2x7qwy"; + }; + }; + "pino-std-serializers-1.2.0" = { + name = "pino-std-serializers"; + packageName = "pino-std-serializers"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-1.2.0.tgz"; + sha512 = "0h8xndhy3qwgkycbmypfp7a2dvk875prgnfg46zj9vz14i24xqqdw1xp748hkv2xl2phwhyaa82yr1ym6jn6r61527kz5f7f8qird78"; }; }; "pkg-dir-2.0.0" = { @@ -19338,13 +19842,13 @@ let sha1 = "0a32ca9481b1c364e92e18dc55c876de9d01da8b"; }; }; - "plist-2.1.0" = { + "plist-3.0.1" = { name = "plist"; packageName = "plist"; - version = "2.1.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/plist/-/plist-2.1.0.tgz"; - sha1 = "57ccdb7a0821df21831217a3cad54e3e146a1025"; + url = "https://registry.npmjs.org/plist/-/plist-3.0.1.tgz"; + sha512 = "12n868myk28as4ivyihfw9ai50y0vc1jrr77r55drlidyi7qpwlm23aj9n05qqlzhs544yah6p535b5hiayh6xykf81q68wg8f2z60s"; }; }; "pluralize-1.2.1" = { @@ -19455,15 +19959,6 @@ let sha1 = "01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"; }; }; - "postcss-6.0.14" = { - name = "postcss"; - packageName = "postcss"; - version = "6.0.14"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-6.0.14.tgz"; - sha512 = "2id33g6232s35n25daqrkz0bvzm2zmhlkfzmigkgia5q4jy9xg38spppmsdg0qswjankyi28wrbjsdwhczqfkx7h71gg8dmzz8p779l"; - }; - }; "postcss-6.0.19" = { name = "postcss"; packageName = "postcss"; @@ -19473,6 +19968,15 @@ let sha512 = "174sg3cs8v8bqg8rnk673qp365n46kls3f3a41pp0jx48qivkg06rck0j2bfyzm5hr1i6kjbcn82h1rkjgfi5jbd0amrd877m3wfpbz"; }; }; + "postcss-6.0.21" = { + name = "postcss"; + packageName = "postcss"; + version = "6.0.21"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss/-/postcss-6.0.21.tgz"; + sha512 = "1vvp2mzw4gq6zm875fi7hgyypy0a44mbdpv0i4aqxsq8xajdxfyaz4ap4idh29v74ag4z26wla48k315yyg3d0h83zxkn1kniywmxnb"; + }; + }; "prebuild-install-2.1.2" = { name = "prebuild-install"; packageName = "prebuild-install"; @@ -19581,13 +20085,13 @@ let sha512 = "2dgznnpxsgy9bgp4kfby1is72blvca4lhmqb3nlja8yiig1v52c12p5yw0aag8jqazhkqvihpxmqf9gsjlg5dr1jb56jxzgnqrazy2n"; }; }; - "probe-image-size-3.2.0" = { + "probe-image-size-4.0.0" = { name = "probe-image-size"; packageName = "probe-image-size"; - version = "3.2.0"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/probe-image-size/-/probe-image-size-3.2.0.tgz"; - sha512 = "2ss74kxzba7k01p9fz756q4q9g6m29h49s5pp9wg1larrjmlcm1avhy7rwmqqkpd8azblwa3wk736xz1nrlvzc1h274g863ywifckic"; + url = "https://registry.npmjs.org/probe-image-size/-/probe-image-size-4.0.0.tgz"; + sha512 = "1qwy2hmhw201igjdk90dpky6b1qpc9b2jm7nxrsshcagf0ln73s62mwfd2j0mkfx29bhsndjmm8v2fk3nwk8jinzavcz9iicnyx2vly"; }; }; "process-0.11.10" = { @@ -19932,31 +20436,31 @@ let sha1 = "39f699f3a46560dd5ebacbca693caf7c65c18cc6"; }; }; - "pug-2.0.0-rc.4" = { + "pug-2.0.3" = { name = "pug"; packageName = "pug"; - version = "2.0.0-rc.4"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/pug/-/pug-2.0.0-rc.4.tgz"; - sha512 = "1fbygi6jg8awam3agrc63yjlgxk8vfpnym1ql4dikclikp3kdrxfpfgdywadidzzic33b9fdqnwqy6ag82m4x6kmgl644zsz2ig3gj8"; + url = "https://registry.npmjs.org/pug/-/pug-2.0.3.tgz"; + sha1 = "71cba82537c95a5eab7ed04696e4221f53aa878e"; }; }; - "pug-attrs-2.0.2" = { + "pug-attrs-2.0.3" = { name = "pug-attrs"; packageName = "pug-attrs"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/pug-attrs/-/pug-attrs-2.0.2.tgz"; - sha1 = "8be2b2225568ffa75d1b866982bff9f4111affcb"; + url = "https://registry.npmjs.org/pug-attrs/-/pug-attrs-2.0.3.tgz"; + sha1 = "a3095f970e64151f7bdad957eef55fb5d7905d15"; }; }; - "pug-code-gen-2.0.0" = { + "pug-code-gen-2.0.1" = { name = "pug-code-gen"; packageName = "pug-code-gen"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/pug-code-gen/-/pug-code-gen-2.0.0.tgz"; - sha512 = "1b9phnpcwd902482wvyql8a4h9wr1fw5idsjvg14bjvkmvxharb8m2ca25rj2f0s4i9sdldp2fj02i5933qys4921r9p7w97wjj52hk"; + url = "https://registry.npmjs.org/pug-code-gen/-/pug-code-gen-2.0.1.tgz"; + sha1 = "0951ec83225d74d8cfc476a7f99a259b5f7d050c"; }; }; "pug-error-1.3.2" = { @@ -19968,76 +20472,76 @@ let sha1 = "53ae7d9d29bb03cf564493a026109f54c47f5f26"; }; }; - "pug-filters-2.1.5" = { + "pug-filters-3.1.0" = { name = "pug-filters"; packageName = "pug-filters"; - version = "2.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/pug-filters/-/pug-filters-2.1.5.tgz"; - sha512 = "0nihpmd2irqm58nrnc382aqyb787sw551g74fc4500j4kda6qxhvahknqahl918pizcx97wp64fq34m2kksp8p2jlqqn2vbmga3nk66"; - }; - }; - "pug-lexer-3.1.0" = { - name = "pug-lexer"; - packageName = "pug-lexer"; version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/pug-lexer/-/pug-lexer-3.1.0.tgz"; - sha1 = "fd087376d4a675b4f59f8fef422883434e9581a2"; + url = "https://registry.npmjs.org/pug-filters/-/pug-filters-3.1.0.tgz"; + sha1 = "27165555bc04c236e4aa2b0366246dfa021b626e"; }; }; - "pug-linker-3.0.3" = { - name = "pug-linker"; - packageName = "pug-linker"; - version = "3.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/pug-linker/-/pug-linker-3.0.3.tgz"; - sha512 = "3j4v4ah7h6m44m7z40iqkmsdyyjb0azz5ajifi5v4byld75vrl715r2xnc8vhm4z1v686m55yyxhlcmzx4cby2ssv4yqp221779q8hc"; - }; - }; - "pug-load-2.0.9" = { - name = "pug-load"; - packageName = "pug-load"; - version = "2.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/pug-load/-/pug-load-2.0.9.tgz"; - sha512 = "3liz20386ljxz81ia1jz31fljanr88zp0br2b45lrjdzr40slg2nkyz3xi7bsqam2zixzb86hspwvl734ac36f8shz6iqpf58w5jdq4"; - }; - }; - "pug-parser-4.0.0" = { - name = "pug-parser"; - packageName = "pug-parser"; + "pug-lexer-4.0.0" = { + name = "pug-lexer"; + packageName = "pug-lexer"; version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/pug-parser/-/pug-parser-4.0.0.tgz"; - sha512 = "11a3hd10qhnpzmdrgqwndjjzmgqz090q2l89jmaqvjm0lnlrxcqig1fi0d92wxna26d18g8ywv4n9msnnlb5x2qq2qdc6sbywa19hd1"; + url = "https://registry.npmjs.org/pug-lexer/-/pug-lexer-4.0.0.tgz"; + sha1 = "210c18457ef2e1760242740c5e647bd794cec278"; }; }; - "pug-runtime-2.0.3" = { + "pug-linker-3.0.5" = { + name = "pug-linker"; + packageName = "pug-linker"; + version = "3.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/pug-linker/-/pug-linker-3.0.5.tgz"; + sha1 = "9e9a7ae4005682d027deeb96b000f88eeb83a02f"; + }; + }; + "pug-load-2.0.11" = { + name = "pug-load"; + packageName = "pug-load"; + version = "2.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/pug-load/-/pug-load-2.0.11.tgz"; + sha1 = "e648e57ed113fe2c1f45d57858ea2bad6bc01527"; + }; + }; + "pug-parser-5.0.0" = { + name = "pug-parser"; + packageName = "pug-parser"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pug-parser/-/pug-parser-5.0.0.tgz"; + sha1 = "e394ad9b3fca93123940aff885c06e44ab7e68e4"; + }; + }; + "pug-runtime-2.0.4" = { name = "pug-runtime"; packageName = "pug-runtime"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/pug-runtime/-/pug-runtime-2.0.3.tgz"; - sha1 = "98162607b0fce9e254d427f33987a5aee7168bda"; + url = "https://registry.npmjs.org/pug-runtime/-/pug-runtime-2.0.4.tgz"; + sha1 = "e178e1bda68ab2e8c0acfc9bced2c54fd88ceb58"; }; }; - "pug-strip-comments-1.0.2" = { + "pug-strip-comments-1.0.3" = { name = "pug-strip-comments"; packageName = "pug-strip-comments"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/pug-strip-comments/-/pug-strip-comments-1.0.2.tgz"; - sha1 = "d313afa01bcc374980e1399e23ebf2eb9bdc8513"; + url = "https://registry.npmjs.org/pug-strip-comments/-/pug-strip-comments-1.0.3.tgz"; + sha1 = "f1559592206edc6f85310dacf4afb48a025af59f"; }; }; - "pug-walk-1.1.5" = { + "pug-walk-1.1.7" = { name = "pug-walk"; packageName = "pug-walk"; - version = "1.1.5"; + version = "1.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/pug-walk/-/pug-walk-1.1.5.tgz"; - sha512 = "1418rf52jpq3k5l26drb11156l945688pjpia6njqrxzgffjb2rric213vrqigglhmhwc0r57zsmlknnwvhg5w9nh025b6yapb4g6dc"; + url = "https://registry.npmjs.org/pug-walk/-/pug-walk-1.1.7.tgz"; + sha1 = "c00d5c5128bac5806bec15d2b7e7cdabe42531f3"; }; }; "pull-cat-1.1.11" = { @@ -20076,13 +20580,13 @@ let sha1 = "5f2f3aed47ad86919f01b12a2e99d6f1bd776581"; }; }; - "pull-stream-3.6.2" = { + "pull-stream-3.6.7" = { name = "pull-stream"; packageName = "pull-stream"; - version = "3.6.2"; + version = "3.6.7"; src = fetchurl { - url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.6.2.tgz"; - sha1 = "1ea14c6f13174e6ac4def0c2a4e76567b7cb0c5c"; + url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.6.7.tgz"; + sha512 = "0cq5h32fsfnhxa9wbgk55jhr0z4mx6zmm42nx9r6n3j4bpl6sw2a6vh41raicq2q11bxh1vg7jxv2cdqw7nq6zb0fxm5nj8ipz3dlax"; }; }; "pull-window-2.1.4" = { @@ -20121,6 +20625,15 @@ let sha512 = "288hcmlwdnqda84ylx9cv413ic0r59k0dp71hy7a200jsb7h1y63277jwdp1jdp13c1b3pl6g2gzr5gjv9p72f5sp7w3p0d34swrqxf"; }; }; + "pump-3.0.0" = { + name = "pump"; + packageName = "pump"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz"; + sha512 = "31n24fqakqmhzk2ch644gziskmysmrgiwclsdsr0rwk9spgikqpwickbnayap0rynfjlq72s7iny2p35n3qszypr97ws5njkpx741ig"; + }; + }; "pumpify-1.4.0" = { name = "pumpify"; packageName = "pumpify"; @@ -20364,13 +20877,13 @@ let sha1 = "63ac953352499ad670a9681a75680f6bf3dd1faf"; }; }; - "query-string-5.1.0" = { + "query-string-5.1.1" = { name = "query-string"; packageName = "query-string"; - version = "5.1.0"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/query-string/-/query-string-5.1.0.tgz"; - sha512 = "04m33y2wlmhz19y109cv7l537bdagzl15jv3y0jc3mb7wrw3jpz15pws8m7pbfbqv9nwad46cg3c4cd620f27mwzs1hml2q373y8w0p"; + url = "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz"; + sha512 = "0kkwn38nmjd6n6byiz52gngvyiw46fbibx9c9p1vzn9g7l11f2jpbs39d4aqajk7kk2a6k69wx5bjgavbg1lh275ih6k84jdnr8wdc2"; }; }; "querystring-0.2.0" = { @@ -20526,13 +21039,13 @@ let sha1 = "f49be6b487894ddc40dcc94a322f611092e00d5e"; }; }; - "raven-2.3.0" = { + "raven-2.4.2" = { name = "raven"; packageName = "raven"; - version = "2.3.0"; + version = "2.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/raven/-/raven-2.3.0.tgz"; - sha1 = "96f15346bdaa433b3b6d47130804506155833d69"; + url = "https://registry.npmjs.org/raven/-/raven-2.4.2.tgz"; + sha1 = "0129e2adc30788646fd530b67d08a8ce25d4f6dc"; }; }; "raw-body-0.0.3" = { @@ -20598,13 +21111,13 @@ let sha1 = "ce24a2029ad94c3a40d09604a87227027d7210d3"; }; }; - "rc-1.2.5" = { + "rc-1.2.6" = { name = "rc"; packageName = "rc"; - version = "1.2.5"; + version = "1.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/rc/-/rc-1.2.5.tgz"; - sha1 = "275cd687f6e3b36cc756baa26dfee80a790301fd"; + url = "https://registry.npmjs.org/rc/-/rc-1.2.6.tgz"; + sha1 = "eb18989c6d4f4f162c399f79ddd29f3835568092"; }; }; "rc-config-loader-2.0.1" = { @@ -20652,6 +21165,15 @@ let sha1 = "2d5d157786a37c055d22077c32c53f8329e91c7b"; }; }; + "read-metadata-1.0.0" = { + name = "read-metadata"; + packageName = "read-metadata"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-metadata/-/read-metadata-1.0.0.tgz"; + sha1 = "6df9cbe51184e8ceb7d0668b40ee5191e6f3dac6"; + }; + }; "read-only-stream-2.0.0" = { name = "read-only-stream"; packageName = "read-only-stream"; @@ -20661,13 +21183,13 @@ let sha1 = "2724fd6a8113d73764ac288d4386270c1dbf17f0"; }; }; - "read-package-json-2.0.12" = { + "read-package-json-2.0.13" = { name = "read-package-json"; packageName = "read-package-json"; - version = "2.0.12"; + version = "2.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.12.tgz"; - sha512 = "15w2z3m1iysjf0zwvyc5mix8nypx42shx90alil4sslq6caj3pgk59zsn2ppxn95nls6bs7yw7khl5rmlq9gljv27w3vs2gxg9wigwv"; + url = "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.13.tgz"; + sha512 = "2d6gl0kam8r9s4akgqi1pjbfqa6iszwsi1v87kw354b68s7dck4w8flnjp38b9dsj9cldbch0czj1m9gbrh252dm3c6mg2r6knmjmzz"; }; }; "read-pkg-1.1.0" = { @@ -20769,13 +21291,13 @@ let sha1 = "8f90341e68a53ccc928788dacfcd11b36eb9b78e"; }; }; - "readable-stream-2.3.4" = { + "readable-stream-2.3.5" = { name = "readable-stream"; packageName = "readable-stream"; - version = "2.3.4"; + version = "2.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.4.tgz"; - sha512 = "1jpffi1v0l7pkzrhh8i9c6cbswa9npyx114cbfncfnzl9d7w9p08k9n703hq5xr2c3rg86qiq023sl1x8y6mawgsxgggy8ccrwk3rmy"; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz"; + sha512 = "09n3j4jsfl2lq3gj65qwn5b3lvzb624lrb8m14h81ls9cw59vvm8436gm5zwaqxf6y1zrfwbrsmizsq48jw1s3qj9zhpjp438735bdl"; }; }; "readdirp-2.1.0" = { @@ -20832,13 +21354,13 @@ let sha512 = "0bb5d70l5lg02x515r2klvjhhz6xcxdb4ykbx16wq45l822bbsdd8sbki7vb28j17xr7181fmwlzhx3bizvr5xdq6cxpv53sidrq44x"; }; }; - "recursive-watch-1.1.3" = { + "recursive-watch-1.1.4" = { name = "recursive-watch"; packageName = "recursive-watch"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/recursive-watch/-/recursive-watch-1.1.3.tgz"; - sha512 = "3m0s8140jpamg1xxdlsslshx10qznb889s6yc8av6vvqbs56banhmjqy9lgl7g4ppsrsja0d2lhb5lacl3nxm8ggsrpdd7xqf53hvzx"; + url = "https://registry.npmjs.org/recursive-watch/-/recursive-watch-1.1.4.tgz"; + sha512 = "0yks7j98w5d3y375fb99kfbb8rz5qz72v6ld5i15h7fds1i02fq027w82ipanv3dkgvvrxyybw1v8lyrcs54h9airzv12sbcw1a6rvx"; }; }; "redent-1.0.0" = { @@ -20895,13 +21417,13 @@ let sha512 = "3a3044ax6qdvss83xgjfx10h5q91ls0mwgs3wpsnxcdsiipq3cnmqzsh6glyq0r7vsmpw49jp84c2jnfrhi2bgycrkd9hhhf6ia8lrk"; }; }; - "redis-commands-1.3.4" = { + "redis-commands-1.3.5" = { name = "redis-commands"; packageName = "redis-commands"; - version = "1.3.4"; + version = "1.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/redis-commands/-/redis-commands-1.3.4.tgz"; - sha512 = "2xl6insq71fz02pxvdcqj9q06la7nj0g5idl66yp5x7741k6xah4slrslq8wfil0fa9lx68cgl2rvzy08p1bgp7jyvjbinc8r13df25"; + url = "https://registry.npmjs.org/redis-commands/-/redis-commands-1.3.5.tgz"; + sha512 = "2q8pai3gf0dczb03jjig3mpaz4j2kvw8icpgf8hp4fryr3d6c0mjkvxxdmlyhainybx4zhgqsw9ghc9p986alzdzd2n2p4cxvr8b0by"; }; }; "redis-parser-2.6.0" = { @@ -20967,6 +21489,15 @@ let sha512 = "3cggngaj8m70zdn8kghha4mhvavm7jfy5xm2iqi94w4gi5m5irs3nlrgg975w2231y49jnnw7zhsg648pbkl9zb6vwhii83926q7917"; }; }; + "regexpp-1.1.0" = { + name = "regexpp"; + packageName = "regexpp"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/regexpp/-/regexpp-1.1.0.tgz"; + sha512 = "21xg69jgy5r7mffh5gjaqsv6izqvqh466q3fanmnzsgk33xhxp68nnszw4jcxk2w8lnc92phy26sr7xqq3ni36mg9yh2xb0bbqg1qrc"; + }; + }; "registry-auth-token-3.3.2" = { name = "registry-auth-token"; packageName = "registry-auth-token"; @@ -21183,13 +21714,13 @@ let sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0"; }; }; - "request-2.83.0" = { + "request-2.85.0" = { name = "request"; packageName = "request"; - version = "2.83.0"; + version = "2.85.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.83.0.tgz"; - sha512 = "0by1djkn836sqd9pk2c777wcjvp34qbk1plx7s4lmykljrblpjc64dvn6ni2vyxsbyk33wnl6avym8vgw0ggr4226xakck8mw7y07cm"; + url = "https://registry.npmjs.org/request/-/request-2.85.0.tgz"; + sha512 = "2d3hg10zs5ycnr8prmiwdhacf88fl0x0bi6szs0z2r07zcbk419laixwpjp8sqapbc2ifyyih7p3r60wgr58bmcncz3pqnx523c8zph"; }; }; "request-2.9.203" = { @@ -21291,13 +21822,13 @@ let sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b"; }; }; - "resolve-1.5.0" = { + "resolve-1.6.0" = { name = "resolve"; packageName = "resolve"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz"; - sha512 = "25scf9zkhf5yc9x3d7mfq2im5vyxmq3ih939na6jzblal7mgfcijmadl2maz501mkccykj714gvdhhmlzi86hbk7k03r9ipnwd142l6"; + url = "https://registry.npmjs.org/resolve/-/resolve-1.6.0.tgz"; + sha512 = "1vidqan0cvx5paxxhp9ir7kfd1j7k2ll0z9d0arj8wrqrfw20mdj3ckwy8gwl7n2xagc3z3jm6zy1d3fhl3w2qffcj144xrvd0cj3lv"; }; }; "resolve-dir-1.0.1" = { @@ -21579,13 +22110,13 @@ let sha1 = "0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"; }; }; - "run-parallel-1.1.7" = { + "run-parallel-1.1.8" = { name = "run-parallel"; packageName = "run-parallel"; - version = "1.1.7"; + version = "1.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.7.tgz"; - sha512 = "322cb6n7h8761gprij4m1z52rizyzvxwviima893gphrbrxkhjv6q4ifwspd0w9jhlk7jj0x64449aagms18v7ps6hr774ymvavh7lw"; + url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.8.tgz"; + sha512 = "1jzs29b3g9xx5408i8gzyflx0wajfa1ai9sgm63pbvkaas0351j9y92kxq06x8dhg7w829skizs88cdlf156zfm1yk5brbbb0spb6vv"; }; }; "run-queue-1.0.3" = { @@ -21597,13 +22128,13 @@ let sha1 = "e848396f057d223f24386924618e25694161ec47"; }; }; - "run-series-1.1.4" = { + "run-series-1.1.6" = { name = "run-series"; packageName = "run-series"; - version = "1.1.4"; + version = "1.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/run-series/-/run-series-1.1.4.tgz"; - sha1 = "89a73ddc5e75c9ef8ab6320c0a1600d6a41179b9"; + url = "https://registry.npmjs.org/run-series/-/run-series-1.1.6.tgz"; + sha512 = "2rpksrvsfrz5kv3cwr448d60521dlky61p5hp3ci7g8140yfm58g7xak4gkqysfc9cm6hknxyizfs832939fxg01qslxrzlx7l805a1"; }; }; "rusha-0.8.13" = { @@ -21660,13 +22191,13 @@ let sha1 = "753b87a89a11c95467c4ac1626c4efc4e05c67be"; }; }; - "rxjs-5.5.6" = { + "rxjs-5.5.8" = { name = "rxjs"; packageName = "rxjs"; - version = "5.5.6"; + version = "5.5.8"; src = fetchurl { - url = "https://registry.npmjs.org/rxjs/-/rxjs-5.5.6.tgz"; - sha512 = "293yj2n5f5bj8b8y9czwgm5l3bqa0g3bbghnxsxwdpiz6s2mxiw6a79w3sqq3c1by3avmb5bgk8xgi0yss5y09pxw87055l60f3k15z"; + url = "https://registry.npmjs.org/rxjs/-/rxjs-5.5.8.tgz"; + sha512 = "32whnkvnay58zbcwimj3lpagg52k7swjdcys6i14a0im2hj1svh602bpvpb3zrqv36k96a1gsjjzbjxvfy6aj89i838l06mxsiflgh7"; }; }; "safe-buffer-5.0.1" = { @@ -21750,15 +22281,6 @@ let sha1 = "d472db228eb331c2506b0e8c15524adb939d12c1"; }; }; - "sax-0.6.1" = { - name = "sax"; - packageName = "sax"; - version = "0.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz"; - sha1 = "563b19c7c1de892e09bfc4f2fc30e3c27f0952b9"; - }; - }; "sax-1.1.4" = { name = "sax"; packageName = "sax"; @@ -21786,15 +22308,6 @@ let sha512 = "1dn291mjsda42w8kldlbmngk6dhjxfbvvd5lckyqmwbjaj6069iq3wx0nvcfglwnpddz2qa93lzf4hv77iz43bd2qixa079sjzl799n"; }; }; - "schema-utils-0.3.0" = { - name = "schema-utils"; - packageName = "schema-utils"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz"; - sha1 = "f5877222ce3e931edae039f17eb3716e7137f8cf"; - }; - }; "schema-utils-0.4.5" = { name = "schema-utils"; packageName = "schema-utils"; @@ -21813,6 +22326,15 @@ let sha1 = "a346bb1acd4207ae70bd7c0c7ca9e566b6baddb8"; }; }; + "seek-bzip-1.0.5" = { + name = "seek-bzip"; + packageName = "seek-bzip"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.5.tgz"; + sha1 = "cfe917cb3d274bcffac792758af53173eb1fabdc"; + }; + }; "semaphore-async-await-1.5.1" = { name = "semaphore-async-await"; packageName = "semaphore-async-await"; @@ -21930,13 +22452,13 @@ let sha1 = "57f41de69707a62709a7e0104ba2117109ea47e8"; }; }; - "semver-utils-1.1.1" = { + "semver-utils-1.1.2" = { name = "semver-utils"; packageName = "semver-utils"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/semver-utils/-/semver-utils-1.1.1.tgz"; - sha1 = "27d92fec34d27cfa42707d3b40d025ae9855f2df"; + url = "https://registry.npmjs.org/semver-utils/-/semver-utils-1.1.2.tgz"; + sha512 = "09ryf3nvrfjqr93b8fj691lh48pvqhrpah5a5fm87szs42xcnl33sss49piv1grb9h2i7icdvz0i0m5yak5ccxa6xbv4x294rsfs6zr"; }; }; "send-0.0.3" = { @@ -22065,13 +22587,13 @@ let sha1 = "dd419e268de012ab72b319d337f2105013f9381f"; }; }; - "serve-favicon-2.4.5" = { + "serve-favicon-2.5.0" = { name = "serve-favicon"; packageName = "serve-favicon"; - version = "2.4.5"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.4.5.tgz"; - sha512 = "2gn8a5l0hh655cxq2cvvar6k1hl8cpmagplavx6svjiz9kmi968nwbzhpc2fvpcpmsfqb8s5jjq0gvn8vwwc2lx3cj57ckbcf3prcdk"; + url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.5.0.tgz"; + sha1 = "935d240cdfe0f5805307fdfe967d88942a2cbcf0"; }; }; "serve-index-1.7.3" = { @@ -22146,13 +22668,13 @@ let sha1 = "f13bf928e42b9c3e79383e61cc3998b5d14e6cdd"; }; }; - "service-runner-2.5.1" = { + "service-runner-2.3.0" = { name = "service-runner"; packageName = "service-runner"; - version = "2.5.1"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/service-runner/-/service-runner-2.5.1.tgz"; - sha1 = "b282214463187607748aa3695023a09f5d28c672"; + url = "https://registry.npmjs.org/service-runner/-/service-runner-2.3.0.tgz"; + sha1 = "09039dfdcc40cdbd0259dd3f982916675838cb59"; }; }; "set-blocking-2.0.0" = { @@ -22164,15 +22686,6 @@ let sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; }; }; - "set-getter-0.1.0" = { - name = "set-getter"; - packageName = "set-getter"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/set-getter/-/set-getter-0.1.0.tgz"; - sha1 = "d769c182c9d5a51f409145f2fba82e5e86e80376"; - }; - }; "set-immediate-shim-1.0.1" = { name = "set-immediate-shim"; packageName = "set-immediate-shim"; @@ -22227,13 +22740,13 @@ let sha512 = "2jlhhawfqdiga1m6if01ks1q3yx56k5vj6wf372589vkswvdflw7224viivxali56b0jjsckpmjy10rj6fcakhw2dbq2psr197kzw86"; }; }; - "sha.js-2.4.10" = { + "sha.js-2.4.11" = { name = "sha.js"; packageName = "sha.js"; - version = "2.4.10"; + version = "2.4.11"; src = fetchurl { - url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.10.tgz"; - sha512 = "2lfna0mg4mzdki4p3q29rsgywbghvy6f6jy6b61zj68d2d936wfqjgqpsdjchfcqkiim53qknpcnq9iiafyidfrw154qf75a2n2cz5y"; + url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz"; + sha512 = "2lihh3p2mrwymrly93ni37b1dvzwbm1jc47iqp66ax4bj41js4mr94wghv3c2agq98bb44nxxddn2n67ab978zk00xx2znw3vj2kha0"; }; }; "shallow-clone-0.1.2" = { @@ -22353,13 +22866,13 @@ let sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590"; }; }; - "sign-addon-0.2.2" = { + "sign-addon-0.3.0" = { name = "sign-addon"; packageName = "sign-addon"; - version = "0.2.2"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/sign-addon/-/sign-addon-0.2.2.tgz"; - sha512 = "3v5myvfbil1c5fsvqx32vqdv7mk62059isry4811avmkgzfv95scw8pnkwa77m6zg9g8vgsp3glqjm65k3rj8xfxnqv24mcmhjk78bz"; + url = "https://registry.npmjs.org/sign-addon/-/sign-addon-0.3.0.tgz"; + sha512 = "2czjlarf0pa0svlhbdb9i6hrk429za0gsialmxbmgwgbhyjx7mxkgf5mww4rkmsbncdi2va8p64rxjxf7gv8b0jd2a87cvm7rw5pky5"; }; }; "signal-exit-3.0.2" = { @@ -22416,13 +22929,13 @@ let sha512 = "2r1w3cxxmd92r19mjrlzwn6xypjd5vrx0gk21l2bmxcp1x54pavhmifbhq8llxfk6z2lmzly7g3l8rrdl19m65nzlcicwy7cfn3sha6"; }; }; - "simple-git-1.91.0" = { + "simple-git-1.92.0" = { name = "simple-git"; packageName = "simple-git"; - version = "1.91.0"; + version = "1.92.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-1.91.0.tgz"; - sha1 = "842db6c2ba08328e93c17391a895b850518cd13a"; + url = "https://registry.npmjs.org/simple-git/-/simple-git-1.92.0.tgz"; + sha1 = "6061468eb7d19f0141078fc742e62457e910f547"; }; }; "simple-lru-cache-0.0.2" = { @@ -22668,13 +23181,13 @@ let sha1 = "d76ef9127cb23c2259edb1e8349c2e8d5e2d74c1"; }; }; - "snapdragon-0.8.1" = { + "snapdragon-0.8.2" = { name = "snapdragon"; packageName = "snapdragon"; - version = "0.8.1"; + version = "0.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.1.tgz"; - sha1 = "e12b5487faded3e3dea0ac91e9400bf75b401370"; + url = "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz"; + sha512 = "2b0sap2q0c6qbfkw6znql845b143frn5gkkz4gpirjhgwa2j3wy3jsvrfg51s5c1w1m4nkgis97x9yvmzsc533kap9j3h3zcffqxp0n"; }; }; "snapdragon-node-2.1.1" = { @@ -22731,13 +23244,13 @@ let sha512 = "0k2smmr24w5hb1cpql6vcgh58vzp4pmh9anf0bgz3arlsgq1mapnlq9fjqr6xs10aq1cmxaw987fwknqi62frax0fvs9bj3q3kmpg8l"; }; }; - "snyk-1.69.10" = { + "snyk-1.70.3" = { name = "snyk"; packageName = "snyk"; - version = "1.69.10"; + version = "1.70.3"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.69.10.tgz"; - sha1 = "34c66b21791435dd17fa2955904a5fdd6b57415d"; + url = "https://registry.npmjs.org/snyk/-/snyk-1.70.3.tgz"; + sha1 = "53c98949d27bf57905eeb7beed94d360a24fff55"; }; }; "snyk-config-1.0.1" = { @@ -22812,13 +23325,13 @@ let sha1 = "2a7bf0f07c7b811b9dda93cf9bbb10dc992dd7bc"; }; }; - "snyk-python-plugin-1.5.6" = { + "snyk-python-plugin-1.5.7" = { name = "snyk-python-plugin"; packageName = "snyk-python-plugin"; - version = "1.5.6"; + version = "1.5.7"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.5.6.tgz"; - sha512 = "1iv7h9k0vj7g2zzx8nzighx84q70kwvl4hhzd4fzxmc8vv06ymwwn4v7cirgbksqrjf9z1bfxq8id308ifb1flyas7blz8zs7xf4w30"; + url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.5.7.tgz"; + sha512 = "3fqq6dbx31yysvd835ng60linxmbkzixiqqf28yxq9pdx3x8dq55syhv1g6as3s85wd04q5vc5qlfgdl91jlhwcgjvdwjjr2wwp84pq"; }; }; "snyk-resolve-1.0.0" = { @@ -22839,13 +23352,13 @@ let sha1 = "13743a058437dff890baaf437c333c966a743cb6"; }; }; - "snyk-sbt-plugin-1.2.4" = { + "snyk-sbt-plugin-1.2.5" = { name = "snyk-sbt-plugin"; packageName = "snyk-sbt-plugin"; - version = "1.2.4"; + version = "1.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-1.2.4.tgz"; - sha512 = "3fry8q6f0nrcrzs67zjxkgabb0hinyn5zy1kxq8wf9ca1r0fs67mk4ybiy4fxjy8rwj2axbhhhc3lf5wi97m3amh9k70pakg08yq7q4"; + url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-1.2.5.tgz"; + sha512 = "183dfn89vslcl63y76jxyndz67f5c8ii4wh0pvbxgzqb3161rz5j5p4k7dv69shiw55q1lyb1j70pjng6rafw5k0jnqc58x63bpqgz8"; }; }; "snyk-tree-1.0.0" = { @@ -22902,6 +23415,15 @@ let sha1 = "c1a4590ceff87ecf13c72652f046f716b29e6014"; }; }; + "socket.io-2.1.0" = { + name = "socket.io"; + packageName = "socket.io"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io/-/socket.io-2.1.0.tgz"; + sha512 = "2wkm6yqxvn8wk51rbakza3zxg3rknzfgmwqrbzvnlacf1yylplsr61i67m01sg8x7589ymj6x3z266ngvqd6qyyakdx4dlnsl4bfbr9"; + }; + }; "socket.io-adapter-0.2.0" = { name = "socket.io-adapter"; packageName = "socket.io-adapter"; @@ -22965,6 +23487,15 @@ let sha1 = "0918a552406dc5e540b380dcd97afc4a64332f8e"; }; }; + "socket.io-client-2.1.0" = { + name = "socket.io-client"; + packageName = "socket.io-client"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.1.0.tgz"; + sha512 = "1xkd66603gshd7s080j107ms405z18mljc7gbmnkllph1zfg82sz5mgvsyhi1zs3bbv5lgvv29gxfn624gpv46v5mwy610wpnj8zwjf"; + }; + }; "socket.io-parser-2.1.2" = { name = "socket.io-parser"; packageName = "socket.io-parser"; @@ -23001,6 +23532,15 @@ let sha512 = "3pd3lbxawkd1zs739v0vv81vhf6pyax989j96hrc7vhql0xv7kn13sr893hrnn6m71jngw5h61523dq0b0p8drvff0fm0lbz8fbcil3"; }; }; + "socket.io-parser-3.2.0" = { + name = "socket.io-parser"; + packageName = "socket.io-parser"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.2.0.tgz"; + sha512 = "10calkdapaxrn8pjqghqxl9h2s6bm76wdd7rp3fd468zz43xcyx6qvywfdivrb2r1dsddig2byv2mbymiyb2q4r628s7z6wpb3q320m"; + }; + }; "socks-1.1.10" = { name = "socks"; packageName = "socks"; @@ -23028,22 +23568,22 @@ let sha512 = "33yfj0m61wn7g9s59m7mxhm6w91nkdrd7hcnnbacrj58zqgykpyr7f6lsggvc9xzysrf951ncxh4malqi11yf8z6909fasllxi6cnxh"; }; }; - "sodium-javascript-0.5.4" = { + "sodium-javascript-0.5.5" = { name = "sodium-javascript"; packageName = "sodium-javascript"; - version = "0.5.4"; + version = "0.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/sodium-javascript/-/sodium-javascript-0.5.4.tgz"; - sha512 = "1dqdzm0qjk1rwq62b010b649wdpvlzdxpmwc972p0dcwsc86wqfcm8lbdcxlrwypkn2jq5df1xpbxhxfphnpr993ac543p9s212si30"; + url = "https://registry.npmjs.org/sodium-javascript/-/sodium-javascript-0.5.5.tgz"; + sha512 = "3451wvpagbw2ib50galmlfrb5za3zh0ml1irbm2ijd0lbjblg9va4fnag6sfs7msb1m0i5zicz93jwp90c22v0n40qzpczhicg85jah"; }; }; - "sodium-native-2.1.4" = { + "sodium-native-2.1.5" = { name = "sodium-native"; packageName = "sodium-native"; - version = "2.1.4"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/sodium-native/-/sodium-native-2.1.4.tgz"; - sha512 = "3d3bbjycbpplxgjpfz78vqr8g8hp62j37hr4c3vym7ax36qzxqan73fmqw2i3wd8ix65ysdlzbnzhrs3634ngp840gfpmm9alarc80j"; + url = "https://registry.npmjs.org/sodium-native/-/sodium-native-2.1.5.tgz"; + sha512 = "3cwd4rvsggx0lzc7433v6321fjs65q9nqr3c9gcz7j51ca580aq6ciacmmq788yxb3ih78b1fkpkprm75d0hadj3ng2bznc6qsl1var"; }; }; "sodium-universal-2.0.0" = { @@ -23226,24 +23766,6 @@ let sha1 = "32552aa64b458392a85eab3b0b5ee61527167aeb"; }; }; - "source-map-support-0.5.0" = { - name = "source-map-support"; - packageName = "source-map-support"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.0.tgz"; - sha512 = "3nwgpximc17yn0lfg8658fxkm2hwbpvnbx5x1g0qgqvjm3vzld96rh1gf6iw1srbkicp0m825sq92r9bnj2r2gl8ys0f7fzivf0sjmx"; - }; - }; - "source-map-support-0.5.1" = { - name = "source-map-support"; - packageName = "source-map-support"; - version = "0.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.1.tgz"; - sha512 = "276x5a16yv0nlzjdvspsnbkxqhv8lvfj7a0sfzkaasfcwa2rm1ni3h3c0fva63bfqnazbywvs4pzrnbwg43j7gpymjd9cbbndq5x4qi"; - }; - }; "source-map-support-0.5.3" = { name = "source-map-support"; packageName = "source-map-support"; @@ -23253,6 +23775,15 @@ let sha512 = "3xy2ylp2qm8jwglcsf2fjwvn5w56im64w7yjghyv9ilw2fc5qj65w8h38lpls27m3b5prv8x9cnfmrhkfk7rlb52hmf810ycs0i7abq"; }; }; + "source-map-support-0.5.4" = { + name = "source-map-support"; + packageName = "source-map-support"; + version = "0.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.4.tgz"; + sha512 = "1vfdnbvldylljhm89hfxwsr3pd108my5z1l9gx8ld1j2v2bfpranqc7kc8i9mj24lbq6c4xxs181anrsa5ypbfd3r08v3c1dqyd4i1w"; + }; + }; "source-map-url-0.4.0" = { name = "source-map-url"; packageName = "source-map-url"; @@ -23469,13 +24000,13 @@ let sha1 = "512675a28f08f1e581779e1989ab1e13effb49e4"; }; }; - "sshpk-1.13.1" = { + "sshpk-1.14.1" = { name = "sshpk"; packageName = "sshpk"; - version = "1.13.1"; + version = "1.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz"; - sha1 = "512df6da6287144316dc4c18fe1cf1d940739be3"; + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz"; + sha1 = "130f5975eddad963f1d56f92b9ac6c51fa9f83eb"; }; }; "sshpk-1.7.1" = { @@ -23496,22 +24027,13 @@ let sha1 = "62e143c18530fda103320b3403e8ad42786d9718"; }; }; - "ssri-4.1.6" = { + "ssri-5.3.0" = { name = "ssri"; packageName = "ssri"; - version = "4.1.6"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/ssri/-/ssri-4.1.6.tgz"; - sha512 = "283n1p781cl2pj3jk32blcvwjdlaixng0v5x2f9qi3ndxrmyg3hk4clsjpcfsszkymy40q426yz5skax4ivsmll2p9hhcc00ivc4ijr"; - }; - }; - "ssri-5.2.4" = { - name = "ssri"; - packageName = "ssri"; - version = "5.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/ssri/-/ssri-5.2.4.tgz"; - sha512 = "2si1dr4dwg0bkvsn38d6rk5raw5lbn2m9giwf8pnhy55wqgxsvv7b1pn252wj166cd8j302a2gwjy00ni473yr1vrxrzmssqs000waj"; + url = "https://registry.npmjs.org/ssri/-/ssri-5.3.0.tgz"; + sha512 = "00qc3iqsi21cc2az3nz36q88psab4ickpzranndk6vmrb6yhn5xsq3kgp21x3lp0406bdaalpb59xy7zzqnl40ans69v3z2l8z8h52x"; }; }; "stable-0.1.6" = { @@ -23541,6 +24063,15 @@ let sha1 = "a8f6eaeca90674c333e7c43953f275b451510695"; }; }; + "stat-mode-0.2.2" = { + name = "stat-mode"; + packageName = "stat-mode"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/stat-mode/-/stat-mode-0.2.2.tgz"; + sha1 = "e6c80b623123d7d80cf132ce538f346289072502"; + }; + }; "static-extend-0.1.2" = { name = "static-extend"; packageName = "static-extend"; @@ -23595,6 +24126,15 @@ let sha512 = "1xxwqpj713rq1idbmp7mj7cj9dl52lazgpd5x8a9g88jawbkn9xpwbgljl7cvnd0jqkll2zpdj5xy63dlis9l2k8vmx1n1gvyv8456f"; }; }; + "statuses-1.5.0" = { + name = "statuses"; + packageName = "statuses"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz"; + sha1 = "161c7dac177659fd9811f43771fa99381478628c"; + }; + }; "steno-0.4.4" = { name = "steno"; packageName = "steno"; @@ -23676,13 +24216,13 @@ let sha512 = "2h4ymczmf5aqldga4sj8acqlzc3almazi2vwiv7kx63k28sz1wwkqgzzv1hn47jf49k1x94w25fmmi001h5mj3n6g9in1s6b1n5vkcr"; }; }; - "stream-http-2.8.0" = { + "stream-http-2.8.1" = { name = "stream-http"; packageName = "stream-http"; - version = "2.8.0"; + version = "2.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/stream-http/-/stream-http-2.8.0.tgz"; - sha512 = "2ghzil78wsr29z8p1883i0vwx9gpsspha4wvdbpvqzbknrfiavwis010i5a7vy0xx8n486f6kwmjxsk3mg1w4bjy4whvizriz28b4xi"; + url = "https://registry.npmjs.org/stream-http/-/stream-http-2.8.1.tgz"; + sha512 = "3fbvnv92iyjjnbpggg15blfwzyk4q0f5rsdz2wyyd20j05vw8qgmr185r1r36i3m6qqb82il99qn0b09bb4b7s1myvccbf1bsij63bi"; }; }; "stream-parser-0.3.1" = { @@ -23901,13 +24441,13 @@ let sha512 = "29s1fqgr4mnhfxwczgdghfmmc1f792m9hysvcjxw2h5lfj8ndf2b6gm02m96qk5m75g4aisijvng4pk618anwbr8i9ay2jyszkqgslw"; }; }; - "string.prototype.codepointat-0.2.0" = { + "string.prototype.codepointat-0.2.1" = { name = "string.prototype.codepointat"; packageName = "string.prototype.codepointat"; - version = "0.2.0"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.codepointat/-/string.prototype.codepointat-0.2.0.tgz"; - sha1 = "6b26e9bd3afcaa7be3b4269b526de1b82000ac78"; + url = "https://registry.npmjs.org/string.prototype.codepointat/-/string.prototype.codepointat-0.2.1.tgz"; + sha512 = "1r18lbap331hx5hfic2irpd3rai1ymp5s93p5xfzfr0khw9krkx51glwhmdjxbrk07kryqqdc2fly59avw3pq3q2apq7q487q55bh6r"; }; }; "string2compact-1.2.2" = { @@ -24063,6 +24603,15 @@ let sha1 = "956bcc5d84430f69256a90ed823765cd858e159c"; }; }; + "strip-dirs-2.1.0" = { + name = "strip-dirs"; + packageName = "strip-dirs"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-dirs/-/strip-dirs-2.1.0.tgz"; + sha512 = "3gd7bh1h7xjvl8y6lj1mmsv4qpgbxd620fbp2cjlnc3b9gn7wnzbs1170gs7i6y5arm0dd09y8d74vr357gvwmx9f0616wbw8wv3q14"; + }; + }; "strip-eof-1.0.0" = { name = "strip-eof"; packageName = "strip-eof"; @@ -24117,6 +24666,15 @@ let sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; }; }; + "strip-outer-1.0.1" = { + name = "strip-outer"; + packageName = "strip-outer"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz"; + sha512 = "31a8vlzg4gwak3cx7n0lask77xyqpf5mz4ckphc10ykmb9r2lais7v4w8a8xij9lv2115xjnl7avkwp2l7cw3kbc3lpjsghl72757lk"; + }; + }; "strong-data-uri-1.0.5" = { name = "strong-data-uri"; packageName = "strong-data-uri"; @@ -24252,13 +24810,13 @@ let sha1 = "be7a0de484dec5c5cddf8b3d59125044912f635b"; }; }; - "supports-color-5.2.0" = { + "supports-color-5.3.0" = { name = "supports-color"; packageName = "supports-color"; - version = "5.2.0"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-5.2.0.tgz"; - sha512 = "3jqwn02aw7bczn3f56mfbx3nvhrydwsc6g9vkp54794rfdg61vbp3qy4vdj1n8jvpahlcywpcv0afxjxbj5a3wm9lpqcsr5ix5nyzqp"; + url = "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz"; + sha512 = "0v9skvg8c5hgqfsm98p7d7hisk11syjdvl3nxid3ik572hbjwv4vyzws7q0n1yz8mvb1asbk00838fi09hyfskrng54icn8nbag98yi"; }; }; "symbol-observable-1.0.1" = { @@ -24297,13 +24855,13 @@ let sha1 = "2bbc542f0fda9861a755d3947fefd8b3f513855f"; }; }; - "table-4.0.3" = { + "table-4.0.2" = { name = "table"; packageName = "table"; - version = "4.0.3"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/table/-/table-4.0.3.tgz"; - sha512 = "0m684sf5sicq9hlavaw7wrm8d10p2vm1cvvrxgl7f2rpqbn5cm6hhsbzb0is6r1bm19p7960dwxif6lc48bz712kx27s176hhafgfjb"; + url = "https://registry.npmjs.org/table/-/table-4.0.2.tgz"; + sha512 = "2q47avrxblc0an2g5ij8sd7ss2bqhdxy2949dk774gyg9vmsivg7fwyn885v2va72sxiv5k59ifvi3hg4ra6z95lr8in6sjyw008jai"; }; }; "tabtab-1.3.2" = { @@ -24397,13 +24955,13 @@ let sha512 = "1ryql8hyrrhd0gdd71ishbj3cnr8ay0i0wpvy9mj3hjiy35cc1wa0h07wz8jwils98j00gr03ix3cf2j1xm43xjn9bsavwn1yr4a0x5"; }; }; - "tar-4.4.0" = { + "tar-4.4.1" = { name = "tar"; packageName = "tar"; - version = "4.4.0"; + version = "4.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-4.4.0.tgz"; - sha512 = "2jqkq86l5d9kaqvxd7m5r48smv4f8y10vx7r0rpwafwz5sskrmlpdswp8g351jfk5if2jv0a3wbjpss31x1cf6x5dx8zhib465576c0"; + url = "https://registry.npmjs.org/tar/-/tar-4.4.1.tgz"; + sha512 = "33gymcvk33znj1lscj0kds60g5jzagw2dcx1fcbpxz85pi21kqlazvwz579p301x0vqvir1nslh901zq28sfx2zpsnd7qldvjpzbsrv"; }; }; "tar-fs-1.16.0" = { @@ -24649,6 +25207,15 @@ let sha1 = "faa0e9d230c51acc95ca13a361ac05ca7e04553d"; }; }; + "thunkify-wrap-1.0.4" = { + name = "thunkify-wrap"; + packageName = "thunkify-wrap"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/thunkify-wrap/-/thunkify-wrap-1.0.4.tgz"; + sha1 = "b52be548ddfefda20e00b58c6096762b43dd6880"; + }; + }; "thunky-0.1.0" = { name = "thunky"; packageName = "thunky"; @@ -24766,13 +25333,13 @@ let sha1 = "320b5a52d83abb5978d81a3e887d4aefb15a6164"; }; }; - "titleize-1.0.0" = { + "titleize-1.0.1" = { name = "titleize"; packageName = "titleize"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/titleize/-/titleize-1.0.0.tgz"; - sha1 = "7d350722061830ba6617631e0cfd3ea08398d95a"; + url = "https://registry.npmjs.org/titleize/-/titleize-1.0.1.tgz"; + sha512 = "1xp43r14ynva5c21rihxm625x47109zj7k3j0cpdmm74lc4fwml3vags077221gz2gf7vafwnskncmag4wnsisiz0bmiawapc70ck5d"; }; }; "tmp-0.0.28" = { @@ -24964,13 +25531,13 @@ let sha1 = "50346e42a43b35daf2a86f414afb153629a854be"; }; }; - "torrent-stream-1.0.3" = { + "torrent-stream-1.0.4" = { name = "torrent-stream"; packageName = "torrent-stream"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/torrent-stream/-/torrent-stream-1.0.3.tgz"; - sha1 = "d8c043b44c3c448c9397a3aec42d2df55887037b"; + url = "https://registry.npmjs.org/torrent-stream/-/torrent-stream-1.0.4.tgz"; + sha512 = "3ka40l845bfjydjk9jbiz27x4cqd8birv5zfzvdm7ciij7r53ydz6y7pwmk0628qwdnkchgh10z4kdc3408zi8a8pimq7506qrji010"; }; }; "tosource-1.0.0" = { @@ -25126,6 +25693,15 @@ let sha1 = "9f9ba9d9efa8764c387698bcbfeb2c848f11adb3"; }; }; + "trim-repeated-1.0.0" = { + name = "trim-repeated"; + packageName = "trim-repeated"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz"; + sha1 = "e3646a2ea4e891312bf7eace6cfb05380bc01c21"; + }; + }; "trim-right-1.0.1" = { name = "trim-right"; packageName = "trim-right"; @@ -25342,6 +25918,15 @@ let sha512 = "2gjv6xyp9rqfdfqadayc4b36b79sjdiwsxa38z43v01cdn3xbc06ax90mjv36hxj9j96nfbwr6w1wn7n0zq8f3y3fw4jfy0j1hw5557"; }; }; + "typescript-2.8.1" = { + name = "typescript"; + packageName = "typescript"; + version = "2.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/typescript/-/typescript-2.8.1.tgz"; + sha512 = "1v0ac83sjf21wg11fpllicxz8irx9yg341zmng7vz15524gbfphc9ch70n4x9r70gm0r4ak79xyaxw9zh6b2cwcs7mg447qvzlxz3q2"; + }; + }; "typewise-1.0.3" = { name = "typewise"; packageName = "typewise"; @@ -25432,13 +26017,13 @@ let sha1 = "fa0984770b428b7a9b2a8058f46355d14fef211a"; }; }; - "uglify-js-2.7.5" = { + "uglify-js-2.8.21" = { name = "uglify-js"; packageName = "uglify-js"; - version = "2.7.5"; + version = "2.8.21"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz"; - sha1 = "4612c0c7baaee2ba7c487de4904ae122079f2ca8"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.21.tgz"; + sha1 = "1733f669ae6f82fc90c7b25ec0f5c783ee375314"; }; }; "uglify-js-2.8.29" = { @@ -25450,13 +26035,13 @@ let sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd"; }; }; - "uglify-js-3.3.12" = { + "uglify-js-3.3.18" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.3.12"; + version = "3.3.18"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.12.tgz"; - sha512 = "166ccv37fz5bsnwpp0n0xqxx63pdg8d4hxhac79k61n47l69mcw7sp5g3c68y98x867da1w1bnv5ryisvsjsj639sbpdl2mg56nng72"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.18.tgz"; + sha512 = "3vg4gpamx95s8md0lsnx3njijc8x5z8nifn2c204w261w09h7d65zjkm9mxy4v3scrab7nhd6qypdq5jgf8nkbvzvqp8akpzwbch62n"; }; }; "uglify-js-3.3.6" = { @@ -25477,22 +26062,13 @@ let sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7"; }; }; - "uglifyjs-webpack-plugin-0.4.6" = { + "uglifyjs-webpack-plugin-1.2.4" = { name = "uglifyjs-webpack-plugin"; packageName = "uglifyjs-webpack-plugin"; - version = "0.4.6"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz"; - sha1 = "b951f4abb6bd617e66f63eb891498e391763e309"; - }; - }; - "uglifyjs-webpack-plugin-1.2.2" = { - name = "uglifyjs-webpack-plugin"; - packageName = "uglifyjs-webpack-plugin"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.2.tgz"; - sha512 = "3ngk387v5rza5gly8576cr1kmqmrpvb5jp6l33ac6ps5zkra0anr722gmx29i4m6q5bj6v4gdh8jikqg7l1lf4nkc06aynz6nzwsvq8"; + url = "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.4.tgz"; + sha512 = "14jcr2nd1d4l940llkm93b2rm9886qi9vz16ab85nji84bmsr99rvzvv4vwzj3j0m2lpkkm2gskd4p29lv4vzjr76zp6vxwjn71nhng"; }; }; "uid-0.0.2" = { @@ -25558,13 +26134,13 @@ let sha1 = "483126e11774df2f71b8b639dcd799c376162b82"; }; }; - "uint64be-2.0.1" = { + "uint64be-2.0.2" = { name = "uint64be"; packageName = "uint64be"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/uint64be/-/uint64be-2.0.1.tgz"; - sha1 = "a310d94e4e5e0b02a95d678e33323f802bdc8428"; + url = "https://registry.npmjs.org/uint64be/-/uint64be-2.0.2.tgz"; + sha512 = "34jzmdzz81fdi4s48rxr9dzs63iln7w6y9d44ckq6nvxd6v7y0wpc6x90zc2md21ddc1abfwk5h20py3s79bzhknqqphkchj6z9s2pm"; }; }; "ultron-1.0.2" = { @@ -25585,13 +26161,22 @@ let sha512 = "0x78hsv3jykmjl6qdqlqiz7v5nf06li8b5yvzpj6grnzwbcjch8ngyg55lm8g8mg4znvk7qbryvrr2dxacz3cvyb1nsm64qsw21g0ah"; }; }; - "umd-3.0.1" = { + "umd-3.0.3" = { name = "umd"; packageName = "umd"; - version = "3.0.1"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/umd/-/umd-3.0.1.tgz"; - sha1 = "8ae556e11011f63c2596708a8837259f01b3d60e"; + url = "https://registry.npmjs.org/umd/-/umd-3.0.3.tgz"; + sha512 = "2iz3bypw716y5lgdg89d7jwnkqnla4sid3l5hr2259ypf8h6sbkw3n0xa51ckzkkayf0c39ksaiax2j6ighj36p5ipwh5p1wx50d1z0"; + }; + }; + "unbzip2-stream-1.2.5" = { + name = "unbzip2-stream"; + packageName = "unbzip2-stream"; + version = "1.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.2.5.tgz"; + sha512 = "0xgvidx384p6cc8zh4m0qq000cn140dsckkijf95ka6iqi9j5nsrjrrf3mr3gxnybcvf2l4hxkaf0j7cqxncm3lnpq4ripw2j7zfc4b"; }; }; "unc-path-regex-0.1.2" = { @@ -25927,6 +26512,15 @@ let sha1 = "7f1f302055b3fea0f3e81dc78eb36766cb65e3f1"; }; }; + "unyield-0.0.1" = { + name = "unyield"; + packageName = "unyield"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unyield/-/unyield-0.0.1.tgz"; + sha1 = "150e65da42bf7742445b958a64eb9b85d1d2b180"; + }; + }; "unzip-response-1.0.2" = { name = "unzip-response"; packageName = "unzip-response"; @@ -25945,15 +26539,6 @@ let sha1 = "d2f0f737d16b0615e72a6935ed04214572d56f97"; }; }; - "upath-1.0.2" = { - name = "upath"; - packageName = "upath"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/upath/-/upath-1.0.2.tgz"; - sha512 = "19nv38v416yy515gbq0lvg549w1m48mg17ibl9jp6g0pzlzg6j3lzygbw3c4ia2i9vk0ij0g4fcwfvsa9snxpgdk4a7qbprnj7s4abw"; - }; - }; "upath-1.0.4" = { name = "upath"; packageName = "upath"; @@ -25990,6 +26575,15 @@ let sha1 = "4e8827a6bb915140ab093559d7014e3ebb837451"; }; }; + "update-notifier-2.4.0" = { + name = "update-notifier"; + packageName = "update-notifier"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.4.0.tgz"; + sha1 = "f9b4c700fbfd4ec12c811587258777d563d8c866"; + }; + }; "update-section-0.3.3" = { name = "update-section"; packageName = "update-section"; @@ -26071,13 +26665,13 @@ let sha1 = "1505a03a289a48cbd7a434efbaeec5055f5633a9"; }; }; - "use-2.0.2" = { + "use-3.1.0" = { name = "use"; packageName = "use"; - version = "2.0.2"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/use/-/use-2.0.2.tgz"; - sha1 = "ae28a0d72f93bf22422a18a2e379993112dec8e8"; + url = "https://registry.npmjs.org/use/-/use-3.1.0.tgz"; + sha512 = "01m2fmv6pc6r5zgjxdb31sx9vhii5ahpwmdn89mpqcvh5f0kpjn6zpmh5qj8m2yhf8s3g6ygwnlccg0j2g36kcjvp16rynbrx048hp9"; }; }; "user-home-1.1.1" = { @@ -26215,22 +26809,22 @@ let sha1 = "ae43eb7745f5fe63dcc2f277cb4164ad27087f30"; }; }; - "utp-native-1.6.2" = { + "utp-native-1.7.0" = { name = "utp-native"; packageName = "utp-native"; - version = "1.6.2"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/utp-native/-/utp-native-1.6.2.tgz"; - sha512 = "2mcnn6w5as2dvz6rj4fb33174z3a1rl9bm2cfazrr4084gq7aal0bkmkwr1cjpkvy1zgni3zdk0570fx7cmnd0k0hg18wfb2hvbigfg"; + url = "https://registry.npmjs.org/utp-native/-/utp-native-1.7.0.tgz"; + sha512 = "1d0ccaz56506y44838shld6zkqx9rcx3cpw5qddbfbyjyjr73704gysrl3qwii6i80kx1i2ysnn8bdx6q0i4biwzjj36ksx2865i0yz"; }; }; - "uue-3.1.1" = { + "uue-3.1.2" = { name = "uue"; packageName = "uue"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/uue/-/uue-3.1.1.tgz"; - sha512 = "29ykgvcsrhwbifm7aa4mf8876c6z2ksc26cnpxf3ljwhg7vfrjz2asvl7ylkjj91alnp2d7n1xvi5qphmn0a1ci091a20mdmnbzg91i"; + url = "https://registry.npmjs.org/uue/-/uue-3.1.2.tgz"; + sha512 = "0pcj6km8jmr85nr0xvnq9nmicnz9a2ysy8bj7s9qxin8c0hzd992bwx8bsnxlmbw02iynqyp0l7a9c7zi2ipqrsfczx5ddhb9fqn4kb"; }; }; "uuid-2.0.3" = { @@ -26611,31 +27205,58 @@ let sha1 = "87239d9e166b2d7352245b8a813597804c1d63aa"; }; }; - "vscode-languageclient-3.5.0" = { + "vscode-jsonrpc-3.6.0" = { + name = "vscode-jsonrpc"; + packageName = "vscode-jsonrpc"; + version = "3.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.6.0.tgz"; + sha512 = "1ikdzcmqhhk38d5kz8izbydm4bwh0hik4n6nwnklb0ygyynqasajzaycxg4cwzy72xag5izw12qknvm4irbz6gws8n7kkz5wj7cg89y"; + }; + }; + "vscode-languageclient-4.0.0" = { name = "vscode-languageclient"; packageName = "vscode-languageclient"; - version = "3.5.0"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-3.5.0.tgz"; - sha1 = "36d02cc186a8365a4467719a290fb200a9ae490a"; + url = "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-4.0.0.tgz"; + sha512 = "26vnna1pgmd2l4al7p76v5jqv5jnbljan1wjqywnn1h4wypx3bilgfnir5xmyj356hyvcikihbj7m030blp0nn9a7cmdmwrws110vf1"; }; }; - "vscode-languageserver-3.5.0" = { + "vscode-languageserver-3.5.1" = { name = "vscode-languageserver"; packageName = "vscode-languageserver"; - version = "3.5.0"; + version = "3.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-3.5.0.tgz"; - sha1 = "d28099bc6ddda8c1dd16b707e454e1b1ddae0dba"; + url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-3.5.1.tgz"; + sha512 = "20rg3b1dymhvnkkxjg481ygy13zg0lg35n5bs4fhwl8f8g3lwy53vnfsxcarjnn6zfjbanq0mllqcqaimbf24n99df327g082ghm1a5"; }; }; - "vscode-languageserver-protocol-3.5.0" = { + "vscode-languageserver-4.0.0" = { + name = "vscode-languageserver"; + packageName = "vscode-languageserver"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-4.0.0.tgz"; + sha512 = "1g2q6pp97pn1vw1qsxw22487iv64qc8vpr3pjjdmb6j6h6r08l2jb8mv1x8zrv42zsy62c9cvjq1qkb74q7xgsigpc4adlx2sfzs63g"; + }; + }; + "vscode-languageserver-protocol-3.5.1" = { name = "vscode-languageserver-protocol"; packageName = "vscode-languageserver-protocol"; - version = "3.5.0"; + version = "3.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.5.0.tgz"; - sha1 = "067c5cbe27709795398d119692c97ebba1452209"; + url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.5.1.tgz"; + sha512 = "1hajzildw9njhvj7psprgaw4kipjfsi0dw6fw1r1a8nk04plns64f5f2rvzxsj1knm9ad55f2x0d4dcivbg2zi5gii5ggq01ciw7wym"; + }; + }; + "vscode-languageserver-protocol-3.6.0" = { + name = "vscode-languageserver-protocol"; + packageName = "vscode-languageserver-protocol"; + version = "3.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.6.0.tgz"; + sha512 = "0qcx36adi340y26hb4smwifvand4xkysgxm7mr5m4ycxbfnx8vd0g2sin9j4p9v2lnrgx47zpshiam95lmm0z4l953vpihh0ian3piw"; }; }; "vscode-languageserver-types-3.5.0" = { @@ -26647,22 +27268,31 @@ let sha1 = "e48d79962f0b8e02de955e3f524908e2b19c0374"; }; }; - "vscode-uri-1.0.1" = { - name = "vscode-uri"; - packageName = "vscode-uri"; - version = "1.0.1"; + "vscode-languageserver-types-3.6.1" = { + name = "vscode-languageserver-types"; + packageName = "vscode-languageserver-types"; + version = "3.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-uri/-/vscode-uri-1.0.1.tgz"; - sha1 = "11a86befeac3c4aa3ec08623651a3c81a6d0bbc8"; + url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.6.1.tgz"; + sha512 = "2ci0g6n2903n20zdbgjbvj3wxn7fh09f9pmbgnwyjjnxwfvmgni244v0k5y31jlv351bdk8cqk4p81wdb9qkyfchxwwqn8lr25vg61n"; }; }; - "walk-2.3.9" = { + "vscode-uri-1.0.3" = { + name = "vscode-uri"; + packageName = "vscode-uri"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-uri/-/vscode-uri-1.0.3.tgz"; + sha1 = "631bdbf716dccab0e65291a8dc25c23232085a52"; + }; + }; + "walk-2.3.13" = { name = "walk"; packageName = "walk"; - version = "2.3.9"; + version = "2.3.13"; src = fetchurl { - url = "https://registry.npmjs.org/walk/-/walk-2.3.9.tgz"; - sha1 = "31b4db6678f2ae01c39ea9fb8725a9031e558a7b"; + url = "https://registry.npmjs.org/walk/-/walk-2.3.13.tgz"; + sha512 = "2g4ayyccqgq4fx68dhds9pwhvj2344n9p0lhb4z1hnsi882apm64s434lqz57rx4b0r1x9w1njfqrywd1la0ljqm7j4xxg8nixqri7g"; }; }; "walk-sync-0.3.2" = { @@ -26683,13 +27313,13 @@ let sha1 = "d1b14f39d2e2cb4ab8c4098f756fe4b164e473d4"; }; }; - "watchpack-1.4.0" = { + "watchpack-1.5.0" = { name = "watchpack"; packageName = "watchpack"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/watchpack/-/watchpack-1.4.0.tgz"; - sha1 = "4a1472bcbb952bd0a9bb4036801f954dfb39faac"; + url = "https://registry.npmjs.org/watchpack/-/watchpack-1.5.0.tgz"; + sha512 = "003dzsqf9q7awjnkv00gwrqw7s8n29y8nmfcmpsl845j2m7rgxxvvd3gld643c92jfwq9yw7ysbaavw9pq1yc5df8yfxmh1sjj64aa5"; }; }; "wcwidth-1.0.1" = { @@ -26719,15 +27349,6 @@ let sha512 = "15gwgjh9anvzcissfhxy3gki7jxn1dy9vq5rma1sgwkbbra8wbxnvimwalgmy8anm33x56mfp492akzhs0gidwmbnadx0ck3fdq23v1"; }; }; - "webpack-3.10.0" = { - name = "webpack"; - packageName = "webpack"; - version = "3.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-3.10.0.tgz"; - sha512 = "0n3rl5qq259csi0x5qh12wzyaypfds5wy0zrzky19wqsa0mjibrn19fdfgbabply2l576vlj8j69nzkb23jqfy6a36xb3cwi1g4l73z"; - }; - }; "webpack-sources-1.1.0" = { name = "webpack-sources"; packageName = "webpack-sources"; @@ -26755,22 +27376,22 @@ let sha512 = "0d1n4yv45ibxf72hj7qka3j7v53dwn58savfiyvsppqhhrgg3g648ykk5v7fpb53hz85kj87m4f45r7d5iazx4yqgs381z6qnfd98cy"; }; }; - "websocket-stream-5.1.1" = { + "websocket-stream-5.1.2" = { name = "websocket-stream"; packageName = "websocket-stream"; - version = "5.1.1"; + version = "5.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/websocket-stream/-/websocket-stream-5.1.1.tgz"; - sha512 = "18iw90ncl6cpip9j7rxdf6mag5klhhn7fklhb5lz41dy3wk9vxp3lxxkmwsnldjk5zfx3fjww55xg47k5k1a4cpph92k7j26p9kk56a"; + url = "https://registry.npmjs.org/websocket-stream/-/websocket-stream-5.1.2.tgz"; + sha512 = "1bq9cabpvsx4b0aajmbhsgkdzh816rrixhbnsmvcr0ypcndhn5zz9fggfc8i4l2s00b6jhif65phkc9l6zvika8ngb21rip9qx4pj4m"; }; }; - "whatwg-fetch-2.0.3" = { + "whatwg-fetch-2.0.4" = { name = "whatwg-fetch"; packageName = "whatwg-fetch"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz"; - sha1 = "9c84ec2dcf68187ff00bc64e1274b442176e1c84"; + url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz"; + sha512 = "2g4p2ymmww4wm7cf86xwpb0dndwlxk1gg3brsrj892a4z593h25hyhqv0rmv4hzz4zxv3smmaflsnhilakfpr6y8f2gf3sfd8ckbi3m"; }; }; "whatwg-url-6.3.0" = { @@ -26890,6 +27511,15 @@ let sha1 = "f45f10d141086c5d94ae14c03b2098440a7e71b0"; }; }; + "win-fork-1.1.1" = { + name = "win-fork"; + packageName = "win-fork"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/win-fork/-/win-fork-1.1.1.tgz"; + sha1 = "8f58e0656fca00adc8c86a2b89e3cd2d6a2d5e5e"; + }; + }; "win-release-1.1.1" = { name = "win-release"; packageName = "win-release"; @@ -27007,13 +27637,13 @@ let sha1 = "3c9349d196207fd1bdff9d4bc43ef72510e3a12e"; }; }; - "winston-2.4.0" = { + "winston-2.4.1" = { name = "winston"; packageName = "winston"; - version = "2.4.0"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-2.4.0.tgz"; - sha1 = "808050b93d52661ed9fb6c26b3f0c826708b0aee"; + url = "https://registry.npmjs.org/winston/-/winston-2.4.1.tgz"; + sha512 = "2m8ya9y2s295czzzd8yffyny528vfnbjlzz4xpix3c5y51yfmczzbh3v1hkj0kmxwr25c7yp3xxz1vz4skbj93n4ir9gxbp6y9q7zwk"; }; }; "with-4.0.3" = { @@ -27061,13 +27691,13 @@ let sha1 = "27584810891456a4171c8d0226441ade90cbcaeb"; }; }; - "worker-farm-1.5.4" = { + "worker-farm-1.6.0" = { name = "worker-farm"; packageName = "worker-farm"; - version = "1.5.4"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/worker-farm/-/worker-farm-1.5.4.tgz"; - sha512 = "3xic3z7f6cga2kaps1ysysq02qljwi534lziz472mvngx097xg4y0fk77qi194akp44dbl8wcinys0mjvwxcrd2rqlgsznw9fa84g11"; + url = "https://registry.npmjs.org/worker-farm/-/worker-farm-1.6.0.tgz"; + sha512 = "1yxyar4li6hnvj884kxg0agx61wsrmqnbqc06r7wy8is6iyhf2czrdgnxx4055c5hwlhhg1y8j72sh35wak9i3996kvbwycfssbf3zb"; }; }; "wrap-ansi-2.1.0" = { @@ -27115,15 +27745,6 @@ let sha512 = "3s89p8x1i16wg1prbm40z7l00611hzk2s7kkvph6fw4cx049p3gpviqmhbgqxxi9pfjz32mx3aj7qsygmfcnvasgs43rj1ynwdd944p"; }; }; - "wrench-1.5.9" = { - name = "wrench"; - packageName = "wrench"; - version = "1.5.9"; - src = fetchurl { - url = "https://registry.npmjs.org/wrench/-/wrench-1.5.9.tgz"; - sha1 = "411691c63a9b2531b1700267279bdeca23b2142a"; - }; - }; "write-0.2.1" = { name = "write"; packageName = "write"; @@ -27277,15 +27898,6 @@ let sha1 = "de3ee912477be2f250b60f612f34a8c4da616efe"; }; }; - "xml-char-classes-1.0.0" = { - name = "xml-char-classes"; - packageName = "xml-char-classes"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/xml-char-classes/-/xml-char-classes-1.0.0.tgz"; - sha1 = "64657848a20ffc5df583a42ad8a277b4512bbc4d"; - }; - }; "xml2js-0.1.14" = { name = "xml2js"; packageName = "xml2js"; @@ -27412,6 +28024,15 @@ let sha1 = "fa6bf762a60a413fb3dd8f4b03c5b269238d308f"; }; }; + "xmldom-0.1.22" = { + name = "xmldom"; + packageName = "xmldom"; + version = "0.1.22"; + src = fetchurl { + url = "https://registry.npmjs.org/xmldom/-/xmldom-0.1.22.tgz"; + sha1 = "10de4e5e964981f03c8cc72fadc08d14b6c3aa26"; + }; + }; "xmldom-0.1.27" = { name = "xmldom"; packageName = "xmldom"; @@ -27584,6 +28205,15 @@ let sha1 = "8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"; }; }; + "yaml-js-0.0.8" = { + name = "yaml-js"; + packageName = "yaml-js"; + version = "0.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/yaml-js/-/yaml-js-0.0.8.tgz"; + sha1 = "87cfa5a9613f48e26005420d6a8ee0da6fe8daec"; + }; + }; "yargs-1.3.3" = { name = "yargs"; packageName = "yargs"; @@ -27593,15 +28223,6 @@ let sha1 = "054de8b61f22eefdb7207059eaef9d6b83fb931a"; }; }; - "yargs-10.0.3" = { - name = "yargs"; - packageName = "yargs"; - version = "10.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-10.0.3.tgz"; - sha512 = "1vn6jsqrhybxddyhmvkh0d43n2lk1z8081glfq80zpjfs4xgwpk0mmgdiry9zgsihmv9a2qidmp5hhyqqq8mzzkr037wla0qd1nk80f"; - }; - }; "yargs-10.1.2" = { name = "yargs"; packageName = "yargs"; @@ -27611,6 +28232,24 @@ let sha512 = "25gvc8vjalpbv69v0frmh10x203dsnl0jrnx8c2mww3qrxl69kms5ppzry3lp51lgaby524hc6qa80kgrz0zcdvas8flq26l33aix4a"; }; }; + "yargs-11.0.0" = { + name = "yargs"; + packageName = "yargs"; + version = "11.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-11.0.0.tgz"; + sha512 = "03n9lfnyx1dfj5sm811f3d96djsr6fixd5qi6cl6wj8xf0y01sgn7w3ynv5gn2vl30dwq5mz2hw5f522v8xbwc8m9h6nf8hqsa7wfj6"; + }; + }; + "yargs-11.1.0" = { + name = "yargs"; + packageName = "yargs"; + version = "11.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-11.1.0.tgz"; + sha512 = "3j5awbfcbh8ik0kz01mycydpi1bz9fg70xc66lk1r1qvrs5x41i2w8nvgj0aip7z9vypcsxks76z75sz4lr6z3ida9c04inkvsbl19p"; + }; + }; "yargs-3.10.0" = { name = "yargs"; packageName = "yargs"; @@ -27728,6 +28367,15 @@ let sha512 = "0jyff04yy5xlrgvccky4f7phgp99lk2r1n7dk67hkb0picdjpa2ap27g4jrm94cw1d31vw8sh2b5cvnvga2w838bgh6l1kwld1bmzy8"; }; }; + "yargs-parser-9.0.2" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "9.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-9.0.2.tgz"; + sha1 = "9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077"; + }; + }; "yauzl-2.4.1" = { name = "yauzl"; packageName = "yauzl"; @@ -27773,22 +28421,22 @@ let sha1 = "94ab784896a64f53a9fac452d5e9133e2750a236"; }; }; - "yeoman-environment-2.0.5" = { + "yeoman-environment-2.0.6" = { name = "yeoman-environment"; packageName = "yeoman-environment"; - version = "2.0.5"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.0.5.tgz"; - sha512 = "3kfwj39dplgp9w79zmk9p5hm4dfw21304srx68f0hzxhak45iql4j8gzxj4l3q9p4jcmwf25ar0ak4sm57rzx46bv4z2f3q3vybpxgb"; + url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.0.6.tgz"; + sha512 = "0z4544lfc7gzyp98fihqwi42p0j2dqwgrcl99i1d0b04qkslfv3im5r0xvp8rvapiqlwjg48b63kr5p1japcz3548wg445w7i6w2ccg"; }; }; - "yosay-2.0.1" = { + "yosay-2.0.2" = { name = "yosay"; packageName = "yosay"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/yosay/-/yosay-2.0.1.tgz"; - sha512 = "1n6z65vkm1r31a1ms8wn32m9q61vrlz9isn43lm00qka1zvnich78zbnp29xwy72z361is2yimrpglmc55w97hbi9pas5pqlnvqbpw4"; + url = "https://registry.npmjs.org/yosay/-/yosay-2.0.2.tgz"; + sha512 = "1n24pfz9fc1pd1p1cc2bl3jy6nb9xxbqadmzx3grims5xmk9r64xy98ybnim6wwz4kj3z91qc391v785s4876ki6749xcly7ngzmxba"; }; }; "zen-observable-0.5.2" = { @@ -27886,11 +28534,11 @@ in sources."brace-expansion-1.1.11" sources."chalk-1.1.3" sources."chmodr-1.0.2" - sources."colors-1.1.2" - sources."commander-2.14.1" + sources."colors-1.2.1" + sources."commander-2.15.1" sources."concat-map-0.0.1" sources."convert-source-map-1.5.1" - sources."core-js-2.5.3" + sources."core-js-2.5.4" sources."deasync-0.1.12" sources."debug-2.6.9" sources."detect-indent-4.0.0" @@ -27913,7 +28561,7 @@ in sources."home-or-tmp-2.0.0" sources."homedir-polyfill-1.0.1" sources."ini-1.3.5" - sources."invariant-2.2.3" + sources."invariant-2.2.4" sources."is-3.2.1" sources."is-finite-1.0.2" sources."is-windows-1.0.2" @@ -27937,7 +28585,7 @@ in sources."mkdirp-0.5.1" sources."moment-2.20.1" sources."ms-2.0.0" - sources."nan-2.9.2" + sources."nan-2.10.0" sources."node.extend-2.0.0" sources."nomnom-1.8.1" sources."number-is-nan-1.0.1" @@ -27950,7 +28598,7 @@ in sources."private-0.1.8" sources."regenerator-runtime-0.11.1" sources."repeating-2.0.1" - sources."resolve-1.5.0" + sources."resolve-1.6.0" sources."sax-0.5.8" sources."slash-1.0.0" sources."source-map-0.6.1" @@ -27979,10 +28627,10 @@ in asar = nodeEnv.buildNodePackage { name = "asar"; packageName = "asar"; - version = "0.14.2"; + version = "0.14.3"; src = fetchurl { - url = "https://registry.npmjs.org/asar/-/asar-0.14.2.tgz"; - sha512 = "1s03v9h1823r1y95jgrdnf4b2hj56gdi879kq29lv7q59hnn530q6g32qakjj8d6lzjx52r5qvg30szdi1fkvj3zx1dgaq30k5kiakq"; + url = "https://registry.npmjs.org/asar/-/asar-0.14.3.tgz"; + sha512 = "1p102lrikvbx1rrp8b1d47fif3qwz2487q4djgnf6288hjk8gf2nxcinwzixkfh0dw0zy7mbv1przwg4zcnpgv7wpsbnqg6a1anf4zs"; }; dependencies = [ sources."abbrev-1.1.1" @@ -28003,7 +28651,7 @@ in sources."chromium-pickle-js-0.2.0" sources."co-4.6.0" sources."combined-stream-1.0.6" - sources."commander-2.14.1" + sources."commander-2.15.1" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" (sources."cryptiles-3.1.2" // { @@ -28065,11 +28713,11 @@ in sources."q-1.5.1" sources."qs-6.5.1" sources."readable-stream-1.1.14" - sources."request-2.83.0" + sources."request-2.85.0" sources."rimraf-2.6.2" sources."safe-buffer-5.1.1" sources."sntp-2.1.0" - sources."sshpk-1.13.1" + sources."sshpk-1.14.1" sources."string_decoder-0.10.31" sources."stringstream-0.0.5" sources."tmp-0.0.28" @@ -28098,15 +28746,15 @@ in azure-cli = nodeEnv.buildNodePackage { name = "azure-cli"; packageName = "azure-cli"; - version = "0.10.17"; + version = "0.10.18"; src = fetchurl { - url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.17.tgz"; - sha1 = "e991dfa17dc5d7d91731180851fd9cbfbadf73c3"; + url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.18.tgz"; + sha512 = "05k876g0s9ac53vrqqcn5h2l6s9ccawihr29gxvj8fib49qg2mhf1v52277r2wgcjxibj7vq2b3zp2jkp0vwd6d1pkv8alwf84ri6wc"; }; dependencies = [ sources."@types/caseless-0.12.1" sources."@types/form-data-2.2.1" - sources."@types/node-8.9.4" + sources."@types/node-8.10.1" sources."@types/request-2.47.0" sources."@types/tough-cookie-2.3.2" sources."@types/uuid-3.4.3" @@ -28173,7 +28821,7 @@ in sources."azure-arm-hdinsight-jobs-0.1.0" sources."azure-arm-insights-0.11.3" sources."azure-arm-iothub-1.0.1-preview" - sources."azure-arm-network-4.0.1" + sources."azure-arm-network-5.1.0" (sources."azure-arm-powerbiembedded-0.1.0" // { dependencies = [ sources."async-0.2.7" @@ -28280,16 +28928,17 @@ in sources."brace-expansion-1.1.11" sources."browserify-mime-1.2.9" sources."buffer-equal-constant-time-1.0.1" + sources."buffer-from-1.0.0" sources."caller-id-0.1.0" sources."caseless-0.12.0" sources."chalk-0.4.0" - sources."clone-1.0.3" + sources."clone-1.0.4" sources."co-4.6.0" sources."colors-1.1.2" sources."combined-stream-1.0.6" sources."commander-1.0.4" sources."concat-map-0.0.1" - sources."concat-stream-1.6.0" + sources."concat-stream-1.6.2" sources."core-util-is-1.0.2" (sources."cryptiles-3.1.2" // { dependencies = [ @@ -28370,7 +29019,7 @@ in sources."jws-3.1.4" sources."jwt-decode-2.2.0" sources."keypress-0.1.0" - (sources."kuduscript-1.0.15" // { + (sources."kuduscript-1.0.16" // { dependencies = [ sources."commander-1.1.1" sources."streamline-0.4.11" @@ -28384,21 +29033,21 @@ in sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."moment-2.20.1" - (sources."ms-rest-2.3.1" // { + sources."moment-2.22.0" + (sources."ms-rest-2.3.2" // { dependencies = [ sources."extend-3.0.1" - sources."request-2.83.0" + sources."request-2.85.0" sources."through-2.3.8" sources."tunnel-0.0.5" ]; }) - (sources."ms-rest-azure-2.5.4" // { + (sources."ms-rest-azure-2.5.5" // { dependencies = [ - sources."@types/node-9.4.6" - (sources."adal-node-0.1.27" // { + sources."@types/node-9.6.1" + (sources."adal-node-0.1.28" // { dependencies = [ - sources."@types/node-8.9.4" + sources."@types/node-8.10.1" ]; }) sources."async-2.6.0" @@ -28453,7 +29102,7 @@ in sources."boom-2.10.1" sources."caseless-0.11.0" sources."chalk-1.1.3" - sources."commander-2.14.1" + sources."commander-2.15.1" sources."cryptiles-2.0.5" sources."extend-3.0.1" sources."form-data-1.0.1" @@ -28480,7 +29129,7 @@ in sources."asn1-0.1.11" ]; }) - sources."sshpk-1.13.1" + sources."sshpk-1.14.1" sources."stack-trace-0.0.10" sources."stream-combiner-0.0.4" sources."streamline-0.10.17" @@ -28493,7 +29142,7 @@ in dependencies = [ sources."caseless-0.11.0" sources."process-nextick-args-2.0.0" - sources."readable-stream-2.3.4" + sources."readable-stream-2.3.5" sources."string_decoder-1.0.3" ]; }) @@ -28539,10 +29188,10 @@ in bower = nodeEnv.buildNodePackage { name = "bower"; packageName = "bower"; - version = "1.8.2"; + version = "1.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/bower/-/bower-1.8.2.tgz"; - sha1 = "adf53529c8d4af02ef24fb8d5341c1419d33e2f7"; + url = "https://registry.npmjs.org/bower/-/bower-1.8.4.tgz"; + sha1 = "e7876a076deb8137f7d06525dc5e8c66db82f28a"; }; buildInputs = globalBuildInputs; meta = { @@ -28565,7 +29214,7 @@ in sources."argparse-1.0.4" sources."array-find-index-1.0.2" sources."balanced-match-1.0.0" - sources."bower-1.8.2" + sources."bower-1.8.4" sources."bower-endpoint-parser-0.2.1" sources."bower-json-0.6.0" sources."bower-logger-0.2.1" @@ -28597,7 +29246,7 @@ in sources."get-stdin-4.0.1" sources."glob-6.0.4" sources."graceful-fs-3.0.11" - sources."hosted-git-info-2.5.0" + sources."hosted-git-info-2.6.0" sources."indent-string-2.1.0" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -28619,7 +29268,7 @@ in sources."minimist-1.2.0" sources."mkdirp-0.5.1" sources."ms-2.0.0" - sources."natives-1.1.1" + sources."natives-1.1.2" sources."normalize-package-data-2.4.0" sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" @@ -28675,13 +29324,12 @@ in browserify = nodeEnv.buildNodePackage { name = "browserify"; packageName = "browserify"; - version = "16.1.0"; + version = "16.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/browserify/-/browserify-16.1.0.tgz"; - sha512 = "356pxbnfj5skk2jkc36m9qma51v9f2cf3km9rbvblhdzv1jlpdhppm0ggi42ifmq2knlfg5jcvif4pqlxfkfjrs27x3adz5s0naa14g"; + url = "https://registry.npmjs.org/browserify/-/browserify-16.1.1.tgz"; + sha512 = "01ay1w7sndfvwjdc5n7sa9a4yzzrwdr8agj1655dz50f0g034scaqli9v1dngxasi8gk8gqvqcsqnmphvwkj1y6awlq1y5l6bbgc8c9"; }; dependencies = [ - sources."@browserify/acorn5-object-spread-5.0.1" sources."JSONStream-1.3.2" sources."acorn-4.0.13" sources."acorn-node-1.3.0" @@ -28696,7 +29344,7 @@ in sources."bn.js-4.11.8" sources."brace-expansion-1.1.11" sources."brorand-1.1.0" - sources."browser-pack-6.0.4" + sources."browser-pack-6.1.0" (sources."browser-resolve-1.11.2" // { dependencies = [ sources."resolve-1.1.7" @@ -28709,13 +29357,14 @@ in sources."browserify-sign-4.0.4" sources."browserify-zlib-0.2.0" sources."buffer-5.1.0" + sources."buffer-from-1.0.0" sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" sources."cached-path-relative-1.0.1" sources."cipher-base-1.0.4" sources."combine-source-map-0.8.0" sources."concat-map-0.0.1" - sources."concat-stream-1.6.0" + sources."concat-stream-1.6.2" sources."console-browserify-1.1.0" sources."constants-browserify-1.0.0" sources."convert-source-map-1.1.3" @@ -28732,7 +29381,7 @@ in sources."defined-1.0.0" sources."deps-sort-2.0.0" sources."des.js-1.0.0" - sources."detective-5.0.2" + sources."detective-5.1.0" sources."diffie-hellman-5.0.2" sources."domain-browser-1.2.0" sources."duplexer2-0.1.4" @@ -28748,29 +29397,18 @@ in sources."hmac-drbg-1.0.1" sources."htmlescape-1.1.1" sources."https-browserify-1.0.0" - sources."ieee754-1.1.8" + sources."ieee754-1.1.11" sources."indexof-0.0.1" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."inline-source-map-0.6.2" - (sources."insert-module-globals-7.0.1" // { - dependencies = [ - sources."combine-source-map-0.7.2" - sources."concat-stream-1.5.2" - sources."readable-stream-2.0.6" - sources."string_decoder-0.10.31" - ]; - }) + sources."insert-module-globals-7.0.5" sources."is-buffer-1.1.6" - sources."isarray-1.0.0" + sources."isarray-2.0.4" sources."json-stable-stringify-0.0.1" sources."jsonify-0.0.0" sources."jsonparse-1.3.1" - (sources."labeled-stream-splicer-2.0.0" // { - dependencies = [ - sources."isarray-0.0.1" - ]; - }) + sources."labeled-stream-splicer-2.0.1" sources."lexical-scope-1.2.0" sources."lodash.memoize-3.0.4" sources."md5.js-1.3.4" @@ -28780,9 +29418,10 @@ in sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - (sources."module-deps-6.0.0" // { + (sources."module-deps-6.0.2" // { dependencies = [ - sources."acorn-5.5.0" + sources."acorn-5.5.3" + sources."minimist-1.2.0" ]; }) sources."once-1.4.0" @@ -28796,7 +29435,7 @@ in sources."path-platform-0.11.15" sources."pbkdf2-3.0.14" sources."process-0.11.10" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."public-encrypt-4.0.0" sources."punycode-1.4.1" sources."querystring-0.2.0" @@ -28804,21 +29443,21 @@ in sources."randombytes-2.0.6" sources."randomfill-1.0.4" sources."read-only-stream-2.0.0" - (sources."readable-stream-2.3.4" // { + (sources."readable-stream-2.3.5" // { dependencies = [ - sources."process-nextick-args-2.0.0" + sources."isarray-1.0.0" ]; }) - sources."resolve-1.5.0" + sources."resolve-1.6.0" sources."ripemd160-2.0.1" sources."safe-buffer-5.1.1" - sources."sha.js-2.4.10" + sources."sha.js-2.4.11" sources."shasum-1.0.2" sources."shell-quote-1.6.1" sources."source-map-0.5.7" sources."stream-browserify-2.0.1" sources."stream-combiner2-1.1.1" - sources."stream-http-2.8.0" + sources."stream-http-2.8.1" sources."stream-splicer-2.0.0" sources."string_decoder-1.0.3" (sources."subarg-1.0.0" // { @@ -28826,18 +29465,14 @@ in sources."minimist-1.2.0" ]; }) - (sources."syntax-error-1.4.0" // { - dependencies = [ - sources."acorn-5.5.0" - ]; - }) + sources."syntax-error-1.4.0" sources."through-2.3.8" sources."through2-2.0.3" sources."timers-browserify-1.4.2" sources."to-arraybuffer-1.0.1" sources."tty-browserify-0.0.1" sources."typedarray-0.0.6" - sources."umd-3.0.1" + sources."umd-3.0.3" (sources."url-0.11.0" // { dependencies = [ sources."punycode-1.3.2" @@ -28884,8 +29519,8 @@ in sources."async-0.2.10" sources."aws-sign-0.2.0" sources."balanced-match-1.0.0" - sources."base64-js-1.2.0" - sources."bencode-1.0.0" + sources."base64-js-1.2.3" + sources."bencode-2.0.0" sources."bitfield-0.1.0" sources."bittorrent-dht-6.4.2" sources."bittorrent-tracker-7.7.0" @@ -28894,9 +29529,12 @@ in sources."bncode-0.5.3" sources."boom-0.3.8" sources."brace-expansion-1.1.11" + sources."buffer-alloc-1.1.0" sources."buffer-alloc-unsafe-1.0.0" sources."buffer-equal-0.0.1" sources."buffer-equals-1.0.4" + sources."buffer-fill-0.1.1" + sources."buffer-from-1.0.0" sources."bufferview-1.0.1" sources."builtin-modules-1.1.1" sources."bytebuffer-3.5.5" @@ -28913,10 +29551,10 @@ in sources."codepage-1.4.0" sources."colour-0.7.1" sources."combined-stream-0.0.7" - sources."commander-2.14.1" + sources."commander-2.15.1" sources."compact2string-1.4.0" sources."concat-map-0.0.1" - sources."concat-stream-1.6.0" + sources."concat-stream-1.6.2" sources."cookie-jar-0.2.0" sources."core-util-is-1.0.2" sources."cryptiles-0.1.3" @@ -28963,7 +29601,7 @@ in sources."hat-0.0.3" sources."hawk-0.10.2" sources."hoek-0.7.6" - sources."hosted-git-info-2.5.0" + sources."hosted-git-info-2.6.0" sources."immediate-chunk-store-1.0.8" sources."indent-string-2.1.0" sources."inflight-1.0.6" @@ -28987,11 +29625,11 @@ in sources."k-bucket-0.6.0" (sources."k-rpc-3.7.0" // { dependencies = [ - sources."bencode-1.0.0" + sources."bencode-2.0.0" sources."k-bucket-2.0.1" ]; }) - sources."k-rpc-socket-1.7.2" + sources."k-rpc-socket-1.8.0" sources."keypress-0.2.1" sources."load-json-file-1.1.0" sources."lodash-3.10.1" @@ -29026,12 +29664,12 @@ in sources."pad-0.0.5" sources."parse-json-2.2.0" sources."parse-torrent-5.8.3" - sources."parse-torrent-file-4.0.3" + sources."parse-torrent-file-4.1.0" sources."path-exists-2.1.0" sources."path-is-absolute-1.0.1" sources."path-type-1.1.0" - sources."peer-wire-protocol-0.7.0" - (sources."peer-wire-swarm-0.12.1" // { + sources."peer-wire-protocol-0.7.1" + (sources."peer-wire-swarm-0.12.2" // { dependencies = [ sources."bncode-0.2.3" ]; @@ -29039,6 +29677,7 @@ in (sources."peerflix-0.34.0" // { dependencies = [ sources."bencode-0.7.0" + sources."buffer-alloc-unsafe-0.1.1" sources."debug-3.1.0" sources."end-of-stream-0.1.5" sources."get-stdin-5.0.1" @@ -29048,7 +29687,7 @@ in sources."object-assign-4.1.1" sources."once-1.2.0" sources."parse-torrent-file-2.1.4" - sources."readable-stream-2.3.4" + sources."readable-stream-2.3.5" sources."safe-buffer-5.0.1" sources."string_decoder-1.0.3" sources."thirty-two-0.0.2" @@ -29069,7 +29708,7 @@ in sources."supports-color-0.2.0" ]; }) - sources."plist-2.1.0" + sources."plist-3.0.1" sources."process-nextick-args-2.0.0" sources."promiscuous-0.6.0" sources."protobufjs-3.8.2" @@ -29106,8 +29745,8 @@ in sources."request-2.16.6" sources."rimraf-2.6.2" sources."router-0.6.2" - sources."run-parallel-1.1.7" - sources."run-series-1.1.4" + sources."run-parallel-1.1.8" + sources."run-series-1.1.6" sources."rusha-0.8.13" sources."rx-2.5.3" sources."safe-buffer-5.1.1" @@ -29133,7 +29772,7 @@ in (sources."srt2vtt-1.3.1" // { dependencies = [ sources."isarray-1.0.0" - sources."readable-stream-2.3.4" + sources."readable-stream-2.3.5" sources."string_decoder-1.0.3" ]; }) @@ -29155,7 +29794,7 @@ in ]; }) sources."torrent-piece-1.1.1" - (sources."torrent-stream-1.0.3" // { + (sources."torrent-stream-1.0.4" // { dependencies = [ sources."bencode-0.8.0" sources."debug-2.6.9" @@ -29181,12 +29820,8 @@ in sources."wrap-fn-0.1.5" sources."wrappy-1.0.2" sources."ws-1.1.5" - (sources."xml2js-0.4.19" // { - dependencies = [ - sources."xmlbuilder-9.0.7" - ]; - }) - sources."xmlbuilder-8.2.2" + sources."xml2js-0.4.19" + sources."xmlbuilder-9.0.7" sources."xmldom-0.1.27" sources."xspfr-0.3.1" sources."xtend-4.0.1" @@ -29203,10 +29838,10 @@ in clean-css = nodeEnv.buildNodePackage { name = "clean-css"; packageName = "clean-css"; - version = "4.1.9"; + version = "4.1.11"; src = fetchurl { - url = "https://registry.npmjs.org/clean-css/-/clean-css-4.1.9.tgz"; - sha1 = "35cee8ae7687a49b98034f70de00c4edd3826301"; + url = "https://registry.npmjs.org/clean-css/-/clean-css-4.1.11.tgz"; + sha1 = "2ecdf145aba38f54740f26cefd0ff3e03e125d6a"; }; dependencies = [ sources."source-map-0.5.7" @@ -29247,17 +29882,17 @@ in }; dependencies = [ sources."ansi-regex-2.1.1" - sources."ansi-styles-3.2.0" + sources."ansi-styles-3.2.1" sources."axios-0.17.1" - sources."chalk-2.3.1" + sources."chalk-2.3.2" sources."cli-cursor-2.1.0" - sources."cli-spinners-1.1.0" + sources."cli-spinners-1.3.0" sources."cli-table2-0.2.0" sources."code-point-at-1.1.0" sources."color-convert-1.9.1" sources."color-name-1.1.3" - sources."colors-1.1.2" - sources."commander-2.14.1" + sources."colors-1.2.1" + sources."commander-2.15.1" sources."debug-3.1.0" sources."escape-string-regexp-1.0.5" sources."follow-redirects-1.4.1" @@ -29276,7 +29911,7 @@ in sources."signal-exit-3.0.2" sources."string-width-1.0.2" sources."strip-ansi-3.0.1" - sources."supports-color-5.2.0" + sources."supports-color-5.3.0" ]; buildInputs = globalBuildInputs; meta = { @@ -29310,7 +29945,7 @@ in sources."stack-trace-0.0.10" sources."statsd-parser-0.0.4" sources."strftime-0.10.0" - sources."winston-2.4.0" + sources."winston-2.4.1" ]; buildInputs = globalBuildInputs; meta = { @@ -29332,8 +29967,8 @@ in dependencies = [ sources."JSONStream-1.3.2" sources."abbrev-1.1.1" - sources."accepts-1.3.4" - sources."acorn-5.5.0" + sources."accepts-1.3.5" + sources."acorn-5.5.3" sources."acorn-node-1.3.0" sources."aliasify-2.1.0" sources."ansi-0.3.1" @@ -29356,7 +29991,7 @@ in sources."balanced-match-1.0.0" sources."base64-js-0.0.8" sources."bcrypt-pbkdf-1.0.1" - sources."big-integer-1.6.26" + sources."big-integer-1.6.27" sources."block-stream-0.0.9" sources."bn.js-4.11.8" (sources."body-parser-1.18.2" // { @@ -29369,7 +30004,7 @@ in sources."bplist-parser-0.1.1" sources."brace-expansion-1.1.11" sources."brorand-1.1.0" - sources."browser-pack-6.0.4" + sources."browser-pack-6.1.0" (sources."browser-resolve-1.11.2" // { dependencies = [ sources."resolve-1.1.7" @@ -29388,6 +30023,7 @@ in sources."browserify-transform-tools-1.7.0" sources."browserify-zlib-0.1.4" sources."buffer-5.1.0" + sources."buffer-from-1.0.0" sources."buffer-xor-1.0.3" sources."builtin-modules-1.1.1" sources."builtin-status-codes-3.0.0" @@ -29402,7 +30038,7 @@ in sources."code-point-at-1.1.0" sources."combine-source-map-0.8.0" sources."combined-stream-1.0.6" - sources."commander-2.14.1" + sources."commander-2.15.1" sources."compressible-2.0.13" sources."compression-1.7.2" sources."concat-map-0.0.1" @@ -29431,15 +30067,14 @@ in }) (sources."cordova-js-4.2.2" // { dependencies = [ - sources."acorn-5.5.0" - sources."isarray-0.0.1" + sources."acorn-5.5.3" + sources."isarray-2.0.4" ]; }) (sources."cordova-lib-8.0.0" // { dependencies = [ sources."acorn-4.0.13" sources."base64-js-1.2.3" - sources."combine-source-map-0.7.2" sources."glob-7.1.1" sources."hash-base-2.0.2" sources."isarray-1.0.0" @@ -29496,7 +30131,7 @@ in sources."domain-browser-1.1.7" sources."dot-prop-3.0.0" sources."duplexer2-0.1.4" - sources."duplexify-3.5.3" + sources."duplexify-3.5.4" sources."ecc-jsbn-0.1.1" sources."editor-1.0.0" sources."ee-first-1.1.1" @@ -29510,12 +30145,12 @@ in sources."events-1.1.1" sources."evp_bytestokey-1.0.3" sources."exit-hook-1.1.1" - sources."express-4.16.2" + sources."express-4.16.3" sources."extend-3.0.1" sources."extsprintf-1.3.0" sources."falafel-2.1.0" sources."figures-1.7.0" - sources."finalhandler-1.1.0" + sources."finalhandler-1.1.1" sources."foreach-2.0.5" sources."forever-agent-0.6.1" sources."form-data-2.1.4" @@ -29538,27 +30173,27 @@ in sources."hawk-3.1.3" sources."hmac-drbg-1.0.1" sources."hoek-2.16.3" - sources."hosted-git-info-2.5.0" + sources."hosted-git-info-2.6.0" sources."htmlescape-1.1.1" - (sources."http-errors-1.6.2" // { - dependencies = [ - sources."depd-1.1.1" - ]; - }) + sources."http-errors-1.6.3" sources."http-signature-1.1.1" sources."https-browserify-1.0.0" sources."iconv-lite-0.4.19" - sources."ieee754-1.1.8" + sources."ieee754-1.1.11" sources."imurmurhash-0.1.4" sources."indexof-0.0.1" sources."infinity-agent-2.0.3" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.5" - sources."init-package-json-1.10.1" + sources."init-package-json-1.10.3" sources."inline-source-map-0.6.2" sources."inquirer-0.10.1" - sources."insert-module-globals-7.0.1" + (sources."insert-module-globals-7.0.5" // { + dependencies = [ + sources."concat-stream-1.6.2" + ]; + }) (sources."insight-0.8.4" // { dependencies = [ (sources."configstore-1.4.0" // { @@ -29585,11 +30220,11 @@ in sources."is-redirect-1.0.0" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" - sources."is-url-1.2.2" + sources."is-url-1.2.4" sources."isarray-0.0.1" sources."isstream-0.1.2" sources."jsbn-0.1.1" - sources."json-parse-better-errors-1.0.1" + sources."json-parse-better-errors-1.0.2" sources."json-schema-0.2.3" sources."json-stable-stringify-0.0.1" sources."json-stringify-safe-5.0.1" @@ -29601,14 +30236,14 @@ in sources."assert-plus-1.0.0" ]; }) - sources."labeled-stream-splicer-2.0.0" + sources."labeled-stream-splicer-2.0.1" sources."latest-version-1.0.1" sources."lexical-scope-1.2.0" sources."lodash-3.10.1" sources."lodash._getnative-3.9.1" sources."lodash.debounce-3.1.1" sources."lodash.memoize-3.0.4" - sources."lowercase-keys-1.0.0" + sources."lowercase-keys-1.0.1" sources."md5.js-1.3.4" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" @@ -29629,7 +30264,7 @@ in sources."nested-error-stacks-1.0.2" sources."nopt-3.0.1" sources."normalize-package-data-2.4.0" - sources."npm-package-arg-5.1.2" + sources."npm-package-arg-6.0.0" sources."number-is-nan-1.0.1" sources."oauth-sign-0.8.2" sources."object-assign-4.1.1" @@ -29676,19 +30311,24 @@ in sources."randombytes-2.0.6" sources."randomfill-1.0.4" sources."range-parser-1.2.0" - sources."raw-body-2.3.2" - sources."rc-1.2.5" + (sources."raw-body-2.3.2" // { + dependencies = [ + sources."depd-1.1.1" + sources."http-errors-1.6.2" + ]; + }) + sources."rc-1.2.6" sources."read-1.0.7" sources."read-all-stream-3.1.0" sources."read-only-stream-2.0.0" - sources."read-package-json-2.0.12" - sources."readable-stream-2.3.4" + sources."read-package-json-2.0.13" + sources."readable-stream-2.3.5" sources."readline2-1.0.1" sources."rechoir-0.6.2" sources."registry-url-3.1.0" sources."repeating-1.1.3" sources."request-2.79.0" - sources."resolve-1.5.0" + sources."resolve-1.6.0" sources."restore-cursor-1.0.1" sources."rimraf-2.6.2" sources."ripemd160-2.0.1" @@ -29698,10 +30338,10 @@ in sources."sax-0.3.5" sources."semver-5.5.0" sources."semver-diff-2.1.0" - sources."send-0.16.1" - sources."serve-static-1.13.1" + sources."send-0.16.2" + sources."serve-static-1.13.2" sources."setprototypeof-1.1.0" - sources."sha.js-2.4.10" + sources."sha.js-2.4.11" sources."shasum-1.0.2" sources."shell-quote-1.6.1" sources."shelljs-0.5.3" @@ -29714,20 +30354,20 @@ in sources."spdx-exceptions-2.1.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.0" - (sources."sshpk-1.13.1" // { + (sources."sshpk-1.14.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) - sources."statuses-1.3.1" + sources."statuses-1.4.0" sources."stream-browserify-2.0.1" sources."stream-buffers-2.2.0" sources."stream-combiner2-1.1.1" - sources."stream-http-2.8.0" + sources."stream-http-2.8.1" sources."stream-shift-1.0.0" sources."stream-splicer-2.0.0" sources."string-length-1.0.1" - sources."string.prototype.codepointat-0.2.0" + sources."string.prototype.codepointat-0.2.1" sources."string_decoder-1.0.3" sources."stringstream-0.0.5" sources."strip-ansi-3.0.1" @@ -29747,7 +30387,7 @@ in sources."tweetnacl-0.14.5" sources."type-is-1.6.16" sources."typedarray-0.0.6" - sources."umd-3.0.1" + sources."umd-3.0.3" sources."underscore-1.8.3" sources."unorm-1.4.1" sources."unpipe-1.0.0" @@ -29808,7 +30448,7 @@ in sha1 = "19cc3eda322160fd3f7232af1cb2a360e898a2e9"; }; dependencies = [ - sources."clone-2.1.1" + sources."clone-2.1.2" sources."parserlib-1.1.1" ]; buildInputs = globalBuildInputs; @@ -29831,9 +30471,9 @@ in dependencies = [ sources."abstract-random-access-1.1.2" sources."ajv-5.5.2" - sources."ansi-diff-stream-1.2.0" + sources."ansi-diff-stream-1.2.1" sources."ansi-regex-3.0.0" - sources."ansi-styles-3.2.0" + sources."ansi-styles-3.2.1" sources."anymatch-1.3.2" sources."ap-0.1.0" sources."append-tree-2.4.1" @@ -29867,23 +30507,28 @@ in sources."kind-of-4.0.0" ]; }) + sources."buffer-alloc-1.1.0" + sources."buffer-alloc-unsafe-1.0.0" sources."buffer-equals-1.0.4" + sources."buffer-fill-0.1.1" + sources."buffer-from-1.0.0" sources."buffer-indexof-1.1.1" - sources."bulk-write-stream-1.1.3" + sources."bulk-write-stream-1.1.4" sources."bytes-3.0.0" sources."call-me-maybe-1.0.1" sources."caseless-0.12.0" - sources."chalk-2.3.1" + sources."chalk-2.3.2" + sources."circular-append-file-1.0.1" sources."cli-truncate-1.1.0" sources."cliclopts-1.1.1" sources."co-4.6.0" - sources."codecs-1.2.0" + sources."codecs-1.2.1" sources."color-convert-1.9.1" sources."color-name-1.1.3" - sources."colors-1.1.2" + sources."colors-1.2.1" sources."combined-stream-1.0.6" sources."concat-map-0.0.1" - sources."concat-stream-1.6.0" + sources."concat-stream-1.6.2" sources."connections-1.4.2" sources."content-types-0.1.0" sources."core-util-is-1.0.2" @@ -29899,13 +30544,16 @@ in (sources."dat-doctor-1.3.1" // { dependencies = [ sources."debug-2.6.9" + sources."dns-packet-1.3.1" + sources."dns-socket-1.6.3" sources."lru-2.0.1" + sources."multicast-dns-6.2.3" sources."pump-1.0.3" ]; }) sources."dat-encoding-5.0.1" - sources."dat-ignore-2.0.0" - (sources."dat-json-1.0.1" // { + sources."dat-ignore-2.1.1" + (sources."dat-json-1.0.2" // { dependencies = [ sources."dat-encoding-4.0.2" sources."debug-2.6.9" @@ -29923,6 +30571,7 @@ in }) (sources."dat-node-3.5.8" // { dependencies = [ + sources."buffer-alloc-unsafe-0.1.1" sources."minimist-0.0.8" sources."process-nextick-args-1.0.7" sources."pump-1.0.3" @@ -29939,18 +30588,27 @@ in sources."deep-equal-0.2.2" sources."delayed-stream-1.0.0" sources."directory-index-html-2.1.0" - sources."discovery-channel-5.4.7" + (sources."discovery-channel-5.5.1" // { + dependencies = [ + sources."pump-3.0.0" + ]; + }) (sources."discovery-swarm-4.4.2" // { dependencies = [ + (sources."dns-discovery-6.1.0" // { + dependencies = [ + sources."thunky-1.0.2" + ]; + }) sources."thunky-0.1.0" ]; }) sources."dns-discovery-5.6.1" - sources."dns-packet-1.3.1" - sources."dns-socket-1.6.3" + sources."dns-packet-4.1.1" + sources."dns-socket-3.0.0" sources."dns-txt-2.0.2" sources."dom-walk-0.1.1" - sources."duplexify-3.5.3" + sources."duplexify-3.5.4" sources."ecc-jsbn-0.1.1" sources."end-of-stream-1.4.1" sources."escape-string-regexp-1.0.5" @@ -29985,12 +30643,12 @@ in sources."hoek-4.2.1" sources."http-methods-0.1.0" sources."http-signature-1.2.0" - (sources."hypercore-6.12.2" // { + (sources."hypercore-6.12.7" // { dependencies = [ sources."varint-5.0.0" ]; }) - sources."hypercore-protocol-6.5.2" + sources."hypercore-protocol-6.6.4" (sources."hyperdrive-9.12.3" // { dependencies = [ sources."varint-4.0.1" @@ -30026,8 +30684,13 @@ in sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" sources."k-bucket-3.3.1" - sources."k-rpc-4.2.1" - sources."k-rpc-socket-1.7.2" + (sources."k-rpc-4.3.1" // { + dependencies = [ + sources."bencode-2.0.0" + sources."k-bucket-4.0.0" + ]; + }) + sources."k-rpc-socket-1.8.0" sources."kind-of-3.2.2" sources."last-one-wins-1.0.4" sources."length-prefixed-message-3.0.3" @@ -30047,11 +30710,12 @@ in sources."mkdirp-0.5.1" sources."ms-2.0.0" sources."multi-random-access-2.1.1" - sources."multicast-dns-6.2.3" + sources."multicast-dns-7.0.0" sources."multicb-1.2.2" + sources."multistream-2.1.0" sources."mute-stream-0.0.7" sources."mutexify-1.2.0" - sources."nan-2.9.2" + sources."nan-2.10.0" sources."nanoassert-1.1.0" sources."nanobus-3.3.0" sources."nanotiming-1.0.1" @@ -30063,7 +30727,7 @@ in }) sources."nets-3.2.0" sources."network-address-1.1.2" - sources."node-gyp-build-3.2.2" + sources."node-gyp-build-3.3.0" sources."normalize-path-2.1.1" sources."oauth-sign-0.8.2" sources."object.omit-2.0.1" @@ -30104,13 +30768,13 @@ in sources."randombytes-2.0.6" sources."range-parser-1.2.0" sources."read-1.0.7" - sources."readable-stream-2.3.4" - sources."recursive-watch-1.1.3" + sources."readable-stream-2.3.5" + sources."recursive-watch-1.1.4" sources."regex-cache-0.4.4" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.2" sources."repeat-string-1.6.1" - sources."request-2.83.0" + sources."request-2.85.0" sources."revalidator-0.1.8" sources."rimraf-2.6.2" sources."rusha-0.8.13" @@ -30120,14 +30784,14 @@ in sources."siphash24-1.1.0" sources."slice-ansi-1.0.0" sources."sntp-2.1.0" - sources."sodium-javascript-0.5.4" - sources."sodium-native-2.1.4" + sources."sodium-javascript-0.5.5" + sources."sodium-native-2.1.5" sources."sodium-universal-2.0.0" sources."sorted-array-functions-1.1.0" sources."sorted-indexof-1.0.0" sources."sparse-bitfield-3.0.3" sources."speedometer-1.0.0" - sources."sshpk-1.13.1" + sources."sshpk-1.14.1" sources."stack-trace-0.0.10" sources."status-logger-3.1.1" sources."stream-collector-1.0.1" @@ -30143,7 +30807,7 @@ in sources."debug-2.6.9" ]; }) - sources."supports-color-5.2.0" + sources."supports-color-5.3.0" (sources."throttle-1.0.3" // { dependencies = [ sources."debug-2.6.9" @@ -30160,14 +30824,14 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."typedarray-0.0.6" - sources."uint64be-2.0.1" + sources."uint64be-2.0.2" sources."unixify-1.0.0" sources."unordered-array-remove-1.0.2" sources."unordered-set-1.1.0" sources."untildify-3.0.2" sources."util-deprecate-1.0.2" sources."utile-0.3.0" - sources."utp-native-1.6.2" + sources."utp-native-1.7.0" sources."uuid-3.2.1" sources."varint-3.0.1" sources."verror-1.10.0" @@ -30195,10 +30859,10 @@ in dhcp = nodeEnv.buildNodePackage { name = "dhcp"; packageName = "dhcp"; - version = "0.2.10"; + version = "0.2.11"; src = fetchurl { - url = "https://registry.npmjs.org/dhcp/-/dhcp-0.2.10.tgz"; - sha512 = "04a373cxgb6b43gzymh1z71aas9c7nx9ap9q11bsc5jgrhx9q6b9204w08qrlrmgn72kj1csiadl8zlm5031097a8paczgzi9653k3m"; + url = "https://registry.npmjs.org/dhcp/-/dhcp-0.2.11.tgz"; + sha512 = "287rcz01q13rn3b83ds5kh05l176wag4p9vxxzrx3q63nhjmy6pvkxf1c1d7k0bd8r8nhqdldn5f1p50r4a1y1ybgy9zz0gqfbwb0d7"; }; dependencies = [ sources."minimist-1.2.0" @@ -30268,7 +30932,7 @@ in sources."fresh-0.2.4" sources."from-0.1.7" sources."hiredis-0.4.1" - sources."http-parser-js-0.4.10" + sources."http-parser-js-0.4.11" sources."inherits-2.0.3" sources."ini-1.3.5" sources."ipaddr.js-1.0.5" @@ -30291,7 +30955,7 @@ in sources."mime-types-2.1.18" sources."minimist-0.0.10" sources."ms-0.7.0" - sources."nan-2.9.2" + sources."nan-2.10.0" (sources."native-dns-git+https://github.com/okTurtles/node-dns.git#08433ec98f517eed3c6d5e47bdf62603539cd402" // { dependencies = [ sources."native-dns-packet-git+https://github.com/okTurtles/native-dns-packet.git#8bf2714c318cfe7d31bca2006385882ccbf503e4" @@ -30375,7 +31039,7 @@ in sources."cors-2.8.4" sources."deferred-leveldown-0.2.0" sources."docker-parse-image-3.0.1" - sources."duplexify-3.5.3" + sources."duplexify-3.5.4" sources."end-of-stream-1.4.1" (sources."errno-0.1.7" // { dependencies = [ @@ -30386,7 +31050,7 @@ in (sources."fs-blob-store-5.2.1" // { dependencies = [ sources."isarray-1.0.0" - sources."readable-stream-2.3.4" + sources."readable-stream-2.3.5" sources."string_decoder-1.0.3" ]; }) @@ -30437,7 +31101,7 @@ in dependencies = [ sources."isarray-1.0.0" sources."minimist-1.2.0" - sources."readable-stream-2.3.4" + sources."readable-stream-2.3.5" sources."split2-2.2.0" sources."string_decoder-1.0.3" sources."through2-2.0.3" @@ -30453,7 +31117,7 @@ in sources."pull-level-2.0.4" sources."pull-live-1.0.1" sources."pull-pushable-2.2.0" - sources."pull-stream-3.6.2" + sources."pull-stream-3.6.7" sources."pull-window-2.1.4" sources."pump-1.0.3" (sources."pumpify-1.4.0" // { @@ -30474,9 +31138,9 @@ in sources."string_decoder-0.10.31" (sources."tar-stream-1.5.5" // { dependencies = [ - sources."bl-1.2.1" + sources."bl-1.2.2" sources."isarray-1.0.0" - sources."readable-stream-2.3.4" + sources."readable-stream-2.3.5" sources."string_decoder-1.0.3" ]; }) @@ -30507,10 +31171,10 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "3.3.6"; + version = "3.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.3.6.tgz"; - sha512 = "0zn9wiliz4sz4xnmcc3nks76gkaxp8q0lk0nqm1ysxczibxnh074kap87w366jnzxvzx5la0h6wdqjrm7zja307sq8g0qj265fjyky6"; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.3.7.tgz"; + sha512 = "07fvd6djvw50nbjimxyvl9jv86lky0wz6v5mrj8q4fgdpwgb70636bgsg13plj83jl33lk9mk7ixmidp85zikv4w4cwnli53hi4r8vi"; }; dependencies = [ sources."JSONStream-1.3.2" @@ -30519,7 +31183,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.0" sources."asynckit-0.4.0" - sources."aws-sdk-2.203.0" + sources."aws-sdk-2.218.1" sources."aws-sign2-0.7.0" sources."aws4-1.6.0" sources."base64-js-1.2.3" @@ -30573,7 +31237,7 @@ in sources."punycode-1.3.2" sources."qs-6.5.1" sources."querystring-0.2.0" - (sources."request-2.83.0" // { + (sources."request-2.85.0" // { dependencies = [ sources."punycode-1.4.1" ]; @@ -30581,7 +31245,7 @@ in sources."safe-buffer-5.1.1" sources."sax-1.2.1" sources."sntp-2.1.0" - sources."sshpk-1.13.1" + sources."sshpk-1.14.1" sources."stringstream-0.0.5" sources."through-2.3.8" sources."tough-cookie-2.3.4" @@ -30645,14 +31309,14 @@ in sources."caseless-0.11.0" (sources."chalk-2.1.0" // { dependencies = [ - sources."ansi-styles-3.2.0" + sources."ansi-styles-3.2.1" ]; }) sources."chokidar-1.6.0" sources."color-convert-1.9.1" sources."color-name-1.1.3" sources."combined-stream-1.0.6" - sources."commander-2.14.1" + sources."commander-2.15.1" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" sources."cross-spawn-4.0.0" @@ -30725,7 +31389,7 @@ in sources."kind-of-3.2.2" sources."klaw-1.3.1" sources."lodash-4.13.1" - sources."lru-cache-4.1.1" + sources."lru-cache-4.1.2" sources."micromatch-2.3.11" sources."mime-db-1.33.0" sources."mime-types-2.1.18" @@ -30733,7 +31397,7 @@ in sources."minimist-1.2.0" sources."mkdirp-0.5.1" sources."murmur-hash-js-1.0.0" - sources."nan-2.9.2" + sources."nan-2.10.0" (sources."node-elm-compiler-4.3.3" // { dependencies = [ sources."firstline-1.2.0" @@ -30764,7 +31428,7 @@ in }) ]; }) - sources."readable-stream-2.3.4" + sources."readable-stream-2.3.5" sources."readdirp-2.1.0" sources."regex-cache-0.4.4" sources."remove-trailing-separator-1.1.0" @@ -30776,7 +31440,7 @@ in sources."set-immediate-shim-1.0.1" sources."sntp-1.0.9" sources."split-1.0.1" - (sources."sshpk-1.13.1" // { + (sources."sshpk-1.14.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -30818,7 +31482,7 @@ in sha512 = "06w3hpcnxg63wg262ldhw4s2shyr1f1bvilqshy88i4svamgxk0qzdhhma2rwcwq7qpjwjlr8m1z2qbmqw9faff5f8hl45yj3jxrs3z"; }; dependencies = [ - sources."ansi-escapes-3.0.0" + sources."ansi-escapes-3.1.0" sources."ansi-regex-3.0.0" sources."ansi-styles-2.2.1" sources."arch-2.1.0" @@ -30859,7 +31523,7 @@ in sources."concat-map-0.0.1" sources."conf-1.4.0" sources."convert-source-map-1.5.1" - sources."core-js-2.5.3" + sources."core-js-2.5.4" sources."cross-spawn-5.1.0" sources."currently-unhandled-0.4.1" sources."debug-2.6.9" @@ -30886,7 +31550,7 @@ in sources."has-symbol-support-x-1.4.2" sources."has-to-string-tag-x-1.4.1" sources."home-or-tmp-2.0.0" - sources."hosted-git-info-2.5.0" + sources."hosted-git-info-2.6.0" sources."iconv-lite-0.4.19" (sources."import-jsx-1.3.0" // { dependencies = [ @@ -30898,15 +31562,15 @@ in sources."indent-string-3.2.0" (sources."ink-0.3.1" // { dependencies = [ - sources."ansi-styles-3.2.0" - sources."chalk-2.3.1" + sources."ansi-styles-3.2.1" + sources."chalk-2.3.2" sources."core-js-1.2.7" sources."strip-ansi-4.0.0" - sources."supports-color-5.2.0" + sources."supports-color-5.3.0" ]; }) sources."ink-text-input-1.1.1" - sources."invariant-2.2.3" + sources."invariant-2.2.4" sources."is-arrayish-0.2.1" sources."is-builtin-module-1.0.0" sources."is-finite-1.0.2" @@ -30932,8 +31596,8 @@ in sources."log-update-2.3.0" sources."loose-envify-1.3.1" sources."loud-rejection-1.6.0" - sources."lowercase-keys-1.0.0" - sources."lru-cache-4.1.1" + sources."lowercase-keys-1.0.1" + sources."lru-cache-4.1.2" sources."make-dir-1.2.0" sources."map-obj-1.0.1" sources."mem-1.1.0" @@ -31017,7 +31681,7 @@ in sources."url-parse-lax-1.0.0" sources."url-to-options-1.0.1" sources."validate-npm-package-license-3.0.3" - sources."whatwg-fetch-2.0.3" + sources."whatwg-fetch-2.0.4" sources."which-1.3.0" sources."wrap-ansi-3.0.1" sources."write-file-atomic-2.3.0" @@ -31035,21 +31699,21 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "4.18.1"; + version = "4.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-4.18.1.tgz"; - sha512 = "21i792qmqdz7dzm68ncjf4q3bi3c5kb1q103hkdp868mm9p7gd153hjzsq70mfyfx0vrjzna8x734xmpkp9himw32svf7j24jjrzx40"; + url = "https://registry.npmjs.org/eslint/-/eslint-4.19.1.tgz"; + sha512 = "0hw70vjlg6z0y9kf6vjr7g0w9hbm426fwvyzr88l62c5hd9mxrbw5v34b6zb31vbbyda3mkvcwgfnxgqaxvpn0wlrxr0va43pbzygbd"; }; dependencies = [ - sources."acorn-5.5.0" + sources."acorn-5.5.3" (sources."acorn-jsx-3.0.1" // { dependencies = [ sources."acorn-3.3.0" ]; }) sources."ajv-5.5.2" - sources."ajv-keywords-3.1.0" - sources."ansi-escapes-3.0.0" + sources."ajv-keywords-2.1.1" + sources."ansi-escapes-3.1.0" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" sources."argparse-1.0.10" @@ -31064,12 +31728,13 @@ in }) sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" + sources."buffer-from-1.0.0" sources."caller-path-0.1.0" sources."callsites-0.2.0" - (sources."chalk-2.3.1" // { + (sources."chalk-2.3.2" // { dependencies = [ - sources."ansi-styles-3.2.0" - sources."supports-color-5.2.0" + sources."ansi-styles-3.2.1" + sources."supports-color-5.3.0" ]; }) sources."chardet-0.4.2" @@ -31080,7 +31745,7 @@ in sources."color-convert-1.9.1" sources."color-name-1.1.3" sources."concat-map-0.0.1" - sources."concat-stream-1.6.0" + sources."concat-stream-1.6.2" sources."core-util-is-1.0.2" sources."cross-spawn-5.1.0" sources."debug-3.1.0" @@ -31090,13 +31755,13 @@ in sources."escape-string-regexp-1.0.5" sources."eslint-scope-3.7.1" sources."eslint-visitor-keys-1.0.0" - sources."espree-3.5.3" + sources."espree-3.5.4" sources."esprima-4.0.0" - sources."esquery-1.0.0" + sources."esquery-1.0.1" sources."esrecurse-4.2.1" sources."estraverse-4.2.0" sources."esutils-2.0.2" - sources."external-editor-2.1.0" + sources."external-editor-2.2.0" sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" sources."fast-levenshtein-2.0.6" @@ -31106,7 +31771,7 @@ in sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" sources."glob-7.1.2" - sources."globals-11.3.0" + sources."globals-11.4.0" sources."globby-5.0.0" sources."graceful-fs-4.1.11" sources."has-ansi-2.0.0" @@ -31119,19 +31784,19 @@ in sources."inquirer-3.3.0" sources."is-fullwidth-code-point-2.0.0" sources."is-path-cwd-1.0.0" - sources."is-path-in-cwd-1.0.0" + sources."is-path-in-cwd-1.0.1" sources."is-path-inside-1.0.1" sources."is-promise-2.1.0" sources."is-resolvable-1.1.0" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."js-tokens-3.0.2" - sources."js-yaml-3.10.0" + sources."js-yaml-3.11.0" sources."json-schema-traverse-0.3.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."levn-0.3.0" sources."lodash-4.17.5" - sources."lru-cache-4.1.1" + sources."lru-cache-4.1.2" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" @@ -31154,7 +31819,8 @@ in sources."process-nextick-args-2.0.0" sources."progress-2.0.0" sources."pseudomap-1.0.2" - sources."readable-stream-2.3.4" + sources."readable-stream-2.3.5" + sources."regexpp-1.1.0" sources."require-uncached-1.0.3" sources."resolve-from-1.0.1" sources."restore-cursor-2.0.0" @@ -31178,11 +31844,7 @@ in }) sources."strip-json-comments-2.0.1" sources."supports-color-2.0.0" - (sources."table-4.0.3" // { - dependencies = [ - sources."ajv-6.2.0" - ]; - }) + sources."table-4.0.2" sources."text-table-0.2.0" sources."through-2.3.8" sources."tmp-0.0.33" @@ -31213,15 +31875,15 @@ in sha512 = "32h5278qn4pnlm2wl573mhg112diqpiazr07vxj0la2qwc3a1dlva5gsbyypnbnsis7r05kcx173qhb4wdl9w8spc7g3zk1575ciirc"; }; dependencies = [ - sources."acorn-5.5.0" + sources."acorn-5.5.3" (sources."acorn-jsx-3.0.1" // { dependencies = [ sources."acorn-3.3.0" ]; }) sources."ajv-5.5.2" - sources."ajv-keywords-3.1.0" - sources."ansi-escapes-3.0.0" + sources."ajv-keywords-2.1.1" + sources."ansi-escapes-3.1.0" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" sources."argparse-1.0.10" @@ -31236,6 +31898,7 @@ in }) sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" + sources."buffer-from-1.0.0" sources."caller-path-0.1.0" sources."callsites-0.2.0" (sources."chalk-1.1.3" // { @@ -31251,7 +31914,7 @@ in sources."color-convert-1.9.1" sources."color-name-1.1.3" sources."concat-map-0.0.1" - sources."concat-stream-1.6.0" + sources."concat-stream-1.6.2" sources."core-util-is-1.0.2" sources."cross-spawn-5.1.0" sources."debug-3.1.0" @@ -31259,13 +31922,13 @@ in sources."del-2.2.2" sources."doctrine-2.1.0" sources."escape-string-regexp-1.0.5" - (sources."eslint-4.18.1" // { + (sources."eslint-4.19.1" // { dependencies = [ sources."ansi-regex-3.0.0" - sources."ansi-styles-3.2.0" - (sources."chalk-2.3.1" // { + sources."ansi-styles-3.2.1" + (sources."chalk-2.3.2" // { dependencies = [ - sources."supports-color-5.2.0" + sources."supports-color-5.3.0" ]; }) sources."strip-ansi-4.0.0" @@ -31274,13 +31937,13 @@ in }) sources."eslint-scope-3.7.1" sources."eslint-visitor-keys-1.0.0" - sources."espree-3.5.3" + sources."espree-3.5.4" sources."esprima-4.0.0" - sources."esquery-1.0.0" + sources."esquery-1.0.1" sources."esrecurse-4.2.1" sources."estraverse-4.2.0" sources."esutils-2.0.2" - sources."external-editor-2.1.0" + sources."external-editor-2.2.0" sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" sources."fast-levenshtein-2.0.6" @@ -31290,7 +31953,7 @@ in sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" sources."glob-7.1.2" - sources."globals-11.3.0" + sources."globals-11.4.0" sources."globby-5.0.0" sources."graceful-fs-4.1.11" sources."has-ansi-2.0.0" @@ -31303,19 +31966,19 @@ in sources."inquirer-3.3.0" sources."is-fullwidth-code-point-2.0.0" sources."is-path-cwd-1.0.0" - sources."is-path-in-cwd-1.0.0" + sources."is-path-in-cwd-1.0.1" sources."is-path-inside-1.0.1" sources."is-promise-2.1.0" sources."is-resolvable-1.1.0" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."js-tokens-3.0.2" - sources."js-yaml-3.10.0" + sources."js-yaml-3.11.0" sources."json-schema-traverse-0.3.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."levn-0.3.0" sources."lodash-4.17.5" - sources."lru-cache-4.1.1" + sources."lru-cache-4.1.2" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" @@ -31339,9 +32002,10 @@ in sources."process-nextick-args-2.0.0" sources."progress-2.0.0" sources."pseudomap-1.0.2" - sources."readable-stream-2.3.4" + sources."readable-stream-2.3.5" + sources."regexpp-1.1.0" sources."require-uncached-1.0.3" - sources."resolve-1.5.0" + sources."resolve-1.6.0" sources."resolve-from-1.0.1" sources."restore-cursor-2.0.0" sources."rimraf-2.6.2" @@ -31364,11 +32028,7 @@ in sources."has-flag-1.0.0" ]; }) - (sources."table-4.0.3" // { - dependencies = [ - sources."ajv-6.2.0" - ]; - }) + sources."table-4.0.2" sources."text-table-0.2.0" sources."through-2.3.8" sources."tmp-0.0.33" @@ -31433,7 +32093,7 @@ in sources."caseless-0.12.0" sources."chalk-1.1.3" sources."cli-cursor-1.0.2" - sources."cli-spinners-1.1.0" + sources."cli-spinners-1.3.0" sources."co-4.6.0" sources."color-convert-1.9.1" sources."color-name-1.1.3" @@ -31475,7 +32135,7 @@ in sources."hasha-2.2.0" sources."hawk-6.0.2" sources."hoek-4.2.1" - sources."hosted-git-info-2.5.0" + sources."hosted-git-info-2.6.0" sources."http-signature-1.2.0" sources."indent-string-2.1.0" sources."inherits-2.0.3" @@ -31517,12 +32177,12 @@ in sources."onetime-1.1.0" (sources."ora-1.4.0" // { dependencies = [ - sources."ansi-styles-3.2.0" - sources."chalk-2.3.1" + sources."ansi-styles-3.2.1" + sources."chalk-2.3.2" sources."cli-cursor-2.1.0" sources."onetime-2.0.1" sources."restore-cursor-2.0.0" - sources."supports-color-5.2.0" + sources."supports-color-5.3.0" ]; }) sources."os-tmpdir-1.0.2" @@ -31546,10 +32206,10 @@ in sources."qs-6.5.1" sources."read-pkg-1.1.0" sources."read-pkg-up-1.0.1" - sources."readable-stream-2.3.4" + sources."readable-stream-2.3.5" sources."redent-1.0.0" sources."repeating-2.0.1" - sources."request-2.83.0" + sources."request-2.85.0" sources."request-progress-2.0.1" sources."restore-cursor-1.0.1" sources."safe-buffer-5.1.1" @@ -31560,7 +32220,7 @@ in sources."spdx-exceptions-2.1.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.0" - sources."sshpk-1.13.1" + sources."sshpk-1.14.1" sources."string_decoder-1.0.3" sources."stringstream-0.0.5" sources."strip-ansi-3.0.1" @@ -31600,7 +32260,7 @@ in sha1 = "c027feb75a512001d1287bbfb3ffaafba67eb92f"; }; dependencies = [ - sources."bower-1.8.2" + sources."bower-1.8.4" sources."bower-endpoint-parser-0.2.1" sources."bower-logger-0.2.1" sources."glob-3.2.11" @@ -31648,7 +32308,7 @@ in sources."colors-1.0.3" ]; }) - sources."clone-1.0.3" + sources."clone-1.0.4" sources."colors-0.6.2" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" @@ -31709,7 +32369,7 @@ in sources."minimist-0.0.10" sources."mkdirp-0.5.1" sources."mute-stream-0.0.7" - sources."nan-2.9.2" + sources."nan-2.10.0" (sources."nconf-0.6.9" // { dependencies = [ sources."async-0.2.9" @@ -31729,7 +32389,7 @@ in sources."preserve-0.2.0" (sources."prettyjson-1.2.1" // { dependencies = [ - sources."colors-1.1.2" + sources."colors-1.2.1" sources."minimist-1.2.0" ]; }) @@ -31746,7 +32406,7 @@ in ]; }) sources."read-1.0.7" - sources."readable-stream-2.3.4" + sources."readable-stream-2.3.5" sources."readdirp-2.1.0" sources."regex-cache-0.4.4" sources."remove-trailing-separator-1.1.0" @@ -31799,7 +32459,7 @@ in sources."microee-0.0.6" sources."minilog-3.1.0" sources."ms-2.0.0" - sources."simple-git-1.91.0" + sources."simple-git-1.92.0" sources."tabtab-git+https://github.com/mixu/node-tabtab.git" ]; buildInputs = globalBuildInputs; @@ -31916,7 +32576,7 @@ in sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."msgpack-1.0.2" - sources."nan-2.9.2" + sources."nan-2.10.0" sources."optimist-0.3.7" sources."pop-iterate-1.0.1" sources."promise-6.1.0" @@ -31980,7 +32640,7 @@ in sources."array-uniq-1.0.3" sources."array-unique-0.3.2" sources."assign-symbols-1.0.0" - sources."atob-2.0.3" + sources."atob-2.1.0" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -32007,7 +32667,7 @@ in sources."define-property-0.2.5" ]; }) - sources."clone-1.0.3" + sources."clone-1.0.4" sources."clone-stats-0.0.1" sources."collection-visit-1.0.0" sources."color-support-1.1.3" @@ -32084,7 +32744,7 @@ in (sources."gulp-util-3.0.8" // { dependencies = [ sources."isarray-1.0.0" - sources."readable-stream-2.3.4" + sources."readable-stream-2.3.5" sources."string_decoder-1.0.3" ]; }) @@ -32117,7 +32777,6 @@ in sources."isexe-2.0.0" sources."isobject-3.0.1" sources."kind-of-6.0.2" - sources."lazy-cache-2.0.2" (sources."liftoff-2.5.0" // { dependencies = [ sources."has-values-0.1.4" @@ -32159,7 +32818,7 @@ in sources."make-iterator-1.0.0" sources."map-cache-0.2.2" sources."map-visit-1.0.0" - (sources."micromatch-3.1.9" // { + (sources."micromatch-3.1.10" // { dependencies = [ (sources."is-accessor-descriptor-0.1.6" // { dependencies = [ @@ -32182,7 +32841,7 @@ in sources."ms-2.0.0" sources."multipipe-0.1.2" sources."nanomatch-1.2.9" - sources."natives-1.1.1" + sources."natives-1.1.2" sources."object-assign-3.0.0" sources."object-copy-0.1.0" sources."object-visit-1.0.1" @@ -32208,7 +32867,7 @@ in sources."repeat-element-1.1.2" sources."repeat-string-1.6.1" sources."replace-ext-0.0.1" - sources."resolve-1.5.0" + sources."resolve-1.6.0" sources."resolve-dir-1.0.1" sources."resolve-url-0.2.1" sources."ret-0.1.15" @@ -32216,10 +32875,9 @@ in sources."safe-regex-1.1.0" sources."semver-4.3.6" sources."sequencify-0.0.7" - sources."set-getter-0.1.0" sources."set-value-2.0.0" sources."sigmund-1.0.1" - (sources."snapdragon-0.8.1" // { + (sources."snapdragon-0.8.2" // { dependencies = [ (sources."define-property-0.2.5" // { dependencies = [ @@ -32275,7 +32933,11 @@ in ]; }) sources."urix-0.1.0" - sources."use-2.0.2" + (sources."use-3.1.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) sources."user-home-1.1.1" sources."util-deprecate-1.0.2" sources."v8flags-2.1.1" @@ -32414,29 +33076,27 @@ in html-minifier = nodeEnv.buildNodePackage { name = "html-minifier"; packageName = "html-minifier"; - version = "3.5.9"; + version = "3.5.13"; src = fetchurl { - url = "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.9.tgz"; - sha512 = "3a2xnyzk38awjgzlkd59vsf8bk77ahyxsk7k9vg7gspl9z0v3zxgzzmix1vrz8xdfcxc00kg807z85hfqnz9wg20py4ihn9apvqx6hi"; + url = "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.13.tgz"; + sha512 = "2785fjg53p0bj5zx963ckq2pg7x3vcscag5y2znzmfr1v08qls2l60nvska8nm5v3wjp9kd9lp3nw8136q8cwn9jqwz8b7lwzvgvcq7"; }; dependencies = [ sources."camel-case-3.0.0" - sources."clean-css-4.1.9" - sources."commander-2.14.1" + sources."clean-css-4.1.11" + sources."commander-2.15.1" sources."he-1.1.1" sources."lower-case-1.1.4" - sources."ncname-1.0.0" sources."no-case-2.3.2" sources."param-case-2.1.1" sources."relateurl-0.2.7" sources."source-map-0.5.7" - (sources."uglify-js-3.3.12" // { + (sources."uglify-js-3.3.18" // { dependencies = [ sources."source-map-0.6.1" ]; }) sources."upper-case-1.1.3" - sources."xml-char-classes-1.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -32450,14 +33110,14 @@ in ionic = nodeEnv.buildNodePackage { name = "ionic"; packageName = "ionic"; - version = "3.19.1"; + version = "3.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/ionic/-/ionic-3.19.1.tgz"; - sha512 = "11hpd51qzi8fms87q1xqwc347dp9mxhvzci2jlw94ayvs1v2n3iaqwdic1g1213k91xwzp52z6y17a08via45l936bgda3pi6zfbmsk"; + url = "https://registry.npmjs.org/ionic/-/ionic-3.20.0.tgz"; + sha512 = "2a051r5s0p9ihcahqysmbjklhivms8rlv5zxxi7bqrxa3x8sqqpyhbjpl7z5k4263vmfkqj3qmzciz6kbyivgk3arz22jqfqsxczqn9"; }; dependencies = [ - sources."@ionic/cli-framework-0.1.2" - (sources."@ionic/cli-utils-1.19.1" // { + sources."@ionic/cli-framework-0.1.3" + (sources."@ionic/cli-utils-1.19.2" // { dependencies = [ sources."bytes-1.0.0" sources."debug-2.6.9" @@ -32465,17 +33125,17 @@ in sources."is-glob-3.1.0" sources."mime-1.4.1" sources."raw-body-1.1.7" - sources."setprototypeof-1.1.0" - sources."statuses-1.3.1" + sources."setprototypeof-1.0.3" + sources."statuses-1.4.0" sources."string_decoder-0.10.31" sources."yallist-3.0.2" ]; }) sources."@ionic/discover-0.4.0" - sources."accepts-1.3.4" - sources."ansi-escapes-3.0.0" + sources."accepts-1.3.5" + sources."ansi-escapes-3.1.0" sources."ansi-regex-3.0.0" - sources."ansi-styles-3.2.0" + sources."ansi-styles-3.2.1" sources."anymatch-1.3.2" sources."archiver-2.1.1" sources."archiver-utils-1.3.0" @@ -32490,7 +33150,7 @@ in sources."balanced-match-1.0.0" sources."basic-auth-1.1.0" sources."binary-extensions-1.11.0" - sources."bl-1.2.1" + sources."bl-1.2.2" sources."body-5.1.0" sources."body-parser-1.18.2" sources."brace-expansion-1.1.11" @@ -32501,11 +33161,11 @@ in }) sources."buffer-crc32-0.2.13" sources."bytes-3.0.0" - sources."chalk-2.3.1" + sources."chalk-2.3.2" sources."chardet-0.4.2" sources."chokidar-1.7.0" sources."chownr-1.0.1" - sources."ci-info-1.1.2" + sources."ci-info-1.1.3" sources."cli-cursor-2.1.0" sources."cli-width-2.2.0" sources."color-convert-1.9.1" @@ -32529,7 +33189,7 @@ in sources."delayed-stream-1.0.0" sources."depd-1.1.2" sources."destroy-1.0.4" - sources."diff-3.4.0" + sources."diff-3.5.0" sources."ee-first-1.1.1" sources."elementtree-0.1.7" sources."encodeurl-1.0.2" @@ -32541,19 +33201,23 @@ in sources."eventemitter3-1.2.0" sources."expand-brackets-0.1.5" sources."expand-range-1.8.2" - sources."express-4.16.2" + (sources."express-4.16.3" // { + dependencies = [ + sources."setprototypeof-1.1.0" + ]; + }) sources."extend-3.0.1" - sources."external-editor-2.1.0" + sources."external-editor-2.2.0" sources."extglob-0.3.2" sources."faye-websocket-0.10.0" sources."figures-2.0.0" sources."filename-regex-2.0.1" sources."fill-range-2.2.3" - sources."finalhandler-1.1.0" + sources."finalhandler-1.1.1" sources."for-in-1.0.2" sources."for-own-0.1.5" sources."form-data-2.3.2" - sources."formidable-1.1.1" + sources."formidable-1.2.1" sources."forwarded-0.1.2" sources."fresh-0.5.2" sources."fs-minipass-1.2.5" @@ -32564,12 +33228,8 @@ in sources."glob-parent-2.0.0" sources."graceful-fs-4.1.11" sources."has-flag-3.0.0" - (sources."http-errors-1.6.2" // { - dependencies = [ - sources."depd-1.1.1" - ]; - }) - sources."http-parser-js-0.4.10" + sources."http-errors-1.6.3" + sources."http-parser-js-0.4.11" sources."http-proxy-1.16.2" sources."http-proxy-middleware-0.17.4" sources."iconv-lite-0.4.19" @@ -32609,7 +33269,7 @@ in sources."lodash.isarray-3.0.4" sources."lodash.keys-3.1.2" sources."lodash.restparam-3.6.1" - sources."lru-cache-4.1.1" + sources."lru-cache-4.1.2" sources."macos-release-1.1.0" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" @@ -32621,12 +33281,12 @@ in sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" - sources."minipass-2.2.1" + sources."minipass-2.2.4" sources."minizlib-1.1.0" sources."mkdirp-0.5.1" sources."ms-2.0.0" sources."mute-stream-0.0.7" - sources."nan-2.9.2" + sources."nan-2.10.0" sources."ncp-2.0.0" sources."negotiator-0.6.1" sources."netmask-1.0.6" @@ -32636,7 +33296,7 @@ in sources."on-finished-2.3.0" sources."once-1.4.0" sources."onetime-2.0.1" - sources."opn-5.2.0" + sources."opn-5.3.0" sources."os-name-2.0.1" sources."os-tmpdir-1.0.2" sources."parse-glob-3.0.4" @@ -32658,8 +33318,13 @@ in ]; }) sources."range-parser-1.2.0" - sources."raw-body-2.3.2" - sources."readable-stream-2.3.4" + (sources."raw-body-2.3.2" // { + dependencies = [ + sources."depd-1.1.1" + sources."http-errors-1.6.2" + ]; + }) + sources."readable-stream-2.3.5" sources."readdirp-2.1.0" sources."regex-cache-0.4.4" sources."remove-trailing-separator-1.1.0" @@ -32676,23 +33341,23 @@ in sources."safe-json-parse-1.0.1" sources."sax-1.1.4" sources."semver-5.5.0" - sources."send-0.16.1" - sources."serve-static-1.13.1" + sources."send-0.16.2" + sources."serve-static-1.13.2" sources."set-immediate-shim-1.0.1" - sources."setprototypeof-1.0.3" + sources."setprototypeof-1.1.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" sources."slice-ansi-1.0.0" sources."ssh-config-1.1.3" - sources."statuses-1.4.0" + sources."statuses-1.5.0" sources."string-template-0.2.1" sources."string-width-2.1.1" sources."string_decoder-1.0.3" sources."strip-ansi-4.0.0" sources."superagent-3.8.2" - sources."supports-color-5.2.0" - (sources."tar-4.4.0" // { + sources."supports-color-5.3.0" + (sources."tar-4.4.1" // { dependencies = [ sources."minimist-0.0.8" ]; @@ -32790,7 +33455,7 @@ in sources."inherits-2.0.3" sources."is-buffer-1.1.6" sources."isexe-2.0.0" - (sources."js-yaml-3.10.0" // { + (sources."js-yaml-3.11.0" // { dependencies = [ sources."esprima-4.0.0" ]; @@ -32844,14 +33509,14 @@ in javascript-typescript-langserver = nodeEnv.buildNodePackage { name = "javascript-typescript-langserver"; packageName = "javascript-typescript-langserver"; - version = "2.7.1"; + version = "2.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.7.1.tgz"; - sha512 = "3dxj2iihfilq0dbhhrchhxqd6x9nhrjwnqkgr4gnmqk75zgnaa119p1h2vx7l0wmpqcafw0nifv02bn0g5y1wgal06a5yr6iii7dx18"; + url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.8.0.tgz"; + sha512 = "23rbqwsks302r65kckp12dy9pid4lpl9cn51bz9xg54j90ig3cxxd9ygs7vq5b72k2x75w960hfd4ww2zgqpypdqmb510vqfhx442s1"; }; dependencies = [ sources."ansi-color-0.2.1" - sources."ansi-styles-3.2.0" + sources."ansi-styles-3.2.1" sources."any-promise-1.3.0" sources."assertion-error-1.1.0" sources."balanced-match-1.0.0" @@ -32859,11 +33524,11 @@ in sources."bufrw-1.2.1" sources."chai-4.1.2" sources."chai-as-promised-7.1.1" - sources."chalk-2.3.1" + sources."chalk-2.3.2" sources."check-error-1.0.2" sources."color-convert-1.9.1" sources."color-name-1.1.3" - sources."commander-2.14.1" + sources."commander-2.15.1" sources."concat-map-0.0.1" sources."deep-eql-3.0.1" sources."deep-equal-1.0.1" @@ -32877,7 +33542,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.3" sources."iterare-0.0.8" - (sources."jaeger-client-3.9.1" // { + (sources."jaeger-client-3.10.0" // { dependencies = [ sources."opentracing-0.13.0" ]; @@ -32888,27 +33553,32 @@ in sources."mz-2.7.0" sources."node-int64-0.4.0" sources."object-assign-4.1.1" - sources."object-hash-1.2.0" + sources."object-hash-1.3.0" sources."once-1.4.0" - sources."opentracing-0.14.1" + sources."opentracing-0.14.2" sources."path-is-absolute-1.0.1" sources."pathval-1.1.0" - sources."rxjs-5.5.6" + sources."rxjs-5.5.8" sources."semaphore-async-await-1.5.1" sources."string-similarity-1.2.0" sources."string-template-0.2.1" - sources."supports-color-5.2.0" + sources."supports-color-5.3.0" sources."symbol-observable-1.0.1" sources."thenify-3.3.0" sources."thenify-all-1.6.0" sources."thriftrw-3.11.2" sources."type-detect-4.0.8" sources."typescript-2.7.2" - sources."vscode-jsonrpc-3.5.0" - sources."vscode-languageserver-3.5.0" - sources."vscode-languageserver-protocol-3.5.0" - sources."vscode-languageserver-types-3.5.0" - sources."vscode-uri-1.0.1" + sources."vscode-jsonrpc-3.6.0" + (sources."vscode-languageserver-3.5.1" // { + dependencies = [ + sources."vscode-jsonrpc-3.5.0" + sources."vscode-languageserver-types-3.5.0" + ]; + }) + sources."vscode-languageserver-protocol-3.5.1" + sources."vscode-languageserver-types-3.6.1" + sources."vscode-uri-1.0.3" sources."wrappy-1.0.2" sources."xorshift-0.2.1" sources."xtend-4.0.1" @@ -32962,7 +33632,7 @@ in sources."graceful-fs-4.1.11" sources."js2xmlparser-3.0.0" sources."klaw-2.0.0" - sources."marked-0.3.17" + sources."marked-0.3.19" sources."minimist-0.0.8" sources."mkdirp-0.5.1" (sources."requizzle-0.2.1" // { @@ -33067,7 +33737,7 @@ in dependencies = [ sources."abbrev-1.1.1" sources."bluebird-3.5.1" - sources."commander-2.14.1" + sources."commander-2.15.1" sources."config-chain-1.1.11" sources."editorconfig-0.13.3" sources."ini-1.3.5" @@ -33175,11 +33845,11 @@ in sources."esprima-4.0.0" sources."extend-3.0.1" sources."form-data-2.3.2" - sources."formidable-1.1.1" + sources."formidable-1.2.1" sources."graphlib-2.1.5" sources."inherits-2.0.3" sources."isarray-1.0.0" - sources."js-yaml-3.10.0" + sources."js-yaml-3.11.0" sources."lodash-4.17.5" sources."methods-1.1.2" sources."mime-1.6.0" @@ -33191,7 +33861,7 @@ in sources."process-nextick-args-2.0.0" sources."punycode-2.1.0" sources."qs-6.5.1" - sources."readable-stream-2.3.4" + sources."readable-stream-2.3.5" sources."safe-buffer-5.1.1" sources."slash-1.0.0" sources."sprintf-js-1.0.3" @@ -33218,11 +33888,11 @@ in sha512 = "3isg3ph43vqfq6m6pg0d1iy7gj2gc6jgym0gp3ng7p9fv7bf1q43isf3wbc7bc9w5swsxqjc3v304ic8iinilwrkwxgks1alaxjs3si"; }; dependencies = [ - sources."accepts-1.3.4" + sources."accepts-1.3.5" sources."ajv-5.5.2" sources."ansi-align-2.0.0" sources."ansi-regex-3.0.0" - sources."ansi-styles-3.2.0" + sources."ansi-styles-3.2.1" sources."array-flatten-1.1.1" sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -33231,14 +33901,19 @@ in sources."aws4-1.6.0" sources."basic-auth-2.0.0" sources."bcrypt-pbkdf-1.0.1" - sources."body-parser-1.18.2" + (sources."body-parser-1.18.2" // { + dependencies = [ + sources."setprototypeof-1.0.3" + ]; + }) sources."boom-4.3.1" sources."boxen-1.3.0" sources."bytes-3.0.0" sources."camelcase-4.1.0" sources."capture-stack-trace-1.0.0" sources."caseless-0.12.0" - sources."chalk-2.3.1" + sources."chalk-2.3.2" + sources."ci-info-1.1.3" sources."cli-boxes-1.0.0" sources."cliui-4.0.0" sources."co-4.6.0" @@ -33248,7 +33923,7 @@ in sources."combined-stream-1.0.6" sources."compressible-2.0.13" sources."compression-1.7.2" - sources."configstore-3.1.1" + sources."configstore-3.1.2" sources."connect-pause-0.1.1" sources."content-disposition-0.5.2" sources."content-type-1.0.4" @@ -33281,10 +33956,9 @@ in sources."escape-string-regexp-1.0.5" sources."etag-1.8.1" sources."execa-0.7.0" - (sources."express-4.16.2" // { + (sources."express-4.16.3" // { dependencies = [ - sources."setprototypeof-1.1.0" - sources."statuses-1.3.1" + sources."statuses-1.4.0" ]; }) (sources."express-urlrewrite-1.2.0" // { @@ -33296,7 +33970,7 @@ in sources."extsprintf-1.3.0" sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" - sources."finalhandler-1.1.0" + sources."finalhandler-1.1.1" sources."find-up-2.1.0" sources."forever-agent-0.6.1" sources."form-data-2.3.2" @@ -33313,11 +33987,7 @@ in sources."has-flag-3.0.0" sources."hawk-6.0.2" sources."hoek-4.2.1" - (sources."http-errors-1.6.2" // { - dependencies = [ - sources."depd-1.1.1" - ]; - }) + sources."http-errors-1.6.3" sources."http-signature-1.2.0" sources."iconv-lite-0.4.19" sources."import-lazy-2.1.0" @@ -33326,6 +33996,7 @@ in sources."ini-1.3.5" sources."invert-kv-1.0.0" sources."ipaddr.js-1.6.0" + sources."is-ci-1.1.0" sources."is-fullwidth-code-point-2.0.0" sources."is-installed-globally-0.1.0" sources."is-npm-1.0.0" @@ -33352,8 +34023,8 @@ in sources."lodash-4.17.5" sources."lodash-id-0.14.0" sources."lowdb-0.15.5" - sources."lowercase-keys-1.0.0" - sources."lru-cache-4.1.1" + sources."lowercase-keys-1.0.1" + sources."lru-cache-4.1.2" sources."make-dir-1.2.0" sources."media-typer-0.3.0" sources."mem-1.1.0" @@ -33396,34 +34067,39 @@ in sources."punycode-1.4.1" sources."qs-6.5.1" sources."range-parser-1.2.0" - sources."raw-body-2.3.2" - sources."rc-1.2.5" + (sources."raw-body-2.3.2" // { + dependencies = [ + sources."depd-1.1.1" + sources."http-errors-1.6.2" + ]; + }) + sources."rc-1.2.6" sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" - sources."request-2.83.0" + sources."request-2.85.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" sources."safe-buffer-5.1.1" sources."semver-5.5.0" sources."semver-diff-2.1.0" - sources."send-0.16.1" - sources."serve-static-1.13.1" + sources."send-0.16.2" + sources."serve-static-1.13.2" sources."server-destroy-1.0.1" sources."set-blocking-2.0.0" - sources."setprototypeof-1.0.3" + sources."setprototypeof-1.1.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" sources."sntp-2.1.0" - sources."sshpk-1.13.1" - sources."statuses-1.4.0" + sources."sshpk-1.14.1" + sources."statuses-1.5.0" sources."steno-0.4.4" sources."string-width-2.1.1" sources."stringstream-0.0.5" sources."strip-ansi-4.0.0" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" - sources."supports-color-5.2.0" + sources."supports-color-5.3.0" sources."term-size-1.2.0" sources."timed-out-4.0.1" sources."tough-cookie-2.3.4" @@ -33433,7 +34109,7 @@ in sources."unique-string-1.0.0" sources."unpipe-1.0.0" sources."unzip-response-2.0.1" - sources."update-notifier-2.3.0" + sources."update-notifier-2.4.0" sources."url-parse-lax-1.0.0" sources."utils-merge-1.0.1" sources."uuid-3.2.1" @@ -33472,10 +34148,10 @@ in js-yaml = nodeEnv.buildNodePackage { name = "js-yaml"; packageName = "js-yaml"; - version = "3.10.0"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz"; - sha512 = "0h26sq1bwxc45bm0hvlcadrbk4bizzaw729wvw690ya7mpys45bqfzdqwhjkdrnq0i44dzxckykz4bix22jfdyfg1asybg3yzczjsrv"; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.11.0.tgz"; + sha512 = "0gka65n4d9gmcy0c8cy5h55r273dbxnw54gibp2nq5mmdmksjgb2nhcdfgfxs1wg3yayyrydn2v79fny7hdyq907dg87vmgjnsnr8mi"; }; dependencies = [ sources."argparse-1.0.10" @@ -33501,7 +34177,7 @@ in }; dependencies = [ sources."JSONStream-1.3.2" - sources."accepts-1.3.4" + sources."accepts-1.3.5" sources."acorn-4.0.13" sources."acorn-node-1.3.0" sources."addressparser-1.0.1" @@ -33528,7 +34204,7 @@ in sources."asn1.js-4.10.1" sources."assert-1.4.1" sources."assert-plus-1.0.0" - sources."ast-types-0.11.2" + sources."ast-types-0.11.3" sources."astw-2.2.0" sources."async-2.1.5" sources."async-each-1.0.1" @@ -33555,7 +34231,11 @@ in sources."blob-0.0.4" sources."bluebird-3.5.1" sources."bn.js-4.11.8" - sources."body-parser-1.18.2" + (sources."body-parser-1.18.2" // { + dependencies = [ + sources."setprototypeof-1.0.3" + ]; + }) sources."boom-4.3.1" sources."brace-expansion-1.1.11" (sources."braces-1.8.5" // { @@ -33564,7 +34244,7 @@ in ]; }) sources."brorand-1.1.0" - sources."browser-pack-6.0.4" + sources."browser-pack-6.1.0" (sources."browser-resolve-1.11.2" // { dependencies = [ sources."resolve-1.1.7" @@ -33572,10 +34252,9 @@ in }) (sources."browserify-14.5.0" // { dependencies = [ - sources."acorn-5.5.0" - sources."combine-source-map-0.7.2" + sources."acorn-5.5.3" sources."hash-base-2.0.2" - sources."isarray-0.0.1" + sources."isarray-2.0.4" sources."process-nextick-args-2.0.0" sources."source-map-0.5.7" ]; @@ -33587,6 +34266,7 @@ in sources."browserify-sign-4.0.4" sources."browserify-zlib-0.2.0" sources."buffer-5.1.0" + sources."buffer-from-1.0.0" sources."buffer-more-ints-0.0.2" sources."buffer-xor-1.0.3" sources."buildmail-4.0.1" @@ -33600,11 +34280,11 @@ in sources."cipher-base-1.0.4" sources."circular-json-0.5.1" sources."co-4.6.0" - sources."colors-1.1.2" + sources."colors-1.2.1" sources."combine-lists-1.0.1" sources."combine-source-map-0.8.0" sources."combined-stream-1.0.6" - sources."commander-2.14.1" + sources."commander-2.15.1" sources."component-bind-1.0.0" sources."component-emitter-1.2.1" sources."component-inherit-0.0.3" @@ -33625,7 +34305,7 @@ in sources."content-type-1.0.4" sources."convert-source-map-1.1.3" sources."cookie-0.3.1" - sources."core-js-2.5.3" + sources."core-js-2.5.4" sources."core-util-is-1.0.2" sources."create-ecdh-4.0.0" sources."create-hash-1.1.3" @@ -33665,7 +34345,7 @@ in sources."debug-3.1.0" ]; }) - (sources."engine.io-client-3.1.5" // { + (sources."engine.io-client-3.1.6" // { dependencies = [ sources."debug-3.1.0" ]; @@ -33735,11 +34415,7 @@ in sources."hmac-drbg-1.0.1" sources."hoek-4.2.1" sources."htmlescape-1.1.1" - (sources."http-errors-1.6.2" // { - dependencies = [ - sources."depd-1.1.1" - ]; - }) + sources."http-errors-1.6.3" sources."http-proxy-1.16.2" sources."http-proxy-agent-1.0.0" sources."http-signature-1.2.0" @@ -33748,13 +34424,17 @@ in sources."https-browserify-1.0.0" sources."https-proxy-agent-1.0.0" sources."iconv-lite-0.4.19" - sources."ieee754-1.1.8" + sources."ieee754-1.1.11" sources."indexof-0.0.1" sources."inflection-1.10.0" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."inline-source-map-0.6.2" - sources."insert-module-globals-7.0.1" + (sources."insert-module-globals-7.0.5" // { + dependencies = [ + sources."concat-stream-1.6.2" + ]; + }) sources."ip-1.0.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" @@ -33785,7 +34465,7 @@ in sources."jsonpointer-4.0.1" sources."jsprim-1.4.1" sources."kind-of-3.2.2" - sources."labeled-stream-splicer-2.0.0" + sources."labeled-stream-splicer-2.0.1" sources."levn-0.3.0" sources."lexical-scope-1.2.0" sources."libbase64-0.1.0" @@ -33845,7 +34525,7 @@ in sources."mkdirp-0.5.1" sources."module-deps-4.1.1" sources."ms-2.0.0" - sources."nan-2.9.2" + sources."nan-2.10.0" sources."negotiator-0.6.1" sources."netmask-1.0.6" sources."node-uuid-1.4.8" @@ -33918,32 +34598,37 @@ in sources."randombytes-2.0.6" sources."randomfill-1.0.4" sources."range-parser-1.2.0" - sources."raw-body-2.3.2" + (sources."raw-body-2.3.2" // { + dependencies = [ + sources."depd-1.1.1" + sources."http-errors-1.6.2" + ]; + }) sources."read-only-stream-2.0.0" - (sources."readable-stream-2.3.4" // { + (sources."readable-stream-2.3.5" // { dependencies = [ sources."isarray-1.0.0" ]; }) sources."readdirp-2.1.0" sources."redis-2.8.0" - sources."redis-commands-1.3.4" + sources."redis-commands-1.3.5" sources."redis-parser-2.6.0" sources."regex-cache-0.4.4" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.2" sources."repeat-string-1.6.1" - sources."request-2.83.0" + sources."request-2.85.0" sources."requestretry-1.13.0" sources."requires-port-1.0.0" - sources."resolve-1.5.0" + sources."resolve-1.6.0" sources."rimraf-2.6.2" sources."ripemd160-2.0.1" sources."safe-buffer-5.1.1" sources."semver-5.5.0" sources."set-immediate-shim-1.0.1" - sources."setprototypeof-1.0.3" - sources."sha.js-2.4.10" + sources."setprototypeof-1.1.0" + sources."sha.js-2.4.11" sources."shasum-1.0.2" sources."shell-quote-1.6.1" sources."slack-node-0.2.0" @@ -33965,11 +34650,11 @@ in sources."socks-1.1.10" sources."socks-proxy-agent-2.1.1" sources."source-map-0.6.1" - sources."sshpk-1.13.1" - sources."statuses-1.4.0" + sources."sshpk-1.14.1" + sources."statuses-1.5.0" sources."stream-browserify-2.0.1" sources."stream-combiner2-1.1.1" - sources."stream-http-2.8.0" + sources."stream-http-2.8.1" sources."stream-splicer-2.0.0" sources."streamroller-0.7.0" sources."string_decoder-1.0.3" @@ -33995,7 +34680,7 @@ in sources."type-is-1.6.16" sources."typedarray-0.0.6" sources."ultron-1.1.1" - sources."umd-3.0.1" + sources."umd-3.0.3" sources."underscore-1.7.0" sources."unpipe-1.0.0" (sources."url-0.11.0" // { @@ -34005,7 +34690,7 @@ in }) (sources."useragent-2.3.0" // { dependencies = [ - sources."lru-cache-4.1.1" + sources."lru-cache-4.1.2" ]; }) (sources."util-0.10.3" // { @@ -34093,7 +34778,7 @@ in sources."etag-1.7.0" (sources."express-3.21.2" // { dependencies = [ - sources."accepts-1.3.4" + sources."accepts-1.3.5" sources."destroy-1.0.3" sources."ms-2.0.0" sources."negotiator-0.6.1" @@ -34178,7 +34863,7 @@ in sources."ms-0.7.1" ]; }) - sources."statuses-1.4.0" + sources."statuses-1.5.0" sources."stream-counter-0.2.0" sources."string_decoder-0.10.31" sources."tsscmp-1.0.5" @@ -34203,19 +34888,19 @@ in lerna = nodeEnv.buildNodePackage { name = "lerna"; packageName = "lerna"; - version = "2.9.0"; + version = "2.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/lerna/-/lerna-2.9.0.tgz"; - sha512 = "18aayy3dsb36bz3rrvbmg1pfvc4zsxqmiax923v738dlp7nw68y5gndi268db91cyzjxwpdimppqfb84z9ywi79mhlak4i73flxgazh"; + url = "https://registry.npmjs.org/lerna/-/lerna-2.9.1.tgz"; + sha512 = "24gcfland5nc7mjhv7qibij72qw9069ppwj262qxc5sd136xsrr6rvc934fj4lpzblvh1w7vcgqvwjx9nrhk6waw8cgxik397vdf1wg"; }; dependencies = [ sources."JSONStream-1.3.2" sources."add-stream-1.0.0" sources."align-text-0.1.4" sources."amdefine-1.0.1" - sources."ansi-escapes-3.0.0" + sources."ansi-escapes-3.1.0" sources."ansi-regex-2.1.1" - sources."ansi-styles-3.2.0" + sources."ansi-styles-3.2.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.4" sources."array-find-index-1.0.2" @@ -34226,19 +34911,20 @@ in sources."async-1.5.2" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" + sources."buffer-from-1.0.0" sources."builtin-modules-1.1.1" sources."byline-5.0.0" sources."camelcase-1.2.1" sources."camelcase-keys-2.1.0" sources."capture-stack-trace-1.0.0" sources."center-align-0.1.3" - sources."chalk-2.3.1" + sources."chalk-2.3.2" sources."chardet-0.4.2" - sources."ci-info-1.1.2" + sources."ci-info-1.1.3" sources."cli-cursor-2.1.0" sources."cli-width-2.2.0" sources."cliui-2.1.0" - sources."clone-1.0.3" + sources."clone-1.0.4" sources."cmd-shim-2.0.2" sources."code-point-at-1.1.0" sources."color-convert-1.9.1" @@ -34247,9 +34933,9 @@ in sources."command-join-2.0.0" sources."compare-func-1.3.2" sources."concat-map-0.0.1" - sources."concat-stream-1.6.0" + sources."concat-stream-1.6.2" sources."console-control-strings-1.1.0" - (sources."conventional-changelog-1.1.17" // { + (sources."conventional-changelog-1.1.23" // { dependencies = [ sources."camelcase-4.1.0" sources."map-obj-1.0.1" @@ -34257,8 +34943,8 @@ in ]; }) sources."conventional-changelog-angular-1.6.6" - sources."conventional-changelog-atom-0.2.4" - (sources."conventional-changelog-cli-1.3.15" // { + sources."conventional-changelog-atom-0.2.8" + (sources."conventional-changelog-cli-1.3.21" // { dependencies = [ sources."camelcase-2.1.1" sources."camelcase-keys-4.2.0" @@ -34281,22 +34967,22 @@ in sources."yargs-3.10.0" ]; }) - sources."conventional-changelog-codemirror-0.3.4" - (sources."conventional-changelog-core-2.0.5" // { + sources."conventional-changelog-codemirror-0.3.8" + (sources."conventional-changelog-core-2.0.10" // { dependencies = [ sources."meow-4.0.0" ]; }) - sources."conventional-changelog-ember-0.3.6" - sources."conventional-changelog-eslint-1.0.4" - sources."conventional-changelog-express-0.3.4" + sources."conventional-changelog-ember-0.3.11" + sources."conventional-changelog-eslint-1.0.9" + sources."conventional-changelog-express-0.3.6" sources."conventional-changelog-jquery-0.1.0" sources."conventional-changelog-jscs-0.1.0" - sources."conventional-changelog-jshint-0.3.4" - sources."conventional-changelog-preset-loader-1.1.6" - sources."conventional-changelog-writer-3.0.4" - sources."conventional-commits-filter-1.1.5" - sources."conventional-commits-parser-2.1.5" + sources."conventional-changelog-jshint-0.3.8" + sources."conventional-changelog-preset-loader-1.1.8" + sources."conventional-changelog-writer-3.0.9" + sources."conventional-commits-filter-1.1.6" + sources."conventional-commits-parser-2.1.7" (sources."conventional-recommended-bump-1.2.1" // { dependencies = [ sources."meow-3.7.0" @@ -34322,7 +35008,7 @@ in sources."error-ex-1.3.1" sources."escape-string-regexp-1.0.5" sources."execa-0.8.0" - sources."external-editor-2.1.0" + sources."external-editor-2.2.0" sources."figures-2.0.0" sources."find-up-2.1.0" sources."fs-extra-4.0.3" @@ -34333,14 +35019,14 @@ in sources."get-port-3.2.0" sources."get-stdin-4.0.1" sources."get-stream-3.0.0" - (sources."git-raw-commits-1.3.4" // { + (sources."git-raw-commits-1.3.6" // { dependencies = [ sources."read-pkg-3.0.0" sources."read-pkg-up-3.0.0" ]; }) sources."git-remote-origin-url-2.0.0" - sources."git-semver-tags-1.3.4" + sources."git-semver-tags-1.3.6" sources."gitconfiglocal-1.0.0" sources."glob-7.1.2" sources."glob-parent-3.1.0" @@ -34354,7 +35040,7 @@ in sources."handlebars-4.0.11" sources."has-flag-3.0.0" sources."has-unicode-2.0.1" - sources."hosted-git-info-2.5.0" + sources."hosted-git-info-2.6.0" sources."iconv-lite-0.4.19" sources."imurmurhash-0.1.4" sources."indent-string-2.1.0" @@ -34387,7 +35073,7 @@ in sources."is-utf8-0.2.1" sources."isarray-1.0.0" sources."isexe-2.0.0" - sources."json-parse-better-errors-1.0.1" + sources."json-parse-better-errors-1.0.2" sources."json-stringify-safe-5.0.1" sources."jsonfile-4.0.0" sources."jsonparse-1.3.1" @@ -34407,8 +35093,8 @@ in sources."lodash.templatesettings-4.1.0" sources."longest-1.0.1" sources."loud-rejection-1.6.0" - sources."lowercase-keys-1.0.0" - sources."lru-cache-4.1.1" + sources."lowercase-keys-1.0.1" + sources."lru-cache-4.1.2" sources."make-dir-1.2.0" sources."map-obj-1.0.1" sources."mem-1.1.0" @@ -34427,8 +35113,8 @@ in sources."minimist-0.0.8" sources."minimist-options-3.0.2" sources."mkdirp-0.5.1" - sources."modify-values-1.0.0" - sources."moment-2.20.1" + sources."modify-values-1.0.1" + sources."moment-2.22.0" sources."mute-stream-0.0.7" sources."normalize-package-data-2.4.0" sources."npm-run-path-2.0.2" @@ -34469,11 +35155,11 @@ in sources."pseudomap-1.0.2" sources."q-1.5.1" sources."quick-lru-1.1.0" - sources."rc-1.2.5" + sources."rc-1.2.6" sources."read-cmd-shim-1.0.1" sources."read-pkg-3.0.0" sources."read-pkg-up-1.0.1" - sources."readable-stream-2.3.4" + sources."readable-stream-2.3.5" sources."redent-1.0.0" sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" @@ -34514,7 +35200,7 @@ in sources."minimist-0.1.0" ]; }) - sources."supports-color-5.2.0" + sources."supports-color-5.3.0" sources."temp-dir-1.0.0" (sources."temp-write-3.4.0" // { dependencies = [ @@ -34651,7 +35337,7 @@ in sources."safe-buffer-5.1.1" sources."sntp-1.0.9" sources."source-map-0.5.7" - (sources."sshpk-1.13.1" // { + (sources."sshpk-1.14.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -34714,14 +35400,14 @@ in sources."kind-of-4.0.0" ]; }) - sources."clone-2.1.1" + sources."clone-2.1.2" sources."clone-buffer-1.0.0" sources."clone-stats-1.0.0" - sources."cloneable-readable-1.0.0" + sources."cloneable-readable-1.1.2" sources."concat-map-0.0.1" sources."convert-source-map-1.5.1" sources."core-util-is-1.0.2" - sources."duplexify-3.5.3" + sources."duplexify-3.5.4" sources."end-of-stream-1.4.1" sources."expand-brackets-0.1.5" sources."expand-range-1.8.2" @@ -34793,7 +35479,7 @@ in }) ]; }) - sources."readable-stream-2.3.4" + sources."readable-stream-2.3.5" sources."regex-cache-0.4.4" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.2" @@ -34810,14 +35496,10 @@ in sources."unique-stream-2.2.1" sources."util-deprecate-1.0.2" sources."vali-date-1.0.0" - (sources."vinyl-2.1.0" // { - dependencies = [ - sources."process-nextick-args-1.0.7" - ]; - }) + sources."vinyl-2.1.0" (sources."vinyl-fs-2.4.4" // { dependencies = [ - sources."clone-1.0.3" + sources."clone-1.0.4" sources."clone-stats-0.0.1" sources."is-extglob-1.0.0" sources."is-glob-2.0.1" @@ -34848,7 +35530,7 @@ in sha512 = "3pnrrz3blfy50s64c4wdj9gjl8zv3p72wd0vmrk86qjdd676g9sj4cwywp356r633csg568pczll7pfb6sxpm0x9fvbk4zhwvdpb70b"; }; dependencies = [ - sources."accepts-1.3.4" + sources."accepts-1.3.5" sources."after-0.8.2" sources."ajv-5.5.2" sources."anymatch-1.3.2" @@ -34873,7 +35555,11 @@ in sources."better-assert-1.0.2" sources."binary-extensions-1.11.0" sources."blob-0.0.4" - sources."body-parser-1.18.2" + (sources."body-parser-1.18.2" // { + dependencies = [ + sources."setprototypeof-1.0.3" + ]; + }) sources."boom-4.3.1" sources."brace-expansion-1.1.11" (sources."braces-1.8.5" // { @@ -34910,26 +35596,17 @@ in sources."ee-first-1.1.1" sources."emoji-regex-6.1.1" sources."encodeurl-1.0.2" - (sources."engine.io-3.1.5" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) - (sources."engine.io-client-3.1.5" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) + sources."engine.io-3.2.0" + sources."engine.io-client-3.2.1" sources."engine.io-parser-2.1.2" sources."entities-1.1.1" sources."escape-html-1.0.3" sources."etag-1.8.1" sources."expand-brackets-0.1.5" sources."expand-range-1.8.2" - (sources."express-4.16.2" // { + (sources."express-4.16.3" // { dependencies = [ - sources."setprototypeof-1.1.0" - sources."statuses-1.3.1" + sources."statuses-1.4.0" ]; }) sources."extend-3.0.1" @@ -34939,7 +35616,7 @@ in sources."fast-json-stable-stringify-2.0.0" sources."filename-regex-2.0.1" sources."fill-range-2.2.3" - sources."finalhandler-1.1.0" + sources."finalhandler-1.1.1" sources."for-in-1.0.2" sources."for-own-0.1.5" sources."forever-agent-0.6.1" @@ -34959,16 +35636,12 @@ in sources."hawk-6.0.2" sources."hoek-4.2.1" sources."html-entities-1.2.1" - (sources."http-errors-1.6.2" // { - dependencies = [ - sources."depd-1.1.1" - ]; - }) + sources."http-errors-1.6.3" sources."http-signature-1.2.0" sources."iconv-lite-0.4.19" sources."indexof-0.0.1" sources."inherits-2.0.3" - sources."innertext-1.0.2" + sources."innertext-1.0.3" sources."ipaddr.js-1.6.0" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" @@ -35007,14 +35680,14 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.0" sources."ms-2.0.0" - sources."nan-2.9.2" + sources."nan-2.10.0" sources."negotiator-0.6.1" sources."normalize-path-2.1.1" sources."oauth-sign-0.8.2" sources."object-component-0.0.3" sources."object.omit-2.0.1" sources."on-finished-2.3.0" - sources."opn-5.2.0" + sources."opn-5.3.0" sources."parse-glob-3.0.4" sources."parseqs-0.0.5" sources."parseuri-0.0.5" @@ -35037,35 +35710,37 @@ in ]; }) sources."range-parser-1.2.0" - sources."raw-body-2.3.2" - sources."readable-stream-2.3.4" + (sources."raw-body-2.3.2" // { + dependencies = [ + sources."depd-1.1.1" + sources."http-errors-1.6.2" + ]; + }) + sources."readable-stream-2.3.5" sources."readdirp-2.1.0" sources."regex-cache-0.4.4" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.2" sources."repeat-string-1.6.1" - sources."request-2.83.0" + sources."request-2.85.0" sources."safe-buffer-5.1.1" - sources."send-0.16.1" - sources."serve-static-1.13.1" + sources."send-0.16.2" + sources."serve-static-1.13.2" sources."set-immediate-shim-1.0.1" - sources."setprototypeof-1.0.3" + sources."setprototypeof-1.1.0" sources."sntp-2.1.0" - (sources."socket.io-2.0.4" // { + (sources."socket.io-2.1.0" // { dependencies = [ + sources."debug-3.1.0" sources."isarray-2.0.1" ]; }) sources."socket.io-adapter-1.1.1" - sources."socket.io-client-2.0.4" - (sources."socket.io-parser-3.1.3" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) + sources."socket.io-client-2.1.0" + sources."socket.io-parser-3.2.0" sources."sprintf-js-1.0.3" - sources."sshpk-1.13.1" - sources."statuses-1.4.0" + sources."sshpk-1.14.1" + sources."statuses-1.5.0" sources."string_decoder-1.0.3" sources."stringstream-0.0.5" sources."to-array-0.1.4" @@ -35079,7 +35754,6 @@ in sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uuid-3.2.1" - sources."uws-9.14.0" sources."vary-1.1.2" sources."verror-1.10.0" sources."ws-3.3.3" @@ -35104,7 +35778,7 @@ in sha1 = "4498644bbf81a66f18dd8dffdef61c4c1c374ca3"; }; dependencies = [ - sources."accepts-1.3.4" + sources."accepts-1.3.5" sources."anymatch-1.3.2" sources."apache-crypt-1.2.1" sources."apache-md5-1.1.2" @@ -35124,7 +35798,7 @@ in ]; }) sources."chokidar-1.7.0" - sources."colors-1.1.2" + sources."colors-1.2.1" sources."concat-map-0.0.1" sources."connect-3.5.1" sources."core-util-is-1.0.2" @@ -35154,12 +35828,8 @@ in sources."glob-parent-2.0.0" sources."graceful-fs-4.1.11" sources."http-auth-3.1.3" - (sources."http-errors-1.6.2" // { - dependencies = [ - sources."depd-1.1.1" - ]; - }) - sources."http-parser-js-0.4.10" + sources."http-errors-1.6.3" + sources."http-parser-js-0.4.11" sources."inherits-2.0.3" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" @@ -35188,14 +35858,14 @@ in ]; }) sources."ms-0.7.1" - sources."nan-2.9.2" + sources."nan-2.10.0" sources."negotiator-0.6.1" sources."normalize-path-2.1.1" sources."object-assign-4.1.1" sources."object.omit-2.0.1" sources."on-finished-2.3.0" sources."on-headers-1.0.1" - sources."opn-5.2.0" + sources."opn-5.3.0" sources."parse-glob-3.0.4" sources."parseurl-1.3.2" sources."path-is-absolute-1.0.1" @@ -35213,7 +35883,7 @@ in ]; }) sources."range-parser-1.2.0" - sources."readable-stream-2.3.4" + sources."readable-stream-2.3.5" sources."readdirp-2.1.0" sources."regex-cache-0.4.4" sources."remove-trailing-separator-1.1.0" @@ -35234,7 +35904,7 @@ in ]; }) sources."set-immediate-shim-1.0.1" - sources."setprototypeof-1.0.3" + sources."setprototypeof-1.1.0" sources."split-0.3.3" sources."statuses-1.3.1" sources."stream-combiner-0.0.4" @@ -35297,19 +35967,19 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "5.0.1"; + version = "5.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-5.0.1.tgz"; - sha512 = "2975gb84ixyiin9mdahnmpxxqmn9zmc7d07hh6kv0bnl3mqf6slj83r1f44hvk9f5qk247ajfdmynbyinabrbfi0j8za4v776i3572a"; + url = "https://registry.npmjs.org/mocha/-/mocha-5.0.5.tgz"; + sha512 = "20cyp9x4b3gfrd50w8dcfkm0dv2mc6z0ikvfpkc8dzca6hppslgn0yiw2qdzc4ggf234kzcdvs0hw7lnv7ywilaml4w39vr6r93ghyw"; }; dependencies = [ sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" - sources."browser-stdout-1.3.0" + sources."browser-stdout-1.3.1" sources."commander-2.11.0" sources."concat-map-0.0.1" sources."debug-3.1.0" - sources."diff-3.3.1" + sources."diff-3.5.0" sources."escape-string-regexp-1.0.5" sources."fs.realpath-1.0.0" sources."glob-7.1.2" @@ -35348,7 +36018,7 @@ in sources."argparse-1.0.10" sources."asynckit-0.4.0" sources."combined-stream-1.0.6" - sources."commander-2.14.1" + sources."commander-2.15.1" sources."component-emitter-1.2.1" sources."cookiejar-2.1.1" sources."core-util-is-1.0.2" @@ -35357,11 +36027,11 @@ in sources."esprima-4.0.0" sources."extend-3.0.1" sources."form-data-2.3.2" - sources."formidable-1.1.1" + sources."formidable-1.2.1" sources."graphlib-2.1.5" sources."inherits-2.0.3" sources."isarray-1.0.0" - sources."js-yaml-3.10.0" + sources."js-yaml-3.11.0" sources."json-refs-2.1.7" sources."lodash-4.17.5" sources."methods-1.1.2" @@ -35374,7 +36044,7 @@ in sources."process-nextick-args-2.0.0" sources."punycode-2.1.0" sources."qs-6.5.1" - sources."readable-stream-2.3.4" + sources."readable-stream-2.3.5" sources."safe-buffer-5.1.1" sources."slash-1.0.0" sources."sprintf-js-1.0.3" @@ -35415,10 +36085,10 @@ in node2nix = nodeEnv.buildNodePackage { name = "node2nix"; packageName = "node2nix"; - version = "1.5.2"; + version = "1.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/node2nix/-/node2nix-1.5.2.tgz"; - sha512 = "2mvfkqyzfcjfp429vmagcshlp9iqblngn9fslcxpg2n83k6ajwlh0gcnyiypsixpws8nq14d3b3syr9implhsq98wg3zw7nj6b6sg9f"; + url = "https://registry.npmjs.org/node2nix/-/node2nix-1.5.3.tgz"; + sha512 = "1nwm3hvx3ybg10mzn5sysdgxii42975v6gyrzjb79s46lhk67ndf1fcrlrxcfaiyj9a997hz2zk9ysm0qclxsd5nziwm01myv95z262"; }; dependencies = [ sources."abbrev-1.1.1" @@ -35434,13 +36104,14 @@ in sources."base64-js-1.2.3" sources."bcrypt-pbkdf-1.0.1" sources."boom-4.3.1" + sources."buffer-from-1.0.0" sources."builtin-modules-1.1.1" sources."builtins-1.0.3" sources."caseless-0.12.0" sources."co-4.6.0" sources."code-point-at-1.1.0" sources."combined-stream-1.0.6" - sources."concat-stream-1.6.0" + sources."concat-stream-1.6.2" sources."config-chain-1.1.11" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" @@ -35475,7 +36146,7 @@ in sources."has-unicode-2.0.1" sources."hawk-6.0.2" sources."hoek-4.2.1" - sources."hosted-git-info-2.5.0" + sources."hosted-git-info-2.6.0" sources."http-signature-1.2.0" sources."inherits-2.0.3" sources."ini-1.3.5" @@ -35493,15 +36164,15 @@ in sources."mime-db-1.33.0" sources."mime-types-2.1.18" sources."minimist-0.0.8" - sources."minipass-2.2.1" + sources."minipass-2.2.4" sources."minizlib-1.1.0" sources."mkdirp-0.5.1" sources."ncp-0.4.2" sources."nijs-0.0.25" sources."nopt-3.0.6" sources."normalize-package-data-2.4.0" - sources."npm-package-arg-5.1.2" - sources."npm-registry-client-8.5.0" + sources."npm-package-arg-6.0.0" + sources."npm-registry-client-8.5.1" (sources."npmconf-2.1.2" // { dependencies = [ sources."once-1.3.3" @@ -35522,8 +36193,8 @@ in sources."proto-list-1.2.4" sources."punycode-1.4.1" sources."qs-6.5.1" - sources."readable-stream-2.3.4" - sources."request-2.83.0" + sources."readable-stream-2.3.5" + sources."request-2.85.0" sources."retry-0.10.1" sources."rimraf-2.2.8" sources."safe-buffer-5.1.1" @@ -35537,8 +36208,8 @@ in sources."spdx-exceptions-2.1.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.0" - sources."sshpk-1.13.1" - sources."ssri-4.1.6" + sources."sshpk-1.14.1" + sources."ssri-5.3.0" sources."string-width-1.0.2" sources."string_decoder-1.0.3" sources."stringstream-0.0.5" @@ -35555,7 +36226,7 @@ in sources."validate-npm-package-license-3.0.3" sources."validate-npm-package-name-3.0.0" sources."verror-1.10.0" - sources."walk-2.3.9" + sources."walk-2.3.13" sources."wide-align-1.1.2" sources."wrappy-1.0.2" sources."yallist-3.0.2" @@ -35658,15 +36329,15 @@ in sources."process-nextick-args-2.0.0" sources."punycode-1.4.1" sources."qs-6.5.1" - sources."readable-stream-2.3.4" - sources."request-2.83.0" + sources."readable-stream-2.3.5" + sources."request-2.85.0" sources."rimraf-2.6.2" sources."safe-buffer-5.1.1" sources."semver-5.3.0" sources."set-blocking-2.0.0" sources."signal-exit-3.0.2" sources."sntp-2.1.0" - sources."sshpk-1.13.1" + sources."sshpk-1.14.1" sources."string-width-1.0.2" sources."string_decoder-1.0.3" sources."stringstream-0.0.5" @@ -35694,10 +36365,10 @@ in node-gyp-build = nodeEnv.buildNodePackage { name = "node-gyp-build"; packageName = "node-gyp-build"; - version = "3.2.2"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.2.2.tgz"; - sha512 = "34hwi28wvvh5nn8bv71n0fb83xjyk84jsn8j9zgkaqnfigpv2hk6fs9jaffsn7qi3yi4n7iwd9yjyagd1rh74ckzdf5s6l59b8vzidp"; + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.3.0.tgz"; + sha512 = "0vkilw1ghsjca0lrj9gsdgsi8wj4bvpfr25q1qzx1kp5hhvjdhapmvpmrd2hikwq9dxydw6sdvv0730wwvmsg36xqf0hgp9777l3ns8"; }; buildInputs = globalBuildInputs; meta = { @@ -35718,7 +36389,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."accepts-1.3.4" + sources."accepts-1.3.5" sources."after-0.8.2" sources."ajv-4.11.8" sources."ansi-regex-2.1.1" @@ -35740,7 +36411,7 @@ in sources."yargs-1.3.3" ]; }) - sources."big-integer-1.6.26" + sources."big-integer-1.6.27" sources."block-stream-0.0.9" (sources."body-parser-1.18.2" // { dependencies = [ @@ -35789,10 +36460,10 @@ in sources."error-ex-1.3.1" sources."escape-html-1.0.3" sources."etag-1.8.1" - sources."express-4.16.2" + sources."express-4.16.3" sources."extend-3.0.1" sources."extsprintf-1.3.0" - sources."finalhandler-1.1.0" + sources."finalhandler-1.1.1" sources."find-up-1.1.2" sources."forever-agent-0.6.1" sources."form-data-2.1.4" @@ -35812,12 +36483,8 @@ in sources."hawk-3.1.3" sources."headless-0.1.7" sources."hoek-2.16.3" - sources."hosted-git-info-2.5.0" - (sources."http-errors-1.6.2" // { - dependencies = [ - sources."depd-1.1.1" - ]; - }) + sources."hosted-git-info-2.6.0" + sources."http-errors-1.6.3" sources."http-signature-1.1.1" sources."iconv-lite-0.4.19" sources."indent-string-2.1.0" @@ -35861,7 +36528,7 @@ in sources."minimist-1.2.0" sources."mkdirp-0.5.1" sources."ms-2.0.0" - sources."nan-2.9.2" + sources."nan-2.10.0" sources."negotiator-0.6.1" sources."node-pre-gyp-0.6.39" sources."nopt-4.0.1" @@ -35897,20 +36564,29 @@ in sources."punycode-1.4.1" sources."qs-6.5.1" sources."range-parser-1.2.0" - sources."raw-body-2.3.2" - sources."rc-1.2.5" + (sources."raw-body-2.3.2" // { + dependencies = [ + sources."depd-1.1.1" + sources."http-errors-1.6.2" + ]; + }) + sources."rc-1.2.6" sources."read-pkg-1.1.0" sources."read-pkg-up-1.0.1" - sources."readable-stream-2.3.4" + sources."readable-stream-2.3.5" sources."redent-1.0.0" sources."repeating-2.0.1" sources."request-2.81.0" sources."rimraf-2.2.8" sources."safe-buffer-5.1.1" sources."semver-4.3.6" - sources."send-0.16.1" - sources."serve-favicon-2.4.5" - sources."serve-static-1.13.1" + sources."send-0.16.2" + (sources."serve-favicon-2.5.0" // { + dependencies = [ + sources."ms-2.1.1" + ]; + }) + sources."serve-static-1.13.2" sources."set-blocking-2.0.0" sources."setprototypeof-1.1.0" sources."signal-exit-3.0.2" @@ -35919,12 +36595,12 @@ in sources."spdx-exceptions-2.1.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.0" - (sources."sshpk-1.13.1" // { + (sources."sshpk-1.14.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) - sources."statuses-1.3.1" + sources."statuses-1.4.0" sources."string-width-1.0.2" sources."string_decoder-1.0.3" sources."stringstream-0.0.5" @@ -35986,130 +36662,79 @@ in node-pre-gyp = nodeEnv.buildNodePackage { name = "node-pre-gyp"; packageName = "node-pre-gyp"; - version = "0.6.39"; + version = "0.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz"; - sha512 = "2cwrivwc0ha272cly9r61bbb14kkl1s1hsmn53yr88b6pfjqj512nac6c5rphc6ak88v8gpl1f879qdd3v7386103zzr7miibpmbhis"; + url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.9.0.tgz"; + sha1 = "bdd4c3afac9b1b1ebff0a9ff3362859eb6781bb8"; }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-4.11.8" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.4" - sources."asn1-0.2.3" - sources."assert-plus-0.2.0" - sources."asynckit-0.4.0" - sources."aws-sign2-0.6.0" - sources."aws4-1.6.0" sources."balanced-match-1.0.0" - sources."bcrypt-pbkdf-1.0.1" - sources."block-stream-0.0.9" - sources."boom-2.10.1" sources."brace-expansion-1.1.11" - sources."caseless-0.12.0" - sources."co-4.6.0" + sources."chownr-1.0.1" sources."code-point-at-1.1.0" - sources."combined-stream-1.0.6" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" - sources."cryptiles-2.0.5" - sources."dashdash-1.14.1" sources."debug-2.6.9" sources."deep-extend-0.4.2" - sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."detect-libc-1.0.3" - sources."ecc-jsbn-0.1.1" - sources."extend-3.0.1" - sources."extsprintf-1.3.0" - sources."forever-agent-0.6.1" - sources."form-data-2.1.4" + sources."fs-minipass-1.2.5" sources."fs.realpath-1.0.0" - sources."fstream-1.0.11" - sources."fstream-ignore-1.0.5" sources."gauge-2.7.4" - sources."getpass-0.1.7" sources."glob-7.1.2" - sources."graceful-fs-4.1.11" - sources."har-schema-1.0.5" - sources."har-validator-4.2.1" sources."has-unicode-2.0.1" - sources."hawk-3.1.3" - sources."hoek-2.16.3" - sources."http-signature-1.1.1" + sources."iconv-lite-0.4.19" + sources."ignore-walk-3.0.1" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.5" sources."is-fullwidth-code-point-1.0.0" - sources."is-typedarray-1.0.0" sources."isarray-1.0.0" - sources."isstream-0.1.2" - sources."jsbn-0.1.1" - sources."json-schema-0.2.3" - sources."json-stable-stringify-1.0.1" - sources."json-stringify-safe-5.0.1" - sources."jsonify-0.0.0" - (sources."jsprim-1.4.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - sources."mime-db-1.33.0" - sources."mime-types-2.1.18" sources."minimatch-3.0.4" sources."minimist-0.0.8" + sources."minipass-2.2.4" + sources."minizlib-1.1.0" sources."mkdirp-0.5.1" sources."ms-2.0.0" + sources."needle-2.2.0" sources."nopt-4.0.1" + sources."npm-bundled-1.0.3" + sources."npm-packlist-1.1.10" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" - sources."oauth-sign-0.8.2" sources."object-assign-4.1.1" sources."once-1.4.0" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" sources."path-is-absolute-1.0.1" - sources."performance-now-0.2.0" sources."process-nextick-args-2.0.0" - sources."punycode-1.4.1" - sources."qs-6.4.0" - (sources."rc-1.2.5" // { + (sources."rc-1.2.6" // { dependencies = [ sources."minimist-1.2.0" ]; }) - sources."readable-stream-2.3.4" - sources."request-2.81.0" + sources."readable-stream-2.3.5" sources."rimraf-2.6.2" sources."safe-buffer-5.1.1" + sources."sax-1.2.4" sources."semver-5.5.0" sources."set-blocking-2.0.0" sources."signal-exit-3.0.2" - sources."sntp-1.0.9" - (sources."sshpk-1.13.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) sources."string-width-1.0.2" sources."string_decoder-1.0.3" - sources."stringstream-0.0.5" sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" - sources."tar-2.2.1" - sources."tar-pack-3.4.1" - sources."tough-cookie-2.3.4" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" - sources."uid-number-0.0.6" + sources."tar-4.4.1" sources."util-deprecate-1.0.2" - sources."uuid-3.2.1" - sources."verror-1.10.0" sources."wide-align-1.1.2" sources."wrappy-1.0.2" + sources."yallist-3.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -36123,16 +36748,16 @@ in nodemon = nodeEnv.buildNodePackage { name = "nodemon"; packageName = "nodemon"; - version = "1.17.1"; + version = "1.17.3"; src = fetchurl { - url = "https://registry.npmjs.org/nodemon/-/nodemon-1.17.1.tgz"; - sha512 = "2dnscknr22xf5r06zcrjz0ljaa2agbrnczh4faf42qsmqfpcng6znv6138nwyyr16fpqk28wgfab1bw3snrsyfz8pirmjl9ywdqibx7"; + url = "https://registry.npmjs.org/nodemon/-/nodemon-1.17.3.tgz"; + sha512 = "1i6m13ad9c1p8xilw0vjcgmj0nnk1y9b3lncx6kwljxw89hmk5z9vv8m452wfd5qg9bqf9r0b236d9vxbc3i2sx2flamfrr03xm42zh"; }; dependencies = [ sources."abbrev-1.1.1" sources."ansi-align-2.0.0" sources."ansi-regex-3.0.0" - sources."ansi-styles-3.2.0" + sources."ansi-styles-3.2.1" (sources."anymatch-2.0.0" // { dependencies = [ sources."is-accessor-descriptor-1.0.0" @@ -36147,7 +36772,7 @@ in sources."array-unique-0.3.2" sources."assign-symbols-1.0.0" sources."async-each-1.0.1" - sources."atob-2.0.3" + sources."atob-2.1.0" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -36172,8 +36797,8 @@ in sources."cache-base-1.0.1" sources."camelcase-4.1.0" sources."capture-stack-trace-1.0.0" - sources."chalk-2.3.1" - (sources."chokidar-2.0.2" // { + sources."chalk-2.3.2" + (sources."chokidar-2.0.3" // { dependencies = [ sources."debug-2.6.9" sources."define-property-1.0.0" @@ -36198,6 +36823,7 @@ in }) ]; }) + sources."ci-info-1.1.3" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" @@ -36209,7 +36835,7 @@ in sources."color-name-1.1.3" sources."component-emitter-1.2.1" sources."concat-map-0.0.1" - sources."configstore-3.1.1" + sources."configstore-3.1.2" sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" @@ -36264,6 +36890,7 @@ in sources."is-accessor-descriptor-1.0.0" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" + sources."is-ci-1.1.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-extendable-1.0.1" @@ -36286,14 +36913,13 @@ in sources."isobject-3.0.1" sources."kind-of-6.0.2" sources."latest-version-3.1.0" - sources."lazy-cache-2.0.2" - sources."lowercase-keys-1.0.0" - sources."lru-cache-4.1.1" + sources."lowercase-keys-1.0.1" + sources."lru-cache-4.1.2" sources."make-dir-1.2.0" sources."map-cache-0.2.2" sources."map-stream-0.1.0" sources."map-visit-1.0.0" - (sources."micromatch-3.1.9" // { + (sources."micromatch-3.1.10" // { dependencies = [ (sources."is-accessor-descriptor-0.1.6" // { dependencies = [ @@ -36313,7 +36939,7 @@ in sources."minimist-1.2.0" sources."mixin-deep-1.3.1" sources."ms-2.0.0" - sources."nan-2.9.2" + sources."nan-2.10.0" sources."nanomatch-1.2.9" sources."nopt-1.0.10" sources."normalize-path-2.1.1" @@ -36336,8 +36962,8 @@ in sources."ps-tree-1.1.0" sources."pseudomap-1.0.2" sources."pstree.remy-1.1.0" - sources."rc-1.2.5" - sources."readable-stream-2.3.4" + sources."rc-1.2.6" + sources."readable-stream-2.3.5" sources."readdirp-2.1.0" sources."regex-not-1.0.2" sources."registry-auth-token-3.3.2" @@ -36351,13 +36977,12 @@ in sources."safe-regex-1.1.0" sources."semver-5.5.0" sources."semver-diff-2.1.0" - sources."set-getter-0.1.0" sources."set-immediate-shim-1.0.1" sources."set-value-2.0.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" - (sources."snapdragon-0.8.1" // { + (sources."snapdragon-0.8.2" // { dependencies = [ (sources."define-property-0.2.5" // { dependencies = [ @@ -36391,7 +37016,7 @@ in sources."strip-ansi-4.0.0" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" - sources."supports-color-5.2.0" + sources."supports-color-5.3.0" sources."term-size-1.2.0" sources."through-2.3.8" sources."timed-out-4.0.1" @@ -36421,10 +37046,14 @@ in }) sources."unzip-response-2.0.1" sources."upath-1.0.4" - sources."update-notifier-2.3.0" + sources."update-notifier-2.4.0" sources."urix-0.1.0" sources."url-parse-lax-1.0.0" - sources."use-2.0.2" + (sources."use-3.1.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) sources."util-deprecate-1.0.2" sources."which-1.3.0" sources."widest-line-2.0.0" @@ -36451,11 +37080,10 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."accepts-1.3.4" + sources."accepts-1.3.5" sources."addressparser-0.3.2" sources."ajv-5.5.2" sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" sources."append-field-0.1.0" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.4" @@ -36463,49 +37091,29 @@ in sources."array-flatten-1.1.1" sources."array-indexofobject-0.0.1" sources."asn1-0.2.3" - sources."assert-plus-0.2.0" + sources."assert-plus-1.0.0" sources."async-0.1.22" sources."async-limiter-1.0.0" sources."asynckit-0.4.0" - sources."aws-sign2-0.6.0" + sources."aws-sign2-0.7.0" sources."aws4-1.6.0" sources."balanced-match-1.0.0" sources."basic-auth-2.0.0" - (sources."bcrypt-1.0.3" // { - dependencies = [ - sources."assert-plus-1.0.0" - sources."aws-sign2-0.7.0" - sources."boom-4.3.1" - sources."caseless-0.12.0" - (sources."cryptiles-3.1.2" // { - dependencies = [ - sources."boom-5.2.0" - ]; - }) - sources."form-data-2.3.2" - sources."har-validator-5.0.3" - sources."hawk-6.0.2" - sources."hoek-4.2.1" - sources."http-signature-1.2.0" - sources."request-2.83.0" - sources."sntp-2.1.0" - sources."tunnel-agent-0.6.0" - ]; - }) + sources."bcrypt-1.0.3" sources."bcrypt-pbkdf-1.0.1" sources."bcryptjs-2.4.3" - sources."bl-1.2.1" + sources."bl-1.2.2" sources."block-stream-0.0.9" sources."body-parser-1.18.2" sources."boolbase-1.0.0" - sources."boom-2.10.1" + sources."boom-4.3.1" sources."brace-expansion-1.1.11" + sources."buffer-from-1.0.0" sources."buildmail-2.0.0" sources."busboy-0.2.14" sources."bytes-3.0.0" sources."callback-stream-1.1.0" - sources."caseless-0.11.0" - sources."chalk-1.1.3" + sources."caseless-0.12.0" (sources."cheerio-0.22.0" // { dependencies = [ sources."domelementtype-1.1.3" @@ -36515,10 +37123,10 @@ in sources."co-4.6.0" sources."code-point-at-1.1.0" sources."combined-stream-1.0.6" - sources."commander-2.14.1" + sources."commander-2.13.0" sources."commist-1.0.0" sources."concat-map-0.0.1" - sources."concat-stream-1.6.0" + sources."concat-stream-1.6.2" sources."console-control-strings-1.1.0" sources."content-disposition-0.5.2" sources."content-type-1.0.4" @@ -36530,7 +37138,11 @@ in sources."cors-2.8.4" sources."crc-3.4.4" sources."cron-1.3.0" - sources."cryptiles-2.0.5" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) sources."css-select-1.2.0" sources."css-what-2.1.0" sources."dashdash-1.14.1" @@ -36545,7 +37157,7 @@ in sources."domelementtype-1.3.0" sources."domhandler-2.4.1" sources."domutils-1.5.1" - sources."duplexify-3.5.3" + sources."duplexify-3.5.4" sources."ecc-jsbn-0.1.1" sources."ee-first-1.1.1" sources."encodeurl-1.0.2" @@ -36558,7 +37170,6 @@ in sources."etag-1.8.1" (sources."express-4.16.2" // { dependencies = [ - sources."setprototypeof-1.1.0" sources."statuses-1.3.1" ]; }) @@ -36567,7 +37178,7 @@ in sources."extsprintf-1.3.0" sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" - sources."feedparser-1.1.3" + sources."feedparser-2.2.9" sources."finalhandler-1.1.0" (sources."follow-redirects-1.3.0" // { dependencies = [ @@ -36575,7 +37186,7 @@ in ]; }) sources."forever-agent-0.6.1" - sources."form-data-1.0.1" + sources."form-data-2.3.2" sources."forwarded-0.1.2" sources."fresh-0.5.2" sources."fs-extra-5.0.0" @@ -36584,32 +37195,25 @@ in sources."fstream-1.0.11" sources."fstream-ignore-1.0.5" sources."gauge-2.7.4" - sources."generate-function-2.0.0" - sources."generate-object-property-1.2.0" sources."getpass-0.1.7" sources."glob-7.1.2" sources."glob-parent-3.1.0" sources."glob-stream-6.1.0" sources."graceful-fs-4.1.11" sources."har-schema-2.0.0" - sources."har-validator-2.0.6" - sources."has-ansi-2.0.0" + sources."har-validator-5.0.3" sources."has-unicode-2.0.1" sources."hash-sum-1.0.2" - sources."hawk-3.1.3" + sources."hawk-6.0.2" sources."help-me-1.1.0" - sources."hoek-2.16.3" + sources."hoek-4.2.1" (sources."htmlparser2-3.9.2" // { dependencies = [ sources."domelementtype-1.3.0" ]; }) - (sources."http-errors-1.6.2" // { - dependencies = [ - sources."depd-1.1.1" - ]; - }) - sources."http-signature-1.1.1" + sources."http-errors-1.6.3" + sources."http-signature-1.2.0" sources."i18next-1.10.6" sources."i18next-client-1.10.3" sources."iconv-lite-0.4.19" @@ -36622,10 +37226,7 @@ in sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-1.0.0" sources."is-glob-3.1.0" - sources."is-my-ip-valid-1.0.0" - sources."is-my-json-valid-2.17.2" sources."is-negated-glob-1.0.0" - sources."is-property-1.0.2" sources."is-relative-1.0.0" sources."is-typedarray-1.0.0" sources."is-unc-path-1.0.0" @@ -36643,31 +37244,29 @@ in sources."jsonata-1.5.0" sources."jsonfile-4.0.0" sources."jsonify-0.0.0" - sources."jsonpointer-4.0.1" - (sources."jsprim-1.4.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."jsprim-1.4.1" sources."keygrip-1.0.2" sources."leven-1.0.2" sources."libbase64-0.1.0" sources."libmime-1.2.0" sources."libqp-1.1.0" - sources."lodash-4.17.5" + sources."lodash.assign-4.2.0" sources."lodash.assignin-4.2.0" sources."lodash.bind-4.2.1" sources."lodash.defaults-4.2.0" sources."lodash.filter-4.6.0" sources."lodash.flatten-4.4.0" sources."lodash.foreach-4.5.0" + sources."lodash.get-4.4.2" + sources."lodash.has-4.5.2" sources."lodash.map-4.6.0" sources."lodash.merge-4.6.1" sources."lodash.pick-4.4.0" sources."lodash.reduce-4.6.0" sources."lodash.reject-4.6.0" sources."lodash.some-4.6.0" - sources."lru-cache-4.1.1" + sources."lodash.uniq-4.5.0" + sources."lru-cache-4.1.2" (sources."mailcomposer-2.1.0" // { dependencies = [ sources."needle-0.10.0" @@ -36689,7 +37288,7 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.0" sources."mkdirp-0.5.1" - sources."moment-2.20.1" + sources."moment-2.22.0" sources."moment-timezone-0.5.14" (sources."mqtt-2.15.1" // { dependencies = [ @@ -36697,6 +37296,7 @@ in ]; }) sources."mqtt-packet-5.5.0" + sources."mri-1.1.0" sources."ms-2.0.0" (sources."multer-1.3.0" // { dependencies = [ @@ -36712,10 +37312,10 @@ in sources."needle-0.11.0" sources."negotiator-0.6.1" sources."node-pre-gyp-0.6.36" - (sources."node-red-node-email-0.1.24" // { + (sources."node-red-node-email-0.1.27" // { dependencies = [ sources."addressparser-1.0.1" - sources."clone-1.0.3" + sources."clone-1.0.4" sources."isarray-0.0.1" sources."minimist-0.0.10" sources."readable-stream-1.1.14" @@ -36723,41 +37323,13 @@ in sources."string_decoder-0.10.31" ]; }) - (sources."node-red-node-feedparser-0.1.8" // { + (sources."node-red-node-feedparser-0.1.12" // { dependencies = [ - sources."addressparser-0.1.3" - sources."async-2.6.0" - sources."bl-1.1.2" - sources."isarray-0.0.1" - sources."process-nextick-args-1.0.7" - sources."qs-6.2.3" - sources."readable-stream-1.0.34" - sources."string_decoder-0.10.31" + sources."addressparser-1.0.1" ]; }) - sources."node-red-node-rbe-0.2.1" - (sources."node-red-node-twitter-0.1.12" // { - dependencies = [ - sources."assert-plus-1.0.0" - sources."aws-sign2-0.7.0" - sources."boom-4.3.1" - sources."caseless-0.12.0" - (sources."cryptiles-3.1.2" // { - dependencies = [ - sources."boom-5.2.0" - ]; - }) - sources."form-data-2.3.2" - sources."har-validator-5.0.3" - sources."hawk-6.0.2" - sources."hoek-4.2.1" - sources."http-signature-1.2.0" - sources."request-2.83.0" - sources."sntp-2.1.0" - sources."tunnel-agent-0.6.0" - ]; - }) - sources."node-uuid-1.4.8" + sources."node-red-node-rbe-0.2.3" + sources."node-red-node-twitter-0.1.13" sources."nodemailer-1.11.0" sources."nodemailer-direct-transport-1.1.0" sources."nodemailer-smtp-transport-1.1.0" @@ -36789,8 +37361,6 @@ in sources."path-to-regexp-0.1.7" sources."pause-0.0.1" sources."performance-now-2.1.0" - sources."pinkie-2.0.4" - sources."pinkie-promise-2.0.1" sources."poplib-0.1.7" sources."process-nextick-args-2.0.0" sources."proxy-addr-2.0.3" @@ -36801,39 +37371,36 @@ in sources."qs-6.5.1" sources."random-bytes-1.0.0" sources."range-parser-1.2.0" - sources."raw-body-2.3.2" - sources."rc-1.2.5" - sources."readable-stream-2.3.4" - sources."reinterval-1.1.0" - sources."remove-trailing-separator-1.1.0" - (sources."request-2.74.0" // { + (sources."raw-body-2.3.2" // { dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.0.6" + sources."depd-1.1.1" + sources."http-errors-1.6.2" + sources."setprototypeof-1.0.3" ]; }) + sources."rc-1.2.6" + sources."readable-stream-2.3.5" + sources."reinterval-1.1.0" + sources."remove-trailing-separator-1.1.0" + sources."request-2.85.0" sources."retry-0.6.1" sources."rimraf-2.6.2" sources."safe-buffer-5.1.1" - sources."sax-0.6.1" + sources."sax-1.2.4" sources."semver-5.4.1" sources."send-0.16.1" sources."sentiment-2.1.0" sources."serve-static-1.13.1" sources."set-blocking-2.0.0" - sources."setprototypeof-1.0.3" + sources."setprototypeof-1.1.0" sources."signal-exit-3.0.2" sources."smtp-connection-1.3.8" - sources."sntp-1.0.9" + sources."sntp-2.1.0" sources."source-map-0.6.1" sources."split2-2.2.0" sources."sprintf-js-1.0.3" - (sources."sshpk-1.13.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - sources."statuses-1.4.0" + sources."sshpk-1.14.1" + sources."statuses-1.5.0" sources."stream-shift-1.0.0" sources."streamsearch-0.1.2" sources."string-width-1.0.2" @@ -36841,23 +37408,18 @@ in sources."stringstream-0.0.5" sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" - sources."supports-color-2.0.0" sources."tar-2.2.1" sources."tar-pack-3.4.1" sources."through2-2.0.3" sources."through2-filter-2.0.0" sources."to-absolute-glob-2.0.2" sources."tough-cookie-2.3.4" - sources."tunnel-agent-0.4.3" + sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."twitter-ng-0.6.2" sources."type-is-1.6.16" sources."typedarray-0.0.6" - (sources."uglify-js-3.3.6" // { - dependencies = [ - sources."commander-2.13.0" - ]; - }) + sources."uglify-js-3.3.6" sources."uid-number-0.0.6" sources."uid-safe-2.1.5" sources."uid2-0.0.3" @@ -36869,11 +37431,11 @@ in sources."utf7-1.0.2" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" - sources."uue-3.1.1" + sources."uue-3.1.2" sources."uuid-3.2.1" sources."vary-1.1.2" sources."verror-1.10.0" - sources."websocket-stream-5.1.1" + sources."websocket-stream-5.1.2" sources."when-3.7.8" sources."wide-align-1.1.2" sources."wordwrap-0.0.3" @@ -36973,7 +37535,7 @@ in sources."ms-0.1.0" sources."muri-0.3.1" sources."nan-1.0.0" - sources."natives-1.1.1" + sources."natives-1.1.2" (sources."net-ping-1.1.7" // { dependencies = [ sources."nan-2.3.5" @@ -37027,10 +37589,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "5.6.0"; + version = "5.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-5.6.0.tgz"; - sha512 = "0nnr796ik5h8bsd3k9ygivivr3na2ksnf5iipf8dsnn20j10i9sgmhmsnzbimd2pqgjbrpp8gbpl2q7j5c7yjqjfirrh8xcc3v3gpws"; + url = "https://registry.npmjs.org/npm/-/npm-5.8.0.tgz"; + sha512 = "32zs775qksijpj23rwly4h8gs435lbsgaxzw6dmyjjg3i8qd40bmmadv3ac9mdxd0cd2x0m3ncsqa0j5vkmkvh8dknn0j9d1k6ig30f"; }; buildInputs = globalBuildInputs; meta = { @@ -37143,7 +37705,7 @@ in sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.3.5" - sources."natives-1.1.1" + sources."natives-1.1.2" sources."ncp-0.4.2" sources."nopt-2.2.1" (sources."npm-registry-client-0.2.27" // { @@ -37170,8 +37732,8 @@ in sources."proto-list-1.2.4" sources."punycode-1.4.1" sources."qs-6.5.1" - sources."readable-stream-2.3.4" - sources."request-2.83.0" + sources."readable-stream-2.3.5" + sources."request-2.85.0" sources."retry-0.6.0" sources."rimraf-2.6.2" sources."safe-buffer-5.1.1" @@ -37180,7 +37742,7 @@ in sources."signal-exit-3.0.2" sources."slide-1.1.6" sources."sntp-2.1.0" - sources."sshpk-1.13.1" + sources."sshpk-1.14.1" sources."string-width-1.0.2" sources."string_decoder-1.0.3" sources."stringstream-0.0.5" @@ -37206,7 +37768,7 @@ in sources."util-deprecate-1.0.2" sources."uuid-3.2.1" sources."verror-1.10.0" - sources."walk-2.3.9" + sources."walk-2.3.13" sources."wide-align-1.1.2" sources."wrappy-1.0.2" ]; @@ -37221,10 +37783,10 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "2.14.0"; + version = "2.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.14.0.tgz"; - sha512 = "1yk2hf3npvf7kjmiapbq8np5dsb9sx8iiinnfm69vabh55ahzxdv3m14s2sbbsx5q0n269jyz3qhiqx5krhvmbpgqpihas5nvwwlras"; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.14.1.tgz"; + sha512 = "1ciz9n8wmwq3lpi3g6xmjr4plqf3ydpqznrcci5bbrq7d9clkmkcg3gzbaqwkgrjgmvahby0akylk66zq8n8zm5mqn0vj0jsrxhryf4"; }; dependencies = [ sources."abbrev-1.1.1" @@ -37249,6 +37811,7 @@ in sources."capture-stack-trace-1.0.0" sources."center-align-0.1.3" sources."chalk-1.1.3" + sources."ci-info-1.1.3" sources."cint-8.2.1" sources."cli-boxes-1.0.0" sources."cli-cursor-1.0.2" @@ -37261,7 +37824,7 @@ in sources."color-convert-1.9.1" sources."color-name-1.1.3" sources."colors-1.0.3" - sources."commander-2.14.1" + sources."commander-2.15.1" sources."concat-map-0.0.1" (sources."configstore-1.4.0" // { dependencies = [ @@ -37278,7 +37841,7 @@ in sources."dot-prop-3.0.0" sources."duplexer2-0.1.4" sources."duplexer3-0.1.4" - sources."duplexify-3.5.3" + sources."duplexify-3.5.4" sources."email-validator-1.1.1" sources."end-of-stream-1.4.1" sources."error-ex-1.3.1" @@ -37303,7 +37866,7 @@ in sources."has-ansi-2.0.0" sources."has-flag-3.0.0" sources."hasbin-1.2.3" - sources."hosted-git-info-2.5.0" + sources."hosted-git-info-2.6.0" sources."iconv-lite-0.4.19" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" @@ -37315,6 +37878,7 @@ in sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" sources."is-builtin-module-1.0.0" + sources."is-ci-1.1.0" sources."is-extendable-0.1.1" sources."is-finite-1.0.2" sources."is-fullwidth-code-point-1.0.0" @@ -37332,7 +37896,7 @@ in sources."isexe-2.0.0" sources."isobject-3.0.1" sources."jju-1.3.0" - sources."js-yaml-3.10.0" + sources."js-yaml-3.11.0" sources."json-parse-helpfulerror-1.0.3" sources."json5-0.5.1" sources."kind-of-3.2.2" @@ -37347,8 +37911,8 @@ in sources."lodash.defaultsdeep-4.6.0" sources."lodash.mergewith-4.6.1" sources."longest-1.0.1" - sources."lowercase-keys-1.0.0" - sources."lru-cache-4.1.1" + sources."lowercase-keys-1.0.1" + sources."lru-cache-4.1.2" sources."make-dir-1.2.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" @@ -37403,12 +37967,12 @@ in sources."pseudomap-1.0.2" sources."punycode-1.3.2" sources."querystring-0.2.0" - sources."rc-1.2.5" + sources."rc-1.2.6" sources."rc-config-loader-2.0.1" sources."read-all-stream-3.1.0" sources."read-pkg-1.1.0" sources."read-pkg-up-1.0.1" - sources."readable-stream-2.3.4" + sources."readable-stream-2.3.5" sources."recursive-readdir-2.2.2" sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" @@ -37425,7 +37989,7 @@ in sources."sax-1.2.4" sources."semver-5.5.0" sources."semver-diff-2.1.0" - sources."semver-utils-1.1.1" + sources."semver-utils-1.1.2" sources."set-blocking-2.0.0" (sources."shallow-clone-0.1.2" // { dependencies = [ @@ -37436,7 +38000,7 @@ in sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" sources."slide-1.1.6" - (sources."snyk-1.69.10" // { + (sources."snyk-1.70.3" // { dependencies = [ sources."async-0.9.2" sources."camelcase-3.0.0" @@ -37480,7 +38044,7 @@ in sources."debug-2.6.9" ]; }) - sources."snyk-python-plugin-1.5.6" + sources."snyk-python-plugin-1.5.7" (sources."snyk-resolve-1.0.0" // { dependencies = [ sources."debug-2.6.9" @@ -37494,7 +38058,7 @@ in sources."uuid-2.0.3" ]; }) - (sources."snyk-sbt-plugin-1.2.4" // { + (sources."snyk-sbt-plugin-1.2.5" // { dependencies = [ sources."debug-2.6.9" ]; @@ -37534,14 +38098,14 @@ in sources."undefsafe-0.0.3" sources."unique-string-1.0.0" sources."unzip-response-1.0.2" - (sources."update-notifier-2.3.0" // { + (sources."update-notifier-2.4.0" // { dependencies = [ sources."ansi-regex-3.0.0" - sources."ansi-styles-3.2.0" + sources."ansi-styles-3.2.1" sources."boxen-1.3.0" sources."camelcase-4.1.0" - sources."chalk-2.3.1" - sources."configstore-3.1.1" + sources."chalk-2.3.2" + sources."configstore-3.1.2" sources."dot-prop-4.2.0" sources."got-6.7.1" sources."is-fullwidth-code-point-2.0.0" @@ -37550,7 +38114,7 @@ in sources."pify-3.0.0" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" - sources."supports-color-5.2.0" + sources."supports-color-5.3.0" sources."timed-out-4.0.1" sources."unzip-response-2.0.1" sources."widest-line-2.0.0" @@ -37600,13 +38164,13 @@ in }; dependencies = [ sources."agent-base-4.2.0" - sources."ansi-escapes-3.0.0" + sources."ansi-escapes-3.1.0" sources."ansi-regex-2.1.1" - sources."ansi-styles-3.2.0" + sources."ansi-styles-3.2.1" sources."boom-5.2.0" sources."builtin-modules-1.1.1" sources."camelcase-4.1.0" - sources."chalk-2.3.1" + sources."chalk-2.3.2" sources."chardet-0.4.2" sources."cli-cursor-2.1.0" sources."cli-table2-0.2.0" @@ -37619,7 +38183,7 @@ in sources."code-point-at-1.1.0" sources."color-convert-1.9.1" sources."color-name-1.1.3" - sources."colors-1.1.2" + sources."colors-1.2.1" sources."cross-spawn-5.1.0" sources."cvss-1.0.2" sources."debug-3.1.0" @@ -37629,7 +38193,7 @@ in sources."es6-promisify-5.0.0" sources."escape-string-regexp-1.0.5" sources."execa-0.7.0" - sources."external-editor-2.1.0" + sources."external-editor-2.2.0" sources."figures-2.0.0" sources."find-up-2.1.0" sources."get-caller-file-1.0.2" @@ -37637,8 +38201,8 @@ in sources."graceful-fs-4.1.11" sources."has-flag-3.0.0" sources."hoek-4.2.1" - sources."hosted-git-info-2.5.0" - sources."https-proxy-agent-2.1.1" + sources."hosted-git-info-2.6.0" + sources."https-proxy-agent-2.2.1" sources."iconv-lite-0.4.19" (sources."inquirer-3.3.0" // { dependencies = [ @@ -37660,7 +38224,7 @@ in sources."load-json-file-2.0.0" sources."locate-path-2.0.0" sources."lodash-3.10.1" - sources."lru-cache-4.1.1" + sources."lru-cache-4.1.2" sources."mem-1.1.0" sources."mimic-fn-1.2.0" sources."ms-2.0.0" @@ -37703,7 +38267,7 @@ in sources."strip-ansi-3.0.1" sources."strip-bom-3.0.0" sources."strip-eof-1.0.0" - sources."supports-color-5.2.0" + sources."supports-color-5.3.0" sources."through-2.3.8" sources."tmp-0.0.33" sources."validate-npm-package-license-3.0.3" @@ -37735,33 +38299,33 @@ in ocaml-language-server = nodeEnv.buildNodePackage { name = "ocaml-language-server"; packageName = "ocaml-language-server"; - version = "1.0.27"; + version = "1.0.32"; src = fetchurl { - url = "https://registry.npmjs.org/ocaml-language-server/-/ocaml-language-server-1.0.27.tgz"; - sha512 = "14fhxv57nybf56n1454ccmdn2sn41amzf4f6a1n70ha48ndrpcw14g6hvv91k5bj775pxh74aa8ncsc3f7bfgz0cg0nwg8ysv43dmqw"; + url = "https://registry.npmjs.org/ocaml-language-server/-/ocaml-language-server-1.0.32.tgz"; + sha512 = "2hdrvr25l7lv0plz31dqgnrr0qli6332z69ywwns4mxmmyk3mc1s7rjdsgf201rw11nqhwbhj2w7n0zijqldbwi5chdnma667lihcyc"; }; dependencies = [ sources."async-2.6.0" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."concat-map-0.0.1" - sources."deepmerge-2.0.1" + sources."deepmerge-2.1.0" sources."fs.realpath-1.0.0" sources."glob-7.1.2" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."lodash-4.17.5" - sources."lokijs-1.5.2" + sources."lokijs-1.5.3" sources."minimatch-3.0.4" sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."pegjs-0.10.0" - sources."vscode-jsonrpc-3.5.0" - sources."vscode-languageclient-3.5.0" - sources."vscode-languageserver-3.5.0" - sources."vscode-languageserver-protocol-3.5.0" - sources."vscode-languageserver-types-3.5.0" - sources."vscode-uri-1.0.1" + sources."vscode-jsonrpc-3.6.0" + sources."vscode-languageclient-4.0.0" + sources."vscode-languageserver-4.0.0" + sources."vscode-languageserver-protocol-3.6.0" + sources."vscode-languageserver-types-3.6.1" + sources."vscode-uri-1.0.3" sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; @@ -37773,16 +38337,17 @@ in production = true; bypassCache = false; }; - parsoid = nodeEnv.buildNodePackage { + "parsoid-git://github.com/abbradar/parsoid#stable" = nodeEnv.buildNodePackage { name = "parsoid"; packageName = "parsoid"; version = "0.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/parsoid/-/parsoid-0.8.0.tgz"; - sha1 = "fbedac4c5c0b721f4c241287b81bdc3e4c7987c9"; + src = fetchgit { + url = "git://github.com/abbradar/parsoid"; + rev = "89958e4f9e5583e0fdc5447103392e3d749d500b"; + sha256 = "1af850ced5bd8db64e20ad30bf59d99c14624efba3127759ca1c34088a0aadd7"; }; dependencies = [ - sources."accepts-1.3.4" + sources."accepts-1.3.5" sources."ajv-5.5.2" sources."align-text-0.1.4" sources."amdefine-1.0.1" @@ -37799,11 +38364,12 @@ in sources."babybird-0.0.1" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.1" - sources."bl-1.2.1" + sources."bl-1.2.2" sources."bluebird-3.5.1" (sources."body-parser-1.18.2" // { dependencies = [ sources."content-type-1.0.4" + sources."setprototypeof-1.0.3" ]; }) sources."boom-4.3.1" @@ -37820,17 +38386,17 @@ in sources."cliui-2.1.0" sources."co-4.6.0" sources."code-point-at-1.1.0" - sources."colors-1.1.2" + sources."colors-1.2.1" sources."combined-stream-1.0.6" sources."compressible-2.0.13" sources."compression-1.7.2" sources."concat-map-0.0.1" sources."connect-busboy-0.0.2" sources."content-disposition-0.5.2" - sources."content-type-git+https://github.com/wikimedia/content-type.git#master" + sources."content-type-git+https://github.com/wikimedia/content-type#master" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" - sources."core-js-2.5.3" + sources."core-js-2.5.4" sources."core-util-is-1.0.2" (sources."cryptiles-3.1.2" // { dependencies = [ @@ -37847,7 +38413,7 @@ in sources."dicer-0.2.5" sources."diff-1.4.0" sources."dnscache-1.0.1" - sources."dom-storage-2.0.2" + sources."dom-storage-2.1.0" sources."domino-1.0.30" sources."dtrace-provider-0.8.6" sources."ecc-jsbn-0.1.1" @@ -37858,11 +38424,10 @@ in sources."escape-html-1.0.3" sources."esprima-4.0.0" sources."etag-1.8.1" - (sources."express-4.16.2" // { + (sources."express-4.16.3" // { dependencies = [ sources."content-type-1.0.4" - sources."setprototypeof-1.1.0" - sources."statuses-1.3.1" + sources."statuses-1.4.0" ]; }) (sources."express-handlebars-3.0.0" // { @@ -37876,9 +38441,9 @@ in sources."extsprintf-1.3.0" sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" - (sources."finalhandler-1.1.0" // { + (sources."finalhandler-1.1.1" // { dependencies = [ - sources."statuses-1.3.1" + sources."statuses-1.4.0" ]; }) sources."find-up-1.1.2" @@ -37901,13 +38466,9 @@ in sources."hat-0.0.3" sources."hawk-6.0.2" sources."hoek-4.2.1" - sources."hosted-git-info-2.5.0" + sources."hosted-git-info-2.6.0" sources."hot-shots-4.8.0" - (sources."http-errors-1.6.2" // { - dependencies = [ - sources."depd-1.1.1" - ]; - }) + sources."http-errors-1.6.3" sources."http-signature-1.2.0" sources."iconv-lite-0.4.19" sources."inflight-1.0.6" @@ -37923,7 +38484,7 @@ in sources."is-utf8-0.2.1" sources."isarray-0.0.1" sources."isstream-0.1.2" - sources."js-yaml-3.10.0" + sources."js-yaml-3.11.0" sources."jsbn-0.1.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.3.1" @@ -37953,13 +38514,13 @@ in sources."minimatch-3.0.4" sources."minimist-0.0.10" sources."mkdirp-0.5.1" - sources."moment-2.20.1" + sources."moment-2.22.0" sources."ms-2.0.0" sources."msgpack5-3.6.0" sources."mv-2.1.1" - sources."nan-2.9.2" + sources."nan-2.10.0" sources."ncp-2.0.0" - sources."negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access" + sources."negotiator-git+https://github.com/arlolra/negotiator#full-parse-access" sources."normalize-package-data-2.4.0" sources."number-is-nan-1.0.1" sources."oauth-sign-0.8.2" @@ -37976,7 +38537,7 @@ in sources."path-is-absolute-1.0.1" sources."path-to-regexp-0.1.7" sources."path-type-1.1.0" - sources."pegjs-git+https://github.com/tstarling/pegjs.git#fork" + sources."pegjs-git+https://github.com/tstarling/pegjs#fork" sources."performance-now-2.1.0" sources."pify-2.3.0" sources."pinkie-2.0.4" @@ -37988,12 +38549,17 @@ in sources."punycode-1.4.1" sources."qs-6.5.1" sources."range-parser-1.2.0" - sources."raw-body-2.3.2" + (sources."raw-body-2.3.2" // { + dependencies = [ + sources."depd-1.1.1" + sources."http-errors-1.6.2" + ]; + }) sources."read-pkg-1.1.0" sources."read-pkg-up-1.0.1" sources."readable-stream-1.1.14" sources."repeat-string-1.6.1" - sources."request-2.83.0" + sources."request-2.85.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" sources."right-align-0.1.3" @@ -38001,20 +38567,24 @@ in sources."safe-buffer-5.1.1" sources."safe-json-stringify-1.1.0" sources."semver-5.5.0" - sources."send-0.16.1" - sources."serve-favicon-2.4.5" - sources."serve-static-1.13.1" - (sources."service-runner-2.5.1" // { + sources."send-0.16.2" + (sources."serve-favicon-2.5.0" // { + dependencies = [ + sources."ms-2.1.1" + ]; + }) + sources."serve-static-1.13.2" + (sources."service-runner-2.3.0" // { dependencies = [ sources."isarray-1.0.0" sources."minimist-0.0.8" sources."ms-0.7.3" - sources."readable-stream-2.3.4" + sources."readable-stream-2.3.5" sources."string_decoder-1.0.3" ]; }) sources."set-blocking-2.0.0" - sources."setprototypeof-1.0.3" + sources."setprototypeof-1.1.0" sources."simplediff-0.1.1" sources."sntp-2.1.0" sources."source-map-0.4.4" @@ -38023,8 +38593,8 @@ in sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.0" sources."sprintf-js-1.0.3" - sources."sshpk-1.13.1" - sources."statuses-1.4.0" + sources."sshpk-1.14.1" + sources."statuses-1.5.0" sources."streamsearch-0.1.2" sources."string-width-1.0.2" sources."string_decoder-0.10.31" @@ -38065,7 +38635,6 @@ in buildInputs = globalBuildInputs; meta = { description = "Mediawiki parser for the VisualEditor."; - homepage = "https://github.com/wikimedia/parsoid#readme"; license = "GPL-2.0+"; }; production = true; @@ -38091,8 +38660,8 @@ in sources."array-flatten-2.1.1" sources."balanced-match-1.0.0" sources."base64-js-0.0.8" - sources."bencode-1.0.0" - sources."big-integer-1.6.26" + sources."bencode-2.0.0" + sources."big-integer-1.6.27" sources."bitfield-0.1.0" sources."bittorrent-dht-6.4.2" sources."bittorrent-tracker-7.7.0" @@ -38103,9 +38672,12 @@ in sources."bplist-creator-0.0.6" sources."bplist-parser-0.1.1" sources."brace-expansion-1.1.11" + sources."buffer-alloc-1.1.0" sources."buffer-alloc-unsafe-1.0.0" sources."buffer-equal-0.0.1" sources."buffer-equals-1.0.4" + sources."buffer-fill-0.1.1" + sources."buffer-from-1.0.0" sources."buffer-indexof-1.1.1" sources."builtin-modules-1.1.1" sources."camelcase-2.1.1" @@ -38117,7 +38689,7 @@ in sources."code-point-at-1.1.0" sources."compact2string-1.4.0" sources."concat-map-0.0.1" - sources."concat-stream-1.6.0" + sources."concat-stream-1.6.2" sources."consume-http-header-1.0.0" sources."consume-until-1.0.0" sources."core-util-is-1.0.2" @@ -38153,7 +38725,7 @@ in sources."graceful-fs-4.1.11" sources."has-ansi-2.0.0" sources."hat-0.0.3" - sources."hosted-git-info-2.5.0" + sources."hosted-git-info-2.6.0" sources."http-headers-3.0.2" sources."immediate-chunk-store-1.0.8" sources."indent-string-2.1.0" @@ -38179,11 +38751,11 @@ in sources."k-bucket-0.6.0" (sources."k-rpc-3.7.0" // { dependencies = [ - sources."bencode-1.0.0" + sources."bencode-2.0.0" sources."k-bucket-2.0.1" ]; }) - sources."k-rpc-socket-1.7.2" + sources."k-rpc-socket-1.8.0" sources."keypress-0.2.1" sources."load-json-file-1.1.0" sources."lodash-3.10.1" @@ -38224,12 +38796,12 @@ in sources."get-stdin-5.0.1" ]; }) - sources."parse-torrent-file-4.0.3" + sources."parse-torrent-file-4.1.0" sources."path-exists-2.1.0" sources."path-is-absolute-1.0.1" sources."path-type-1.1.0" - sources."peer-wire-protocol-0.7.0" - (sources."peer-wire-swarm-0.12.1" // { + sources."peer-wire-protocol-0.7.1" + (sources."peer-wire-swarm-0.12.2" // { dependencies = [ sources."bncode-0.2.3" ]; @@ -38244,19 +38816,19 @@ in sources."random-iterate-1.0.1" sources."randombytes-2.0.6" sources."range-parser-1.2.0" - sources."rc-1.2.5" + sources."rc-1.2.6" sources."re-emitter-1.1.3" sources."read-pkg-1.1.0" sources."read-pkg-up-1.0.1" - sources."readable-stream-2.3.4" + sources."readable-stream-2.3.5" sources."redent-1.0.0" sources."repeating-2.0.1" sources."restore-cursor-1.0.1" sources."reverse-http-1.3.0" sources."rimraf-2.6.2" sources."run-async-2.3.0" - sources."run-parallel-1.1.7" - sources."run-series-1.1.4" + sources."run-parallel-1.1.8" + sources."run-series-1.1.6" sources."rusha-0.8.13" sources."rx-4.1.0" sources."safe-buffer-5.1.1" @@ -38297,14 +38869,15 @@ in sources."bencode-0.8.0" sources."isarray-1.0.0" sources."minimist-1.2.0" - sources."readable-stream-2.3.4" + sources."readable-stream-2.3.5" sources."string_decoder-1.0.3" ]; }) sources."torrent-piece-1.1.1" - (sources."torrent-stream-1.0.3" // { + (sources."torrent-stream-1.0.4" // { dependencies = [ sources."bencode-0.7.0" + sources."buffer-alloc-unsafe-0.1.1" sources."end-of-stream-0.1.5" sources."isarray-0.0.1" sources."magnet-uri-4.2.3" @@ -38377,9 +38950,12 @@ in sources."body-parser-1.13.3" sources."boom-0.3.8" sources."brace-expansion-1.1.11" + sources."buffer-alloc-1.1.0" sources."buffer-alloc-unsafe-1.0.0" sources."buffer-equal-0.0.1" sources."buffer-equals-1.0.4" + sources."buffer-fill-0.1.1" + sources."buffer-from-1.0.0" sources."bytes-2.1.0" sources."callsite-1.0.0" sources."combined-stream-0.0.7" @@ -38434,7 +39010,7 @@ in sources."etag-1.7.0" (sources."express-3.21.2" // { dependencies = [ - sources."accepts-1.3.4" + sources."accepts-1.3.5" sources."destroy-1.0.3" sources."ms-2.0.0" sources."multiparty-3.3.2" @@ -38488,11 +39064,11 @@ in sources."k-bucket-0.6.0" (sources."k-rpc-3.7.0" // { dependencies = [ - sources."bencode-1.0.0" + sources."bencode-2.0.0" sources."k-bucket-2.0.1" ]; }) - sources."k-rpc-socket-1.7.2" + sources."k-rpc-socket-1.8.0" sources."lodash-2.4.2" sources."lru-2.0.1" sources."magnet-uri-2.0.1" @@ -38535,8 +39111,8 @@ in sources."parseurl-1.3.2" sources."path-is-absolute-1.0.1" sources."pause-0.1.0" - sources."peer-wire-protocol-0.7.0" - (sources."peer-wire-swarm-0.12.1" // { + sources."peer-wire-protocol-0.7.1" + (sources."peer-wire-swarm-0.12.2" // { dependencies = [ sources."bncode-0.2.3" ]; @@ -38573,8 +39149,8 @@ in }) sources."rimraf-2.6.2" sources."rndm-1.2.0" - sources."run-parallel-1.1.7" - sources."run-series-1.1.4" + sources."run-parallel-1.1.8" + sources."run-series-1.1.6" sources."rusha-0.8.13" sources."safe-buffer-5.1.1" (sources."send-0.13.0" // { @@ -38619,7 +39195,7 @@ in ]; }) sources."speedometer-0.1.4" - sources."statuses-1.4.0" + sources."statuses-1.5.0" sources."stream-counter-0.2.0" sources."string2compact-1.2.2" sources."string_decoder-0.10.31" @@ -38628,9 +39204,10 @@ in sources."to-array-0.1.4" sources."torrent-discovery-5.4.0" sources."torrent-piece-1.1.1" - (sources."torrent-stream-1.0.3" // { + (sources."torrent-stream-1.0.4" // { dependencies = [ sources."bencode-0.8.0" + sources."buffer-alloc-unsafe-0.1.1" sources."debug-2.6.9" sources."end-of-stream-0.1.5" sources."isarray-1.0.0" @@ -38638,7 +39215,7 @@ in sources."mkdirp-0.3.5" sources."ms-2.0.0" sources."once-1.3.3" - sources."readable-stream-2.3.4" + sources."readable-stream-2.3.5" sources."safe-buffer-5.0.1" sources."string_decoder-1.0.3" sources."ultron-1.1.1" @@ -38696,7 +39273,7 @@ in sources."caseless-0.11.0" sources."chalk-1.1.3" sources."combined-stream-1.0.6" - sources."commander-2.14.1" + sources."commander-2.15.1" sources."concat-map-0.0.1" sources."concat-stream-1.5.0" sources."core-util-is-1.0.2" @@ -38768,7 +39345,7 @@ in sources."request-progress-2.0.1" sources."rimraf-2.6.2" sources."sntp-1.0.9" - (sources."sshpk-1.13.1" // { + (sources."sshpk-1.14.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -38801,10 +39378,10 @@ in prettier = nodeEnv.buildNodePackage { name = "prettier"; packageName = "prettier"; - version = "1.11.0"; + version = "1.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-1.11.0.tgz"; - sha512 = "3xk1i02slbak5bilsgbsi5qh2f68dn84s1as0h2bymmiwm3isnazndlvl74yjwlmqxkaw9sj45c402xhy5xk5h0nkbcv39gqwyyfg75"; + url = "https://registry.npmjs.org/prettier/-/prettier-1.11.1.tgz"; + sha512 = "33s27xnirdx15j0dkp0i79bawmn7pysqxjiksh1jd5gcl4fdzvhd1sr9n7lh4k1ik37g1lmi3gb33j3kz31psqlxxyz1l5djgmq7wjg"; }; buildInputs = globalBuildInputs; meta = { @@ -38827,30 +39404,58 @@ in sources."JSONStream-1.3.2" sources."acorn-4.0.13" sources."acorn-node-1.3.0" - sources."anymatch-1.3.2" - sources."arr-diff-2.0.0" + (sources."anymatch-2.0.0" // { + dependencies = [ + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."is-extendable-0.1.1" + ]; + }) + sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" sources."array-filter-0.0.1" sources."array-map-0.0.0" sources."array-reduce-0.0.0" - sources."array-unique-0.2.1" + sources."array-unique-0.3.2" sources."asn1.js-4.10.1" sources."assert-1.4.1" + sources."assign-symbols-1.0.0" sources."astw-2.2.0" sources."async-1.5.2" sources."async-each-1.0.1" + sources."atob-2.1.0" sources."balanced-match-1.0.0" + (sources."base-0.11.2" // { + dependencies = [ + (sources."define-property-1.0.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + sources."kind-of-3.2.2" + ]; + }) sources."base64-js-1.2.3" sources."binary-extensions-1.11.0" sources."bn.js-4.11.8" sources."brace-expansion-1.1.11" - (sources."braces-1.8.5" // { + (sources."braces-2.3.1" // { dependencies = [ - sources."kind-of-4.0.0" + sources."is-extendable-0.1.1" ]; }) sources."brorand-1.1.0" - sources."browser-pack-6.0.4" + sources."browser-pack-6.1.0" (sources."browser-resolve-1.11.2" // { dependencies = [ sources."resolve-1.1.7" @@ -38858,15 +39463,14 @@ in }) (sources."browserify-13.3.0" // { dependencies = [ - sources."acorn-5.5.0" - sources."combine-source-map-0.7.2" + sources."acorn-5.5.3" (sources."concat-stream-1.5.2" // { dependencies = [ sources."readable-stream-2.0.6" ]; }) sources."hash-base-2.0.2" - sources."isarray-0.0.1" + sources."isarray-2.0.4" sources."process-nextick-args-2.0.0" ]; }) @@ -38884,24 +39488,44 @@ in sources."browserify-sign-4.0.4" sources."browserify-zlib-0.1.4" sources."buffer-4.9.1" + sources."buffer-from-1.0.0" sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" + sources."cache-base-1.0.1" sources."cached-path-relative-1.0.1" - sources."chokidar-1.7.0" + (sources."chokidar-2.0.3" // { + dependencies = [ + sources."is-accessor-descriptor-1.0.0" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + sources."is-extendable-1.0.1" + ]; + }) sources."cipher-base-1.0.4" - sources."colors-1.1.2" + (sources."class-utils-0.3.6" // { + dependencies = [ + sources."define-property-0.2.5" + ]; + }) + sources."collection-visit-1.0.0" + sources."colors-1.2.1" sources."combine-source-map-0.8.0" + sources."component-emitter-1.2.1" sources."concat-map-0.0.1" - sources."concat-stream-1.6.0" + sources."concat-stream-1.6.2" sources."console-browserify-1.1.0" sources."constants-browserify-1.0.0" sources."convert-source-map-1.1.3" + sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" sources."create-ecdh-4.0.0" sources."create-hash-1.1.3" sources."create-hmac-1.1.6" sources."crypto-browserify-3.12.0" sources."date-now-0.1.4" + sources."debug-2.6.9" + sources."decode-uri-component-0.2.0" + sources."define-property-2.0.2" sources."defined-1.0.0" sources."deps-sort-2.0.0" sources."des.js-1.0.0" @@ -38912,64 +39536,90 @@ in sources."elliptic-6.4.0" sources."events-1.1.1" sources."evp_bytestokey-1.0.3" - sources."expand-brackets-0.1.5" - sources."expand-range-1.8.2" - sources."extglob-0.3.2" - sources."filename-regex-2.0.1" - sources."fill-range-2.2.3" + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."define-property-0.2.5" + ]; + }) + sources."extend-shallow-3.0.2" + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + sources."kind-of-5.1.0" + ]; + }) + sources."fill-range-4.0.0" sources."for-in-1.0.2" - sources."for-own-0.1.5" + sources."fragment-cache-0.2.1" sources."fs.realpath-1.0.0" sources."fsevents-1.1.3" sources."function-bind-1.1.1" + sources."get-value-2.0.6" sources."glob-7.1.2" - sources."glob-base-0.3.0" - sources."glob-parent-2.0.0" + (sources."glob-parent-3.1.0" // { + dependencies = [ + sources."is-glob-3.1.0" + ]; + }) sources."graceful-fs-4.1.11" sources."has-1.0.1" + sources."has-value-1.0.0" + sources."has-values-1.0.0" sources."hash-base-3.0.4" sources."hash.js-1.1.3" sources."hmac-drbg-1.0.1" sources."htmlescape-1.1.1" sources."https-browserify-0.0.1" - sources."ieee754-1.1.8" + sources."ieee754-1.1.11" sources."indexof-0.0.1" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."inline-source-map-0.6.2" - sources."insert-module-globals-7.0.1" + (sources."insert-module-globals-7.0.5" // { + dependencies = [ + sources."concat-stream-1.6.2" + ]; + }) + sources."is-accessor-descriptor-1.0.0" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-dotfile-1.0.3" - sources."is-equal-shallow-0.1.3" - sources."is-extendable-0.1.1" - sources."is-extglob-1.0.0" - sources."is-glob-2.0.1" - sources."is-number-2.1.0" - sources."is-posix-bracket-0.1.1" - sources."is-primitive-2.0.0" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + sources."is-extendable-1.0.1" + sources."is-extglob-2.1.1" + sources."is-glob-4.0.0" + sources."is-number-4.0.0" + sources."is-odd-2.0.0" + sources."is-plain-object-2.0.4" + sources."is-windows-1.0.2" sources."isarray-1.0.0" sources."isexe-2.0.0" - sources."isobject-2.1.0" + sources."isobject-3.0.1" sources."json-stable-stringify-0.0.1" sources."jsonify-0.0.0" sources."jsonparse-1.3.1" - sources."kind-of-3.2.2" - sources."labeled-stream-splicer-2.0.0" + sources."kind-of-6.0.2" + sources."labeled-stream-splicer-2.0.1" sources."lexical-scope-1.2.0" - sources."lodash-4.17.5" sources."lodash.memoize-3.0.4" + sources."map-cache-0.2.2" + sources."map-visit-1.0.0" sources."md5.js-1.3.4" - sources."micromatch-2.3.11" + sources."micromatch-3.1.10" sources."miller-rabin-4.0.1" sources."mime-1.6.0" sources."minimalistic-assert-1.0.0" sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.0" + sources."mixin-deep-1.3.1" sources."module-deps-4.1.1" + sources."ms-2.0.0" sources."mute-stream-0.0.7" - sources."nan-2.9.2" + sources."nan-2.10.0" + sources."nanomatch-1.2.9" + sources."neo-async-2.5.0" (sources."node-static-0.7.10" // { dependencies = [ sources."minimist-0.0.10" @@ -38977,7 +39627,9 @@ in ]; }) sources."normalize-path-2.1.1" - sources."object.omit-2.0.1" + sources."object-copy-0.1.0" + sources."object-visit-1.0.1" + sources."object.pick-1.3.0" sources."once-1.4.0" sources."optimist-0.6.1" sources."os-browserify-0.1.2" @@ -38985,55 +39637,77 @@ in sources."pako-0.2.9" sources."parents-1.0.1" sources."parse-asn1-5.1.0" - sources."parse-glob-3.0.4" + sources."pascalcase-0.1.1" sources."path-browserify-0.0.0" + sources."path-dirname-1.0.2" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.5" sources."path-platform-0.11.15" sources."pbkdf2-3.0.14" - sources."preserve-0.2.0" + sources."posix-character-classes-0.1.1" sources."process-0.11.10" sources."process-nextick-args-1.0.7" sources."public-encrypt-4.0.0" sources."punycode-1.4.1" sources."querystring-0.2.0" sources."querystring-es3-0.2.1" - (sources."randomatic-1.1.7" // { - dependencies = [ - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - ]; - }) sources."randombytes-2.0.6" sources."randomfill-1.0.4" sources."read-1.0.7" sources."read-only-stream-2.0.0" - (sources."readable-stream-2.3.4" // { + (sources."readable-stream-2.3.5" // { dependencies = [ sources."isarray-1.0.0" sources."string_decoder-1.0.3" ]; }) sources."readdirp-2.1.0" - sources."regex-cache-0.4.4" + sources."regex-not-1.0.2" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.2" sources."repeat-string-1.6.1" - sources."resolve-1.5.0" + sources."resolve-1.6.0" + sources."resolve-url-0.2.1" + sources."ret-0.1.15" sources."rimraf-2.2.8" sources."ripemd160-2.0.1" sources."safe-buffer-5.1.1" + sources."safe-regex-1.1.0" sources."set-immediate-shim-1.0.1" - sources."sha.js-2.4.10" + sources."set-value-2.0.0" + sources."sha.js-2.4.11" sources."shasum-1.0.2" sources."shell-quote-1.6.1" + (sources."snapdragon-0.8.2" // { + dependencies = [ + (sources."define-property-0.2.5" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."extend-shallow-2.0.1" + sources."kind-of-4.0.0" + ]; + }) + (sources."snapdragon-node-2.1.1" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."snapdragon-util-3.0.1" sources."source-map-0.5.7" + sources."source-map-resolve-0.5.1" + sources."source-map-url-0.4.0" + (sources."split-string-3.1.0" // { + dependencies = [ + sources."extend-shallow-3.0.2" + sources."is-extendable-1.0.1" + ]; + }) + sources."static-extend-0.1.2" sources."stream-browserify-2.0.1" sources."stream-combiner2-1.1.1" - sources."stream-http-2.8.0" + sources."stream-http-2.8.1" sources."stream-splicer-2.0.0" sources."string-stream-0.0.7" sources."string_decoder-0.10.31" @@ -39044,15 +39718,39 @@ in sources."through2-2.0.3" sources."timers-browserify-1.4.2" sources."to-arraybuffer-1.0.1" + sources."to-object-path-0.3.0" + sources."to-regex-3.0.2" + sources."to-regex-range-2.1.1" sources."tree-kill-1.2.0" sources."tty-browserify-0.0.1" sources."typedarray-0.0.6" - sources."umd-3.0.1" + sources."umd-3.0.3" + (sources."union-value-1.0.0" // { + dependencies = [ + sources."set-value-0.4.3" + ]; + }) + (sources."unset-value-1.0.0" // { + dependencies = [ + (sources."has-value-0.3.1" // { + dependencies = [ + sources."isobject-2.1.0" + ]; + }) + ]; + }) + sources."upath-1.0.4" + sources."urix-0.1.0" (sources."url-0.11.0" // { dependencies = [ sources."punycode-1.3.2" ]; }) + (sources."use-3.1.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) (sources."util-0.10.3" // { dependencies = [ sources."inherits-2.0.1" @@ -39060,9 +39758,28 @@ in }) sources."util-deprecate-1.0.2" sources."vm-browserify-0.0.4" - (sources."watchpack-1.4.0" // { + (sources."watchpack-1.5.0" // { dependencies = [ - sources."async-2.6.0" + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + sources."has-values-0.1.4" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."is-extendable-0.1.1" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) ]; }) sources."which-1.3.0" @@ -39090,7 +39807,7 @@ in dependencies = [ sources."@types/babel-types-7.0.1" sources."@types/babylon-6.16.2" - sources."accepts-1.3.4" + sources."accepts-1.3.5" sources."acorn-3.3.0" (sources."acorn-globals-3.1.0" // { dependencies = [ @@ -39099,7 +39816,6 @@ in }) sources."ajv-4.11.8" sources."align-text-0.1.4" - sources."amdefine-1.0.1" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.4" @@ -39116,8 +39832,12 @@ in sources."basic-auth-2.0.0" sources."bcrypt-pbkdf-1.0.1" sources."bindings-1.2.1" - sources."bl-1.2.1" - sources."body-parser-1.18.2" + sources."bl-1.2.2" + (sources."body-parser-1.18.2" // { + dependencies = [ + sources."setprototypeof-1.0.3" + ]; + }) sources."boom-2.10.1" sources."bufferutil-2.0.1" sources."bytes-3.0.0" @@ -39126,12 +39846,12 @@ in sources."center-align-0.1.3" sources."character-parser-2.2.0" sources."chownr-1.0.1" - sources."clean-css-3.4.28" + sources."clean-css-4.1.11" sources."cliui-2.1.0" sources."co-4.6.0" sources."code-point-at-1.1.0" sources."combined-stream-1.0.6" - sources."commander-2.14.1" + sources."commander-2.15.1" sources."console-control-strings-1.1.0" sources."constantinople-3.1.2" sources."content-disposition-0.5.2" @@ -39139,7 +39859,7 @@ in sources."cookie-0.3.1" sources."cookie-parser-1.4.3" sources."cookie-signature-1.0.6" - sources."core-js-2.5.3" + sources."core-js-2.5.4" sources."core-util-is-1.0.2" sources."cryptiles-2.0.5" sources."dashdash-1.14.1" @@ -39161,15 +39881,14 @@ in sources."etag-1.8.1" sources."eventemitter2-3.0.2" sources."expand-template-1.1.0" - (sources."express-4.16.2" // { + (sources."express-4.16.3" // { dependencies = [ - sources."setprototypeof-1.1.0" - sources."statuses-1.3.1" + sources."statuses-1.4.0" ]; }) sources."extend-3.0.1" sources."extsprintf-1.3.0" - sources."finalhandler-1.1.0" + sources."finalhandler-1.1.1" sources."forever-agent-0.6.1" sources."form-data-2.1.4" sources."forwarded-0.1.2" @@ -39179,18 +39898,13 @@ in sources."getpass-0.1.7" sources."github-from-package-0.0.0" sources."graceful-fs-4.1.11" - sources."graceful-readlink-1.0.1" sources."har-schema-1.0.5" sources."har-validator-4.2.1" sources."has-1.0.1" sources."has-unicode-2.0.1" sources."hawk-3.1.3" sources."hoek-2.16.3" - (sources."http-errors-1.6.2" // { - dependencies = [ - sources."depd-1.1.1" - ]; - }) + sources."http-errors-1.6.3" sources."http-signature-1.1.1" sources."httpolyglot-0.1.2" sources."iconv-lite-0.4.19" @@ -39270,44 +39984,43 @@ in sources."promise-7.3.1" sources."proxy-addr-2.0.3" sources."prr-1.0.1" - (sources."pug-2.0.0-rc.4" // { + (sources."pug-2.0.3" // { dependencies = [ sources."acorn-4.0.13" - sources."commander-2.8.1" - sources."source-map-0.4.4" ]; }) - sources."pug-attrs-2.0.2" - sources."pug-code-gen-2.0.0" + sources."pug-attrs-2.0.3" + sources."pug-code-gen-2.0.1" sources."pug-error-1.3.2" - (sources."pug-filters-2.1.5" // { - dependencies = [ - sources."source-map-0.5.7" - ]; - }) - sources."pug-lexer-3.1.0" - sources."pug-linker-3.0.3" - sources."pug-load-2.0.9" - sources."pug-parser-4.0.0" - sources."pug-runtime-2.0.3" - sources."pug-strip-comments-1.0.2" - sources."pug-walk-1.1.5" + sources."pug-filters-3.1.0" + sources."pug-lexer-4.0.0" + sources."pug-linker-3.0.5" + sources."pug-load-2.0.11" + sources."pug-parser-5.0.0" + sources."pug-runtime-2.0.4" + sources."pug-strip-comments-1.0.3" + sources."pug-walk-1.1.7" sources."pump-1.0.3" sources."punycode-1.4.1" sources."qs-6.5.1" sources."qtdatastream-0.7.1" sources."range-parser-1.2.0" - sources."raw-body-2.3.2" - sources."rc-1.2.5" - sources."readable-stream-2.3.4" + (sources."raw-body-2.3.2" // { + dependencies = [ + sources."depd-1.1.1" + sources."http-errors-1.6.2" + ]; + }) + sources."rc-1.2.6" + sources."readable-stream-2.3.5" sources."regenerator-runtime-0.11.1" sources."repeat-string-1.6.1" sources."request-2.81.0" - sources."resolve-1.5.0" + sources."resolve-1.6.0" sources."right-align-0.1.3" sources."safe-buffer-5.1.1" sources."semver-5.5.0" - sources."send-0.16.1" + sources."send-0.16.2" (sources."serve-favicon-2.3.2" // { dependencies = [ sources."etag-1.7.0" @@ -39315,19 +40028,19 @@ in sources."ms-0.7.2" ]; }) - sources."serve-static-1.13.1" + sources."serve-static-1.13.2" sources."set-blocking-2.0.0" - sources."setprototypeof-1.0.3" + sources."setprototypeof-1.1.0" sources."signal-exit-3.0.2" sources."simple-get-1.4.3" sources."sntp-1.0.9" sources."source-map-0.5.7" - (sources."sshpk-1.13.1" // { + (sources."sshpk-1.14.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) - sources."statuses-1.4.0" + sources."statuses-1.5.0" sources."string-width-1.0.2" sources."string_decoder-1.0.3" sources."stringstream-0.0.5" @@ -39379,13 +40092,13 @@ in sha1 = "da6ac7d4d7777a59a5e951cf46e72fd4b6b40a2c"; }; dependencies = [ - sources."acorn-5.5.0" + sources."acorn-5.5.3" sources."amdefine-1.0.1" sources."ast-types-0.9.6" sources."balanced-match-1.0.0" sources."base62-0.1.1" sources."brace-expansion-1.1.11" - sources."commander-2.14.1" + sources."commander-2.15.1" sources."commoner-0.10.8" sources."concat-map-0.0.1" sources."defined-1.0.0" @@ -39590,7 +40303,7 @@ in (sources."openid-2.0.6" // { dependencies = [ sources."qs-6.5.1" - sources."request-2.83.0" + sources."request-2.85.0" ]; }) sources."pause-0.0.1" @@ -39605,7 +40318,7 @@ in sources."sax-1.2.4" sources."send-0.1.4" sources."sntp-2.1.0" - sources."sshpk-1.13.1" + sources."sshpk-1.14.1" sources."stream-counter-0.2.0" sources."string-1.6.1" sources."string_decoder-0.10.31" @@ -39646,10 +40359,10 @@ in serve = nodeEnv.buildNodePackage { name = "serve"; packageName = "serve"; - version = "6.5.0"; + version = "6.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/serve/-/serve-6.5.0.tgz"; - sha512 = "3jvih9f09fhgz59n8j1nb607wvhwailsnw1x98zqrq8rig5rc2a6dc3v3r2mw4mnvbgg5jnpiss440jfm9gbrymf985hqw1wlngbyf2"; + url = "https://registry.npmjs.org/serve/-/serve-6.5.3.tgz"; + sha512 = "1jywhr5vn5y47j4zh87vgh214j2zyd28j9jzcqdp7i9wdmv2v1i5yy3zfz7bb620md2v5fvz9x7ca6i1n9vihvg8xgm1mpijvnv3i3g"; }; dependencies = [ (sources."@zeit/check-updates-1.1.0" // { @@ -39657,13 +40370,13 @@ in sources."chalk-2.3.0" ]; }) - sources."accepts-1.3.4" + sources."accepts-1.3.5" sources."address-1.0.3" sources."align-text-0.1.4" sources."amdefine-1.0.1" sources."ansi-align-2.0.0" sources."ansi-regex-3.0.0" - sources."ansi-styles-3.2.0" + sources."ansi-styles-3.2.1" sources."arch-2.1.0" (sources."args-3.0.8" // { dependencies = [ @@ -39678,10 +40391,10 @@ in sources."camelcase-4.1.0" sources."capture-stack-trace-1.0.0" sources."center-align-0.1.3" - (sources."chalk-2.3.1" // { + (sources."chalk-2.3.2" // { dependencies = [ sources."has-flag-3.0.0" - sources."supports-color-5.2.0" + sources."supports-color-5.3.0" ]; }) sources."cli-boxes-1.0.0" @@ -39695,7 +40408,7 @@ in sources."color-name-1.1.3" sources."compressible-2.0.13" sources."compression-1.7.2" - sources."configstore-3.1.1" + sources."configstore-3.1.2" sources."content-type-1.0.4" sources."create-error-class-3.0.2" sources."cross-spawn-5.1.0" @@ -39758,8 +40471,8 @@ in sources."lazy-cache-1.0.4" sources."lodash-4.17.5" sources."longest-1.0.1" - sources."lowercase-keys-1.0.0" - sources."lru-cache-4.1.1" + sources."lowercase-keys-1.0.1" + sources."lru-cache-4.1.2" sources."make-dir-1.2.0" sources."micro-9.1.0" sources."micro-compress-1.0.0" @@ -39788,7 +40501,7 @@ in sources."pseudomap-1.0.2" sources."range-parser-1.2.0" sources."raw-body-2.3.2" - sources."rc-1.2.5" + sources."rc-1.2.6" sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" sources."repeat-string-1.6.1" @@ -39800,6 +40513,7 @@ in dependencies = [ sources."depd-1.1.2" sources."ms-2.0.0" + sources."statuses-1.4.0" ]; }) sources."setprototypeof-1.0.3" @@ -39807,7 +40521,7 @@ in sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" sources."source-map-0.4.4" - sources."statuses-1.4.0" + sources."statuses-1.5.0" sources."string-similarity-1.2.0" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" @@ -39858,7 +40572,7 @@ in dependencies = [ sources."CSSselect-0.4.1" sources."CSSwhat-0.4.7" - sources."accepts-1.3.4" + sources."accepts-1.3.5" sources."after-0.8.1" sources."ajv-5.5.2" sources."array-flatten-1.1.1" @@ -39891,7 +40605,7 @@ in }) sources."co-4.6.0" sources."combined-stream-1.0.6" - sources."commander-2.14.1" + sources."commander-2.15.1" sources."component-bind-1.0.0" sources."component-emitter-1.1.2" sources."component-inherit-0.0.3" @@ -39930,12 +40644,12 @@ in sources."escape-html-1.0.3" sources."etag-1.8.1" sources."event-stream-3.3.4" - sources."express-4.16.2" + sources."express-4.16.3" sources."extend-3.0.1" sources."extsprintf-1.3.0" sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" - sources."finalhandler-1.1.0" + sources."finalhandler-1.1.1" sources."forever-agent-0.6.1" sources."form-data-2.3.2" sources."forwarded-0.1.2" @@ -39954,11 +40668,7 @@ in sources."entities-1.0.0" ]; }) - (sources."http-errors-1.6.2" // { - dependencies = [ - sources."depd-1.1.1" - ]; - }) + sources."http-errors-1.6.3" sources."http-signature-1.2.0" sources."iconv-lite-0.4.19" sources."indexof-0.0.1" @@ -40005,13 +40715,18 @@ in sources."punycode-1.4.1" sources."qs-6.5.1" sources."range-parser-1.2.0" - sources."raw-body-2.3.2" + (sources."raw-body-2.3.2" // { + dependencies = [ + sources."depd-1.1.1" + sources."http-errors-1.6.2" + ]; + }) sources."read-1.0.7" sources."readable-stream-1.1.14" - sources."request-2.83.0" + sources."request-2.85.0" sources."safe-buffer-5.1.1" - sources."send-0.16.1" - sources."serve-static-1.13.1" + sources."send-0.16.2" + sources."serve-static-1.13.2" sources."setprototypeof-1.1.0" sources."slate-irc-0.7.3" (sources."slate-irc-parser-0.0.2" // { @@ -40035,8 +40750,8 @@ in sources."socket.io-client-1.0.6" sources."socket.io-parser-2.2.0" sources."split-0.3.3" - sources."sshpk-1.13.1" - sources."statuses-1.3.1" + sources."sshpk-1.14.1" + sources."statuses-1.4.0" sources."stream-combiner-0.0.4" sources."string_decoder-0.10.31" sources."stringstream-0.0.5" @@ -40075,10 +40790,10 @@ in }; dependencies = [ sources."JSONStream-1.3.2" - sources."accepts-1.3.4" + sources."accepts-1.3.5" sources."ajv-5.5.2" sources."amdefine-1.0.1" - sources."ansi-styles-3.2.0" + sources."ansi-styles-3.2.1" sources."argparse-1.0.10" sources."array-flatten-2.1.1" sources."array-uniq-1.0.3" @@ -40095,7 +40810,12 @@ in sources."bytes-3.0.0" sources."iconv-lite-0.4.19" sources."qs-6.5.1" - sources."raw-body-2.3.2" + (sources."raw-body-2.3.2" // { + dependencies = [ + sources."depd-1.1.1" + sources."http-errors-1.6.2" + ]; + }) ]; }) sources."boom-4.3.1" @@ -40107,12 +40827,12 @@ in }) sources."bytes-1.0.0" sources."caseless-0.12.0" - sources."chalk-2.3.1" + sources."chalk-2.3.2" sources."co-4.6.0" sources."color-convert-1.9.1" sources."color-name-1.1.3" sources."combined-stream-1.0.6" - sources."commander-2.14.1" + sources."commander-2.15.1" sources."compressible-2.0.13" (sources."compression-1.7.2" // { dependencies = [ @@ -40181,9 +40901,10 @@ in sources."highlight.js-8.9.1" sources."hoek-4.2.1" sources."htmlparser2-3.9.2" - (sources."http-errors-1.6.2" // { + (sources."http-errors-1.6.3" // { dependencies = [ - sources."depd-1.1.1" + sources."setprototypeof-1.1.0" + sources."statuses-1.5.0" ]; }) sources."http-signature-1.2.0" @@ -40195,7 +40916,7 @@ in sources."isarray-1.0.0" sources."isstream-0.1.2" sources."jju-1.3.0" - sources."js-yaml-3.10.0" + sources."js-yaml-3.11.0" sources."jsbn-0.1.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.3.1" @@ -40222,10 +40943,10 @@ in sources."minimatch-1.0.0" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."moment-2.20.1" + sources."moment-2.22.0" sources."ms-2.0.0" sources."mv-2.1.1" - sources."nan-2.9.2" + sources."nan-2.10.0" sources."ncp-2.0.0" sources."negotiator-0.6.1" sources."number-is-nan-1.0.1" @@ -40238,7 +40959,7 @@ in sources."path-is-absolute-1.0.1" sources."path-to-regexp-0.1.7" sources."performance-now-2.1.0" - sources."postcss-6.0.19" + sources."postcss-6.0.21" sources."process-nextick-args-2.0.0" sources."proxy-addr-1.1.5" sources."punycode-1.4.1" @@ -40253,11 +40974,11 @@ in }) (sources."render-readme-1.3.1" // { dependencies = [ - sources."readable-stream-2.3.4" + sources."readable-stream-2.3.5" sources."source-map-0.6.1" ]; }) - (sources."request-2.83.0" // { + (sources."request-2.85.0" // { dependencies = [ sources."qs-6.5.1" ]; @@ -40282,11 +41003,11 @@ in sources."source-map-0.1.43" sources."sprintf-js-1.0.3" sources."srcset-1.0.0" - sources."sshpk-1.13.1" + sources."sshpk-1.14.1" sources."statuses-1.3.1" sources."string_decoder-1.0.3" sources."stringstream-0.0.5" - sources."supports-color-5.2.0" + sources."supports-color-5.3.0" sources."through-2.3.8" sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" @@ -40340,7 +41061,7 @@ in sources."lodash-4.17.5" sources."minimatch-3.0.4" sources."process-nextick-args-2.0.0" - sources."readable-stream-2.3.4" + sources."readable-stream-2.3.5" sources."readdirp-2.1.0" sources."safe-buffer-5.1.1" sources."set-immediate-shim-1.0.1" @@ -40386,7 +41107,7 @@ in sources."ecc-jsbn-0.1.1" sources."escape-regexp-component-1.0.2" sources."extsprintf-1.2.0" - sources."formidable-1.1.1" + sources."formidable-1.2.1" sources."glob-6.0.4" sources."http-signature-0.11.0" sources."inflight-1.0.6" @@ -40403,7 +41124,7 @@ in sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."mv-2.1.1" - sources."nan-2.9.2" + sources."nan-2.10.0" sources."ncp-2.0.0" sources."negotiator-0.5.3" sources."node-uuid-1.4.8" @@ -40413,7 +41134,7 @@ in sources."precond-0.2.3" sources."process-nextick-args-2.0.0" sources."qs-3.1.0" - sources."readable-stream-2.3.4" + sources."readable-stream-2.3.5" (sources."restify-4.0.3" // { dependencies = [ sources."lru-cache-2.7.3" @@ -40495,13 +41216,13 @@ in "socket.io" = nodeEnv.buildNodePackage { name = "socket.io"; packageName = "socket.io"; - version = "2.0.4"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-2.0.4.tgz"; - sha1 = "c1a4590ceff87ecf13c72652f046f716b29e6014"; + url = "https://registry.npmjs.org/socket.io/-/socket.io-2.1.0.tgz"; + sha512 = "2wkm6yqxvn8wk51rbakza3zxg3rknzfgmwqrbzvnlacf1yylplsr61i67m01sg8x7589ymj6x3z266ngvqd6qyyakdx4dlnsl4bfbr9"; }; dependencies = [ - sources."accepts-1.3.4" + sources."accepts-1.3.5" sources."after-0.8.2" sources."arraybuffer.slice-0.0.7" sources."async-limiter-1.0.0" @@ -40515,17 +41236,9 @@ in sources."component-emitter-1.2.1" sources."component-inherit-0.0.3" sources."cookie-0.3.1" - sources."debug-2.6.9" - (sources."engine.io-3.1.5" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) - (sources."engine.io-client-3.1.5" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) + sources."debug-3.1.0" + sources."engine.io-3.2.0" + sources."engine.io-client-3.2.1" sources."engine.io-parser-2.1.2" sources."has-binary2-1.0.2" sources."has-cors-1.1.0" @@ -40540,15 +41253,10 @@ in sources."parseuri-0.0.5" sources."safe-buffer-5.1.1" sources."socket.io-adapter-1.1.1" - sources."socket.io-client-2.0.4" - (sources."socket.io-parser-3.1.3" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) + sources."socket.io-client-2.1.0" + sources."socket.io-parser-3.2.0" sources."to-array-0.1.4" sources."ultron-1.1.1" - sources."uws-9.14.0" sources."ws-3.3.3" sources."xmlhttprequest-ssl-1.5.5" sources."yeast-0.1.2" @@ -40594,7 +41302,7 @@ in sources."hashring-3.2.0" sources."keypress-0.1.0" sources."modern-syslog-1.1.2" - sources."nan-2.9.2" + sources."nan-2.10.0" sources."sequence-2.2.1" sources."simple-lru-cache-0.0.2" sources."winser-0.1.6" @@ -40715,7 +41423,7 @@ in sources."domelementtype-1.3.0" sources."domutils-1.5.1" sources."entities-1.1.1" - sources."es-abstract-1.10.0" + sources."es-abstract-1.11.0" sources."es-to-primitive-1.1.1" sources."esprima-4.0.0" sources."foreach-2.0.5" @@ -40779,7 +41487,7 @@ in sources."path-is-absolute-1.0.1" sources."process-nextick-args-2.0.0" sources."prr-1.0.1" - sources."readable-stream-2.3.4" + sources."readable-stream-2.3.5" sources."resolve-from-2.0.0" sources."safe-buffer-5.1.1" sources."string_decoder-1.0.3" @@ -40799,13 +41507,14 @@ in titanium = nodeEnv.buildNodePackage { name = "titanium"; packageName = "titanium"; - version = "5.0.14"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/titanium/-/titanium-5.0.14.tgz"; - sha1 = "140bd332624acae65113a3ffec10b8cbb940ad0b"; + url = "https://registry.npmjs.org/titanium/-/titanium-5.1.0.tgz"; + sha1 = "68597b6d324a65c7cf070c40a2a156b219ca06dd"; }; dependencies = [ sources."adm-zip-0.4.7" + sources."ajv-4.11.8" sources."align-text-0.1.4" sources."amdefine-1.0.1" sources."ansi-regex-2.1.1" @@ -40819,13 +41528,14 @@ in sources."bcrypt-pbkdf-1.0.1" sources."boom-2.10.1" sources."camelcase-1.2.1" - sources."caseless-0.11.0" + sources."caseless-0.12.0" sources."center-align-0.1.3" sources."chalk-1.1.3" sources."cliui-2.1.0" + sources."co-4.6.0" sources."colors-1.1.2" sources."combined-stream-1.0.6" - sources."commander-2.14.1" + sources."commander-2.15.1" sources."core-util-is-1.0.2" sources."cryptiles-2.0.5" sources."cycle-1.0.3" @@ -40850,7 +41560,8 @@ in sources."generate-object-property-1.2.0" sources."getpass-0.1.7" sources."graceful-fs-4.1.11" - sources."har-validator-2.0.6" + sources."har-schema-1.0.5" + sources."har-validator-4.2.1" sources."has-ansi-2.0.0" sources."hawk-3.1.3" sources."hoek-2.16.3" @@ -40864,8 +41575,10 @@ in sources."isstream-0.1.2" sources."jsbn-0.1.1" sources."json-schema-0.2.3" + sources."json-stable-stringify-1.0.1" sources."json-stringify-safe-5.0.1" sources."jsonfile-2.4.0" + sources."jsonify-0.0.0" sources."jsonpointer-4.0.1" (sources."jsprim-1.4.1" // { dependencies = [ @@ -40882,32 +41595,42 @@ in sources."mime-types-2.1.18" sources."minimist-0.0.10" sources."moment-2.16.0" - (sources."node-appc-0.2.41" // { + (sources."node-appc-0.2.44" // { dependencies = [ - sources."async-2.1.4" + sources."async-2.3.0" + sources."fs-extra-2.0.0" + sources."request-2.81.0" sources."source-map-0.5.7" sources."wordwrap-0.0.2" ]; }) - sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."optimist-0.6.1" sources."os-tmpdir-1.0.2" + sources."performance-now-0.2.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."pkginfo-0.3.1" sources."punycode-1.4.1" - sources."qs-6.3.2" + sources."qs-6.4.0" sources."repeat-string-1.6.1" - sources."request-2.79.0" + (sources."request-2.79.0" // { + dependencies = [ + sources."caseless-0.11.0" + sources."har-validator-2.0.6" + sources."qs-6.3.2" + sources."tunnel-agent-0.4.3" + ]; + }) sources."right-align-0.1.3" sources."rimraf-2.2.8" + sources."safe-buffer-5.1.1" sources."semver-5.3.0" sources."sntp-1.0.9" sources."source-map-0.1.32" sources."source-map-support-0.3.2" sources."sprintf-0.1.5" - (sources."sshpk-1.13.1" // { + (sources."sshpk-1.14.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -40918,15 +41641,11 @@ in sources."supports-color-2.0.0" sources."temp-0.8.3" sources."tough-cookie-2.3.4" - sources."tunnel-agent-0.4.3" + sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - (sources."uglify-js-2.7.5" // { - dependencies = [ - sources."async-0.2.10" - ]; - }) + sources."uglify-js-2.8.21" sources."uglify-to-browserify-1.0.2" - sources."uuid-3.2.1" + sources."uuid-3.0.1" sources."verror-1.10.0" sources."window-size-0.1.0" (sources."winston-1.1.2" // { @@ -40936,8 +41655,7 @@ in ]; }) sources."wordwrap-0.0.3" - sources."wrench-1.5.9" - sources."xmldom-0.1.27" + sources."xmldom-0.1.22" sources."xtend-4.0.1" sources."yargs-3.10.0" ]; @@ -40953,10 +41671,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "2.7.2"; + version = "2.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-2.7.2.tgz"; - sha512 = "2gjv6xyp9rqfdfqadayc4b36b79sjdiwsxa38z43v01cdn3xbc06ax90mjv36hxj9j96nfbwr6w1wn7n0zq8f3y3fw4jfy0j1hw5557"; + url = "https://registry.npmjs.org/typescript/-/typescript-2.8.1.tgz"; + sha512 = "1v0ac83sjf21wg11fpllicxz8irx9yg341zmng7vz15524gbfphc9ch70n4x9r70gm0r4ak79xyaxw9zh6b2cwcs7mg447qvzlxz3q2"; }; buildInputs = globalBuildInputs; meta = { @@ -40990,9 +41708,11 @@ in sources."bluebird-3.5.1" sources."boxen-1.3.0" sources."brace-expansion-1.1.11" + sources."buffer-from-1.0.0" sources."camelcase-4.1.0" sources."capture-stack-trace-1.0.0" sources."chalk-1.1.3" + sources."ci-info-1.1.3" sources."cli-boxes-1.0.0" sources."cli-cursor-1.0.2" (sources."cli-truncate-1.1.0" // { @@ -41001,14 +41721,14 @@ in sources."strip-ansi-4.0.0" ]; }) - sources."clone-1.0.3" + sources."clone-1.0.4" sources."color-convert-1.9.1" sources."color-name-1.1.3" sources."columnify-1.5.4" sources."combined-stream-1.0.6" sources."concat-map-0.0.1" - sources."concat-stream-1.6.0" - sources."configstore-3.1.1" + sources."concat-stream-1.6.2" + sources."configstore-3.1.2" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" sources."cross-spawn-5.1.0" @@ -41045,9 +41765,10 @@ in sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.5" - sources."invariant-2.2.3" + sources."invariant-2.2.4" sources."is-absolute-0.2.6" sources."is-arrayish-0.2.1" + sources."is-ci-1.1.0" sources."is-fullwidth-code-point-2.0.0" sources."is-installed-globally-0.1.0" sources."is-npm-1.0.0" @@ -41070,8 +41791,8 @@ in sources."lockfile-1.0.3" sources."log-update-1.0.2" sources."loose-envify-1.3.1" - sources."lowercase-keys-1.0.0" - sources."lru-cache-4.1.1" + sources."lowercase-keys-1.0.1" + sources."lru-cache-4.1.2" sources."make-dir-1.2.0" sources."make-error-1.3.4" sources."make-error-cause-1.2.2" @@ -41103,12 +41824,12 @@ in sources."promise-finally-3.0.0" sources."pseudomap-1.0.2" sources."punycode-1.4.1" - (sources."rc-1.2.5" // { + (sources."rc-1.2.6" // { dependencies = [ sources."minimist-1.2.0" ]; }) - sources."readable-stream-2.3.4" + sources."readable-stream-2.3.5" sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" sources."restore-cursor-1.0.1" @@ -41136,7 +41857,7 @@ in sources."touch-1.0.0" sources."tough-cookie-2.3.4" sources."typedarray-0.0.6" - sources."typescript-2.7.2" + sources."typescript-2.8.1" (sources."typings-core-2.3.3" // { dependencies = [ sources."minimist-0.0.8" @@ -41145,12 +41866,12 @@ in sources."unc-path-regex-0.1.2" sources."unique-string-1.0.0" sources."unzip-response-2.0.1" - (sources."update-notifier-2.3.0" // { + (sources."update-notifier-2.4.0" // { dependencies = [ - sources."ansi-styles-3.2.0" - sources."chalk-2.3.1" + sources."ansi-styles-3.2.1" + sources."chalk-2.3.2" sources."semver-5.5.0" - sources."supports-color-5.2.0" + sources."supports-color-5.3.0" ]; }) sources."url-parse-lax-1.0.0" @@ -41178,19 +41899,19 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.3.12"; + version = "3.3.18"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.12.tgz"; - sha512 = "166ccv37fz5bsnwpp0n0xqxx63pdg8d4hxhac79k61n47l69mcw7sp5g3c68y98x867da1w1bnv5ryisvsjsj639sbpdl2mg56nng72"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.18.tgz"; + sha512 = "3vg4gpamx95s8md0lsnx3njijc8x5z8nifn2c204w261w09h7d65zjkm9mxy4v3scrab7nhd6qypdq5jgf8nkbvzvqp8akpzwbch62n"; }; dependencies = [ - sources."commander-2.14.1" + sources."commander-2.15.1" sources."source-map-0.6.1" ]; buildInputs = globalBuildInputs; meta = { description = "JavaScript parser, mangler/compressor and beautifier toolkit"; - homepage = http://lisperator.net/uglifyjs; + homepage = "https://github.com/mishoo/UglifyJS2#readme"; license = "BSD-2-Clause"; }; production = true; @@ -41199,14 +41920,14 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "1.4.10"; + version = "1.4.17"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.4.10.tgz"; - sha512 = "0l2pf7nl7pkc8kq77agwg5s5c21wd3rl10l42l6xk6s3bkdv8l0vhlrvzampasaraikblyjh0sq81rqym3whn2jfspqhivllpkb8iqp"; + url = "https://registry.npmjs.org/ungit/-/ungit-1.4.17.tgz"; + sha512 = "1qy7j5zv8kvk5c9y4pjh0x8m243yhc1prv9s3kqbbpsxkgapdk8ap6dwa3nhh93cj5v1mb29jnfqqy20lypwvy8j8z3436vdckhc480"; }; dependencies = [ sources."abbrev-1.1.1" - sources."accepts-1.3.4" + sources."accepts-1.3.5" sources."after-0.8.2" sources."ajv-5.5.2" sources."ansi-regex-2.1.1" @@ -41230,24 +41951,30 @@ in sources."blob-0.0.4" sources."bluebird-3.5.1" sources."blueimp-md5-2.10.0" - sources."body-parser-1.18.2" + (sources."body-parser-1.18.2" // { + dependencies = [ + sources."setprototypeof-1.0.3" + ]; + }) sources."boom-4.3.1" sources."brace-expansion-1.1.11" + sources."buffer-from-1.0.0" sources."builtin-modules-1.1.1" sources."builtins-1.0.3" sources."bytes-3.0.0" sources."callsite-1.0.0" sources."camelcase-4.1.0" sources."caseless-0.12.0" + sources."charenc-0.0.2" (sources."cliui-4.0.0" // { dependencies = [ sources."ansi-regex-2.1.1" ]; }) - sources."clone-2.1.1" + sources."clone-2.1.2" sources."co-4.6.0" sources."code-point-at-1.1.0" - sources."color-2.0.1" + sources."color-3.0.0" sources."color-convert-1.9.1" sources."color-name-1.1.3" sources."color-string-1.5.2" @@ -41257,7 +41984,7 @@ in sources."component-emitter-1.1.2" sources."component-inherit-0.0.3" sources."concat-map-0.0.1" - sources."concat-stream-1.6.0" + sources."concat-stream-1.6.2" sources."console-control-strings-1.1.0" sources."content-disposition-0.5.2" sources."content-type-1.0.4" @@ -41269,6 +41996,7 @@ in sources."crc-3.4.4" sources."cross-spawn-5.1.0" sources."crossroads-0.12.2" + sources."crypt-0.0.2" (sources."cryptiles-3.1.2" // { dependencies = [ sources."boom-5.2.0" @@ -41283,7 +42011,7 @@ in sources."delegates-1.0.0" sources."depd-1.1.2" sources."destroy-1.0.4" - sources."diff-3.4.0" + sources."diff-3.5.0" (sources."diff2html-2.3.3" // { dependencies = [ sources."mkdirp-0.3.0" @@ -41299,7 +42027,7 @@ in sources."debug-3.1.0" ]; }) - (sources."engine.io-client-3.1.5" // { + (sources."engine.io-client-3.1.6" // { dependencies = [ sources."debug-3.1.0" ]; @@ -41309,11 +42037,9 @@ in sources."etag-1.8.1" sources."eve-0.5.4" sources."execa-0.7.0" - (sources."express-4.16.2" // { + (sources."express-4.16.3" // { dependencies = [ - sources."serve-static-1.13.1" - sources."setprototypeof-1.1.0" - sources."statuses-1.3.1" + sources."statuses-1.4.0" ]; }) sources."express-session-1.15.6" @@ -41323,7 +42049,7 @@ in sources."eyes-0.1.8" sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" - sources."finalhandler-1.1.0" + sources."finalhandler-1.1.1" sources."find-up-2.1.0" sources."forever-agent-0.6.1" sources."form-data-0.1.3" @@ -41334,7 +42060,7 @@ in sources."gauge-2.7.4" sources."get-caller-file-1.0.2" sources."get-stream-3.0.0" - sources."getmac-1.2.1" + sources."getmac-1.4.1" sources."getpass-0.1.7" sources."glob-7.1.2" sources."graceful-fs-4.1.11" @@ -41347,12 +42073,8 @@ in sources."hawk-6.0.2" sources."hoek-4.2.1" sources."hogan.js-3.0.2" - sources."hosted-git-info-2.5.0" - (sources."http-errors-1.6.2" // { - dependencies = [ - sources."depd-1.1.1" - ]; - }) + sources."hosted-git-info-2.6.0" + sources."http-errors-1.6.3" sources."http-signature-1.2.0" sources."iconv-lite-0.4.19" sources."ignore-3.3.7" @@ -41363,6 +42085,7 @@ in sources."invert-kv-1.0.0" sources."ipaddr.js-1.6.0" sources."is-arrayish-0.3.1" + sources."is-buffer-1.1.6" sources."is-builtin-module-1.0.0" sources."is-fullwidth-code-point-1.0.0" sources."is-stream-1.1.0" @@ -41389,8 +42112,8 @@ in sources."lcid-1.0.0" sources."locate-path-2.0.0" sources."lodash-4.17.5" - sources."lru-cache-4.1.1" - sources."lsmod-1.0.0" + sources."lru-cache-4.1.2" + sources."md5-2.2.1" sources."media-typer-0.3.0" sources."mem-1.1.0" (sources."memorystore-1.6.0" // { @@ -41407,22 +42130,22 @@ in sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."moment-2.20.1" + sources."moment-2.21.0" sources."ms-2.0.0" sources."negotiator-0.6.1" sources."node-cache-4.1.1" sources."nopt-1.0.10" sources."normalize-package-data-2.4.0" - sources."npm-5.6.0" - sources."npm-package-arg-5.1.2" - (sources."npm-registry-client-8.5.0" // { + sources."npm-5.7.1" + sources."npm-package-arg-6.0.0" + (sources."npm-registry-client-8.5.1" // { dependencies = [ sources."combined-stream-1.0.6" sources."delayed-stream-1.0.0" sources."extend-3.0.1" sources."form-data-2.3.2" sources."isarray-1.0.0" - sources."readable-stream-2.3.4" + sources."readable-stream-2.3.5" sources."string_decoder-1.0.3" ]; }) @@ -41465,34 +42188,35 @@ in sources."qs-6.5.1" sources."random-bytes-1.0.0" sources."range-parser-1.2.0" - (sources."raven-2.3.0" // { + (sources."raven-2.4.2" // { dependencies = [ sources."uuid-3.0.0" ]; }) - sources."raw-body-2.3.2" - (sources."rc-1.2.5" // { + (sources."raw-body-2.3.2" // { + dependencies = [ + sources."depd-1.1.1" + sources."http-errors-1.6.2" + ]; + }) + (sources."rc-1.2.6" // { dependencies = [ sources."minimist-1.2.0" ]; }) sources."readable-stream-1.0.27-1" sources."reduce-component-1.0.1" - sources."request-2.83.0" + sources."request-2.85.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" sources."retry-0.10.1" sources."rimraf-2.6.2" sources."safe-buffer-5.1.1" - sources."semver-5.4.1" - sources."send-0.16.1" - (sources."serve-static-1.13.2" // { - dependencies = [ - sources."send-0.16.2" - ]; - }) + sources."semver-5.5.0" + sources."send-0.16.2" + sources."serve-static-1.13.2" sources."set-blocking-2.0.0" - sources."setprototypeof-1.0.3" + sources."setprototypeof-1.1.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" @@ -41518,10 +42242,10 @@ in sources."spdx-exceptions-2.1.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.0" - sources."sshpk-1.13.1" - sources."ssri-4.1.6" + sources."sshpk-1.14.1" + sources."ssri-5.3.0" sources."stack-trace-0.0.9" - sources."statuses-1.4.0" + sources."statuses-1.5.0" sources."string-width-1.0.2" sources."string_decoder-0.10.31" sources."stringstream-0.0.5" @@ -41537,9 +42261,9 @@ in sources."delayed-stream-1.0.0" sources."extend-3.0.1" sources."form-data-2.3.2" - sources."formidable-1.1.1" + sources."formidable-1.2.1" sources."isarray-1.0.0" - sources."readable-stream-2.3.4" + sources."readable-stream-2.3.5" sources."string_decoder-1.0.3" ]; }) @@ -41568,11 +42292,11 @@ in sources."validate-npm-package-name-3.0.0" sources."vary-1.1.2" sources."verror-1.10.0" - sources."whatwg-fetch-2.0.3" + sources."whatwg-fetch-2.0.4" sources."which-1.3.0" sources."which-module-2.0.0" sources."wide-align-1.1.2" - (sources."winston-2.4.0" // { + (sources."winston-2.4.1" // { dependencies = [ sources."async-1.0.0" ]; @@ -41588,7 +42312,7 @@ in sources."xmlhttprequest-ssl-1.5.5" sources."y18n-3.2.1" sources."yallist-2.1.2" - (sources."yargs-10.1.2" // { + (sources."yargs-11.1.0" // { dependencies = [ sources."ansi-regex-3.0.0" sources."is-fullwidth-code-point-2.0.0" @@ -41596,7 +42320,7 @@ in sources."strip-ansi-4.0.0" ]; }) - sources."yargs-parser-8.1.0" + sources."yargs-parser-9.0.2" sources."yeast-0.1.2" ]; buildInputs = globalBuildInputs; @@ -41608,6 +42332,307 @@ in production = true; bypassCache = false; }; + vue-cli = nodeEnv.buildNodePackage { + name = "vue-cli"; + packageName = "vue-cli"; + version = "2.9.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-cli/-/vue-cli-2.9.3.tgz"; + sha512 = "1wljsr8srayqg7crbbczi00v31q3dxm3vz4fjcdqasdgsm1ajc9gham6sinsxlraniwg4dn5b1kmpw0nln63cy3v02vib07shyvq2ki"; + }; + dependencies = [ + sources."absolute-0.0.1" + sources."ajv-5.5.2" + sources."align-text-0.1.4" + sources."amdefine-1.0.1" + sources."ansi-escapes-3.1.0" + sources."ansi-red-0.1.1" + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" + sources."ansi-wrap-0.1.0" + sources."argparse-1.0.10" + sources."array-differ-1.0.0" + sources."array-union-1.0.2" + sources."array-uniq-1.0.3" + sources."arrify-1.0.1" + sources."asn1-0.2.3" + sources."assert-plus-1.0.0" + sources."async-2.6.0" + sources."asynckit-0.4.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.6.0" + sources."balanced-match-1.0.0" + sources."base64-js-0.0.8" + sources."bcrypt-pbkdf-1.0.1" + sources."bl-1.2.2" + sources."bluebird-3.5.1" + sources."boom-4.3.1" + sources."brace-expansion-1.1.11" + sources."buffer-3.6.0" + sources."buffer-crc32-0.2.13" + sources."builtins-1.0.3" + sources."camelcase-1.2.1" + sources."capture-stack-trace-1.0.0" + sources."caseless-0.12.0" + (sources."caw-2.0.1" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) + sources."center-align-0.1.3" + sources."chalk-2.3.2" + sources."chardet-0.4.2" + sources."cli-cursor-2.1.0" + sources."cli-spinners-1.3.0" + sources."cli-width-2.2.0" + sources."cliui-2.1.0" + sources."clone-1.0.4" + sources."co-3.1.0" + sources."co-from-stream-0.0.0" + sources."co-fs-extra-1.2.1" + sources."co-read-0.0.1" + sources."coffee-script-1.12.7" + sources."color-convert-1.9.1" + sources."color-name-1.1.3" + sources."combined-stream-1.0.6" + sources."commander-2.15.1" + sources."concat-map-0.0.1" + sources."config-chain-1.1.11" + sources."consolidate-0.14.5" + sources."core-util-is-1.0.2" + sources."create-error-class-3.0.2" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) + sources."dashdash-1.14.1" + sources."decamelize-1.2.0" + (sources."decompress-4.2.0" // { + dependencies = [ + sources."file-type-3.9.0" + sources."get-stream-2.3.1" + ]; + }) + sources."decompress-tar-4.1.1" + sources."decompress-tarbz2-4.1.1" + sources."decompress-targz-4.1.1" + sources."decompress-unzip-4.0.1" + sources."delayed-stream-1.0.0" + (sources."download-5.0.3" // { + dependencies = [ + sources."file-type-5.2.0" + ]; + }) + (sources."download-git-repo-1.0.2" // { + dependencies = [ + sources."commander-2.8.1" + sources."file-type-6.2.0" + ]; + }) + sources."duplexer3-0.1.4" + sources."ecc-jsbn-0.1.1" + sources."enable-1.3.2" + sources."end-of-stream-1.4.1" + sources."escape-string-regexp-1.0.5" + sources."esprima-4.0.0" + sources."extend-3.0.1" + sources."extend-shallow-2.0.1" + sources."external-editor-2.2.0" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-1.1.0" + sources."fast-json-stable-stringify-2.0.0" + sources."fd-slicer-1.0.1" + sources."figures-2.0.0" + sources."file-type-5.2.0" + sources."filename-reserved-regex-2.0.0" + sources."filenamify-2.0.0" + sources."forever-agent-0.6.1" + sources."form-data-2.3.2" + sources."fs-extra-0.26.7" + sources."fs.realpath-1.0.0" + sources."get-proxy-2.1.0" + sources."get-stream-3.0.0" + sources."getpass-0.1.7" + sources."git-clone-0.1.0" + sources."glob-7.1.2" + sources."got-6.7.1" + sources."graceful-fs-4.1.11" + sources."graceful-readlink-1.0.1" + sources."gray-matter-2.1.1" + (sources."handlebars-4.0.11" // { + dependencies = [ + sources."async-1.5.2" + sources."wordwrap-0.0.2" + ]; + }) + sources."har-schema-2.0.0" + sources."har-validator-5.0.3" + sources."has-ansi-2.0.0" + sources."has-flag-3.0.0" + sources."has-generators-1.0.1" + sources."has-symbol-support-x-1.4.2" + sources."has-to-string-tag-x-1.4.1" + sources."hawk-6.0.2" + sources."hoek-4.2.1" + sources."http-signature-1.2.0" + sources."iconv-lite-0.4.19" + sources."ieee754-1.1.11" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."ini-1.3.5" + sources."inquirer-3.3.0" + sources."is-3.2.1" + sources."is-buffer-1.1.6" + sources."is-extendable-0.1.1" + sources."is-fullwidth-code-point-2.0.0" + sources."is-natural-number-4.0.1" + sources."is-object-1.0.1" + sources."is-promise-2.1.0" + sources."is-redirect-1.0.0" + sources."is-retry-allowed-1.1.0" + sources."is-stream-1.1.0" + sources."is-typedarray-1.0.0" + sources."is-utf8-0.2.1" + sources."isarray-1.0.0" + sources."isstream-0.1.2" + sources."isurl-1.0.0" + sources."js-yaml-3.11.0" + sources."jsbn-0.1.1" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.3.1" + sources."json-stringify-safe-5.0.1" + sources."jsonfile-2.4.0" + sources."jsprim-1.4.1" + sources."kind-of-3.2.2" + sources."klaw-1.3.1" + sources."lazy-cache-1.0.4" + sources."lodash-4.17.5" + sources."log-symbols-2.2.0" + sources."longest-1.0.1" + sources."lowercase-keys-1.0.1" + (sources."make-dir-1.2.0" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) + (sources."metalsmith-2.3.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."chalk-1.1.3" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + ]; + }) + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."mimic-fn-1.2.0" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + sources."multimatch-2.1.0" + sources."mute-stream-0.0.7" + sources."npm-conf-1.1.3" + sources."oauth-sign-0.8.2" + sources."object-assign-4.1.1" + sources."once-1.4.0" + sources."onetime-2.0.1" + sources."optimist-0.6.1" + sources."ora-1.4.0" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."path-is-absolute-1.0.1" + sources."pend-1.2.0" + sources."performance-now-2.1.0" + sources."pify-2.3.0" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + sources."prepend-http-1.0.4" + sources."process-nextick-args-2.0.0" + sources."proto-list-1.2.4" + sources."punycode-1.4.1" + sources."qs-6.5.1" + sources."read-metadata-1.0.0" + sources."readable-stream-2.3.5" + sources."recursive-readdir-2.2.2" + sources."repeat-string-1.6.1" + (sources."request-2.85.0" // { + dependencies = [ + sources."co-4.6.0" + ]; + }) + sources."restore-cursor-2.0.0" + sources."right-align-0.1.3" + sources."rimraf-2.6.2" + sources."run-async-2.3.0" + sources."rx-lite-4.0.8" + sources."rx-lite-aggregates-4.0.8" + sources."safe-buffer-5.1.1" + sources."seek-bzip-1.0.5" + sources."semver-5.5.0" + sources."signal-exit-3.0.2" + sources."sntp-2.1.0" + sources."source-map-0.4.4" + sources."sprintf-js-1.0.3" + sources."sshpk-1.14.1" + sources."stat-mode-0.2.2" + sources."string-width-2.1.1" + sources."string_decoder-1.0.3" + sources."stringstream-0.0.5" + sources."strip-ansi-4.0.0" + sources."strip-dirs-2.1.0" + sources."strip-outer-1.0.1" + sources."supports-color-5.3.0" + sources."tar-stream-1.5.5" + sources."through-2.3.8" + sources."thunkify-2.1.2" + sources."thunkify-wrap-1.0.4" + sources."tildify-1.2.0" + sources."timed-out-4.0.1" + sources."tmp-0.0.33" + sources."toml-2.3.3" + sources."tough-cookie-2.3.4" + sources."trim-repeated-1.0.0" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + (sources."uglify-js-2.8.29" // { + dependencies = [ + sources."source-map-0.5.7" + ]; + }) + sources."uglify-to-browserify-1.0.2" + sources."uid-0.0.2" + sources."unbzip2-stream-1.2.5" + sources."unyield-0.0.1" + sources."unzip-response-2.0.1" + sources."url-parse-lax-1.0.0" + sources."url-to-options-1.0.1" + sources."user-home-2.0.0" + sources."util-deprecate-1.0.2" + sources."uuid-3.2.1" + sources."validate-npm-package-name-3.0.0" + sources."verror-1.10.0" + sources."ware-1.3.0" + sources."win-fork-1.1.1" + sources."window-size-0.1.0" + sources."wordwrap-0.0.3" + sources."wrap-fn-0.1.5" + sources."wrappy-1.0.2" + sources."xtend-4.0.1" + sources."yaml-js-0.0.8" + sources."yargs-3.10.0" + sources."yauzl-2.9.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A simple CLI for scaffolding Vue.js projects."; + homepage = "https://github.com/vuejs/vue-cli#readme"; + license = "MIT"; + }; + production = true; + bypassCache = false; + }; webdrvr = nodeEnv.buildNodePackage { name = "webdrvr"; packageName = "webdrvr"; @@ -41633,7 +42658,7 @@ in sources."caseless-0.11.0" sources."chalk-1.1.3" sources."combined-stream-1.0.6" - sources."commander-2.14.1" + sources."commander-2.15.1" sources."concat-map-0.0.1" sources."concat-stream-1.5.0" (sources."config-chain-1.1.11" // { @@ -41724,7 +42749,7 @@ in sources."rimraf-2.6.2" sources."semver-2.3.2" sources."sntp-1.0.9" - (sources."sshpk-1.13.1" // { + (sources."sshpk-1.14.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -41759,17 +42784,17 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "4.0.1"; + version = "4.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.0.1.tgz"; - sha512 = "1hb2dyvj718ijrx00xnd3zbzqll3jqnij5rp5qp4pxx3vl9wxg7jsz8s703h3snxr73yi9a2xpfgwqxs8gcbhl277g5l4lgc8r0sx4c"; + url = "https://registry.npmjs.org/webpack/-/webpack-4.4.1.tgz"; + sha512 = "2zmid39lsiz55wvivhnza1i1w8561z3fn30bs3jii5n10q5462p7yqrk5y5bf7j612g2mflygsy1lyvxc0dhxxhb75a7380q5r0kdc8"; }; dependencies = [ - sources."acorn-5.5.0" + sources."acorn-5.5.3" sources."acorn-dynamic-import-3.0.0" - sources."ajv-6.2.0" + sources."ajv-6.4.0" sources."ajv-keywords-3.1.0" - sources."anymatch-1.3.2" + sources."anymatch-2.0.0" sources."aproba-1.2.0" sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" @@ -41778,9 +42803,8 @@ in sources."asn1.js-4.10.1" sources."assert-1.4.1" sources."assign-symbols-1.0.0" - sources."async-2.6.0" sources."async-each-1.0.1" - sources."atob-2.0.3" + sources."atob-2.1.0" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -41813,11 +42837,12 @@ in sources."browserify-sign-4.0.4" sources."browserify-zlib-0.2.0" sources."buffer-4.9.1" + sources."buffer-from-1.0.0" sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" sources."cacache-10.0.4" sources."cache-base-1.0.1" - sources."chokidar-1.7.0" + sources."chokidar-2.0.3" sources."chownr-1.0.1" sources."chrome-trace-event-0.1.2" sources."cipher-base-1.0.4" @@ -41831,7 +42856,7 @@ in sources."commondir-1.0.1" sources."component-emitter-1.2.1" sources."concat-map-0.0.1" - sources."concat-stream-1.6.0" + sources."concat-stream-1.6.2" sources."console-browserify-1.1.0" sources."constants-browserify-1.0.0" sources."copy-concurrently-1.0.5" @@ -41849,7 +42874,7 @@ in sources."des.js-1.0.0" sources."diffie-hellman-5.0.2" sources."domain-browser-1.2.0" - sources."duplexify-3.5.3" + sources."duplexify-3.5.4" sources."elliptic-6.4.0" sources."emojis-list-2.1.0" sources."end-of-stream-1.4.1" @@ -41865,7 +42890,6 @@ in sources."define-property-0.2.5" ]; }) - sources."expand-range-1.8.2" sources."extend-shallow-3.0.2" (sources."extglob-2.0.4" // { dependencies = [ @@ -41877,7 +42901,6 @@ in }) sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" - sources."filename-regex-2.0.1" (sources."fill-range-4.0.0" // { dependencies = [ sources."kind-of-3.2.2" @@ -41885,9 +42908,8 @@ in }) sources."find-cache-dir-1.0.0" sources."find-up-2.1.0" - sources."flush-write-stream-1.0.2" + sources."flush-write-stream-1.0.3" sources."for-in-1.0.2" - sources."for-own-0.1.5" sources."fragment-cache-0.2.1" sources."from2-2.3.0" sources."fs-write-stream-atomic-1.0.10" @@ -41895,8 +42917,11 @@ in sources."fsevents-1.1.3" sources."get-value-2.0.6" sources."glob-7.1.2" - sources."glob-base-0.3.0" - sources."glob-parent-2.0.0" + (sources."glob-parent-3.1.0" // { + dependencies = [ + sources."is-glob-3.1.0" + ]; + }) sources."graceful-fs-4.1.11" sources."has-value-1.0.0" sources."has-values-1.0.0" @@ -41904,7 +42929,7 @@ in sources."hash.js-1.1.3" sources."hmac-drbg-1.0.1" sources."https-browserify-1.0.0" - sources."ieee754-1.1.8" + sources."ieee754-1.1.11" sources."iferr-0.1.5" sources."imurmurhash-0.1.4" sources."indexof-0.0.1" @@ -41915,34 +42940,28 @@ in sources."is-buffer-1.1.6" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" - sources."is-dotfile-1.0.3" - sources."is-equal-shallow-0.1.3" sources."is-extendable-0.1.1" - sources."is-extglob-1.0.0" - sources."is-glob-2.0.1" + sources."is-extglob-2.1.1" + sources."is-glob-4.0.0" sources."is-number-3.0.0" sources."is-odd-2.0.0" sources."is-plain-object-2.0.4" - sources."is-posix-bracket-0.1.1" - sources."is-primitive-2.0.0" sources."is-windows-1.0.2" sources."isarray-1.0.0" sources."isobject-3.0.1" sources."json-schema-traverse-0.3.1" sources."json5-0.5.1" sources."kind-of-6.0.2" - sources."lazy-cache-2.0.2" sources."loader-runner-2.3.0" sources."loader-utils-1.1.0" sources."locate-path-2.0.0" - sources."lodash-4.17.5" - sources."lru-cache-4.1.1" + sources."lru-cache-4.1.2" sources."make-dir-1.2.0" sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."md5.js-1.3.4" sources."memory-fs-0.4.1" - (sources."micromatch-3.1.9" // { + (sources."micromatch-3.1.10" // { dependencies = [ sources."has-values-0.1.4" (sources."is-accessor-descriptor-0.1.6" // { @@ -41970,19 +42989,19 @@ in sources."mkdirp-0.5.1" sources."move-concurrently-1.0.1" sources."ms-2.0.0" - sources."nan-2.9.2" + sources."nan-2.10.0" sources."nanomatch-1.2.9" sources."neo-async-2.5.0" (sources."node-libs-browser-2.1.0" // { dependencies = [ sources."hash-base-2.0.2" sources."inherits-2.0.1" + sources."punycode-1.4.1" ]; }) sources."normalize-path-2.1.1" sources."object-copy-0.1.0" sources."object-visit-1.0.1" - sources."object.omit-2.0.1" sources."object.pick-1.3.0" sources."once-1.4.0" sources."os-browserify-0.3.0" @@ -41992,16 +43011,15 @@ in sources."pako-1.0.6" sources."parallel-transform-1.1.0" sources."parse-asn1-5.1.0" - sources."parse-glob-3.0.4" sources."pascalcase-0.1.1" sources."path-browserify-0.0.0" + sources."path-dirname-1.0.2" sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" sources."pbkdf2-3.0.14" sources."pify-3.0.0" sources."pkg-dir-2.0.0" sources."posix-character-classes-0.1.1" - sources."preserve-0.2.0" sources."process-0.11.10" sources."process-nextick-args-2.0.0" sources."promise-inflight-1.0.1" @@ -42010,23 +43028,13 @@ in sources."public-encrypt-4.0.0" sources."pump-2.0.1" sources."pumpify-1.4.0" - sources."punycode-1.4.1" + sources."punycode-2.1.0" sources."querystring-0.2.0" sources."querystring-es3-0.2.1" - (sources."randomatic-1.1.7" // { - dependencies = [ - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - ]; - }) sources."randombytes-2.0.6" sources."randomfill-1.0.4" - sources."readable-stream-2.3.4" + sources."readable-stream-2.3.5" sources."readdirp-2.1.0" - sources."regex-cache-0.4.4" sources."regex-not-1.0.2" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.2" @@ -42040,12 +43048,11 @@ in sources."safe-regex-1.1.0" sources."schema-utils-0.4.5" sources."serialize-javascript-1.4.0" - sources."set-getter-0.1.0" sources."set-immediate-shim-1.0.1" sources."set-value-2.0.0" sources."setimmediate-1.0.5" - sources."sha.js-2.4.10" - (sources."snapdragon-0.8.1" // { + sources."sha.js-2.4.11" + (sources."snapdragon-0.8.2" // { dependencies = [ (sources."define-property-0.2.5" // { dependencies = [ @@ -42091,11 +43098,11 @@ in sources."extend-shallow-3.0.2" ]; }) - sources."ssri-5.2.4" + sources."ssri-5.3.0" sources."static-extend-0.1.2" sources."stream-browserify-2.0.1" sources."stream-each-1.2.2" - sources."stream-http-2.8.0" + sources."stream-http-2.8.1" sources."stream-shift-1.0.0" sources."string_decoder-1.0.3" sources."tapable-1.0.0" @@ -42108,7 +43115,7 @@ in sources."tty-browserify-0.0.0" sources."typedarray-0.0.6" sources."uglify-es-3.3.10" - (sources."uglifyjs-webpack-plugin-1.2.2" // { + (sources."uglifyjs-webpack-plugin-1.2.4" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -42129,40 +43136,29 @@ in }) ]; }) + sources."upath-1.0.4" + sources."uri-js-3.0.2" sources."urix-0.1.0" (sources."url-0.11.0" // { dependencies = [ sources."punycode-1.3.2" ]; }) - sources."use-2.0.2" + (sources."use-3.1.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) sources."util-0.10.3" sources."util-deprecate-1.0.2" sources."vm-browserify-0.0.4" - (sources."watchpack-1.4.0" // { - dependencies = [ - sources."arr-diff-2.0.0" - sources."array-unique-0.2.1" - (sources."braces-1.8.5" // { - dependencies = [ - sources."kind-of-4.0.0" - ]; - }) - sources."expand-brackets-0.1.5" - sources."extglob-0.3.2" - sources."fill-range-2.2.3" - sources."is-number-2.1.0" - sources."isobject-2.1.0" - sources."kind-of-3.2.2" - sources."micromatch-2.3.11" - ]; - }) + sources."watchpack-1.5.0" (sources."webpack-sources-1.1.0" // { dependencies = [ sources."source-map-0.6.1" ]; }) - sources."worker-farm-1.5.4" + sources."worker-farm-1.6.0" sources."wrappy-1.0.2" sources."xtend-4.0.1" sources."y18n-4.0.0" @@ -42180,20 +43176,18 @@ in web-ext = nodeEnv.buildNodePackage { name = "web-ext"; packageName = "web-ext"; - version = "2.4.0"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/web-ext/-/web-ext-2.4.0.tgz"; - sha1 = "4103e737196eb2a9fe83087752357d1dfe618294"; + url = "https://registry.npmjs.org/web-ext/-/web-ext-2.6.0.tgz"; + sha1 = "52c074123e6376a4fb673e565c33dd027714e9b0"; }; dependencies = [ - sources."@types/node-9.4.6" + sources."@cliqz-oss/firefox-client-0.3.1" + sources."@cliqz-oss/node-firefox-connect-1.2.1" + sources."@types/node-9.6.1" sources."JSONSelect-0.2.1" - sources."acorn-5.5.0" - (sources."acorn-dynamic-import-2.0.2" // { - dependencies = [ - sources."acorn-4.0.13" - ]; - }) + sources."abbrev-1.1.1" + sources."acorn-5.5.3" (sources."acorn-jsx-3.0.1" // { dependencies = [ sources."acorn-3.3.0" @@ -42202,89 +43196,119 @@ in sources."adbkit-2.11.0" sources."adbkit-logcat-1.1.0" sources."adbkit-monkey-1.0.1" - (sources."addons-linter-0.35.0" // { + (sources."addons-linter-0.41.0" // { dependencies = [ sources."ajv-keywords-1.5.1" sources."ansi-escapes-1.4.0" sources."ansi-regex-3.0.0" - sources."ansi-styles-3.2.0" + sources."ansi-styles-3.2.1" sources."async-2.6.0" sources."camelcase-1.2.1" sources."cli-cursor-1.0.2" - (sources."cliui-3.2.0" // { - dependencies = [ - sources."string-width-1.0.2" - ]; - }) + sources."cliui-3.2.0" sources."debug-3.1.0" sources."decamelize-1.2.0" sources."domelementtype-1.1.3" + sources."es6-promise-3.3.1" sources."figures-1.7.0" - sources."globals-11.3.0" - sources."hash-base-2.0.2" - sources."inherits-2.0.1" + sources."find-up-2.1.0" + sources."for-in-0.1.8" + sources."globals-11.4.0" + sources."got-3.3.1" sources."inquirer-0.12.0" sources."is-fullwidth-code-point-1.0.0" + sources."latest-version-1.0.1" + sources."lazy-cache-0.2.7" sources."mute-stream-0.0.5" + sources."object-assign-3.0.0" sources."onetime-1.1.0" + sources."package-json-1.2.0" sources."parse-json-2.2.0" + sources."path-exists-3.0.0" sources."pluralize-1.2.1" sources."progress-1.1.8" - sources."punycode-2.1.0" + sources."punycode-1.3.2" + sources."repeating-1.1.3" sources."restore-cursor-1.0.1" sources."run-async-0.1.0" sources."rx-lite-3.1.2" sources."slice-ansi-0.0.4" sources."source-map-0.6.1" - sources."source-map-support-0.5.1" + sources."source-map-support-0.5.4" sources."string-width-1.0.2" sources."strip-ansi-4.0.0" - sources."supports-color-4.5.0" + sources."strip-bom-2.0.0" + sources."supports-color-5.3.0" sources."table-3.8.3" + sources."timed-out-2.0.0" + sources."traverse-0.6.6" sources."underscore-1.6.0" + sources."update-notifier-0.5.0" + sources."which-module-2.0.0" + sources."window-size-0.2.0" sources."wordwrap-0.0.2" - (sources."yargs-10.0.3" // { + (sources."yargs-11.0.0" // { dependencies = [ sources."camelcase-4.1.0" + sources."cliui-4.0.0" sources."is-fullwidth-code-point-2.0.0" sources."string-width-2.1.1" ]; }) - sources."yargs-parser-8.1.0" + sources."yargs-parser-9.0.2" ]; }) sources."adm-zip-0.4.7" - sources."ajv-5.5.2" - sources."ajv-keywords-3.1.0" + sources."ajv-6.3.0" + sources."ajv-keywords-2.1.1" sources."ajv-merge-patch-3.0.0" sources."align-text-0.1.4" sources."anchor-markdown-header-0.5.7" sources."ansi-align-2.0.0" - sources."ansi-escapes-3.0.0" + sources."ansi-escapes-3.1.0" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" + sources."ansicolors-0.3.2" sources."any-promise-1.3.0" - sources."anymatch-1.3.2" + (sources."anymatch-2.0.0" // { + dependencies = [ + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."is-extendable-1.0.1" + ]; + }) sources."archiver-2.1.1" sources."archiver-utils-1.3.0" + sources."archy-1.0.0" sources."argparse-1.0.10" - sources."arr-diff-2.0.0" + sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" sources."array-filter-0.0.1" sources."array-from-2.1.1" sources."array-map-0.0.0" sources."array-reduce-0.0.0" sources."array-union-1.0.2" sources."array-uniq-1.0.3" - sources."array-unique-0.2.1" + sources."array-unique-0.3.2" sources."arrify-1.0.1" + sources."asap-2.0.6" sources."asn1-0.2.3" - sources."asn1.js-4.10.1" - sources."assert-1.4.1" sources."assert-plus-1.0.0" + sources."assign-symbols-1.0.0" sources."async-0.2.10" sources."async-each-1.0.1" sources."asynckit-0.4.0" + sources."atob-2.1.0" sources."aws-sign2-0.7.0" sources."aws4-1.6.0" sources."babel-code-frame-6.26.0" @@ -42310,43 +43334,40 @@ in sources."babylon-6.18.0" sources."bail-1.0.2" sources."balanced-match-1.0.0" - sources."base64-js-1.2.3" - sources."base64url-2.0.0" - sources."bcrypt-pbkdf-1.0.1" - sources."big.js-3.2.0" - sources."binary-extensions-1.11.0" - sources."bl-1.2.1" - sources."bluebird-2.9.34" - sources."bn.js-4.11.8" - sources."boolbase-1.0.0" - sources."boom-4.3.1" - sources."boundary-1.0.1" - sources."boxen-1.3.0" - sources."brace-expansion-1.1.11" - (sources."braces-1.8.5" // { + (sources."base-0.11.2" // { dependencies = [ - sources."kind-of-4.0.0" + (sources."define-property-1.0.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + sources."kind-of-3.2.2" ]; }) - sources."brorand-1.1.0" - sources."browserify-aes-1.1.1" - sources."browserify-cipher-1.0.0" - sources."browserify-des-1.0.0" - sources."browserify-rsa-4.0.1" - sources."browserify-sign-4.0.4" - sources."browserify-zlib-0.2.0" - sources."buffer-4.9.1" + sources."base64-js-0.0.2" + sources."base64url-2.0.0" + sources."bcrypt-pbkdf-1.0.1" + sources."binary-extensions-1.11.0" + sources."bl-1.2.2" + sources."bluebird-2.9.34" + sources."boolbase-1.0.0" + sources."boom-4.3.1" + sources."bops-0.1.1" + sources."boundary-1.0.1" + sources."boxen-0.3.1" + sources."brace-expansion-1.1.11" + sources."braces-2.3.1" sources."buffer-crc32-0.2.13" sources."buffer-equal-constant-time-1.0.1" - sources."buffer-xor-1.0.3" + sources."buffer-from-1.0.0" sources."builtin-modules-1.1.1" - sources."builtin-status-codes-3.0.0" (sources."bunyan-1.8.12" // { dependencies = [ sources."glob-6.0.4" sources."rimraf-2.4.5" ]; }) + sources."cache-base-1.0.1" sources."caller-path-0.1.0" sources."callsites-0.2.0" sources."camelcase-4.1.0" @@ -42354,7 +43375,7 @@ in sources."caseless-0.12.0" sources."ccount-1.0.2" sources."center-align-0.1.3" - sources."chalk-2.3.0" + sources."chalk-2.3.2" sources."character-entities-1.2.1" sources."character-entities-html4-1.1.1" sources."character-entities-legacy-1.1.1" @@ -42365,39 +43386,54 @@ in sources."domelementtype-1.3.0" ]; }) - sources."chokidar-1.7.0" - sources."cipher-base-1.0.4" + (sources."chokidar-2.0.3" // { + dependencies = [ + sources."is-accessor-descriptor-1.0.0" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + sources."is-extendable-0.1.1" + ]; + }) sources."circular-json-0.3.3" + (sources."class-utils-0.3.6" // { + dependencies = [ + sources."define-property-0.2.5" + ]; + }) sources."cli-boxes-1.0.0" sources."cli-cursor-2.1.0" sources."cli-width-2.2.0" + sources."clite-0.3.0" sources."cliui-2.1.0" - sources."clone-1.0.3" + sources."clone-1.0.4" + sources."clone-deep-0.3.0" sources."co-4.6.0" sources."code-point-at-1.1.0" sources."collapse-white-space-1.0.3" + sources."collection-visit-1.0.0" sources."color-convert-1.9.1" sources."color-name-1.1.3" sources."colors-0.5.1" sources."columnify-1.5.4" sources."combined-stream-1.0.6" - sources."commander-2.14.1" + sources."commander-2.15.1" sources."common-tags-1.7.2" + sources."component-emitter-1.2.1" sources."compress-commons-1.2.2" sources."concat-map-0.0.1" - sources."concat-stream-1.6.0" - sources."configstore-3.1.1" - sources."console-browserify-1.1.0" - sources."constants-browserify-1.0.0" + sources."concat-stream-1.6.2" + (sources."configstore-1.4.0" // { + dependencies = [ + sources."uuid-2.0.3" + ]; + }) sources."convert-source-map-1.5.1" - sources."core-js-2.5.3" + sources."copy-descriptor-0.1.1" + sources."core-js-2.5.4" sources."core-util-is-1.0.2" sources."crc-3.5.0" sources."crc32-stream-2.0.0" - sources."create-ecdh-4.0.0" sources."create-error-class-3.0.2" - sources."create-hash-1.1.3" - sources."create-hmac-1.1.6" sources."cross-spawn-5.1.0" sources."crx-parser-0.1.2" (sources."cryptiles-3.1.2" // { @@ -42405,67 +43441,67 @@ in sources."boom-5.2.0" ]; }) - sources."crypto-browserify-3.12.0" sources."crypto-random-string-1.0.0" sources."css-select-1.2.0" sources."css-what-2.1.0" sources."d-1.0.0" sources."dashdash-1.14.1" - sources."date-now-0.1.4" sources."debounce-1.1.0" sources."debug-2.6.9" sources."decamelize-2.0.0" + sources."decode-uri-component-0.2.0" sources."deep-equal-1.0.1" sources."deep-extend-0.4.2" sources."deep-is-0.1.3" sources."deepcopy-0.6.3" - sources."deepmerge-1.5.2" + sources."deepmerge-2.1.0" sources."defaults-1.0.3" + sources."define-property-2.0.2" sources."del-2.2.2" sources."delayed-stream-1.0.0" - sources."des.js-1.0.0" sources."detect-indent-4.0.0" - sources."diffie-hellman-5.0.2" - (sources."dispensary-0.12.0" // { + (sources."dispensary-0.16.0" // { dependencies = [ - sources."semver-5.4.1" - sources."source-map-support-0.5.0" + sources."ajv-5.5.2" ]; }) - sources."doctoc-1.3.0" + sources."doctoc-1.3.1" sources."doctrine-2.1.0" sources."dom-serializer-0.1.0" - sources."domain-browser-1.2.0" sources."domelementtype-1.3.0" sources."domhandler-2.4.1" sources."domutils-1.5.1" - sources."dot-prop-4.2.0" + sources."dot-prop-3.0.0" sources."dtrace-provider-0.8.6" + sources."duplexer2-0.1.4" sources."duplexer3-0.1.4" + sources."duplexify-3.5.4" sources."ecc-jsbn-0.1.1" sources."ecdsa-sig-formatter-1.0.9" - sources."elliptic-6.4.0" + sources."email-validator-1.1.1" sources."emoji-regex-6.1.3" - sources."emojis-list-2.1.0" sources."encoding-0.1.12" sources."end-of-stream-1.4.1" - sources."enhanced-resolve-3.4.1" sources."entities-1.1.1" - sources."errno-0.1.7" sources."error-ex-1.3.1" - sources."es5-ext-0.10.39" + sources."es5-ext-0.10.42" sources."es6-error-4.1.1" sources."es6-iterator-2.0.3" sources."es6-map-0.1.5" - sources."es6-promise-4.2.4" - sources."es6-promisify-5.0.0" + sources."es6-promise-2.3.0" + (sources."es6-promisify-5.0.0" // { + dependencies = [ + sources."es6-promise-4.2.4" + ]; + }) sources."es6-set-0.1.5" sources."es6-symbol-3.1.1" sources."es6-weak-map-2.0.2" sources."escape-string-regexp-1.0.5" sources."escope-3.6.0" - (sources."eslint-4.15.0" // { + (sources."eslint-4.19.0" // { dependencies = [ + sources."ajv-5.5.2" sources."esprima-4.0.0" ]; }) @@ -42492,24 +43528,31 @@ in }) sources."eslint-scope-3.7.1" sources."eslint-visitor-keys-1.0.0" - sources."espree-3.5.3" + sources."espree-3.5.4" sources."esprima-3.1.3" - sources."esquery-1.0.0" + sources."esquery-1.0.1" sources."esrecurse-4.2.1" sources."estraverse-4.2.0" sources."esutils-2.0.2" sources."event-emitter-0.3.5" sources."event-to-promise-0.8.0" - sources."events-1.1.1" - sources."evp_bytestokey-1.0.3" sources."execa-0.7.0" sources."exit-hook-1.1.1" - sources."expand-brackets-0.1.5" - sources."expand-range-1.8.2" + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."define-property-0.2.5" + ]; + }) sources."extend-3.0.1" - sources."external-editor-2.1.0" - sources."extglob-0.3.2" - sources."extract-text-webpack-plugin-3.0.2" + sources."extend-shallow-3.0.2" + sources."external-editor-2.2.0" + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + sources."kind-of-5.1.0" + ]; + }) sources."extsprintf-1.3.0" sources."fast-deep-equal-1.1.0" sources."fast-json-parse-1.0.3" @@ -42520,10 +43563,9 @@ in sources."fd-slicer-1.0.1" sources."figures-2.0.0" sources."file-entry-cache-2.0.0" - sources."filename-regex-2.0.1" - sources."fill-range-2.2.3" - sources."find-up-2.1.0" - sources."firefox-client-0.3.0" + sources."fill-range-4.0.0" + sources."filled-array-1.1.0" + sources."find-up-1.1.2" (sources."firefox-profile-1.1.0" // { dependencies = [ sources."async-2.5.0" @@ -42532,11 +43574,12 @@ in sources."first-chunk-stream-2.0.0" sources."flat-cache-1.3.0" sources."flatstr-1.0.5" - sources."fluent-0.4.1" + sources."fluent-syntax-0.6.6" sources."for-in-1.0.2" - sources."for-own-0.1.5" + sources."for-own-1.0.0" sources."forever-agent-0.6.1" sources."form-data-2.3.2" + sources."fragment-cache-0.2.1" sources."fs-extra-4.0.3" sources."fs.realpath-1.0.0" sources."fsevents-1.1.3" @@ -42554,6 +43597,7 @@ in sources."generate-object-property-1.2.0" sources."get-caller-file-1.0.2" sources."get-stream-3.0.0" + sources."get-value-2.0.6" sources."getpass-0.1.7" sources."gettext-parser-1.1.0" (sources."git-rev-sync-1.9.1" // { @@ -42562,71 +43606,75 @@ in ]; }) sources."glob-7.1.2" - sources."glob-base-0.3.0" - sources."glob-parent-2.0.0" + (sources."glob-parent-3.1.0" // { + dependencies = [ + sources."is-glob-3.1.0" + ]; + }) sources."global-dirs-0.1.1" sources."globals-9.18.0" sources."globby-5.0.0" - sources."got-6.7.1" + sources."got-5.7.1" sources."graceful-fs-4.1.11" sources."graceful-readlink-1.0.1" + sources."graphlib-2.1.5" sources."growly-1.3.0" sources."har-schema-2.0.0" sources."har-validator-5.0.3" sources."has-1.0.1" sources."has-ansi-2.0.0" sources."has-color-0.1.7" - sources."has-flag-2.0.0" - sources."hash-base-3.0.4" - sources."hash.js-1.1.3" + sources."has-flag-3.0.0" + sources."has-value-1.0.0" + sources."has-values-1.0.0" + sources."hasbin-1.2.3" sources."hawk-6.0.2" - sources."hmac-drbg-1.0.1" sources."hoek-4.2.1" sources."home-or-tmp-2.0.0" - sources."hosted-git-info-2.5.0" + sources."hosted-git-info-2.6.0" sources."htmlparser2-3.9.2" sources."http-signature-1.2.0" - sources."https-browserify-1.0.0" sources."iconv-lite-0.4.19" - sources."ieee754-1.1.8" sources."ignore-3.3.7" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" - sources."indexof-0.0.1" + sources."infinity-agent-2.0.3" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.5" sources."inquirer-3.3.0" sources."interpret-1.1.0" - sources."invariant-2.2.3" + sources."invariant-2.2.4" sources."invert-kv-1.0.0" sources."is-absolute-0.1.7" + sources."is-accessor-descriptor-1.0.0" sources."is-alphabetical-1.0.1" sources."is-alphanumerical-1.0.1" sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" sources."is-builtin-module-1.0.0" + sources."is-data-descriptor-1.0.0" sources."is-decimal-1.0.1" - sources."is-dotfile-1.0.3" - sources."is-equal-shallow-0.1.3" + sources."is-descriptor-1.0.2" sources."is-extendable-0.1.1" - sources."is-extglob-1.0.0" + sources."is-extglob-2.1.1" sources."is-finite-1.0.2" sources."is-fullwidth-code-point-2.0.0" - sources."is-glob-2.0.1" + sources."is-glob-4.0.0" sources."is-hexadecimal-1.0.1" sources."is-installed-globally-0.1.0" + sources."is-mergeable-object-1.1.0" sources."is-my-ip-valid-1.0.0" sources."is-my-json-valid-2.17.2" sources."is-npm-1.0.0" - sources."is-number-2.1.0" + sources."is-number-4.0.0" sources."is-obj-1.0.1" + sources."is-odd-2.0.0" sources."is-path-cwd-1.0.0" - sources."is-path-in-cwd-1.0.0" + sources."is-path-in-cwd-1.0.1" sources."is-path-inside-1.0.1" - sources."is-posix-bracket-0.1.1" - sources."is-primitive-2.0.0" + sources."is-plain-object-2.0.4" sources."is-promise-2.1.0" sources."is-property-1.0.2" sources."is-redirect-1.0.0" @@ -42636,22 +43684,22 @@ in sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" + sources."is-windows-1.0.2" sources."isarray-1.0.0" sources."isemail-1.2.0" sources."isexe-2.0.0" - sources."isobject-2.1.0" + sources."isobject-3.0.1" sources."isstream-0.1.2" sources."jed-1.1.1" sources."jetpack-id-1.0.0" sources."joi-6.10.1" sources."js-select-0.6.0" sources."js-tokens-3.0.2" - sources."js-yaml-3.10.0" + sources."js-yaml-3.11.0" sources."jsbn-0.1.1" sources."jsesc-1.3.0" - sources."json-loader-0.5.7" sources."json-merge-patch-0.2.3" - sources."json-parse-better-errors-1.0.1" + sources."json-parse-better-errors-1.0.2" sources."json-schema-0.2.3" sources."json-schema-traverse-0.3.1" sources."json-stable-stringify-1.0.1" @@ -42667,66 +43715,71 @@ in sources."jwa-1.1.5" sources."jws-3.1.4" sources."kind-of-3.2.2" - sources."latest-version-3.1.0" + sources."latest-version-2.0.0" sources."lazy-cache-1.0.4" sources."lazystream-1.0.0" sources."lcid-1.0.0" sources."levn-0.3.0" - sources."load-json-file-2.0.0" - sources."loader-runner-2.3.0" - sources."loader-utils-1.1.0" + sources."load-json-file-1.1.0" sources."locate-path-2.0.0" sources."lodash-4.17.5" - sources."lodash.endswith-4.2.1" - sources."lodash.isfunction-3.0.9" - sources."lodash.isstring-4.0.1" + sources."lodash.assign-4.2.0" + sources."lodash.clonedeep-4.5.0" + sources."lodash.defaults-4.2.0" + sources."lodash.defaultsdeep-4.6.0" + sources."lodash.mergewith-4.6.1" sources."lodash.once-4.1.1" sources."lodash.sortby-4.7.0" - sources."lodash.startswith-4.2.1" sources."longest-1.0.1" sources."longest-streak-1.0.0" sources."loose-envify-1.3.1" - sources."lowercase-keys-1.0.0" - sources."lru-cache-4.1.1" + sources."lowercase-keys-1.0.1" + sources."lru-cache-4.1.2" sources."make-dir-1.2.0" + sources."map-cache-0.2.2" + sources."map-visit-1.0.0" sources."markdown-table-0.4.0" sources."markdown-to-ast-3.4.0" - sources."md5.js-1.3.4" sources."mem-1.1.0" - sources."memory-fs-0.4.1" - sources."micromatch-2.3.11" - sources."miller-rabin-4.0.1" + (sources."micromatch-3.1.10" // { + dependencies = [ + sources."is-extendable-0.1.1" + ]; + }) sources."mime-db-1.33.0" sources."mime-types-2.1.18" sources."mimic-fn-1.2.0" - sources."minimalistic-assert-1.0.0" - sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.0" + sources."mixin-deep-1.3.1" + sources."mixin-object-2.0.1" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" ]; }) - sources."moment-2.20.1" + sources."moment-2.22.0" sources."ms-2.0.0" sources."mute-stream-0.0.7" sources."mv-2.1.1" sources."mz-2.7.0" - sources."nan-2.9.2" + sources."nan-2.10.0" + sources."nanomatch-1.2.9" sources."natural-compare-1.4.0" sources."natural-compare-lite-1.4.0" + sources."nconf-0.7.2" sources."ncp-2.0.0" - sources."next-tick-1.0.0" - (sources."node-firefox-connect-1.2.0" // { + (sources."needle-2.2.0" // { dependencies = [ - sources."es6-promise-2.3.0" - sources."traverse-0.4.6" + sources."debug-2.6.9" ]; }) - sources."node-forge-0.7.2" - sources."node-libs-browser-2.1.0" + sources."neo-async-2.5.0" + sources."nested-error-stacks-1.0.2" + sources."next-tick-1.0.0" + sources."node-forge-0.7.5" sources."node-notifier-5.2.1" + sources."node-status-codes-1.0.0" sources."nomnom-1.8.1" sources."normalize-package-data-2.4.0" sources."normalize-path-2.1.1" @@ -42735,41 +43788,44 @@ in sources."number-is-nan-1.0.1" sources."oauth-sign-0.8.2" sources."object-assign-4.1.1" - sources."object.omit-2.0.1" + sources."object-copy-0.1.0" + sources."object-visit-1.0.1" + sources."object.pick-1.3.0" sources."once-1.4.0" sources."onetime-2.0.1" sources."open-0.0.5" sources."optionator-0.8.2" - sources."os-browserify-0.3.0" sources."os-homedir-1.0.2" sources."os-locale-2.1.0" + sources."os-name-1.0.3" sources."os-shim-0.1.3" sources."os-tmpdir-1.0.2" + sources."osenv-0.1.5" + sources."osx-release-1.1.0" sources."p-finally-1.0.0" sources."p-limit-1.2.0" sources."p-locate-2.0.0" sources."p-try-1.0.0" - sources."package-json-4.0.1" + sources."package-json-2.4.0" sources."pako-1.0.6" - sources."parse-asn1-5.1.0" sources."parse-entities-1.1.1" - sources."parse-glob-3.0.4" sources."parse-json-4.0.0" sources."parse5-3.0.3" - sources."path-browserify-0.0.0" - sources."path-exists-3.0.0" + sources."pascalcase-0.1.1" + sources."path-dirname-1.0.2" + sources."path-exists-2.1.0" sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" sources."path-key-2.0.1" sources."path-parse-1.0.5" - sources."path-type-2.0.0" - sources."pbkdf2-3.0.14" + sources."path-type-1.1.0" sources."pend-1.2.0" sources."performance-now-2.1.0" sources."pify-2.3.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" - sources."pino-4.10.3" + sources."pino-4.14.0" + sources."pino-std-serializers-1.2.0" sources."pluralize-7.0.0" (sources."po2json-0.4.5" // { dependencies = [ @@ -42778,48 +43834,38 @@ in sources."strip-ansi-0.1.1" ]; }) - sources."postcss-6.0.14" + sources."posix-character-classes-0.1.1" + sources."postcss-6.0.19" sources."prelude-ls-1.1.2" sources."prepend-http-1.0.4" - sources."preserve-0.2.0" sources."private-0.1.8" - (sources."probe-image-size-3.2.0" // { + (sources."probe-image-size-4.0.0" // { dependencies = [ sources."debug-2.6.9" ]; }) - sources."process-0.11.10" sources."process-nextick-args-2.0.0" sources."progress-2.0.0" - sources."prr-1.0.1" + sources."promise-7.3.1" + sources."proxy-from-env-1.0.0" sources."pseudomap-1.0.2" - sources."public-encrypt-4.0.0" - sources."pump-2.0.1" + sources."pump-3.0.0" sources."punycode-1.4.1" sources."qs-6.5.1" sources."querystring-0.2.0" - sources."querystring-es3-0.2.1" sources."quick-format-unescaped-1.1.2" - (sources."randomatic-1.1.7" // { - dependencies = [ - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - ]; - }) - sources."randombytes-2.0.6" - sources."randomfill-1.0.4" - sources."rc-1.2.5" - sources."read-pkg-2.0.0" - sources."read-pkg-up-2.0.0" - sources."readable-stream-2.3.4" + sources."rc-1.2.6" + sources."read-all-stream-3.1.0" + sources."read-pkg-1.1.0" + sources."read-pkg-up-1.0.1" + sources."readable-stream-2.3.5" sources."readdirp-2.1.0" sources."readline2-1.0.1" sources."rechoir-0.6.2" + sources."recursive-readdir-2.2.2" sources."regenerator-runtime-0.11.1" - sources."regex-cache-0.4.4" + sources."regex-not-1.0.2" + sources."regexpp-1.1.0" sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" (sources."relaxed-json-1.0.1" // { @@ -42838,35 +43884,42 @@ in sources."repeat-element-1.1.2" sources."repeat-string-1.6.1" sources."repeating-2.0.1" - sources."request-2.83.0" + sources."request-2.85.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" sources."require-uncached-1.0.3" - sources."resolve-1.5.0" + sources."resolve-1.6.0" sources."resolve-from-1.0.1" + sources."resolve-url-0.2.1" sources."restore-cursor-2.0.0" + sources."ret-0.1.15" sources."right-align-0.1.3" sources."rimraf-2.6.2" - sources."ripemd160-2.0.1" sources."run-async-2.3.0" + sources."rx-4.1.0" sources."rx-lite-4.0.8" sources."rx-lite-aggregates-4.0.8" sources."safe-buffer-5.1.1" sources."safe-json-stringify-1.1.0" + sources."safe-regex-1.1.0" sources."sax-1.2.4" - sources."schema-utils-0.3.0" sources."semver-5.5.0" sources."semver-diff-2.1.0" sources."set-blocking-2.0.0" sources."set-immediate-shim-1.0.1" - sources."setimmediate-1.0.5" - sources."sha.js-2.4.10" + sources."set-value-2.0.0" + sources."sha.js-2.4.11" + (sources."shallow-clone-0.1.2" // { + dependencies = [ + sources."kind-of-2.0.1" + ]; + }) sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."shell-quote-1.6.1" sources."shelljs-0.8.1" sources."shellwords-0.1.1" - (sources."sign-addon-0.2.2" // { + (sources."sign-addon-0.3.0" // { dependencies = [ sources."assert-plus-0.2.0" sources."aws-sign2-0.6.0" @@ -42894,26 +43947,118 @@ in sources."signal-exit-3.0.2" sources."slash-1.0.0" sources."slice-ansi-1.0.0" + sources."slide-1.1.6" + (sources."snapdragon-0.8.2" // { + dependencies = [ + (sources."define-property-0.2.5" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."extend-shallow-2.0.1" + sources."kind-of-4.0.0" + ]; + }) + (sources."snapdragon-node-2.1.1" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."snapdragon-util-3.0.1" sources."sntp-2.1.0" - sources."source-list-map-2.0.0" + (sources."snyk-1.70.3" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."async-1.5.2" + sources."camelcase-3.0.0" + sources."chalk-1.1.3" + sources."inquirer-1.0.3" + sources."mute-stream-0.0.6" + sources."os-locale-1.4.0" + sources."run-async-2.3.0" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."yargs-3.15.0" + ]; + }) + (sources."snyk-config-1.0.1" // { + dependencies = [ + sources."async-0.9.2" + sources."debug-2.6.9" + ]; + }) + sources."snyk-go-plugin-1.4.5" + sources."snyk-gradle-plugin-1.2.0" + (sources."snyk-module-1.8.1" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + sources."snyk-mvn-plugin-1.1.1" + (sources."snyk-nuget-plugin-1.3.9" // { + dependencies = [ + sources."es6-promise-4.2.4" + ]; + }) + sources."snyk-php-plugin-1.3.2" + (sources."snyk-policy-1.10.2" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + sources."snyk-python-plugin-1.5.7" + (sources."snyk-resolve-1.0.0" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + (sources."snyk-resolve-deps-1.7.0" // { + dependencies = [ + sources."configstore-2.1.0" + sources."debug-2.6.9" + sources."update-notifier-0.6.3" + sources."uuid-2.0.3" + sources."yargs-4.8.1" + ]; + }) + (sources."snyk-sbt-plugin-1.2.5" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + sources."snyk-tree-1.0.0" + (sources."snyk-try-require-1.2.0" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) sources."source-map-0.5.7" + sources."source-map-resolve-0.5.1" (sources."source-map-support-0.5.3" // { dependencies = [ sources."source-map-0.6.1" ]; }) + sources."source-map-url-0.4.0" sources."spawn-sync-1.0.15" sources."spdx-correct-3.0.0" sources."spdx-exceptions-2.1.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.0" sources."split-0.3.3" + (sources."split-string-3.1.0" // { + dependencies = [ + sources."extend-shallow-3.0.2" + sources."is-extendable-1.0.1" + ]; + }) sources."split2-2.2.0" sources."sprintf-js-1.0.3" - sources."sshpk-1.13.1" - sources."stream-browserify-2.0.1" - sources."stream-http-2.8.0" + sources."sshpk-1.14.1" + sources."static-extend-0.1.2" sources."stream-parser-0.3.1" + sources."stream-shift-1.0.0" sources."stream-to-array-2.3.0" (sources."stream-to-promise-2.2.0" // { dependencies = [ @@ -42921,6 +44066,7 @@ in sources."once-1.3.3" ]; }) + sources."string-length-1.0.1" sources."string-width-2.1.1" sources."string_decoder-1.0.3" sources."stringify-entities-1.3.1" @@ -42933,114 +44079,143 @@ in sources."strip-json-comments-2.0.1" sources."structured-source-3.0.2" sources."supports-color-2.0.0" - (sources."table-4.0.3" // { + sources."table-4.0.2" + sources."tar-stream-1.5.5" + (sources."tempfile-1.1.1" // { dependencies = [ - sources."ajv-6.2.0" + sources."uuid-2.0.3" ]; }) - sources."tapable-0.2.8" - sources."tar-stream-1.5.5" sources."term-size-1.2.0" sources."text-table-0.2.0" + sources."then-fs-2.0.0" sources."thenify-3.3.0" sources."thenify-all-1.6.0" sources."through-2.3.8" sources."through2-2.0.3" - sources."timed-out-4.0.1" - sources."timers-browserify-2.0.6" + sources."timed-out-3.1.3" sources."tmp-0.0.33" - sources."to-arraybuffer-1.0.1" sources."to-fast-properties-1.0.3" + sources."to-object-path-0.3.0" + sources."to-regex-3.0.2" + sources."to-regex-range-2.1.1" + sources."to-utf8-0.0.1" + sources."toml-2.3.3" sources."topo-1.1.0" sources."tosource-1.0.0" sources."tough-cookie-2.3.4" sources."tr46-1.0.1" - sources."traverse-0.6.6" + sources."traverse-0.4.6" sources."trim-0.0.1" sources."trim-right-1.0.1" sources."trim-trailing-lines-1.1.0" sources."trough-1.0.1" - sources."tty-browserify-0.0.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" sources."typedarray-0.0.6" - sources."uglify-js-2.8.29" - sources."uglify-to-browserify-1.0.2" - (sources."uglifyjs-webpack-plugin-0.4.6" // { - dependencies = [ - sources."yargs-3.10.0" - ]; - }) + sources."undefsafe-0.0.3" sources."underscore-1.8.3" sources."unherit-1.1.0" sources."unified-4.2.1" + (sources."union-value-1.0.0" // { + dependencies = [ + sources."set-value-0.4.3" + ]; + }) sources."unique-string-1.0.0" sources."unist-util-is-2.1.1" sources."unist-util-remove-position-1.1.1" sources."unist-util-visit-1.3.0" sources."universalify-0.1.1" - sources."unzip-response-2.0.1" - sources."upath-1.0.2" + (sources."unset-value-1.0.0" // { + dependencies = [ + (sources."has-value-0.3.1" // { + dependencies = [ + sources."isobject-2.1.0" + ]; + }) + ]; + }) + sources."unzip-response-1.0.2" + sources."upath-1.0.4" (sources."update-notifier-2.3.0" // { dependencies = [ + sources."boxen-1.3.0" + sources."configstore-3.1.2" + sources."dot-prop-4.2.0" + sources."got-6.7.1" + sources."latest-version-3.1.0" + sources."package-json-4.0.1" sources."pify-3.0.0" + sources."timed-out-4.0.1" + sources."unzip-response-2.0.1" + sources."widest-line-2.0.0" + sources."write-file-atomic-2.3.0" + sources."xdg-basedir-3.0.0" ]; }) sources."update-section-0.3.3" - (sources."url-0.11.0" // { + sources."urix-0.1.0" + sources."url-0.11.0" + sources."url-parse-lax-1.0.0" + (sources."use-3.1.0" // { dependencies = [ - sources."punycode-1.3.2" + sources."kind-of-6.0.2" ]; }) - sources."url-parse-lax-1.0.0" sources."user-home-2.0.0" - sources."util-0.10.3" sources."util-deprecate-1.0.2" sources."uuid-3.2.1" sources."validate-npm-package-license-3.0.3" sources."verror-1.10.0" sources."vfile-1.4.0" sources."vfile-location-2.0.2" - sources."vm-browserify-0.0.4" - (sources."watchpack-1.4.0" // { + (sources."watchpack-1.5.0" // { dependencies = [ - sources."async-2.6.0" + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + sources."has-values-0.1.4" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."is-extendable-1.0.1" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."kind-of-6.0.2" ]; }) sources."wcwidth-1.0.1" sources."webidl-conversions-4.0.2" - (sources."webpack-3.10.0" // { + (sources."whatwg-url-6.3.0" // { dependencies = [ - sources."ajv-keywords-2.1.1" - sources."ansi-regex-2.1.1" - sources."camelcase-4.1.0" - sources."is-fullwidth-code-point-2.0.0" - sources."source-map-0.5.7" - sources."string-width-2.1.1" - sources."strip-ansi-3.0.1" - (sources."yargs-8.0.2" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."strip-ansi-4.0.0" - ]; - }) + sources."punycode-2.1.0" ]; }) - sources."webpack-sources-1.1.0" - sources."whatwg-url-6.3.0" sources."when-3.7.7" sources."which-1.3.0" - sources."which-module-2.0.0" - sources."widest-line-2.0.0" - sources."window-size-0.1.0" + sources."which-module-1.0.0" + sources."widest-line-1.0.0" + sources."win-release-1.1.1" + sources."window-size-0.1.4" sources."winreg-0.0.12" sources."wordwrap-1.0.0" sources."wrap-ansi-2.1.0" sources."wrappy-1.0.2" sources."write-0.2.1" - sources."write-file-atomic-2.3.0" - sources."xdg-basedir-3.0.0" + sources."write-file-atomic-1.3.4" + sources."xdg-basedir-2.0.0" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" sources."xmldom-0.1.27" @@ -43053,23 +44228,15 @@ in sources."camelcase-3.0.0" sources."cliui-3.2.0" sources."decamelize-1.2.0" - sources."find-up-1.1.2" sources."is-fullwidth-code-point-1.0.0" - sources."load-json-file-1.1.0" sources."os-locale-1.4.0" - sources."parse-json-2.2.0" - sources."path-exists-2.1.0" - sources."path-type-1.1.0" - sources."read-pkg-1.1.0" - sources."read-pkg-up-1.0.1" sources."string-width-1.0.2" - sources."strip-bom-2.0.0" - sources."which-module-1.0.0" sources."yargs-parser-4.2.1" ]; }) - sources."yargs-parser-7.0.0" + sources."yargs-parser-2.4.1" sources."yauzl-2.9.1" + sources."zip-1.2.0" (sources."zip-dir-1.0.2" // { dependencies = [ sources."async-1.5.2" @@ -43134,7 +44301,7 @@ in sources."ajv-5.5.2" sources."ansi-0.3.1" sources."ansi-align-2.0.0" - sources."ansi-escapes-3.0.0" + sources."ansi-escapes-3.1.0" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" sources."are-we-there-yet-1.1.4" @@ -43159,21 +44326,27 @@ in sources."boom-4.3.1" sources."boxen-1.3.0" sources."brace-expansion-1.1.11" + sources."buffer-from-1.0.0" sources."builtin-modules-1.1.1" - sources."cacheable-request-2.1.4" + (sources."cacheable-request-2.1.4" // { + dependencies = [ + sources."lowercase-keys-1.0.0" + ]; + }) sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" sources."capture-stack-trace-1.0.0" sources."caseless-0.12.0" sources."chalk-1.1.3" sources."chardet-0.4.2" + sources."ci-info-1.1.3" sources."clean-stack-1.3.0" sources."cli-boxes-1.0.0" sources."cli-cursor-2.1.0" sources."cli-list-0.2.0" sources."cli-width-2.2.0" - sources."clone-1.0.3" - sources."clone-regexp-1.0.0" + sources."clone-1.0.4" + sources."clone-regexp-1.0.1" sources."clone-response-1.0.2" sources."clone-stats-0.0.1" sources."co-4.6.0" @@ -43182,8 +44355,8 @@ in sources."color-name-1.1.3" sources."combined-stream-1.0.6" sources."concat-map-0.0.1" - sources."concat-stream-1.6.0" - sources."configstore-3.1.1" + sources."concat-stream-1.6.2" + sources."configstore-3.1.2" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" sources."cross-spawn-5.1.0" @@ -43204,7 +44377,7 @@ in sources."default-uid-1.0.0" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" - sources."diff-3.4.0" + sources."diff-3.5.0" sources."dot-prop-4.2.0" sources."downgrade-root-1.2.2" sources."duplexer3-0.1.4" @@ -43216,7 +44389,7 @@ in sources."execall-1.0.0" sources."exit-hook-1.1.1" sources."extend-3.0.1" - sources."external-editor-2.1.0" + sources."external-editor-2.2.0" sources."extsprintf-1.3.0" sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" @@ -43244,7 +44417,7 @@ in sources."glob-7.1.2" sources."global-dirs-0.1.1" sources."globby-6.1.0" - sources."got-8.2.0" + sources."got-8.3.0" sources."graceful-fs-4.1.11" sources."grouped-queue-0.3.3" sources."har-schema-2.0.0" @@ -43256,10 +44429,10 @@ in sources."has-unicode-2.0.1" sources."hawk-6.0.2" sources."hoek-4.2.1" - sources."hosted-git-info-2.5.0" + sources."hosted-git-info-2.6.0" sources."http-cache-semantics-3.8.1" sources."http-signature-1.2.0" - sources."humanize-string-1.0.1" + sources."humanize-string-1.0.2" sources."iconv-lite-0.4.19" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" @@ -43270,10 +44443,10 @@ in (sources."inquirer-3.3.0" // { dependencies = [ sources."ansi-regex-3.0.0" - sources."ansi-styles-3.2.0" - sources."chalk-2.3.1" + sources."ansi-styles-3.2.1" + sources."chalk-2.3.2" sources."strip-ansi-4.0.0" - sources."supports-color-5.2.0" + sources."supports-color-5.3.0" ]; }) (sources."insight-0.8.4" // { @@ -43304,6 +44477,7 @@ in sources."into-stream-3.1.0" sources."is-arrayish-0.2.1" sources."is-builtin-module-1.0.0" + sources."is-ci-1.1.0" sources."is-docker-1.1.0" sources."is-finite-1.0.2" sources."is-fullwidth-code-point-2.0.0" @@ -43320,7 +44494,7 @@ in sources."is-root-1.0.0" sources."is-scoped-1.0.0" sources."is-stream-1.1.0" - sources."is-supported-regexp-flag-1.0.0" + sources."is-supported-regexp-flag-1.0.1" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" sources."isarray-1.0.0" @@ -43345,8 +44519,8 @@ in sources."lodash.padstart-4.6.1" sources."log-symbols-1.0.2" sources."loud-rejection-1.6.0" - sources."lowercase-keys-1.0.0" - sources."lru-cache-4.1.1" + sources."lowercase-keys-1.0.1" + sources."lru-cache-4.1.2" sources."make-dir-1.2.0" sources."map-obj-1.0.1" sources."mem-1.1.0" @@ -43372,6 +44546,7 @@ in (sources."npm-keyword-5.0.0" // { dependencies = [ sources."got-7.1.0" + sources."p-cancelable-0.3.0" sources."p-timeout-1.2.1" sources."prepend-http-1.0.4" sources."url-parse-lax-1.0.0" @@ -43397,7 +44572,7 @@ in sources."osenv-0.1.5" sources."osx-release-1.1.0" sources."p-any-1.1.0" - sources."p-cancelable-0.3.0" + sources."p-cancelable-0.4.1" sources."p-finally-1.0.0" sources."p-is-promise-1.1.0" sources."p-limit-1.2.0" @@ -43434,8 +44609,8 @@ in sources."pseudomap-1.0.2" sources."punycode-1.4.1" sources."qs-6.5.1" - sources."query-string-5.1.0" - sources."rc-1.2.5" + sources."query-string-5.1.1" + sources."rc-1.2.6" sources."read-pkg-1.1.0" (sources."read-pkg-up-2.0.0" // { dependencies = [ @@ -43448,14 +44623,14 @@ in sources."strip-bom-3.0.0" ]; }) - sources."readable-stream-2.3.4" + sources."readable-stream-2.3.5" sources."readline2-1.0.1" sources."redent-1.0.0" sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" sources."repeating-2.0.1" sources."replace-ext-0.0.1" - sources."request-2.83.0" + sources."request-2.85.0" sources."responselike-1.0.2" sources."restore-cursor-2.0.0" sources."root-check-1.0.0" @@ -43486,7 +44661,7 @@ in sources."spdx-exceptions-2.1.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.0" - sources."sshpk-1.13.1" + sources."sshpk-1.14.1" sources."strict-uri-encode-1.1.0" sources."string-length-1.0.1" sources."string-width-2.1.1" @@ -43521,7 +44696,7 @@ in sources."through-2.3.8" sources."through2-2.0.3" sources."timed-out-4.0.1" - sources."titleize-1.0.0" + sources."titleize-1.0.1" sources."tmp-0.0.33" sources."tough-cookie-2.3.4" sources."trim-newlines-1.0.0" @@ -43532,13 +44707,13 @@ in sources."unique-string-1.0.0" sources."untildify-3.0.2" sources."unzip-response-2.0.1" - (sources."update-notifier-2.3.0" // { + (sources."update-notifier-2.4.0" // { dependencies = [ - sources."ansi-styles-3.2.0" + sources."ansi-styles-3.2.1" sources."camelcase-4.1.0" - sources."chalk-2.3.1" + sources."chalk-2.3.2" sources."execa-0.7.0" - sources."supports-color-5.2.0" + sources."supports-color-5.3.0" ]; }) sources."url-parse-lax-3.0.0" @@ -43550,7 +44725,7 @@ in sources."verror-1.10.0" sources."vinyl-1.2.0" sources."vinyl-file-2.0.0" - sources."walk-2.3.9" + sources."walk-2.3.13" sources."which-1.3.0" sources."widest-line-2.0.0" sources."win-release-1.1.1" @@ -43575,19 +44750,19 @@ in sources."onetime-1.1.0" ]; }) - (sources."yeoman-environment-2.0.5" // { + (sources."yeoman-environment-2.0.6" // { dependencies = [ - sources."ansi-styles-3.2.0" - sources."chalk-2.3.1" + sources."ansi-styles-3.2.1" + sources."chalk-2.3.2" sources."debug-3.1.0" sources."log-symbols-2.2.0" sources."pify-2.3.0" - sources."supports-color-5.2.0" + sources."supports-color-5.3.0" ]; }) - (sources."yosay-2.0.1" // { + (sources."yosay-2.0.2" // { dependencies = [ - sources."ansi-styles-3.2.0" + sources."ansi-styles-3.2.1" sources."is-fullwidth-code-point-1.0.0" ]; }) diff --git a/pkgs/development/node-packages/node-packages-v8.json b/pkgs/development/node-packages/node-packages-v8.json index 8abdc0e608c..0a3334b5e97 100644 --- a/pkgs/development/node-packages/node-packages-v8.json +++ b/pkgs/development/node-packages/node-packages-v8.json @@ -11,5 +11,7 @@ , "pnpm" , "semver" , "sloc" +, "vue-cli" +, "swagger" , "npm" ] diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix index 61752e7598c..cdad11f3817 100644 --- a/pkgs/development/node-packages/node-packages-v8.nix +++ b/pkgs/development/node-packages/node-packages-v8.nix @@ -1,9 +1,18 @@ -# This file has been generated by node2nix 1.5.2. Do not edit! +# This file has been generated by node2nix 1.5.3. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: let sources = { + "URIjs-1.16.1" = { + name = "URIjs"; + packageName = "URIjs"; + version = "1.16.1"; + src = fetchurl { + url = "https://registry.npmjs.org/URIjs/-/URIjs-1.16.1.tgz"; + sha1 = "edebc678b8b74b26b05d2b481e12383f5ae04b8b"; + }; + }; "abbrev-1.1.1" = { name = "abbrev"; packageName = "abbrev"; @@ -13,6 +22,15 @@ let sha512 = "38s4f3id97wsb0rg9nm9zvxyq0nvwrmrpa5dzvrkp36mf5ibs98b4z6lvsbrwzzs0sbcank6c7gpp06vcwp9acfhp41rzlhi3ybsxwy"; }; }; + "absolute-0.0.1" = { + name = "absolute"; + packageName = "absolute"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/absolute/-/absolute-0.0.1.tgz"; + sha1 = "c22822f87e1c939f579887504d9c109c4173829d"; + }; + }; "abstract-random-access-1.1.2" = { name = "abstract-random-access"; packageName = "abstract-random-access"; @@ -22,15 +40,6 @@ let sha1 = "9a8eac8ff79866f3f9b4bb1443ca778f1598aeda"; }; }; - "ajv-4.11.8" = { - name = "ajv"; - packageName = "ajv"; - version = "4.11.8"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz"; - sha1 = "82ffb02b29e662ae53bdc20af15947706739c536"; - }; - }; "ajv-5.5.2" = { name = "ajv"; packageName = "ajv"; @@ -40,13 +49,67 @@ let sha1 = "73b5eeca3fab653e3d3f9422b341ad42205dc965"; }; }; - "ansi-diff-stream-1.2.0" = { + "align-text-0.1.4" = { + name = "align-text"; + packageName = "align-text"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz"; + sha1 = "0cd90a561093f35d0a99256c22b7069433fad117"; + }; + }; + "amdefine-1.0.1" = { + name = "amdefine"; + packageName = "amdefine"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz"; + sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5"; + }; + }; + "ansi-align-2.0.0" = { + name = "ansi-align"; + packageName = "ansi-align"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz"; + sha1 = "c36aeccba563b89ceb556f3690f0b1d9e3547f7f"; + }; + }; + "ansi-diff-stream-1.2.1" = { name = "ansi-diff-stream"; packageName = "ansi-diff-stream"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-diff-stream/-/ansi-diff-stream-1.2.0.tgz"; - sha1 = "eb325c20ac3623ecd592011a9295d76d97de460e"; + url = "https://registry.npmjs.org/ansi-diff-stream/-/ansi-diff-stream-1.2.1.tgz"; + sha512 = "3lf59lflmnm783cbczclcms4qp42l79s7jbzx7xgz89rzk325nfj26bzd61g83lp250a3pjwh8q5w1khvfjkwn8rm9sm80dhbgsr8ix"; + }; + }; + "ansi-escapes-1.4.0" = { + name = "ansi-escapes"; + packageName = "ansi-escapes"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz"; + sha1 = "d3a8a83b319aa67793662b13e761c7911422306e"; + }; + }; + "ansi-escapes-3.1.0" = { + name = "ansi-escapes"; + packageName = "ansi-escapes"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz"; + sha512 = "1bm72rs09dwjhfif8kqjxnpb5fgmcdgkn5483f11j6791s5161f2kvxy69pkgcq0jdws6kqfmr1bx5189lnvkzgkq851qs3gzq1n02j"; + }; + }; + "ansi-red-0.1.1" = { + name = "ansi-red"; + packageName = "ansi-red"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-red/-/ansi-red-0.1.1.tgz"; + sha1 = "8c638f9d1080800a353c9c28c8a81ca4705d946c"; }; }; "ansi-regex-2.1.1" = { @@ -67,13 +130,31 @@ let sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; }; }; - "ansi-styles-3.2.0" = { + "ansi-styles-2.2.1" = { name = "ansi-styles"; packageName = "ansi-styles"; - version = "3.2.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz"; - sha512 = "2x19fs1qvg7ifsdvii4g8kqpa5hir1lm0k0y0fz6dhm5c8gh4z9il4wqczl078p2ikmrav23dmj86cxy8y1j22k4mv59d8qq6c8wx1n"; + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"; + sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; + }; + }; + "ansi-styles-3.2.1" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz"; + sha512 = "2lgkskkj4c1fsnrksy0yffda0wss84p8lfiazdc7jli7iqnvrxkzbxjzpvx13lm28qw0zkawfxvz2bdiisc72ccy7hx8i8rm4iijgam"; + }; + }; + "ansi-wrap-0.1.0" = { + name = "ansi-wrap"; + packageName = "ansi-wrap"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz"; + sha1 = "a82250ddb0015e9a27ca82e82ea603bbfa45efaf"; }; }; "anymatch-1.3.2" = { @@ -85,6 +166,15 @@ let sha512 = "269dbx666z4ws49vag1dma5kdpjlx83s74c1jlngrn2672rhvbc47i5ay5h40spmrzgvbvcm33i4yrp88rrc6lg70v78k155z45lwyi"; }; }; + "anymatch-2.0.0" = { + name = "anymatch"; + packageName = "anymatch"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz"; + sha512 = "03mjsaw6xk4zhvl17fpqn59j4v2bafqs0yfw5y45hl8x97xlihwvjmcx3icnaamvipplnczymvzg4sb4ixwpzak0k3p21c00nqqxmz6"; + }; + }; "ap-0.1.0" = { name = "ap"; packageName = "ap"; @@ -94,6 +184,15 @@ let sha1 = "d8a3f26615379398a1b53ca6cc1a666a0fbfe150"; }; }; + "append-field-0.1.0" = { + name = "append-field"; + packageName = "append-field"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/append-field/-/append-field-0.1.0.tgz"; + sha1 = "6ddc58fa083c7bc545d3c5995b2830cc2366d44a"; + }; + }; "append-tree-2.4.1" = { name = "append-tree"; packageName = "append-tree"; @@ -121,6 +220,15 @@ let sha1 = "bb5dca382bb94f05e15194373d16fd3ba1ca110d"; }; }; + "argparse-1.0.10" = { + name = "argparse"; + packageName = "argparse"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz"; + sha512 = "17fhywmdjcp8g0ys089i5xg26yajkkg9zg8hyry3fghz75b2pq5vdx997dk5p2sc15r9nsj8rmf4f27g81hi92kzj5q86sdmg5ni553"; + }; + }; "arr-diff-2.0.0" = { name = "arr-diff"; packageName = "arr-diff"; @@ -130,6 +238,15 @@ let sha1 = "8f3b827f955a8bd669697e4a4256ac3ceae356cf"; }; }; + "arr-diff-4.0.0" = { + name = "arr-diff"; + packageName = "arr-diff"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz"; + sha1 = "d6461074febfec71e7e15235761a329a5dc7c520"; + }; + }; "arr-flatten-1.1.0" = { name = "arr-flatten"; packageName = "arr-flatten"; @@ -139,6 +256,24 @@ let sha512 = "2vdly17xk5kw7bfzajrjdnw4ml3wrfblx8064n0i4fxlchcscx2mvnwkq2bnnqvbqvdy4vs9ad462lz0rid7khysly9m9vzjiblly1g"; }; }; + "arr-union-3.1.0" = { + name = "arr-union"; + packageName = "arr-union"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz"; + sha1 = "e39b09aea9def866a8f206e288af63919bae39c4"; + }; + }; + "array-differ-1.0.0" = { + name = "array-differ"; + packageName = "array-differ"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz"; + sha1 = "eff52e3758249d33be402b8bb8e564bb2b5d4031"; + }; + }; "array-lru-1.1.1" = { name = "array-lru"; packageName = "array-lru"; @@ -148,6 +283,24 @@ let sha1 = "0c7e1b4e022ae166ff1e8448c595f3181fcd3337"; }; }; + "array-union-1.0.2" = { + name = "array-union"; + packageName = "array-union"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz"; + sha1 = "9a34410e4f4e3da23dea375be5be70f24778ec39"; + }; + }; + "array-uniq-1.0.3" = { + name = "array-uniq"; + packageName = "array-uniq"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz"; + sha1 = "af6ac877a25cc7f74e058894753858dfdb24fdb6"; + }; + }; "array-unique-0.2.1" = { name = "array-unique"; packageName = "array-unique"; @@ -157,6 +310,24 @@ let sha1 = "a1d97ccafcbc2625cc70fadceb36a50c58b01a53"; }; }; + "array-unique-0.3.2" = { + name = "array-unique"; + packageName = "array-unique"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz"; + sha1 = "a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"; + }; + }; + "arrify-1.0.1" = { + name = "arrify"; + packageName = "arrify"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz"; + sha1 = "898508da2226f380df904728456849c1501a4b0d"; + }; + }; "asn1-0.2.3" = { name = "asn1"; packageName = "asn1"; @@ -166,15 +337,6 @@ let sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86"; }; }; - "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"; - }; - }; "assert-plus-1.0.0" = { name = "assert-plus"; packageName = "assert-plus"; @@ -184,6 +346,15 @@ let sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; }; }; + "assign-symbols-1.0.0" = { + name = "assign-symbols"; + packageName = "assign-symbols"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz"; + sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"; + }; + }; "async-0.9.2" = { name = "async"; packageName = "async"; @@ -202,6 +373,15 @@ let sha1 = "f8fc04ca3a13784ade9e1641af98578cfbd647a9"; }; }; + "async-1.5.2" = { + name = "async"; + packageName = "async"; + version = "1.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-1.5.2.tgz"; + sha1 = "ec6a61ae56480c0c3cb241c95618e20892f9672a"; + }; + }; "async-2.1.5" = { name = "async"; packageName = "async"; @@ -211,6 +391,24 @@ let sha1 = "e587c68580994ac67fc56ff86d3ac56bdbe810bc"; }; }; + "async-2.6.0" = { + name = "async"; + packageName = "async"; + version = "2.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-2.6.0.tgz"; + sha512 = "0zp4b5788400npi1ixjry5x3a4m21c8pnknk8v731rgnwnjbp5ijmfcf5ppmn1ap4a04md1s9dr8n9ygdvrmiai590v0k6dby1wc1y4"; + }; + }; + "async-each-1.0.1" = { + name = "async-each"; + packageName = "async-each"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz"; + sha1 = "19d386a1d9edc6e7c1c85d388aedbcc56d33602d"; + }; + }; "asynckit-0.4.0" = { name = "asynckit"; packageName = "asynckit"; @@ -220,6 +418,15 @@ let sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; }; }; + "atob-2.1.0" = { + name = "atob"; + packageName = "atob"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/atob/-/atob-2.1.0.tgz"; + sha512 = "0dyf7054n94f1pwp9chcy6vawgwd2wqp8jqrnvxl489jyxxbg46n2vkb5vfs5jqnkmh6kbyv4lpysrn13hzzh5q021frc6vrcgqms2a"; + }; + }; "atomic-batcher-1.0.2" = { name = "atomic-batcher"; packageName = "atomic-batcher"; @@ -229,15 +436,6 @@ let sha1 = "d16901d10ccec59516c197b9ccd8930689b813b4"; }; }; - "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"; - }; - }; "aws-sign2-0.7.0" = { name = "aws-sign2"; packageName = "aws-sign2"; @@ -265,6 +463,24 @@ let sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; }; }; + "base-0.11.2" = { + name = "base"; + packageName = "base"; + version = "0.11.2"; + src = fetchurl { + url = "https://registry.npmjs.org/base/-/base-0.11.2.tgz"; + sha512 = "11dwi4v72034dqafp0qxsg8h6cpn92vv4vf909a9fybd69yfg6gqn4hhav6x59r1wbi8h1qlgfh9np0340mpljv1hc9v9p02giqygp5"; + }; + }; + "base64-js-0.0.8" = { + name = "base64-js"; + packageName = "base64-js"; + version = "0.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz"; + sha1 = "1101e9544f4a76b1bc3b26d452ca96d7a35e7978"; + }; + }; "bcrypt-pbkdf-1.0.1" = { name = "bcrypt-pbkdf"; packageName = "bcrypt-pbkdf"; @@ -292,6 +508,15 @@ let sha512 = "3rdjlprrhprwwygnw5aik9pgi1xyr09yvgq3rbr4g3pl1v70mcc1k903x3vh9z782jly6vmnvp44nrskl5rhcxgfdwz19fl1b1qggf2"; }; }; + "binary-extensions-1.11.0" = { + name = "binary-extensions"; + packageName = "binary-extensions"; + version = "1.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.11.0.tgz"; + sha1 = "46aa1751fb6a2f93ee5e689bb1087d4b14c6c205"; + }; + }; "bitfield-rle-2.1.0" = { name = "bitfield-rle"; packageName = "bitfield-rle"; @@ -310,6 +535,15 @@ let sha512 = "10md5792s6q3xwdrmwh1a8ax9w128g607b5qsbxzw8x0gl9184g754hprchl6mq8lmf4f8qylk2h8vavsnbn9yy9gzjnyh2kwrzmxky"; }; }; + "bl-1.2.2" = { + name = "bl"; + packageName = "bl"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz"; + sha512 = "0810nalazir8szyxvbg53d7416j4a7xy94sdri37mwmnax9s9hx88mzky882sr9dv0is7w9fqlp7ys6ijr1z1imc2dnfxk8fri51jvv"; + }; + }; "blake2b-2.1.2" = { name = "blake2b"; packageName = "blake2b"; @@ -337,6 +571,15 @@ let sha1 = "13ebfe778a03205cfe03751481ebb4b3300c126a"; }; }; + "bluebird-3.5.1" = { + name = "bluebird"; + packageName = "bluebird"; + version = "3.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz"; + sha512 = "2631bhp784qng0ifbypsmvijn6kjfvkhq2335kdz8ix5qi3wb3lbpg94xjn1av2s6i95ygr5a4y9j1721dw6zdbywwh1m48by4qpa1h"; + }; + }; "body-0.1.0" = { name = "body"; packageName = "body"; @@ -346,13 +589,13 @@ let sha1 = "e714fe28cd8848aa34cdf2c9f242bbe2e15d1cd8"; }; }; - "boom-2.10.1" = { - name = "boom"; - packageName = "boom"; - version = "2.10.1"; + "body-parser-1.12.4" = { + name = "body-parser"; + packageName = "body-parser"; + version = "1.12.4"; src = fetchurl { - url = "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"; - sha1 = "39c8918ceff5799f83f9492a848f625add0c766f"; + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.12.4.tgz"; + sha1 = "090700c4ba28862a8520ef378395fdee5f61c229"; }; }; "boom-4.3.1" = { @@ -373,6 +616,15 @@ let sha512 = "19h20yqpvca08dns1rs4f057f10w63v0snxfml4h5khsk266x3x1im0w72bza4k2xn0kfz6jlv001dhcvxsjr09bmbqnysils9m7437"; }; }; + "boxen-1.3.0" = { + name = "boxen"; + packageName = "boxen"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz"; + sha512 = "0pmn5jcnph7yfgfhlncg1lys066cq44kavj4d9qhmyy9705w61pabpwlma09xg4xplzbxh78d3m4xwvjwk478r3xyqnmpzq79yy7lsc"; + }; + }; "brace-expansion-1.1.11" = { name = "brace-expansion"; packageName = "brace-expansion"; @@ -391,13 +643,67 @@ let sha1 = "ba77962e12dff969d6b76711e914b737857bf6a7"; }; }; - "browser-stdout-1.3.0" = { + "braces-2.3.1" = { + name = "braces"; + packageName = "braces"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/braces/-/braces-2.3.1.tgz"; + sha512 = "2fpcx8h100fhpaffr6mh5ysp6dv06nl5xkii807fw0c603i15sg3wsxmj63fdn4apxdnn8an2ks883mvrdsv7mfryhfxg1pf1h6bvj8"; + }; + }; + "browser-stdout-1.3.1" = { name = "browser-stdout"; packageName = "browser-stdout"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz"; - sha1 = "f351d32969d32fa5d7a5567154263d928ae3bd1f"; + url = "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz"; + sha512 = "21jjhrf3wdmzsfqgva5s7shs1wdmcdxsjvi75p8z7i0q2i6n3654gpxjqlhbnpmzm25cpkshyi8swy13017qkp9m7xnbgw0bwiia45a"; + }; + }; + "buffer-3.6.0" = { + name = "buffer"; + packageName = "buffer"; + version = "3.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer/-/buffer-3.6.0.tgz"; + sha1 = "a72c936f77b96bf52f5f7e7b467180628551defb"; + }; + }; + "buffer-alloc-1.1.0" = { + name = "buffer-alloc"; + packageName = "buffer-alloc"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.1.0.tgz"; + sha1 = "05514d33bf1656d3540c684f65b1202e90eca303"; + }; + }; + "buffer-alloc-unsafe-0.1.1" = { + name = "buffer-alloc-unsafe"; + packageName = "buffer-alloc-unsafe"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-0.1.1.tgz"; + sha1 = "ffe1f67551dd055737de253337bfe853dfab1a6a"; + }; + }; + "buffer-alloc-unsafe-1.0.0" = { + name = "buffer-alloc-unsafe"; + packageName = "buffer-alloc-unsafe"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.0.0.tgz"; + sha1 = "474aa88f34e7bc75fa311d2e6457409c5846c3fe"; + }; + }; + "buffer-crc32-0.2.13" = { + name = "buffer-crc32"; + packageName = "buffer-crc32"; + version = "0.2.13"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz"; + sha1 = "0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"; }; }; "buffer-equals-1.0.4" = { @@ -409,6 +715,24 @@ let sha1 = "0353b54fd07fd9564170671ae6f66b9cf10d27f5"; }; }; + "buffer-fill-0.1.1" = { + name = "buffer-fill"; + packageName = "buffer-fill"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-fill/-/buffer-fill-0.1.1.tgz"; + sha512 = "3nny0zbpnaxp1544gp7lc53jvs1jgzpmp92cy939dik36bi8lvhrsh4g082lxdplwsma22cgg9q93dw5dnbn1ljqkh4fb2i6w3lq032"; + }; + }; + "buffer-from-1.0.0" = { + name = "buffer-from"; + packageName = "buffer-from"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.0.0.tgz"; + sha512 = "3252laq8prm41lgzlhmc7rdj99gwcvpf7cn6j686g4qmspnl3haid5khv9pc9cfjja9wb64nwfvgdwi2kpdf125xfg48aqapwssjxpk"; + }; + }; "buffer-indexof-1.1.1" = { name = "buffer-indexof"; packageName = "buffer-indexof"; @@ -418,13 +742,49 @@ let sha512 = "3bgz1zhq9ng3gypq825f00p9qi9y6z7wvkkf28nhjlyifnb3lk1dkmbya84k0ja79zv8kmmhvalwcnnz92533ip7pnjp3is1w9cxyp3"; }; }; - "bulk-write-stream-1.1.3" = { + "builtins-1.0.3" = { + name = "builtins"; + packageName = "builtins"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz"; + sha1 = "cb94faeb61c8696451db36534e1422f94f0aee88"; + }; + }; + "bulk-write-stream-1.1.4" = { name = "bulk-write-stream"; packageName = "bulk-write-stream"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/bulk-write-stream/-/bulk-write-stream-1.1.3.tgz"; - sha1 = "d29ca385fbd53f357aee5bd3d3028732b62ae275"; + url = "https://registry.npmjs.org/bulk-write-stream/-/bulk-write-stream-1.1.4.tgz"; + sha512 = "2g3ccqw8k5vhdhnks27i954xglllw5gay8nvy3zgm2c7jpwnjc2imarwshx53pz54br6q4i4x2va4s80ixavafphhsykdhyzrvv1lhs"; + }; + }; + "busboy-0.2.14" = { + name = "busboy"; + packageName = "busboy"; + version = "0.2.14"; + src = fetchurl { + url = "https://registry.npmjs.org/busboy/-/busboy-0.2.14.tgz"; + sha1 = "6c2a622efcf47c57bbbe1e2a9c37ad36c7925453"; + }; + }; + "bytes-1.0.0" = { + name = "bytes"; + packageName = "bytes"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz"; + sha1 = "3569ede8ba34315fab99c3e92cb04c7220de1fa8"; + }; + }; + "bytes-2.1.0" = { + name = "bytes"; + packageName = "bytes"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bytes/-/bytes-2.1.0.tgz"; + sha1 = "ac93c410e2ffc9cc7cf4b464b38289067f5e47b4"; }; }; "bytes-3.0.0" = { @@ -436,6 +796,15 @@ let sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048"; }; }; + "cache-base-1.0.1" = { + name = "cache-base"; + packageName = "cache-base"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz"; + sha512 = "36i943khi87af4gif9r6imjgybqxq9cbd69z2h8p2s2j6scfbhrv7j3n591xl982fmyq29rkwh70a6qdcf3v0piwzfh8n2jf571v9q0"; + }; + }; "call-me-maybe-1.0.1" = { name = "call-me-maybe"; packageName = "call-me-maybe"; @@ -445,6 +814,33 @@ let sha1 = "26d208ea89e37b5cbde60250a15f031c16a4d66b"; }; }; + "camelcase-1.2.1" = { + name = "camelcase"; + packageName = "camelcase"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"; + sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"; + }; + }; + "camelcase-4.1.0" = { + name = "camelcase"; + packageName = "camelcase"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz"; + sha1 = "d545635be1e33c542649c69173e5de6acfae34dd"; + }; + }; + "capture-stack-trace-1.0.0" = { + name = "capture-stack-trace"; + packageName = "capture-stack-trace"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz"; + sha1 = "4a6fa07399c26bba47f0b2496b4d0fb408c5550d"; + }; + }; "caseless-0.12.0" = { name = "caseless"; packageName = "caseless"; @@ -454,13 +850,139 @@ let sha1 = "1b681c21ff84033c826543090689420d187151dc"; }; }; - "chalk-2.3.1" = { + "caw-2.0.1" = { + name = "caw"; + packageName = "caw"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/caw/-/caw-2.0.1.tgz"; + sha512 = "2wa0gi2wljxw00rvqz454sgdr8yy90z8lhprxjc1prwi695lnzrh6sk0qqhp63h9gmbldyvvzfvm8k1jk0sbv6icdawcss441jky3qa"; + }; + }; + "center-align-0.1.3" = { + name = "center-align"; + packageName = "center-align"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz"; + sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad"; + }; + }; + "chalk-1.1.3" = { name = "chalk"; packageName = "chalk"; - version = "2.3.1"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-2.3.1.tgz"; - sha512 = "3m0k6j50aridlrk1q8kf3cd1vcj6qcg2nx5yk8d0196hmw0c4a6y1h315p24l34yz0chfrcrkrsr12cixccfp5q7caw5803z6hkhia1"; + url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"; + sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; + }; + }; + "chalk-2.3.2" = { + name = "chalk"; + packageName = "chalk"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz"; + sha512 = "06jlrzx0nb92910rcfhx55n28jgvhc0qda49scnfyifnmc31dyfqsl5qqiwhsxkrhrc6c07x69q037f1pwg06kkfd1qdzaxz7dj7kk4"; + }; + }; + "chardet-0.4.2" = { + name = "chardet"; + packageName = "chardet"; + version = "0.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz"; + sha1 = "b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"; + }; + }; + "charenc-0.0.2" = { + name = "charenc"; + packageName = "charenc"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz"; + sha1 = "c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"; + }; + }; + "chokidar-2.0.3" = { + name = "chokidar"; + packageName = "chokidar"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/chokidar/-/chokidar-2.0.3.tgz"; + sha512 = "0r9sfr7gz91aphg4vk476c4z07gqq6wdyhlhk3brazjwfvqz9jqccl19qyrwiwijx0aw85jw0zhnfayapk9wzzcj9wcqp3dhrfj4vyd"; + }; + }; + "chownr-1.0.1" = { + name = "chownr"; + packageName = "chownr"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz"; + sha1 = "e2a75042a9551908bebd25b8523d5f9769d79181"; + }; + }; + "ci-info-1.1.3" = { + name = "ci-info"; + packageName = "ci-info"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ci-info/-/ci-info-1.1.3.tgz"; + sha512 = "0p634fyx3kkll2blj5f5bjmz273d7ba201yi3jlrvy7p7lnmmi479d6s3khwmp9lnfrb314l4kw5dq40q60hzfnmfycqibzm3izrbs8"; + }; + }; + "circular-append-file-1.0.1" = { + name = "circular-append-file"; + packageName = "circular-append-file"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/circular-append-file/-/circular-append-file-1.0.1.tgz"; + sha512 = "294ys13wj7mq7c2sb6h20a25z98wv9mar62nliikcsnb55xyqqwy3hj2ghcmc71yrx61i9s15x0qy71sy9x6i0ghsaxf2akn2zcah05"; + }; + }; + "class-utils-0.3.6" = { + name = "class-utils"; + packageName = "class-utils"; + version = "0.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz"; + sha512 = "1xcqwmfmsbrm2ck76brwiqjmcza655khgh5szh6wngk357i37sgwsga1pbarwzaz9hvzkriqhq6j0z5mv0pmz61cf9wxvk3y5mlzs58"; + }; + }; + "cli-boxes-1.0.0" = { + name = "cli-boxes"; + packageName = "cli-boxes"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz"; + sha1 = "4fa917c3e59c94a004cd61f8ee509da651687143"; + }; + }; + "cli-cursor-1.0.2" = { + name = "cli-cursor"; + packageName = "cli-cursor"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz"; + sha1 = "64da3f7d56a54412e59794bd62dc35295e8f2987"; + }; + }; + "cli-cursor-2.1.0" = { + name = "cli-cursor"; + packageName = "cli-cursor"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz"; + sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5"; + }; + }; + "cli-spinners-1.1.0" = { + name = "cli-spinners"; + packageName = "cli-spinners"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.1.0.tgz"; + sha1 = "f1847b168844d917a671eb9d147e3df497c90d06"; }; }; "cli-table-0.3.1" = { @@ -481,6 +1003,24 @@ let sha512 = "1h48346i2bsfvj3h0qfxmyh1770cxb3d9ibk75yjag1xgzk021yqbmkiv30k5c0qgyb0sxkvjc3sckmakf4i7q1d2gh1nmw9fimj2vc"; }; }; + "cli-width-1.1.1" = { + name = "cli-width"; + packageName = "cli-width"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-width/-/cli-width-1.1.1.tgz"; + sha1 = "a4d293ef67ebb7b88d4a4d42c0ccf00c4d1e366d"; + }; + }; + "cli-width-2.2.0" = { + name = "cli-width"; + packageName = "cli-width"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz"; + sha1 = "ff19ede8a9a5e579324147b0c11f0fbcbabed639"; + }; + }; "cliclopts-1.1.1" = { name = "cliclopts"; packageName = "cliclopts"; @@ -490,6 +1030,42 @@ let sha1 = "69431c7cb5af723774b0d3911b4c37512431910f"; }; }; + "cliui-2.1.0" = { + name = "cliui"; + packageName = "cliui"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz"; + sha1 = "4b475760ff80264c762c3a1719032e91c7fea0d1"; + }; + }; + "clone-1.0.4" = { + name = "clone"; + packageName = "clone"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz"; + sha1 = "da309cc263df15994c688ca902179ca3c7cd7c7e"; + }; + }; + "clone-2.0.0" = { + name = "clone"; + packageName = "clone"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clone/-/clone-2.0.0.tgz"; + sha1 = "df65d3ca142e4a4a47db33da3468d088a16fc76e"; + }; + }; + "co-3.1.0" = { + name = "co"; + packageName = "co"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/co/-/co-3.1.0.tgz"; + sha1 = "4ea54ea5a08938153185e15210c68d9092bc1b78"; + }; + }; "co-4.6.0" = { name = "co"; packageName = "co"; @@ -499,6 +1075,33 @@ let sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"; }; }; + "co-from-stream-0.0.0" = { + name = "co-from-stream"; + packageName = "co-from-stream"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/co-from-stream/-/co-from-stream-0.0.0.tgz"; + sha1 = "1a5cd8ced77263946094fa39f2499a63297bcaf9"; + }; + }; + "co-fs-extra-1.2.1" = { + name = "co-fs-extra"; + packageName = "co-fs-extra"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/co-fs-extra/-/co-fs-extra-1.2.1.tgz"; + sha1 = "3b6ad77cf2614530f677b1cf62664f5ba756b722"; + }; + }; + "co-read-0.0.1" = { + name = "co-read"; + packageName = "co-read"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/co-read/-/co-read-0.0.1.tgz"; + sha1 = "f81b3eb8a86675fec51e3d883a7f564e873c9389"; + }; + }; "code-point-at-1.1.0" = { name = "code-point-at"; packageName = "code-point-at"; @@ -508,13 +1111,31 @@ let sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; }; }; - "codecs-1.2.0" = { + "codecs-1.2.1" = { name = "codecs"; packageName = "codecs"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/codecs/-/codecs-1.2.0.tgz"; - sha1 = "5148549e3d156c5fa053d7cbb419715a0cf43d16"; + url = "https://registry.npmjs.org/codecs/-/codecs-1.2.1.tgz"; + sha512 = "16fzwl2fvacbii9fby6i5cm2bz4ajaf4jdyffq1ggwnjbzjim0cbspymc9x9sf5whlzmknj7cybqaxvy5lmxlc99hm9sm6pj7wz3ya8"; + }; + }; + "coffee-script-1.12.7" = { + name = "coffee-script"; + packageName = "coffee-script"; + version = "1.12.7"; + src = fetchurl { + url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz"; + sha512 = "29mq40padyvizg4f141b00p0p74hx9v06d7gxk84ggsiyw6rf5bb65gnfwk1i02r276jwqybmi5hx98s943slyazjnqd69jmj389dvw"; + }; + }; + "collection-visit-1.0.0" = { + name = "collection-visit"; + packageName = "collection-visit"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz"; + sha1 = "4bc0373c164bc3291b4d368c829cf1a80a59dca0"; }; }; "color-convert-1.9.1" = { @@ -544,13 +1165,13 @@ let sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b"; }; }; - "colors-1.1.2" = { + "colors-1.2.1" = { name = "colors"; packageName = "colors"; - version = "1.1.2"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz"; - sha1 = "168a4701756b6a7f51a12ce0c97bfa28c084ed63"; + url = "https://registry.npmjs.org/colors/-/colors-1.2.1.tgz"; + sha512 = "0m8vssxhc3xlx639gz68425ll6mqh0rib6yr7s2v2vg1hwnqka02zijxmg16iyvzmd5sbsczjs2mqs0n428pc1cgkgj439fsa9b1kxk"; }; }; "combined-stream-1.0.6" = { @@ -562,6 +1183,15 @@ let sha1 = "723e7df6e801ac5613113a7e445a9b69cb632818"; }; }; + "commander-0.6.1" = { + name = "commander"; + packageName = "commander"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz"; + sha1 = "fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06"; + }; + }; "commander-2.11.0" = { name = "commander"; packageName = "commander"; @@ -571,6 +1201,33 @@ let sha512 = "2yi2hwf0bghfnv1fdgd4wvh7s0acjrgqbgww97ncm6i6s6ffs1zahnj48f6gqpqj6fsf0jigvnr0civ25k2160c38281r80wvg7jkkg"; }; }; + "commander-2.15.1" = { + name = "commander"; + packageName = "commander"; + version = "2.15.1"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz"; + sha512 = "1mb8z6hhy74rfdgj3spmk52sdqa5bb2w5wp28z3md1daqcca4vbbsg66wz8hdhrv0fnnmf8yzdkmnw3c373vcccmyizzlnmbpsd6msn"; + }; + }; + "commander-2.3.0" = { + name = "commander"; + packageName = "commander"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.3.0.tgz"; + sha1 = "fd430e889832ec353b9acd1de217c11cb3eef873"; + }; + }; + "commander-2.8.1" = { + name = "commander"; + packageName = "commander"; + version = "2.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz"; + sha1 = "06be367febfda0c330aa1e2a072d3dc9762425d4"; + }; + }; "commander-2.9.0" = { name = "commander"; packageName = "commander"; @@ -580,6 +1237,15 @@ let sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; }; }; + "component-emitter-1.2.1" = { + name = "component-emitter"; + packageName = "component-emitter"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz"; + sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6"; + }; + }; "concat-map-0.0.1" = { name = "concat-map"; packageName = "concat-map"; @@ -589,13 +1255,40 @@ let sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; }; }; - "concat-stream-1.6.0" = { + "concat-stream-1.6.2" = { name = "concat-stream"; packageName = "concat-stream"; - version = "1.6.0"; + version = "1.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz"; - sha1 = "0aac662fd52be78964d5532f694784e70110acf7"; + url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz"; + sha512 = "05nnf80j9ls12y3cw2dfnc6rmand3ya5sx9cqn9dgg19ljzdnyfjjv8ig79xi73gr2y4rkfzn9wjip2zzwp5n2d49njd3ki2a1c3cfv"; + }; + }; + "config-chain-1.1.11" = { + name = "config-chain"; + packageName = "config-chain"; + version = "1.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.11.tgz"; + sha1 = "aba09747dfbe4c3e70e766a6e41586e1859fc6f2"; + }; + }; + "configstore-3.1.2" = { + name = "configstore"; + packageName = "configstore"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/configstore/-/configstore-3.1.2.tgz"; + sha512 = "2difdg3f56d584kfxl1zvm4ik5m3ln949m0q9sxq6ranzx2iwqa9zxqxy2l5i2lsm8jwmaiqkf7rc73gfnfip5m2qh8awd3s4ggknxy"; + }; + }; + "connect-3.6.6" = { + name = "connect"; + packageName = "connect"; + version = "3.6.6"; + src = fetchurl { + url = "https://registry.npmjs.org/connect/-/connect-3.6.6.tgz"; + sha1 = "09eff6c55af7236e137135a72574858b6786f524"; }; }; "connections-1.4.2" = { @@ -616,6 +1309,24 @@ let sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; }; }; + "consolidate-0.14.5" = { + name = "consolidate"; + packageName = "consolidate"; + version = "0.14.5"; + src = fetchurl { + url = "https://registry.npmjs.org/consolidate/-/consolidate-0.14.5.tgz"; + sha1 = "5a25047bc76f73072667c8cb52c989888f494c63"; + }; + }; + "content-type-1.0.4" = { + name = "content-type"; + packageName = "content-type"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz"; + sha512 = "1f4y61wc913jrnga7nny83gzf9l2488q6sl1ry9lbwgh5x5d3va0xcc0xrmjk6gdxl6d4r6rsk800xp5bazhjrx05yx1wpc8c8gg0w4"; + }; + }; "content-types-0.1.0" = { name = "content-types"; packageName = "content-types"; @@ -625,6 +1336,33 @@ let sha1 = "0e790b3abfef90f6ecb77ae8585db9099caf7578"; }; }; + "cookiejar-2.0.6" = { + name = "cookiejar"; + packageName = "cookiejar"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/cookiejar/-/cookiejar-2.0.6.tgz"; + sha1 = "0abf356ad00d1c5a219d88d44518046dd026acfe"; + }; + }; + "cookiejar-2.1.1" = { + name = "cookiejar"; + packageName = "cookiejar"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.1.tgz"; + sha1 = "41ad57b1b555951ec171412a81942b1e8200d34a"; + }; + }; + "copy-descriptor-0.1.1" = { + name = "copy-descriptor"; + packageName = "copy-descriptor"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz"; + sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d"; + }; + }; "core-util-is-1.0.2" = { name = "core-util-is"; packageName = "core-util-is"; @@ -643,13 +1381,31 @@ let sha1 = "11a45bc47ab30c54d00bb869ea1802fbcd9a09d0"; }; }; - "cryptiles-2.0.5" = { - name = "cryptiles"; - packageName = "cryptiles"; - version = "2.0.5"; + "create-error-class-3.0.2" = { + name = "create-error-class"; + packageName = "create-error-class"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"; - sha1 = "3bdfecdc608147c1c67202fa291e7dca59eaa3b8"; + url = "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz"; + sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6"; + }; + }; + "cross-spawn-5.1.0" = { + name = "cross-spawn"; + packageName = "cross-spawn"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz"; + sha1 = "e8bd0efee58fcff6f8f94510a0a554bbfa235449"; + }; + }; + "crypt-0.0.2" = { + name = "crypt"; + packageName = "crypt"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz"; + sha1 = "88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"; }; }; "cryptiles-3.1.2" = { @@ -661,6 +1417,15 @@ let sha1 = "a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe"; }; }; + "crypto-random-string-1.0.0" = { + name = "crypto-random-string"; + packageName = "crypto-random-string"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz"; + sha1 = "a230f64f568310e1498009940790ec99545bca7e"; + }; + }; "cycle-1.0.3" = { name = "cycle"; packageName = "cycle"; @@ -670,6 +1435,15 @@ let sha1 = "21e80b2be8580f98b468f379430662b046c34ad2"; }; }; + "dag-map-1.0.2" = { + name = "dag-map"; + packageName = "dag-map"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/dag-map/-/dag-map-1.0.2.tgz"; + sha1 = "e8379f041000ed561fc515475c1ed2c85eece8d7"; + }; + }; "dashdash-1.14.1" = { name = "dashdash"; packageName = "dashdash"; @@ -715,22 +1489,22 @@ let sha512 = "2lc9p062gaa2xrf07z14xqgid3rw5fg05ak3s13g3mrr5hf8zxmdvp3lq4wggj7k5pc2c43r3d4yyy7rfrqafsdm7hfisdda4zgsi1w"; }; }; - "dat-ignore-2.0.0" = { + "dat-ignore-2.1.1" = { name = "dat-ignore"; packageName = "dat-ignore"; - version = "2.0.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/dat-ignore/-/dat-ignore-2.0.0.tgz"; - sha512 = "1s78mv3ngs1v1cgpcp97y1xmns97m2r6gjkkrksl63j5d870vpsmmrhsfm1vw4q0dz4c1yfnfcpijlgbqai9c5d2zj1lz56rih0kxk8"; + url = "https://registry.npmjs.org/dat-ignore/-/dat-ignore-2.1.1.tgz"; + sha512 = "3ars15n4l3fgvnzah15zpfzirg66clg2a72d2qawg340ad1f0xbahxgzfj52q3ib48s6k7m4a8zcpv5n3pq2blkm1dhpyz1s9d9y44d"; }; }; - "dat-json-1.0.1" = { + "dat-json-1.0.2" = { name = "dat-json"; packageName = "dat-json"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/dat-json/-/dat-json-1.0.1.tgz"; - sha512 = "13nn20vg6jx1h8ypazv9zn236hvv29wwq52mdbbfl77zrg8d7syni933v2mm3y1jsk25c7dc2gs1876fz0yblniryncnbjxrf0aq0nq"; + url = "https://registry.npmjs.org/dat-json/-/dat-json-1.0.2.tgz"; + sha512 = "0i32dn4p0dmjbljm9csnrfibnrgljbqcqkiy5n2wn0mdqpklnv6k9imrv93c0j6p5hsrpnnpjdibhw6fyf5a3183g2wxd1zw5avx6hi"; }; }; "dat-link-resolve-2.1.0" = { @@ -805,6 +1579,15 @@ let sha1 = "277b895a39f1aa7f96a495a02fb3662a5ed9f2e0"; }; }; + "debug-2.2.0" = { + name = "debug"; + packageName = "debug"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz"; + sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da"; + }; + }; "debug-2.6.9" = { name = "debug"; packageName = "debug"; @@ -823,6 +1606,69 @@ let sha512 = "3g1hqsahr1ks2kpvdxrwzr57fj90nnr0hvwwrw8yyyzcv3i11sym8zwibxx67bl1mln0acddrzpkkdjjxnc6n2cm9fazmgzzsl1fzrr"; }; }; + "decamelize-1.2.0" = { + name = "decamelize"; + packageName = "decamelize"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; + sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; + }; + }; + "decode-uri-component-0.2.0" = { + name = "decode-uri-component"; + packageName = "decode-uri-component"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz"; + sha1 = "eb3913333458775cb84cd1a1fae062106bb87545"; + }; + }; + "decompress-4.2.0" = { + name = "decompress"; + packageName = "decompress"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decompress/-/decompress-4.2.0.tgz"; + sha1 = "7aedd85427e5a92dacfe55674a7c505e96d01f9d"; + }; + }; + "decompress-tar-4.1.1" = { + name = "decompress-tar"; + packageName = "decompress-tar"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/decompress-tar/-/decompress-tar-4.1.1.tgz"; + sha512 = "18rwwdac0961cs2xpagx8sfqysxzcvvna1bfhjd8aamgm5k6mbcr88k0qp46z1fvypvk00sc27mv0n7885cfwi525gix96659l4rli5"; + }; + }; + "decompress-tarbz2-4.1.1" = { + name = "decompress-tarbz2"; + packageName = "decompress-tarbz2"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz"; + sha512 = "3s2l466xc70zvxrwsr1xr7x5sg9g9wh2wsvk81pxmhc0m73hwhfhhn63c53n6vkv8rlxs80gscrkpk8fc2mbh3j154cvbzm6wpk3kxk"; + }; + }; + "decompress-targz-4.1.1" = { + name = "decompress-targz"; + packageName = "decompress-targz"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/decompress-targz/-/decompress-targz-4.1.1.tgz"; + sha512 = "3gig705jrzdsihjnfij52kj17mgsclfn5vbzswqqdjd0ac4f0dy0afds02m4zm5jacnppavhydyy0rgd99prk8hkmbcisgbfxk3agz3"; + }; + }; + "decompress-unzip-4.0.1" = { + name = "decompress-unzip"; + packageName = "decompress-unzip"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-4.0.1.tgz"; + sha1 = "deaaccdfd14aeaf85578f733ae8210f9b4848f69"; + }; + }; "deep-equal-0.2.2" = { name = "deep-equal"; packageName = "deep-equal"; @@ -841,6 +1687,33 @@ let sha1 = "48b699c27e334bf89f10892be432f6e4c7d34a7f"; }; }; + "define-property-0.2.5" = { + name = "define-property"; + packageName = "define-property"; + version = "0.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz"; + sha1 = "c35b1ef918ec3c990f9a5bc57be04aacec5c8116"; + }; + }; + "define-property-1.0.0" = { + name = "define-property"; + packageName = "define-property"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz"; + sha1 = "769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"; + }; + }; + "define-property-2.0.2" = { + name = "define-property"; + packageName = "define-property"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz"; + sha512 = "1hrk3pzr4hyhfnrjy1msrlj2zh769x4l35q9fq0a2cy2glq3h1iwjkpmvz39y9idwy71h9hd98lydi92485bzkff1dzm70wbr8vc0lg"; + }; + }; "delayed-stream-1.0.0" = { name = "delayed-stream"; packageName = "delayed-stream"; @@ -859,6 +1732,33 @@ let sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; }; }; + "depd-1.0.1" = { + name = "depd"; + packageName = "depd"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/depd/-/depd-1.0.1.tgz"; + sha1 = "80aec64c9d6d97e65cc2a9caa93c0aa6abf73aaa"; + }; + }; + "depd-1.1.2" = { + name = "depd"; + packageName = "depd"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz"; + sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9"; + }; + }; + "destroy-1.0.4" = { + name = "destroy"; + packageName = "destroy"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz"; + sha1 = "978857442c44749e4206613e37946205826abd80"; + }; + }; "detect-libc-1.0.3" = { name = "detect-libc"; packageName = "detect-libc"; @@ -868,13 +1768,31 @@ let sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"; }; }; - "diff-3.3.1" = { + "dicer-0.2.5" = { + name = "dicer"; + packageName = "dicer"; + version = "0.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/dicer/-/dicer-0.2.5.tgz"; + sha1 = "5996c086bb33218c812c090bddc09cd12facb70f"; + }; + }; + "diff-1.4.0" = { name = "diff"; packageName = "diff"; - version = "3.3.1"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/diff/-/diff-3.3.1.tgz"; - sha512 = "31pj7v5gg5igmvwzk6zxw1wbvwjg6m9sfl0h3bs1x4q6idcw98vr8z8wcqk2603q0blpqkmkxp659kjj91wksr03yr8xlh16djcg8rh"; + url = "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz"; + sha1 = "7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf"; + }; + }; + "diff-3.5.0" = { + name = "diff"; + packageName = "diff"; + version = "3.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz"; + sha512 = "32bkv3cfhax4x5zhiyfn63wjhqwkzsjiql3my8p3d9hvv020p8f9hdi7mpqixrkpgs0g9k15mn736s449yad9wq1plhxyhxb2sam3h3"; }; }; "directory-index-html-2.1.0" = { @@ -886,13 +1804,13 @@ let sha1 = "4d5afc5187edba67ec6ab0e55f6422a0e2cb7338"; }; }; - "discovery-channel-5.4.7" = { + "discovery-channel-5.5.1" = { name = "discovery-channel"; packageName = "discovery-channel"; - version = "5.4.7"; + version = "5.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/discovery-channel/-/discovery-channel-5.4.7.tgz"; - sha512 = "3c8npbdr7r6725kkj76h5zy72l3gd8ndb3dy4dwbapxapfzccl9f6iy0zdy3wxywcfb6cc64w4mf089v00rcr1aqcjdlvn483pnzs78"; + url = "https://registry.npmjs.org/discovery-channel/-/discovery-channel-5.5.1.tgz"; + sha512 = "2zzy8n58w43cvmnascylmw3nppynm334nsjd85w329k8461lwif8xz8b5xqhx8grhpiawhhrri9nlf08ajxriiy4sn26gila509jj8h"; }; }; "discovery-swarm-4.4.2" = { @@ -913,6 +1831,15 @@ let sha512 = "2hda8mbvxc2r10g5p9dsrjk3qdrp7gpk66ps0dikwzcdgn9bvsf8ih9k19kxw7wr299cm7hav2q6rjp5m76zyb6mb19bfa3g6zxyvmg"; }; }; + "dns-discovery-6.1.0" = { + name = "dns-discovery"; + packageName = "dns-discovery"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dns-discovery/-/dns-discovery-6.1.0.tgz"; + sha512 = "2qyx3fzq9h9x0m2l5b9226hx2vxpl7w3sgh352qfpa683zmjbzsm8x984jvfmrl3yzzipwg07p6dqdcm8ba3v19x5q1sdgfdhpssp9a"; + }; + }; "dns-packet-1.3.1" = { name = "dns-packet"; packageName = "dns-packet"; @@ -922,6 +1849,15 @@ let sha512 = "19g682cvkba33mwrism28hibd2nv9xd16k5bj807jx3ih1cc7ff9dn8chmfjnqgglzl6lq3m3jarxng9vbarccgchd0aq118d15yk6i"; }; }; + "dns-packet-4.1.1" = { + name = "dns-packet"; + packageName = "dns-packet"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dns-packet/-/dns-packet-4.1.1.tgz"; + sha512 = "09adhjnzfiilwrksrckjrxcfi54gy5xgcsvkq24r98j0xh1asvl5iywj4p37s4l7drgysmdlkv95iki5c554gviaj4738fnlhgn42v3"; + }; + }; "dns-socket-1.6.3" = { name = "dns-socket"; packageName = "dns-socket"; @@ -931,6 +1867,15 @@ let sha512 = "2g9g9jqx44qpiawlxfn1g647dqwwz2djjpy350c83d1z79d5wa21cknh1jz4wrwsjkvgn14vhmjjxqxf5n8fqq6fjyzw85aa7fk4rgy"; }; }; + "dns-socket-3.0.0" = { + name = "dns-socket"; + packageName = "dns-socket"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dns-socket/-/dns-socket-3.0.0.tgz"; + sha512 = "3yrr8f842jzbhkhbi8a5pgqasyqn03n74gq9l43qmr33ih6ms57kdl5ffkb6zpaaicgj2w8w7kdx4s4xh10aw3vz3k69zh9583s8i9k"; + }; + }; "dns-txt-2.0.2" = { name = "dns-txt"; packageName = "dns-txt"; @@ -949,13 +1894,58 @@ let sha1 = "672226dc74c8f799ad35307df936aba11acd6018"; }; }; - "duplexify-3.5.3" = { + "dot-prop-4.2.0" = { + name = "dot-prop"; + packageName = "dot-prop"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz"; + sha512 = "2wyv9brsq3dzp724y1q5z5j5ja83y834hgc193lnarfdycwz1ii3xg02qxx3dg05x3skwjm1di5s5a8hqi8l5v1afx2bia436pifhxm"; + }; + }; + "download-5.0.3" = { + name = "download"; + packageName = "download"; + version = "5.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/download/-/download-5.0.3.tgz"; + sha1 = "63537f977f99266a30eb8a2a2fbd1f20b8000f7a"; + }; + }; + "download-git-repo-1.0.2" = { + name = "download-git-repo"; + packageName = "download-git-repo"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/download-git-repo/-/download-git-repo-1.0.2.tgz"; + sha512 = "21sjxnakbaz6gkw8lrk0dizw893hwawsrhaypkxph8cdf6v7gyxl8b4n82qh99v4zvzcbbxbc7ff8jzkkn91vmn0w381vzh9ypi801z"; + }; + }; + "duplexer-0.1.1" = { + name = "duplexer"; + packageName = "duplexer"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz"; + sha1 = "ace6ff808c1ce66b57d1ebf97977acb02334cfc1"; + }; + }; + "duplexer3-0.1.4" = { + name = "duplexer3"; + packageName = "duplexer3"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz"; + sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"; + }; + }; + "duplexify-3.5.4" = { name = "duplexify"; packageName = "duplexify"; - version = "3.5.3"; + version = "3.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/duplexify/-/duplexify-3.5.3.tgz"; - sha512 = "0c611ik2kv5wiqwfi5zjyx70dnw117lbr0wwqxqxc0hldnnfigiqyh5xr7x6267vs63jgvqkzvvwb3b1g37zkk3nx5dh5z8xbs07hl3"; + url = "https://registry.npmjs.org/duplexify/-/duplexify-3.5.4.tgz"; + sha512 = "2qcky919ps17a9ndimxvcqc73wlrcjmq8ppddbnl45xs9yqp1dmzzfaspfn63xzp14rl3dlk4g6y2ia71s6r9nggd0mb891hcni4di7"; }; }; "ecc-jsbn-0.1.1" = { @@ -967,6 +1957,42 @@ let sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505"; }; }; + "ee-first-1.1.0" = { + name = "ee-first"; + packageName = "ee-first"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz"; + sha1 = "6a0d7c6221e490feefd92ec3f441c9ce8cd097f4"; + }; + }; + "ee-first-1.1.1" = { + name = "ee-first"; + packageName = "ee-first"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"; + sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; + }; + }; + "enable-1.3.2" = { + name = "enable"; + packageName = "enable"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/enable/-/enable-1.3.2.tgz"; + sha1 = "9eba6837d16d0982b59f87d889bf754443d52931"; + }; + }; + "encodeurl-1.0.2" = { + name = "encodeurl"; + packageName = "encodeurl"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz"; + sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; + }; + }; "end-of-stream-1.4.1" = { name = "end-of-stream"; packageName = "end-of-stream"; @@ -976,6 +2002,24 @@ let sha512 = "3cjrpi6n5i6gf8jaiwg31y2xkgx59szhhcj9myqwmdw16s9r6yvwznxd2lhqf96mpm6knyb3w2bcnksg5nzkrq6iada0k6nvdj2pjfl"; }; }; + "escape-html-1.0.3" = { + name = "escape-html"; + packageName = "escape-html"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"; + sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988"; + }; + }; + "escape-string-regexp-1.0.2" = { + name = "escape-string-regexp"; + packageName = "escape-string-regexp"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz"; + sha1 = "4dbc2fe674e71949caf3fb2695ce7f2dc1d9a8d1"; + }; + }; "escape-string-regexp-1.0.5" = { name = "escape-string-regexp"; packageName = "escape-string-regexp"; @@ -985,6 +2029,51 @@ let sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; }; }; + "esprima-4.0.0" = { + name = "esprima"; + packageName = "esprima"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz"; + sha512 = "27mkhd94y9vrr8pb97br0ym5h85rawwb0biswgwdfp31x0387y12k9p9598bi4fc83fif6crfzqiqmmjs4x7gcb22ml3z1fldqm7yx1"; + }; + }; + "etag-1.8.1" = { + name = "etag"; + packageName = "etag"; + version = "1.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz"; + sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; + }; + }; + "event-stream-3.3.4" = { + name = "event-stream"; + packageName = "event-stream"; + version = "3.3.4"; + src = fetchurl { + url = "http://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz"; + sha1 = "4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571"; + }; + }; + "execa-0.7.0" = { + name = "execa"; + packageName = "execa"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz"; + sha1 = "944becd34cc41ee32a63a9faf27ad5a65fc59777"; + }; + }; + "exit-hook-1.1.1" = { + name = "exit-hook"; + packageName = "exit-hook"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz"; + sha1 = "f05ca233b48c05d54fff07765df8507e95c02ff8"; + }; + }; "expand-brackets-0.1.5" = { name = "expand-brackets"; packageName = "expand-brackets"; @@ -994,6 +2083,15 @@ let sha1 = "df07284e342a807cd733ac5af72411e581d1177b"; }; }; + "expand-brackets-2.1.4" = { + name = "expand-brackets"; + packageName = "expand-brackets"; + version = "2.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz"; + sha1 = "b77735e315ce30f6b6eff0f83b04151a22449622"; + }; + }; "expand-range-1.8.2" = { name = "expand-range"; packageName = "expand-range"; @@ -1003,6 +2101,15 @@ let sha1 = "a299effd335fe2721ebae8e257ec79644fc85337"; }; }; + "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"; + }; + }; "extend-3.0.1" = { name = "extend"; packageName = "extend"; @@ -1012,6 +2119,33 @@ let sha1 = "a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"; }; }; + "extend-shallow-2.0.1" = { + name = "extend-shallow"; + packageName = "extend-shallow"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz"; + sha1 = "51af7d614ad9a9f610ea1bafbb989d6b1c56890f"; + }; + }; + "extend-shallow-3.0.2" = { + name = "extend-shallow"; + packageName = "extend-shallow"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz"; + sha1 = "26a71aaf073b39fb2127172746131c2704028db8"; + }; + }; + "external-editor-2.1.0" = { + name = "external-editor"; + packageName = "external-editor"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/external-editor/-/external-editor-2.1.0.tgz"; + sha512 = "366albydy3glqs8h6y7rdpdhmyffn7vaig5snw8cb1zmn22mgvfywr08jfbmqjiqc9pyjyaaqv6xz5sfy2j1y18590l4f8mji7j53hk"; + }; + }; "extglob-0.3.2" = { name = "extglob"; packageName = "extglob"; @@ -1021,6 +2155,15 @@ let sha1 = "2e18ff3d2f49ab2765cec9023f011daa8d8349a1"; }; }; + "extglob-2.0.4" = { + name = "extglob"; + packageName = "extglob"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz"; + sha512 = "2klp0045k4wnaspb9khqx90ddv7rjg997mlyp5qz41sl2yqdrpw8g8wji77qq16aawl4yhvg0f993ln48lja0kfmy0wnbh4g50zlrin"; + }; + }; "extsprintf-1.3.0" = { name = "extsprintf"; packageName = "extsprintf"; @@ -1066,6 +2209,60 @@ let sha1 = "d303ccbfee02a9a56a3493fb08bcb59691aa53b1"; }; }; + "fd-slicer-1.0.1" = { + name = "fd-slicer"; + packageName = "fd-slicer"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz"; + sha1 = "8b5bcbd9ec327c5041bf9ab023fd6750f1177e65"; + }; + }; + "figures-1.7.0" = { + name = "figures"; + packageName = "figures"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz"; + sha1 = "cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"; + }; + }; + "figures-2.0.0" = { + name = "figures"; + packageName = "figures"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz"; + sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"; + }; + }; + "file-type-3.9.0" = { + name = "file-type"; + packageName = "file-type"; + version = "3.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz"; + sha1 = "257a078384d1db8087bc449d107d52a52672b9e9"; + }; + }; + "file-type-5.2.0" = { + name = "file-type"; + packageName = "file-type"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz"; + sha1 = "2ddbea7c73ffe36368dfae49dc338c058c2b8ad6"; + }; + }; + "file-type-6.2.0" = { + name = "file-type"; + packageName = "file-type"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/file-type/-/file-type-6.2.0.tgz"; + sha512 = "0xf8ry7jj1c5mvvp5qxidq3qcqxzdngx1q9r981ddq3wfcidwqd4h52hplv462hvm9frdl086advhfqfxbnvwm8ass3knby6l217xv0"; + }; + }; "filename-regex-2.0.1" = { name = "filename-regex"; packageName = "filename-regex"; @@ -1075,6 +2272,24 @@ let sha1 = "c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"; }; }; + "filename-reserved-regex-2.0.0" = { + name = "filename-reserved-regex"; + packageName = "filename-reserved-regex"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz"; + sha1 = "abf73dfab735d045440abfea2d91f389ebbfa229"; + }; + }; + "filenamify-2.0.0" = { + name = "filenamify"; + packageName = "filenamify"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/filenamify/-/filenamify-2.0.0.tgz"; + sha1 = "bd162262c0b6e94bfbcdcf19a3bbb3764f785695"; + }; + }; "fill-range-2.2.3" = { name = "fill-range"; packageName = "fill-range"; @@ -1084,6 +2299,24 @@ let sha1 = "50b77dfd7e469bc7492470963699fe7a8485a723"; }; }; + "fill-range-4.0.0" = { + name = "fill-range"; + packageName = "fill-range"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz"; + sha1 = "d544811d428f98eb06a63dc402d2403c328c38f7"; + }; + }; + "finalhandler-1.1.0" = { + name = "finalhandler"; + packageName = "finalhandler"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz"; + sha1 = "ce0b6855b45853e791b2fcc680046d88253dd7f5"; + }; + }; "findup-sync-0.3.0" = { name = "findup-sync"; packageName = "findup-sync"; @@ -1138,13 +2371,13 @@ let sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; }; }; - "form-data-2.1.4" = { + "form-data-1.0.0-rc3" = { name = "form-data"; packageName = "form-data"; - version = "2.1.4"; + version = "1.0.0-rc3"; src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz"; - sha1 = "33c183acf193276ecaa98143a69e94bfee1750d1"; + url = "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc3.tgz"; + sha1 = "d35bc62e7fbc2937ae78f948aaa0d38d90607577"; }; }; "form-data-2.3.2" = { @@ -1156,6 +2389,51 @@ let sha1 = "4970498be604c20c005d4f5c23aecd21d6b49099"; }; }; + "formidable-1.0.17" = { + name = "formidable"; + packageName = "formidable"; + version = "1.0.17"; + src = fetchurl { + url = "https://registry.npmjs.org/formidable/-/formidable-1.0.17.tgz"; + sha1 = "ef5491490f9433b705faa77249c99029ae348559"; + }; + }; + "formidable-1.2.1" = { + name = "formidable"; + packageName = "formidable"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/formidable/-/formidable-1.2.1.tgz"; + sha512 = "1x0n2rfaiasdjbw1mm7s29z84f68c7iji7lb1gkxvpknvv6q7bwns7z55ijcf4vkh4kvis12rbgaaih49jf9lj53s30mllb1d35bkqn"; + }; + }; + "fragment-cache-0.2.1" = { + name = "fragment-cache"; + packageName = "fragment-cache"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz"; + sha1 = "4290fad27f13e89be7f33799c6bc5a0abfff0d19"; + }; + }; + "fresh-0.5.2" = { + name = "fresh"; + packageName = "fresh"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz"; + sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7"; + }; + }; + "from-0.1.7" = { + name = "from"; + packageName = "from"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/from/-/from-0.1.7.tgz"; + sha1 = "83c60afc58b9c56997007ed1a768b3ab303a44fe"; + }; + }; "from2-2.3.0" = { name = "from2"; packageName = "from2"; @@ -1165,6 +2443,33 @@ let sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af"; }; }; + "fs-extra-0.24.0" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "0.24.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-0.24.0.tgz"; + sha1 = "d4e4342a96675cb7846633a6099249332b539952"; + }; + }; + "fs-extra-0.26.7" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "0.26.7"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-0.26.7.tgz"; + sha1 = "9ae1fdd94897798edab76d0918cf42d0c3184fa9"; + }; + }; + "fs-minipass-1.2.5" = { + name = "fs-minipass"; + packageName = "fs-minipass"; + version = "1.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz"; + sha512 = "2hpc9wbzrndi5bswg9q9hwxmg4yd99zbvssxnz6g04clj68qhd8c83zn282v3q7f9h1xi7c4lmnn341nlgfpwby2k14738pr796a416"; + }; + }; "fs.realpath-1.0.0" = { name = "fs.realpath"; packageName = "fs.realpath"; @@ -1174,6 +2479,15 @@ let sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; }; }; + "fsevents-1.1.3" = { + name = "fsevents"; + packageName = "fsevents"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/fsevents/-/fsevents-1.1.3.tgz"; + sha512 = "3jw51f4iayxvp9wfxczk1xgcvhsydhlgah64jmpl0mqiii2h8i5pp0lrqac5xn7296gxqrvy4lgm4k4hkifk8gipgqxd68x764gp2jq"; + }; + }; "fstream-1.0.11" = { name = "fstream"; packageName = "fstream"; @@ -1183,15 +2497,6 @@ let sha1 = "5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"; }; }; - "fstream-ignore-1.0.5" = { - name = "fstream-ignore"; - packageName = "fstream-ignore"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz"; - sha1 = "9c31dae34767018fe1d249b24dada67d092da105"; - }; - }; "gauge-2.7.4" = { name = "gauge"; packageName = "gauge"; @@ -1201,6 +2506,42 @@ let sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7"; }; }; + "get-proxy-2.1.0" = { + name = "get-proxy"; + packageName = "get-proxy"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-proxy/-/get-proxy-2.1.0.tgz"; + sha512 = "0kjf4p1krvzah7k5yngvvc39b7jnkzqlp3cdab8451zh1q4mxmav111dmycnadv28ja2wvcwvavjl7w550ja7qyw4dx976n0illhrnf"; + }; + }; + "get-stream-2.3.1" = { + name = "get-stream"; + packageName = "get-stream"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz"; + sha1 = "5f38f93f346009666ee0150a054167f91bdd95de"; + }; + }; + "get-stream-3.0.0" = { + name = "get-stream"; + packageName = "get-stream"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz"; + sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14"; + }; + }; + "get-value-2.0.6" = { + name = "get-value"; + packageName = "get-value"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz"; + sha1 = "dc15ca1c672387ca76bd37ac0a395ba2042a2c28"; + }; + }; "getpass-0.1.7" = { name = "getpass"; packageName = "getpass"; @@ -1210,6 +2551,24 @@ let sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; }; }; + "git-clone-0.1.0" = { + name = "git-clone"; + packageName = "git-clone"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/git-clone/-/git-clone-0.1.0.tgz"; + sha1 = "0d76163778093aef7f1c30238f2a9ef3f07a2eb9"; + }; + }; + "glob-3.2.11" = { + name = "glob"; + packageName = "glob"; + version = "3.2.11"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz"; + sha1 = "4a973f635b9190f715d10987d5c00fd2815ebe3d"; + }; + }; "glob-5.0.15" = { name = "glob"; packageName = "glob"; @@ -1246,6 +2605,15 @@ let sha1 = "81383d72db054fcccf5336daa902f182f6edbb28"; }; }; + "glob-parent-3.1.0" = { + name = "glob-parent"; + packageName = "glob-parent"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz"; + sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae"; + }; + }; "global-4.3.2" = { name = "global"; packageName = "global"; @@ -1255,6 +2623,24 @@ let sha1 = "e76989268a6c74c38908b1305b10fc0e394e9d0f"; }; }; + "global-dirs-0.1.1" = { + name = "global-dirs"; + packageName = "global-dirs"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz"; + sha1 = "b319c0dd4607f353f3be9cca4c72fc148c49f445"; + }; + }; + "got-6.7.1" = { + name = "got"; + packageName = "got"; + version = "6.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/got/-/got-6.7.1.tgz"; + sha1 = "240cd05785a9a18e561dc1b44b41c763ef1e8db0"; + }; + }; "graceful-fs-4.1.11" = { name = "graceful-fs"; packageName = "graceful-fs"; @@ -1273,6 +2659,24 @@ let sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725"; }; }; + "graphlib-2.1.5" = { + name = "graphlib"; + packageName = "graphlib"; + version = "2.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/graphlib/-/graphlib-2.1.5.tgz"; + sha512 = "0w1lx3hms5mx84mlxsgpvjr42qba17wwqhma0np67c9l8smkd2nwx7gr8724a2q1z7x0hjdjnwzx81893mj2ax498wl7y1h4yl5pysy"; + }; + }; + "gray-matter-2.1.1" = { + name = "gray-matter"; + packageName = "gray-matter"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/gray-matter/-/gray-matter-2.1.1.tgz"; + sha1 = "3042d9adec2a1ded6a7707a9ed2380f8a17a430e"; + }; + }; "growl-1.10.3" = { name = "growl"; packageName = "growl"; @@ -1282,6 +2686,15 @@ let sha512 = "3aibvz85l13j140w4jjdk8939q6r7dnf8ay2licxgkaaldk7wbm093c1p5g7k5cg80rl0xslmczyraawfgdr82hhxn7rfsm1rn6rac4"; }; }; + "growl-1.9.2" = { + name = "growl"; + packageName = "growl"; + version = "1.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz"; + sha1 = "0ea7743715db8d8de2c5ede1775e1b45ac85c02f"; + }; + }; "grunt-known-options-1.1.0" = { name = "grunt-known-options"; packageName = "grunt-known-options"; @@ -1291,13 +2704,13 @@ let sha1 = "a4274eeb32fa765da5a7a3b1712617ce3b144149"; }; }; - "har-schema-1.0.5" = { - name = "har-schema"; - packageName = "har-schema"; - version = "1.0.5"; + "handlebars-4.0.11" = { + name = "handlebars"; + packageName = "handlebars"; + version = "4.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz"; - sha1 = "d263135f43307c02c602afc8fe95970c0151369e"; + url = "https://registry.npmjs.org/handlebars/-/handlebars-4.0.11.tgz"; + sha1 = "630a35dfe0294bc281edae6ffc5d329fc7982dcc"; }; }; "har-schema-2.0.0" = { @@ -1309,15 +2722,6 @@ let sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; }; }; - "har-validator-4.2.1" = { - name = "har-validator"; - packageName = "har-validator"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz"; - sha1 = "33481d0f1bbff600dd203d75812a6a5fba002e2a"; - }; - }; "har-validator-5.0.3" = { name = "har-validator"; packageName = "har-validator"; @@ -1327,6 +2731,15 @@ let sha1 = "ba402c266194f15956ef15e0fcf242993f6a7dfd"; }; }; + "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"; + }; + }; "has-flag-2.0.0" = { name = "has-flag"; packageName = "has-flag"; @@ -1345,6 +2758,33 @@ let sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; }; }; + "has-generators-1.0.1" = { + name = "has-generators"; + packageName = "has-generators"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/has-generators/-/has-generators-1.0.1.tgz"; + sha1 = "a6a2e55486011940482e13e2c93791c449acf449"; + }; + }; + "has-symbol-support-x-1.4.2" = { + name = "has-symbol-support-x"; + packageName = "has-symbol-support-x"; + version = "1.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz"; + sha512 = "0kljkjnsw7jnqm8dpf05rd7a59xjfwlbmp1qxs5kdda78zwwqfpkq5ryc2510iyam6v5vbyy0h7bpkwqadajq1ag2zaa7dymyyhwfnx"; + }; + }; + "has-to-string-tag-x-1.4.1" = { + name = "has-to-string-tag-x"; + packageName = "has-to-string-tag-x"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz"; + sha512 = "0bqvhd628h3lrsydbp1xllh7jp23c58j7d4z0x0v9ddffindkk1zfrqmzm28z47ipjp0zxlmzvmlzk98zf9mzjsc47bmp1ydizcmmmx"; + }; + }; "has-unicode-2.0.1" = { name = "has-unicode"; packageName = "has-unicode"; @@ -1354,13 +2794,40 @@ let sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9"; }; }; - "hawk-3.1.3" = { - name = "hawk"; - packageName = "hawk"; - version = "3.1.3"; + "has-value-0.3.1" = { + name = "has-value"; + packageName = "has-value"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz"; - sha1 = "078444bd7c1640b0fe540d2c9b73d59678e8e1c4"; + url = "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz"; + sha1 = "7b1f58bada62ca827ec0a2078025654845995e1f"; + }; + }; + "has-value-1.0.0" = { + name = "has-value"; + packageName = "has-value"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz"; + sha1 = "18b281da585b1c5c51def24c930ed29a0be6b177"; + }; + }; + "has-values-0.1.4" = { + name = "has-values"; + packageName = "has-values"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz"; + sha1 = "6d61de95d91dfca9b9a02089ad384bff8f62b771"; + }; + }; + "has-values-1.0.0" = { + name = "has-values"; + packageName = "has-values"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz"; + sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f"; }; }; "hawk-6.0.2" = { @@ -1381,15 +2848,6 @@ let sha1 = "93410fd21b009735151f8868c2f271f3427e23fd"; }; }; - "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"; - }; - }; "hoek-4.2.1" = { name = "hoek"; packageName = "hoek"; @@ -1399,6 +2857,15 @@ let sha512 = "1y8kprb3qldxqj31zai5n8dvhydsl9nn5w4rskhnbzzhldn6pm6n5lcyam3sfkb61a62d5m58k8im7z6ngwbd9cw9zp4zm4y7ckrf20"; }; }; + "http-errors-1.6.3" = { + name = "http-errors"; + packageName = "http-errors"; + version = "1.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz"; + sha1 = "8b55680bb4be283a0b5bf4ea2e38580be1d9320d"; + }; + }; "http-methods-0.1.0" = { name = "http-methods"; packageName = "http-methods"; @@ -1408,15 +2875,6 @@ let sha1 = "29691b6fc58f4f7e81a3605dca82682b068e4430"; }; }; - "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"; - }; - }; "http-signature-1.2.0" = { name = "http-signature"; packageName = "http-signature"; @@ -1426,22 +2884,22 @@ let sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; }; }; - "hypercore-6.12.2" = { + "hypercore-6.12.7" = { name = "hypercore"; packageName = "hypercore"; - version = "6.12.2"; + version = "6.12.7"; src = fetchurl { - url = "https://registry.npmjs.org/hypercore/-/hypercore-6.12.2.tgz"; - sha512 = "1s7l8r5bpiialz194g5kryp5bpcg8n0x0l7jfgynjiimi3pyn0lkcijijk20g5ibagfzi3jnrlyh1jp9ywbrys5inbwl83ra7a6qbr6"; + url = "https://registry.npmjs.org/hypercore/-/hypercore-6.12.7.tgz"; + sha512 = "28wgk53py46wrcp8h8xkirakbc3v64r1aaqnl0g0ivp9x7791wkga63mbjl0cdsa3yif0cvbp8djwcpzx0smfyyqkdz7skjdgsbg57j"; }; }; - "hypercore-protocol-6.5.2" = { + "hypercore-protocol-6.6.4" = { name = "hypercore-protocol"; packageName = "hypercore-protocol"; - version = "6.5.2"; + version = "6.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/hypercore-protocol/-/hypercore-protocol-6.5.2.tgz"; - sha512 = "03l77nma8ga06ywa469jzqgc13hjk9bg3w2cv95g3fwnqy2fvz8qpczcih65jscvk0ira5kpm3sk2vqh2whzzvnm19jlqrzi78v80n3"; + url = "https://registry.npmjs.org/hypercore-protocol/-/hypercore-protocol-6.6.4.tgz"; + sha512 = "0rxj8d4lp45q7v3wwwv23m7qi84vw3wvyafqiy9x5f9lqkynq8v8yajpq9bcnc935927qjnxajn8n0cyhg0fqjnpywlfyxgxczkndgm"; }; }; "hyperdrive-9.12.3" = { @@ -1480,6 +2938,69 @@ let sha1 = "d96c92732076f072711b6b10fd7d4f65ad8ee23d"; }; }; + "iconv-lite-0.4.19" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.19"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz"; + sha512 = "0jj1pdq3j9ak8cixn2kjp7ip8hf3xgnb85j4jr32yf9rry620v9072c0kk577mllfk1zl9wzs5ypwzbp7vbhf7j31d5rrqgwb0nldm1"; + }; + }; + "iconv-lite-0.4.8" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.8"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.8.tgz"; + sha1 = "c6019a7595f2cefca702eab694a010bcd9298d20"; + }; + }; + "ieee754-1.1.11" = { + name = "ieee754"; + packageName = "ieee754"; + version = "1.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.11.tgz"; + sha512 = "0g5x1ijy37vzfz46pnh03mxkmdb9d2qd9f8ncy49xj4j9xkks9p0x8s5hnyc7grwh6sryk118rd7w7wz6w0hzyw9agwnavvlc4g642n"; + }; + }; + "ignore-by-default-1.0.1" = { + name = "ignore-by-default"; + packageName = "ignore-by-default"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz"; + sha1 = "48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09"; + }; + }; + "ignore-walk-3.0.1" = { + name = "ignore-walk"; + packageName = "ignore-walk"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz"; + sha512 = "2ajgs5klg786rkdxs37mbxn0p8ah2ai0nj0bjv5vbrfir4y0pvrhxxadv46s8g1hqkq5p3fjssys3n6qvz60p4jzjsgfq683lrnad8d"; + }; + }; + "import-lazy-2.1.0" = { + name = "import-lazy"; + packageName = "import-lazy"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz"; + sha1 = "05698e3d45c88e8d7e9d92cb0584e77f096f3e43"; + }; + }; + "imurmurhash-0.1.4" = { + name = "imurmurhash"; + packageName = "imurmurhash"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"; + sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; + }; + }; "inflight-1.0.6" = { name = "inflight"; packageName = "inflight"; @@ -1507,6 +3028,24 @@ let sha512 = "1rjbvf1rg5ywhnba08sgagn2qf23lab330qrqmh7d891zap3xpxcyfyj1cblpf0f0rypglcfacybzyrpd4996aa1mbc820awa33k5j5"; }; }; + "inquirer-0.10.1" = { + name = "inquirer"; + packageName = "inquirer"; + version = "0.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/inquirer/-/inquirer-0.10.1.tgz"; + sha1 = "ea25e4ce69ca145e05c99e46dcfec05e4012594a"; + }; + }; + "inquirer-3.3.0" = { + name = "inquirer"; + packageName = "inquirer"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz"; + sha512 = "1wsmzzva3rfjb4bfks7ba2nvha9ziwgq2kag6xxibc5cc6mz19xbgj4fm3a7ghvfbfx4am0x13ibc8j2s5m3sv12nph44rq56gnvv47"; + }; + }; "ip-1.1.5" = { name = "ip"; packageName = "ip"; @@ -1516,6 +3055,42 @@ let sha1 = "bdded70114290828c0a039e72ef25f5aaec4354a"; }; }; + "is-3.2.1" = { + name = "is"; + packageName = "is"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is/-/is-3.2.1.tgz"; + sha1 = "d0ac2ad55eb7b0bec926a5266f6c662aaa83dca5"; + }; + }; + "is-accessor-descriptor-0.1.6" = { + name = "is-accessor-descriptor"; + packageName = "is-accessor-descriptor"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz"; + sha1 = "a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"; + }; + }; + "is-accessor-descriptor-1.0.0" = { + name = "is-accessor-descriptor"; + packageName = "is-accessor-descriptor"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz"; + sha512 = "1qllik6fjwfq17ic0fxwqyll8mrhmcm36xfsq45xc57mq9ah4i4nn4f8fvgb0gx4kpl3jlpkzndp0xlmmf2mh0xmggw6mhw74fng64v"; + }; + }; + "is-binary-path-1.0.1" = { + name = "is-binary-path"; + packageName = "is-binary-path"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz"; + sha1 = "75f16642b480f187a711c814161fd3a4a7655898"; + }; + }; "is-buffer-1.1.6" = { name = "is-buffer"; packageName = "is-buffer"; @@ -1525,6 +3100,51 @@ let sha512 = "3kr8dm9qyklmm2xyiz75s8db90bfilfals4x0g276kncihrrrz0ar4y6dqpvc7pwy7h43jay1bayi1r62x97nzvcswkk4ap18pl1irm"; }; }; + "is-ci-1.1.0" = { + name = "is-ci"; + packageName = "is-ci"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-ci/-/is-ci-1.1.0.tgz"; + sha512 = "0m66alrh568wj40xwshf8q99gsjfk1jr0czp4jc2sm519wfzzzprkl5zjvw2r5h49p72d50ywj9qg67dnyazq0ijy4flgny2b1ygd3k"; + }; + }; + "is-data-descriptor-0.1.4" = { + name = "is-data-descriptor"; + packageName = "is-data-descriptor"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz"; + sha1 = "0b5ee648388e2c860282e793f1856fec3f301b56"; + }; + }; + "is-data-descriptor-1.0.0" = { + name = "is-data-descriptor"; + packageName = "is-data-descriptor"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz"; + sha512 = "0ny6kxc752fg3z6fmj8a7fw2lai2y17d9fx0028nvyv1qj0sa30rfryhv9xd7b7is1yfs0val6amsy2b22rh589il10md36a75mgd4d"; + }; + }; + "is-descriptor-0.1.6" = { + name = "is-descriptor"; + packageName = "is-descriptor"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz"; + sha512 = "0gbflcxmd30gzj91y19fylsfalirl6qg71sxjximc8lc2vxkg5h9scnahvxsczymchlx742i8ai489843ys431vyw73rp418jpxiw3a"; + }; + }; + "is-descriptor-1.0.2" = { + name = "is-descriptor"; + packageName = "is-descriptor"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz"; + sha512 = "2v1a9mn2rzz52v8vs3i7njk9pv95fh971yc81xr0zkaw3dff4gbv1zv048xyjysfgwpajbyryk2px8hinwwh0wagblmw6chdbjsrs6r"; + }; + }; "is-dotfile-1.0.3" = { name = "is-dotfile"; packageName = "is-dotfile"; @@ -1552,6 +3172,15 @@ let sha1 = "62b110e289a471418e3ec36a617d472e301dfc89"; }; }; + "is-extendable-1.0.1" = { + name = "is-extendable"; + packageName = "is-extendable"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz"; + sha512 = "0w73qlx9ynmv2iznw1kll86yd04z4rsz3788nzgh7amcnpsbyxbrs734im9dibqgps6pjyz61s8kp4lcsbjsdfrlc51m1pm2hrxgfba"; + }; + }; "is-extglob-1.0.0" = { name = "is-extglob"; packageName = "is-extglob"; @@ -1561,6 +3190,15 @@ let sha1 = "ac468177c4943405a092fc8f29760c6ffc6206c0"; }; }; + "is-extglob-2.1.1" = { + name = "is-extglob"; + packageName = "is-extglob"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"; + sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; + }; + }; "is-fullwidth-code-point-1.0.0" = { name = "is-fullwidth-code-point"; packageName = "is-fullwidth-code-point"; @@ -1597,6 +3235,60 @@ let sha1 = "d096f926a3ded5600f3fdfd91198cb0888c2d863"; }; }; + "is-glob-3.1.0" = { + name = "is-glob"; + packageName = "is-glob"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz"; + sha1 = "7ba5ae24217804ac70707b96922567486cc3e84a"; + }; + }; + "is-glob-4.0.0" = { + name = "is-glob"; + packageName = "is-glob"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz"; + sha1 = "9521c76845cc2610a85203ddf080a958c2ffabc0"; + }; + }; + "is-installed-globally-0.1.0" = { + name = "is-installed-globally"; + packageName = "is-installed-globally"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.1.0.tgz"; + sha1 = "0dfd98f5a9111716dd535dda6492f67bf3d25a80"; + }; + }; + "is-invalid-path-0.1.0" = { + name = "is-invalid-path"; + packageName = "is-invalid-path"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-invalid-path/-/is-invalid-path-0.1.0.tgz"; + sha1 = "307a855b3cf1a938b44ea70d2c61106053714f34"; + }; + }; + "is-natural-number-4.0.1" = { + name = "is-natural-number"; + packageName = "is-natural-number"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-natural-number/-/is-natural-number-4.0.1.tgz"; + sha1 = "ab9d76e1db4ced51e35de0c72ebecf09f734cde8"; + }; + }; + "is-npm-1.0.0" = { + name = "is-npm"; + packageName = "is-npm"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz"; + sha1 = "f2fb63a65e4905b406c86072765a1a4dc793b9f4"; + }; + }; "is-number-2.1.0" = { name = "is-number"; packageName = "is-number"; @@ -1615,6 +3307,60 @@ let sha1 = "24fd6201a4782cf50561c810276afc7d12d71195"; }; }; + "is-number-4.0.0" = { + name = "is-number"; + packageName = "is-number"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz"; + sha512 = "20ybhnkgsrcwv730ch8qvzayjwcvs83jk2w6iim7wv3h2nn4jz8hsldn0k6ggx4xgcypwirqjb5xdacsswsk06w2nk56zr509q2aadd"; + }; + }; + "is-obj-1.0.1" = { + name = "is-obj"; + packageName = "is-obj"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz"; + sha1 = "3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"; + }; + }; + "is-object-1.0.1" = { + name = "is-object"; + packageName = "is-object"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz"; + sha1 = "8952688c5ec2ffd6b03ecc85e769e02903083470"; + }; + }; + "is-odd-2.0.0" = { + name = "is-odd"; + packageName = "is-odd"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-odd/-/is-odd-2.0.0.tgz"; + sha512 = "34m1wg28c9l1v9bqz2klwl4ybhyqkhk80d95664jmcbq1jjpg471nv96mqgqy4838xpa8wm7mbpynmq4294pq6iw163s0ar1b3a4f1r"; + }; + }; + "is-path-inside-1.0.1" = { + name = "is-path-inside"; + packageName = "is-path-inside"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz"; + sha1 = "8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"; + }; + }; + "is-plain-object-2.0.4" = { + name = "is-plain-object"; + packageName = "is-plain-object"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz"; + sha512 = "0xgsjz9m3kg5pm36lcchblxk53qay59ya7wi5jgdmz0dsl5b0j2j7wcd48yyfaip1m70mj9aqf8kib02fn62k0hy0vxg2hng60yk4w7"; + }; + }; "is-posix-bracket-0.1.1" = { name = "is-posix-bracket"; packageName = "is-posix-bracket"; @@ -1633,6 +3379,42 @@ let sha1 = "207bab91638499c07b2adf240a41a87210034575"; }; }; + "is-promise-2.1.0" = { + name = "is-promise"; + packageName = "is-promise"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz"; + sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"; + }; + }; + "is-redirect-1.0.0" = { + name = "is-redirect"; + packageName = "is-redirect"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz"; + sha1 = "1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"; + }; + }; + "is-retry-allowed-1.1.0" = { + name = "is-retry-allowed"; + packageName = "is-retry-allowed"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz"; + sha1 = "11a060568b67339444033d0125a61a20d564fb34"; + }; + }; + "is-stream-1.1.0" = { + name = "is-stream"; + packageName = "is-stream"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz"; + sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; + }; + }; "is-string-1.0.4" = { name = "is-string"; packageName = "is-string"; @@ -1651,6 +3433,42 @@ let sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; }; }; + "is-utf8-0.2.1" = { + name = "is-utf8"; + packageName = "is-utf8"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz"; + sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72"; + }; + }; + "is-valid-path-0.1.1" = { + name = "is-valid-path"; + packageName = "is-valid-path"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-valid-path/-/is-valid-path-0.1.1.tgz"; + sha1 = "110f9ff74c37f663e1ec7915eb451f2db93ac9df"; + }; + }; + "is-windows-1.0.2" = { + name = "is-windows"; + packageName = "is-windows"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz"; + sha512 = "0h9a8zw2ddl25yryp7i376iqjdvlsx4gw93sxy4067dw2yi98m3krfwd9xgi9q5w0idw9rqnyhhncr38xsppyi5izkb7ngai58bawkr"; + }; + }; + "isarray-0.0.1" = { + name = "isarray"; + packageName = "isarray"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; + sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; + }; + }; "isarray-1.0.0" = { name = "isarray"; packageName = "isarray"; @@ -1678,6 +3496,15 @@ let sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89"; }; }; + "isobject-3.0.1" = { + name = "isobject"; + packageName = "isobject"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz"; + sha1 = "4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"; + }; + }; "isstream-0.1.2" = { name = "isstream"; packageName = "isstream"; @@ -1687,6 +3514,15 @@ let sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; }; }; + "isurl-1.0.0" = { + name = "isurl"; + packageName = "isurl"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz"; + sha512 = "3vs53bpdrwiwwcql2xs20jmd8qha27k4iypdhr0b3isgdaj18vz80nhxwvvqxk6y3x5vj3slchxl0r91gjhz487xmkkp52gridg5zyl"; + }; + }; "iterators-0.1.0" = { name = "iterators"; packageName = "iterators"; @@ -1696,6 +3532,24 @@ let sha1 = "d03f666ca4e6130138565997cacea54164203156"; }; }; + "jade-0.26.3" = { + name = "jade"; + packageName = "jade"; + version = "0.26.3"; + src = fetchurl { + url = "https://registry.npmjs.org/jade/-/jade-0.26.3.tgz"; + sha1 = "8f10d7977d8d79f2f6ff862a81b0513ccb25686c"; + }; + }; + "js-yaml-3.11.0" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "3.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.11.0.tgz"; + sha512 = "0gka65n4d9gmcy0c8cy5h55r273dbxnw54gibp2nq5mmdmksjgb2nhcdfgfxs1wg3yayyrydn2v79fny7hdyq907dg87vmgjnsnr8mi"; + }; + }; "jsbn-0.1.1" = { name = "jsbn"; packageName = "jsbn"; @@ -1705,6 +3559,15 @@ let sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; }; }; + "json-refs-2.1.7" = { + name = "json-refs"; + packageName = "json-refs"; + version = "2.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/json-refs/-/json-refs-2.1.7.tgz"; + sha1 = "b9eb01fe29f5ea3e92878f15aea10ad38b5acf89"; + }; + }; "json-schema-0.2.3" = { name = "json-schema"; packageName = "json-schema"; @@ -1714,6 +3577,15 @@ let sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; }; }; + "json-schema-deref-sync-0.3.4" = { + name = "json-schema-deref-sync"; + packageName = "json-schema-deref-sync"; + version = "0.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema-deref-sync/-/json-schema-deref-sync-0.3.4.tgz"; + sha512 = "1q3093cgk00pbsrzpb8h1j8cxl21gmnw5xb7wd5i3f47yawm6qmbg5ls94d1h1nhay2vh5fcz0wgfzy2ra2ylw77hrr0306apxj6az1"; + }; + }; "json-schema-traverse-0.3.1" = { name = "json-schema-traverse"; packageName = "json-schema-traverse"; @@ -1723,15 +3595,6 @@ let sha1 = "349a6d44c53a51de89b40805c5d5e59b417d3340"; }; }; - "json-stable-stringify-1.0.1" = { - name = "json-stable-stringify"; - packageName = "json-stable-stringify"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz"; - sha1 = "9a759d39c5f2ff503fd5300646ed445f88c4f9af"; - }; - }; "json-stringify-safe-5.0.1" = { name = "json-stringify-safe"; packageName = "json-stringify-safe"; @@ -1741,13 +3604,13 @@ let sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; }; }; - "jsonify-0.0.0" = { - name = "jsonify"; - packageName = "jsonify"; - version = "0.0.0"; + "jsonfile-2.4.0" = { + name = "jsonfile"; + packageName = "jsonfile"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz"; - sha1 = "2c74b6ee41d93ca51b7b5aaee8f503631d252a73"; + url = "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz"; + sha1 = "3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"; }; }; "jsprim-1.4.1" = { @@ -1768,13 +3631,22 @@ let sha512 = "2dkl580azs1f5pj72mpygwdcc2mh4p355sxi84ki1w9c6k226nmjfglq5b7zgk5gmpfjammx5xliirzaf2nh9kyhqdb1xpvhjlic34j"; }; }; - "k-rpc-4.2.1" = { + "k-bucket-4.0.0" = { + name = "k-bucket"; + packageName = "k-bucket"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/k-bucket/-/k-bucket-4.0.0.tgz"; + sha512 = "04i173zw3l2aagsnywafmgs87wzhhkakvnhcfvxbnbmn7rz37rkqkryc8d6x8dccqlmvgawb2vhd49ms8s2wkbg3dh3qlffamzcpshk"; + }; + }; + "k-rpc-4.3.1" = { name = "k-rpc"; packageName = "k-rpc"; - version = "4.2.1"; + version = "4.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/k-rpc/-/k-rpc-4.2.1.tgz"; - sha512 = "2nbjxg0x7jsa14zhvx68w1vri68hsxzbxz7b7ap76fdp0jkrgna2rq636yxnax04f3f8i2ambj2fpan6qli6vixmfryz78vrapdip8n"; + url = "https://registry.npmjs.org/k-rpc/-/k-rpc-4.3.1.tgz"; + sha512 = "0a7k7qcmcik3dwcjd6f0ngq3i3pdz1cc7xz9ck30gd65nd0ylmgx0kf6b686qd1kk32v3rcila2hdj12cnrjwrjqzs96vjqw5jhj04s"; }; }; "k-rpc-socket-1.8.0" = { @@ -1804,6 +3676,33 @@ let sha1 = "20813df3d712928b207378691a45066fae72dd57"; }; }; + "kind-of-5.1.0" = { + name = "kind-of"; + packageName = "kind-of"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz"; + sha512 = "0zk87sccrjx6pgf9n74v4msnqwq5siyhrkpaklx7yk85ygy5ypcgmyfhbd5mmcyd53x8zcw0gzvp9bhbglziqbhp7a6n5zsf6p08q9l"; + }; + }; + "kind-of-6.0.2" = { + name = "kind-of"; + packageName = "kind-of"; + version = "6.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz"; + sha512 = "2l91vcracq8y3nxacsssb4yhk0ww011gi5sn55wsb6bpnhyds2i1x98512f61r8awxmj602bxky6c7hsyibjvz17f1pmlf7r4whp6dk"; + }; + }; + "klaw-1.3.1" = { + name = "klaw"; + packageName = "klaw"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz"; + sha1 = "4088433b46b3b1ba259d78785d8e96f73ba02439"; + }; + }; "last-one-wins-1.0.4" = { name = "last-one-wins"; packageName = "last-one-wins"; @@ -1813,6 +3712,24 @@ let sha1 = "c1bfd0cbcb46790ec9156b8d1aee8fcb86cda22a"; }; }; + "latest-version-3.1.0" = { + name = "latest-version"; + packageName = "latest-version"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/latest-version/-/latest-version-3.1.0.tgz"; + sha1 = "a205383fea322b33b5ae3b18abee0dc2f356ee15"; + }; + }; + "lazy-cache-1.0.4" = { + name = "lazy-cache"; + packageName = "lazy-cache"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz"; + sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"; + }; + }; "length-prefixed-message-3.0.3" = { name = "length-prefixed-message"; packageName = "length-prefixed-message"; @@ -1822,6 +3739,15 @@ let sha1 = "245474d69abc0614dca368dc35aa8074982a23ac"; }; }; + "lodash-3.10.1" = { + name = "lodash"; + packageName = "lodash"; + version = "3.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"; + sha1 = "5bf45e8e49ba4189e17d482789dfd15bd140b7b6"; + }; + }; "lodash-4.17.5" = { name = "lodash"; packageName = "lodash"; @@ -1831,6 +3757,177 @@ let sha512 = "11hikgyas884mz8a58vyixaahxbpdwljdw4cb6qp15xa3sfqikp2mm6wgv41jsl34nzsv1hkx9kw3nwczvas5p73whirmaz4sxggwmj"; }; }; + "lodash-compat-3.10.2" = { + name = "lodash-compat"; + packageName = "lodash-compat"; + version = "3.10.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash-compat/-/lodash-compat-3.10.2.tgz"; + sha1 = "c6940128a9d30f8e902cd2cf99fd0cba4ecfc183"; + }; + }; + "lodash._arraypool-2.4.1" = { + name = "lodash._arraypool"; + packageName = "lodash._arraypool"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._arraypool/-/lodash._arraypool-2.4.1.tgz"; + sha1 = "e88eecb92e2bb84c9065612fd958a0719cd47f94"; + }; + }; + "lodash._basebind-2.4.1" = { + name = "lodash._basebind"; + packageName = "lodash._basebind"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._basebind/-/lodash._basebind-2.4.1.tgz"; + sha1 = "e940b9ebdd27c327e0a8dab1b55916c5341e9575"; + }; + }; + "lodash._baseclone-2.4.1" = { + name = "lodash._baseclone"; + packageName = "lodash._baseclone"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._baseclone/-/lodash._baseclone-2.4.1.tgz"; + sha1 = "30f823e57e17e3735d383bd62b60b387543b4186"; + }; + }; + "lodash._basecreate-2.4.1" = { + name = "lodash._basecreate"; + packageName = "lodash._basecreate"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-2.4.1.tgz"; + sha1 = "f8e6f5b578a9e34e541179b56b8eeebf4a287e08"; + }; + }; + "lodash._basecreatecallback-2.4.1" = { + name = "lodash._basecreatecallback"; + packageName = "lodash._basecreatecallback"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._basecreatecallback/-/lodash._basecreatecallback-2.4.1.tgz"; + sha1 = "7d0b267649cb29e7a139d0103b7c11fae84e4851"; + }; + }; + "lodash._basecreatewrapper-2.4.1" = { + name = "lodash._basecreatewrapper"; + packageName = "lodash._basecreatewrapper"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._basecreatewrapper/-/lodash._basecreatewrapper-2.4.1.tgz"; + sha1 = "4d31f2e7de7e134fbf2803762b8150b32519666f"; + }; + }; + "lodash._createwrapper-2.4.1" = { + name = "lodash._createwrapper"; + packageName = "lodash._createwrapper"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._createwrapper/-/lodash._createwrapper-2.4.1.tgz"; + sha1 = "51d6957973da4ed556e37290d8c1a18c53de1607"; + }; + }; + "lodash._getarray-2.4.1" = { + name = "lodash._getarray"; + packageName = "lodash._getarray"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._getarray/-/lodash._getarray-2.4.1.tgz"; + sha1 = "faf1f7f810fa985a251c2187404481094839e5ee"; + }; + }; + "lodash._isnative-2.4.1" = { + name = "lodash._isnative"; + packageName = "lodash._isnative"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"; + sha1 = "3ea6404b784a7be836c7b57580e1cdf79b14832c"; + }; + }; + "lodash._maxpoolsize-2.4.1" = { + name = "lodash._maxpoolsize"; + packageName = "lodash._maxpoolsize"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._maxpoolsize/-/lodash._maxpoolsize-2.4.1.tgz"; + sha1 = "9d482f463b8e66afbe59c2c14edb117060172334"; + }; + }; + "lodash._objecttypes-2.4.1" = { + name = "lodash._objecttypes"; + packageName = "lodash._objecttypes"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz"; + sha1 = "7c0b7f69d98a1f76529f890b0cdb1b4dfec11c11"; + }; + }; + "lodash._releasearray-2.4.1" = { + name = "lodash._releasearray"; + packageName = "lodash._releasearray"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._releasearray/-/lodash._releasearray-2.4.1.tgz"; + sha1 = "a6139630d76d1536b07ddc80962889b082f6a641"; + }; + }; + "lodash._setbinddata-2.4.1" = { + name = "lodash._setbinddata"; + packageName = "lodash._setbinddata"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._setbinddata/-/lodash._setbinddata-2.4.1.tgz"; + sha1 = "f7c200cd1b92ef236b399eecf73c648d17aa94d2"; + }; + }; + "lodash._shimkeys-2.4.1" = { + name = "lodash._shimkeys"; + packageName = "lodash._shimkeys"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz"; + sha1 = "6e9cc9666ff081f0b5a6c978b83e242e6949d203"; + }; + }; + "lodash._slice-2.4.1" = { + name = "lodash._slice"; + packageName = "lodash._slice"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._slice/-/lodash._slice-2.4.1.tgz"; + sha1 = "745cf41a53597b18f688898544405efa2b06d90f"; + }; + }; + "lodash.assign-2.4.1" = { + name = "lodash.assign"; + packageName = "lodash.assign"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-2.4.1.tgz"; + sha1 = "84c39596dd71181a97b0652913a7c9675e49b1aa"; + }; + }; + "lodash.bind-2.4.1" = { + name = "lodash.bind"; + packageName = "lodash.bind"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.bind/-/lodash.bind-2.4.1.tgz"; + sha1 = "5d19fa005c8c4d236faf4742c7b7a1fcabe29267"; + }; + }; + "lodash.clonedeep-2.4.1" = { + name = "lodash.clonedeep"; + packageName = "lodash.clonedeep"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-2.4.1.tgz"; + sha1 = "f29203b40b12fee0a45d3631648259bebabc7868"; + }; + }; "lodash.flattendeep-4.4.0" = { name = "lodash.flattendeep"; packageName = "lodash.flattendeep"; @@ -1840,6 +3937,105 @@ let sha1 = "fb030917f86a3134e5bc9bec0d69e0013ddfedb2"; }; }; + "lodash.foreach-2.4.1" = { + name = "lodash.foreach"; + packageName = "lodash.foreach"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-2.4.1.tgz"; + sha1 = "fe3fc3a34c86c94cab6f9522560282741e016309"; + }; + }; + "lodash.forown-2.4.1" = { + name = "lodash.forown"; + packageName = "lodash.forown"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.forown/-/lodash.forown-2.4.1.tgz"; + sha1 = "78b41eafe1405fa966459ea4193fd502d084524b"; + }; + }; + "lodash.get-4.4.2" = { + name = "lodash.get"; + packageName = "lodash.get"; + version = "4.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz"; + sha1 = "2d177f652fa31e939b4438d5341499dfa3825e99"; + }; + }; + "lodash.identity-2.4.1" = { + name = "lodash.identity"; + packageName = "lodash.identity"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.identity/-/lodash.identity-2.4.1.tgz"; + sha1 = "6694cffa65fef931f7c31ce86c74597cf560f4f1"; + }; + }; + "lodash.isarray-2.4.1" = { + name = "lodash.isarray"; + packageName = "lodash.isarray"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-2.4.1.tgz"; + sha1 = "b52a326c1f62f6d7da73a31d5401df6ef44f0fa1"; + }; + }; + "lodash.isequal-4.5.0" = { + name = "lodash.isequal"; + packageName = "lodash.isequal"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz"; + sha1 = "415c4478f2bcc30120c22ce10ed3226f7d3e18e0"; + }; + }; + "lodash.isfunction-2.4.1" = { + name = "lodash.isfunction"; + packageName = "lodash.isfunction"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-2.4.1.tgz"; + sha1 = "2cfd575c73e498ab57e319b77fa02adef13a94d1"; + }; + }; + "lodash.isobject-2.4.1" = { + name = "lodash.isobject"; + packageName = "lodash.isobject"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz"; + sha1 = "5a2e47fe69953f1ee631a7eba1fe64d2d06558f5"; + }; + }; + "lodash.keys-2.4.1" = { + name = "lodash.keys"; + packageName = "lodash.keys"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz"; + sha1 = "48dea46df8ff7632b10d706b8acb26591e2b3727"; + }; + }; + "lodash.noop-2.4.1" = { + name = "lodash.noop"; + packageName = "lodash.noop"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.noop/-/lodash.noop-2.4.1.tgz"; + sha1 = "4fb54f816652e5ae10e8f72f717a388c7326538a"; + }; + }; + "lodash.support-2.4.1" = { + name = "lodash.support"; + packageName = "lodash.support"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.support/-/lodash.support-2.4.1.tgz"; + sha1 = "320e0b67031673c28d7a2bb5d9e0331a45240515"; + }; + }; "lodash.throttle-4.1.1" = { name = "lodash.throttle"; packageName = "lodash.throttle"; @@ -1849,6 +4045,33 @@ let sha1 = "c23e91b710242ac70c37f1e1cda9274cc39bf2f4"; }; }; + "log-symbols-2.2.0" = { + name = "log-symbols"; + packageName = "log-symbols"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz"; + sha512 = "093j1mha2zwbfkb6cvxr94l1dsx44607vvyxadxki3j69s40n2f6x6iqs6f9rzpvvqd8anclsqdlrm3klkwxixm4k2fl8bjr4b01qjm"; + }; + }; + "longest-1.0.1" = { + name = "longest"; + packageName = "longest"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz"; + sha1 = "30a0b2da38f73770e8294a0d22e6625ed77d0097"; + }; + }; + "lowercase-keys-1.0.1" = { + name = "lowercase-keys"; + packageName = "lowercase-keys"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz"; + sha512 = "1a7qa1zn5zl1nf7i6w3299lc3biabfb0w2c30cl770l2dbldvi72nwvjdlinhx7j0ldip82sj710aprdjbmbg782i2pa3jpbgmy6qhv"; + }; + }; "lru-2.0.1" = { name = "lru"; packageName = "lru"; @@ -1867,6 +4090,87 @@ let sha1 = "ea7fb8546d83733396a13091d76cfeb4c06837d5"; }; }; + "lru-cache-2.7.3" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "2.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"; + sha1 = "6d4524e8b955f95d4f5b58851ce21dd72fb4e952"; + }; + }; + "lru-cache-4.1.2" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.2.tgz"; + sha512 = "1whynbvy3pbwcpkxk6rqhsymj2h3bh7p13nfhs9ch6hfx96vrh86j7vd4lqcaqjy5dhsfjps6sh2wqndh269wjz42khbh6339g9a1y2"; + }; + }; + "make-dir-1.2.0" = { + name = "make-dir"; + packageName = "make-dir"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/make-dir/-/make-dir-1.2.0.tgz"; + sha512 = "0ivb7kryzyklvicp8a0lsq56pzjmvycb6bs4d0239q9ygcrs8ylx94q57fgxq3vqvzzs9v3ldl5m1jkxfvfaxh5p8lgb0qchmmh1mb8"; + }; + }; + "map-cache-0.2.2" = { + name = "map-cache"; + packageName = "map-cache"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz"; + sha1 = "c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"; + }; + }; + "map-stream-0.1.0" = { + name = "map-stream"; + packageName = "map-stream"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz"; + sha1 = "e56aa94c4c8055a16404a0674b78f215f7c8e194"; + }; + }; + "map-visit-1.0.0" = { + name = "map-visit"; + packageName = "map-visit"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz"; + sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"; + }; + }; + "md5-2.2.1" = { + name = "md5"; + packageName = "md5"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/md5/-/md5-2.2.1.tgz"; + sha1 = "53ab38d5fe3c8891ba465329ea23fac0540126f9"; + }; + }; + "media-typer-0.3.0" = { + name = "media-typer"; + packageName = "media-typer"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"; + sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; + }; + }; + "memory-cache-0.1.6" = { + name = "memory-cache"; + packageName = "memory-cache"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/memory-cache/-/memory-cache-0.1.6.tgz"; + sha1 = "2ed9933ed7a8c718249be7366f7ca8749acf8a24"; + }; + }; "memory-pager-1.1.0" = { name = "memory-pager"; packageName = "memory-pager"; @@ -1885,6 +4189,24 @@ let sha1 = "f8a064760d37e7978ad5f9f6d3c119a494f57081"; }; }; + "metalsmith-2.3.0" = { + name = "metalsmith"; + packageName = "metalsmith"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/metalsmith/-/metalsmith-2.3.0.tgz"; + sha1 = "833afbb5a2a6385e2d9ae3d935e39e33eaea5231"; + }; + }; + "methods-1.1.2" = { + name = "methods"; + packageName = "methods"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"; + sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; + }; + }; "micromatch-2.3.11" = { name = "micromatch"; packageName = "micromatch"; @@ -1894,6 +4216,33 @@ let sha1 = "86677c97d1720b363431d04d0d15293bd38c1565"; }; }; + "micromatch-3.1.10" = { + name = "micromatch"; + packageName = "micromatch"; + version = "3.1.10"; + src = fetchurl { + url = "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz"; + sha512 = "1r9rsac8gdslsplya0cnzyk6q0bh7m0wnxccdisacr5327k5k0v6f48dzp0022z8qqpzpvxw7sv1gzhvrqn6v5sz7qcvx37by1a8s1i"; + }; + }; + "mime-1.3.4" = { + name = "mime"; + packageName = "mime"; + version = "1.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz"; + sha1 = "115f9e3b6b3daf2959983cb38f149a2d40eb5d53"; + }; + }; + "mime-1.4.1" = { + name = "mime"; + packageName = "mime"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz"; + sha512 = "2sz22r1xrnyvq6jg0h6b6cab3s3xdsfqa0n6vl9xv9gq3ppcxrcpg2hqfc41xjwnfwfkr6240l5gys7nds61ch6xcb3gr3fwsl7x398"; + }; + }; "mime-1.6.0" = { name = "mime"; packageName = "mime"; @@ -1921,6 +4270,15 @@ let sha512 = "22krj1kw7n9z10zdyx7smcaim4bzwqsqzhspwha06q58gcrxfp93hw2cd0vk5crhq5p2dwzqlpacg32lrmp5sjzb798zdzy35mdmkwm"; }; }; + "mimic-fn-1.2.0" = { + name = "mimic-fn"; + packageName = "mimic-fn"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz"; + sha512 = "1clrrqw75rmpkw0x53axy8va2hq2gzynz9zb58m0xv1nh3lg81cv4dfdy7pk9vrlb9ydwmj6klpicwkv2bjx3m8aj4fi2ph3jxkizwd"; + }; + }; "min-document-2.19.0" = { name = "min-document"; packageName = "min-document"; @@ -1930,6 +4288,15 @@ let sha1 = "7bd282e3f5842ed295bb748cdd9f1ffa2c824685"; }; }; + "minimatch-0.3.0" = { + name = "minimatch"; + packageName = "minimatch"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz"; + sha1 = "275d8edaac4f1bb3326472089e7949c8394699dd"; + }; + }; "minimatch-3.0.4" = { name = "minimatch"; packageName = "minimatch"; @@ -1957,6 +4324,24 @@ let sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; }; }; + "minipass-2.2.4" = { + name = "minipass"; + packageName = "minipass"; + version = "2.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass/-/minipass-2.2.4.tgz"; + sha512 = "3r74gps1yd2fabj46qd42hknvpkg4aqwg3cdz8xjn8aqww0rsk3nmbgh8p2h0rkjlpxihg1wnpfa4bmpgmnydlbhpb1rz5dcxcwhdc7"; + }; + }; + "minizlib-1.1.0" = { + name = "minizlib"; + packageName = "minizlib"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minizlib/-/minizlib-1.1.0.tgz"; + sha512 = "2agpbdf9h90nhafdam3jwrw8gcz3jw1i40cx6bhwaw8qaf2s863gi2b77l73dc3hmf5dx491hv5km1rqzabgsbpkjxrvdcwy6pr8gp1"; + }; + }; "mirror-folder-2.1.1" = { name = "mirror-folder"; packageName = "mirror-folder"; @@ -1966,6 +4351,24 @@ let sha1 = "1ad3b777b39e403cc27bf52086c23e41ef4c9604"; }; }; + "mixin-deep-1.3.1" = { + name = "mixin-deep"; + packageName = "mixin-deep"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz"; + sha512 = "0swcxf279pl5jc4b3d4fm9whbi6sbv2xbcfm1fkxiz793qa2hl5wd1b8dw019dgyidx5nwpa141k0cvvwan0rfypn2am0c4fwn2v4pi"; + }; + }; + "mkdirp-0.3.0" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz"; + sha1 = "1bbf5ab1ba827af23575143490426455f481fe1e"; + }; + }; "mkdirp-0.5.1" = { name = "mkdirp"; packageName = "mkdirp"; @@ -1975,6 +4378,33 @@ let sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; }; }; + "mocha-2.5.3" = { + name = "mocha"; + packageName = "mocha"; + version = "2.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/mocha/-/mocha-2.5.3.tgz"; + sha1 = "161be5bdeb496771eb9b35745050b622b5aefc58"; + }; + }; + "mpath-0.2.1" = { + name = "mpath"; + packageName = "mpath"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mpath/-/mpath-0.2.1.tgz"; + sha1 = "3a4e829359801de96309c27a6b2e102e89f9e96e"; + }; + }; + "ms-0.7.1" = { + name = "ms"; + packageName = "ms"; + version = "0.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"; + sha1 = "9cd13c03adbff25b65effde7ce864ee952017098"; + }; + }; "ms-2.0.0" = { name = "ms"; packageName = "ms"; @@ -1984,6 +4414,15 @@ let sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; }; }; + "multer-1.3.0" = { + name = "multer"; + packageName = "multer"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/multer/-/multer-1.3.0.tgz"; + sha1 = "092b2670f6846fa4914965efc8cf94c20fec6cd2"; + }; + }; "multi-random-access-2.1.1" = { name = "multi-random-access"; packageName = "multi-random-access"; @@ -2002,6 +4441,15 @@ let sha512 = "3m42kr8y2s1krl4gzb5xsa9v3h01xalvrgdkj99gyfaq7761asmj5m6kzm70mxb22125gia12g7rmarnzmh09403j8j2cyvx7jqjblf"; }; }; + "multicast-dns-7.0.0" = { + name = "multicast-dns"; + packageName = "multicast-dns"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.0.0.tgz"; + sha512 = "3z5r41v1y4fk8751g0s7ssgzpiaw7g3bwbnjk9gvdh5x3rijzpnlk03s0vlng9yx3f5j9h0zfy6rjfmh183gxyxh2y8y7hps977k806"; + }; + }; "multicb-1.2.2" = { name = "multicb"; packageName = "multicb"; @@ -2011,6 +4459,33 @@ let sha512 = "2liv9lhcxrlp21524jzp1hxzbd07xmb7qlzma5qfn98bgn63ga0i5jalrhlz6qc08fd4jxh3hj2mi9wm14s95lip5x236052rv3i4rx"; }; }; + "multimatch-2.1.0" = { + name = "multimatch"; + packageName = "multimatch"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/multimatch/-/multimatch-2.1.0.tgz"; + sha1 = "9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b"; + }; + }; + "multistream-2.1.0" = { + name = "multistream"; + packageName = "multistream"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/multistream/-/multistream-2.1.0.tgz"; + sha1 = "625c267d5c44424ad6294788b5bb4da3dcb32f1d"; + }; + }; + "mute-stream-0.0.5" = { + name = "mute-stream"; + packageName = "mute-stream"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz"; + sha1 = "8fbfabb0a98a253d3184331f9e8deb7372fac6c0"; + }; + }; "mute-stream-0.0.7" = { name = "mute-stream"; packageName = "mute-stream"; @@ -2029,13 +4504,13 @@ let sha512 = "2hha5ly9j3v9pqpfvkbq8spn9sz7qz5bv8p303zmdisskhcn6i7ia5dviv8xhs3xlwi9562i4r4rm6mkk5gg0abm34zm1dkvp2z76m2"; }; }; - "nan-2.9.2" = { + "nan-2.10.0" = { name = "nan"; packageName = "nan"; - version = "2.9.2"; + version = "2.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.9.2.tgz"; - sha512 = "1iwlv98jbkr46c7hy28crk2m89jiskrp4qfa5ysyacyq8dkbk4hii3cc61irf39b7n6wd9cjlaasmakv9dsknqhb3876zrvrbjvmmcn"; + url = "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz"; + sha512 = "349rr7x0djrlkav4gbhkg355852ingn965r0kkch8rr4cwp7qki9676zpq8cq988yszzd2hld6szsbbnd1v6rghzf11abn1nyzlj1vc"; }; }; "nanoassert-1.1.0" = { @@ -2056,6 +4531,15 @@ let sha1 = "bce5d5d435a5362c7dad7f9e90cd21959589be86"; }; }; + "nanomatch-1.2.9" = { + name = "nanomatch"; + packageName = "nanomatch"; + version = "1.2.9"; + src = fetchurl { + url = "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.9.tgz"; + sha512 = "1f2indb6hj1h79gxklk6ac2lhfjfydw5ak3v2nwilwir5hqvz9l9kxf63l8k1blsjq4v7r2pf0gqc1b55sqqym5bn9afhrj5xnpvi4z"; + }; + }; "nanotiming-1.0.1" = { name = "nanotiming"; packageName = "nanotiming"; @@ -2065,6 +4549,15 @@ let sha1 = "13e7a2e2767967974fedfff071edd39327f44ec3"; }; }; + "native-promise-only-0.8.1" = { + name = "native-promise-only"; + packageName = "native-promise-only"; + version = "0.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/native-promise-only/-/native-promise-only-0.8.1.tgz"; + sha1 = "20a318c30cb45f71fe7adfbf7b21c99c1472ef11"; + }; + }; "ncp-1.0.1" = { name = "ncp"; packageName = "ncp"; @@ -2083,6 +4576,15 @@ let sha512 = "15fbq2bchsjk85zklc34xl74skmdxbipsf0zjf1k6jfq1fr31h5bn7c6438ff55i9yzrhf11k85ahvahyb73khfjl4sj59zjrqksj9d"; }; }; + "needle-2.2.0" = { + name = "needle"; + packageName = "needle"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/needle/-/needle-2.2.0.tgz"; + sha512 = "3ry4wyih9w3nc3d319bmfd9l4jj8fn00lqfs1d00sfy6azvy66yhm6jv411cn1c1zqc01hvj59dlavm82mzxw5mlar8ck9ylz5s0mkq"; + }; + }; "nets-3.2.0" = { name = "nets"; packageName = "nets"; @@ -2101,13 +4603,31 @@ let sha1 = "4aa7bfd43f03f0b81c9702b13d6a858ddb326f3e"; }; }; - "node-gyp-build-3.2.2" = { + "node-gyp-build-3.3.0" = { name = "node-gyp-build"; packageName = "node-gyp-build"; - version = "3.2.2"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.2.2.tgz"; - sha512 = "34hwi28wvvh5nn8bv71n0fb83xjyk84jsn8j9zgkaqnfigpv2hk6fs9jaffsn7qi3yi4n7iwd9yjyagd1rh74ckzdf5s6l59b8vzidp"; + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.3.0.tgz"; + sha512 = "0vkilw1ghsjca0lrj9gsdgsi8wj4bvpfr25q1qzx1kp5hhvjdhapmvpmrd2hikwq9dxydw6sdvv0730wwvmsg36xqf0hgp9777l3ns8"; + }; + }; + "nodemon-1.17.3" = { + name = "nodemon"; + packageName = "nodemon"; + version = "1.17.3"; + src = fetchurl { + url = "https://registry.npmjs.org/nodemon/-/nodemon-1.17.3.tgz"; + sha512 = "1i6m13ad9c1p8xilw0vjcgmj0nnk1y9b3lncx6kwljxw89hmk5z9vv8m452wfd5qg9bqf9r0b236d9vxbc3i2sx2flamfrr03xm42zh"; + }; + }; + "nopt-1.0.10" = { + name = "nopt"; + packageName = "nopt"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz"; + sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee"; }; }; "nopt-3.0.6" = { @@ -2137,6 +4657,42 @@ let sha1 = "1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"; }; }; + "npm-bundled-1.0.3" = { + name = "npm-bundled"; + packageName = "npm-bundled"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.3.tgz"; + sha512 = "0xk8ky1cjf8q2wkbgfzplpn04sm9xnl6i71dwnc29rfh8m2glan5nd6l4k3q7ikci7xpwfpcmyy3frr873zndjmhbr344grkyh3f907"; + }; + }; + "npm-conf-1.1.3" = { + name = "npm-conf"; + packageName = "npm-conf"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz"; + sha512 = "1rx44jzcf3byibrwmgyr0598hng4snjfj9bx29xm7bi5y1bqkbvb2krh8z0ccpzv3aps71qwrq55a56l1qkzlan118xyfn9j5nkh9v2"; + }; + }; + "npm-packlist-1.1.10" = { + name = "npm-packlist"; + packageName = "npm-packlist"; + version = "1.1.10"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.10.tgz"; + sha512 = "1c5z9bibdf07na26xffshagxk8gfnsbaav802dkvbrlgj4mixz4giji96yb1zs7p9yl9n28mlkhjp9jklq55j27c0i837vk507v8001"; + }; + }; + "npm-run-path-2.0.2" = { + name = "npm-run-path"; + packageName = "npm-run-path"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz"; + sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f"; + }; + }; "npmlog-4.1.2" = { name = "npmlog"; packageName = "npmlog"; @@ -2164,6 +4720,15 @@ let sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"; }; }; + "object-assign-3.0.0" = { + name = "object-assign"; + packageName = "object-assign"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz"; + sha1 = "9bedd5ca0897949bca47e7ff408062d549f587f2"; + }; + }; "object-assign-4.1.1" = { name = "object-assign"; packageName = "object-assign"; @@ -2173,6 +4738,24 @@ let sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; }; }; + "object-copy-0.1.0" = { + name = "object-copy"; + packageName = "object-copy"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz"; + sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c"; + }; + }; + "object-visit-1.0.1" = { + name = "object-visit"; + packageName = "object-visit"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz"; + sha1 = "f79c4493af0c5377b59fe39d395e41042dd045bb"; + }; + }; "object.omit-2.0.1" = { name = "object.omit"; packageName = "object.omit"; @@ -2182,6 +4765,33 @@ let sha1 = "1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"; }; }; + "object.pick-1.3.0" = { + name = "object.pick"; + packageName = "object.pick"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz"; + sha1 = "87a10ac4c1694bd2e1cbf53591a66141fb5dd747"; + }; + }; + "on-finished-2.2.1" = { + name = "on-finished"; + packageName = "on-finished"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/on-finished/-/on-finished-2.2.1.tgz"; + sha1 = "5c85c1cc36299f78029653f667f27b6b99ebc029"; + }; + }; + "on-finished-2.3.0" = { + name = "on-finished"; + packageName = "on-finished"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz"; + sha1 = "20f1336481b083cd75337992a16971aa2d906947"; + }; + }; "once-1.4.0" = { name = "once"; packageName = "once"; @@ -2191,6 +4801,33 @@ let sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; }; }; + "onetime-1.1.0" = { + name = "onetime"; + packageName = "onetime"; + version = "1.1.0"; + src = fetchurl { + url = "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz"; + sha1 = "a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"; + }; + }; + "onetime-2.0.1" = { + name = "onetime"; + packageName = "onetime"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz"; + sha1 = "067428230fd67443b2794b22bba528b6867962d4"; + }; + }; + "optimist-0.6.1" = { + name = "optimist"; + packageName = "optimist"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz"; + sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686"; + }; + }; "optparse-1.0.5" = { name = "optparse"; packageName = "optparse"; @@ -2200,6 +4837,15 @@ let sha1 = "75e75a96506611eb1c65ba89018ff08a981e2c16"; }; }; + "ora-1.4.0" = { + name = "ora"; + packageName = "ora"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ora/-/ora-1.4.0.tgz"; + sha512 = "2kz616isg6vqp95rsja7fc47k22qipv9b44dhsyxsl7x95ly9j17dwn8dxq8adyhw6ap1nlpfg2dk8v6r7b2m8r61v3ikriwh6bbhl8"; + }; + }; "os-homedir-1.0.2" = { name = "os-homedir"; packageName = "os-homedir"; @@ -2227,6 +4873,24 @@ let sha512 = "3ddw0y41pxv08ls5xhmq1bi81hppjbr45k78cjfx99vznh5znrj5g1b1wab9caj1mqlsvmfms0zm9cfb47ygm0d8wv5fccx8049q9fh"; }; }; + "p-finally-1.0.0" = { + name = "p-finally"; + packageName = "p-finally"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz"; + sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; + }; + }; + "package-json-4.0.1" = { + name = "package-json"; + packageName = "package-json"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/package-json/-/package-json-4.0.1.tgz"; + sha1 = "8869a0401253661c4c4ca3da6c2121ed555f5eed"; + }; + }; "parse-glob-3.0.4" = { name = "parse-glob"; packageName = "parse-glob"; @@ -2245,6 +4909,33 @@ let sha1 = "6ae83a7aa25a9d9b700acc28698cd1f1ed7e9536"; }; }; + "parseurl-1.3.2" = { + name = "parseurl"; + packageName = "parseurl"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz"; + sha1 = "fc289d4ed8993119460c156253262cdc8de65bf3"; + }; + }; + "pascalcase-0.1.1" = { + name = "pascalcase"; + packageName = "pascalcase"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz"; + sha1 = "b363e55e8006ca6fe21784d2db22bd15d7917f14"; + }; + }; + "path-dirname-1.0.2" = { + name = "path-dirname"; + packageName = "path-dirname"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz"; + sha1 = "cc33d24d525e099a5388c0336c6e32b9160609e0"; + }; + }; "path-is-absolute-1.0.1" = { name = "path-is-absolute"; packageName = "path-is-absolute"; @@ -2254,13 +4945,58 @@ let sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; }; }; - "performance-now-0.2.0" = { - name = "performance-now"; - packageName = "performance-now"; - version = "0.2.0"; + "path-is-inside-1.0.2" = { + name = "path-is-inside"; + packageName = "path-is-inside"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz"; - sha1 = "33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"; + url = "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz"; + sha1 = "365417dede44430d1c11af61027facf074bdfc53"; + }; + }; + "path-key-2.0.1" = { + name = "path-key"; + packageName = "path-key"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz"; + sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40"; + }; + }; + "path-loader-1.0.4" = { + name = "path-loader"; + packageName = "path-loader"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/path-loader/-/path-loader-1.0.4.tgz"; + sha512 = "1ss8fmalfnf2hx07sbbf2nzcf1z85m7jksnaf18i5lp85mylav3wckypakqq7lb93nbrpsj50ajhx0wl63w0q7y9k08gjlnsfihzwlk"; + }; + }; + "path-to-regexp-1.7.0" = { + name = "path-to-regexp"; + packageName = "path-to-regexp"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz"; + sha1 = "59fde0f435badacba103a84e9d3bc64e96b9937d"; + }; + }; + "pause-stream-0.0.11" = { + name = "pause-stream"; + packageName = "pause-stream"; + version = "0.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz"; + sha1 = "fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445"; + }; + }; + "pend-1.2.0" = { + name = "pend"; + packageName = "pend"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz"; + sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50"; }; }; "performance-now-2.1.0" = { @@ -2272,6 +5008,42 @@ let sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; }; }; + "pify-2.3.0" = { + name = "pify"; + packageName = "pify"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"; + sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c"; + }; + }; + "pify-3.0.0" = { + name = "pify"; + packageName = "pify"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz"; + sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; "pkginfo-0.3.1" = { name = "pkginfo"; packageName = "pkginfo"; @@ -2290,6 +5062,24 @@ let sha1 = "b5418ef0439de5425fc4995042dced14fb2a84ff"; }; }; + "posix-character-classes-0.1.1" = { + name = "posix-character-classes"; + packageName = "posix-character-classes"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz"; + sha1 = "01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"; + }; + }; + "prepend-http-1.0.4" = { + name = "prepend-http"; + packageName = "prepend-http"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz"; + sha1 = "d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"; + }; + }; "preserve-0.2.0" = { name = "preserve"; packageName = "preserve"; @@ -2362,6 +5152,15 @@ let sha1 = "8e57123c396ab988897fb327fd3aedc3e735e4fe"; }; }; + "proto-list-1.2.4" = { + name = "proto-list"; + packageName = "proto-list"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz"; + sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849"; + }; + }; "protocol-buffers-encodings-1.1.0" = { name = "protocol-buffers-encodings"; packageName = "protocol-buffers-encodings"; @@ -2371,6 +5170,33 @@ let sha512 = "28vhf9zv4h6gc3nia9pshzn16jm1h6r58nj2mwmkji35fjbscjwxrxigwy87j82y8wayn29qgc31939b1fyk6dmvvhwv1gp0ywc8s2a"; }; }; + "ps-tree-1.1.0" = { + name = "ps-tree"; + packageName = "ps-tree"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ps-tree/-/ps-tree-1.1.0.tgz"; + sha1 = "b421b24140d6203f1ed3c76996b4427b08e8c014"; + }; + }; + "pseudomap-1.0.2" = { + name = "pseudomap"; + packageName = "pseudomap"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz"; + sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; + }; + }; + "pstree.remy-1.1.0" = { + name = "pstree.remy"; + packageName = "pstree.remy"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.0.tgz"; + sha512 = "3jqj1qpjdy5lizvm5mir14vqzzqgaim2yl0iwa164ps6mlp20liyaid1mhr62k23dg0zbkk11zcnzk56d0xvzy9ddbdfmjcnjy3k4mb"; + }; + }; "pump-1.0.3" = { name = "pump"; packageName = "pump"; @@ -2389,6 +5215,15 @@ let sha512 = "288hcmlwdnqda84ylx9cv413ic0r59k0dp71hy7a200jsb7h1y63277jwdp1jdp13c1b3pl6g2gzr5gjv9p72f5sp7w3p0d34swrqxf"; }; }; + "pump-3.0.0" = { + name = "pump"; + packageName = "pump"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz"; + sha512 = "31n24fqakqmhzk2ch644gziskmysmrgiwclsdsr0rwk9spgikqpwickbnayap0rynfjlq72s7iny2p35n3qszypr97ws5njkpx741ig"; + }; + }; "punycode-1.4.1" = { name = "punycode"; packageName = "punycode"; @@ -2398,13 +5233,40 @@ let sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; }; }; - "qs-6.4.0" = { + "punycode-2.1.0" = { + name = "punycode"; + packageName = "punycode"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/punycode/-/punycode-2.1.0.tgz"; + sha1 = "5f863edc89b96db09074bad7947bf09056ca4e7d"; + }; + }; + "qs-2.3.3" = { name = "qs"; packageName = "qs"; - version = "6.4.0"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz"; - sha1 = "13e26d28ad6b0ffaa91312cd3bf708ed351e7233"; + url = "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz"; + sha1 = "e9e85adbe75da0bbe4c8e0476a086290f863b404"; + }; + }; + "qs-2.4.2" = { + name = "qs"; + packageName = "qs"; + version = "2.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-2.4.2.tgz"; + sha1 = "f7ce788e5777df0b5010da7f7c4e73ba32470f5a"; + }; + }; + "qs-4.0.0" = { + name = "qs"; + packageName = "qs"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-4.0.0.tgz"; + sha1 = "c31d9b74ec27df75e543a86c78728ed8d4623607"; }; }; "qs-6.5.1" = { @@ -2470,13 +5332,22 @@ let sha1 = "f49be6b487894ddc40dcc94a322f611092e00d5e"; }; }; - "rc-1.2.5" = { + "raw-body-2.0.2" = { + name = "raw-body"; + packageName = "raw-body"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/raw-body/-/raw-body-2.0.2.tgz"; + sha1 = "a2c2f98c8531cee99c63d8d238b7de97bb659fca"; + }; + }; + "rc-1.2.6" = { name = "rc"; packageName = "rc"; - version = "1.2.5"; + version = "1.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/rc/-/rc-1.2.5.tgz"; - sha1 = "275cd687f6e3b36cc756baa26dfee80a790301fd"; + url = "https://registry.npmjs.org/rc/-/rc-1.2.6.tgz"; + sha1 = "eb18989c6d4f4f162c399f79ddd29f3835568092"; }; }; "read-1.0.7" = { @@ -2488,13 +5359,40 @@ let sha1 = "b3da19bd052431a97671d44a42634adf710b40c4"; }; }; - "readable-stream-2.3.4" = { + "read-metadata-1.0.0" = { + name = "read-metadata"; + packageName = "read-metadata"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-metadata/-/read-metadata-1.0.0.tgz"; + sha1 = "6df9cbe51184e8ceb7d0668b40ee5191e6f3dac6"; + }; + }; + "readable-stream-1.0.27-1" = { name = "readable-stream"; packageName = "readable-stream"; - version = "2.3.4"; + version = "1.0.27-1"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.4.tgz"; - sha512 = "1jpffi1v0l7pkzrhh8i9c6cbswa9npyx114cbfncfnzl9d7w9p08k9n703hq5xr2c3rg86qiq023sl1x8y6mawgsxgggy8ccrwk3rmy"; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.27-1.tgz"; + sha1 = "6b67983c20357cefd07f0165001a16d710d91078"; + }; + }; + "readable-stream-1.1.14" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "1.1.14"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz"; + sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9"; + }; + }; + "readable-stream-2.3.5" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "2.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz"; + sha512 = "09n3j4jsfl2lq3gj65qwn5b3lvzb624lrb8m14h81ls9cw59vvm8436gm5zwaqxf6y1zrfwbrsmizsq48jw1s3qj9zhpjp438735bdl"; }; }; "readdirp-2.1.0" = { @@ -2506,13 +5404,40 @@ let sha1 = "4ed0ad060df3073300c48440373f72d1cc642d78"; }; }; - "recursive-watch-1.1.3" = { + "readline2-1.0.1" = { + name = "readline2"; + packageName = "readline2"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/readline2/-/readline2-1.0.1.tgz"; + sha1 = "41059608ffc154757b715d9989d199ffbf372e35"; + }; + }; + "recursive-readdir-2.2.2" = { + name = "recursive-readdir"; + packageName = "recursive-readdir"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz"; + sha512 = "0bb5d70l5lg02x515r2klvjhhz6xcxdb4ykbx16wq45l822bbsdd8sbki7vb28j17xr7181fmwlzhx3bizvr5xdq6cxpv53sidrq44x"; + }; + }; + "recursive-watch-1.1.4" = { name = "recursive-watch"; packageName = "recursive-watch"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/recursive-watch/-/recursive-watch-1.1.3.tgz"; - sha512 = "3m0s8140jpamg1xxdlsslshx10qznb889s6yc8av6vvqbs56banhmjqy9lgl7g4ppsrsja0d2lhb5lacl3nxm8ggsrpdd7xqf53hvzx"; + url = "https://registry.npmjs.org/recursive-watch/-/recursive-watch-1.1.4.tgz"; + sha512 = "0yks7j98w5d3y375fb99kfbb8rz5qz72v6ld5i15h7fds1i02fq027w82ipanv3dkgvvrxyybw1v8lyrcs54h9airzv12sbcw1a6rvx"; + }; + }; + "reduce-component-1.0.1" = { + name = "reduce-component"; + packageName = "reduce-component"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/reduce-component/-/reduce-component-1.0.1.tgz"; + sha1 = "e0c93542c574521bea13df0f9488ed82ab77c5da"; }; }; "regex-cache-0.4.4" = { @@ -2524,6 +5449,33 @@ let sha512 = "1crfmf19zkv0imnbbkj7bwrcyin3zxa88cs86b6apkxj8qrsmkxnydhsy2ia75q4ld10rhi2s2c36h7g77a997mh9c2z453s311jllx"; }; }; + "regex-not-1.0.2" = { + name = "regex-not"; + packageName = "regex-not"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz"; + sha512 = "3cggngaj8m70zdn8kghha4mhvavm7jfy5xm2iqi94w4gi5m5irs3nlrgg975w2231y49jnnw7zhsg648pbkl9zb6vwhii83926q7917"; + }; + }; + "registry-auth-token-3.3.2" = { + name = "registry-auth-token"; + packageName = "registry-auth-token"; + version = "3.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.2.tgz"; + sha512 = "2fv3fbyf4wv81famfkd3j8nld0fc4sfjfxfc91wwpqwgp00nl3727c9z4sdm4gicb4nxzmhkrphsnphpamgmknsh2ak15qpmmrzvg94"; + }; + }; + "registry-url-3.1.0" = { + name = "registry-url"; + packageName = "registry-url"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz"; + sha1 = "3d4ef870f73dde1d77f0cf9a381432444e174942"; + }; + }; "remove-trailing-separator-1.1.0" = { name = "remove-trailing-separator"; packageName = "remove-trailing-separator"; @@ -2551,22 +5503,13 @@ let sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; }; }; - "request-2.81.0" = { + "request-2.85.0" = { name = "request"; packageName = "request"; - version = "2.81.0"; + version = "2.85.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.81.0.tgz"; - sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0"; - }; - }; - "request-2.83.0" = { - name = "request"; - packageName = "request"; - version = "2.83.0"; - src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.83.0.tgz"; - sha512 = "0by1djkn836sqd9pk2c777wcjvp34qbk1plx7s4lmykljrblpjc64dvn6ni2vyxsbyk33wnl6avym8vgw0ggr4226xakck8mw7y07cm"; + url = "https://registry.npmjs.org/request/-/request-2.85.0.tgz"; + sha512 = "2d3hg10zs5ycnr8prmiwdhacf88fl0x0bi6szs0z2r07zcbk419laixwpjp8sqapbc2ifyyih7p3r60wgr58bmcncz3pqnx523c8zph"; }; }; "resolve-1.1.7" = { @@ -2578,6 +5521,42 @@ let sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b"; }; }; + "resolve-url-0.2.1" = { + name = "resolve-url"; + packageName = "resolve-url"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz"; + sha1 = "2c637fe77c893afd2a663fe21aa9080068e2052a"; + }; + }; + "restore-cursor-1.0.1" = { + name = "restore-cursor"; + packageName = "restore-cursor"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz"; + sha1 = "34661f46886327fed2991479152252df92daa541"; + }; + }; + "restore-cursor-2.0.0" = { + name = "restore-cursor"; + packageName = "restore-cursor"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz"; + sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf"; + }; + }; + "ret-0.1.15" = { + name = "ret"; + packageName = "ret"; + version = "0.1.15"; + src = fetchurl { + url = "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz"; + sha512 = "2d7igpgyzdlpx2ni0sql8gsnqk9qivfsw6bn1aklm19kbhgxjzmlazz8szfsbdpjka4gk6i3zf0jqa0llaf7dni636fnbwfmyjmhfad"; + }; + }; "revalidator-0.1.8" = { name = "revalidator"; packageName = "revalidator"; @@ -2587,6 +5566,15 @@ let sha1 = "fece61bfa0c1b52a206bd6b18198184bdd523a3b"; }; }; + "right-align-0.1.3" = { + name = "right-align"; + packageName = "right-align"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz"; + sha1 = "61339b722fe6a3515689210d24e14c96148613ef"; + }; + }; "rimraf-2.6.2" = { name = "rimraf"; packageName = "rimraf"; @@ -2596,6 +5584,24 @@ let sha512 = "3kmrqh8xli7rzfm8wc6j9lp0c6vml172iv3z088an9xlwl1xvkvh3fn92za66ms4c9yww80qa5kan31k1z1ypqvkchmh1mznb09xdwn"; }; }; + "run-async-0.1.0" = { + name = "run-async"; + packageName = "run-async"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/run-async/-/run-async-0.1.0.tgz"; + sha1 = "c8ad4a5e110661e402a7d21b530e009f25f8e389"; + }; + }; + "run-async-2.3.0" = { + name = "run-async"; + packageName = "run-async"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz"; + sha1 = "0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"; + }; + }; "rusha-0.8.13" = { name = "rusha"; packageName = "rusha"; @@ -2605,6 +5611,33 @@ let sha1 = "9a084e7b860b17bff3015b92c67a6a336191513a"; }; }; + "rx-lite-3.1.2" = { + name = "rx-lite"; + packageName = "rx-lite"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/rx-lite/-/rx-lite-3.1.2.tgz"; + sha1 = "19ce502ca572665f3b647b10939f97fd1615f102"; + }; + }; + "rx-lite-4.0.8" = { + name = "rx-lite"; + packageName = "rx-lite"; + version = "4.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz"; + sha1 = "0b1e11af8bc44836f04a6407e92da42467b79444"; + }; + }; + "rx-lite-aggregates-4.0.8" = { + name = "rx-lite-aggregates"; + packageName = "rx-lite-aggregates"; + version = "4.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz"; + sha1 = "753b87a89a11c95467c4ac1626c4efc4e05c67be"; + }; + }; "safe-buffer-5.1.1" = { name = "safe-buffer"; packageName = "safe-buffer"; @@ -2614,6 +5647,42 @@ let sha512 = "1p28rllll1w65yzq5azi4izx962399xdsdlfbaynn7vmp981hiss05jhiy9hm7sbbfk3b4dhlcv0zy07fc59mnc07hdv6wcgqkcvawh"; }; }; + "safe-regex-1.1.0" = { + name = "safe-regex"; + packageName = "safe-regex"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz"; + sha1 = "40a3669f3b077d1e943d44629e157dd48023bf2e"; + }; + }; + "sanitize-filename-1.6.1" = { + name = "sanitize-filename"; + packageName = "sanitize-filename"; + version = "1.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sanitize-filename/-/sanitize-filename-1.6.1.tgz"; + sha1 = "612da1c96473fa02dccda92dcd5b4ab164a6772a"; + }; + }; + "sax-1.2.4" = { + name = "sax"; + packageName = "sax"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz"; + sha512 = "1dn291mjsda42w8kldlbmngk6dhjxfbvvd5lckyqmwbjaj6069iq3wx0nvcfglwnpddz2qa93lzf4hv77iz43bd2qixa079sjzl799n"; + }; + }; + "seek-bzip-1.0.5" = { + name = "seek-bzip"; + packageName = "seek-bzip"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.5.tgz"; + sha1 = "cfe917cb3d274bcffac792758af53173eb1fabdc"; + }; + }; "semver-5.3.0" = { name = "semver"; packageName = "semver"; @@ -2632,6 +5701,33 @@ let sha512 = "0h32zh035y8m6dzcqhcymbhwgmc8839fa1hhj0jfh9ivp9kmqfj1sbwnsnkzcn9qm3sqn38sa8ys2g4c638lpnmzjr0a0qndmv7f8p1"; }; }; + "semver-diff-2.1.0" = { + name = "semver-diff"; + packageName = "semver-diff"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz"; + sha1 = "4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36"; + }; + }; + "send-0.16.2" = { + name = "send"; + packageName = "send"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/send/-/send-0.16.2.tgz"; + sha512 = "1kh8iy2h9x6mqbb0kssb4d966irri0z8g2151jwx47q32dbmds01j9fs2c8hln68dqqh0ims8p450z3xfw6vs8v2k253c1cyla1ibhk"; + }; + }; + "serve-static-1.13.2" = { + name = "serve-static"; + packageName = "serve-static"; + version = "1.13.2"; + src = fetchurl { + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz"; + sha512 = "2gkkd7jlmrn2a8d736x3fcij9jj16aglbq6pcivb897g01k1dlrpvb565d3hq9zwafyr60zlcqr5flgd2yqs36s8wxpylxqnck5vyx7"; + }; + }; "set-blocking-2.0.0" = { name = "set-blocking"; packageName = "set-blocking"; @@ -2650,6 +5746,60 @@ let sha1 = "4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"; }; }; + "set-value-0.4.3" = { + name = "set-value"; + packageName = "set-value"; + version = "0.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz"; + sha1 = "7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"; + }; + }; + "set-value-2.0.0" = { + name = "set-value"; + packageName = "set-value"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz"; + sha512 = "1xdxg14zh452ih8f7826ki7xpq8wk8a831pm5zngqf8cbc4qv6mr9npks863bfqylfrhm161whf9199rmqn4i12wzmz2ks69z3343c7"; + }; + }; + "setprototypeof-1.1.0" = { + name = "setprototypeof"; + packageName = "setprototypeof"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz"; + sha512 = "2jlhhawfqdiga1m6if01ks1q3yx56k5vj6wf372589vkswvdflw7224viivxali56b0jjsckpmjy10rj6fcakhw2dbq2psr197kzw86"; + }; + }; + "shebang-command-1.2.0" = { + name = "shebang-command"; + packageName = "shebang-command"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz"; + sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea"; + }; + }; + "shebang-regex-1.0.0" = { + name = "shebang-regex"; + packageName = "shebang-regex"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz"; + sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3"; + }; + }; + "sigmund-1.0.1" = { + name = "sigmund"; + packageName = "sigmund"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"; + sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590"; + }; + }; "signal-exit-3.0.2" = { name = "signal-exit"; packageName = "signal-exit"; @@ -2686,6 +5836,15 @@ let sha512 = "17nq5vsq9227bsp0msljjp4lfra2d2f0338xk2z2m1523s3d990appvqrar9j9l3akw6bbjmbw92b9g386fggqiqz76xslvj88q8c4w"; }; }; + "slash-1.0.0" = { + name = "slash"; + packageName = "slash"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz"; + sha1 = "c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"; + }; + }; "slasp-0.0.4" = { name = "slasp"; packageName = "slasp"; @@ -2704,13 +5863,31 @@ let sha512 = "1xd3zsk02nck4y601rn98n8cicrphaw5bdix278mk1yizmjv9s0wpa6akcqggd7d99c55s3byf4ylqdxkshyfsfnfx7lvwbmq2b3siw"; }; }; - "sntp-1.0.9" = { - name = "sntp"; - packageName = "sntp"; - version = "1.0.9"; + "snapdragon-0.8.2" = { + name = "snapdragon"; + packageName = "snapdragon"; + version = "0.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"; - sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198"; + url = "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz"; + sha512 = "2b0sap2q0c6qbfkw6znql845b143frn5gkkz4gpirjhgwa2j3wy3jsvrfg51s5c1w1m4nkgis97x9yvmzsc533kap9j3h3zcffqxp0n"; + }; + }; + "snapdragon-node-2.1.1" = { + name = "snapdragon-node"; + packageName = "snapdragon-node"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz"; + sha512 = "2gk18pdld8ij1bpa2mdwl8f7i4rl5d4ys3qw31hipj56wslnsfhp1vxp3q36kj1m4f34wzzlvj0282qx5xlflqf978xyqlc2viyaviv"; + }; + }; + "snapdragon-util-3.0.1" = { + name = "snapdragon-util"; + packageName = "snapdragon-util"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz"; + sha512 = "1jsaqma4ycl2iq0761i1w7758z1kq7gbsij4xfb7p5cnw0qa62pszv6pr3j856n3pbxww7wwxs5wvcg2cb6vy020kw3bchashqs9clr"; }; }; "sntp-2.1.0" = { @@ -2722,22 +5899,22 @@ let sha512 = "0k2smmr24w5hb1cpql6vcgh58vzp4pmh9anf0bgz3arlsgq1mapnlq9fjqr6xs10aq1cmxaw987fwknqi62frax0fvs9bj3q3kmpg8l"; }; }; - "sodium-javascript-0.5.4" = { + "sodium-javascript-0.5.5" = { name = "sodium-javascript"; packageName = "sodium-javascript"; - version = "0.5.4"; + version = "0.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/sodium-javascript/-/sodium-javascript-0.5.4.tgz"; - sha512 = "1dqdzm0qjk1rwq62b010b649wdpvlzdxpmwc972p0dcwsc86wqfcm8lbdcxlrwypkn2jq5df1xpbxhxfphnpr993ac543p9s212si30"; + url = "https://registry.npmjs.org/sodium-javascript/-/sodium-javascript-0.5.5.tgz"; + sha512 = "3451wvpagbw2ib50galmlfrb5za3zh0ml1irbm2ijd0lbjblg9va4fnag6sfs7msb1m0i5zicz93jwp90c22v0n40qzpczhicg85jah"; }; }; - "sodium-native-2.1.4" = { + "sodium-native-2.1.5" = { name = "sodium-native"; packageName = "sodium-native"; - version = "2.1.4"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/sodium-native/-/sodium-native-2.1.4.tgz"; - sha512 = "3d3bbjycbpplxgjpfz78vqr8g8hp62j37hr4c3vym7ax36qzxqan73fmqw2i3wd8ix65ysdlzbnzhrs3634ngp840gfpmm9alarc80j"; + url = "https://registry.npmjs.org/sodium-native/-/sodium-native-2.1.5.tgz"; + sha512 = "3cwd4rvsggx0lzc7433v6321fjs65q9nqr3c9gcz7j51ca580aq6ciacmmq788yxb3ih78b1fkpkprm75d0hadj3ng2bznc6qsl1var"; }; }; "sodium-universal-2.0.0" = { @@ -2767,6 +5944,51 @@ let sha1 = "17c742ff7cf187e2f59a15df9b81f17a62ce0899"; }; }; + "source-map-0.4.4" = { + name = "source-map"; + packageName = "source-map"; + version = "0.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz"; + sha1 = "eba4f5da9c0dc999de68032d8b4f76173652036b"; + }; + }; + "source-map-0.5.7" = { + name = "source-map"; + packageName = "source-map"; + version = "0.5.7"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"; + sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"; + }; + }; + "source-map-resolve-0.5.1" = { + name = "source-map-resolve"; + packageName = "source-map-resolve"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.1.tgz"; + sha512 = "3ccyfzn4imm9m891wy0bqh85lxrsf82snlh7dlgvjc28rpd2m6n95x8kjmm2crcpqv6234xc2lqzp1h1cyx7xrn146nzinzzk1bd9fh"; + }; + }; + "source-map-url-0.4.0" = { + name = "source-map-url"; + packageName = "source-map-url"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz"; + sha1 = "3e935d7ddd73631b97659956d55128e87b5084a3"; + }; + }; + "spark-md5-1.0.1" = { + name = "spark-md5"; + packageName = "spark-md5"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/spark-md5/-/spark-md5-1.0.1.tgz"; + sha1 = "c4b9a8d41cf7b0845423a821824f8dffa0f51b7c"; + }; + }; "sparse-bitfield-3.0.3" = { name = "sparse-bitfield"; packageName = "sparse-bitfield"; @@ -2785,13 +6007,40 @@ let sha1 = "cd671cb06752c22bca3370e2f334440be4fc62e2"; }; }; - "sshpk-1.13.1" = { + "split-0.3.3" = { + name = "split"; + packageName = "split"; + version = "0.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/split/-/split-0.3.3.tgz"; + sha1 = "cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f"; + }; + }; + "split-string-3.1.0" = { + name = "split-string"; + packageName = "split-string"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz"; + sha512 = "25ih1dx2qb3lawqjxj85znd4l3x8nnigrcdlpfw8064gh2mwxic9bgg5ylgxm9gjl3v8dmyc47rycp8xvqz78jqalg0g9yqj225acrp"; + }; + }; + "sprintf-js-1.0.3" = { + name = "sprintf-js"; + packageName = "sprintf-js"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"; + sha1 = "04e6926f662895354f3dd015203633b857297e2c"; + }; + }; + "sshpk-1.14.1" = { name = "sshpk"; packageName = "sshpk"; - version = "1.13.1"; + version = "1.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz"; - sha1 = "512df6da6287144316dc4c18fe1cf1d940739be3"; + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz"; + sha1 = "130f5975eddad963f1d56f92b9ac6c51fa9f83eb"; }; }; "stack-trace-0.0.10" = { @@ -2803,6 +6052,24 @@ let sha1 = "547c70b347e8d32b4e108ea1a2a159e5fdde19c0"; }; }; + "stat-mode-0.2.2" = { + name = "stat-mode"; + packageName = "stat-mode"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/stat-mode/-/stat-mode-0.2.2.tgz"; + sha1 = "e6c80b623123d7d80cf132ce538f346289072502"; + }; + }; + "static-extend-0.1.2" = { + name = "static-extend"; + packageName = "static-extend"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz"; + sha1 = "60809c39cbff55337226fd5e0b520f341f1fb5c6"; + }; + }; "status-logger-3.1.1" = { name = "status-logger"; packageName = "status-logger"; @@ -2812,6 +6079,24 @@ let sha512 = "005i18cgcklklz0gqd9gsck97zwf2zfr9wa26lr9djafcng34nbdlqmhwrm9ixf2qgjb9mm2k72ggscb7v3zvybbkys1xfkzv6immkl"; }; }; + "statuses-1.3.1" = { + name = "statuses"; + packageName = "statuses"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz"; + sha1 = "faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"; + }; + }; + "statuses-1.4.0" = { + name = "statuses"; + packageName = "statuses"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz"; + sha512 = "1xxwqpj713rq1idbmp7mj7cj9dl52lazgpd5x8a9g88jawbkn9xpwbgljl7cvnd0jqkll2zpdj5xy63dlis9l2k8vmx1n1gvyv8456f"; + }; + }; "stream-collector-1.0.1" = { name = "stream-collector"; packageName = "stream-collector"; @@ -2821,6 +6106,15 @@ let sha1 = "4d4e55f171356121b2c5f6559f944705ab28db15"; }; }; + "stream-combiner-0.0.4" = { + name = "stream-combiner"; + packageName = "stream-combiner"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz"; + sha1 = "4d5e433c185261dde623ca3f44c586bcf5c4ad14"; + }; + }; "stream-each-1.2.2" = { name = "stream-each"; packageName = "stream-each"; @@ -2848,6 +6142,24 @@ let sha1 = "d5c752825e5367e786f78e18e445ea223a155952"; }; }; + "streamsearch-0.1.2" = { + name = "streamsearch"; + packageName = "streamsearch"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz"; + sha1 = "808b9d0e56fc273d809ba57338e929919a1a9f1a"; + }; + }; + "string-3.3.3" = { + name = "string"; + packageName = "string"; + version = "3.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/string/-/string-3.3.3.tgz"; + sha1 = "5ea211cd92d228e184294990a6cc97b366a77cb0"; + }; + }; "string-width-1.0.2" = { name = "string-width"; packageName = "string-width"; @@ -2866,6 +6178,15 @@ let sha512 = "29s1fqgr4mnhfxwczgdghfmmc1f792m9hysvcjxw2h5lfj8ndf2b6gm02m96qk5m75g4aisijvng4pk618anwbr8i9ay2jyszkqgslw"; }; }; + "string_decoder-0.10.31" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; + sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; + }; + }; "string_decoder-1.0.3" = { name = "string_decoder"; packageName = "string_decoder"; @@ -2902,6 +6223,24 @@ let sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; }; }; + "strip-dirs-2.1.0" = { + name = "strip-dirs"; + packageName = "strip-dirs"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-dirs/-/strip-dirs-2.1.0.tgz"; + sha512 = "3gd7bh1h7xjvl8y6lj1mmsv4qpgbxd620fbp2cjlnc3b9gn7wnzbs1170gs7i6y5arm0dd09y8d74vr357gvwmx9f0616wbw8wv3q14"; + }; + }; + "strip-eof-1.0.0" = { + name = "strip-eof"; + packageName = "strip-eof"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz"; + sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf"; + }; + }; "strip-json-comments-2.0.1" = { name = "strip-json-comments"; packageName = "strip-json-comments"; @@ -2911,6 +6250,15 @@ let sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; }; }; + "strip-outer-1.0.1" = { + name = "strip-outer"; + packageName = "strip-outer"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz"; + sha512 = "31a8vlzg4gwak3cx7n0lask77xyqpf5mz4ckphc10ykmb9r2lais7v4w8a8xij9lv2115xjnl7avkwp2l7cw3kbc3lpjsghl72757lk"; + }; + }; "subcommand-2.1.0" = { name = "subcommand"; packageName = "subcommand"; @@ -2920,6 +6268,42 @@ let sha1 = "5e4ceca5a3779e3365b1511e05f866877302f760"; }; }; + "superagent-1.8.5" = { + name = "superagent"; + packageName = "superagent"; + version = "1.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/superagent/-/superagent-1.8.5.tgz"; + sha1 = "1c0ddc3af30e80eb84ebc05cb2122da8fe940b55"; + }; + }; + "superagent-3.8.2" = { + name = "superagent"; + packageName = "superagent"; + version = "3.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/superagent/-/superagent-3.8.2.tgz"; + sha512 = "0sxwwjllf26hx079lw1w3c1zywq2af9ssi7f0n334xzz1mgnfx2lr5l532a988zyi3bigzmfidqgdrfmwv6ghgzs77qsw87yr0zhlc1"; + }; + }; + "supports-color-1.2.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-1.2.0.tgz"; + sha1 = "ff1ed1e61169d06b3cf2d588e188b18d8847e17e"; + }; + }; + "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"; + }; + }; "supports-color-4.4.0" = { name = "supports-color"; packageName = "supports-color"; @@ -2929,13 +6313,58 @@ let sha512 = "1flwwfdd7gg94xrc0b2ard3qjx4cpy600q49gx43y8pzvs7j56q78bjhv8mk18vgbggr4fd11jda8ck5cdrkc5jcjs04nlp7kwbg85c"; }; }; - "supports-color-5.2.0" = { + "supports-color-5.3.0" = { name = "supports-color"; packageName = "supports-color"; - version = "5.2.0"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-5.2.0.tgz"; - sha512 = "3jqwn02aw7bczn3f56mfbx3nvhrydwsc6g9vkp54794rfdg61vbp3qy4vdj1n8jvpahlcywpcv0afxjxbj5a3wm9lpqcsr5ix5nyzqp"; + url = "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz"; + sha512 = "0v9skvg8c5hgqfsm98p7d7hisk11syjdvl3nxid3ik572hbjwv4vyzws7q0n1yz8mvb1asbk00838fi09hyfskrng54icn8nbag98yi"; + }; + }; + "swagger-converter-0.1.7" = { + name = "swagger-converter"; + packageName = "swagger-converter"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/swagger-converter/-/swagger-converter-0.1.7.tgz"; + sha1 = "a097519c6f1ee4dd67e308d9b53ddc9c2b257f97"; + }; + }; + "swagger-converter-0.2.0" = { + name = "swagger-converter"; + packageName = "swagger-converter"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/swagger-converter/-/swagger-converter-0.2.0.tgz"; + sha1 = "354023cfc5ed3d4ef6895c310189067bbe66d616"; + }; + }; + "swagger-editor-2.10.5" = { + name = "swagger-editor"; + packageName = "swagger-editor"; + version = "2.10.5"; + src = fetchurl { + url = "https://registry.npmjs.org/swagger-editor/-/swagger-editor-2.10.5.tgz"; + sha1 = "a4316ccb0d40a77d30dadf91f0f4db7e475f948a"; + }; + }; + "swagger-test-templates-1.4.3" = { + name = "swagger-test-templates"; + packageName = "swagger-test-templates"; + version = "1.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/swagger-test-templates/-/swagger-test-templates-1.4.3.tgz"; + sha1 = "e047473aec06b938992e427665cafdbb6a01cfc0"; + }; + }; + "swagger-tools-0.9.16" = { + name = "swagger-tools"; + packageName = "swagger-tools"; + version = "0.9.16"; + src = fetchurl { + url = "https://registry.npmjs.org/swagger-tools/-/swagger-tools-0.9.16.tgz"; + sha1 = "e39fae3d581d713682491e1926cd87bf2c209bfb"; }; }; "tar-2.2.1" = { @@ -2947,13 +6376,31 @@ let sha1 = "8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"; }; }; - "tar-pack-3.4.1" = { - name = "tar-pack"; - packageName = "tar-pack"; - version = "3.4.1"; + "tar-4.4.1" = { + name = "tar"; + packageName = "tar"; + version = "4.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.1.tgz"; - sha512 = "0mgk8jd55vr7i3i29r1skhxwwbqkqfz6mbr32r5nn8h6v5xns8d2rc7835y7wj0zmppckxai7nm8r4s65kkg6yhirnwx33yixn75x1w"; + url = "https://registry.npmjs.org/tar/-/tar-4.4.1.tgz"; + sha512 = "33gymcvk33znj1lscj0kds60g5jzagw2dcx1fcbpxz85pi21kqlazvwz579p301x0vqvir1nslh901zq28sfx2zpsnd7qldvjpzbsrv"; + }; + }; + "tar-stream-1.5.5" = { + name = "tar-stream"; + packageName = "tar-stream"; + version = "1.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.5.tgz"; + sha512 = "219gn10gvilrq6h3yshbhn25fx46n0wlgg66h0v326jhzz8gmpxsinb8bnhx1py35z0cv2248v91k2vy6vmkajmvpmkfmizywn601wr"; + }; + }; + "term-size-1.2.0" = { + name = "term-size"; + packageName = "term-size"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz"; + sha1 = "458b83887f288fc56d6fffbfad262e26638efa69"; }; }; "throttle-1.0.3" = { @@ -2965,6 +6412,15 @@ let sha1 = "8a32e4a15f1763d997948317c5ebe3ad8a41e4b7"; }; }; + "through-2.3.8" = { + name = "through"; + packageName = "through"; + version = "2.3.8"; + src = fetchurl { + url = "https://registry.npmjs.org/through/-/through-2.3.8.tgz"; + sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; + }; + }; "through2-2.0.3" = { name = "through2"; packageName = "through2"; @@ -2974,6 +6430,24 @@ let sha1 = "0004569b37c7c74ba39c43f3ced78d1ad94140be"; }; }; + "thunkify-2.1.2" = { + name = "thunkify"; + packageName = "thunkify"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/thunkify/-/thunkify-2.1.2.tgz"; + sha1 = "faa0e9d230c51acc95ca13a361ac05ca7e04553d"; + }; + }; + "thunkify-wrap-1.0.4" = { + name = "thunkify-wrap"; + packageName = "thunkify-wrap"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/thunkify-wrap/-/thunkify-wrap-1.0.4.tgz"; + sha1 = "b52be548ddfefda20e00b58c6096762b43dd6880"; + }; + }; "thunky-0.1.0" = { name = "thunky"; packageName = "thunky"; @@ -2992,6 +6466,33 @@ let sha1 = "a862e018e3fb1ea2ec3fce5d55605cf57f247371"; }; }; + "tildify-1.2.0" = { + name = "tildify"; + packageName = "tildify"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tildify/-/tildify-1.2.0.tgz"; + sha1 = "dcec03f55dca9b7aa3e5b04f21817eb56e63588a"; + }; + }; + "timed-out-4.0.1" = { + name = "timed-out"; + packageName = "timed-out"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz"; + sha1 = "f32eacac5a175bea25d7fab565ab3ed8741ef56f"; + }; + }; + "tmp-0.0.33" = { + name = "tmp"; + packageName = "tmp"; + version = "0.0.33"; + src = fetchurl { + url = "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz"; + sha512 = "0drg2bck1cj8677rgs1l98v7vqaxawcqh6ja87qilwnd719l5y0lzv5ssn3pcwa37fdbg4188y6x15a90vkllyvfpd9v7fai2b8j44d"; + }; + }; "to-buffer-1.1.0" = { name = "to-buffer"; packageName = "to-buffer"; @@ -3001,6 +6502,42 @@ let sha1 = "375bc03edae5c35a8fa0b3fe95a1f3985db1dcfa"; }; }; + "to-iso-string-0.0.2" = { + name = "to-iso-string"; + packageName = "to-iso-string"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/to-iso-string/-/to-iso-string-0.0.2.tgz"; + sha1 = "4dc19e664dfccbe25bd8db508b00c6da158255d1"; + }; + }; + "to-object-path-0.3.0" = { + name = "to-object-path"; + packageName = "to-object-path"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz"; + sha1 = "297588b7b0e7e0ac08e04e672f85c1f4999e17af"; + }; + }; + "to-regex-3.0.2" = { + name = "to-regex"; + packageName = "to-regex"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz"; + sha512 = "03lcq1y1ks55lss37m3cx52f8f4wj85rqsxfxrhi3y8rqa0iiny6df8ardg2f742z870v7xw749lcsxh8yplsmbvaig4rrds1w6asqm"; + }; + }; + "to-regex-range-2.1.1" = { + name = "to-regex-range"; + packageName = "to-regex-range"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz"; + sha1 = "7c80c17b9dfebe599e27367e0d4dd5590141db38"; + }; + }; "toiletdb-1.4.1" = { name = "toiletdb"; packageName = "toiletdb"; @@ -3010,6 +6547,24 @@ let sha512 = "0c9ayp39hvxd1lzl6cxvsxcys0jzfb698i3as3xrw3n9zpxwmx4sqwisv63bfsmdl10c6v4inpj5kvckhlr3nd3ny1pj264r0qags0l"; }; }; + "toml-2.3.3" = { + name = "toml"; + packageName = "toml"; + version = "2.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/toml/-/toml-2.3.3.tgz"; + sha512 = "16a6xk2s4y4llqya2gjgwzlvb0512sw8ahxfd4b225j2sd9i52zca1w65d69wd7frzhcz2ak3gf3r3y9ws727b5gnp1n7wh2j3gkciv"; + }; + }; + "touch-3.1.0" = { + name = "touch"; + packageName = "touch"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz"; + sha512 = "2a3sk3562y1ihbl06r5g1pzs37mwhhnz8f8vvcc0k8bhykczzgv9dyw71kkz4mbf81iq7wbf2nq7hpy6z6zhanj8s9d6bjk5r9pq72q"; + }; + }; "tough-cookie-2.3.4" = { name = "tough-cookie"; packageName = "tough-cookie"; @@ -3028,6 +6583,15 @@ let sha512 = "3da1j7ba37apy5kqlv436dz265b8ni63ca069gy4wrj9krq236j7sp0r259ia6jk1a8d7qqg37kkk8kwmnaqwcy90wnwnjxxp8bnf78"; }; }; + "traverse-0.6.6" = { + name = "traverse"; + packageName = "traverse"; + version = "0.6.6"; + src = fetchurl { + url = "https://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz"; + sha1 = "cbdf560fd7b9af632502fed40f918c157ea97137"; + }; + }; "trim-0.0.1" = { name = "trim"; packageName = "trim"; @@ -3037,6 +6601,24 @@ let sha1 = "5858547f6b290757ee95cccc666fb50084c460dd"; }; }; + "trim-repeated-1.0.0" = { + name = "trim-repeated"; + packageName = "trim-repeated"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz"; + sha1 = "e3646a2ea4e891312bf7eace6cfb05380bc01c21"; + }; + }; + "truncate-utf8-bytes-1.0.2" = { + name = "truncate-utf8-bytes"; + packageName = "truncate-utf8-bytes"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz"; + sha1 = "405923909592d56f78a5818434b0b78489ca5f2b"; + }; + }; "ttl-1.3.1" = { name = "ttl"; packageName = "ttl"; @@ -3064,6 +6646,15 @@ let sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; }; }; + "type-is-1.6.16" = { + name = "type-is"; + packageName = "type-is"; + version = "1.6.16"; + src = fetchurl { + url = "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz"; + sha512 = "3sqj799a59bbpyx9h2nhwjgi776w2jc2pp620b1rgk22fc3czfbxmav4m8kq0ilaqfxx6v1hww5pzgf13bnz6n84fx62qvazszia68x"; + }; + }; "typedarray-0.0.6" = { name = "typedarray"; packageName = "typedarray"; @@ -3073,22 +6664,76 @@ let sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; }; }; - "uid-number-0.0.6" = { - name = "uid-number"; - packageName = "uid-number"; - version = "0.0.6"; + "uglify-js-2.8.29" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "2.8.29"; src = fetchurl { - url = "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz"; - sha1 = "0ea10e8035e8eb5b8e4449f06da1c730663baa81"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz"; + sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd"; }; }; - "uint64be-2.0.1" = { + "uglify-to-browserify-1.0.2" = { + name = "uglify-to-browserify"; + packageName = "uglify-to-browserify"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"; + sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7"; + }; + }; + "uid-0.0.2" = { + name = "uid"; + packageName = "uid"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uid/-/uid-0.0.2.tgz"; + sha1 = "5e4a5d4b78138b4f70f89fd3c76fc59aa9d2f103"; + }; + }; + "uint64be-2.0.2" = { name = "uint64be"; packageName = "uint64be"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/uint64be/-/uint64be-2.0.1.tgz"; - sha1 = "a310d94e4e5e0b02a95d678e33323f802bdc8428"; + url = "https://registry.npmjs.org/uint64be/-/uint64be-2.0.2.tgz"; + sha512 = "34jzmdzz81fdi4s48rxr9dzs63iln7w6y9d44ckq6nvxd6v7y0wpc6x90zc2md21ddc1abfwk5h20py3s79bzhknqqphkchj6z9s2pm"; + }; + }; + "unbzip2-stream-1.2.5" = { + name = "unbzip2-stream"; + packageName = "unbzip2-stream"; + version = "1.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.2.5.tgz"; + sha512 = "0xgvidx384p6cc8zh4m0qq000cn140dsckkijf95ka6iqi9j5nsrjrrf3mr3gxnybcvf2l4hxkaf0j7cqxncm3lnpq4ripw2j7zfc4b"; + }; + }; + "undefsafe-2.0.2" = { + name = "undefsafe"; + packageName = "undefsafe"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.2.tgz"; + sha1 = "225f6b9e0337663e0d8e7cfd686fc2836ccace76"; + }; + }; + "union-value-1.0.0" = { + name = "union-value"; + packageName = "union-value"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz"; + sha1 = "5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"; + }; + }; + "unique-string-1.0.0" = { + name = "unique-string"; + packageName = "unique-string"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz"; + sha1 = "9e1057cca851abb93398f8b33ae187b99caec11a"; }; }; "unixify-1.0.0" = { @@ -3127,6 +6772,24 @@ let sha1 = "985a27e975baa20b8263aea7a791e9300941a9ec"; }; }; + "unpipe-1.0.0" = { + name = "unpipe"; + packageName = "unpipe"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"; + sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec"; + }; + }; + "unset-value-1.0.0" = { + name = "unset-value"; + packageName = "unset-value"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz"; + sha1 = "8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"; + }; + }; "untildify-3.0.2" = { name = "untildify"; packageName = "untildify"; @@ -3136,6 +6799,105 @@ let sha1 = "7f1f302055b3fea0f3e81dc78eb36766cb65e3f1"; }; }; + "unyield-0.0.1" = { + name = "unyield"; + packageName = "unyield"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unyield/-/unyield-0.0.1.tgz"; + sha1 = "150e65da42bf7742445b958a64eb9b85d1d2b180"; + }; + }; + "unzip-response-2.0.1" = { + name = "unzip-response"; + packageName = "unzip-response"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz"; + sha1 = "d2f0f737d16b0615e72a6935ed04214572d56f97"; + }; + }; + "upath-1.0.4" = { + name = "upath"; + packageName = "upath"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/upath/-/upath-1.0.4.tgz"; + sha512 = "0xw24ba88hfvwwgniyn17n26av45g1pxqf095231065l4n9dp5w3hyc7azjd8sqyix7pnfx1pmr44fzmwwazkz0ly83cp214g4qk13p"; + }; + }; + "update-notifier-2.4.0" = { + name = "update-notifier"; + packageName = "update-notifier"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.4.0.tgz"; + sha1 = "f9b4c700fbfd4ec12c811587258777d563d8c866"; + }; + }; + "uri-js-3.0.2" = { + name = "uri-js"; + packageName = "uri-js"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uri-js/-/uri-js-3.0.2.tgz"; + sha1 = "f90b858507f81dea4dcfbb3c4c3dbfa2b557faaa"; + }; + }; + "urix-0.1.0" = { + name = "urix"; + packageName = "urix"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz"; + sha1 = "da937f7a62e21fec1fd18d49b35c2935067a6c72"; + }; + }; + "url-parse-lax-1.0.0" = { + name = "url-parse-lax"; + packageName = "url-parse-lax"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz"; + sha1 = "7af8f303645e9bd79a272e7a14ac68bc0609da73"; + }; + }; + "url-to-options-1.0.1" = { + name = "url-to-options"; + packageName = "url-to-options"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz"; + sha1 = "1505a03a289a48cbd7a434efbaeec5055f5633a9"; + }; + }; + "use-3.1.0" = { + name = "use"; + packageName = "use"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/use/-/use-3.1.0.tgz"; + sha512 = "01m2fmv6pc6r5zgjxdb31sx9vhii5ahpwmdn89mpqcvh5f0kpjn6zpmh5qj8m2yhf8s3g6ygwnlccg0j2g36kcjvp16rynbrx048hp9"; + }; + }; + "user-home-2.0.0" = { + name = "user-home"; + packageName = "user-home"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/user-home/-/user-home-2.0.0.tgz"; + sha1 = "9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"; + }; + }; + "utf8-byte-length-1.0.4" = { + name = "utf8-byte-length"; + packageName = "utf8-byte-length"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz"; + sha1 = "f45f150c4c66eee968186505ab93fcbb8ad6bf61"; + }; + }; "util-deprecate-1.0.2" = { name = "util-deprecate"; packageName = "util-deprecate"; @@ -3154,13 +6916,22 @@ let sha1 = "1352c340eb820e4d8ddba039a4fbfaa32ed4ef3a"; }; }; - "utp-native-1.6.2" = { + "utils-merge-1.0.1" = { + name = "utils-merge"; + packageName = "utils-merge"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz"; + sha1 = "9f95710f50a267947b2ccc124741c1028427e713"; + }; + }; + "utp-native-1.7.0" = { name = "utp-native"; packageName = "utp-native"; - version = "1.6.2"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/utp-native/-/utp-native-1.6.2.tgz"; - sha512 = "2mcnn6w5as2dvz6rj4fb33174z3a1rl9bm2cfazrr4084gq7aal0bkmkwr1cjpkvy1zgni3zdk0570fx7cmnd0k0hg18wfb2hvbigfg"; + url = "https://registry.npmjs.org/utp-native/-/utp-native-1.7.0.tgz"; + sha512 = "1d0ccaz56506y44838shld6zkqx9rcx3cpw5qddbfbyjyjr73704gysrl3qwii6i80kx1i2ysnn8bdx6q0i4biwzjj36ksx2865i0yz"; }; }; "uuid-3.2.1" = { @@ -3172,6 +6943,33 @@ let sha512 = "0843vl1c974n8kw5kn0kvhvhwk8y8jydr0xkwwl2963xxmkw4ingk6xj9c8m48jw2i95giglxzq5aw5v5mij9kv7fzln8pxav1cr6cd"; }; }; + "valid-url-1.0.9" = { + name = "valid-url"; + packageName = "valid-url"; + version = "1.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/valid-url/-/valid-url-1.0.9.tgz"; + sha1 = "1c14479b40f1397a75782f115e4086447433a200"; + }; + }; + "validate-npm-package-name-3.0.0" = { + name = "validate-npm-package-name"; + packageName = "validate-npm-package-name"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz"; + sha1 = "5fa912d81eb7d0c74afc140de7317f0ca7df437e"; + }; + }; + "validator-9.4.1" = { + name = "validator"; + packageName = "validator"; + version = "9.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/validator/-/validator-9.4.1.tgz"; + sha512 = "2f2x8zxh7czpkf33h5x8fvj48rfszyhkar554x5c2hw7qlsbdqjqvv6nczzsfkw6z5rj6gqabxhcg8haip0xgz7sn4jr6fi7f7llpk1"; + }; + }; "varint-3.0.1" = { name = "varint"; packageName = "varint"; @@ -3208,6 +7006,15 @@ let sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; }; }; + "ware-1.3.0" = { + name = "ware"; + packageName = "ware"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ware/-/ware-1.3.0.tgz"; + sha1 = "d1b14f39d2e2cb4ab8c4098f756fe4b164e473d4"; + }; + }; "which-1.3.0" = { name = "which"; packageName = "which"; @@ -3226,6 +7033,33 @@ let sha512 = "39m5b8qc31vxhh0bz14vh9a1kf9znarvlpkf0v6vv1f2dxi61gihav2djq2mn7ns1z3yq6l8pyydj52fyzbm2q04rssrcrv4jbwnc4a"; }; }; + "widest-line-2.0.0" = { + name = "widest-line"; + packageName = "widest-line"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/widest-line/-/widest-line-2.0.0.tgz"; + sha1 = "0142a4e8a243f8882c0233aa0e0281aa76152273"; + }; + }; + "win-fork-1.1.1" = { + name = "win-fork"; + packageName = "win-fork"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/win-fork/-/win-fork-1.1.1.tgz"; + sha1 = "8f58e0656fca00adc8c86a2b89e3cd2d6a2d5e5e"; + }; + }; + "window-size-0.1.0" = { + name = "window-size"; + packageName = "window-size"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz"; + sha1 = "5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"; + }; + }; "winston-2.1.1" = { name = "winston"; packageName = "winston"; @@ -3235,6 +7069,24 @@ let sha1 = "3c9349d196207fd1bdff9d4bc43ef72510e3a12e"; }; }; + "wordwrap-0.0.2" = { + name = "wordwrap"; + packageName = "wordwrap"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"; + sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f"; + }; + }; + "wordwrap-0.0.3" = { + name = "wordwrap"; + packageName = "wordwrap"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"; + sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107"; + }; + }; "wrap-ansi-3.0.1" = { name = "wrap-ansi"; packageName = "wrap-ansi"; @@ -3244,6 +7096,15 @@ let sha1 = "288a04d87eda5c286e060dfe8f135ce8d007f8ba"; }; }; + "wrap-fn-0.1.5" = { + name = "wrap-fn"; + packageName = "wrap-fn"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/wrap-fn/-/wrap-fn-0.1.5.tgz"; + sha1 = "f21b6e41016ff4a7e31720dbc63a09016bdf9845"; + }; + }; "wrappy-1.0.2" = { name = "wrappy"; packageName = "wrappy"; @@ -3253,6 +7114,24 @@ let sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; }; }; + "write-file-atomic-2.3.0" = { + name = "write-file-atomic"; + packageName = "write-file-atomic"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz"; + sha512 = "2sgqxmcqzjd7nq9gjh6jz7vfb0gs0ag4jvqzdq93afq3bw3jrm88mhxql9sryyb04f3ipw5jkgjfiigsmdwlz9fgsnnm3cxhcmxxqy6"; + }; + }; + "xdg-basedir-3.0.0" = { + name = "xdg-basedir"; + packageName = "xdg-basedir"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz"; + sha1 = "496b2cc109eca8dbacfe2dc72b603c17c5870ad4"; + }; + }; "xhr-2.4.1" = { name = "xhr"; packageName = "xhr"; @@ -3280,16 +7159,70 @@ let sha1 = "a5c6d532be656e23db820efb943a1f04998d63af"; }; }; + "yallist-2.1.2" = { + name = "yallist"; + packageName = "yallist"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz"; + sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52"; + }; + }; + "yallist-3.0.2" = { + name = "yallist"; + packageName = "yallist"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz"; + sha1 = "8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"; + }; + }; + "yaml-js-0.0.8" = { + name = "yaml-js"; + packageName = "yaml-js"; + version = "0.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/yaml-js/-/yaml-js-0.0.8.tgz"; + sha1 = "87cfa5a9613f48e26005420d6a8ee0da6fe8daec"; + }; + }; + "yargs-3.10.0" = { + name = "yargs"; + packageName = "yargs"; + version = "3.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz"; + sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"; + }; + }; + "yauzl-2.9.1" = { + name = "yauzl"; + packageName = "yauzl"; + version = "2.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yauzl/-/yauzl-2.9.1.tgz"; + sha1 = "a81981ea70a57946133883f029c5821a89359a7f"; + }; + }; + "z-schema-3.19.1" = { + name = "z-schema"; + packageName = "z-schema"; + version = "3.19.1"; + src = fetchurl { + url = "https://registry.npmjs.org/z-schema/-/z-schema-3.19.1.tgz"; + sha512 = "29crh8y7kjqp652n8wpbh4ljd4j579jg9kwaw9anmd8nhkdz5ljg9arxm8wpcpir5rka60l7h3i13mahcrsq95ydl3f1pxfcfm77wwc"; + }; + }; }; in { bower = nodeEnv.buildNodePackage { name = "bower"; packageName = "bower"; - version = "1.8.2"; + version = "1.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/bower/-/bower-1.8.2.tgz"; - sha1 = "adf53529c8d4af02ef24fb8d5341c1419d33e2f7"; + url = "https://registry.npmjs.org/bower/-/bower-1.8.4.tgz"; + sha1 = "e7876a076deb8137f7d06525dc5e8c66db82f28a"; }; buildInputs = globalBuildInputs; meta = { @@ -3328,9 +7261,9 @@ in dependencies = [ sources."abstract-random-access-1.1.2" sources."ajv-5.5.2" - sources."ansi-diff-stream-1.2.0" + sources."ansi-diff-stream-1.2.1" sources."ansi-regex-3.0.0" - sources."ansi-styles-3.2.0" + sources."ansi-styles-3.2.1" sources."anymatch-1.3.2" sources."ap-0.1.0" sources."append-tree-2.4.1" @@ -3364,23 +7297,28 @@ in sources."kind-of-4.0.0" ]; }) + sources."buffer-alloc-1.1.0" + sources."buffer-alloc-unsafe-1.0.0" sources."buffer-equals-1.0.4" + sources."buffer-fill-0.1.1" + sources."buffer-from-1.0.0" sources."buffer-indexof-1.1.1" - sources."bulk-write-stream-1.1.3" + sources."bulk-write-stream-1.1.4" sources."bytes-3.0.0" sources."call-me-maybe-1.0.1" sources."caseless-0.12.0" - sources."chalk-2.3.1" + sources."chalk-2.3.2" + sources."circular-append-file-1.0.1" sources."cli-truncate-1.1.0" sources."cliclopts-1.1.1" sources."co-4.6.0" - sources."codecs-1.2.0" + sources."codecs-1.2.1" sources."color-convert-1.9.1" sources."color-name-1.1.3" - sources."colors-1.1.2" + sources."colors-1.2.1" sources."combined-stream-1.0.6" sources."concat-map-0.0.1" - sources."concat-stream-1.6.0" + sources."concat-stream-1.6.2" sources."connections-1.4.2" sources."content-types-0.1.0" sources."core-util-is-1.0.2" @@ -3396,13 +7334,16 @@ in (sources."dat-doctor-1.3.1" // { dependencies = [ sources."debug-2.6.9" + sources."dns-packet-1.3.1" + sources."dns-socket-1.6.3" sources."lru-2.0.1" + sources."multicast-dns-6.2.3" sources."pump-1.0.3" ]; }) sources."dat-encoding-5.0.1" - sources."dat-ignore-2.0.0" - (sources."dat-json-1.0.1" // { + sources."dat-ignore-2.1.1" + (sources."dat-json-1.0.2" // { dependencies = [ sources."dat-encoding-4.0.2" sources."debug-2.6.9" @@ -3420,6 +7361,7 @@ in }) (sources."dat-node-3.5.8" // { dependencies = [ + sources."buffer-alloc-unsafe-0.1.1" sources."minimist-0.0.8" sources."process-nextick-args-1.0.7" sources."pump-1.0.3" @@ -3436,18 +7378,27 @@ in sources."deep-equal-0.2.2" sources."delayed-stream-1.0.0" sources."directory-index-html-2.1.0" - sources."discovery-channel-5.4.7" + (sources."discovery-channel-5.5.1" // { + dependencies = [ + sources."pump-3.0.0" + ]; + }) (sources."discovery-swarm-4.4.2" // { dependencies = [ + (sources."dns-discovery-6.1.0" // { + dependencies = [ + sources."thunky-1.0.2" + ]; + }) sources."thunky-0.1.0" ]; }) sources."dns-discovery-5.6.1" - sources."dns-packet-1.3.1" - sources."dns-socket-1.6.3" + sources."dns-packet-4.1.1" + sources."dns-socket-3.0.0" sources."dns-txt-2.0.2" sources."dom-walk-0.1.1" - sources."duplexify-3.5.3" + sources."duplexify-3.5.4" sources."ecc-jsbn-0.1.1" sources."end-of-stream-1.4.1" sources."escape-string-regexp-1.0.5" @@ -3482,12 +7433,12 @@ in sources."hoek-4.2.1" sources."http-methods-0.1.0" sources."http-signature-1.2.0" - (sources."hypercore-6.12.2" // { + (sources."hypercore-6.12.7" // { dependencies = [ sources."varint-5.0.0" ]; }) - sources."hypercore-protocol-6.5.2" + sources."hypercore-protocol-6.6.4" (sources."hyperdrive-9.12.3" // { dependencies = [ sources."varint-4.0.1" @@ -3523,9 +7474,10 @@ in sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" sources."k-bucket-3.3.1" - (sources."k-rpc-4.2.1" // { + (sources."k-rpc-4.3.1" // { dependencies = [ sources."bencode-2.0.0" + sources."k-bucket-4.0.0" ]; }) sources."k-rpc-socket-1.8.0" @@ -3548,11 +7500,12 @@ in sources."mkdirp-0.5.1" sources."ms-2.0.0" sources."multi-random-access-2.1.1" - sources."multicast-dns-6.2.3" + sources."multicast-dns-7.0.0" sources."multicb-1.2.2" + sources."multistream-2.1.0" sources."mute-stream-0.0.7" sources."mutexify-1.2.0" - sources."nan-2.9.2" + sources."nan-2.10.0" sources."nanoassert-1.1.0" sources."nanobus-3.3.0" sources."nanotiming-1.0.1" @@ -3564,7 +7517,7 @@ in }) sources."nets-3.2.0" sources."network-address-1.1.2" - sources."node-gyp-build-3.2.2" + sources."node-gyp-build-3.3.0" sources."normalize-path-2.1.1" sources."oauth-sign-0.8.2" sources."object.omit-2.0.1" @@ -3605,13 +7558,13 @@ in sources."randombytes-2.0.6" sources."range-parser-1.2.0" sources."read-1.0.7" - sources."readable-stream-2.3.4" - sources."recursive-watch-1.1.3" + sources."readable-stream-2.3.5" + sources."recursive-watch-1.1.4" sources."regex-cache-0.4.4" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.2" sources."repeat-string-1.6.1" - sources."request-2.83.0" + sources."request-2.85.0" sources."revalidator-0.1.8" sources."rimraf-2.6.2" sources."rusha-0.8.13" @@ -3621,14 +7574,14 @@ in sources."siphash24-1.1.0" sources."slice-ansi-1.0.0" sources."sntp-2.1.0" - sources."sodium-javascript-0.5.4" - sources."sodium-native-2.1.4" + sources."sodium-javascript-0.5.5" + sources."sodium-native-2.1.5" sources."sodium-universal-2.0.0" sources."sorted-array-functions-1.1.0" sources."sorted-indexof-1.0.0" sources."sparse-bitfield-3.0.3" sources."speedometer-1.0.0" - sources."sshpk-1.13.1" + sources."sshpk-1.14.1" sources."stack-trace-0.0.10" sources."status-logger-3.1.1" sources."stream-collector-1.0.1" @@ -3644,7 +7597,7 @@ in sources."debug-2.6.9" ]; }) - sources."supports-color-5.2.0" + sources."supports-color-5.3.0" (sources."throttle-1.0.3" // { dependencies = [ sources."debug-2.6.9" @@ -3661,14 +7614,14 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."typedarray-0.0.6" - sources."uint64be-2.0.1" + sources."uint64be-2.0.2" sources."unixify-1.0.0" sources."unordered-array-remove-1.0.2" sources."unordered-set-1.1.0" sources."untildify-3.0.2" sources."util-deprecate-1.0.2" sources."utile-0.3.0" - sources."utp-native-1.6.2" + sources."utp-native-1.7.0" sources."uuid-3.2.1" sources."varint-3.0.1" sources."verror-1.10.0" @@ -3730,19 +7683,19 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "5.0.1"; + version = "5.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-5.0.1.tgz"; - sha512 = "2975gb84ixyiin9mdahnmpxxqmn9zmc7d07hh6kv0bnl3mqf6slj83r1f44hvk9f5qk247ajfdmynbyinabrbfi0j8za4v776i3572a"; + url = "https://registry.npmjs.org/mocha/-/mocha-5.0.5.tgz"; + sha512 = "20cyp9x4b3gfrd50w8dcfkm0dv2mc6z0ikvfpkc8dzca6hppslgn0yiw2qdzc4ggf234kzcdvs0hw7lnv7ywilaml4w39vr6r93ghyw"; }; dependencies = [ sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" - sources."browser-stdout-1.3.0" + sources."browser-stdout-1.3.1" sources."commander-2.11.0" sources."concat-map-0.0.1" sources."debug-3.1.0" - sources."diff-3.3.1" + sources."diff-3.5.0" sources."escape-string-regexp-1.0.5" sources."fs.realpath-1.0.0" sources."glob-7.1.2" @@ -3879,15 +7832,15 @@ in sources."process-nextick-args-2.0.0" sources."punycode-1.4.1" sources."qs-6.5.1" - sources."readable-stream-2.3.4" - sources."request-2.83.0" + sources."readable-stream-2.3.5" + sources."request-2.85.0" sources."rimraf-2.6.2" sources."safe-buffer-5.1.1" sources."semver-5.3.0" sources."set-blocking-2.0.0" sources."signal-exit-3.0.2" sources."sntp-2.1.0" - sources."sshpk-1.13.1" + sources."sshpk-1.14.1" sources."string-width-1.0.2" sources."string_decoder-1.0.3" sources."stringstream-0.0.5" @@ -3915,10 +7868,10 @@ in node-gyp-build = nodeEnv.buildNodePackage { name = "node-gyp-build"; packageName = "node-gyp-build"; - version = "3.2.2"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.2.2.tgz"; - sha512 = "34hwi28wvvh5nn8bv71n0fb83xjyk84jsn8j9zgkaqnfigpv2hk6fs9jaffsn7qi3yi4n7iwd9yjyagd1rh74ckzdf5s6l59b8vzidp"; + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.3.0.tgz"; + sha512 = "0vkilw1ghsjca0lrj9gsdgsi8wj4bvpfr25q1qzx1kp5hhvjdhapmvpmrd2hikwq9dxydw6sdvv0730wwvmsg36xqf0hgp9777l3ns8"; }; buildInputs = globalBuildInputs; meta = { @@ -3932,130 +7885,79 @@ in node-pre-gyp = nodeEnv.buildNodePackage { name = "node-pre-gyp"; packageName = "node-pre-gyp"; - version = "0.6.39"; + version = "0.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz"; - sha512 = "2cwrivwc0ha272cly9r61bbb14kkl1s1hsmn53yr88b6pfjqj512nac6c5rphc6ak88v8gpl1f879qdd3v7386103zzr7miibpmbhis"; + url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.9.0.tgz"; + sha1 = "bdd4c3afac9b1b1ebff0a9ff3362859eb6781bb8"; }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-4.11.8" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.4" - sources."asn1-0.2.3" - sources."assert-plus-0.2.0" - sources."asynckit-0.4.0" - sources."aws-sign2-0.6.0" - sources."aws4-1.6.0" sources."balanced-match-1.0.0" - sources."bcrypt-pbkdf-1.0.1" - sources."block-stream-0.0.9" - sources."boom-2.10.1" sources."brace-expansion-1.1.11" - sources."caseless-0.12.0" - sources."co-4.6.0" + sources."chownr-1.0.1" sources."code-point-at-1.1.0" - sources."combined-stream-1.0.6" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" - sources."cryptiles-2.0.5" - sources."dashdash-1.14.1" sources."debug-2.6.9" sources."deep-extend-0.4.2" - sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."detect-libc-1.0.3" - sources."ecc-jsbn-0.1.1" - sources."extend-3.0.1" - sources."extsprintf-1.3.0" - sources."forever-agent-0.6.1" - sources."form-data-2.1.4" + sources."fs-minipass-1.2.5" sources."fs.realpath-1.0.0" - sources."fstream-1.0.11" - sources."fstream-ignore-1.0.5" sources."gauge-2.7.4" - sources."getpass-0.1.7" sources."glob-7.1.2" - sources."graceful-fs-4.1.11" - sources."har-schema-1.0.5" - sources."har-validator-4.2.1" sources."has-unicode-2.0.1" - sources."hawk-3.1.3" - sources."hoek-2.16.3" - sources."http-signature-1.1.1" + sources."iconv-lite-0.4.19" + sources."ignore-walk-3.0.1" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.5" sources."is-fullwidth-code-point-1.0.0" - sources."is-typedarray-1.0.0" sources."isarray-1.0.0" - sources."isstream-0.1.2" - sources."jsbn-0.1.1" - sources."json-schema-0.2.3" - sources."json-stable-stringify-1.0.1" - sources."json-stringify-safe-5.0.1" - sources."jsonify-0.0.0" - (sources."jsprim-1.4.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - sources."mime-db-1.33.0" - sources."mime-types-2.1.18" sources."minimatch-3.0.4" sources."minimist-0.0.8" + sources."minipass-2.2.4" + sources."minizlib-1.1.0" sources."mkdirp-0.5.1" sources."ms-2.0.0" + sources."needle-2.2.0" sources."nopt-4.0.1" + sources."npm-bundled-1.0.3" + sources."npm-packlist-1.1.10" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" - sources."oauth-sign-0.8.2" sources."object-assign-4.1.1" sources."once-1.4.0" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" sources."path-is-absolute-1.0.1" - sources."performance-now-0.2.0" sources."process-nextick-args-2.0.0" - sources."punycode-1.4.1" - sources."qs-6.4.0" - (sources."rc-1.2.5" // { + (sources."rc-1.2.6" // { dependencies = [ sources."minimist-1.2.0" ]; }) - sources."readable-stream-2.3.4" - sources."request-2.81.0" + sources."readable-stream-2.3.5" sources."rimraf-2.6.2" sources."safe-buffer-5.1.1" + sources."sax-1.2.4" sources."semver-5.5.0" sources."set-blocking-2.0.0" sources."signal-exit-3.0.2" - sources."sntp-1.0.9" - (sources."sshpk-1.13.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) sources."string-width-1.0.2" sources."string_decoder-1.0.3" - sources."stringstream-0.0.5" sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" - sources."tar-2.2.1" - sources."tar-pack-3.4.1" - sources."tough-cookie-2.3.4" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" - sources."uid-number-0.0.6" + sources."tar-4.4.1" sources."util-deprecate-1.0.2" - sources."uuid-3.2.1" - sources."verror-1.10.0" sources."wide-align-1.1.2" sources."wrappy-1.0.2" + sources."yallist-3.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -4069,10 +7971,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "1.35.1"; + version = "1.37.3"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-1.35.1.tgz"; - sha1 = "7eb1265daa9da18dab7a7b1645747cd046c42f33"; + url = "https://registry.npmjs.org/pnpm/-/pnpm-1.37.3.tgz"; + sha1 = "592f62fb50633506494bd683a0533a95520ef968"; }; buildInputs = globalBuildInputs; meta = { @@ -4124,7 +8026,7 @@ in sources."lodash-4.17.5" sources."minimatch-3.0.4" sources."process-nextick-args-2.0.0" - sources."readable-stream-2.3.4" + sources."readable-stream-2.3.5" sources."readdirp-2.1.0" sources."safe-buffer-5.1.1" sources."set-immediate-shim-1.0.1" @@ -4140,13 +8042,894 @@ in production = true; bypassCache = true; }; + vue-cli = nodeEnv.buildNodePackage { + name = "vue-cli"; + packageName = "vue-cli"; + version = "2.9.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-cli/-/vue-cli-2.9.3.tgz"; + sha512 = "1wljsr8srayqg7crbbczi00v31q3dxm3vz4fjcdqasdgsm1ajc9gham6sinsxlraniwg4dn5b1kmpw0nln63cy3v02vib07shyvq2ki"; + }; + dependencies = [ + sources."absolute-0.0.1" + sources."ajv-5.5.2" + sources."align-text-0.1.4" + sources."amdefine-1.0.1" + sources."ansi-escapes-3.1.0" + sources."ansi-red-0.1.1" + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" + sources."ansi-wrap-0.1.0" + sources."argparse-1.0.10" + sources."array-differ-1.0.0" + sources."array-union-1.0.2" + sources."array-uniq-1.0.3" + sources."arrify-1.0.1" + sources."asn1-0.2.3" + sources."assert-plus-1.0.0" + sources."async-2.6.0" + sources."asynckit-0.4.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.6.0" + sources."balanced-match-1.0.0" + sources."base64-js-0.0.8" + sources."bcrypt-pbkdf-1.0.1" + sources."bl-1.2.2" + sources."bluebird-3.5.1" + sources."boom-4.3.1" + sources."brace-expansion-1.1.11" + sources."buffer-3.6.0" + sources."buffer-crc32-0.2.13" + sources."builtins-1.0.3" + sources."camelcase-1.2.1" + sources."capture-stack-trace-1.0.0" + sources."caseless-0.12.0" + (sources."caw-2.0.1" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) + sources."center-align-0.1.3" + sources."chalk-2.3.2" + sources."chardet-0.4.2" + sources."cli-cursor-2.1.0" + sources."cli-spinners-1.1.0" + sources."cli-width-2.2.0" + sources."cliui-2.1.0" + sources."clone-1.0.4" + sources."co-3.1.0" + sources."co-from-stream-0.0.0" + sources."co-fs-extra-1.2.1" + sources."co-read-0.0.1" + sources."coffee-script-1.12.7" + sources."color-convert-1.9.1" + sources."color-name-1.1.3" + sources."combined-stream-1.0.6" + sources."commander-2.15.1" + sources."concat-map-0.0.1" + sources."config-chain-1.1.11" + sources."consolidate-0.14.5" + sources."core-util-is-1.0.2" + sources."create-error-class-3.0.2" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) + sources."dashdash-1.14.1" + sources."decamelize-1.2.0" + (sources."decompress-4.2.0" // { + dependencies = [ + sources."file-type-3.9.0" + sources."get-stream-2.3.1" + ]; + }) + sources."decompress-tar-4.1.1" + sources."decompress-tarbz2-4.1.1" + sources."decompress-targz-4.1.1" + sources."decompress-unzip-4.0.1" + sources."delayed-stream-1.0.0" + (sources."download-5.0.3" // { + dependencies = [ + sources."file-type-5.2.0" + ]; + }) + (sources."download-git-repo-1.0.2" // { + dependencies = [ + sources."commander-2.8.1" + sources."file-type-6.2.0" + ]; + }) + sources."duplexer3-0.1.4" + sources."ecc-jsbn-0.1.1" + sources."enable-1.3.2" + sources."end-of-stream-1.4.1" + sources."escape-string-regexp-1.0.5" + sources."esprima-4.0.0" + sources."extend-3.0.1" + sources."extend-shallow-2.0.1" + sources."external-editor-2.1.0" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-1.1.0" + sources."fast-json-stable-stringify-2.0.0" + sources."fd-slicer-1.0.1" + sources."figures-2.0.0" + sources."file-type-5.2.0" + sources."filename-reserved-regex-2.0.0" + sources."filenamify-2.0.0" + sources."forever-agent-0.6.1" + sources."form-data-2.3.2" + sources."fs-extra-0.26.7" + sources."fs.realpath-1.0.0" + sources."get-proxy-2.1.0" + sources."get-stream-3.0.0" + sources."getpass-0.1.7" + sources."git-clone-0.1.0" + sources."glob-7.1.2" + sources."got-6.7.1" + sources."graceful-fs-4.1.11" + sources."graceful-readlink-1.0.1" + sources."gray-matter-2.1.1" + (sources."handlebars-4.0.11" // { + dependencies = [ + sources."async-1.5.2" + sources."wordwrap-0.0.2" + ]; + }) + sources."har-schema-2.0.0" + sources."har-validator-5.0.3" + sources."has-ansi-2.0.0" + sources."has-flag-3.0.0" + sources."has-generators-1.0.1" + sources."has-symbol-support-x-1.4.2" + sources."has-to-string-tag-x-1.4.1" + sources."hawk-6.0.2" + sources."hoek-4.2.1" + sources."http-signature-1.2.0" + sources."iconv-lite-0.4.19" + sources."ieee754-1.1.11" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."ini-1.3.5" + sources."inquirer-3.3.0" + sources."is-3.2.1" + sources."is-buffer-1.1.6" + sources."is-extendable-0.1.1" + sources."is-fullwidth-code-point-2.0.0" + sources."is-natural-number-4.0.1" + sources."is-object-1.0.1" + sources."is-promise-2.1.0" + sources."is-redirect-1.0.0" + sources."is-retry-allowed-1.1.0" + sources."is-stream-1.1.0" + sources."is-typedarray-1.0.0" + sources."is-utf8-0.2.1" + sources."isarray-1.0.0" + sources."isstream-0.1.2" + sources."isurl-1.0.0" + sources."js-yaml-3.11.0" + sources."jsbn-0.1.1" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.3.1" + sources."json-stringify-safe-5.0.1" + sources."jsonfile-2.4.0" + sources."jsprim-1.4.1" + sources."kind-of-3.2.2" + sources."klaw-1.3.1" + sources."lazy-cache-1.0.4" + sources."lodash-4.17.5" + sources."log-symbols-2.2.0" + sources."longest-1.0.1" + sources."lowercase-keys-1.0.1" + (sources."make-dir-1.2.0" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) + (sources."metalsmith-2.3.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."chalk-1.1.3" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + ]; + }) + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."mimic-fn-1.2.0" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + sources."multimatch-2.1.0" + sources."mute-stream-0.0.7" + sources."npm-conf-1.1.3" + sources."oauth-sign-0.8.2" + sources."object-assign-4.1.1" + sources."once-1.4.0" + sources."onetime-2.0.1" + sources."optimist-0.6.1" + sources."ora-1.4.0" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."path-is-absolute-1.0.1" + sources."pend-1.2.0" + sources."performance-now-2.1.0" + sources."pify-2.3.0" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + sources."prepend-http-1.0.4" + sources."process-nextick-args-2.0.0" + sources."proto-list-1.2.4" + sources."punycode-1.4.1" + sources."qs-6.5.1" + sources."read-metadata-1.0.0" + sources."readable-stream-2.3.5" + sources."recursive-readdir-2.2.2" + sources."repeat-string-1.6.1" + (sources."request-2.85.0" // { + dependencies = [ + sources."co-4.6.0" + ]; + }) + sources."restore-cursor-2.0.0" + sources."right-align-0.1.3" + sources."rimraf-2.6.2" + sources."run-async-2.3.0" + sources."rx-lite-4.0.8" + sources."rx-lite-aggregates-4.0.8" + sources."safe-buffer-5.1.1" + sources."seek-bzip-1.0.5" + sources."semver-5.5.0" + sources."signal-exit-3.0.2" + sources."sntp-2.1.0" + sources."source-map-0.4.4" + sources."sprintf-js-1.0.3" + sources."sshpk-1.14.1" + sources."stat-mode-0.2.2" + sources."string-width-2.1.1" + sources."string_decoder-1.0.3" + sources."stringstream-0.0.5" + sources."strip-ansi-4.0.0" + sources."strip-dirs-2.1.0" + sources."strip-outer-1.0.1" + sources."supports-color-5.3.0" + sources."tar-stream-1.5.5" + sources."through-2.3.8" + sources."thunkify-2.1.2" + sources."thunkify-wrap-1.0.4" + sources."tildify-1.2.0" + sources."timed-out-4.0.1" + sources."tmp-0.0.33" + sources."toml-2.3.3" + sources."tough-cookie-2.3.4" + sources."trim-repeated-1.0.0" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + (sources."uglify-js-2.8.29" // { + dependencies = [ + sources."source-map-0.5.7" + ]; + }) + sources."uglify-to-browserify-1.0.2" + sources."uid-0.0.2" + sources."unbzip2-stream-1.2.5" + sources."unyield-0.0.1" + sources."unzip-response-2.0.1" + sources."url-parse-lax-1.0.0" + sources."url-to-options-1.0.1" + sources."user-home-2.0.0" + sources."util-deprecate-1.0.2" + sources."uuid-3.2.1" + sources."validate-npm-package-name-3.0.0" + sources."verror-1.10.0" + sources."ware-1.3.0" + sources."win-fork-1.1.1" + sources."window-size-0.1.0" + sources."wordwrap-0.0.3" + sources."wrap-fn-0.1.5" + sources."wrappy-1.0.2" + sources."xtend-4.0.1" + sources."yaml-js-0.0.8" + sources."yargs-3.10.0" + sources."yauzl-2.9.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A simple CLI for scaffolding Vue.js projects."; + homepage = "https://github.com/vuejs/vue-cli#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; + swagger = nodeEnv.buildNodePackage { + name = "swagger"; + packageName = "swagger"; + version = "0.7.5"; + src = fetchurl { + url = "https://registry.npmjs.org/swagger/-/swagger-0.7.5.tgz"; + sha1 = "3be6ee3d392c3b006fc7a9b5b2d60c7e834860fd"; + }; + dependencies = [ + sources."URIjs-1.16.1" + sources."abbrev-1.1.1" + sources."align-text-0.1.4" + sources."amdefine-1.0.1" + sources."ansi-align-2.0.0" + sources."ansi-escapes-1.4.0" + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + (sources."anymatch-2.0.0" // { + dependencies = [ + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."is-extendable-0.1.1" + ]; + }) + sources."append-field-0.1.0" + sources."argparse-1.0.10" + sources."arr-diff-4.0.0" + sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" + sources."array-unique-0.3.2" + sources."assign-symbols-1.0.0" + sources."async-1.5.2" + sources."async-each-1.0.1" + sources."asynckit-0.4.0" + sources."atob-2.1.0" + sources."balanced-match-1.0.0" + (sources."base-0.11.2" // { + dependencies = [ + (sources."define-property-1.0.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + sources."kind-of-3.2.2" + ]; + }) + sources."binary-extensions-1.11.0" + (sources."body-parser-1.12.4" // { + dependencies = [ + sources."debug-2.2.0" + sources."qs-2.4.2" + ]; + }) + sources."boxen-1.3.0" + sources."brace-expansion-1.1.11" + (sources."braces-2.3.1" // { + dependencies = [ + sources."is-extendable-0.1.1" + ]; + }) + sources."buffer-from-1.0.0" + sources."busboy-0.2.14" + sources."bytes-1.0.0" + sources."cache-base-1.0.1" + sources."camelcase-4.1.0" + sources."capture-stack-trace-1.0.0" + sources."center-align-0.1.3" + sources."chalk-1.1.3" + sources."charenc-0.0.2" + (sources."chokidar-2.0.3" // { + dependencies = [ + sources."debug-2.6.9" + sources."is-accessor-descriptor-1.0.0" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + sources."is-extendable-1.0.1" + ]; + }) + sources."ci-info-1.1.3" + (sources."class-utils-0.3.6" // { + dependencies = [ + sources."define-property-0.2.5" + ]; + }) + sources."cli-boxes-1.0.0" + sources."cli-cursor-1.0.2" + sources."cli-width-1.1.1" + sources."cliui-2.1.0" + sources."clone-2.0.0" + sources."code-point-at-1.1.0" + sources."collection-visit-1.0.0" + sources."color-convert-1.9.1" + sources."color-name-1.1.3" + sources."combined-stream-1.0.6" + sources."commander-2.15.1" + sources."component-emitter-1.2.1" + sources."concat-map-0.0.1" + sources."concat-stream-1.6.2" + sources."configstore-3.1.2" + sources."connect-3.6.6" + sources."content-type-1.0.4" + sources."cookiejar-2.1.1" + sources."copy-descriptor-0.1.1" + sources."core-util-is-1.0.2" + sources."create-error-class-3.0.2" + sources."cross-spawn-5.1.0" + sources."crypt-0.0.2" + sources."crypto-random-string-1.0.0" + sources."dag-map-1.0.2" + sources."debug-2.6.9" + sources."decamelize-1.2.0" + sources."decode-uri-component-0.2.0" + sources."deep-extend-0.4.2" + sources."define-property-2.0.2" + sources."delayed-stream-1.0.0" + sources."depd-1.1.2" + sources."destroy-1.0.4" + sources."dicer-0.2.5" + sources."diff-1.4.0" + sources."dot-prop-4.2.0" + sources."duplexer-0.1.1" + sources."duplexer3-0.1.4" + sources."ee-first-1.1.1" + sources."encodeurl-1.0.2" + sources."escape-html-1.0.3" + sources."escape-string-regexp-1.0.5" + sources."esprima-4.0.0" + sources."etag-1.8.1" + sources."event-stream-3.3.4" + sources."execa-0.7.0" + sources."exit-hook-1.1.1" + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."define-property-0.2.5" + ]; + }) + sources."extend-3.0.1" + sources."extend-shallow-3.0.2" + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + sources."kind-of-5.1.0" + ]; + }) + sources."figures-1.7.0" + sources."fill-range-4.0.0" + sources."finalhandler-1.1.0" + sources."for-in-1.0.2" + sources."form-data-2.3.2" + sources."formidable-1.2.1" + sources."fragment-cache-0.2.1" + sources."fresh-0.5.2" + sources."from-0.1.7" + sources."fs-extra-0.24.0" + sources."fs.realpath-1.0.0" + sources."fsevents-1.1.3" + sources."get-stream-3.0.0" + sources."get-value-2.0.6" + sources."glob-7.1.2" + (sources."glob-parent-3.1.0" // { + dependencies = [ + sources."is-glob-3.1.0" + ]; + }) + sources."global-dirs-0.1.1" + sources."got-6.7.1" + sources."graceful-fs-4.1.11" + sources."graphlib-2.1.5" + sources."growl-1.9.2" + sources."handlebars-4.0.11" + sources."has-ansi-2.0.0" + sources."has-flag-3.0.0" + sources."has-value-1.0.0" + sources."has-values-1.0.0" + sources."http-errors-1.6.3" + sources."iconv-lite-0.4.8" + sources."ignore-by-default-1.0.1" + sources."import-lazy-2.1.0" + sources."imurmurhash-0.1.4" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."ini-1.3.5" + sources."inquirer-0.10.1" + sources."is-accessor-descriptor-1.0.0" + sources."is-binary-path-1.0.1" + sources."is-buffer-1.1.6" + sources."is-ci-1.1.0" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + sources."is-extendable-1.0.1" + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-1.0.0" + sources."is-glob-4.0.0" + sources."is-installed-globally-0.1.0" + sources."is-invalid-path-0.1.0" + sources."is-npm-1.0.0" + sources."is-number-4.0.0" + sources."is-obj-1.0.1" + sources."is-odd-2.0.0" + sources."is-path-inside-1.0.1" + sources."is-plain-object-2.0.4" + sources."is-redirect-1.0.0" + sources."is-retry-allowed-1.1.0" + sources."is-stream-1.1.0" + sources."is-valid-path-0.1.1" + sources."is-windows-1.0.2" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isobject-3.0.1" + (sources."jade-0.26.3" // { + dependencies = [ + sources."commander-0.6.1" + sources."mkdirp-0.3.0" + ]; + }) + sources."js-yaml-3.11.0" + (sources."json-refs-2.1.7" // { + dependencies = [ + sources."debug-3.1.0" + sources."ms-2.0.0" + sources."qs-6.5.1" + sources."superagent-3.8.2" + ]; + }) + (sources."json-schema-deref-sync-0.3.4" // { + dependencies = [ + sources."lodash-4.17.5" + ]; + }) + sources."jsonfile-2.4.0" + sources."kind-of-6.0.2" + sources."latest-version-3.1.0" + sources."lazy-cache-1.0.4" + sources."lodash-3.10.1" + sources."lodash-compat-3.10.2" + sources."lodash._arraypool-2.4.1" + sources."lodash._basebind-2.4.1" + sources."lodash._baseclone-2.4.1" + sources."lodash._basecreate-2.4.1" + sources."lodash._basecreatecallback-2.4.1" + sources."lodash._basecreatewrapper-2.4.1" + sources."lodash._createwrapper-2.4.1" + sources."lodash._getarray-2.4.1" + sources."lodash._isnative-2.4.1" + sources."lodash._maxpoolsize-2.4.1" + sources."lodash._objecttypes-2.4.1" + sources."lodash._releasearray-2.4.1" + sources."lodash._setbinddata-2.4.1" + sources."lodash._shimkeys-2.4.1" + sources."lodash._slice-2.4.1" + sources."lodash.assign-2.4.1" + sources."lodash.bind-2.4.1" + sources."lodash.clonedeep-2.4.1" + sources."lodash.foreach-2.4.1" + sources."lodash.forown-2.4.1" + sources."lodash.get-4.4.2" + sources."lodash.identity-2.4.1" + sources."lodash.isarray-2.4.1" + sources."lodash.isequal-4.5.0" + sources."lodash.isfunction-2.4.1" + sources."lodash.isobject-2.4.1" + sources."lodash.keys-2.4.1" + sources."lodash.noop-2.4.1" + sources."lodash.support-2.4.1" + sources."longest-1.0.1" + sources."lowercase-keys-1.0.1" + sources."lru-cache-2.7.3" + sources."make-dir-1.2.0" + sources."map-cache-0.2.2" + sources."map-stream-0.1.0" + sources."map-visit-1.0.0" + sources."md5-2.2.1" + sources."media-typer-0.3.0" + sources."memory-cache-0.1.6" + sources."methods-1.1.2" + sources."micromatch-3.1.10" + sources."mime-1.4.1" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mixin-deep-1.3.1" + sources."mkdirp-0.5.1" + (sources."mocha-2.5.3" // { + dependencies = [ + sources."commander-2.3.0" + sources."debug-2.2.0" + sources."escape-string-regexp-1.0.2" + sources."glob-3.2.11" + sources."minimatch-0.3.0" + sources."ms-0.7.1" + sources."supports-color-1.2.0" + ]; + }) + sources."mpath-0.2.1" + sources."ms-2.0.0" + (sources."multer-1.3.0" // { + dependencies = [ + sources."ee-first-1.1.1" + sources."isarray-1.0.0" + sources."on-finished-2.3.0" + sources."readable-stream-2.3.5" + sources."string_decoder-1.0.3" + ]; + }) + sources."mute-stream-0.0.5" + sources."nan-2.10.0" + sources."nanomatch-1.2.9" + sources."native-promise-only-0.8.1" + (sources."nodemon-1.17.3" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" + sources."chalk-2.3.2" + sources."debug-3.1.0" + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + sources."has-values-0.1.4" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."is-extendable-0.1.1" + sources."is-fullwidth-code-point-2.0.0" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."lru-cache-4.1.2" + sources."minimist-1.2.0" + sources."strip-ansi-4.0.0" + sources."supports-color-5.3.0" + ]; + }) + sources."nopt-1.0.10" + sources."normalize-path-2.1.1" + sources."npm-run-path-2.0.2" + sources."number-is-nan-1.0.1" + sources."object-assign-4.1.1" + sources."object-copy-0.1.0" + sources."object-visit-1.0.1" + sources."object.pick-1.3.0" + sources."on-finished-2.3.0" + sources."once-1.4.0" + sources."onetime-1.1.0" + sources."optimist-0.6.1" + sources."p-finally-1.0.0" + sources."package-json-4.0.1" + sources."parseurl-1.3.2" + sources."pascalcase-0.1.1" + sources."path-dirname-1.0.2" + sources."path-is-absolute-1.0.1" + sources."path-is-inside-1.0.2" + sources."path-key-2.0.1" + sources."path-loader-1.0.4" + sources."path-to-regexp-1.7.0" + sources."pause-stream-0.0.11" + sources."pify-3.0.0" + sources."posix-character-classes-0.1.1" + sources."prepend-http-1.0.4" + sources."process-nextick-args-2.0.0" + sources."ps-tree-1.1.0" + sources."pseudomap-1.0.2" + sources."pstree.remy-1.1.0" + sources."punycode-2.1.0" + sources."qs-4.0.0" + sources."range-parser-1.2.0" + (sources."raw-body-2.0.2" // { + dependencies = [ + sources."bytes-2.1.0" + ]; + }) + sources."rc-1.2.6" + sources."readable-stream-2.3.5" + sources."readdirp-2.1.0" + sources."readline2-1.0.1" + sources."reduce-component-1.0.1" + sources."regex-not-1.0.2" + sources."registry-auth-token-3.3.2" + sources."registry-url-3.1.0" + sources."remove-trailing-separator-1.1.0" + sources."repeat-element-1.1.2" + sources."repeat-string-1.6.1" + sources."resolve-url-0.2.1" + sources."restore-cursor-1.0.1" + sources."ret-0.1.15" + sources."right-align-0.1.3" + sources."rimraf-2.6.2" + sources."run-async-0.1.0" + sources."rx-lite-3.1.2" + sources."safe-buffer-5.1.1" + sources."safe-regex-1.1.0" + sources."sanitize-filename-1.6.1" + sources."semver-5.5.0" + sources."semver-diff-2.1.0" + sources."send-0.16.2" + (sources."serve-static-1.13.2" // { + dependencies = [ + sources."statuses-1.4.0" + ]; + }) + sources."set-immediate-shim-1.0.1" + sources."set-value-2.0.0" + sources."setprototypeof-1.1.0" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."sigmund-1.0.1" + sources."signal-exit-3.0.2" + sources."slash-1.0.0" + (sources."snapdragon-0.8.2" // { + dependencies = [ + (sources."define-property-0.2.5" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."extend-shallow-2.0.1" + sources."kind-of-4.0.0" + ]; + }) + (sources."snapdragon-node-2.1.1" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."snapdragon-util-3.0.1" + sources."source-map-0.5.7" + sources."source-map-resolve-0.5.1" + sources."source-map-url-0.4.0" + sources."spark-md5-1.0.1" + sources."split-0.3.3" + (sources."split-string-3.1.0" // { + dependencies = [ + sources."extend-shallow-3.0.2" + sources."is-extendable-1.0.1" + ]; + }) + sources."sprintf-js-1.0.3" + sources."static-extend-0.1.2" + sources."statuses-1.3.1" + sources."stream-combiner-0.0.4" + sources."streamsearch-0.1.2" + sources."string-3.3.3" + sources."string-width-2.1.1" + sources."string_decoder-1.0.3" + sources."strip-ansi-3.0.1" + sources."strip-eof-1.0.0" + sources."strip-json-comments-2.0.1" + (sources."superagent-1.8.5" // { + dependencies = [ + sources."qs-2.3.3" + sources."readable-stream-1.0.27-1" + ]; + }) + sources."supports-color-2.0.0" + sources."swagger-converter-0.2.0" + sources."swagger-editor-2.10.5" + (sources."swagger-test-templates-1.4.3" // { + dependencies = [ + sources."camelcase-1.2.1" + sources."is-extglob-1.0.0" + sources."is-glob-2.0.1" + sources."kind-of-3.2.2" + sources."source-map-0.4.4" + sources."wordwrap-0.0.2" + ]; + }) + (sources."swagger-tools-0.9.16" // { + dependencies = [ + sources."cookiejar-2.0.6" + sources."depd-1.0.1" + sources."ee-first-1.1.0" + sources."extend-3.0.0" + sources."form-data-1.0.0-rc3" + sources."formidable-1.0.17" + sources."isarray-0.0.1" + sources."lodash-4.17.5" + sources."mime-1.3.4" + sources."ms-0.7.1" + sources."object-assign-3.0.0" + sources."on-finished-2.2.1" + sources."readable-stream-1.1.14" + sources."string_decoder-0.10.31" + sources."swagger-converter-0.1.7" + ]; + }) + sources."term-size-1.2.0" + sources."through-2.3.8" + sources."timed-out-4.0.1" + sources."to-iso-string-0.0.2" + sources."to-object-path-0.3.0" + sources."to-regex-3.0.2" + sources."to-regex-range-2.1.1" + sources."touch-3.1.0" + sources."traverse-0.6.6" + sources."truncate-utf8-bytes-1.0.2" + sources."type-is-1.6.16" + sources."typedarray-0.0.6" + (sources."uglify-js-2.8.29" // { + dependencies = [ + sources."source-map-0.5.7" + ]; + }) + sources."uglify-to-browserify-1.0.2" + (sources."undefsafe-2.0.2" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + (sources."union-value-1.0.0" // { + dependencies = [ + sources."set-value-0.4.3" + ]; + }) + sources."unique-string-1.0.0" + sources."unpipe-1.0.0" + (sources."unset-value-1.0.0" // { + dependencies = [ + (sources."has-value-0.3.1" // { + dependencies = [ + sources."isobject-2.1.0" + ]; + }) + ]; + }) + sources."unzip-response-2.0.1" + sources."upath-1.0.4" + sources."update-notifier-2.4.0" + sources."uri-js-3.0.2" + sources."urix-0.1.0" + sources."url-parse-lax-1.0.0" + (sources."use-3.1.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + sources."utf8-byte-length-1.0.4" + sources."util-deprecate-1.0.2" + sources."utils-merge-1.0.1" + sources."valid-url-1.0.9" + sources."validator-9.4.1" + sources."which-1.3.0" + sources."widest-line-2.0.0" + sources."window-size-0.1.0" + sources."wordwrap-0.0.3" + sources."wrappy-1.0.2" + sources."write-file-atomic-2.3.0" + sources."xdg-basedir-3.0.0" + sources."xtend-4.0.1" + sources."yallist-2.1.2" + sources."yargs-3.10.0" + sources."z-schema-3.19.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "The Swagger command-line. Provides Swagger utilities and project lifecycle support."; + homepage = "https://github.com/swagger-api/swagger-node#readme"; + license = "Apache 2.0"; + }; + production = true; + bypassCache = true; + }; npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "5.6.0"; + version = "5.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-5.6.0.tgz"; - sha512 = "0nnr796ik5h8bsd3k9ygivivr3na2ksnf5iipf8dsnn20j10i9sgmhmsnzbimd2pqgjbrpp8gbpl2q7j5c7yjqjfirrh8xcc3v3gpws"; + url = "https://registry.npmjs.org/npm/-/npm-5.8.0.tgz"; + sha512 = "32zs775qksijpj23rwly4h8gs435lbsgaxzw6dmyjjg3i8qd40bmmadv3ac9mdxd0cd2x0m3ncsqa0j5vkmkvh8dknn0j9d1k6ig30f"; }; buildInputs = globalBuildInputs; meta = { diff --git a/pkgs/development/python-modules/WSME/default.nix b/pkgs/development/python-modules/WSME/default.nix new file mode 100644 index 00000000000..8cbbd2c767f --- /dev/null +++ b/pkgs/development/python-modules/WSME/default.nix @@ -0,0 +1,49 @@ +{ lib, buildPythonPackage, fetchPypi, isPy3k +, pbr, six, simplegeneric, netaddr, pytz, webob +, cornice, nose, webtest, pecan, transaction, cherrypy, sphinx +, flask, flask-restful, suds-jurko, glibcLocales }: + +buildPythonPackage rec { + pname = "WSME"; + version = "0.9.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "e790ac755a7e36eaa796d3966d3878677896dbc7d1c2685cb85c06b744c21976"; + }; + + postPatch = '' + # remove turbogears tests as we don't have it packaged + rm tests/test_tg* + # WSME seems incompatible with recent SQLAlchemy version + rm wsmeext/tests/test_sqlalchemy* + # https://bugs.launchpad.net/wsme/+bug/1510823 + ${if isPy3k then "rm tests/test_cornice.py" else ""} + ''; + + checkPhae = '' + nosetests --exclude test_buildhtml \ + --exlcude test_custom_clientside_error \ + --exclude test_custom_non_http_clientside_error + ''; + + # UnicodeEncodeError, ImportError, ... + doCheck = !isPy3k; + + nativeBuildInputs = [ pbr ]; + + propagatedBuildInputs = [ + six simplegeneric netaddr pytz webob + ]; + + checkInputs = [ + cornice nose webtest pecan transaction cherrypy sphinx + flask flask-restful suds-jurko glibcLocales + ]; + + meta = with lib; { + description = "Simplify the writing of REST APIs, and extend them with additional protocols"; + homepage = http://git.openstack.org/cgit/openstack/wsme; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/affinity/default.nix b/pkgs/development/python-modules/affinity/default.nix index f2cb2ef6445..4eaaf56b441 100644 --- a/pkgs/development/python-modules/affinity/default.nix +++ b/pkgs/development/python-modules/affinity/default.nix @@ -1,13 +1,17 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi, isPy3k }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "affinity"; version = "0.1.0"; + + # syntax error + disabled = isPy3k; + src = fetchPypi { inherit pname version; sha256 = "1i6j7kszvnzh5vh9k48cqwx2kzf73a6abgv9s6bf0j2zmfjl2wb6"; }; + meta = { description = "control processor affinity on windows and linux"; homepage = http://cheeseshop.python.org/pypi/affinity; diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index 19ad64e7472..809c8766352 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "aiohttp"; - version = "3.0.1"; + version = "3.0.9"; src = fetchPypi { inherit pname version; - sha256 = "7aee5c0750584946fde40da70f0b28fe769f85182f1171acef18a35fd8ecd221"; + sha256 = "281a9fa56b5ce587a2147ec285d18a224942f7e020581afa6cc44d7caecf937b"; }; disabled = pythonOlder "3.4"; diff --git a/pkgs/development/python-modules/allpairspy/default.nix b/pkgs/development/python-modules/allpairspy/default.nix new file mode 100644 index 00000000000..e21b43c60e0 --- /dev/null +++ b/pkgs/development/python-modules/allpairspy/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, six, pytest }: + +buildPythonPackage rec { + pname = "allpairspy"; + version = "2.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "9fb7962ee523bd96c5098cd3c97ac1b8eb73021d3df9314657ee9de00f52e034"; + }; + + propagatedBuildInputs = [ six ]; + + checkInputs = [ pytest ]; + + checkPhase = '' + py.test + ''; + + meta = with lib; { + description = "Pairwise test combinations generator"; + homepage = https://github.com/thombashi/allpairspy; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix index d3cdc0f43f2..d98eba693d2 100644 --- a/pkgs/development/python-modules/altair/default.nix +++ b/pkgs/development/python-modules/altair/default.nix @@ -1,17 +1,20 @@ { stdenv, buildPythonPackage, fetchPypi -, pytest, vega, pandas, ipython, traitlets }: +, pytest, glibcLocales, vega, pandas, ipython, traitlets }: buildPythonPackage rec { pname = "altair"; version = "1.2.1"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; sha256 = "c1303f77f1ba4d632f2958c83c0f457b2b969860b1ac9adfb872aefa1780baa7"; }; - buildInputs = [ pytest ]; + postPatch = '' + sed -i "s/vega==/vega>=/g" setup.py + ''; + + checkInputs = [ pytest glibcLocales ]; checkPhase = '' export LANG=en_US.UTF-8 @@ -19,8 +22,6 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ vega pandas ipython traitlets ]; - # Disabling checks, MockRequest object has no method send() - doCheck = false; meta = with stdenv.lib; { description = "A declarative statistical visualization library for Python."; diff --git a/pkgs/development/python-modules/asana/default.nix b/pkgs/development/python-modules/asana/default.nix index 91664f76ad1..62b176fb59c 100644 --- a/pkgs/development/python-modules/asana/default.nix +++ b/pkgs/development/python-modules/asana/default.nix @@ -1,5 +1,5 @@ -{ lib, buildPythonPackage, fetchPypi, - pytest, requests, requests_oauthlib, six +{ lib, buildPythonPackage, pytest, requests, requests_oauthlib, six +, fetchFromGitHub, responses, stdenv }: buildPythonPackage rec { @@ -7,18 +7,14 @@ buildPythonPackage rec { version = "0.7.0"; name = "${pname}-${version}"; - meta = { - description = "Python client library for Asana"; - homepage = https://github.com/asana/python-asana; - license = lib.licenses.mit; + src = fetchFromGitHub { + owner = "asana"; + repo = "python-asana"; + rev = "v${version}"; + sha256 = "0786y3wxqxxhsb0kkpx4bfzif3dhvv3dmm6vnq58iyj94862kpxf"; }; - src = fetchPypi { - inherit pname version; - sha256 = "a7ff4a78529257a5412e78cafd6b3025523364c0ab628d579f2771dd66b254bc"; - }; - - checkInputs = [ pytest ]; + checkInputs = [ pytest responses ]; propagatedBuildInputs = [ requests requests_oauthlib six ]; patchPhase = '' @@ -27,11 +23,13 @@ buildPythonPackage rec { sed -i "s/requests_oauthlib~=0.6.1/requests_oauthlib >=0.6.1/" setup.py ''; - # ERROR: file not found: tests - doCheck = false; - checkPhase = '' py.test tests ''; + meta = with stdenv.lib; { + description = "Python client library for Asana"; + homepage = https://github.com/asana/python-asana; + license = licenses.mit; + }; } diff --git a/pkgs/development/python-modules/asgi_ipc/default.nix b/pkgs/development/python-modules/asgi_ipc/default.nix deleted file mode 100644 index bdb12203de6..00000000000 --- a/pkgs/development/python-modules/asgi_ipc/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, buildPythonPackage, fetchurl, - asgiref, msgpack, posix_ipc -}: -buildPythonPackage rec { - version = "1.4.2"; - pname = "asgi_ipc"; - name = "${pname}-${version}"; - - src = fetchurl { - url = "mirror://pypi/a/asgi_ipc/${name}.tar.gz"; - sha256 = "2403f41184405791b05e7aee570bd6ccd47e2d91845d78fe17adcf58ef48c037"; - }; - - propagatedBuildInputs = [ asgiref msgpack posix_ipc ]; - - meta = with stdenv.lib; { - description = "Posix IPC-backed ASGI channel layer implementation"; - license = licenses.bsd3; - homepage = https://github.com/django/asgi_ipc/; - }; -} diff --git a/pkgs/development/python-modules/asgi_redis/default.nix b/pkgs/development/python-modules/asgi_redis/default.nix deleted file mode 100644 index d4c9388f1a7..00000000000 --- a/pkgs/development/python-modules/asgi_redis/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, buildPythonPackage, fetchPypi, - asgiref, asgi_ipc, msgpack, six, redis, cryptography -}: -buildPythonPackage rec { - version = "1.4.3"; - pname = "asgi_redis"; - name = "${pname}-${version}"; - - src = fetchPypi { - inherit pname version; - sha256 = "10xk7k7mcd28nb3v93mc8xa7sa6p02jnbl8idk6scr6p75jaixzi"; - }; - - # Requires a redis server available - doCheck = false; - - propagatedBuildInputs = [ asgiref asgi_ipc msgpack six redis cryptography ]; - - meta = with stdenv.lib; { - description = "Redis-backed ASGI channel layer implementation"; - license = licenses.bsd3; - homepage = https://github.com/django/asgi_redis/; - }; -} diff --git a/pkgs/development/python-modules/asgiref/default.nix b/pkgs/development/python-modules/asgiref/default.nix index 223f53698e9..f40adc91b4b 100644 --- a/pkgs/development/python-modules/asgiref/default.nix +++ b/pkgs/development/python-modules/asgiref/default.nix @@ -1,15 +1,15 @@ -{ stdenv, buildPythonPackage, fetchurl, six }: +{ stdenv, buildPythonPackage, fetchurl, six, async-timeout }: buildPythonPackage rec { - version = "2.1.5"; + version = "2.2.0"; pname = "asgiref"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/a/asgiref/${name}.tar.gz"; - sha256 = "1a46196df28c67e046a54cc537ce5a8f6a59eb68649f54680d7e4fc3b113ab1b"; + sha256 = "1fmrd749hqxwicnivvgrcw812gbj2zm49zcnkghh9yxbkjfcvxcv"; }; - propagatedBuildInputs = [ six ]; + propagatedBuildInputs = [ six async-timeout ]; meta = with stdenv.lib; { description = "Reference ASGI adapters and channel layers"; diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix index ccf988fc56d..4ff4841cf5f 100644 --- a/pkgs/development/python-modules/astropy/default.nix +++ b/pkgs/development/python-modules/astropy/default.nix @@ -1,16 +1,18 @@ { lib , fetchPypi , buildPythonPackage +, isPy3k , numpy , pytest }: buildPythonPackage rec { - pname = "astropy"; version = "3.0"; - name = "${pname}-${version}"; + disabled = !isPy3k; # according to setup.py + doCheck = false; #Some tests are failing. More importantly setup.py hangs on completion. Needs fixing with a proper shellhook. + src = fetchPypi { inherit pname version; sha256 = "9e0ad19b9d6d227bdf0932bbe64a8c5dd4a47d4ec078586cf24bf9f0c61d9ecf"; @@ -18,7 +20,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ pytest numpy ]; # yes it really has pytest in install_requires - meta = { description = "Astronomy/Astrophysics library for Python"; homepage = http://www.astropy.org; diff --git a/pkgs/development/python-modules/bibtexparser/default.nix b/pkgs/development/python-modules/bibtexparser/default.nix index 50e389a9e14..06d7c689e65 100644 --- a/pkgs/development/python-modules/bibtexparser/default.nix +++ b/pkgs/development/python-modules/bibtexparser/default.nix @@ -1,20 +1,31 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, pyparsing +, future +, nose +, glibcLocales }: buildPythonPackage rec { pname = "bibtexparser"; version = "1.0.1"; - name = "${pname}-${version}"; - src = fetchPypi { - inherit pname version; - sha256 = "cc41cdd8332c2bf44b97daf1f135f4f267c3b744c33976655cd270b66f964c0a"; + # PyPI tarball does not ship tests + src = fetchFromGitHub { + owner = "sciunto-org"; + repo = "python-${pname}"; + rev = "v${version}"; + sha256 = "0lmlarkfbq2hp1wa04a62245jr2mqizqsdlgilj5aq6vy92gr6ai"; }; - # No tests in archive - doCheck = false; + propagatedBuildInputs = [ pyparsing future ]; + + checkInputs = [ nose glibcLocales ]; + + checkPhase = '' + LC_ALL="en_US.UTF-8" nosetests + ''; meta = { description = "Bibtex parser for python 2.7 and 3.3 and newer"; diff --git a/pkgs/development/python-modules/binaryornot/default.nix b/pkgs/development/python-modules/binaryornot/default.nix new file mode 100644 index 00000000000..2f0b01a5c23 --- /dev/null +++ b/pkgs/development/python-modules/binaryornot/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchPypi, chardet, hypothesis }: + +buildPythonPackage rec { + pname = "binaryornot"; + version = "0.4.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "359501dfc9d40632edc9fac890e19542db1a287bbcfa58175b66658392018061"; + }; + + prePatch = '' + # See https://github.com/audreyr/binaryornot/issues/40 + substituteInPlace tests/test_check.py \ + --replace "average_size=512" "average_size=128" + ''; + + propagatedBuildInputs = [ chardet ]; + + checkInputs = [ hypothesis ]; + + meta = with lib; { + homepage = https://github.com/audreyr/binaryornot; + description = "Ultra-lightweight pure Python package to check if a file is binary or text"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/bleach/default.nix b/pkgs/development/python-modules/bleach/default.nix index e4ccb0c92d6..786564b92e0 100644 --- a/pkgs/development/python-modules/bleach/default.nix +++ b/pkgs/development/python-modules/bleach/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "bleach"; - version = "2.1.2"; + version = "2.1.3"; src = fetchPypi { inherit pname version; - sha256 = "38fc8cbebea4e787d8db55d6f324820c7f74362b70db9142c1ac7920452d1a19"; + sha256 = "eb7386f632349d10d9ce9d4a838b134d4731571851149f9cc2c05a9a837a9a44"; }; checkInputs = [ pytest pytestrunner ]; @@ -41,4 +41,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ prikhi ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/blinkstick/default.nix b/pkgs/development/python-modules/blinkstick/default.nix new file mode 100644 index 00000000000..96f7bfebdeb --- /dev/null +++ b/pkgs/development/python-modules/blinkstick/default.nix @@ -0,0 +1,31 @@ +{ lib, buildPythonPackage, fetchPypi, fetchpatch, pyusb }: + +buildPythonPackage rec { + pname = "BlinkStick"; + version = "1.1.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "3edf4b83a3fa1a7bd953b452b76542d54285ff6f1145b6e19f9b5438120fa408"; + }; + + patches = [ + (fetchpatch { + url = https://github.com/arvydas/blinkstick-python/commit/a9227d0.patch; + sha256 = "1mcmxlnkbfxwp84qz32l5rlc7r9anh9yhnqaj1y8rny5s13jb01f"; + }) + (fetchpatch { + url = https://github.com/arvydas/blinkstick-python/pull/54.patch; + sha256 = "1gjq6xbai794bbdyrv82i96l1a7qkwvlhzd6sa937dy5ivv6s6hl"; + }) + ]; + + propagatedBuildInputs = [ pyusb ]; + + meta = with lib; { + description = "Python package to control BlinkStick USB devices"; + homepage = https://pypi.python.org/pypi/BlinkStick/; + license = licenses.bsd3; + maintainers = with maintainers; [ np ]; + }; +} diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index 44613dd4e5b..7f3fb46d1e1 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -1,6 +1,7 @@ { stdenv, buildPythonPackage, fetchPypi, iana-etc, libredirect, pytest, case, kombu, billiard, pytz, anyjson, amqp, eventlet -}: +}: + buildPythonPackage rec { pname = "celery"; version = "4.1.0"; @@ -11,11 +12,11 @@ buildPythonPackage rec { }; # make /etc/protocols accessible to fix socket.getprotobyname('tcp') in sandbox - preCheck = '' + preCheck = stdenv.lib.optionalString stdenv.isLinux '' export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols \ LD_PRELOAD=${libredirect}/lib/libredirect.so ''; - postCheck = '' + postCheck = stdenv.lib.optionalString stdenv.isLinux '' unset NIX_REDIRECTS LD_PRELOAD ''; diff --git a/pkgs/development/python-modules/colander/default.nix b/pkgs/development/python-modules/colander/default.nix new file mode 100644 index 00000000000..ed27464d1fe --- /dev/null +++ b/pkgs/development/python-modules/colander/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchPypi +, translationstring, iso8601 }: + +buildPythonPackage rec { + pname = "colander"; + version = "1.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "e20e9acf190e5711cf96aa65a5405dac04b6e841028fc361d953a9923dbc4e72"; + }; + + propagatedBuildInputs = [ translationstring iso8601 ]; + + meta = with lib; { + description = "A simple schema-based serialization and deserialization library"; + homepage = https://docs.pylonsproject.org/projects/colander/en/latest/; + license = licenses.free; # http://repoze.org/LICENSE.txt + maintainers = with maintainers; [ garbas domenkozar ]; + }; +} diff --git a/pkgs/development/python-modules/commonmark/default.nix b/pkgs/development/python-modules/commonmark/default.nix new file mode 100644 index 00000000000..d6cd69f6c8a --- /dev/null +++ b/pkgs/development/python-modules/commonmark/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchPypi, isPy3k, glibcLocales, future }: + +buildPythonPackage rec { + pname = "CommonMark"; + version = "0.7.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "4dfbbd1dbc669a9b71a015032b2bbe5c4b019ca8b6ca410d89cf7020de46d2c0"; + }; + + preCheck = '' + export LC_ALL="en_US.UTF-8" + ''; + + # UnicodeEncodeError on Python 2 + doCheck = isPy3k; + + checkInputs = [ glibcLocales ]; + propagatedBuildInputs = [ future ]; + + meta = with lib; { + description = "Python parser for the CommonMark Markdown spec"; + homepage = https://github.com/rolandshoemaker/CommonMark-py; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/construct/default.nix b/pkgs/development/python-modules/construct/default.nix index 78aa0aab5c0..afba2e17bf6 100644 --- a/pkgs/development/python-modules/construct/default.nix +++ b/pkgs/development/python-modules/construct/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, six, pythonOlder }: +{ stdenv, buildPythonPackage, fetchFromGitHub, six, pytest, pythonOlder }: buildPythonPackage rec { pname = "construct"; @@ -14,15 +14,16 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - # Tests fail with the following error on Python 3.5+ - # TypeError: not all arguments converted during string formatting - doCheck = pythonOlder "3.5"; + checkInputs = [ pytest ]; + + checkPhase = '' + py.test -k 'not test_numpy' tests + ''; meta = with stdenv.lib; { description = "Powerful declarative parser (and builder) for binary data"; homepage = http://construct.readthedocs.org/; license = licenses.mit; - platforms = platforms.linux; maintainers = with maintainers; [ bjornfor ]; }; } diff --git a/pkgs/development/python-modules/credstash/default.nix b/pkgs/development/python-modules/credstash/default.nix index 6a9e1240b86..8be1780aa99 100644 --- a/pkgs/development/python-modules/credstash/default.nix +++ b/pkgs/development/python-modules/credstash/default.nix @@ -1,15 +1,20 @@ -{ stdenv, buildPythonPackage, fetchPypi, cryptography, boto3, pyyaml, docutils }: +{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, cryptography, boto3, pyyaml, docutils }: buildPythonPackage rec { - pname = "credstash"; + pname = "credstash"; version = "1.14.0"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; sha256 = "718b337f7a6fa001e014386071f05c59900525d0507009126d2fe8d75fe0761d"; }; + patches = fetchpatch { + url = https://github.com/fugue/credstash/pull/178.patch; + sha256 = "15ih4h5v63g7qfmqdl4zca147wkcrx8vnsh4ns33001dipcfb5sc"; + excludes = [ ".travis.yml" ]; + }; + propagatedBuildInputs = [ cryptography boto3 pyyaml docutils ]; # No tests in archive diff --git a/pkgs/development/python-modules/csvkit/default.nix b/pkgs/development/python-modules/csvkit/default.nix index bfabf4376e7..badf33f8c12 100644 --- a/pkgs/development/python-modules/csvkit/default.nix +++ b/pkgs/development/python-modules/csvkit/default.nix @@ -1,28 +1,38 @@ -{ stdenv, fetchPypi, buildPythonPackage, - dateutil, dbf, xlrd, sqlalchemy, openpyxl, - agate-excel, agate-dbf, agate-sql, isPy3k }: +{ lib, fetchPypi, buildPythonPackage, isPy3k +, agate, agate-excel, agate-dbf, agate-sql, six +, argparse, ordereddict, simplejson +, glibcLocales, nose, mock, unittest2 +}: buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "csvkit"; - version = "1.0.2"; + pname = "csvkit"; + version = "1.0.2"; - src = fetchPypi { - inherit pname version; - sha256 = "05vfsba9nwh4islszgs18rq8sjkpzqni0cdwvvkw7pi0r63pz2as"; - }; + src = fetchPypi { + inherit pname version; + sha256 = "05vfsba9nwh4islszgs18rq8sjkpzqni0cdwvvkw7pi0r63pz2as"; + }; - propagatedBuildInputs = [ dateutil dbf xlrd sqlalchemy openpyxl - agate-excel agate-dbf agate-sql ]; + propagatedBuildInputs = [ + agate agate-excel agate-dbf agate-sql six + ] ++ lib.optionals (!isPy3k) [ + argparse ordereddict simplejson + ]; - doCheck = !isPy3k; - # (only) python 3 we had 9 failures and 57 errors out of a much larger - # number of tests. + checkInputs = [ + glibcLocales nose + ] ++ lib.optionals (!isPy3k) [ + mock unittest2 + ]; - meta = with stdenv.lib; { - description = "A library of utilities for working with CSV, the king of tabular file formats"; - maintainers = with maintainers; [ vrthra ]; - license = with licenses; [ mit ]; - homepage = https://github.com/wireservice/csvkit; - }; + checkPhase = '' + LC_ALL="en_US.UTF-8" nosetests -e test_csvsql + ''; + + meta = with lib; { + description = "A library of utilities for working with CSV, the king of tabular file formats"; + maintainers = with maintainers; [ vrthra ]; + license = with licenses; [ mit ]; + homepage = https://github.com/wireservice/csvkit; + }; } diff --git a/pkgs/development/python-modules/curtsies/default.nix b/pkgs/development/python-modules/curtsies/default.nix index 8d6052c5299..d29ad1d6474 100644 --- a/pkgs/development/python-modules/curtsies/default.nix +++ b/pkgs/development/python-modules/curtsies/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, blessings, mock, nose, pyte, pytest, wcwidth }: +{ stdenv, buildPythonPackage, fetchPypi, blessings, mock, nose, pyte, wcwidth, typing }: buildPythonPackage rec { pname = "curtsies"; @@ -8,12 +8,12 @@ buildPythonPackage rec { sha256 = "89c802ec051d01dec6fc983e9856a3706e4ea8265d2940b1f6d504a9e26ed3a9"; }; - propagatedBuildInputs = [ blessings wcwidth pyte ]; + propagatedBuildInputs = [ blessings wcwidth typing ]; - checkInputs = [ nose mock pytest ]; + checkInputs = [ mock pyte nose ]; checkPhase = '' - py.test + nosetests tests ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/daphne/default.nix b/pkgs/development/python-modules/daphne/default.nix index 86b00ca7408..7ead1cacfa6 100644 --- a/pkgs/development/python-modules/daphne/default.nix +++ b/pkgs/development/python-modules/daphne/default.nix @@ -1,19 +1,31 @@ -{ stdenv, buildPythonPackage, fetchPypi, - asgiref, autobahn, twisted, hypothesis +{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub +, asgiref, autobahn, twisted, pytestrunner +, hypothesis, pytest, pytest-asyncio }: buildPythonPackage rec { pname = "daphne"; - name = "${pname}-${version}"; - version = "2.0.3"; + version = "2.1.0"; - src = fetchPypi { - inherit pname version; - sha256 = "bb2075ce35ca00f2e5440cc034dfebd5c00d346de62ea45f099db089b868c31f"; + disabled = !isPy3k; + + src = fetchFromGitHub { + owner = "django"; + repo = pname; + rev = version; + sha256 = "1lbpn0l796ar77amqy8dap30zxmsn6as8y2lbmp4lk8m9awscwi8"; }; - buildInputs = [ hypothesis ]; + nativeBuildInputs = [ pytestrunner ]; + propagatedBuildInputs = [ asgiref autobahn twisted ]; + checkInputs = [ hypothesis pytest pytest-asyncio ]; + + checkPhase = '' + # Other tests fail, seems to be due to filesystem access + py.test -k "test_cli or test_utils" + ''; + meta = with stdenv.lib; { description = "Django ASGI (HTTP/WebSocket) server"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/datashape/default.nix b/pkgs/development/python-modules/datashape/default.nix index 9177e9f0ff4..4fcb38e7b36 100644 --- a/pkgs/development/python-modules/datashape/default.nix +++ b/pkgs/development/python-modules/datashape/default.nix @@ -31,8 +31,10 @@ in buildPythonPackage rec { checkInputs = [ pytest mock ]; propagatedBuildInputs = [ numpy multipledispatch dateutil ]; + # Disable several tests + # https://github.com/blaze/datashape/issues/232 checkPhase = '' - py.test datashape/tests + py.test -k "not test_validate and not test_nested_iteratables and not test_validate_dicts and not test_tuples_can_be_records_too" datashape/tests ''; meta = { diff --git a/pkgs/development/python-modules/dbf/default.nix b/pkgs/development/python-modules/dbf/default.nix index 2343ea2918b..ac8087be63e 100644 --- a/pkgs/development/python-modules/dbf/default.nix +++ b/pkgs/development/python-modules/dbf/default.nix @@ -1,21 +1,24 @@ -{ stdenv, fetchPypi, buildPythonPackage, aenum, isPy3k }: +{ stdenv, fetchPypi, buildPythonPackage, aenum, isPy3k, pythonOlder, enum34, python }: buildPythonPackage rec { pname = "dbf"; version = "0.96.8"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; sha256 = "1z8n7s4cka6x9ybh4qpfhj51v2qrk38h2f06npizzhm0hmn6r3v1"; }; - propagatedBuildInputs = [ aenum ]; + propagatedBuildInputs = [ aenum ] ++ stdenv.lib.optional (pythonOlder "3.4") [ enum34 ]; doCheck = !isPy3k; # tests are not yet ported. # https://groups.google.com/forum/#!topic/python-dbase/96rx2xmCG4w + checkPhase = '' + ${python.interpreter} dbf/test.py + ''; + meta = with stdenv.lib; { description = "Pure python package for reading/writing dBase, FoxPro, and Visual FoxPro .dbf files"; homepage = "https://pypi.python.org/pypi/dbf"; diff --git a/pkgs/development/python-modules/deform/default.nix b/pkgs/development/python-modules/deform/default.nix new file mode 100644 index 00000000000..53286b38722 --- /dev/null +++ b/pkgs/development/python-modules/deform/default.nix @@ -0,0 +1,41 @@ +{ lib, buildPythonPackage, fetchPypi +, chameleon, colander, iso8601, peppercorn, translationstring, zope_deprecation +, nose, coverage, beautifulsoup4, flaky }: + +buildPythonPackage rec { + pname = "deform"; + version = "2.0.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "874d3346a02c500432efdcc73b1a7174aa0ea69cd52a99bb9a812967f54f6f79"; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "iso8601<=0.1.11" iso8601 + ''; + + propagatedBuildInputs = [ + chameleon + colander + iso8601 + peppercorn + translationstring + zope_deprecation + ]; + + checkInputs = [ + nose + coverage + beautifulsoup4 + flaky + ]; + + meta = with lib; { + description = "Form library with advanced features like nested forms"; + homepage = https://docs.pylonsproject.org/projects/deform/en/latest/; + license = licenses.free; # http://www.repoze.org/LICENSE.txt + maintainers = with maintainers; [ garbas domenkozar ]; + }; +} diff --git a/pkgs/development/python-modules/deluge-client/default.nix b/pkgs/development/python-modules/deluge-client/default.nix new file mode 100644 index 00000000000..838cc846387 --- /dev/null +++ b/pkgs/development/python-modules/deluge-client/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "deluge-client"; + version = "1.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "048zfidv08sr4hivdd3xxf1pywhqbnszj5qcn51h2f4y1588fhpf"; + }; + + # it will try to connect to a running instance + doCheck = false; + + meta = with stdenv.lib; { + description = "Lightweight pure-python rpc client for deluge"; + homepage = https://github.com/JohnDoee/deluge-client; + license = licenses.mit; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/development/python-modules/diff_cover/default.nix b/pkgs/development/python-modules/diff_cover/default.nix index b8286e7d6b1..57f0a1ef238 100644 --- a/pkgs/development/python-modules/diff_cover/default.nix +++ b/pkgs/development/python-modules/diff_cover/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, fetchPypi, jinja2, jinja2_pluralize, pygments, six, inflect, mock, nose, coverage, pycodestyle, flake8, pyflakes, git, - pylint, pydocstyle, fetchpatch }: + pylint, pydocstyle, fetchpatch, glibcLocales }: buildPythonPackage rec { pname = "diff_cover"; @@ -25,7 +25,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ jinja2 jinja2_pluralize pygments six inflect ]; - checkInputs = [ mock nose coverage pycodestyle flake8 pyflakes pylint pydocstyle git ]; + checkInputs = [ mock nose coverage pycodestyle flake8 pyflakes pylint pydocstyle git glibcLocales ]; meta = with stdenv.lib; { description = "Automatically find diff lines that need test coverage"; diff --git a/pkgs/development/python-modules/discid/default.nix b/pkgs/development/python-modules/discid/default.nix index d237f366fdf..f3d403d9f2c 100644 --- a/pkgs/development/python-modules/discid/default.nix +++ b/pkgs/development/python-modules/discid/default.nix @@ -10,15 +10,17 @@ buildPythonPackage rec { sha256 = "78a3bf6c8377fdbe3d85e914a209ff97aa43e35605779639847b510ced31f7b9"; }; - patchPhase = '' - substituteInPlace discid/libdiscid.py \ - --replace '_open_library(_LIB_NAME)' "_open_library('${libdiscid}/lib/libdiscid.so.0')" - ''; + patchPhase = + let extension = stdenv.hostPlatform.extensions.sharedLibrary; in + '' + substituteInPlace discid/libdiscid.py \ + --replace "_open_library(_LIB_NAME)" \ + "_open_library('${libdiscid}/lib/libdiscid${extension}')" + ''; meta = with stdenv.lib; { description = "Python binding of libdiscid"; homepage = "https://python-discid.readthedocs.org/"; license = licenses.lgpl3Plus; - platforms = platforms.linux; }; } diff --git a/pkgs/development/python-modules/distro/default.nix b/pkgs/development/python-modules/distro/default.nix index 36264921f64..da6984c9be9 100644 --- a/pkgs/development/python-modules/distro/default.nix +++ b/pkgs/development/python-modules/distro/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchPypi, buildPythonPackage, pytest, pytestcov, tox }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "distro"; version = "1.2.0"; diff --git a/pkgs/development/python-modules/dj-database-url/default.nix b/pkgs/development/python-modules/dj-database-url/default.nix new file mode 100644 index 00000000000..f334b7efeac --- /dev/null +++ b/pkgs/development/python-modules/dj-database-url/default.nix @@ -0,0 +1,20 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "dj-database-url"; + version = "0.5.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "4aeaeb1f573c74835b0686a2b46b85990571159ffc21aa57ecd4d1e1cb334163"; + }; + + # Tests access a DB via network + doCheck = false; + + meta = with lib; { + description = "Use Database URLs in your Django Application"; + homepage = https://github.com/kennethreitz/dj-database-url; + license = licenses.bsd2; + }; +} diff --git a/pkgs/development/python-modules/django-pipeline/default.nix b/pkgs/development/python-modules/django-pipeline/default.nix new file mode 100644 index 00000000000..58e9d746b97 --- /dev/null +++ b/pkgs/development/python-modules/django-pipeline/default.nix @@ -0,0 +1,36 @@ +{ lib, buildPythonPackage, fetchFromGitHub, isPy3k +, django, futures, mock, jinja2, jsmin, slimit }: + +buildPythonPackage rec { + pname = "django-pipeline"; + version = "1.6.14"; + + # no tests on PyPI + src = fetchFromGitHub { + owner = "jazzband"; + repo = pname; + rev = version; + sha256 = "1xf732bd17mgha75jfhlnms46ib2pffhpfa0ca7bmng9jhbvsl9j"; + }; + + postPatch = '' + substituteInPlace tests/tests/test_compiler.py \ + --replace "/usr/bin/env" "" + ''; + + propagatedBuildInputs = [ django ] ++ lib.optional (!isPy3k) futures; + + checkInputs = [ jinja2 jsmin slimit ] ++ lib.optional (!isPy3k) mock; + + checkPhase = '' + export PYTHONPATH=.:$PYTHONPATH + export DJANGO_SETTINGS_MODULE=tests.settings + ${django}/bin/django-admin.py test tests + ''; + + meta = with lib; { + description = "Pipeline is an asset packaging library for Django"; + homepage = https://github.com/cyberdelia/django-pipeline; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/django-polymorphic/default.nix b/pkgs/development/python-modules/django-polymorphic/default.nix index 8cb68ed1e7d..2cd112d8150 100644 --- a/pkgs/development/python-modules/django-polymorphic/default.nix +++ b/pkgs/development/python-modules/django-polymorphic/default.nix @@ -1,18 +1,24 @@ -{ stdenv, buildPythonPackage, fetchPypi, django }: +{ stdenv, buildPythonPackage, fetchFromGitHub, python, django, dj-database-url }: buildPythonPackage rec { pname = "django-polymorphic"; version = "2.0.2"; - name = "${pname}-${version}"; - src = fetchPypi { - inherit pname version; - sha256 = "e1821d7b5874509a158a0f22bebf544330e0944c481c5a3e6da6cac8887e4e88"; + # PyPI tarball is missing some test files + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "18p84kdwpfp423vb2n38h840mj3bq0j57jx3cry7c8dznpi0vfi2"; }; - checkInputs = [ django ]; + checkInputs = [ dj-database-url ]; propagatedBuildInputs = [ django ]; + checkPhase = '' + ${python.interpreter} runtests.py + ''; + meta = { homepage = https://github.com/django-polymorphic/django-polymorphic; description = "Improved Django model inheritance with automatic downcasting"; diff --git a/pkgs/development/python-modules/django/1_11.nix b/pkgs/development/python-modules/django/1_11.nix index ca0322cf607..8dead564485 100644 --- a/pkgs/development/python-modules/django/1_11.nix +++ b/pkgs/development/python-modules/django/1_11.nix @@ -6,14 +6,13 @@ buildPythonPackage rec { pname = "Django"; - name = "${pname}-${version}"; - version = "1.11.9"; + version = "1.11.12"; disabled = pythonOlder "2.7"; src = fetchurl { - url = "http://www.djangoproject.com/m/releases/1.11/${name}.tar.gz"; - sha256 = "0d0hh9sh2rwazi7z2lnqvz1424bq6ps6c5h6ss04klp14agi4g9m"; + url = "http://www.djangoproject.com/m/releases/1.11/${pname}-${version}.tar.gz"; + sha256 = "1szjha338grhf9dq0wpbrqwvak597shsx474pm5j67kn09xqqfad"; }; patches = stdenv.lib.optionals withGdal [ diff --git a/pkgs/development/python-modules/ecpy/default.nix b/pkgs/development/python-modules/ecpy/default.nix index 84830e7f2b8..277a5cece56 100644 --- a/pkgs/development/python-modules/ecpy/default.nix +++ b/pkgs/development/python-modules/ecpy/default.nix @@ -1,12 +1,13 @@ -{ stdenv, fetchPypi, buildPythonPackage, hidapi +{ stdenv, fetchPypi, buildPythonPackage, isPy3k, hidapi , pycrypto, pillow, protobuf, future, ecpy }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "ECPy"; version = "0.8.3"; + disabled = !isPy3k; + src = fetchPypi { inherit pname version; sha256 = "ef3d95419d53368f52fb7d4b883b8df0dfc2dd19a76243422d24981c3e5f27bd"; diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index 2d459d625d0..55750f5bf3b 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi, pythonOlder, # Build inputs - dateutil, six, ipaddress ? null, + dateutil, six, text-unidecode, ipaddress ? null, # Test inputs email_validator, nose, mock, ukpostcodeparser }: @@ -8,12 +8,11 @@ assert pythonOlder "3.3" -> ipaddress != null; buildPythonPackage rec { pname = "Faker"; - version = "0.8.8"; - name = "${pname}-${version}"; + version = "0.8.11"; src = fetchPypi { inherit pname version; - sha256 = "e928cf853ef69d7471421f2a3716a1239e43de0fa9855f4016ee0c9f1057328a"; + sha256 = "126kdy6lj10rwgchzz0lzjabx0zcyskamhn0qib67k69fcksjmq8"; }; checkInputs = [ @@ -26,6 +25,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ dateutil six + text-unidecode ] ++ lib.optional (pythonOlder "3.3") ipaddress; meta = with lib; { diff --git a/pkgs/development/python-modules/flake8-debugger/default.nix b/pkgs/development/python-modules/flake8-debugger/default.nix index 9d69c0389b6..32e9a08b741 100644 --- a/pkgs/development/python-modules/flake8-debugger/default.nix +++ b/pkgs/development/python-modules/flake8-debugger/default.nix @@ -1,15 +1,24 @@ -{ lib, fetchurl, buildPythonPackage, flake8, nose }: +{ lib, fetchPypi, buildPythonPackage, flake8, pycodestyle, pytestrunner, pytest }: buildPythonPackage rec { pname = "flake8-debugger"; - name = "${pname}-${version}"; version = "3.1.0"; - src = fetchurl { - url = "mirror://pypi/f/flake8-debugger/${name}.tar.gz"; + + src = fetchPypi { + inherit pname version; sha256 = "be4fb88de3ee8f6dd5053a2d347e2c0a2b54bab6733a2280bb20ebd3c4ca1d97"; }; - buildInputs = [ nose ]; - propagatedBuildInputs = [ flake8 ]; + + nativeBuildInputs = [ pytestrunner ]; + + propagatedBuildInputs = [ flake8 pycodestyle ]; + + checkInputs = [ pytest ]; + + # Tests not included in PyPI tarball + # FIXME: Remove when https://github.com/JBKahn/flake8-debugger/pull/15 is merged + doCheck = false; + meta = { homepage = https://github.com/jbkahn/flake8-debugger; description = "ipdb/pdb statement checker plugin for flake8"; diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix index d88c894009c..ca1c9a09e4e 100644 --- a/pkgs/development/python-modules/ftfy/default.nix +++ b/pkgs/development/python-modules/ftfy/default.nix @@ -7,18 +7,23 @@ , python , isPy3k }: + buildPythonPackage rec { - name = "${pname}-${version}"; pname = "ftfy"; - # latest is 5.1.1, buy spaCy requires 4.4.3 - version = "5.3.0"; + + version = "4.4.3"; + # ftfy v5 only supports python3. Since at the moment the only + # packages that use ftfy are spacy and textacy which both support + # python 2 and 3, they have pinned ftfy to the v4 branch. + # I propose to stick to v4 until another package requires v5. + # At that point we can make a ftfy_v4 package. src = fetchPypi { inherit pname version; - sha256 = "0ba702d5138f9b35df32b55920c9466208608108f1f3d5de1a68c17e3d68cb7f"; + sha256 = "152xdb56rhs1q4r0ck1n557sbphw7zq18r75a7kkd159ckdnc01w"; }; - propagatedBuildInputs = [ html5lib wcwidth]; + propagatedBuildInputs = [ html5lib wcwidth ]; checkInputs = [ nose @@ -32,13 +37,10 @@ buildPythonPackage rec { # FileNotFoundError: [Errno 2] No such file or directory: 'ftfy' doCheck = false; - # "this version of ftfy is no longer written for Python 2" - disabled = !isPy3k; - meta = with stdenv.lib; { description = "Given Unicode text, make its representation consistent and possibly less broken."; homepage = https://github.com/LuminosoInsight/python-ftfy/tree/master/tests; license = licenses.mit; - maintainers = with maintainers; [ sdll ]; - }; + maintainers = with maintainers; [ sdll aborsu ]; + }; } diff --git a/pkgs/development/python-modules/ftputil/default.nix b/pkgs/development/python-modules/ftputil/default.nix new file mode 100644 index 00000000000..d3d338a2c8d --- /dev/null +++ b/pkgs/development/python-modules/ftputil/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchPypi, pytest }: + +buildPythonPackage rec { + version = "3.4"; + pname = "ftputil"; + + src = fetchPypi { + inherit pname version; + sha256 = "374b01e174079e91babe2a462fbd6f6c00dbfbfa299dec04239ca4229fbf8762"; + }; + + checkInputs = [ pytest ]; + + checkPhase = '' + touch Makefile + # Disable tests that require network access or access /home + py.test test \ + -k "not test_public_servers and not test_real_ftp \ + and not test_set_parser and not test_repr" + ''; + + meta = with lib; { + description = "High-level FTP client library (virtual file system and more)"; + homepage = http://ftputil.sschwarzer.net/; + license = licenses.bsd2; # "Modified BSD license, says pypi" + }; +} diff --git a/pkgs/development/python-modules/google_api_core/default.nix b/pkgs/development/python-modules/google_api_core/default.nix index 2899eeb4a8a..df148b1ede3 100644 --- a/pkgs/development/python-modules/google_api_core/default.nix +++ b/pkgs/development/python-modules/google_api_core/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi -, google_auth, protobuf, googleapis_common_protos, requests, grpcio, setuptools, mock, pytest }: +, google_auth, protobuf3_5, googleapis_common_protos, requests, grpcio, setuptools, mock, pytest }: buildPythonPackage rec { pname = "google-api-core"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "0144d467083ed54d2e8ccb4212d42c3724fe0b844b7d3a0ff85aea54b7ae8347"; }; - propagatedBuildInputs = [ google_auth protobuf googleapis_common_protos requests grpcio ]; + propagatedBuildInputs = [ google_auth protobuf3_5 googleapis_common_protos requests grpcio ]; checkInputs = [ setuptools mock pytest ]; checkPhase = '' diff --git a/pkgs/development/python-modules/google_cloud_speech/default.nix b/pkgs/development/python-modules/google_cloud_speech/default.nix index c24e0d88067..0d7c12c6e77 100644 --- a/pkgs/development/python-modules/google_cloud_speech/default.nix +++ b/pkgs/development/python-modules/google_cloud_speech/default.nix @@ -13,9 +13,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ setuptools google_api_core google_gax google_cloud_core ]; checkInputs = [ pytest mock ]; - checkPhase = '' - py.test - ''; + # needs credentials + doCheck = false; meta = with stdenv.lib; { description = "Cloud Speech API enables integration of Google speech recognition into applications."; diff --git a/pkgs/development/python-modules/google_gax/default.nix b/pkgs/development/python-modules/google_gax/default.nix index 24000161338..a8ac37e7e8c 100644 --- a/pkgs/development/python-modules/google_gax/default.nix +++ b/pkgs/development/python-modules/google_gax/default.nix @@ -1,5 +1,6 @@ { stdenv, buildPythonPackage, fetchPypi -, google_auth, ply, protobuf, grpcio, requests, googleapis_common_protos, dill, future, pytest, mock, unittest2 }: +, google_auth, ply, protobuf3_5, grpcio, requests +, googleapis_common_protos, dill, future, pytest, mock, unittest2 }: buildPythonPackage rec { pname = "google-gax"; @@ -10,7 +11,7 @@ buildPythonPackage rec { sha256 = "0p1ribd2xy7a04wnjv12agkcdi6f9cpj838884hayx07p5g8v3ji"; }; - propagatedBuildInputs = [ google_auth ply protobuf grpcio requests googleapis_common_protos dill future ]; + propagatedBuildInputs = [ google_auth ply protobuf3_5 grpcio requests googleapis_common_protos dill future ]; checkInputs = [ pytest mock unittest2 ]; # Importing test__grpc_google_auth fails with "ModuleNotFoundError: No module named 'google_auth_httplib2'", where diff --git a/pkgs/development/python-modules/googleapis_common_protos/default.nix b/pkgs/development/python-modules/googleapis_common_protos/default.nix index 28e84f4846e..7427e590c0c 100644 --- a/pkgs/development/python-modules/googleapis_common_protos/default.nix +++ b/pkgs/development/python-modules/googleapis_common_protos/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi -, protobuf, pytest }: +, protobuf3_5, pytest }: buildPythonPackage rec { pname = "googleapis-common-protos"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "1whfjl44gy15ha6palpwa2m0xi36dsvpaz8vw0cvb2k2lbdfsxf0"; }; - propagatedBuildInputs = [ protobuf ]; + propagatedBuildInputs = [ protobuf3_5 ]; checkInputs = [ pytest ]; doCheck = false; # there are no tests diff --git a/pkgs/development/python-modules/gpapi/default.nix b/pkgs/development/python-modules/gpapi/default.nix new file mode 100644 index 00000000000..da3bbcf28db --- /dev/null +++ b/pkgs/development/python-modules/gpapi/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi, requests, protobuf, pycryptodome }: + +buildPythonPackage rec { + version = "0.4.2"; + pname = "gpapi"; + + src = fetchPypi { + inherit version pname; + sha256 = "1fv2y3xbwn512fjxrdwgq6cz0xjd7mh54nq1f18wyz8w40vcznns"; + }; + + propagatedBuildInputs = [ requests protobuf pycryptodome ]; + + meta = with stdenv.lib; { + homepage = https://github.com/NoMore201/googleplay-api; + license = licenses.gpl3; + description = "Google Play Unofficial Python API"; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/development/python-modules/gplaycli/default.nix b/pkgs/development/python-modules/gplaycli/default.nix new file mode 100644 index 00000000000..01827fc87f5 --- /dev/null +++ b/pkgs/development/python-modules/gplaycli/default.nix @@ -0,0 +1,26 @@ +{ buildPythonPackage, stdenv, libffi, isPy3k, pyasn1, clint, ndg-httpsclient +, protobuf, requests, args, gpapi, pyaxmlparser, fetchFromGitHub +}: + +buildPythonPackage rec { + version = "3.21"; + name = "gplaycli-${version}"; + + src = fetchFromGitHub { + owner = "matlink"; + repo = "gplaycli"; + rev = version; + sha256 = "1r5nzi9yzswam0866gypjcvv3f1rw13jwx9s49chp8byxy1dyrs2"; + }; + + disabled = !isPy3k; + + propagatedBuildInputs = [ libffi pyasn1 clint ndg-httpsclient protobuf requests args gpapi pyaxmlparser ]; + + meta = with stdenv.lib; { + homepage = https://github.com/matlink/gplaycli; + description = "Google Play Downloader via Command line"; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/development/python-modules/graph-tool/2.x.x.nix b/pkgs/development/python-modules/graph-tool/2.x.x.nix index 99fe4b73cb9..0b89303dd5a 100644 --- a/pkgs/development/python-modules/graph-tool/2.x.x.nix +++ b/pkgs/development/python-modules/graph-tool/2.x.x.nix @@ -1,9 +1,11 @@ { stdenv, fetchurl, python, cairomm, sparsehash, pycairo, autoreconfHook, pkgconfig, boost, expat, scipy, numpy, cgal, gmp, mpfr, lndir, -gobjectIntrospection, pygobject3, gtk3, matplotlib }: +gobjectIntrospection, pygobject3, gtk3, matplotlib, ncurses, +buildPythonPackage }: -stdenv.mkDerivation rec { - version = "2.16"; +buildPythonPackage rec { + format = "other"; + version = "2.26"; name = "${python.libPrefix}-graph-tool-${version}"; meta = with stdenv.lib; { @@ -16,16 +18,19 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://downloads.skewed.de/graph-tool/graph-tool-${version}.tar.bz2"; - sha256 = "03b1pmh2gvsgyq491gvskx8fwgqy9k942faymdnhwpbbbfhx911p"; + sha256 = "0w7pd2h8ayr88kjl82c8fdshnk6f3xslc77gy7ma09zkbvf76qnz"; }; configureFlags = [ "--with-python-module-path=$(out)/${python.sitePackages}" + "--with-boost-libdir=${boost}/lib" + "--with-expat=${expat}" + "--with-cgal=${cgal}" "--enable-openmp" ]; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ ]; + buildInputs = [ ncurses ]; propagatedBuildInputs = [ boost diff --git a/pkgs/development/python-modules/green/default.nix b/pkgs/development/python-modules/green/default.nix new file mode 100644 index 00000000000..fa09e4ded21 --- /dev/null +++ b/pkgs/development/python-modules/green/default.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonPackage, fetchPypi, isPy3k, colorama, coverage, termstyle, unidecode, mock, backports_shutil_get_terminal_size }: + +buildPythonPackage rec { + pname = "green"; + version = "2.12.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "8cdd2934eff754c9664f373ee0d77cb1cb35dbbf3b719b8ae3b059718db875df"; + }; + + prePatch = '' + # See https://github.com/CleanCut/green/pull/182 + substituteInPlace setup.py --replace python-termstyle termstyle + ''; + + propagatedBuildInputs = [ + colorama coverage termstyle unidecode + ] ++ lib.optionals (!isPy3k) [ mock backports_shutil_get_terminal_size ]; + + meta = with lib; { + description = "Python test runner"; + homepage = https://github.com/CleanCut/green; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index d1f0903238c..47e9d179eea 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi, lib -, six, protobuf, enum34, futures, isPy26, isPy27, isPy34 }: +, six, protobuf3_5, enum34, futures, isPy26, isPy27, isPy34 }: buildPythonPackage rec { pname = "grpcio"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "e7c43b5619deff48cc177c1b0618c4beeb2797f910f160e3c2035d5baf790a5d"; }; - propagatedBuildInputs = [ six protobuf ] + propagatedBuildInputs = [ six protobuf3_5 ] ++ lib.optionals (isPy26 || isPy27 || isPy34) [ enum34 ] ++ lib.optionals (isPy26 || isPy27) [ futures ]; diff --git a/pkgs/development/python-modules/ha-ffmpeg/default.nix b/pkgs/development/python-modules/ha-ffmpeg/default.nix new file mode 100644 index 00000000000..4259b7ad053 --- /dev/null +++ b/pkgs/development/python-modules/ha-ffmpeg/default.nix @@ -0,0 +1,28 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k +, ffmpeg, async-timeout }: + +buildPythonPackage rec { + pname = "ha-ffmpeg"; + version = "1.9"; + + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "0644j5fqw8p6li6nrnm1rw7nhvsixq1c7gik3f1yx50776yg05i8"; + }; + + buildInputs = [ ffmpeg ]; + + propagatedBuildInputs = [ async-timeout ]; + + # only manual tests + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/pvizeli/ha-ffmpeg; + description = "Library for home-assistant to handle ffmpeg"; + license = licenses.bsd3; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/development/python-modules/hbmqtt/default.nix b/pkgs/development/python-modules/hbmqtt/default.nix index 379aa1c3cf4..ade4111c5a3 100644 --- a/pkgs/development/python-modules/hbmqtt/default.nix +++ b/pkgs/development/python-modules/hbmqtt/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "hbmqtt"; - version = "0.9.1"; + version = "0.9.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "04lqqcy84f9gcwqhrlvzp689r3mkdd8ipsnfzw8gryfny4lh8wrx"; + sha256 = "6f61e05007648a4f33e300fafcf42776ca95508ba1141799f94169427ce5018c"; }; propagatedBuildInputs = [ transitions websockets passlib docopt pyyaml ]; diff --git a/pkgs/development/python-modules/htmltreediff/default.nix b/pkgs/development/python-modules/htmltreediff/default.nix new file mode 100644 index 00000000000..5e839e4ada9 --- /dev/null +++ b/pkgs/development/python-modules/htmltreediff/default.nix @@ -0,0 +1,26 @@ +{ buildPythonPackage, fetchFromGitHub, isPy3k, lxml, html5lib, nose, stdenv }: + +buildPythonPackage rec { + version = "v0.1.2"; + pname = "htmltreediff"; + + disabled = isPy3k; + + src = fetchFromGitHub { + owner = "christian-oudard"; + repo = pname; + rev = version; + sha256 = "16mqp2jyznrw1mgd3qzybq28h2k5wz7vmmz1m6xpgscazyjhvvd1"; + }; + + propagatedBuildInputs = [ lxml html5lib ]; + + checkInputs = [ nose ]; + + meta = with stdenv.lib; { + description = " Structure-aware diff for html and xml documents"; + homepage = https://github.com/christian-oudard/htmltreediff; + license = licenses.bsdOriginal; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/development/python-modules/hvac/default.nix b/pkgs/development/python-modules/hvac/default.nix new file mode 100644 index 00000000000..8bc54e9226c --- /dev/null +++ b/pkgs/development/python-modules/hvac/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonPackage, fetchPypi, requests }: + +buildPythonPackage rec { + pname = "hvac"; + version = "0.5.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "2c9308334301daee3b5c6d56a032ca2c81eeb97d2777b73d795e201e8d037687"; + }; + + propagatedBuildInputs = [ requests ]; + + # Requires running a Vault server + doCheck = false; + + meta = with lib; { + description = "HashiCorp Vault API client"; + homepage = https://github.com/ianunruh/hvac; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/idna-ssl/default.nix b/pkgs/development/python-modules/idna-ssl/default.nix index 177e68f6295..b324705a152 100644 --- a/pkgs/development/python-modules/idna-ssl/default.nix +++ b/pkgs/development/python-modules/idna-ssl/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi, idna }: buildPythonPackage rec { - pname = "idna_ssl"; - version = "1.0.0"; + pname = "idna-ssl"; + version = "1.0.1"; src = fetchPypi { inherit pname version; - sha256 = "1227e44039bd31e02adaeafdbba61281596d623d222643fb021f87f2144ea147"; + sha256 = "1293f030bc608e9aa9cdee72aa93c1521bbb9c7698068c61c9ada6772162b979"; }; propagatedBuildInputs = [ idna ]; diff --git a/pkgs/development/python-modules/imbalanced-learn/default.nix b/pkgs/development/python-modules/imbalanced-learn/default.nix new file mode 100644 index 00000000000..65afe116510 --- /dev/null +++ b/pkgs/development/python-modules/imbalanced-learn/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildPythonPackage, fetchPypi, scikitlearn, pandas, nose, pytest }: + +buildPythonPackage rec { + pname = "imbalanced-learn"; + version = "0.3.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "1r5js9kw6rvmfvxxkfjlcxv5xn5h19qvg7d41byilxwq9kd515g4"; + }; + + propagatedBuildInputs = [ scikitlearn ]; + checkInputs = [ nose pytest pandas ]; + checkPhase = '' + export HOME=$PWD + # skip some tests that fail because of minimal rounding errors + py.test imblearn --ignore=imblearn/metrics/classification.py + py.test doc/*.rst + ''; + + meta = with stdenv.lib; { + description = "Library offering a number of re-sampling techniques commonly used in datasets showing strong between-class imbalance"; + homepage = https://github.com/scikit-learn-contrib/imbalanced-learn; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/klein/default.nix b/pkgs/development/python-modules/klein/default.nix new file mode 100644 index 00000000000..3dfbb4e17db --- /dev/null +++ b/pkgs/development/python-modules/klein/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchPypi +, six, twisted, werkzeug, incremental +, mock }: + +buildPythonPackage rec { + pname = "klein"; + version = "17.10.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "30aaf0d78a987d5dbfe0968a07367ad0c73e02823cc8eef4c54f80ab848370d0"; + }; + + propagatedBuildInputs = [ six twisted werkzeug incremental ]; + + checkInputs = [ mock ]; + + checkPhase = '' + trial klein + ''; + + meta = with lib; { + description = "Klein Web Micro-Framework"; + homepage = "https://github.com/twisted/klein"; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/konfig/default.nix b/pkgs/development/python-modules/konfig/default.nix new file mode 100644 index 00000000000..e7062bad5ee --- /dev/null +++ b/pkgs/development/python-modules/konfig/default.nix @@ -0,0 +1,48 @@ +{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, writeText, configparser, six, pytest, glibcLocales }: + +buildPythonPackage rec { + pname = "konfig"; + version = "1.1"; + + # konfig unconditionaly depend on configparser, even if it is part of + # the standard library in python 3.2 or above. + disabled = isPy3k; + + # PyPI tarball is missing utf8.ini, required for tests + src = fetchFromGitHub { + owner = "mozilla-services"; + repo = pname; + rev = version; + sha256 = "1h780fbrv275dcik4cs3rincza805z6q726b48r4a0qmh5d8160c"; + }; + + propagatedBuildInputs = [ configparser six ]; + + patches = [ (writeText "konfig.patch" '' + diff --git a/setup.py b/setup.py + index 96fd858..bb4db06 100644 + --- a/setup.py + +++ b/setup.py + @@ -20,7 +20,7 @@ setup(name='konfig', + author_email="tarek@mozilla.com", + include_package_data=True, + install_requires = [ + - 'configparser', 'argparse', 'six' + + 'configparser', 'six' + ], + zip_safe=False, + classifiers=classifiers, + '') ]; + + checkInputs = [ pytest glibcLocales ]; + + checkPhase = '' + LC_ALL=en_US.utf8 pytest -v konfig/tests + ''; + + meta = with lib; { + description = "Yet Another Config Parser"; + homepage = "https://github.com/mozilla-services/konfig"; + license = licenses.mpl20; + }; +} diff --git a/pkgs/development/python-modules/ldappool/default.nix b/pkgs/development/python-modules/ldappool/default.nix new file mode 100644 index 00000000000..58ca72a3dc9 --- /dev/null +++ b/pkgs/development/python-modules/ldappool/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, isPy3k +, pbr, ldap, fixtures, testresources, testtools }: + +buildPythonPackage rec { + name = "ldappool-${version}"; + version = "2.2.0"; + + src = fetchPypi { + pname = "ldappool"; + inherit version; + sha256 = "1akmzf51cjfvmd0nvvm562z1w9vq45zsx6fa72kraqgsgxhnrhqz"; + }; + + nativeBuildInputs = [ pbr ]; + + propagatedBuildInputs = [ ldap ]; + + checkInputs = [ fixtures testresources testtools ]; + + meta = with lib; { + description = "A simple connector pool for python-ldap"; + homepage = https://git.openstack.org/cgit/openstack/ldappool; + license = licenses.mpl20; + }; +} diff --git a/pkgs/development/python-modules/libais/default.nix b/pkgs/development/python-modules/libais/default.nix index 5d8c886e00b..5261a7b6564 100644 --- a/pkgs/development/python-modules/libais/default.nix +++ b/pkgs/development/python-modules/libais/default.nix @@ -1,20 +1,19 @@ -{ stdenv, buildPythonPackage, fetchurl, +{ stdenv, buildPythonPackage, fetchPypi, six, pytest, pytestrunner, pytestcov, coverage }: buildPythonPackage rec { pname = "libais"; - name = "${pname}-${version}"; - version = "0.16"; + version = "0.17"; - src = fetchurl { - url = "mirror://pypi/l/libais/${name}.tar.bz2"; - sha256 = "14dsh5k32ryszwdn6p45wrqp4ska6cc9qpm6lk5c5d1p4rc7wnhq"; + src = fetchPypi { + inherit pname version; + sha256 = "0pyka09h8nb0vlzh14npq4nxmzg1046lr3klgn97dsf5k0iflapb"; }; # data files missing doCheck = false; - buildInputs = [ pytest pytestrunner pytestcov coverage ]; + checkInputs = [ pytest pytestrunner pytestcov coverage ]; propagatedBuildInputs = [ six ]; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/libgpuarray/default.nix b/pkgs/development/python-modules/libgpuarray/default.nix index c0c2b205f58..26fe33995ed 100644 --- a/pkgs/development/python-modules/libgpuarray/default.nix +++ b/pkgs/development/python-modules/libgpuarray/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { libraryPath = lib.makeLibraryPath ( [] ++ lib.optionals cudaSupport [ cudatoolkit.lib cudatoolkit.out ] - ++ lib.optionals openclSupport [ ocl-icd clblas ] + ++ lib.optionals openclSupport ([ clblas ] ++ lib.optional (!stdenv.isDarwin) ocl-icd) ); preBuild = '' @@ -47,7 +47,7 @@ buildPythonPackage rec { postFixup = '' rm $out/lib/libgpuarray-static.a - + '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' function fixRunPath { p=$(patchelf --print-rpath $1) patchelf --set-rpath "$p:$libraryPath" $1 @@ -75,7 +75,7 @@ buildPythonPackage rec { description = "Library to manipulate tensors on GPU."; license = licenses.free; maintainers = with maintainers; [ artuuge ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/logster/default.nix b/pkgs/development/python-modules/logster/default.nix new file mode 100644 index 00000000000..e4b57e4ce40 --- /dev/null +++ b/pkgs/development/python-modules/logster/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pygtail }: + +buildPythonPackage rec { + pname = "logster"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "etsy"; + repo = pname; + rev = version; + sha256 = "06ac5hydas24h2cn8l5i69v1z0min5hwh6a1lcm1b08xnvpsi85q"; + }; + + propagatedBuildInputs = [ pygtail ]; + + meta = with lib; { + description = "Parses log files, generates metrics for Graphite and Ganglia"; + license = licenses.gpl3Plus; + homepage = https://github.com/etsy/logster; + }; +} diff --git a/pkgs/development/python-modules/miniupnpc/default.nix b/pkgs/development/python-modules/miniupnpc/default.nix new file mode 100644 index 00000000000..d267cb6a976 --- /dev/null +++ b/pkgs/development/python-modules/miniupnpc/default.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "miniupnpc"; + version = "2.0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0ca94zz7sr2x57j218aypxqcwkr23n8js30f3yrvvqbg929nr93y"; + }; + + meta = with stdenv.lib; { + description = "miniUPnP client"; + homepage = http://miniupnp.free.fr/; + license = licenses.mit; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/development/python-modules/moinmoin/default.nix b/pkgs/development/python-modules/moinmoin/default.nix index cedd45f2f22..6891dd2b627 100644 --- a/pkgs/development/python-modules/moinmoin/default.nix +++ b/pkgs/development/python-modules/moinmoin/default.nix @@ -1,13 +1,16 @@ -{ lib, buildPythonPackage, fetchurl, fetchpatch +{ lib, buildPythonPackage, fetchurl, fetchpatch, isPy3k , pytest, werkzeug, pygments }: buildPythonPackage rec { - name = "moinmoin-${ver}"; - ver = "1.9.9"; + name = "moinmoin"; + version = "1.9.9"; + + # SyntaxError in setup.py + disabled = isPy3k; src = fetchurl { - url = "http://static.moinmo.in/files/moin-${ver}.tar.gz"; + url = "http://static.moinmo.in/files/moin-${version}.tar.gz"; sha256 = "197ga41qghykmir80ik17f9hjpmixslv3zjgj7bj9qvs1dvdg5s3"; }; diff --git a/pkgs/development/python-modules/mrbob/default.nix b/pkgs/development/python-modules/mrbob/default.nix new file mode 100644 index 00000000000..3f974872b95 --- /dev/null +++ b/pkgs/development/python-modules/mrbob/default.nix @@ -0,0 +1,28 @@ +{ buildPythonPackage, stdenv, glibcLocales, mock, nose, isPy3k, argparse, jinja2, six +, fetchPypi, lib +}: + +buildPythonPackage rec { + pname = "mrbob"; + version = "0.1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "6737eaf98aaeae85e07ebef844ee5156df2f06a8b28d7c3dcb056f811c588121"; + }; + + disabled = isPy3k; + + checkInputs = [ nose glibcLocales mock ]; + checkPhase = '' + LC_ALL="en_US.UTF-8" nosetests + ''; + + propagatedBuildInputs = [ argparse jinja2 six ]; + + meta = with stdenv.lib; { + homepage = https://github.com/domenkozar/mr.bob; + description = "A tool to generate code skeletons from templates"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/msgpack-numpy/default.nix b/pkgs/development/python-modules/msgpack-numpy/default.nix new file mode 100644 index 00000000000..0244b03c484 --- /dev/null +++ b/pkgs/development/python-modules/msgpack-numpy/default.nix @@ -0,0 +1,38 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, cython +, msgpack-python +, numpy +, python +}: + +buildPythonPackage rec { + pname = "msgpack-numpy"; + version = "0.4.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1czf125nixzwskiqiw0145kfj15030sp334cb89gp5w4rz3h7img"; + }; + + buildInputs = [ + cython + ]; + + propagatedBuildInputs = [ + msgpack-python + numpy + ]; + + checkPhase = '' + ${python.interpreter} msgpack_numpy.py + ''; + + meta = with stdenv.lib; { + description = "Practical Machine Learning for NLP in Python"; + homepage = https://github.com/lebedov/msgpack-numpy; + license = licenses.bsd3; + maintainers = with maintainers; [ aborsu ]; + }; +} diff --git a/pkgs/development/python-modules/mt-940/default.nix b/pkgs/development/python-modules/mt-940/default.nix new file mode 100644 index 00000000000..5e2ad1d5aa2 --- /dev/null +++ b/pkgs/development/python-modules/mt-940/default.nix @@ -0,0 +1,35 @@ +{ buildPythonPackage, stdenv, pytestrunner, pyyaml, pytest, enum34 +, pytestpep8, pytestflakes,fetchFromGitHub, isPy3k, lib, glibcLocales +}: + +buildPythonPackage rec { + version = "v4.10.0"; + pname = "mt940"; + + src = fetchFromGitHub { + owner = "WoLpH"; + repo = pname; + rev = version; + sha256 = "1dsf2di8rr0iw2vaz6dppalby3y7i8x2bl0qjqvaiqacjxxvwj65"; + }; + + patches = [ + ./no-coverage.patch + ]; + + propagatedBuildInputs = [ pyyaml pytestrunner ] + ++ lib.optional (!isPy3k) enum34; + + LC_ALL="en_US.UTF-8"; + + checkInputs = [ pytestpep8 pytestflakes pytest glibcLocales ]; + checkPhase = '' + py.test + ''; + + meta = with stdenv.lib; { + description = "A library to parse MT940 files and returns smart Python collections for statistics and manipulation"; + homepage = "http://pythonhosted.org/mt-940/"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/mt-940/no-coverage.patch b/pkgs/development/python-modules/mt-940/no-coverage.patch new file mode 100644 index 00000000000..1617e6dd394 --- /dev/null +++ b/pkgs/development/python-modules/mt-940/no-coverage.patch @@ -0,0 +1,26 @@ +diff --git a/pytest.ini b/pytest.ini +index fef28f5..f366331 100644 +--- a/pytest.ini ++++ b/pytest.ini +@@ -4,10 +4,6 @@ python_files = + tests/*.py + + addopts = +- --cov mt940 +- --cov-report term-missing +- --cov-report html +- --no-cov-on-fail + --doctest-modules + --pep8 + --flakes +diff --git a/tests/requirements.txt b/tests/requirements.txt +index fc55572..e52cc28 100644 +--- a/tests/requirements.txt ++++ b/tests/requirements.txt +@@ -3,6 +3,5 @@ + -r ../docs/requirements.txt + pytest + pytest-cache +-pytest-cover + pytest-flakes + pytest-pep8 diff --git a/pkgs/development/python-modules/murmurhash/default.nix b/pkgs/development/python-modules/murmurhash/default.nix index 023c94cdc8e..f689bc2ff49 100644 --- a/pkgs/development/python-modules/murmurhash/default.nix +++ b/pkgs/development/python-modules/murmurhash/default.nix @@ -1,35 +1,34 @@ { stdenv , buildPythonPackage -, fetchFromGitHub +, fetchPypi , cython , python }: buildPythonPackage rec { pname = "murmurhash"; - version = "0.26.4"; - name = pname + "-" + version; + version = "0.28.0"; - src = fetchFromGitHub { - owner = "explosion"; - repo = "murmurhash"; - rev = "0.26.4"; - sha256 = "0n2j0glhlv2yh3fjgbg4d79j1c1fpchgjd4vnpw908l9mzchhmdv"; + src = fetchPypi { + inherit pname version; + sha256 = "16id8jppw8r54wisrlaaiprcszzb7d7lbpnskqn38s8i7vnkf4b5"; }; buildInputs = [ cython ]; + # No test + doCheck = false; + checkPhase = '' - cd murmurhash/tests - ${python.interpreter} -m unittest discover -p "*test*" + pytest murmurhash ''; meta = with stdenv.lib; { description = "Cython bindings for MurmurHash2"; homepage = https://github.com/explosion/murmurhash; license = licenses.mit; - maintainers = with maintainers; [ sdll ]; - }; + maintainers = with maintainers; [ aborsu sdll ]; + }; } diff --git a/pkgs/development/python-modules/neovim/default.nix b/pkgs/development/python-modules/neovim/default.nix index 6fcd82aca9e..646a8e7bb11 100644 --- a/pkgs/development/python-modules/neovim/default.nix +++ b/pkgs/development/python-modules/neovim/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "neovim"; - version = "0.2.1"; + version = "0.2.4"; src = fetchPypi { inherit pname version; - sha256 = "16vzxmp7f6dl20n30j5cwwvrjj5h3c2ch8ldbss31anf36nirsdp"; + sha256 = "0accfgyvihs08bwapgakx6w93p4vbrq2448n2z6gw88m2hja9jm3"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/networkx/default.nix b/pkgs/development/python-modules/networkx/default.nix index f6fc4139c85..3388aef9cef 100644 --- a/pkgs/development/python-modules/networkx/default.nix +++ b/pkgs/development/python-modules/networkx/default.nix @@ -3,32 +3,24 @@ , fetchPypi , nose , decorator -, isPy36 -, isPyPy }: buildPythonPackage rec { pname = "networkx"; - version = "1.11"; - - # Currently broken on PyPy. - # https://github.com/networkx/networkx/pull/1361 - disabled = isPyPy; + version = "2.1"; src = fetchPypi { inherit pname version; - sha256 = "1f74s56xb4ggixiq0vxyfxsfk8p20c7a099lpcf60izv1php03hd"; + extension = "zip"; + sha256 = "64272ca418972b70a196cb15d9c85a5a6041f09a2f32e0d30c0255f25d458bb1"; }; checkInputs = [ nose ]; propagatedBuildInputs = [ decorator ]; - # 17 failures with 3.6 https://github.com/networkx/networkx/issues/2396#issuecomment-304437299 - doCheck = !(isPy36); - meta = { homepage = "https://networkx.github.io/"; description = "Library for the creation, manipulation, and study of the structure, dynamics, and functions of complex networks"; license = lib.licenses.bsd3; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/nevow/default.nix b/pkgs/development/python-modules/nevow/default.nix new file mode 100644 index 00000000000..ccbb59c44dc --- /dev/null +++ b/pkgs/development/python-modules/nevow/default.nix @@ -0,0 +1,41 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k, twisted }: + +buildPythonPackage rec { + pname = "Nevow"; + version = "0.14.3"; + disabled = isPy3k; + + src = fetchPypi { + inherit version pname; + sha256 = "0pid8dj3p8ai715n9a59cryfxrrbxidpda3f8hvgmfpcrjdmnmmb"; + }; + + propagatedBuildInputs = [ twisted ]; + + checkPhase = '' + trial formless nevow + ''; + + meta = with stdenv.lib; { + description = "Nevow, a web application construction kit for Python"; + longDescription = '' + Nevow - Pronounced as the French "nouveau", or "noo-voh", Nevow + is a web application construction kit written in Python. It is + designed to allow the programmer to express as much of the view + logic as desired in Python, and includes a pure Python XML + expression syntax named stan to facilitate this. However it + also provides rich support for designer-edited templates, using + a very small XML attribute language to provide bi-directional + template manipulation capability. + + Nevow also includes formless, a declarative syntax for + specifying the types of method parameters and exposing these + methods to the web. Forms can be rendered automatically, and + form posts will be validated and input coerced, rendering error + pages if appropriate. Once a form post has validated + successfully, the method will be called with the coerced values. + ''; + homepage = https://github.com/twisted/nevow; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index a38f23d5536..65e9c54fde4 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -21,8 +21,12 @@ , simplejson , traits , xvfbwrapper +, pytestcov +, codecov # other dependencies , which +, bash +, glibcLocales }: assert !isPy3k -> configparser != null; @@ -36,9 +40,14 @@ buildPythonPackage rec { sha256 = "4c14c6cae1f530f89d76fa8136d52488b1daf3a02179da65121b76eaf4a6f0ea"; }; - doCheck = false; # fails with TypeError: None is not callable - checkInputs = [ which ]; - buildInputs = [ pytest mock ]; # required in installPhase + # see https://github.com/nipy/nipype/issues/2240 + patches = [ ./prov-version.patch ]; + + postPatch = '' + substituteInPlace nipype/interfaces/base/tests/test_core.py \ + --replace "/usr/bin/env bash" "${bash}/bin/bash" + ''; + propagatedBuildInputs = [ click dateutil @@ -59,6 +68,12 @@ buildPythonPackage rec { configparser ]; + checkInputs = [ pytest mock pytestcov codecov which glibcLocales ]; + + checkPhase = '' + LC_ALL="en_US.UTF-8" py.test -v --doctest-modules nipype + ''; + meta = with stdenv.lib; { homepage = http://nipy.org/nipype/; description = "Neuroimaging in Python: Pipelines and Interfaces"; diff --git a/pkgs/development/python-modules/nipype/prov-version.patch b/pkgs/development/python-modules/nipype/prov-version.patch new file mode 100644 index 00000000000..133295d0560 --- /dev/null +++ b/pkgs/development/python-modules/nipype/prov-version.patch @@ -0,0 +1,21 @@ +diff --git a/nipype/info.py b/nipype/info.py +index 1daa382e2..da338d0ea 100644 +--- a/nipype/info.py ++++ b/nipype/info.py +@@ -108,7 +108,6 @@ DATEUTIL_MIN_VERSION = '2.2' + PYTEST_MIN_VERSION = '3.0' + FUTURE_MIN_VERSION = '0.16.0' + SIMPLEJSON_MIN_VERSION = '3.8.0' +-PROV_VERSION = '1.5.0' + CLICK_MIN_VERSION = '6.6.0' + PYDOT_MIN_VERSION = '1.2.3' + +@@ -140,7 +139,7 @@ REQUIRES = [ + 'traits>=%s' % TRAITS_MIN_VERSION, + 'future>=%s' % FUTURE_MIN_VERSION, + 'simplejson>=%s' % SIMPLEJSON_MIN_VERSION, +- 'prov==%s' % PROV_VERSION, ++ 'prov<2', + 'click>=%s' % CLICK_MIN_VERSION, + 'funcsigs', + 'pytest>=%s' % PYTEST_MIN_VERSION, diff --git a/pkgs/development/python-modules/node-semver/default.nix b/pkgs/development/python-modules/node-semver/default.nix index 7351d2edfd3..9e4ba35680a 100644 --- a/pkgs/development/python-modules/node-semver/default.nix +++ b/pkgs/development/python-modules/node-semver/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchPypi, buildPythonPackage, pytest, tox }: buildPythonPackage rec { - name = "${pname}-${version}"; version = "0.3.0"; pname = "node-semver"; diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index be5a798b6c6..d4e7de2872d 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -1,4 +1,5 @@ -{ lib +{ stdenv +, lib , buildPythonPackage , fetchPypi , nose @@ -48,7 +49,11 @@ buildPythonPackage rec { checkPhase = '' runHook preCheck mkdir tmp - HOME=tmp nosetests -v + HOME=tmp nosetests -v ${if (stdenv.isDarwin) then '' + --exclude test_delete \ + --exclude test_checkpoints_follow_file + '' + else ""} ''; meta = { diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index f32f417c391..b561149b2ab 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -1,14 +1,14 @@ -{lib, fetchPypi, python, buildPythonPackage, isPy27, isPyPy, gfortran, nose, blas}: +{lib, fetchPypi, python, buildPythonPackage, isPy27, isPyPy, gfortran, nose, blas, hostPlatform }: buildPythonPackage rec { pname = "numpy"; - version = "1.14.0"; + version = "1.14.2"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "3de643935b212307b420248018323a44ec51987a336d1d747c1322afc3c099fb"; + sha256 = "facc6f925c3099ac01a1f03758100772560a0b020fb9d70f210404be08006bcb"; }; disabled = isPyPy; @@ -20,6 +20,18 @@ buildPythonPackage rec { ./numpy-distutils-C++.patch ]; + postPatch = lib.optionalString hostPlatform.isMusl '' + # Use fenv.h + sed -i \ + numpy/core/src/npymath/ieee754.c.src \ + numpy/core/include/numpy/ufuncobject.h \ + -e 's/__GLIBC__/__linux__/' + # Don't use various complex trig functions + substituteInPlace numpy/core/src/private/npy_config.h \ + --replace '#if defined(__GLIBC__)' "#if 1" \ + --replace '#if !__GLIBC_PREREQ(2, 18)' "#if 1" + ''; + preConfigure = '' sed -i 's/-faltivec//' numpy/distutils/system_info.py export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES diff --git a/pkgs/development/python-modules/odo/default.nix b/pkgs/development/python-modules/odo/default.nix index 73b3f0be150..f18420b676b 100644 --- a/pkgs/development/python-modules/odo/default.nix +++ b/pkgs/development/python-modules/odo/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pytest , datashape , numpy @@ -8,23 +8,28 @@ , toolz , multipledispatch , networkx +, dask }: buildPythonPackage rec { pname = "odo"; - version= "0.5.0"; - name = "${pname}-${version}"; + version= "0.5.1"; - src = fetchPypi { - inherit pname version; - sha256 = "1mh5k69d9ph9jd07jl9yqh78rbnh5cjspi1q530v3ml7ivjzz4p8"; + + src = fetchFromGitHub { + owner = "blaze"; + repo = pname; + rev = version; + sha256 = "142f4jvaqjn0dq6rvlk7d7mzcmc255a9z4nxc1b3a862hp4gvijs"; }; - checkInputs = [ pytest ]; + checkInputs = [ pytest dask ]; propagatedBuildInputs = [ datashape numpy pandas toolz multipledispatch networkx ]; + # Disable failing tests + # https://github.com/blaze/odo/issues/609 checkPhase = '' - py.test odo/tests + py.test -k "not test_numpy_asserts_type_after_dataframe" odo/tests ''; meta = { @@ -32,5 +37,8 @@ buildPythonPackage rec { description = "Data migration utilities"; license = lib.licenses.bsdOriginal; maintainers = with lib.maintainers; [ fridh ]; + # incomaptible with Networkx 2 + # see https://github.com/blaze/odo/pull/601 + broken = true; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/paypalrestsdk/default.nix b/pkgs/development/python-modules/paypalrestsdk/default.nix new file mode 100644 index 00000000000..dbc918e6c0d --- /dev/null +++ b/pkgs/development/python-modules/paypalrestsdk/default.nix @@ -0,0 +1,20 @@ +{ buildPythonPackage, fetchPypi +, requests, six, pyopenssl }: + +buildPythonPackage rec { + pname = "paypalrestsdk"; + version = "1.13.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "238713208031e8981bf70b3350b3d7f85ed64d34e0f21e4c1184444a546fee7f"; + }; + + propagatedBuildInputs = [ requests six pyopenssl ]; + + meta = { + homepage = https://developer.paypal.com/; + description = "Python APIs to create, process and manage payment"; + license = "PayPal SDK License"; + }; +} diff --git a/pkgs/development/python-modules/polib/default.nix b/pkgs/development/python-modules/polib/default.nix new file mode 100644 index 00000000000..3b2ee20c825 --- /dev/null +++ b/pkgs/development/python-modules/polib/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "polib"; + version = "1.0.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "16klwlswfbgmkzrra80fgzhic9447pk3mnr75r2fkz72bkvpcclb"; + }; + + # error: invalid command 'test' + doCheck = false; + + meta = with stdenv.lib; { + description = "A library to manipulate gettext files (po and mo files)"; + homepage = https://bitbucket.org/izi/polib/; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/pomegranate/default.nix b/pkgs/development/python-modules/pomegranate/default.nix index 77b373de259..e611e2ea5b1 100644 --- a/pkgs/development/python-modules/pomegranate/default.nix +++ b/pkgs/development/python-modules/pomegranate/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "pomegranate"; version = "0.8.1"; - name = "${pname}-${version}"; src = fetchFromGitHub { repo = pname; @@ -21,5 +20,9 @@ buildPythonPackage rec { homepage = https://github.com/jmschrei/pomegranate; license = licenses.mit; maintainers = with maintainers; [ rybern ]; + + # "pomegranate does not yet work with networkx 2.0" + # see https://github.com/jmschrei/pomegranate/issues/209 + broken = true; }; } diff --git a/pkgs/development/python-modules/poppler-qt5/default.nix b/pkgs/development/python-modules/poppler-qt5/default.nix new file mode 100644 index 00000000000..0ae689034a3 --- /dev/null +++ b/pkgs/development/python-modules/poppler-qt5/default.nix @@ -0,0 +1,42 @@ +{ buildPythonPackage, fetchPypi, stdenv, sip, qtbase, pyqt5, poppler, pkgconfig, fetchpatch +, python, substituteAll +}: + +buildPythonPackage rec { + pname = "python-poppler-qt5"; + version = "0.24.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0l69llw1fzwz8y90q0qp9q5pifbrqjjbwii7di54dwghw5fc6w1r"; + }; + + patches = [ + (substituteAll { + src = ./poppler-include-dir.patch; + poppler_include_dir = "${poppler.dev}/include/poppler"; + }) + (fetchpatch { + url = "https://github.com/wbsoft/python-poppler-qt5/commit/faf4d1308f89560b0d849671226e3080dfc72e79.patch"; + sha256 = "18krhh6wzsnpxzlzv02nginb1vralla8ai24zqk10nc4mj6fkj86"; + }) + ]; + + setupPyBuildFlags = [ + "--pyqt-sip-dir ${pyqt5}/share/sip/PyQt5" + "--qt-include-dir ${qtbase.dev}/include" + ]; + + buildInputs = [ qtbase.dev poppler ]; + nativeBuildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ sip pyqt5.dev ]; + + # no tests, just bindings for `poppler_qt5` + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/wbsoft/python-poppler-qt5; + license = licenses.gpl2; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/development/python-modules/poppler-qt5/poppler-include-dir.patch b/pkgs/development/python-modules/poppler-qt5/poppler-include-dir.patch new file mode 100644 index 00000000000..7106c1d6352 --- /dev/null +++ b/pkgs/development/python-modules/poppler-qt5/poppler-include-dir.patch @@ -0,0 +1,12 @@ +diff --git a/setup.py b/setup.py +index 59a75b0..0a73268 100644 +--- a/setup.py ++++ b/setup.py +@@ -169,6 +169,7 @@ class build_ext(build_ext_base): + 'Please specify via --pyqt-sip-flags=') + + self.include_dirs += (self.qt_include_dir, ++ '@poppler_include_dir@', + os.path.join(self.qt_include_dir, 'QtCore'), + os.path.join(self.qt_include_dir, 'QtGui'), + os.path.join(self.qt_include_dir, 'QtXml')) diff --git a/pkgs/development/python-modules/proboscis/default.nix b/pkgs/development/python-modules/proboscis/default.nix new file mode 100644 index 00000000000..f2373e4702f --- /dev/null +++ b/pkgs/development/python-modules/proboscis/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi, nose }: + +buildPythonPackage rec { + pname = "proboscis"; + version = "1.2.6.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "b822b243a7c82030fce0de97bdc432345941306d2c24ef227ca561dd019cd238"; + }; + + propagatedBuildInputs = [ nose ]; + doCheck = false; + + meta = with stdenv.lib; { + description = "A Python test framework that extends Python's built-in unittest module and Nose with features from TestNG"; + homepage = https://pypi.python.org/pypi/proboscis; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/progressbar/default.nix b/pkgs/development/python-modules/progressbar/default.nix new file mode 100644 index 00000000000..18dfa693f5b --- /dev/null +++ b/pkgs/development/python-modules/progressbar/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "progressbar"; + version = "2.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "dfee5201237ca0e942baa4d451fee8bf8a54065a337fabe7378b8585aeda56a3"; + }; + + # invalid command 'test' + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://pypi.python.org/pypi/progressbar; + description = "Text progressbar library for python"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ domenkozar ]; + }; +} diff --git a/pkgs/development/python-modules/prov/default.nix b/pkgs/development/python-modules/prov/default.nix index 8866382ea8f..f5f5b719b06 100644 --- a/pkgs/development/python-modules/prov/default.nix +++ b/pkgs/development/python-modules/prov/default.nix @@ -7,6 +7,8 @@ , six , pydotplus , rdflib +, pydot +, glibcLocales }: buildPythonPackage rec { @@ -18,6 +20,10 @@ buildPythonPackage rec { sha256 = "640dc158d931403bc6c1a0ad80702caae71f810bac21f90ec605865c8444b7bb"; }; + prePatch = '' + substituteInPlace setup.py --replace "six==1.10.0" "six>=1.10.0" + ''; + propagatedBuildInputs = [ lxml networkx @@ -26,7 +32,15 @@ buildPythonPackage rec { pydotplus rdflib ]; - doCheck = false; # takes ~60 mins + + checkInputs = [ + pydot + glibcLocales + ]; + + preCheck = '' + export LC_ALL="en_US.utf-8" + ''; meta = with stdenv.lib; { description = "A Python library for W3C Provenance Data Model (PROV)"; diff --git a/pkgs/development/python-modules/publicsuffix/default.nix b/pkgs/development/python-modules/publicsuffix/default.nix new file mode 100644 index 00000000000..9c90161c6ea --- /dev/null +++ b/pkgs/development/python-modules/publicsuffix/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k }: + +buildPythonPackage rec { + pname = "publicsuffix"; + version = "1.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1adx520249z2cy7ykwjr1k190mn2888wqn9jf8qm27ly4qymjxxf"; + }; + + + # fix the ASCII-mode LICENSE file read + # disable test_fetch and the doctests (which also invoke fetch) + patchPhase = stdenv.lib.optionalString isPy3k '' + sed -i "s/)\.read(/,encoding='utf-8'\0/" setup.py + '' + '' + sed -i -e "/def test_fetch/i\\ + \\t@unittest.skip('requires internet')" -e "/def additional_tests():/,+1d" tests.py + ''; + + meta = with stdenv.lib; { + description = "Allows to get the public suffix of a domain name"; + homepage = "https://pypi.python.org/pypi/publicsuffix/"; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/pushbullet/default.nix b/pkgs/development/python-modules/pushbullet/default.nix new file mode 100644 index 00000000000..74c0f66b91e --- /dev/null +++ b/pkgs/development/python-modules/pushbullet/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchPypi +, requests, websocket_client, python_magic +, pytest, mock }: + +buildPythonPackage rec { + pname = "pushbullet.py"; + version = "0.11.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "aa9dc7bb46e083e3497d46241154f12944a8f540e29d150330ca94db0b453b8d"; + }; + + propagatedBuildInputs = [ requests websocket_client python_magic ]; + + checkInputs = [ pytest mock ]; + + checkPhase = '' + PUSHBULLET_API_KEY="" py.test -k "not test_e2e and not test_auth" + ''; + + meta = with lib; { + description = "A simple python client for pushbullet.com"; + homepage = https://github.com/randomchars/pushbullet.py; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/pushover/default.nix b/pkgs/development/python-modules/pushover/default.nix new file mode 100644 index 00000000000..f5d1a9568c3 --- /dev/null +++ b/pkgs/development/python-modules/pushover/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi +, requests }: + +buildPythonPackage rec { + pname = "python-pushover"; + version = "0.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "0xlghiqd9rsgn7jdhc8v1xh3xspssihrw1vyy85gvjzxa1ah19sk"; + }; + + propagatedBuildInputs = [ requests ]; + + # tests require network + doCheck = false; + + meta = with stdenv.lib; { + description = "Bindings and command line utility for the Pushover notification service"; + homepage = https://github.com/Thibauth/python-pushover; + license = licenses.gpl3; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/development/python-modules/py4j/default.nix b/pkgs/development/python-modules/py4j/default.nix new file mode 100644 index 00000000000..9cf9828635f --- /dev/null +++ b/pkgs/development/python-modules/py4j/default.nix @@ -0,0 +1,22 @@ +{ buildPythonPackage, fetchPypi, stdenv }: + +buildPythonPackage rec { + pname = "py4j"; + + version = "0.10.6"; + + src = fetchPypi { + inherit pname version; + extension= "zip"; + sha256 = "10shayghsmcdr03w12a7sdm6vsxpjm8alw3ym3mr1hki45yarryk"; + }; + + propagatedBuildInputs = [ ]; + + meta = with stdenv.lib; { + description = "Py4J enables Python programs running in a Python interpreter to dynamically access Java objects in a Java Virtual Machine. Methods are called as if the Java objects resided in the Python interpreter and Java collections can be accessed through standard Python collection methods. Py4J also enables Java programs to call back Python objects."; + homepage = https://www.py4j.org/; + license = licenses.bsd3; + maintainers = [ maintainers.shlevy ]; + }; +} diff --git a/pkgs/development/python-modules/pyamf/default.nix b/pkgs/development/python-modules/pyamf/default.nix index 59acacd5051..5ac6ef82964 100644 --- a/pkgs/development/python-modules/pyamf/default.nix +++ b/pkgs/development/python-modules/pyamf/default.nix @@ -1,10 +1,12 @@ -{ stdenv, fetchPypi, buildPythonPackage, defusedxml }: +{ stdenv, fetchPypi, buildPythonPackage, isPy3k, defusedxml }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "PyAMF"; version = "0.8.0"; + # according to setup.py + disabled = isPy3k; + src = fetchPypi { inherit pname version; sha256 = "1r3lp9gkph48g9lijby5rs5daa3lhxs204r14zw4kvp3hf4xcm84"; diff --git a/pkgs/development/python-modules/pyaxmlparser/default.nix b/pkgs/development/python-modules/pyaxmlparser/default.nix new file mode 100644 index 00000000000..be82cc7bf02 --- /dev/null +++ b/pkgs/development/python-modules/pyaxmlparser/default.nix @@ -0,0 +1,20 @@ +{ buildPythonPackage, stdenv, lxml, click, fetchPypi }: + +buildPythonPackage rec { + version = "0.3.7"; + pname = "pyaxmlparser"; + + src = fetchPypi { + inherit pname version; + sha256 = "1spwr28sc6fc3cqdx2j2zq38qx889hixl4ahhf1nphpmrl39ypxr"; + }; + + propagatedBuildInputs = [ lxml click ]; + + meta = with stdenv.lib; { + description = "Python3 Parser for Android XML file and get Application Name without using Androguard"; + homepage = https://github.com/appknox/pyaxmlparser; + license = licenses.mit; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/development/python-modules/pychart/default.nix b/pkgs/development/python-modules/pychart/default.nix new file mode 100644 index 00000000000..259c87347d7 --- /dev/null +++ b/pkgs/development/python-modules/pychart/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy27 }: + +buildPythonPackage rec { + pname = "pychart"; + version = "1.39"; + + disabled = ! isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "882650928776a7ca72e67054a9e0ac98f78645f279c0cfb5910db28f03f07c2e"; + }; + + meta = with stdenv.lib; { + description = "Library for creating high quality encapsulated Postscript, PDF, PNG, or SVG charts"; + homepage = https://pypi.python.org/pypi/PyChart; + license = licenses.gpl2; + }; +} diff --git a/pkgs/development/python-modules/pycups/default.nix b/pkgs/development/python-modules/pycups/default.nix new file mode 100644 index 00000000000..28dff352e38 --- /dev/null +++ b/pkgs/development/python-modules/pycups/default.nix @@ -0,0 +1,22 @@ +{ stdenv, lib, buildPythonPackage, fetchurl, cups, libiconv }: + +buildPythonPackage rec { + pname = "pycups"; + version = "1.9.73"; + + src = fetchurl { + url = "http://cyberelk.net/tim/data/pycups/pycups-${version}.tar.bz2"; + sha256 = "c381be011889ca6f728598578c89c8ac9f7ab1e95b614474df9f2fa831ae5335"; + }; + + buildInputs = [ cups ] ++ lib.optional stdenv.isDarwin libiconv; + + # Wants to connect to CUPS + doCheck = false; + + meta = with lib; { + description = "Python bindings for libcups"; + homepage = http://cyberelk.net/tim/software/pycups/; + license = with licenses; [ gpl2Plus ]; + }; +} diff --git a/pkgs/development/python-modules/pyechonest/default.nix b/pkgs/development/python-modules/pyechonest/default.nix new file mode 100644 index 00000000000..6a2559710a9 --- /dev/null +++ b/pkgs/development/python-modules/pyechonest/default.nix @@ -0,0 +1,17 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k }: + +buildPythonPackage rec { + pname = "pyechonest"; + version = "8.0.2"; + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "496265f4b7d33483ec153b9e1b8333fe959b115f7e781510089c8313b7d86560"; + }; + + meta = with stdenv.lib; { + description = "Tap into The Echo Nest's Musical Brain for the best music search, information, recommendations and remix tools on the web"; + homepage = https://github.com/echonest/pyechonest; + }; +} diff --git a/pkgs/development/python-modules/pygame_sdl2/default.nix b/pkgs/development/python-modules/pygame_sdl2/default.nix index eab56f9f7ac..08c266da696 100644 --- a/pkgs/development/python-modules/pygame_sdl2/default.nix +++ b/pkgs/development/python-modules/pygame_sdl2/default.nix @@ -1,18 +1,30 @@ -{ stdenv, pkgs, buildPythonPackage, fetchFromGitHub, isPy27 +{ stdenv, pkgs, buildPythonPackage, fetchurl, isPy27, fetchpatch , cython, SDL2, SDL2_image, SDL2_ttf, SDL2_mixer, libjpeg, libpng }: buildPythonPackage rec { pname = "pygame_sdl2"; - version = "6.99.10.1227"; - name = "${pname}-${version}"; + version = "2.1.0"; + renpy_version = "6.99.14"; + name = "${pname}-${version}-${renpy_version}"; - src = fetchFromGitHub { - owner = "renpy"; - repo = "${pname}"; - rev = "renpy-${version}"; - sha256 = "10n6janvqh5adn7pcijqwqfh234sybjz788kb8ac6b4l11hy2lx1"; + src = fetchurl { + url = "https://www.renpy.org/dl/${renpy_version}/pygame_sdl2-${version}-for-renpy-${renpy_version}.tar.gz"; + sha256 = "1zsnb2bivbwysgxmfg9iv12arhpf3gqkmqinhciz955hlqv016b9"; }; + # force rebuild of headers needed for install + prePatch = '' + rm -rf gen gen3 + ''; + + patches = [ + # fix for recent sdl2 + (fetchpatch { + url = "https://github.com/apoleon/pygame_sdl2/commit/ced6051f4a4559a725804cc58c079e1efea0a573.patch"; + sha256 = "08rqjzvdlmmdf8kyd8ws5lzjy1mrwnds4fdy38inkyw7saydcxyr"; + }) + ]; + buildInputs = [ SDL2 SDL2_image SDL2_ttf SDL2_mixer cython libjpeg libpng diff --git a/pkgs/development/python-modules/pygtail/default.nix b/pkgs/development/python-modules/pygtail/default.nix new file mode 100644 index 00000000000..503dad717c2 --- /dev/null +++ b/pkgs/development/python-modules/pygtail/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchFromGitHub }: + +buildPythonPackage rec { + pname = "pygtail"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "bgreenlee"; + repo = pname; + rev = version; + sha256 = "1f8qlijiwn10jxg1bsi6q42fznbg8rw039yaxfh6rzbaj2gaxbz1"; + }; + + # remove at next bump, tag is one commit early for 0.8.0 + postPatch = '' + substituteInPlace pygtail/core.py \ + --replace 0.7.0 0.8.0 + ''; + + meta = with lib; { + description = "A library for reading log file lines that have not been read"; + license = licenses.gpl2Plus; + homepage = https://github.com/bgreenlee/pygtail; + }; +} diff --git a/pkgs/development/python-modules/pyhomematic/default.nix b/pkgs/development/python-modules/pyhomematic/default.nix index 1191b09ec38..be6fb7c8bb6 100644 --- a/pkgs/development/python-modules/pyhomematic/default.nix +++ b/pkgs/development/python-modules/pyhomematic/default.nix @@ -14,6 +14,9 @@ buildPythonPackage rec { sha256 = "1g181x2mrhxcaswr6vi2m7if97wv4rf2g2pny60334sciga8njfz"; }; + # Unreliable timing: https://github.com/danielperna84/pyhomematic/issues/126 + doCheck = false; + meta = with stdenv.lib; { description = "Python 3 Interface to interact with Homematic devices"; homepage = https://github.com/danielperna84/pyhomematic; diff --git a/pkgs/development/python-modules/pyjade/default.nix b/pkgs/development/python-modules/pyjade/default.nix new file mode 100644 index 00000000000..ad6742f5deb --- /dev/null +++ b/pkgs/development/python-modules/pyjade/default.nix @@ -0,0 +1,29 @@ +{ stdenv, buildPythonPackage, fetchPypi, pyramid_mako, nose, django, jinja2 +, tornado, pyramid, Mako, six }: + +buildPythonPackage rec { + pname = "pyjade"; + version = "4.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1mycn5cc9cp4fb0i2vzgkkk6d0glnkbilggwb4i99i09vr0vg5cd"; + }; + + buildInputs = [ pyramid_mako nose django jinja2 tornado pyramid Mako ]; + propagatedBuildInputs = [ six ]; + postPatch = '' + sed -i 's/1.4.99/1.99/' setup.py + ''; + checkPhase = '' + nosetests pyjade + ''; + # No tests distributed. https://github.com/syrusakbary/pyjade/issues/262 + doCheck = false; + meta = with stdenv.lib; { + description = "Jade syntax template adapter for Django, Jinja2, Mako and Tornado templates"; + homepage = "https://github.com/syrusakbary/pyjade"; + license = licenses.mit; + maintainers = with maintainers; [ nand0p ]; + }; +} diff --git a/pkgs/development/python-modules/pyocr/default.nix b/pkgs/development/python-modules/pyocr/default.nix index e253e64a41c..c30d80a0015 100644 --- a/pkgs/development/python-modules/pyocr/default.nix +++ b/pkgs/development/python-modules/pyocr/default.nix @@ -1,11 +1,12 @@ { lib, fetchFromGitHub, buildPythonPackage, pillow, six -, tesseract, cuneiform +, tesseract, cuneiform, isPy3k }: buildPythonPackage rec { pname = "pyocr"; version = "0.4.7"; name = pname + "-" + version; + disabled = !isPy3k; # Don't fetch from PYPI because it doesn't contain tests. src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index 225da204e21..50cb8ceba91 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -9,6 +9,7 @@ let version = "5.10"; inherit (pythonPackages) buildPythonPackage python dbus-python sip; + in buildPythonPackage { pname = pname; version = version; @@ -27,14 +28,16 @@ in buildPythonPackage { sha256 = "0l2zy6b7bfjxmg4bb8yikg6i8iy2xdwmvk7knfmrzfpqbmkycbrl"; }; - nativeBuildInputs = [ pkgconfig qmake ]; + outputs = [ "out" "dev" ]; - buildInputs = [ - lndir qtbase qtsvg qtwebkit qtwebengine dbus_libs + nativeBuildInputs = [ pkgconfig qmake lndir ]; + + buildInputs = [ dbus_libs ]; + + propagatedBuildInputs = [ + sip qtbase qtsvg qtwebkit qtwebengine ] ++ lib.optional withWebSockets qtwebsockets ++ lib.optional withConnectivity qtconnectivity; - propagatedBuildInputs = [ sip ]; - configurePhase = '' runHook preConfigure diff --git a/pkgs/development/python-modules/pyslurm/default.nix b/pkgs/development/python-modules/pyslurm/default.nix index 41b42bb63ec..74ff0be3833 100644 --- a/pkgs/development/python-modules/pyslurm/default.nix +++ b/pkgs/development/python-modules/pyslurm/default.nix @@ -2,14 +2,13 @@ buildPythonPackage rec { pname = "pyslurm"; - version = "20171102"; - name = pname + "-" + version; + version = "20170302"; src = fetchFromGitHub { repo = "pyslurm"; owner = "PySlurm"; - rev = "a2acbc820da419e308c5817998d2abe78a7b75e6"; - sha256 = "1wmlx5fh1xzjyksvmq7i083hmyvs7id61ysk2d9hbmf8rza498as"; + rev = "f5a756f199da404ec73cb7fcd7f04ec4d21ea3ff"; + sha256 = "1xn321nc8i8zmngh537j6lnng1rhdp460qx4skvh9daz5h9nxznx"; }; buildInputs = [ cython slurm ]; diff --git a/pkgs/development/python-modules/pyspark/default.nix b/pkgs/development/python-modules/pyspark/default.nix new file mode 100644 index 00000000000..3447c64cf6b --- /dev/null +++ b/pkgs/development/python-modules/pyspark/default.nix @@ -0,0 +1,28 @@ +{ buildPythonPackage, fetchPypi, stdenv, py4j }: + +buildPythonPackage rec { + pname = "pyspark"; + version = "2.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0vlq07yqy6c7ayg401i0qynnliqz405bmw1r8alkck0m1s8kcd8b"; + }; + + # pypandoc is broken with pandoc2, so we just lose docs. + postPatch = '' + sed -i "s/'pypandoc'//" setup.py + ''; + + propagatedBuildInputs = [ py4j ]; + + # Tests assume running spark... + doCheck = false; + + meta = with stdenv.lib; { + description = "Apache Spark"; + homepage = https://github.com/apache/spark/tree/master/python; + license = licenses.asl20; + maintainers = [ maintainers.shlevy ]; + }; +} diff --git a/pkgs/development/python-modules/python-ctags3/default.nix b/pkgs/development/python-modules/python-ctags3/default.nix new file mode 100644 index 00000000000..ba29154df3a --- /dev/null +++ b/pkgs/development/python-modules/python-ctags3/default.nix @@ -0,0 +1,17 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "python-ctags3"; + version = "1.2.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "62e1d48a8cd88756767f3f5e3f1b1a81bc84deeb736f0c9480a5b5d066f63c3e"; + }; + + meta = with lib; { + description = "Ctags indexing python bindings"; + homepage = https://github.com/jonashaag/python-ctags3; + license = licenses.lgpl3Plus; + }; +} diff --git a/pkgs/development/python-modules/python-gnupg/default.nix b/pkgs/development/python-modules/python-gnupg/default.nix index 9d29e109db4..12b6bf92918 100644 --- a/pkgs/development/python-modules/python-gnupg/default.nix +++ b/pkgs/development/python-modules/python-gnupg/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "python-gnupg"; - version = "0.4.1"; + version = "0.4.2"; src = fetchPypi { inherit pname version; - sha256 = "06hfw9cmiw5306fyisp3kzg1hww260qzip829g7y7pj1mwpb0izg"; + sha256 = "0wzvx8y4ii1y1vch28a0m6f2y4px9r7qd8fpimsx6y5z4pfscm2s"; }; propagatedBuildInputs = [ gnupg1 ]; diff --git a/pkgs/development/python-modules/python-ly/default.nix b/pkgs/development/python-modules/python-ly/default.nix new file mode 100644 index 00000000000..4c1bd05f4a0 --- /dev/null +++ b/pkgs/development/python-modules/python-ly/default.nix @@ -0,0 +1,21 @@ +{ buildPythonPackage, fetchPypi, stdenv }: + +buildPythonPackage rec { + pname = "python-ly"; + version = "0.9.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "0x98dv7p8mg26p4816yy8hz4f34zf6hpnnfmr56msgh9jnsm2qfl"; + }; + + # tests not shipped on `pypi` and + # seem to be broken ATM: https://github.com/wbsoft/python-ly/issues/70 + doCheck = false; + + meta = with stdenv.lib; { + description = "Tool and library for manipulating LilyPond files"; + license = licenses.gpl2; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/development/python-modules/readme_renderer/default.nix b/pkgs/development/python-modules/readme_renderer/default.nix index af0b64fc340..d9982919493 100644 --- a/pkgs/development/python-modules/readme_renderer/default.nix +++ b/pkgs/development/python-modules/readme_renderer/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , pytest +, CommonMark , bleach , docutils , pygments @@ -10,18 +11,17 @@ buildPythonPackage rec { pname = "readme_renderer"; - version = "17.2"; - name = "${pname}-${version}"; + version = "17.4"; src = fetchPypi { inherit pname version; - sha256 = "9deab442963a63a71ab494bf581b1c844473995a2357f4b3228a1df1c8cba8da"; + sha256 = "82d68175feec897af2a38fe8590778f14c3be5324cc62e3ce5752a9b1e4b60ab"; }; checkInputs = [ pytest ]; propagatedBuildInputs = [ - bleach docutils pygments six + CommonMark bleach docutils pygments six ]; checkPhase = '' @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = https://github.com/pypa/readme_renderer; license = lib.licenses.asl20; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/rednose/default.nix b/pkgs/development/python-modules/rednose/default.nix new file mode 100644 index 00000000000..d9736dcb6f3 --- /dev/null +++ b/pkgs/development/python-modules/rednose/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchPypi, nose, six, colorama, termstyle }: + +buildPythonPackage rec { + pname = "rednose"; + version = "1.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "6da77917788be277b70259edc0bb92fc6f28fe268b765b4ea88206cc3543a3e1"; + }; + + prePatch = '' + substituteInPlace setup.py --replace "six==1.10.0" "six>=1.10.0" + ''; + + checkInputs = [ six ]; + propagatedBuildInputs = [ nose colorama termstyle ]; + + meta = with lib; { + description = "A python nose plugin adding color to console results"; + homepage = https://github.com/JBKahn/rednose; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix index 44650618f5f..dc7b91a54a8 100644 --- a/pkgs/development/python-modules/regex/default.nix +++ b/pkgs/development/python-modules/regex/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, python }: @@ -13,11 +14,15 @@ buildPythonPackage rec { sha256 = "2353c0e983c4029caf32016f1dddef623c3117ac282a818468c6d2f5d541698d"; }; + postCheck = '' + echo "We now run tests ourselves, since the setuptools installer doesn't." + ${python.interpreter} -c 'import test_regex; test_regex.test_main();' + ''; + meta = { description = "Alternative regular expression module, to replace re"; homepage = https://bitbucket.org/mrabarnett/mrab-regex; license = lib.licenses.psfl; - platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ abbradar ]; }; } diff --git a/pkgs/development/python-modules/robomachine/default.nix b/pkgs/development/python-modules/robomachine/default.nix index 72407131cb1..f29cafb7aee 100644 --- a/pkgs/development/python-modules/robomachine/default.nix +++ b/pkgs/development/python-modules/robomachine/default.nix @@ -1,16 +1,15 @@ -{ stdenv, fetchurl, buildPythonPackage, pyparsing, argparse, robotframework }: +{ stdenv, fetchPypi, buildPythonPackage, pyparsing, argparse, robotframework, allpairspy }: buildPythonPackage rec { - pname = "robomachine"; + pname = "RoboMachine"; version = "0.8.0"; - name = pname + "-" + version; - src = fetchurl { - url = "mirror://pypi/R/RoboMachine/RoboMachine-0.6.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "242cfd9be0f7591138eaeba03c9c190f894ce045e1767ab7b90eca330259fc45"; }; - propagatedBuildInputs = [ pyparsing argparse robotframework ]; + propagatedBuildInputs = [ pyparsing argparse robotframework allpairspy ]; # Remove Windows .bat files postInstall = '' diff --git a/pkgs/development/python-modules/robotframework/default.nix b/pkgs/development/python-modules/robotframework/default.nix index 6a4a8867025..22f35121119 100644 --- a/pkgs/development/python-modules/robotframework/default.nix +++ b/pkgs/development/python-modules/robotframework/default.nix @@ -15,7 +15,6 @@ buildPythonPackage rec { description = "Generic test automation framework"; homepage = http://robotframework.org/; license = licenses.asl20; - platforms = platforms.linux; maintainers = with maintainers; [ bjornfor ]; }; } diff --git a/pkgs/development/python-modules/root_numpy/default.nix b/pkgs/development/python-modules/root_numpy/default.nix index 008bafae9d7..10511952228 100644 --- a/pkgs/development/python-modules/root_numpy/default.nix +++ b/pkgs/development/python-modules/root_numpy/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, isPy3k, buildPythonPackage, numpy, root }: +{ lib, fetchPypi, isPy3k, buildPythonPackage, numpy, root, nose }: buildPythonPackage rec { pname = "root_numpy"; @@ -11,6 +11,11 @@ buildPythonPackage rec { }; disabled = isPy3k; # blocked by #27649 + checkInputs = [ nose ]; + checkPhase = '' + python setup.py install_lib -d . + nosetests -s -v root_numpy + ''; propagatedBuildInputs = [ numpy root ]; diff --git a/pkgs/development/python-modules/rootpy/default.nix b/pkgs/development/python-modules/rootpy/default.nix index 0827786acfc..e9061b0a6a3 100644 --- a/pkgs/development/python-modules/rootpy/default.nix +++ b/pkgs/development/python-modules/rootpy/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, isPy3k, buildPythonPackage, numpy, matplotlib, root, root_numpy, tables }: +{ lib, fetchPypi, isPy3k, buildPythonPackage, numpy, matplotlib, root, root_numpy, tables, pytest }: buildPythonPackage rec { pname = "rootpy"; @@ -14,6 +14,14 @@ buildPythonPackage rec { propagatedBuildInputs = [ matplotlib numpy root root_numpy tables ]; + checkInputs = [ pytest ]; + checkPhase = '' + # tests fail with /homeless-shelter + export HOME=$PWD + # skip problematic tests + py.test rootpy -k "not test_stl and not test_cpp and not test_xrootd_glob_single and not test_xrootd_glob_multiple" + ''; + meta = with lib; { homepage = http://www.rootpy.org; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/scikitlearn/default.nix b/pkgs/development/python-modules/scikitlearn/default.nix index 6d32b056a0a..00bdcae1b9a 100644 --- a/pkgs/development/python-modules/scikitlearn/default.nix +++ b/pkgs/development/python-modules/scikitlearn/default.nix @@ -21,8 +21,9 @@ buildPythonPackage rec { LC_ALL="en_US.UTF-8"; # Disable doctests on OSX: https://github.com/scikit-learn/scikit-learn/issues/10213 + # Disable doctests everywhere: https://github.com/NixOS/nixpkgs/issues/35436 checkPhase = '' - HOME=$TMPDIR OMP_NUM_THREADS=1 nosetests ${stdenv.lib.optionalString stdenv.isDarwin "--doctest-options=+SKIP"} $out/${python.sitePackages}/sklearn/ + HOME=$TMPDIR OMP_NUM_THREADS=1 nosetests --doctest-options=+SKIP $out/${python.sitePackages}/sklearn/ ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/selenium/default.nix b/pkgs/development/python-modules/selenium/default.nix index 6b64cd18b4f..1661dd2cf3a 100644 --- a/pkgs/development/python-modules/selenium/default.nix +++ b/pkgs/development/python-modules/selenium/default.nix @@ -7,6 +7,19 @@ , xorg }: + +let + # Recompiling x_ignore_nofocus.so as the original one dlopen's libX11.so.6 by some + # absolute paths. Replaced by relative path so it is found when used in nix. + x_ignore_nofocus = + fetchFromGitHub { + owner = "SeleniumHQ"; + repo = "selenium"; + rev = "selenium-3.6.0"; + sha256 = "13wf4hx4i7nhl4s8xkziwxl0km1j873syrj4amragj6mpip2wn8v"; + }; +in + buildPythonPackage rec { pname = "selenium"; version = "3.6.0"; @@ -23,21 +36,11 @@ buildPythonPackage rec { geckodriver ]; - # Recompiling x_ignore_nofocus.so as the original one dlopen's libX11.so.6 by some - # absolute paths. Replaced by relative path so it is found when used in nix. - x_ignore_nofocus = - fetchFromGitHub { - owner = "SeleniumHQ"; - repo = "selenium"; - rev = "selenium-3.6.0"; - sha256 = "13wf4hx4i7nhl4s8xkziwxl0km1j873syrj4amragj6mpip2wn8v"; - }; - - patchPhase = '' + patchPhase = stdenv.lib.optionalString stdenv.isLinux '' cp "${x_ignore_nofocus}/cpp/linux-specific/"* . substituteInPlace x_ignore_nofocus.c --replace "/usr/lib/libX11.so.6" "${xorg.libX11.out}/lib/libX11.so.6" - gcc -c -fPIC x_ignore_nofocus.c -o x_ignore_nofocus.o - gcc -shared \ + cc -c -fPIC x_ignore_nofocus.c -o x_ignore_nofocus.o + cc -shared \ -Wl,${if stdenv.isDarwin then "-install_name" else "-soname"},x_ignore_nofocus.so \ -o x_ignore_nofocus.so \ x_ignore_nofocus.o diff --git a/pkgs/development/python-modules/serversyncstorage/default.nix b/pkgs/development/python-modules/serversyncstorage/default.nix index 40a580877af..1d9274610da 100644 --- a/pkgs/development/python-modules/serversyncstorage/default.nix +++ b/pkgs/development/python-modules/serversyncstorage/default.nix @@ -35,4 +35,8 @@ buildPythonPackage rec { pyramid sqlalchemy simplejson mozsvc cornice pyramid_hawkauth pymysql pymysqlsa umemcache WSGIProxy requests pybrowserid ]; + + meta = { + broken = true; # 2018-11-04 + }; } diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix index 7246205619f..6f10cfdf3ba 100644 --- a/pkgs/development/python-modules/shapely/default.nix +++ b/pkgs/development/python-modules/shapely/default.nix @@ -30,10 +30,9 @@ buildPythonPackage rec { sed -i "s|free = load_dll('c').free|free = load_dll('c', fallbacks=['${stdenv.cc.libc}/lib/${libc}']).free|" shapely/geos.py ''; - # tests/test_voctorized fails because the vectorized extension is not - # available in when running tests + # Disable the tests that improperly try to use the built extensions checkPhase = '' - py.test --ignore tests/test_vectorized.py + py.test -k 'not test_vectorized and not test_fallbacks' tests ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/slimit/default.nix b/pkgs/development/python-modules/slimit/default.nix new file mode 100644 index 00000000000..ff4c63891e5 --- /dev/null +++ b/pkgs/development/python-modules/slimit/default.nix @@ -0,0 +1,36 @@ +{ lib, buildPythonPackage, fetchPypi, isPy3k, fetchpatch, python, ply }: + +buildPythonPackage rec { + pname = "slimit"; + version = "0.8.1"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "f433dcef899f166b207b67d91d3f7344659cb33b8259818f084167244e17720b"; + }; + + # Some patches from https://github.com/rspivak/slimit/pull/65 + patches = lib.optionals isPy3k [ + (fetchpatch { + url = https://github.com/lelit/slimit/commit/a61e12d88cc123c4b7af2abef21d06fd182e561a.patch; + sha256 = "0lbhvkgn4l8g9fwvb81rfwjx7hsaq2pid8a5gczdk1ba65wfvdq5"; + }) + (fetchpatch { + url = https://github.com/lelit/slimit/commit/e8331659fb89e8a4613c5e4e338c877fead9c551.patch; + sha256 = "1hv4ysn09c9bfd5bxhhrp51hsi81hdidmx0y7zcrjjiich9ayrni"; + }) + ]; + + propagatedBuildInputs = [ ply ]; + + checkPhase = '' + ${python.interpreter} -m unittest discover -s src/slimit + ''; + + meta = with lib; { + description = "JavaScript minifier"; + homepage = http://slimit.readthedocs.org/; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/smart_open/default.nix b/pkgs/development/python-modules/smart_open/default.nix index 2e2020f61f0..c4992eb9d9b 100644 --- a/pkgs/development/python-modules/smart_open/default.nix +++ b/pkgs/development/python-modules/smart_open/default.nix @@ -3,7 +3,9 @@ , isPy3k , fetchPypi , boto +, boto3 , bz2file +, mock , moto , requests , responses @@ -12,14 +14,26 @@ buildPythonPackage rec { pname = "smart_open"; name = "${pname}-${version}"; - version = "1.5.6"; + version = "1.5.7"; src = fetchPypi { inherit pname version; - sha256 = "8fd2de1c359bd0074bd6d334a5b9820ae1c5b6ba563970b95052bace4b71baeb"; + sha256 = "0y1c29pdxxgxkymr7g2n59siqqaq351zbx9vz8433dxvzy4qgd7p"; }; - propagatedBuildInputs = [ boto bz2file requests responses moto ]; + # nixpkgs version of moto is >=1.2.0, remove version pin to fix build + postPatch = '' + substituteInPlace ./setup.py --replace "moto==0.4.31" "moto" + ''; + + # moto>=1.0.0 is backwards-incompatible and some tests fail with it, + # so disable tests for now + doCheck = false; + + checkInputs = [ mock moto responses ]; + + # upstream code requires both boto and boto3 + propagatedBuildInputs = [ boto boto3 bz2file requests ]; meta = { license = lib.licenses.mit; description = "smart_open is a Python 2 & Python 3 library for efficient streaming of very large file"; diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index 6c7c3c8400c..b94374aeda8 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -3,12 +3,11 @@ , buildPythonPackage , python , fetchPypi -, fetchFromGitHub +, html5lib , pytest , cython -, cymem , preshed -, pathlib2 +, ftfy , numpy , murmurhash , plac @@ -16,7 +15,6 @@ , ujson , dill , requests -, ftfy , thinc , pip , regex @@ -24,32 +22,49 @@ buildPythonPackage rec { pname = "spacy"; - version = "1.8.2"; + version = "2.0.9"; - src = fetchFromGitHub { - owner = "explosion"; - repo = "spaCy"; - rev = "v${version}"; - sha256 = "0v3bmmar31a6968y4wl0lmgnc3829l2mnwd8s959m4pqw1y1w648"; + src = fetchPypi { + inherit pname version; + sha256 = "1ihkhflhyz67bp73kfjqfrbcgdxi2msz5asbrh0pkk590c4vmms5"; }; + prePatch = '' + substituteInPlace setup.py --replace \ + "'html5lib==1.0b8'," \ + "'html5lib'," + + substituteInPlace setup.py --replace \ + "'regex==2017.4.5'," \ + "'regex'," + + substituteInPlace setup.py --replace \ + "'ftfy==2017.4.5'," \ + "'ftfy'," + + substituteInPlace setup.py --replace \ + "'pathlib'," \ + "\"pathlib; python_version<'3.4'\"," + ''; + propagatedBuildInputs = [ cython - cymem - pathlib2 - preshed - numpy - murmurhash - plac - six - ujson dill - requests + html5lib + murmurhash + numpy + plac + preshed regex - ftfy + requests + six thinc - pytest - pip + ujson + ftfy + ]; + + checkInputs = [ + pytest ]; doCheck = false; diff --git a/pkgs/development/python-modules/sseclient/default.nix b/pkgs/development/python-modules/sseclient/default.nix new file mode 100644 index 00000000000..9ac04e18e4f --- /dev/null +++ b/pkgs/development/python-modules/sseclient/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi +, requests, six +, backports_unittest-mock, pluggy, pytest, pytestrunner }: + +buildPythonPackage rec { + pname = "sseclient"; + version = "0.0.19"; + + src = fetchPypi { + inherit pname version; + sha256 = "7a2ea3f4c8525ae9a677bc8193df5db88e23bcaafcc34938a1ee665975703a9f"; + }; + + propagatedBuildInputs = [ requests six ]; + + checkInputs = [ backports_unittest-mock pytest pytestrunner ]; + + meta = with stdenv.lib; { + description = "Client library for reading Server Sent Event streams"; + homepage = https://github.com/btubbs/sseclient; + license = licenses.mit; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/development/python-modules/stem/default.nix b/pkgs/development/python-modules/stem/default.nix new file mode 100644 index 00000000000..1df139ab29c --- /dev/null +++ b/pkgs/development/python-modules/stem/default.nix @@ -0,0 +1,30 @@ +{ lib, buildPythonPackage, fetchPypi, python, mock }: + +buildPythonPackage rec { + pname = "stem"; + version = "1.6.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1va9p3ij7lxg6ixfsvaql06dn11l3fgpxmss1dhlvafm7sqizznp"; + }; + + postPatch = '' + rm test/unit/installation.py + sed -i "/test.unit.installation/d" test/settings.cfg + ''; + + checkInputs = [ mock ]; + + checkPhase = '' + touch .gitignore + ${python.interpreter} run_tests.py -u + ''; + + meta = with lib; { + description = "Controller library that allows applications to interact with Tor"; + homepage = https://stem.torproject.org/; + license = licenses.gpl3; + maintainers = with maintainers; [ phreedom ]; + }; +} diff --git a/pkgs/development/python-modules/tablib/default.nix b/pkgs/development/python-modules/tablib/default.nix new file mode 100644 index 00000000000..9f1bf2390b6 --- /dev/null +++ b/pkgs/development/python-modules/tablib/default.nix @@ -0,0 +1,29 @@ +{ buildPythonPackage, stdenv, fetchPypi, pytest, unicodecsv, pandas +, xlwt, openpyxl, pyyaml, xlrd, odfpy, fetchpatch +}: + +buildPythonPackage rec { + pname = "tablib"; + version = "0.12.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "11wxchj0qz77dn79yiq30k4b4gsm429f4bizk4lm4rb63nk51kxq"; + }; + + checkInputs = [ pytest unicodecsv pandas ]; + propagatedBuildInputs = [ xlwt openpyxl pyyaml xlrd odfpy ]; + + patches = [ + (fetchpatch { + url = "https://github.com/kennethreitz/tablib/commit/0e51a2d0944022af186d2dcd34c0ab3c47141ba5.patch"; + sha256 = "0lbbl871zdn5vpgqyjkil0c2ap3b5hz19rmihhyvrx7m4mlh1aij"; + }) + ]; + + meta = with stdenv.lib; { + description = "Tablib: format-agnostic tabular dataset library"; + homepage = http://python-tablib.org; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/termstyle/default.nix b/pkgs/development/python-modules/termstyle/default.nix new file mode 100644 index 00000000000..0a1c4e76412 --- /dev/null +++ b/pkgs/development/python-modules/termstyle/default.nix @@ -0,0 +1,20 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "termstyle"; + version = "0.1.11"; + + src = fetchPypi { + inherit pname version; + sha256 = "ef74b83698ea014112040cf32b1a093c1ab3d91c4dd18ecc03ec178fd99c9f9f"; + }; + + # Only manual tests + doCheck = false; + + meta = with lib; { + description = "Console colouring for python"; + homepage = "https://pypi.python.org/pypi/python-termstyle/0.1.10"; + license = licenses.bsdOriginal; + }; +} diff --git a/pkgs/development/python-modules/text-unidecode/default.nix b/pkgs/development/python-modules/text-unidecode/default.nix new file mode 100644 index 00000000000..79ee34c733b --- /dev/null +++ b/pkgs/development/python-modules/text-unidecode/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi, pytest }: + +buildPythonPackage rec { + pname = "text-unidecode"; + version = "1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1l081m1w8ibbx684ca71ibdy68iwqsivy6rf6yqvysdclzldbbyh"; + }; + + checkInputs = [ pytest ]; + + checkPhase = '' + py.test + ''; + + meta = with lib; { + description = "The most basic Text::Unidecode port"; + homepage = https://github.com/kmike/text-unidecode; + license = licenses.artistic1; + }; +} diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index 15794caf58b..2c6df953e16 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -1,15 +1,19 @@ { stdenv +, lib , pkgs , buildPythonPackage , fetchPypi -, fetchFromGitHub +, pythonOlder , pytest , cython , cymem +, msgpack-numpy +, msgpack-python , preshed , numpy , python , murmurhash +, pathlib , hypothesis , tqdm , cytoolz @@ -21,36 +25,21 @@ , dill }: -let - enableDebugging = true; - - pathlibLocked = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "pathlib"; - version = "1.0.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "17zajiw4mjbkkv6ahp3xf025qglkj0805m9s41c45zryzj6p2h39"; - }; - - doCheck = false; # fails to import support from test - }; -in buildPythonPackage rec { +buildPythonPackage rec { pname = "thinc"; - version = "6.5.1"; + version = "6.10.2"; name = pname + "-" + version; - src = fetchFromGitHub { - owner = "explosion"; - repo = "thinc"; - rev = "v${version}"; - sha256 = "008kmjsvanh6qgnpvsn3qacfcyprxirxbw4yfd8flyg7mxw793ws"; + src = fetchPypi { + inherit pname version; + sha256 = "0xia81wvfrhyriywab184s49g8rpl42vcf5fy3x6xxw50a2yn7cs"; }; propagatedBuildInputs = [ cython cymem + msgpack-numpy + msgpack-python preshed numpy murmurhash @@ -64,22 +53,34 @@ in buildPythonPackage rec { termcolor wrapt dill - pathlibLocked + ] ++ lib.optional (pythonOlder "3.4") pathlib; + + + checkInputs = [ + pytest ]; + prePatch = '' + substituteInPlace setup.py --replace \ + "'pathlib>=1.0.0,<2.0.0'," \ + "\"pathlib>=1.0.0,<2.0.0; python_version<'3.4'\"," + + substituteInPlace setup.py --replace \ + "'cytoolz>=0.8,<0.9'," \ + "'cytoolz>=0.8'," + ''; + + # Cannot find cython modules. doCheck = false; - # fails to import some modules - # checkPhase = '' - # ${python.interpreter} -m pytest thinc/tests - # # cd thinc/tests - # # ${python.interpreter} -m unittest discover -p "*test*" - # ''; + checkPhase = '' + pytest thinc/tests + ''; meta = with stdenv.lib; { description = "Practical Machine Learning for NLP in Python"; homepage = https://github.com/explosion/thinc; license = licenses.mit; - maintainers = with maintainers; [ sdll ]; + maintainers = with maintainers; [ aborsu sdll ]; }; } diff --git a/pkgs/development/python-modules/thumbor/default.nix b/pkgs/development/python-modules/thumbor/default.nix new file mode 100644 index 00000000000..94261b10e3d --- /dev/null +++ b/pkgs/development/python-modules/thumbor/default.nix @@ -0,0 +1,56 @@ +{ buildPythonPackage, stdenv, tornado, pycrypto, pycurl, pytz +, pillow, derpconf, python_magic, pexif, libthumbor, opencv, webcolors +, piexif, futures, statsd, thumborPexif, fetchPypi, fetchpatch, isPy3k, lib +}: + +buildPythonPackage rec { + pname = "thumbor"; + version = "6.4.2"; + + disabled = isPy3k; # see https://github.com/thumbor/thumbor/issues/1004 + + src = fetchPypi { + inherit pname version; + sha256 = "0y9mf78j80vjh4y0xvgnybc1wqfcwm5s19xhsfgkn12hh8pmh14d"; + }; + + patches = [ + (fetchpatch { + url = "https://github.com/thumbor/thumbor/commit/4f2bc99451409e404f7fa0f3e4a3bdaea7b49869.patch"; + sha256 = "0qqw1n1pfd8f8cn168718gzwf4b35j2j9ajyw643xpf92s0iq2cc"; + }) + ]; + + postPatch = '' + substituteInPlace "setup.py" \ + --replace '"argparse",' "" ${lib.optionalString isPy3k ''--replace '"futures",' ""''} + ''; + + propagatedBuildInputs = [ + tornado + pycrypto + pycurl + pytz + pillow + derpconf + python_magic + pexif + libthumbor + opencv + webcolors + piexif + statsd + ] ++ lib.optionals (!isPy3k) [ futures thumborPexif ]; + + # disabled due to too many impure tests and issues with native modules in + # the pure testing environment. See https://github.com/NixOS/nixpkgs/pull/37147 + # for further reference. + doCheck = false; + + meta = with stdenv.lib; { + description = "A smart imaging service"; + homepage = https://github.com/thumbor/thumbor/wiki; + license = licenses.mit; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/development/python-modules/tmdb3/default.nix b/pkgs/development/python-modules/tmdb3/default.nix new file mode 100644 index 00000000000..87b62cd78ac --- /dev/null +++ b/pkgs/development/python-modules/tmdb3/default.nix @@ -0,0 +1,20 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "tmdb3"; + version = "0.7.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "9b6e043b8a65d159e7fc8f720badc7ffee5109296e38676c107454e03a895983"; + }; + + # no tests implemented + doCheck = false; + + meta = with lib; { + description = "Python implementation of the v3 API for TheMovieDB.org, allowing access to movie and cast information"; + homepage = https://pypi.python.org/pypi/tmdb3; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/tunigo/default.nix b/pkgs/development/python-modules/tunigo/default.nix new file mode 100644 index 00000000000..767bb21f0fd --- /dev/null +++ b/pkgs/development/python-modules/tunigo/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchFromGitHub, requests, mock, responses, pytest }: + +buildPythonPackage rec { + pname = "tunigo"; + version = "1.0.0"; + + propagatedBuildInputs = [ requests ]; + + src = fetchFromGitHub { + owner = "trygveaa"; + repo = "python-tunigo"; + rev = "v${version}"; + sha256 = "07q9girrjjffzkn8xj4l3ynf9m4psi809zf6f81f54jdb330p2fs"; + }; + + checkInputs = [ mock responses pytest ]; + + checkPhase = '' + py.test + ''; + + meta = with lib; { + description = "Python API for the browse feature of Spotify"; + homepage = https://github.com/trygveaa/python-tunigo; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/virtual-display/default.nix b/pkgs/development/python-modules/virtual-display/default.nix new file mode 100644 index 00000000000..262d2a5d33a --- /dev/null +++ b/pkgs/development/python-modules/virtual-display/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi, EasyProcess }: + +buildPythonPackage rec { + pname = "PyVirtualDisplay"; + version = "0.2.1"; + + propagatedBuildInputs = [ EasyProcess ]; + + src = fetchPypi { + inherit pname version; + sha256 = "012883851a992f9c53f0dc6a512765a95cf241bdb734af79e6bdfef95c6e9982"; + }; + + # requires X server + doCheck = false; + + meta = with lib; { + description = "Python wrapper for Xvfb, Xephyr and Xvnc"; + homepage = "https://github.com/ponty/pyvirtualdisplay"; + license = licenses.bsdOriginal; + maintainers = with maintainers; [ layus ]; + }; +} diff --git a/pkgs/development/python-modules/weboob/default.nix b/pkgs/development/python-modules/weboob/default.nix index b71e4d3a4ff..a4b1b9c467a 100644 --- a/pkgs/development/python-modules/weboob/default.nix +++ b/pkgs/development/python-modules/weboob/default.nix @@ -33,6 +33,7 @@ buildPythonPackage rec { homepage = http://weboob.org; description = "Collection of applications and APIs to interact with websites without requiring the user to open a browser"; license = stdenv.lib.licenses.agpl3; + broken = true; # 2018-04-11 }; } diff --git a/pkgs/development/python-modules/xdot/default.nix b/pkgs/development/python-modules/xdot/default.nix new file mode 100644 index 00000000000..f9a735c97ab --- /dev/null +++ b/pkgs/development/python-modules/xdot/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi, isPy3k +, wrapGAppsHook, gobjectIntrospection, pygobject3, graphviz, gnome3 }: + +buildPythonPackage rec { + pname = "xdot"; + version = "0.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "01v9vmgdxz1q2m2vq2b4aqx4ycw7grc0l4is673ygvyg9rk02dx3"; + }; + + disabled = !isPy3k; + + nativeBuildInputs = [ wrapGAppsHook ]; + propagatedBuildInputs = [ gobjectIntrospection pygobject3 graphviz gnome3.gtk ]; + + meta = with lib; { + description = "xdot.py is an interactive viewer for graphs written in Graphviz's dot"; + homepage = https://github.com/jrfonseca/xdot.py; + license = licenses.lgpl3Plus; + }; +} diff --git a/pkgs/development/python-modules/yahooweather/default.nix b/pkgs/development/python-modules/yahooweather/default.nix new file mode 100644 index 00000000000..38c060aa8e8 --- /dev/null +++ b/pkgs/development/python-modules/yahooweather/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi, isPy3k }: + +buildPythonPackage rec { + pname = "yahooweather"; + version = "0.10"; + + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "0bsxmngkpzvqm50i2cnxjzhpbdhb8s10ly8h5q08696cjihqdkpa"; + }; + + # Tests require network access + doCheck = false; + + meta = with lib; { + description = "Provide an interface to the Yahoo! Weather RSS feed"; + homepage = https://github.com/pvizeli/yahooweather; + license = licenses.bsd2; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/development/python-modules/zope_copy/default.nix b/pkgs/development/python-modules/zope_copy/default.nix index 305928c1846..6bd7ae33fb9 100644 --- a/pkgs/development/python-modules/zope_copy/default.nix +++ b/pkgs/development/python-modules/zope_copy/default.nix @@ -8,20 +8,23 @@ buildPythonPackage rec { - pname = "zope_copy"; - version = "4.0.2"; + pname = "zope.copy"; + version = "4.1.0"; src = fetchPypi { inherit pname version; - extension = "zip"; - sha256 = "eb2a95866df1377741876a3ee62d8600e80089e6246e1a235e86791b29534457"; + sha256 = "702dbb52e2427a1cc2e2b4b3f5a40c64dcbf9ebed85888ae8fa67172263a6994"; }; propagatedBuildInputs = [ zope_interface ]; checkInputs = [ zope_location zope_schema ]; + checkPhase = '' + python -m unittest discover -s src/zope/copy + ''; + meta = { maintainers = with lib.maintainers; [ domenkozar ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/r-modules/README.md b/pkgs/development/r-modules/README.md index c8f02bd1478..e6fd09d7647 100644 --- a/pkgs/development/r-modules/README.md +++ b/pkgs/development/r-modules/README.md @@ -1,120 +1 @@ -R packages -========== - -## Installation - -Define an environment for R that contains all the libraries that you'd like to -use by adding the following snippet to your $HOME/.config/nixpkgs/config.nix file: - -```nix -{ - packageOverrides = super: let self = super.pkgs; in - { - - rEnv = super.rWrapper.override { - packages = with self.rPackages; [ - devtools - ggplot2 - reshape2 - yaml - optparse - ]; - }; - }; -} -``` - -Then you can use `nix-env -f "" -iA rEnv` to install it into your user -profile. The set of available libraries can be discovered by running the -command `nix-env -f "" -qaP -A rPackages`. The first column from that -output is the name that has to be passed to rWrapper in the code snipped above. - -However, if you'd like to add a file to your project source to make the -environment available for other contributors, you can create a `default.nix` -file like so: -```nix -let - pkgs = import {}; - stdenv = pkgs.stdenv; -in with pkgs; { - myProject = stdenv.mkDerivation { - name = "myProject"; - version = "1"; - src = if pkgs.lib.inNixShell then null else nix; - - buildInputs = with rPackages; [ - R - ggplot2 - knitr - ]; - }; -} -``` -and then run `nix-shell .` to be dropped into a shell with those packages -available. - -## RStudio - -RStudio uses a standard set of packages and ignores any custom R -environments or installed packages you may have. To create a custom -environment, see `rstudioWrapper`, which functions similarly to -`rWrapper`: - -```nix -{ - packageOverrides = super: let self = super.pkgs; in - { - - rstudioEnv = super.rstudioWrapper.override { - packages = with self.rPackages; [ - dplyr - ggplot2 - reshape2 - ]; - }; - }; -} -``` - -Then like above, `nix-env -f "" -iA rstudioEnv` will install -this into your user profile. - -Alternatively, you can create a self-contained `shell.nix` without the need to -modify any configuration files: - -```nix -{ pkgs ? import {} -}: - -pkgs.rstudioWrapper.override { - packages = with pkgs.rPackages; [ dplyr ggplot2 reshape2 ]; -} - -``` - -Executing `nix-shell` will then drop you into an environment equivalent to the -one above. If you need additional packages just add them to the list and -re-enter the shell. - -## Updating the package set - -```bash -nix-shell generate-shell.nix - -Rscript generate-r-packages.R cran > cran-packages.nix.new -mv cran-packages.nix.new cran-packages.nix - -Rscript generate-r-packages.R bioc > bioc-packages.nix.new -mv bioc-packages.nix.new bioc-packages.nix -``` - -`generate-r-packages.R ` reads `-packages.nix`, therefor the renaming. - - -## Testing if the Nix-expression could be evaluated - -```bash -nix-build test-evaluation.nix --dry-run -``` - -If this exits fine, the expression is ok. If not, you have to edit `default.nix` +Moved to [/doc/languages-frameworks/r.section.md](/doc/languages-frameworks/r.section.md) diff --git a/pkgs/development/ruby-modules/bundled-common/default.nix b/pkgs/development/ruby-modules/bundled-common/default.nix index 1f31aec886a..16f1abe1a89 100644 --- a/pkgs/development/ruby-modules/bundled-common/default.nix +++ b/pkgs/development/ruby-modules/bundled-common/default.nix @@ -29,7 +29,7 @@ with import ./functions.nix { inherit lib gemConfig; }; let gemFiles = bundlerFiles args; - importedGemset = if builtins.typeOf gemFiles.gemset == "path" + importedGemset = if builtins.typeOf gemFiles.gemset != "set" then import gemFiles.gemset else gemFiles.gemset; diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index ac0b2dd07f8..a442155a631 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -259,8 +259,9 @@ in ]; }; rugged = attrs: { - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cmake openssl libssh2 zlib ]; + dontUseCmakeConfigure = true; }; scrypt = attrs: diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index 3aa64356896..beebd8ada9b 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -5,12 +5,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "ammonite-${version}"; - version = "1.0.5"; + version = "1.1.0"; scalaVersion = "2.12"; src = fetchurl { url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}"; - sha256 = "10y73a4aaz3530qr9mms1j70c6dxgl9kwvnpbh062gnrbyw34z9l"; + sha256 = "0dx5w1ffnqazsyp6zxrmfcn7yhkkd81h7njwbqqv1pbchj5znj6l"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index 97bd0d6e3df..02f44f4bf70 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "cppcheck"; - version = "1.80"; + version = "1.82"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/${pname}/${name}.tar.bz2"; - sha256 = "1yx06yhkqlv9849ns7p97mj09gm9j7xc51q7yvzkk8ldvx4d4h88"; + sha256 = "0kk9injrxbv4mmmjswrh1kidal6l0sdzbp40kv8vwf5aiv8jjaz0"; }; buildInputs = [ pcre ]; diff --git a/pkgs/development/tools/analysis/retdec/default.nix b/pkgs/development/tools/analysis/retdec/default.nix index f88546163d4..a4c62e6fc32 100644 --- a/pkgs/development/tools/analysis/retdec/default.nix +++ b/pkgs/development/tools/analysis/retdec/default.nix @@ -116,5 +116,6 @@ in stdenv.mkDerivation rec { homepage = https://retdec.com; license = licenses.mit; maintainers = with maintainers; [ dtzWill ]; + broken = withPEPatterns; # retdec-full is broken, 2018-04-11 }; } diff --git a/pkgs/development/tools/analysis/spin/default.nix b/pkgs/development/tools/analysis/spin/default.nix index 284bf26782f..a59b452b432 100644 --- a/pkgs/development/tools/analysis/spin/default.nix +++ b/pkgs/development/tools/analysis/spin/default.nix @@ -7,12 +7,15 @@ let in stdenv.mkDerivation rec { name = "spin-${version}"; - version = "6.4.7"; + version = "6.4.8"; url-version = stdenv.lib.replaceChars ["."] [""] version; src = fetchurl { - url = "http://spinroot.com/spin/Src/spin${url-version}.tar.gz"; - sha256 = "17m2xaag0jns8hsa4466zxq35ylg9fnzynzvjjmx4ympbiil6mqv"; + # The homepage is behind CloudFlare anti-DDoS protection, which blocks cURL. + # Dropbox mirror from developers: + # https://www.dropbox.com/sh/fgzipzp4wpo3qc1/AADZPqS4aoR-pjNF6OQXRLQHa + url = "https://www.dropbox.com/sh/fgzipzp4wpo3qc1/AADya1lOBJZDbgWGrUSq-dfHa/spin${url-version}.tar.gz?raw=1"; + sha256 = "1rvamdsf0igzpndlr4ck7004jw9x1bg4xyf78zh5k9sp848vnd80"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/ansible-lint/default.nix b/pkgs/development/tools/ansible-lint/default.nix new file mode 100644 index 00000000000..16d2782b734 --- /dev/null +++ b/pkgs/development/tools/ansible-lint/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, pythonPackages, ansible }: + +pythonPackages.buildPythonPackage rec { + pname = "ansible-lint"; + version = "3.4.20"; + + src = fetchFromGitHub { + owner = "willthames"; + repo = "ansible-lint"; + rev = "v${version}"; + sha256 = "0wgczijrg5azn2f63hjbkas1w0f5hbvxnk3ia53w69mybk0gy044"; + }; + + propagatedBuildInputs = with pythonPackages; [ pyyaml six ] ++ [ ansible ]; + + checkInputs = [ pythonPackages.nose ]; + + postPatch = '' + patchShebangs bin/ansible-lint + ''; + + checkPhase = '' + nosetests test + ''; + + meta = { + homepage = "https://github.com/willthames/ansible-lint"; + description = "Best practices checker for Ansible"; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.sengaya ]; + }; +} diff --git a/pkgs/development/tools/build-managers/bazel/0.4.nix b/pkgs/development/tools/build-managers/bazel/0.4.nix index d131232e96d..7fa39ef2162 100644 --- a/pkgs/development/tools/build-managers/bazel/0.4.nix +++ b/pkgs/development/tools/build-managers/bazel/0.4.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { description = "Build tool that builds code quickly and reliably"; license = licenses.asl20; maintainers = with maintainers; [ cstrahan philandstuff ]; - platforms = platforms.unix; + platforms = platforms.linux; }; name = "bazel-${version}"; diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index 4a2afbeedfe..04d7d93455e 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -1,27 +1,59 @@ -{ lib, buildPythonApplication, fetchPypi -, requests, fasteners, pyyaml, pyjwt, colorama, patch -, bottle, pluginbase, six, distro, pylint, node-semver -, future, pygments, mccabe -}: +{ lib, fetchpatch, python }: -buildPythonApplication rec { - version = "0.28.1"; +let newPython = python.override { + packageOverrides = self: super: { + distro = super.distro.overridePythonAttrs (oldAttrs: rec { + version = "1.1.0"; + src = oldAttrs.src.override { + inherit version; + sha256 = "1vn1db2akw98ybnpns92qi11v94hydwp130s8753k6ikby95883j"; + }; + }); + node-semver = super.node-semver.overridePythonAttrs (oldAttrs: rec { + version = "0.2.0"; + src = oldAttrs.src.override { + inherit version; + sha256 = "1080pdxrvnkr8i7b7bk0dfx6cwrkkzzfaranl7207q6rdybzqay3"; + }; + }); + }; +}; + +in newPython.pkgs.buildPythonApplication rec { + version = "1.1.1"; # remove patch below when updating pname = "conan"; - src = fetchPypi { + src = newPython.pkgs.fetchPypi { inherit pname version; - sha256 = "0zf564iqh0099yd779f9fgk21qyp87d7cmgfj34hmncf8y3qh32a"; + sha256 = "1k1r401bc9fgmhd5n5f29mjcn346r3zdrm7p28nwpr2r2p3fslrl"; }; - propagatedBuildInputs = [ + checkInputs = with newPython.pkgs; [ + nose + parameterized + mock + webtest + codecov + ]; + + propagatedBuildInputs = with newPython.pkgs; [ requests fasteners pyyaml pyjwt colorama patch bottle pluginbase six distro pylint node-semver future pygments mccabe ]; - # enable tests once all of these pythonPackages available: - # [ nose nose_parameterized mock webtest codecov ] - doCheck = false; + patches = [ + # already merged, remove with the next package update + (fetchpatch { + url = "https://github.com/conan-io/conan/commit/51cc4cbd51ac8f9b9efa2bf678a2d7810e273ff3.patch"; + sha256 = "0d93g4hjpfk8z870imwdswkw5qba2h5zhfgwwijiqhr2pv7fl1y7"; + }) + ]; + + preCheck = '' + export HOME="$TMP/conan-home" + mkdir -p "$HOME" + ''; meta = with lib; { homepage = https://conan.io; diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 5e8f14c5f84..fbbddbd0fcb 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -52,12 +52,12 @@ rec { }; gradle_latest = gradleGen rec { - name = "gradle-4.6"; + name = "gradle-4.7"; nativeVersion = "0.14"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "05drn7a9d2blbmd3l0443bpf5qzf5frwnl9ww0bha1qfng95zgcq"; + sha256 = "016vvjvk3gfasv3h6dxxp48kp9v4ariqj280bijn835mr1yhi9gw"; }; }; diff --git a/pkgs/development/tools/build-managers/icmake/default.nix b/pkgs/development/tools/build-managers/icmake/default.nix index 5b455f267d8..6f4d726e294 100644 --- a/pkgs/development/tools/build-managers/icmake/default.nix +++ b/pkgs/development/tools/build-managers/icmake/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "icmake-${version}"; - version = "9.02.06"; + version = "9.02.07"; src = fetchFromGitHub { - sha256 = "1hs7fhqpkhlrjvjhfarf5bmxl8dw3r0immzdib27gwh3sfzgpx0b"; + sha256 = "1q3rwri5s1sqm4h75bahkjnlym4bk2ygg4fb75yrniwnj8rhdp12"; rev = version; repo = "icmake"; owner = "fbb-git"; diff --git a/pkgs/development/tools/build-managers/remake/default.nix b/pkgs/development/tools/build-managers/remake/default.nix index 7a199cc925a..926cc83cd97 100644 --- a/pkgs/development/tools/build-managers/remake/default.nix +++ b/pkgs/development/tools/build-managers/remake/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { homepage = http://bashdb.sourceforge.net/remake/; license = stdenv.lib.licenses.gpl3; description = "GNU Make with comprehensible tracing and a debugger"; - platforms = stdenv.lib.platforms.linux; + platforms = with stdenv.lib.platforms; linux ++ darwin; maintainers = with stdenv.lib.maintainers; [ bjornfor ]; }; } diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index 01a112bcecc..04102e7e8f8 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "sbt-${version}"; - version = "1.1.1"; + version = "1.1.4"; src = fetchurl { urls = [ @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz" "https://cocl.us/sbt-${version}.tgz" ]; - sha256 = "0fy04mnnrbdm7kfnjh6sv1q3g6wqzvwyf1p43f36rw3qalap544a"; + sha256 = "0hc361gb71psadx9gj78j0j60fw4sljjk8sl45hw6yzx3hmmkg9g"; }; patchPhase = '' diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix index 72c0aaabf85..a5d5702029b 100644 --- a/pkgs/development/tools/database/sqldeveloper/default.nix +++ b/pkgs/development/tools/database/sqldeveloper/default.nix @@ -1,7 +1,7 @@ { stdenv, makeWrapper, requireFile, unzip, openjdk }: stdenv.mkDerivation rec { - version = "17.4.0.355.2349"; + version = "17.4.1.054.0712"; name = "sqldeveloper-${version}"; src = requireFile rec { @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { nix-prefetch-url --type sha256 file:///path/to/${name} ''; # obtained by `sha256sum sqldeveloper-${version}-no-jre.zip` - sha256 = "70add9b5c998583416e3d127aeb63dde8e3d0489036982026b930c85496c7850"; + sha256 = "7e92ca94d02489002db291c96f1d67f9b2501a8967ff3457103fcf60c1eb154a"; }; buildInputs = [ makeWrapper unzip ]; diff --git a/pkgs/development/tools/gllvm/default.nix b/pkgs/development/tools/gllvm/default.nix new file mode 100644 index 00000000000..58ee7699b45 --- /dev/null +++ b/pkgs/development/tools/gllvm/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "gllvm-${version}"; + version = "2018-02-09"; + + goPackagePath = "github.com/SRI-CSL/gllvm"; + + src = fetchFromGitHub { + owner = "SRI-CSL"; + repo = "gllvm"; + rev = "ef83222afd22452dd1277329df227a326db9f84f"; + sha256 = "068mc8q7jmpjzh6pr0ygvv39mh4k7vz0dmiacxf3pdsigy3d1y1a"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/SRI-CSL/gllvm; + description = "Whole Program LLVM: wllvm ported to go"; + license = licenses.bsd3; + maintainers = with maintainers; [ dtzWill ]; + }; +} diff --git a/pkgs/development/tools/glslviewer/default.nix b/pkgs/development/tools/glslviewer/default.nix index 7a28f86562f..fbae0a76f25 100644 --- a/pkgs/development/tools/glslviewer/default.nix +++ b/pkgs/development/tools/glslviewer/default.nix @@ -1,36 +1,46 @@ { stdenv, fetchFromGitHub, glfw, pkgconfig, libXrandr, libXdamage , libXext, libXrender, libXinerama, libXcursor, libXxf86vm, libXi -, libX11, libGLU, Cocoa +, libX11, libGLU, python2Packages, ensureNewerSourcesForZipFilesHook +, Cocoa }: stdenv.mkDerivation rec { name = "glslviewer-${version}"; - version = "1.2"; + version = "2018-01-31"; src = fetchFromGitHub { owner = "patriciogonzalezvivo"; repo = "glslViewer"; - rev = version; - sha256 = "05ya821l2pd58anyx21mgmlm2bv78rz8cnbvqw4d9pfhq40z9psw"; + rev = "cac40f6984dbeb638950744c9508aa88591fea6c"; + sha256 = "1bykpp68hdxjlxvi1xicyb6822mz69q0adz24faaac372pls4bk0"; }; + nativeBuildInputs = [ pkgconfig ensureNewerSourcesForZipFilesHook ]; + buildInputs = [ + glfw libGLU glfw libXrandr libXdamage + libXext libXrender libXinerama libXcursor libXxf86vm + libXi libX11 + ] ++ (with python2Packages; [ python setuptools wrapPython ]) + ++ stdenv.lib.optional stdenv.isDarwin Cocoa; + pythonPath = with python2Packages; [ requests.dev ]; + # Makefile has /usr/local/bin hard-coded for 'make install' preConfigure = '' substituteInPlace Makefile \ --replace '/usr/local' "$out" \ --replace '/usr/bin/clang++' 'clang++' + substituteInPlace Makefile \ + --replace 'python setup.py install' "python setup.py install --prefix=$out" ''; preInstall = '' - mkdir -p $out/bin + mkdir -p $out/bin $(toPythonPath "$out") + export PYTHONPATH=$PYTHONPATH:$(toPythonPath "$out") ''; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - glfw libGLU glfw libXrandr libXdamage - libXext libXrender libXinerama libXcursor libXxf86vm - libXi libX11 - ] ++ stdenv.lib.optional stdenv.isDarwin Cocoa; + postInstall = '' + wrapPythonPrograms + ''; meta = with stdenv.lib; { description = "Live GLSL coding renderer"; diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix index 1ea4d160b4c..89cc7eb1bfe 100644 --- a/pkgs/development/tools/godot/default.nix +++ b/pkgs/development/tools/godot/default.nix @@ -1,41 +1,67 @@ -{ stdenv, fetchFromGitHub, gcc5, scons, pkgconfig, libX11, libXcursor -, libXinerama, libXrandr, libXrender, freetype, openssl, alsaLib -, libpulseaudio, libGLU, zlib }: +{ stdenv, lib, fetchFromGitHub, scons, pkgconfig, libX11, libXcursor +, libXinerama, libXrandr, libXrender, libpulseaudio ? null +, libXi ? null, libXext, libXfixes, freetype, openssl +, alsaLib, libGLU, zlib, yasm ? null }: -stdenv.mkDerivation rec { +let + options = { + touch = libXi != null; + pulseaudio = false; + }; +in stdenv.mkDerivation rec { name = "godot-${version}"; - version = "2.1.4"; + version = "3.0.2"; src = fetchFromGitHub { owner = "godotengine"; repo = "godot"; rev = "${version}-stable"; - sha256 = "0d2zczn5k7296sky5gllq55cxd586nx134y2iwjpkqqjr62g0h48"; + sha256 = "1ca1zznb7qqn4vf2nfwb8nww5x0k8fc4lwjvgydr6nr2mn70xka4"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - gcc5 scons libX11 libXcursor libXinerama libXrandr libXrender - freetype openssl alsaLib libpulseaudio libGLU zlib + scons libX11 libXcursor libXinerama libXrandr libXrender + libXi libXext libXfixes freetype openssl alsaLib libpulseaudio + libGLU zlib yasm ]; - patches = [ ./pkg_config_additions.patch ]; + patches = [ + ./pkg_config_additions.patch + ./dont_clobber_environment.patch + ]; enableParallelBuilding = true; buildPhase = '' - scons platform=x11 prefix=$out -j $NIX_BUILD_CORES + scons platform=x11 prefix=$out -j $NIX_BUILD_CORES \ + ${lib.concatStringsSep " " + (lib.mapAttrsToList (k: v: "${k}=${builtins.toJSON v}") options)} ''; installPhase = '' - mkdir $out/bin -p - cp bin/godot.* $out/bin/ + mkdir -p $out/bin + cp bin/godot.x11.tools.* $out/bin/godot + + mkdir -p "$out/share/applications" + cp misc/dist/linux/godot.desktop "$out/share/applications/" + substituteInPlace "$out/share/applications/godot.desktop" \ + --replace "Exec=godot" \ + "Exec=$out/bin/godot" + + mkdir -p "$out/share/icons/hicolor/scalable/apps/" + cp icon.svg "$out/share/icons/hicolor/scalable/apps/godot.svg" + cp icon.png "$out/share/icons/godot.png" + + mkdir -p "$out/share/man/man6" + cp misc/dist/linux/godot.6 "$out/share/man/man6/" ''; meta = { homepage = "https://godotengine.org"; description = "Free and Open Source 2D and 3D game engine"; license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; + platforms = [ "i686-linux" "x86_64-linux" ]; + maintainers = [ stdenv.lib.maintainers.twey ]; }; } diff --git a/pkgs/development/tools/godot/dont_clobber_environment.patch b/pkgs/development/tools/godot/dont_clobber_environment.patch new file mode 100644 index 00000000000..c57c85588a0 --- /dev/null +++ b/pkgs/development/tools/godot/dont_clobber_environment.patch @@ -0,0 +1,16 @@ ++++ build/SConstruct +@@ -69,10 +69,10 @@ + custom_tools = ['mingw'] + + env_base = Environment(tools=custom_tools) +-if 'TERM' in os.environ: +- env_base['ENV']['TERM'] = os.environ['TERM'] +-env_base.AppendENVPath('PATH', os.getenv('PATH')) +-env_base.AppendENVPath('PKG_CONFIG_PATH', os.getenv('PKG_CONFIG_PATH')) ++for k in ("TERM", "PATH", "PKG_CONFIG_PATH"): ++ if (k in os.environ): ++ env_base["ENV"][k] = os.environ[k] ++ + env_base.global_defaults = global_defaults + env_base.android_maven_repos = [] + env_base.android_flat_dirs = [] diff --git a/pkgs/development/tools/godot/pkg_config_additions.patch b/pkgs/development/tools/godot/pkg_config_additions.patch index 2302710ac7e..286372f060a 100644 --- a/pkgs/development/tools/godot/pkg_config_additions.patch +++ b/pkgs/development/tools/godot/pkg_config_additions.patch @@ -1,12 +1,13 @@ -+++ build/platform/x11/detect.py -@@ -139,6 +139,10 @@ - env.ParseConfig('pkg-config xinerama --cflags --libs') ++++ b/platform/x11/detect.py +@@ -142,6 +142,11 @@ env.ParseConfig('pkg-config xcursor --cflags --libs') + env.ParseConfig('pkg-config xinerama --cflags --libs') env.ParseConfig('pkg-config xrandr --cflags --libs') + env.ParseConfig('pkg-config xrender --cflags --libs') -+ env.ParseConfig('pkg-config oslibGLU_combined --cflags') ++ env.ParseConfig('pkg-config xext --cflags --libs') ++ env.ParseConfig('pkg-config xfixes --cflags --libs') + env.ParseConfig('pkg-config glu --cflags --libs') + env.ParseConfig('pkg-config zlib --cflags --libs') - - if (env['builtin_openssl'] == 'no'): - # Currently not compatible with OpenSSL 1.1.0+ + + if (env['touch']): + x11_error = os.system("pkg-config xi --modversion > /dev/null ") diff --git a/pkgs/development/tools/guile/guile-lint/default.nix b/pkgs/development/tools/guile/guile-lint/default.nix index 19441c54017..fd9347a4007 100644 --- a/pkgs/development/tools/guile/guile-lint/default.nix +++ b/pkgs/development/tools/guile/guile-lint/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { "exec guile" "exec ${guile}/bin/guile" ''; - doCheck = true; + doCheck = !stdenv.isDarwin; meta = with stdenv.lib; { description = "Checks syntax and semantics in a Guile program or module"; diff --git a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix index a259fd7d76b..2bcf13f1337 100644 --- a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix +++ b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix @@ -8,8 +8,8 @@ mkDerivation { src = fetchFromGitHub { owner = "haskell-CI"; repo = "haskell-ci"; - rev = "36b2ee58b9fd160d606608832625b2b6c32aec43"; - sha256 = "16g99jh5bszvfvb7mmyhl95mkf1l3ydyax8d9py91hi3m8r0c2x0"; + rev = "a4962f1478089654d138da7a3807dfcf2cef4284"; + sha256 = "1qwknajabxcfz5w5g0yn30r8p0180wxp7pncr6nwfhszlhay0vb7"; }; isLibrary = true; isExecutable = true; diff --git a/pkgs/development/tools/imatix_gsl/default.nix b/pkgs/development/tools/imatix_gsl/default.nix index a35af00f449..1d7b22ac5ee 100644 --- a/pkgs/development/tools/imatix_gsl/default.nix +++ b/pkgs/development/tools/imatix_gsl/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { buildInputs = [ pcre ]; + CCNAME = "cc"; + postPatch = "sed -e 's,/usr/bin/install,install,g' -i src/Makefile"; preBuild = "cd src"; installFlags = "DESTDIR=$(out)"; @@ -23,5 +25,6 @@ stdenv.mkDerivation rec { description = "A universal code generator"; platforms = platforms.unix; maintainers = [ maintainers.moosingin3space ]; + broken = stdenv.isLinux; # 2018-04-10 }; } diff --git a/pkgs/development/tools/jsduck/Gemfile.lock b/pkgs/development/tools/jsduck/Gemfile.lock index d3e1556a7b3..2a95d72c946 100644 --- a/pkgs/development/tools/jsduck/Gemfile.lock +++ b/pkgs/development/tools/jsduck/Gemfile.lock @@ -8,7 +8,7 @@ GEM parallel (~> 0.7.1) rdiscount (~> 2.1.6) rkelly-remix (~> 0.0.4) - json (1.8.3) + json (1.8.6) parallel (0.7.1) rdiscount (2.1.8) rkelly-remix (0.0.7) diff --git a/pkgs/development/tools/jsduck/gemset.nix b/pkgs/development/tools/jsduck/gemset.nix index d80bd70dd72..493cc42f4f4 100644 --- a/pkgs/development/tools/jsduck/gemset.nix +++ b/pkgs/development/tools/jsduck/gemset.nix @@ -19,10 +19,10 @@ json = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1nsby6ry8l9xg3yw4adlhk2pnc7i0h0rznvcss4vk3v74qg0k8lc"; + sha256 = "0qmj7fypgb9vag723w1a49qihxrcf5shzars106ynw2zk352gbv5"; type = "gem"; }; - version = "1.8.3"; + version = "1.8.6"; }; parallel = { source = { @@ -48,4 +48,4 @@ }; version = "0.0.7"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/misc/avarice/default.nix b/pkgs/development/tools/misc/avarice/default.nix index ca6cb14c2a4..a8f6426a3b7 100644 --- a/pkgs/development/tools/misc/avarice/default.nix +++ b/pkgs/development/tools/misc/avarice/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { homepage = https://sourceforge.net/projects/avarice/files/avarice/; maintainers = [ stdenv.lib.maintainers.smironov ]; platforms = stdenv.lib.platforms.linux; + broken = true; # 2018-04-10 }; } diff --git a/pkgs/development/tools/misc/avrdude/default.nix b/pkgs/development/tools/misc/avrdude/default.nix index e7d5aaceb2b..66b0467657a 100644 --- a/pkgs/development/tools/misc/avrdude/default.nix +++ b/pkgs/development/tools/misc/avrdude/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.nongnu.org/avrdude/; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = with platforms; linux ++ darwin; maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/development/tools/misc/cl-launch/default.nix b/pkgs/development/tools/misc/cl-launch/default.nix index ffd668dbdee..c245a32a06d 100644 --- a/pkgs/development/tools/misc/cl-launch/default.nix +++ b/pkgs/development/tools/misc/cl-launch/default.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation { description = ''Common Lisp launcher script''; license = stdenv.lib.licenses.llgpl21 ; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/tools/misc/gdb/darwin-target-match.patch b/pkgs/development/tools/misc/gdb/darwin-target-match.patch new file mode 100644 index 00000000000..1328d919503 --- /dev/null +++ b/pkgs/development/tools/misc/gdb/darwin-target-match.patch @@ -0,0 +1,11 @@ +--- a/configure 2017-06-05 00:51:26.000000000 +0900 ++++ b/configure 2018-03-06 23:12:58.000000000 +0900 +@@ -3603,7 +3603,7 @@ + noconfigdirs="$noconfigdirs ld gprof" + noconfigdirs="$noconfigdirs sim target-rda" + ;; +- x86_64-*-darwin[912]*) ++ x86_64-*-darwin*) + noconfigdirs="$noconfigdirs ld gas gprof" + noconfigdirs="$noconfigdirs sim target-rda" + ;; diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index e068b908caf..b5840d07466 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -35,7 +35,8 @@ stdenv.mkDerivation rec { sha256 = "0d2bpqk58fqlx21rbnk8mbcjlggzc9kb5sjirrfrrrjq70ka0qdg"; }; - patches = [ ./debug-info-from-env.patch ]; + patches = [ ./debug-info-from-env.patch ] + ++ stdenv.lib.optional stdenv.isDarwin ./darwin-target-match.patch; nativeBuildInputs = [ pkgconfig texinfo perl setupDebugInfoDirs ] # TODO(@Ericson2314) not sure if should be host or target diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index cf9057d35e2..38b28ec0f60 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, nixUnstable, perlPackages, buildEnv, releaseTools, fetchFromGitHub +{ stdenv, nix, perlPackages, buildEnv, releaseTools, fetchFromGitHub , makeWrapper, autoconf, automake, libtool, unzip, pkgconfig, sqlite, libpqxx , gitAndTools, mercurial, darcs, subversion, bazaar, openssl, bzip2, libxslt , guile, perl, postgresql, aws-sdk-cpp, nukeReferences, git, boehmgc @@ -54,8 +54,8 @@ let TextDiff TextTable XMLSimple - nixUnstable - nixUnstable.perl-bindings + nix + nix.perl-bindings git boehmgc ]; @@ -77,12 +77,12 @@ in releaseTools.nixBuild rec { [ makeWrapper autoconf automake libtool unzip nukeReferences pkgconfig sqlite libpqxx gitAndTools.topGit mercurial darcs subversion bazaar openssl bzip2 libxslt guile # optional, for Guile + Guix support - perlDeps perl nixUnstable + perlDeps perl nix postgresql # for running the tests ]; hydraPath = lib.makeBinPath ( - [ sqlite subversion openssh nixUnstable coreutils findutils pixz + [ sqlite subversion openssh nix coreutils findutils pixz gzip bzip2 lzma gnutar unzip git gitAndTools.topGit mercurial darcs gnused bazaar ] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] ); @@ -117,7 +117,7 @@ in releaseTools.nixBuild rec { --prefix PATH ':' $out/bin:$hydraPath \ --set HYDRA_RELEASE ${version} \ --set HYDRA_HOME $out/libexec/hydra \ - --set NIX_RELEASE ${nixUnstable.name or "unknown"} + --set NIX_RELEASE ${nix.name or "unknown"} done ''; # */ diff --git a/pkgs/development/tools/misc/kibana/5.x.nix b/pkgs/development/tools/misc/kibana/5.x.nix index 78b5df21fde..4aa9dc8b89a 100644 --- a/pkgs/development/tools/misc/kibana/5.x.nix +++ b/pkgs/development/tools/misc/kibana/5.x.nix @@ -11,9 +11,9 @@ let elasticArch = archOverrides."${arch}" or arch; plat = elemAt info 1; shas = { - "x86_64-linux" = "1a9n7s9r0klqvpyr5d3a410cchbsb0syx6cqwbhhnihqyw8dcx1i"; - "i686-linux" = "0snnm5jwynvk6ahgl42yzl2jhld0ykn79rlcq9dsv2gpqnjb2mmv"; - "x86_64-darwin" = "0qw3xkj3n3aja8s8n9r4hbr65jm9m6dgfjhhnrln434648rx7z4v"; + "x86_64-linux" = "1rg4j5jm8mkscrwlbx5qk3qjnblyr8z9x5npvyi73zm0ism0gv4j"; + "i686-linux" = "14swgx9sf23pns2pj30yyhd0p0rnykdimdrnj8rb0r1pqszw57qx"; + "x86_64-darwin" = "10l13r47nx74xicnjgb56nvgvx2al1zx1p8f09pjldaa2gjlll2k"; }; in stdenv.mkDerivation rec { name = "kibana-${version}"; diff --git a/pkgs/development/tools/misc/kibana/6.x.nix b/pkgs/development/tools/misc/kibana/6.x.nix index d7013ef46eb..17620c9df6c 100644 --- a/pkgs/development/tools/misc/kibana/6.x.nix +++ b/pkgs/development/tools/misc/kibana/6.x.nix @@ -7,8 +7,8 @@ let arch = elemAt info 0; plat = elemAt info 1; shas = { - "x86_64-linux" = "0kgsafjn8wzrmiklfc8jg0h3cx25lhlkby8yz35wgpx4wbk3vfjx"; - "x86_64-darwin" = "0i2kq9vyjv151kk7h3dl3hjrqqgxsg0qqxdqwjwlz9ja5axzlxhd"; + "x86_64-linux" = "1br9nvwa3i5sfcbnrxp2x3dxxnsbs9iavz6zwgw0jlh5ngf5vysk"; + "x86_64-darwin" = "1w4dck02i0rrl8m18kvy2zz02cb7bb9a2pdhkd1jfy1qz4ssnhii"; }; in stdenv.mkDerivation rec { name = "kibana-${version}"; diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix index 66895fb7fd3..6b497e45630 100644 --- a/pkgs/development/tools/parsing/ragel/default.nix +++ b/pkgs/development/tools/parsing/ragel/default.nix @@ -20,7 +20,7 @@ let configureFlags = [ "--with-colm=${colm}" ]; - NIX_CFLAGS_COMPILE = "-std=gnu++98"; + NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.cc.isGNU "-std=gnu++98"; doCheck = true; diff --git a/pkgs/development/tools/setupcfg2nix/default.nix b/pkgs/development/tools/setupcfg2nix/default.nix new file mode 100644 index 00000000000..5d1f015e805 --- /dev/null +++ b/pkgs/development/tools/setupcfg2nix/default.nix @@ -0,0 +1,19 @@ +{ buildSetupcfg, fetchFromGitHub, lib }: + +buildSetupcfg rec { + info = import ./info.nix; + src = fetchFromGitHub { + owner = "target"; + repo = "setupcfg2nix"; + rev = info.version; + sha256 = "1zn9njpzwhwikrirgjlyz6ys3xr8gq61ry8blmnpscqvhsdhxcs6"; + }; + application = true; + meta = { + description = "Generate nix expressions from setup.cfg for a python package."; + homepage = https://github.com/target/setupcfg2nix; + license = lib.licenses.mit; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.shlevy ]; + }; +} diff --git a/pkgs/development/tools/setupcfg2nix/info.nix b/pkgs/development/tools/setupcfg2nix/info.nix new file mode 100644 index 00000000000..b0d5873ed63 --- /dev/null +++ b/pkgs/development/tools/setupcfg2nix/info.nix @@ -0,0 +1,7 @@ +{ + pname = ''setupcfg2nix''; + version = ''1.1.0''; + install_requires = [ + ''setuptools'' + ]; +} diff --git a/pkgs/development/web/kore/default.nix b/pkgs/development/web/kore/default.nix index eac2046a233..b0dc2ba041a 100644 --- a/pkgs/development/web/kore/default.nix +++ b/pkgs/development/web/kore/default.nix @@ -20,6 +20,10 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; + # added to fix build w/gcc7 and clang5 + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-error=pointer-compare" + + stdenv.lib.optionalString stdenv.cc.isClang " -Wno-error=unknown-warning-option"; + enableParallelBuilding = true; meta = with stdenv.lib; { diff --git a/pkgs/development/web/nodejs/no-xcodebuild.patch b/pkgs/development/web/nodejs/no-xcodebuild.patch new file mode 100644 index 00000000000..94184152a03 --- /dev/null +++ b/pkgs/development/web/nodejs/no-xcodebuild.patch @@ -0,0 +1,13 @@ +diff -Naur node-v8.9.4/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py node-v8.9.4-new/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py +--- node-v8.9.4/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py 2018-01-03 03:34:44.000000000 +0100 ++++ node-v8.9.4-new/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py 2018-03-12 11:15:37.972537585 +0100 +@@ -1251,7 +1251,8 @@ + if XCODE_VERSION_CACHE: + return XCODE_VERSION_CACHE + try: +- version_list = GetStdout(['xcodebuild', '-version']).splitlines() ++ #version_list = GetStdout(['xcodebuild', '-version']).splitlines() ++ version_list = ['Xcode 9.2', 'Build version 9C40b'] + # In some circumstances xcodebuild exits 0 but doesn't return + # the right results; for example, a user on 10.7 or 10.8 with + # a bogus path set via xcode-select diff --git a/pkgs/development/web/nodejs/v6.nix b/pkgs/development/web/nodejs/v6.nix index c2ca341751b..6dd9dd6f8e1 100644 --- a/pkgs/development/web/nodejs/v6.nix +++ b/pkgs/development/web/nodejs/v6.nix @@ -5,7 +5,7 @@ let in buildNodejs { inherit enableNpm; - version = "6.13.0"; - sha256 = "012dpfqxsrmd3xc4dmq0mik1kab4czf56s8wm2jvm7xjqvi6y5mp"; - patches = lib.optionals stdenv.isDarwin [ ./no-xcode.patch ]; + version = "6.14.1"; + sha256 = "1hxyasy42ih9brgp37n9j85s5vwir3g32k5i3j0vx2kizy4xlphi"; + patches = lib.optionals stdenv.isDarwin [ ./no-xcode.patch ./no-xcodebuild.patch ]; } diff --git a/pkgs/development/web/nodejs/v8.nix b/pkgs/development/web/nodejs/v8.nix index fa5f10e8f7b..942c6cc3fd8 100644 --- a/pkgs/development/web/nodejs/v8.nix +++ b/pkgs/development/web/nodejs/v8.nix @@ -5,7 +5,7 @@ let in buildNodejs { inherit enableNpm; - version = "8.9.4"; - sha256 = "0vy8rlg58kg75j4sw3xadmbrwxfa56iaykmjl18g9a8wkjfdxp3c"; - patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ]; + version = "8.11.1"; + sha256 = "12kmsh5cl72dq5hzik1cczn2n5crbfqqd1xmrzqgryipx98yp9j0"; + patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ./no-xcodebuild.patch ]; } diff --git a/pkgs/development/web/nodejs/v9.nix b/pkgs/development/web/nodejs/v9.nix index af3a8b4d22f..f6f8aa8d1ab 100644 --- a/pkgs/development/web/nodejs/v9.nix +++ b/pkgs/development/web/nodejs/v9.nix @@ -5,7 +5,7 @@ let in buildNodejs { inherit enableNpm; - version = "9.6.1"; - sha256 = "04hi7lwdizwqqbyi77f4z12gnsh673h92brmbssrmw5kjx6h4k5q"; + version = "9.11.1"; + sha256 = "0k4xkcymf4y3k2bxjryb2lj97bxnng75x7a77i2wgx94749kvp13"; patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ]; } diff --git a/pkgs/development/web/remarkjs/generate.sh b/pkgs/development/web/remarkjs/generate.sh index 63d43c6773f..040aaf97716 100644 --- a/pkgs/development/web/remarkjs/generate.sh +++ b/pkgs/development/web/remarkjs/generate.sh @@ -1,3 +1,3 @@ #!/bin/sh -e -node2nix -i pkgs.json -c nodepkgs.nix -e ../../node-packages/node-env.nix +node2nix -6 -i pkgs.json -c nodepkgs.nix -e ../../node-packages/node-env.nix diff --git a/pkgs/development/web/remarkjs/node-packages.nix b/pkgs/development/web/remarkjs/node-packages.nix index 8ece92b4a3f..4c8a6c6db97 100644 --- a/pkgs/development/web/remarkjs/node-packages.nix +++ b/pkgs/development/web/remarkjs/node-packages.nix @@ -1,1060 +1,79 @@ -# This file has been generated by node2nix 1.2.0. Do not edit! +# This file has been generated by node2nix 1.5.3. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: let sources = { - "JSONStream-1.3.1" = { + "@sinonjs/formatio-2.0.0" = { + name = "_at_sinonjs_slash_formatio"; + packageName = "@sinonjs/formatio"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-2.0.0.tgz"; + sha512 = "37dc2svic03crmc9mvs4xc16rd28cbbf33js9ndp8278gb5xi40h1yzx467h3ca9mszjfwwr9vyfnvfbk07dj7gz039izrsq0085kln"; + }; + }; + "JSONStream-1.3.2" = { name = "JSONStream"; packageName = "JSONStream"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.1.tgz"; - sha1 = "707f761e01dae9e16f1bcf93703b78c70966579a"; - }; - }; - "assert-1.4.1" = { - name = "assert"; - packageName = "assert"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz"; - sha1 = "99912d591836b5a6f5b345c0f07eefc08fc65d91"; - }; - }; - "browser-pack-6.0.2" = { - name = "browser-pack"; - packageName = "browser-pack"; - version = "6.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/browser-pack/-/browser-pack-6.0.2.tgz"; - sha1 = "f86cd6cef4f5300c8e63e07a4d512f65fbff4531"; - }; - }; - "browser-resolve-1.11.2" = { - name = "browser-resolve"; - packageName = "browser-resolve"; - version = "1.11.2"; - src = fetchurl { - url = "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.2.tgz"; - sha1 = "8ff09b0a2c421718a1051c260b32e48f442938ce"; - }; - }; - "browserify-zlib-0.1.4" = { - name = "browserify-zlib"; - packageName = "browserify-zlib"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz"; - sha1 = "bb35f8a519f600e0fa6b8485241c979d0141fb2d"; - }; - }; - "buffer-5.0.5" = { - name = "buffer"; - packageName = "buffer"; - version = "5.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer/-/buffer-5.0.5.tgz"; - sha1 = "35c9393244a90aff83581063d16f0882cecc9418"; - }; - }; - "cached-path-relative-1.0.1" = { - name = "cached-path-relative"; - packageName = "cached-path-relative"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.0.1.tgz"; - sha1 = "d09c4b52800aa4c078e2dd81a869aac90d2e54e7"; - }; - }; - "concat-stream-1.5.2" = { - name = "concat-stream"; - packageName = "concat-stream"; - version = "1.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz"; - sha1 = "708978624d856af41a5a741defdd261da752c266"; - }; - }; - "console-browserify-1.1.0" = { - name = "console-browserify"; - packageName = "console-browserify"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz"; - sha1 = "f0241c45730a9fc6323b206dbf38edc741d0bb10"; - }; - }; - "constants-browserify-1.0.0" = { - name = "constants-browserify"; - packageName = "constants-browserify"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz"; - sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; - }; - }; - "crypto-browserify-3.11.0" = { - name = "crypto-browserify"; - packageName = "crypto-browserify"; - version = "3.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.11.0.tgz"; - sha1 = "3652a0906ab9b2a7e0c3ce66a408e957a2485522"; - }; - }; - "defined-1.0.0" = { - name = "defined"; - packageName = "defined"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz"; - sha1 = "c98d9bcef75674188e110969151199e39b1fa693"; - }; - }; - "deps-sort-2.0.0" = { - name = "deps-sort"; - packageName = "deps-sort"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/deps-sort/-/deps-sort-2.0.0.tgz"; - sha1 = "091724902e84658260eb910748cccd1af6e21fb5"; - }; - }; - "domain-browser-1.1.7" = { - name = "domain-browser"; - packageName = "domain-browser"; - version = "1.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.7.tgz"; - sha1 = "867aa4b093faa05f1de08c06f4d7b21fdf8698bc"; - }; - }; - "duplexer2-0.1.4" = { - name = "duplexer2"; - packageName = "duplexer2"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz"; - sha1 = "8b12dab878c0d69e3e7891051662a32fc6bddcc1"; - }; - }; - "events-1.1.1" = { - name = "events"; - packageName = "events"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/events/-/events-1.1.1.tgz"; - sha1 = "9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"; - }; - }; - "glob-7.1.1" = { - name = "glob"; - packageName = "glob"; - version = "7.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz"; - sha1 = "805211df04faaf1c63a3600306cdf5ade50b2ec8"; - }; - }; - "has-1.0.1" = { - name = "has"; - packageName = "has"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/has/-/has-1.0.1.tgz"; - sha1 = "8461733f538b0837c9361e39a9ab9e9704dc2f28"; - }; - }; - "htmlescape-1.1.1" = { - name = "htmlescape"; - packageName = "htmlescape"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/htmlescape/-/htmlescape-1.1.1.tgz"; - sha1 = "3a03edc2214bca3b66424a3e7959349509cb0351"; - }; - }; - "https-browserify-0.0.1" = { - name = "https-browserify"; - packageName = "https-browserify"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz"; - sha1 = "3f91365cabe60b77ed0ebba24b454e3e09d95a82"; - }; - }; - "inherits-2.0.3" = { - name = "inherits"; - packageName = "inherits"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; - sha1 = "633c2c83e3da42a502f52466022480f4208261de"; - }; - }; - "insert-module-globals-7.0.1" = { - name = "insert-module-globals"; - packageName = "insert-module-globals"; - version = "7.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.0.1.tgz"; - sha1 = "c03bf4e01cb086d5b5e5ace8ad0afe7889d638c3"; - }; - }; - "labeled-stream-splicer-2.0.0" = { - name = "labeled-stream-splicer"; - packageName = "labeled-stream-splicer"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.0.tgz"; - sha1 = "a52e1d138024c00b86b1c0c91f677918b8ae0a59"; - }; - }; - "module-deps-4.1.1" = { - name = "module-deps"; - packageName = "module-deps"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/module-deps/-/module-deps-4.1.1.tgz"; - sha1 = "23215833f1da13fd606ccb8087b44852dcb821fd"; - }; - }; - "os-browserify-0.1.2" = { - name = "os-browserify"; - packageName = "os-browserify"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/os-browserify/-/os-browserify-0.1.2.tgz"; - sha1 = "49ca0293e0b19590a5f5de10c7f265a617d8fe54"; - }; - }; - "parents-1.0.1" = { - name = "parents"; - packageName = "parents"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/parents/-/parents-1.0.1.tgz"; - sha1 = "fedd4d2bf193a77745fe71e371d73c3307d9c751"; - }; - }; - "path-browserify-0.0.0" = { - name = "path-browserify"; - packageName = "path-browserify"; - version = "0.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz"; - sha1 = "a0b870729aae214005b7d5032ec2cbbb0fb4451a"; - }; - }; - "process-0.11.9" = { - name = "process"; - packageName = "process"; - version = "0.11.9"; - src = fetchurl { - url = "https://registry.npmjs.org/process/-/process-0.11.9.tgz"; - sha1 = "7bd5ad21aa6253e7da8682264f1e11d11c0318c1"; - }; - }; - "punycode-1.4.1" = { - name = "punycode"; - packageName = "punycode"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"; - sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; - }; - }; - "querystring-es3-0.2.1" = { - name = "querystring-es3"; - packageName = "querystring-es3"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz"; - sha1 = "9ec61f79049875707d69414596fd907a4d711e73"; - }; - }; - "read-only-stream-2.0.0" = { - name = "read-only-stream"; - packageName = "read-only-stream"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/read-only-stream/-/read-only-stream-2.0.0.tgz"; - sha1 = "2724fd6a8113d73764ac288d4386270c1dbf17f0"; - }; - }; - "readable-stream-2.2.6" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "2.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.6.tgz"; - sha1 = "8b43aed76e71483938d12a8d46c6cf1a00b1f816"; - }; - }; - "resolve-1.3.2" = { - name = "resolve"; - packageName = "resolve"; version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.3.2.tgz"; - sha1 = "1f0442c9e0cbb8136e87b9305f932f46c7f28235"; + url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.2.tgz"; + sha1 = "c102371b6ec3a7cf3b847ca00c20bb0fce4c6dea"; }; }; - "shasum-1.0.2" = { - name = "shasum"; - packageName = "shasum"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/shasum/-/shasum-1.0.2.tgz"; - sha1 = "e7012310d8f417f4deb5712150e5678b87ae565f"; - }; - }; - "shell-quote-1.6.1" = { - name = "shell-quote"; - packageName = "shell-quote"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/shell-quote/-/shell-quote-1.6.1.tgz"; - sha1 = "f4781949cce402697127430ea3b3c5476f481767"; - }; - }; - "stream-browserify-2.0.1" = { - name = "stream-browserify"; - packageName = "stream-browserify"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz"; - sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"; - }; - }; - "stream-http-2.6.3" = { - name = "stream-http"; - packageName = "stream-http"; - version = "2.6.3"; - src = fetchurl { - url = "https://registry.npmjs.org/stream-http/-/stream-http-2.6.3.tgz"; - sha1 = "4c3ddbf9635968ea2cfd4e48d43de5def2625ac3"; - }; - }; - "string_decoder-0.10.31" = { - name = "string_decoder"; - packageName = "string_decoder"; - version = "0.10.31"; - src = fetchurl { - url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; - sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; - }; - }; - "subarg-1.0.0" = { - name = "subarg"; - packageName = "subarg"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz"; - sha1 = "f62cf17581e996b48fc965699f54c06ae268b8d2"; - }; - }; - "syntax-error-1.3.0" = { - name = "syntax-error"; - packageName = "syntax-error"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/syntax-error/-/syntax-error-1.3.0.tgz"; - sha1 = "1ed9266c4d40be75dc55bf9bb1cb77062bb96ca1"; - }; - }; - "through2-2.0.3" = { - name = "through2"; - packageName = "through2"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz"; - sha1 = "0004569b37c7c74ba39c43f3ced78d1ad94140be"; - }; - }; - "timers-browserify-1.4.2" = { - name = "timers-browserify"; - packageName = "timers-browserify"; - version = "1.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.2.tgz"; - sha1 = "c9c58b575be8407375cb5e2462dacee74359f41d"; - }; - }; - "tty-browserify-0.0.0" = { - name = "tty-browserify"; - packageName = "tty-browserify"; - version = "0.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz"; - sha1 = "a157ba402da24e9bf957f9aa69d524eed42901a6"; - }; - }; - "url-0.11.0" = { - name = "url"; - packageName = "url"; - version = "0.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/url/-/url-0.11.0.tgz"; - sha1 = "3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"; - }; - }; - "util-0.10.3" = { - name = "util"; - packageName = "util"; - version = "0.10.3"; - src = fetchurl { - url = "https://registry.npmjs.org/util/-/util-0.10.3.tgz"; - sha1 = "7afb1afe50805246489e3db7fe0ed379336ac0f9"; - }; - }; - "vm-browserify-0.0.4" = { - name = "vm-browserify"; - packageName = "vm-browserify"; - version = "0.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz"; - sha1 = "5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"; - }; - }; - "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"; - }; - }; - "jsonparse-1.3.0" = { - name = "jsonparse"; - packageName = "jsonparse"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.0.tgz"; - sha1 = "85fc245b1d9259acc6941960b905adf64e7de0e8"; - }; - }; - "through-2.3.8" = { - name = "through"; - packageName = "through"; - version = "2.3.8"; - src = fetchurl { - url = "https://registry.npmjs.org/through/-/through-2.3.8.tgz"; - sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; - }; - }; - "combine-source-map-0.7.2" = { - name = "combine-source-map"; - packageName = "combine-source-map"; - version = "0.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.7.2.tgz"; - sha1 = "0870312856b307a87cc4ac486f3a9a62aeccc09e"; - }; - }; - "umd-3.0.1" = { - name = "umd"; - packageName = "umd"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/umd/-/umd-3.0.1.tgz"; - sha1 = "8ae556e11011f63c2596708a8837259f01b3d60e"; - }; - }; - "convert-source-map-1.1.3" = { - name = "convert-source-map"; - packageName = "convert-source-map"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.3.tgz"; - sha1 = "4829c877e9fe49b3161f3bf3673888e204699860"; - }; - }; - "inline-source-map-0.6.2" = { - name = "inline-source-map"; - packageName = "inline-source-map"; - version = "0.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.6.2.tgz"; - sha1 = "f9393471c18a79d1724f863fa38b586370ade2a5"; - }; - }; - "lodash.memoize-3.0.4" = { - name = "lodash.memoize"; - packageName = "lodash.memoize"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-3.0.4.tgz"; - sha1 = "2dcbd2c287cbc0a55cc42328bd0c736150d53e3f"; - }; - }; - "source-map-0.5.6" = { - name = "source-map"; - packageName = "source-map"; - version = "0.5.6"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz"; - sha1 = "75ce38f52bf0733c5a7f0c118d81334a2bb5f412"; - }; - }; - "resolve-1.1.7" = { - name = "resolve"; - packageName = "resolve"; - version = "1.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz"; - sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b"; - }; - }; - "pako-0.2.9" = { - name = "pako"; - packageName = "pako"; - version = "0.2.9"; - src = fetchurl { - url = "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz"; - sha1 = "f3f7522f4ef782348da8161bad9ecfd51bf83a75"; - }; - }; - "base64-js-1.2.0" = { - name = "base64-js"; - packageName = "base64-js"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/base64-js/-/base64-js-1.2.0.tgz"; - sha1 = "a39992d723584811982be5e290bb6a53d86700f1"; - }; - }; - "ieee754-1.1.8" = { - name = "ieee754"; - packageName = "ieee754"; - version = "1.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz"; - sha1 = "be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"; - }; - }; - "typedarray-0.0.6" = { - name = "typedarray"; - packageName = "typedarray"; - version = "0.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"; - sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; - }; - }; - "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"; - }; - }; - "core-util-is-1.0.2" = { - name = "core-util-is"; - packageName = "core-util-is"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; - sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; - }; - }; - "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"; - }; - }; - "date-now-0.1.4" = { - name = "date-now"; - packageName = "date-now"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz"; - sha1 = "eaf439fd4d4848ad74e5cc7dbef200672b9e345b"; - }; - }; - "browserify-cipher-1.0.0" = { - name = "browserify-cipher"; - packageName = "browserify-cipher"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.0.tgz"; - sha1 = "9988244874bf5ed4e28da95666dcd66ac8fc363a"; - }; - }; - "browserify-sign-4.0.4" = { - name = "browserify-sign"; - packageName = "browserify-sign"; - version = "4.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz"; - sha1 = "aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"; - }; - }; - "create-ecdh-4.0.0" = { - name = "create-ecdh"; - packageName = "create-ecdh"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.0.tgz"; - sha1 = "888c723596cdf7612f6498233eebd7a35301737d"; - }; - }; - "create-hash-1.1.2" = { - name = "create-hash"; - packageName = "create-hash"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/create-hash/-/create-hash-1.1.2.tgz"; - sha1 = "51210062d7bb7479f6c65bb41a92208b1d61abad"; - }; - }; - "create-hmac-1.1.4" = { - name = "create-hmac"; - packageName = "create-hmac"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.4.tgz"; - sha1 = "d3fb4ba253eb8b3f56e39ea2fbcb8af747bd3170"; - }; - }; - "diffie-hellman-5.0.2" = { - name = "diffie-hellman"; - packageName = "diffie-hellman"; - version = "5.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.2.tgz"; - sha1 = "b5835739270cfe26acf632099fded2a07f209e5e"; - }; - }; - "pbkdf2-3.0.9" = { - name = "pbkdf2"; - packageName = "pbkdf2"; - version = "3.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.9.tgz"; - sha1 = "f2c4b25a600058b3c3773c086c37dbbee1ffe693"; - }; - }; - "public-encrypt-4.0.0" = { - name = "public-encrypt"; - packageName = "public-encrypt"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz"; - sha1 = "39f699f3a46560dd5ebacbca693caf7c65c18cc6"; - }; - }; - "randombytes-2.0.3" = { - name = "randombytes"; - packageName = "randombytes"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/randombytes/-/randombytes-2.0.3.tgz"; - sha1 = "674c99760901c3c4112771a31e521dc349cc09ec"; - }; - }; - "browserify-aes-1.0.6" = { - name = "browserify-aes"; - packageName = "browserify-aes"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.6.tgz"; - sha1 = "5e7725dbdef1fd5930d4ebab48567ce451c48a0a"; - }; - }; - "browserify-des-1.0.0" = { - name = "browserify-des"; - packageName = "browserify-des"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.0.tgz"; - sha1 = "daa277717470922ed2fe18594118a175439721dd"; - }; - }; - "evp_bytestokey-1.0.0" = { - name = "evp_bytestokey"; - packageName = "evp_bytestokey"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz"; - sha1 = "497b66ad9fef65cd7c08a6180824ba1476b66e53"; - }; - }; - "buffer-xor-1.0.3" = { - name = "buffer-xor"; - packageName = "buffer-xor"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz"; - sha1 = "26e61ed1422fb70dd42e6e36729ed51d855fe8d9"; - }; - }; - "cipher-base-1.0.3" = { - name = "cipher-base"; - packageName = "cipher-base"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.3.tgz"; - sha1 = "eeabf194419ce900da3018c207d212f2a6df0a07"; - }; - }; - "des.js-1.0.0" = { - name = "des.js"; - packageName = "des.js"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz"; - sha1 = "c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"; - }; - }; - "minimalistic-assert-1.0.0" = { - name = "minimalistic-assert"; - packageName = "minimalistic-assert"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz"; - sha1 = "702be2dda6b37f4836bcb3f5db56641b64a1d3d3"; - }; - }; - "bn.js-4.11.6" = { - name = "bn.js"; - packageName = "bn.js"; - version = "4.11.6"; - src = fetchurl { - url = "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz"; - sha1 = "53344adb14617a13f6e8dd2ce28905d1c0ba3215"; - }; - }; - "browserify-rsa-4.0.1" = { - name = "browserify-rsa"; - packageName = "browserify-rsa"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz"; - sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524"; - }; - }; - "elliptic-6.4.0" = { - name = "elliptic"; - packageName = "elliptic"; - version = "6.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz"; - sha1 = "cac9af8762c85836187003c8dfe193e5e2eae5df"; - }; - }; - "parse-asn1-5.1.0" = { - name = "parse-asn1"; - packageName = "parse-asn1"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.0.tgz"; - sha1 = "37c4f9b7ed3ab65c74817b5f2480937fbf97c712"; - }; - }; - "brorand-1.1.0" = { - name = "brorand"; - packageName = "brorand"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz"; - sha1 = "12c25efe40a45e3c323eb8675a0a0ce57b22371f"; - }; - }; - "hash.js-1.0.3" = { - name = "hash.js"; - packageName = "hash.js"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/hash.js/-/hash.js-1.0.3.tgz"; - sha1 = "1332ff00156c0a0ffdd8236013d07b77a0451573"; - }; - }; - "hmac-drbg-1.0.0" = { - name = "hmac-drbg"; - packageName = "hmac-drbg"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.0.tgz"; - sha1 = "3db471f45aae4a994a0688322171f51b8b91bee5"; - }; - }; - "minimalistic-crypto-utils-1.0.1" = { - name = "minimalistic-crypto-utils"; - packageName = "minimalistic-crypto-utils"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz"; - sha1 = "f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"; - }; - }; - "asn1.js-4.9.1" = { - name = "asn1.js"; - packageName = "asn1.js"; - version = "4.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.1.tgz"; - sha1 = "48ba240b45a9280e94748990ba597d216617fd40"; - }; - }; - "ripemd160-1.0.1" = { - name = "ripemd160"; - packageName = "ripemd160"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ripemd160/-/ripemd160-1.0.1.tgz"; - sha1 = "93a4bbd4942bc574b69a8fa57c71de10ecca7d6e"; - }; - }; - "sha.js-2.4.8" = { - name = "sha.js"; - packageName = "sha.js"; - version = "2.4.8"; - src = fetchurl { - url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.8.tgz"; - sha1 = "37068c2c476b6baf402d14a49c67f597921f634f"; - }; - }; - "miller-rabin-4.0.0" = { - name = "miller-rabin"; - packageName = "miller-rabin"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.0.tgz"; - sha1 = "4a62fb1d42933c05583982f4c716f6fb9e6c6d3d"; - }; - }; - "fs.realpath-1.0.0" = { - name = "fs.realpath"; - packageName = "fs.realpath"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; - sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; - }; - }; - "inflight-1.0.6" = { - name = "inflight"; - packageName = "inflight"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; - sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; - }; - }; - "minimatch-3.0.3" = { - name = "minimatch"; - packageName = "minimatch"; - version = "3.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz"; - sha1 = "2a4e4090b96b2db06a9d7df01055a62a77c9b774"; - }; - }; - "once-1.4.0" = { - name = "once"; - packageName = "once"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; - sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; - }; - }; - "path-is-absolute-1.0.1" = { - name = "path-is-absolute"; - packageName = "path-is-absolute"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; - sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; - }; - }; - "wrappy-1.0.2" = { - name = "wrappy"; - packageName = "wrappy"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; - sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; - }; - }; - "brace-expansion-1.1.6" = { - name = "brace-expansion"; - packageName = "brace-expansion"; - version = "1.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz"; - sha1 = "7197d7eaa9b87e648390ea61fc66c84427420df9"; - }; - }; - "balanced-match-0.4.2" = { - name = "balanced-match"; - packageName = "balanced-match"; - version = "0.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz"; - sha1 = "cb3f3e3c732dc0f01ee70b403f302e61d7709838"; - }; - }; - "concat-map-0.0.1" = { - name = "concat-map"; - packageName = "concat-map"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; - sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; - }; - }; - "function-bind-1.1.0" = { - name = "function-bind"; - packageName = "function-bind"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.0.tgz"; - sha1 = "16176714c801798e4e8f2cf7f7529467bb4a5771"; - }; - }; - "is-buffer-1.1.5" = { - name = "is-buffer"; - packageName = "is-buffer"; - version = "1.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz"; - sha1 = "1f3b26ef613b214b88cbca23cc6c01d87961eecc"; - }; - }; - "lexical-scope-1.2.0" = { - name = "lexical-scope"; - packageName = "lexical-scope"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lexical-scope/-/lexical-scope-1.2.0.tgz"; - sha1 = "fcea5edc704a4b3a8796cdca419c3a0afaf22df4"; - }; - }; - "astw-2.2.0" = { - name = "astw"; - packageName = "astw"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/astw/-/astw-2.2.0.tgz"; - sha1 = "7bd41784d32493987aeb239b6b4e1c57a873b917"; - }; - }; - "acorn-4.0.11" = { - name = "acorn"; - packageName = "acorn"; - version = "4.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-4.0.11.tgz"; - sha1 = "edcda3bd937e7556410d42ed5860f67399c794c0"; - }; - }; - "isarray-0.0.1" = { - name = "isarray"; - packageName = "isarray"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; - sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; - }; - }; - "stream-splicer-2.0.0" = { - name = "stream-splicer"; - packageName = "stream-splicer"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/stream-splicer/-/stream-splicer-2.0.0.tgz"; - sha1 = "1b63be438a133e4b671cc1935197600175910d83"; - }; - }; - "detective-4.5.0" = { - name = "detective"; - packageName = "detective"; - version = "4.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/detective/-/detective-4.5.0.tgz"; - sha1 = "6e5a8c6b26e6c7a254b1c6b6d7490d98ec91edd1"; - }; - }; - "stream-combiner2-1.1.1" = { - name = "stream-combiner2"; - packageName = "stream-combiner2"; + "abbrev-1.1.1" = { + name = "abbrev"; + packageName = "abbrev"; version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz"; - sha1 = "fb4d8a1420ea362764e21ad4780397bebcb41cbe"; + url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz"; + sha512 = "38s4f3id97wsb0rg9nm9zvxyq0nvwrmrpa5dzvrkp36mf5ibs98b4z6lvsbrwzzs0sbcank6c7gpp06vcwp9acfhp41rzlhi3ybsxwy"; }; }; - "path-platform-0.11.15" = { - name = "path-platform"; - packageName = "path-platform"; - version = "0.11.15"; + "acorn-4.0.13" = { + name = "acorn"; + packageName = "acorn"; + version = "4.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz"; - sha1 = "e864217f74c36850f0852b78dc7bf7d4a5721bf2"; + url = "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz"; + sha1 = "105495ae5361d697bd195c825192e1ad7f253787"; }; }; - "buffer-shims-1.0.0" = { - name = "buffer-shims"; - packageName = "buffer-shims"; - version = "1.0.0"; + "acorn-5.5.3" = { + name = "acorn"; + packageName = "acorn"; + version = "5.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz"; - sha1 = "9978ce317388c649ad8793028c3477ef044a8b51"; + url = "https://registry.npmjs.org/acorn/-/acorn-5.5.3.tgz"; + sha512 = "0wmwifv9mm9gqcir9zbz5y1gl1rgwwprqh1f3csjydj8kf3byca7img3rh5b54kbnw3ik34bc6ynbnzsd01zmxrsfdvjv95hn84rpld"; }; }; - "path-parse-1.0.5" = { - name = "path-parse"; - packageName = "path-parse"; - version = "1.0.5"; + "acorn-node-1.3.0" = { + name = "acorn-node"; + packageName = "acorn-node"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz"; - sha1 = "3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"; + url = "https://registry.npmjs.org/acorn-node/-/acorn-node-1.3.0.tgz"; + sha512 = "0pxd0cjsh0kdh8nxcpm000fcsgwmr8b13gyxkac8yxzz9a5wblqka5crksicnx8mqwy499k1jryr83bjzb3355xikgs5mfxgpigkwvr"; }; }; - "json-stable-stringify-0.0.1" = { - name = "json-stable-stringify"; - packageName = "json-stable-stringify"; - version = "0.0.1"; + "adm-zip-0.2.1" = { + name = "adm-zip"; + packageName = "adm-zip"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz"; - sha1 = "611c23e814db375527df851193db59dd2af27f45"; + url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.2.1.tgz"; + sha1 = "e801cedeb5bd9a4e98d699c5c0f4239e2731dcbf"; }; }; - "jsonify-0.0.0" = { - name = "jsonify"; - packageName = "jsonify"; - version = "0.0.0"; + "ajv-4.11.8" = { + name = "ajv"; + packageName = "ajv"; + version = "4.11.8"; src = fetchurl { - url = "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz"; - sha1 = "2c74b6ee41d93ca51b7b5aaee8f503631d252a73"; + url = "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz"; + sha1 = "82ffb02b29e662ae53bdc20af15947706739c536"; }; }; "array-filter-0.0.1" = { @@ -1066,15 +85,6 @@ let sha1 = "7da8cf2e26628ed732803581fd21f67cacd2eeec"; }; }; - "array-reduce-0.0.0" = { - name = "array-reduce"; - packageName = "array-reduce"; - version = "0.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/array-reduce/-/array-reduce-0.0.0.tgz"; - sha1 = "173899d3ffd1c7d9383e4479525dbe278cab5f2b"; - }; - }; "array-map-0.0.0" = { name = "array-map"; packageName = "array-map"; @@ -1084,283 +94,121 @@ let sha1 = "88a2bab73d1cf7bcd5c1b118a003f66f665fa662"; }; }; - "builtin-status-codes-3.0.0" = { - name = "builtin-status-codes"; - packageName = "builtin-status-codes"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz"; - sha1 = "85982878e21b98e1c66425e03d0174788f569ee8"; - }; - }; - "to-arraybuffer-1.0.1" = { - name = "to-arraybuffer"; - packageName = "to-arraybuffer"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz"; - sha1 = "7d229b1fcc637e466ca081180836a7aabff83f43"; - }; - }; - "minimist-1.2.0" = { - name = "minimist"; - packageName = "minimist"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"; - sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; - }; - }; - "punycode-1.3.2" = { - name = "punycode"; - packageName = "punycode"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"; - sha1 = "9653a036fb7c1ee42342f2325cceefea3926c48d"; - }; - }; - "querystring-0.2.0" = { - name = "querystring"; - packageName = "querystring"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz"; - sha1 = "b209849203bb25df820da756e747005878521620"; - }; - }; - "inherits-2.0.1" = { - name = "inherits"; - packageName = "inherits"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; - sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; - }; - }; - "indexof-0.0.1" = { - name = "indexof"; - packageName = "indexof"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz"; - sha1 = "82dc336d232b9062179d05ab3293a66059fd435d"; - }; - }; - "yargs-3.10.0" = { - name = "yargs"; - packageName = "yargs"; - version = "3.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz"; - sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"; - }; - }; - "uglify-to-browserify-1.0.2" = { - name = "uglify-to-browserify"; - packageName = "uglify-to-browserify"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"; - sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7"; - }; - }; - "camelcase-1.2.1" = { - name = "camelcase"; - packageName = "camelcase"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"; - sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"; - }; - }; - "cliui-2.1.0" = { - name = "cliui"; - packageName = "cliui"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz"; - sha1 = "4b475760ff80264c762c3a1719032e91c7fea0d1"; - }; - }; - "decamelize-1.2.0" = { - name = "decamelize"; - packageName = "decamelize"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; - sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; - }; - }; - "window-size-0.1.0" = { - name = "window-size"; - packageName = "window-size"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz"; - sha1 = "5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"; - }; - }; - "center-align-0.1.3" = { - name = "center-align"; - packageName = "center-align"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz"; - sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad"; - }; - }; - "right-align-0.1.3" = { - name = "right-align"; - packageName = "right-align"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz"; - sha1 = "61339b722fe6a3515689210d24e14c96148613ef"; - }; - }; - "wordwrap-0.0.2" = { - name = "wordwrap"; - packageName = "wordwrap"; - version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"; - sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f"; - }; - }; - "align-text-0.1.4" = { - name = "align-text"; - packageName = "align-text"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz"; - sha1 = "0cd90a561093f35d0a99256c22b7069433fad117"; - }; - }; - "lazy-cache-1.0.4" = { - name = "lazy-cache"; - packageName = "lazy-cache"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz"; - sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"; - }; - }; - "kind-of-3.1.0" = { - name = "kind-of"; - packageName = "kind-of"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/kind-of/-/kind-of-3.1.0.tgz"; - sha1 = "475d698a5e49ff5e53d14e3e732429dc8bf4cf47"; - }; - }; - "longest-1.0.1" = { - name = "longest"; - packageName = "longest"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz"; - sha1 = "30a0b2da38f73770e8294a0d22e6625ed77d0097"; - }; - }; - "repeat-string-1.6.1" = { - name = "repeat-string"; - packageName = "repeat-string"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz"; - sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; - }; - }; - "errno-0.1.4" = { - name = "errno"; - packageName = "errno"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/errno/-/errno-0.1.4.tgz"; - sha1 = "b896e23a9e5e8ba33871fc996abd3635fc9a1c7d"; - }; - }; - "graceful-fs-4.1.11" = { - name = "graceful-fs"; - packageName = "graceful-fs"; - version = "4.1.11"; - src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz"; - sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"; - }; - }; - "image-size-0.5.1" = { - name = "image-size"; - packageName = "image-size"; - version = "0.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/image-size/-/image-size-0.5.1.tgz"; - sha1 = "28eea8548a4b1443480ddddc1e083ae54652439f"; - }; - }; - "mime-1.3.4" = { - name = "mime"; - packageName = "mime"; - version = "1.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz"; - sha1 = "115f9e3b6b3daf2959983cb38f149a2d40eb5d53"; - }; - }; - "mkdirp-0.5.1" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "0.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; - sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; - }; - }; - "promise-7.1.1" = { - name = "promise"; - packageName = "promise"; - version = "7.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/promise/-/promise-7.1.1.tgz"; - sha1 = "489654c692616b8aa55b0724fa809bb7db49c5bf"; - }; - }; - "request-2.81.0" = { - name = "request"; - packageName = "request"; - version = "2.81.0"; - src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.81.0.tgz"; - sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0"; - }; - }; - "prr-0.0.0" = { - name = "prr"; - packageName = "prr"; + "array-reduce-0.0.0" = { + name = "array-reduce"; + packageName = "array-reduce"; version = "0.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz"; - sha1 = "1a84b85908325501411853d0081ee3fa86e2926a"; + url = "https://registry.npmjs.org/array-reduce/-/array-reduce-0.0.0.tgz"; + sha1 = "173899d3ffd1c7d9383e4479525dbe278cab5f2b"; }; }; - "minimist-0.0.8" = { - name = "minimist"; - packageName = "minimist"; - version = "0.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; - sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; - }; - }; - "asap-2.0.5" = { + "asap-2.0.6" = { name = "asap"; packageName = "asap"; - version = "2.0.5"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/asap/-/asap-2.0.5.tgz"; - sha1 = "522765b50c3510490e52d7dcfe085ef9ba96958f"; + url = "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz"; + sha1 = "e50347611d7e690943208bbdafebcbc2fb866d46"; + }; + }; + "asn1-0.1.11" = { + name = "asn1"; + packageName = "asn1"; + version = "0.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"; + sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7"; + }; + }; + "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"; + }; + }; + "asn1.js-4.10.1" = { + name = "asn1.js"; + packageName = "asn1.js"; + version = "4.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz"; + sha512 = "15j9ms7k6dx08m1wqrvc4958vcrshjjpicpxmz9bflsyk0x2r7w20lxlm27jpyj7cwj6158a0582vifk393hqp0ysn9mlbabqw9qzd7"; + }; + }; + "assert-1.4.1" = { + name = "assert"; + packageName = "assert"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz"; + sha1 = "99912d591836b5a6f5b345c0f07eefc08fc65d91"; + }; + }; + "assert-plus-0.1.5" = { + name = "assert-plus"; + packageName = "assert-plus"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"; + sha1 = "ee74009413002d84cec7219c6ac811812e723160"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "astw-2.2.0" = { + name = "astw"; + packageName = "astw"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/astw/-/astw-2.2.0.tgz"; + sha1 = "7bd41784d32493987aeb239b6b4e1c57a873b917"; + }; + }; + "async-0.9.2" = { + name = "async"; + packageName = "async"; + version = "0.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-0.9.2.tgz"; + sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d"; + }; + }; + "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"; + }; + }; + "aws-sign2-0.5.0" = { + name = "aws-sign2"; + packageName = "aws-sign2"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"; + sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63"; }; }; "aws-sign2-0.6.0" = { @@ -1381,400 +229,22 @@ let sha1 = "83ef5ca860b2b32e4a0deedee8c771b9db57471e"; }; }; - "caseless-0.12.0" = { - name = "caseless"; - packageName = "caseless"; - version = "0.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz"; - sha1 = "1b681c21ff84033c826543090689420d187151dc"; - }; - }; - "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-2.1.2" = { - name = "form-data"; - packageName = "form-data"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-2.1.2.tgz"; - sha1 = "89c3534008b97eada4cbb157d58f6f5df025eae4"; - }; - }; - "har-validator-4.2.1" = { - name = "har-validator"; - packageName = "har-validator"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz"; - sha1 = "33481d0f1bbff600dd203d75812a6a5fba002e2a"; - }; - }; - "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"; + "balanced-match-1.0.0" = { + name = "balanced-match"; + packageName = "balanced-match"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"; - sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; + url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"; + sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; }; }; - "isstream-0.1.2" = { - name = "isstream"; - packageName = "isstream"; - version = "0.1.2"; + "base64-js-1.2.3" = { + name = "base64-js"; + packageName = "base64-js"; + version = "1.2.3"; 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.15" = { - name = "mime-types"; - packageName = "mime-types"; - version = "2.1.15"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz"; - sha1 = "a4ebf5064094569237b8cf70046776d09fc92aed"; - }; - }; - "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"; - }; - }; - "performance-now-0.2.0" = { - name = "performance-now"; - packageName = "performance-now"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz"; - sha1 = "33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"; - }; - }; - "qs-6.4.0" = { - name = "qs"; - packageName = "qs"; - version = "6.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz"; - sha1 = "13e26d28ad6b0ffaa91312cd3bf708ed351e7233"; - }; - }; - "safe-buffer-5.0.1" = { - name = "safe-buffer"; - packageName = "safe-buffer"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz"; - sha1 = "d263ca54696cd8a306b5ca6551e92de57918fbe7"; - }; - }; - "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.2" = { - name = "tough-cookie"; - packageName = "tough-cookie"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz"; - sha1 = "f081f76e4c85720e6c37a5faced737150d84072a"; - }; - }; - "tunnel-agent-0.6.0" = { - name = "tunnel-agent"; - packageName = "tunnel-agent"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; - sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; - }; - }; - "uuid-3.0.1" = { - name = "uuid"; - packageName = "uuid"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz"; - sha1 = "6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "ajv-4.11.5" = { - name = "ajv"; - packageName = "ajv"; - version = "4.11.5"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-4.11.5.tgz"; - sha1 = "b6ee74657b993a01dce44b7944d56f485828d5bd"; - }; - }; - "har-schema-1.0.5" = { - name = "har-schema"; - packageName = "har-schema"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz"; - sha1 = "d263135f43307c02c602afc8fe95970c0151369e"; - }; - }; - "co-4.6.0" = { - name = "co"; - packageName = "co"; - version = "4.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/co/-/co-4.6.0.tgz"; - sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"; - }; - }; - "json-stable-stringify-1.0.1" = { - name = "json-stable-stringify"; - packageName = "json-stable-stringify"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz"; - sha1 = "9a759d39c5f2ff503fd5300646ed445f88c4f9af"; - }; - }; - "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.4.0" = { - name = "jsprim"; - packageName = "jsprim"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz"; - sha1 = "a3b87e40298d8c380552d8cc7628a0bb95a22918"; - }; - }; - "sshpk-1.11.0" = { - name = "sshpk"; - packageName = "sshpk"; - version = "1.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.11.0.tgz"; - sha1 = "2d8d5ebb4a6fab28ffba37fa62a90f4a3ea59d77"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "dashdash-1.14.1" = { - name = "dashdash"; - packageName = "dashdash"; - version = "1.14.1"; - src = fetchurl { - url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz"; - sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; - }; - }; - "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.1" = { - name = "jsbn"; - packageName = "jsbn"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"; - sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; - }; - }; - "tweetnacl-0.14.5" = { - name = "tweetnacl"; - packageName = "tweetnacl"; - version = "0.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"; - sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; - }; - }; - "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"; + url = "https://registry.npmjs.org/base64-js/-/base64-js-1.2.3.tgz"; + sha512 = "3kqp8hzql2ccdqf7vqizav1lrwp5gynn081718g9slxcs428sv02n037xb9hfgrqybbk4qacnk5mcv63z8fm3l4h6fi06xm8nqj3h1j"; }; }; "bcrypt-pbkdf-1.0.1" = { @@ -1786,553 +256,13 @@ let sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d"; }; }; - "mime-db-1.27.0" = { - name = "mime-db"; - packageName = "mime-db"; - version = "1.27.0"; + "bn.js-4.11.8" = { + name = "bn.js"; + packageName = "bn.js"; + version = "4.11.8"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz"; - sha1 = "820f572296bbd20ec25ed55e5b5de869e5436eb1"; - }; - }; - "browser-stdout-1.3.0" = { - name = "browser-stdout"; - packageName = "browser-stdout"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz"; - sha1 = "f351d32969d32fa5d7a5567154263d928ae3bd1f"; - }; - }; - "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"; - }; - }; - "debug-2.2.0" = { - name = "debug"; - packageName = "debug"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz"; - sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da"; - }; - }; - "diff-1.4.0" = { - name = "diff"; - packageName = "diff"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz"; - sha1 = "7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf"; - }; - }; - "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"; - }; - }; - "glob-7.0.5" = { - name = "glob"; - packageName = "glob"; - version = "7.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.0.5.tgz"; - sha1 = "b4202a69099bbb4d292a7c1b95b6682b67ebdc95"; - }; - }; - "growl-1.9.2" = { - name = "growl"; - packageName = "growl"; - version = "1.9.2"; - src = fetchurl { - url = "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz"; - sha1 = "0ea7743715db8d8de2c5ede1775e1b45ac85c02f"; - }; - }; - "json3-3.3.2" = { - name = "json3"; - packageName = "json3"; - version = "3.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz"; - sha1 = "3c0434743df93e2f5c42aee7b19bcb483575f4e1"; - }; - }; - "lodash.create-3.1.1" = { - name = "lodash.create"; - packageName = "lodash.create"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.create/-/lodash.create-3.1.1.tgz"; - sha1 = "d7f2849f0dbda7e04682bb8cd72ab022461debe7"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "ms-0.7.1" = { - name = "ms"; - packageName = "ms"; - version = "0.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"; - sha1 = "9cd13c03adbff25b65effde7ce864ee952017098"; - }; - }; - "lodash._baseassign-3.2.0" = { - name = "lodash._baseassign"; - packageName = "lodash._baseassign"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz"; - sha1 = "8c38a099500f215ad09e59f1722fd0c52bfe0a4e"; - }; - }; - "lodash._basecreate-3.0.3" = { - name = "lodash._basecreate"; - packageName = "lodash._basecreate"; - version = "3.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz"; - sha1 = "1bc661614daa7fc311b7d03bf16806a0213cf821"; - }; - }; - "lodash._isiterateecall-3.0.9" = { - name = "lodash._isiterateecall"; - packageName = "lodash._isiterateecall"; - version = "3.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz"; - sha1 = "5203ad7ba425fae842460e696db9cf3e6aac057c"; - }; - }; - "lodash._basecopy-3.0.1" = { - name = "lodash._basecopy"; - packageName = "lodash._basecopy"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz"; - sha1 = "8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"; - }; - }; - "lodash.keys-3.1.2" = { - name = "lodash.keys"; - packageName = "lodash.keys"; - version = "3.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz"; - sha1 = "4dbc0472b156be50a0b286855d1bd0b0c656098a"; - }; - }; - "lodash._getnative-3.9.1" = { - name = "lodash._getnative"; - packageName = "lodash._getnative"; - version = "3.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz"; - sha1 = "570bc7dede46d61cdcde687d65d3eecbaa3aaff5"; - }; - }; - "lodash.isarguments-3.1.0" = { - name = "lodash.isarguments"; - packageName = "lodash.isarguments"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz"; - sha1 = "2f573d85c6a24289ff00663b491c1d338ff3458a"; - }; - }; - "lodash.isarray-3.0.4" = { - name = "lodash.isarray"; - packageName = "lodash.isarray"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz"; - sha1 = "79e4eb88c36a8122af86f844aa9bcd851b5fbb55"; - }; - }; - "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"; - }; - }; - "phantomjs-1.9.7-15" = { - name = "phantomjs"; - packageName = "phantomjs"; - version = "1.9.7-15"; - src = fetchurl { - url = "https://registry.npmjs.org/phantomjs/-/phantomjs-1.9.7-15.tgz"; - sha1 = "0b3a7ce630486a83be91ff4e832eee20e971115b"; - }; - }; - "mocha-phantomjs-core-1.3.1" = { - name = "mocha-phantomjs-core"; - packageName = "mocha-phantomjs-core"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mocha-phantomjs-core/-/mocha-phantomjs-core-1.3.1.tgz"; - sha1 = "586538c8d71fa8de90c41a46acc0481c1fb83e18"; - }; - }; - "adm-zip-0.2.1" = { - name = "adm-zip"; - packageName = "adm-zip"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.2.1.tgz"; - sha1 = "e801cedeb5bd9a4e98d699c5c0f4239e2731dcbf"; - }; - }; - "kew-0.1.7" = { - name = "kew"; - packageName = "kew"; - version = "0.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/kew/-/kew-0.1.7.tgz"; - sha1 = "0a32a817ff1a9b3b12b8c9bacf4bc4d679af8e72"; - }; - }; - "ncp-0.4.2" = { - name = "ncp"; - packageName = "ncp"; - version = "0.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz"; - sha1 = "abcc6cbd3ec2ed2a729ff6e7c1fa8f01784a8574"; - }; - }; - "npmconf-0.0.24" = { - name = "npmconf"; - packageName = "npmconf"; - version = "0.0.24"; - src = fetchurl { - url = "https://registry.npmjs.org/npmconf/-/npmconf-0.0.24.tgz"; - sha1 = "b78875b088ccc3c0afa3eceb3ce3244b1b52390c"; - }; - }; - "mkdirp-0.3.5" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "0.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; - sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; - }; - }; - "progress-1.1.8" = { - name = "progress"; - packageName = "progress"; - version = "1.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz"; - sha1 = "e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"; - }; - }; - "request-2.36.0" = { - name = "request"; - packageName = "request"; - version = "2.36.0"; - src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.36.0.tgz"; - sha1 = "28c6c04262c7b9ffdd21b9255374517ee6d943f5"; - }; - }; - "request-progress-0.3.1" = { - name = "request-progress"; - packageName = "request-progress"; - version = "0.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/request-progress/-/request-progress-0.3.1.tgz"; - sha1 = "0721c105d8a96ac6b2ce8b2c89ae2d5ecfcf6b3a"; - }; - }; - "rimraf-2.2.8" = { - name = "rimraf"; - packageName = "rimraf"; - version = "2.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"; - sha1 = "e439be2aaee327321952730f99a8929e4fc50582"; - }; - }; - "which-1.0.9" = { - name = "which"; - packageName = "which"; - version = "1.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/which/-/which-1.0.9.tgz"; - sha1 = "460c1da0f810103d0321a9b633af9e575e64486f"; - }; - }; - "config-chain-1.1.11" = { - name = "config-chain"; - packageName = "config-chain"; - version = "1.1.11"; - src = fetchurl { - url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.11.tgz"; - sha1 = "aba09747dfbe4c3e70e766a6e41586e1859fc6f2"; - }; - }; - "inherits-1.0.2" = { - name = "inherits"; - packageName = "inherits"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz"; - sha1 = "ca4309dadee6b54cc0b8d247e8d7c7a0975bdc9b"; - }; - }; - "once-1.1.1" = { - name = "once"; - packageName = "once"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/once/-/once-1.1.1.tgz"; - sha1 = "9db574933ccb08c3a7614d154032c09ea6f339e7"; - }; - }; - "osenv-0.0.3" = { - name = "osenv"; - packageName = "osenv"; - version = "0.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/osenv/-/osenv-0.0.3.tgz"; - sha1 = "cd6ad8ddb290915ad9e22765576025d411f29cb6"; - }; - }; - "nopt-2.2.1" = { - name = "nopt"; - packageName = "nopt"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/nopt/-/nopt-2.2.1.tgz"; - sha1 = "2aa09b7d1768487b3b89a9c5aa52335bff0baea7"; - }; - }; - "semver-1.1.4" = { - name = "semver"; - packageName = "semver"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-1.1.4.tgz"; - sha1 = "2e5a4e72bab03472cc97f72753b4508912ef5540"; - }; - }; - "ini-1.1.0" = { - name = "ini"; - packageName = "ini"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ini/-/ini-1.1.0.tgz"; - sha1 = "4e808c2ce144c6c1788918e034d6797bc6cf6281"; - }; - }; - "proto-list-1.2.4" = { - name = "proto-list"; - packageName = "proto-list"; - version = "1.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz"; - sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849"; - }; - }; - "ini-1.3.4" = { - name = "ini"; - packageName = "ini"; - version = "1.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz"; - sha1 = "0537cb79daf59b59a1a517dff706c86ec039162e"; - }; - }; - "abbrev-1.1.0" = { - name = "abbrev"; - packageName = "abbrev"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz"; - sha1 = "d0554c2256636e2f56e7c2e5ad183f859428d81f"; - }; - }; - "qs-0.6.6" = { - name = "qs"; - packageName = "qs"; - version = "0.6.6"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-0.6.6.tgz"; - sha1 = "6e015098ff51968b8a3c819001d5f2c89bc4b107"; - }; - }; - "mime-1.2.11" = { - name = "mime"; - packageName = "mime"; - version = "1.2.11"; - src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; - sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; - }; - }; - "forever-agent-0.5.2" = { - name = "forever-agent"; - packageName = "forever-agent"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"; - sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130"; - }; - }; - "node-uuid-1.4.8" = { - name = "node-uuid"; - packageName = "node-uuid"; - version = "1.4.8"; - src = fetchurl { - url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz"; - sha1 = "b040eb0923968afabf8d32fb1f17f1167fdab907"; - }; - }; - "form-data-0.1.4" = { - name = "form-data"; - packageName = "form-data"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz"; - sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12"; - }; - }; - "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"; - }; - }; - "http-signature-0.10.1" = { - name = "http-signature"; - packageName = "http-signature"; - version = "0.10.1"; - src = fetchurl { - url = "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz"; - sha1 = "4fbdac132559aa8323121e540779c0a012b27e66"; - }; - }; - "oauth-sign-0.3.0" = { - name = "oauth-sign"; - packageName = "oauth-sign"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz"; - sha1 = "cb540f93bb2b22a7d5941691a288d60e8ea9386e"; - }; - }; - "hawk-1.0.0" = { - name = "hawk"; - packageName = "hawk"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz"; - sha1 = "b90bb169807285411da7ffcb8dd2598502d3b52d"; - }; - }; - "aws-sign2-0.5.0" = { - name = "aws-sign2"; - packageName = "aws-sign2"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"; - sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63"; - }; - }; - "combined-stream-0.0.7" = { - name = "combined-stream"; - packageName = "combined-stream"; - version = "0.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz"; - sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f"; - }; - }; - "async-0.9.2" = { - name = "async"; - packageName = "async"; - version = "0.9.2"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-0.9.2.tgz"; - sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d"; - }; - }; - "delayed-stream-0.0.5" = { - name = "delayed-stream"; - packageName = "delayed-stream"; - version = "0.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"; - sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f"; - }; - }; - "assert-plus-0.1.5" = { - name = "assert-plus"; - packageName = "assert-plus"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"; - sha1 = "ee74009413002d84cec7219c6ac811812e723160"; - }; - }; - "asn1-0.1.11" = { - name = "asn1"; - packageName = "asn1"; - version = "0.1.11"; - src = fetchurl { - url = "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"; - sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7"; - }; - }; - "ctype-0.5.3" = { - name = "ctype"; - packageName = "ctype"; - version = "0.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"; - sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f"; - }; - }; - "hoek-0.9.1" = { - name = "hoek"; - packageName = "hoek"; - version = "0.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"; - sha1 = "3d322462badf07716ea7eb85baf88079cddce505"; + url = "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz"; + sha512 = "20bg51v29zygy89w84qb64pkjikxfjdsgjs0ry6pvv8fkwn5kd1izrqn022d838q3rcaq8dmy033g7q8b6960j4f8ipan74y9ydimr2"; }; }; "boom-0.4.2" = { @@ -2344,148 +274,166 @@ let sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b"; }; }; - "cryptiles-0.2.2" = { - name = "cryptiles"; - packageName = "cryptiles"; - version = "0.2.2"; + "boom-2.10.1" = { + name = "boom"; + packageName = "boom"; + version = "2.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"; - sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c"; + url = "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"; + sha1 = "39c8918ceff5799f83f9492a848f625add0c766f"; }; }; - "sntp-0.2.4" = { - name = "sntp"; - packageName = "sntp"; - version = "0.2.4"; + "brace-expansion-1.1.11" = { + name = "brace-expansion"; + packageName = "brace-expansion"; + version = "1.1.11"; src = fetchurl { - url = "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"; - sha1 = "fb885f18b0f3aad189f824862536bceeec750900"; + url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"; + sha512 = "248cnpbbf0p32h53rd3g8wzpgrkaj4p078ra1g6l16f82i6bzkvmhwqan5rk88apbll9ly1476kngd7f7z27i3b3zxpbb3064f8yaw8"; }; }; - "throttleit-0.0.2" = { - name = "throttleit"; - packageName = "throttleit"; - version = "0.0.2"; + "brorand-1.1.0" = { + name = "brorand"; + packageName = "brorand"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz"; - sha1 = "cfedf88e60c00dd9697b61fdd2a8343a9b680eaf"; + url = "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz"; + sha1 = "12c25efe40a45e3c323eb8675a0a0ce57b22371f"; }; }; - "should-equal-1.0.1" = { - name = "should-equal"; - packageName = "should-equal"; - version = "1.0.1"; + "browser-pack-6.0.4" = { + name = "browser-pack"; + packageName = "browser-pack"; + version = "6.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/should-equal/-/should-equal-1.0.1.tgz"; - sha1 = "0b6e9516f2601a9fb0bb2dcc369afa1c7e200af7"; + url = "https://registry.npmjs.org/browser-pack/-/browser-pack-6.0.4.tgz"; + sha512 = "0ylgxzrsxs25v3c4mz5ggqawb8k3xb39ialqlflk1nadfk8wrig2g2ipkpnw6bf9zhdhmigkwqbbl8yssibcb6fgnbbqfgsnfgnz123"; }; }; - "should-format-3.0.3" = { - name = "should-format"; - packageName = "should-format"; - version = "3.0.3"; + "browser-resolve-1.11.2" = { + name = "browser-resolve"; + packageName = "browser-resolve"; + version = "1.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/should-format/-/should-format-3.0.3.tgz"; - sha1 = "9bfc8f74fa39205c53d38c34d717303e277124f1"; + url = "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.2.tgz"; + sha1 = "8ff09b0a2c421718a1051c260b32e48f442938ce"; }; }; - "should-type-1.4.0" = { - name = "should-type"; - packageName = "should-type"; - version = "1.4.0"; + "browser-stdout-1.3.1" = { + name = "browser-stdout"; + packageName = "browser-stdout"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/should-type/-/should-type-1.4.0.tgz"; - sha1 = "0756d8ce846dfd09843a6947719dfa0d4cff5cf3"; + url = "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz"; + sha512 = "21jjhrf3wdmzsfqgva5s7shs1wdmcdxsjvi75p8z7i0q2i6n3654gpxjqlhbnpmzm25cpkshyi8swy13017qkp9m7xnbgw0bwiia45a"; }; }; - "should-type-adaptors-1.0.1" = { - name = "should-type-adaptors"; - packageName = "should-type-adaptors"; - version = "1.0.1"; + "browserify-aes-1.1.1" = { + name = "browserify-aes"; + packageName = "browserify-aes"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/should-type-adaptors/-/should-type-adaptors-1.0.1.tgz"; - sha1 = "efe5553cdf68cff66e5c5f51b712dc351c77beaa"; + url = "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.1.1.tgz"; + sha512 = "0b874c5j68a6h1smd9avnc98zpjy2b4sykkhfpn97lzg7k5aq3ab0jdsmxjafifm0sa3srwscfpcl70gwnlg242p7cavnf115hd6sah"; }; }; - "should-util-1.0.0" = { - name = "should-util"; - packageName = "should-util"; + "browserify-cipher-1.0.0" = { + name = "browserify-cipher"; + packageName = "browserify-cipher"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/should-util/-/should-util-1.0.0.tgz"; - sha1 = "c98cda374aa6b190df8ba87c9889c2b4db620063"; + url = "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.0.tgz"; + sha1 = "9988244874bf5ed4e28da95666dcd66ac8fc363a"; }; }; - "diff-3.2.0" = { - name = "diff"; - packageName = "diff"; - version = "3.2.0"; + "browserify-des-1.0.0" = { + name = "browserify-des"; + packageName = "browserify-des"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz"; - sha1 = "c9ce393a4b7cbd0b058a725c93df299027868ff9"; + url = "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.0.tgz"; + sha1 = "daa277717470922ed2fe18594118a175439721dd"; }; }; - "formatio-1.2.0" = { - name = "formatio"; - packageName = "formatio"; - version = "1.2.0"; + "browserify-rsa-4.0.1" = { + name = "browserify-rsa"; + packageName = "browserify-rsa"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/formatio/-/formatio-1.2.0.tgz"; - sha1 = "f3b2167d9068c4698a8d51f4f760a39a54d818eb"; + url = "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz"; + sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524"; }; }; - "lolex-1.6.0" = { - name = "lolex"; - packageName = "lolex"; - version = "1.6.0"; + "browserify-sign-4.0.4" = { + name = "browserify-sign"; + packageName = "browserify-sign"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/lolex/-/lolex-1.6.0.tgz"; - sha1 = "3a9a0283452a47d7439e72731b9e07d7386e49f6"; + url = "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz"; + sha1 = "aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"; }; }; - "native-promise-only-0.8.1" = { - name = "native-promise-only"; - packageName = "native-promise-only"; - version = "0.8.1"; + "browserify-zlib-0.2.0" = { + name = "browserify-zlib"; + packageName = "browserify-zlib"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/native-promise-only/-/native-promise-only-0.8.1.tgz"; - sha1 = "20a318c30cb45f71fe7adfbf7b21c99c1472ef11"; + url = "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz"; + sha512 = "24488d4s6d901hj9d9jdddapmcvmibbdpjq6nv3bpyjx72546fcqa0vripy0ydsrw1jk6bakfzvynh5i9cz0g59hrmn4ph75d3kdpk7"; }; }; - "path-to-regexp-1.7.0" = { - name = "path-to-regexp"; - packageName = "path-to-regexp"; - version = "1.7.0"; + "buffer-5.1.0" = { + name = "buffer"; + packageName = "buffer"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz"; - sha1 = "59fde0f435badacba103a84e9d3bc64e96b9937d"; + url = "https://registry.npmjs.org/buffer/-/buffer-5.1.0.tgz"; + sha512 = "1ipkzdnq03rnxyl50wmzigdbd96lh0mgzffcab80yxl38x7k316kzs3h0w0bxdjj7vqh6dw3wgb7y3rsqab0ar4ky9rbh0r1f1i2hk2"; }; }; - "samsam-1.2.1" = { - name = "samsam"; - packageName = "samsam"; - version = "1.2.1"; + "buffer-xor-1.0.3" = { + name = "buffer-xor"; + packageName = "buffer-xor"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/samsam/-/samsam-1.2.1.tgz"; - sha1 = "edd39093a3184370cb859243b2bdf255e7d8ea67"; + url = "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz"; + sha1 = "26e61ed1422fb70dd42e6e36729ed51d855fe8d9"; }; }; - "text-encoding-0.6.4" = { - name = "text-encoding"; - packageName = "text-encoding"; - version = "0.6.4"; + "builtin-status-codes-3.0.0" = { + name = "builtin-status-codes"; + packageName = "builtin-status-codes"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz"; - sha1 = "e399a982257a276dae428bb92845cb71bdc26d19"; + url = "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz"; + sha1 = "85982878e21b98e1c66425e03d0174788f569ee8"; }; }; - "type-detect-4.0.0" = { - name = "type-detect"; - packageName = "type-detect"; - version = "4.0.0"; + "cached-path-relative-1.0.1" = { + name = "cached-path-relative"; + packageName = "cached-path-relative"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/type-detect/-/type-detect-4.0.0.tgz"; - sha1 = "62053883542a321f2f7b25746dc696478b18ff6b"; + url = "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.0.1.tgz"; + sha1 = "d09c4b52800aa4c078e2dd81a869aac90d2e54e7"; + }; + }; + "caseless-0.12.0" = { + name = "caseless"; + packageName = "caseless"; + version = "0.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz"; + sha1 = "1b681c21ff84033c826543090689420d187151dc"; + }; + }; + "cipher-base-1.0.4" = { + name = "cipher-base"; + packageName = "cipher-base"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz"; + sha512 = "3cm9kdc1sv7pakzlhrc1pazdvg9lk4hv31lximwbcrgmwfzg6imxrndszgx9yzlizknfh2b73cr7b5mfcv50bldpyq6jr5s4zknsj1a"; }; }; "cli-1.0.1" = { @@ -2497,49 +445,346 @@ let sha1 = "22817534f24bfa4950c34d532d48ecbc621b8c14"; }; }; - "exit-0.1.2" = { - name = "exit"; - packageName = "exit"; - version = "0.1.2"; + "co-4.6.0" = { + name = "co"; + packageName = "co"; + version = "4.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz"; - sha1 = "0632638f8d877cc82107d30a0fff1a17cba1cd0c"; + url = "https://registry.npmjs.org/co/-/co-4.6.0.tgz"; + sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"; }; }; - "htmlparser2-3.8.3" = { - name = "htmlparser2"; - packageName = "htmlparser2"; - version = "3.8.3"; + "combine-source-map-0.7.2" = { + name = "combine-source-map"; + packageName = "combine-source-map"; + version = "0.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz"; - sha1 = "996c28b191516a8be86501a7d79757e5c70c1068"; + url = "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.7.2.tgz"; + sha1 = "0870312856b307a87cc4ac486f3a9a62aeccc09e"; }; }; - "shelljs-0.3.0" = { - name = "shelljs"; - packageName = "shelljs"; - version = "0.3.0"; + "combine-source-map-0.8.0" = { + name = "combine-source-map"; + packageName = "combine-source-map"; + version = "0.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz"; - sha1 = "3596e6307a781544f591f37da618360f31db57b1"; + url = "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.8.0.tgz"; + sha1 = "a58d0df042c186fcf822a8e8015f5450d2d79a8b"; }; }; - "strip-json-comments-1.0.4" = { - name = "strip-json-comments"; - packageName = "strip-json-comments"; - version = "1.0.4"; + "combined-stream-0.0.7" = { + name = "combined-stream"; + packageName = "combined-stream"; + version = "0.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz"; - sha1 = "1e15fbcac97d3ee99bf2d73b4c656b082bbafb91"; + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz"; + sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f"; }; }; - "lodash-3.7.0" = { - name = "lodash"; - packageName = "lodash"; - version = "3.7.0"; + "combined-stream-1.0.6" = { + name = "combined-stream"; + packageName = "combined-stream"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-3.7.0.tgz"; - sha1 = "3678bd8ab995057c07ade836ed2ef087da811d45"; + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz"; + sha1 = "723e7df6e801ac5613113a7e445a9b69cb632818"; + }; + }; + "commander-2.11.0" = { + name = "commander"; + packageName = "commander"; + version = "2.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz"; + sha512 = "2yi2hwf0bghfnv1fdgd4wvh7s0acjrgqbgww97ncm6i6s6ffs1zahnj48f6gqpqj6fsf0jigvnr0civ25k2160c38281r80wvg7jkkg"; + }; + }; + "commander-2.14.1" = { + name = "commander"; + packageName = "commander"; + version = "2.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.14.1.tgz"; + sha512 = "11j7mwxfdnhi3yfkhxjvfkg1mzdsi3wq7iygma6ksmj1f7hfs0z8rpfcysqmy85f67mqvzhda3w1lyy1jqxxm31k799sazbipm7b17r"; + }; + }; + "commander-2.15.0" = { + name = "commander"; + packageName = "commander"; + version = "2.15.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.15.0.tgz"; + sha512 = "090my2m6q69l4kgn1slqs845mf9s5zx7l1p345z2qij174pyk4jr2xkalnq8k0dfhghvdmcjxba03qn959n64r8nkg2cq9d3ja647gc"; + }; + }; + "concat-map-0.0.1" = { + name = "concat-map"; + packageName = "concat-map"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + }; + }; + "concat-stream-1.5.2" = { + name = "concat-stream"; + packageName = "concat-stream"; + version = "1.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz"; + sha1 = "708978624d856af41a5a741defdd261da752c266"; + }; + }; + "concat-stream-1.6.1" = { + name = "concat-stream"; + packageName = "concat-stream"; + version = "1.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.1.tgz"; + sha512 = "1gyp2id8ifqdpzk81qz5q7200wf8m66ammg6cz8cxv4blmqh7rf761fxd1536ib4kcdp8jccvyx1l9vi6kjl26pwyd05pblki455jc2"; + }; + }; + "config-chain-1.1.11" = { + name = "config-chain"; + packageName = "config-chain"; + version = "1.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.11.tgz"; + sha1 = "aba09747dfbe4c3e70e766a6e41586e1859fc6f2"; + }; + }; + "console-browserify-1.1.0" = { + name = "console-browserify"; + packageName = "console-browserify"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz"; + sha1 = "f0241c45730a9fc6323b206dbf38edc741d0bb10"; + }; + }; + "constants-browserify-1.0.0" = { + name = "constants-browserify"; + packageName = "constants-browserify"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz"; + sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; + }; + }; + "convert-source-map-1.1.3" = { + name = "convert-source-map"; + packageName = "convert-source-map"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.3.tgz"; + sha1 = "4829c877e9fe49b3161f3bf3673888e204699860"; + }; + }; + "core-util-is-1.0.2" = { + name = "core-util-is"; + packageName = "core-util-is"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; + sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + }; + }; + "create-ecdh-4.0.0" = { + name = "create-ecdh"; + packageName = "create-ecdh"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.0.tgz"; + sha1 = "888c723596cdf7612f6498233eebd7a35301737d"; + }; + }; + "create-hash-1.1.3" = { + name = "create-hash"; + packageName = "create-hash"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz"; + sha1 = "606042ac8b9262750f483caddab0f5819172d8fd"; + }; + }; + "create-hmac-1.1.6" = { + name = "create-hmac"; + packageName = "create-hmac"; + version = "1.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.6.tgz"; + sha1 = "acb9e221a4e17bdb076e90657c42b93e3726cf06"; + }; + }; + "cryptiles-0.2.2" = { + name = "cryptiles"; + packageName = "cryptiles"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"; + sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c"; + }; + }; + "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"; + }; + }; + "crypto-browserify-3.12.0" = { + name = "crypto-browserify"; + packageName = "crypto-browserify"; + version = "3.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz"; + sha512 = "1d3mrhqlay037azmjp2ml5a8yyls9ijdhilv6f0znz0ajgfm972yr9bhm78wqi09p4crc3shgflk50jc63zijsqv777ikkyi2j2qgkz"; + }; + }; + "ctype-0.5.3" = { + name = "ctype"; + packageName = "ctype"; + version = "0.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"; + sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f"; + }; + }; + "dashdash-1.14.1" = { + name = "dashdash"; + packageName = "dashdash"; + version = "1.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz"; + sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; + }; + }; + "date-now-0.1.4" = { + name = "date-now"; + packageName = "date-now"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz"; + sha1 = "eaf439fd4d4848ad74e5cc7dbef200672b9e345b"; + }; + }; + "debug-3.1.0" = { + name = "debug"; + packageName = "debug"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz"; + sha512 = "3g1hqsahr1ks2kpvdxrwzr57fj90nnr0hvwwrw8yyyzcv3i11sym8zwibxx67bl1mln0acddrzpkkdjjxnc6n2cm9fazmgzzsl1fzrr"; + }; + }; + "defined-1.0.0" = { + name = "defined"; + packageName = "defined"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz"; + sha1 = "c98d9bcef75674188e110969151199e39b1fa693"; + }; + }; + "delayed-stream-0.0.5" = { + name = "delayed-stream"; + packageName = "delayed-stream"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"; + sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f"; + }; + }; + "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"; + }; + }; + "deps-sort-2.0.0" = { + name = "deps-sort"; + packageName = "deps-sort"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/deps-sort/-/deps-sort-2.0.0.tgz"; + sha1 = "091724902e84658260eb910748cccd1af6e21fb5"; + }; + }; + "des.js-1.0.0" = { + name = "des.js"; + packageName = "des.js"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz"; + sha1 = "c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"; + }; + }; + "detective-5.1.0" = { + name = "detective"; + packageName = "detective"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/detective/-/detective-5.1.0.tgz"; + sha512 = "1cm9sp1rl54d3y7v9nvw12kad47g5pcmbzf96s7kpm85j1cc79yc8qb8q0xjj71w32pgz2p4fym47sa851i5lswglmmiimgyflwqlac"; + }; + }; + "diff-3.5.0" = { + name = "diff"; + packageName = "diff"; + version = "3.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz"; + sha512 = "32bkv3cfhax4x5zhiyfn63wjhqwkzsjiql3my8p3d9hvv020p8f9hdi7mpqixrkpgs0g9k15mn736s449yad9wq1plhxyhxb2sam3h3"; + }; + }; + "diffie-hellman-5.0.2" = { + name = "diffie-hellman"; + packageName = "diffie-hellman"; + version = "5.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.2.tgz"; + sha1 = "b5835739270cfe26acf632099fded2a07f209e5e"; + }; + }; + "dom-serializer-0.1.0" = { + name = "dom-serializer"; + packageName = "dom-serializer"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz"; + sha1 = "073c697546ce0780ce23be4a28e293e40bc30c82"; + }; + }; + "domain-browser-1.2.0" = { + name = "domain-browser"; + packageName = "domain-browser"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz"; + sha512 = "1fcxv8rzfhs99afvhji7bs5ppxwn9mw040ixdgvkm6iabz72q61arly2lr57086rjn4g2vkb3rkih1cyc7z35kzv1jjciwyrs4g4y4f"; + }; + }; + "domelementtype-1.1.3" = { + name = "domelementtype"; + packageName = "domelementtype"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz"; + sha1 = "bd28773e2642881aec51544924299c5cd822185b"; + }; + }; + "domelementtype-1.3.0" = { + name = "domelementtype"; + packageName = "domelementtype"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz"; + sha1 = "b17aed82e8ab59e52dd9c19b1756e0fc187204c2"; }; }; "domhandler-2.3.0" = { @@ -2560,22 +805,31 @@ let sha1 = "dcd8488a26f563d61079e48c9f7b7e32373682cf"; }; }; - "domelementtype-1.3.0" = { - name = "domelementtype"; - packageName = "domelementtype"; - version = "1.3.0"; + "duplexer2-0.1.4" = { + name = "duplexer2"; + packageName = "duplexer2"; + version = "0.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz"; - sha1 = "b17aed82e8ab59e52dd9c19b1756e0fc187204c2"; + url = "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz"; + sha1 = "8b12dab878c0d69e3e7891051662a32fc6bddcc1"; }; }; - "readable-stream-1.1.14" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "1.1.14"; + "ecc-jsbn-0.1.1" = { + name = "ecc-jsbn"; + packageName = "ecc-jsbn"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz"; - sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9"; + url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"; + sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505"; + }; + }; + "elliptic-6.4.0" = { + name = "elliptic"; + packageName = "elliptic"; + version = "6.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz"; + sha1 = "cac9af8762c85836187003c8dfe193e5e2eae5df"; }; }; "entities-1.0.0" = { @@ -2587,24 +841,6 @@ let sha1 = "b2987aa3821347fcde642b24fdfc9e4fb712bf26"; }; }; - "dom-serializer-0.1.0" = { - name = "dom-serializer"; - packageName = "dom-serializer"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz"; - sha1 = "073c697546ce0780ce23be4a28e293e40bc30c82"; - }; - }; - "domelementtype-1.1.3" = { - name = "domelementtype"; - packageName = "domelementtype"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz"; - sha1 = "bd28773e2642881aec51544924299c5cd822185b"; - }; - }; "entities-1.1.1" = { name = "entities"; packageName = "entities"; @@ -2614,13 +850,1147 @@ let sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"; }; }; - "interpret-1.0.2" = { - name = "interpret"; - packageName = "interpret"; + "errno-0.1.7" = { + name = "errno"; + packageName = "errno"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz"; + sha512 = "2bdzcjwgdkg5yrvlw6my57pn77k4j7a2pzppwqrq4va9f5bd4b5mzbhwpklhsy1jl7w9sjvnfs30h42nhz2dbdfhagnh8dk6l2d3yii"; + }; + }; + "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"; + }; + }; + "events-2.0.0" = { + name = "events"; + packageName = "events"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/events/-/events-2.0.0.tgz"; + sha512 = "1r878as79mx3xg56nvjxxbryqa8lqn8xmiqi1xqfx2vjygnfaf15h5l658a9ikfr1bhc6ygxny8jr8ddjxpzlh6y443rxv08di3kwxg"; + }; + }; + "evp_bytestokey-1.0.3" = { + name = "evp_bytestokey"; + packageName = "evp_bytestokey"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz"; + sha512 = "1wd18zxd7n42asa63aa4k1bdf58warg29c7c8cdzzkd4r1wva7qwzqnn52h8g8hqwj7bxjkk3ryghajrvz4i27h5bzp30p8hjiqdzgx"; + }; + }; + "exit-0.1.2" = { + name = "exit"; + packageName = "exit"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz"; + sha1 = "0632638f8d877cc82107d30a0fff1a17cba1cd0c"; + }; + }; + "extend-3.0.1" = { + name = "extend"; + packageName = "extend"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz"; + sha1 = "a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"; + }; + }; + "extsprintf-1.3.0" = { + name = "extsprintf"; + packageName = "extsprintf"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz"; + sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; + }; + }; + "forever-agent-0.5.2" = { + name = "forever-agent"; + packageName = "forever-agent"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"; + sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130"; + }; + }; + "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-0.1.4" = { + name = "form-data"; + packageName = "form-data"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz"; + sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12"; + }; + }; + "form-data-2.1.4" = { + name = "form-data"; + packageName = "form-data"; + version = "2.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz"; + sha1 = "33c183acf193276ecaa98143a69e94bfee1750d1"; + }; + }; + "fs.realpath-1.0.0" = { + name = "fs.realpath"; + packageName = "fs.realpath"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; + sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + }; + }; + "function-bind-1.1.1" = { + name = "function-bind"; + packageName = "function-bind"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"; + sha512 = "38chm1mh077ksx6hy2sssfz4q29hf0ncb9k6ila7si54zqcpl5fxd1rh6wi82blqp7jcspf4aynr7jqhbsg2yc9y42xpqqp6c1jz2n8"; + }; + }; + "getpass-0.1.7" = { + name = "getpass"; + packageName = "getpass"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz"; + sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; + }; + }; + "glob-7.1.2" = { + name = "glob"; + packageName = "glob"; + version = "7.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz"; + sha512 = "08vjxzixc9dwc1hn5pd60yyij98krk2pr758aiga97r02ncvaqx1hidi95wk470k1v84gg4alls9bm52m77174z128bgf13b61x951h"; + }; + }; + "graceful-fs-4.1.11" = { + name = "graceful-fs"; + packageName = "graceful-fs"; + version = "4.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz"; + sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"; + }; + }; + "growl-1.10.3" = { + name = "growl"; + packageName = "growl"; + version = "1.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/growl/-/growl-1.10.3.tgz"; + sha512 = "3aibvz85l13j140w4jjdk8939q6r7dnf8ay2licxgkaaldk7wbm093c1p5g7k5cg80rl0xslmczyraawfgdr82hhxn7rfsm1rn6rac4"; + }; + }; + "har-schema-1.0.5" = { + name = "har-schema"; + packageName = "har-schema"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz"; + sha1 = "d263135f43307c02c602afc8fe95970c0151369e"; + }; + }; + "har-validator-4.2.1" = { + name = "har-validator"; + packageName = "har-validator"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz"; + sha1 = "33481d0f1bbff600dd203d75812a6a5fba002e2a"; + }; + }; + "has-1.0.1" = { + name = "has"; + packageName = "has"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/has/-/has-1.0.1.tgz"; + sha1 = "8461733f538b0837c9361e39a9ab9e9704dc2f28"; + }; + }; + "has-flag-2.0.0" = { + name = "has-flag"; + packageName = "has-flag"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz"; + sha1 = "e8207af1cc7b30d446cc70b734b5e8be18f88d51"; + }; + }; + "has-flag-3.0.0" = { + name = "has-flag"; + packageName = "has-flag"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"; + sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; + }; + }; + "hash-base-2.0.2" = { + name = "hash-base"; + packageName = "hash-base"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz"; + sha1 = "66ea1d856db4e8a5470cadf6fce23ae5244ef2e1"; + }; + }; + "hash-base-3.0.4" = { + name = "hash-base"; + packageName = "hash-base"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz"; + sha1 = "5fc8686847ecd73499403319a6b0a3f3f6ae4918"; + }; + }; + "hash.js-1.1.3" = { + name = "hash.js"; + packageName = "hash.js"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz"; + sha512 = "0f88i7rv3ib8lwdh5z5lwrml404frzb1a9n3g25y85jpfng82vzsv7m3c5fbyrpq5ki4c3pa8823z3s61xfigm45q469nqnzp416hgx"; + }; + }; + "hawk-1.0.0" = { + name = "hawk"; + packageName = "hawk"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz"; + sha1 = "b90bb169807285411da7ffcb8dd2598502d3b52d"; + }; + }; + "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"; + }; + }; + "he-1.1.1" = { + name = "he"; + packageName = "he"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/he/-/he-1.1.1.tgz"; + sha1 = "93410fd21b009735151f8868c2f271f3427e23fd"; + }; + }; + "hmac-drbg-1.0.1" = { + name = "hmac-drbg"; + packageName = "hmac-drbg"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz"; + sha1 = "d2745701025a6c775a6c545793ed502fc0c649a1"; + }; + }; + "hoek-0.9.1" = { + name = "hoek"; + packageName = "hoek"; + version = "0.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"; + sha1 = "3d322462badf07716ea7eb85baf88079cddce505"; + }; + }; + "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"; + }; + }; + "htmlescape-1.1.1" = { + name = "htmlescape"; + packageName = "htmlescape"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/htmlescape/-/htmlescape-1.1.1.tgz"; + sha1 = "3a03edc2214bca3b66424a3e7959349509cb0351"; + }; + }; + "htmlparser2-3.8.3" = { + name = "htmlparser2"; + packageName = "htmlparser2"; + version = "3.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz"; + sha1 = "996c28b191516a8be86501a7d79757e5c70c1068"; + }; + }; + "http-signature-0.10.1" = { + name = "http-signature"; + packageName = "http-signature"; + version = "0.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz"; + sha1 = "4fbdac132559aa8323121e540779c0a012b27e66"; + }; + }; + "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"; + }; + }; + "https-browserify-1.0.0" = { + name = "https-browserify"; + packageName = "https-browserify"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz"; + sha1 = "ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"; + }; + }; + "ieee754-1.1.8" = { + name = "ieee754"; + packageName = "ieee754"; + version = "1.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz"; + sha1 = "be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"; + }; + }; + "image-size-0.5.5" = { + name = "image-size"; + packageName = "image-size"; + version = "0.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz"; + sha1 = "09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"; + }; + }; + "indexof-0.0.1" = { + name = "indexof"; + packageName = "indexof"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz"; + sha1 = "82dc336d232b9062179d05ab3293a66059fd435d"; + }; + }; + "inflight-1.0.6" = { + name = "inflight"; + packageName = "inflight"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; + sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + }; + }; + "inherits-1.0.2" = { + name = "inherits"; + packageName = "inherits"; version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/interpret/-/interpret-1.0.2.tgz"; - sha1 = "f4f623f0bb7122f15f5717c8e254b8161b5c5b2d"; + url = "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz"; + sha1 = "ca4309dadee6b54cc0b8d247e8d7c7a0975bdc9b"; + }; + }; + "inherits-2.0.1" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; + sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; + }; + }; + "inherits-2.0.3" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; + sha1 = "633c2c83e3da42a502f52466022480f4208261de"; + }; + }; + "ini-1.1.0" = { + name = "ini"; + packageName = "ini"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ini/-/ini-1.1.0.tgz"; + sha1 = "4e808c2ce144c6c1788918e034d6797bc6cf6281"; + }; + }; + "ini-1.3.5" = { + name = "ini"; + packageName = "ini"; + version = "1.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz"; + sha512 = "1rjbvf1rg5ywhnba08sgagn2qf23lab330qrqmh7d891zap3xpxcyfyj1cblpf0f0rypglcfacybzyrpd4996aa1mbc820awa33k5j5"; + }; + }; + "inline-source-map-0.6.2" = { + name = "inline-source-map"; + packageName = "inline-source-map"; + version = "0.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.6.2.tgz"; + sha1 = "f9393471c18a79d1724f863fa38b586370ade2a5"; + }; + }; + "insert-module-globals-7.0.2" = { + name = "insert-module-globals"; + packageName = "insert-module-globals"; + version = "7.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.0.2.tgz"; + sha512 = "19lb0lqjmyxr13va9m2mdyjmpfb2c4lgnnnwysri85znpa37gcgi6b57zj0h5ymk6fbl3snjfw07gb9azb8yvkldj6av6wdvs1knyx7"; + }; + }; + "interpret-1.1.0" = { + name = "interpret"; + packageName = "interpret"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz"; + sha1 = "7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"; + }; + }; + "is-buffer-1.1.6" = { + name = "is-buffer"; + packageName = "is-buffer"; + version = "1.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz"; + sha512 = "3kr8dm9qyklmm2xyiz75s8db90bfilfals4x0g276kncihrrrz0ar4y6dqpvc7pwy7h43jay1bayi1r62x97nzvcswkk4ap18pl1irm"; + }; + }; + "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"; + }; + }; + "isarray-0.0.1" = { + name = "isarray"; + packageName = "isarray"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; + sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "jsbn-0.1.1" = { + name = "jsbn"; + packageName = "jsbn"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"; + sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; + }; + }; + "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"; + }; + }; + "json-stable-stringify-0.0.1" = { + name = "json-stable-stringify"; + packageName = "json-stable-stringify"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz"; + sha1 = "611c23e814db375527df851193db59dd2af27f45"; + }; + }; + "json-stable-stringify-1.0.1" = { + name = "json-stable-stringify"; + packageName = "json-stable-stringify"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz"; + sha1 = "9a759d39c5f2ff503fd5300646ed445f88c4f9af"; + }; + }; + "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"; + }; + }; + "jsonify-0.0.0" = { + name = "jsonify"; + packageName = "jsonify"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz"; + sha1 = "2c74b6ee41d93ca51b7b5aaee8f503631d252a73"; + }; + }; + "jsonparse-1.3.1" = { + name = "jsonparse"; + packageName = "jsonparse"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz"; + sha1 = "3f4dae4a91fac315f71062f8521cc239f1366280"; + }; + }; + "jsprim-1.4.1" = { + name = "jsprim"; + packageName = "jsprim"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz"; + sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; + }; + }; + "just-extend-1.1.27" = { + name = "just-extend"; + packageName = "just-extend"; + version = "1.1.27"; + src = fetchurl { + url = "https://registry.npmjs.org/just-extend/-/just-extend-1.1.27.tgz"; + sha512 = "3x01f92pvzs341qv1cin9mb3yiimkzjpy0f4dms78ki26ba01kjqcjpcm85sw005lc8d5dkk9wsigwh7zawnh10vml03siifbbnk5cq"; + }; + }; + "kew-0.1.7" = { + name = "kew"; + packageName = "kew"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/kew/-/kew-0.1.7.tgz"; + sha1 = "0a32a817ff1a9b3b12b8c9bacf4bc4d679af8e72"; + }; + }; + "labeled-stream-splicer-2.0.0" = { + name = "labeled-stream-splicer"; + packageName = "labeled-stream-splicer"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.0.tgz"; + sha1 = "a52e1d138024c00b86b1c0c91f677918b8ae0a59"; + }; + }; + "lexical-scope-1.2.0" = { + name = "lexical-scope"; + packageName = "lexical-scope"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lexical-scope/-/lexical-scope-1.2.0.tgz"; + sha1 = "fcea5edc704a4b3a8796cdca419c3a0afaf22df4"; + }; + }; + "lodash-3.7.0" = { + name = "lodash"; + packageName = "lodash"; + version = "3.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-3.7.0.tgz"; + sha1 = "3678bd8ab995057c07ade836ed2ef087da811d45"; + }; + }; + "lodash.get-4.4.2" = { + name = "lodash.get"; + packageName = "lodash.get"; + version = "4.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz"; + sha1 = "2d177f652fa31e939b4438d5341499dfa3825e99"; + }; + }; + "lodash.memoize-3.0.4" = { + name = "lodash.memoize"; + packageName = "lodash.memoize"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-3.0.4.tgz"; + sha1 = "2dcbd2c287cbc0a55cc42328bd0c736150d53e3f"; + }; + }; + "lolex-2.3.2" = { + name = "lolex"; + packageName = "lolex"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lolex/-/lolex-2.3.2.tgz"; + sha512 = "2g7dp64fm1kp17mxgz5r8hlgd65k8wfxz8jwcgqskdxn7vsnm6vj1bylcqblyzl6879p3g7qcjqqwmw0nik6032fksb33q5v7d4v6h3"; + }; + }; + "md5.js-1.3.4" = { + name = "md5.js"; + packageName = "md5.js"; + version = "1.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz"; + sha1 = "e9bdbde94a20a5ac18b04340fc5764d5b09d901d"; + }; + }; + "miller-rabin-4.0.1" = { + name = "miller-rabin"; + packageName = "miller-rabin"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz"; + sha512 = "12277knznlw4myxmgg6vgkrwmrhj9dyniscrlph3s08ndi2q25v3wrv6rwanvz29v5k5x756xa5yif4xllrghpn3jqaamnr3cp5ypnp"; + }; + }; + "mime-1.2.11" = { + name = "mime"; + packageName = "mime"; + version = "1.2.11"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; + sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; + }; + }; + "mime-1.6.0" = { + name = "mime"; + packageName = "mime"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz"; + sha512 = "1x901mk5cdib4xp27v4ivwwr7mhy64r4rk953bzivi5p9lf2bhw88ra2rhkd254xkdx2d3q30zkq239vc4yx4pfsj4hpys8rbr6fif7"; + }; + }; + "mime-db-1.33.0" = { + name = "mime-db"; + packageName = "mime-db"; + version = "1.33.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz"; + sha512 = "36xnw59ik9fqym00cmwb5nyzg0l03k70cp413f7639j93wgmzk1mh0xjc7i6zz3r6k9xnwh0g5cm5a1f3y8c6plgy4qld7fm887ywh4"; + }; + }; + "mime-types-2.1.18" = { + name = "mime-types"; + packageName = "mime-types"; + version = "2.1.18"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz"; + sha512 = "22krj1kw7n9z10zdyx7smcaim4bzwqsqzhspwha06q58gcrxfp93hw2cd0vk5crhq5p2dwzqlpacg32lrmp5sjzb798zdzy35mdmkwm"; + }; + }; + "minimalistic-assert-1.0.0" = { + name = "minimalistic-assert"; + packageName = "minimalistic-assert"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz"; + sha1 = "702be2dda6b37f4836bcb3f5db56641b64a1d3d3"; + }; + }; + "minimalistic-crypto-utils-1.0.1" = { + name = "minimalistic-crypto-utils"; + packageName = "minimalistic-crypto-utils"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz"; + sha1 = "f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"; + }; + }; + "minimatch-3.0.4" = { + name = "minimatch"; + packageName = "minimatch"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; + sha512 = "1879a3j85h92ypvb7lpv1dqpcxl49rqnbgs5la18zmj1yqhwl60c2m74254wbr5pp3znckqpkg9dvjyrz6hfz8b9vag5a3j910db4f8"; + }; + }; + "minimist-0.0.8" = { + name = "minimist"; + packageName = "minimist"; + version = "0.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; + sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; + }; + }; + "minimist-1.2.0" = { + name = "minimist"; + packageName = "minimist"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"; + sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; + }; + }; + "mkdirp-0.3.5" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; + sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; + }; + }; + "mkdirp-0.5.1" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; + sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; + }; + }; + "mocha-phantomjs-core-1.3.1" = { + name = "mocha-phantomjs-core"; + packageName = "mocha-phantomjs-core"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mocha-phantomjs-core/-/mocha-phantomjs-core-1.3.1.tgz"; + sha1 = "586538c8d71fa8de90c41a46acc0481c1fb83e18"; + }; + }; + "module-deps-6.0.0" = { + name = "module-deps"; + packageName = "module-deps"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/module-deps/-/module-deps-6.0.0.tgz"; + sha512 = "0ri32x2v7ywi8n4h92scc5pq6zlh7mmzbmk0gh2gsh3490w4d9islz1rs0in98cl2h5fl0dfx2dfcad0disnaiqflw46d24ja20raq4"; + }; + }; + "ms-2.0.0" = { + name = "ms"; + packageName = "ms"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"; + sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; + }; + }; + "ncp-0.4.2" = { + name = "ncp"; + packageName = "ncp"; + version = "0.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz"; + sha1 = "abcc6cbd3ec2ed2a729ff6e7c1fa8f01784a8574"; + }; + }; + "nise-1.3.0" = { + name = "nise"; + packageName = "nise"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nise/-/nise-1.3.0.tgz"; + sha512 = "20b9q52bz8ncm5jqjfhrhrcr2rb0y8jhb867ayrkdsf78y1c186qra112a6sj6lbnkab0dx0i1cnr2hz4l4dzzkn1l8khvc71vspqjk"; + }; + }; + "node-uuid-1.4.8" = { + name = "node-uuid"; + packageName = "node-uuid"; + version = "1.4.8"; + src = fetchurl { + url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz"; + sha1 = "b040eb0923968afabf8d32fb1f17f1167fdab907"; + }; + }; + "nopt-2.2.1" = { + name = "nopt"; + packageName = "nopt"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/nopt/-/nopt-2.2.1.tgz"; + sha1 = "2aa09b7d1768487b3b89a9c5aa52335bff0baea7"; + }; + }; + "npmconf-0.0.24" = { + name = "npmconf"; + packageName = "npmconf"; + version = "0.0.24"; + src = fetchurl { + url = "https://registry.npmjs.org/npmconf/-/npmconf-0.0.24.tgz"; + sha1 = "b78875b088ccc3c0afa3eceb3ce3244b1b52390c"; + }; + }; + "oauth-sign-0.3.0" = { + name = "oauth-sign"; + packageName = "oauth-sign"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz"; + sha1 = "cb540f93bb2b22a7d5941691a288d60e8ea9386e"; + }; + }; + "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"; + }; + }; + "once-1.1.1" = { + name = "once"; + packageName = "once"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/once/-/once-1.1.1.tgz"; + sha1 = "9db574933ccb08c3a7614d154032c09ea6f339e7"; + }; + }; + "once-1.4.0" = { + name = "once"; + packageName = "once"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; + sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + }; + }; + "os-browserify-0.3.0" = { + name = "os-browserify"; + packageName = "os-browserify"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz"; + sha1 = "854373c7f5c2315914fc9bfc6bd8238fdda1ec27"; + }; + }; + "osenv-0.0.3" = { + name = "osenv"; + packageName = "osenv"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/osenv/-/osenv-0.0.3.tgz"; + sha1 = "cd6ad8ddb290915ad9e22765576025d411f29cb6"; + }; + }; + "pako-1.0.6" = { + name = "pako"; + packageName = "pako"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz"; + sha512 = "1r9hy37qsbhv5ipsydkbir2yl7qg3lbpgj4qzrnb903w8mhj9ibaww0zykbp0ak1nxxp6mpbws3xsrf7fgq39zchci90c7chgqvh1wm"; + }; + }; + "parents-1.0.1" = { + name = "parents"; + packageName = "parents"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parents/-/parents-1.0.1.tgz"; + sha1 = "fedd4d2bf193a77745fe71e371d73c3307d9c751"; + }; + }; + "parse-asn1-5.1.0" = { + name = "parse-asn1"; + packageName = "parse-asn1"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.0.tgz"; + sha1 = "37c4f9b7ed3ab65c74817b5f2480937fbf97c712"; + }; + }; + "path-browserify-0.0.0" = { + name = "path-browserify"; + packageName = "path-browserify"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz"; + sha1 = "a0b870729aae214005b7d5032ec2cbbb0fb4451a"; + }; + }; + "path-is-absolute-1.0.1" = { + name = "path-is-absolute"; + packageName = "path-is-absolute"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; + sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + }; + }; + "path-parse-1.0.5" = { + name = "path-parse"; + packageName = "path-parse"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz"; + sha1 = "3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"; + }; + }; + "path-platform-0.11.15" = { + name = "path-platform"; + packageName = "path-platform"; + version = "0.11.15"; + src = fetchurl { + url = "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz"; + sha1 = "e864217f74c36850f0852b78dc7bf7d4a5721bf2"; + }; + }; + "path-to-regexp-1.7.0" = { + name = "path-to-regexp"; + packageName = "path-to-regexp"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz"; + sha1 = "59fde0f435badacba103a84e9d3bc64e96b9937d"; + }; + }; + "pbkdf2-3.0.14" = { + name = "pbkdf2"; + packageName = "pbkdf2"; + version = "3.0.14"; + src = fetchurl { + url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.14.tgz"; + sha512 = "30bb7vx0m1k1m3d1i1khgvmgddx3ahqgprs421ssrh5plpx50k5bazsj67gdi7qiknircqy59yxbclq95s2rnmk8ysgkqdpsddijfw2"; + }; + }; + "performance-now-0.2.0" = { + name = "performance-now"; + packageName = "performance-now"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz"; + sha1 = "33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"; + }; + }; + "phantomjs-1.9.7-15" = { + name = "phantomjs"; + packageName = "phantomjs"; + version = "1.9.7-15"; + src = fetchurl { + url = "https://registry.npmjs.org/phantomjs/-/phantomjs-1.9.7-15.tgz"; + sha1 = "0b3a7ce630486a83be91ff4e832eee20e971115b"; + }; + }; + "process-0.11.10" = { + name = "process"; + packageName = "process"; + version = "0.11.10"; + src = fetchurl { + url = "https://registry.npmjs.org/process/-/process-0.11.10.tgz"; + sha1 = "7332300e840161bda3e69a1d1d91a7d4bc16f182"; + }; + }; + "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"; + }; + }; + "process-nextick-args-2.0.0" = { + name = "process-nextick-args"; + packageName = "process-nextick-args"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz"; + sha512 = "0rw8xpqqkhs91722slvzf8icxfaimqp4w8zb3840jxr7r8n8035byl6dhdi5bm0yr6x7sdws0gf3m025fg6hqgaklwlbl4d7bah5l9j"; + }; + }; + "progress-1.1.8" = { + name = "progress"; + packageName = "progress"; + version = "1.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz"; + sha1 = "e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"; + }; + }; + "promise-7.3.1" = { + name = "promise"; + packageName = "promise"; + version = "7.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz"; + sha512 = "17cn4nns2nxh9r0pdiqsqx3fpvaa82c1mhcr8r84k2a9hkpb0mj4bxzfbg3l9iy74yn9hj6mh2gsddsi3v939a1zp7ycbzqkxfm12cy"; + }; + }; + "proto-list-1.2.4" = { + name = "proto-list"; + packageName = "proto-list"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz"; + sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849"; + }; + }; + "prr-1.0.1" = { + name = "prr"; + packageName = "prr"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz"; + sha1 = "d3fc114ba06995a45ec6893f484ceb1d78f5f476"; + }; + }; + "public-encrypt-4.0.0" = { + name = "public-encrypt"; + packageName = "public-encrypt"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz"; + sha1 = "39f699f3a46560dd5ebacbca693caf7c65c18cc6"; + }; + }; + "punycode-1.3.2" = { + name = "punycode"; + packageName = "punycode"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"; + sha1 = "9653a036fb7c1ee42342f2325cceefea3926c48d"; + }; + }; + "punycode-1.4.1" = { + name = "punycode"; + packageName = "punycode"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"; + sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; + }; + }; + "qs-0.6.6" = { + name = "qs"; + packageName = "qs"; + version = "0.6.6"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-0.6.6.tgz"; + sha1 = "6e015098ff51968b8a3c819001d5f2c89bc4b107"; + }; + }; + "qs-6.4.0" = { + name = "qs"; + packageName = "qs"; + version = "6.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz"; + sha1 = "13e26d28ad6b0ffaa91312cd3bf708ed351e7233"; + }; + }; + "querystring-0.2.0" = { + name = "querystring"; + packageName = "querystring"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz"; + sha1 = "b209849203bb25df820da756e747005878521620"; + }; + }; + "querystring-es3-0.2.1" = { + name = "querystring-es3"; + packageName = "querystring-es3"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz"; + sha1 = "9ec61f79049875707d69414596fd907a4d711e73"; + }; + }; + "randombytes-2.0.6" = { + name = "randombytes"; + packageName = "randombytes"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz"; + sha512 = "3a0zyz736klfzzpd9vwag3gznq7lrj57igm474dq279gsnyqdgfm1brhrs78ky30gsdwz9rwnjjms00fpdpp2p3x8p9mq2zbhw3k108"; + }; + }; + "randomfill-1.0.4" = { + name = "randomfill"; + packageName = "randomfill"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz"; + sha512 = "0pm7c7mw7a3qwjr21f8cvxaa2sq5l4svqs51lppn833x0yvz3yx8x4vbd4rswjynykvlgvn4hrpq327pvbzp428f4b1fciy3xnmrfgk"; + }; + }; + "read-only-stream-2.0.0" = { + name = "read-only-stream"; + packageName = "read-only-stream"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-only-stream/-/read-only-stream-2.0.0.tgz"; + sha1 = "2724fd6a8113d73764ac288d4386270c1dbf17f0"; + }; + }; + "readable-stream-1.1.14" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "1.1.14"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz"; + sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9"; + }; + }; + "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"; + }; + }; + "readable-stream-2.3.5" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "2.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz"; + sha512 = "09n3j4jsfl2lq3gj65qwn5b3lvzb624lrb8m14h81ls9cw59vvm8436gm5zwaqxf6y1zrfwbrsmizsq48jw1s3qj9zhpjp438735bdl"; }; }; "rechoir-0.6.2" = { @@ -2632,347 +2002,722 @@ let sha1 = "85204b54dba82d5742e28c96756ef43af50e3384"; }; }; + "request-2.36.0" = { + name = "request"; + packageName = "request"; + version = "2.36.0"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.36.0.tgz"; + sha1 = "28c6c04262c7b9ffdd21b9255374517ee6d943f5"; + }; + }; + "request-2.81.0" = { + name = "request"; + packageName = "request"; + version = "2.81.0"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.81.0.tgz"; + sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0"; + }; + }; + "request-progress-0.3.1" = { + name = "request-progress"; + packageName = "request-progress"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/request-progress/-/request-progress-0.3.1.tgz"; + sha1 = "0721c105d8a96ac6b2ce8b2c89ae2d5ecfcf6b3a"; + }; + }; + "resolve-1.1.7" = { + name = "resolve"; + packageName = "resolve"; + version = "1.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz"; + sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b"; + }; + }; + "resolve-1.5.0" = { + name = "resolve"; + packageName = "resolve"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz"; + sha512 = "25scf9zkhf5yc9x3d7mfq2im5vyxmq3ih939na6jzblal7mgfcijmadl2maz501mkccykj714gvdhhmlzi86hbk7k03r9ipnwd142l6"; + }; + }; + "rimraf-2.2.8" = { + name = "rimraf"; + packageName = "rimraf"; + version = "2.2.8"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"; + sha1 = "e439be2aaee327321952730f99a8929e4fc50582"; + }; + }; + "ripemd160-2.0.1" = { + name = "ripemd160"; + packageName = "ripemd160"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.1.tgz"; + sha1 = "0f4584295c53a3628af7e6d79aca21ce57d1c6e7"; + }; + }; + "safe-buffer-5.1.1" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz"; + sha512 = "1p28rllll1w65yzq5azi4izx962399xdsdlfbaynn7vmp981hiss05jhiy9hm7sbbfk3b4dhlcv0zy07fc59mnc07hdv6wcgqkcvawh"; + }; + }; + "samsam-1.3.0" = { + name = "samsam"; + packageName = "samsam"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/samsam/-/samsam-1.3.0.tgz"; + sha512 = "1p5ac86nbwsyxsaqbfa288xk904a0lfc8fph9h2nflvgmz5ilwyprs12lb6as5n6k8q24y541sr4bvv7dy3pl1d2nnm6lpw7xh0hz6l"; + }; + }; + "semver-1.1.4" = { + name = "semver"; + packageName = "semver"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-1.1.4.tgz"; + sha1 = "2e5a4e72bab03472cc97f72753b4508912ef5540"; + }; + }; + "sha.js-2.4.10" = { + name = "sha.js"; + packageName = "sha.js"; + version = "2.4.10"; + src = fetchurl { + url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.10.tgz"; + sha512 = "2lfna0mg4mzdki4p3q29rsgywbghvy6f6jy6b61zj68d2d936wfqjgqpsdjchfcqkiim53qknpcnq9iiafyidfrw154qf75a2n2cz5y"; + }; + }; + "shasum-1.0.2" = { + name = "shasum"; + packageName = "shasum"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/shasum/-/shasum-1.0.2.tgz"; + sha1 = "e7012310d8f417f4deb5712150e5678b87ae565f"; + }; + }; + "shell-quote-1.6.1" = { + name = "shell-quote"; + packageName = "shell-quote"; + version = "1.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/shell-quote/-/shell-quote-1.6.1.tgz"; + sha1 = "f4781949cce402697127430ea3b3c5476f481767"; + }; + }; + "shelljs-0.3.0" = { + name = "shelljs"; + packageName = "shelljs"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz"; + sha1 = "3596e6307a781544f591f37da618360f31db57b1"; + }; + }; + "should-equal-2.0.0" = { + name = "should-equal"; + packageName = "should-equal"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/should-equal/-/should-equal-2.0.0.tgz"; + sha512 = "16cp397231rnlk9vc4i8jggycqwxpgrn3pm9l2bf5y02ln4gawz41z2ycqnw9h1rkm7x8zf5qy5d7jv7ll0c634p62fpxfar96gmzb4"; + }; + }; + "should-format-3.0.3" = { + name = "should-format"; + packageName = "should-format"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/should-format/-/should-format-3.0.3.tgz"; + sha1 = "9bfc8f74fa39205c53d38c34d717303e277124f1"; + }; + }; + "should-type-1.4.0" = { + name = "should-type"; + packageName = "should-type"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/should-type/-/should-type-1.4.0.tgz"; + sha1 = "0756d8ce846dfd09843a6947719dfa0d4cff5cf3"; + }; + }; + "should-type-adaptors-1.1.0" = { + name = "should-type-adaptors"; + packageName = "should-type-adaptors"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/should-type-adaptors/-/should-type-adaptors-1.1.0.tgz"; + sha512 = "1y2b2dwphk185za2spffsr383na1pdjl2bf8lwv6yzaix1q9px92brp5i0m670kz5lb9kdlxkp61vq53v7mcxjadhgfjdz7h9v223i4"; + }; + }; + "should-util-1.0.0" = { + name = "should-util"; + packageName = "should-util"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/should-util/-/should-util-1.0.0.tgz"; + sha1 = "c98cda374aa6b190df8ba87c9889c2b4db620063"; + }; + }; + "sntp-0.2.4" = { + name = "sntp"; + packageName = "sntp"; + version = "0.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"; + sha1 = "fb885f18b0f3aad189f824862536bceeec750900"; + }; + }; + "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"; + }; + }; + "source-map-0.5.7" = { + name = "source-map"; + packageName = "source-map"; + version = "0.5.7"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"; + sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"; + }; + }; + "source-map-0.6.1" = { + name = "source-map"; + packageName = "source-map"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"; + sha512 = "3p7hw8p69ikj5mwapmqkacsjnbvdfk5ylyamjg9x5izkl717xvzj0vk3fnmx1n4pf54h5rs7r8ig5kk4jv4ycqqj0hv75cnx6k1lf2j"; + }; + }; + "sshpk-1.14.1" = { + name = "sshpk"; + packageName = "sshpk"; + version = "1.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz"; + sha1 = "130f5975eddad963f1d56f92b9ac6c51fa9f83eb"; + }; + }; + "stream-browserify-2.0.1" = { + name = "stream-browserify"; + packageName = "stream-browserify"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz"; + sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"; + }; + }; + "stream-combiner2-1.1.1" = { + name = "stream-combiner2"; + packageName = "stream-combiner2"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz"; + sha1 = "fb4d8a1420ea362764e21ad4780397bebcb41cbe"; + }; + }; + "stream-http-2.8.0" = { + name = "stream-http"; + packageName = "stream-http"; + version = "2.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-http/-/stream-http-2.8.0.tgz"; + sha512 = "2ghzil78wsr29z8p1883i0vwx9gpsspha4wvdbpvqzbknrfiavwis010i5a7vy0xx8n486f6kwmjxsk3mg1w4bjy4whvizriz28b4xi"; + }; + }; + "stream-splicer-2.0.0" = { + name = "stream-splicer"; + packageName = "stream-splicer"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-splicer/-/stream-splicer-2.0.0.tgz"; + sha1 = "1b63be438a133e4b671cc1935197600175910d83"; + }; + }; + "string_decoder-0.10.31" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; + sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; + }; + }; + "string_decoder-1.0.3" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz"; + sha512 = "22vw5mmwlyblqc2zyqwl39wyhyahhpiyknim8iz5fk6xi002x777gkswiq8fh297djs5ii4pgrys57wq33hr5zf3xfd0d7kjxkzl0g0"; + }; + }; + "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"; + }; + }; + "strip-json-comments-1.0.4" = { + name = "strip-json-comments"; + packageName = "strip-json-comments"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz"; + sha1 = "1e15fbcac97d3ee99bf2d73b4c656b082bbafb91"; + }; + }; + "subarg-1.0.0" = { + name = "subarg"; + packageName = "subarg"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz"; + sha1 = "f62cf17581e996b48fc965699f54c06ae268b8d2"; + }; + }; + "supports-color-4.4.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz"; + sha512 = "1flwwfdd7gg94xrc0b2ard3qjx4cpy600q49gx43y8pzvs7j56q78bjhv8mk18vgbggr4fd11jda8ck5cdrkc5jcjs04nlp7kwbg85c"; + }; + }; + "supports-color-5.3.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "5.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz"; + sha512 = "0v9skvg8c5hgqfsm98p7d7hisk11syjdvl3nxid3ik572hbjwv4vyzws7q0n1yz8mvb1asbk00838fi09hyfskrng54icn8nbag98yi"; + }; + }; + "syntax-error-1.4.0" = { + name = "syntax-error"; + packageName = "syntax-error"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/syntax-error/-/syntax-error-1.4.0.tgz"; + sha512 = "3psid3r9b0gmnkf2ggydlw1nrcnyqa78smdihifdvff5vmlq92v8qyd6zfi94wczhllcyxl78zbc47cvz3h6xpa9v372xp6msxybwv0"; + }; + }; + "text-encoding-0.6.4" = { + name = "text-encoding"; + packageName = "text-encoding"; + version = "0.6.4"; + src = fetchurl { + url = "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz"; + sha1 = "e399a982257a276dae428bb92845cb71bdc26d19"; + }; + }; + "throttleit-0.0.2" = { + name = "throttleit"; + packageName = "throttleit"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz"; + sha1 = "cfedf88e60c00dd9697b61fdd2a8343a9b680eaf"; + }; + }; + "through-2.3.8" = { + name = "through"; + packageName = "through"; + version = "2.3.8"; + src = fetchurl { + url = "https://registry.npmjs.org/through/-/through-2.3.8.tgz"; + sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; + }; + }; + "through2-2.0.3" = { + name = "through2"; + packageName = "through2"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz"; + sha1 = "0004569b37c7c74ba39c43f3ced78d1ad94140be"; + }; + }; + "timers-browserify-1.4.2" = { + name = "timers-browserify"; + packageName = "timers-browserify"; + version = "1.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.2.tgz"; + sha1 = "c9c58b575be8407375cb5e2462dacee74359f41d"; + }; + }; + "to-arraybuffer-1.0.1" = { + name = "to-arraybuffer"; + packageName = "to-arraybuffer"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz"; + sha1 = "7d229b1fcc637e466ca081180836a7aabff83f43"; + }; + }; + "tough-cookie-2.3.4" = { + name = "tough-cookie"; + packageName = "tough-cookie"; + version = "2.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz"; + sha512 = "0ncm6j3cjq1f26mzjf04k9bkw1b08w53s4qa3a11c1bdj4pgnqv1422c1xs5jyy6y1psppjx52fhagq5zkjkgrcpdkxcdiry96r77jd"; + }; + }; + "tty-browserify-0.0.1" = { + name = "tty-browserify"; + packageName = "tty-browserify"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz"; + sha512 = "33h4i99m8bj5vqm3hmvfhi19whavny64ic0mr4yl8s14riw077ballp49zbv3kzy8615pad3gfcy7fxa86za1q41biqpmdwn8xxlx0b"; + }; + }; + "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"; + }; + }; + "tunnel-agent-0.6.0" = { + name = "tunnel-agent"; + packageName = "tunnel-agent"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; + sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; + }; + }; + "tweetnacl-0.14.5" = { + name = "tweetnacl"; + packageName = "tweetnacl"; + version = "0.14.5"; + src = fetchurl { + url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"; + sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; + }; + }; + "type-detect-4.0.8" = { + name = "type-detect"; + packageName = "type-detect"; + version = "4.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz"; + sha512 = "3z3kf4kgd3czn50a158v1k2l61lpbznrbk8xvh2pdsfsrcsda3271427fzmp1r7awnvvzrhzclfm03cpv671rdlqyz56xpmh6cgzyni"; + }; + }; + "typedarray-0.0.6" = { + name = "typedarray"; + packageName = "typedarray"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"; + sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; + }; + }; + "umd-3.0.2" = { + name = "umd"; + packageName = "umd"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/umd/-/umd-3.0.2.tgz"; + sha512 = "0wgy2hbi34ncj74m0vw30yjcrw0wg3m465r28y458kvvkp7lsmm3klki0f79slyspfnr4c3l0qzcmpggcybk4d6lcb05kh0aj5c2rx6"; + }; + }; + "url-0.11.0" = { + name = "url"; + packageName = "url"; + version = "0.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/url/-/url-0.11.0.tgz"; + sha1 = "3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"; + }; + }; + "util-0.10.3" = { + name = "util"; + packageName = "util"; + version = "0.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/util/-/util-0.10.3.tgz"; + sha1 = "7afb1afe50805246489e3db7fe0ed379336ac0f9"; + }; + }; + "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"; + }; + }; + "uuid-3.2.1" = { + name = "uuid"; + packageName = "uuid"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz"; + sha512 = "0843vl1c974n8kw5kn0kvhvhwk8y8jydr0xkwwl2963xxmkw4ingk6xj9c8m48jw2i95giglxzq5aw5v5mij9kv7fzln8pxav1cr6cd"; + }; + }; + "verror-1.10.0" = { + name = "verror"; + packageName = "verror"; + version = "1.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz"; + sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; + }; + }; + "vm-browserify-0.0.4" = { + name = "vm-browserify"; + packageName = "vm-browserify"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz"; + sha1 = "5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"; + }; + }; + "which-1.0.9" = { + name = "which"; + packageName = "which"; + version = "1.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/which/-/which-1.0.9.tgz"; + sha1 = "460c1da0f810103d0321a9b633af9e575e64486f"; + }; + }; + "wrappy-1.0.2" = { + name = "wrappy"; + packageName = "wrappy"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; + sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + }; + }; + "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"; + }; + }; }; in { marked = nodeEnv.buildNodePackage { name = "marked"; packageName = "marked"; - version = "0.3.6"; + version = "0.3.17"; src = fetchurl { - url = "https://registry.npmjs.org/marked/-/marked-0.3.6.tgz"; - sha1 = "b2c6c618fccece4ef86c4fc6cb8a7cbf5aeda8d7"; + url = "https://registry.npmjs.org/marked/-/marked-0.3.17.tgz"; + sha512 = "2cw4hwy4hyxspppby5ww0sljhyg0nhlgy0aamqvf7nrhg4vyrgyp8ah52pz99rr8pvsjk3h9z9q8fhrlqaixw5kgk2si5yrr0v9n0pq"; }; buildInputs = globalBuildInputs; meta = { description = "A markdown parser built for speed"; - homepage = https://github.com/chjj/marked; + homepage = https://github.com/markedjs/marked; license = "MIT"; }; production = true; + bypassCache = false; }; browserify = nodeEnv.buildNodePackage { name = "browserify"; packageName = "browserify"; - version = "14.1.0"; + version = "16.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/browserify/-/browserify-14.1.0.tgz"; - sha1 = "0508cc1e7bf4c152312c2fa523e676c0b0b92311"; + url = "https://registry.npmjs.org/browserify/-/browserify-16.1.1.tgz"; + sha512 = "01ay1w7sndfvwjdc5n7sa9a4yzzrwdr8agj1655dz50f0g034scaqli9v1dngxasi8gk8gqvqcsqnmphvwkj1y6awlq1y5l6bbgc8c9"; }; dependencies = [ - (sources."JSONStream-1.3.1" // { - dependencies = [ - sources."jsonparse-1.3.0" - sources."through-2.3.8" - ]; - }) + sources."JSONStream-1.3.2" + sources."acorn-4.0.13" + sources."acorn-node-1.3.0" + sources."array-filter-0.0.1" + sources."array-map-0.0.0" + sources."array-reduce-0.0.0" + sources."asn1.js-4.10.1" sources."assert-1.4.1" - (sources."browser-pack-6.0.2" // { - dependencies = [ - (sources."combine-source-map-0.7.2" // { - dependencies = [ - sources."convert-source-map-1.1.3" - sources."inline-source-map-0.6.2" - sources."lodash.memoize-3.0.4" - sources."source-map-0.5.6" - ]; - }) - sources."umd-3.0.1" - ]; - }) + sources."astw-2.2.0" + sources."balanced-match-1.0.0" + sources."base64-js-1.2.3" + sources."bn.js-4.11.8" + sources."brace-expansion-1.1.11" + sources."brorand-1.1.0" + sources."browser-pack-6.0.4" (sources."browser-resolve-1.11.2" // { dependencies = [ sources."resolve-1.1.7" ]; }) - (sources."browserify-zlib-0.1.4" // { - dependencies = [ - sources."pako-0.2.9" - ]; - }) - (sources."buffer-5.0.5" // { - dependencies = [ - sources."base64-js-1.2.0" - sources."ieee754-1.1.8" - ]; - }) + sources."browserify-aes-1.1.1" + sources."browserify-cipher-1.0.0" + sources."browserify-des-1.0.0" + sources."browserify-rsa-4.0.1" + sources."browserify-sign-4.0.4" + sources."browserify-zlib-0.2.0" + sources."buffer-5.1.0" + sources."buffer-xor-1.0.3" + sources."builtin-status-codes-3.0.0" sources."cached-path-relative-1.0.1" - (sources."concat-stream-1.5.2" // { - dependencies = [ - sources."typedarray-0.0.6" - (sources."readable-stream-2.0.6" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."util-deprecate-1.0.2" - ]; - }) - ]; - }) - (sources."console-browserify-1.1.0" // { - dependencies = [ - sources."date-now-0.1.4" - ]; - }) + sources."cipher-base-1.0.4" + sources."combine-source-map-0.8.0" + sources."concat-map-0.0.1" + sources."concat-stream-1.6.1" + sources."console-browserify-1.1.0" sources."constants-browserify-1.0.0" - (sources."crypto-browserify-3.11.0" // { + sources."convert-source-map-1.1.3" + sources."core-util-is-1.0.2" + sources."create-ecdh-4.0.0" + sources."create-hash-1.1.3" + sources."create-hmac-1.1.6" + (sources."crypto-browserify-3.12.0" // { dependencies = [ - (sources."browserify-cipher-1.0.0" // { - dependencies = [ - (sources."browserify-aes-1.0.6" // { - dependencies = [ - sources."buffer-xor-1.0.3" - sources."cipher-base-1.0.3" - ]; - }) - (sources."browserify-des-1.0.0" // { - dependencies = [ - sources."cipher-base-1.0.3" - (sources."des.js-1.0.0" // { - dependencies = [ - sources."minimalistic-assert-1.0.0" - ]; - }) - ]; - }) - sources."evp_bytestokey-1.0.0" - ]; - }) - (sources."browserify-sign-4.0.4" // { - dependencies = [ - sources."bn.js-4.11.6" - sources."browserify-rsa-4.0.1" - (sources."elliptic-6.4.0" // { - dependencies = [ - sources."brorand-1.1.0" - sources."hash.js-1.0.3" - sources."hmac-drbg-1.0.0" - sources."minimalistic-assert-1.0.0" - sources."minimalistic-crypto-utils-1.0.1" - ]; - }) - (sources."parse-asn1-5.1.0" // { - dependencies = [ - (sources."asn1.js-4.9.1" // { - dependencies = [ - sources."minimalistic-assert-1.0.0" - ]; - }) - (sources."browserify-aes-1.0.6" // { - dependencies = [ - sources."buffer-xor-1.0.3" - sources."cipher-base-1.0.3" - ]; - }) - sources."evp_bytestokey-1.0.0" - ]; - }) - ]; - }) - (sources."create-ecdh-4.0.0" // { - dependencies = [ - sources."bn.js-4.11.6" - (sources."elliptic-6.4.0" // { - dependencies = [ - sources."brorand-1.1.0" - sources."hash.js-1.0.3" - sources."hmac-drbg-1.0.0" - sources."minimalistic-assert-1.0.0" - sources."minimalistic-crypto-utils-1.0.1" - ]; - }) - ]; - }) - (sources."create-hash-1.1.2" // { - dependencies = [ - sources."cipher-base-1.0.3" - sources."ripemd160-1.0.1" - sources."sha.js-2.4.8" - ]; - }) - sources."create-hmac-1.1.4" - (sources."diffie-hellman-5.0.2" // { - dependencies = [ - sources."bn.js-4.11.6" - (sources."miller-rabin-4.0.0" // { - dependencies = [ - sources."brorand-1.1.0" - ]; - }) - ]; - }) - sources."pbkdf2-3.0.9" - (sources."public-encrypt-4.0.0" // { - dependencies = [ - sources."bn.js-4.11.6" - sources."browserify-rsa-4.0.1" - (sources."parse-asn1-5.1.0" // { - dependencies = [ - (sources."asn1.js-4.9.1" // { - dependencies = [ - sources."minimalistic-assert-1.0.0" - ]; - }) - (sources."browserify-aes-1.0.6" // { - dependencies = [ - sources."buffer-xor-1.0.3" - sources."cipher-base-1.0.3" - ]; - }) - sources."evp_bytestokey-1.0.0" - ]; - }) - ]; - }) - sources."randombytes-2.0.3" + sources."hash-base-2.0.2" ]; }) + sources."date-now-0.1.4" sources."defined-1.0.0" sources."deps-sort-2.0.0" - sources."domain-browser-1.1.7" + sources."des.js-1.0.0" + sources."detective-5.1.0" + sources."diffie-hellman-5.0.2" + sources."domain-browser-1.2.0" sources."duplexer2-0.1.4" - sources."events-1.1.1" - (sources."glob-7.1.1" // { - dependencies = [ - sources."fs.realpath-1.0.0" - (sources."inflight-1.0.6" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - (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."has-1.0.1" // { - dependencies = [ - sources."function-bind-1.1.0" - ]; - }) + sources."elliptic-6.4.0" + sources."events-2.0.0" + sources."evp_bytestokey-1.0.3" + sources."fs.realpath-1.0.0" + sources."function-bind-1.1.1" + sources."glob-7.1.2" + sources."has-1.0.1" + sources."hash-base-3.0.4" + sources."hash.js-1.1.3" + sources."hmac-drbg-1.0.1" sources."htmlescape-1.1.1" - sources."https-browserify-0.0.1" + sources."https-browserify-1.0.0" + sources."ieee754-1.1.8" + sources."indexof-0.0.1" + sources."inflight-1.0.6" sources."inherits-2.0.3" - (sources."insert-module-globals-7.0.1" // { + sources."inline-source-map-0.6.2" + (sources."insert-module-globals-7.0.2" // { dependencies = [ - (sources."combine-source-map-0.7.2" // { - dependencies = [ - sources."convert-source-map-1.1.3" - sources."inline-source-map-0.6.2" - sources."lodash.memoize-3.0.4" - sources."source-map-0.5.6" - ]; - }) - sources."is-buffer-1.1.5" - (sources."lexical-scope-1.2.0" // { - dependencies = [ - (sources."astw-2.2.0" // { - dependencies = [ - sources."acorn-4.0.11" - ]; - }) - ]; - }) + sources."combine-source-map-0.7.2" + sources."concat-stream-1.5.2" + sources."readable-stream-2.0.6" + sources."string_decoder-0.10.31" ]; }) + sources."is-buffer-1.1.6" + sources."isarray-1.0.0" + sources."json-stable-stringify-0.0.1" + sources."jsonify-0.0.0" + sources."jsonparse-1.3.1" (sources."labeled-stream-splicer-2.0.0" // { dependencies = [ sources."isarray-0.0.1" - sources."stream-splicer-2.0.0" ]; }) - (sources."module-deps-4.1.1" // { + sources."lexical-scope-1.2.0" + sources."lodash.memoize-3.0.4" + sources."md5.js-1.3.4" + sources."miller-rabin-4.0.1" + sources."minimalistic-assert-1.0.0" + sources."minimalistic-crypto-utils-1.0.1" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + (sources."module-deps-6.0.0" // { dependencies = [ - (sources."detective-4.5.0" // { - dependencies = [ - sources."acorn-4.0.11" - ]; - }) - sources."stream-combiner2-1.1.1" - ]; - }) - sources."os-browserify-0.1.2" - (sources."parents-1.0.1" // { - dependencies = [ - sources."path-platform-0.11.15" + sources."acorn-5.5.3" + sources."minimist-1.2.0" ]; }) + sources."once-1.4.0" + sources."os-browserify-0.3.0" + sources."pako-1.0.6" + sources."parents-1.0.1" + sources."parse-asn1-5.1.0" sources."path-browserify-0.0.0" - sources."process-0.11.9" + sources."path-is-absolute-1.0.1" + sources."path-parse-1.0.5" + sources."path-platform-0.11.15" + sources."pbkdf2-3.0.14" + sources."process-0.11.10" + sources."process-nextick-args-1.0.7" + sources."public-encrypt-4.0.0" sources."punycode-1.4.1" + sources."querystring-0.2.0" sources."querystring-es3-0.2.1" + sources."randombytes-2.0.6" + sources."randomfill-1.0.4" sources."read-only-stream-2.0.0" - (sources."readable-stream-2.2.6" // { + (sources."readable-stream-2.3.5" // { dependencies = [ - sources."buffer-shims-1.0.0" - sources."core-util-is-1.0.2" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."util-deprecate-1.0.2" - ]; - }) - (sources."resolve-1.3.2" // { - dependencies = [ - sources."path-parse-1.0.5" - ]; - }) - (sources."shasum-1.0.2" // { - dependencies = [ - (sources."json-stable-stringify-0.0.1" // { - dependencies = [ - sources."jsonify-0.0.0" - ]; - }) - sources."sha.js-2.4.8" - ]; - }) - (sources."shell-quote-1.6.1" // { - dependencies = [ - sources."jsonify-0.0.0" - sources."array-filter-0.0.1" - sources."array-reduce-0.0.0" - sources."array-map-0.0.0" + sources."process-nextick-args-2.0.0" ]; }) + sources."resolve-1.5.0" + sources."ripemd160-2.0.1" + sources."safe-buffer-5.1.1" + sources."sha.js-2.4.10" + sources."shasum-1.0.2" + sources."shell-quote-1.6.1" + sources."source-map-0.5.7" sources."stream-browserify-2.0.1" - (sources."stream-http-2.6.3" // { - dependencies = [ - sources."builtin-status-codes-3.0.0" - sources."to-arraybuffer-1.0.1" - ]; - }) - sources."string_decoder-0.10.31" + sources."stream-combiner2-1.1.1" + sources."stream-http-2.8.0" + sources."stream-splicer-2.0.0" + sources."string_decoder-1.0.3" (sources."subarg-1.0.0" // { dependencies = [ sources."minimist-1.2.0" ]; }) - (sources."syntax-error-1.3.0" // { - dependencies = [ - sources."acorn-4.0.11" - ]; - }) + sources."syntax-error-1.4.0" + sources."through-2.3.8" sources."through2-2.0.3" sources."timers-browserify-1.4.2" - sources."tty-browserify-0.0.0" + sources."to-arraybuffer-1.0.1" + sources."tty-browserify-0.0.1" + sources."typedarray-0.0.6" + sources."umd-3.0.2" (sources."url-0.11.0" // { dependencies = [ sources."punycode-1.3.2" - sources."querystring-0.2.0" ]; }) (sources."util-0.10.3" // { @@ -2980,75 +2725,31 @@ in sources."inherits-2.0.1" ]; }) - (sources."vm-browserify-0.0.4" // { - dependencies = [ - sources."indexof-0.0.1" - ]; - }) + sources."util-deprecate-1.0.2" + sources."vm-browserify-0.0.4" + sources."wrappy-1.0.2" sources."xtend-4.0.1" ]; buildInputs = globalBuildInputs; meta = { description = "browser-side require() the node way"; - homepage = "https://github.com/substack/node-browserify#readme"; + homepage = "https://github.com/browserify/browserify#readme"; license = "MIT"; }; production = true; + bypassCache = false; }; uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "2.8.20"; + version = "3.3.14"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.20.tgz"; - sha1 = "be87100fbc18de3876ed606e9d24b4568311cecf"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.14.tgz"; + sha512 = "0b7d9nvyrhc5ij0xaxvgha7h97d5h36zhnwmbbbj5abk64bvn38sf4d5jwy64n8algm2q36a08n0z4k4khhnnq4h4ysvrin0lyib3rr"; }; dependencies = [ - sources."source-map-0.5.6" - (sources."yargs-3.10.0" // { - dependencies = [ - sources."camelcase-1.2.1" - (sources."cliui-2.1.0" // { - dependencies = [ - (sources."center-align-0.1.3" // { - dependencies = [ - (sources."align-text-0.1.4" // { - dependencies = [ - (sources."kind-of-3.1.0" // { - dependencies = [ - sources."is-buffer-1.1.5" - ]; - }) - sources."longest-1.0.1" - sources."repeat-string-1.6.1" - ]; - }) - sources."lazy-cache-1.0.4" - ]; - }) - (sources."right-align-0.1.3" // { - dependencies = [ - (sources."align-text-0.1.4" // { - dependencies = [ - (sources."kind-of-3.1.0" // { - dependencies = [ - sources."is-buffer-1.1.5" - ]; - }) - sources."longest-1.0.1" - sources."repeat-string-1.6.1" - ]; - }) - ]; - }) - sources."wordwrap-0.0.2" - ]; - }) - sources."decamelize-1.2.0" - sources."window-size-0.1.0" - ]; - }) - sources."uglify-to-browserify-1.0.2" + sources."commander-2.14.1" + sources."source-map-0.6.1" ]; buildInputs = globalBuildInputs; meta = { @@ -3057,123 +2758,85 @@ in license = "BSD-2-Clause"; }; production = true; + bypassCache = false; }; less = nodeEnv.buildNodePackage { name = "less"; packageName = "less"; - version = "2.7.2"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/less/-/less-2.7.2.tgz"; - sha1 = "368d6cc73e1fb03981183280918743c5dcf9b3df"; + url = "https://registry.npmjs.org/less/-/less-3.0.1.tgz"; + sha512 = "25qmszxk5bzrjgyy1m0k87zc1c5h19ckvnlkhl9j3ncm3zfx7rzmydj6f4sw5c7ldc4npzs41fmgd1hw113kilrk8sggwzwvfw7hi59"; }; dependencies = [ - (sources."errno-0.1.4" // { - dependencies = [ - sources."prr-0.0.0" - ]; - }) + sources."ajv-4.11.8" + sources."asap-2.0.6" + sources."asn1-0.2.3" + sources."assert-plus-0.2.0" + sources."asynckit-0.4.0" + sources."aws-sign2-0.6.0" + sources."aws4-1.6.0" + sources."bcrypt-pbkdf-1.0.1" + sources."boom-2.10.1" + sources."caseless-0.12.0" + sources."co-4.6.0" + sources."combined-stream-1.0.6" + sources."core-util-is-1.0.2" + sources."cryptiles-2.0.5" + sources."dashdash-1.14.1" + sources."delayed-stream-1.0.0" + sources."ecc-jsbn-0.1.1" + sources."errno-0.1.7" + sources."extend-3.0.1" + sources."extsprintf-1.3.0" + sources."forever-agent-0.6.1" + sources."form-data-2.1.4" + sources."getpass-0.1.7" sources."graceful-fs-4.1.11" - sources."image-size-0.5.1" - sources."mime-1.3.4" - (sources."mkdirp-0.5.1" // { + sources."har-schema-1.0.5" + sources."har-validator-4.2.1" + sources."hawk-3.1.3" + sources."hoek-2.16.3" + sources."http-signature-1.1.1" + sources."image-size-0.5.5" + sources."is-typedarray-1.0.0" + sources."isstream-0.1.2" + sources."jsbn-0.1.1" + sources."json-schema-0.2.3" + sources."json-stable-stringify-1.0.1" + sources."json-stringify-safe-5.0.1" + sources."jsonify-0.0.0" + (sources."jsprim-1.4.1" // { dependencies = [ - sources."minimist-0.0.8" + sources."assert-plus-1.0.0" ]; }) - (sources."promise-7.1.1" // { + sources."mime-1.6.0" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + sources."oauth-sign-0.8.2" + sources."performance-now-0.2.0" + sources."promise-7.3.1" + sources."prr-1.0.1" + sources."punycode-1.4.1" + sources."qs-6.4.0" + sources."request-2.81.0" + sources."safe-buffer-5.1.1" + sources."sntp-1.0.9" + sources."source-map-0.5.7" + (sources."sshpk-1.14.1" // { dependencies = [ - sources."asap-2.0.5" - ]; - }) - sources."source-map-0.5.6" - (sources."request-2.81.0" // { - dependencies = [ - sources."aws-sign2-0.6.0" - sources."aws4-1.6.0" - sources."caseless-0.12.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-2.1.2" // { - dependencies = [ - sources."asynckit-0.4.0" - ]; - }) - (sources."har-validator-4.2.1" // { - dependencies = [ - (sources."ajv-4.11.5" // { - dependencies = [ - sources."co-4.6.0" - (sources."json-stable-stringify-1.0.1" // { - dependencies = [ - sources."jsonify-0.0.0" - ]; - }) - ]; - }) - sources."har-schema-1.0.5" - ]; - }) - (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.4.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."sshpk-1.11.0" // { - dependencies = [ - sources."asn1-0.2.3" - sources."assert-plus-1.0.0" - sources."dashdash-1.14.1" - sources."getpass-0.1.6" - sources."jsbn-0.1.1" - sources."tweetnacl-0.14.5" - sources."jodid25519-1.0.2" - sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.1" - ]; - }) - ]; - }) - sources."is-typedarray-1.0.0" - sources."isstream-0.1.2" - sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.15" // { - dependencies = [ - sources."mime-db-1.27.0" - ]; - }) - sources."oauth-sign-0.8.2" - sources."performance-now-0.2.0" - sources."qs-6.4.0" - sources."safe-buffer-5.0.1" - sources."stringstream-0.0.5" - (sources."tough-cookie-2.3.2" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) - sources."tunnel-agent-0.6.0" - sources."uuid-3.0.1" + sources."assert-plus-1.0.0" ]; }) + sources."stringstream-0.0.5" + sources."tough-cookie-2.3.4" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."uuid-3.2.1" + sources."verror-1.10.0" ]; buildInputs = globalBuildInputs; meta = { @@ -3182,86 +2845,40 @@ in license = "Apache-2.0"; }; production = true; + bypassCache = false; }; mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "3.2.0"; + version = "5.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-3.2.0.tgz"; - sha1 = "7dc4f45e5088075171a68896814e6ae9eb7a85e3"; + url = "https://registry.npmjs.org/mocha/-/mocha-5.0.4.tgz"; + sha512 = "1agv3n6vr1rhjv18n6nfra7wlz7jmf38aym85299fdidy0qq6wsl9zcnvsn4867dcwjgrmrfgnymvg5f7c8sxccw10lvcb8y40akhww"; }; dependencies = [ - sources."browser-stdout-1.3.0" - (sources."commander-2.9.0" // { - dependencies = [ - sources."graceful-readlink-1.0.1" - ]; - }) - (sources."debug-2.2.0" // { - dependencies = [ - sources."ms-0.7.1" - ]; - }) - sources."diff-1.4.0" + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.11" + sources."browser-stdout-1.3.1" + sources."commander-2.11.0" + sources."concat-map-0.0.1" + sources."debug-3.1.0" + sources."diff-3.5.0" sources."escape-string-regexp-1.0.5" - (sources."glob-7.0.5" // { - dependencies = [ - sources."fs.realpath-1.0.0" - (sources."inflight-1.0.6" // { - 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."growl-1.9.2" - sources."json3-3.3.2" - (sources."lodash.create-3.1.1" // { - dependencies = [ - (sources."lodash._baseassign-3.2.0" // { - dependencies = [ - sources."lodash._basecopy-3.0.1" - (sources."lodash.keys-3.1.2" // { - dependencies = [ - sources."lodash._getnative-3.9.1" - sources."lodash.isarguments-3.1.0" - sources."lodash.isarray-3.0.4" - ]; - }) - ]; - }) - sources."lodash._basecreate-3.0.3" - sources."lodash._isiterateecall-3.0.9" - ]; - }) - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) - (sources."supports-color-3.1.2" // { - dependencies = [ - sources."has-flag-1.0.0" - ]; - }) + sources."fs.realpath-1.0.0" + sources."glob-7.1.2" + sources."growl-1.10.3" + sources."has-flag-2.0.0" + sources."he-1.1.1" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + sources."ms-2.0.0" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."supports-color-4.4.0" + sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -3270,6 +2887,7 @@ in license = "MIT"; }; production = true; + bypassCache = false; }; mocha-phantomjs = nodeEnv.buildNodePackage { name = "mocha-phantomjs"; @@ -3280,90 +2898,56 @@ in sha1 = "c75e16612e1a6af0ad8d281e3a2fef49d55e505b"; }; dependencies = [ - (sources."phantomjs-1.9.7-15" // { + sources."abbrev-1.1.1" + sources."adm-zip-0.2.1" + sources."asn1-0.1.11" + sources."assert-plus-0.1.5" + sources."async-0.9.2" + sources."aws-sign2-0.5.0" + sources."boom-0.4.2" + sources."combined-stream-0.0.7" + sources."commander-2.15.0" + (sources."config-chain-1.1.11" // { dependencies = [ - sources."adm-zip-0.2.1" - sources."kew-0.1.7" - sources."ncp-0.4.2" - (sources."npmconf-0.0.24" // { - dependencies = [ - (sources."config-chain-1.1.11" // { - dependencies = [ - sources."proto-list-1.2.4" - sources."ini-1.3.4" - ]; - }) - sources."inherits-1.0.2" - sources."once-1.1.1" - sources."osenv-0.0.3" - (sources."nopt-2.2.1" // { - dependencies = [ - sources."abbrev-1.1.0" - ]; - }) - sources."semver-1.1.4" - sources."ini-1.1.0" - ]; - }) - sources."mkdirp-0.3.5" - sources."progress-1.1.8" - (sources."request-2.36.0" // { - dependencies = [ - sources."qs-0.6.6" - sources."json-stringify-safe-5.0.1" - sources."mime-1.2.11" - sources."forever-agent-0.5.2" - sources."node-uuid-1.4.8" - (sources."tough-cookie-2.3.2" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) - (sources."form-data-0.1.4" // { - dependencies = [ - (sources."combined-stream-0.0.7" // { - dependencies = [ - sources."delayed-stream-0.0.5" - ]; - }) - sources."async-0.9.2" - ]; - }) - sources."tunnel-agent-0.4.3" - (sources."http-signature-0.10.1" // { - dependencies = [ - sources."assert-plus-0.1.5" - sources."asn1-0.1.11" - sources."ctype-0.5.3" - ]; - }) - sources."oauth-sign-0.3.0" - (sources."hawk-1.0.0" // { - dependencies = [ - sources."hoek-0.9.1" - sources."boom-0.4.2" - sources."cryptiles-0.2.2" - sources."sntp-0.2.4" - ]; - }) - sources."aws-sign2-0.5.0" - ]; - }) - (sources."request-progress-0.3.1" // { - dependencies = [ - sources."throttleit-0.0.2" - ]; - }) - sources."rimraf-2.2.8" - sources."which-1.0.9" + sources."ini-1.3.5" ]; }) + sources."cryptiles-0.2.2" + sources."ctype-0.5.3" + sources."delayed-stream-0.0.5" + sources."forever-agent-0.5.2" + sources."form-data-0.1.4" + sources."hawk-1.0.0" + sources."hoek-0.9.1" + sources."http-signature-0.10.1" + sources."inherits-1.0.2" + sources."ini-1.1.0" + sources."json-stringify-safe-5.0.1" + sources."kew-0.1.7" + sources."mime-1.2.11" + sources."mkdirp-0.3.5" sources."mocha-phantomjs-core-1.3.1" - (sources."commander-2.9.0" // { - dependencies = [ - sources."graceful-readlink-1.0.1" - ]; - }) + sources."ncp-0.4.2" + sources."node-uuid-1.4.8" + sources."nopt-2.2.1" + sources."npmconf-0.0.24" + sources."oauth-sign-0.3.0" + sources."once-1.1.1" + sources."osenv-0.0.3" + sources."phantomjs-1.9.7-15" + sources."progress-1.1.8" + sources."proto-list-1.2.4" + sources."punycode-1.4.1" + sources."qs-0.6.6" + sources."request-2.36.0" + sources."request-progress-0.3.1" + sources."rimraf-2.2.8" + sources."semver-1.1.4" + sources."sntp-0.2.4" + sources."throttleit-0.0.2" + sources."tough-cookie-2.3.4" + sources."tunnel-agent-0.4.3" + sources."which-1.0.9" ]; buildInputs = globalBuildInputs; meta = { @@ -3371,20 +2955,21 @@ in homepage = "https://github.com/nathanboktae/mocha-phantomjs#readme"; }; production = true; + bypassCache = false; }; should = nodeEnv.buildNodePackage { name = "should"; packageName = "should"; - version = "11.2.1"; + version = "13.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/should/-/should-11.2.1.tgz"; - sha1 = "90f55145552d01cfc200666e4e818a1c9670eda2"; + url = "https://registry.npmjs.org/should/-/should-13.2.1.tgz"; + sha512 = "21w1m96rk6ljlx72mlkyg4ix3bg2s4s461fpwi1i6shz7fvl6kfmyqgmij3374iq187a4qfhn7vsc0zs7qw1i61nqn3gy0f8g0cvvwp"; }; dependencies = [ - sources."should-equal-1.0.1" + sources."should-equal-2.0.0" sources."should-format-3.0.3" sources."should-type-1.4.0" - sources."should-type-adaptors-1.0.1" + sources."should-type-adaptors-1.1.0" sources."should-util-1.0.0" ]; buildInputs = globalBuildInputs; @@ -3394,28 +2979,30 @@ in license = "MIT"; }; production = true; + bypassCache = false; }; sinon = nodeEnv.buildNodePackage { name = "sinon"; packageName = "sinon"; - version = "2.1.0"; + version = "4.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/sinon/-/sinon-2.1.0.tgz"; - sha1 = "e057a9d2bf1b32f5d6dd62628ca9ee3961b0cafb"; + url = "https://registry.npmjs.org/sinon/-/sinon-4.4.4.tgz"; + sha512 = "2wny4iakvr5mfcbgka4hb99893a7v00ygavndsavqpvijidhigwg9iqq9w225vgb741z0waxn4fdi2ndzp83dk2dja2fkj10kglb6q3"; }; dependencies = [ - sources."diff-3.2.0" - sources."formatio-1.2.0" - sources."lolex-1.6.0" - sources."native-promise-only-0.8.1" - (sources."path-to-regexp-1.7.0" // { - dependencies = [ - sources."isarray-0.0.1" - ]; - }) - sources."samsam-1.2.1" + sources."@sinonjs/formatio-2.0.0" + sources."diff-3.5.0" + sources."has-flag-3.0.0" + sources."isarray-0.0.1" + sources."just-extend-1.1.27" + sources."lodash.get-4.4.2" + sources."lolex-2.3.2" + sources."nise-1.3.0" + sources."path-to-regexp-1.7.0" + sources."samsam-1.3.0" + sources."supports-color-5.3.0" sources."text-encoding-0.6.4" - sources."type-detect-4.0.0" + sources."type-detect-4.0.8" ]; buildInputs = globalBuildInputs; meta = { @@ -3424,81 +3011,53 @@ in license = "BSD-3-Clause"; }; production = true; + bypassCache = false; }; jshint = nodeEnv.buildNodePackage { name = "jshint"; packageName = "jshint"; - version = "2.9.4"; + version = "2.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/jshint/-/jshint-2.9.4.tgz"; - sha1 = "5e3ba97848d5290273db514aee47fe24cf592934"; + url = "https://registry.npmjs.org/jshint/-/jshint-2.9.5.tgz"; + sha1 = "1e7252915ce681b40827ee14248c46d34e9aa62c"; }; dependencies = [ - (sources."cli-1.0.1" // { + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.11" + sources."cli-1.0.1" + sources."concat-map-0.0.1" + sources."console-browserify-1.1.0" + sources."core-util-is-1.0.2" + sources."date-now-0.1.4" + (sources."dom-serializer-0.1.0" // { dependencies = [ - (sources."glob-7.1.1" // { - dependencies = [ - sources."fs.realpath-1.0.0" - (sources."inflight-1.0.6" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - sources."inherits-2.0.3" - (sources."once-1.4.0" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - sources."path-is-absolute-1.0.1" - ]; - }) + sources."domelementtype-1.1.3" ]; }) - (sources."console-browserify-1.1.0" // { + sources."domelementtype-1.3.0" + sources."domhandler-2.3.0" + (sources."domutils-1.5.1" // { dependencies = [ - sources."date-now-0.1.4" + sources."entities-1.1.1" ]; }) + sources."entities-1.0.0" 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-3.0.3" // { - 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."strip-json-comments-1.0.4" + sources."fs.realpath-1.0.0" + sources."glob-7.1.2" + sources."htmlparser2-3.8.3" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."isarray-0.0.1" sources."lodash-3.7.0" + sources."minimatch-3.0.4" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."readable-stream-1.1.14" + sources."shelljs-0.3.0" + sources."string_decoder-0.10.31" + sources."strip-json-comments-1.0.4" + sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -3507,60 +3066,40 @@ in license = "(MIT AND JSON)"; }; production = true; + bypassCache = false; }; shelljs = nodeEnv.buildNodePackage { name = "shelljs"; packageName = "shelljs"; - version = "0.7.7"; + version = "0.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.7.tgz"; - sha1 = "b2f5c77ef97148f4b4f6e22682e10bba8667cff1"; + url = "https://registry.npmjs.org/shelljs/-/shelljs-0.8.1.tgz"; + sha512 = "0c12wlk7s62rnm6d8cc4frddll01p5f117v2ss075y9zxxfpl5qr322bw7qdksgl7ljfc04rv2wyn6qyjv1m5953ywmgk39srif43v0"; }; dependencies = [ - (sources."glob-7.1.1" // { - dependencies = [ - sources."fs.realpath-1.0.0" - (sources."inflight-1.0.6" // { - 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."interpret-1.0.2" - (sources."rechoir-0.6.2" // { - dependencies = [ - (sources."resolve-1.3.2" // { - dependencies = [ - sources."path-parse-1.0.5" - ]; - }) - ]; - }) + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.11" + sources."concat-map-0.0.1" + sources."fs.realpath-1.0.0" + sources."glob-7.1.2" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."interpret-1.1.0" + sources."minimatch-3.0.4" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."path-parse-1.0.5" + sources."rechoir-0.6.2" + sources."resolve-1.5.0" + sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; meta = { description = "Portable Unix shell commands for Node.js"; - homepage = https://github.com/shelljs/shelljs; + homepage = http://github.com/shelljs/shelljs; license = "BSD-3-Clause"; }; production = true; + bypassCache = false; }; } \ No newline at end of file diff --git a/pkgs/development/web/remarkjs/nodepkgs.nix b/pkgs/development/web/remarkjs/nodepkgs.nix index dde8ada0db9..186302f2715 100644 --- a/pkgs/development/web/remarkjs/nodepkgs.nix +++ b/pkgs/development/web/remarkjs/nodepkgs.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.2.0. Do not edit! +# This file has been generated by node2nix 1.5.3. Do not edit! {pkgs ? import { inherit system; @@ -8,9 +8,10 @@ let nodeEnv = import ../../node-packages/node-env.nix { inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile; inherit nodejs; + libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; in import ./node-packages.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; -} +} \ No newline at end of file diff --git a/pkgs/development/web/woff2/default.nix b/pkgs/development/web/woff2/default.nix index 3480924370e..1142c1e006b 100644 --- a/pkgs/development/web/woff2/default.nix +++ b/pkgs/development/web/woff2/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ brotli ]; + propagatedBuildInputs = [ brotli ]; # without this binaries only get built if shared libs are disable patchPhase = '' diff --git a/pkgs/games/cataclysm-dda/default.nix b/pkgs/games/cataclysm-dda/default.nix index a3adec38401..01829238daa 100644 --- a/pkgs/games/cataclysm-dda/default.nix +++ b/pkgs/games/cataclysm-dda/default.nix @@ -46,6 +46,8 @@ stdenv.mkDerivation rec { "WARNINGS+=-Wno-inconsistent-missing-override" ]; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-user-defined-warnings"; + postBuild = stdenv.lib.optionalString (tiles && stdenv.isDarwin) '' # iconutil on macOS is not available in nixpkgs png2icns data/osx/AppIcon.icns data/osx/AppIcon.iconset/* diff --git a/pkgs/games/commandergenius/default.nix b/pkgs/games/commandergenius/default.nix index f77dfe8ba94..70413f0f941 100644 --- a/pkgs/games/commandergenius/default.nix +++ b/pkgs/games/commandergenius/default.nix @@ -1,19 +1,24 @@ { lib, stdenv, fetchFromGitHub, SDL2, SDL2_image, pkgconfig -, libvorbis, libGL, boost, cmake }: - +, libvorbis, libGL, boost, cmake, zlib, curl, SDL2_mixer, python3 +}: stdenv.mkDerivation rec { name = "commandergenius-${version}"; - version = "1822release"; + version = "2.2.0"; src = fetchFromGitHub { owner = "gerstrong"; repo = "Commander-Genius"; rev = "v${version}"; - sha256 = "07vxg8p1dnnkajzs5nifxpwn4mdd1hxsw05jl25gvaimpl9p2qc8"; + sha256 = "1hjx4j325vj1ayxi3j2dpplpd3x0iqx98gyb093ld7dfnsyilbph"; }; - buildInputs = [ SDL2 SDL2_image libGL boost libvorbis ]; + buildInputs = [ SDL2 SDL2_image SDL2_mixer libGL boost libvorbis zlib curl python3 ]; + + preConfigure = '' + export cmakeFlags="$cmakeFlags -DCMAKE_INSTALL_PREFIX=$out -DSHAREDIR=$out/share" + export makeFlags="$makeFlags DESTDIR=$(out)" + ''; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index f9a61ddbf8b..641676489ed 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -4,13 +4,13 @@ }: let - dfVersion = "0.44.05"; - version = "${dfVersion}-r2"; + dfVersion = "0.44.09"; + version = "${dfVersion}-r1"; rev = "refs/tags/${version}"; - sha256 = "1hr3qsx7rd36syw7dfp4lh8kpmz1pvva757za2yn34hj1jm4nh52"; + sha256 = "1cwifdhi48a976xc472nf6q2k0ibwqffil5a4llcymcxdbgxdcc9"; # revision of library/xml submodule - xmlRev = "2794f8a6d7405d4858bac486a0bb17b94740c142"; + xmlRev = "3c0bf63674d5430deadaf7befaec42f0ec1e8bc5"; arch = if stdenv.system == "x86_64-linux" then "64" diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix index 8cdfc426d83..29cc2dc6285 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "dwarf-therapist-original-${version}"; - version = "39.2.1"; + version = "39.3.1"; src = fetchFromGitHub { owner = "Dwarf-Therapist"; repo = "Dwarf-Therapist"; rev = "v${version}"; - sha256 = "1dgcn1a4sz649kj94ldqy4ms7zhwpaj3q4r86b0yfh6dda8jzlgp"; + sha256 = "0vb0dg1r833gaa4jzlrxf9acn41az3xjs9alx7r9lkqwvkjyrdy2"; }; outputs = [ "out" "layouts" ]; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { description = "Tool to manage dwarves in in a running game of Dwarf Fortress"; maintainers = with maintainers; [ the-kenny abbradar bendlas ]; license = licenses.mit; - platforms = platforms.linux; + platforms = [ "x86_64-linux" "i686-linux" ]; homepage = https://github.com/Dwarf-Therapist/Dwarf-Therapist; }; } diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix index 8a85578172a..79dd46c2191 100644 --- a/pkgs/games/dwarf-fortress/game.nix +++ b/pkgs/games/dwarf-fortress/game.nix @@ -4,7 +4,7 @@ let baseVersion = "44"; - patchVersion = "05"; + patchVersion = "09"; dfVersion = "0.${baseVersion}.${patchVersion}"; libpath = lib.makeLibraryPath [ stdenv.cc.cc stdenv.glibc dwarf-fortress-unfuck SDL ]; platform = @@ -12,8 +12,8 @@ let else if stdenv.system == "i686-linux" then "linux32" else throw "Unsupported platform"; sha256 = - if stdenv.system == "x86_64-linux" then "18bjyhjp5458bfbizm8vq4s00pqpfs097qp6pv76m84kgbc4ghg3" - else if stdenv.system == "i686-linux" then "1b9i4kf4c8s6bhqwn8jx100mg7fqp8nmswrai5w8dsma01py4amr" + if stdenv.system == "x86_64-linux" then "1haikynkg1pqyrzzqk1qxm19p36ww58qp8brh3fjxssp4x71rcdy" + else if stdenv.system == "i686-linux" then "0lmbrdf7wjdwj5yx0khnq871yxvhfwqxjjyfkqcdy5ik18lvlkj8" else throw "Unsupported platform"; in diff --git a/pkgs/games/dwarf-fortress/soundsense.nix b/pkgs/games/dwarf-fortress/soundsense.nix index def3a09a4ba..67c86f7f745 100644 --- a/pkgs/games/dwarf-fortress/soundsense.nix +++ b/pkgs/games/dwarf-fortress/soundsense.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { version = "2016-1_196"; - dfVersion = "0.44.05"; + dfVersion = "0.44.09"; inherit soundPack; name = "soundsense-${version}"; src = fetchzip { diff --git a/pkgs/games/dwarf-fortress/themes/cla.nix b/pkgs/games/dwarf-fortress/themes/cla.nix index 7c3eb0b63e3..c7d85c48ce8 100644 --- a/pkgs/games/dwarf-fortress/themes/cla.nix +++ b/pkgs/games/dwarf-fortress/themes/cla.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { cp -r data raw $out ''; - passthru.dfVersion = "0.44.05"; + passthru.dfVersion = "0.44.09"; preferLocalBuild = true; diff --git a/pkgs/games/dwarf-fortress/themes/phoebus.nix b/pkgs/games/dwarf-fortress/themes/phoebus.nix index d9490271920..8641e15fa86 100644 --- a/pkgs/games/dwarf-fortress/themes/phoebus.nix +++ b/pkgs/games/dwarf-fortress/themes/phoebus.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "phoebus-theme-${version}"; - version = "44.05"; + version = "44.07"; src = fetchFromGitHub { owner = "DFgraphics"; repo = "Phoebus"; rev = version; - sha256 = "06mhr6dpbvwp9dxn70kyr6dwyql2k6x5zba2zf6awjah7idys0xr"; + sha256 = "114yc0s7j57i4rq6iq295gggbgzx4qb389xip8lkzfg4dnp6klns"; }; installPhase = '' @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { cp -r data raw $out ''; - passthru.dfVersion = "0.44.05"; + passthru.dfVersion = "0.44.09"; preferLocalBuild = true; diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix index 89e98f4b451..fc42c05f070 100644 --- a/pkgs/games/dwarf-fortress/unfuck.nix +++ b/pkgs/games/dwarf-fortress/unfuck.nix @@ -3,7 +3,7 @@ , ncurses, glib, gtk2, libsndfile, zlib }: -let dfVersion = "0.44.05"; in +let dfVersion = "0.44.09"; in stdenv.mkDerivation { name = "dwarf_fortress_unfuck-${dfVersion}"; diff --git a/pkgs/games/dxx-rebirth/default.nix b/pkgs/games/dxx-rebirth/default.nix index cea07d873ab..3b05ed14292 100644 --- a/pkgs/games/dxx-rebirth/default.nix +++ b/pkgs/games/dxx-rebirth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, scons, pkgconfig +{ stdenv, fetchurl, fetchpatch, scons, pkgconfig , SDL, SDL_mixer, libGLU_combined, physfs }: @@ -17,12 +17,34 @@ in stdenv.mkDerivation rec { sha256 = "0m9k34zyr8bbni9szip407mffdpwbqszgfggavgqjwq0k9c1w7ka"; }; + # TODO: drop these when upgrading to version > 0.59.100 + patches = [ + (fetchpatch { + name = "dxx-gcc7-fix1.patch"; + url = "https://github.com/dxx-rebirth/dxx-rebirth/commit/1ed7cec714c623758e3418ec69eaf3b3ff03e9f6.patch"; + sha256 = "026pn8xglmxryaj8555h5rhzkx30lxmksja1fzdlfyb1vll75gq0"; + }) + (fetchpatch { + name = "dxx-gcc7-fix2.patch"; + url = "https://github.com/dxx-rebirth/dxx-rebirth/commit/73057ad8ec6977ac747637db1080686f11b4c3cc.patch"; + sha256 = "0s506vdd2djrrm3xl0ygn9ylpg6y8qxii2nnzk3sf9133glp3swy"; + }) + ]; + nativeBuildInputs = [ pkgconfig scons ]; buildInputs = [ libGLU_combined physfs SDL SDL_mixer ]; enableParallelBuilding = true; + buildPhase = '' + runHook preBuild + + scons prefix=$out + + runHook postBuild + ''; + installPhase = '' runHook preInstall @@ -37,7 +59,7 @@ in stdenv.mkDerivation rec { description = "Source Port of the Descent 1 and 2 engines"; homepage = http://www.dxx-rebirth.com/; license = licenses.free; - maintainers = with maintainers; [ viric ]; + maintainers = with maintainers; [ viric peterhoeg ]; platforms = with platforms; linux; }; } diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index b3319bae973..2cc63e9ecde 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -19,15 +19,15 @@ let binDists = { x86_64-linux = let bdist = bdistForArch { inUrl = "linux64"; inTar = "x64"; }; in { alpha = { - stable = bdist { sha256 = "1i25q8x80qdpmf00lvml67gyklrfvmr4gfyakrx954bq8giiy4ll"; fetcher = authenticatedFetch; }; - experimental = bdist { sha256 = "0s7cn5xhzwn793bmvlhlmibhbxdpfmpnpn33k5a4hdprc5gc27rg"; version = "0.16.24"; fetcher = authenticatedFetch; }; + stable = bdist { sha256 = "0gxa8wh0py4l1ym57sfq792kfh00khi0f9ykjlmjqqkdksyxgddf"; fetcher = authenticatedFetch; }; + experimental = bdist { sha256 = "1iy3k9zrw3za9mabf89lfl8i20xfij66ih5vngz5xfyy99mwxiy6"; version = "0.16.35"; fetcher = authenticatedFetch; }; }; headless = { - stable = bdist { sha256 = "0v5sypz1q6x6hi6k5cyi06f9ld0cky80l0z64psd3v2ax9hyyh8h"; }; - experimental = bdist { sha256 = "1ff4yjybiqr5kw583hmxkbrbxa3haj4bkjj8sx811c3s269gspi2"; version = "0.16.24"; }; + stable = bdist { sha256 = "0n2j86af41dkbsyyy5lawjpdd7c0lvfdwxpwbj1m8v470i1g8zq4"; }; + experimental = bdist { sha256 = "0x4miyva1lmiyv3lb4savdlycia1kzw6bri4qj9b2jmyw1dr8x8h"; version = "0.16.35"; }; }; demo = { - stable = bdist { sha256 = "0aca8gks7wl7yi821bcca16c94zcc41agin5j0vfz500i0sngzzw"; version = "0.15.36"; }; + stable = bdist { sha256 = "1z04rdlcxnfwami0l5nm292w4ydfhr1s6rcl8hxrsa73d4xk5lch"; version = "0.16.36"; }; experimental = bdist { }; }; }; @@ -49,7 +49,7 @@ let actual = binDists.${stdenv.system}.${releaseType}.${branch} or (throw "Factorio: unsupported platform"); bdistForArch = arch: { sha256 ? null - , version ? "0.15.40" + , version ? "0.16.36" , fetcher ? fetchurl , nameMut ? x: x }: diff --git a/pkgs/games/freeorion/default.nix b/pkgs/games/freeorion/default.nix index 3d7e132e612..011812580e7 100644 --- a/pkgs/games/freeorion/default.nix +++ b/pkgs/games/freeorion/default.nix @@ -1,5 +1,7 @@ -{ stdenv, fetchFromGitHub, cmake, doxygen, graphviz, makeWrapper -, boost, SDL2, python2, freetype, openal, libogg, libvorbis, zlib, libpng, libtiff, libjpeg, libGLU_combined, glew, libxslt }: +{ stdenv, fetchFromGitHub, fetchpatch, cmake, doxygen, graphviz, makeWrapper +, boost, SDL2, python2, freetype, openal, libogg, libvorbis, zlib, libpng, libtiff +, libjpeg, libGLU_combined, glew, libxslt +}: stdenv.mkDerivation rec { version = "0.4.7.1"; @@ -19,6 +21,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; patches = [ + # fix build with boost 1.66 + (fetchpatch { + url = https://github.com/freeorion/freeorion/commit/c9b5b13fb81b1ed142dee0e843101c6b8832ca95.patch; + sha256 = "0agqhxk8462sgd230lmdzbrbrfd77zyy7a4g8hrf28zxza1nza94"; + }) ./fix_rpaths.patch ]; diff --git a/pkgs/games/gargoyle/darwin.patch b/pkgs/games/gargoyle/darwin.patch index cf44dffc897..230f453acad 100644 --- a/pkgs/games/gargoyle/darwin.patch +++ b/pkgs/games/gargoyle/darwin.patch @@ -26,6 +26,147 @@ index 1f8829d..d8455eb 100644 } SEARCH_SOURCE = +diff --git a/garglk/fontmac.m b/garglk/fontmac.m +index d6e1426..72304a3 100644 +--- a/garglk/fontmac.m ++++ b/garglk/fontmac.m +@@ -167,7 +167,7 @@ static void propfont(char *file, int style) + } + } + +-static NSMutableArray * gli_registered_fonts = nil; ++static NSMutableArray * gli_registered_fonts = nil; + static NSDistributedLock * gli_font_lock = nil; + + void fontreplace(char *font, int type) +@@ -181,7 +181,7 @@ void fontreplace(char *font, int type) + NSFontDescriptor * fontFamilyDescriptor = + [[NSFontDescriptor fontDescriptorWithFontAttributes: nil] fontDescriptorWithFamily: fontFamily]; + +- NSArray * fontMatches = ++ NSArray * fontMatches = + [fontFamilyDescriptor matchingFontDescriptorsWithMandatoryKeys: nil]; + + for (NSFontDescriptor * sysfont in fontMatches) +@@ -197,7 +197,7 @@ void fontreplace(char *font, int type) + + else if ([sysfont symbolicTraits] & NSFontItalicTrait) + style = FONTI; +- ++ + /* find path for font */ + CFURLRef urlRef = CTFontDescriptorCopyAttribute((CTFontDescriptorRef)sysfont, kCTFontURLAttribute); + if (!urlRef) +@@ -259,7 +259,7 @@ void fontload(void) + + // obtain a list of all files in the Fonts directory + NSString * fontFolder = [[NSString stringWithUTF8String: env] stringByAppendingPathComponent: @"Fonts"]; +- NSArray * fontFiles = [[NSFileManager defaultManager] contentsOfDirectoryAtPath: fontFolder error: nil]; ++ NSArray * fontFiles = [[NSFileManager defaultManager] contentsOfDirectoryAtPath: fontFolder error: nil]; + + // create a collection to hold the registered font URLs + gli_registered_fonts = [NSMutableArray new]; +diff --git a/garglk/launchmac.m b/garglk/launchmac.m +index 68deca5..9f752ac 100644 +--- a/garglk/launchmac.m ++++ b/garglk/launchmac.m +@@ -72,14 +72,14 @@ char *winfilters[] = + height: (unsigned int) height + { + [[self openGLContext] makeCurrentContext]; +- ++ + /* allocate new texture */ + glDeleteTextures(1, &output); + glGenTextures(1, &output); + + /* bind target to texture */ +- glEnable(GL_TEXTURE_RECTANGLE_ARB); +- glBindTexture(GL_TEXTURE_RECTANGLE_ARB, output); ++ glEnable(GL_TEXTURE_RECTANGLE_ARB); ++ glBindTexture(GL_TEXTURE_RECTANGLE_ARB, output); + + /* set target parameters */ + glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_STORAGE_HINT_APPLE, GL_STORAGE_CACHED_APPLE); +@@ -460,7 +460,7 @@ static BOOL isTextbufferEvent(NSEvent * evt) + if (filter != FILTER_ALL) + { + NSArray * filterTypes = [NSArray arrayWithObject: [NSString stringWithCString: winfilters[filter] +- encoding: NSUTF8StringEncoding]]; ++ encoding: NSUTF8StringEncoding]]; + [openDlg setAllowedFileTypes: filterTypes]; + [openDlg setAllowsOtherFileTypes: NO]; + } +@@ -485,7 +485,7 @@ static BOOL isTextbufferEvent(NSEvent * evt) + if (filter != FILTER_ALL) + { + NSArray * filterTypes = [NSArray arrayWithObject: [NSString stringWithCString: winfilters[filter] +- encoding: NSUTF8StringEncoding]]; ++ encoding: NSUTF8StringEncoding]]; + [saveDlg setAllowedFileTypes: filterTypes]; + [saveDlg setAllowsOtherFileTypes: NO]; + } +@@ -518,7 +518,7 @@ static BOOL isTextbufferEvent(NSEvent * evt) + + { + BOOL openedFirstGame; +- NSMutableDictionary * windows; ++ NSMutableDictionary * windows; + NSConnection * link; + } + - (BOOL) launchFile: (NSString *) file; +@@ -760,20 +760,20 @@ static BOOL isTextbufferEvent(NSEvent * evt) + - (BOOL) launchFileDialog + { + int result; +- ++ + NSOpenPanel * openDlg = [NSOpenPanel openPanel]; + + [openDlg setCanChooseFiles: YES]; + [openDlg setCanChooseDirectories: NO]; + [openDlg setAllowsMultipleSelection: NO]; + [openDlg setTitle: [NSString stringWithCString: AppName encoding: NSUTF8StringEncoding]]; +- ++ + NSMutableArray *filterTypes = [NSMutableArray arrayWithCapacity:100]; +- +- NSEnumerator *docTypeEnum = [[[[NSBundle mainBundle] infoDictionary] ++ ++ NSEnumerator *docTypeEnum = [[[[NSBundle mainBundle] infoDictionary] + objectForKey:@"CFBundleDocumentTypes"] objectEnumerator]; + NSDictionary *docType; +- ++ + while (docType = [docTypeEnum nextObject]) + { + [filterTypes addObjectsFromArray:[docType objectForKey: @"CFBundleTypeExtensions"]]; +diff --git a/garglk/ttsmac.m b/garglk/ttsmac.m +index 9f6ab0e..de3d6fe 100644 +--- a/garglk/ttsmac.m ++++ b/garglk/ttsmac.m +@@ -30,7 +30,7 @@ + #import "sysmac.h" + + // a queue of phrases to feed to the speech synthesizer +-static NSMutableArray * phraseQueue = nil; ++static NSMutableArray * phraseQueue = nil; + static NSRange purgeRange; + + @interface SpeechDelegate : NSObject +@@ -96,10 +96,10 @@ void gli_initialize_tts(void) + NSString * lang = [NSString stringWithCString: gli_conf_speak_language + encoding: NSUTF8StringEncoding]; + +- NSArray * voices = [NSSpeechSynthesizer availableVoices]; ++ NSArray * voices = [NSSpeechSynthesizer availableVoices]; + for (NSString * voice in voices) + { +- NSDictionary * attr = [NSSpeechSynthesizer attributesForVoice: voice]; ++ NSDictionary * attr = [NSSpeechSynthesizer attributesForVoice: voice]; + if ([lang isEqualToString: [attr objectForKey: NSVoiceLocaleIdentifier]]) + { + [synth setVoice: voice]; diff --git a/tads/tads3/vmtz.cpp b/tads/tads3/vmtz.cpp index 5e193a1..dce46f7 100644 --- a/tads/tads3/vmtz.cpp diff --git a/pkgs/games/gargoyle/default.nix b/pkgs/games/gargoyle/default.nix index 4c5b2827a0e..fc02bdffcad 100644 --- a/pkgs/games/gargoyle/default.nix +++ b/pkgs/games/gargoyle/default.nix @@ -36,6 +36,11 @@ stdenv.mkDerivation { patches = [ ./darwin.patch ]; + postPatch = '' + substituteInPlace Jamrules \ + --replace -mmacosx-version-min=10.7 -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET + ''; + buildPhase = jamenv + "jam -j$NIX_BUILD_CORES"; installPhase = if stdenv.isDarwin then (builtins.readFile ./darwin.sh) else jamenv + '' diff --git a/pkgs/games/openarena/default.nix b/pkgs/games/openarena/default.nix index 1e396318bbb..22ce05cb38a 100644 --- a/pkgs/games/openarena/default.nix +++ b/pkgs/games/openarena/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, makeWrapper, patchelf, pkgs, stdenv, SDL, libogg, libvorbis }: +{ fetchurl, makeWrapper, patchelf, pkgs, stdenv, SDL, libogg, libvorbis, curl }: stdenv.mkDerivation rec { name = "openarena-${version}"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { installPhase = let gameDir = "$out/openarena-$version"; interpreter = "$(< \"$NIX_CC/nix-support/dynamic-linker\")"; - libPath = stdenv.lib.makeLibraryPath [ SDL libogg libvorbis ]; + libPath = stdenv.lib.makeLibraryPath [ SDL libogg libvorbis curl ]; in '' mkdir -pv $out/bin cd $out diff --git a/pkgs/games/openra/default.nix b/pkgs/games/openra/default.nix index c6aedcd172e..069ed900e8f 100644 --- a/pkgs/games/openra/default.nix +++ b/pkgs/games/openra/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "openra-${version}"; - version = "20180218"; + version = "20180307"; meta = with stdenv.lib; { description = "Real Time Strategy game engine recreating the C&C titles"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { owner = "OpenRA"; repo = "OpenRA"; rev = "release-${version}"; - sha256 = "1853p2q88602s3zf22wg1h2qx2x661n20bcjjbfmj0h2d4p9dmaf"; + sha256 = "05c6vrmlgzfxgfx1idqmp6czmr079px3n57q5ahnwzqvcl11a2jj"; extraPostFetch = '' sed -i 's,curl,curl --insecure,g' $out/thirdparty/{fetch-thirdparty-deps,noget}.sh diff --git a/pkgs/games/pingus/default.nix b/pkgs/games/pingus/default.nix index 68257fc9e9e..e8bac9571f8 100644 --- a/pkgs/games/pingus/default.nix +++ b/pkgs/games/pingus/default.nix @@ -1,5 +1,5 @@ -{stdenv, fetchurl, scons, SDL, SDL_image, boost, libpng, SDL_mixer, pkgconfig -, libGLU_combined}: +{stdenv, fetchurl, fetchpatch, scons, SDL, SDL_image, boost, libpng, SDL_mixer +, pkgconfig, libGLU_combined}: let s = # Generated upstream information rec { @@ -18,6 +18,13 @@ stdenv.mkDerivation rec { src = fetchurl { inherit (s) url sha256; }; + patches = [ + # fix build with gcc7 + (fetchpatch { + url = https://github.com/Pingus/pingus/commit/df6e2f445d3e2925a94d22faeb17be9444513e92.patch; + sha256 = "0nqyhznnnvpgfa6rfv8rapjfpw99b67n97jfqp9r3hpib1b3ja6p"; + }) + ]; makeFlags = '' PREFIX="$(out)" ''; meta = { inherit (s) version; diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index 49d786284da..1d1157939f8 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, writeScript, buildFHSUserEnv, steam +{ stdenv, lib, writeScript, buildFHSUserEnv, steam, glxinfo-i686 , steam-runtime-wrapped, steam-runtime-wrapped-i686 ? null , withJava ? false , withPrimus ? false @@ -9,16 +9,7 @@ let commonTargetPkgs = pkgs: with pkgs; - let - tzdir = "${pkgs.tzdata}/share/zoneinfo"; - # I'm not sure if this is the best way to add things like this - # to an FHSUserEnv - etc-zoneinfo = pkgs.runCommand "zoneinfo" {} '' - mkdir -p $out/etc - ln -s ${tzdir} $out/etc/zoneinfo - ln -s ${tzdir}/UTC $out/etc/localtime - ''; - in [ + [ steamPackages.steam-fonts # Errors in output without those pciutils @@ -30,8 +21,6 @@ let perl # Open URLs xdg_utils - # Zoneinfo - etc-zoneinfo iana-etc ] ++ lib.optional withJava jdk ++ lib.optional withPrimus primus @@ -69,29 +58,115 @@ in buildFHSUserEnv rec { xlibs.libX11 xlibs.libXfixes - # Needed to properly check for libGL.so.1 in steam-wrapper.sh - pkgsi686Linux.glxinfo - # Not formally in runtime but needed by some games gst_all_1.gstreamer gst_all_1.gst-plugins-ugly libdrm mono xorg.xkeyboardconfig - xlibs.libpciaccess - + xorg.libpciaccess + ] ++ (if (!nativeOnly) then [ (steamPackages.steam-runtime-wrapped.override { - inherit nativeOnly runtimeOnly; + inherit runtimeOnly; }) - ]; + ] else [ + # Required + glib + gtk2 + bzip2 + zlib + gdk_pixbuf - extraBuildCommands = '' + # Without these it silently fails + xorg.libXinerama + xorg.libXdamage + xorg.libXcursor + xorg.libXrender + xorg.libXScrnSaver + xorg.libXxf86vm + xorg.libXi + xorg.libSM + xorg.libICE + gnome2.GConf + freetype + (curl.override { gnutlsSupport = true; sslSupport = false; }) + nspr + nss + fontconfig + cairo + pango + expat + dbus + cups + libcap + SDL2 + libusb1 + dbus-glib + libav + atk + # Only libraries are needed from those two + libudev0-shim + networkmanager098 + + # Verified games requirements + xorg.libXt + xorg.libXmu + xorg.libxcb + libGLU + libuuid + libogg + libvorbis + SDL + SDL2_image + glew110 + openssl + libidn + tbb + wayland + mesa_noglu + libxkbcommon + + # Other things from runtime + flac + freeglut + libjpeg + libpng12 + libsamplerate + libmikmod + libtheora + libtiff + pixman + speex + SDL_image + SDL_ttf + SDL_mixer + SDL2_ttf + SDL2_mixer + gstreamer + gst-plugins-base + libGLU + libappindicator-gtk2 + libcaca + libcanberra + libgcrypt + libvpx + librsvg + xorg.libXft + libvdpau + ] ++ steamPackages.steam-runtime-wrapped.overridePkgs); + + extraBuildCommands = if (!nativeOnly) then '' mkdir -p steamrt ln -s ../lib/steam-runtime steamrt/${steam-runtime-wrapped.arch} ${lib.optionalString (steam-runtime-wrapped-i686 != null) '' ln -s ../lib32/steam-runtime steamrt/${steam-runtime-wrapped-i686.arch} ''} ln -s ${runSh} steamrt/run.sh + '' else '' + ln -s /usr/lib/libbz2.so usr/lib/libbz2.so.1.0 + ${lib.optionalString (steam-runtime-wrapped-i686 != null) '' + ln -s /usr/lib32/libbz2.so usr/lib32/libbz2.so.1.0 + ''} ''; extraInstallCommands = '' @@ -102,14 +177,13 @@ in buildFHSUserEnv rec { ''; profile = '' - export STEAM_RUNTIME=/steamrt - export TZDIR=/etc/zoneinfo + export STEAM_RUNTIME=${if nativeOnly then "0" else "/steamrt"} ''; runScript = writeScript "steam-wrapper.sh" '' #!${stdenv.shell} if [ -f /host/etc/NIXOS ]; then # Check only useful on NixOS - glxinfo >/dev/null 2>&1 + ${glxinfo-i686}/bin/glxinfo >/dev/null 2>&1 # If there was an error running glxinfo, we know something is wrong with the configuration if [ $? -ne 0 ]; then cat < /dev/stderr @@ -124,9 +198,13 @@ in buildFHSUserEnv rec { EOF fi fi - steam + exec steam "$@" ''; + meta = steam.meta // { + broken = nativeOnly; + }; + passthru.run = buildFHSUserEnv { name = "steam-run"; @@ -141,8 +219,8 @@ in buildFHSUserEnv rec { exit 1 fi shift - export LD_LIBRARY_PATH=${lib.concatStringsSep ":" ldPath}:$LD_LIBRARY_PATH - exec "$run" "$@" + ${lib.optionalString (!nativeOnly) "export LD_LIBRARY_PATH=${lib.concatStringsSep ":" ldPath}:$LD_LIBRARY_PATH"} + exec -- "$run" "$@" ''; }; } diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix index 6a6485d4331..b7dbba55269 100644 --- a/pkgs/games/steam/default.nix +++ b/pkgs/games/steam/default.nix @@ -13,6 +13,7 @@ let steam = callPackage ./steam.nix { }; steam-fonts = callPackage ./fonts.nix { }; steam-chrootenv = callPackage ./chrootenv.nix { + glxinfo-i686 = pkgs.pkgsi686Linux.glxinfo; steam-runtime-wrapped-i686 = if steamArch == "amd64" then pkgs.pkgsi686Linux.steamPackages.steam-runtime-wrapped diff --git a/pkgs/games/steam/runtime-wrapped.nix b/pkgs/games/steam/runtime-wrapped.nix index 2030425ba12..b3746a50c77 100644 --- a/pkgs/games/steam/runtime-wrapped.nix +++ b/pkgs/games/steam/runtime-wrapped.nix @@ -1,103 +1,22 @@ { stdenv, steamArch, lib, perl, pkgs, steam-runtime -, nativeOnly ? false , runtimeOnly ? false }: -assert !(nativeOnly && runtimeOnly); - let - runtimePkgs = with pkgs; [ - # Required - glib - gtk2 - bzip2 - zlib - gdk_pixbuf - - # Without these it silently fails - xlibs.libXinerama - xlibs.libXdamage - xlibs.libXcursor - xlibs.libXrender - xlibs.libXScrnSaver - xlibs.libXxf86vm - xlibs.libXi - xlibs.libSM - xlibs.libICE - gnome2.GConf - freetype - (curl.override { gnutlsSupport = true; sslSupport = false; }) - nspr - nss - fontconfig - cairo - pango - expat - dbus - cups - libcap - SDL2 - libusb1 - dbus-glib - libav - atk - # Only libraries are needed from those two - libudev0-shim - networkmanager098 - - # Verified games requirements - xlibs.libXmu - xlibs.libxcb - libGLU - libuuid - libogg - libvorbis - SDL - SDL2_image - glew110 - openssl - libidn - tbb - - # Other things from runtime - xlibs.libXinerama - flac - freeglut - libjpeg - libpng12 - libsamplerate - libmikmod - libtheora - pixman - speex - SDL_image - SDL_ttf - SDL_mixer - SDL2_net - SDL2_ttf - SDL2_mixer - gstreamer - gst-plugins-base - ]; - - overridePkgs = with pkgs; [ + overridePkgs = lib.optionals (!runtimeOnly) (with pkgs; [ libgpgerror libpulseaudio alsaLib openalSoft - libva + libva1-full + libvdpau vulkan-loader gcc.cc nss nspr - ]; + ]); - ourRuntime = if runtimeOnly then [] - else if nativeOnly then runtimePkgs ++ overridePkgs - else overridePkgs; - steamRuntime = lib.optional (!nativeOnly) steam-runtime; - - allPkgs = ourRuntime ++ steamRuntime; + allPkgs = overridePkgs ++ [ steam-runtime ]; gnuArch = if steamArch == "amd64" then "x86_64-linux-gnu" else if steamArch == "i386" then "i386-linux-gnu" @@ -114,7 +33,7 @@ in stdenv.mkDerivation rec { builder = ./build-wrapped.sh; passthru = { - inherit gnuArch libs bins; + inherit gnuArch libs bins overridePkgs; arch = steamArch; }; diff --git a/pkgs/games/terraria-server/default.nix b/pkgs/games/terraria-server/default.nix index 5fcb5063bbc..1c145f6d71c 100644 --- a/pkgs/games/terraria-server/default.nix +++ b/pkgs/games/terraria-server/default.nix @@ -3,12 +3,12 @@ assert stdenv.system == "x86_64-linux"; stdenv.mkDerivation rec { name = "terraria-server-${version}"; - version = "1.3.1.1"; + version = "1.3.5.3"; urlVersion = lib.replaceChars ["."] [""] version; src = fetchurl { url = "http://terraria.org/server/terraria-server-${urlVersion}.zip"; - sha256 = "0bwh0na0dy6cjc1xchd5sp3c7av50q38hk03219dmqd72n9p44rq"; + sha256 = "0l7j2n6ip4hxph7dfal7kzdm3dqnm1wba6zc94gafkh97wr35ck3"; }; buildInputs = [ file unzip ]; diff --git a/pkgs/games/the-powder-toy/default.nix b/pkgs/games/the-powder-toy/default.nix index c70feca0860..ce5b0b26966 100644 --- a/pkgs/games/the-powder-toy/default.nix +++ b/pkgs/games/the-powder-toy/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A free 2D physics sandbox game"; homepage = http://powdertoy.co.uk/; - platforms = platforms.unix; + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; license = licenses.gpl3; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/games/tome4/default.nix b/pkgs/games/tome4/default.nix index 83f34f5b04a..19cf026933e 100644 --- a/pkgs/games/tome4/default.nix +++ b/pkgs/games/tome4/default.nix @@ -32,7 +32,8 @@ in stdenv.mkDerivation rec { libGLU openal libpng libvorbis SDL2 SDL2_ttf SDL2_image ]; - enableParallelBuilding = true; + # disable parallel building as it caused sporadic build failures + enableParallelBuilding = false; NIX_CFLAGS_COMPILE = [ "-I${SDL2_image}/include/SDL2" @@ -81,6 +82,6 @@ in stdenv.mkDerivation rec { homepage = https://te4.org/; license = licenses.gpl3; maintainers = with maintainers; [ chattered peterhoeg ]; - platforms = platforms.linux; + platforms = subtractLists ["aarch64-linux"] platforms.linux; }; } diff --git a/pkgs/games/warsow/default.nix b/pkgs/games/warsow/default.nix index 3e1729e2091..1b51130768e 100644 --- a/pkgs/games/warsow/default.nix +++ b/pkgs/games/warsow/default.nix @@ -1,52 +1,27 @@ -{ stdenv, fetchurl, unzip, pkgconfig, zlib, curl, libjpeg, libpng, libvorbis -, libtheora, libXxf86dga, libXxf86vm, libXinerama, SDL, libGLU_combined, openal, freetype -, makeWrapper -}: +{ stdenv, fetchurl, warsow-engine, makeWrapper }: + stdenv.mkDerivation rec { name = "warsow-${version}"; - version = "1.03"; - mversion = "1.02"; # sometimes only engine is updated - src1 = fetchurl { - url = "http://www.warsow.net:1337/~warsow/${version}/warsow_${version}_sdk.tar.gz"; - sha256 = "0z6r5v30p8fxbszmkxssv5fnnjw7w5wfn7wfgbwvmy87ayi7mkcq"; + version = "2.1.2"; + + src = fetchurl { + url = "http://sebastian.network/warsow/${name}.tar.gz"; + sha256 = "07y2airw5qg3s1bf1c63a6snjj22riz0mqhk62jmfm9nrarhavrc"; }; - src2 = fetchurl { - url = "http://www.warsow.net:1337/~warsow/${mversion}/warsow_${mversion}.tar.gz"; - sha256 = "0ai5v1h5g9nq21ixz23v0qsj9dr7dbiz7l8r34mq4c3z6ili8zpy"; - }; - unpackPhase = '' - tar xf "$src1" - cd warsow_${version}_sdk - tar xf "$src2" - mkdir -p source/release/ - mv warsow_${mversion}/basewsw source/release/ - cd source - ''; - patchPhase = '' - substituteInPlace snd_openal/snd_main.c --replace libopenal.so.1 ${openal}/lib/libopenal.so.1 - ''; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ unzip zlib curl libjpeg libpng libvorbis libtheora - libXxf86dga libXxf86vm libXinerama SDL libGLU_combined openal makeWrapper - ]; + + nativeBuildInputs = [ makeWrapper ]; + installPhase = '' - dest=$out/opt/warsow - cd release - mkdir -p $dest + mkdir -p $out/share/warsow + cp -r basewsw $out/share/warsow + ln -s ${warsow-engine}/lib/warsow $out/share/warsow/libs + mkdir -p $out/bin - cp -v {warsow,wsw_server,wswtv_server}* $dest - cp -rv basewsw libs $dest - # Since 1.03 some modules are _always_ downloaded from server, thus - makeWrapper $dest/warsow $out/bin/warsow \ - --suffix-each LD_LIBRARY_PATH ':' "${freetype.out}/lib" - makeWrapper $dest/wsw_server $out/bin/wsw_server - makeWrapper $dest/wswtv_server $out/bin/wswtv_server - ''; - postFixup = '' - p=$out/opt/warsow/warsow.* - cur_rpath=$(patchelf --print-rpath $p) - patchelf --set-rpath $cur_rpath:${libGLU_combined}/lib $p + for i in ${warsow-engine}/bin/*; do + makeWrapper "$i" "$out/bin/$(basename "$i")" --run "cd $out/share/warsow" + done ''; + meta = with stdenv.lib; { description = "Multiplayer FPS game designed for competitive gaming"; longDescription = '' @@ -56,10 +31,8 @@ stdenv.mkDerivation rec { and macOS. ''; homepage = http://www.warsow.net; - # Engine is under GPLv2, everything else is under license = licenses.unfreeRedistributable; - maintainers = with maintainers; [ astsmtl ]; - platforms = platforms.linux; - broken = true; # Depends on a specific old libjpeg version + maintainers = with maintainers; [ astsmtl abbradar ]; + platforms = warsow-engine.meta.platforms; }; } diff --git a/pkgs/games/warsow/engine.nix b/pkgs/games/warsow/engine.nix new file mode 100644 index 00000000000..12832f2a439 --- /dev/null +++ b/pkgs/games/warsow/engine.nix @@ -0,0 +1,52 @@ +{ stdenv, lib, fetchurl, cmake, libogg, libvorbis, libtheora, curl, freetype +, libjpeg, libpng, SDL2, libGL, openal, zlib +}: + +let + # The game loads all those via dlopen(). + libs = lib.mapAttrs (name: x: lib.getLib x) { + inherit zlib curl libpng libjpeg libogg libvorbis libtheora freetype; + }; + +in stdenv.mkDerivation (libs // rec { + name = "warsow-engine-${version}"; + version = "2.1.0"; + + src = fetchurl { + url = "http://sebastian.network/warsow/warsow_21_sdk.tar.gz"; + sha256 = "0fj5k7qpf6far8i1xhqxlpfjch10zj26xpilhp95aq2yiz08pj4r"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + libogg libvorbis libtheora curl freetype libjpeg SDL2 libGL openal zlib + libpng + ]; + + patches = [ ./libpath.patch ]; + postPatch = '' + cd source/source + substituteAllInPlace gameshared/q_arch.h + ''; + + cmakeFlags = [ "-DQFUSION_GAME=Warsow" ]; + + enableParallelBuilding = true; + + installPhase = '' + mkdir -p $out/lib + cp -r libs $out/lib/warsow + for i in warsow.* wsw_server.* wswtv_server.*; do + install -Dm755 "$i" "$out/bin/''${i%.*}" + done + ''; + + meta = with stdenv.lib; { + description = "Multiplayer FPS game designed for competitive gaming (engine only)"; + homepage = http://www.warsow.net; + license = licenses.gpl2; + maintainers = with maintainers; [ astsmtl abbradar ]; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/games/warsow/libpath.patch b/pkgs/games/warsow/libpath.patch new file mode 100644 index 00000000000..ad248710237 --- /dev/null +++ b/pkgs/games/warsow/libpath.patch @@ -0,0 +1,28 @@ +diff -ru3 warsow_21_sdk_old/source/source/gameshared/q_arch.h warsow_21_sdk_new/source/source/gameshared/q_arch.h +--- warsow_21_sdk_old/source/source/gameshared/q_arch.h 2016-03-26 22:22:10.000000000 +0300 ++++ warsow_21_sdk_new/source/source/gameshared/q_arch.h 2018-03-13 00:37:29.907019953 +0300 +@@ -206,15 +206,15 @@ + #endif + + // FIXME: move these to CMakeLists.txt +-#define LIBZ_LIBNAME "libz.so.1|libz.so" +-#define LIBCURL_LIBNAME "libcurl.so.4|libcurl.so.3|libcurl.so" +-#define LIBPNG_LIBNAME "libpng16.so.16|libpng15.so.15|libpng14.so.14|libpng12.so.0|libpng.so" +-#define LIBJPEG_LIBNAME "libjpeg.so.8|libjpeg.so" +-#define LIBOGG_LIBNAME "libogg.so.0|libogg.so" +-#define LIBVORBIS_LIBNAME "libvorbis.so.0|libvorbis.so" +-#define LIBVORBISFILE_LIBNAME "libvorbisfile.so.3|libvorbisfile.so" +-#define LIBTHEORA_LIBNAME "libtheora.so.0|libtheora.so" +-#define LIBFREETYPE_LIBNAME "libfreetype.so.6|libfreetype.so" ++#define LIBZ_LIBNAME "@zlib@/lib/libz.so" ++#define LIBCURL_LIBNAME "@curl@/lib/libcurl.so" ++#define LIBPNG_LIBNAME "@libpng@/lib/libpng.so" ++#define LIBJPEG_LIBNAME "@libjpeg@/lib/libjpeg.so" ++#define LIBOGG_LIBNAME "@libogg@/lib/libogg.so" ++#define LIBVORBIS_LIBNAME "@libvorbis@/lib/libvorbis.so" ++#define LIBVORBISFILE_LIBNAME "@libvorbis@/lib/libvorbisfile.so" ++#define LIBTHEORA_LIBNAME "@libtheora@/lib/libtheora.so" ++#define LIBFREETYPE_LIBNAME "@freetype@/lib/libfreetype.so" + + #if defined ( __FreeBSD__ ) + #define BUILDSTRING "FreeBSD" diff --git a/pkgs/games/widelands/default.nix b/pkgs/games/widelands/default.nix index 94fd23cd8cb..222275a2ba1 100644 --- a/pkgs/games/widelands/default.nix +++ b/pkgs/games/widelands/default.nix @@ -26,9 +26,8 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "https://launchpad.net/widelands/build${version}/build${version}/+download/" - + "widelands-build${version}-src.tar.bz2"; - sha256 = "19h1gina7k1ai2mn2fd75lxm8iz8wrs6dz6dchdvg8i8d39gj4g5"; + url = "http://launchpad.net/widelands/build${version}/build${version}/+download/widelands-build${version}-src-gcc7.tar.bz2"; + sha256 = "0n2lb1c2dix32j90nir96zfqivn63izr1pmabjnhns3wbb7vhwzg"; }; preConfigure = '' @@ -47,12 +46,12 @@ stdenv.mkDerivation rec { ]; prePatch = '' - substituteInPlace ./debian/widelands.desktop --replace "/usr/share/games/widelands/data/" "$out/share/widelands/" + substituteInPlace ./debian/org.widelands.widelands.desktop --replace "/usr/share/games/widelands/data/" "$out/share/widelands/" ''; postInstall = '' mkdir -p "$out/share/applications/" - cp -v "../debian/widelands.desktop" "$out/share/applications/" + cp -v "../debian/org.widelands.widelands.desktop" "$out/share/applications/" ''; enableParallelBuilding = true; diff --git a/pkgs/games/xskat/default.nix b/pkgs/games/xskat/default.nix index bd41531d923..383bdb88284 100644 --- a/pkgs/games/xskat/default.nix +++ b/pkgs/games/xskat/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = { inherit (s) version; description = ''Famous german card game''; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.free; longDescription = ''Play the german card game Skat against the AI or over IRC.''; homepage = http://www.xskat.de/; diff --git a/pkgs/games/xsok/default.nix b/pkgs/games/xsok/default.nix index e683e96d206..0aa0c97f07d 100644 --- a/pkgs/games/xsok/default.nix +++ b/pkgs/games/xsok/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { sed -e '/chown /d' -i src/Imakefile sed -e '/chmod /d' -i src/Imakefile sed -e '/InstallAppDefaults/d' -i src/Imakefile + sed -e 's/CC = gcc/CC = cc/g' -i src/Imakefile ''; makeFlags = ["BINDIR=$(out)/bin"]; @@ -41,7 +42,7 @@ stdenv.mkDerivation rec { description = "A generic Sokoban game for X11"; license = stdenv.lib.licenses.gpl2Plus; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; homepage = https://tracker.debian.org/pkg/xsok; }; } diff --git a/pkgs/games/zandronum/default.nix b/pkgs/games/zandronum/default.nix index 377741ef544..ce32e435608 100644 --- a/pkgs/games/zandronum/default.nix +++ b/pkgs/games/zandronum/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchhg, cmake, pkgconfig, makeWrapper, callPackage -, soundfont-fluid, SDL, libGLU_combined, glew, bzip2, zlib, libjpeg, fluidsynth, openssl, gtk2, python3 +, soundfont-fluid, SDL, libGL, glew, bzip2, zlib, libjpeg, fluidsynth, openssl, gtk2, python3, libgme , serverOnly ? false }: @@ -7,6 +7,7 @@ let suffix = lib.optionalString serverOnly "-server"; fmod = callPackage ./fmod.nix { }; sqlite = callPackage ./sqlite.nix { }; + clientLibPath = lib.makeLibraryPath [ fluidsynth ]; in stdenv.mkDerivation { name = "zandronum${suffix}-3.0"; @@ -27,8 +28,8 @@ in stdenv.mkDerivation { # I have no idea why would SDL and libjpeg be needed for the server part! # But they are. - buildInputs = [ openssl bzip2 zlib SDL libjpeg sqlite ] - ++ lib.optionals (!serverOnly) [ libGLU_combined glew fmod fluidsynth gtk2 ]; + buildInputs = [ openssl bzip2 zlib SDL libjpeg sqlite libgme ] + ++ lib.optionals (!serverOnly) [ libGL glew fmod fluidsynth gtk2 ]; nativeBuildInputs = [ cmake pkgconfig makeWrapper python3 ]; @@ -44,9 +45,10 @@ in stdenv.mkDerivation { ''; cmakeFlags = - lib.optional (!serverOnly) "-DFMOD_LIBRARY=${fmod}/lib/libfmodex.so" - ++ lib.optional serverOnly "-DSERVERONLY=ON" - ; + [ "-DFORCE_INTERNAL_GME=OFF" ] + ++ (if serverOnly + then [ "-DSERVERONLY=ON" ] + else [ "-DFMOD_LIBRARY=${fmod}/lib/libfmodex.so" ]); enableParallelBuilding = true; @@ -59,16 +61,18 @@ in stdenv.mkDerivation { *.pk3 \ ${lib.optionalString (!serverOnly) "liboutput_sdl.so"} \ $out/lib/zandronum - '' + (if (!serverOnly) then - ''makeWrapper $out/lib/zandronum/zandronum $out/bin/zandronum --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH:${fluidsynth}/lib"'' - else - ''makeWrapper $out/lib/zandronum/zandronum${suffix} $out/bin/zandronum${suffix}''); + makeWrapper $out/lib/zandronum/zandronum${suffix} $out/bin/zandronum${suffix} + ''; postFixup = lib.optionalString (!serverOnly) '' - patchelf --set-rpath $(patchelf --print-rpath $out/lib/zandronum/zandronum):$out/lib/zandronum \ + patchelf --set-rpath $(patchelf --print-rpath $out/lib/zandronum/zandronum):$out/lib/zandronum:${clientLibPath} \ $out/lib/zandronum/zandronum ''; + passthru = { + inherit fmod sqlite; + }; + meta = with stdenv.lib; { homepage = http://zandronum.com/; description = "Multiplayer oriented port, based off Skulltag, for Doom and Doom II by id Software"; diff --git a/pkgs/games/zandronum/fmod.nix b/pkgs/games/zandronum/fmod.nix index b45ec24ca6b..7f76101d8ce 100644 --- a/pkgs/games/zandronum/fmod.nix +++ b/pkgs/games/zandronum/fmod.nix @@ -1,52 +1,35 @@ -{ stdenv, fetchurl }: +{ stdenv, lib, fetchurl, alsaLib, libpulseaudio }: -assert (stdenv.system == "x86_64-linux") || (stdenv.system == "i686-linux"); let bits = stdenv.lib.optionalString (stdenv.system == "x86_64-linux") "64"; + libPath = lib.makeLibraryPath [ stdenv.cc.cc alsaLib libpulseaudio ]; - libPath = stdenv.lib.makeLibraryPath - [ stdenv.cc.libc stdenv.cc.cc ] + ":${stdenv.cc.cc.lib}/lib64"; - patchLib = x: "patchelf --set-rpath ${libPath} ${x}"; - - src = - (if (bits == "64") then - fetchurl { - url = "http://zandronum.com/essentials/fmod/fmodapi42416linux64.tar.gz"; - sha256 = "0hkwlzchzzgd7fanqznbv5bs53z2qy8iiv9l2y77l4sg1jwmlm6y"; - } - else - fetchurl { - url = "http://zandronum.com/essentials/fmod/fmodapi42416linux.tar.gz"; - sha256 = "13diw3ax2slkr99mwyjyc62b8awc30k0z08cvkpk2p3i1j6f85m5"; - } - ); in stdenv.mkDerivation rec { - inherit src; + name = "fmod-${version}"; + version = "4.44.64"; - name = "fmod-${version}"; - version = "4.24.16"; + src = fetchurl { + url = "https://zdoom.org/files/fmod/fmodapi44464linux.tar.gz"; + sha256 = "047hk92xapwwqj281f4zwl0ih821rrliya70gfj82sdfjh9lz8i1"; + }; dontStrip = true; dontPatchELF = true; dontBuild = true; - makeFlags = [ "DESTLIBDIR=$(out)/lib" "DESTHDRDIR=$(out)/include" ]; - - preInstall = '' - mkdir -p $out/lib - ''; - - postInstall = '' - mv $out/lib/libfmodex${bits}-${version}.so $out/lib/libfmodex.so - mv $out/lib/libfmodexp${bits}-${version}.so $out/lib/libfmodexp.so + installPhase = '' + install -Dm755 api/lib/libfmodex${bits}-${version}.so $out/lib/libfmodex-${version}.so + ln -s libfmodex-${version}.so $out/lib/libfmodex.so + patchelf --set-rpath ${libPath} $out/lib/libfmodex.so + cp -r api/inc $out/include ''; meta = with stdenv.lib; { description = "Programming library and toolkit for the creation and playback of interactive audio"; - homepage = "http://www.fmod.org/"; + homepage = http://www.fmod.org/; license = licenses.unfreeRedistributable; - platforms = platforms.linux; - maintainers = [ stdenv.lib.maintainers.lassulus ]; + platforms = [ "x86_64-linux" "i686-linux" ]; + maintainers = [ maintainers.lassulus ]; }; } diff --git a/pkgs/misc/arm-trusted-firmware/default.nix b/pkgs/misc/arm-trusted-firmware/default.nix new file mode 100644 index 00000000000..868d60d6d32 --- /dev/null +++ b/pkgs/misc/arm-trusted-firmware/default.nix @@ -0,0 +1,85 @@ +{ stdenv, fetchFromGitHub, buildPackages }: + +let + buildArmTrustedFirmware = { filesToInstall + , installDir ? "$out" + , platform + , extraMakeFlags ? [] + , extraMeta ? {} + , ... } @ args: + stdenv.mkDerivation (rec { + + name = "arm-trusted-firmware-${platform}-${version}"; + version = "1.5"; + + src = fetchFromGitHub { + owner = "ARM-software"; + repo = "arm-trusted-firmware"; + rev = "refs/tags/v${version}"; + sha256 = "1gm0bn2llzfzz9bfsz11fhwxj5lxvyrq7bc13fjj033nljzxn7k8"; + }; + + depsBuildBuild = [ buildPackages.stdenv.cc ]; + + makeFlags = [ + "CROSS_COMPILE=${stdenv.cc.targetPrefix}" + "PLAT=${platform}" + ] ++ extraMakeFlags; + + installPhase = '' + runHook preInstall + + mkdir -p ${installDir} + cp ${stdenv.lib.concatStringsSep " " filesToInstall} ${installDir} + + runHook postInstall + ''; + + hardeningDisable = [ "all" ]; + dontStrip = true; + + # Fatal error: can't create build/sun50iw1p1/release/bl31/sunxi_clocks.o: No such file or directory + enableParallelBuilding = false; + + meta = with stdenv.lib; { + homepage = https://github.com/ARM-software/arm-trusted-firmware; + description = "A reference implementation of secure world software for ARMv8-A"; + license = licenses.bsd3; + maintainers = [ maintainers.lopsided98 ]; + } // extraMeta; + } // builtins.removeAttrs args [ "extraMeta" ]); + +in rec { + inherit buildArmTrustedFirmware; + + armTrustedFirmwareAllwinner = buildArmTrustedFirmware rec { + version = "1.0"; + src = fetchFromGitHub { + owner = "apritzel"; + repo = "arm-trusted-firmware"; + # Branch: `allwinner` + rev = "91f2402d941036a0db092d5375d0535c270b9121"; + sha256 = "0lbipkxb01w97r6ah8wdbwxir3013rp249fcqhlzh2gjwhp5l1ys"; + }; + platform = "sun50iw1p1"; + extraMeta.platforms = ["aarch64-linux"]; + filesToInstall = ["build/${platform}/release/bl31.bin"]; + }; + + armTrustedFirmwareQemu = buildArmTrustedFirmware rec { + platform = "qemu"; + extraMeta.platforms = ["aarch64-linux"]; + filesToInstall = [ + "build/${platform}/release/bl1.bin" + "build/${platform}/release/bl2.bin" + "build/${platform}/release/bl31.bin" + ]; + }; + + armTrustedFirmwareRK3328 = buildArmTrustedFirmware rec { + extraMakeFlags = [ "bl31" ]; + platform = "rk3328"; + extraMeta.platforms = ["aarch64-linux"]; + filesToInstall = [ "build/${platform}/release/bl31/bl31.elf"]; + }; +} diff --git a/pkgs/misc/base16-builder/node-packages.nix b/pkgs/misc/base16-builder/node-packages.nix index bb98d7ab9cc..a112dcdec97 100644 --- a/pkgs/misc/base16-builder/node-packages.nix +++ b/pkgs/misc/base16-builder/node-packages.nix @@ -6,11 +6,11 @@ let nodeEnv = import ./../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile; + inherit (pkgs) stdenv libtool python2 utillinux runCommand writeTextFile; inherit nodejs; }; in import ./node-packages-generated.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; -} \ No newline at end of file +} diff --git a/pkgs/misc/cups/cups-clean-dirty.patch b/pkgs/misc/cups/cups-clean-dirty.patch new file mode 100644 index 00000000000..0bdc8198e8f --- /dev/null +++ b/pkgs/misc/cups/cups-clean-dirty.patch @@ -0,0 +1,13 @@ +diff --git a/scheduler/main.c b/scheduler/main.c +index 8925c8373..acf031684 100644 +--- a/scheduler/main.c ++++ b/scheduler/main.c +@@ -893,7 +893,7 @@ main(int argc, /* I - Number of command-line args */ + * Write dirty config/state files... + */ + +- if (DirtyCleanTime && current_time >= DirtyCleanTime && cupsArrayCount(Clients) == 0) ++ if (DirtyCleanTime && current_time >= DirtyCleanTime) + cupsdCleanDirty(); + + #ifdef __APPLE__ diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index db344b32d21..feeb73a27e9 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -22,9 +22,12 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { - url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/cups-systemd-socket.patch?h=packages/cups"; + name = "cups"; # weird name to avoid change (for now) + url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/cups-systemd-socket.patch" + + "?h=packages/cups&id=41fefa22ac518"; sha256 = "1ddgdlg9s0l2ph6l8lx1m1lx6k50gyxqi3qiwr44ppq1rxs80ny5"; }) + ./cups-clean-dirty.patch ]; nativeBuildInputs = [ pkgconfig removeReferencesTo ]; @@ -40,7 +43,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--localstatedir=/var" "--sysconfdir=/etc" - "--with-rundir=/run" "--enable-raw-printing" "--enable-threads" ] ++ optionals stdenv.isLinux [ diff --git a/pkgs/misc/documentation-highlighter/LICENSE b/pkgs/misc/documentation-highlighter/LICENSE new file mode 100644 index 00000000000..422deb7350f --- /dev/null +++ b/pkgs/misc/documentation-highlighter/LICENSE @@ -0,0 +1,24 @@ +Copyright (c) 2006, Ivan Sagalaev +All rights reserved. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + * Neither the name of highlight.js nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY +EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY +DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/pkgs/misc/documentation-highlighter/README.md b/pkgs/misc/documentation-highlighter/README.md new file mode 100644 index 00000000000..f4baa3c8e00 --- /dev/null +++ b/pkgs/misc/documentation-highlighter/README.md @@ -0,0 +1,152 @@ +This file was generated with pkgs/misc/documentation-highlighter/update.sh + +# Highlight.js + +[![Build Status](https://travis-ci.org/isagalaev/highlight.js.svg?branch=master)](https://travis-ci.org/isagalaev/highlight.js) + +Highlight.js is a syntax highlighter written in JavaScript. It works in +the browser as well as on the server. It works with pretty much any +markup, doesn’t depend on any framework and has automatic language +detection. + +## Getting Started + +The bare minimum for using highlight.js on a web page is linking to the +library along with one of the styles and calling +[`initHighlightingOnLoad`][1]: + +```html + + + +``` + +This will find and highlight code inside of `
` tags; it tries
+to detect the language automatically. If automatic detection doesn’t
+work for you, you can specify the language in the `class` attribute:
+
+```html
+
...

+```
+
+The list of supported language classes is available in the [class
+reference][2].  Classes can also be prefixed with either `language-` or
+`lang-`.
+
+To disable highlighting altogether use the `nohighlight` class:
+
+```html
+
...

+```
+
+## Custom Initialization
+
+When you need a bit more control over the initialization of
+highlight.js, you can use the [`highlightBlock`][3] and [`configure`][4]
+functions. This allows you to control *what* to highlight and *when*.
+
+Here’s an equivalent way to calling [`initHighlightingOnLoad`][1] using
+jQuery:
+
+```javascript
+$(document).ready(function() {
+  $('pre code').each(function(i, block) {
+    hljs.highlightBlock(block);
+  });
+});
+```
+
+You can use any tags instead of `
` to mark up your code. If
+you don't use a container that preserve line breaks you will need to
+configure highlight.js to use the `
` tag:
+
+```javascript
+hljs.configure({useBR: true});
+
+$('div.code').each(function(i, block) {
+  hljs.highlightBlock(block);
+});
+```
+
+For other options refer to the documentation for [`configure`][4].
+
+
+## Web Workers
+
+You can run highlighting inside a web worker to avoid freezing the browser
+window while dealing with very big chunks of code.
+
+In your main script:
+
+```javascript
+addEventListener('load', function() {
+  var code = document.querySelector('#code');
+  var worker = new Worker('worker.js');
+  worker.onmessage = function(event) { code.innerHTML = event.data; }
+  worker.postMessage(code.textContent);
+})
+```
+
+In worker.js:
+
+```javascript
+onmessage = function(event) {
+  importScripts('/highlight.pack.js');
+  var result = self.hljs.highlightAuto(event.data);
+  postMessage(result.value);
+}
+```
+
+
+## Getting the Library
+
+You can get highlight.js as a hosted, or custom-build, browser script or
+as a server module. Right out of the box the browser script supports
+both AMD and CommonJS, so if you wish you can use RequireJS or
+Browserify without having to build from source. The server module also
+works perfectly fine with Browserify, but there is the option to use a
+build specific to browsers rather than something meant for a server.
+Head over to the [download page][5] for all the options.
+
+**Don't link to GitHub directly.** The library is not supposed to work straight
+from the source, it requires building. If none of the pre-packaged options
+work for you refer to the [building documentation][6].
+
+**The CDN-hosted package doesn't have all the languages.** Otherwise it'd be
+too big. If you don't see the language you need in the ["Common" section][5],
+it can be added manually:
+
+```html
+
+```
+
+**On Almond.** You need to use the optimizer to give the module a name. For
+example:
+
+```
+r.js -o name=hljs paths.hljs=/path/to/highlight out=highlight.js
+```
+
+
+## License
+
+Highlight.js is released under the BSD License. See [LICENSE][7] file
+for details.
+
+## Links
+
+The official site for the library is at .
+
+Further in-depth documentation for the API and other topics is at
+.
+
+Authors and contributors are listed in the [AUTHORS.en.txt][8] file.
+
+[1]: http://highlightjs.readthedocs.io/en/latest/api.html#inithighlightingonload
+[2]: http://highlightjs.readthedocs.io/en/latest/css-classes-reference.html
+[3]: http://highlightjs.readthedocs.io/en/latest/api.html#highlightblock-block
+[4]: http://highlightjs.readthedocs.io/en/latest/api.html#configure-options
+[5]: https://highlightjs.org/download/
+[6]: http://highlightjs.readthedocs.io/en/latest/building-testing.html
+[7]: https://github.com/isagalaev/highlight.js/blob/master/LICENSE
+[8]: https://github.com/isagalaev/highlight.js/blob/master/AUTHORS.en.txt
diff --git a/pkgs/misc/documentation-highlighter/default.nix b/pkgs/misc/documentation-highlighter/default.nix
new file mode 100644
index 00000000000..a9fbcc178bb
--- /dev/null
+++ b/pkgs/misc/documentation-highlighter/default.nix
@@ -0,0 +1,12 @@
+{ stdenv, runCommand }:
+runCommand "documentation-highlighter" {
+  meta = {
+    description = "Highlight.js sources for the Nix Ecosystem's documentation.";
+    homepage = https://highlightjs.org;
+    license = stdenv.lib.licenses.bsd3;
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.grahamc ];
+  };
+} ''
+  cp -r ${./.} $out
+''
diff --git a/pkgs/misc/documentation-highlighter/highlight.pack.js b/pkgs/misc/documentation-highlighter/highlight.pack.js
new file mode 100644
index 00000000000..f909702367e
--- /dev/null
+++ b/pkgs/misc/documentation-highlighter/highlight.pack.js
@@ -0,0 +1,2 @@
+/*! highlight.js v9.12.0 | BSD3 License | git.io/hljslicense */
+!function(e){var n="object"==typeof window&&window||"object"==typeof self&&self;"undefined"!=typeof exports?e(exports):n&&(n.hljs=e({}),"function"==typeof define&&define.amd&&define([],function(){return n.hljs}))}(function(e){function n(e){return e.replace(/&/g,"&").replace(//g,">")}function t(e){return e.nodeName.toLowerCase()}function r(e,n){var t=e&&e.exec(n);return t&&0===t.index}function a(e){return k.test(e)}function i(e){var n,t,r,i,o=e.className+" ";if(o+=e.parentNode?e.parentNode.className:"",t=B.exec(o))return w(t[1])?t[1]:"no-highlight";for(o=o.split(/\s+/),n=0,r=o.length;r>n;n++)if(i=o[n],a(i)||w(i))return i}function o(e){var n,t={},r=Array.prototype.slice.call(arguments,1);for(n in e)t[n]=e[n];return r.forEach(function(e){for(n in e)t[n]=e[n]}),t}function u(e){var n=[];return function r(e,a){for(var i=e.firstChild;i;i=i.nextSibling)3===i.nodeType?a+=i.nodeValue.length:1===i.nodeType&&(n.push({event:"start",offset:a,node:i}),a=r(i,a),t(i).match(/br|hr|img|input/)||n.push({event:"stop",offset:a,node:i}));return a}(e,0),n}function c(e,r,a){function i(){return e.length&&r.length?e[0].offset!==r[0].offset?e[0].offset"}function u(e){s+=""}function c(e){("start"===e.event?o:u)(e.node)}for(var l=0,s="",f=[];e.length||r.length;){var g=i();if(s+=n(a.substring(l,g[0].offset)),l=g[0].offset,g===e){f.reverse().forEach(u);do c(g.splice(0,1)[0]),g=i();while(g===e&&g.length&&g[0].offset===l);f.reverse().forEach(o)}else"start"===g[0].event?f.push(g[0].node):f.pop(),c(g.splice(0,1)[0])}return s+n(a.substr(l))}function l(e){return e.v&&!e.cached_variants&&(e.cached_variants=e.v.map(function(n){return o(e,{v:null},n)})),e.cached_variants||e.eW&&[o(e)]||[e]}function s(e){function n(e){return e&&e.source||e}function t(t,r){return new RegExp(n(t),"m"+(e.cI?"i":"")+(r?"g":""))}function r(a,i){if(!a.compiled){if(a.compiled=!0,a.k=a.k||a.bK,a.k){var o={},u=function(n,t){e.cI&&(t=t.toLowerCase()),t.split(" ").forEach(function(e){var t=e.split("|");o[t[0]]=[n,t[1]?Number(t[1]):1]})};"string"==typeof a.k?u("keyword",a.k):x(a.k).forEach(function(e){u(e,a.k[e])}),a.k=o}a.lR=t(a.l||/\w+/,!0),i&&(a.bK&&(a.b="\\b("+a.bK.split(" ").join("|")+")\\b"),a.b||(a.b=/\B|\b/),a.bR=t(a.b),a.e||a.eW||(a.e=/\B|\b/),a.e&&(a.eR=t(a.e)),a.tE=n(a.e)||"",a.eW&&i.tE&&(a.tE+=(a.e?"|":"")+i.tE)),a.i&&(a.iR=t(a.i)),null==a.r&&(a.r=1),a.c||(a.c=[]),a.c=Array.prototype.concat.apply([],a.c.map(function(e){return l("self"===e?a:e)})),a.c.forEach(function(e){r(e,a)}),a.starts&&r(a.starts,i);var c=a.c.map(function(e){return e.bK?"\\.?("+e.b+")\\.?":e.b}).concat([a.tE,a.i]).map(n).filter(Boolean);a.t=c.length?t(c.join("|"),!0):{exec:function(){return null}}}}r(e)}function f(e,t,a,i){function o(e,n){var t,a;for(t=0,a=n.c.length;a>t;t++)if(r(n.c[t].bR,e))return n.c[t]}function u(e,n){if(r(e.eR,n)){for(;e.endsParent&&e.parent;)e=e.parent;return e}return e.eW?u(e.parent,n):void 0}function c(e,n){return!a&&r(n.iR,e)}function l(e,n){var t=N.cI?n[0].toLowerCase():n[0];return e.k.hasOwnProperty(t)&&e.k[t]}function p(e,n,t,r){var a=r?"":I.classPrefix,i='',i+n+o}function h(){var e,t,r,a;if(!E.k)return n(k);for(a="",t=0,E.lR.lastIndex=0,r=E.lR.exec(k);r;)a+=n(k.substring(t,r.index)),e=l(E,r),e?(B+=e[1],a+=p(e[0],n(r[0]))):a+=n(r[0]),t=E.lR.lastIndex,r=E.lR.exec(k);return a+n(k.substr(t))}function d(){var e="string"==typeof E.sL;if(e&&!y[E.sL])return n(k);var t=e?f(E.sL,k,!0,x[E.sL]):g(k,E.sL.length?E.sL:void 0);return E.r>0&&(B+=t.r),e&&(x[E.sL]=t.top),p(t.language,t.value,!1,!0)}function b(){L+=null!=E.sL?d():h(),k=""}function v(e){L+=e.cN?p(e.cN,"",!0):"",E=Object.create(e,{parent:{value:E}})}function m(e,n){if(k+=e,null==n)return b(),0;var t=o(n,E);if(t)return t.skip?k+=n:(t.eB&&(k+=n),b(),t.rB||t.eB||(k=n)),v(t,n),t.rB?0:n.length;var r=u(E,n);if(r){var a=E;a.skip?k+=n:(a.rE||a.eE||(k+=n),b(),a.eE&&(k=n));do E.cN&&(L+=C),E.skip||(B+=E.r),E=E.parent;while(E!==r.parent);return r.starts&&v(r.starts,""),a.rE?0:n.length}if(c(n,E))throw new Error('Illegal lexeme "'+n+'" for mode "'+(E.cN||"")+'"');return k+=n,n.length||1}var N=w(e);if(!N)throw new Error('Unknown language: "'+e+'"');s(N);var R,E=i||N,x={},L="";for(R=E;R!==N;R=R.parent)R.cN&&(L=p(R.cN,"",!0)+L);var k="",B=0;try{for(var M,j,O=0;;){if(E.t.lastIndex=O,M=E.t.exec(t),!M)break;j=m(t.substring(O,M.index),M[0]),O=M.index+j}for(m(t.substr(O)),R=E;R.parent;R=R.parent)R.cN&&(L+=C);return{r:B,value:L,language:e,top:E}}catch(T){if(T.message&&-1!==T.message.indexOf("Illegal"))return{r:0,value:n(t)};throw T}}function g(e,t){t=t||I.languages||x(y);var r={r:0,value:n(e)},a=r;return t.filter(w).forEach(function(n){var t=f(n,e,!1);t.language=n,t.r>a.r&&(a=t),t.r>r.r&&(a=r,r=t)}),a.language&&(r.second_best=a),r}function p(e){return I.tabReplace||I.useBR?e.replace(M,function(e,n){return I.useBR&&"\n"===e?"
":I.tabReplace?n.replace(/\t/g,I.tabReplace):""}):e}function h(e,n,t){var r=n?L[n]:t,a=[e.trim()];return e.match(/\bhljs\b/)||a.push("hljs"),-1===e.indexOf(r)&&a.push(r),a.join(" ").trim()}function d(e){var n,t,r,o,l,s=i(e);a(s)||(I.useBR?(n=document.createElementNS("http://www.w3.org/1999/xhtml","div"),n.innerHTML=e.innerHTML.replace(/\n/g,"").replace(//g,"\n")):n=e,l=n.textContent,r=s?f(s,l,!0):g(l),t=u(n),t.length&&(o=document.createElementNS("http://www.w3.org/1999/xhtml","div"),o.innerHTML=r.value,r.value=c(t,u(o),l)),r.value=p(r.value),e.innerHTML=r.value,e.className=h(e.className,s,r.language),e.result={language:r.language,re:r.r},r.second_best&&(e.second_best={language:r.second_best.language,re:r.second_best.r}))}function b(e){I=o(I,e)}function v(){if(!v.called){v.called=!0;var e=document.querySelectorAll("pre code");E.forEach.call(e,d)}}function m(){addEventListener("DOMContentLoaded",v,!1),addEventListener("load",v,!1)}function N(n,t){var r=y[n]=t(e);r.aliases&&r.aliases.forEach(function(e){L[e]=n})}function R(){return x(y)}function w(e){return e=(e||"").toLowerCase(),y[e]||y[L[e]]}var E=[],x=Object.keys,y={},L={},k=/^(no-?highlight|plain|text)$/i,B=/\blang(?:uage)?-([\w-]+)\b/i,M=/((^(<[^>]+>|\t|)+|(?:\n)))/gm,C="",I={classPrefix:"hljs-",tabReplace:null,useBR:!1,languages:void 0};return e.highlight=f,e.highlightAuto=g,e.fixMarkup=p,e.highlightBlock=d,e.configure=b,e.initHighlighting=v,e.initHighlightingOnLoad=m,e.registerLanguage=N,e.listLanguages=R,e.getLanguage=w,e.inherit=o,e.IR="[a-zA-Z]\\w*",e.UIR="[a-zA-Z_]\\w*",e.NR="\\b\\d+(\\.\\d+)?",e.CNR="(-?)(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)",e.BNR="\\b(0b[01]+)",e.RSR="!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|-|-=|/=|/|:|;|<<|<<=|<=|<|===|==|=|>>>=|>>=|>=|>>>|>>|>|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~",e.BE={b:"\\\\[\\s\\S]",r:0},e.ASM={cN:"string",b:"'",e:"'",i:"\\n",c:[e.BE]},e.QSM={cN:"string",b:'"',e:'"',i:"\\n",c:[e.BE]},e.PWM={b:/\b(a|an|the|are|I'm|isn't|don't|doesn't|won't|but|just|should|pretty|simply|enough|gonna|going|wtf|so|such|will|you|your|they|like|more)\b/},e.C=function(n,t,r){var a=e.inherit({cN:"comment",b:n,e:t,c:[]},r||{});return a.c.push(e.PWM),a.c.push({cN:"doctag",b:"(?:TODO|FIXME|NOTE|BUG|XXX):",r:0}),a},e.CLCM=e.C("//","$"),e.CBCM=e.C("/\\*","\\*/"),e.HCM=e.C("#","$"),e.NM={cN:"number",b:e.NR,r:0},e.CNM={cN:"number",b:e.CNR,r:0},e.BNM={cN:"number",b:e.BNR,r:0},e.CSSNM={cN:"number",b:e.NR+"(%|em|ex|ch|rem|vw|vh|vmin|vmax|cm|mm|in|pt|pc|px|deg|grad|rad|turn|s|ms|Hz|kHz|dpi|dpcm|dppx)?",r:0},e.RM={cN:"regexp",b:/\//,e:/\/[gimuy]*/,i:/\n/,c:[e.BE,{b:/\[/,e:/\]/,r:0,c:[e.BE]}]},e.TM={cN:"title",b:e.IR,r:0},e.UTM={cN:"title",b:e.UIR,r:0},e.METHOD_GUARD={b:"\\.\\s*"+e.UIR,r:0},e});hljs.registerLanguage("nix",function(e){var r={keyword:"rec with let in inherit assert if else then",literal:"true false or and null",built_in:"import abort baseNameOf dirOf isNull builtins map removeAttrs throw toString derivation"},t={cN:"subst",b:/\$\{/,e:/}/,k:r},i={b:/[a-zA-Z0-9-_]+(\s*=)/,rB:!0,r:0,c:[{cN:"attr",b:/\S+/}]},s={cN:"string",c:[t],v:[{b:"''",e:"''"},{b:'"',e:'"'}]},a=[e.NM,e.HCM,e.CBCM,s,i];return t.c=a,{aliases:["nixos"],k:r,c:a}});hljs.registerLanguage("bash",function(e){var t={cN:"variable",v:[{b:/\$[\w\d#@][\w\d_]*/},{b:/\$\{(.*?)}/}]},s={cN:"string",b:/"/,e:/"/,c:[e.BE,t,{cN:"variable",b:/\$\(/,e:/\)/,c:[e.BE]}]},a={cN:"string",b:/'/,e:/'/};return{aliases:["sh","zsh"],l:/\b-?[a-z\._]+\b/,k:{keyword:"if then else elif fi for while in do done case esac function",literal:"true false",built_in:"break cd continue eval exec exit export getopts hash pwd readonly return shift test times trap umask unset alias bind builtin caller command declare echo enable help let local logout mapfile printf read readarray source type typeset ulimit unalias set shopt autoload bg bindkey bye cap chdir clone comparguments compcall compctl compdescribe compfiles compgroups compquote comptags comptry compvalues dirs disable disown echotc echoti emulate fc fg float functions getcap getln history integer jobs kill limit log noglob popd print pushd pushln rehash sched setcap setopt stat suspend ttyctl unfunction unhash unlimit unsetopt vared wait whence where which zcompile zformat zftp zle zmodload zparseopts zprof zpty zregexparse zsocket zstyle ztcp",_:"-ne -eq -lt -gt -f -d -e -s -l -a"},c:[{cN:"meta",b:/^#![^\n]+sh\s*$/,r:10},{cN:"function",b:/\w[\w\d_]*\s*\(\s*\)\s*\{/,rB:!0,c:[e.inherit(e.TM,{b:/\w[\w\d_]*/})],r:0},e.HCM,s,a,t]}});
\ No newline at end of file
diff --git a/pkgs/misc/documentation-highlighter/loader.js b/pkgs/misc/documentation-highlighter/loader.js
new file mode 100644
index 00000000000..4ad7dbf24b5
--- /dev/null
+++ b/pkgs/misc/documentation-highlighter/loader.js
@@ -0,0 +1,7 @@
+/* This file is NOT part of highlight.js */
+document.onreadystatechange = function () {
+    var listings = document.querySelectorAll('.programlisting, .screen');
+    for (i = 0; i < listings.length; ++i) {
+        hljs.highlightBlock(listings[i]);
+    }
+}
diff --git a/pkgs/misc/documentation-highlighter/mono-blue.css b/pkgs/misc/documentation-highlighter/mono-blue.css
new file mode 100644
index 00000000000..884c97c7673
--- /dev/null
+++ b/pkgs/misc/documentation-highlighter/mono-blue.css
@@ -0,0 +1,59 @@
+/*
+  Five-color theme from a single blue hue.
+*/
+.hljs {
+  display: block;
+  overflow-x: auto;
+  padding: 0.5em;
+  background: #eaeef3;
+}
+
+.hljs {
+  color: #00193a;
+}
+
+.hljs-keyword,
+.hljs-selector-tag,
+.hljs-title,
+.hljs-section,
+.hljs-doctag,
+.hljs-name,
+.hljs-strong {
+  font-weight: bold;
+}
+
+.hljs-comment {
+  color: #738191;
+}
+
+.hljs-string,
+.hljs-title,
+.hljs-section,
+.hljs-built_in,
+.hljs-literal,
+.hljs-type,
+.hljs-addition,
+.hljs-tag,
+.hljs-quote,
+.hljs-name,
+.hljs-selector-id,
+.hljs-selector-class {
+  color: #0048ab;
+}
+
+.hljs-meta,
+.hljs-subst,
+.hljs-symbol,
+.hljs-regexp,
+.hljs-attribute,
+.hljs-deletion,
+.hljs-variable,
+.hljs-template-variable,
+.hljs-link,
+.hljs-bullet {
+  color: #4c81c9;
+}
+
+.hljs-emphasis {
+  font-style: italic;
+}
diff --git a/pkgs/misc/documentation-highlighter/update.sh b/pkgs/misc/documentation-highlighter/update.sh
new file mode 100755
index 00000000000..3b77af4af41
--- /dev/null
+++ b/pkgs/misc/documentation-highlighter/update.sh
@@ -0,0 +1,42 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl -p unzip
+
+set -eu
+set -o pipefail
+
+root=$(pwd)
+
+if [ ! -f "./update.sh" ]; then
+    echo "Please run this script from within pkgs/misc/documentation-highlighter/!"
+    exit 1
+fi
+
+scratch=$(mktemp -d -t tmp.XXXXXXXXXX)
+function finish {
+  rm -rf "$scratch"
+}
+trap finish EXIT
+
+
+mkdir $scratch/src
+cd $scratch/src
+
+token=$(curl https://highlightjs.org/download/ -c "$scratch/jar" \
+    | grep csrf \
+    | cut -d"'" -f6)
+
+curl --header "Referer: https://highlightjs.org/download/"\
+    -b "$scratch/jar" \
+    --data "csrfmiddlewaretoken=$token&nix.js=on&bash.js=on" \
+    https://highlightjs.org/download/ > $scratch/out.zip
+
+unzip "$scratch/out.zip"
+out="$root/"
+mkdir -p "$out"
+cp ./{highlight.pack.js,LICENSE,styles/mono-blue.css} "$out"
+
+(
+    echo "This file was generated with pkgs/misc/documentation-highlighter/update.sh"
+    echo ""
+    cat README.md
+) > "$out/README.md"
diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index f8f8d16d142..b18ae7762df 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -11,16 +11,16 @@
 let
 
   name = "hplip-${version}";
-  version = "3.17.10";
+  version = "3.17.11";
 
   src = fetchurl {
     url = "mirror://sourceforge/hplip/${name}.tar.gz";
-    sha256 = "0v27hg856b5z2rilczcbfgz8ksxn0n810g1glac3mxkj8qbl8wqg";
+    sha256 = "0xda7x7xxjvzn1l0adlvbwcw21crq1r3r79bkf94q3m5i6abx49g";
   };
 
   plugin = fetchurl {
-    url = "http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run";
-    sha256 = "07am3dnl0ipgfswz5wndprryljh9rqbfhq7mm4d4yyj3bdnnzlig";
+    url = "https://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run";
+    sha256 = "0vqhwqc33vxncdhbzdchbgrcrxvkwnp7rc2hkswwn9da112s0c9w";
   };
 
   hplipState = substituteAll {
@@ -57,6 +57,7 @@ pythonPackages.buildPythonApplication {
     dbus
     net_snmp
     openssl
+    zlib
   ];
 
   nativeBuildInputs = [
@@ -69,6 +70,7 @@ pythonPackages.buildPythonApplication {
     pygobject2
     reportlab
     usbutils
+    sip
   ] ++ stdenv.lib.optionals withQt5 [
     pyqt5
   ];
@@ -97,7 +99,7 @@ pythonPackages.buildPythonApplication {
       --with-mimedir=$out/etc/cups
       --enable-policykit
       --disable-qt4
-      ${stdenv.lib.optionals withQt5 "--enable-qt5"}
+      ${stdenv.lib.optionalString withQt5 "--enable-qt5"}
     "
 
     export makeFlags="
@@ -182,7 +184,7 @@ pythonPackages.buildPythonApplication {
 
   meta = with stdenv.lib; {
     description = "Print, scan and fax HP drivers for Linux";
-    homepage = http://hplipopensource.com/;
+    homepage = https://developers.hp.com/hp-linux-imaging-and-printing;
     license = if withPlugin
       then licenses.unfree
       else with licenses; [ mit bsd2 gpl2Plus ];
diff --git a/pkgs/misc/emulators/citra/default.nix b/pkgs/misc/emulators/citra/default.nix
index db1de37da96..453114e3b7a 100644
--- a/pkgs/misc/emulators/citra/default.nix
+++ b/pkgs/misc/emulators/citra/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://citra-emu.org/;
     description = "An open-source emulator for the Nintendo 3DS capable of playing many of your favorite games.";
-    platforms = platforms.linux;
+    platforms = [ "x86_64-linux" "i686-linux" ];
     license = licenses.gpl2;
     maintainers = with maintainers; [ abbradar ];
   };
diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix
index a147c986674..283a8b52047 100644
--- a/pkgs/misc/emulators/wine/base.nix
+++ b/pkgs/misc/emulators/wine/base.nix
@@ -103,6 +103,10 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
   
   enableParallelBuilding = true;
 
+  # https://bugs.winehq.org/show_bug.cgi?id=43530
+  # https://github.com/NixOS/nixpkgs/issues/31989
+  hardeningDisable = [ "bindnow" ];
+
   passthru = { inherit pkgArches; };
   meta = {
     inherit version platforms;
diff --git a/pkgs/misc/frescobaldi/default.nix b/pkgs/misc/frescobaldi/default.nix
index 84272992f2b..af4c54d9d0d 100644
--- a/pkgs/misc/frescobaldi/default.nix
+++ b/pkgs/misc/frescobaldi/default.nix
@@ -1,21 +1,22 @@
-{ stdenv, fetchurl, pythonPackages, lilypond}:
+{ lib, fetchFromGitHub, python3Packages, lilypond }:
 
-pythonPackages.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   name = "frescobaldi-${version}";
-  version = "2.0.16";
+  version = "3.0.0";
 
-  src = fetchurl {
-    url = "https://github.com/wbsoft/frescobaldi/releases/download/"
-          + "v2.0.16/${name}.tar.gz";
-    sha256 = "12pabvq5b2lq84q3kx8lh02zh6ali6v4wnin2k2ycnm45mk9ms6q";
+  src = fetchFromGitHub {
+    owner = "wbsoft";
+    repo = "frescobaldi";
+    rev = "v${version}";
+    sha256 = "1yn18pwsjxpxz5j3yfysmaif8k0vqahj5c7ays9cxsylpg9hl7jd";
   };
 
-  propagatedBuildInputs = with pythonPackages; [ lilypond
-    pyqt4 poppler-qt4 pygame ];
+  propagatedBuildInputs = with python3Packages; [ lilypond pygame python-ly poppler-qt5 ];
 
-  patches = [ ./setup.cfg.patch ./python-path.patch ];
+  # no tests in shipped with upstream
+  doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = http://frescobaldi.org/;
     description = ''Frescobaldi is a LilyPond sheet music text editor'';
     longDescription = ''
@@ -31,7 +32,7 @@ pythonPackages.buildPythonApplication rec {
       fonts and keyboard shortcuts
     '';
     license = licenses.gpl2Plus;
-    maintainers = [ maintainers.sepi ];
+    maintainers = with maintainers; [ sepi ma27 ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/misc/frescobaldi/python-path.patch b/pkgs/misc/frescobaldi/python-path.patch
deleted file mode 100644
index 6c54d9f208e..00000000000
--- a/pkgs/misc/frescobaldi/python-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -u frescobaldi-2.0.16.old/frescobaldi frescobaldi-2.0.16/frescobaldi
---- frescobaldi-2.0.16/frescobaldi	2014-10-24 11:29:28.705687224 +0200
-+++ frescobaldi-2.0.16.new/frescobaldi	2014-10-24 11:31:08.086444793 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/env python
- import sys
- import frescobaldi_app.main
- import app
-Common subdirectories: frescobaldi-2.0.16/frescobaldi_app and frescobaldi-2.0.16.new/frescobaldi_app
-Common subdirectories: frescobaldi-2.0.16/macosx and frescobaldi-2.0.16.new/macosx
diff --git a/pkgs/misc/frescobaldi/setup.cfg.patch b/pkgs/misc/frescobaldi/setup.cfg.patch
deleted file mode 100644
index 502cdd61966..00000000000
--- a/pkgs/misc/frescobaldi/setup.cfg.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Common subdirectories: frescobaldi-2.0.16.old/build and frescobaldi-2.0.16/build
-Common subdirectories: frescobaldi-2.0.16.old/frescobaldi_app and frescobaldi-2.0.16/frescobaldi_app
-Common subdirectories: frescobaldi-2.0.16.old/macosx and frescobaldi-2.0.16/macosx
-diff -u frescobaldi-2.0.16.old/setup.cfg frescobaldi-2.0.16/setup.cfg
---- frescobaldi-2.0.16.old/setup.cfg	2012-02-05 07:08:24.000000000 +0100
-+++ frescobaldi-2.0.16/setup.cfg	2014-10-24 15:08:48.141335620 +0200
-@@ -1,6 +1,2 @@
--[bdist_wininst]
--bitmap=frescobaldi-wininst.bmp
--install-script=frescobaldi-wininst.py
--
- [sdist]
- force-manifest=1
diff --git a/pkgs/misc/jackaudio/clang.patch b/pkgs/misc/jackaudio/clang.patch
deleted file mode 100644
index 131f8c4c04d..00000000000
--- a/pkgs/misc/jackaudio/clang.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/tests/test.cpp b/tests/test.cpp
-index 8a8a811..31e8459 100644
---- a/tests/test.cpp
-+++ b/tests/test.cpp
-@@ -479,7 +479,7 @@ int process4(jack_nframes_t nframes, void *arg)
- 	jack_nframes_t delta_time = cur_time - last_time;
- 
- 	Log("calling process4 callback : jack_frame_time = %ld delta_time = %ld\n", cur_time, delta_time);
--	if (delta_time > 0  && (jack_nframes_t)abs(delta_time - cur_buffer_size) > tolerance) {
-+	if (delta_time > 0  && (jack_nframes_t)fabs(delta_time - cur_buffer_size) > tolerance) {
- 		printf("!!! ERROR !!! jack_frame_time seems to return incorrect values cur_buffer_size = %d, delta_time = %d tolerance %d\n", cur_buffer_size, delta_time, tolerance);
- 	}
- 
-@@ -1064,7 +1064,7 @@ int main (int argc, char *argv[])
-     }
-     jack_sleep(1 * 1000);
-     cur_buffer_size = jack_get_buffer_size(client1);
--    if (abs((old_buffer_size * factor) - cur_buffer_size) > 5) {  // Tolerance needed for dummy driver...
-+    if (fabs((old_buffer_size * factor) - cur_buffer_size) > 5) {  // Tolerance needed for dummy driver...
-         printf("!!! ERROR !!! Buffer size has not been changed !\n");
-         printf("!!! Maybe jack was compiled without the '--enable-resize' flag...\n");
-     } else {
diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix
index 0ed0246a881..52b0abc48a7 100644
--- a/pkgs/misc/jackaudio/default.nix
+++ b/pkgs/misc/jackaudio/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
   ] ++ stdenv.lib.optionals stdenv.isDarwin [ aften AudioToolbox CoreAudio CoreFoundation ];
 
   # CoreFoundation 10.10 doesn't include CFNotificationCenter.h yet.
-  patches = stdenv.lib.optionals stdenv.isDarwin [ ./clang.patch ./darwin-cf.patch ];
+  patches = stdenv.lib.optionals stdenv.isDarwin [ ./darwin-cf.patch ];
 
   prePatch = ''
     substituteInPlace svnversion_regenerate.sh \
diff --git a/pkgs/misc/logging/beats/5.x.nix b/pkgs/misc/logging/beats/5.x.nix
index ba2a8b2448e..94d5449100d 100644
--- a/pkgs/misc/logging/beats/5.x.nix
+++ b/pkgs/misc/logging/beats/5.x.nix
@@ -8,7 +8,7 @@ let beat = package : extraArgs : buildGoPackage (rec {
         owner = "elastic";
         repo = "beats";
         rev = "v${version}";
-        sha256 = "0ri2l8pyl1fnx0zypliwprkk1wkaxz8ywkgz8h2f08v7h1zgq1m6";
+        sha256 = "00g90i58c6gnyzszsx7y75vn1350hrkzrsb50xx700jqg9ii8yin";
       };
 
       goPackagePath = "github.com/elastic/beats";
diff --git a/pkgs/misc/logging/beats/6.x.nix b/pkgs/misc/logging/beats/6.x.nix
index 2883604491c..ce911ae40d5 100644
--- a/pkgs/misc/logging/beats/6.x.nix
+++ b/pkgs/misc/logging/beats/6.x.nix
@@ -8,7 +8,7 @@ let beat = package : extraArgs : buildGoPackage (rec {
         owner = "elastic";
         repo = "beats";
         rev = "v${version}";
-        sha256 = "05ay6hdc1jgi6b00bd998zc39ca8jhnk7i6m3mw70s0baqv1scik";
+        sha256 = "194z3j9zwlbc6j97iy1m1cl0xqks3ws2bjp2xrgy8cwpi7fclaw2";
       };
 
       goPackagePath = "github.com/elastic/beats";
diff --git a/pkgs/misc/riscv-pk/default.nix b/pkgs/misc/riscv-pk/default.nix
index b605b9715d4..d4705dd9dd7 100644
--- a/pkgs/misc/riscv-pk/default.nix
+++ b/pkgs/misc/riscv-pk/default.nix
@@ -36,6 +36,7 @@ in stdenv.mkDerivation {
     description = "RISC-V Proxy Kernel and Bootloader.";
     homepage = https://github.com/riscv/riscv-pk;
     license = stdenv.lib.licenses.bsd3;
+    platforms = [ "riscv-linux" ];
     maintainers = [ stdenv.lib.maintainers.shlevy ];
   };
 }
diff --git a/pkgs/misc/screensavers/light-locker/default.nix b/pkgs/misc/screensavers/light-locker/default.nix
index c2486b7ebe4..d081581d255 100644
--- a/pkgs/misc/screensavers/light-locker/default.nix
+++ b/pkgs/misc/screensavers/light-locker/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   patches = [ ./systemd.patch ];
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ which xfce.xfce4_dev_tools glib systemd
+  buildInputs = [ which xfce.xfce4-dev-tools glib systemd
                   libX11 libXScrnSaver libXxf86misc gtk3 dbus-glib wrapGAppsHook ];
 
   preConfigure = ''
diff --git a/pkgs/misc/screensavers/slock/default.nix b/pkgs/misc/screensavers/slock/default.nix
index 6b310236de4..82ce4c20df8 100644
--- a/pkgs/misc/screensavers/slock/default.nix
+++ b/pkgs/misc/screensavers/slock/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, writeText
 , xproto, libX11, libXext, libXrandr
 # default header can be obtained from
-# http://git.suckless.org/slock/tree/config.def.h
+# https://git.suckless.org/slock/tree/config.def.h
 , conf ? null }:
 
 with stdenv.lib;
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   name = "slock-1.4";
 
   src = fetchurl {
-    url = "http://dl.suckless.org/tools/${name}.tar.gz";
+    url = "https://dl.suckless.org/tools/${name}.tar.gz";
     sha256 = "0sif752303dg33f14k6pgwq2jp1hjyhqv6x4sy3sj281qvdljf5m";
   };
 
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://tools.suckless.org/slock;
+    homepage = https://tools.suckless.org/slock;
     description = "Simple X display locker";
     longDescription = ''
       Simple X display locker. This is the simplest X screen locker.
diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix
index 537576ca63b..f1ab822c6f4 100644
--- a/pkgs/misc/seafile-shared/default.nix
+++ b/pkgs/misc/seafile-shared/default.nix
@@ -30,6 +30,6 @@ stdenv.mkDerivation rec {
     description = "Shared components of Seafile: seafile-daemon, libseafile, libseafile python bindings, manuals, and icons";
     license = licenses.gpl3;
     platforms = platforms.linux;
-    maintainers = [ maintainers.calrama ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/misc/stabber/default.nix b/pkgs/misc/stabber/default.nix
new file mode 100644
index 00000000000..ec8ef076c2f
--- /dev/null
+++ b/pkgs/misc/stabber/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, expat
+, libmicrohttpd
+}:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  name = "stabber-unstable-${version}";
+  version = "2016-11-09";
+
+  src = fetchFromGitHub {
+    owner = "boothj5";
+    repo = "stabber";
+    rev = "ed75087e4483233eb2cc5472dbd85ddfb7a1d4d4";
+    sha256 = "1l6cibggi9rx6d26j1g92r1m8zm1g899f6z7n4pfqp84mrfqgz0p";
+  };
+
+  preAutoreconf = ''
+    mkdir m4
+  '';
+
+  buildInputs = [ autoreconfHook pkgconfig glib expat libmicrohttpd ];
+
+  meta = {
+    description = "Stubbed XMPP Server";
+    homepage = https://github.com/boothj5/stabber;
+    license = licenses.gpl3;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ hschaeidt ];
+  };
+}
diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 1bfcea1057e..4cf1748bad4 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -1,30 +1,34 @@
-{ stdenv, fetchurl, fetchpatch, bc, dtc, openssl, python2
-, hostPlatform
+{ stdenv, fetchurl, fetchpatch, bc, dtc, openssl, python2, swig
+, armTrustedFirmwareAllwinner
+, hostPlatform, buildPackages
 }:
 
 let
-  buildUBoot = { targetPlatforms
-            , filesToInstall
+  # Various changes for 64-bit sunxi boards, (hopefully) destined for 2018.05
+  sunxiPatch = fetchpatch {
+    name = "sunxi.patch";
+    url = "https://github.com/u-boot/u-boot/compare/v2018.03...dezgeg:2018-03-sunxi.patch";
+    sha256 = "1pqn7c6c06hfygwpcgaraqvqxcjhz99j0rx5psfhj8igy0qvk2dq";
+  };
+
+  buildUBoot = { filesToInstall
             , installDir ? "$out"
             , defconfig
+            , extraPatches ? []
             , extraMakeFlags ? []
             , extraMeta ? {}
             , ... } @ args:
            stdenv.mkDerivation (rec {
 
     name = "uboot-${defconfig}-${version}";
-    version = "2017.11";
+    version = "2018.03";
 
     src = fetchurl {
       url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2";
-      sha256 = "01bcsah5imy6m3fbjwhqywxg0pfk5fl8ks9ylb7kv3zmrb9qy0ba";
+      sha256 = "1z9x635l5164c5hnf7qs19w7j3qghbkgs7rpn673dm898i9pfx3y";
     };
 
     patches = [
-      (fetchpatch {
-        url = https://github.com/dezgeg/u-boot/commit/cbsize-2017-11.patch;
-        sha256 = "08rqsrj78aif8vaxlpwiwwv1jwf0diihbj0h88hc0mlp0kmyqxwm";
-      })
       (fetchpatch {
         url = https://github.com/dezgeg/u-boot/commit/rpi-2017-11-patch1.patch;
         sha256 = "067yq55vv1slv4xy346px7h329pi14abdn04chg6s1s6hmf6c1x9";
@@ -34,23 +38,35 @@ let
         sha256 = "0bbw0q027xvzvdxxvpzjajg4rm30a8mb7z74b6ma9q0l7y7bi0c4";
       })
       (fetchpatch {
-        url = https://github.com/dezgeg/u-boot/commit/pythonpath-2017-11.patch;
-        sha256 = "162b2lglp307pzxsf9m7nnmzwxqd7xkwp5j85bm6bg1a38ngpl9v";
+        url = https://github.com/dezgeg/u-boot/commit/pythonpath-2018-03.patch;
+        sha256 = "1rhhlhrwhv7ic1n5i720jfh2cxwrkssrkvinllyjy3j9k9bpzcqd";
       })
-    ];
+      (fetchpatch {
+        url = https://github.com/dezgeg/u-boot/commit/extlinux-path-length-2018-03.patch;
+        sha256 = "07jafdnxvqv8lz256qy29agjc2k1zj5ad4k28r1w5qkhwj4ixmf8";
+      })
+    ] ++ extraPatches;
 
     postPatch = ''
       patchShebangs tools
     '';
 
-    nativeBuildInputs = [ bc dtc openssl python2 ];
+    nativeBuildInputs = [ bc dtc openssl python2 swig ];
+    depsBuildBuild = [ buildPackages.stdenv.cc ];
 
     hardeningDisable = [ "all" ];
 
-    makeFlags = [ "DTC=dtc" ] ++ extraMakeFlags;
+    makeFlags = [
+      "DTC=dtc"
+      "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
+    ] ++ extraMakeFlags;
 
     configurePhase = ''
+      runHook preConfigure
+
       make ${defconfig}
+
+      runHook postConfigure
     '';
 
     installPhase = ''
@@ -62,24 +78,18 @@ let
       runHook postInstall
     '';
 
-    enableParallelBuilding = true;
-    dontStrip = true;
+    # make[2]: *** No rule to make target 'lib/efi_loader/helloworld.efi', needed by '__build'.  Stop.
+    enableParallelBuilding = false;
 
-    crossAttrs = {
-      makeFlags = [
-        "ARCH=${hostPlatform.platform.kernelArch}"
-        "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
-      ];
-    };
+    dontStrip = true;
 
     meta = with stdenv.lib; {
       homepage = http://www.denx.de/wiki/U-Boot/;
       description = "Boot loader for embedded systems";
       license = licenses.gpl2;
       maintainers = [ maintainers.dezgeg ];
-      platforms = targetPlatforms;
     } // extraMeta;
-  } // args);
+  } // removeAttrs args [ "extraMeta" ]);
 
 in rec {
   inherit buildUBoot;
@@ -87,11 +97,14 @@ in rec {
   ubootTools = buildUBoot rec {
     defconfig = "allnoconfig";
     installDir = "$out/bin";
-    buildFlags = "tools NO_SDL=1";
+    hardeningDisable = [];
     dontStrip = false;
-    targetPlatforms = stdenv.lib.platforms.linux;
+    extraMeta.platforms = stdenv.lib.platforms.linux;
     # build tools/kwboot
-    extraMakeFlags = [ "CONFIG_KIRKWOOD=y" ];
+    extraMakeFlags = [ "CONFIG_KIRKWOOD=y" "CROSS_BUILD_TOOLS=1" "NO_SDL=1" "tools" ];
+    postConfigure = ''
+      sed -i '/CONFIG_SYS_TEXT_BASE/c\CONFIG_SYS_TEXT_BASE=0x00000000' .config
+    '';
     filesToInstall = [
       "tools/dumpimage"
       "tools/fdtgrep"
@@ -103,86 +116,125 @@ in rec {
 
   ubootA20OlinuxinoLime = buildUBoot rec {
     defconfig = "A20-OLinuXino-Lime_defconfig";
-    targetPlatforms = ["armv7l-linux"];
+    extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot-sunxi-with-spl.bin"];
   };
 
   ubootBananaPi = buildUBoot rec {
     defconfig = "Bananapi_defconfig";
-    targetPlatforms = ["armv7l-linux"];
+    extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot-sunxi-with-spl.bin"];
   };
 
   ubootBeagleboneBlack = buildUBoot rec {
     defconfig = "am335x_boneblack_defconfig";
-    targetPlatforms = ["armv7l-linux"];
+    extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["MLO" "u-boot.img"];
   };
 
   # http://git.denx.de/?p=u-boot.git;a=blob;f=board/solidrun/clearfog/README;hb=refs/heads/master
   ubootClearfog = buildUBoot rec {
     defconfig = "clearfog_defconfig";
-    targetPlatforms = ["armv7l-linux"];
+    extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot-spl.kwb"];
   };
 
+  ubootGuruplug = buildUBoot rec {
+    defconfig = "guruplug_defconfig";
+    extraMeta.platforms = ["armv5tel-linux"];
+    filesToInstall = ["u-boot.bin"];
+  };
+
   ubootJetsonTK1 = buildUBoot rec {
     defconfig = "jetson-tk1_defconfig";
-    targetPlatforms = ["armv7l-linux"];
+    extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot" "u-boot.dtb" "u-boot-dtb-tegra.bin" "u-boot-nodtb-tegra.bin"];
+    # tegra-uboot-flasher expects this exact directory layout, sigh...
+    postInstall = ''
+      mkdir -p $out/spl
+      cp spl/u-boot-spl $out/spl/
+    '';
   };
 
   ubootOdroidXU3 = buildUBoot rec {
     defconfig = "odroid-xu3_defconfig";
-    targetPlatforms = ["armv7l-linux"];
+    extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot-dtb.bin"];
   };
 
   ubootOrangePiPc = buildUBoot rec {
     defconfig = "orangepi_pc_defconfig";
-    targetPlatforms = ["armv7l-linux"];
+    extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot-sunxi-with-spl.bin"];
   };
 
   ubootPcduino3Nano = buildUBoot rec {
     defconfig = "Linksprite_pcDuino3_Nano_defconfig";
-    targetPlatforms = ["armv7l-linux"];
+    extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot-sunxi-with-spl.bin"];
   };
 
+  ubootPine64 = buildUBoot rec {
+    extraPatches = [sunxiPatch];
+    defconfig = "pine64_plus_defconfig";
+    extraMeta.platforms = ["aarch64-linux"];
+    BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin";
+    filesToInstall = ["u-boot-sunxi-with-spl.bin"];
+  };
+
+  ubootQemuAarch64 = buildUBoot rec {
+    defconfig = "qemu_arm64_defconfig";
+    extraMeta.platforms = ["aarch64-linux"];
+    filesToInstall = ["u-boot.bin"];
+  };
+
   ubootQemuArm = buildUBoot rec {
     defconfig = "qemu_arm_defconfig";
-    targetPlatforms = ["armv7l-linux"];
+    extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot.bin"];
   };
 
   ubootRaspberryPi = buildUBoot rec {
     defconfig = "rpi_defconfig";
-    targetPlatforms = ["armv6l-linux"];
+    extraMeta.platforms = ["armv6l-linux"];
     filesToInstall = ["u-boot.bin"];
   };
 
   ubootRaspberryPi2 = buildUBoot rec {
     defconfig = "rpi_2_defconfig";
-    targetPlatforms = ["armv7l-linux"];
+    extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot.bin"];
   };
 
   ubootRaspberryPi3_32bit = buildUBoot rec {
     defconfig = "rpi_3_32b_defconfig";
-    targetPlatforms = ["armv7l-linux"];
+    extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot.bin"];
   };
 
   ubootRaspberryPi3_64bit = buildUBoot rec {
     defconfig = "rpi_3_defconfig";
-    targetPlatforms = ["aarch64-linux"];
+    extraMeta.platforms = ["aarch64-linux"];
     filesToInstall = ["u-boot.bin"];
   };
 
+  ubootSheevaplug = buildUBoot rec {
+    defconfig = "sheevaplug_defconfig";
+    extraMeta.platforms = ["armv5tel-linux"];
+    filesToInstall = ["u-boot.bin"];
+  };
+
+  ubootSopine = buildUBoot rec {
+    extraPatches = [sunxiPatch];
+    defconfig = "sopine_baseboard_defconfig";
+    extraMeta.platforms = ["aarch64-linux"];
+    BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin";
+    filesToInstall = ["u-boot-sunxi-with-spl.bin"];
+  };
+
   ubootUtilite = buildUBoot rec {
     defconfig = "cm_fx6_defconfig";
-    targetPlatforms = ["armv7l-linux"];
+    extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot-with-nand-spl.imx"];
     buildFlags = "u-boot-with-nand-spl.imx";
     postConfigure = ''
@@ -196,7 +248,7 @@ in rec {
 
   ubootWandboard = buildUBoot rec {
     defconfig = "wandboard_defconfig";
-    targetPlatforms = ["armv7l-linux"];
+    extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot.img" "SPL"];
   };
 }
diff --git a/pkgs/misc/uboot/gas220.patch b/pkgs/misc/uboot/gas220.patch
deleted file mode 100644
index c5a91b0f3d0..00000000000
--- a/pkgs/misc/uboot/gas220.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Patch to allow assembling with binutils 2.20. It worked without this patch in 2.19.1
-diff --git a/board/mv_feroceon/USP/jump.S b/board/mv_feroceon/USP/jump.S
-index 4b6b9ee..58037fc 100644
---- a/board/mv_feroceon/USP/jump.S
-+++ b/board/mv_feroceon/USP/jump.S
-@@ -29,9 +29,11 @@ disclaimer.
- #include "sys/mvCpuIfRegs.h"
- 
- 
--jumpStart:
- 
- .section	".reset_vector_sect",#alloc, #execinstr
-+
-+jumpStart:
-+
- #if defined(MV_88F6082) || defined(MV_88F6183) || defined(DB_88F5181_OLD) || defined(DB_FPGA) || \
- 	defined(MV88F6281) || defined(MV88F6192) || defined(MV88F6180)  || defined(MV_88F6183L) || \
-     defined(MV88F6190)
diff --git a/pkgs/misc/uboot/guruplug-file-systems.patch b/pkgs/misc/uboot/guruplug-file-systems.patch
deleted file mode 100644
index 30dc1994303..00000000000
--- a/pkgs/misc/uboot/guruplug-file-systems.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Add support for the various file systems as found in `sheevaplug.h'.
-As for the SheevaPlug, the increase in size means that the environment
-must be pushed further away.
-
-In addition, increase the malloc area size to allow compilation of UbiFS.
-
---- u-boot/include/configs/guruplug.h	1970-01-01 01:00:01.000000000 +0100
-+++ u-boot/include/configs/guruplug.h	2010-09-29 18:59:52.000000000 +0200
-@@ -123,8 +123,8 @@
-  * it has to be rounded to sector size
-  */
- #define CONFIG_ENV_SIZE			0x20000	/* 128k */
--#define CONFIG_ENV_ADDR			0x40000
--#define CONFIG_ENV_OFFSET		0x40000	/* env starts here */
-+#define CONFIG_ENV_ADDR			0x60000
-+#define CONFIG_ENV_OFFSET		0x60000	/* env starts here */
- 
- /*
-  * Default environment variables
-@@ -145,7 +145,7 @@
- /*
-  * Size of malloc() pool
-  */
--#define CONFIG_SYS_MALLOC_LEN	(1024 * 128) /* 128kB for malloc() */
-+#define CONFIG_SYS_MALLOC_LEN	(1024 * 1024) /* 1 MiB for malloc() */
- /* size in bytes reserved for initial data */
- #define CONFIG_SYS_GBL_DATA_SIZE	128
- 
-@@ -195,4 +195,18 @@
- 
- #define CONFIG_SYS_ALT_MEMTEST
- 
-+/*
-+ * File system
-+ */
-+#define CONFIG_CMD_EXT2
-+#define CONFIG_CMD_FAT
-+#define CONFIG_CMD_JFFS2
-+#define CONFIG_CMD_UBI
-+#define CONFIG_CMD_UBIFS
-+#define CONFIG_RBTREE
-+#define CONFIG_MTD_DEVICE               /* needed for mtdparts commands */
-+#define CONFIG_MTD_PARTITIONS
-+#define CONFIG_CMD_MTDPARTS
-+#define CONFIG_LZO
-+
- #endif /* _CONFIG_GURUPLUG_H */
-
diff --git a/pkgs/misc/uboot/guruplug-usb-msd-multi-lun.patch b/pkgs/misc/uboot/guruplug-usb-msd-multi-lun.patch
deleted file mode 100644
index 4f32dd89031..00000000000
--- a/pkgs/misc/uboot/guruplug-usb-msd-multi-lun.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-The GuruPlug's microSD card reader is a USB mass storage device that
-has two logical units (LUNs), i.e., two "SCSI disks".  This patch
-adds multi-LUN support to the USB MSD driver.
-
-See the thread at .
-
---- u-boot/common/usb_storage.c	1970-01-01 01:00:01.000000000 +0100
-+++ u-boot/common/usb_storage.c	2010-10-02 00:38:15.000000000 +0200
-@@ -204,6 +204,22 @@ int usb_stor_info(void)
- 	return 1;
- }
- 
-+static unsigned int usb_get_max_lun(struct us_data *us)
-+{
-+	int len;
-+	unsigned char result;
-+	len = usb_control_msg(us->pusb_dev,
-+			      usb_rcvctrlpipe(us->pusb_dev, 0),
-+			      US_BBB_GET_MAX_LUN,
-+			      USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_IN,
-+			      0, us->ifnum,
-+			      &result, sizeof(result),
-+			      USB_CNTL_TIMEOUT * 5);
-+	USB_STOR_PRINTF("Get Max LUN -> len = %i, result = %i\n",
-+			len, (int) result);
-+	return (len > 0) ? result : 0;
-+}
-+
- /*******************************************************************************
-  * scan the usb and reports device info
-  * to the user if mode = 1
-@@ -241,13 +257,21 @@ int usb_stor_scan(int mode)
- 			break; /* no more devices avaiable */
- 
- 		if (usb_storage_probe(dev, 0, &usb_stor[usb_max_devs])) {
--			/* ok, it is a storage devices
--			 * get info and fill it in
--			 */
--			if (usb_stor_get_info(dev, &usb_stor[usb_max_devs],
--						&usb_dev_desc[usb_max_devs]) == 1)
-+			/* OK, it's a storage device.  Iterate over its LUNs
-+			 * and populate `usb_dev_desc'.  */
-+			int lun, max_lun, start = usb_max_devs;
-+
-+			max_lun = usb_get_max_lun(&usb_stor[usb_max_devs]);
-+			for (lun = 0;
-+			     lun <= max_lun && usb_max_devs < USB_MAX_STOR_DEV;
-+			     lun++) {
-+				usb_dev_desc[usb_max_devs].lun = lun;
-+				if (usb_stor_get_info(dev, &usb_stor[start],
-+						      &usb_dev_desc[usb_max_devs]) == 1) {
- 				usb_max_devs++;
- 		}
-+			}
-+		}
- 		/* if storage device */
- 		if (usb_max_devs == USB_MAX_STOR_DEV) {
- 			printf("max USB Storage Device reached: %d stopping\n",
-@@ -882,6 +906,7 @@ static int usb_inquiry(ccb *srb, struct 
- 	do {
- 		memset(&srb->cmd[0], 0, 12);
- 		srb->cmd[0] = SCSI_INQUIRY;
-+		srb->cmd[1] = srb->lun << 5;
- 		srb->cmd[4] = 36;
- 		srb->datalen = 36;
- 		srb->cmdlen = 12;
-@@ -905,6 +930,7 @@ static int usb_request_sense(ccb *srb, s
- 	ptr = (char *)srb->pdata;
- 	memset(&srb->cmd[0], 0, 12);
- 	srb->cmd[0] = SCSI_REQ_SENSE;
-+	srb->cmd[1] = srb->lun << 5;
- 	srb->cmd[4] = 18;
- 	srb->datalen = 18;
- 	srb->pdata = &srb->sense_buf[0];
-@@ -924,6 +950,7 @@ static int usb_test_unit_ready(ccb *srb,
- 	do {
- 		memset(&srb->cmd[0], 0, 12);
- 		srb->cmd[0] = SCSI_TST_U_RDY;
-+		srb->cmd[1] = srb->lun << 5;
- 		srb->datalen = 0;
- 		srb->cmdlen = 12;
- 		if (ss->transport(srb, ss) == USB_STOR_TRANSPORT_GOOD)
-@@ -943,6 +970,7 @@ static int usb_read_capacity(ccb *srb, s
- 	do {
- 		memset(&srb->cmd[0], 0, 12);
- 		srb->cmd[0] = SCSI_RD_CAPAC;
-+		srb->cmd[1] = srb->lun << 5;
- 		srb->datalen = 8;
- 		srb->cmdlen = 12;
- 		if (ss->transport(srb, ss) == USB_STOR_TRANSPORT_GOOD)
-@@ -957,6 +985,7 @@ static int usb_read_10(ccb *srb, struct 
- {
- 	memset(&srb->cmd[0], 0, 12);
- 	srb->cmd[0] = SCSI_READ10;
-+	srb->cmd[1] = srb->lun << 5;
- 	srb->cmd[2] = ((unsigned char) (start >> 24)) & 0xff;
- 	srb->cmd[3] = ((unsigned char) (start >> 16)) & 0xff;
- 	srb->cmd[4] = ((unsigned char) (start >> 8)) & 0xff;
-@@ -973,6 +1002,7 @@ static int usb_write_10(ccb *srb, struct
- {
- 	memset(&srb->cmd[0], 0, 12);
- 	srb->cmd[0] = SCSI_WRITE10;
-+	srb->cmd[1] = srb->lun << 5;
- 	srb->cmd[2] = ((unsigned char) (start >> 24)) & 0xff;
- 	srb->cmd[3] = ((unsigned char) (start >> 16)) & 0xff;
- 	srb->cmd[4] = ((unsigned char) (start >> 8)) & 0xff;
diff --git a/pkgs/misc/uboot/guruplug.nix b/pkgs/misc/uboot/guruplug.nix
deleted file mode 100644
index 9f24f1da86a..00000000000
--- a/pkgs/misc/uboot/guruplug.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{stdenv, fetchgit, unzip}:
-
-# Marvell's branch of U-Boot for the GuruPlug.
-
-let
-  # Aug 2010 revision of the `testing' branch of Marvell's U-Boot repository.
-  # See
-  # 
-  # for details.
-  rev = "f106056095049c2c748c2a2797e5353295240e04";
-in
-stdenv.mkDerivation {
-  name = "uboot-guruplug-0.0-pre-${stdenv.lib.strings.substring 0 7 rev}";
-
-  src = fetchgit {
-    url = "git://git.denx.de/u-boot-marvell.git";
-    sha256 = "18gwyj16vml7aja9cyan51jwfcysy4cs062z7wmgdc0l9bha6iw7";
-    inherit rev;
-  };
-
-  patches =
-    [ ./guruplug-file-systems.patch ./guruplug-usb-msd-multi-lun.patch ];
-
-  enableParallelBuilding = true;
-
-  # Remove the cross compiler prefix.
-  configurePhase = ''
-    make mrproper
-    make guruplug_config
-    sed -i /CROSS_COMPILE/d include/config.mk
-  '';
-
-  buildPhase = ''
-    unset src
-    if test -z "$crossConfig"; then
-        make all u-boot.kwb
-    else
-        make all u-boot.kwb ARCH=arm CROSS_COMPILE=$crossConfig-
-    fi
-  '';
-
-  nativeBuildInputs = [ unzip ];
-
-  dontStrip = true;
-
-  installPhase = ''
-    mkdir -p $out
-    cp -v u-boot u-boot.{kwb,map} $out
-
-    mkdir -p $out/bin
-    cp tools/{envcrc,mkimage} $out/bin
-  '';
-
-  meta = {
-    platforms = [ "armv5tel-linux" ];
-  };
-}
diff --git a/pkgs/misc/uboot/rock64.nix b/pkgs/misc/uboot/rock64.nix
new file mode 100644
index 00000000000..623c6015534
--- /dev/null
+++ b/pkgs/misc/uboot/rock64.nix
@@ -0,0 +1,37 @@
+{ lib, buildUBoot, fetchFromGitHub, armTrustedFirmwareRK3328 }: let
+  rkbin = fetchFromGitHub {
+    owner = "ayufan-rock64";
+    repo = "rkbin";
+    rev = "d8b90685b3d93c358936babdd854f1018bc6d35e";
+    sha256 = "0wrh3xa968sdp0j9n692jnv3071ymab719zc56vllba0aaabiaxr";
+  };
+in buildUBoot rec {
+  name = "uboot-${defconfig}-${version}";
+  version = "2018.01";
+
+  src = fetchFromGitHub {
+    owner = "ayufan-rock64";
+    repo = "linux-u-boot";
+    rev = "19e31fac0dee3c4f6b2ea4371e4321f79db0f495";
+    sha256 = "1vmv7q9yafsc0zivd0qdfmf930dvhzkf4a3j6apxxgx9g10wgwrg";
+  };
+
+  extraMakeFlags = [ "BL31=${armTrustedFirmwareRK3328}/bl31.elf" "u-boot.itb" "all" ];
+
+  # So close to being blob free... But U-Boot TPL causes the kernel to hang
+  postBuild = ''
+    ./tools/mkimage -n rk3328 -T rksd -d ${rkbin}/rk33/rk3328_ddr_786MHz_v1.06.bin idbloader.img
+    cat spl/u-boot-spl.bin >> idbloader.img
+    dd if=u-boot.itb of=idbloader.img seek=448 conv=notrunc
+  '';
+
+  defconfig = "rock64-rk3328_defconfig";
+  filesToInstall = [ "spl/u-boot-spl.bin" "tpl/u-boot-tpl.bin" "u-boot.itb" "idbloader.img"];
+
+  extraMeta = with lib; {
+    maintainers = [ maintainers.lopsided98 ];
+    platforms = ["aarch64-linux"];
+    # Because of the TPL blob
+    license = licenses.unfreeRedistributableFirmware;
+  };
+}
diff --git a/pkgs/misc/uboot/sheevaplug.nix b/pkgs/misc/uboot/sheevaplug.nix
deleted file mode 100644
index 53d811d1a44..00000000000
--- a/pkgs/misc/uboot/sheevaplug.nix
+++ /dev/null
@@ -1,61 +0,0 @@
-{stdenv, fetchurl, unzip}:
-
-# We should enable this check once we have the cross target system information
-# assert stdenv.system == "armv5tel-linux" || crossConfig == "armv5tel-linux";
-
-# All this file is made for the Marvell Sheevaplug
-   
-stdenv.mkDerivation {
-  name = "uboot-sheevaplug-3.4.27";
-   
-  src = fetchurl {
-    url = "ftp://ftp.denx.de/pub/u-boot/u-boot-1.1.4.tar.bz2";
-    sha256 = "19vp4rlikz7h72pqsjhgz7nmgjy4c6vabvxkw67wni70vy5ddy8s";
-  };
-
-  srcAddon = fetchurl {
-    url = "http://www.plugcomputer.org/405/us/plug-basic/uboot/u-boot-3.4.27.zip";
-    sha256 = "1wqxznpdb6d2kx58gral4q0mg5ddxyrv7az8c6v29nr3cd9yrfsg";
-  };
-
-  postUnpack = ''
-    mv u-boot-1.1.4 u-boot-3.4.27
-    unzip -o $srcAddon
-    sourceRoot=u-boot-3.4.27
-  '';
-
-  patches = [ ./gas220.patch ];
-
-  # Remove the cross compiler prefix, and add reiserfs support
-  configurePhase = ''
-    make mrproper
-    make rd88f6281Sheevaplug_config NBOOT=1 LE=1
-    sed -i /CROSS_COMPILE/d include/config.mk
-  '';
-
-  buildPhase = ''
-    unset src
-    if test -z "$crossConfig"; then
-        make clean all
-    else
-        make clean all ARCH=arm CROSS_COMPILE=$crossConfig-
-    fi
-  '';
-
-  nativeBuildInputs = [ unzip ];
-
-  dontStrip = true;
-
-  installPhase = ''
-    mkdir -p $out
-    cp u-boot-rd88f6281Sheevaplug_400db_nand.bin $out
-    cp u-boot u-boot.map $out
-
-    mkdir -p $out/bin
-    cp tools/{envcrc,mkimage} $out/bin
-  '';
-
-  meta = {
-    platforms = [ "armv5tel-linux" ];
-  };
-}
diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 78aed2aa833..f8e865fbf3b 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -1,8 +1,8 @@
 # TODO check that no license information gets lost
 { fetchurl, stdenv, python, go, cmake, vim, vimUtils, perl, ruby, unzip
-, which, fetchgit, llvmPackages
+, which, fetchgit, llvmPackages, rustPlatform
 , xkb_switch, rustracerd, fzf, skim
-, python3, boost, icu
+, python3, boost, icu, ncurses
 , ycmd, makeWrapper, rake
 , pythonPackages, python3Packages
 , substituteAll
@@ -58,6 +58,7 @@ rec {
   YouCompleteMe       = youcompleteme;
   airline             = vim-airline;
   alternative         = a-vim; # backwards compat, added 2014-10-21
+  bats                = bats-vim;
   calendar            = calendar-vim;
   coffee-script       = vim-coffee-script;
   coffeeScript        = coffee-script; # backwards compat, added 2014-10-18
@@ -148,6 +149,31 @@ rec {
     dependencies = [];
   };
 
+  LanguageClient-neovim = let
+    LanguageClient-neovim-src = fetchgit {
+      url = "https://github.com/autozimu/LanguageClient-neovim";
+      rev = "fbc46862af7fa254f74f1108149fd0669c46f1ad";
+      sha256 = "1wrrmikriyw8an8hn7240igcaca9a0ykh1j0dfy45kslxkmqkk3r";
+    };
+    LanguageClient-neovim-bin = rustPlatform.buildRustPackage {
+      name = "LanguageClient-neovim-bin";
+      src = LanguageClient-neovim-src;
+
+      cargoSha256 = "0c2sklpvab63a1f1mhcq9abq5m2srkj52ypq7dq44g8ngn2a05ka";
+    };
+  in buildVimPluginFrom2Nix {
+    name = "LanguageClient-neovim-2018-03-06";
+    src = LanguageClient-neovim-src;
+
+    dependencies = [];
+    propogatedBuildInputs = [ LanguageClient-neovim-bin ];
+
+    preFixup = ''
+      substituteInPlace "$out"/share/vim-plugins/LanguageClient-neovim/plugin/LanguageClient.vim \
+        --replace "let l:command = [s:root . '/bin/languageclient']" "let l:command = ['${LanguageClient-neovim-bin}/bin/languageclient']"
+    '';
+  };
+
   # --- generated packages bellow this line ---
 
   CSApprox = buildVimPluginFrom2Nix { # created by nix#NixDerivation
@@ -173,11 +199,11 @@ rec {
   };
 
   Cosco = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Cosco-2017-07-26";
+    name = "Cosco-2018-02-15";
     src = fetchgit {
       url = "git://github.com/lfilho/cosco.vim";
-      rev = "4a2a080415860196c936a32679d9032f41ba21e4";
-      sha256 = "0gljxy6shr7kmm8vvj6rm4c0lr0ydbny9lrsp64c3d4d0b2wnmig";
+      rev = "434dc68b93b8f42babe1887a269145ce39c97edf";
+      sha256 = "1ng91nkkd9rgyihp4dvzrj7drm31d9r2vx4id1n8v6gc1rx3qasv";
     };
     dependencies = [];
 
@@ -195,11 +221,11 @@ rec {
   };
 
   Hoogle = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Hoogle-2017-11-04";
+    name = "Hoogle-2018-03-04";
     src = fetchgit {
       url = "git://github.com/Twinside/vim-hoogle";
-      rev = "14256fa4f482bb40f55311a6d8037103549c7844";
-      sha256 = "1dhfy9s6q11cb424x595anj17sgsqywdyrcw3ynmk3949iiwaqhb";
+      rev = "871d104c92e33cb238506f2805f1652561978cc8";
+      sha256 = "17qvi57g72ijgk7nczczli3kcphvdf625fzqbqcmqpsawgvfd07n";
     };
     dependencies = [];
 
@@ -228,22 +254,22 @@ rec {
   };
 
   Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Syntastic-2018-01-12";
+    name = "Syntastic-2018-02-20";
     src = fetchgit {
       url = "git://github.com/scrooloose/syntastic";
-      rev = "937d77d1f3ba8de08ad275e052e38d0e680a175b";
-      sha256 = "10qrq1fs53srp4inxmcm8zq5kjdl56hh1lwh2jhda9mfwrbhg3fp";
+      rev = "b7b473b2688827dcd7d8c801197b8bfc31b20dc4";
+      sha256 = "11nwzgb5s75z348px81mmxh681rs25ccls9x5z8f36i7ykq46j1x";
     };
     dependencies = [];
 
   };
 
   SyntaxRange = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "SyntaxRange-2017-07-03";
+    name = "SyntaxRange-2018-03-09";
     src = fetchgit {
       url = "git://github.com/inkarkat/vim-SyntaxRange";
-      rev = "213cfda0a0f11505665dbfe1e58c803f498761a6";
-      sha256 = "1dg9n3zll3a79lv96kdlxxs141binb8w79zdisj7djxc5y2k48qs";
+      rev = "dc33d8f84ebbf4c9fa03ce00b8adeb83e05249d3";
+      sha256 = "0nf0hkgl5fm0laxb5253br894259kz33zyiwxzrry6w3108alasr";
     };
     dependencies = [];
 
@@ -261,33 +287,33 @@ rec {
   };
 
   Tagbar = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Tagbar-2017-12-03";
+    name = "Tagbar-2017-12-17";
     src = fetchgit {
       url = "git://github.com/majutsushi/tagbar";
-      rev = "c004652797185121bbf264138d57eb2a0199b6db";
-      sha256 = "0aj319iz3g9b1xs8g2k7ikjhjy6y94i0hyk0a9km7swglairld06";
+      rev = "387bbadda98e1376ff3871aa461b1f0abd4ece70";
+      sha256 = "0srmslg0v1a7zhzz0wgzgv7jyr0j3q9m766qzb7zimkkb32fcbx9";
     };
     dependencies = [];
 
   };
 
   The_NERD_Commenter = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "The_NERD_Commenter-2017-11-07";
+    name = "The_NERD_Commenter-2018-03-03";
     src = fetchgit {
       url = "git://github.com/scrooloose/nerdcommenter";
-      rev = "fd61bc71f64c8accf86f06c633fd19b205efa85b";
-      sha256 = "07196j5bp3k4ckapyrp3366h0nyvqq5r26hqqihgfa62s1n8rjsl";
+      rev = "e679d8a34193d1ac93b98ed792cdde7c9b1104a1";
+      sha256 = "0if71mcrc7cm8xr4m2zjcm2k4wkfhxyh6phfc0k13s8h392wb7v4";
     };
     dependencies = [];
 
   };
 
   The_NERD_tree = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "The_NERD_tree-2017-12-06";
+    name = "The_NERD_tree-2018-03-06";
     src = fetchgit {
       url = "git://github.com/scrooloose/nerdtree";
-      rev = "8cbea5109e8c7ed682da25bb488267d781db0bd4";
-      sha256 = "0n4shpdl33yghkqk0vllrmmb74dflf39liyclkbpqmcymx9rw2qj";
+      rev = "ed446e5cbe0733a8f98befc88d33e42edebb67d2";
+      sha256 = "0i5qy8lb8w5ri30905i7411754g2vzj4jlccak5lj852vyzgdp56";
     };
     dependencies = [];
 
@@ -305,22 +331,22 @@ rec {
   };
 
   VimOutliner = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "VimOutliner-2017-08-02";
+    name = "VimOutliner-2018-02-17";
     src = fetchgit {
       url = "git://github.com/vimoutliner/vimoutliner";
-      rev = "c13141d604959d84225c3a53dc4b0ef5ae8b2bfe";
-      sha256 = "1bg45cnpvnk2k7r6l2n3sz0cw2lhrglphak10yp11yqf4q1rxl7x";
+      rev = "ec4dc9bd932a0cce476a3f8f0a78ca61ff94188c";
+      sha256 = "0fj3ya7n9wfbnkcdwp9kggm8c3p5jm3iwzbk4gdqjmhqkvdfz5rk";
     };
     dependencies = [];
 
   };
 
   WebAPI = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "WebAPI-2017-04-26";
+    name = "WebAPI-2018-02-08";
     src = fetchgit {
       url = "git://github.com/mattn/webapi-vim";
-      rev = "e76f2da9a8f292a999a95ae688534f76c2dca9bd";
-      sha256 = "02970g7blj478vid88gayba39rdcm9236nigkrijapyf5rd24zhh";
+      rev = "6459fbdd7fd38c4630fb49e9c687946633b58849";
+      sha256 = "0ndskj9rw526kgl1y645w1gqmsdw3268ps1armccadjj9d8flkdi";
     };
     dependencies = [];
 
@@ -354,11 +380,11 @@ rec {
   };
 
   clang_complete = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "clang_complete-2017-09-25";
+    name = "clang_complete-2018-01-18";
     src = fetchgit {
       url = "git://github.com/Rip-Rip/clang_complete";
-      rev = "fb8f4f25ab808bc83bc7c704f23171cb6b020737";
-      sha256 = "0y80ds4l5gqqdm56ymkgsfpizpx96kzrr0ivx29q7ahd4ry847xa";
+      rev = "0918788ea0b9dc4c753ffd162c95f890ae57a275";
+      sha256 = "19hf7xrx1lsvn5rhwmc0qc1qzpb365j1d0jzvihd99p0zkgzgj1p";
     };
     dependencies = [];
     # In addition to the arguments you pass to your compiler, you also need to
@@ -455,12 +481,23 @@ rec {
 
   };
 
+  forms = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "forms-2012-11-28";
+    src = fetchgit {
+      url = "git://github.com/megaannum/forms";
+      rev = "b601e03fe0a3b8a43766231f4a6217e4492b4f75";
+      sha256 = "19kp1i5c6jmnpbsap9giayqbzlv7vh02mp4mjvicqj9n0nfyay74";
+    };
+    dependencies = ["self"];
+
+  };
+
   fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "fugitive-2017-12-16";
+    name = "fugitive-2018-01-25";
     src = fetchgit {
       url = "git://github.com/tpope/vim-fugitive";
-      rev = "f3ccb0c12ee4985b8808f83059830a24cc92821c";
-      sha256 = "1ry67wi5dci4jy54jyf3lsf0yq13a42z9w5qh39rwv5w9wiab2fb";
+      rev = "b82abd5bd583cfb90be63ae12adc36a84577bd45";
+      sha256 = "0y3fkw7f5gqb339qlby19f444085c929gjbmbibmgig7hrarqrz4";
     };
     dependencies = [];
 
@@ -489,11 +526,11 @@ rec {
   };
 
   vim-autoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-autoformat-2017-12-06";
+    name = "vim-autoformat-2018-03-02";
     src = fetchgit {
       url = "https://github.com/Chiel92/vim-autoformat";
-      rev = "27f0e48a9b60ab8a45178d6104fa819a99ead2ee";
-      sha256 = "0na5qwgpafnxz7lbscs9y0ffbd01b1ab2q1kqrr78a3gqz37ga0s";
+      rev = "e63b4e957ad034494b1495d4b4ac1a18503cba79";
+      sha256 = "1p64q9a7wqppy1zj70xki86zs5wwxbf9x0wdd4fsg0w741ga9wdf";
     };
     dependencies = [];
 
@@ -511,22 +548,22 @@ rec {
   };
 
   tsuquyomi = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "tsuquyomi-2017-11-10";
+    name = "tsuquyomi-2018-03-02";
     src = fetchgit {
       url = "https://github.com/Quramy/tsuquyomi";
-      rev = "8a647de888e1d823718f717d47678a97b5012196";
-      sha256 = "0zvcr15g6m17736a7nwr9aa7c3sd25ad39v7dban0jiz6asd7nn1";
+      rev = "064f5a2ccaf642681634cf06b8ce45751e1d0475";
+      sha256 = "12pik378p5c2w219yg8pb8lrdkhxvk0mvkji9dhh0h5v9yzk5x4z";
     };
     dependencies = [];
 
   };
 
   deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "deoplete-nvim-2018-01-14";
+    name = "deoplete-nvim-2018-02-28";
     src = fetchgit {
       url = "https://github.com/Shougo/deoplete.nvim";
-      rev = "b164eb8c36ddbb8835434e013358de29b9c8f1f2";
-      sha256 = "0k3zmpdlg4y4f0y3pgfcqmglrrs1iagw8iaaz131nyswz0m2pf6x";
+      rev = "642f9e9b0ed9457734d974aeb9417192077b7551";
+      sha256 = "1si07fw1ckgdl74xx0bq6hhd0nyi67gkjanqz4v317zpmzhcvi76";
     };
     dependencies = [];
 
@@ -555,11 +592,11 @@ rec {
   };
 
   vim-closetag = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-closetag-2017-11-01";
+    name = "vim-closetag-2018-03-09";
     src = fetchgit {
       url = "https://github.com/alvan/vim-closetag";
-      rev = "277e21d04c417112da6ecd3485373c6d3ff93b90";
-      sha256 = "1wx9qqas0gd301pn9zabbl4b9v41i1hwbnd8fyy8kxxf0cbpdwaf";
+      rev = "aa14c2c1e7da4112e46ef6b287cacdd7af96da6f";
+      sha256 = "058z8dzqki3idv7r5654xd91wplhhnsa2l533rszmkzji3hj2why";
     };
     dependencies = [];
 
@@ -588,22 +625,11 @@ rec {
   };
 
   vim-css-color = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-css-color-2017-11-03";
+    name = "vim-css-color-2018-03-06";
     src = fetchgit {
       url = "https://github.com/ap/vim-css-color";
-      rev = "fcf5829daa7817994fb856dbaa905e6fd8beb50c";
-      sha256 = "1a617ji11395zimqjgpcq2qciyjzq5ixm85vc8rkj8jda0qgm91c";
-    };
-    dependencies = [];
-
-  };
-
-  LanguageClient-neovim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "LanguageClient-neovim-2017-12-05";
-    src = fetchgit {
-      url = "https://github.com/autozimu/LanguageClient-neovim";
-      rev = "eac16849eb5cb5592cf043fa222282a7082f257b";
-      sha256 = "07j7zm8xbvsanr9ghwxaw88m0kfr0ih262g299n5rr972s93wpg6";
+      rev = "afaacf50e65b7d30b170e70ee13c1518dce1e032";
+      sha256 = "1ck8qv3wfmc7rdddzd7zh2dsnb0rx69grmc0laz7n1358xg0i4vx";
     };
     dependencies = [];
 
@@ -621,11 +647,11 @@ rec {
   };
 
   clighter8 = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "clighter8-2017-11-30";
+    name = "clighter8-2018-01-24";
     src = fetchgit {
       url = "https://github.com/bbchung/clighter8";
-      rev = "909f2162a3dfa3d4089533e42af01b4411ef6a78";
-      sha256 = "0hi1v8ww4yzwpdr25zzdr4ccwvs5d3pa02gj5y6qfc5ddz1krdml";
+      rev = "314ab6887cfe785146b86d754441904a927f7999";
+      sha256 = "1j2lfx10r978348nycw5mpg2ahwiqcgqml2g2vps5yy9x891fzya";
     };
     dependencies = [];
     preFixup = ''
@@ -635,11 +661,11 @@ rec {
   };
 
   neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neomake-2017-12-06";
+    name = "neomake-2018-03-07";
     src = fetchgit {
       url = "https://github.com/benekastah/neomake";
-      rev = "22bcbd560820d387b61ae285b1d1a74f338e3e13";
-      sha256 = "1hp99fpbvi72m51m2ivn4rg64awlr9zqkvhjh99rl7ax8y0zw8ap";
+      rev = "666e20797f8e8c9d2fdab906d313a5b9714543f0";
+      sha256 = "0wx82bal16jfq1kk2rxrpl79brqfhpdmwbx55wggh7rc893ll4v4";
     };
     dependencies = [];
 
@@ -668,11 +694,11 @@ rec {
   };
 
   vim-toml = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-toml-2017-12-10";
+    name = "vim-toml-2018-03-06";
     src = fetchgit {
       url = "https://github.com/cespare/vim-toml";
-      rev = "b531aac0d45aaa373070c4cc30d7ead91960f5a7";
-      sha256 = "14g3zvyfvhilr5ka3jhja4jxjn99957sk6hlv13yfkg349f57dvg";
+      rev = "624f02475080ea26d9430b8d31d7c3199b0ec939";
+      sha256 = "0frjdv50rhd3awrddq25x4l22ca15i5587pgcmvwxz92y52484lx";
     };
     dependencies = [];
 
@@ -712,11 +738,11 @@ rec {
   };
 
   vim-sort-motion = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-sort-motion-2017-10-03";
+    name = "vim-sort-motion-2018-03-05";
     src = fetchgit {
       url = "https://github.com/christoomey/vim-sort-motion";
-      rev = "7384f20d829b4abde28ced40975f0beb319dce27";
-      sha256 = "1x4hxa7dijb5g7vmrbgs2zi8aiqc759ljmh8qqwk6lafc016plnj";
+      rev = "b4455cea401c86d189e84c4dda55f18d8a4a67d4";
+      sha256 = "0cav0l152qy8fvhwpcdr7lddf0jnjkjw6hnjrmmpvikxj7rq2yik";
     };
     dependencies = [];
 
@@ -745,11 +771,11 @@ rec {
   };
 
   ctrlp-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ctrlp-vim-2017-08-30";
+    name = "ctrlp-vim-2018-02-10";
     src = fetchgit {
       url = "https://github.com/ctrlpvim/ctrlp.vim";
-      rev = "bde7a2950adaa82e894d7bdf69e3e7383e40d229";
-      sha256 = "19q3cfs3rd3q1xfhyz55r1c3750nrjvwz7jxnhqqn751zgimnsyl";
+      rev = "35c9b961c916e4370f97cb74a0ba57435a3dbc25";
+      sha256 = "08g1w7lfxpp0b175fkyyb8njpz7jwysfba0s20873f2frj6c77rc";
     };
     dependencies = [];
 
@@ -800,11 +826,11 @@ rec {
   };
 
   vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-2017-05-24";
+    name = "vim-2018-03-11";
     src = fetchgit {
       url = "https://github.com/dracula/vim";
-      rev = "6a5bf34193927c70b6c21dcbe1c130d2ab0951d6";
-      sha256 = "1mmqrc52k133ddpxcs0mxjph4n4b856r5wbs17bgcpk95cfbspb1";
+      rev = "1f44625290f0f1488f7056e166f69ee6f171d273";
+      sha256 = "0xs5mbqgs5nvymiiwgbycb278v9mmjm3pxybqlyg5r09ri6ncfkq";
     };
     dependencies = [];
 
@@ -866,11 +892,11 @@ rec {
   };
 
   vim-elixir = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-elixir-2018-02-01";
+    name = "vim-elixir-2018-02-28";
     src = fetchgit {
       url = "https://github.com/elixir-lang/vim-elixir";
-      rev = "8ca41c1f02208dd5ca68c7bcb6c71b3b92f46af6";
-      sha256 = "0dp9cqflbwc3h1hzgn9fyaxhcn6q9bclgfy9kkgywp8zk5kwzb7p";
+      rev = "bd75abb934c97a3d6d753f019e0f3aef3c132c2e";
+      sha256 = "1qic3av5avf50dvxkz1iq98impdabflk64xj5wmzr9iag1p0qwz9";
     };
     dependencies = [];
 
@@ -899,11 +925,11 @@ rec {
   };
 
   vim-localvimrc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-localvimrc-2018-01-04";
+    name = "vim-localvimrc-2018-03-04";
     src = fetchgit {
       url = "https://github.com/embear/vim-localvimrc";
-      rev = "b915ce29c619fb367ed41d4c95d57eaaaed31b39";
-      sha256 = "13bc3davmw2pms663yniiha8bayzy1m08xjhyrnlqqb2dz77m5gy";
+      rev = "632d27c6c29bb2f05131c4bd2c804b9bf6068d57";
+      sha256 = "1xj9qvpvhzi31wj0wp0i67j233vzaj3zpplpacszki31bsai263f";
     };
     dependencies = [];
 
@@ -943,11 +969,11 @@ rec {
   };
 
   vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-go-2017-12-06";
+    name = "vim-go-2018-03-07";
     src = fetchgit {
       url = "https://github.com/fatih/vim-go";
-      rev = "7f4673573d67aacec0ac35d37eb3123abe4fcf70";
-      sha256 = "074097m1xd7j97zkkhrkfnj8d4ndms20gp8zas2vha1h48yy5a70";
+      rev = "d2b0a234ffb5441a3488c78fe8e5f551ddbdd454";
+      sha256 = "1qcy1w9p23gxrii4ddg6mn8kn4i9d0q3rmkrblvxhbk7snxbh7n8";
     };
     dependencies = [];
 
@@ -976,11 +1002,11 @@ rec {
   };
 
   psc-ide-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "psc-ide-vim-2017-10-24";
+    name = "psc-ide-vim-2018-03-11";
     src = fetchgit {
       url = "https://github.com/frigoeu/psc-ide-vim";
-      rev = "23bf302de91181d409fb988ce372ab703b119bc5";
-      sha256 = "1yjnc6173zdxbcbszrv7184rk5jax6d187c1klsm8b6lx4j1jv4d";
+      rev = "6d4a3cc27e9782b703f6dd61ef5fdf27054bac0f";
+      sha256 = "19w0cvrka3klxbh9z1yq873v92rhmxdj68bdnqxzwybf24hgsk9g";
     };
     dependencies = [];
 
@@ -1008,12 +1034,34 @@ rec {
 
   };
 
+  vim-maktaba = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-maktaba-2017-12-29";
+    src = fetchgit {
+      url = "https://github.com/google/vim-maktaba";
+      rev = "6e3be879bcf2d4e3c5bb56653e5eda9e08b84982";
+      sha256 = "1nbpn6pcphrakd4icl24l4a68hjcq4a0aaq6kdwrvlsd1c3lk4dm";
+    };
+    dependencies = [];
+
+  };
+
+  gitv = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "gitv-2017-11-26";
+    src = fetchgit {
+      url = "https://github.com/gregsexton/gitv";
+      rev = "4b7ecf354726a3d31d0ad9090efd27a79c850a35";
+      sha256 = "0n2ddq0kicl2xjrhxi5pqvpikxa7vbf0hp3lzwmpapmvx146wi3w";
+    };
+    dependencies = ["fugitive"];
+
+  };
+
   vim-jsdoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-jsdoc-2017-02-11";
+    name = "vim-jsdoc-2017-12-18";
     src = fetchgit {
       url = "https://github.com/heavenshell/vim-jsdoc";
-      rev = "cd8f084c3b4bd198620d45a007cee6b009b57b35";
-      sha256 = "0a2d9jwxjws8l7y89yn7xl07r5yh7r7987a8hfalvz12qmdmff1j";
+      rev = "a164cb4c14b9063e82b6ccba96b4bc8b3a6d8f73";
+      sha256 = "0f4hj2vd4l4rprizkg64q6dmm86f5yc9gk554a6f4kpagw2w9y76";
     };
     dependencies = [];
 
@@ -1042,22 +1090,22 @@ rec {
   };
 
   calendar-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "calendar-vim-2017-07-08";
+    name = "calendar-vim-2017-12-14";
     src = fetchgit {
       url = "https://github.com/itchyny/calendar.vim";
-      rev = "6d6be26b2ad1870658525e2a42046429c845516c";
-      sha256 = "0g4k7vn3r8y0ss0nl6apxgpkdi7ixi87a9g5xr66n70lxyn7m9pz";
+      rev = "25009a8eeae8ecca0c0d74f06f62ad82d2557c1c";
+      sha256 = "0kswc92frzsgsd2qzajxdndkyd2yxh8gmcxib5a3by8sg27qvi8p";
     };
     dependencies = [];
 
   };
 
   lightline-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "lightline-vim-2017-12-05";
+    name = "lightline-vim-2018-01-31";
     src = fetchgit {
       url = "https://github.com/itchyny/lightline.vim";
-      rev = "b19faca129f7921766c0a32a7c378dc89a61e590";
-      sha256 = "1sif7wspivpakm4nlhsq1v93s6s18q5kx8s5zqq97chhv626l8c7";
+      rev = "78c43c144643e49c529a93b9eaa4eda12614f923";
+      sha256 = "1g1s8bi6pzjc9kbqd1mn1d2ym6c90xf22dv2wfli0nyp6dsja2v2";
     };
     dependencies = [];
 
@@ -1097,11 +1145,11 @@ rec {
   };
 
   vim-test-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-test-git-2018-01-16";
+    name = "vim-test-git-2018-03-08";
     src = fetchgit {
       url = "https://github.com/janko-m/vim-test.git";
-      rev = "731ad6942f9449d2ed22f6d9ccc8d1ce613b1f19";
-      sha256 = "14xwsc23zmkfl6ydvqiqf7l0gn5nxqdm62rvgiky5j5ii9iqj3hr";
+      rev = "3760d79934bb95c782611601187067730e108a26";
+      sha256 = "06l4h66vzk4h628q45g3z529m3db28d5qfiabwr6l6x9sph5ha82";
     };
     dependencies = [];
 
@@ -1218,11 +1266,11 @@ rec {
   };
 
   fzf-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "fzf-vim-2018-01-09";
+    name = "fzf-vim-2018-03-09";
     src = fetchgit {
       url = "https://github.com/junegunn/fzf.vim";
-      rev = "c0a5fee7071ed89602b9b59fb67e83d6cd23addc";
-      sha256 = "0biqq9g116zziv9k0axgn8wasgwb57fwaxwjj8vsajrmq5phdl4z";
+      rev = "a362bc58f1fbbfbbbef749851006e46155979c7d";
+      sha256 = "187d7aw5g7nr6cg5la86kdplb32zy58w1mfm3npb47qm9sydgql6";
     };
     dependencies = [];
 
@@ -1261,23 +1309,12 @@ rec {
 
   };
 
-  vim-clang = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-clang-2016-10-17";
-    src = fetchgit {
-      url = "https://github.com/justmao945/vim-clang";
-      rev = "0076e0c64baa71c1c1f404e6a500e45190cdad5c";
-      sha256 = "04fbmlrvgl278hlrnhlxppy1dz5fdilj9rzrc1vvxrw9ih3knvr3";
-    };
-    dependencies = [];
-
-  };
-
   vim-niceblock = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-niceblock-2015-08-22";
+    name = "vim-niceblock-2018-01-30";
     src = fetchgit {
       url = "https://github.com/kana/vim-niceblock";
-      rev = "03c59f648fcadd415fc91d7b100cf48bd0a55fac";
-      sha256 = "05p3xr61v3infi07r9ahr30190kamgdjxkjjlawbqnrn8pv9fws4";
+      rev = "178629a8b81da2fa614bd6c19e7797e325ee9153";
+      sha256 = "1bz8qjnwk3gz9h0194g3qqga91i4k78r9s1xymn2fv35llrfsdx0";
     };
     dependencies = [];
 
@@ -1305,17 +1342,6 @@ rec {
 
   };
 
-  vim-textobj-user = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-textobj-user-2017-09-28";
-    src = fetchgit {
-      url = "https://github.com/kana/vim-textobj-user";
-      rev = "e231b65797b5765b3ee862d71077e9bd56f3ca3e";
-      sha256 = "0zsgr2cn8s42d7jllnxw2cvqkl27lc921d1mkph7ny7jgnghaay9";
-    };
-    dependencies = [];
-
-  };
-
   latex-box = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "latex-box-2015-06-01";
     src = fetchgit {
@@ -1328,11 +1354,11 @@ rec {
   };
 
   typescript-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "typescript-vim-2017-10-24";
+    name = "typescript-vim-2018-03-08";
     src = fetchgit {
       url = "https://github.com/leafgarland/typescript-vim";
-      rev = "fbd0e9e508535f7d89778f7280dc76505348dcc6";
-      sha256 = "1psxdkr35m1x6lpsrn2v482sn9n4pysw1i0j9nr1g7r4nh1058fk";
+      rev = "e25636b44211a4be7b089bfed7cf09aa7dd086f5";
+      sha256 = "1i422j4za5xwcv3zz7cjw523nnh5q652c04phqp681lgdmgqszh4";
     };
     dependencies = [];
 
@@ -1350,11 +1376,11 @@ rec {
   };
 
   vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimtex-2017-12-07";
+    name = "vimtex-2018-03-10";
     src = fetchgit {
       url = "https://github.com/lervag/vimtex";
-      rev = "9851656a0c280d394f8e0f0fac61988613ea392e";
-      sha256 = "1mwhj6nk00srlmvsdbpcnqcpwsr87ciwzxgdr1v489bb8l4rw9na";
+      rev = "38a434a38a11d10da43dea1aac8f1143404c3eaf";
+      sha256 = "0hz807i3byhrvbv98rl8k4r3n6dyninaqlr1kga95dllg6xr0k5p";
     };
     dependencies = [];
 
@@ -1409,38 +1435,27 @@ rec {
   };
 
   vim-highlightedyank = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-highlightedyank-2017-12-06";
+    name = "vim-highlightedyank-2018-03-08";
     src = fetchgit {
       url = "https://github.com/machakann/vim-highlightedyank";
-      rev = "7e072d62e79b68a548dfd0c18f7b739dca4cae74";
-      sha256 = "1kkngy28nlbyb4dz010hjb8dxih1zlzwsr0yjkhqyvpz0k5vvyq9";
+      rev = "775326f9cf63098a347cea842bb6069590771371";
+      sha256 = "1414acj3ma7iydkr8vgysblmbcizflm9ivwhikanj1klyj0jm2rl";
     };
     dependencies = [];
 
   };
 
   Jenkinsfile-vim-syntax = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Jenkinsfile-vim-syntax-2017-08-29";
+    name = "Jenkinsfile-vim-syntax-2018-03-05";
     src = fetchgit {
       url = "https://github.com/martinda/Jenkinsfile-vim-syntax";
-      rev = "e3d2e19ad1c8f79872380901c0392c2671757831";
-      sha256 = "18bfyjsxgqg562n8kkcnyd05pp17ipap7ray9az92fapzhw5q4x9";
+      rev = "6d8957428ef53620f00c1ec74d08712f41515085";
+      sha256 = "1pn33lvv5cls45vd8g1cm2fi0cm1lzwnsqcacgxcv67l25mg5979";
     };
     dependencies = [];
 
   };
 
-  forms = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "forms-2012-11-28";
-    src = fetchgit {
-      url = "https://github.com/megaannum/forms";
-      rev = "b601e03fe0a3b8a43766231f4a6217e4492b4f75";
-      sha256 = "19kp1i5c6jmnpbsap9giayqbzlv7vh02mp4mjvicqj9n0nfyay74";
-    };
-    dependencies = ["self"];
-
-  };
-
   self = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "self-2014-05-28";
     src = fetchgit {
@@ -1464,22 +1479,22 @@ rec {
   };
 
   vim-grepper-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-grepper-git-2018-01-16";
+    name = "vim-grepper-git-2018-03-06";
     src = fetchgit {
       url = "https://github.com/mhinz/vim-grepper.git";
-      rev = "4fd6260c56ffa0642095143f802d1cbfceb7437d";
-      sha256 = "11rhj6m85hxd4kf8yms4mab8553dcgl0yxm9r7nhdqpz6mljsir9";
+      rev = "46d78f293b12d8ba743f68ce4fb69881a64d30b2";
+      sha256 = "19pbsv8i58r2z5a2yvn8f8v7gjz82nn8mw0hhfzwg5nlj0nn5kx3";
     };
     dependencies = [];
 
   };
 
   vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-startify-2017-12-20";
+    name = "vim-startify-2018-02-28";
     src = fetchgit {
       url = "https://github.com/mhinz/vim-startify";
-      rev = "5e476d8e00da70bc33c54a174fd8cb18ed991868";
-      sha256 = "07k7ddjqc2jisk0sh9k8w6r5xhh47cbzbxdnbkjz7bdskkwsdsay";
+      rev = "226cafe0a0e42339919577c7388f7acdc554127b";
+      sha256 = "1w6ycxha9mcrf5q9f5zr627fg70gmabbd5b4yd8pnhbrsfjyvrf8";
     };
     dependencies = [];
 
@@ -1497,11 +1512,11 @@ rec {
   };
 
   ack-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ack-vim-2017-11-05";
+    name = "ack-vim-2018-02-28";
     src = fetchgit {
       url = "https://github.com/mileszs/ack.vim";
-      rev = "6e04746a63dd2453601ae36c83d53fe2021a45f4";
-      sha256 = "0453ghmaaqwv6z8a3sncd3jxs9j050sp9ymiw2aqpc1a28kdlrv8";
+      rev = "36e40f9ec91bdbf6f1adf408522a73a6925c3042";
+      sha256 = "0yppr89hd1jyp0pj56hxdjbn32sr7pj3mihd18wxispvl5dqd6fm";
     };
     dependencies = [];
 
@@ -1566,22 +1581,22 @@ rec {
   };
 
   haskell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "haskell-vim-2017-10-16";
+    name = "haskell-vim-2018-01-25";
     src = fetchgit {
       url = "https://github.com/neovimhaskell/haskell-vim";
-      rev = "d877d5cd5f2f5747fa835d4b639499187fa4ae9e";
-      sha256 = "16iihz0jy61s5dyzzf5dbvd6ii1zna98pckqkjlpxcqqx636sm5c";
+      rev = "430b529224c5f9ae53b148f814b7b1fc82b8b525";
+      sha256 = "15z259b9b3wbklc8rndsq2rlhgccvxhfgd76yy80jqjmfmzib8kg";
     };
     dependencies = [];
 
   };
 
   cpsm = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "cpsm-2017-10-30";
+    name = "cpsm-2018-02-01";
     src = fetchgit {
       url = "https://github.com/nixprime/cpsm";
-      rev = "3744240ca48f98eea064f3cbc1a62b3f25f44030";
-      sha256 = "0x5jac7x85bqdh38vggi1fvxjw2z29b2227n471f3cxy8arvylrw";
+      rev = "8a4a0a05162762b857b656d51b59a5bf01850877";
+      sha256 = "0v44gf9ygrqc6rpfpiq329jija4icy0iy240yk30c0r04mjahc0b";
     };
     dependencies = [];
     buildInputs = [
@@ -1590,6 +1605,7 @@ rec {
       cmake
       boost
       icu
+      ncurses
     ];
     buildPhase = ''
       patchShebangs .
@@ -1632,22 +1648,22 @@ rec {
   };
 
   vim-markdown = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-markdown-2017-05-10";
+    name = "vim-markdown-2018-01-20";
     src = fetchgit {
       url = "https://github.com/plasticboy/vim-markdown";
-      rev = "3fcde7215e22913f004c2836fd46ff61746be6db";
-      sha256 = "0ymbs7235zi5hwyzc0vaikb3n6jwj6xarmgjj4lpf4wbsa1212yy";
+      rev = "861e84fc0bc97be8387e92ac2fc180599dc2b5a3";
+      sha256 = "1lfcl6rsjqyzny5rvipm1wd4qxnv96ff8anjaba0rv4m7b99yv6z";
     };
     dependencies = [];
 
   };
 
   python-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "python-mode-2017-12-01";
+    name = "python-mode-2018-02-19";
     src = fetchgit {
       url = "https://github.com/python-mode/python-mode";
-      rev = "2ae7a2323d7632eaa5fc5170c287608ecf8d25c5";
-      sha256 = "1qd7akvqlmrcxiknv1fxqb37vimlicidibxzc4jm9i05cvk1z68p";
+      rev = "d5e7be11a74e8bda57388415d07d0faa0bcf9c5c";
+      sha256 = "13863z80dwzmyi2adjc3hywqqd14w43nkhzy7lqarqiv7ks207kv";
     };
     dependencies = [];
 
@@ -1665,44 +1681,44 @@ rec {
   };
 
   purescript-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "purescript-vim-2017-10-19";
+    name = "purescript-vim-2018-03-11";
     src = fetchgit {
       url = "https://github.com/raichoo/purescript-vim";
-      rev = "ece34d9782a075761f31854a33eccd932eb2cf57";
-      sha256 = "0x6hpibmhgw5aqq25rcpvgz2a60jh7i8x23gigakmmrxv51cjcrj";
+      rev = "bd19dedebc7420565b8aec111e59217da838db59";
+      sha256 = "1h7fh5kfs4s735gj2nc7dvsir5fzvg49ajvcg35filwlx13r9nvj";
     };
     dependencies = [];
 
   };
 
   vim-wordy = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-wordy-2016-11-07";
+    name = "vim-wordy-2018-03-10";
     src = fetchgit {
       url = "https://github.com/reedes/vim-wordy";
-      rev = "bd37684a041fce85c34bb56c41c5a12c04a376ca";
-      sha256 = "0lv3ff1yfqdz2vj6lwaygslds1ccidbb09f4x1cdwlawxdgh3w2v";
+      rev = "14b9dbf76a82e29273a74768573900361200467f";
+      sha256 = "0qx3ngw4k7bgzmxpv1x4lkq3njm3zcb1j5ph6fx26wgagxhiaqhk";
     };
     dependencies = [];
 
   };
 
   committia-vim-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "committia-vim-git-2017-12-04";
+    name = "committia-vim-git-2018-03-01";
     src = fetchgit {
       url = "https://github.com/rhysd/committia.vim.git";
-      rev = "51aec02e5ab07c89fa5d5445cfe3a8e0098bec27";
-      sha256 = "08nqncgnmbvhnn850s6hhp6p6scqg2iiwrl9air952yh9pl91h84";
+      rev = "78d5aceaeed3ba7d6ed503df7ae54a5e7505eed0";
+      sha256 = "1wpvjkb62vb70yg7x3k84rk6fv0ykxms7bpn511z8dbs5v8xzzjg";
     };
     dependencies = [];
 
   };
 
   vim-grammarous = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-grammarous-2017-08-25";
+    name = "vim-grammarous-2018-02-24";
     src = fetchgit {
       url = "https://github.com/rhysd/vim-grammarous";
-      rev = "51ef5190813c0d9d8aaebd5191f183cff767f805";
-      sha256 = "1mm8hd39q2sl4hi83c4zvrl27a8djr1pv35ch0pivg84ad9p7qq5";
+      rev = "c039e40bc9124a2467376da2434a46cd216c49c6";
+      sha256 = "1mg3nqm4klimnljd642cd3z7nvhbrg1va09d7bnxcp6flyabpbfh";
     };
     dependencies = [];
     # use `:GrammarousCheck` to initialize checking
@@ -1729,11 +1745,11 @@ rec {
   };
 
   vim-puppet = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-puppet-2017-08-25";
+    name = "vim-puppet-2018-03-03";
     src = fetchgit {
       url = "https://github.com/rodjek/vim-puppet";
-      rev = "0d8ddd0dc3b7c908a82a6f16fa61aade766cc7e3";
-      sha256 = "1jgn9vahyn80zz0wfzx9abamsahh9wrrq1nf9qghljm4si3fq766";
+      rev = "921ccf81b5e11b40a49c458469ffa46c0d0560f8";
+      sha256 = "0c1lnxn2ja68p8vhvv5gzg3m79aiazpfagmjnydfndv1dvbww39a";
     };
     dependencies = [];
 
@@ -1751,44 +1767,44 @@ rec {
   };
 
   nvim-completion-manager = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "nvim-completion-manager-2017-11-09";
+    name = "nvim-completion-manager-2017-12-28";
     src = fetchgit {
       url = "https://github.com/roxma/nvim-completion-manager";
-      rev = "21c4b617419c4de782a533c07afcf6cbc453a94a";
-      sha256 = "0rdjp1qis96d83g967h73jlhlg27danrvvndljfq2ncgpg3b2x16";
+      rev = "e724a442072261993ca503e969d2cb25722ab1d2";
+      sha256 = "00q52vl06hgcinclszm21a3rx7ivc147p52w1p29icksc26yxhjb";
     };
     dependencies = [];
 
   };
 
   rust-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "rust-vim-2017-09-20";
+    name = "rust-vim-2018-01-15";
     src = fetchgit {
       url = "https://github.com/rust-lang/rust.vim";
-      rev = "b6d88adcf9867aa69f4d20d45d49bb54979842a4";
-      sha256 = "0n0hiqlv3amnzn69wyyq6z3r8zr0gcg86hw6flk7z39cxjhjv3vr";
+      rev = "8e75da9834abb22f8d7ece3f4ca4324a14fa18a6";
+      sha256 = "1mn4jijfzz2jq215dnwkq5gxiw0ysmvrsrvq4aypr2ms2040iqiq";
     };
     dependencies = [];
 
   };
 
   vim-devicons = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-devicons-2017-10-13";
+    name = "vim-devicons-2018-03-10";
     src = fetchgit {
       url = "https://github.com/ryanoasis/vim-devicons";
-      rev = "a3e50225a8d544c9eff9c53c5405269a1b2b29f8";
-      sha256 = "0glnwqnaw28g41zd9c3wvcsk6fmiphlwiq80lskbyn1pxfb3h14m";
+      rev = "d9a8fef7e9ffa19516ed42634e9fcd37e9e2cf48";
+      sha256 = "0vwbjxg0ai627v2mynbklvldxn5dllj3wfhhhlyqgdrn4ls6l5nc";
     };
     dependencies = [];
 
   };
 
   neoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neoformat-2017-12-04";
+    name = "neoformat-2018-03-03";
     src = fetchgit {
       url = "https://github.com/sbdchd/neoformat";
-      rev = "81d2d19e6bb65432b95f930af38ca6dab89d0434";
-      sha256 = "13ivv4ymkxk5rl5hkrlb4r328vhhpw6il0zdsynp9j41d4qq198s";
+      rev = "c042511faa57fbe9c0c55ca30c710c1605345cf5";
+      sha256 = "0rdd4jsk1l7yfbfd7v9z9rb6k0darlms2hxsy602v7j485n4ayd9";
     };
     dependencies = [];
 
@@ -1806,44 +1822,44 @@ rec {
   };
 
   vim-polyglot = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-polyglot-2017-12-06";
+    name = "vim-polyglot-2018-02-06";
     src = fetchgit {
       url = "https://github.com/sheerun/vim-polyglot";
-      rev = "11f53253ad9fd0cd3e7a44ed9f8c80a4f265b46e";
-      sha256 = "1p1h0flhzcaivrpsxb1xc1lc0kc901aq80p32j15ia3g2ib8vl4y";
+      rev = "96c5c20e418fa95b7137b6ef418946f25de91b1b";
+      sha256 = "0izqrl6rgfy9rva6qlyib9w3vwdva290cajnyblmxff3gfql1vrj";
     };
     dependencies = [];
 
   };
 
   context_filetype-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "context_filetype-vim-2017-11-15";
+    name = "context_filetype-vim-2018-02-06";
     src = fetchgit {
       url = "https://github.com/shougo/context_filetype.vim";
-      rev = "6856503cd938d018c2d42277ee6ca896fd63f5a2";
-      sha256 = "1s4nimpvc5ps602h8xb231nvmk9jbzs981an5kxr3idmmk44j5ms";
+      rev = "514b50f812904f063736cda3c787db7d9b290151";
+      sha256 = "1xb7lcvriyadrzz93vps9hsa2x8vi8lbwfzk2gm2l3i90mf9xddq";
     };
     dependencies = [];
 
   };
 
   denite-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "denite-nvim-2018-01-16";
+    name = "denite-nvim-2018-02-28";
     src = fetchgit {
       url = "https://github.com/shougo/denite.nvim";
-      rev = "0d48d8d498d410a5ea4403648d528e7267d87461";
-      sha256 = "1npag0da8s3jv4jm8waqvsdfg0gnqhkc07r3m17zp2r2bh3b9bjc";
+      rev = "b16579be4431a7eb708deb17d73ec641a8c89a54";
+      sha256 = "0kabnbqc4j2mgf5m5h0i3yy9pbpk3igrmcwmpq1vs4c4nb1bgkiy";
     };
     dependencies = [];
 
   };
 
   echodoc-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "echodoc-vim-2018-01-12";
+    name = "echodoc-vim-2018-02-18";
     src = fetchgit {
       url = "https://github.com/shougo/echodoc.vim";
-      rev = "410ead5a9fa4400b51771cba3b7599722c9e65b1";
-      sha256 = "01czpvn5rs37x0ml8bc5vwyhklm6fk3wl339smc3jvyr1w73rrf5";
+      rev = "ba85a728a6628fa22f1e4088637a005f21338cd5";
+      sha256 = "119azfkrplr6a14wypaw27rff332ji1rhnw1lfrzq9nir7kfd4p6";
     };
     dependencies = [];
 
@@ -1872,22 +1888,22 @@ rec {
   };
 
   neocomplete-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neocomplete-vim-2017-10-22";
+    name = "neocomplete-vim-2018-01-28";
     src = fetchgit {
       url = "https://github.com/shougo/neocomplete.vim";
-      rev = "46791e7692e07384a089d125c5c536246698d04c";
-      sha256 = "1iqd6fqlkm8bvibsapcvqqmyklzjad2l0c745lppdgdb959v016a";
+      rev = "1401a1c6ab56546c55804ba09e6c9fe87654e954";
+      sha256 = "01s2cx1cd4j16pb6ixrx9z8h4dsj2dvlxfly2gzm9khpsgsx454h";
     };
     dependencies = [];
 
   };
 
   neoinclude-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neoinclude-vim-2017-10-01";
+    name = "neoinclude-vim-2018-02-12";
     src = fetchgit {
       url = "https://github.com/shougo/neoinclude.vim";
-      rev = "b5956ac824fdd60d6eacaa597c8d329252972d8b";
-      sha256 = "07x7hxqhklcr5y8zkw9939cwx7rpiicjlc65bn526fkmhcc2hng6";
+      rev = "b63757822e0c31db04b32f0ca6bab01a560c2498";
+      sha256 = "1q2pbvl0xspjzwnisnrmv6w9wq289avzz2248hnm0v20rxvy5lwj";
     };
     dependencies = [];
 
@@ -1905,22 +1921,22 @@ rec {
   };
 
   neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neosnippet-snippets-2017-09-26";
+    name = "neosnippet-snippets-2018-01-28";
     src = fetchgit {
       url = "https://github.com/shougo/neosnippet-snippets";
-      rev = "8dbb78599984140c50418d3dd23d0de4c8f13e74";
-      sha256 = "1hs4xvr9x03ccrcczhly4qlvr5bfxfvdk3ir4821mlg1gsgclkwh";
+      rev = "5902053e0202248f0855d7a2b4f562425447493e";
+      sha256 = "12a89hlpz0gydl7wpqnanybmrl88r6pqznm0p76y6ir9m460gxw6";
     };
     dependencies = [];
 
   };
 
   neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neosnippet-vim-2017-11-23";
+    name = "neosnippet-vim-2018-02-22";
     src = fetchgit {
       url = "https://github.com/shougo/neosnippet.vim";
-      rev = "9ee1b4e059d4ffcc02312da13ee36315dacbffe4";
-      sha256 = "0c4pk02hnvzgj6pwy4lx481n7gj2fjwlsmcy7vxfps9h8h9qd6kw";
+      rev = "e38afeab494bbc66be15e181bc96b78df3654a88";
+      sha256 = "1pm2drwq3hmbibai03pn6qh373kwfqf49npv1gq8d566wfmg0qrq";
     };
     dependencies = [];
 
@@ -1949,22 +1965,22 @@ rec {
   };
 
   unite-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "unite-vim-2017-12-06";
+    name = "unite-vim-2018-01-12";
     src = fetchgit {
       url = "https://github.com/shougo/unite.vim";
-      rev = "49fe0efad7a838a5bec9e653fb80504c94744ff9";
-      sha256 = "0vlpk053vdd5iqx2hmg9kvhg4270gq437smawdwjh88vriix3f1d";
+      rev = "cc0af4798f91e1c3a4a78ae028a3ac3e61d25eb3";
+      sha256 = "1vj3bpdyv7wq0xnk9ladacy1giz5x92a62akasbd84bkd79gaxwv";
     };
     dependencies = [];
 
   };
 
   vimproc-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimproc-vim-2017-11-21";
+    name = "vimproc-vim-2018-01-07";
     src = fetchgit {
       url = "https://github.com/shougo/vimproc.vim";
-      rev = "81f4fa5239705724a49fbecd3299ced843f4972f";
-      sha256 = "03pkp37d07nx857kqz2h6q2z13ca2944zq2lcqdcc97s9nnjnzha";
+      rev = "2300224d366642f4f8d6f88861535d4ccbe20143";
+      sha256 = "0b8ljqnix8bs667bpymg3s0g5f49fnphgddl6196dj6jvdfn1xia";
     };
     dependencies = [];
     buildInputs = [ which ];
@@ -2000,11 +2016,11 @@ rec {
   };
 
   alchemist-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "alchemist-vim-2017-11-22";
+    name = "alchemist-vim-2018-02-03";
     src = fetchgit {
       url = "https://github.com/slashmili/alchemist.vim";
-      rev = "1e08668e844ef5c6cb552e83bb842285a6ba4228";
-      sha256 = "05viwrvakxnc4fajscn7chvldc9vvjssbz4c81vdw8wgwxv8qay7";
+      rev = "1bc6ac4405f0b7bbf5dd963313f103f1416f27cb";
+      sha256 = "0ff83xknlkb2rdhvpp75nclilb4mlmkr86lp9jwb52dc0a6l2g8i";
     };
     dependencies = [];
 
@@ -2055,11 +2071,11 @@ rec {
   };
 
   vim-quickrun = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-quickrun-2017-11-25";
+    name = "vim-quickrun-2018-02-21";
     src = fetchgit {
       url = "https://github.com/thinca/vim-quickrun";
-      rev = "1170ba086f8e27c123add196675ddab64a59ce70";
-      sha256 = "1vpllpinqf46ymsr7n1ywip4y7ibm3i8cidh271a57cvac0hig6d";
+      rev = "8d864e7feb7ac9dded84808f76fcb3fcd3ed8ae3";
+      sha256 = "0m2l1ajgagryaff3gaw91930y5p5ni1s2s4gnahwvqyiq3jdxaxh";
     };
     dependencies = [];
 
@@ -2088,33 +2104,33 @@ rec {
   };
 
   vim-dispatch = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-dispatch-2017-10-10";
+    name = "vim-dispatch-2018-03-02";
     src = fetchgit {
       url = "https://github.com/tpope/vim-dispatch";
-      rev = "be7b194f47bdee6baa4460ccd030b860ada548dd";
-      sha256 = "0lxhk6y1lf625i8hnsl44wzh8mfxi2h1hswrmisbmm2dbmyy84hd";
+      rev = "e83ac42fefa4bcf2b4197bec2b4d917e15225815";
+      sha256 = "1mkhygh5pgp9z6gn2chn8kvj6fgfvg9gnym9icfdlm0hl2ldig1w";
     };
     dependencies = [];
 
   };
 
   vim-eunuch = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-eunuch-2017-06-08";
+    name = "vim-eunuch-2018-02-18";
     src = fetchgit {
       url = "https://github.com/tpope/vim-eunuch";
-      rev = "b536b887072ff3cc382842ce9f675ec222302f4f";
-      sha256 = "0vp037kb12mawy186cm384m5hl0p051rihhm1jr2qck0vwaps58p";
+      rev = "b62f7d4d4dcb6bdb840441c11435aa4361ec0454";
+      sha256 = "0h6q4jjqb9b0cdbg0ymm5kfw1a2b4m83fqdfw61637rd6i0ganks";
     };
     dependencies = [];
 
   };
 
   vim-repeat = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-repeat-2017-04-21";
+    name = "vim-repeat-2018-01-30";
     src = fetchgit {
       url = "https://github.com/tpope/vim-repeat";
-      rev = "070ee903245999b2b79f7386631ffd29ce9b8e9f";
-      sha256 = "1grsaaar2ng1049gc3r8wbbp5imp31z1lcg399vhh3k36y34q213";
+      rev = "8106e142dfdc278ff3eaaadd7b362ad7949d4357";
+      sha256 = "1q0bmqxi1kqxq7g8l0qj7y93g9rqffwc3fbmhpj3chx2kswhd5hc";
     };
     dependencies = [];
 
@@ -2165,22 +2181,22 @@ rec {
   };
 
   open-browser-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "open-browser-vim-2017-12-15";
+    name = "open-browser-vim-2018-03-11";
     src = fetchgit {
       url = "https://github.com/tyru/open-browser.vim";
-      rev = "ee8decb2b26020320128eecd7a96383d995c8804";
-      sha256 = "1a9j13h174lkp1gqd80idwdb8d74gdkyfgvb2l153jcqyvwpzcl2";
+      rev = "43b08d6642f26af5a875b0d0bdb3aa9a6d12e7eb";
+      sha256 = "162dv172n16jpjr812d561yyj9rz9xn4qrfx18wlpyixj3qf2bda";
     };
     dependencies = [];
 
   };
 
   youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "youcompleteme-2017-12-03";
+    name = "youcompleteme-2018-03-09";
     src = fetchgit {
       url = "https://github.com/valloric/youcompleteme";
-      rev = "290dd94721d1bc97fab4f2e975a0cf6258abfbac";
-      sha256 = "0jhaixhx9lxqwb8ncxkafn478cc4dkh7ss6qjn29lcn9qdy9bvd7";
+      rev = "3a760212cb306655780a2c3be6412890ba5cf89b";
+      sha256 = "0q0gjlsb0l3k7a1fiz4lqa75r146y4myr42kwri0rm8y4fgpbc12";
     };
     dependencies = [];
     buildPhase = ''
@@ -2194,7 +2210,7 @@ rec {
 
     meta = {
       description = "Fastest non utf-8 aware word and C completion engine for Vim";
-      homepage = https://github.com/Valloric/YouCompleteMe;
+      homepage = http://github.com/Valloric/YouCompleteMe;
       license = stdenv.lib.licenses.gpl3;
       maintainers = with stdenv.lib.maintainers; [marcweber jagajaga];
       platforms = stdenv.lib.platforms.unix;
@@ -2202,22 +2218,22 @@ rec {
   };
 
   vim-airline-themes = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-airline-themes-2017-11-18";
+    name = "vim-airline-themes-2018-01-05";
     src = fetchgit {
       url = "https://github.com/vim-airline/vim-airline-themes";
-      rev = "52dfa2b6c0dc2fd7a0e92954030893de3d173105";
-      sha256 = "0m65xmg259781r1wk8dz0d0diiayqyl1wahsb2fdqs369wwx4irr";
+      rev = "4b7f77e770a2165726072a2b6f109f2457783080";
+      sha256 = "02wbch9mbj0slafd5jrklmyawrxpisf8c3f5c72gq30j8hlyb86n";
     };
     dependencies = [];
 
   };
 
   vim-pandoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-pandoc-2017-11-22";
+    name = "vim-pandoc-2018-01-11";
     src = fetchgit {
       url = "https://github.com/vim-pandoc/vim-pandoc";
-      rev = "6ab0e8ed4dd3325d6b304e8f97f2cba80e3269ae";
-      sha256 = "07zdkp7g9y2vp3f9j2f12acap4ykgjp85in5qnhmg4dw8l8r07x5";
+      rev = "3a686781ab5ea622616798475deb394e48d3cc48";
+      sha256 = "1nvz8v52jydkvnlid5w8dkjmr548ryla2vaxnlgj125aamkvmgn3";
     };
     dependencies = [];
 
@@ -2322,6 +2338,17 @@ rec {
 
   };
 
+  bats-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "bats-vim-2013-07-03";
+    src = fetchgit {
+      url = "https://github.com/vim-scripts/bats.vim";
+      rev = "3c283f594ff8bc7fb0c25cd07ebef0f17385f94a";
+      sha256 = "06f3hdf7y5gpwmc6inrhk938qmn7cr6mbk00amrnl1qjvk09givx";
+    };
+    dependencies = [];
+
+  };
+
   changeColorScheme-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "changeColorScheme-vim-2010-10-17";
     src = fetchgit {
@@ -2378,33 +2405,44 @@ rec {
   };
 
   ale = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ale-2018-02-25";
+    name = "ale-2018-03-10";
     src = fetchgit {
       url = "https://github.com/w0rp/ale";
-      rev = "7ec684206c1395a940d8ad2d26d59773a432115c";
-      sha256 = "1hvybsvs2i01q3s9wpydyxgsvg59r2valk61vl4jh2mrrh0bfi9i";
+      rev = "05d39bc1a9eb79ff6f36b190b4612ff052812e7e";
+      sha256 = "0p8pllh93bd43051rjcw9jamkmldb0rc3x8llw010m05jgrkngda";
     };
     dependencies = [];
 
   };
 
   vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-wakatime-2017-11-24";
+    name = "vim-wakatime-2018-01-28";
     src = fetchgit {
       url = "https://github.com/wakatime/vim-wakatime";
-      rev = "48b4e59dcd75890eb56d7ceb2d57ff63ed17c373";
-      sha256 = "0aspkigh08cdnv2mq425dapklxizir134zksrm608q02qpf0m7hg";
+      rev = "dadf0bc9697a3eea043190e9ccfe4fb2e53a20ca";
+      sha256 = "0fimkkkxii0g12xfbq8vs0i50ffincsbpz96x55q0j7gnlxbhwfr";
     };
     dependencies = [];
     buildInputs = [ python ];
   };
 
   targets-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "targets-vim-2017-12-03";
+    name = "targets-vim-2018-02-28";
     src = fetchgit {
       url = "https://github.com/wellle/targets.vim";
-      rev = "6f809397526797f8f419a5d2b86d90e5aff68e66";
-      sha256 = "0djjm7b41kgrkz447br7qi3w96ayz9lyxd164gyp082qqxxpz63q";
+      rev = "c1732189c9ec29cc3320094304019ffcafadafc4";
+      sha256 = "12ryicmb29qhmn216xdv9g8rl170mz5zrbfnmqja3wdlwkj3g83j";
+    };
+    dependencies = [];
+
+  };
+
+  vim-dirdiff = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-dirdiff-2018-01-30";
+    src = fetchgit {
+      url = "https://github.com/will133/vim-dirdiff";
+      rev = "b5a3d59bfbeb5cef7dbadbe69c455b470988b58c";
+      sha256 = "16hc88k00xa757k0h53r1sbqwxdxdy0118yl2vsigd6rqk474nw1";
     };
     dependencies = [];
 
@@ -2448,25 +2486,25 @@ rec {
   };
 
   nim-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "nim-vim-2017-11-29";
+    name = "nim-vim-2018-02-27";
     src = fetchgit {
       url = "https://github.com/zah/nim.vim";
-      rev = "8167c50bd421c921b198001387e60d4728868010";
-      sha256 = "0yk6qmxns3jzb7riwyrddmlszy89s0ihii0462rfa4b8wlmpan1l";
+      rev = "bdc19809d22190d9b8e85377252a24d930cd25f8";
+      sha256 = "08abwnzim767jvin6jsp2a580hpxzb2w5hbf8w5dhkvxv2pgk0vz";
     };
     dependencies = [];
 
   };
 
   deoplete-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "deoplete-go-2017-11-14";
+    name = "deoplete-go-2018-02-04";
     src = fetchgit {
       url = "https://github.com/zchee/deoplete-go";
-      rev = "844a0dce554f92cbd9938baf34f1801b5d872e58";
-      sha256 = "15sf8ssb85va6b0si07nyh5c5xdikdl99fihgprqk1wxi9mp28cj";
+      rev = "513ae17f1bd33954da80059a21c128a315726a81";
+      sha256 = "0rfxzryccrq3dnjgb9aljzrmfjk7p8l2qdjkl8ar4bh2hmz8vn5y";
     };
     dependencies = [];
-    buildInputs = [ python3 ];
+    buildInputs = [ python3 ]; 
     buildPhase = ''
       pushd ./rplugin/python3/deoplete/ujson
       python3 setup.py build --build-base=$PWD/build --build-lib=$PWD/build
@@ -2476,22 +2514,22 @@ rec {
   };
 
   deoplete-jedi = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "deoplete-jedi-2017-12-05";
+    name = "deoplete-jedi-2018-02-25";
     src = fetchgit {
       url = "https://github.com/zchee/deoplete-jedi";
-      rev = "715acf2847b8fa8d436a10a4c3dfd7187d53b72f";
-      sha256 = "12d16z4mvc6aln5vnrdf275ci1w7v454zl9x54khqfikc0pwyjg8";
+      rev = "0410de74239b79d9fc21fe1076e46a97aa0d44cc";
+      sha256 = "0bp4d5q5y72bhmrwcczz6g1z53n372qydbsxjl7r2amaiy0l3yl0";
     };
     dependencies = [];
 
   };
 
   zig-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "zig-vim-2017-10-17";
+    name = "zig-vim-2018-02-28";
     src = fetchgit {
       url = "https://github.com/zig-lang/zig.vim";
-      rev = "6059db59f61b517f5d65303b61f03324e01fdc2f";
-      sha256 = "0w3pa63s0r6h6w1iqmc444qrsc99xcccwapd6nyh3gb72z228d7z";
+      rev = "1ce1b03ace88c447733cd5f398f09ff1d83d6831";
+      sha256 = "0y96dwfh1291gn7ia749nc8r03ndq7f29lgqag4dcs59x0pk4f5w";
     };
     dependencies = [];
 
@@ -2509,39 +2547,27 @@ rec {
   };
 
   gruvbox = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "gruvbox-2017-10-01";
+    name = "gruvbox-2018-02-25";
     src = fetchgit {
       url = "git://github.com/morhetz/gruvbox";
-      rev = "16504d394e145e0372d2491e02769d241350399a";
-      sha256 = "0yhas9lnsn9lfld37lvm5msmmkj6c7d8ajgarazc5rykbl8bw8rg";
+      rev = "cb4e7a5643f7d2dd40e694bcbd28c4b89b185e86";
+      sha256 = "12qkq1x96bm1cmqfg6sb8jxpl2b6gwvhc5qn3gva6vl4nx3ianqi";
     };
     dependencies = [];
 
   };
 
   maktaba = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "maktaba-2017-05-07";
+    name = "maktaba-2017-12-29";
     src = fetchgit {
       url = "git://github.com/google/vim-maktaba";
-      rev = "2ae8b4478ea9bc2c6c8106acb55ddfb935754fb9";
-      sha256 = "1w8paqn0qyk4j5wfx48rc2za7kzhgdaggikklmjr1vsv2y0b8fzc";
+      rev = "6e3be879bcf2d4e3c5bb56653e5eda9e08b84982";
+      sha256 = "1nbpn6pcphrakd4icl24l4a68hjcq4a0aaq6kdwrvlsd1c3lk4dm";
     };
     dependencies = [];
 
   };
 
-  gitv = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "gitv-2017-11-26";
-    src = fetchgit {
-      url = "https://github.com/gregsexton/gitv";
-      rev = "4b7ecf354726a3d31d0ad9090efd27a79c850a35";
-      sha256 = "0n2ddq0kicl2xjrhxi5pqvpikxa7vbf0hp3lzwmpapmvx146wi3w";
-    };
-    dependencies = ["fugitive"];
-
-  };
-
-
   matchit-zip = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "matchit-zip";
     src = fetchurl {
@@ -2565,11 +2591,11 @@ rec {
   };
 
   neco-look = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neco-look-2018-01-07";
+    name = "neco-look-2018-01-21";
     src = fetchgit {
       url = "git://github.com/ujihisa/neco-look";
-      rev = "ff3de2731177694d0e85f1227b6cfd51c8e2bc8d";
-      sha256 = "0zpny9sj7alzsbrjbph71b44zf575hij1ky8pwgba0ygp2p2fxd4";
+      rev = "4ead88e70f359fb9cef6537ed9c336b7673c1b4c";
+      sha256 = "1lszbif7ymdjch1ypnr1nihs6gfbhb86sj6nz3dwrbgsl454nnrj";
     };
     dependencies = [];
 
@@ -2620,22 +2646,22 @@ rec {
   };
 
   riv = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "riv-2017-02-07";
+    name = "riv-2018-01-21";
     src = fetchgit {
       url = "git://github.com/Rykka/riv.vim";
-      rev = "d1efdd92fbb51dc452c61eec54a0ec084f011b4b";
-      sha256 = "18qcglbrixgqk05x34dy2cksaw0dg7n51p48i6zkh5sqspv98zz3";
+      rev = "454fef3402c8b8b2c2036232a9e9b798f5e35d09";
+      sha256 = "1n5m4y03bfabhr6inmgwhwc4ayaafavsrqagklzjwfx1cv3r9f2j";
     };
     dependencies = [];
 
   };
 
   sensible = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "sensible-2017-05-09";
+    name = "sensible-2018-01-22";
     src = fetchgit {
       url = "git://github.com/tpope/vim-sensible";
-      rev = "49ee364222dc2a5a00dddf89fd61880e3e39d46a";
-      sha256 = "0x9zn547hzzxjzplr2rkzhydh2y0a4fdkrwmdvw2yp203msyhcjx";
+      rev = "2d60332fa5b2b1ea346864245569df426052865a";
+      sha256 = "1psv8r3xshcg5c09i8h2qff6jp62anjmsa24qzvbc71ass5bqxyb";
     };
     dependencies = [];
 
@@ -2697,11 +2723,11 @@ rec {
   };
 
   table-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "table-mode-2018-01-04";
+    name = "table-mode-2018-02-13";
     src = fetchgit {
       url = "git://github.com/dhruvasagar/vim-table-mode";
-      rev = "b25fe6f9f0f0b704d05ebd05edbbf0be3038cef9";
-      sha256 = "14ykj2yrwi8k6mkzg0vi4favwg88l8c7zf7m6qzvndpjqw8jggdy";
+      rev = "c35fd9b104fb75017f3866a28a77cf38f61b7801";
+      sha256 = "0l52ipl7a1g3js6lfig4xjw17nmmjvpv7gsrpn166kwgrxgis802";
     };
     dependencies = [];
 
@@ -2762,11 +2788,11 @@ rec {
   };
 
   vim-addon-actions = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-actions-2017-09-23";
+    name = "vim-addon-actions-2018-01-18";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-actions";
-      rev = "7f48bea57fd9dfb06498422bc1cbe9f7553efa6e";
-      sha256 = "0q9w2x49zd3a43cm4ikgpwrqiz0k9a6pss0zrvskaxhh6mifpxpg";
+      rev = "540cae09832ba6abf9fc63c55781bf86584c33ac";
+      sha256 = "011w5k09i01r9x64j20qj0f7d057m9wki2m8l2wds47l57hr3vz6";
     };
     dependencies = ["vim-addon-mw-utils" "tlib"];
 
@@ -2872,11 +2898,11 @@ rec {
   };
 
   vim-addon-mw-utils = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-mw-utils-2012-11-05";
+    name = "vim-addon-mw-utils-2018-03-09";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-mw-utils";
-      rev = "0c5612fa31ee434ba055e21c76f456244b3b5109";
-      sha256 = "147s1k4n45d3x281vj35l26sv4waxjlpqdn83z3k9n51556h1d45";
+      rev = "295862ba6be47ec3b11b6c85c10d982ffd9bc0b2";
+      sha256 = "0ylvhmx0cnj2x38plwqlq4pqyqyxxhf4s08hknnl7qhrr5kd533f";
     };
     dependencies = [];
 
@@ -2971,22 +2997,22 @@ rec {
   };
 
   vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-airline-2017-11-27";
+    name = "vim-airline-2018-03-06";
     src = fetchgit {
       url = "git://github.com/vim-airline/vim-airline";
-      rev = "6c8d0f5e6af878db71b2dc44ccf1d1417381d6a0";
-      sha256 = "0azrapbb3w84c62kcbrycm75qmwdfz38852sv7cccwb7v1xgj9ab";
+      rev = "958f78335eafe419ee002ad58d358854323de33a";
+      sha256 = "1h0a0rsnbbwhw55r2hcpfkxqamnx62jzqb451lh3ipvfs0ral6w7";
     };
     dependencies = [];
 
   };
 
   vim-coffee-script = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-coffee-script-2017-12-04";
+    name = "vim-coffee-script-2018-02-27";
     src = fetchgit {
       url = "git://github.com/kchmck/vim-coffee-script";
-      rev = "de6b6327b4e738ea5dbf0ef97d06d39217e4e6fc";
-      sha256 = "0rvvsqlc3vrfpvh25a8kykwnf5dwx7blbnl5by1ja0l77l1hnrz4";
+      rev = "9e3b4de2a476caeb6ff21b5da20966d7c67a98bb";
+      sha256 = "1yzhyi12r508r2yjkzbcnddv3q4whjf3kchp23xs0snhwd9b981x";
     };
     dependencies = [];
 
@@ -3003,17 +3029,6 @@ rec {
 
   };
 
-  vim-dirdiff = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-dirdiff-2017-01-19";
-    src = fetchgit {
-      url = "https://github.com/will133/vim-dirdiff";
-      rev = "db1fe77dcefa7a5b1089c8a84d1b401a4bd780bc";
-      sha256 = "1540h5skh8rcpzj0vp8sr53hg9jmmknj155pxs4z5w6gvzk7nx0p";
-    };
-    dependencies = [];
-
-  };
-
   vim-easy-align = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-easy-align-2017-06-03";
     src = fetchgit {
@@ -3048,11 +3063,11 @@ rec {
   };
 
   vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-gitgutter-2018-02-26";
+    name = "vim-gitgutter-2018-03-08";
     src = fetchgit {
       url = "git://github.com/airblade/vim-gitgutter";
-      rev = "e512d3a6fc80900c24ef293b475715f49ec6ded8";
-      sha256 = "0wd6x3fb5jbqlvismp3f59ycid49gn3qvd16cj8x87v6l3anmp4s";
+      rev = "380e7935b7b4cac10d3bc3031d492deaf5008495";
+      sha256 = "0c1dh3rkhgrp1sala1y5y2wn7b94c75y7h3j3dsl8lmbl64y2vl8";
     };
     dependencies = [];
 
@@ -3081,22 +3096,22 @@ rec {
   };
 
   vim-javascript = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-javascript-2018-01-10";
+    name = "vim-javascript-2018-03-04";
     src = fetchgit {
       url = "git://github.com/pangloss/vim-javascript";
-      rev = "4c0a554423df72ecb8d13b143afa7a4cfcb994ec";
-      sha256 = "01lbkcfjqwrn2pbxz1jj8g2vxasc2i7s6nc7665s1warn066ykjr";
+      rev = "3e0b1af8c2b2b613add52d782b29f325c6a414e3";
+      sha256 = "1rxds6sswnm7xyy39ljwhykb3r6jd9jsm1lbhhw2r226d56pj15w";
     };
     dependencies = [];
 
   };
 
   vim-jsbeautify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-jsbeautify-2017-05-20";
+    name = "vim-jsbeautify-2018-01-31";
     src = fetchgit {
       url = "git://github.com/maksimr/vim-jsbeautify";
-      rev = "e83f749c3de7e958e7bc285e80e484707b6f1e12";
-      sha256 = "0dy9ljqp6shac406xgawzrqcapm80rjxmbzwy93ypzlhi8b67w0a";
+      rev = "7a55bffa7d87e4f1ed11650e56a1361779b39624";
+      sha256 = "01jvc3nkvmhw9n7m9x96ax1ndzw78ryjmgrvkqb7gja1xb8i8jqq";
     };
     dependencies = [];
 
@@ -3125,11 +3140,11 @@ rec {
   };
 
   vim-multiple-cursors = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-multiple-cursors-2017-08-04";
+    name = "vim-multiple-cursors-2018-03-02";
     src = fetchgit {
       url = "git://github.com/terryma/vim-multiple-cursors";
-      rev = "a97dab5bc440bf0a7b62bb2de4479963a888f4ff";
-      sha256 = "1ac5l5h138ns9z9ni4qbcykkg9yfpjjalk0g9wrra4rp0nlakaqk";
+      rev = "c9b95e49a48937903c9fc41d87d9b4c9aded10d7";
+      sha256 = "1r8xlfydarvaags541xn1mc5ry97ikyvjhkrpyngzfw48jlc0aaa";
     };
     dependencies = [];
 
@@ -3146,23 +3161,12 @@ rec {
 
   };
 
-  vim-rooter = buildVimPluginFrom2Nix {
-    name = "vim-rooter-2017-11-20";
-    src = fetchgit {
-      url = "git://github.com/airblade/vim-rooter";
-      rev = "3509dfb80d0076270a04049548738daeedf6dfb9";
-      sha256 = "03j26fw0dcvcc81fn8hx1prdwlgnd3g340pbxrzgbgxxq5kr0bwl";
-    };
-    dependencies = [];
-
-  };
-
   vim-ruby = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-ruby-2017-06-22";
+    name = "vim-ruby-2018-03-02";
     src = fetchgit {
       url = "git://github.com/vim-ruby/vim-ruby";
-      rev = "074200ffa39b19baf9d9750d399d53d97f21ee07";
-      sha256 = "1w2d12cl40nf73f3hcpqc4sqma8h1a557fy8kds2x143gq7s5vx6";
+      rev = "15e32500f58c3bb66eb6b1eb4af57d86263895c0";
+      sha256 = "15lhg4wdrx7989rbawpa2jlfrfnhf5km76g8ld5b2c2gqixxy4aj";
     };
     dependencies = [];
 
@@ -3180,44 +3184,44 @@ rec {
   };
 
   vim-signature = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-signature-2017-09-24";
+    name = "vim-signature-2018-02-28";
     src = fetchgit {
       url = "git://github.com/kshenoy/vim-signature";
-      rev = "eaa8af20ac4d46f911a083298d7a19e27be180e0";
-      sha256 = "1vha52bmbs88lnwjfvkbx2jb74k8gqjky0c9gv8gqy74lypcdas5";
+      rev = "21b03ff51d08775a44417db14bf6dee690723d06";
+      sha256 = "1v36zkr8jkhhfsdli6rvrz3akcr8bmfqyrkxb2izb0c250b9swrg";
     };
     dependencies = [];
 
   };
 
   vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-signify-2017-08-19";
+    name = "vim-signify-2018-02-21";
     src = fetchgit {
       url = "git://github.com/mhinz/vim-signify";
-      rev = "1a8a15d835d8f2da56cd793a0222227af6c89839";
-      sha256 = "13yvwy2vw64g4v08k83svhp26nmmir0qd21wpp89qclbzwb2q2k2";
+      rev = "26ed57e0fe7a28c8763920e946b2225ec577df3f";
+      sha256 = "0xkmyzm79gay1cga9znlsdk3mwc6smavv7xg5x6gr8a17wjipmlm";
     };
     dependencies = [];
 
   };
 
   vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-snippets-2017-12-05";
+    name = "vim-snippets-2018-03-05";
     src = fetchgit {
       url = "git://github.com/honza/vim-snippets";
-      rev = "e116db735e54a8e428f8b2c08c842ee52b7230fe";
-      sha256 = "05zn4z40awqab8fz9z49wkry6hww89la33vj552cf6lhzfkbbsvv";
+      rev = "f02955d40b64c9db6f6bdeee40d0f44a00c58865";
+      sha256 = "0ylbvr88xh1lw4lbiiwg617wp4r25d32wl4rsb7s2c5isy6aimki";
     };
     dependencies = [];
 
   };
 
   vim-webdevicons = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-webdevicons-2017-10-13";
+    name = "vim-webdevicons-2018-03-10";
     src = fetchgit {
       url = "git://github.com/ryanoasis/vim-devicons";
-      rev = "a3e50225a8d544c9eff9c53c5405269a1b2b29f8";
-      sha256 = "0glnwqnaw28g41zd9c3wvcsk6fmiphlwiq80lskbyn1pxfb3h14m";
+      rev = "d9a8fef7e9ffa19516ed42634e9fcd37e9e2cf48";
+      sha256 = "0vwbjxg0ai627v2mynbklvldxn5dllj3wfhhhlyqgdrn4ls6l5nc";
     };
     dependencies = [];
 
@@ -3235,33 +3239,33 @@ rec {
   };
 
   vimwiki = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimwiki-2017-12-04";
+    name = "vimwiki-2018-02-26";
     src = fetchgit {
       url = "git://github.com/vimwiki/vimwiki";
-      rev = "75fe1d4f003f77a33955f436e023a4ce9548cb69";
-      sha256 = "1a4918jsxjvlzj4qqariygwjjcs2lflykgq5k5l3ar3jvwlw0n7p";
+      rev = "4bacbe00005f23d72d247fdde3a9e857d690b44b";
+      sha256 = "1kbblgzl311ksgyy4q44cngzacn3i2sfmfgmv441vzc7lq0fpmd6";
     };
     dependencies = [];
 
   };
 
   vinegar = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vinegar-2017-06-27";
+    name = "vinegar-2017-12-28";
     src = fetchgit {
       url = "git://github.com/tpope/vim-vinegar";
-      rev = "c795cb739347cbddeeb288c3c35da9f140a513c9";
-      sha256 = "1dcirb0b73s2l14ppn8mlh79pjpf9kgym9im05039ynr9rl83fv3";
+      rev = "44bc76a6abf6aeafa4d0808288bb4fcc9a2e98f8";
+      sha256 = "1h612j0w0kz2f8575r63dzdi65fhq77dp7rhziixs3pkq54pqcsg";
     };
     dependencies = [];
 
   };
 
   vundle = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vundle-2017-11-10";
+    name = "vundle-2018-02-02";
     src = fetchgit {
       url = "git://github.com/gmarik/vundle";
-      rev = "fcc204205e3305c4f86f07e09cd756c7d06f0f00";
-      sha256 = "1wpxp59rh1l6i4mvavqsh1xxqj3fmqiggl92h6chj4lc8anssydy";
+      rev = "9a38216a1c0c597f978d73547d37681fc689c90d";
+      sha256 = "1695glma8zf2lnp0w713sdvwqagf1s127p4i60114nk6gx5g5x2c";
     };
     dependencies = [];
 
@@ -3288,4 +3292,5 @@ rec {
     dependencies = [];
 
   };
+
 }
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 04ccbb2a99d..2fde808478b 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -37,7 +37,6 @@
 "github:andsild/peskcolor.vim.git"
 "github:andviro/flake8-vim"
 "github:ap/vim-css-color"
-"github:autozimu/LanguageClient-neovim"
 "github:bazelbuild/vim-bazel"
 "github:bbchung/clighter8"
 "github:benekastah/neomake"
@@ -189,6 +188,7 @@
 "github:vim-scripts/a.vim"
 "github:vim-scripts/align"
 "github:vim-scripts/argtextobj.vim"
+"github:vim-scripts/bats.vim"
 "github:vim-scripts/changeColorScheme.vim"
 "github:vim-scripts/mayansmoke.git"
 "github:vim-scripts/random.vim"
diff --git a/pkgs/misc/vscode-extensions/vscode-utils.nix b/pkgs/misc/vscode-extensions/vscode-utils.nix
index 83cb559dca1..4c095278f91 100644
--- a/pkgs/misc/vscode-extensions/vscode-utils.nix
+++ b/pkgs/misc/vscode-extensions/vscode-utils.nix
@@ -37,7 +37,7 @@ let
 
     installPhase = ''
       mkdir -p "$out/share/${extendedPkgName}/extensions/${vscodeExtUniqueId}"
-      find . -mindepth 1 -maxdepth 1 | xargs mv -t "$out/share/${extendedPkgName}/extensions/${vscodeExtUniqueId}/"
+      find . -mindepth 1 -maxdepth 1 | xargs -d'\n' mv -t "$out/share/${extendedPkgName}/extensions/${vscodeExtUniqueId}/"
     '';
 
   });
diff --git a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix
index 081f713d054..f8c424089f0 100644
--- a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix
+++ b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix
@@ -14,7 +14,6 @@ with frameworks; with libs; {
   AppKitScripting         = [];
   AppleScriptKit          = [];
   AppleScriptObjC         = [];
-  AppleShareClientCore    = [ CoreServices ];
   AudioToolbox            = [ AudioUnit CoreAudio CF CoreMIDI ];
   AudioUnit               = [ Carbon CoreAudio CF ];
   AudioVideoBridging      = [ Foundation ];
@@ -84,12 +83,10 @@ with frameworks; with libs; {
   PCSC                    = [ CoreData ];
   PreferencePanes         = [];
   PubSub                  = [];
-  Python                  = [ ApplicationServices ];
   QTKit                   = [ CoreMediaIO CoreMedia MediaToolbox QuickTime VideoToolbox ];
   QuickLook               = [ ApplicationServices CF ];
   QuickTime               = [ ApplicationServices AudioUnit Carbon CoreAudio CoreServices OpenGL QuartzCore ];
   Ruby                    = [];
-  RubyCocoa               = [];
   SceneKit                = [];
   ScreenSaver             = [];
   Scripting               = [];
@@ -105,11 +102,9 @@ with frameworks; with libs; {
   SystemConfiguration     = [ CF Security ];
   TWAIN                   = [ Carbon ];
   Tcl                     = [];
-  Tk                      = [ ApplicationServices Carbon X11 ];
   VideoDecodeAcceleration = [ CF CoreVideo ];
   VideoToolbox            = [ CF CoreMedia CoreVideo ];
   WebKit                  = [ ApplicationServices Carbon JavaScriptCore OpenGL ];
-  X11                     = []; # used by Tk, should this exist?
 
   # Umbrellas
   Accelerate          = [ CoreWLAN IOBluetooth ];
diff --git a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix
index 357a87689a0..dc7edface9a 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix
@@ -7,11 +7,13 @@ appleDerivation rec {
 
   # "spray" requires some files that aren't compiling correctly in xcbuild.
   # "rtadvd" seems to fail with some missing constants.
-  # We disable spray and rtadvd here for now.
+  # "traceroute6" and "ping6" require ipsec which doesn't build correctly
   patchPhase = ''
     substituteInPlace network_cmds.xcodeproj/project.pbxproj \
       --replace "7294F0EA0EE8BAC80052EC88 /* PBXTargetDependency */," "" \
-      --replace "7216D34D0EE89FEC00AE70E4 /* PBXTargetDependency */," ""
+      --replace "7216D34D0EE89FEC00AE70E4 /* PBXTargetDependency */," "" \
+      --replace "72CD1D9C0EE8C47C005F825D /* PBXTargetDependency */," "" \
+      --replace "7216D2C20EE89ADF00AE70E4 /* PBXTargetDependency */," ""
   '';
 
   # temporary install phase until xcodebuild has "install" support
diff --git a/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix
index f434e15794e..4f527acc950 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix
@@ -10,10 +10,12 @@ appleDerivation rec {
     # - su ('security/pam_appl.h' file not found)
     # - find (Undefined symbol '_get_date')
     # - w (Undefined symbol '_res_9_init')
+    # - expr
     substituteInPlace shell_cmds.xcodeproj/project.pbxproj \
       --replace "FCBA168714A146D000AA698B /* PBXTargetDependency */," "" \
       --replace "FCBA165914A146D000AA698B /* PBXTargetDependency */," "" \
-      --replace "FCBA169514A146D000AA698B /* PBXTargetDependency */," ""
+      --replace "FCBA169514A146D000AA698B /* PBXTargetDependency */," "" \
+      --replace "FCBA165514A146D000AA698B /* PBXTargetDependency */," ""
 
     # disable w, test install
     # get rid of permission stuff
diff --git a/pkgs/os-specific/darwin/opencflite/default.nix b/pkgs/os-specific/darwin/opencflite/default.nix
index 09a346e4446..960e0677da1 100644
--- a/pkgs/os-specific/darwin/opencflite/default.nix
+++ b/pkgs/os-specific/darwin/opencflite/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0jgmzs0ycl930hmzcvx0ykryik56704yw62w394q1q3xw5kkjn9v";
   };
 
-  configureFlags = [ "--with-uuid=${libuuid}" ];
+  configureFlags = [ "--with-uuid=${libuuid.dev}" ];
   buildInputs = [ icu tzdata.dev ];
   enableParallelBuilding = true;
 
diff --git a/pkgs/os-specific/darwin/skhd/default.nix b/pkgs/os-specific/darwin/skhd/default.nix
new file mode 100644
index 00000000000..aa97a36e691
--- /dev/null
+++ b/pkgs/os-specific/darwin/skhd/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, Carbon }:
+
+stdenv.mkDerivation rec {
+  name = "skhd-${version}";
+  version = "0.0.10";
+
+  src = fetchFromGitHub {
+    owner = "koekeishiya";
+    repo = "skhd";
+    rev = "v${version}";
+    sha256 = "0a0r8z9bvb1pzqag7nqa84xm99n0xvg27cw11qcv65snr06bqc9w";
+  };
+
+  buildInputs = [ Carbon ];
+
+  makeFlags = [ "BUILD_PATH=$(out)/bin" ];
+
+  postInstall = ''
+    mkdir -p $out/Library/LaunchDaemons
+    cp ${./org.nixos.skhd.plist} $out/Library/LaunchDaemons/org.nixos.skhd.plist
+    substituteInPlace $out/Library/LaunchDaemons/org.nixos.skhd.plist --subst-var out
+  '';
+
+  # See https://github.com/koekeishiya/skhd/issues/28
+  hardeningDisable = [ "all" ];
+
+  meta = with stdenv.lib; {
+    description = "Simple hotkey daemon for macOS";
+    homepage = https://github.com/koekeishiya/skhd;
+    platforms = platforms.darwin;
+    maintainers = with maintainers; [ lnl7 ];
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/os-specific/darwin/skhd/org.nixos.skhd.plist b/pkgs/os-specific/darwin/skhd/org.nixos.skhd.plist
new file mode 100644
index 00000000000..e6624487740
--- /dev/null
+++ b/pkgs/os-specific/darwin/skhd/org.nixos.skhd.plist
@@ -0,0 +1,23 @@
+
+
+
+
+  Label
+  org.nixos.skhd
+  ProgramArguments
+  
+    @out@/bin/skhd
+  
+  ProcessType
+  Interactive
+  EnvironmentVariables
+  
+    PATH
+    @out@/bin:/nix/var/nix/profiles/default/bin:/usr/bin:/bin:/usr/sbin:/sbin
+  
+  RunAtLoad
+  
+  KeepAlive
+  
+
+
diff --git a/pkgs/os-specific/linux/amdgpu-pro/default.nix b/pkgs/os-specific/linux/amdgpu-pro/default.nix
index 0272eccd800..a3c09c3de99 100644
--- a/pkgs/os-specific/linux/amdgpu-pro/default.nix
+++ b/pkgs/os-specific/linux/amdgpu-pro/default.nix
@@ -30,9 +30,9 @@ let
 
 in stdenv.mkDerivation rec {
 
-  version = "17.10";
+  version = "17.40";
   pname = "amdgpu-pro";
-  build = "${version}-401251";
+  build = "${version}-492261";
 
   libCompatDir = "/run/lib/${libArch}";
 
@@ -41,7 +41,7 @@ in stdenv.mkDerivation rec {
   src = fetchurl {
     url =
     "https://www2.ati.com/drivers/linux/ubuntu/amdgpu-pro-${build}.tar.xz";
-    sha256 = "004n0df8acjpjz72z3bjxb2a0b7qwln13jlknfn7xxqvhhwwy40a";
+    sha256 = "1c073lp9cq1rc2mddky2r0j2dv9dd167qj02visz37vwaxbm2r5h";
     curlOpts = "--referer http://support.amd.com/en-us/kb-articles/Pages/AMD-Radeon-GPU-PRO-Linux-Beta-Driver%e2%80%93Release-Notes.aspx";
   };
 
@@ -57,15 +57,14 @@ in stdenv.mkDerivation rec {
     sourceRoot=.
   '';
 
-  modulePatches = [
-    ./patches/0001-disable-firmware-copy.patch
-    ./patches/0002-linux-4.9-fixes.patch
-    ./patches/0003-Change-seq_printf-format-for-64-bit-context.patch
-    ./patches/0004-fix-warnings-for-Werror.patch
-  ];
+  modulePatches = optionals (!libsOnly) ([
+    ./patches/0001-fix-warnings-for-Werror.patch
+    ./patches/0002-fix-sketchy-int-ptr-warning.patch
+    ./patches/0003-disable-firmware-copy.patch
+  ]);
 
   patchPhase = optionalString (!libsOnly) ''
-    pushd usr/src/amdgpu-pro-${build}
+    pushd usr/src/amdgpu-${build}
     for patch in $modulePatches
     do
       echo $patch
@@ -74,12 +73,18 @@ in stdenv.mkDerivation rec {
     popd
   '';
 
+  xreallocarray = ./xreallocarray.c;
+
   preBuild = optionalString (!libsOnly) ''
-    pushd usr/src/amdgpu-pro-${build}
+    pushd usr/src/amdgpu-${build}
     makeFlags="$makeFlags M=$(pwd)"
     patchShebangs pre-build.sh
     ./pre-build.sh ${kernel.version}
     popd
+    pushd lib
+    $CC -fPIC -shared -o libhack-xreallocarray.so $xreallocarray
+    strip libhack-xreallocarray.so
+    popd
   '';
 
   modules = [
@@ -89,7 +94,7 @@ in stdenv.mkDerivation rec {
   ];
 
   postBuild = optionalString (!libsOnly)
-    (concatMapStrings (m: "xz usr/src/amdgpu-pro-${build}/${m}\n") modules);
+    (concatMapStrings (m: "xz usr/src/amdgpu-${build}/${m}\n") modules);
 
   NIX_CFLAGS_COMPILE = "-Werror";
 
@@ -110,16 +115,17 @@ in stdenv.mkDerivation rec {
     pushd usr
     cp -r lib/${libArch}/* $out/lib
   '' + optionalString (!libsOnly) ''
-    cp -r src/amdgpu-pro-${build}/firmware $out/lib/firmware
+    cp -r src/amdgpu-${build}/firmware $out/lib/firmware
   '' + ''
     cp -r share $out/share
     popd
 
     pushd opt/amdgpu-pro
-  '' + optionalString (!stdenv.is64bit) ''
+  '' + optionalString (!libsOnly && stdenv.is64bit) ''
     cp -r bin $out/bin
   '' + ''
     cp -r include $out/include
+    cp -r share/* $out/share
     cp -r lib/${libArch}/* $out/lib
   '' + optionalString (!libsOnly) ''
     mv lib/xorg $out/lib/xorg
@@ -128,12 +134,12 @@ in stdenv.mkDerivation rec {
 
   '' + optionalString (!libsOnly)
     (concatMapStrings (m:
-      "install -Dm444 usr/src/amdgpu-pro-${build}/${m}.xz $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/gpu/drm/${m}.xz\n") modules)
+      "install -Dm444 usr/src/amdgpu-${build}/${m}.xz $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/gpu/drm/${m}.xz\n") modules)
   + ''
     mv $out/etc/vulkan $out/share
     interpreter="$(cat $NIX_CC/nix-support/dynamic-linker)"
     libPath="$out/lib:$out/lib/gbm:$depLibPath"
-  '' + optionalString (!stdenv.is64bit) ''
+  '' + optionalString (!libsOnly && stdenv.is64bit) ''
     for prog in clinfo modetest vbltest kms-universal-planes kms-steal-crtc modeprint amdgpu_test kmstest proptest; do
       patchelf --interpreter "$interpreter" --set-rpath "$libPath" "$out/bin/$prog"
     done
@@ -147,10 +153,17 @@ in stdenv.mkDerivation rec {
     for lib in `find "$out/lib/" -name '*.so*' -type f`; do
       patchelf --set-rpath "$libPath" "$lib"
     done
-    for lib in libEGL.so.1 libGL.so.1.2 ${optionalString (!libsOnly) "xorg/modules/extensions/libglx.so"} dri/amdgpu_dri.so; do
+    for lib in libEGL.so.1 libGL.so.1.2 ${optionalString (!libsOnly) "xorg/modules/extensions/libglx.so"} dri/amdgpu_dri.so libamdocl${bitness}.so; do
       perl -pi -e 's:${libReplaceDir}:${libCompatDir}:g' "$out/lib/$lib"
     done
+    for lib in dri/amdgpu_dri.so libdrm_amdgpu.so.1.0.0 libgbm_amdgpu.so.1.0.0 libkms_amdgpu.so.1.0.0 libamdocl${bitness}.so; do
+      perl -pi -e 's:/opt/amdgpu-pro/:/run/amdgpu-pro/:g' "$out/lib/$lib"
+    done
     substituteInPlace "$out/share/vulkan/icd.d/amd_icd${bitness}.json" --replace "/opt/amdgpu-pro/lib/${libArch}" "$out/lib"
+  '' + optionalString (!libsOnly) ''
+    for lib in drivers/modesetting_drv.so libglamoregl.so; do
+      patchelf --add-needed $out/lib/libhack-xreallocarray.so $out/lib/xorg/modules/$lib
+    done
   '';
 
   buildInputs = [
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0001-disable-firmware-copy.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0001-disable-firmware-copy.patch
deleted file mode 100644
index 4733e0580af..00000000000
--- a/pkgs/os-specific/linux/amdgpu-pro/patches/0001-disable-firmware-copy.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 704cef8638ffbdd8de9e57f28b43ea42c685ea87 Mon Sep 17 00:00:00 2001
-From: David McFarland 
-Date: Sat, 28 Jan 2017 16:57:26 -0400
-Subject: [PATCH 1/4] disable firmware copy
-
----
- pre-build.sh | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/pre-build.sh b/pre-build.sh
-index 622ff13..e3cd009 100755
---- a/pre-build.sh
-+++ b/pre-build.sh
-@@ -35,8 +35,3 @@ find ttm -name '*.c' -exec grep EXPORT_SYMBOL {} + \
-     | sort -u \
-     | awk -F'[()]' '{print "#define "$2" amd"$2" //"$0}'\
-     > include/rename_symbol.h
--
--FW_DIR="/lib/firmware/$KERNELVER"
--mkdir -p $FW_DIR
--cp -ar /usr/src/amdgpu-pro-17.10-401251/firmware/radeon $FW_DIR
--cp -ar /usr/src/amdgpu-pro-17.10-401251/firmware/amdgpu $FW_DIR
--- 
-2.12.2
-
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0001-fix-warnings-for-Werror.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0001-fix-warnings-for-Werror.patch
new file mode 100644
index 00000000000..ecde6401ac1
--- /dev/null
+++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0001-fix-warnings-for-Werror.patch
@@ -0,0 +1,71 @@
+From 9167d76c435a7c1df7954f0fbe5cc6d083f8ed2f Mon Sep 17 00:00:00 2001
+From: David McFarland 
+Date: Mon, 6 Feb 2017 22:13:49 -0400
+Subject: [PATCH 1/3] fix warnings for Werror
+
+---
+ amd/amdgpu/amdgpu_device.c         | 4 ++--
+ amd/amdgpu/amdgpu_sa.c             | 2 +-
+ amd/display/dc/bios/bios_parser2.c | 8 ++++----
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/amd/amdgpu/amdgpu_device.c b/amd/amdgpu/amdgpu_device.c
+index fc1c543..186e06d 100644
+--- a/amd/amdgpu/amdgpu_device.c
++++ b/amd/amdgpu/amdgpu_device.c
+@@ -3164,7 +3164,7 @@ void amdgpu_debugfs_cleanup(struct drm_minor *minor)
+ 	struct drm_info_node *node, *tmp;
+ 
+ 	if (!&minor->debugfs_root)
+-		return 0;
++		return;
+ 
+ 	mutex_lock(&minor->debugfs_lock);
+ 	list_for_each_entry_safe(node, tmp,
+@@ -3175,7 +3175,7 @@ void amdgpu_debugfs_cleanup(struct drm_minor *minor)
+ 	}
+ 	mutex_unlock(&minor->debugfs_lock);
+ 
+-	return 0;
++	return;
+ }
+ #endif
+ 
+diff --git a/amd/amdgpu/amdgpu_sa.c b/amd/amdgpu/amdgpu_sa.c
+index 7206b34..8b7123c 100644
+--- a/amd/amdgpu/amdgpu_sa.c
++++ b/amd/amdgpu/amdgpu_sa.c
+@@ -430,7 +430,7 @@ void amdgpu_sa_bo_dump_debug_info(struct amdgpu_sa_manager *sa_manager,
+ 		if (i->fence)
+ #if defined(BUILD_AS_DKMS)
+ 			seq_printf(m, " protected by 0x%08x on context %d",
+-					i->fence->seqno, i->fence->context);
++					i->fence->seqno, (int)i->fence->context);
+ #else
+ 			seq_printf(m, " protected by 0x%08x on context %llu",
+ 				   i->fence->seqno, i->fence->context);
+diff --git a/amd/display/dc/bios/bios_parser2.c b/amd/display/dc/bios/bios_parser2.c
+index 86fce5a..99681c5 100644
+--- a/amd/display/dc/bios/bios_parser2.c
++++ b/amd/display/dc/bios/bios_parser2.c
+@@ -1326,13 +1326,13 @@ static enum bp_result get_embedded_panel_info_v2_1(
+ 	info->lcd_timing.misc_info.VERTICAL_CUT_OFF = 0;
+ 
+ 	info->lcd_timing.misc_info.H_REPLICATION_BY2 =
+-		lvds->lcd_timing.miscinfo & ATOM_H_REPLICATIONBY2;
++		(lvds->lcd_timing.miscinfo & ATOM_H_REPLICATIONBY2) != 0;
+ 	info->lcd_timing.misc_info.V_REPLICATION_BY2 =
+-		lvds->lcd_timing.miscinfo & ATOM_V_REPLICATIONBY2;
++		(lvds->lcd_timing.miscinfo & ATOM_V_REPLICATIONBY2) != 0;
+ 	info->lcd_timing.misc_info.COMPOSITE_SYNC =
+-		lvds->lcd_timing.miscinfo & ATOM_COMPOSITESYNC;
++		(lvds->lcd_timing.miscinfo & ATOM_COMPOSITESYNC) != 0;
+ 	info->lcd_timing.misc_info.INTERLACE =
+-		lvds->lcd_timing.miscinfo & ATOM_INTERLACE;
++		(lvds->lcd_timing.miscinfo & ATOM_INTERLACE) != 0;
+ 
+ 	/* not provided by VBIOS*/
+ 	info->lcd_timing.misc_info.DOUBLE_CLOCK = 0;
+-- 
+2.15.1
+
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0002-fix-sketchy-int-ptr-warning.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0002-fix-sketchy-int-ptr-warning.patch
new file mode 100644
index 00000000000..20f429757a5
--- /dev/null
+++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0002-fix-sketchy-int-ptr-warning.patch
@@ -0,0 +1,25 @@
+From a07ee5dec35ca24a013a6638543ef5030b2bab40 Mon Sep 17 00:00:00 2001
+From: David McFarland 
+Date: Tue, 9 Jan 2018 21:45:33 -0400
+Subject: [PATCH 2/3] fix sketchy int->ptr warning
+
+---
+ amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/amd/display/amdgpu_dm/amdgpu_dm_helpers.c b/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
+index d0f091b..707815a 100644
+--- a/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
++++ b/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
+@@ -236,7 +236,7 @@ bool dm_helpers_dp_mst_write_payload_allocation_table(
+ 		pbn = drm_dp_calc_pbn_mode(clock, bpp);
+ 
+ 		slots = drm_dp_find_vcpi_slots(mst_mgr, pbn);
+-		ret = drm_dp_mst_allocate_vcpi(mst_mgr, mst_port, pbn, slots);
++		ret = drm_dp_mst_allocate_vcpi(mst_mgr, mst_port, pbn, &slots);
+ 
+ 		if (!ret)
+ 			return false;
+-- 
+2.15.1
+
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0002-linux-4.9-fixes.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0002-linux-4.9-fixes.patch
deleted file mode 100644
index aa6cbcc118d..00000000000
--- a/pkgs/os-specific/linux/amdgpu-pro/patches/0002-linux-4.9-fixes.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 0ead7017e1db18be971c24c891d4bdcc507deea7 Mon Sep 17 00:00:00 2001
-From: David McFarland 
-Date: Sun, 29 Jan 2017 18:23:47 -0400
-Subject: [PATCH 2/4] linux-4.9 fixes
-
----
- amd/amdkcl/kcl_io.c                     | 2 ++
- amd/display/amdgpu_dm/amdgpu_dm_types.c | 8 ++++++++
- 2 files changed, 10 insertions(+)
-
-diff --git a/amd/amdkcl/kcl_io.c b/amd/amdkcl/kcl_io.c
-index d8f843f..9a1bd9b 100644
---- a/amd/amdkcl/kcl_io.c
-+++ b/amd/amdkcl/kcl_io.c
-@@ -31,4 +31,6 @@ void amdkcl_io_init(void)
- 	_kcl_io_free_memtype = amdkcl_fp_setup("io_free_memtype", NULL);
- }
- #endif
-+#else
-+void amdkcl_io_init(void) {}
- #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0) */
-diff --git a/amd/display/amdgpu_dm/amdgpu_dm_types.c b/amd/display/amdgpu_dm/amdgpu_dm_types.c
-index 34313a9..44a4a71 100644
---- a/amd/display/amdgpu_dm/amdgpu_dm_types.c
-+++ b/amd/display/amdgpu_dm/amdgpu_dm_types.c
-@@ -1720,6 +1720,10 @@ static int dm_plane_helper_prepare_fb(
- static int dm_plane_helper_prepare_fb(
- 	struct drm_plane *plane,
- 	const struct drm_plane_state *new_state)
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
-+static int dm_plane_helper_prepare_fb(
-+	struct drm_plane *plane,
-+	struct drm_plane_state *new_state)
- #else
- static int dm_plane_helper_prepare_fb(
- 	struct drm_plane *plane,
-@@ -1766,6 +1770,10 @@ static void dm_plane_helper_cleanup_fb(
- static void dm_plane_helper_cleanup_fb(
- 	struct drm_plane *plane,
- 	const struct drm_plane_state *old_state)
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
-+static void dm_plane_helper_cleanup_fb(
-+	struct drm_plane *plane,
-+	struct drm_plane_state *old_state)
- #else
- static void dm_plane_helper_cleanup_fb(
- 	struct drm_plane *plane,
--- 
-2.12.2
-
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0003-Change-seq_printf-format-for-64-bit-context.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0003-Change-seq_printf-format-for-64-bit-context.patch
deleted file mode 100644
index 7a11c9bd4ef..00000000000
--- a/pkgs/os-specific/linux/amdgpu-pro/patches/0003-Change-seq_printf-format-for-64-bit-context.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From b6dd36dd90c5d88ae10b9dbc763d3bacb95ccddb Mon Sep 17 00:00:00 2001
-From: "Luke A. Guest" 
-Date: Sun, 25 Sep 2016 16:46:39 +0100
-Subject: [PATCH 3/4] Change seq_printf format for 64 bit context
-
----
- amd/amdgpu/amdgpu_sa.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/amd/amdgpu/amdgpu_sa.c b/amd/amdgpu/amdgpu_sa.c
-index 74932bf..db4119a 100644
---- a/amd/amdgpu/amdgpu_sa.c
-+++ b/amd/amdgpu/amdgpu_sa.c
-@@ -428,7 +428,7 @@ void amdgpu_sa_bo_dump_debug_info(struct amdgpu_sa_manager *sa_manager,
- 			   soffset, eoffset, eoffset - soffset);
- 
- 		if (i->fence)
--#if defined(BUILD_AS_DKMS)
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0)
- 			seq_printf(m, " protected by 0x%08x on context %d",
- 					i->fence->seqno, i->fence->context);
- #else
--- 
-2.12.2
-
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0003-disable-firmware-copy.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0003-disable-firmware-copy.patch
new file mode 100644
index 00000000000..0091c471680
--- /dev/null
+++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0003-disable-firmware-copy.patch
@@ -0,0 +1,25 @@
+From 7a3062acbbabdb29239bbc8c984e62589a88576e Mon Sep 17 00:00:00 2001
+From: David McFarland 
+Date: Tue, 9 Jan 2018 21:49:55 -0400
+Subject: [PATCH 3/3] disable firmware copy
+
+---
+ pre-build.sh | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/pre-build.sh b/pre-build.sh
+index e7b8a32..bad8f25 100755
+--- a/pre-build.sh
++++ b/pre-build.sh
+@@ -38,8 +38,3 @@ find ttm -name '*.c' -exec grep EXPORT_SYMBOL {} + \
+     | sort -u \
+     | awk -F'[()]' '{print "#define "$2" amd"$2" //"$0}'\
+     >> include/rename_symbol.h
+-
+-FW_DIR="/lib/firmware/$KERNELVER"
+-mkdir -p $FW_DIR
+-cp -ar /usr/src/amdgpu-17.40-492261/firmware/radeon $FW_DIR
+-cp -ar /usr/src/amdgpu-17.40-492261/firmware/amdgpu $FW_DIR
+-- 
+2.15.1
+
diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0004-fix-warnings-for-Werror.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0004-fix-warnings-for-Werror.patch
deleted file mode 100644
index cd360e18faa..00000000000
--- a/pkgs/os-specific/linux/amdgpu-pro/patches/0004-fix-warnings-for-Werror.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From dbf01d3934c52acaaa37f008859f69c5edf19ad5 Mon Sep 17 00:00:00 2001
-From: David McFarland 
-Date: Mon, 6 Feb 2017 22:13:49 -0400
-Subject: [PATCH 4/4] fix warnings for Werror
-
----
- amd/amdgpu/amdgpu_ttm.c                 | 2 ++
- amd/display/amdgpu_dm/amdgpu_dm_types.c | 2 +-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/amd/amdgpu/amdgpu_ttm.c b/amd/amdgpu/amdgpu_ttm.c
-index 0e30389..890aafa 100644
---- a/amd/amdgpu/amdgpu_ttm.c
-+++ b/amd/amdgpu/amdgpu_ttm.c
-@@ -1083,6 +1083,7 @@ uint32_t amdgpu_ttm_tt_pte_flags(struct amdgpu_device *adev, struct ttm_tt *ttm,
- 	return flags;
- }
- 
-+#if 0
- static void amdgpu_ttm_lru_removal(struct ttm_buffer_object *tbo)
- {
- 	struct amdgpu_device *adev = amdgpu_ttm_adev(tbo->bdev);
-@@ -1132,6 +1133,7 @@ static struct list_head *amdgpu_ttm_swap_lru_tail(struct ttm_buffer_object *tbo)
- 
- 	return res;
- }
-+#endif
- 
- static bool amdgpu_ttm_bo_eviction_valuable(struct ttm_buffer_object *bo,
- 					    const struct ttm_place *place)
-diff --git a/amd/display/amdgpu_dm/amdgpu_dm_types.c b/amd/display/amdgpu_dm/amdgpu_dm_types.c
-index 44a4a71..ae7e707 100644
---- a/amd/display/amdgpu_dm/amdgpu_dm_types.c
-+++ b/amd/display/amdgpu_dm/amdgpu_dm_types.c
-@@ -932,7 +932,7 @@ static void decide_crtc_timing_for_drm_display_mode(
- }
- 
- static struct dc_target *create_target_for_sink(
--		const struct amdgpu_connector *aconnector,
-+		struct amdgpu_connector *aconnector,
- 		const struct drm_display_mode *drm_mode,
- 		const struct dm_connector_state *dm_state)
- {
--- 
-2.12.2
-
diff --git a/pkgs/os-specific/linux/amdgpu-pro/xreallocarray.c b/pkgs/os-specific/linux/amdgpu-pro/xreallocarray.c
new file mode 100644
index 00000000000..ab47bacb822
--- /dev/null
+++ b/pkgs/os-specific/linux/amdgpu-pro/xreallocarray.c
@@ -0,0 +1,5 @@
+#include 
+
+void *xreallocarray(void *ptr, size_t nmemb, size_t size) {
+  return reallocarray(ptr, nmemb, size);
+}
diff --git a/pkgs/os-specific/linux/autofs/default.nix b/pkgs/os-specific/linux/autofs/default.nix
index 8c207e4a47d..79e12dd0f43 100644
--- a/pkgs/os-specific/linux/autofs/default.nix
+++ b/pkgs/os-specific/linux/autofs/default.nix
@@ -2,14 +2,14 @@
 , libxml2, kerberos, kmod, openldap, sssd, cyrus_sasl, openssl }:
 
 let
-  version = "5.1.3";
+  version = "5.1.4";
   name = "autofs-${version}";
 in stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
     url = "mirror://kernel/linux/daemons/autofs/v5/${name}.tar.xz";
-    sha256 = "1gxifa93104pxlmxrikhwciy5zdgk20m63siyhq1myym7vzfnvp9";
+    sha256 = "08hpphawzcdibwbhw0r3y7hnfczlazpp90sf3bz2imgza7p31klg";
   };
 
   preConfigure = ''
diff --git a/pkgs/os-specific/linux/bbswitch/default.nix b/pkgs/os-specific/linux/bbswitch/default.nix
index ade9b8f750f..f5d3b4f5c4e 100644
--- a/pkgs/os-specific/linux/bbswitch/default.nix
+++ b/pkgs/os-specific/linux/bbswitch/default.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "A module for powering off hybrid GPUs";
-    platforms = platforms.linux;
+    platforms = [ "x86_64-linux" "i686-linux" ];
     homepage = https://github.com/Bumblebee-Project/bbswitch;
     maintainers = with maintainers; [ abbradar ];
   };
diff --git a/pkgs/os-specific/linux/beegfs/default.nix b/pkgs/os-specific/linux/beegfs/default.nix
index 6cf233694cd..f17bc9492c1 100644
--- a/pkgs/os-specific/linux/beegfs/default.nix
+++ b/pkgs/os-specific/linux/beegfs/default.nix
@@ -5,7 +5,7 @@
 } :
 
 let
-  version = "6.17";
+  version = "6.18";
 
   subdirs = [
     "beeond_thirdparty/build"
@@ -30,7 +30,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://git.beegfs.com/pub/v6/repository/archive.tar.bz2?ref=${version}";
-    sha256 = "10xs7gzdmlg23k6zn1b7jij3lljn7rr1j6h476hq4lbg981qk3n3";
+    sha256 = "1g874qyxh4v53ah3lzchrqi0jci7wngr54q3f4d9q0kzvvifripn";
   };
 
   nativeBuildInputs = [ which unzip pkgconfig cppunit openjdk ant perl ];
diff --git a/pkgs/os-specific/linux/beegfs/kernel-module.nix b/pkgs/os-specific/linux/beegfs/kernel-module.nix
index 4525d156159..63e45928f21 100644
--- a/pkgs/os-specific/linux/beegfs/kernel-module.nix
+++ b/pkgs/os-specific/linux/beegfs/kernel-module.nix
@@ -3,13 +3,13 @@
 } :
 
 let
-  version = "6.17";
+  version = "6.18";
 in stdenv.mkDerivation {
   name = "beegfs-module-${version}-${kernel.version}";
 
   src = fetchurl {
     url = "https://git.beegfs.com/pub/v6/repository/archive.tar.bz2?ref=${version}";
-    sha256 = "10xs7gzdmlg23k6zn1b7jij3lljn7rr1j6h476hq4lbg981qk3n3";
+    sha256 = "1g874qyxh4v53ah3lzchrqi0jci7wngr54q3f4d9q0kzvvifripn";
   };
 
   hardeningDisable = [ "fortify" "pic" "stackprotector" ];
@@ -41,6 +41,5 @@ in stdenv.mkDerivation {
     platforms = [ "i686-linux" "x86_64-linux" ];
     license = licenses.gpl2;
     maintainers = with maintainers; [ markuskowa ];
-    broken = versionAtLeast kernel.version "4.14";
   };
 }
diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix
index 744f37b8b8c..d4c4582ffb2 100644
--- a/pkgs/os-specific/linux/busybox/default.nix
+++ b/pkgs/os-specific/linux/busybox/default.nix
@@ -49,6 +49,8 @@ stdenv.mkDerivation rec {
     ./busybox-in-store.patch
   ];
 
+  postPatch = "patchShebangs .";
+
   configurePhase = ''
     export KCONFIG_NOTIMESTAMP=1
     make ${if enableMinimal then "allnoconfig" else "defconfig"}
diff --git a/pkgs/os-specific/linux/ena/default.nix b/pkgs/os-specific/linux/ena/default.nix
index 9ed691d69f0..e3f382ababc 100644
--- a/pkgs/os-specific/linux/ena/default.nix
+++ b/pkgs/os-specific/linux/ena/default.nix
@@ -1,14 +1,14 @@
 { lib, stdenv, fetchFromGitHub, kernel, kmod }:
 
 stdenv.mkDerivation rec {
-  version = "1.5.0";
+  version = "1.5.2";
   name = "ena-${version}-${kernel.version}";
 
   src = fetchFromGitHub {
     owner = "amzn";
     repo = "amzn-drivers";
     rev = "ena_linux_${version}";
-    sha256 = "1h3vnwa2129advyws69n0sqyra4nz68mng6g84whbvhzjyx810sj";
+    sha256 = "18wf36092kr3zlpnqdkcdlim3vvjxy5f24zzsv4fwa7xg12mcfjm";
   };
 
   hardeningDisable = [ "pic" ];
diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
index acdba5987bb..724498b960c 100644
--- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
+++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
@@ -2,51 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "firmware-linux-nonfree-${version}";
-  version = "2018-01-04-${src.iwlRev}";
+  version = "2018-03-20";
 
-  # The src runCommand automates the process of building a merged repository of both
-  #
-  # https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/
-  # https://git.kernel.org/cgit/linux/kernel/git/iwlwifi/linux-firmware.git/
-  #
-  # This gives us up to date iwlwifi firmware as well as
-  # the usual set of firmware. firmware/linux-firmware usually lags kernel releases
-  # so iwlwifi cards will fail to load on newly released kernels.
-  #
-  # To update, go to the above repositories and look for latest tags / commits, then
-  # update version to the more recent commit date
-
-  src = runCommand "firmware-linux-nonfree-src-merged-${version}" {
-    shallowSince = "2017-10-01";
-    baseRev = "65b1c68c63f974d72610db38dfae49861117cae2";
-    iwlRev = "iwlwifi-fw-2017-11-15";
-
-    # When updating this, you need to let it run with a wrong hash, in order to find out the desired hash
-    # randomly mutate the hash to break out of fixed hash, when updating
-    outputHash = "1anr7fblxfcrfrrgq98kzy64yrwygc2wdgi47skdmjxhi3wbrvxz";
-
-    outputHashAlgo = "sha256";
-    outputHashMode = "recursive";
-
-    # Doing the download on a remote machine just duplicates network
-    # traffic, so don't do that.
-    preferLocalBuild = true;
-
-    nativeBuildInputs = [ cacert git gnupg ];
-  } ''
-    git init src && (
-      cd src
-      git config user.email "build-daemon@nixos.org"
-      git config user.name "Nixos Build Daemon $name"
-      git remote add base https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
-      git remote add iwl https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/linux-firmware.git
-      git fetch --shallow-since=$shallowSince base
-      git fetch --shallow-since=$shallowSince iwl
-      git checkout -b work $baseRev
-      git merge $iwlRev)
-    rm -rf src/.git
-    cp -a src $out
-  '';
+  src = fetchgit {
+    url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git";
+    rev = "8c1e439c967a50f0698d61aafdba3841aff10db0";
+    sha256 = "110vxgahyx5dvylqrxsm5cmx4a32cl2zchvm6cgc270jz75fg7wd";
+  };
 
   preInstall = ''
     mkdir -p $out
diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
index c71f1c0ea2e..9c83092481b 100644
--- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
+++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
@@ -11,27 +11,16 @@ stdenv.mkDerivation rec {
     sha256 = "12aisha8rlr28310hakps04z9p45kd2wvks0w1vxw1kwfh1ncy9s";
   };
 
-  dontStrip = true;    # Stripping breaks some of the binaries
-
   installPhase = ''
     mkdir -p $out/share/raspberrypi/boot
     cp -R boot/* $out/share/raspberrypi/boot
-    cp -R hardfp/opt/vc/* $out
-    cp opt/vc/LICENCE $out/share/raspberrypi
-
-    for f in $out/bin/*; do
-      if isELF "$f"; then
-        patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$f"
-        patchelf --set-rpath "$out/lib" "$f"
-      fi
-    done
   '';
 
   meta = with stdenv.lib; {
     description = "Firmware for the Raspberry Pi board";
-    homepage = https://github.com/raspberrypi;
-    license = licenses.unfree;
+    homepage = https://github.com/raspberrypi/firmware;
+    license = licenses.unfreeRedistributableFirmware; # See https://github.com/raspberrypi/firmware/blob/master/boot/LICENCE.broadcom
     platforms = [ "armv6l-linux" "armv7l-linux" "aarch64-linux" ];
-    maintainers = with maintainers; [ viric tavyc ];
+    maintainers = with maintainers; [ dezgeg viric tavyc ];
   };
 }
diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/tools-dont-install-sysv-init-scripts.patch b/pkgs/os-specific/linux/firmware/raspberrypi/tools-dont-install-sysv-init-scripts.patch
new file mode 100644
index 00000000000..e12aeeb0cdb
--- /dev/null
+++ b/pkgs/os-specific/linux/firmware/raspberrypi/tools-dont-install-sysv-init-scripts.patch
@@ -0,0 +1,20 @@
+diff --git a/interface/vmcs_host/linux/vcfiled/CMakeLists.txt b/interface/vmcs_host/linux/vcfiled/CMakeLists.txt
+index aed0e83..b325676 100644
+--- a/interface/vmcs_host/linux/vcfiled/CMakeLists.txt
++++ b/interface/vmcs_host/linux/vcfiled/CMakeLists.txt
+@@ -17,15 +17,6 @@ target_link_libraries(vcfiled
+ install(TARGETS vcfiled 
+         RUNTIME DESTINATION sbin)
+ 
+-configure_file (etc/init.d/vcfiled ${PROJECT_BINARY_DIR}/etc/init.d/vcfiled)
+-
+-# script to start up vcfiled at start of day
+-install(PROGRAMS ${PROJECT_BINARY_DIR}/etc/init.d/vcfiled
+-        DESTINATION /etc/init.d)
+-# install locally to the installation directory too
+-install(PROGRAMS ${PROJECT_BINARY_DIR}/etc/init.d/vcfiled
+-        DESTINATION ${VMCS_INSTALL_PREFIX}/share/install)
+-
+ # test program for vcfiled_check library
+ add_executable(vcfiled_lock_test vcfiled_lock_test.c)
+ target_link_libraries(vcfiled_lock_test vcfiled_check)
diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix b/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix
new file mode 100644
index 00000000000..7f4c9dae166
--- /dev/null
+++ b/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "raspberrypi-tools-${version}";
+  version = "2018-02-05";
+
+  src = fetchFromGitHub {
+    owner = "raspberrypi";
+    repo = "userland";
+    rev = "a343dcad1dae4e93f4bfb99496697e207f91027e";
+    sha256 = "1z4qrwjb7x3a45mx978q8vyhnx068sgzhymm4z0ayhckji4ngal1";
+  };
+
+  patches = [ ./tools-dont-install-sysv-init-scripts.patch ];
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  preConfigure = ''
+    cmakeFlagsArray+=("-DVMCS_INSTALL_PREFIX=$out")
+  '' + stdenv.lib.optionalString stdenv.isAarch64 ''
+    cmakeFlagsArray+=("-DARM64=1")
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Userland tools for the Raspberry Pi board";
+    homepage = https://github.com/raspberrypi/userland;
+    license = licenses.bsd3;
+    platforms = [ "armv6l-linux" "armv7l-linux" "aarch64-linux" ];
+    maintainers = with maintainers; [ dezgeg viric tavyc ];
+  };
+}
diff --git a/pkgs/os-specific/linux/ixgbevf/default.nix b/pkgs/os-specific/linux/ixgbevf/default.nix
index ffdf0d678d7..6bcc548ba52 100644
--- a/pkgs/os-specific/linux/ixgbevf/default.nix
+++ b/pkgs/os-specific/linux/ixgbevf/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "ixgbevf-${version}-${kernel.version}";
-  version = "4.3.3";
+  version = "4.3.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/e1000/ixgbevf-${version}.tar.gz";
-    sha256 = "0kq8y0944kaprw445wb8iswdck2jmc0xpkx0iv6idy3r5cc4hvyg";
+    sha256 = "122zn9nd8f95bpidiiinc8xaizypkirqs8vlmsdy2iv3w65md9k3";
   };
 
   nativeBuildInputs = kernel.moduleBuildDependencies;
diff --git a/pkgs/os-specific/linux/jfbview/default.nix b/pkgs/os-specific/linux/jfbview/default.nix
index 89a220c85e2..fdec72dd09c 100644
--- a/pkgs/os-specific/linux/jfbview/default.nix
+++ b/pkgs/os-specific/linux/jfbview/default.nix
@@ -64,5 +64,7 @@ stdenv.mkDerivation rec {
     homepage = https://seasonofcode.com/pages/jfbview.html;
     license = licenses.asl20;
     platforms = platforms.linux;
+    # incompatible with latest mupdf, see https://github.com/jichu4n/JFBView/issues/17
+    broken = true;
   };
 }
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 50f5999c557..3755c425808 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -135,6 +135,7 @@ with stdenv.lib;
   NETFILTER y
   NETFILTER_ADVANCED y
   CGROUP_BPF? y # Required by systemd per-cgroup firewalling
+  CGROUP_NET_PRIO y # Required by systemd
   IP_ROUTE_VERBOSE y
   IP_MROUTE_MULTIPLE_TABLES y
   IP_VS_PROTO_TCP y
diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index 4b8515a86d3..47784e77012 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,13 +3,13 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.14.24";
+  version = "4.14.36";
 
   # branchVersion needs to be x.y
   extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "00cqhc8198f4gj6cpz7nblpgi5zh2145arjx1yp0p4gmswdjslds";
+    sha256 = "0hxwd3kl5g7zrcl3b00nxdv0zjkmmfrk1i5v3hrjm0dmsw249qna";
   };
 } // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.15.nix b/pkgs/os-specific/linux/kernel/linux-4.15.nix
index 1c488989243..07f408027d8 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.15.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.15.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.15.7";
+  version = "4.15.18";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1in8gy82ccpri7xhbgim3jrh15lbfrfzjgg69g0yvq534d5xyi6d";
+    sha256 = "0hdg5h91zwypsgb1lp1m5q1iak1g00rml54fh6j7nj8dgrqwv29z";
   };
 } // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index 4f42f7b81c7..fe8633ed0da 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.4.120";
+  version = "4.4.129";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0y7li4vcvv04aqkrgl01i98pgwm9njzrb8y8wdvwaq9658vhfpx2";
+    sha256 = "0aviyky8f73l6jpi1d4by947rj78d5vckxkyf9aj73bavaxc8rd1";
   };
 } // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index d1bf5fb5c62..63fe3db3b57 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.9.86";
+  version = "4.9.96";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "11bf1jcxn5gwd1g99ml2kn65vkpciq8hdz7xc0bjy66gxysnxkx7";
+    sha256 = "0zw7x86c8qa2kzkwlxlhqzsnddyp1ncw4ja660bqnzqrnmp5jvw2";
   };
 } // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix b/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix
index 85d31048ffc..5685e6dd904 100644
--- a/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix
+++ b/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix
@@ -3,9 +3,9 @@
 with stdenv.lib;
 
 let
-  version = "4.15.7";
+  version = "4.15.18";
   revision = "a";
-  sha256 = "19kgy1fa4flnqm3a50hilgjczqkscay10183cvkzy3vxrnf8fl0f";
+  sha256 = "1wld16i3r06mqxwwkghsxnnivg1jpc6c15y9iclhdgl4srcs1qp6";
 
   # modVersion needs to be x.y.z, will automatically add .0 if needed
   modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index 60fb0064513..9833bb57baf 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -35,6 +35,8 @@ in {
   extraMeta ? {},
   # Whether to utilize the controversial import-from-derivation feature to parse the config
   allowImportFromDerivation ? false,
+  # ignored
+  features ? null,
 
   hostPlatform
 }:
diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix
index 06552eb3579..b386bebddf3 100644
--- a/pkgs/os-specific/linux/kernel/perf.nix
+++ b/pkgs/os-specific/linux/kernel/perf.nix
@@ -12,7 +12,7 @@ assert versionAtLeast kernel.version "3.12";
 stdenv.mkDerivation {
   name = "perf-linux-${kernel.version}";
 
-  inherit (kernel) src makeFlags;
+  inherit (kernel) src;
 
   preConfigure = ''
     cd tools/perf
@@ -24,17 +24,21 @@ stdenv.mkDerivation {
       substituteInPlace $x --replace /usr/lib/debug /run/current-system/sw/lib/debug
     done
 
-    [ -f bash_completion ] && sed -i 's,^have perf,_have perf,' bash_completion
-    export makeFlags="DESTDIR=$out WERROR=0 $makeFlags"
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -DTIPDIR=\"$out/share/doc/perf-tip\""
+    if [ -f bash_completion ]; then
+      sed -i 's,^have perf,_have perf,' bash_completion
+    fi
   '';
 
+  makeFlags = ["prefix=$(out)" "WERROR=0"] ++ kernel.makeFlags;
+
   # perf refers both to newt and slang
-  nativeBuildInputs = [ asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt
-      flex bison libiberty libaudit makeWrapper pkgconfig python perl ];
-  buildInputs =
-    [ elfutils newt slang libunwind libbfd zlib openssl systemtap.stapBuild numactl
-    ] ++ stdenv.lib.optional withGtk gtk2;
+  nativeBuildInputs = [
+    asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt
+    flex bison libiberty libaudit makeWrapper pkgconfig python perl
+  ];
+  buildInputs = [
+    elfutils newt slang libunwind libbfd zlib openssl systemtap.stapBuild numactl
+  ] ++ stdenv.lib.optional withGtk gtk2;
 
   # Note: we don't add elfutils to buildInputs, since it provides a
   # bad `ld' and other stuff.
@@ -43,6 +47,7 @@ stdenv.mkDerivation {
       "-Wno-error=bool-compare"
       "-Wno-error=deprecated-declarations"
       "-DOBJDUMP_PATH=\"${binutils}/bin/objdump\""
+      "-DTIPDIR=\"$(out)/share/doc/perf-tip\""
     ]
     # gcc before 6 doesn't know these options
     ++ stdenv.lib.optionals (hasPrefix "gcc-6" stdenv.cc.cc.name) [
@@ -50,7 +55,7 @@ stdenv.mkDerivation {
     ];
 
   separateDebugInfo = true;
-  installFlags = "install install-man ASCIIDOC8=1";
+  installFlags = "install install-man ASCIIDOC8=1 prefix=$(out)";
 
   preFixup = ''
     wrapProgram $out/bin/perf \
diff --git a/pkgs/os-specific/linux/libsemanage/default.nix b/pkgs/os-specific/linux/libsemanage/default.nix
index c60d96bba78..587349e4067 100644
--- a/pkgs/os-specific/linux/libsemanage/default.nix
+++ b/pkgs/os-specific/linux/libsemanage/default.nix
@@ -13,7 +13,13 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ bison flex ];
   buildInputs = [ libsepol libselinux ustr bzip2 libaudit ];
 
-  NIX_CFLAGS_COMPILE = "-fstack-protector-all -std=gnu89";
+  NIX_CFLAGS_COMPILE = [
+    "-fstack-protector-all"
+    "-std=gnu89"
+    # these were added to fix build with gcc7. review on update
+    "-Wno-error=format-truncation"
+    "-Wno-error=implicit-fallthrough"
+  ];
 
   preBuild = ''
     makeFlagsArray+=("PREFIX=$out")
diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix
index 97843b2253f..857a3b580a8 100644
--- a/pkgs/os-specific/linux/microcode/intel.nix
+++ b/pkgs/os-specific/linux/microcode/intel.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "microcode-intel-${version}";
-  version = "20171117";
+  version = "20180312";
 
   src = fetchurl {
-    url = "https://downloadmirror.intel.com/27337/eng/microcode-${version}.tgz";
-    sha256 = "1p14ypbg28bdkbza6dx6dpjrdr5p13vmgrh2cw0y1v2qzalivgck";
+    url = "https://downloadmirror.intel.com/27591/eng/microcode-${version}.tgz";
+    sha256 = "0yg7q5blcqgq8jyjxhn9n48rxws77ylqzyn4kn10l6yzwan1yf0b";
   };
 
   buildInputs = [ libarchive ];
diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix
index 7edc7b58c6c..be52cbc2029 100644
--- a/pkgs/os-specific/linux/nftables/default.nix
+++ b/pkgs/os-specific/linux/nftables/default.nix
@@ -2,11 +2,12 @@
 , flex, bison, libmnl, libnftnl, gmp, readline }:
 
 stdenv.mkDerivation rec {
-  name = "nftables-0.8.2";
+  version = "0.8.3";
+  name = "nftables-${version}";
 
   src = fetchurl {
     url = "http://netfilter.org/projects/nftables/files/${name}.tar.bz2";
-    sha256 = "1v370wzh3fzby0cdb9iykkhdj1yjcp5qkp33xyn7w7pii2phlpv7";
+    sha256 = "0f2yv7as1ybkfvn75f72x0z9y1ydibw4s3hbzhlmvsc8vgsy2syi";
   };
 
   configureFlags = [
diff --git a/pkgs/os-specific/linux/nvidia-x11/builder-legacy173.sh b/pkgs/os-specific/linux/nvidia-x11/builder-legacy173.sh
deleted file mode 100755
index 5d47df9a87a..00000000000
--- a/pkgs/os-specific/linux/nvidia-x11/builder-legacy173.sh
+++ /dev/null
@@ -1,99 +0,0 @@
-source $stdenv/setup
-
-dontPatchELF=1 # must keep libXv, $out in RPATH
-
-
-unpackFile() {
-    sh $src -x
-}
-
-
-buildPhase() {
-    if test -z "$libsOnly"; then
-        echo "Building linux driver against kernel: " $kernel;
-
-        cd usr/src/nv/
-
-        shopt -s nullglob
-
-        for a in $kpatches; do
-          patch -p1 < $a
-        done
-
-        # Workaround: get it to build on kernels that have CONFIG_XEN
-        # set.  Disable the test, apply a patch to disable the Xen
-        # functionality.
-        
-        #substituteInPlace Makefile.kbuild --replace xen_sanity_check fnord
-        #patch -p1 < $xenPatch
-
-        # Create the module.
-        kernelVersion=$(cd $kernel/lib/modules && ls)
-        sysSource=$(echo $kernel/lib/modules/$kernelVersion/source)
-        sysOut=$(echo $kernel/lib/modules/$kernelVersion/build)
-        unset src # used by the nv makefile
-        make SYSSRC=$sysSource SYSOUT=$sysOut module
-        cd ../../..
-    fi
-}
-
-
-installPhase() {
-
-    # Install libGL and friends.
-    mkdir -p $out/lib
-    cp -prd usr/lib/* usr/X11R6/lib/libXv* $out/lib/
-
-    ln -snf libGLcore.so.$versionNumber $out/lib/libGLcore.so
-    ln -snf libGLcore.so.$versionNumber $out/lib/libGLcore.so.1
-    ln -snf libGL.so.$versionNumber $out/lib/libGL.so
-    ln -snf libGL.so.$versionNumber $out/lib/libGL.so.1
-    ln -snf libnvidia-cfg.so.$versionNumber $out/lib/libnvidia-cfg.so.1
-    ln -snf libnvidia-tls.so.$versionNumber $out/lib/libnvidia-tls.so.1
-    ln -snf libnvidia-tls.so.$versionNumber $out/lib/tls/libnvidia-tls.so.1
-    ln -snf libXvMCNVIDIA.so.$versionNumber $out/lib/libXvMCNVIDIA_dynamic.so.1
-    ln -snf libcuda.so.$versionNumber $out/lib/libcuda.so.1
-
-    patchelf --set-rpath $out/lib:$glPath $out/lib/libGL.so.*.*
-    patchelf --set-rpath $out/lib:$glPath $out/lib/libXvMCNVIDIA.so.*.*
-    set +e
-    # Legacy nvidia doesn't have cuda
-    patchelf --set-rpath $cudaPath $out/lib/libcuda.so.*.*
-    set -e
-    
-    if test -z "$libsOnly"; then
-        
-        # Install the kernel module.
-        mkdir -p $out/lib/modules/$kernelVersion/misc
-        cp usr/src/nv/nvidia.ko $out/lib/modules/$kernelVersion/misc
-
-        # Install the X driver.
-        mkdir -p $out/lib/xorg/modules
-        cp -prd usr/X11R6/lib/modules/* $out/lib/xorg/modules/
-
-        ln -snf libnvidia-wfb.so.$versionNumber $out/lib/xorg/modules/libnvidia-wfb.so.1
-        ln -snf libglx.so.$versionNumber $out/lib/xorg/modules/extensions/libglx.so
-
-        patchelf --set-rpath $out/lib $out/lib/xorg/modules/extensions/libglx.so.*.*
-
-        # Install the programs.
-        mkdir -p $out/bin
-
-        for i in nvidia-settings nvidia-xconfig; do
-	    cp usr/bin/$i $out/bin/$i
-	    patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-	        --set-rpath $out/lib:$programPath:$glPath $out/bin/$i
-        done
-    
-        # Header files etc.
-        cp -prd usr/include usr/share $out
-
-        # Patch the `nvidia-settings.desktop' file.
-        substituteInPlace $out/share/applications/nvidia-settings.desktop \
-            --replace '__UTILS_PATH__' $out/bin \
-            --replace '__PIXMAP_PATH__' $out/share/pixmaps
-    fi
-}
-
-
-genericBuild
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index d0348bd67d4..11a97d420a8 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -17,11 +17,13 @@ in
 rec {
   # Policy: use the highest stable version as the default (on our master).
   stable = generic {
-    version = "390.25";
-    sha256_32bit = "0fkbpx01l46pprrd4nlc2y6hfmkb55ddlwm1r84kr6j08qmmb0qi";
-    sha256_64bit = "0whsls1mm6vkll5qmxnyz8vjgspp1rmqpsampgi83k62n514c08r";
-    settingsSha256 = "1jhbr68z36s3fr9vx3ga2f6yrzlwpc0j5mw8h12g65p7wdsbk6y7";
-    persistencedSha256 = "033azbhi50f1b0lw759sncgf7ckh2m2c0khj5v15sch9kl1fzk8i";
+    version = "390.48";
+    sha256_32bit = "1y6n2hfz9vd0h7gd31fgxcl76s5pjf8afwqyq5slqpcxpd78j5ai";
+    sha256_64bit = "16a3blvizcksmaxr644s857yanw3i3vcvqvn7qnwbsbqpmxga09c";
+    settingsSha256 = "058xaiw5g0kxrvc3lvy4424fqbjkvmsznj2v73cgbm25i1m83krl";
+    persistencedSha256 = "0y86bhzl42lqyrbibqzf8a8yd49zbq3ryb78vgsl13i44f9sl79k";
+
+    patches = [ ./fix_missing_symbol.patch ];
   };
 
   beta = stable; # not enough interest to maintain beta ATM
@@ -46,12 +48,13 @@ rec {
     persistencedSha256 = null;
     useGLVND = false;
     useProfiles = false;
+    settings32Bit = true;
 
     prePatch = let
       debPatches = fetchurl {
         url = "mirror://debian/pool/non-free/n/nvidia-graphics-drivers-legacy-304xx/"
-            + "nvidia-graphics-drivers-legacy-304xx_304.135-2.debian.tar.xz";
-        sha256 = "0mhji0ssn7075q5a650idigs48kzf11pzj2ca2n07rwxg3vj6pdr";
+            + "nvidia-graphics-drivers-legacy-304xx_304.137-5.debian.tar.xz";
+        sha256 = "0n8512mfcnvklfbg8gv4lzbkm3z6nncwj6ix2b8ngdkmc04f3b6l";
       };
       prefix = "debian/module/debian/patches";
       applyPatches = pnames: if pnames == [] then null else
@@ -63,6 +66,4 @@ rec {
     in applyPatches [ "fix-typos" ];
     patches = maybePatch_drm_legacy;
   };
-
-  legacy_173 = callPackage ./legacy173.nix { };
 }
diff --git a/pkgs/os-specific/linux/nvidia-x11/fix_missing_symbol.patch b/pkgs/os-specific/linux/nvidia-x11/fix_missing_symbol.patch
new file mode 100644
index 00000000000..ea783b4f011
--- /dev/null
+++ b/pkgs/os-specific/linux/nvidia-x11/fix_missing_symbol.patch
@@ -0,0 +1,19 @@
+https://devtalk.nvidia.com/default/topic/1030082/linux/kernel-4-16-rc1-breaks-latest-drivers-unknown-symbol-swiotlb_map_sg_attrs-/
+--- a/kernel/common/inc/nv-linux.h~     2018-01-25 06:09:41.000000000 +0100
++++ b/kernel/common/inc/nv-linux.h      2018-03-05 13:58:17.746725638 +0100
+@@ -1209,6 +1209,7 @@ static inline NvU32 nv_alloc_init_flags(
+ static inline NvBool nv_dma_maps_swiotlb(struct pci_dev *dev)
+ {
+     NvBool swiotlb_in_use = NV_FALSE;
++#if 0
+ #if defined(CONFIG_SWIOTLB)
+   #if defined(NV_DMA_OPS_PRESENT) || defined(NV_GET_DMA_OPS_PRESENT)
+     /*
+@@ -1251,7 +1252,7 @@ static inline NvBool nv_dma_maps_swiotlb
+     swiotlb_in_use = (swiotlb == 1);
+   #endif
+ #endif
+-
++#endif
+     return swiotlb_in_use;
+ }
diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix
index bde8ad361dc..13e5d1b76ea 100644
--- a/pkgs/os-specific/linux/nvidia-x11/generic.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix
@@ -6,6 +6,7 @@
 , useGLVND ? true
 , useProfiles ? true
 , preferGtk2 ? false
+, settings32Bit ? false
 
 , prePatch ? ""
 , patches ? []
@@ -68,7 +69,7 @@ let
     disallowedReferences = optional (!libsOnly) [ kernel.dev ];
 
     passthru = {
-      settings = callPackage (import ./settings.nix self settingsSha256) {
+      settings = (if settings32Bit then callPackage_i686 else callPackage) (import ./settings.nix self settingsSha256) {
         withGtk2 = preferGtk2;
         withGtk3 = !preferGtk2;
       };
@@ -79,7 +80,7 @@ let
       homepage = http://www.nvidia.com/object/unix.html;
       description = "X.org driver and kernel module for NVIDIA graphics cards";
       license = licenses.unfreeRedistributable;
-      platforms = platforms.linux;
+      platforms = [ "i686-linux" "x86_64-linux" ];
       maintainers = [ maintainers.vcunat ];
       priority = 4; # resolves collision with xorg-server's "lib/xorg/modules/extensions/libglx.so"
     };
diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix
deleted file mode 100644
index 51a230974c8..00000000000
--- a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{stdenv, fetchurl, kernel, xorg, zlib, gtk2, atk, pango, glib, gdk_pixbuf}:
-
-let
-
-  versionNumber = "173.14.39";
-
-in
-
-stdenv.mkDerivation {
-  name = "nvidia-x11-${versionNumber}-${kernel.version}";
-
-  builder = ./builder-legacy173.sh;
-
-  src =
-    if stdenv.system == "i686-linux" then
-      fetchurl {
-        url = "https://download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}-pkg0.run";
-        sha256 = "08xb7s7cxmj4zv4i3645kjhlhhwxiq6km9ixmsw3vv91f7rkb6d0";
-      }
-    else if stdenv.system == "x86_64-linux" then
-      fetchurl {
-        url = "https://download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-pkg0.run";
-        sha256 = "1p2ls0xj81l8v4n6dbjj3p5wlw1iyhgzyvqcv4h5fdxhhs2cb3md";
-      }
-    else throw "nvidia-x11 does not support platform ${stdenv.system}";
-
-  kernel = kernel.dev;
-
-  hardeningDisable = [ "pic" "format" ];
-
-  inherit versionNumber;
-
-  dontStrip = true;
-
-  glPath = stdenv.lib.makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr];
-
-  cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.cc.cc];
-
-  programPath = stdenv.lib.makeLibraryPath [ gtk2 atk pango glib gdk_pixbuf xorg.libXv ];
-
-  passthru = {
-    settings = null;
-    persistenced = null;
-    useGLVND = false;
-    useProfiles = false;
-  };
-
-  meta = {
-    homepage = http://www.nvidia.com/object/unix.html;
-    description = "X.org driver and kernel module for Legacy NVIDIA graphics cards";
-    license = stdenv.lib.licenses.unfree;
-  };
-}
diff --git a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix
index 22fd1242700..21e6cb5d500 100644
--- a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.nvidia.com/object/unix.html;
     description = "Settings application for NVIDIA graphics cards";
     license = licenses.unfreeRedistributable;
-    platforms = platforms.linux;
+    platforms = nvidia_x11.meta.platforms;
     maintainers = with maintainers; [ abbradar ];
   };
 }
diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix
index bbe3af5d016..740067af558 100644
--- a/pkgs/os-specific/linux/nvidia-x11/settings.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix
@@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.nvidia.com/object/unix.html;
     description = "Settings application for NVIDIA graphics cards";
     license = licenses.unfreeRedistributable;
-    platforms = platforms.linux;
+    platforms = nvidia_x11.meta.platforms;
     maintainers = with maintainers; [ abbradar ];
   };
 }
diff --git a/pkgs/os-specific/linux/nvidiabl/default.nix b/pkgs/os-specific/linux/nvidiabl/default.nix
index 6f9af040b8a..02161f7133c 100644
--- a/pkgs/os-specific/linux/nvidiabl/default.nix
+++ b/pkgs/os-specific/linux/nvidiabl/default.nix
@@ -2,18 +2,19 @@
 
 stdenv.mkDerivation rec {
   name = "nvidiabl-${version}-${kernel.version}";
-  version = "0.87";
+  version = "2017-09-26";
 
+  # We use a fork which adds support for newer kernels -- upstream has been abandoned.
   src = fetchFromGitHub {
-    owner = "guillaumezin";
+    owner = "yorickvP";
     repo = "nvidiabl";
-    rev = "v${version}";
-    sha256 = "1hs61dxn84vsyvrd2s899dhgg342mhfkbdn1nkhcvly45hdp2nca";
+    rev = "2d909f4dfceb24ce98479fd571411c6ec3b71bea";
+    sha256 = "0dsar8fsaxwywjh6rbrxkhdp142vqjnsyxfz6bgpbqml6slpiqs1";
   };
 
   hardeningDisable = [ "pic" ];
 
-  patches = [ ./linux4compat.patch ];
+  nativeBuildInputs = kernel.moduleBuildDependencies;
 
   preConfigure = ''
     sed -i 's|/sbin/depmod|#/sbin/depmod|' Makefile
@@ -25,11 +26,11 @@ stdenv.mkDerivation rec {
     "KVER=${kernel.modDirVersion}"
   ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Linux driver for setting the backlight brightness on laptops using NVIDIA GPU";
     homepage = https://github.com/guillaumezin/nvidiabl;
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
-    broken = !stdenv.lib.versionOlder kernel.version "4.9";
+    license = licenses.gpl2;
+    platforms = [ "x86_64-linux" "i686-linux" ];
+    maintainers = with maintainers; [ yorickvp ];
   };
 }
diff --git a/pkgs/os-specific/linux/nvidiabl/linux4compat.patch b/pkgs/os-specific/linux/nvidiabl/linux4compat.patch
deleted file mode 100644
index ad8236a2b63..00000000000
--- a/pkgs/os-specific/linux/nvidiabl/linux4compat.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 2bf6f08b2492cc04a2c39fdcb22a2d0c18963d1c Mon Sep 17 00:00:00 2001
-From: sonic414 
-Date: Tue, 28 Apr 2015 19:30:15 +0530
-Subject: [PATCH] strnicmp to strncasecmp in Linux 4.0.0
-
----
- nvidiabl-module.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/nvidiabl-module.c b/nvidiabl-module.c
-index b789ea4..b306579 100644
---- a/nvidiabl-module.c
-+++ b/nvidiabl-module.c
-@@ -214,7 +214,7 @@ static int __init nvidiabl_init(void)
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)
- 	
- 	for (iii = 0 ; iii < sizeof(backlight_type_ids) ; iii++) {
--		if (strnicmp(bl_type, backlight_type_ids[iii].id, sizeof(bl_type)) == 0) {
-+		if (strncasecmp(bl_type, backlight_type_ids[iii].id, sizeof(bl_type)) == 0) {
- 			props.type = backlight_type_ids[iii].type;
- 			printk(KERN_INFO "nvidiabl: backlight type is %s\n", backlight_type_ids[iii].id);
- 		}
diff --git a/pkgs/os-specific/linux/phc-intel/default.nix b/pkgs/os-specific/linux/phc-intel/default.nix
index 81db8a9f26d..cc6ac64d58a 100644
--- a/pkgs/os-specific/linux/phc-intel/default.nix
+++ b/pkgs/os-specific/linux/phc-intel/default.nix
@@ -6,14 +6,14 @@ assert stdenv.lib.versionAtLeast kernel.version "4.10";
 
 let
   release = "0.4.0";
-  revbump = "rev24"; # don't forget to change forum download id...
+  revbump = "rev25"; # don't forget to change forum download id...
 in stdenv.mkDerivation rec {
   name = "linux-phc-intel-${version}-${kernel.version}";
   version = "${release}-${revbump}";
 
   src = fetchurl {
-    sha256 = "02b4j8ap1fy09z36pmpplbw4vpwqdi16jyzw5kl0a60ydgxkmrpz";
-    url = "http://www.linux-phc.org/forum/download/file.php?id=178";
+    sha256 = "1w91hpphd8i0br7g5qra26jdydqar45zqwq6jq8yyz6l0vb10zlz";
+    url = "http://www.linux-phc.org/forum/download/file.php?id=194";
     name = "phc-intel-pack-${revbump}.tar.bz2";
   };
 
diff --git a/pkgs/os-specific/linux/policycoreutils/default.nix b/pkgs/os-specific/linux/policycoreutils/default.nix
index 536c69ff557..d540bb665f9 100644
--- a/pkgs/os-specific/linux/policycoreutils/default.nix
+++ b/pkgs/os-specific/linux/policycoreutils/default.nix
@@ -57,7 +57,10 @@ stdenv.mkDerivation rec {
     '')}"
   '';
 
-  NIX_CFLAGS_COMPILE = "-fstack-protector-all";
+  NIX_CFLAGS_COMPILE = [
+    "-fstack-protector-all"
+    "-Wno-error=implicit-fallthrough" "-Wno-error=alloc-size-larger-than=" # gcc7
+  ];
 
   meta = with stdenv.lib; {
     description = "SELinux policy core utilities";
diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix
index ca15571d1ed..3a76450a830 100644
--- a/pkgs/os-specific/linux/shadow/default.nix
+++ b/pkgs/os-specific/linux/shadow/default.nix
@@ -60,8 +60,10 @@ stdenv.mkDerivation rec {
     configureFlags="$configureFlags --with-xml-catalog=$PWD/xmlcatalog ";
   '';
 
-  configureFlags = " --enable-man "
-    + stdenv.lib.optionalString (hostPlatform.libc != "glibc") " --disable-nscd ";
+  configureFlags = [
+    "--enable-man"
+    "--with-group-name-max-length=32"
+  ] ++ stdenv.lib.optional (hostPlatform.libc != "glibc") "--disable-nscd";
 
   preBuild = stdenv.lib.optionalString (hostPlatform.libc == "glibc")
     ''
diff --git a/pkgs/os-specific/linux/sinit/default.nix b/pkgs/os-specific/linux/sinit/default.nix
index 46abb6ccc66..32761970d81 100644
--- a/pkgs/os-specific/linux/sinit/default.nix
+++ b/pkgs/os-specific/linux/sinit/default.nix
@@ -5,7 +5,7 @@ let
     baseName="sinit";
     version="1.0";
     name="${baseName}-${version}";
-    url="http://git.suckless.org/sinit/";
+    url="https://git.suckless.org/sinit/";
     sha256="0cf8yylgrrj1wxm5v6jdlbnxpx97m38yxrc9nmv1l8hldjqsj9pc";
     rev = "refs/tags/v${version}";
   };
@@ -32,6 +32,6 @@ stdenv.mkDerivation {
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
     homepage = https://tools.suckless.org/sinit;
-    downloadPage = "http://git.suckless.org/sinit";
+    downloadPage = "https://git.suckless.org/sinit";
   };
 }
diff --git a/pkgs/os-specific/linux/spl/const.patch b/pkgs/os-specific/linux/spl/const.patch
deleted file mode 100644
index 932e8a9eb1c..00000000000
--- a/pkgs/os-specific/linux/spl/const.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/module/spl/spl-proc.c b/module/spl/spl-proc.c
-index eb00505..6f38cef 100644
---- a/module/spl/spl-proc.c
-+++ b/module/spl/spl-proc.c
-@@ -36,7 +36,7 @@
- #include 
- #include 
- 
--#if defined(CONSTIFY_PLUGIN) && LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)
-+#if defined(CONSTIFY_PLUGIN)
- typedef struct ctl_table __no_const spl_ctl_table;
- #else
- typedef struct ctl_table spl_ctl_table;
diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix
index 57698b5ad45..7c37d18c868 100644
--- a/pkgs/os-specific/linux/spl/default.nix
+++ b/pkgs/os-specific/linux/spl/default.nix
@@ -11,6 +11,7 @@ let
     , sha256
     , rev ? "spl-${version}"
     , broken ? false
+    , patches ? []
     } @ args : stdenv.mkDerivation rec {
       name = "spl-${version}-${kernel.version}";
 
@@ -20,7 +21,7 @@ let
         inherit rev sha256;
       };
 
-      patches = [ ./const.patch ./install_prefix.patch ];
+      inherit patches;
 
       nativeBuildInputs = [ autoreconfHook ] ++ kernel.moduleBuildDependencies;
 
@@ -61,19 +62,22 @@ in
   assert kernel != null;
 {
     splStable = common {
-      version = "0.7.6";
-      sha256 = "1l641d89k48ngmarx9mxh8gw2zzrf7fw7n8zmslhz4h1152plddb";
+      version = "0.7.8";
+      sha256 = "0ypyy7ij280n7rly6ifrvna9k55gxwdx9a7lalf4r1ka714379fi";
+      patches = [ ./install_prefix-0.7.8.patch ];
     };
 
     splUnstable = common {
-      version = "2018-01-24";
-      rev = "23602fdb39e1254c669707ec9d2d0e6bcdbf1771";
-      sha256 = "09py2dwj77f6s2qcnkwdslg5nxb3hq2bq39zpxpm6msqyifhl69h";
+      version = "2018-04-10";
+      rev = "9125f8f5bdb36bfbd2d816d30b6b29b9f89ae3d8";
+      sha256 = "00zrbca906rzjd62m4khiw3sdv8x18dapcmvkyaawripwvzc4iri";
+      patches = [ ./install_prefix.patch ];
     };
 
     splLegacyCrypto = common {
       version = "2018-01-24";
       rev = "23602fdb39e1254c669707ec9d2d0e6bcdbf1771";
       sha256 = "09py2dwj77f6s2qcnkwdslg5nxb3hq2bq39zpxpm6msqyifhl69h";
+      patches = [ ./install_prefix.patch ];
     };
 }
diff --git a/pkgs/os-specific/linux/spl/install_prefix-0.7.8.patch b/pkgs/os-specific/linux/spl/install_prefix-0.7.8.patch
new file mode 100644
index 00000000000..dc91392bd2f
--- /dev/null
+++ b/pkgs/os-specific/linux/spl/install_prefix-0.7.8.patch
@@ -0,0 +1,174 @@
+diff --git a/Makefile.am b/Makefile.am
+index 4977448..ac17217 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -12,10 +12,10 @@ endif
+ if CONFIG_KERNEL
+ SUBDIRS += module
+ 
+-extradir = @prefix@/src/spl-$(VERSION)
++extradir = @prefix@/libexec/spl
+ extra_HEADERS = spl.release.in spl_config.h.in
+ 
+-kerneldir = @prefix@/src/spl-$(VERSION)/$(LINUX_VERSION)
++kerneldir = @prefix@/libexec/spl/$(LINUX_VERSION)
+ nodist_kernel_HEADERS = spl.release spl_config.h module/$(LINUX_SYMBOLS)
+ endif
+ 
+diff --git a/include/Makefile.am b/include/Makefile.am
+index 3200222..4a47aaa 100644
+--- a/include/Makefile.am
++++ b/include/Makefile.am
+@@ -13,6 +13,6 @@ USER_H =
+ EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
+ 
+ if CONFIG_KERNEL
+-kerneldir = @prefix@/src/spl-$(VERSION)/include
++kerneldir = @prefix@/libexec/spl/include
+ kernel_HEADERS = $(KERNEL_H)
+ endif
+diff --git a/include/fs/Makefile.am b/include/fs/Makefile.am
+index e0da4b3..d6d7af0 100644
+--- a/include/fs/Makefile.am
++++ b/include/fs/Makefile.am
+@@ -8,6 +8,6 @@ USER_H =
+ EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
+ 
+ if CONFIG_KERNEL
+-kerneldir = @prefix@/src/spl-$(VERSION)/include/fs
++kerneldir = @prefix@/libexec/spl/include/fs
+ kernel_HEADERS = $(KERNEL_H)
+ endif
+diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am
+index 712e94e..4af9fb7 100644
+--- a/include/linux/Makefile.am
++++ b/include/linux/Makefile.am
+@@ -18,6 +18,6 @@ USER_H =
+ EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
+ 
+ if CONFIG_KERNEL
+-kerneldir = @prefix@/src/spl-$(VERSION)/include/linux
++kerneldir = @prefix@/libexec/spl/include/linux
+ kernel_HEADERS = $(KERNEL_H)
+ endif
+diff --git a/include/rpc/Makefile.am b/include/rpc/Makefile.am
+index cfc8246..4fbd33d 100644
+--- a/include/rpc/Makefile.am
++++ b/include/rpc/Makefile.am
+@@ -9,6 +9,6 @@ USER_H =
+ EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
+ 
+ if CONFIG_KERNEL
+-kerneldir = @prefix@/src/spl-$(VERSION)/include/rpc
++kerneldir = @prefix@/libexec/spl/include/rpc
+ kernel_HEADERS = $(KERNEL_H)
+ endif
+diff --git a/include/sharefs/Makefile.am b/include/sharefs/Makefile.am
+index 10e7093..febecdf 100644
+--- a/include/sharefs/Makefile.am
++++ b/include/sharefs/Makefile.am
+@@ -8,6 +8,6 @@ USER_H =
+ EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
+ 
+ if CONFIG_KERNEL
+-kerneldir = @prefix@/src/spl-$(VERSION)/include/sharefs
++kerneldir = @prefix@/libexec/spl/include/sharefs
+ kernel_HEADERS = $(KERNEL_H)
+ endif
+diff --git a/include/sys/Makefile.am b/include/sys/Makefile.am
+index 73c4a84..31a9f50 100644
+--- a/include/sys/Makefile.am
++++ b/include/sys/Makefile.am
+@@ -107,7 +107,7 @@ USER_H =
+ EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
+ 
+ if CONFIG_KERNEL
+-kerneldir = @prefix@/src/spl-$(VERSION)/include/sys
++kerneldir = @prefix@/libexec/spl/include/sys
+ kernel_HEADERS = $(KERNEL_H)
+ endif
+ 
+diff --git a/include/sys/fm/Makefile.am b/include/sys/fm/Makefile.am
+index 2821cbe..a84ce8e 100644
+--- a/include/sys/fm/Makefile.am
++++ b/include/sys/fm/Makefile.am
+@@ -9,6 +9,6 @@ USER_H =
+ EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
+ 
+ if CONFIG_KERNEL
+-kerneldir = @prefix@/src/spl-$(VERSION)/include/sys/fm
++kerneldir = @prefix@/libexec/spl/include/sys/fm
+ kernel_HEADERS = $(KERNEL_H)
+ endif
+diff --git a/include/sys/fs/Makefile.am b/include/sys/fs/Makefile.am
+index 581083e..0c35fb7 100644
+--- a/include/sys/fs/Makefile.am
++++ b/include/sys/fs/Makefile.am
+@@ -8,6 +8,6 @@ USER_H =
+ EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
+ 
+ if CONFIG_KERNEL
+-kerneldir = @prefix@/src/spl-$(VERSION)/include/sys/fs
++kerneldir = @prefix@/libexec/spl/include/sys/fs
+ kernel_HEADERS = $(KERNEL_H)
+ endif
+diff --git a/include/sys/sysevent/Makefile.am b/include/sys/sysevent/Makefile.am
+index 63d9af3..de1aa18 100644
+--- a/include/sys/sysevent/Makefile.am
++++ b/include/sys/sysevent/Makefile.am
+@@ -8,6 +8,6 @@ USER_H =
+ EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
+ 
+ if CONFIG_KERNEL
+-kerneldir = @prefix@/src/spl-$(VERSION)/include/sys/sysevent
++kerneldir = @prefix@/libexec/spl/include/sys/sysevent
+ kernel_HEADERS = $(KERNEL_H)
+ endif
+diff --git a/include/util/Makefile.am b/include/util/Makefile.am
+index e2bf09f..3f5d6ce 100644
+--- a/include/util/Makefile.am
++++ b/include/util/Makefile.am
+@@ -9,6 +9,6 @@ USER_H =
+ EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
+ 
+ if CONFIG_KERNEL
+-kerneldir = @prefix@/src/spl-$(VERSION)/include/util
++kerneldir = @prefix@/libexec/spl/include/util
+ kernel_HEADERS = $(KERNEL_H)
+ endif
+diff --git a/include/vm/Makefile.am b/include/vm/Makefile.am
+index 7faab0a..8148b3d 100644
+--- a/include/vm/Makefile.am
++++ b/include/vm/Makefile.am
+@@ -10,6 +10,6 @@ USER_H =
+ EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
+ 
+ if CONFIG_KERNEL
+-kerneldir = @prefix@/src/spl-$(VERSION)/include/vm
++kerneldir = @prefix@/libexec/spl/include/vm
+ kernel_HEADERS = $(KERNEL_H)
+ endif
+diff --git a/module/Makefile.in b/module/Makefile.in
+index d4e62e1..73fa01c 100644
+--- a/module/Makefile.in
++++ b/module/Makefile.in
+@@ -21,15 +21,15 @@ clean:
+ modules_install:
+ 	@# Install the kernel modules
+ 	$(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` $@ \
+-		INSTALL_MOD_PATH=$(DESTDIR)$(INSTALL_MOD_PATH) \
++		INSTALL_MOD_PATH=@prefix@/$(INSTALL_MOD_PATH) \
+ 		INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) \
+ 		KERNELRELEASE=@LINUX_VERSION@
+ 	@# Remove extraneous build products when packaging
+-	kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \
+-	if [ -n "$(DESTDIR)" ]; then \
++	kmoddir=@prefix@/$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \
++	if [ -n "@prefix@" ]; then \
+ 		find $$kmoddir -name 'modules.*' | xargs $(RM); \
+ 	fi
+-	sysmap=$(DESTDIR)$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \
++	sysmap=@prefix@/$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \
+ 	if [ -f $$sysmap ]; then \
+ 		depmod -ae -F $$sysmap @LINUX_VERSION@; \
+ 	fi
diff --git a/pkgs/os-specific/linux/spl/install_prefix.patch b/pkgs/os-specific/linux/spl/install_prefix.patch
index dc91392bd2f..114ca123147 100644
--- a/pkgs/os-specific/linux/spl/install_prefix.patch
+++ b/pkgs/os-specific/linux/spl/install_prefix.patch
@@ -112,18 +112,6 @@ index 581083e..0c35fb7 100644
 +kerneldir = @prefix@/libexec/spl/include/sys/fs
  kernel_HEADERS = $(KERNEL_H)
  endif
-diff --git a/include/sys/sysevent/Makefile.am b/include/sys/sysevent/Makefile.am
-index 63d9af3..de1aa18 100644
---- a/include/sys/sysevent/Makefile.am
-+++ b/include/sys/sysevent/Makefile.am
-@@ -8,6 +8,6 @@ USER_H =
- EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
- 
- if CONFIG_KERNEL
--kerneldir = @prefix@/src/spl-$(VERSION)/include/sys/sysevent
-+kerneldir = @prefix@/libexec/spl/include/sys/sysevent
- kernel_HEADERS = $(KERNEL_H)
- endif
 diff --git a/include/util/Makefile.am b/include/util/Makefile.am
 index e2bf09f..3f5d6ce 100644
 --- a/include/util/Makefile.am
diff --git a/pkgs/os-specific/linux/trinity/default.nix b/pkgs/os-specific/linux/trinity/default.nix
index b69bd576ed2..4c3a92cd87e 100644
--- a/pkgs/os-specific/linux/trinity/default.nix
+++ b/pkgs/os-specific/linux/trinity/default.nix
@@ -11,6 +11,9 @@ stdenv.mkDerivation rec {
     sha256 = "19asyrypjhx2cgjdmwfvmgc0hk3xg00zvgkl89vwxngdb40bkwfq";
   };
 
+  # Fails on 32-bit otherwise
+  NIX_CFLAGS_COMPILE = "-Wno-error";
+
   postPatch = ''
     patchShebangs ./configure
     patchShebangs ./scripts/
diff --git a/pkgs/os-specific/linux/v4l2loopback/default.nix b/pkgs/os-specific/linux/v4l2loopback/default.nix
index 920c8c0bdee..3db2814a087 100644
--- a/pkgs/os-specific/linux/v4l2loopback/default.nix
+++ b/pkgs/os-specific/linux/v4l2loopback/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchurl, kernel, kmod }:
+{ stdenv, fetchFromGitHub, kernel, kmod }:
 
 stdenv.mkDerivation rec {
   name = "v4l2loopback-${version}-${kernel.version}";
-  version = "0.9.1";
+  version = "0.11.0";
 
-  src = fetchurl {
-    url = "https://github.com/umlaeute/v4l2loopback/archive/v${version}.tar.gz";
-    sha256 = "1crkhxlnskqrfj3f7jmiiyi5m75zmj7n0s26xz07wcwdzdf2p568";
+  src = fetchFromGitHub {
+    owner = "umlaeute";
+    repo = "v4l2loopback";
+    rev = "v${version}";
+    sha256 = "1wb5qmy13w8rl4279bwp69s4sb1x5hk5d2n563p1yk8yi567p2az";
   };
 
   hardeningDisable = [ "format" "pic" ];
diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix
index 0029353ba20..b88646424be 100644
--- a/pkgs/os-specific/linux/wireguard/default.nix
+++ b/pkgs/os-specific/linux/wireguard/default.nix
@@ -6,11 +6,11 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.10";
 let
   name = "wireguard-${version}";
 
-  version = "0.0.20180218";
+  version = "0.0.20180413";
 
   src = fetchurl {
     url    = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
-    sha256 = "4ac4c4e4ad4dc2cf9dcb831b0cf347567ccea675ca524528cf5a4d9dccb2fe52";
+    sha256 = "0lbjx62ihc8prqfhvmi0v1xq1q3ayzj5rfy2p5149nr9qx3z37j1";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index 868e354c7b5..43704e1d28c 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -1,8 +1,10 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, utillinux, nukeReferences, coreutils, fetchpatch
+{ stdenv, fetchFromGitHub, autoreconfHook, utillinux, nukeReferences, coreutils
+, perl, fetchpatch
 , configFile ? "all"
 
 # Userspace dependencies
 , zlib, libuuid, python, attr, openssl
+, nfs-utils
 
 # Kernel dependencies
 , kernel ? null, spl ? null, splUnstable ? null, splLegacyCrypto ? null
@@ -26,7 +28,7 @@ let
         versionAtLeast kernel.version incompatibleKernelVersion then
        throw ''
          Linux v${kernel.version} is not yet supported by zfsonlinux v${version}.
-         ${stdenv.lib.optional (!isUnstable) "Try zfsUnstable or set the NixOS option boot.zfs.enableUnstable."}
+         ${stdenv.lib.optionalString (!isUnstable) "Try zfsUnstable or set the NixOS option boot.zfs.enableUnstable."}
        ''
     else stdenv.mkDerivation rec {
       name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}";
@@ -39,8 +41,12 @@ let
 
       patches = extraPatches;
 
+      postPatch = optionalString buildKernel ''
+        patchShebangs scripts
+      '';
+
       nativeBuildInputs = [ autoreconfHook nukeReferences ]
-         ++ optional buildKernel kernel.moduleBuildDependencies;
+         ++ optional buildKernel (kernel.moduleBuildDependencies ++ [ perl ]);
       buildInputs =
            optionals buildKernel [ spl ]
         ++ optionals buildUser [ zlib libuuid python attr ]
@@ -56,6 +62,7 @@ let
         substituteInPlace ./module/zfs/zfs_ctldir.c   --replace "mount -t zfs"            "${utillinux}/bin/mount -t zfs"
         substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/umount"             "${utillinux}/bin/umount"
         substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/mount"              "${utillinux}/bin/mount"
+        substituteInPlace ./lib/libshare/nfs.c        --replace "/usr/sbin/exportfs"      "${nfs-utils}/bin/exportfs"
         substituteInPlace ./cmd/ztest/ztest.c         --replace "/usr/sbin/ztest"         "$out/sbin/ztest"
         substituteInPlace ./cmd/ztest/ztest.c         --replace "/usr/sbin/zdb"           "$out/sbin/zdb"
         substituteInPlace ./config/user-systemd.m4    --replace "/usr/lib/modules-load.d" "$out/etc/modules-load.d"
@@ -72,6 +79,7 @@ let
         done
 
         ./autogen.sh
+        configureFlagsArray+=("--libexecdir=$out/libexec")
       '';
 
       configureFlags = [
@@ -81,6 +89,7 @@ let
         "--with-udevdir=$(out)/lib/udev"
         "--with-systemdunitdir=$(out)/etc/systemd/system"
         "--with-systemdpresetdir=$(out)/etc/systemd/system-preset"
+        "--with-systemdgeneratordir=$(out)/lib/systemd/system-generator"
         "--with-mounthelperdir=$(out)/bin"
         "--sysconfdir=/etc"
         "--localstatedir=/var"
@@ -139,12 +148,12 @@ in {
   # to be adapted
   zfsStable = common {
     # comment/uncomment if breaking kernel versions are known
-    incompatibleKernelVersion = null;
+    incompatibleKernelVersion = "4.16";
 
     # this package should point to the latest release.
-    version = "0.7.6";
+    version = "0.7.8";
 
-    sha256 = "1k3a69zfdk4ia4z2l69lbz0mj26bwdanxd2wynkdpm2kl3zjj18h";
+    sha256 = "0m7j5cpz81lqcfbh4w3wvqjjka07wickl27klgy1zplv6vr0baix";
 
     extraPatches = [
       (fetchpatch {
@@ -156,30 +165,32 @@ in {
     inherit spl;
   };
 
-  zfsUnstable = common {
+  zfsUnstable = common rec {
     # comment/uncomment if breaking kernel versions are known
-    incompatibleKernelVersion = null;
+    incompatibleKernelVersion = "4.16";
 
     # this package should point to a version / git revision compatible with the latest kernel release
-    version = "2018-02-02";
+    version = "2018-04-10";
 
-    rev = "fbd42542686af053f0d162ec4630ffd4fff1cc30";
-    sha256 = "0qzkwnnk7kz1hwvcaqlpzi5yspfhhmd2alklc07k056ddzbx52qb";
+    rev = "74df0c5e251a920a1966a011c16f960cd7ba562e";
+    sha256 = "1x3mipj3ryznnd7kx84r3n607hv6jqs66mb61g3zcdmvk6al4yq4";
     isUnstable = true;
 
     extraPatches = [
       (fetchpatch {
-        url = "https://github.com/Mic92/zfs/compare/fbd42542686af053f0d162ec4630ffd4fff1cc30...nixos-zfs-2018-02-02.patch";
-        sha256 = "05wqwjm9648x60vkwxbp8l6z1q73r2a5l2ni28i2f4pla8s3ahln";
+        url = "https://github.com/Mic92/zfs/compare/${rev}...nixos-zfs-2018-02-02.patch";
+        sha256 = "1gqmgqi39qhk5kbbvidh8f2xqq25vj58i9x0wjqvcx6a71qj49ch";
       })
     ];
 
     spl = splUnstable;
   };
 
+  # TODO: Remove this module before 18.09
+  # also remove boot.zfs.enableLegacyCrypto
   zfsLegacyCrypto = common {
     # comment/uncomment if breaking kernel versions are known
-    incompatibleKernelVersion = null;
+    incompatibleKernelVersion = "4.16";
 
     # this package should point to a version / git revision compatible with the latest kernel release
     version = "2018-02-01";
diff --git a/pkgs/servers/amqp/qpid-cpp/default.nix b/pkgs/servers/amqp/qpid-cpp/default.nix
index 6c256d14fe7..a838fa3b904 100644
--- a/pkgs/servers/amqp/qpid-cpp/default.nix
+++ b/pkgs/servers/amqp/qpid-cpp/default.nix
@@ -1,33 +1,53 @@
-{ stdenv, fetchurl, cmake, python2, boost, libuuid, ruby }:
+{ stdenv, fetchurl, cmake, python2, boost, libuuid, ruby, buildEnv, buildPythonPackage, qpid-python }:
 
-stdenv.mkDerivation rec {
+let
   name = "qpid-cpp-${version}";
-
-  version = "0.34";
+  version = "1.37.0";
 
   src = fetchurl {
     url = "mirror://apache/qpid/cpp/${version}/${name}.tar.gz";
-    sha256 = "07ibwvw5lm7xabv32zai5x03r7l9mxm0zk7h9lbfkzmav0f41w0w";
+    sha256 = "1s4hyi867i0lqn81c1crrk6fga1gmsv61675vjv5v41skz56lrsb";
   };
 
-  buildInputs = [ cmake python2 boost libuuid ruby ];
-
-  # the subdir managementgen wants to install python stuff in ${python} and
-  # the installation tries to create some folders in /var
-  patchPhase = ''
-    sed -i '/managementgen/d' CMakeLists.txt
-    sed -i '/ENV/d' src/CMakeLists.txt
-  '';
-
-  NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations -Wno-error=unused-function";
-
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://qpid.apache.org;
     repositories.git = git://git.apache.org/qpid.git;
     repositories.svn = http://svn.apache.org/repos/asf/qpid;
     description = "An AMQP message broker and a C++ messaging API";
-    license = stdenv.lib.licenses.asl20;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.cpages ];
+    license = licenses.asl20;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ cpages ma27 ];
   };
+
+  qpid-cpp = stdenv.mkDerivation {
+    inherit src meta name;
+
+    nativeBuildInputs = [ cmake ];
+    buildInputs = [ boost libuuid ruby python2 ];
+
+    # the subdir managementgen wants to install python stuff in ${python} and
+    # the installation tries to create some folders in /var
+    postPatch = ''
+      sed -i '/managementgen/d' CMakeLists.txt
+      sed -i '/ENV/d' src/CMakeLists.txt
+      sed -i '/management/d' CMakeLists.txt
+    '';
+
+    NIX_CFLAGS_COMPILE = [
+      "-Wno-error=deprecated-declarations"
+      "-Wno-error=unused-function"
+      "-Wno-error=int-in-bool-context"
+    ];
+  };
+
+  python-frontend = buildPythonPackage {
+    inherit name meta src;
+
+    sourceRoot = "${name}/management/python";
+
+    propagatedBuildInputs = [ qpid-python ];
+  };
+in buildEnv {
+  name = "${name}-env";
+  paths = [ qpid-cpp python-frontend ];
 }
diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix
index ad8aeadeff0..d89e59d662e 100644
--- a/pkgs/servers/caddy/default.nix
+++ b/pkgs/servers/caddy/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "caddy-${version}";
-  version = "0.10.11";
+  version = "0.10.12";
 
   goPackagePath = "github.com/mholt/caddy";
 
@@ -12,7 +12,7 @@ buildGoPackage rec {
     owner = "mholt";
     repo = "caddy";
     rev = "v${version}";
-    sha256 = "04ls0s79dsyxnrpra55qvl0dk9nyvps59l034326r3bzk4jhb3q6";
+    sha256 = "0vmgswln72qqay73z39qn135sl5k71zlybr2jdrcjlmp4i7hrf88";
   };
 
   buildFlagsArray = ''
diff --git a/pkgs/servers/computing/torque/default.nix b/pkgs/servers/computing/torque/default.nix
index 9c4bc4bda73..35c830dff8a 100644
--- a/pkgs/servers/computing/torque/default.nix
+++ b/pkgs/servers/computing/torque/default.nix
@@ -16,6 +16,9 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  # added to fix build with gcc7
+  NIX_CFLAGS_COMPILE = [ "-fpermissive" ];
+
   preConfigure = ''
    substituteInPlace ./configure \
      --replace '/usr/bin/file' '${file}/bin/file'
diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index a222805fc45..1a5577e8165 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -12,16 +12,16 @@ inherit (stdenv.lib) optional optionals optionalString concatStringsSep;
 
 unwrapped = stdenv.mkDerivation rec {
   name = "knot-resolver-${version}";
-  version = "2.1.1";
+  version = "2.3.0";
 
   src = fetchurl {
     url = "http://secure.nic.cz/files/knot-resolver/${name}.tar.xz";
-    sha256 = "0b9caee03d7cd30e1dc8fa0ce5fafade31fc1785314986bbf77cad446522a1b3";
+    sha256 = "2d19c5daf8440bd3d2acd1886b9ede65f04f7753c6fd4618a92a1a4ba3b27a9b";
   };
 
   outputs = [ "out" "dev" ];
 
-  configurePhase = ":";
+  configurePhase = "patchShebangs scripts/";
 
   nativeBuildInputs = [ pkgconfig which hexdump ];
 
diff --git a/pkgs/servers/fcgiwrap/default.nix b/pkgs/servers/fcgiwrap/default.nix
index 84c24e68478..a1ec3a7deb0 100644
--- a/pkgs/servers/fcgiwrap/default.nix
+++ b/pkgs/servers/fcgiwrap/default.nix
@@ -9,6 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "07y6s4mm86cv7p1ljz94sxnqa89y9amn3vzwsnbq5hrl4vdy0zac";
   };
 
+  NIX_CFLAGS_COMPILE = "-Wno-error=implicit-fallthrough";
   configureFlags = [ "--with-systemd" "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ];
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/servers/ftp/pure-ftpd/default.nix b/pkgs/servers/ftp/pure-ftpd/default.nix
index 3728ee6c2a8..f41bb726a28 100644
--- a/pkgs/servers/ftp/pure-ftpd/default.nix
+++ b/pkgs/servers/ftp/pure-ftpd/default.nix
@@ -17,6 +17,6 @@ stdenv.mkDerivation rec {
     homepage = https://www.pureftpd.org;
     license = licenses.isc; # with some parts covered by BSD3(?)
     maintainers = [ maintainers.lethalman ];
-    platforms = platforms.unix;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 2b031f33555..1189b8c21db 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
 # Do not edit!
 
 {
-  version = "0.63.3";
+  version = "0.65.5";
   components = {
     "abode" = ps: with ps; [  ];
     "ads" = ps: with ps; [  ];
@@ -21,6 +21,7 @@
     "arduino" = ps: with ps; [  ];
     "arlo" = ps: with ps; [  ];
     "asterisk_mbox" = ps: with ps; [  ];
+    "august" = ps: with ps; [  ];
     "axis" = ps: with ps; [  ];
     "bbb_gpio" = ps: with ps; [  ];
     "binary_sensor.concord232" = ps: with ps; [  ];
@@ -32,10 +33,12 @@
     "binary_sensor.trend" = ps: with ps; [ numpy ];
     "binary_sensor.workday" = ps: with ps; [  ];
     "blink" = ps: with ps; [  ];
+    "bmw_connected_drive" = ps: with ps; [  ];
     "calendar.caldav" = ps: with ps; [  ];
     "calendar.todoist" = ps: with ps; [ todoist ];
     "camera.foscam" = ps: with ps; [  ];
     "camera.onvif" = ps: with ps; [  ];
+    "camera.proxy" = ps: with ps; [ pillow ];
     "camera.synology" = ps: with ps; [  ];
     "camera.uvc" = ps: with ps; [  ];
     "camera.xeoma" = ps: with ps; [  ];
@@ -56,7 +59,7 @@
     "cloud" = ps: with ps; [  ];
     "coinbase" = ps: with ps; [  ];
     "comfoconnect" = ps: with ps; [  ];
-    "conversation" = ps: with ps; [  ];
+    "config.config_entries" = ps: with ps; [  ];
     "cover.myq" = ps: with ps; [  ];
     "daikin" = ps: with ps; [  ];
     "datadog" = ps: with ps; [ datadog ];
@@ -89,19 +92,21 @@
     "dweet" = ps: with ps; [  ];
     "dyson" = ps: with ps; [  ];
     "ecobee" = ps: with ps; [  ];
+    "egardia" = ps: with ps; [  ];
     "eight_sleep" = ps: with ps; [  ];
     "emulated_hue" = ps: with ps; [ aiohttp-cors ];
     "enocean" = ps: with ps; [  ];
     "envisalink" = ps: with ps; [  ];
     "fan.xiaomi_miio" = ps: with ps; [  ];
     "feedreader" = ps: with ps; [ feedparser ];
-    "ffmpeg" = ps: with ps; [  ];
-    "frontend" = ps: with ps; [ user-agents ];
+    "ffmpeg" = ps: with ps; [ ha-ffmpeg ];
+    "frontend" = ps: with ps; [  ];
     "gc100" = ps: with ps; [  ];
     "goalfeed" = ps: with ps; [  ];
     "google" = ps: with ps; [ google_api_python_client oauth2client ];
     "hdmi_cec" = ps: with ps; [  ];
     "hive" = ps: with ps; [  ];
+    "homekit" = ps: with ps; [  ];
     "homematic" = ps: with ps; [ pyhomematic ];
     "http" = ps: with ps; [ aiohttp-cors ];
     "hue" = ps: with ps; [  ];
@@ -159,6 +164,7 @@
     "media_player.bluesound" = ps: with ps; [ xmltodict ];
     "media_player.braviatv" = ps: with ps; [  ];
     "media_player.cast" = ps: with ps; [ PyChromecast ];
+    "media_player.channels" = ps: with ps; [  ];
     "media_player.clementine" = ps: with ps; [  ];
     "media_player.cmus" = ps: with ps; [  ];
     "media_player.denonavr" = ps: with ps; [  ];
@@ -187,12 +193,14 @@
     "media_player.russound_rnet" = ps: with ps; [  ];
     "media_player.samsungtv" = ps: with ps; [ wakeonlan ];
     "media_player.snapcast" = ps: with ps; [  ];
+    "media_player.songpal" = ps: with ps; [  ];
     "media_player.sonos" = ps: with ps; [  ];
     "media_player.soundtouch" = ps: with ps; [ libsoundtouch ];
     "media_player.spotify" = ps: with ps; [  ];
     "media_player.vizio" = ps: with ps; [  ];
     "media_player.vlc" = ps: with ps; [  ];
     "media_player.webostv" = ps: with ps; [ websockets ];
+    "media_player.xiaomi_tv" = ps: with ps; [  ];
     "media_player.yamaha" = ps: with ps; [  ];
     "media_player.yamaha_musiccast" = ps: with ps; [  ];
     "media_player.ziggo_mediabox_xl" = ps: with ps; [  ];
@@ -226,7 +234,7 @@
     "notify.message_bird" = ps: with ps; [  ];
     "notify.pushbullet" = ps: with ps; [ pushbullet ];
     "notify.pushetta" = ps: with ps; [  ];
-    "notify.pushover" = ps: with ps; [  ];
+    "notify.pushover" = ps: with ps; [ python-pushover ];
     "notify.rocketchat" = ps: with ps; [  ];
     "notify.sendgrid" = ps: with ps; [  ];
     "notify.simplepush" = ps: with ps; [  ];
@@ -272,7 +280,7 @@
     "sensor.crimereports" = ps: with ps; [  ];
     "sensor.cups" = ps: with ps; [  ];
     "sensor.darksky" = ps: with ps; [  ];
-    "sensor.deluge" = ps: with ps; [  ];
+    "sensor.deluge" = ps: with ps; [ deluge-client ];
     "sensor.deutsche_bahn" = ps: with ps; [  ];
     "sensor.dht" = ps: with ps; [  ];
     "sensor.discogs" = ps: with ps; [ discogs_client ];
@@ -334,6 +342,7 @@
     "sensor.sabnzbd" = ps: with ps; [  ];
     "sensor.scrape" = ps: with ps; [ beautifulsoup4 ];
     "sensor.season" = ps: with ps; [ ephem ];
+    "sensor.sense" = ps: with ps; [  ];
     "sensor.sensehat" = ps: with ps; [  ];
     "sensor.serial" = ps: with ps; [  ];
     "sensor.serial_pm" = ps: with ps; [  ];
@@ -342,7 +351,9 @@
     "sensor.snmp" = ps: with ps; [ pysnmp ];
     "sensor.sochain" = ps: with ps; [  ];
     "sensor.speedtest" = ps: with ps; [  ];
+    "sensor.spotcrime" = ps: with ps; [  ];
     "sensor.sql" = ps: with ps; [ sqlalchemy ];
+    "sensor.startca" = ps: with ps; [ xmltodict ];
     "sensor.steam_online" = ps: with ps; [  ];
     "sensor.swiss_hydrological_data" = ps: with ps; [ xmltodict ];
     "sensor.swiss_public_transport" = ps: with ps; [  ];
@@ -365,16 +376,18 @@
     "sensor.xbox_live" = ps: with ps; [  ];
     "sensor.yahoo_finance" = ps: with ps; [  ];
     "sensor.yr" = ps: with ps; [ xmltodict ];
-    "sensor.yweather" = ps: with ps; [  ];
+    "sensor.yweather" = ps: with ps; [ yahooweather ];
+    "sensor.zestimate" = ps: with ps; [ xmltodict ];
     "shiftr" = ps: with ps; [ paho-mqtt ];
     "skybell" = ps: with ps; [  ];
     "sleepiq" = ps: with ps; [  ];
+    "smappee" = ps: with ps; [  ];
     "spc" = ps: with ps; [ websockets ];
     "statsd" = ps: with ps; [ statsd ];
     "switch.acer_projector" = ps: with ps; [ pyserial ];
     "switch.anel_pwrctrl" = ps: with ps; [  ];
     "switch.broadlink" = ps: with ps; [  ];
-    "switch.deluge" = ps: with ps; [  ];
+    "switch.deluge" = ps: with ps; [ deluge-client ];
     "switch.digitalloggers" = ps: with ps; [  ];
     "switch.dlink" = ps: with ps; [  ];
     "switch.edimax" = ps: with ps; [  ];
@@ -408,8 +421,9 @@
     "tts.google" = ps: with ps; [  ];
     "tts.microsoft" = ps: with ps; [  ];
     "twilio" = ps: with ps; [ twilio ];
+    "upcloud" = ps: with ps; [  ];
     "updater" = ps: with ps; [ distro ];
-    "upnp" = ps: with ps; [  ];
+    "upnp" = ps: with ps; [ miniupnpc ];
     "usps" = ps: with ps; [  ];
     "vacuum.roomba" = ps: with ps; [  ];
     "vacuum.xiaomi_miio" = ps: with ps; [  ];
@@ -425,7 +439,7 @@
     "weather.darksky" = ps: with ps; [  ];
     "weather.metoffice" = ps: with ps; [  ];
     "weather.openweathermap" = ps: with ps; [  ];
-    "weather.yweather" = ps: with ps; [  ];
+    "weather.yweather" = ps: with ps; [ yahooweather ];
     "wemo" = ps: with ps; [  ];
     "wink" = ps: with ps; [  ];
     "xiaomi_aqara" = ps: with ps; [  ];
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index cb9424ad5cf..bfdfd4a1548 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -7,18 +7,11 @@ let
 
   py = python3.override {
     packageOverrides = self: super: {
-      yarl = super.yarl.overridePythonAttrs (oldAttrs: rec {
-        version = "1.1.0";
-        src = oldAttrs.src.override {
-          inherit version;
-          sha256 = "162630v7f98l27h11msk9416lqwm2mpgxh4s636594nlbfs9by3a";
-        };
-      });
       aiohttp = super.aiohttp.overridePythonAttrs (oldAttrs: rec {
-        version = "2.3.10";
+        version = "3.0.6";
         src = oldAttrs.src.override {
           inherit version;
-          sha256 = "8adda6583ba438a4c70693374e10b60168663ffa6564c5c75d3c7a9055290964";
+          sha256 = "5b588d21b454aaeaf2debf3c4a37f0752fb91a5c15b621deca7e8c49316154fe";
         };
       });
       pytest = super.pytest.overridePythonAttrs (oldAttrs: rec {
@@ -29,10 +22,10 @@ let
         };
       });
       voluptuous = super.voluptuous.overridePythonAttrs (oldAttrs: rec {
-        version = "0.10.5";
+        version = "0.11.1";
         src = oldAttrs.src.override {
           inherit version;
-          sha256 = "15i3gaap8ilhpbah1ffc6q415wkvliqxilc6s69a4rinvkw6cx3s";
+          sha256 = "af7315c9fa99e0bfd195a21106c82c81619b42f0bd9b6e287b797c6b6b6a9918";
         };
       });
       hass-frontend = super.callPackage ./frontend.nix { };
@@ -51,12 +44,14 @@ let
   extraBuildInputs = extraPackages py.pkgs;
 
   # Don't forget to run parse-requirements.py after updating
-  hassVersion = "0.63.3";
+  hassVersion = "0.65.5";
 
 in with py.pkgs; buildPythonApplication rec {
   pname = "homeassistant";
   version = assert (componentPackages.version == hassVersion); hassVersion;
 
+  disabled = pythonOlder "3.5";
+
   inherit availableComponents;
 
   # PyPI tarball is missing tests/ directory
@@ -64,14 +59,14 @@ in with py.pkgs; buildPythonApplication rec {
     owner = "home-assistant";
     repo = "home-assistant";
     rev = version;
-    sha256 = "1lrdrn0x8i81vbqxziv5fgcc8ldz7x5r62kfz3nyg4g43rk3dqq8";
+    sha256 = "1jd44y3f31926g08h2zykp9hnigh6yms38mqn3i5gcl01n1n368k";
   };
 
   propagatedBuildInputs = [
     # From setup.py
-    requests pyyaml pytz pip jinja2 voluptuous typing aiohttp yarl async-timeout chardet astral certifi attrs
+    requests pyyaml pytz pip jinja2 voluptuous typing aiohttp async-timeout astral certifi attrs
     # From http, frontend and recorder components
-    sqlalchemy aiohttp-cors hass-frontend user-agents
+    sqlalchemy aiohttp-cors hass-frontend
   ] ++ componentBuildInputs ++ extraBuildInputs;
 
   checkInputs = [
diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix
index 018405f578d..b6f8826130f 100644
--- a/pkgs/servers/home-assistant/frontend.nix
+++ b/pkgs/servers/home-assistant/frontend.nix
@@ -1,11 +1,13 @@
-{ stdenv, fetchPypi, buildPythonPackage }:
+{ stdenv, fetchPypi, buildPythonPackage, user-agents }:
 
 buildPythonPackage rec {
   pname = "home-assistant-frontend";
-  version = "20180209.0";
+  version = "20180310.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b85f0e833871408a95619ae38d5344701a6466e8f7b5530e718ccc260b68d3ed";
+    sha256 = "5a7cca7ed461d650859df7d036ff4c579366bbcde5eb6407b1aff6a0dbbae2c2";
   };
+
+  propagatedBuildInputs = [ user-agents ];
 }
diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix
index 41e65b588e1..dd076606da5 100644
--- a/pkgs/servers/http/apache-httpd/2.4.nix
+++ b/pkgs/servers/http/apache-httpd/2.4.nix
@@ -16,12 +16,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null;
 assert http2Support -> nghttp2 != null;
 
 stdenv.mkDerivation rec {
-  version = "2.4.29";
+  version = "2.4.33";
   name = "apache-httpd-${version}";
 
   src = fetchurl {
     url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
-    sha256 = "777753a5a25568a2a27428b2214980564bc1c38c1abf9ccc7630b639991f7f00";
+    sha256 = "de02511859b00d17845b9abdd1f975d5ccb5d0b280c567da5bf2ad4b70846f05";
   };
 
   # FIXME: -dev depends on -doc
diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix
index 181e3bf134f..7bf1b1ffa64 100644
--- a/pkgs/servers/http/lighttpd/default.nix
+++ b/pkgs/servers/http/lighttpd/default.nix
@@ -9,11 +9,11 @@ assert enableMysql -> mysql != null;
 assert enableLdap -> openldap != null;
 
 stdenv.mkDerivation rec {
-  name = "lighttpd-1.4.48";
+  name = "lighttpd-1.4.49";
 
   src = fetchurl {
     url = "http://download.lighttpd.net/lighttpd/releases-1.4.x/${name}.tar.xz";
-    sha256 = "0djgsx06x3p22rjvzml5klq7gqd9nk88qzlxifa7p7ajqymdb2hg";
+    sha256 = "02ff77cpvy1006cwfym38vf78xm18plyj636ll74r7kx2bblkpxf";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/servers/mail/archiveopteryx/default.nix b/pkgs/servers/mail/archiveopteryx/default.nix
index 50f94e4688c..080cbc89775 100644
--- a/pkgs/servers/mail/archiveopteryx/default.nix
+++ b/pkgs/servers/mail/archiveopteryx/default.nix
@@ -19,6 +19,13 @@ stdenv.mkDerivation rec {
     sed -i 's:MANDIR = $(PREFIX)/man:MANDIR = '$out'/share/man:' ./Jamsettings
     sed -i 's:READMEDIR = $(PREFIX):READMEDIR = '$out'/share/doc/archiveopteryx:' ./Jamsettings
   '';
+
+  # fix build on gcc7
+  NIX_CFLAGS_COMPILE = [
+    "-Wno-error=builtin-declaration-mismatch"
+    "-Wno-error=implicit-fallthrough"
+  ];
+
   buildPhase = ''jam "-j$NIX_BUILD_CORES" '';
   installPhase = ''
     jam install
diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix
index 0060a59d807..c9065d04161 100644
--- a/pkgs/servers/mail/dovecot/default.nix
+++ b/pkgs/servers/mail/dovecot/default.nix
@@ -8,7 +8,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "dovecot-2.3.0.1";
+  name = "dovecot-2.3.1";
 
   nativeBuildInputs = [ perl pkgconfig ];
   buildInputs =
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://dovecot.org/releases/2.3/${name}.tar.gz";
-    sha256 = "0lzisrdgrj5qqwjb7bv99mf2aljm568r6g108yisp0s644z2nxxb";
+    sha256 = "14zva4f8k64x86sm9n21cp2yvrpph6k6k52bm22a00pxjwdq50q8";
   };
 
   preConfigure = ''
diff --git a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix
index 92b404d0f65..e98c58c891a 100644
--- a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix
+++ b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "dovecot-pigeonhole-${version}";
-  version = "0.5.0.1";
+  version = "0.5.1";
 
   src = fetchurl {
     url = "http://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-${version}.tar.gz";
-    sha256 = "1lpsdqh9pwqx917z5v23bahhhbrcb3y5ps3l413sli8cn4a6sdan";
+    sha256 = "0ivmaxic6cygfphvlrvy0xgggydm7j7kjv1ssfqbr08q4rcsmc73";
   };
 
   buildInputs = [ dovecot openssl ];
@@ -33,6 +33,6 @@ stdenv.mkDerivation rec {
     description = "A sieve plugin for the Dovecot IMAP server";
     license = licenses.lgpl21;
     maintainers = [ maintainers.rickynils ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/servers/mail/opensmtpd/extras.nix b/pkgs/servers/mail/opensmtpd/extras.nix
index 5e87a1fb099..6b63c317d78 100644
--- a/pkgs/servers/mail/opensmtpd/extras.nix
+++ b/pkgs/servers/mail/opensmtpd/extras.nix
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
     homepage = https://www.opensmtpd.org/;
     description = "Extra plugins for the OpenSMTPD mail server";
     license = licenses.isc;
-    platforms = platforms.unix;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ gebner ];
   };
 }
diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index d8352df3623..4c7d1649832 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -26,13 +26,13 @@ let
   };
 in pythonPackages.buildPythonApplication rec {
   name = "matrix-synapse-${version}";
-  version = "0.26.0";
+  version = "0.26.1";
 
   src = fetchFromGitHub {
     owner = "matrix-org";
     repo = "synapse";
     rev = "v${version}";
-    sha256 = "1ggdnb4c8y835j9lxsglxry6fqy7d190s70rccjrc3rj0p5vwlyj";
+    sha256 = "1rm15qj743k376skjxyyfmzwajx3rb8z2inzc4309kl98jfw3cw0";
   };
 
   patches = [
diff --git a/pkgs/servers/mattermost/matterircd.nix b/pkgs/servers/mattermost/matterircd.nix
index 02a4e3bd66f..d489deb5944 100644
--- a/pkgs/servers/mattermost/matterircd.nix
+++ b/pkgs/servers/mattermost/matterircd.nix
@@ -2,16 +2,16 @@
 
 buildGoPackage rec {
   name = "matterircd-${version}";
-  version = "0.12.0";
+  version = "0.16.5";
 
   src = fetchFromGitHub {
     owner = "42wim";
     repo = "matterircd";
     rev = "v${version}";
-    sha256 = "1fgpfyb78l1kl0kja2fjqc4ik1q869cmhx6xdmp9ff2qcqk22cj0";
+    sha256 = "1rsmc2dpf25rkl8c085xwssbry3hv1gv318m7rdj616agx4m7yr2";
   };
 
-  goPackagePath = "github.com/42vim/matterircd";
+  goPackagePath = "github.com/42wim/matterircd";
 
   meta = with stdenv.lib; {
     inherit (src.meta) homepage;
diff --git a/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix b/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix
index 08c08d7d3c1..92bbc309ed3 100644
--- a/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix
+++ b/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix
@@ -13,4 +13,5 @@ mkDerivation {
   executableHaskellDepends = [ base bytestring network ];
   description = "accepts TCP connections and echoes the client's IP address back to it";
   license = stdenv.lib.licenses.lgpl3;
+  broken = true; # 2018-04-10
 }
diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index 876209b9b02..d2a0d046389 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }:
 
 buildGoPackage rec {
-  version = "5.0.0";
+  version = "5.0.4";
   name = "grafana-${version}";
   goPackagePath = "github.com/grafana/grafana";
 
@@ -9,12 +9,12 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "grafana";
     repo = "grafana";
-    sha256 = "1clkvi651wc4zx9bql5iwwnjgwgrj34dirs7ypi6rdgxissp89p9";
+    sha256 = "18f69985a5j6fd2ax6z50yfss70phdh1vwyx0z69j145zac3sf90";
   };
 
   srcStatic = fetchurl {
     url = "https://grafana-releases.s3.amazonaws.com/release/grafana-${version}.linux-x64.tar.gz";
-    sha256 = "1n2l5ybscc0g1npsa648wjwwb4qrj3f549nf0y6wsifp5k051lhd";
+    sha256 = "0xdpqf8n3ds0g7nhbiwahhdj0hfc4biz69rhkl48vm31idlr92sc";
   };
 
   preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace";
diff --git a/pkgs/servers/monitoring/heapster/default.nix b/pkgs/servers/monitoring/heapster/default.nix
index db3c518c729..39c04857638 100644
--- a/pkgs/servers/monitoring/heapster/default.nix
+++ b/pkgs/servers/monitoring/heapster/default.nix
@@ -10,7 +10,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "kubernetes";
     repo = "heapster";
-    sha256 = "057z9imgd2gvcbvahja3i26jzgm33dmfaxraakmcr4a2xfhj50hq";
+    sha256 = "1vg83207y7yigydnnhlvzs3s94vx02i56lqgs6a96c6i3mr3ydpb";
   };
 
   preBuild = ''
diff --git a/pkgs/servers/monitoring/plugins/default.nix b/pkgs/servers/monitoring/plugins/default.nix
index 808257ca121..a0f7341571c 100644
--- a/pkgs/servers/monitoring/plugins/default.nix
+++ b/pkgs/servers/monitoring/plugins/default.nix
@@ -62,7 +62,7 @@ _EOF
   '';
 
   meta = {
-    description = "Official monitoring plugins for Nagios/Ichinga/Sensu and others.";
+    description = "Official monitoring plugins for Nagios/Icinga/Sensu and others.";
     homepage    = https://www.monitoring-plugins.org;
     license     = licenses.gpl2;
     platforms   = platforms.linux;
diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
index 047585e2fc0..798f31c3458 100644
--- a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "blackbox_exporter-${version}";
-  version = "0.11.0";
+  version = "0.12.0";
   rev = version;
 
   goPackagePath = "github.com/prometheus/blackbox_exporter";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "prometheus";
     repo = "blackbox_exporter";
-    sha256 = "1zwhyvjkf222bwvgim28yizk2vq0777dviqfkkc3vdhiwl9amr8v";
+    sha256 = "0gd3vymk3qdfjnf0rx9kwc6v0jv7f8l30igvj2v7bljar2d6hzxf";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix
index 8b70ad423e9..497f20ac55e 100644
--- a/pkgs/servers/monitoring/prometheus/node-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "node_exporter-${version}";
-  version = "0.15.0";
+  version = "0.15.2";
   rev = "v${version}";
 
   goPackagePath = "github.com/prometheus/node_exporter";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "prometheus";
     repo = "node_exporter";
-    sha256 = "0v1m6m9fmlw66s9v50y2rfr5kbpb9mxbwpcab4cmgcjs1y7wcn49";
+    sha256 = "1vxbkps80ba8c0ndawijg07am5gyc8y49h8fd0ky5h05zmkp25qv";
   };
 
   # FIXME: megacli test fails
diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix
index 65a95c021c4..e06aaa9faa4 100644
--- a/pkgs/servers/monitoring/telegraf/default.nix
+++ b/pkgs/servers/monitoring/telegraf/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "telegraf-${version}";
-  version = "1.5.1";
+  version = "1.5.3";
 
   goPackagePath = "github.com/influxdata/telegraf";
 
diff --git a/pkgs/servers/monitoring/telegraf/deps-1.5.1.nix b/pkgs/servers/monitoring/telegraf/deps-1.5.3.nix
similarity index 100%
rename from pkgs/servers/monitoring/telegraf/deps-1.5.1.nix
rename to pkgs/servers/monitoring/telegraf/deps-1.5.3.nix
diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix
index 2e423246c51..e6baf9e64d8 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name= "nextcloud-${version}";
-  version = "13.0.0";
+  version = "13.0.1";
 
   src = fetchurl {
     url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2";
-    sha256 = "38e6064432a2d1a044f219028d3fd46cb7a943a47e11eef346810bd289705aec";
+    sha256 = "048x3x6d11m75ghxjcjzm8amjm6ljirv6djbl53awwp9f5532hsp";
   };
 
   installPhase = ''
diff --git a/pkgs/servers/nextcloud/news-updater.nix b/pkgs/servers/nextcloud/news-updater.nix
index a78b3d59095..0fcb5047549 100644
--- a/pkgs/servers/nextcloud/news-updater.nix
+++ b/pkgs/servers/nextcloud/news-updater.nix
@@ -2,11 +2,11 @@
 
 python3Packages.buildPythonApplication rec {
   name = "nextcloud-news-updater-${version}";
-  version = "10.0.0";
+  version = "10.0.1";
 
   src = fetchurl {
     url = "mirror://pypi/n/nextcloud_news_updater/nextcloud_news_updater-${version}.tar.gz";
-    sha256 = "00pscz0p4s10y1ymb6sm0gx4a5wdbhimn30582x8i28n58nnl8j0";
+    sha256 = "14jj3w417wfsm1ki34d980b0s6vfn8i29g4c66qb2fizdq1d0z6q";
   };
 
   doCheck = false;
diff --git a/pkgs/servers/openpts/bugs.patch b/pkgs/servers/openpts/bugs.patch
deleted file mode 100644
index d818bafbc9f..00000000000
--- a/pkgs/servers/openpts/bugs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urNp openpts-0.2.6-cvs-patched/src/fsm.c openpts-0.2.6-current/src/fsm.c
---- openpts-0.2.6-cvs-patched/src/fsm.c	2012-01-05 03:49:15.000000000 -0500
-+++ openpts-0.2.6-current/src/fsm.c	2012-01-09 12:11:17.338706205 -0500
-@@ -934,7 +934,7 @@ char *getEventString(OPENPTS_PCR_EVENT_W
-     /* event */
-     event = eventWrapper->event;
-     if (event != NULL) {
--        // len = snprintf(buf, size, "PCR[%d],TYPE=%d", (int)event->ulPcrIndex, event->eventType);
-+        snprintf(buf, size, "PCR[%d],TYPE=%d", (int)event->ulPcrIndex, event->eventType);
-     } else {
-         LOG(LOG_ERR, "NULL event\n");  // TODO(munetoh)
-         xfree(buf);
diff --git a/pkgs/servers/openpts/default.nix b/pkgs/servers/openpts/default.nix
deleted file mode 100644
index 27731af3803..00000000000
--- a/pkgs/servers/openpts/default.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{ stdenv, fetchurl, autoconf, automake, pkgconfig, libtool, trousers, openssl, libxml2, libuuid, gettext, perl }:
-
-stdenv.mkDerivation rec {
-  name = "openpts-${version}";
-  version = "0.2.6";
-
-  src = fetchurl {
-    url = "http://jaist.dl.osdn.jp/openpts/54410/openpts-${version}.tar.gz";
-    sha256 = "1b5phshl49fxr5y3g5zz75gm0n4cw8i7n29x5f1a95xkwrjpazi0";
-  };
-
-  # patches from https://apps.fedoraproject.org/packages/openpts/sources/patches/
-  patches = [ ./bugs.patch ./zlib.patch ./tboot.patch ./ptsc.patch ];
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ autoconf automake libtool trousers openssl libxml2 libuuid gettext ];
-
-  preConfigure = ''
-    substituteInPlace include/Makefile.am --replace "./cvs2msg.pl" "${perl}/bin/perl cvs2msg.pl";
-    $SHELL bootstrap.sh
-    '';
-
-  configureFlags = [ "--with-tss" "--with-aru" "--with-tboot" "--enable-tnc" "--with-aide" ];
-
-  NIX_CFLAGS_COMPILE = "-I${trousers}/include/trousers -I${trousers}/include/tss -Wno-deprecated-declarations";
-
-  preInstall = ''
-    mkdir -p $out
-    mkdir -p $out/etc
-    cp -p dist/ptsc.conf.in $out/etc/ptsc.conf
-    cp -p dist/ptsv.conf.in $out/etc/ptsv.conf
-    mkdir -p $out/share/openpts/models
-    cp -p models/*.uml $out/share/openpts/models/
-
-    mkdir -p $out/share/openpts/tpm_emulator
-    cp dist/tpm_emulator/README.rhel $out/share/openpts/tpm_emulator/README
-    cp dist/tpm_emulator/binary_bios_measurements $out/share/openpts/tpm_emulator/
-    cp dist/tpm_emulator/tcsd $out/share/openpts/tpm_emulator/
-
-    mkdir -p $out/share/openpts/tboot
-    cp dist/tboot/README.fedora15 $out/share/openpts/tboot/README
-    cp dist/tboot/ptsc.conf.fedora15 $out/share/openpts/tboot/ptsc.conf
-    cp dist/tboot/tcsd.conf.fedora15 $out/share/openpts/tboot/tcsd.conf
-    cp dist/tboot/tcsd.fedora15 $out/share/openpts/tboot/tcsd
-    '';
-
-  meta = {
-    description = "TCG Platform Trust Service (PTS)";
-    homepage = http://sourceforge.jp/projects/openpts;
-    license = stdenv.lib.licenses.cpl10;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ tstrobel ];
-  };
-}
diff --git a/pkgs/servers/openpts/ptsc.patch b/pkgs/servers/openpts/ptsc.patch
deleted file mode 100644
index b6fcde74074..00000000000
--- a/pkgs/servers/openpts/ptsc.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -urNp openpts-0.2.6-patched/src/ptsc.c openpts-0.2.6-current/src/ptsc.c
---- openpts-0.2.6-patched/src/ptsc.c	2012-08-21 15:57:07.733841433 -0400
-+++ openpts-0.2.6-current/src/ptsc.c	2012-08-21 16:13:26.479732504 -0400
-@@ -457,7 +457,10 @@ void ptsc_lock(void) {
-             exit(1);
-         }
-         oldgrp = getegid();
--        setegid(grp.gr_gid);
-+        if(setegid(grp.gr_gid) != 0){
-+		LOG(LOG_ERR, "setegid fail");
-+		exit(1);
-+	}
-     }
- 
-     oldmask = umask(0);
-@@ -467,7 +470,10 @@ void ptsc_lock(void) {
-     }
-     if (grpent) {
-         chmod(LOCK_DIR, 02775);
--        setegid(oldgrp);
-+	if(setegid(oldgrp) != 0){
-+		LOG(LOG_ERR, "setegid fail");
-+		exit(1);
-+        }
-     }
-     fd = open(LOCK_FILE, O_RDWR | O_CREAT | O_TRUNC, 0660);
-     if (fd < 0) {
-
diff --git a/pkgs/servers/openpts/tboot.patch b/pkgs/servers/openpts/tboot.patch
deleted file mode 100644
index 6ecee583920..00000000000
--- a/pkgs/servers/openpts/tboot.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -urNp openpts-0.2.6-patched/src/tboot2iml.c openpts-0.2.6-current/src/tboot2iml.c
---- openpts-0.2.6-patched/src/tboot2iml.c	2012-07-23 16:30:12.381361421 -0400
-+++ openpts-0.2.6-current/src/tboot2iml.c	2012-07-23 17:25:59.053945778 -0400
-@@ -531,7 +531,7 @@ int sinit_acm_hash(char *filename, int s
- 
- 
- int sha1sum_unzip(char *filename, int *filesize, BYTE *digest) {
--    FILE *fp;
-+    gzFile fp;
-     char buf[2048];
-     SHA_CTX sha_ctx;
-     int len;
-@@ -541,7 +541,7 @@ int sha1sum_unzip(char *filename, int *f
- 
-     /* open */
-     fp = gzopen(filename, "rb");
--    if (fp == NULL) {
-+    if (fp == Z_NULL) {
-         LOG(LOG_ERR, "File %s does not exist\n", filename);
-         return 0;
-     }
diff --git a/pkgs/servers/openpts/zlib.patch b/pkgs/servers/openpts/zlib.patch
deleted file mode 100644
index 7fa3fce10fe..00000000000
--- a/pkgs/servers/openpts/zlib.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urNp openpts-0.2.6-cvs-patched/src/Makefile.am openpts-0.2.6-current/src/Makefile.am
---- openpts-0.2.6-cvs-patched/src/Makefile.am	2012-01-05 03:49:15.000000000 -0500
-+++ openpts-0.2.6-current/src/Makefile.am	2012-01-09 14:12:02.507361732 -0500
-@@ -30,7 +30,7 @@ localedir = $(datadir)/locale
- 
- 
- AM_CPPFLAGS = -I$(top_srcdir)/include $(LIBXML2_CFLAGS) $(TSS_CFLAGS) -I../include -DLOCALEDIR=\"$(localedir)\"
--AM_LDFLAGS = $(LIBXML2_LIBS) $(LIBCRYPTO_LIBS) $(TSS_LIBS) -lopenpts
-+AM_LDFLAGS = $(LIBXML2_LIBS) $(LIBCRYPTO_LIBS) $(TSS_LIBS) -lz -lopenpts
- # $(LIBINTL) -lopenpts
- 
- if HAVE_LIBUUID
diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index 90b00169a51..ba7e9c923e3 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/pkgs/servers/samba/4.x.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchurl, python, pkgconfig, perl, libxslt, docbook_xsl
 , 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
+, krb5Full, zlib, openldap, cups, pam, avahi, acl, libaio, fam, libceph, glusterfs
 , gnutls, libgcrypt, libgpgerror
 , ncurses, libunwind, libibverbs, librdmacm, systemd
 
@@ -19,11 +19,11 @@ with lib;
 
 stdenv.mkDerivation rec {
   name = "samba-${version}";
-  version = "4.7.4";
+  version = "4.7.6";
 
   src = fetchurl {
     url = "mirror://samba/pub/samba/stable/${name}.tar.gz";
-    sha256 = "0iw290n0q4l5s92d0f9yz27yp3rdfr6bvsmvg1xvd19g8p2d04pv";
+    sha256 = "0vkxqp3wh7bpn1fd45lznmrpn2ma1fq75yq28vi08rggr07y7v8y";
   };
 
   outputs = [ "out" "dev" "man" ];
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   buildInputs =
     [ python pkgconfig perl libxslt docbook_xsl docbook_xml_dtd_42 /*
       docbook_xml_dtd_45 */ readline talloc popt iniparser
-      libbsd libarchive zlib acl fam libiconv gettext libunwind kerberos
+      libbsd libarchive zlib acl fam libiconv gettext libunwind krb5Full
     ]
     ++ optionals stdenv.isLinux [ libaio pam systemd ]
     ++ optionals (enableInfiniband && stdenv.isLinux) [ libibverbs librdmacm ]
@@ -61,6 +61,7 @@ stdenv.mkDerivation rec {
     [ "--with-static-modules=NONE"
       "--with-shared-modules=ALL"
       "--with-system-mitkrb5"
+      "--with-system-mitkdc" "${krb5Full}"
       "--enable-fhs"
       "--sysconfdir=/etc"
       "--localstatedir=/var"
diff --git a/pkgs/servers/samba/master.nix b/pkgs/servers/samba/master.nix
index f1dd7fe7b14..df1f9feb4de 100644
--- a/pkgs/servers/samba/master.nix
+++ b/pkgs/servers/samba/master.nix
@@ -4,14 +4,14 @@
 } :
 
   (samba4.overrideAttrs(oldAttrs: rec {
-    name = "samba-master${version}";
-    version = "4.8.0_2018-01-25";
+    name = "samba-unstable-${version}";
+    version = "2018-03-09";
 
     src = fetchFromGitHub {
       owner = "samba-team";
       repo = "samba";
-      rev = "849169a7b6ed0beb78bbddf25537521c1ed2f8e1";
-      sha256 = "1535w787cy1x5ia9arjrg6hhf926wi8wm9qj0k0jgydy3600zpbv";
+      rev = "9e954bcbf43d67a18ee55f84cda0b09028f96b92";
+      sha256 = "07j1pwm4kax6pq21gq9gpmp7dhj5afdyvkhgyl3yz334mb41q11g";
     };
 
     # Remove unnecessary install flags, same as <4.8 patch
diff --git a/pkgs/servers/search/elasticsearch/5.x.nix b/pkgs/servers/search/elasticsearch/5.x.nix
index 0d27e4fefcc..59638771eff 100644
--- a/pkgs/servers/search/elasticsearch/5.x.nix
+++ b/pkgs/servers/search/elasticsearch/5.x.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}.tar.gz";
-    sha256 = "0wjjvzjbdgdv9qznk1b8dx63zgs7s6jnrrbrnd5dn27lhymxiwpl";
+    sha256 = "0sm99m4m4mmigj6ll22kyaw7zkp1s2i0mhzx15fzidnybdnlifb4";
   };
 
   patches = [ ./es-home-5.x.patch ./es-classpath-5.x.patch ];
diff --git a/pkgs/servers/search/elasticsearch/6.x.nix b/pkgs/servers/search/elasticsearch/6.x.nix
index 6057c2dee82..f2c9133617c 100644
--- a/pkgs/servers/search/elasticsearch/6.x.nix
+++ b/pkgs/servers/search/elasticsearch/6.x.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}.tar.gz";
-    sha256 = "03xwd8r0l0a29wl6wrp4bh7xr1b79q2rqfmsq3d5k35pv85sw3lw";
+    sha256 = "13hf00khq33yw6zv022vcrsf6vm43isx40x7ww8r1lqx3vmg3rli";
   };
 
   patches = [ ./es-home-6.x.patch ];
@@ -30,8 +30,7 @@ stdenv.mkDerivation rec {
       ${if (!stdenv.isDarwin)
         then ''--prefix PATH : "${utillinux}/bin/"''
         else ''--prefix PATH : "${getopt}/bin"''} \
-      --set JAVA_HOME "${jre_headless}" \
-      --set ES_JVM_OPTIONS "$out/config/jvm.options"
+      --set JAVA_HOME "${jre_headless}"
 
     wrapProgram $out/bin/elasticsearch-plugin --set JAVA_HOME "${jre_headless}"
   '';
diff --git a/pkgs/servers/shairplay/default.nix b/pkgs/servers/shairplay/default.nix
index 33e2f39280a..f9b17b947cf 100644
--- a/pkgs/servers/shairplay/default.nix
+++ b/pkgs/servers/shairplay/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   # the build will fail without complaining about a reference to /tmp
-  preFixup = ''
+  preFixup = stdenv.lib.optionalString stdenv.isLinux ''
     patchelf \
       --set-rpath "${stdenv.lib.makeLibraryPath buildInputs}:$out/lib" \
       $out/bin/shairplay
diff --git a/pkgs/servers/sql/percona/5.6.x.nix b/pkgs/servers/sql/percona/5.6.x.nix
index fc6c54f82c9..e440f11b2e4 100644
--- a/pkgs/servers/sql/percona/5.6.x.nix
+++ b/pkgs/servers/sql/percona/5.6.x.nix
@@ -57,5 +57,6 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
     license = licenses.gpl2;
     maintainers = with maintainers; [ grahamc ];
+    broken = true; # 2018-04-11
   };
 }
diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index 02a620cee53..a2093962ea9 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -93,33 +93,33 @@ let
 in {
 
   postgresql93 = common {
-    version = "9.3.20";
+    version = "9.3.22";
     psqlSchema = "9.3";
-    sha256 = "1jp6lac4b0q6hb28yrdsl0ymzn75gg59hvp5zasarf3mf3b8l4zb";
+    sha256 = "06p9rk2bav41ybp8ra1bpf44avw9kl5s1wyql21n5awvlm5fs60v";
   };
 
   postgresql94 = common {
-    version = "9.4.15";
+    version = "9.4.17";
     psqlSchema = "9.4";
-    sha256 = "1i5c67gg4fj38hk07h6w6m4mqak84bhnblqsjbpiamg4x33v7gqj";
+    sha256 = "1inpkwbr2xappz3kq3jr3hsn6mwn167nijcx406q8aq56p9hqcks";
   };
 
   postgresql95 = common {
-    version = "9.5.10";
+    version = "9.5.12";
     psqlSchema = "9.5";
-    sha256 = "10gjfn16bhzkmlqfsn384w49db0j39bg3n4majwxdpjd17g7lpcl";
+    sha256 = "167nlrpsnqz63gafgn21j4yc2f5g1mpfkz8qxjxk2xs6crf6zs02";
   };
 
   postgresql96 = common {
-    version = "9.6.6";
+    version = "9.6.8";
     psqlSchema = "9.6";
-    sha256 = "0m417h30s18rwa7yzkqqcdb22ifpcda2fpg2cyx8bxvjp3ydz71r";
+    sha256 = "0w7bwf19wbdd3jjbjv03cnx56qka4801srcbsayk9v792awv7zga";
   };
 
   postgresql100 = common {
-    version = "10.1";
+    version = "10.3";
     psqlSchema = "10.0";
-    sha256 = "04z7lm4h94625vbncwv98svycqr942n3q47ailqaczkszqjlxjrw";
+    sha256 = "06lkcwsf851z49zqcws5yc77s2yrbaazf2nvbk38hpp31rw6i8kf";
   };
 
 }
diff --git a/pkgs/servers/sql/postgresql/pg_repack/default.nix b/pkgs/servers/sql/postgresql/pg_repack/default.nix
index 0a25b314506..50c9c68bb5f 100644
--- a/pkgs/servers/sql/postgresql/pg_repack/default.nix
+++ b/pkgs/servers/sql/postgresql/pg_repack/default.nix
@@ -1,17 +1,16 @@
 { stdenv, fetchFromGitHub, postgresql, openssl, zlib, readline }:
 
 stdenv.mkDerivation rec {
-    name = "pg_repack-${version}.1";
-    version = "1.4.0";
-    rev = "ver_${version}.1";
+    name = "pg_repack-${version}";
+    version = "1.4.2";
 
     buildInputs = [ postgresql openssl zlib readline ];
 
     src = fetchFromGitHub {
-      owner = "reorg";
-      repo = "pg_repack";
-      inherit rev;
-      sha256 = "1ym2dlhgcizyy4p5dcfw7kadrq6g34pv3liyfx604irprzhw9k74";
+      owner  = "reorg";
+      repo   = "pg_repack";
+      rev    = "refs/tags/ver_${version}";
+      sha256 = "1yv5x7dgiv1miazbngkrkdbc2zpwklj6nlligghjvv83bcl8969q";
     };
 
     installPhase = ''
diff --git a/pkgs/servers/sql/postgresql/timescaledb/default.nix b/pkgs/servers/sql/postgresql/timescaledb/default.nix
index 223bd6e470b..e1a4aed3b7e 100644
--- a/pkgs/servers/sql/postgresql/timescaledb/default.nix
+++ b/pkgs/servers/sql/postgresql/timescaledb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, postgresql }:
+{ stdenv, fetchFromGitHub, cmake, postgresql }:
 
 # # To enable on NixOS:
 # config.services.postgresql = {
@@ -8,29 +8,37 @@
 
 stdenv.mkDerivation rec {
   name = "timescaledb-${version}";
-  version = "0.6.0";
+  version = "0.9.1";
 
+  nativeBuildInputs = [ cmake ];
   buildInputs = [ postgresql ];
 
   src = fetchFromGitHub {
-    owner = "timescale";
-    repo = "timescaledb";
-    rev = version;
-    sha256 = "061z1ll3x7ca7fj12rl2difkdvmqykksqhpsql552qkkylg7iq4d";
+    owner  = "timescale";
+    repo   = "timescaledb";
+    rev    = "refs/tags/${version}";
+    sha256 = "00k8fk5a1xpv9nxlmafnngk31wh80h6m72vsl1hnyq7nhby7ylic";
   };
 
-  installPhase = ''
-    mkdir -p $out/bin
-    install -D timescaledb.so      -t $out/lib
-    install -D timescaledb.control -t $out/share/extension
-    cp -dpR    sql/*                  $out/share/extension/
+  # Fix the install phase which tries to install into the pgsql extension dir,
+  # and cannot be manually overridden. This is rather fragile but works OK.
+  patchPhase = ''
+    for x in CMakeLists.txt sql/CMakeLists.txt; do
+      substituteInPlace "$x" \
+        --replace 'DESTINATION "''${PG_SHAREDIR}/extension"' "DESTINATION \"$out/share/extension\""
+    done
+
+    for x in src/CMakeLists.txt src/loader/CMakeLists.txt; do
+      substituteInPlace "$x" \
+        --replace 'DESTINATION ''${PG_PKGLIBDIR}' "DESTINATION \"$out/lib\""
+    done
   '';
 
   meta = with stdenv.lib; {
     description = "Scales PostgreSQL for time-series data via automatic partitioning across time and space";
-    homepage = https://www.timescale.com/;
+    homepage    = https://www.timescale.com/;
     maintainers = with maintainers; [ volth ];
-    platforms = platforms.linux;
-    license = licenses.postgresql;
+    platforms   = platforms.linux;
+    license     = licenses.postgresql;
   };
 }
diff --git a/pkgs/servers/squid/4.nix b/pkgs/servers/squid/4.nix
index 777e910038a..4c76173a280 100644
--- a/pkgs/servers/squid/4.nix
+++ b/pkgs/servers/squid/4.nix
@@ -2,11 +2,11 @@
 , expat, libxml2, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "squid-4.0.23";
+  name = "squid-4.0.24";
 
   src = fetchurl {
     url = "http://www.squid-cache.org/Versions/v4/${name}.tar.xz";
-    sha256 = "0a8g0zs3xayfkxl8maq823b14lckvh9d5lf7ryh9rx303xh1mdqq";
+    sha256 = "01vayx86sakfy9zz2q5cvzv97865l1zb0jkqbh7wqz9hcgbs0789";
   };
 
   buildInputs = [
diff --git a/pkgs/servers/trezord/default.nix b/pkgs/servers/trezord/default.nix
index bdc37b700e5..a3c50564621 100644
--- a/pkgs/servers/trezord/default.nix
+++ b/pkgs/servers/trezord/default.nix
@@ -1,65 +1,26 @@
-{ stdenv, fetchgit, fetchFromGitHub, curl, cmake, boost, gcc, protobuf, pkgconfig, jsoncpp
-, libusb1, libmicrohttpd
-}:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
-let
-  version = "1.2.1";
-in
+buildGoPackage rec {
+  name = "trezord-go-${version}";
+  version = "2.0.12";
 
-stdenv.mkDerivation rec {
-  name = "trezord-${version}";
+  # Fixes Cgo related build failures (see https://github.com/NixOS/nixpkgs/issues/25959 )
+  hardeningDisable = [ "fortify" ];
 
-  src = fetchgit {
-    url    = "https://github.com/trezor/trezord";
-    rev    = "refs/tags/v${version}";
-    sha256 = "1iaxmwyidjdcrc6jg0859v6v5x3qnz5b0p78pq0bypvmgyijhpm4";
-  };
+  goPackagePath = "github.com/trezor/trezord-go";
 
-  common = fetchFromGitHub {
-    owner = "trezor";
-    repo = "trezor-common";
-    rev = "b55fb61218431e9c99c9d6c1673801902fc9e92e";
-    sha256 = "1zanbgz1qjs8wfwp0z91sqcvj77a9iis694k415jyd2dn4riqhdg";
+  src = fetchFromGitHub {
+    owner  = "trezor";
+    repo   = "trezord-go";
+    rev    = "v${version}";
+    sha256 = "03pz223jjfbd0g9gkk21q6d27jc8vd1bc1jz00i0f3dzvsyfx5g6";
   };
 
   meta = with stdenv.lib; {
-    description = "TREZOR Bridge daemon for TREZOR bitcoin hardware wallet";
+    description = "TREZOR Communication Daemon aka TREZOR Bridge";
     homepage = https://mytrezor.com;
     license = licenses.gpl3;
     maintainers = with stdenv.lib.maintainers; [ canndrew jb55 ];
     platforms = platforms.linux;
   };
-
-  patches = [ ./dynamic-link.patch ];
-
-  nativeBuildInputs = [
-    cmake
-    gcc
-    pkgconfig
-  ];
-
-  buildInputs = [
-    curl
-    boost
-    protobuf
-    libusb1
-    libmicrohttpd
-    jsoncpp
-  ];
-
-  preConfigure = ''
-    ( cd src/config
-      ln -s $common/protob/config.proto
-      protoc -I . --cpp_out=. config.proto
-    )
-  '';
-
-  LD_LIBRARY_PATH = "${stdenv.lib.makeLibraryPath [ curl ]}";
-  cmakeFlags = [ "-DJSONCPP_LIBRARY='${jsoncpp}/lib/libjsoncpp.so'" ];
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp trezord $out/bin
-  '';
 }
-
diff --git a/pkgs/servers/trezord/dynamic-link.patch b/pkgs/servers/trezord/dynamic-link.patch
deleted file mode 100644
index 0f1f448a3f7..00000000000
--- a/pkgs/servers/trezord/dynamic-link.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7c0e2cf..0e3f4ac 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -59,13 +59,6 @@ target_link_libraries(trezord ${OS_LIBRARIES})
- find_package(CURL REQUIRED)
- find_package(libmicrohttpd REQUIRED)
- 
--# add static libs
--if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
--  set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
--  set(BUILD_SHARED_LIBS off)
--  set(Boost_USE_STATIC_LIBS on)
--  set(CMAKE_FIND_STATIC FIRST)
--endif(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
- find_package(Boost 1.53.0 REQUIRED
-   regex thread system unit_test_framework program_options chrono)
- find_package(Protobuf 2.5.0 REQUIRED)
diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix
index 040a2ece303..e9d2fd07dc5 100644
--- a/pkgs/servers/unifi/default.nix
+++ b/pkgs/servers/unifi/default.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   name = "unifi-controller-${version}";
-  version = "5.6.30";
+  version = "5.6.36";
 
   src = fetchurl {
     url = "https://dl.ubnt.com/unifi/${version}/unifi_sysvinit_all.deb";
-    sha256 = "083bh29i7dpn0ajc6h584vhkybiavnln3xndpb670chfrbywxyj4";
+    sha256 = "075q7vm56fdsjwh72y2cb1pirl2pxdkvqnhvd3bf1c2n64mvp6bi";
   };
 
   buildInputs = [ dpkg ];
diff --git a/pkgs/servers/web-apps/klaus/default.nix b/pkgs/servers/web-apps/klaus/default.nix
new file mode 100644
index 00000000000..bb953ecc03a
--- /dev/null
+++ b/pkgs/servers/web-apps/klaus/default.nix
@@ -0,0 +1,40 @@
+{ lib, python, fetchFromGitHub }:
+
+python.pkgs.buildPythonApplication rec {
+  pname = "klaus";
+  version = "1.2.2";
+
+  src = fetchFromGitHub {
+    owner = "jonashaag";
+    repo = pname;
+    rev = version;
+    sha256 = "0hkl1ycyd5ccijmknr3yfp3ga43y01m7390xnibqqgaisfvcm9wp";
+  };
+
+  prePatch = ''
+    substituteInPlace runtests.sh \
+      --replace "mkdir -p \$builddir" "mkdir -p \$builddir && pwd"
+  '';
+
+  propagatedBuildInputs = with python.pkgs; [
+    six flask pygments dulwich httpauth humanize
+  ];
+
+  checkInputs = with python.pkgs; [
+    pytest requests python-ctags3
+  ] ++ lib.optional (!isPy3k) mock;
+
+  checkPhase = ''
+    ./runtests.sh
+  '';
+
+  # Needs to set up some git repos
+  doCheck = false;
+
+  meta = with lib; {
+    description = "The first Git web viewer that Just Works";
+    homepage    = https://github.com/jonashaag/klaus;
+    license     = licenses.isc;
+    maintainers = with maintainers; [ matthiasbeyer ];
+  };
+}
diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix
index c99b20a46bd..c8a918c2bd2 100644
--- a/pkgs/servers/web-apps/matomo/default.nix
+++ b/pkgs/servers/web-apps/matomo/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "matomo-${version}";
-  version = "3.3.0";
+  version = "3.4.0";
 
   src = fetchurl {
     # TODO: As soon as the tarballs are renamed as well on future releases, this should be enabled again
     # url = "https://builds.matomo.org/${name}.tar.gz";
     url = "https://builds.matomo.org/piwik-${version}.tar.gz";
-    sha256 = "1ybzj3kk0x29nv8c6xnhir5d9dr0q0fl1vnm4i7zvhml73ryqk0f";
+    sha256 = "1hnja8mvjvlbqgw7maa76lxd5hxxg7d5ggq9wyrff25mapj398wc";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index d22565ae8db..25544633c77 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -848,11 +848,11 @@ let
   }) // {inherit libX11 xextproto xproto ;};
 
   libXfixes = (mkDerivation "libXfixes" {
-    name = "libXfixes-5.0.2";
+    name = "libXfixes-5.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libXfixes-5.0.2.tar.bz2;
-      sha256 = "1slsk898386xii0r3l7szwwq3s6y2m4dsj0x93ninjh8xkghxllv";
+      url = mirror://xorg/individual/lib/libXfixes-5.0.3.tar.bz2;
+      sha256 = "1miana3y4hwdqdparsccmygqr3ic3hs5jrqfzp70hvi2zwxd676y";
     };
     nativeBuildInputs = [ pkgconfig ];
     buildInputs = [ fixesproto libX11 xextproto xproto ];
@@ -2570,6 +2570,9 @@ let
       url = mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2;
       sha256 = "0kckng0zs1viz0nr84rdl6dswgip7ndn4pnh5nfwnviwpsfmmksd";
     };
+    postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+      substituteInPlace $out/lib/X11/config/darwin.cf --replace "/usr/bin/" ""
+    '';
     nativeBuildInputs = [ pkgconfig ];
     buildInputs = [ ];
     meta.platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 18189ba2e68..13fbf7b6791 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -429,8 +429,9 @@ in
   xorgserver = with xorg; attrs_passed:
     # exchange attrs if abiCompat is set
     let
+      version = (builtins.parseDrvName attrs_passed.name).version;
       attrs = with args;
-        if (args.abiCompat == null) then attrs_passed
+        if (args.abiCompat == null || lib.hasPrefix args.abiCompat version) then attrs_passed
         else if (args.abiCompat == "1.17") then {
           name = "xorg-server-1.17.4";
           builder = ./builder.sh;
@@ -452,7 +453,7 @@ in
             buildInputs = [ dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ];
             postPatch = "sed '1i#include ' -i include/os.h";
             meta.platforms = stdenv.lib.platforms.unix;
-        } else throw "unsupported xorg abiCompat: ${args.abiCompat}";
+        } else throw "unsupported xorg abiCompat ${args.abiCompat} for ${attrs_passed.name}";
 
     in attrs //
     (let
diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix
index b0e3492c0da..2d0e1a529da 100644
--- a/pkgs/servers/xmpp/prosody/default.nix
+++ b/pkgs/servers/xmpp/prosody/default.nix
@@ -1,14 +1,13 @@
 { stdenv, fetchurl, libidn, openssl, makeWrapper, fetchhg
 , lua5, luasocket, luasec, luaexpat, luafilesystem, luabitop
 , withLibevent ? true, luaevent ? null
-, withZlib ? true, luazlib ? null
 , withDBI ? true, luadbi ? null
 # use withExtraLibs to add additional dependencies of community modules
 , withExtraLibs ? [ ]
+, withOnlyInstalledCommunityModules ? [ ]
 , withCommunityModules ? [ ] }:
 
 assert withLibevent -> luaevent != null;
-assert withZlib -> luazlib != null;
 assert withDBI -> luadbi != null;
 
 with stdenv.lib;
@@ -16,7 +15,6 @@ with stdenv.lib;
 let
   libs        = [ luasocket luasec luaexpat luafilesystem luabitop ]
                 ++ optional withLibevent luaevent
-                ++ optional withZlib luazlib
                 ++ optional withDBI luadbi
                 ++ withExtraLibs;
   getPath     = lib : type : "${lib}/lib/lua/${lua5.luaversion}/?.${type};${lib}/share/lua/${lua5.luaversion}/?.${type}";
@@ -27,21 +25,22 @@ let
 in
 
 stdenv.mkDerivation rec {
-  version = "0.9.12";
+  version = "0.10.0";
   name = "prosody-${version}";
 
   src = fetchurl {
     url = "http://prosody.im/downloads/source/${name}.tar.gz";
-    sha256 = "139yxqpinajl32ryrybvilh54ddb1q6s0ajjhlcs4a0rnwia6n8s";
+    sha256 = "1644jy5dk46vahmh6nna36s79k8k668sbi3qamjb4q3c4m3y853l";
   };
 
   communityModules = fetchhg {
     url = "https://hg.prosody.im/prosody-modules";
-    rev = "9a3e51f348fe";
-    sha256 = "09g4vi52rv0r3jzcm0bsgp4ngqq6iapfbxfh0l7qj36qnajp4vm6";
+    rev = "150a7bd59043";
+    sha256 = "0nfx3lngcy88nd81gb7v4kh3nz1bzsm67bxgpd2lprk54diqcrz1";
   };
 
-  buildInputs = [ lua5 makeWrapper libidn openssl ];
+  buildInputs = [ lua5 makeWrapper libidn openssl ]
+    ++ optional withDBI luadbi;
 
   configureFlags = [
     "--ostype=linux"
@@ -52,7 +51,7 @@ stdenv.mkDerivation rec {
   postInstall = ''
       ${concatMapStringsSep "\n" (module: ''
         cp -r $communityModules/mod_${module} $out/lib/prosody/modules/
-      '') withCommunityModules}
+      '') (withCommunityModules ++ withOnlyInstalledCommunityModules)}
       wrapProgram $out/bin/prosody \
         --set LUA_PATH '${luaPath};' \
         --set LUA_CPATH '${luaCPath};'
@@ -62,11 +61,13 @@ stdenv.mkDerivation rec {
         --set LUA_CPATH '${luaCPath};'
     '';
 
+  passthru.communityModules = withCommunityModules;
+
   meta = {
     description = "Open-source XMPP application server written in Lua";
     license = licenses.mit;
-    homepage = http://www.prosody.im;
+    homepage = https://prosody.im;
     platforms = platforms.linux;
-    maintainers = [ ];
+    maintainers = with maintainers; [ fpletz globin ];
   };
 }
diff --git a/pkgs/shells/nix-bash-completions/default.nix b/pkgs/shells/nix-bash-completions/default.nix
index c8582366d1a..b76e65ca871 100644
--- a/pkgs/shells/nix-bash-completions/default.nix
+++ b/pkgs/shells/nix-bash-completions/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  version = "0.6.4";
+  version = "0.6.6";
   name = "nix-bash-completions-${version}";
 
   src = fetchFromGitHub {
     owner = "hedning";
     repo = "nix-bash-completions";
     rev = "v${version}";
-    sha256 = "1kdysrfc8dx24q438wj3aisn64g2w5yb6mx91qa385p5hz7b1yz2";
+    sha256 = "1lz9cgacyd4cphr7l90x4hn0ifhxwzz2d5829w1jcglasfacfpsw";
   };
 
   # To enable lazy loading via. bash-completion we need a symlink to the script
diff --git a/pkgs/shells/nix-zsh-completions/default.nix b/pkgs/shells/nix-zsh-completions/default.nix
index 2bcff6b809d..8e15476451a 100644
--- a/pkgs/shells/nix-zsh-completions/default.nix
+++ b/pkgs/shells/nix-zsh-completions/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 let
-  version = "0.3.8";
+  version = "0.3.9";
 in
 
 stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     owner = "spwhitt";
     repo = "nix-zsh-completions";
     rev = "${version}";
-    sha256 = "05ynd38br2kn657g7l01jg1q8ja9xwrdyb95w02gh7j9cww2k06w";
+    sha256 = "1ysc9g72yj63ygm915a316f1hcklmgswyrwsq5abwwj48001y01n";
   };
 
   installPhase = ''
diff --git a/pkgs/shells/oh-my-zsh/default.nix b/pkgs/shells/oh-my-zsh/default.nix
index 8cfcb9ecbbe..5412f4ce896 100644
--- a/pkgs/shells/oh-my-zsh/default.nix
+++ b/pkgs/shells/oh-my-zsh/default.nix
@@ -4,13 +4,13 @@
 { stdenv, fetchgit }:
 
 stdenv.mkDerivation rec {
-  version = "2018-01-22";
+  version = "2018-04-06";
   name = "oh-my-zsh-${version}";
 
   src = fetchgit {
     url = "https://github.com/robbyrussell/oh-my-zsh";
-    rev = "37c2d0ddd751e15d0c87a51e2d9f9849093571dc";
-    sha256 = "0x2r7205ps5v5bl1f9vdnry9gxflypaahz49cnhq5f5klb49bakn";
+    rev = "62b8a70a7c5d0c939d8dabfef48796a092d1a55f";
+    sha256 = "02na47pa2ly17yvwa2nhzyrp8iarawyirhfw3779sh0w78vgw1gs";
   };
 
   pathsToLink = [ "/share/oh-my-zsh" ];
diff --git a/pkgs/shells/rush/default.nix b/pkgs/shells/rush/default.nix
index 8280897c47a..9a5f7a753d3 100644
--- a/pkgs/shells/rush/default.nix
+++ b/pkgs/shells/rush/default.nix
@@ -8,7 +8,9 @@ stdenv.mkDerivation rec {
     sha256 = "1vxdb81ify4xcyygh86250pi50krb16dkj42i5ii4ns3araiwckz";
   };
 
-  patches = [ ./fix-format-security-error.patch ];
+  patches = [ ./fix-format-security-error.patch
+    ./intprops.patch
+  ];
 
   doCheck = true;
 
diff --git a/pkgs/shells/rush/gets.patch b/pkgs/shells/rush/gets.patch
deleted file mode 100644
index 94b1f5dd2f5..00000000000
--- a/pkgs/shells/rush/gets.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- rush-1.7/gnu/stdio.in.h.org	2010-06-13 19:14:59.000000000 +0200
-+++ rush-1.7/gnu/stdio.in.h	2013-12-30 14:29:55.000000000 +0100
-@@ -138,8 +138,10 @@ _GL_WARN_ON_USE (fflush, "fflush is not
- /* It is very rare that the developer ever has full control of stdin,
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
-+#if defined gets 
- #undef gets
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-+#endif
- 
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@
diff --git a/pkgs/shells/rush/intprops.patch b/pkgs/shells/rush/intprops.patch
new file mode 100644
index 00000000000..947cb0b9ab9
--- /dev/null
+++ b/pkgs/shells/rush/intprops.patch
@@ -0,0 +1,257 @@
+Description: Update to latest intprops.h from gnulib, fixes FTBFS with gcc 7
+Author: Adrian Bunk 
+Bug-Debian: https://bugs.debian.org/853649
+
+--- rush-1.8+dfsg.orig/gnu/intprops.h
++++ rush-1.8+dfsg/gnu/intprops.h
+@@ -1,20 +1,18 @@
+-/* -*- buffer-read-only: t -*- vi: set ro: */
+-/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+ /* intprops.h -- properties of integer types
+ 
+-   Copyright (C) 2001-2016 Free Software Foundation, Inc.
++   Copyright (C) 2001-2017 Free Software Foundation, Inc.
+ 
+    This program is free software: you can redistribute it and/or modify it
+-   under the terms of the GNU General Public License as published
+-   by the Free Software Foundation; either version 3 of the License, or
++   under the terms of the GNU Lesser General Public License as published
++   by the Free Software Foundation; either version 2.1 of the License, or
+    (at your option) any later version.
+ 
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-   GNU General Public License for more details.
++   GNU Lesser General Public License for more details.
+ 
+-   You should have received a copy of the GNU General Public License
++   You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see .  */
+ 
+ /* Written by Paul Eggert.  */
+@@ -23,7 +21,6 @@
+ #define _GL_INTPROPS_H
+ 
+ #include 
+-#include 
+ 
+ /* Return a value with the common real type of E and V and the value of V.  */
+ #define _GL_INT_CONVERT(e, v) (0 * (e) + (v))
+@@ -49,12 +46,16 @@
+ 
+ /* Minimum and maximum values for integer types and expressions.  */
+ 
++/* The width in bits of the integer type or expression T.
++   Padding bits are not supported; this is checked at compile-time below.  */
++#define TYPE_WIDTH(t) (sizeof (t) * CHAR_BIT)
++
+ /* The maximum and minimum values for the integer type T.  */
+ #define TYPE_MINIMUM(t) ((t) ~ TYPE_MAXIMUM (t))
+ #define TYPE_MAXIMUM(t)                                                 \
+   ((t) (! TYPE_SIGNED (t)                                               \
+         ? (t) -1                                                        \
+-        : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1)))
++        : ((((t) 1 << (TYPE_WIDTH (t) - 2)) - 1) * 2 + 1)))
+ 
+ /* The maximum and minimum values for the type of the expression E,
+    after integer promotion.  E should not have side effects.  */
+@@ -67,29 +68,23 @@
+    ? _GL_SIGNED_INT_MAXIMUM (e)                                         \
+    : _GL_INT_NEGATE_CONVERT (e, 1))
+ #define _GL_SIGNED_INT_MAXIMUM(e)                                       \
+-  (((_GL_INT_CONVERT (e, 1) << (sizeof ((e) + 0) * CHAR_BIT - 2)) - 1) * 2 + 1)
++  (((_GL_INT_CONVERT (e, 1) << (TYPE_WIDTH ((e) + 0) - 2)) - 1) * 2 + 1)
++
++/* Work around OpenVMS incompatibility with C99.  */
++#if !defined LLONG_MAX && defined __INT64_MAX
++# define LLONG_MAX __INT64_MAX
++# define LLONG_MIN __INT64_MIN
++#endif
+ 
+ /* This include file assumes that signed types are two's complement without
+    padding bits; the above macros have undefined behavior otherwise.
+    If this is a problem for you, please let us know how to fix it for your host.
+-   As a sanity check, test the assumption for some signed types that
+-    bounds.  */
+-verify (TYPE_MINIMUM (signed char) == SCHAR_MIN);
+-verify (TYPE_MAXIMUM (signed char) == SCHAR_MAX);
+-verify (TYPE_MINIMUM (short int) == SHRT_MIN);
+-verify (TYPE_MAXIMUM (short int) == SHRT_MAX);
+-verify (TYPE_MINIMUM (int) == INT_MIN);
+-verify (TYPE_MAXIMUM (int) == INT_MAX);
+-verify (TYPE_MINIMUM (long int) == LONG_MIN);
+-verify (TYPE_MAXIMUM (long int) == LONG_MAX);
+-#ifdef LLONG_MAX
+-verify (TYPE_MINIMUM (long long int) == LLONG_MIN);
+-verify (TYPE_MAXIMUM (long long int) == LLONG_MAX);
+-#endif
++   This assumption is tested by the intprops-tests module.  */
+ 
+ /* Does the __typeof__ keyword work?  This could be done by
+    'configure', but for now it's easier to do it by hand.  */
+-#if (2 <= __GNUC__ || defined __IBM__TYPEOF__ \
++#if (2 <= __GNUC__ \
++     || (1210 <= __IBMC__ && defined __IBM__TYPEOF__) \
+      || (0x5110 <= __SUNPRO_C && !__STDC__))
+ # define _GL_HAVE___TYPEOF__ 1
+ #else
+@@ -118,8 +113,7 @@ verify (TYPE_MAXIMUM (long long int) ==
+    signed, this macro may overestimate the true bound by one byte when
+    applied to unsigned types of size 2, 4, 16, ... bytes.  */
+ #define INT_STRLEN_BOUND(t)                                     \
+-  (INT_BITS_STRLEN_BOUND (sizeof (t) * CHAR_BIT                 \
+-                          - _GL_SIGNED_TYPE_OR_EXPR (t))        \
++  (INT_BITS_STRLEN_BOUND (TYPE_WIDTH (t) - _GL_SIGNED_TYPE_OR_EXPR (t)) \
+    + _GL_SIGNED_TYPE_OR_EXPR (t))
+ 
+ /* Bound on buffer size needed to represent an integer type or expression T,
+@@ -224,20 +218,27 @@ verify (TYPE_MAXIMUM (long long int) ==
+    ? (a) < (min) >> (b)                                 \
+    : (max) >> (b) < (a))
+ 
+-/* True if __builtin_add_overflow (A, B, P) works when P is null.  */
+-#define _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL (7 <= __GNUC__)
++/* True if __builtin_add_overflow (A, B, P) works when P is non-null.  */
++#if 5 <= __GNUC__ && !defined __ICC
++# define _GL_HAS_BUILTIN_OVERFLOW 1
++#else
++# define _GL_HAS_BUILTIN_OVERFLOW 0
++#endif
++
++/* True if __builtin_add_overflow_p (A, B, C) works.  */
++#define _GL_HAS_BUILTIN_OVERFLOW_P (7 <= __GNUC__)
+ 
+ /* The _GL*_OVERFLOW macros have the same restrictions as the
+    *_RANGE_OVERFLOW macros, except that they do not assume that operands
+    (e.g., A and B) have the same type as MIN and MAX.  Instead, they assume
+    that the result (e.g., A + B) has that type.  */
+-#if _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL
+-# define _GL_ADD_OVERFLOW(a, b, min, max)
+-   __builtin_add_overflow (a, b, (__typeof__ ((a) + (b)) *) 0)
+-# define _GL_SUBTRACT_OVERFLOW(a, b, min, max)
+-   __builtin_sub_overflow (a, b, (__typeof__ ((a) - (b)) *) 0)
+-# define _GL_MULTIPLY_OVERFLOW(a, b, min, max)
+-   __builtin_mul_overflow (a, b, (__typeof__ ((a) * (b)) *) 0)
++#if _GL_HAS_BUILTIN_OVERFLOW_P
++# define _GL_ADD_OVERFLOW(a, b, min, max)                               \
++   __builtin_add_overflow_p (a, b, (__typeof__ ((a) + (b))) 0)
++# define _GL_SUBTRACT_OVERFLOW(a, b, min, max)                          \
++   __builtin_sub_overflow_p (a, b, (__typeof__ ((a) - (b))) 0)
++# define _GL_MULTIPLY_OVERFLOW(a, b, min, max)                          \
++   __builtin_mul_overflow_p (a, b, (__typeof__ ((a) * (b))) 0)
+ #else
+ # define _GL_ADD_OVERFLOW(a, b, min, max)                                \
+    ((min) < 0 ? INT_ADD_RANGE_OVERFLOW (a, b, min, max)                  \
+@@ -317,7 +318,7 @@ verify (TYPE_MAXIMUM (long long int) ==
+   _GL_BINARY_OP_OVERFLOW (a, b, _GL_ADD_OVERFLOW)
+ #define INT_SUBTRACT_OVERFLOW(a, b) \
+   _GL_BINARY_OP_OVERFLOW (a, b, _GL_SUBTRACT_OVERFLOW)
+-#if _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL
++#if _GL_HAS_BUILTIN_OVERFLOW_P
+ # define INT_NEGATE_OVERFLOW(a) INT_SUBTRACT_OVERFLOW (0, a)
+ #else
+ # define INT_NEGATE_OVERFLOW(a) \
+@@ -351,10 +352,6 @@ verify (TYPE_MAXIMUM (long long int) ==
+ #define INT_MULTIPLY_WRAPV(a, b, r) \
+   _GL_INT_OP_WRAPV (a, b, r, *, __builtin_mul_overflow, INT_MULTIPLY_OVERFLOW)
+ 
+-#ifndef __has_builtin
+-# define __has_builtin(x) 0
+-#endif
+-
+ /* Nonzero if this compiler has GCC bug 68193 or Clang bug 25390.  See:
+    https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68193
+    https://llvm.org/bugs/show_bug.cgi?id=25390
+@@ -371,17 +368,17 @@ verify (TYPE_MAXIMUM (long long int) ==
+    the operation.  BUILTIN is the builtin operation, and OVERFLOW the
+    overflow predicate.  Return 1 if the result overflows.  See above
+    for restrictions.  */
+-#if 5 <= __GNUC__ || __has_builtin (__builtin_add_overflow)
++#if _GL_HAS_BUILTIN_OVERFLOW
+ # define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) builtin (a, b, r)
+ #elif 201112 <= __STDC_VERSION__ && !_GL__GENERIC_BOGUS
+ # define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) \
+    (_Generic \
+     (*(r), \
+      signed char: \
+-       _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned char, \
++       _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \
+                         signed char, SCHAR_MIN, SCHAR_MAX), \
+      short int: \
+-       _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned short int, \
++       _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \
+                         short int, SHRT_MIN, SHRT_MAX), \
+      int: \
+        _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \
+@@ -395,10 +392,10 @@ verify (TYPE_MAXIMUM (long long int) ==
+ #else
+ # define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) \
+    (sizeof *(r) == sizeof (signed char) \
+-    ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned char, \
++    ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \
+                        signed char, SCHAR_MIN, SCHAR_MAX) \
+     : sizeof *(r) == sizeof (short int) \
+-    ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned short int, \
++    ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \
+                        short int, SHRT_MIN, SHRT_MAX) \
+     : sizeof *(r) == sizeof (int) \
+     ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \
+@@ -414,15 +411,14 @@ verify (TYPE_MAXIMUM (long long int) ==
+ # else
+ #  define _GL_INT_OP_WRAPV_LONGISH(a, b, r, op, overflow) \
+     _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \
+-                     long int, LONG_MIN, LONG_MAX))
++                     long int, LONG_MIN, LONG_MAX)
+ # endif
+ #endif
+ 
+ /* Store the low-order bits of A  B into *R, where the operation
+    is given by OP.  Use the unsigned type UT for calculation to avoid
+-   overflow problems.  *R's type is T, with extremal values TMIN and
+-   TMAX.  T must be a signed integer type.  Return 1 if the result
+-   overflows.  */
++   overflow problems.  *R's type is T, with extrema TMIN and TMAX.
++   T must be a signed integer type.  Return 1 if the result overflows.  */
+ #define _GL_INT_OP_CALC(a, b, r, op, overflow, ut, t, tmin, tmax) \
+   (sizeof ((a) op (b)) < sizeof (t) \
+    ? _GL_INT_OP_CALC1 ((t) (a), (t) (b), r, op, overflow, ut, t, tmin, tmax) \
+@@ -431,17 +427,27 @@ verify (TYPE_MAXIMUM (long long int) ==
+   ((overflow (a, b) \
+     || (EXPR_SIGNED ((a) op (b)) && ((a) op (b)) < (tmin)) \
+     || (tmax) < ((a) op (b))) \
+-   ? (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a, b, op, ut, t, tmin, tmax), 1) \
+-   : (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a, b, op, ut, t, tmin, tmax), 0))
++   ? (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a, b, op, ut, t), 1) \
++   : (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a, b, op, ut, t), 0))
++
++/* Return the low-order bits of A  B, where the operation is given
++   by OP.  Use the unsigned type UT for calculation to avoid undefined
++   behavior on signed integer overflow, and convert the result to type T.
++   UT is at least as wide as T and is no narrower than unsigned int,
++   T is two's complement, and there is no padding or trap representations.
++   Assume that converting UT to T yields the low-order bits, as is
++   done in all known two's-complement C compilers.  E.g., see:
++   https://gcc.gnu.org/onlinedocs/gcc/Integers-implementation.html
++
++   According to the C standard, converting UT to T yields an
++   implementation-defined result or signal for values outside T's
++   range.  However, code that works around this theoretical problem
++   runs afoul of a compiler bug in Oracle Studio 12.3 x86.  See:
++   http://lists.gnu.org/archive/html/bug-gnulib/2017-04/msg00049.html
++   As the compiler bug is real, don't try to work around the
++   theoretical problem.  */
+ 
+-/* Return A  B, where the operation is given by OP.  Use the
+-   unsigned type UT for calculation to avoid overflow problems.
+-   Convert the result to type T without overflow by subtracting TMIN
+-   from large values before converting, and adding it afterwards.
+-   Compilers can optimize all the operations except OP.  */
+-#define _GL_INT_OP_WRAPV_VIA_UNSIGNED(a, b, op, ut, t, tmin, tmax) \
+-  (((ut) (a) op (ut) (b)) <= (tmax) \
+-   ? (t) ((ut) (a) op (ut) (b)) \
+-   : ((t) (((ut) (a) op (ut) (b)) - (tmin)) + (tmin)))
++#define _GL_INT_OP_WRAPV_VIA_UNSIGNED(a, b, op, ut, t) \
++  ((t) ((ut) (a) op (ut) (b)))
+ 
+ #endif /* _GL_INTPROPS_H */
diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix
index 43b766fdaf2..3259dbbd9bc 100644
--- a/pkgs/shells/zsh/default.nix
+++ b/pkgs/shells/zsh/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ncurses, pcre }:
 
 let
-  version = "5.4.2";
+  version = "5.5.1";
 
   documentation = fetchurl {
     url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.gz";
-    sha256 = "1703g6vfz2vpb866wgl71nvg0ynjq0zvrjwkqbv7v6q3606jbmn3";
+    sha256 = "0bm9n7lycdzvw5hmgi4a920pqbb5yxvmyhfxx8jbign2hzgf7g01";
   };
 
 in
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://sourceforge/zsh/zsh-${version}.tar.gz";
-    sha256 = "1jdcfinzmki2w963msvsanv29vqqfmdfm4rncwpw0r3zqnrcsywm";
+    sha256 = "10705qnnr3p416bwfjaip9r7yw187vczzjrk60yg79dfwy4slk3p";
   };
 
   buildInputs = [ ncurses pcre ];
diff --git a/pkgs/stdenv/cygwin/rebase-x86_64.sh b/pkgs/stdenv/cygwin/rebase-x86_64.sh
index 77adc52d53b..4c8f8ebd7eb 100644
--- a/pkgs/stdenv/cygwin/rebase-x86_64.sh
+++ b/pkgs/stdenv/cygwin/rebase-x86_64.sh
@@ -8,7 +8,7 @@ _cygwinFixAutoImageBase() {
         if [ -f /etc/rebasenix.nextbase ]; then
             NEXTBASE="$( gawk != null;
@@ -38,6 +38,7 @@ stdenv.mkDerivation rec {
     file()  { ${file}/bin/file      "$@"; }\
     awk()   { ${gawk}/bin/awk       "$@"; }\
     sort()  { ${coreutils}/bin/sort "$@"; }\
+    xset()  { ${xset}/bin/xset      "$@"; }\
     &#' -i "$out"/bin/*
 
     substituteInPlace $out/bin/xdg-open \
diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
index d6425ede4f4..b109a835635 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -17,25 +17,20 @@ let
 
   baseUrl = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads";
   sources = name: system: {
-    i686-linux = {
-      url = "${baseUrl}/${name}-linux-x86.tar.gz";
-      sha256 = "0fq8zw1a5c0mnmw6f7j9j80y6kq0f0v2wn1d7b8mfq8ih5x53a85";
-    };
-
     x86_64-darwin = {
       url = "${baseUrl}/${name}-darwin-x86_64.tar.gz";
-      sha256 = "1h4m70fk3hri4lgm9lh2pm0v196nc2r3hpf42h3xx5k7sqklsns2";
+      sha256 = "0c4jj580f7z6phiw4zhd32dlf4inkrxy3cig6ng66fi4zi6vnpc9";
     };
 
     x86_64-linux = {
       url = "${baseUrl}/${name}-linux-x86_64.tar.gz";
-      sha256 = "1ynvllxzjr3y4qflw06njj7qqcf7539mbp06rs03i8hargsgbamx";
+      sha256 = "0rblb0akwdzr5i8al0dcz482xmx1xdnjnzgqywjvwd8fzdyzq7bp";
     };
   }.${system};
 
 in stdenv.mkDerivation rec {
   name = "google-cloud-sdk-${version}";
-  version = "184.0.0";
+  version = "190.0.1";
 
   src = fetchurl (sources name stdenv.system);
 
@@ -64,7 +59,7 @@ in stdenv.mkDerivation rec {
         mkdir -p $out/bin
         ln -s $programPath $binaryPath
     done
-    
+
     # disable component updater and update check
     substituteInPlace $out/google-cloud-sdk/lib/googlecloudsdk/core/config.json \
       --replace "\"disable_updater\": false" "\"disable_updater\": true"
@@ -88,6 +83,6 @@ in stdenv.mkDerivation rec {
     license = licenses.free;
     homepage = "https://cloud.google.com/sdk/";
     maintainers = with maintainers; [ stephenmw zimbatm ];
-    platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
+    platforms = [ "x86_64-linux" "x86_64-darwin" ];
   };
 }
diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix
index b5056460225..4077c4fb9ec 100644
--- a/pkgs/tools/admin/salt/default.nix
+++ b/pkgs/tools/admin/salt/default.nix
@@ -8,19 +8,18 @@
 
 python2Packages.buildPythonApplication rec {
   pname = "salt";
-  version = "2017.7.2";
-  name = "${pname}-${version}";
+  version = "2017.7.4";
 
   src = python2Packages.fetchPypi {
     inherit pname version;
-    sha256 = "0h18zwp1w90rgxpmqgrmn9wp31h03f0vak8lpnnbh0dzbbgcffzz";
+    sha256 = "15xfvclk3ns8vk17j7bfy4alq7ab5x3y3jnpqzp5583bfyak0mqx";
   };
 
   propagatedBuildInputs = with python2Packages; [
     futures
     jinja2
     markupsafe
-    msgpack
+    msgpack-python
     pycrypto
     pyyaml
     pyzmq
diff --git a/pkgs/tools/archivers/xarchiver/default.nix b/pkgs/tools/archivers/xarchiver/default.nix
index 189035a8c8b..d8c4175e776 100644
--- a/pkgs/tools/archivers/xarchiver/default.nix
+++ b/pkgs/tools/archivers/xarchiver/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, gtk3, pkgconfig, intltool, libxslt, hicolor-icon-theme }:
+{ stdenv, fetchFromGitHub, fetchpatch, gtk3, pkgconfig, intltool, libxslt, hicolor-icon-theme }:
 
 stdenv.mkDerivation rec {
   version = "0.5.4.12";
@@ -11,6 +11,14 @@ stdenv.mkDerivation rec {
     sha256 = "13d8slcx3frz0dhl1w4llj7001n57cjjb8r7dlaw5qacaas3xfwi";
   };
 
+  patches = [
+    # Fixes darwin build, remove with next update.
+    (fetchpatch {
+      url = https://github.com/ib/xarchiver/commit/8c69d066a827419feafd0bd047d19207ceadc7df.patch;
+      sha256 = "1ch1409hx1ynkm0mz93zy8h7wvcrsn56sz7lczsf6hznc8yzl0qg";
+    })
+  ];
+
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ gtk3 intltool libxslt hicolor-icon-theme ];
 
diff --git a/pkgs/tools/audio/glyr/default.nix b/pkgs/tools/audio/glyr/default.nix
index e98667b8c04..23a33122c9f 100644
--- a/pkgs/tools/audio/glyr/default.nix
+++ b/pkgs/tools/audio/glyr/default.nix
@@ -15,16 +15,12 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake pkgconfig ];
   buildInputs = [ sqlite glib curl ];
 
-  configurePhase = ''
-    cmake -DCMAKE_INSTALL_PREFIX=$out
-  '';
-
   meta = with stdenv.lib; {
     license = licenses.lgpl3;
     description = "A music related metadata searchengine";
     homepage = https://github.com/sahib/glyr;
     maintainers = [ maintainers.sternenseemann ];
-    platforms = platforms.linux; # TODO macOS would be possible
+    platforms = platforms.unix;
   };
 }
 
diff --git a/pkgs/tools/backup/bdsync/default.nix b/pkgs/tools/backup/bdsync/default.nix
index 8ef846a8dca..2fd67765aaf 100644
--- a/pkgs/tools/backup/bdsync/default.nix
+++ b/pkgs/tools/backup/bdsync/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     description = "Fast block device synchronizing tool";
     homepage = https://github.com/TargetHolding/bdsync;
     license = licenses.gpl2;
-    platforms = platforms.all;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ jluttine ];
   };
 
diff --git a/pkgs/tools/backup/mtx/default.nix b/pkgs/tools/backup/mtx/default.nix
index bc1f584f1c0..46f213a6ef4 100644
--- a/pkgs/tools/backup/mtx/default.nix
+++ b/pkgs/tools/backup/mtx/default.nix
@@ -22,6 +22,6 @@ stdenv.mkDerivation rec {
     homepage = https://sourceforge.net/projects/mtx/;
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.redvers ];
-    platforms = stdenv.lib.platforms.all;
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/tools/backup/ori/default.nix b/pkgs/tools/backup/ori/default.nix
index d95716864c8..279652b0cd0 100644
--- a/pkgs/tools/backup/ori/default.nix
+++ b/pkgs/tools/backup/ori/default.nix
@@ -24,5 +24,6 @@ stdenv.mkDerivation rec {
     homepage = http://ori.scs.stanford.edu/;
     license = licenses.mit;
     platforms = platforms.unix;
+    broken = true; # 2018-04-11
   };
 }
diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix
index 931fcea4a44..158d7f1d2cf 100644
--- a/pkgs/tools/backup/restic/default.nix
+++ b/pkgs/tools/backup/restic/default.nix
@@ -32,7 +32,7 @@ buildGoPackage rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = https://restic.github.io;
+    homepage = https://restic.net;
     description = "A backup program that is fast, efficient and secure";
     platforms = platforms.linux ++ platforms.darwin;
     license = licenses.bsd2;
diff --git a/pkgs/tools/backup/s3ql/default.nix b/pkgs/tools/backup/s3ql/default.nix
index 66480a2f13a..1bd8ebfd44b 100644
--- a/pkgs/tools/backup/s3ql/default.nix
+++ b/pkgs/tools/backup/s3ql/default.nix
@@ -3,11 +3,11 @@
 python3Packages.buildPythonApplication rec {
   name = "${pname}-${version}";
   pname = "s3ql";
-  version = "2.21";
+  version = "2.26";
 
   src = fetchurl {
     url = "https://bitbucket.org/nikratio/${pname}/downloads/${name}.tar.bz2";
-    sha256 = "1mifmxbsxc2rcrydk2vs5cjfd5r0510q5y7rmavlzi8grpcqdf3d";
+    sha256 = "0xs1jbak51zwjrd6jmd96xl3a3jpw0p1s05f7sw5wipvvg0xnmfn";
   };
 
   buildInputs = [ which ]; # tests will fail without which
diff --git a/pkgs/tools/cd-dvd/bchunk/default.nix b/pkgs/tools/cd-dvd/bchunk/default.nix
index a4298bf2920..6828ef7d61d 100644
--- a/pkgs/tools/cd-dvd/bchunk/default.nix
+++ b/pkgs/tools/cd-dvd/bchunk/default.nix
@@ -9,9 +9,11 @@ stdenv.mkDerivation rec {
     sha256 = "12dxx98kbpc5z4dgni25280088bhlsb677rp832r82zzc1drpng7";
   };
 
+  makeFlags = stdenv.lib.optionals stdenv.cc.isClang [ "CC=cc" "LD=cc" ];
+
   installPhase = ''
     install -Dt $out/bin bchunk
-    install -Dt $out/share/man/man1 bchunk.1    
+    install -Dt $out/share/man/man1 bchunk.1
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix
index 45af74b0b3e..707b8f0d799 100644
--- a/pkgs/tools/compression/brotli/default.nix
+++ b/pkgs/tools/compression/brotli/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "brotli-${version}";
-  version = "1.0.2";
+  version = "1.0.3";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "brotli";
     rev = "v" + version;
-    sha256 = "1rpg16zpr7h6vs7qr6npmqhyw4w5nkp24iq70s4dryn77m0r4mcv";
+    sha256 = "1hlkqgkm2gv6q83dswg6b19hpw8j33y6iw924j8r647pd4qg1xs7";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix
index fb24e1394b7..7e8abc03ac0 100644
--- a/pkgs/tools/filesystems/btrfs-progs/default.nix
+++ b/pkgs/tools/filesystems/btrfs-progs/default.nix
@@ -2,14 +2,14 @@
 , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt, zstd
 }:
 
-let version = "4.14.1"; in
+let version = "4.15.1"; in
 
 stdenv.mkDerivation rec {
   name = "btrfs-progs-${version}";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
-    sha256 = "1palnddw3d50kyflwk1j4xapbc6jniid6j5i9dsr8l8a7nkv7ich";
+    sha256 = "15izak6jg6pqr6ha9447cdrdj9k6kfiarvwlrj53cpvrsv02l437";
   };
 
   nativeBuildInputs = [
@@ -20,7 +20,9 @@ stdenv.mkDerivation rec {
 
   # gcc bug with -O1 on ARM with gcc 4.8
   # This should be fine on all platforms so apply universally
-  patchPhase = "sed -i s/-O1/-O2/ configure";
+  prePatch = "sed -i s/-O1/-O2/ configure";
+
+  patches = [ ./e2fsprogs.patch ];
 
   postInstall = ''
     install -v -m 444 -D btrfs-completion $out/etc/bash_completion.d/btrfs
diff --git a/pkgs/tools/filesystems/btrfs-progs/e2fsprogs.patch b/pkgs/tools/filesystems/btrfs-progs/e2fsprogs.patch
new file mode 100644
index 00000000000..dc4fa5a6ffa
--- /dev/null
+++ b/pkgs/tools/filesystems/btrfs-progs/e2fsprogs.patch
@@ -0,0 +1,34 @@
+From e4034ba388308fd4b791bd20122c28070d195e1e Mon Sep 17 00:00:00 2001
+From: Qu Wenruo 
+Date: Wed, 14 Mar 2018 08:56:57 +0800
+Subject: [PATCH] btrfs-progs: convert/ext2: Remove check for
+ ext2_ext_attr_entry->e_value_block
+
+In latest e2fsprogs (1.44.0) definition of ext2_ext_attr_entry has
+removed member e_value_block, as currently ext* doesn't support it set
+anyway.
+
+So remove such check so that we can pass compile.
+
+Issue: #110
+Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=199071
+Signed-off-by: Qu Wenruo 
+Signed-off-by: David Sterba 
+---
+ convert/source-ext2.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/convert/source-ext2.c b/convert/source-ext2.c
+index b1492c786..070126ec3 100644
+--- a/convert/source-ext2.c
++++ b/convert/source-ext2.c
+@@ -422,8 +422,7 @@ static int ext2_xattr_check_entry(struct ext2_ext_attr_entry *entry,
+ {
+ 	size_t value_size = entry->e_value_size;
+ 
+-	if (entry->e_value_block != 0 || value_size > size ||
+-	    entry->e_value_offs + value_size > size)
++	if (value_size > size || entry->e_value_offs + value_size > size)
+ 		return -EIO;
+ 	return 0;
+ }
diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix
index 3d35a10f3b3..66d74ff5cf7 100644
--- a/pkgs/tools/filesystems/ceph/generic.nix
+++ b/pkgs/tools/filesystems/ceph/generic.nix
@@ -5,7 +5,7 @@
 , openldap, lttngUst
 , babeltrace, gperf
 , cunit, snappy
-, rocksdb
+, rocksdb, makeWrapper
 
 # Optional Dependencies
 , yasm ? null, fcgi ? null, expat ? null
@@ -96,6 +96,7 @@ let
     ps.pecan
     ps.prettytable
     ps.webob
+    ps.cherrypy
 	]);
 
 in
@@ -113,7 +114,7 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [
     cmake
-    pkgconfig which git python2Packages.wrapPython
+    pkgconfig which git python2Packages.wrapPython makeWrapper
     (ensureNewerSourcesHook { year = "1980"; })
   ];
   
@@ -158,6 +159,7 @@ stdenv.mkDerivation {
 
   postFixup = ''
     wrapPythonPrograms
+    wrapProgram $out/bin/ceph-mgr --set PYTHONPATH $out/${python2Packages.python.sitePackages}
   '';
 
   enableParallelBuilding = true;
diff --git a/pkgs/tools/filesystems/darling-dmg/default.nix b/pkgs/tools/filesystems/darling-dmg/default.nix
index 9e640b18a92..e44d0d22905 100644
--- a/pkgs/tools/filesystems/darling-dmg/default.nix
+++ b/pkgs/tools/filesystems/darling-dmg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, fuse, zlib, bzip2, openssl, libxml2, icu } :
+{ stdenv, fetchFromGitHub, fetchpatch, cmake, fuse, zlib, bzip2, openssl, libxml2, icu } :
 
 stdenv.mkDerivation rec {
   name = "darling-dmg-${version}";
@@ -11,6 +11,13 @@ stdenv.mkDerivation rec {
     sha256 = "0x285p16zfnp0p6injw1frc8krif748sfgxhdd7gb75kz0dfbkrk";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/darlinghq/darling-dmg/commit/cbb0092264b5c5cf3e92d6c2de23f02d859ebf44.patch";
+    sha256 = "05fhgn5c09f1rva6bvbq16nhlkblrhscbf69k04ajwdh7y98sw39";
+     })
+  ];
+
   buildInputs = [ cmake fuse openssl zlib bzip2 libxml2 icu ];
 
   meta = {
diff --git a/pkgs/tools/filesystems/dislocker/cmake_dirfix.patch b/pkgs/tools/filesystems/dislocker/cmake_dirfix.patch
deleted file mode 100644
index 829666bfe7a..00000000000
--- a/pkgs/tools/filesystems/dislocker/cmake_dirfix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 365903a..f126ade 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -149,7 +149,7 @@ if(NOT DEFINED bindir)
- endif()
- 
- string (TOLOWER "${CMAKE_SYSTEM_NAME}" SYSNAME)
--set (DIS_MAN ../man/${SYSNAME})
-+set (DIS_MAN ${PROJECT_SOURCE_DIR}/man/${SYSNAME})
- 
- # RPATH handling
- if(POLICY CMP0042)
diff --git a/pkgs/tools/filesystems/dislocker/default.nix b/pkgs/tools/filesystems/dislocker/default.nix
index 57676e7a89a..2e4ea88df7f 100644
--- a/pkgs/tools/filesystems/dislocker/default.nix
+++ b/pkgs/tools/filesystems/dislocker/default.nix
@@ -4,7 +4,7 @@
 }:
 with stdenv.lib;
 let
-  version = "0.6.1";
+  version = "0.7.1";
 in
 stdenv.mkDerivation rec {
   name = "dislocker-${version}";
@@ -13,13 +13,11 @@ stdenv.mkDerivation rec {
     owner = "aorimn";
     repo = "dislocker";
     rev = "v${version}";
-    sha256 = "1s2pvsf4jgzxk9d9m2ik7v7g81lvj8mhmhh7f53vwy0vmihf9h0d";
+    sha256 = "1crh2sg5x1kgqmdrl1nmrqwxjykxa4zwnbggcpdn97mj2gvdw7sb";
   };
 
   buildInputs = [ cmake fuse polarssl ];
 
-  patches = [ ./cmake_dirfix.patch ];
-
   meta = {
     description = "Read BitLocker encrypted partitions in Linux";
     homepage    = https://github.com/aorimn/dislocker;
diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix
index 6326cda3539..558a9917660 100644
--- a/pkgs/tools/filesystems/e2fsprogs/default.nix
+++ b/pkgs/tools/filesystems/e2fsprogs/default.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, fetchurl, pkgconfig, libuuid, gettext, texinfo }:
 
 stdenv.mkDerivation rec {
-  name = "e2fsprogs-1.43.8";
+  name = "e2fsprogs-1.44.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz";
-    sha256 = "1pn33rap3lcjm3gx07pmgyhx4j634gja63phmi4g5dq8yj0z8ciz";
+    sha256 = "1rn1nvp8kcvjmbh2bxrjfbrz7zz519d52rrxqvc50l0hzs6hda55";
   };
 
   outputs = [ "bin" "dev" "out" "man" "info" ];
diff --git a/pkgs/tools/filesystems/extundelete/default.nix b/pkgs/tools/filesystems/extundelete/default.nix
index a30709d4c92..e0c5ea3def4 100644
--- a/pkgs/tools/filesystems/extundelete/default.nix
+++ b/pkgs/tools/filesystems/extundelete/default.nix
@@ -11,6 +11,14 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ e2fsprogs ];
 
+  # inode field i_dir_acl was repurposed as i_size_high in e2fsprogs 1.44,
+  # breaking the build
+  patchPhase = ''
+    substituteInPlace src/insertionops.cc \
+      --replace "Directory ACL:" "High 32 bits of size:" \
+      --replace "inode.i_dir_acl" "inode.i_size_high"
+  '';
+
   meta = with stdenv.lib; {
     description = "Utility that can recover deleted files from an ext3 or ext4 partition";
     homepage = http://extundelete.sourceforge.net/;
diff --git a/pkgs/tools/filesystems/grive/default.nix b/pkgs/tools/filesystems/grive/default.nix
deleted file mode 100644
index 9f4472c27f1..00000000000
--- a/pkgs/tools/filesystems/grive/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, fetchgit, cmake, libgcrypt, json_c, curl, expat, boost, libiberty }:
-
-stdenv.mkDerivation rec {
-  version = "0.3.0";
-  name = "grive-${version}";
-
-  src = fetchgit {
-    url = "https://github.com/Grive/grive.git";
-    rev = "51e42914f3666ee6e0bc16a4c78f60b117265c24";
-    sha256 = "11cqfcjl128nfg1rjvpvr9x1x2ch3kyliw4vi14n51zqp82f9ysb";
-  };
-
-  buildInputs = [cmake libgcrypt json_c curl expat stdenv libiberty boost];
-
-  # work around new libiberty headers, see
-  # http://stackoverflow.com/questions/11748035/libiberty-bfd-h-wants-config-h-now
-  prePatch = ''
-    sed -i '1i#define PACKAGE "grive"\n#define PACKAGE_VERSION "${version}"' \
-      libgrive/src/bfd/SymbolInfo.cc
-  '';
-
-  meta = {
-    description = "An open source (experimental) Linux client for Google Drive";
-    homepage = https://github.com/Grive/grive;
-    license = stdenv.lib.licenses.gpl2;
-
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/tools/misc/antimicro/default.nix b/pkgs/tools/misc/antimicro/default.nix
index ee0accac2d9..62d46bba5b0 100644
--- a/pkgs/tools/misc/antimicro/default.nix
+++ b/pkgs/tools/misc/antimicro/default.nix
@@ -22,5 +22,6 @@ mkDerivation rec {
     maintainers = with maintainers; [ jb55 ];
     license = licenses.gpl3;
     platforms = with platforms; linux;
+    broken = true; # 2018-04-10
   };
 }
diff --git a/pkgs/tools/misc/bepasty/default.nix b/pkgs/tools/misc/bepasty/default.nix
index ee2680da006..f69f654cda3 100644
--- a/pkgs/tools/misc/bepasty/default.nix
+++ b/pkgs/tools/misc/bepasty/default.nix
@@ -4,7 +4,10 @@
 
 with python.pkgs;
 
-buildPythonApplication rec {
+#We need to use buildPythonPackage here to get the PYTHONPATH build correctly.
+#This is needed for services.bepasty
+#https://github.com/NixOS/nixpkgs/pull/38300
+buildPythonPackage rec {
   pname = "bepasty";
   version = "0.4.0";
   name = "${pname}-${version}";
diff --git a/pkgs/tools/misc/bonfire/default.nix b/pkgs/tools/misc/bonfire/default.nix
index 16b2169769f..0d6e93118d8 100644
--- a/pkgs/tools/misc/bonfire/default.nix
+++ b/pkgs/tools/misc/bonfire/default.nix
@@ -20,7 +20,7 @@ buildPythonApplication rec {
     # https://github.com/blue-yonder/bonfire/pull/24
     substituteInPlace requirements.txt \
       --replace "arrow>=0.5.4,<0.8" "arrow>=0.5.4,<0.13" \
-      --replace "keyring>=9,<10"    "keyring>=9,<11"
+      --replace "keyring>=9,<10"    "keyring>=9,<=11"
     # pip fails when encountering the git hash for the package version
     substituteInPlace setup.py \
       --replace "version=version," "version='${version}',"
diff --git a/pkgs/tools/misc/cutecom/default.nix b/pkgs/tools/misc/cutecom/default.nix
index e3f8a4c43a5..b20e493a585 100644
--- a/pkgs/tools/misc/cutecom/default.nix
+++ b/pkgs/tools/misc/cutecom/default.nix
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
     homepage = http://cutecom.sourceforge.net/;
     license = stdenv.lib.licenses.gpl2Plus;
     maintainers = [ stdenv.lib.maintainers.bennofs ];
-    platforms = stdenv.lib.platforms.unix;
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix
index 810bf06527b..a08f465d6cd 100644
--- a/pkgs/tools/misc/debian-devscripts/default.nix
+++ b/pkgs/tools/misc/debian-devscripts/default.nix
@@ -54,7 +54,8 @@ in stdenv.mkDerivation rec {
       wrapProgram "$i" \
         --prefix PERL5LIB : "$PERL5LIB" \
         --prefix PERL5LIB : "$out/share/devscripts" \
-        --prefix PYTHONPATH : "$out/lib/python3.4/site-packages"
+        --prefix PYTHONPATH : "$out/lib/python3.4/site-packages" \
+        --prefix PATH : "${dpkg}/bin"
     done
   '';
 
diff --git a/pkgs/tools/misc/gnokii/default.nix b/pkgs/tools/misc/gnokii/default.nix
index adad66c9bfa..eb029d32f73 100644
--- a/pkgs/tools/misc/gnokii/default.nix
+++ b/pkgs/tools/misc/gnokii/default.nix
@@ -21,5 +21,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.gnokii.org;
     maintainers = [ stdenv.lib.maintainers.raskin ];
     platforms = stdenv.lib.platforms.linux;
+    broken = true; # 2018-04-10
   };
 }
diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix
index d4acc063b4d..b9945a3afd3 100644
--- a/pkgs/tools/misc/graylog/default.nix
+++ b/pkgs/tools/misc/graylog/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "2.4.1";
+  version = "2.4.3";
   name = "graylog-${version}";
 
   src = fetchurl {
     url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz";
-    sha256 = "1dps1vvv8b154ayamhjxdgiq101qs4w0nk79j3zb41pdyn2fji4j";
+    sha256 = "0kwgg9m9sqzl4y2ri69fpi7w9961psbmfdq3avjsbgbs60ly1hn6";
   };
 
   dontBuild = true;
diff --git a/pkgs/tools/misc/gsmartcontrol/default.nix b/pkgs/tools/misc/gsmartcontrol/default.nix
index d4322f051d0..f7cdf5ca608 100644
--- a/pkgs/tools/misc/gsmartcontrol/default.nix
+++ b/pkgs/tools/misc/gsmartcontrol/default.nix
@@ -1,18 +1,28 @@
-{ fetchurl, stdenv, smartmontools, gtkmm2, libglademm, pkgconfig, pcre }:
+{ fetchurl, stdenv, smartmontools, autoreconfHook, gettext, gtkmm3, pkgconfig, wrapGAppsHook, pcre-cpp, gnome3 }:
 
 stdenv.mkDerivation rec {
-  version="0.8.7";
+  version="1.1.3";
   name = "gsmartcontrol-${version}";
 
   src = fetchurl {
-    url = "http://artificialtime.com/gsmartcontrol/gsmartcontrol-${version}.tar.bz2";
-    sha256 = "1ipykzqpfvlr84j38hr7q2cag4imrn1gql10slp8bfrs4h1si3vh";
+    url = "mirror://sourceforge/gsmartcontrol/gsmartcontrol-${version}.tar.bz2";
+    sha256 = "1a8j7dkml9zvgpk83xcdajfz7g6mmpmm5k86dl5sjc24zb7n4kxn";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ smartmontools gtkmm2 libglademm pcre ];
+  patches = [
+    ./fix-paths.patch
+  ];
 
-  #installTargets = "install datainstall";
+  nativeBuildInputs = [ autoreconfHook gettext pkgconfig wrapGAppsHook ];
+  buildInputs = [ gtkmm3 pcre-cpp gnome3.adwaita-icon-theme ];
+
+  enableParallelBuilding = true;
+
+  preFixup = ''
+    gappsWrapperArgs+=(
+      --prefix PATH : "${stdenv.lib.makeBinPath [ smartmontools ]}"
+    )
+  '';
 
   meta = {
     description = "Hard disk drive health inspection tool";
@@ -25,7 +35,7 @@ stdenv.mkDerivation rec {
       It allows you to inspect the drive's SMART data to determine its health,
       as well as run various tests on it.
     '';
-    homepage = http://gsmartcontrol.sourceforge.net/;
+    homepage = https://gsmartcontrol.sourceforge.io/;
     license = stdenv.lib.licenses.gpl2Plus;
     maintainers = with stdenv.lib.maintainers; [qknight];
     platforms = with stdenv.lib.platforms; linux;
diff --git a/pkgs/tools/misc/gsmartcontrol/fix-paths.patch b/pkgs/tools/misc/gsmartcontrol/fix-paths.patch
new file mode 100644
index 00000000000..905b63bee0c
--- /dev/null
+++ b/pkgs/tools/misc/gsmartcontrol/fix-paths.patch
@@ -0,0 +1,58 @@
+diff --git a/configure.ac b/configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -475,6 +475,7 @@
+ 
+ 
+ AC_CONFIG_FILES([ data/gsmartcontrol.desktop data/gsmartcontrol.appdata.xml \
++	data/org.gsmartcontrol.policy \
+ 	data/nsis/distribution.txt data/nsis/gsmartcontrol.nsi \
+ 	debian.dist/changelog \
+ 	src/gsc_winres.rc src/gsmartcontrol.exe.manifest \
+diff --git a/data/gsmartcontrol-root.in b/data/gsmartcontrol-root.in
+--- a/data/gsmartcontrol-root.in
++++ b/data/gsmartcontrol-root.in
+@@ -8,7 +8,7 @@
+ # Run gsmartcontrol with root, asking for root password first.
+ # export GSMARTCONTROL_SU to override a su command (e.g. "kdesu -c").
+ 
+-EXEC_BIN="@prefix@/sbin/gsmartcontrol";
++EXEC_BIN="@prefix@/bin/gsmartcontrol";
+ prog_name="gsmartcontrol"
+ 
+ 
+@@ -118,7 +118,7 @@
+ # Add @prefix@/sbin as well (freebsd seems to require it).
+ # Note that beesu won't show a GUI login box if /usr/sbin is before /usr/bin,
+ # so add it first as well.
+-EXTRA_PATHS="/usr/bin:/usr/sbin:/usr/local/sbin:@prefix@/sbin";
++EXTRA_PATHS="/usr/bin:/usr/sbin:/usr/local/sbin:@prefix@/bin";
+ export PATH="$EXTRA_PATHS:$PATH"
+ 
+ 
+diff --git a/data/org.gsmartcontrol.policy b/data/org.gsmartcontrol.policy.in
+rename from data/org.gsmartcontrol.policy
+rename to data/org.gsmartcontrol.policy.in
+--- a/data/org.gsmartcontrol.policy
++++ b/data/org.gsmartcontrol.policy.in
+@@ -12,7 +12,7 @@
+       auth_admin
+       auth_admin
+     
+-    /usr/sbin/gsmartcontrol
++    @prefix@/bin/gsmartcontrol
+     true
+   
+ 
+diff --git a/src/Makefile.am b/src/Makefile.am
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -24,7 +24,7 @@
+ # endif
+ 
+ 
+-sbin_PROGRAMS = gsmartcontrol
++bin_PROGRAMS = gsmartcontrol
+ 
+ gsmartcontrol_LDADD = $(top_builddir)/src/applib/libapplib.a \
+ 	$(top_builddir)/src/libdebug/libdebug.a \
diff --git a/pkgs/tools/misc/logstash/5.x.nix b/pkgs/tools/misc/logstash/5.x.nix
index e528e3e0285..058a8472bf2 100644
--- a/pkgs/tools/misc/logstash/5.x.nix
+++ b/pkgs/tools/misc/logstash/5.x.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz";
-    sha256 = "0cpim121ydxdjr251by9jw6pidh5b52jl5ldcm7gp015q49x1nl7";
+    sha256 = "0qcq4c4nysdscbjrikhw653xwbi4dwscynjzyndsp8l21vl81x7p";
   };
 
   dontBuild         = true;
diff --git a/pkgs/tools/misc/logstash/6.x.nix b/pkgs/tools/misc/logstash/6.x.nix
index 3eb2648a441..6aa3fd83696 100644
--- a/pkgs/tools/misc/logstash/6.x.nix
+++ b/pkgs/tools/misc/logstash/6.x.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz";
-    sha256 = "18680qpdvhr16dx66jfia1zrg52005sgdy9yhl7vdhm4gcr7pxwc";
+    sha256 = "07j3jjg5ik4gjgvcx15qqqas9p1m3815jml82a5r1ip9l6vc4h20";
   };
 
   dontBuild         = true;
@@ -22,6 +22,9 @@ stdenv.mkDerivation rec {
     mkdir -p $out
     cp -r {Gemfile*,modules,vendor,lib,bin,config,data,logstash-core,logstash-core-plugin-api} $out
 
+    patchShebangs $out/bin/logstash
+    patchShebangs $out/bin/logstash-plugin
+
     wrapProgram $out/bin/logstash \
        --set JAVA_HOME "${jre}"
 
diff --git a/pkgs/tools/misc/mht2htm/default.nix b/pkgs/tools/misc/mht2htm/default.nix
index 930fd1e5d3e..4f6c4bad97c 100644
--- a/pkgs/tools/misc/mht2htm/default.nix
+++ b/pkgs/tools/misc/mht2htm/default.nix
@@ -39,5 +39,6 @@ in stdenv.mkDerivation rec {
     license     = licenses.gpl3;
     maintainers = with maintainers; [ peterhoeg ];
     platforms   = platforms.all;
+    broken = true; # 2018-04-11
   };
 }
diff --git a/pkgs/tools/misc/mstflint/default.nix b/pkgs/tools/misc/mstflint/default.nix
index 9706e3f0288..748c0917def 100644
--- a/pkgs/tools/misc/mstflint/default.nix
+++ b/pkgs/tools/misc/mstflint/default.nix
@@ -15,5 +15,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ wkennington ];
+    broken = true; # 2018-04-11
   };
 }
diff --git a/pkgs/tools/misc/noteshrink/default.nix b/pkgs/tools/misc/noteshrink/default.nix
new file mode 100644
index 00000000000..77c84ab4511
--- /dev/null
+++ b/pkgs/tools/misc/noteshrink/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, python3, imagemagick }:
+
+with python3.pkgs;
+
+buildPythonApplication rec {
+  name = "noteshrink-${version}";
+  version = "0.1.1";
+
+  src = fetchFromGitHub {
+    owner  = "mzucker";
+    repo   = "noteshrink";
+    rev    = version;
+    sha256 = "0xhrvg3d8ffnbbizsrfppcd2y98znvkgxjdmvbvin458m2rwccka";
+  };
+
+  propagatedBuildInputs = [ numpy scipy imagemagick pillow ];
+
+  meta = with stdenv.lib; {
+    description = "Convert scans of handwritten notes to beautiful, compact PDFs";
+    homepage    = https://mzucker.github.io/2016/09/20/noteshrink.html;
+    license     = licenses.mit;
+    maintainers = with maintainers; [ rnhmjoj ];
+  };
+}
diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix
index 3b220153f17..a437eba4957 100644
--- a/pkgs/tools/misc/ostree/default.nix
+++ b/pkgs/tools/misc/ostree/default.nix
@@ -7,8 +7,8 @@ let
   libglnx-src = fetchFromGitHub {
     owner  = "GNOME";
     repo   = "libglnx";
-    rev    = "5362f6bc3ff3e30f379e767b203d15c9e56d6f08";
-    sha256 = "1l4vm7bx3cf4q44n3a1i2gszyryqyimcxvx54gna72q7dw130mrr";
+    rev    = "0c82203cd459a35cc3f471e3205355e9fb79160f";
+    sha256 = "0xbrv7q6b2ygrbr0yr7p01zpryw45643qfwnlw0z2yv515qs7isc";
   };
 
   bsdiff-src = fetchFromGitHub {
@@ -18,7 +18,7 @@ let
     sha256 = "1h71d2h2d3anp4msvpaff445rnzdxii3id2yglqk7af9i43kdsn1";
   };
 
-  version = "2017.12";
+  version = "2018.4";
 in stdenv.mkDerivation {
   name = "ostree-${version}";
 
@@ -26,7 +26,7 @@ in stdenv.mkDerivation {
     rev    = "v${version}";
     owner  = "ostreedev";
     repo   = "ostree";
-    sha256 = "0gxvpzwz7z4zihz5hkn6ajv7f6gas4zi2pznhi5v6wy7cw06if68";
+    sha256 = "00jgj6vcjpz1akfbmf82q1bcs3njrmvdgy4c2gnn24vkmh9yr0lr";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/tools/misc/pick/default.nix b/pkgs/tools/misc/pick/default.nix
index 0afd28b3c91..45b0da6f8db 100644
--- a/pkgs/tools/misc/pick/default.nix
+++ b/pkgs/tools/misc/pick/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "pick-${version}";
-  version = "2.0.1";
+  version = "2.0.2";
 
   src = fetchFromGitHub {
     owner = "calleerlandsson";
     repo = "pick";
     rev = "v${version}";
-    sha256 = "0ypawbzpw188rxgv8x044iib3a517j5grgqnxy035ax5zzjavsrr";
+    sha256 = "0wm3220gqrwldiq0rjdraq5mw3i7d58zwzls8234sx9maf59h0k0";
   };
 
   buildInputs = [ ncurses ];
diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix
index 447ef9dd5ec..2eb6f1aa8e6 100644
--- a/pkgs/tools/misc/plantuml/default.nix
+++ b/pkgs/tools/misc/plantuml/default.nix
@@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
     # "java -jar plantuml.jar -license" says GPLv3 or later
     license = licenses.gpl3Plus;
     maintainers = [ maintainers.bjornfor ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/tools/misc/rename/default.nix b/pkgs/tools/misc/rename/default.nix
index e30c2e89349..450424d0f54 100644
--- a/pkgs/tools/misc/rename/default.nix
+++ b/pkgs/tools/misc/rename/default.nix
@@ -3,6 +3,7 @@
 buildPerlPackage rec {
   name = "rename-${version}";
   version = "1.9";
+  outputs = [ "out" ];
   src = fetchFromGitHub {
     owner = "pstray";
     repo = "rename";
diff --git a/pkgs/tools/misc/t/Gemfile.lock b/pkgs/tools/misc/t/Gemfile.lock
index d85f5a1a752..6506d32b0ce 100644
--- a/pkgs/tools/misc/t/Gemfile.lock
+++ b/pkgs/tools/misc/t/Gemfile.lock
@@ -1,52 +1,63 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.3.7)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
     buftok (0.2.0)
-    equalizer (0.0.9)
-    faraday (0.9.1)
-      multipart-post (>= 1.2, < 3)
-    geokit (1.9.0)
-      multi_json (>= 1.3.2)
-    htmlentities (4.3.3)
-    http (0.6.3)
+    domain_name (0.5.20170404)
+      unf (>= 0.0.5, < 1.0.0)
+    equalizer (0.0.11)
+    geokit (1.11.0)
+    htmlentities (4.3.4)
+    http (3.0.0)
+      addressable (~> 2.3)
+      http-cookie (~> 1.0)
+      http-form_data (>= 2.0.0.pre.pre2, < 3)
       http_parser.rb (~> 0.6.0)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
+    http-form_data (2.1.0)
     http_parser.rb (0.6.0)
-    json (1.8.2)
     launchy (2.4.3)
       addressable (~> 2.3)
     memoizable (0.4.2)
       thread_safe (~> 0.3, >= 0.3.1)
-    multi_json (1.11.0)
     multipart-post (2.0.0)
-    naught (1.0.0)
-    oauth (0.4.7)
-    retryable (2.0.1)
+    naught (1.1.0)
+    oauth (0.5.4)
+    public_suffix (3.0.2)
+    retryable (2.0.4)
     simple_oauth (0.3.1)
-    t (2.9.0)
-      geokit (>= 1.8.3, < 2)
+    t (3.1.0)
+      geokit (~> 1.9)
       htmlentities (~> 4.3)
       launchy (~> 2.4)
-      oauth (~> 0.4.7)
+      oauth (~> 0.5.1)
       retryable (~> 2.0)
       thor (>= 0.19.1, < 2)
-      twitter (~> 5.13)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    twitter (5.14.0)
+      twitter (~> 6.0)
+    thor (0.20.0)
+    thread_safe (0.3.6)
+    twitter (6.2.0)
       addressable (~> 2.3)
       buftok (~> 0.2.0)
-      equalizer (~> 0.0.9)
-      faraday (~> 0.9.0)
-      http (~> 0.6.0)
+      equalizer (~> 0.0.11)
+      http (~> 3.0)
+      http-form_data (~> 2.0)
       http_parser.rb (~> 0.6.0)
-      json (~> 1.8)
       memoizable (~> 0.4.0)
+      multipart-post (~> 2.0)
       naught (~> 1.0)
       simple_oauth (~> 0.3.0)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   t
+
+BUNDLED WITH
+   1.14.6
diff --git a/pkgs/tools/misc/t/default.nix b/pkgs/tools/misc/t/default.nix
index ad9e0949ce8..b9c93c63954 100644
--- a/pkgs/tools/misc/t/default.nix
+++ b/pkgs/tools/misc/t/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, bundlerEnv, ruby }:
 
 bundlerEnv {
-  name = "t-2.9.0";
+  name = "t-3.1.0";
 
   inherit ruby;
   gemfile = ./Gemfile;
diff --git a/pkgs/tools/misc/t/gemset.nix b/pkgs/tools/misc/t/gemset.nix
index 6c721111c67..268cbae5e80 100644
--- a/pkgs/tools/misc/t/gemset.nix
+++ b/pkgs/tools/misc/t/gemset.nix
@@ -1,185 +1,203 @@
 {
-  "addressable" = {
-    version = "2.3.7";
+  addressable = {
+    dependencies = ["public_suffix"];
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk";
       type = "gem";
-      sha256 = "1x1401m59snw59c2bxr10jj10z1n4r4jvz8c55d0c3sh2smbl8kh";
     };
+    version = "2.5.2";
   };
-  "buftok" = {
-    version = "0.2.0";
+  buftok = {
     source = {
-      type = "gem";
+      remotes = ["https://rubygems.org"];
       sha256 = "1rzsy1vy50v55x9z0nivf23y0r9jkmq6i130xa75pq9i8qrn1mxs";
-    };
-  };
-  "equalizer" = {
-    version = "0.0.9";
-    source = {
       type = "gem";
-      sha256 = "1i6vfh2lzyrvvm35qa9cf3xh2gxj941x0v78pp0c7bwji3f5hawr";
     };
+    version = "0.2.0";
   };
-  "faraday" = {
-    version = "0.9.1";
+  domain_name = {
+    dependencies = ["unf"];
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "12hs8yijhak7p2hf1xkh98g0mnp5phq3mrrhywzaxpwz1gw5r3kf";
       type = "gem";
-      sha256 = "1h33znnfzxpscgpq28i9fcqijd61h61zgs3gabpdgqfa1043axsn";
     };
-    dependencies = [
-      "multipart-post"
-    ];
+    version = "0.5.20170404";
   };
-  "geokit" = {
-    version = "1.9.0";
+  equalizer = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1kjmx3fygx8njxfrwcmn7clfhjhb6bvv3scy2lyyi0wqyi3brra4";
       type = "gem";
-      sha256 = "1bpkjz2q8hm7i4mrrp1if51zq6fz3qkqj55qwlb7jh9jlgyvjmqy";
     };
-    dependencies = [
-      "multi_json"
-    ];
+    version = "0.0.11";
   };
-  "htmlentities" = {
-    version = "4.3.3";
+  geokit = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1iryy9gcrayd4c2xfxnb0acnmqcz5bv7pp6ilaifwlwl6jnc40dm";
       type = "gem";
-      sha256 = "0v4m2pn6q2h7iqdkxk9z3j4828harcjgk1h77v9i4x87avv5130p";
     };
+    version = "1.11.0";
   };
-  "http" = {
-    version = "0.6.3";
+  htmlentities = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj";
       type = "gem";
-      sha256 = "0wmj5i1l0f6ajhs8wi1h3sdwhrl00llrpsmh6xs9dwjm2amvdvxv";
     };
-    dependencies = [
-      "http_parser.rb"
-    ];
+    version = "4.3.4";
+  };
+  http = {
+    dependencies = ["addressable" "http-cookie" "http-form_data" "http_parser.rb"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1mqjjqgdq83rz3nvq69bn0n5x45hnwd4794fmfbi0wrd1n47syfs";
+      type = "gem";
+    };
+    version = "3.0.0";
+  };
+  http-cookie = {
+    dependencies = ["domain_name"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g";
+      type = "gem";
+    };
+    version = "1.0.3";
+  };
+  http-form_data = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1j90dydw36h9s09n760aid8asabigqcgi7agsyqh53iz5s3qv9v0";
+      type = "gem";
+    };
+    version = "2.1.0";
   };
   "http_parser.rb" = {
-    version = "0.6.0";
     source = {
-      type = "gem";
+      remotes = ["https://rubygems.org"];
       sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi";
-    };
-  };
-  "json" = {
-    version = "1.8.2";
-    source = {
       type = "gem";
-      sha256 = "0zzvv25vjikavd3b1bp6lvbgj23vv9jvmnl4vpim8pv30z8p6vr5";
     };
+    version = "0.6.0";
   };
-  "launchy" = {
-    version = "2.4.3";
+  launchy = {
+    dependencies = ["addressable"];
     source = {
-      type = "gem";
+      remotes = ["https://rubygems.org"];
       sha256 = "190lfbiy1vwxhbgn4nl4dcbzxvm049jwc158r2x7kq3g5khjrxa2";
-    };
-    dependencies = [
-      "addressable"
-    ];
-  };
-  "memoizable" = {
-    version = "0.4.2";
-    source = {
       type = "gem";
+    };
+    version = "2.4.3";
+  };
+  memoizable = {
+    dependencies = ["thread_safe"];
+    source = {
+      remotes = ["https://rubygems.org"];
       sha256 = "0v42bvghsvfpzybfazl14qhkrjvx0xlmxz0wwqc960ga1wld5x5c";
-    };
-    dependencies = [
-      "thread_safe"
-    ];
-  };
-  "multi_json" = {
-    version = "1.11.0";
-    source = {
       type = "gem";
-      sha256 = "1mg3hp17ch8bkf3ndj40s50yjs0vrqbfh3aq5r02jkpjkh23wgxl";
     };
+    version = "0.4.2";
   };
-  "multipart-post" = {
-    version = "2.0.0";
+  multipart-post = {
     source = {
-      type = "gem";
+      remotes = ["https://rubygems.org"];
       sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x";
-    };
-  };
-  "naught" = {
-    version = "1.0.0";
-    source = {
       type = "gem";
-      sha256 = "04m6hh63c96kcnzwy5mpl826yn6sm465zz1z87mmsig86gqi1izd";
     };
+    version = "2.0.0";
   };
-  "oauth" = {
-    version = "0.4.7";
+  naught = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1wwjx35zgbc0nplp8a866iafk4zsrbhwwz4pav5gydr2wm26nksg";
       type = "gem";
-      sha256 = "1k5j09p3al3clpjl6lax62qmhy43f3j3g7i6f9l4dbs6r5vpv95w";
     };
+    version = "1.1.0";
   };
-  "retryable" = {
-    version = "2.0.1";
+  oauth = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1zszdg8q1b135z7l7crjj234k4j0m347hywp5kj6zsq7q78pw09y";
       type = "gem";
-      sha256 = "0wg4vh76cmhwzwrgd0k6kbx4dlp4r98l8yizr72lmzph187dg48f";
     };
+    version = "0.5.4";
   };
-  "simple_oauth" = {
-    version = "0.3.1";
+  public_suffix = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1x5h1dh1i3gwc01jbg01rly2g6a1qwhynb1s8a30ic507z1nh09s";
       type = "gem";
+    };
+    version = "3.0.2";
+  };
+  retryable = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1pxv5xgr08s9gv5npj7h3raxibywznrv2wcrb85ibhlhzgzcxggf";
+      type = "gem";
+    };
+    version = "2.0.4";
+  };
+  simple_oauth = {
+    source = {
+      remotes = ["https://rubygems.org"];
       sha256 = "0dw9ii6m7wckml100xhjc6vxpjcry174lbi9jz5v7ibjr3i94y8l";
-    };
-  };
-  "t" = {
-    version = "2.9.0";
-    source = {
       type = "gem";
-      sha256 = "0qdsyblnnan2wcvql2mzg10jaj3gfv5pbfac54b1y7qkr56dc4dv";
     };
-    dependencies = [
-      "geokit"
-      "htmlentities"
-      "launchy"
-      "oauth"
-      "retryable"
-      "thor"
-      "twitter"
-    ];
+    version = "0.3.1";
   };
-  "thor" = {
-    version = "0.19.1";
+  t = {
+    dependencies = ["geokit" "htmlentities" "launchy" "oauth" "retryable" "thor" "twitter"];
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0qj5zqc819yiscqbyb93alxillyli5ajvrr4gzq52clgkvyap7bd";
       type = "gem";
-      sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z";
     };
+    version = "3.1.0";
   };
-  "thread_safe" = {
-    version = "0.3.5";
+  thor = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0nmqpyj642sk4g16nkbq6pj856adpv91lp4krwhqkh2iw63aszdl";
       type = "gem";
-      sha256 = "1hq46wqsyylx5afkp6jmcihdpv4ynzzq9ygb6z2pb1cbz5js0gcr";
     };
+    version = "0.20.0";
   };
-  "twitter" = {
-    version = "5.14.0";
+  thread_safe = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy";
       type = "gem";
-      sha256 = "0vx7x3fmwgk3axqyw9hyf6yh99kx3ssdy14w2686hz7c4v3qwlc5";
     };
-    dependencies = [
-      "addressable"
-      "buftok"
-      "equalizer"
-      "faraday"
-      "http"
-      "http_parser.rb"
-      "json"
-      "memoizable"
-      "naught"
-      "simple_oauth"
-    ];
+    version = "0.3.6";
+  };
+  twitter = {
+    dependencies = ["addressable" "buftok" "equalizer" "http" "http-form_data" "http_parser.rb" "memoizable" "multipart-post" "naught" "simple_oauth"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0fjyz3viabz3xs5d9aad18zgdbhfwm51jsnzigc8kxk77p1x58n5";
+      type = "gem";
+    };
+    version = "6.2.0";
+  };
+  unf = {
+    dependencies = ["unf_ext"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9";
+      type = "gem";
+    };
+    version = "0.1.4";
+  };
+  unf_ext = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "06p1i6qhy34bpb8q8ms88y6f2kz86azwm098yvcc0nyqk9y729j1";
+      type = "gem";
+    };
+    version = "0.0.7.5";
   };
 }
\ No newline at end of file
diff --git a/pkgs/tools/misc/wyrd/default.nix b/pkgs/tools/misc/wyrd/default.nix
index d02ce41b6aa..1029dbb29d8 100644
--- a/pkgs/tools/misc/wyrd/default.nix
+++ b/pkgs/tools/misc/wyrd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, ncurses, remind, camlp4 }:
+{ stdenv, fetchurl, ocamlPackages, ncurses, remind }:
 
 stdenv.mkDerivation rec {
   version = "1.4.6";
@@ -9,7 +9,13 @@ stdenv.mkDerivation rec {
     sha256 = "0zlrg602q781q8dij62lwdprpfliyy9j1rqfqcz8p2wgndpivddj";
   };
 
-  buildInputs = [ ocaml ncurses remind camlp4 ];
+  NIX_CFLAGS_COMPILE = [ "-DNCURSES_INTERNALS=1" ];
+
+  preConfigure = ''
+    substituteInPlace curses/curses.ml --replace 'pp gcc' "pp $CC"
+  '';
+
+  buildInputs = [ ocamlPackages.ocaml ncurses remind ocamlPackages.camlp4 ];
 
   preferLocalBuild = true;
 
diff --git a/pkgs/tools/misc/xburst-tools/default.nix b/pkgs/tools/misc/xburst-tools/default.nix
index c64ae609bcb..6b63e2f55a2 100644
--- a/pkgs/tools/misc/xburst-tools/default.nix
+++ b/pkgs/tools/misc/xburst-tools/default.nix
@@ -22,6 +22,8 @@ stdenv.mkDerivation {
     "--enable-firmware CROSS_COMPILE=${crossPrefix}-"
     else "";
 
+  hardeningDisable = [ "pic" "stackprotector" ];
+
   # Not to strip cross build binaries (this is for the gcc-cross-wrapper)
   dontCrossStrip = true;
 
diff --git a/pkgs/tools/misc/yubikey-personalization/default.nix b/pkgs/tools/misc/yubikey-personalization/default.nix
index c3bb28bc1a5..462f8d8e99a 100644
--- a/pkgs/tools/misc/yubikey-personalization/default.nix
+++ b/pkgs/tools/misc/yubikey-personalization/default.nix
@@ -28,6 +28,6 @@ stdenv.mkDerivation rec {
     description = "A library and command line tool to personalize YubiKeys";
     license = licenses.bsd2;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ wkennington calrama ];
+    maintainers = with maintainers; [ wkennington ];
   };
 }
diff --git a/pkgs/tools/networking/airfield/node-packages.nix b/pkgs/tools/networking/airfield/node-packages.nix
index e92921e15b8..657d9284f1b 100644
--- a/pkgs/tools/networking/airfield/node-packages.nix
+++ b/pkgs/tools/networking/airfield/node-packages.nix
@@ -1,223 +1,43 @@
-# This file has been generated by node2nix 1.4.0. Do not edit!
+# This file has been generated by node2nix 1.5.3. Do not edit!
 
 {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
 let
   sources = {
-    "connect-2.7.1" = {
-      name = "connect";
-      packageName = "connect";
-      version = "2.7.1";
+    "ajv-5.5.2" = {
+      name = "ajv";
+      packageName = "ajv";
+      version = "5.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/connect/-/connect-2.7.1.tgz";
-        sha1 = "b869df9acf3dd8a0af7523c7c6f1aa8b4b761daa";
+        url = "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz";
+        sha1 = "73b5eeca3fab653e3d3f9422b341ad42205dc965";
       };
     };
-    "commander-0.6.1" = {
-      name = "commander";
-      packageName = "commander";
-      version = "0.6.1";
+    "asn1-0.2.3" = {
+      name = "asn1";
+      packageName = "asn1";
+      version = "0.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz";
-        sha1 = "fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06";
+        url = "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz";
+        sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86";
       };
     };
-    "range-parser-0.0.4" = {
-      name = "range-parser";
-      packageName = "range-parser";
-      version = "0.0.4";
+    "assert-plus-1.0.0" = {
+      name = "assert-plus";
+      packageName = "assert-plus";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/range-parser/-/range-parser-0.0.4.tgz";
-        sha1 = "c0427ffef51c10acba0782a46c9602e744ff620b";
+        url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz";
+        sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525";
       };
     };
-    "mkdirp-0.3.3" = {
-      name = "mkdirp";
-      packageName = "mkdirp";
-      version = "0.3.3";
+    "asynckit-0.4.0" = {
+      name = "asynckit";
+      packageName = "asynckit";
+      version = "0.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.3.tgz";
-        sha1 = "595e251c1370c3a68bab2136d0e348b8105adf13";
-      };
-    };
-    "cookie-0.0.5" = {
-      name = "cookie";
-      packageName = "cookie";
-      version = "0.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cookie/-/cookie-0.0.5.tgz";
-        sha1 = "f9acf9db57eb7568c9fcc596256b7bb22e307c81";
-      };
-    };
-    "buffer-crc32-0.1.1" = {
-      name = "buffer-crc32";
-      packageName = "buffer-crc32";
-      version = "0.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.1.1.tgz";
-        sha1 = "7e110dc9953908ab7c32acdc70c9f945b1cbc526";
-      };
-    };
-    "fresh-0.1.0" = {
-      name = "fresh";
-      packageName = "fresh";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fresh/-/fresh-0.1.0.tgz";
-        sha1 = "03e4b0178424e4c2d5d19a54d8814cdc97934850";
-      };
-    };
-    "methods-0.0.1" = {
-      name = "methods";
-      packageName = "methods";
-      version = "0.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/methods/-/methods-0.0.1.tgz";
-        sha1 = "277c90f8bef39709645a8371c51c3b6c648e068c";
-      };
-    };
-    "send-0.1.0" = {
-      name = "send";
-      packageName = "send";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/send/-/send-0.1.0.tgz";
-        sha1 = "cfb08ebd3cec9b7fc1a37d9ff9e875a971cf4640";
-      };
-    };
-    "cookie-signature-0.0.1" = {
-      name = "cookie-signature";
-      packageName = "cookie-signature";
-      version = "0.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-0.0.1.tgz";
-        sha1 = "13d3603b5cf63befbf85a8801e37aa900db46985";
-      };
-    };
-    "debug-3.1.0" = {
-      name = "debug";
-      packageName = "debug";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz";
-        sha512 = "3g1hqsahr1ks2kpvdxrwzr57fj90nnr0hvwwrw8yyyzcv3i11sym8zwibxx67bl1mln0acddrzpkkdjjxnc6n2cm9fazmgzzsl1fzrr";
-      };
-    };
-    "qs-0.5.1" = {
-      name = "qs";
-      packageName = "qs";
-      version = "0.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-0.5.1.tgz";
-        sha1 = "9f6bf5d9ac6c76384e95d36d15b48980e5e4add0";
-      };
-    };
-    "formidable-1.0.11" = {
-      name = "formidable";
-      packageName = "formidable";
-      version = "1.0.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/formidable/-/formidable-1.0.11.tgz";
-        sha1 = "68f63325a035e644b6f7bb3d11243b9761de1b30";
-      };
-    };
-    "crc-0.2.0" = {
-      name = "crc";
-      packageName = "crc";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/crc/-/crc-0.2.0.tgz";
-        sha1 = "f4486b9bf0a12df83c3fca14e31e030fdabd9454";
-      };
-    };
-    "bytes-0.1.0" = {
-      name = "bytes";
-      packageName = "bytes";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bytes/-/bytes-0.1.0.tgz";
-        sha1 = "c574812228126d6369d1576925a8579db3f8e5a2";
-      };
-    };
-    "pause-0.0.1" = {
-      name = "pause";
-      packageName = "pause";
-      version = "0.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz";
-        sha1 = "1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d";
-      };
-    };
-    "mime-1.2.6" = {
-      name = "mime";
-      packageName = "mime";
-      version = "1.2.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mime/-/mime-1.2.6.tgz";
-        sha1 = "b1f86c768c025fa87b48075f1709f28aeaf20365";
-      };
-    };
-    "ms-2.0.0" = {
-      name = "ms";
-      packageName = "ms";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz";
-        sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8";
-      };
-    };
-    "underscore-1.8.3" = {
-      name = "underscore";
-      packageName = "underscore";
-      version = "1.8.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz";
-        sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022";
-      };
-    };
-    "double-ended-queue-2.1.0-0" = {
-      name = "double-ended-queue";
-      packageName = "double-ended-queue";
-      version = "2.1.0-0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz";
-        sha1 = "103d3527fd31528f40188130c841efdd78264e5c";
-      };
-    };
-    "redis-commands-1.3.1" = {
-      name = "redis-commands";
-      packageName = "redis-commands";
-      version = "1.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/redis-commands/-/redis-commands-1.3.1.tgz";
-        sha1 = "81d826f45fa9c8b2011f4cd7a0fe597d241d442b";
-      };
-    };
-    "redis-parser-2.6.0" = {
-      name = "redis-parser";
-      packageName = "redis-parser";
-      version = "2.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/redis-parser/-/redis-parser-2.6.0.tgz";
-        sha1 = "52ed09dacac108f1a631c07e9b69941e7a19504b";
-      };
-    };
-    "redis-2.8.0" = {
-      name = "redis";
-      packageName = "redis";
-      version = "2.8.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/redis/-/redis-2.8.0.tgz";
-        sha512 = "3a3044ax6qdvss83xgjfx10h5q91ls0mwgs3wpsnxcdsiipq3cnmqzsh6glyq0r7vsmpw49jp84c2jnfrhi2bgycrkd9hhhf6ia8lrk";
-      };
-    };
-    "lodash-4.17.4" = {
-      name = "lodash";
-      packageName = "lodash";
-      version = "4.17.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz";
-        sha1 = "78203a4d1c328ae1d86dca6460e369b57f4055ae";
+        url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz";
+        sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79";
       };
     };
     "aws-sign2-0.7.0" = {
@@ -238,6 +58,51 @@ let
         sha1 = "83ef5ca860b2b32e4a0deedee8c771b9db57471e";
       };
     };
+    "bcrypt-pbkdf-1.0.1" = {
+      name = "bcrypt-pbkdf";
+      packageName = "bcrypt-pbkdf";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz";
+        sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d";
+      };
+    };
+    "boom-4.3.1" = {
+      name = "boom";
+      packageName = "boom";
+      version = "4.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz";
+        sha1 = "4f8a3005cb4a7e3889f749030fd25b96e01d2e31";
+      };
+    };
+    "boom-5.2.0" = {
+      name = "boom";
+      packageName = "boom";
+      version = "5.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz";
+        sha512 = "19h20yqpvca08dns1rs4f057f10w63v0snxfml4h5khsk266x3x1im0w72bza4k2xn0kfz6jlv001dhcvxsjr09bmbqnysils9m7437";
+      };
+    };
+    "buffer-crc32-0.1.1" = {
+      name = "buffer-crc32";
+      packageName = "buffer-crc32";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.1.1.tgz";
+        sha1 = "7e110dc9953908ab7c32acdc70c9f945b1cbc526";
+      };
+    };
+    "bytes-0.1.0" = {
+      name = "bytes";
+      packageName = "bytes";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bytes/-/bytes-0.1.0.tgz";
+        sha1 = "c574812228126d6369d1576925a8579db3f8e5a2";
+      };
+    };
     "caseless-0.12.0" = {
       name = "caseless";
       packageName = "caseless";
@@ -247,13 +112,130 @@ let
         sha1 = "1b681c21ff84033c826543090689420d187151dc";
       };
     };
-    "combined-stream-1.0.5" = {
+    "co-4.6.0" = {
+      name = "co";
+      packageName = "co";
+      version = "4.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/co/-/co-4.6.0.tgz";
+        sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184";
+      };
+    };
+    "combined-stream-1.0.6" = {
       name = "combined-stream";
       packageName = "combined-stream";
-      version = "1.0.5";
+      version = "1.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz";
-        sha1 = "938370a57b4a51dea2c77c15d5c5fdf895164009";
+        url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz";
+        sha1 = "723e7df6e801ac5613113a7e445a9b69cb632818";
+      };
+    };
+    "commander-0.6.1" = {
+      name = "commander";
+      packageName = "commander";
+      version = "0.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz";
+        sha1 = "fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06";
+      };
+    };
+    "connect-2.7.1" = {
+      name = "connect";
+      packageName = "connect";
+      version = "2.7.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/connect/-/connect-2.7.1.tgz";
+        sha1 = "b869df9acf3dd8a0af7523c7c6f1aa8b4b761daa";
+      };
+    };
+    "cookie-0.0.5" = {
+      name = "cookie";
+      packageName = "cookie";
+      version = "0.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cookie/-/cookie-0.0.5.tgz";
+        sha1 = "f9acf9db57eb7568c9fcc596256b7bb22e307c81";
+      };
+    };
+    "cookie-signature-0.0.1" = {
+      name = "cookie-signature";
+      packageName = "cookie-signature";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-0.0.1.tgz";
+        sha1 = "13d3603b5cf63befbf85a8801e37aa900db46985";
+      };
+    };
+    "core-util-is-1.0.2" = {
+      name = "core-util-is";
+      packageName = "core-util-is";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz";
+        sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
+      };
+    };
+    "crc-0.2.0" = {
+      name = "crc";
+      packageName = "crc";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/crc/-/crc-0.2.0.tgz";
+        sha1 = "f4486b9bf0a12df83c3fca14e31e030fdabd9454";
+      };
+    };
+    "cryptiles-3.1.2" = {
+      name = "cryptiles";
+      packageName = "cryptiles";
+      version = "3.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz";
+        sha1 = "a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe";
+      };
+    };
+    "dashdash-1.14.1" = {
+      name = "dashdash";
+      packageName = "dashdash";
+      version = "1.14.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz";
+        sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0";
+      };
+    };
+    "debug-3.1.0" = {
+      name = "debug";
+      packageName = "debug";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz";
+        sha512 = "3g1hqsahr1ks2kpvdxrwzr57fj90nnr0hvwwrw8yyyzcv3i11sym8zwibxx67bl1mln0acddrzpkkdjjxnc6n2cm9fazmgzzsl1fzrr";
+      };
+    };
+    "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";
+      };
+    };
+    "double-ended-queue-2.1.0-0" = {
+      name = "double-ended-queue";
+      packageName = "double-ended-queue";
+      version = "2.1.0-0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz";
+        sha1 = "103d3527fd31528f40188130c841efdd78264e5c";
+      };
+    };
+    "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";
       };
     };
     "extend-3.0.1" = {
@@ -265,6 +247,33 @@ let
         sha1 = "a755ea7bc1adfcc5a31ce7e762dbaadc5e636444";
       };
     };
+    "extsprintf-1.3.0" = {
+      name = "extsprintf";
+      packageName = "extsprintf";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz";
+        sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05";
+      };
+    };
+    "fast-deep-equal-1.1.0" = {
+      name = "fast-deep-equal";
+      packageName = "fast-deep-equal";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz";
+        sha1 = "c053477817c86b51daa853c81e059b733d023614";
+      };
+    };
+    "fast-json-stable-stringify-2.0.0" = {
+      name = "fast-json-stable-stringify";
+      packageName = "fast-json-stable-stringify";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz";
+        sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2";
+      };
+    };
     "forever-agent-0.6.1" = {
       name = "forever-agent";
       packageName = "forever-agent";
@@ -274,13 +283,49 @@ let
         sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91";
       };
     };
-    "form-data-2.3.1" = {
+    "form-data-2.3.2" = {
       name = "form-data";
       packageName = "form-data";
-      version = "2.3.1";
+      version = "2.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz";
-        sha1 = "6fb94fbd71885306d73d15cc497fe4cc4ecd44bf";
+        url = "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz";
+        sha1 = "4970498be604c20c005d4f5c23aecd21d6b49099";
+      };
+    };
+    "formidable-1.0.11" = {
+      name = "formidable";
+      packageName = "formidable";
+      version = "1.0.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/formidable/-/formidable-1.0.11.tgz";
+        sha1 = "68f63325a035e644b6f7bb3d11243b9761de1b30";
+      };
+    };
+    "fresh-0.1.0" = {
+      name = "fresh";
+      packageName = "fresh";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fresh/-/fresh-0.1.0.tgz";
+        sha1 = "03e4b0178424e4c2d5d19a54d8814cdc97934850";
+      };
+    };
+    "getpass-0.1.7" = {
+      name = "getpass";
+      packageName = "getpass";
+      version = "0.1.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz";
+        sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa";
+      };
+    };
+    "har-schema-2.0.0" = {
+      name = "har-schema";
+      packageName = "har-schema";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz";
+        sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92";
       };
     };
     "har-validator-5.0.3" = {
@@ -301,6 +346,15 @@ let
         sha512 = "1nl2hjr2mnhj5jlaz8mh54z7acwz5j5idkch04qgjk78756gw5d0fjk4a2immil5ij9ijdssb9ndpryvnh2xpcbgcjv8lxybn330als";
       };
     };
+    "hoek-4.2.1" = {
+      name = "hoek";
+      packageName = "hoek";
+      version = "4.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz";
+        sha512 = "1y8kprb3qldxqj31zai5n8dvhydsl9nn5w4rskhnbzzhldn6pm6n5lcyam3sfkb61a62d5m58k8im7z6ngwbd9cw9zp4zm4y7ckrf20";
+      };
+    };
     "http-signature-1.2.0" = {
       name = "http-signature";
       packageName = "http-signature";
@@ -328,247 +382,13 @@ let
         sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a";
       };
     };
-    "json-stringify-safe-5.0.1" = {
-      name = "json-stringify-safe";
-      packageName = "json-stringify-safe";
-      version = "5.0.1";
+    "jsbn-0.1.1" = {
+      name = "jsbn";
+      packageName = "jsbn";
+      version = "0.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz";
-        sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
-      };
-    };
-    "mime-types-2.1.17" = {
-      name = "mime-types";
-      packageName = "mime-types";
-      version = "2.1.17";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz";
-        sha1 = "09d7a393f03e995a79f8af857b70a9e0ab16557a";
-      };
-    };
-    "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";
-      };
-    };
-    "performance-now-2.1.0" = {
-      name = "performance-now";
-      packageName = "performance-now";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz";
-        sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b";
-      };
-    };
-    "qs-6.5.1" = {
-      name = "qs";
-      packageName = "qs";
-      version = "6.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz";
-        sha512 = "3waqapyj1k4g135sgj636rmswiaixq19is1rw0rpv4qp6k7dl0a9nwy06m7yl5lbdk9p6xpwwngnggbzlzaz6rh11c86j2nvnnf273r";
-      };
-    };
-    "safe-buffer-5.1.1" = {
-      name = "safe-buffer";
-      packageName = "safe-buffer";
-      version = "5.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz";
-        sha512 = "1p28rllll1w65yzq5azi4izx962399xdsdlfbaynn7vmp981hiss05jhiy9hm7sbbfk3b4dhlcv0zy07fc59mnc07hdv6wcgqkcvawh";
-      };
-    };
-    "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.3" = {
-      name = "tough-cookie";
-      packageName = "tough-cookie";
-      version = "2.3.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz";
-        sha1 = "0b618a5565b6dea90bf3425d04d55edc475a7561";
-      };
-    };
-    "tunnel-agent-0.6.0" = {
-      name = "tunnel-agent";
-      packageName = "tunnel-agent";
-      version = "0.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz";
-        sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd";
-      };
-    };
-    "uuid-3.1.0" = {
-      name = "uuid";
-      packageName = "uuid";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz";
-        sha512 = "3x5mi85l1559nkb35pfksjjgiyfyqrcvmcf0nly1xjl1kb0d37jnxd6sk0b8d331waadnqbf60nfssb563x9pvnjcw87lrh976sv18c";
-      };
-    };
-    "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";
-      };
-    };
-    "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";
-      };
-    };
-    "ajv-5.3.0" = {
-      name = "ajv";
-      packageName = "ajv";
-      version = "5.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-5.3.0.tgz";
-        sha1 = "4414ff74a50879c208ee5fdc826e32c303549eda";
-      };
-    };
-    "har-schema-2.0.0" = {
-      name = "har-schema";
-      packageName = "har-schema";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz";
-        sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92";
-      };
-    };
-    "co-4.6.0" = {
-      name = "co";
-      packageName = "co";
-      version = "4.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/co/-/co-4.6.0.tgz";
-        sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184";
-      };
-    };
-    "fast-deep-equal-1.0.0" = {
-      name = "fast-deep-equal";
-      packageName = "fast-deep-equal";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz";
-        sha1 = "96256a3bc975595eb36d82e9929d060d893439ff";
-      };
-    };
-    "fast-json-stable-stringify-2.0.0" = {
-      name = "fast-json-stable-stringify";
-      packageName = "fast-json-stable-stringify";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz";
-        sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2";
-      };
-    };
-    "json-schema-traverse-0.3.1" = {
-      name = "json-schema-traverse";
-      packageName = "json-schema-traverse";
-      version = "0.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz";
-        sha1 = "349a6d44c53a51de89b40805c5d5e59b417d3340";
-      };
-    };
-    "hoek-4.2.0" = {
-      name = "hoek";
-      packageName = "hoek";
-      version = "4.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz";
-        sha512 = "2cz0q3nnv67drgaw2rm7q57r9rgdax1qa0n4z46is7db1w8vwmh574xcr0d73xl5lg80vb85xg2gdhxzh9gbllagp7xk2q228pw4idz";
-      };
-    };
-    "boom-4.3.1" = {
-      name = "boom";
-      packageName = "boom";
-      version = "4.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz";
-        sha1 = "4f8a3005cb4a7e3889f749030fd25b96e01d2e31";
-      };
-    };
-    "cryptiles-3.1.2" = {
-      name = "cryptiles";
-      packageName = "cryptiles";
-      version = "3.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz";
-        sha1 = "a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe";
-      };
-    };
-    "sntp-2.1.0" = {
-      name = "sntp";
-      packageName = "sntp";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz";
-        sha512 = "0k2smmr24w5hb1cpql6vcgh58vzp4pmh9anf0bgz3arlsgq1mapnlq9fjqr6xs10aq1cmxaw987fwknqi62frax0fvs9bj3q3kmpg8l";
-      };
-    };
-    "boom-5.2.0" = {
-      name = "boom";
-      packageName = "boom";
-      version = "5.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz";
-        sha512 = "19h20yqpvca08dns1rs4f057f10w63v0snxfml4h5khsk266x3x1im0w72bza4k2xn0kfz6jlv001dhcvxsjr09bmbqnysils9m7437";
-      };
-    };
-    "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";
-      };
-    };
-    "jsprim-1.4.1" = {
-      name = "jsprim";
-      packageName = "jsprim";
-      version = "1.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz";
-        sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2";
-      };
-    };
-    "sshpk-1.13.1" = {
-      name = "sshpk";
-      packageName = "sshpk";
-      version = "1.13.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz";
-        sha1 = "512df6da6287144316dc4c18fe1cf1d940739be3";
-      };
-    };
-    "extsprintf-1.3.0" = {
-      name = "extsprintf";
-      packageName = "extsprintf";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz";
-        sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05";
+        url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz";
+        sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513";
       };
     };
     "json-schema-0.2.3" = {
@@ -580,58 +400,247 @@ let
         sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13";
       };
     };
-    "verror-1.10.0" = {
-      name = "verror";
-      packageName = "verror";
-      version = "1.10.0";
+    "json-schema-traverse-0.3.1" = {
+      name = "json-schema-traverse";
+      packageName = "json-schema-traverse";
+      version = "0.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz";
-        sha1 = "3a105ca17053af55d6e270c1f8288682e18da400";
+        url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz";
+        sha1 = "349a6d44c53a51de89b40805c5d5e59b417d3340";
       };
     };
-    "core-util-is-1.0.2" = {
-      name = "core-util-is";
-      packageName = "core-util-is";
-      version = "1.0.2";
+    "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/core-util-is/-/core-util-is-1.0.2.tgz";
-        sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
+        url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz";
+        sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
       };
     };
-    "asn1-0.2.3" = {
-      name = "asn1";
-      packageName = "asn1";
-      version = "0.2.3";
+    "jsprim-1.4.1" = {
+      name = "jsprim";
+      packageName = "jsprim";
+      version = "1.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz";
-        sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86";
+        url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz";
+        sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2";
       };
     };
-    "dashdash-1.14.1" = {
-      name = "dashdash";
-      packageName = "dashdash";
+    "lodash-4.17.5" = {
+      name = "lodash";
+      packageName = "lodash";
+      version = "4.17.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz";
+        sha512 = "11hikgyas884mz8a58vyixaahxbpdwljdw4cb6qp15xa3sfqikp2mm6wgv41jsl34nzsv1hkx9kw3nwczvas5p73whirmaz4sxggwmj";
+      };
+    };
+    "methods-0.0.1" = {
+      name = "methods";
+      packageName = "methods";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/methods/-/methods-0.0.1.tgz";
+        sha1 = "277c90f8bef39709645a8371c51c3b6c648e068c";
+      };
+    };
+    "mime-1.2.6" = {
+      name = "mime";
+      packageName = "mime";
+      version = "1.2.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mime/-/mime-1.2.6.tgz";
+        sha1 = "b1f86c768c025fa87b48075f1709f28aeaf20365";
+      };
+    };
+    "mime-db-1.33.0" = {
+      name = "mime-db";
+      packageName = "mime-db";
+      version = "1.33.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz";
+        sha512 = "36xnw59ik9fqym00cmwb5nyzg0l03k70cp413f7639j93wgmzk1mh0xjc7i6zz3r6k9xnwh0g5cm5a1f3y8c6plgy4qld7fm887ywh4";
+      };
+    };
+    "mime-types-2.1.18" = {
+      name = "mime-types";
+      packageName = "mime-types";
+      version = "2.1.18";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz";
+        sha512 = "22krj1kw7n9z10zdyx7smcaim4bzwqsqzhspwha06q58gcrxfp93hw2cd0vk5crhq5p2dwzqlpacg32lrmp5sjzb798zdzy35mdmkwm";
+      };
+    };
+    "mkdirp-0.3.3" = {
+      name = "mkdirp";
+      packageName = "mkdirp";
+      version = "0.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.3.tgz";
+        sha1 = "595e251c1370c3a68bab2136d0e348b8105adf13";
+      };
+    };
+    "ms-2.0.0" = {
+      name = "ms";
+      packageName = "ms";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz";
+        sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8";
+      };
+    };
+    "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";
+      };
+    };
+    "pause-0.0.1" = {
+      name = "pause";
+      packageName = "pause";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz";
+        sha1 = "1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d";
+      };
+    };
+    "performance-now-2.1.0" = {
+      name = "performance-now";
+      packageName = "performance-now";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz";
+        sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b";
+      };
+    };
+    "punycode-1.4.1" = {
+      name = "punycode";
+      packageName = "punycode";
+      version = "1.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz";
+        sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e";
+      };
+    };
+    "qs-0.5.1" = {
+      name = "qs";
+      packageName = "qs";
+      version = "0.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/qs/-/qs-0.5.1.tgz";
+        sha1 = "9f6bf5d9ac6c76384e95d36d15b48980e5e4add0";
+      };
+    };
+    "qs-6.5.1" = {
+      name = "qs";
+      packageName = "qs";
+      version = "6.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz";
+        sha512 = "3waqapyj1k4g135sgj636rmswiaixq19is1rw0rpv4qp6k7dl0a9nwy06m7yl5lbdk9p6xpwwngnggbzlzaz6rh11c86j2nvnnf273r";
+      };
+    };
+    "range-parser-0.0.4" = {
+      name = "range-parser";
+      packageName = "range-parser";
+      version = "0.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/range-parser/-/range-parser-0.0.4.tgz";
+        sha1 = "c0427ffef51c10acba0782a46c9602e744ff620b";
+      };
+    };
+    "redis-2.8.0" = {
+      name = "redis";
+      packageName = "redis";
+      version = "2.8.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/redis/-/redis-2.8.0.tgz";
+        sha512 = "3a3044ax6qdvss83xgjfx10h5q91ls0mwgs3wpsnxcdsiipq3cnmqzsh6glyq0r7vsmpw49jp84c2jnfrhi2bgycrkd9hhhf6ia8lrk";
+      };
+    };
+    "redis-commands-1.3.5" = {
+      name = "redis-commands";
+      packageName = "redis-commands";
+      version = "1.3.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/redis-commands/-/redis-commands-1.3.5.tgz";
+        sha512 = "2q8pai3gf0dczb03jjig3mpaz4j2kvw8icpgf8hp4fryr3d6c0mjkvxxdmlyhainybx4zhgqsw9ghc9p986alzdzd2n2p4cxvr8b0by";
+      };
+    };
+    "redis-parser-2.6.0" = {
+      name = "redis-parser";
+      packageName = "redis-parser";
+      version = "2.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/redis-parser/-/redis-parser-2.6.0.tgz";
+        sha1 = "52ed09dacac108f1a631c07e9b69941e7a19504b";
+      };
+    };
+    "safe-buffer-5.1.1" = {
+      name = "safe-buffer";
+      packageName = "safe-buffer";
+      version = "5.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz";
+        sha512 = "1p28rllll1w65yzq5azi4izx962399xdsdlfbaynn7vmp981hiss05jhiy9hm7sbbfk3b4dhlcv0zy07fc59mnc07hdv6wcgqkcvawh";
+      };
+    };
+    "send-0.1.0" = {
+      name = "send";
+      packageName = "send";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/send/-/send-0.1.0.tgz";
+        sha1 = "cfb08ebd3cec9b7fc1a37d9ff9e875a971cf4640";
+      };
+    };
+    "sntp-2.1.0" = {
+      name = "sntp";
+      packageName = "sntp";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz";
+        sha512 = "0k2smmr24w5hb1cpql6vcgh58vzp4pmh9anf0bgz3arlsgq1mapnlq9fjqr6xs10aq1cmxaw987fwknqi62frax0fvs9bj3q3kmpg8l";
+      };
+    };
+    "sshpk-1.14.1" = {
+      name = "sshpk";
+      packageName = "sshpk";
       version = "1.14.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz";
-        sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0";
+        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz";
+        sha1 = "130f5975eddad963f1d56f92b9ac6c51fa9f83eb";
       };
     };
-    "getpass-0.1.7" = {
-      name = "getpass";
-      packageName = "getpass";
-      version = "0.1.7";
+    "stringstream-0.0.5" = {
+      name = "stringstream";
+      packageName = "stringstream";
+      version = "0.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz";
-        sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa";
+        url = "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz";
+        sha1 = "4e484cd4de5a0bbbee18e46307710a8a81621878";
       };
     };
-    "jsbn-0.1.1" = {
-      name = "jsbn";
-      packageName = "jsbn";
-      version = "0.1.1";
+    "tough-cookie-2.3.4" = {
+      name = "tough-cookie";
+      packageName = "tough-cookie";
+      version = "2.3.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz";
-        sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513";
+        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz";
+        sha512 = "0ncm6j3cjq1f26mzjf04k9bkw1b08w53s4qa3a11c1bdj4pgnqv1422c1xs5jyy6y1psppjx52fhagq5zkjkgrcpdkxcdiry96r77jd";
+      };
+    };
+    "tunnel-agent-0.6.0" = {
+      name = "tunnel-agent";
+      packageName = "tunnel-agent";
+      version = "0.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz";
+        sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd";
       };
     };
     "tweetnacl-0.14.5" = {
@@ -643,40 +652,31 @@ let
         sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64";
       };
     };
-    "ecc-jsbn-0.1.1" = {
-      name = "ecc-jsbn";
-      packageName = "ecc-jsbn";
-      version = "0.1.1";
+    "underscore-1.8.3" = {
+      name = "underscore";
+      packageName = "underscore";
+      version = "1.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz";
-        sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505";
+        url = "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz";
+        sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022";
       };
     };
-    "bcrypt-pbkdf-1.0.1" = {
-      name = "bcrypt-pbkdf";
-      packageName = "bcrypt-pbkdf";
-      version = "1.0.1";
+    "uuid-3.2.1" = {
+      name = "uuid";
+      packageName = "uuid";
+      version = "3.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz";
-        sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d";
+        url = "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz";
+        sha512 = "0843vl1c974n8kw5kn0kvhvhwk8y8jydr0xkwwl2963xxmkw4ingk6xj9c8m48jw2i95giglxzq5aw5v5mij9kv7fzln8pxav1cr6cd";
       };
     };
-    "mime-db-1.30.0" = {
-      name = "mime-db";
-      packageName = "mime-db";
-      version = "1.30.0";
+    "verror-1.10.0" = {
+      name = "verror";
+      packageName = "verror";
+      version = "1.10.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz";
-        sha1 = "74c643da2dd9d6a45399963465b26d5ca7d71f01";
-      };
-    };
-    "punycode-1.4.1" = {
-      name = "punycode";
-      packageName = "punycode";
-      version = "1.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz";
-        sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e";
+        url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz";
+        sha1 = "3a105ca17053af55d6e270c1f8288682e18da400";
       };
     };
   };
@@ -691,30 +691,31 @@ in
       sha1 = "4c6e5850e6b5e8ca2af57f21ed7097de50948b73";
     };
     dependencies = [
-      sources."connect-2.7.1"
-      sources."commander-0.6.1"
-      sources."range-parser-0.0.4"
-      sources."mkdirp-0.3.3"
-      sources."cookie-0.0.5"
       sources."buffer-crc32-0.1.1"
+      sources."bytes-0.1.0"
+      sources."commander-0.6.1"
+      sources."connect-2.7.1"
+      sources."cookie-0.0.5"
+      sources."cookie-signature-0.0.1"
+      sources."crc-0.2.0"
+      sources."debug-3.1.0"
+      sources."formidable-1.0.11"
       sources."fresh-0.1.0"
       sources."methods-0.0.1"
-      sources."send-0.1.0"
-      sources."cookie-signature-0.0.1"
-      sources."debug-3.1.0"
-      sources."qs-0.5.1"
-      sources."formidable-1.0.11"
-      sources."crc-0.2.0"
-      sources."bytes-0.1.0"
-      sources."pause-0.0.1"
       sources."mime-1.2.6"
+      sources."mkdirp-0.3.3"
       sources."ms-2.0.0"
+      sources."pause-0.0.1"
+      sources."qs-0.5.1"
+      sources."range-parser-0.0.4"
+      sources."send-0.1.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
       description = "Sinatra inspired web development framework";
     };
     production = true;
+    bypassCache = false;
   };
   "swig-0.14.0" = nodeEnv.buildNodePackage {
     name = "swig";
@@ -732,6 +733,7 @@ in
       description = "A fast django-like templating engine for node.js and browsers.";
     };
     production = true;
+    bypassCache = false;
   };
   "consolidate-0.10.0" = nodeEnv.buildNodePackage {
     name = "consolidate";
@@ -747,6 +749,7 @@ in
       homepage = https://github.com/visionmedia/consolidate.js;
     };
     production = true;
+    bypassCache = false;
   };
   redis = nodeEnv.buildNodePackage {
     name = "redis";
@@ -758,7 +761,7 @@ in
     };
     dependencies = [
       sources."double-ended-queue-2.1.0-0"
-      sources."redis-commands-1.3.1"
+      sources."redis-commands-1.3.5"
       sources."redis-parser-2.6.0"
     ];
     buildInputs = globalBuildInputs;
@@ -768,21 +771,22 @@ in
       license = "MIT";
     };
     production = true;
+    bypassCache = false;
   };
   connect-redis = nodeEnv.buildNodePackage {
     name = "connect-redis";
     packageName = "connect-redis";
-    version = "3.3.2";
+    version = "3.3.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/connect-redis/-/connect-redis-3.3.2.tgz";
-      sha512 = "3w8bsdsqpz407jwgac2qa2lp08551xlqmsfyps1q7p0c80lx1dwip148rjc5fgm5w845al5c30i6rypggp4h6nhqzdk1jf0vyagbrkc";
+      url = "https://registry.npmjs.org/connect-redis/-/connect-redis-3.3.3.tgz";
+      sha512 = "355x879l7vfnzp6m199ghns4sgl5xpx0j6nr2bqimy3xj29i168bsaxi8gwky6cqy4apvb62sp8n67rssdzq667zngf7mm4dddsr5df";
     };
     dependencies = [
       sources."debug-3.1.0"
-      sources."redis-2.8.0"
-      sources."ms-2.0.0"
       sources."double-ended-queue-2.1.0-0"
-      sources."redis-commands-1.3.1"
+      sources."ms-2.0.0"
+      sources."redis-2.8.0"
+      sources."redis-commands-1.3.5"
       sources."redis-parser-2.6.0"
     ];
     buildInputs = globalBuildInputs;
@@ -792,6 +796,7 @@ in
       license = "MIT";
     };
     production = true;
+    bypassCache = false;
   };
   async = nodeEnv.buildNodePackage {
     name = "async";
@@ -802,7 +807,7 @@ in
       sha512 = "0zp4b5788400npi1ixjry5x3a4m21c8pnknk8v731rgnwnjbp5ijmfcf5ppmn1ap4a04md1s9dr8n9ygdvrmiai590v0k6dby1wc1y4";
     };
     dependencies = [
-      sources."lodash-4.17.4"
+      sources."lodash-4.17.5"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -811,66 +816,71 @@ in
       license = "MIT";
     };
     production = true;
+    bypassCache = false;
   };
   request = nodeEnv.buildNodePackage {
     name = "request";
     packageName = "request";
-    version = "2.83.0";
+    version = "2.85.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/request/-/request-2.83.0.tgz";
-      sha512 = "0by1djkn836sqd9pk2c777wcjvp34qbk1plx7s4lmykljrblpjc64dvn6ni2vyxsbyk33wnl6avym8vgw0ggr4226xakck8mw7y07cm";
+      url = "https://registry.npmjs.org/request/-/request-2.85.0.tgz";
+      sha512 = "2d3hg10zs5ycnr8prmiwdhacf88fl0x0bi6szs0z2r07zcbk419laixwpjp8sqapbc2ifyyih7p3r60wgr58bmcncz3pqnx523c8zph";
     };
     dependencies = [
+      sources."ajv-5.5.2"
+      sources."asn1-0.2.3"
+      sources."assert-plus-1.0.0"
+      sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.6.0"
+      sources."bcrypt-pbkdf-1.0.1"
+      sources."boom-4.3.1"
       sources."caseless-0.12.0"
-      sources."combined-stream-1.0.5"
+      sources."co-4.6.0"
+      sources."combined-stream-1.0.6"
+      sources."core-util-is-1.0.2"
+      (sources."cryptiles-3.1.2" // {
+        dependencies = [
+          sources."boom-5.2.0"
+        ];
+      })
+      sources."dashdash-1.14.1"
+      sources."delayed-stream-1.0.0"
+      sources."ecc-jsbn-0.1.1"
       sources."extend-3.0.1"
+      sources."extsprintf-1.3.0"
+      sources."fast-deep-equal-1.1.0"
+      sources."fast-json-stable-stringify-2.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.3.1"
+      sources."form-data-2.3.2"
+      sources."getpass-0.1.7"
+      sources."har-schema-2.0.0"
       sources."har-validator-5.0.3"
       sources."hawk-6.0.2"
+      sources."hoek-4.2.1"
       sources."http-signature-1.2.0"
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
+      sources."jsbn-0.1.1"
+      sources."json-schema-0.2.3"
+      sources."json-schema-traverse-0.3.1"
       sources."json-stringify-safe-5.0.1"
-      sources."mime-types-2.1.17"
+      sources."jsprim-1.4.1"
+      sources."mime-db-1.33.0"
+      sources."mime-types-2.1.18"
       sources."oauth-sign-0.8.2"
       sources."performance-now-2.1.0"
+      sources."punycode-1.4.1"
       sources."qs-6.5.1"
       sources."safe-buffer-5.1.1"
-      sources."stringstream-0.0.5"
-      sources."tough-cookie-2.3.3"
-      sources."tunnel-agent-0.6.0"
-      sources."uuid-3.1.0"
-      sources."delayed-stream-1.0.0"
-      sources."asynckit-0.4.0"
-      sources."ajv-5.3.0"
-      sources."har-schema-2.0.0"
-      sources."co-4.6.0"
-      sources."fast-deep-equal-1.0.0"
-      sources."fast-json-stable-stringify-2.0.0"
-      sources."json-schema-traverse-0.3.1"
-      sources."hoek-4.2.0"
-      sources."boom-5.2.0"
-      sources."cryptiles-3.1.2"
       sources."sntp-2.1.0"
-      sources."assert-plus-1.0.0"
-      sources."jsprim-1.4.1"
-      sources."sshpk-1.13.1"
-      sources."extsprintf-1.3.0"
-      sources."json-schema-0.2.3"
-      sources."verror-1.10.0"
-      sources."core-util-is-1.0.2"
-      sources."asn1-0.2.3"
-      sources."dashdash-1.14.1"
-      sources."getpass-0.1.7"
-      sources."jsbn-0.1.1"
+      sources."sshpk-1.14.1"
+      sources."stringstream-0.0.5"
+      sources."tough-cookie-2.3.4"
+      sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
-      sources."ecc-jsbn-0.1.1"
-      sources."bcrypt-pbkdf-1.0.1"
-      sources."mime-db-1.30.0"
-      sources."punycode-1.4.1"
+      sources."uuid-3.2.1"
+      sources."verror-1.10.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -879,5 +889,6 @@ in
       license = "Apache-2.0";
     };
     production = true;
+    bypassCache = false;
   };
 }
\ No newline at end of file
diff --git a/pkgs/tools/networking/airfield/node.nix b/pkgs/tools/networking/airfield/node.nix
index 7460cf4ca6c..75bc6ec109c 100644
--- a/pkgs/tools/networking/airfield/node.nix
+++ b/pkgs/tools/networking/airfield/node.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.4.0. Do not edit!
+# This file has been generated by node2nix 1.5.3. Do not edit!
 
 {pkgs ? import  {
     inherit system;
@@ -8,6 +8,7 @@ let
   nodeEnv = import ../../../development/node-packages/node-env.nix {
     inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
     inherit nodejs;
+    libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages.nix {
diff --git a/pkgs/tools/networking/altermime/default.nix b/pkgs/tools/networking/altermime/default.nix
index f05669a4e50..f1e85487d8f 100644
--- a/pkgs/tools/networking/altermime/default.nix
+++ b/pkgs/tools/networking/altermime/default.nix
@@ -10,7 +10,11 @@ stdenv.mkDerivation rec {
     sha256 = "15zxg6spcmd35r6xbidq2fgcg2nzyv1sbbqds08lzll70mqx4pj7";
   };
 
-  NIX_CFLAGS_COMPILE = "-Wno-error=format";
+  NIX_CFLAGS_COMPILE = [ "-Wno-error=format"
+    "-Wno-error=format-truncation"
+    "-Wno-error=pointer-compare"
+    "-Wno-error=memset-elt-size"
+  ];
 
   postPatch = ''
     sed -i Makefile -e "s@/usr/local@$out@"
diff --git a/pkgs/tools/networking/autossh/default.nix b/pkgs/tools/networking/autossh/default.nix
index 9ff0376c8bc..452837ef2e4 100644
--- a/pkgs/tools/networking/autossh/default.nix
+++ b/pkgs/tools/networking/autossh/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, openssh}:
 
 stdenv.mkDerivation rec {
-  name = "autossh-1.4e";
+  name = "autossh-1.4f";
   
   src = fetchurl {
     url = "http://www.harding.motd.ca/autossh/${name}.tgz";
-    sha256 = "0mlicw28vq2jxa0jf0dys5ja75v0fxpjavlq9dpif6bnknji13ly";
+    sha256 = "1wpqwa2872nqgqbhnb6nnkrlzpdawd5k69gh1qp68354pvhyawh1";
   };
   
   buildInputs = [ openssh ];
diff --git a/pkgs/tools/networking/axel/default.nix b/pkgs/tools/networking/axel/default.nix
index c9d689b8b2c..2155d3c1b3d 100644
--- a/pkgs/tools/networking/axel/default.nix
+++ b/pkgs/tools/networking/axel/default.nix
@@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
     description = "Console downloading program with some features for parallel connections for faster downloading";
     homepage = http://axel.alioth.debian.org/;
     maintainers = with maintainers; [ pSub ];
-    platforms = with platforms; linux ++ darwin;
+    platforms = with platforms; linux;
   };
 }
diff --git a/pkgs/tools/networking/ccnet/default.nix b/pkgs/tools/networking/ccnet/default.nix
index 036819ea76e..d4a279bcc42 100644
--- a/pkgs/tools/networking/ccnet/default.nix
+++ b/pkgs/tools/networking/ccnet/default.nix
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
     description = "A framework for writing networked applications in C";
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
-    maintainers = [ maintainers.calrama ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index dbe2a663935..32a8a788848 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, perl
+{ stdenv, lib, fetchurl, pkgconfig, perl
 , http2Support ? true, nghttp2
 , idnSupport ? false, libidn ? null
 , ldapSupport ? false, openldap ? null
@@ -24,11 +24,14 @@ assert brotliSupport -> brotli != null;
 assert gssSupport -> kerberos != null;
 
 stdenv.mkDerivation rec {
-  name = "curl-7.58.0";
+  name = "curl-7.59.0";
 
   src = fetchurl {
-    url = "https://curl.haxx.se/download/${name}.tar.bz2";
-    sha256 = "0cg7klhf1ksnbw5wvwa802qir877zv4y3dj7swz1xh07g3wq3c0w";
+    urls = [
+      "https://github.com/curl/curl/releases/download/${lib.replaceStrings ["."] ["_"] name}/${name}.tar.bz2"
+      "https://curl.haxx.se/download/${name}.tar.bz2"
+    ];
+    sha256 = "185mazhi4bc5mc6rvhrmnc67j8l3sg7f0w2hp5gmi5ccdbyhz4mm";
   };
 
   outputs = [ "bin" "dev" "out" "man" "devdoc" ];
diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix
index 95e3193fd0f..cce4f88476b 100644
--- a/pkgs/tools/networking/dhcpcd/default.nix
+++ b/pkgs/tools/networking/dhcpcd/default.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ udev ];
 
+  preConfigure = "patchShebangs ./configure";
+
   configureFlags = [
     "--sysconfdir=/etc"
     "--localstatedir=/var"
diff --git a/pkgs/tools/networking/htpdate/default.nix b/pkgs/tools/networking/htpdate/default.nix
index f0bb4ab46fa..c8e14ad7f69 100644
--- a/pkgs/tools/networking/htpdate/default.nix
+++ b/pkgs/tools/networking/htpdate/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Utility to fetch time and set the system clock over HTTP";
     homepage = http://www.vervest.org/htp/;
-    platforms = platforms.unix;
+    platforms = platforms.linux;
     license = licenses.gpl2Plus;
   };
 }
diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix
index ec268d5d77f..fd4dfc5f996 100644
--- a/pkgs/tools/networking/i2p/default.nix
+++ b/pkgs/tools/networking/i2p/default.nix
@@ -27,10 +27,10 @@ let wrapper = stdenv.mkDerivation rec {
 in
 
 stdenv.mkDerivation rec {
-  name = "i2p-0.9.33";
+  name = "i2p-0.9.34";
   src = fetchurl {
     url = "https://github.com/i2p/i2p.i2p/archive/${name}.tar.gz";
-    sha256 = "1hlildi34p34xgpm0gqh09r2jb6nsa7a52gr074r6203xkl2racw";
+    sha256 = "1b3qw096b9i55izvrh2793sbg0ikvihfi6k15sz2pzmjn30hy37l";
   };
   buildInputs = [ jdk ant gettext which ];
   patches = [ ./i2p.patch ];
diff --git a/pkgs/tools/networking/libreswan/default.nix b/pkgs/tools/networking/libreswan/default.nix
index b2024f55c4e..fd2461f5171 100644
--- a/pkgs/tools/networking/libreswan/default.nix
+++ b/pkgs/tools/networking/libreswan/default.nix
@@ -25,7 +25,12 @@ stdenv.mkDerivation {
   };
 
   # These flags were added to compile v3.18. Try to lift them when updating.
-  NIX_CFLAGS_COMPILE = [ "-Wno-error=redundant-decls" "-Wno-error=format-nonliteral" ];
+  NIX_CFLAGS_COMPILE = [ "-Wno-error=redundant-decls" "-Wno-error=format-nonliteral"
+    # these flags were added to build with gcc7
+    "-Wno-error=implicit-fallthrough"
+    "-Wno-error=format-truncation"
+    "-Wno-error=pointer-compare"
+  ];
 
   nativeBuildInputs = [ makeWrapper pkgconfig ];
   buildInputs = [ bash iproute iptables systemd coreutils gnused gawk gmp unbound bison flex pam libevent
diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix
index 6f47b4b5576..26bfd27bf9a 100644
--- a/pkgs/tools/networking/mailutils/default.nix
+++ b/pkgs/tools/networking/mailutils/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, fetchpatch, autoreconfHook, dejagnu, gettext, pkgconfig
 , gdbm, pam, readline, ncurses, gnutls, guile, texinfo, gnum4, sasl, fribidi, nettools
-, python, gss, mysql }:
+, python, gss, mysql, sendmailPath ? "/run/wrappers/bin/sendmail" }:
 
 let
   p = "https://raw.githubusercontent.com/gentoo/gentoo/9c921e89d51876fd876f250324893fd90c019326/net-mail/mailutils/files";
@@ -34,13 +34,14 @@ in stdenv.mkDerivation rec {
   ];
 
   doCheck = true;
-  enableParallelBuilding = true;
+  enableParallelBuilding = false;
   hardeningDisable = [ "format" ];
 
   configureFlags = [
     "--with-gssapi"
     "--with-gsasl"
     "--with-mysql"
+    "--with-path-sendmail=${sendmailPath}"
   ];
 
   readmsg-tests = stdenv.lib.optionals doCheck [
diff --git a/pkgs/tools/networking/megatools/default.nix b/pkgs/tools/networking/megatools/default.nix
index f6a75011287..e2d4880250c 100644
--- a/pkgs/tools/networking/megatools/default.nix
+++ b/pkgs/tools/networking/megatools/default.nix
@@ -1,18 +1,25 @@
-{ stdenv, fetchurl, pkgconfig, glib, fuse, curl, glib-networking
-, asciidoc, wrapGAppsHook }:
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, fuse, curl, glib-networking
+, asciidoc, libxml2, docbook_xsl, docbook_xml_dtd_45, libxslt, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "megatools-${version}";
-  version = "1.9.98";
+  version = "2017-10-26";
 
-  src = fetchurl {
-    url = "https://megatools.megous.com/builds/${name}.tar.gz";
-    sha256 = "0vx1farp0dpg4zwvxdbfdnzjk9qx3sn109p1r1zl3g3xsaj221cv";
+  src = fetchFromGitHub {
+    owner = "megous";
+    repo = "megatools";
+    rev = "35dfba3262f620b4701ec1975293463957e20f26";
+    sha256 = "0xphgv78j731rmhxic4fwzdr7vq5px921qifrw1y40b93nhy4d5n";
   };
 
-  nativeBuildInputs = [ pkgconfig wrapGAppsHook asciidoc ];
+  nativeBuildInputs = [
+    autoreconfHook pkgconfig wrapGAppsHook asciidoc libxml2
+    docbook_xsl docbook_xml_dtd_45 libxslt
+  ];
   buildInputs = [ glib glib-networking fuse curl ];
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "Command line client for Mega.co.nz";
     homepage = https://megatools.megous.com/;
diff --git a/pkgs/tools/networking/network-manager/pptp.nix b/pkgs/tools/networking/network-manager/pptp.nix
deleted file mode 100644
index 08f591b117e..00000000000
--- a/pkgs/tools/networking/network-manager/pptp.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ stdenv, fetchurl, networkmanager, pptp, ppp, intltool, pkgconfig
-, libsecret, withGnome ? true, gnome3 }:
-
-stdenv.mkDerivation rec {
-  name    = "${pname}${if withGnome then "-gnome" else ""}-${version}";
-  pname   = "NetworkManager-pptp";
-  major   = "1.2";
-  version = "${major}.4";
-
-  src = fetchurl {
-    url    = "mirror://gnome/sources/${pname}/${major}/${pname}-${version}.tar.xz";
-    sha256 = "bd97ce768c34cce6d5b5d43681149a8300bec754397a3f46a0d8d0aea7030c5e";
-  };
-
-  buildInputs = [ networkmanager pptp ppp libsecret ]
-    ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring
-                                        gnome3.networkmanagerapplet ];
-
-  nativeBuildInputs = [ intltool pkgconfig ];
-
-  postPatch = ''
-    sed -i -e 's%"\(/usr/sbin\|/usr/pkg/sbin\|/usr/local/sbin\)/[^"]*",%%g' ./src/nm-pptp-service.c
-
-    substituteInPlace ./src/nm-pptp-service.c \
-      --replace /sbin/pptp ${pptp}/bin/pptp \
-      --replace /sbin/pppd ${ppp}/bin/pppd
-  '';
-
-  configureFlags =
-    if withGnome then "--with-gnome --with-gtkver=3" else "--without-gnome";
-
-  meta = {
-    description = "PPtP plugin for NetworkManager";
-    inherit (networkmanager.meta) maintainers platforms;
-  };
-}
diff --git a/pkgs/tools/networking/ngrok-2/default.nix b/pkgs/tools/networking/ngrok-2/default.nix
index 031161da4d5..23725fb2d87 100644
--- a/pkgs/tools/networking/ngrok-2/default.nix
+++ b/pkgs/tools/networking/ngrok-2/default.nix
@@ -1,31 +1,38 @@
 { stdenv, fetchurl, unzip }:
 
+with stdenv.lib;
+
 stdenv.mkDerivation rec {
   name = "ngrok-${version}";
   version = "2.2.8";
 
-  src = if stdenv.system == "i686-linux" then fetchurl {
+  src = if stdenv.isLinux && stdenv.isi686 then fetchurl {
     url = "https://bin.equinox.io/c/4VmDzA7iaHb/ngrok-stable-linux-i386.tgz";
     sha256 = "0s5ymlaxrvm13q3mlvfirh74sx60qh56c5sgdma2r7q5qlsq41xg";
-  } else if stdenv.system == "x86_64-linux" then fetchurl {
+  } else if stdenv.isLinux && stdenv.isx86_64 then fetchurl {
     url = "https://bin.equinox.io/c/4VmDzA7iaHb/ngrok-stable-linux-amd64.tgz";
     sha256 = "1mn9iwgy6xzrjihikwc2k2j59igqmph0cwx17qp0ziap9lp5xxad";
+  } else if stdenv.isDarwin then fetchurl {
+    url = "https://bin.equinox.io/c/4VmDzA7iaHb/ngrok-stable-darwin-386.zip";
+    sha256 = "0yfd250b55wcpgqd00rqfaa7a82f35fmybb31q5xwdbgc2i47pbh";
   } else throw "platform ${stdenv.system} not supported!";
 
   sourceRoot = ".";
 
+  nativeBuildInputs = optional stdenv.isDarwin unzip;
+
   installPhase = ''
     install -D ngrok $out/bin/ngrok
   '';
 
-  meta = with stdenv.lib; {
+  meta = {
     description = "ngrok";
     longDescription = ''
       Allows you to expose a web server running on your local machine to the internet.
     '';
     homepage = https://ngrok.com/;
-    license = stdenv.lib.licenses.unfree;
-    platforms = [ "i686-linux" "x86_64-linux" ];
+    license = licenses.unfree;
+    platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
     maintainers = [ maintainers.bobvanderlinden ];
   };
 }
diff --git a/pkgs/tools/networking/nzbget/default.nix b/pkgs/tools/networking/nzbget/default.nix
index d72ee844c0e..ef65444ae33 100644
--- a/pkgs/tools/networking/nzbget/default.nix
+++ b/pkgs/tools/networking/nzbget/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "nzbget-${version}";
-  version = "19.0";
+  version = "19.1";
 
   src = fetchurl {
     url = "http://github.com/nzbget/nzbget/releases/download/v${version}/nzbget-${version}-src.tar.gz";
-    sha256 = "08kgi4zmh4h1pvxh8x4c3ydf9xl2s6ncm579f0wdm2zknvpf0j16";
+    sha256 = "1rjwv555zc2hiagf00k8l1pzav91qglsnqbqkyy3pmn2d8sl5pq6";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/networking/p2p/libtorrent/default.nix b/pkgs/tools/networking/p2p/libtorrent/default.nix
index 87785f50e6f..87cf6d172c0 100644
--- a/pkgs/tools/networking/p2p/libtorrent/default.nix
+++ b/pkgs/tools/networking/p2p/libtorrent/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     homepage = "http://rtorrent.net/downloads/";
     description = "A BitTorrent library written in C++ for *nix, with focus on high performance and good code";
 
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = with maintainers; [ ebzzry codyopel ];
   };
 }
diff --git a/pkgs/tools/networking/p2p/seeks/default.nix b/pkgs/tools/networking/p2p/seeks/default.nix
index cddfb9621dc..f11c0a63b07 100644
--- a/pkgs/tools/networking/p2p/seeks/default.nix
+++ b/pkgs/tools/networking/p2p/seeks/default.nix
@@ -64,5 +64,6 @@ stdenv.mkDerivation {
       stdenv.lib.maintainers.matejc
     ];
     platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+    broken = true; # 2018-04-11
   };
 }
diff --git a/pkgs/tools/networking/ppp/default.nix b/pkgs/tools/networking/ppp/default.nix
index 570e85c3281..96016ee7b4f 100644
--- a/pkgs/tools/networking/ppp/default.nix
+++ b/pkgs/tools/networking/ppp/default.nix
@@ -23,15 +23,30 @@ stdenv.mkDerivation rec {
         url = "https://anonscm.debian.org/git/collab-maint/pkg-ppp.git/plain/debian/patches/rc_mksid-no-buffer-overflow?h=debian/2.4.7-1%2b4";
         sha256 = "1dk00j7bg9nfgskw39fagnwv1xgsmyv0xnkd6n1v5gy0psw0lvqh";
       })
+      (fetchurl {
+        url = "https://anonscm.debian.org/git/collab-maint/pkg-ppp.git/plain/debian/patches/0016-pppoe-include-netinet-in.h-before-linux-in.h.patch";
+        sha256 = "1xnmqn02kc6g5y84xynjwnpv9cvrfn3nyv7h7r8j8xi7qf2aj4q8";
+      })
       ./musl-fix-headers.patch
     ];
 
   buildInputs = [ libpcap ];
 
+  postPatch = ''
+    # strip is not found when cross compiling with seemingly no way to point
+    # make to the right place, fixup phase will correctly strip
+    # everything anyway so we remove it from the Makefiles
+    for file in $(find -name Makefile.linux); do
+      substituteInPlace "$file" --replace '$(INSTALL) -s' '$(INSTALL)'
+    done
+  '';
+
   installPhase = ''
+    runHook preInstall
     mkdir -p $out/bin
     make install
     install -D -m 755 scripts/{pon,poff,plog} $out/bin
+    runHook postInstall
   '';
 
   postFixup = ''
diff --git a/pkgs/tools/networking/ppp/musl-fix-headers.patch b/pkgs/tools/networking/ppp/musl-fix-headers.patch
index d24f6289684..030cc97d157 100644
--- a/pkgs/tools/networking/ppp/musl-fix-headers.patch
+++ b/pkgs/tools/networking/ppp/musl-fix-headers.patch
@@ -89,12 +89,12 @@ index 3d3bf4e..b5f82d3 100644
     use different frame types... sigh... */
  
 diff --git a/pppd/plugins/rp-pppoe/pppoe.h b/pppd/plugins/rp-pppoe/pppoe.h
-index 9ab2eee..4d68147 100644
+index c4aaa6e..70aef85 100644
 --- a/pppd/plugins/rp-pppoe/pppoe.h
 +++ b/pppd/plugins/rp-pppoe/pppoe.h
-@@ -86,18 +86,6 @@ typedef unsigned long UINT32_t;
- 
- #include 
+@@ -88,18 +88,6 @@ typedef unsigned long UINT32_t;
+ #include 
+ #endif
  
 -#ifdef HAVE_NETINET_IF_ETHER_H
 -#include 
@@ -108,9 +108,9 @@ index 9ab2eee..4d68147 100644
 -#endif
 -
 -
- 
  /* Ethernet frame types according to RFC 2516 */
  #define ETH_PPPOE_DISCOVERY 0x8863
+ #define ETH_PPPOE_SESSION   0x8864
 diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c
 index 6d71530..86d224e 100644
 --- a/pppd/sys-linux.c
diff --git a/pkgs/tools/networking/snabb/default.nix b/pkgs/tools/networking/snabb/default.nix
index 46580c0b802..cdf14f5af33 100644
--- a/pkgs/tools/networking/snabb/default.nix
+++ b/pkgs/tools/networking/snabb/default.nix
@@ -1,14 +1,18 @@
-{ stdenv, lib, fetchFromGitHub, bash, makeWrapper, git, mysql, diffutils, which, coreutils, procps, nettools }:
+{ stdenv, fetchFromGitHub, bash, makeWrapper, git, mysql, diffutils, which, coreutils, procps, nettools
+,supportOpenstack ? true
+}:
+
+with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "snabb-${version}";
-  version = "2016.04";
+  version = "2018.01.2";
 
   src = fetchFromGitHub {
     owner = "snabbco";
     repo = "snabb";
     rev = "v${version}";
-    sha256 = "1b5g477zy6cr5d9171xf8zrhhq6wxshg4cn78i5bki572q86kwlx";
+    sha256 = "0n6bjf5g4imy0aql8fa55c0db3w8h944ia1dk10167x5pqvkgdgm";
   };
 
   buildInputs = [ makeWrapper ];
@@ -20,10 +24,14 @@ stdenv.mkDerivation rec {
     for f in $(find src/program/snabbnfv/ -type f); do
       substituteInPlace $f --replace "/bin/bash" "${bash}/bin/bash"
     done
-
+  '' + optionalString supportOpenstack ''
     # We need a way to pass $PATH to the scripts
-    sed -i '2iexport PATH=${stdenv.lib.makeBinPath [ git mysql.client which procps coreutils ]}' src/program/snabbnfv/neutron_sync_master/neutron_sync_master.sh.inc
-    sed -i '2iexport PATH=${stdenv.lib.makeBinPath [ git coreutils diffutils nettools ]}' src/program/snabbnfv/neutron_sync_agent/neutron_sync_agent.sh.inc
+    sed -i '2iexport PATH=${git}/bin:${mysql}/bin:${which}/bin:${procps}/bin:${coreutils}/bin' src/program/snabbnfv/neutron_sync_master/neutron_sync_master.sh.inc
+    sed -i '2iexport PATH=${git}/bin:${coreutils}/bin:${diffutils}/bin:${nettools}/bin' src/program/snabbnfv/neutron_sync_agent/neutron_sync_agent.sh.inc
+  '';
+
+  preBuild = ''
+    make clean
   '';
 
   installPhase = ''
@@ -35,7 +43,7 @@ stdenv.mkDerivation rec {
   # "Fatal error: can't create obj/arch/sse2_c.o: No such file or directory".
   enableParallelBuilding = false;
 
-  meta = with stdenv.lib; {
+  meta =  {
     homepage = https://github.com/SnabbCo/snabbswitch;
     description = "Simple and fast packet networking toolkit";
     longDescription = ''
diff --git a/pkgs/tools/networking/tlspool/configvar-fix.patch b/pkgs/tools/networking/tlspool/configvar-fix.patch
deleted file mode 100644
index 424fef20dcf..00000000000
--- a/pkgs/tools/networking/tlspool/configvar-fix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 8561789ba70ae5d741992b143ee288b8e11a5e2b Mon Sep 17 00:00:00 2001
-From: joachim schiele 
-Date: Wed, 1 Mar 2017 15:15:22 +0100
-Subject: [PATCH] fix to
- https://github.com/arpa2/tlspool/issues/58#issuecomment-283333738
-
----
- tool/Makefile | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/tool/Makefile b/tool/Makefile
-index 9a15012..0f655e9 100644
---- a/tool/Makefile
-+++ b/tool/Makefile
-@@ -38,7 +38,6 @@ pgp11genkey_LIBS = $(P11KIT_LIBS) -lcrypto
- 
- configvar_CFLAGS = $(tlspool_CFLAGS)
- configvar_LDFLAGS = $(tlspool_LDFLAGS)
--configvar_LIBS = $(tlspool_LIBS)
- 
- P11KIT_CFLAGS = $(shell pkg-config --cflags p11-kit-1)
- P11KIT_LIBS   = $(shell pkg-config --libs   p11-kit-1)
-@@ -96,8 +95,8 @@ have_db: have_db.c
- pgp11_genkey: pgp11_genkey.c
- 	gcc -std=gnu11 $(CFLAGS) $(pgp11genkey_CFLAGS) -o "$@" "$<" $(pgp11genkey_LIBS)
- 
--configvar: configvar.c $(configvar_LIBS)
--	gcc -std=gnu11 $(CFLAGS) $(configvar_CFLAGS) $(configvar_LDFLAGS) $(configvar_CFLAGS) -o "$@" "$<" $(configvar_LIBS)
-+configvar: configvar.c
-+	gcc -std=gnu11 $(CFLAGS) $(configvar_CFLAGS) $(configvar_LDFLAGS) $(configvar_CFLAGS) -o "$@" "$<"
- 
- $(tlspool_LIBS):
- 	$(MAKE) -C ../lib `basename $(tlspool_LIBS)`
--- 
-2.12.0
-
diff --git a/pkgs/tools/networking/tlspool/default.nix b/pkgs/tools/networking/tlspool/default.nix
index 02d3f2c2948..b992fef2253 100644
--- a/pkgs/tools/networking/tlspool/default.nix
+++ b/pkgs/tools/networking/tlspool/default.nix
@@ -1,56 +1,51 @@
-{ pkgs, stdenv, fetchFromGitHub, unzip, libtool, pkgconfig, git, p11-kit,
-  libtasn1, db, openldap, libmemcached, cyrus_sasl, openssl, softhsm, bash,
-  python, libkrb5, quickder, unbound, ldns, gnupg, gnutls-kdh,
-  useSystemd ? true, systemd, swig
+{ stdenv, fetchFromGitHub
+, cmake, pkgconfig, arpa2cm
+, openldap, p11-kit, unbound, libtasn1, db, openssl, quickder, libkrb5, ldns, gnutls-kdh
+, softhsm
 }:
 
 let
   pname = "tlspool";
-  version = "20170123";
+  version = "20180227";
 in
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
-  src = fetchFromGitHub { 
+  src = fetchFromGitHub {
     owner = "arpa2";
     repo = "tlspool";
-    rev = "90cfa0758b02849114ba6373f280a4f2d3e534bf";
-    sha256 = "1qyq6da5bsgb8y9f3jhfrnhbvjns4k80lpkrydkvfx83bg494370";
+    rev = "b4459637d71c7602e94d455e23c74f3973b9cf30";
+    sha256 = "0x78f2bdsiglwicwn3injm5ysfjlfa0yzdpnc0r3iw4z0n89rj2r";
   };
 
-  propagatedBuildInputs = [ python softhsm openldap p11-kit.dev p11-kit.out gnupg ];
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ unbound unzip git libtasn1 db libmemcached cyrus_sasl openssl bash quickder
-                  libkrb5 ldns libtool swig pkgs.pythonPackages.pip gnutls-kdh ]
-                ++ stdenv.lib.optional useSystemd systemd;
+  nativeBuildInputs = [
+    cmake pkgconfig arpa2cm
+  ];
 
-  patches = [ ./fixing-rpath.patch ./configvar-fix.patch ];
+  buildInputs = [
+    openldap p11-kit unbound libtasn1 db openssl quickder libkrb5 ldns gnutls-kdh
+  ];
 
   postPatch = ''
+    # CMake is probably confused because the current version isn't 1.2.6, but 1.2-6
+    substituteInPlace CMakeLists.txt \
+      --replace "Quick-DER 1.2.4" "Quick-DER 1.2"
     substituteInPlace etc/tlspool.conf \
       --replace "dnssec_rootkey ../etc/root.key" "dnssec_rootkey $out/etc/root.key" \
       --replace "pkcs11_path /usr/local/lib/softhsm/libsofthsm2.so" "pkcs11_path ${softhsm}/lib/softhsm/libsofthsm2.so"
-    substituteInPlace lib/Makefile \
-      --replace "DESTDIR=\$(DESTDIR) PREFIX=\$(PREFIX)" "DESTDIR=\$(DESTDIR) PREFIX=\$(PREFIX) SWIG=${swig}/bin/swig"
   '';
 
-  buildPhase = ''
-    make clean
-    make DESTDIR=$out PREFIX=/ all
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin $out/lib $out/sbin $out/etc/tlspool/ $out/include/${pname}/pulleyback
-    make DESTDIR=$out PREFIX=/ install
-    cp -R etc/* $out/etc/tlspool/
-    cp include/tlspool/*.h $out/include/${pname}
-    cp pulleyback/*.h $out/include/${pname}/pulleyback/
-    cp src/*.h $out/include/${pname}
+  postInstall = ''
+    mkdir -p $out/include/${pname}/pulleyback $out/etc/tlspool
+    cp -R $src/etc/* $out/etc/tlspool/
+    cp $src/include/tlspool/*.h $out/include/${pname}
+    cp $src/pulleyback/*.h $out/include/${pname}/pulleyback/
+    cp $src/src/*.h $out/include/${pname}
   '';
 
   meta = with stdenv.lib; {
     description = "A supercharged TLS daemon that allows for easy, strong and consistent deployment";
-    license = licenses.bsd2;
+    license = licenses.gpl3;
     homepage = http://www.tlspool.org;
     maintainers = with maintainers; [ leenaars qknight ];
   };
diff --git a/pkgs/tools/networking/tlspool/fixing-rpath.patch b/pkgs/tools/networking/tlspool/fixing-rpath.patch
deleted file mode 100644
index 6a434f3e400..00000000000
--- a/pkgs/tools/networking/tlspool/fixing-rpath.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 8082f050794f771d1afb8e5c3d08862fc633922b Mon Sep 17 00:00:00 2001
-From: joachim schiele 
-Date: Wed, 1 Mar 2017 13:12:19 +0100
-Subject: [PATCH] RPATH is back
- https://github.com/arpa2/tlspool/issues/58#issuecomment-283318767
-
----
- tool/Makefile | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/tool/Makefile b/tool/Makefile
-index c1e6ce9..9a15012 100644
---- a/tool/Makefile
-+++ b/tool/Makefile
-@@ -18,9 +18,17 @@ LIBS =
- 
- PREFIX = /usr/local
- 
-+DIR := ${CURDIR}
-+LIBDIR := ""
-+ifndef DESTDIR
-+       LIBDIR=$(DIR)/../lib/
-+else
-+       LIBDIR=$(DESTDIR)/lib
-+endif
-+
- tlspool_CFLAGS =
- tlspool_LIBS = ../lib/libtlspool.so
--tlspool_LDFLAGS = -L ../lib -ltlspool
-+tlspool_LDFLAGS = -L ../lib -ltlspool -Wl,-rpath,$(LIBDIR)
- 
- donai_CFLAGS = -DDONAI_ONLY_TEXTPROC
- donai_SRC = ../src/donai.c
--- 
-2.11.1
-
diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix
index 6f37e88f4f6..48a3d1591fc 100644
--- a/pkgs/tools/networking/whois/default.nix
+++ b/pkgs/tools/networking/whois/default.nix
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
     for i in Makefile po/Makefile; do
       substituteInPlace $i --replace "prefix = /usr" "prefix = $out"
     done
-
-    substituteInPlace Makefile --replace "DEFS += HAVE_ICONV" "DEFS += HAVE_ICONV\nwhois_LDADD += -liconv"
+  '' + stdenv.lib.optionalString (stdenv.isDarwin || stdenv.hostPlatform.isMusl) ''
+    echo "whois_LDADD += -liconv" >> Makefile
   '';
 
   makeFlags = [ "HAVE_ICONV=1" ];
@@ -39,6 +39,6 @@ stdenv.mkDerivation rec {
     homepage = https://packages.qa.debian.org/w/whois.html;
     license = licenses.gpl2;
     maintainers = with maintainers; [ fpletz ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/tools/package-management/nix-serve/default.nix b/pkgs/tools/package-management/nix-serve/default.nix
index 1e3579b197e..d03e6f614e5 100644
--- a/pkgs/tools/package-management/nix-serve/default.nix
+++ b/pkgs/tools/package-management/nix-serve/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchFromGitHub,
+{ stdenv, fetchFromGitHub, fetchpatch,
   bzip2, nix, perl, perlPackages,
 }:
 
 with stdenv.lib;
 
 let
-  rev = "7e09caa2a7a435aeb2cd5446aa590d6f9ae1699d";
-  sha256 = "0mjzsiknln3isdri9004wwjjjpak5fj8ncizyncf5jv7g4m4q1pj";
+  rev = "e4675e38ab54942e351c7686e40fabec822120b9";
+  sha256 = "1wm24p6pkxl1d7hrvf4ph6mwzawvqi22c60z9xzndn5xfyr4v0yr";
 in
 
 stdenv.mkDerivation rec {
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     inherit rev sha256;
   };
 
-  buildInputs = [ bzip2 perl nix ]
+  buildInputs = [ bzip2 perl nix nix.perl-bindings ]
     ++ (with perlPackages; [ DBI DBDSQLite Plack Starman ]);
 
   dontBuild = true;
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index b634969c8ac..48a419e6e5d 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchurl, fetchFromGitHub, perl, curl, bzip2, sqlite, openssl ? null, xz
-, pkgconfig, boehmgc, perlPackages, libsodium, aws-sdk-cpp, brotli
+, pkgconfig, boehmgc, perlPackages, libsodium, aws-sdk-cpp, brotli, boost
 , autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook5_xsl
 , libseccomp, busybox-sandbox-shell
 , hostPlatform, buildPlatform
@@ -29,16 +29,20 @@ let
 
     buildInputs = [ curl openssl sqlite xz bzip2 ]
       ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
-      ++ lib.optionals fromGit [ brotli ] # Since 1.12
+      ++ lib.optionals is20 [ brotli ] # Since 1.12
       ++ lib.optional (hostPlatform.isSeccomputable) libseccomp
       ++ lib.optional ((stdenv.isLinux || stdenv.isDarwin) && is20)
           (aws-sdk-cpp.override {
             apis = ["s3"];
             customMemoryManagement = false;
-          });
+          })
+      ++ lib.optional fromGit boost;
 
     propagatedBuildInputs = [ boehmgc ];
 
+    # Seems to be required when using std::atomic with 64-bit types
+    NIX_LDFLAGS = lib.optionalString (stdenv.system == "armv6l-linux") "-latomic";
+
     configureFlags =
       [ "--with-store-dir=${storeDir}"
         "--localstatedir=${stateDir}"
@@ -91,16 +95,19 @@ let
     passthru = { inherit fromGit; };
   };
 
-  perl-bindings = { nix }: stdenv.mkDerivation {
+  perl-bindings = { nix, needsBoost ? false }: stdenv.mkDerivation {
     name = "nix-perl-" + nix.version;
 
     inherit (nix) src;
 
     postUnpack = "sourceRoot=$sourceRoot/perl";
 
+    # This is not cross-compile safe, don't have time to fix right now
+    # but noting for future travellers.
     nativeBuildInputs =
       [ perl pkgconfig curl nix libsodium ]
-      ++ lib.optionals nix.fromGit [ autoreconfHook autoconf-archive ];
+      ++ lib.optionals nix.fromGit [ autoreconfHook autoconf-archive ]
+      ++ lib.optional needsBoost boost;
 
     configureFlags =
       [ "--with-dbi=${perlPackages.DBI}/${perl.libPrefix}"
@@ -125,23 +132,26 @@ in rec {
   }) // { perl-bindings = nixStable; };
 
   nixStable = (common rec {
-    name = "nix-2.0";
+    name = "nix-2.0.1";
     src = fetchurl {
       url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
-      sha256 = "7024d327314bf92c1d3e6cccd944929828a44b24093954036bfb0115a92f5a14";
+      sha256 = "689c33b9885b56b7817bf94aad3bc7ccf50710ebb34b01c5a5a2ac4e472750b1";
     };
   }) // { perl-bindings = perl-bindings { nix = nixStable; }; };
 
   nixUnstable = (lib.lowPrio (common rec {
-    name = "nix-2.0${suffix}";
-    suffix = "pre5968_a6c0b773";
+    name = "nix-2.1${suffix}";
+    suffix = "pre6148_a4aac7f";
     src = fetchFromGitHub {
       owner = "NixOS";
       repo = "nix";
-      rev = "a6c0b773b72d4e30690e01f1f1dcffc28f2d9ea1";
-      sha256 = "0i8wcblcjw3291ba6ki4llw3fgm8ylp9q52kajkyr58dih537346";
+      rev = "a4aac7f88c59c97299027c9668461c637bbc6a72";
+      sha256 = "1250fg1rgzcd0qy960nhl2bw9hsc1a6pyz11rmxasr0h3j1a2z53";
     };
     fromGit = true;
-  })) // { perl-bindings = perl-bindings { nix = nixUnstable; }; };
+  })) // { perl-bindings = perl-bindings {
+    nix = nixUnstable;
+    needsBoost = true;
+  }; };
 
 }
diff --git a/pkgs/tools/package-management/nixops/default.nix b/pkgs/tools/package-management/nixops/default.nix
index daecb8746ea..ec82115087b 100644
--- a/pkgs/tools/package-management/nixops/default.nix
+++ b/pkgs/tools/package-management/nixops/default.nix
@@ -1,9 +1,9 @@
 { callPackage, fetchurl }:
 
 callPackage ./generic.nix (rec {
-  version = "1.5.2";
+  version = "1.6";
   src = fetchurl {
     url = "http://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2";
-    sha256 = "00y2arc5rffvy6xmx4p6ibpjyc61k8dkiabq7ccwwjgckz1d2dpb";
+    sha256 = "0f8ql1a9maf9swl8q054b1haxqckdn78p2xgpwl7paxc98l67i7x";
   };
 })
diff --git a/pkgs/tools/package-management/nixops/generic.nix b/pkgs/tools/package-management/nixops/generic.nix
index d9c9661d41a..f392e0f50ed 100644
--- a/pkgs/tools/package-management/nixops/generic.nix
+++ b/pkgs/tools/package-management/nixops/generic.nix
@@ -25,6 +25,7 @@ python2Packages.buildPythonApplication {
       pysqlite
       datadog
       digital-ocean
+      libvirt
     ];
 
   doCheck = false;
diff --git a/pkgs/tools/package-management/nixui/nixui.nix b/pkgs/tools/package-management/nixui/nixui.nix
index ade19b52162..75bc6ec109c 100644
--- a/pkgs/tools/package-management/nixui/nixui.nix
+++ b/pkgs/tools/package-management/nixui/nixui.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.5.1. Do not edit!
+# This file has been generated by node2nix 1.5.3. Do not edit!
 
 {pkgs ? import  {
     inherit system;
@@ -8,6 +8,7 @@ let
   nodeEnv = import ../../../development/node-packages/node-env.nix {
     inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
     inherit nodejs;
+    libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages.nix {
diff --git a/pkgs/tools/package-management/nixui/node-packages.nix b/pkgs/tools/package-management/nixui/node-packages.nix
index 4973223c0ac..b532039ede1 100644
--- a/pkgs/tools/package-management/nixui/node-packages.nix
+++ b/pkgs/tools/package-management/nixui/node-packages.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.5.1. Do not edit!
+# This file has been generated by node2nix 1.5.3. Do not edit!
 
 {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix
index 3a56db1e0d3..a46550d59cd 100644
--- a/pkgs/tools/package-management/rpm/default.nix
+++ b/pkgs/tools/package-management/rpm/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "rpm-${version}";
-  version = "4.14.0";
+  version = "4.14.1";
 
   src = fetchurl {
     url = "http://ftp.rpm.org/releases/rpm-4.14.x/rpm-${version}.tar.bz2";
-    sha256 = "053396glswgszzg6wizn76vc8zc5m2bicw025vj44g0dc1aav806";
+    sha256 = "0fvrjq6jsvbllb5q6blchzh7p5flk61rz34g4g9mp9iwrhn0xx23";
   };
 
   outputs = [ "out" "dev" "man" ];
diff --git a/pkgs/tools/security/apg/default.nix b/pkgs/tools/security/apg/default.nix
index 04b29bcf8f7..db490c7822f 100644
--- a/pkgs/tools/security/apg/default.nix
+++ b/pkgs/tools/security/apg/default.nix
@@ -10,7 +10,10 @@ stdenv.mkDerivation rec {
   '';
   makeFlags = stdenv.lib.optionals stdenv.isDarwin ["CC=cc"];
 
-  patches = [ ./apg.patch ];
+  patches = [
+    ./apg.patch
+    ./phony-install-target.patch
+  ];
 
   postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
     sed -i -e 's|APG_CLIBS += -lcrypt|APG_CLIBS += -L${openssl.out}/lib -lcrypto|' Makefile
@@ -64,6 +67,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.adel.nursat.kz/apg/;
     license = stdenv.lib.licenses.bsd3;
     maintainers = with stdenv.lib.maintainers; [ astsmtl ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/tools/security/apg/phony-install-target.patch b/pkgs/tools/security/apg/phony-install-target.patch
new file mode 100644
index 00000000000..9edf50b4b59
--- /dev/null
+++ b/pkgs/tools/security/apg/phony-install-target.patch
@@ -0,0 +1,11 @@
+diff -ur a/Makefile b/Makefile
+--- a/Makefile	2003-08-08 00:40:39.000000000 +0900
++++ b/Makefile	2018-04-05 22:29:39.284191020 +0900
+@@ -142,6 +142,7 @@
+ 	strip ${CS_PROGNAME}
+ 	strip ${BFM_PROGNAME}
+ 
++.PHONY: install
+ install:
+ 	if test -x ./apg; then \
+ ./mkinstalldirs ${INSTALL_PREFIX}${APG_BIN_DIR}; \
diff --git a/pkgs/tools/security/browserpass/default.nix b/pkgs/tools/security/browserpass/default.nix
index af1bb14d02a..22f13867152 100644
--- a/pkgs/tools/security/browserpass/default.nix
+++ b/pkgs/tools/security/browserpass/default.nix
@@ -1,9 +1,9 @@
 # This file was generated by https://github.com/kamilchm/go2nix v1.2.0
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub, gnupg }:
 
 buildGoPackage rec {
   name = "browserpass-${version}";
-  version = "2.0.11";
+  version = "2.0.17";
 
   goPackagePath = "github.com/dannyvankooten/browserpass";
 
@@ -13,9 +13,14 @@ buildGoPackage rec {
     repo = "browserpass";
     owner = "dannyvankooten";
     rev = version;
-    sha256 = "0d6rpkka27a57nv69yiw71jj3m6axdj5hygsz36dznnn8w76vvyv";
+    sha256 = "1gbhpx75bcacj6z5p4av0011c4chhzqcjjs2bvmfxpi7826hn9kn";
   };
 
+  postPatch = ''
+    substituteInPlace browserpass.go                                           \
+      --replace /usr/local/bin/gpg ${gnupg}/bin/gpg
+  '';
+
   postInstall = ''
       host_file="$bin/bin/browserpass"
       mkdir -p "$bin/etc"
diff --git a/pkgs/tools/security/browserpass/deps.nix b/pkgs/tools/security/browserpass/deps.nix
index 763317aafc7..631463a69d1 100644
--- a/pkgs/tools/security/browserpass/deps.nix
+++ b/pkgs/tools/security/browserpass/deps.nix
@@ -18,6 +18,15 @@
       sha256 = "0rwkdw143kphpmingsrw1zp030zf3p08f64h347jpdm4lz8z5449";
     };
   }
+  {
+    goPackagePath = "github.com/sahilm/fuzzy";
+    fetch = {
+      type = "git";
+      url = "https://github.com/sahilm/fuzzy";
+      rev = "a154b19bb758dcdd6ede58dc11ea53c2950527b2";
+      sha256 = "0jkw6474d5ik2fq2zznqxj4y3p42z47r7mbg856ln5wyara2sg0l";
+    };
+  }
   {
     goPackagePath = "rsc.io/qr";
     fetch = {
diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix
index 976c58eb1e3..8c12e4e30c3 100644
--- a/pkgs/tools/security/clamav/default.nix
+++ b/pkgs/tools/security/clamav/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "clamav-${version}";
-  version = "0.99.3";
+  version = "0.99.4";
 
   src = fetchurl {
     url = "https://www.clamav.net/downloads/production/${name}.tar.gz";
-    sha256 = "114f7qk3h0klgm0zzn2394n5spcn91vjc9mq6m03l2p0ls955yh0";
+    sha256 = "0q94iwi729id9pyc72w6zlllbaz37qvpi6gc51g2x3fy7ckw6anp";
   };
 
   # don't install sample config files into the absolute sysconfdir folder
@@ -21,8 +21,6 @@ stdenv.mkDerivation rec {
     zlib bzip2 libxml2 openssl ncurses curl libiconv libmilter pcre
   ];
 
-  patches = [ ./fd-leak.patch ];
-
   configureFlags = [
     "--sysconfdir=/etc/clamav"
     "--disable-llvm" # enabling breaks the build at the moment
diff --git a/pkgs/tools/security/clamav/fd-leak.patch b/pkgs/tools/security/clamav/fd-leak.patch
deleted file mode 100644
index 2c147901e44..00000000000
--- a/pkgs/tools/security/clamav/fd-leak.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- a/libclamav/scanners.c	2018-01-26 16:59:00.820231425 +0100
-+++ b/libclamav/scanners.c	2018-01-26 17:39:07.523633805 +0100
-@@ -1366,12 +1366,14 @@
- 
- 	if ((ret = cli_ac_initdata(&tmdata, troot?troot->ac_partsigs:0, troot?troot->ac_lsigs:0, troot?troot->ac_reloff_num:0, CLI_DEFAULT_AC_TRACKLEN))) {
- 		free(tmpname);
-+		free(normalized);
- 		return ret;
- 	}
- 
- 	if ((ret = cli_ac_initdata(&gmdata, groot->ac_partsigs, groot->ac_lsigs, groot->ac_reloff_num, CLI_DEFAULT_AC_TRACKLEN))) {
- 		cli_ac_freedata(&tmdata);
- 		free(tmpname);
-+		free(normalized);
- 		return ret;
- 	}
- 
-@@ -1390,6 +1392,7 @@
- 				cli_errmsg("cli_scanscript: can't write to file %s\n",tmpname);
- 				close(ofd);
- 				free(tmpname);
-+				free(normalized);
- 				return CL_EWRITE;
- 			}
- 			text_normalize_reset(&state);
-@@ -1424,6 +1427,8 @@
- 			if (ret) {
- 				cli_ac_freedata(&tmdata);
- 				free(tmpname);
-+				free(normalized);
-+				close(ofd);
- 				return ret;
- 			}
- 		}
-@@ -1466,11 +1471,9 @@
- 
- 	}
- 
--	if(ctx->engine->keeptmp) {
--		free(tmpname);
--		if (ofd >= 0)
--			close(ofd);
--	}
-+	if (ofd >= 0)
-+		close(ofd);
-+	free(tmpname);
- 	free(normalized);
- 
- 	if(ret != CL_VIRUS || SCAN_ALL)  {
diff --git a/pkgs/tools/security/gencfsm/default.nix b/pkgs/tools/security/gencfsm/default.nix
index 7f6f28593d2..3a9c81df234 100644
--- a/pkgs/tools/security/gencfsm/default.nix
+++ b/pkgs/tools/security/gencfsm/default.nix
@@ -35,5 +35,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = [ maintainers.spacefrogg ];
+    broken = true; # 2018-04-10
   };
 }
diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix
index 89fee90364e..8982c915e72 100644
--- a/pkgs/tools/security/gnupg/22.nix
+++ b/pkgs/tools/security/gnupg/22.nix
@@ -15,11 +15,11 @@ assert guiSupport -> pinentry != null;
 stdenv.mkDerivation rec {
   name = "gnupg-${version}";
 
-  version = "2.2.4";
+  version = "2.2.6";
 
   src = fetchurl {
     url = "mirror://gnupg/gnupg/${name}.tar.bz2";
-    sha256 = "1v7j8v2ww1knknbrhw3svfrqkmf9ll58iq0dczbsdpqgg1j3w6j0";
+    sha256 = "110rf476l3cgn52gh9ia5y0y06y2ialq9dqc12jkhnfhl9gqqkg6";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/security/gnupg/fix-libusb-include-path.patch b/pkgs/tools/security/gnupg/fix-libusb-include-path.patch
index 18c4f110738..a5432f8e3d9 100644
--- a/pkgs/tools/security/gnupg/fix-libusb-include-path.patch
+++ b/pkgs/tools/security/gnupg/fix-libusb-include-path.patch
@@ -1,10 +1,11 @@
 --- a/configure
 +++ b/configure
-@@ -8872,7 +8872,7 @@
+@@ -8987,8 +8987,7 @@
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking libusb include dir" >&5
  $as_echo_n "checking libusb include dir... " >&6; }
     usb_incdir_found="no"
--   for _incdir in "" "/usr/include/libusb-1.0" "/usr/local/include/libusb-1.0"; do
+-   for _incdir in "" "/usr/include/libusb-1.0" \
+-       "/usr/local/include/libusb-1.0" "/usr/pkg/include/libusb-1.0"; do
 +   for _incdir in "$($PKG_CONFIG --variable=includedir libusb-1.0)/libusb-1.0"; do
       _libusb_save_cppflags=$CPPFLAGS
       if test -n "${_incdir}"; then
diff --git a/pkgs/tools/security/keybase-gui/default.nix b/pkgs/tools/security/keybase-gui/default.nix
index 53b871306d7..1d50f5498c8 100644
--- a/pkgs/tools/security/keybase-gui/default.nix
+++ b/pkgs/tools/security/keybase-gui/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, buildFHSUserEnv, writeTextFile, alsaLib, atk, cairo, cups
-, dbus, expat, fontconfig, freetype, gcc, gdk_pixbuf, glib, gnome2, gtk2, nspr
-, nss, pango, systemd, xorg, utillinuxMinimal }:
+, dbus, expat, fontconfig, freetype, gcc, gdk_pixbuf, glib, gnome2, gtk2
+, libnotify, nspr, nss, pango, systemd, xorg, utillinuxMinimal }:
 
 let
   libPath = stdenv.lib.makeLibraryPath [
@@ -17,6 +17,7 @@ let
     glib
     gnome2.GConf
     gtk2
+    libnotify
     nspr
     nss
     pango
diff --git a/pkgs/tools/security/masscan/default.nix b/pkgs/tools/security/masscan/default.nix
index 22a452ccabd..26497659d23 100644
--- a/pkgs/tools/security/masscan/default.nix
+++ b/pkgs/tools/security/masscan/default.nix
@@ -11,9 +11,13 @@ stdenv.mkDerivation rec {
     sha256 = "0mjvwh4i0ncsa3ywavw2s55v5bfv7pyga028c8m8xfash9764wwf";
   };
 
-  buildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ makeWrapper ];
 
-  makeFlags = [ "PREFIX=$(out)" "CC=cc" "-j" ];
+  makeFlags = [ "PREFIX=$(out)" "GITVER=${version}" "CC=cc" ];
+
+  preInstall = ''
+    mkdir -p $out/bin
+  '';
 
   postInstall = ''
     mkdir -p $out/share/man/man8
diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix
index 3d31596a43f..a81fffa2035 100644
--- a/pkgs/tools/security/nmap/default.nix
+++ b/pkgs/tools/security/nmap/default.nix
@@ -19,11 +19,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "nmap${optionalString graphicalSupport "-graphical"}-${version}";
-  version = "7.60";
+  version = "7.70";
 
   src = fetchurl {
     url = "https://nmap.org/dist/nmap-${version}.tar.bz2";
-    sha256 = "08bga42ipymmbxd7wy4x5sl26c0ir1fm3n9rc6nqmhx69z66wyd8";
+    sha256 = "063fg8adx23l4irrh5kn57hsmi1xvjkar4vm4k6g94ppan4hcyw4";
   };
 
   patches = ./zenmap.patch;
diff --git a/pkgs/tools/security/notary/default.nix b/pkgs/tools/security/notary/default.nix
index 36685b1d1e4..4a42c9162e1 100644
--- a/pkgs/tools/security/notary/default.nix
+++ b/pkgs/tools/security/notary/default.nix
@@ -2,22 +2,22 @@
 
 buildGoPackage rec {
   name = "notary-${version}";
-  version = "0.5.1";
-  gitcommit = "9211198";
+  version = "0.6.0";
+  gitcommit = "34f53ad";
 
   src = fetchFromGitHub {
     owner = "theupdateframework";
     repo = "notary";
     rev = "v${version}";
-    sha256 = "0z9nsb1mrl0q5j02jkyzbc6xqsm83qzacsckypsxcrijhw935rs5";
+    sha256 = "0lg7ab2agkk3rnladcvpdzk8cnf3m49qfm4sanh7yjvlvlv1wm4a";
   };
 
   buildInputs = [ libtool ];
 
-  goPackagePath = "github.com/docker/notary";
+  goPackagePath = "github.com/theupdateframework/notary";
 
   buildPhase = ''
-    cd go/src/github.com/docker/notary
+    cd go/src/github.com/theupdateframework/notary
     make GITCOMMIT=${gitcommit} GITUNTRACKEDCHANGES= client
   '';
 
diff --git a/pkgs/tools/security/paperkey/default.nix b/pkgs/tools/security/paperkey/default.nix
index eba707b7d07..1c235c9d883 100644
--- a/pkgs/tools/security/paperkey/default.nix
+++ b/pkgs/tools/security/paperkey/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://www.jabberwocky.com/software/paperkey/;
     license = licenses.gpl2;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = with maintainers; [ skeidel ];
   };
 }
diff --git a/pkgs/tools/security/srm/default.nix b/pkgs/tools/security/srm/default.nix
index fd81933fb58..9782d00267f 100644
--- a/pkgs/tools/security/srm/default.nix
+++ b/pkgs/tools/security/srm/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     homepage = http://srm.sourceforge.net;
     license = licenses.mit;
     maintainers = with maintainers; [ edwtjo ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix
index 8674de1fcee..d2c194308e1 100644
--- a/pkgs/tools/security/sshuttle/default.nix
+++ b/pkgs/tools/security/sshuttle/default.nix
@@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec {
     })
   ];
 
-  nativeBuildInputs = [ makeWrapper pandoc python3Packages.setuptools_scm ];
+  nativeBuildInputs = [ makeWrapper python3Packages.setuptools_scm ] ++ stdenv.lib.optional (stdenv.system != "i686-linux") pandoc;
   buildInputs =
     [ coreutils openssh ] ++
     stdenv.lib.optionals stdenv.isLinux [ iptables nettools procps ];
@@ -29,6 +29,10 @@ python3Packages.buildPythonApplication rec {
   # uses Python 3, so it should be fine.
   doCheck = true;
 
+  checkPhase = ''
+    py.test -k "${stdenv.lib.optionalString stdenv.isDarwin "not test_parse_subnetport_ip6"}"
+  '';
+
   postInstall = let
     mapPath = f: x: stdenv.lib.concatStringsSep ":" (map f x);
   in ''
diff --git a/pkgs/tools/security/sslscan/default.nix b/pkgs/tools/security/sslscan/default.nix
index 782341923fa..6c89b0defa6 100644
--- a/pkgs/tools/security/sslscan/default.nix
+++ b/pkgs/tools/security/sslscan/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ openssl ];
 
-  installFlags = [ "PREFIX=$(out)" ];
+  makeFlags = [ "PREFIX=$(out)" "CC=cc" ];
 
   meta = with stdenv.lib; {
     description = "Tests SSL/TLS services and discover supported cipher suites";
diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix
index 992067da50f..974a95bc0fa 100644
--- a/pkgs/tools/system/htop/default.nix
+++ b/pkgs/tools/system/htop/default.nix
@@ -3,11 +3,11 @@ IOKit, python }:
 
 stdenv.mkDerivation rec {
   name = "htop-${version}";
-  version = "2.1.0";
+  version = "2.2.0";
 
   src = fetchurl {
     url = "http://hisham.hm/htop/releases/${version}/${name}.tar.gz";
-    sha256 = "0j07z0xm2gj1vzvbgh4323k4db9mr7drd7gw95mmpqi61ncvwq1j";
+    sha256 = "0mrwpb3cpn3ai7ar33m31yklj64c3pp576vh1naqff6f21pq5mnr";
   };
 
   nativeBuildInputs = [ python ];
diff --git a/pkgs/tools/system/ipmitool/default.nix b/pkgs/tools/system/ipmitool/default.nix
index fe411edfcda..c906ad3c8cf 100644
--- a/pkgs/tools/system/ipmitool/default.nix
+++ b/pkgs/tools/system/ipmitool/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
     description = ''Command-line interface to IPMI-enabled devices'';
     license = licenses.bsd3;
     homepage = https://sourceforge.net/projects/ipmitool/;
-    platforms = platforms.unix;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ fpletz ];
   };
 }
diff --git a/pkgs/tools/system/osquery/default.nix b/pkgs/tools/system/osquery/default.nix
index c06ba8e541b..44d5bcf5f38 100644
--- a/pkgs/tools/system/osquery/default.nix
+++ b/pkgs/tools/system/osquery/default.nix
@@ -75,5 +75,6 @@ stdenv.mkDerivation rec {
     license = licenses.bsd3;
     platforms = platforms.linux;
     maintainers = with maintainers; [ cstrahan ];
+    broken = true; # 2018-04-11
   };
 }
diff --git a/pkgs/tools/system/pcstat/default.nix b/pkgs/tools/system/pcstat/default.nix
new file mode 100644
index 00000000000..cd3c815934f
--- /dev/null
+++ b/pkgs/tools/system/pcstat/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "pcstat-unstable-${version}";
+  version = "2017-05-28";
+
+  goPackagePath = "github.com/tobert/pcstat";
+
+  src = fetchFromGitHub {
+    rev    = "91a7346e5b462a61e876c0574cb1ba331a6a5ac5";
+    owner  = "tobert";
+    repo   = "pcstat";
+    sha256 = "88853e42d16c05e580af4fb8aa815a84ea0fc43e3a25e19c85e649a5f5a2874c";
+  };
+
+  goDeps = ./deps.nix;
+
+  meta = with stdenv.lib; {
+    description = "Page Cache stat: get page cache stats for files on Linux.";
+    homepage = https://github.com/tobert/pcstat;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ aminechikhaoui ];
+  };
+}
diff --git a/pkgs/tools/system/pcstat/deps.nix b/pkgs/tools/system/pcstat/deps.nix
new file mode 100644
index 00000000000..809bde1122f
--- /dev/null
+++ b/pkgs/tools/system/pcstat/deps.nix
@@ -0,0 +1,11 @@
+[
+  {
+    goPackagePath = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev = "d38bf781f16e180a1b2ad82697d2f81d7b7ecfac";
+      sha256 = "0eedd518ab68c6dfd431a41709d9888bbc13ed31ff64d69dcbd947442b3aaa04";
+    };
+  }
+]
diff --git a/pkgs/tools/system/runit/default.nix b/pkgs/tools/system/runit/default.nix
index 7eced697373..aa2f50f2df0 100644
--- a/pkgs/tools/system/runit/default.nix
+++ b/pkgs/tools/system/runit/default.nix
@@ -51,6 +51,6 @@ stdenv.mkDerivation rec {
     license = licenses.bsd3;
     homepage = http://smarden.org/runit;
     maintainers = with maintainers; [ rickynils joachifm ];
-    platforms = platforms.unix;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/tools/system/s6-rc/default.nix b/pkgs/tools/system/s6-rc/default.nix
index 13ce2414abf..ed1da8d450d 100644
--- a/pkgs/tools/system/s6-rc/default.nix
+++ b/pkgs/tools/system/s6-rc/default.nix
@@ -37,7 +37,7 @@ in stdenv.mkDerivation rec {
   meta = {
     homepage = http://skarnet.org/software/s6-rc/;
     description = "A service manager for s6-based systems";
-    platforms = stdenv.lib.platforms.all;
+    platforms = stdenv.lib.platforms.linux;
     license = stdenv.lib.licenses.isc;
     maintainers = with stdenv.lib.maintainers; [ pmahoney ];
   };
diff --git a/pkgs/tools/system/sg3_utils/default.nix b/pkgs/tools/system/sg3_utils/default.nix
index c1c4527d0a0..ca1af7a74e4 100644
--- a/pkgs/tools/system/sg3_utils/default.nix
+++ b/pkgs/tools/system/sg3_utils/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://sg.danny.cz/sg/;
     description = "Utilities that send SCSI commands to devices";
-    platforms = stdenv.lib.platforms.all;
+    platforms = stdenv.lib.platforms.linux;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/text/xml/xmloscopy/default.nix b/pkgs/tools/text/xml/xmloscopy/default.nix
new file mode 100644
index 00000000000..337aa61af13
--- /dev/null
+++ b/pkgs/tools/text/xml/xmloscopy/default.nix
@@ -0,0 +1,52 @@
+{ stdenv, lib, makeWrapper, dev_only_shellcheck ? null,
+fetchFromGitHub,
+
+fzf, coreutils, libxml2, libxslt, jing, findutils, gnugrep, gnused,
+docbook5
+}:
+stdenv.mkDerivation rec {
+  name = "xmloscopy-${version}";
+  version = "v0.1.2";
+
+  buildInputs = [
+    makeWrapper
+    dev_only_shellcheck
+  ];
+
+  spath = lib.makeBinPath [
+    fzf
+    coreutils
+    libxml2
+    libxslt
+    jing
+    findutils
+    gnugrep
+    gnused
+  ];
+
+  src = fetchFromGitHub {
+    owner = "grahamc";
+    repo = "xmloscopy";
+    rev = version;
+    sha256 = "07fcnf1vv0x72lksl1v0frmlh73gca199ldqqbgdjpybjdffz456";
+  };
+
+  installPhase = ''
+    sed -i "s/hard to say/${version}/" ./xmloscopy
+    type -P shellcheck && shellcheck ./xmloscopy
+    chmod +x ./xmloscopy
+    patchShebangs ./xmloscopy
+    mkdir -p $out/bin
+    cp ./xmloscopy $out/bin/
+    wrapProgram $out/bin/xmloscopy \
+      --set RNG "${docbook5}/xml/rng/docbook/docbook.rng" \
+      --set PATH "${spath}"
+  '';
+
+  meta = {
+    description = "wtf is my docbook broken?";
+    homepage = https://github.com/grahamc/xmloscopy;
+    license = stdenv.lib.licenses.mit;
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix
index 9df89a8072a..d5da10b5cd4 100644
--- a/pkgs/tools/typesetting/asciidoc/default.nix
+++ b/pkgs/tools/typesetting/asciidoc/default.nix
@@ -37,6 +37,9 @@
 # backends
 , enableDeckjsBackend ? false
 , enableOdfBackend ? false
+
+# java is problematic on some platforms, where it is unfree
+, enableJava ? true
 }:
 
 assert enableStandardFeatures ->
@@ -55,7 +58,7 @@ assert enableStandardFeatures ->
   docbook_xml_dtd_45 != null &&
   docbook5_xsl != null &&
   docbook_xsl != null &&
-  fop != null &&
+  (fop != null || !enableJava) &&
 # TODO: Package this:
 #  epubcheck != null &&
   gnused != null &&
@@ -63,7 +66,7 @@ assert enableStandardFeatures ->
 
 # filters
 assert enableExtraPlugins || enableDitaaFilter || enableMscgenFilter || enableDiagFilter || enableQrcodeFilter || enableAafigureFilter -> unzip != null;
-assert enableExtraPlugins || enableDitaaFilter -> jre != null;
+assert (enableExtraPlugins && enableJava) || enableDitaaFilter -> jre != null;
 assert enableExtraPlugins || enableMscgenFilter -> mscgen != null;
 assert enableExtraPlugins || enableDiagFilter -> blockdiag != null && seqdiag != null && actdiag != null && nwdiag != null;
 assert enableExtraPlugins || enableMatplotlibFilter -> matplotlib != null && numpy != null;
@@ -73,7 +76,7 @@ assert enableExtraPlugins || enableDeckjsBackend || enableOdfBackend -> unzip !=
 
 let
 
-  _enableDitaaFilter = enableExtraPlugins || enableDitaaFilter;
+  _enableDitaaFilter = (enableExtraPlugins && enableJava) || enableDitaaFilter;
   _enableMscgenFilter = enableExtraPlugins || enableMscgenFilter;
   _enableDiagFilter = enableExtraPlugins || enableDiagFilter;
   _enableQrcodeFilter = enableExtraPlugins || enableQrcodeFilter;
@@ -239,7 +242,7 @@ stdenv.mkDerivation rec {
         -e "s|^ASCIIDOC =.*|ASCIIDOC = '$out/bin/asciidoc'|" \
         -e "s|^XSLTPROC =.*|XSLTPROC = '${libxslt.bin}/bin/xsltproc'|" \
         -e "s|^DBLATEX =.*|DBLATEX = '${dblatexFull}/bin/dblatex'|" \
-        -e "s|^FOP =.*|FOP = '${fop}/bin/fop'|" \
+        ${optionalString enableJava ''-e "s|^FOP =.*|FOP = '${fop}/bin/fop'|"''} \
         -e "s|^W3M =.*|W3M = '${w3m}/bin/w3m'|" \
         -e "s|^LYNX =.*|LYNX = '${lynx}/bin/lynx'|" \
         -e "s|^XMLLINT =.*|XMLLINT = '${libxml2.bin}/bin/xmllint'|" \
diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix
index ad612fa18af..f3f0a60b480 100644
--- a/pkgs/tools/typesetting/tectonic/default.nix
+++ b/pkgs/tools/typesetting/tectonic/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, rustPlatform, makeWrapper
-, fontconfig, harfbuzz-icu, openssl, pkgconfig }:
+, darwin, fontconfig, harfbuzz-icu, openssl, pkgconfig }:
 
 rustPlatform.buildRustPackage rec {
   name = "tectonic-${version}";
@@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ pkgconfig ];
 
-  buildInputs = [ fontconfig harfbuzz-icu openssl ];
+  buildInputs = [ fontconfig harfbuzz-icu openssl ]
+    ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Cocoa Foundation ]);
 
   # tests fail due to read-only nix store
   doCheck = false;
diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix
index f022ccb829a..921fc877c6c 100644
--- a/pkgs/tools/typesetting/tex/texlive/bin.nix
+++ b/pkgs/tools/typesetting/tex/texlive/bin.nix
@@ -168,7 +168,7 @@ core-big = stdenv.mkDerivation { #TODO: upmendex
         # http://tex.stackexchange.com/questions/97999/when-to-use-luajittex-in-favour-of-luatex
       ];
 
-  patches = [ ./luatex-gcc7.patch ];
+  patches = (common.patches or []) ++ [ ./luatex-gcc7.patch ];
 
   configureScript = ":";
 
diff --git a/pkgs/tools/virtualization/nixos-container/nixos-container.pl b/pkgs/tools/virtualization/nixos-container/nixos-container.pl
index fefdcd614a5..2cb723a7b71 100755
--- a/pkgs/tools/virtualization/nixos-container/nixos-container.pl
+++ b/pkgs/tools/virtualization/nixos-container/nixos-container.pl
@@ -7,6 +7,7 @@ use File::Slurp;
 use Fcntl ':flock';
 use Getopt::Long qw(:config gnu_getopt);
 use Cwd 'abs_path';
+use Time::HiRes;
 
 my $nsenter = "@utillinux@/bin/nsenter";
 my $su = "@su@";
@@ -214,21 +215,6 @@ if (!-e $confFile) {
     die "$0: container ‘$containerName’ does not exist\n" ;
 }
 
-sub isContainerRunning {
-    my $status = `systemctl show 'container\@$containerName'`;
-    return $status =~ /ActiveState=active/;
-}
-
-sub terminateContainer {
-    system("machinectl", "terminate", $containerName) == 0
-        or die "$0: failed to terminate container\n";
-}
-
-sub stopContainer {
-    system("systemctl", "stop", "container\@$containerName") == 0
-        or die "$0: failed to stop container\n";
-}
-
 # Return the PID of the init process of the container.
 sub getLeader {
     my $s = `machinectl show "$containerName" -p Leader`;
@@ -237,6 +223,30 @@ sub getLeader {
     return int($1);
 }
 
+sub isContainerRunning {
+    my $status = `systemctl show 'container\@$containerName'`;
+    return $status =~ /ActiveState=active/;
+}
+
+sub terminateContainer {
+    my $leader = getLeader;
+    system("machinectl", "terminate", $containerName) == 0
+        or die "$0: failed to terminate container\n";
+    # Wait for the leader process to exit
+    # TODO: As for any use of PIDs for process control where the process is
+    #       not a direct child of ours, this can go wrong when the pid gets
+    #       recycled after a PID overflow.
+    #       Relying entirely on some form of UUID provided by machinectl
+    #       instead of PIDs would remove this risk.
+    #       See https://github.com/NixOS/nixpkgs/pull/32992#discussion_r158586048
+    while ( kill 0, $leader ) { Time::HiRes::sleep(0.1) }
+}
+
+sub stopContainer {
+    system("systemctl", "stop", "container\@$containerName") == 0
+        or die "$0: failed to stop container\n";
+}
+
 # Run a command in the container.
 sub runInContainer {
     my @args = @_;
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index f00544c907b..cbb67152b62 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -60,7 +60,6 @@ mapAliases (rec {
   digikam5 = digikam; # added 2017-02-18
   double_conversion = double-conversion; # 2017-11-22
   dwarf_fortress = dwarf-fortress; # added 2016-01-23
-  dwbWrapper = dwb; # added 2015-01
   enblendenfuse = enblend-enfuse; # 2015-09-30
   evolution_data_server = evolution-data-server; # added 2018-02-25
   exfat-utils = exfat;                  # 2015-09-11
@@ -149,7 +148,6 @@ mapAliases (rec {
   networkmanager_l2tp = networkmanager-l2tp; # added 2018-02-25
   networkmanager_openconnect = networkmanager-openconnect; # added 2018-02-25
   networkmanager_openvpn = networkmanager-openvpn; # added 2018-02-25
-  networkmanager_pptp = networkmanager-pptp; # added 2018-02-25
   networkmanager_vpnc = networkmanager-vpnc; # added 2018-02-25
   nmap_graphical = nmap-graphical;  # added 2017-01-19
   nfsUtils = nfs-utils;  # added 2014-12-06
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d38f8d20188..5a94d9e7a8d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -676,6 +676,10 @@ with pkgs;
 
   reattach-to-user-namespace = callPackage ../os-specific/darwin/reattach-to-user-namespace {};
 
+  skhd = callPackage ../os-specific/darwin/skhd {
+    inherit (darwin.apple_sdk.frameworks) Carbon;
+  };
+
   qes = callPackage ../os-specific/darwin/qes {
     inherit (darwin.apple_sdk.frameworks) Carbon;
   };
@@ -1220,6 +1224,8 @@ with pkgs;
 
   gixy = callPackage ../tools/admin/gixy { };
 
+  gllvm = callPackage ../development/tools/gllvm { };
+
   glide = callPackage ../development/tools/glide { };
 
   glock = callPackage ../development/tools/glock { };
@@ -1272,6 +1278,8 @@ with pkgs;
 
   kisslicer = callPackage ../tools/misc/kisslicer { };
 
+  klaus = callPackage ../servers/web-apps/klaus { };
+
   lcdproc = callPackage ../servers/monitoring/lcdproc { };
 
   languagetool = callPackage ../tools/text/languagetool {  };
@@ -1288,7 +1296,9 @@ with pkgs;
 
   mathics = pythonPackages.mathics;
 
-  masscan = callPackage ../tools/security/masscan { };
+  masscan = callPackage ../tools/security/masscan {
+    stdenv = gccStdenv;
+  };
 
   massren = callPackage ../tools/misc/massren { };
 
@@ -1308,6 +1318,8 @@ with pkgs;
 
   nfdump = callPackage ../tools/networking/nfdump { };
 
+  noteshrink = callPackage ../tools/misc/noteshrink { };
+
   nrsc5 = callPackage ../applications/misc/nrsc5 { };
 
   onboard = callPackage ../applications/misc/onboard { };
@@ -1581,9 +1593,8 @@ with pkgs;
 
   ciopfs = callPackage ../tools/filesystems/ciopfs { };
 
-  # Use Citrix Receiver 13.4.0 below if you get "A network error occured (SSL error 4)"
-  # See https://discussions.citrix.com/topic/385459-ssl-error-with-135-works-with-134/?p=1977735
-  citrix_receiver        = hiPrio citrix_receiver_13_8_0;
+  citrix_receiver        = hiPrio citrix_receiver_13_9_0;
+  citrix_receiver_13_9_0 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.9.0"; };
   citrix_receiver_13_8_0 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.8.0"; };
   citrix_receiver_13_7_0 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.7.0"; };
   citrix_receiver_13_6_0 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.6.0"; };
@@ -2077,8 +2088,8 @@ with pkgs;
   evemu = callPackage ../tools/system/evemu { };
 
   # The latest version used by elasticsearch, logstash, kibana and the the beats from elastic.
-  elk5Version = "5.6.6";
-  elk6Version = "6.1.2";
+  elk5Version = "5.6.9";
+  elk6Version = "6.2.4";
 
   elasticsearch = callPackage ../servers/search/elasticsearch { };
   elasticsearch2 = callPackage ../servers/search/elasticsearch/2.x.nix { };
@@ -2446,6 +2457,8 @@ with pkgs;
 
   git-series = callPackage ../development/tools/git-series { };
 
+  git-sizer = callPackage ../applications/version-management/git-sizer { };
+
   git-up = callPackage ../applications/version-management/git-up { };
 
   gitfs = callPackage ../tools/filesystems/gitfs { };
@@ -2538,6 +2551,7 @@ with pkgs;
   gocryptfs = callPackage ../tools/filesystems/gocrypfs { };
 
   godot = callPackage ../development/tools/godot {};
+  godot_headers = callPackage ../development/libraries/godot_headers {};
 
   goklp = callPackage ../tools/networking/goklp {};
 
@@ -2599,17 +2613,13 @@ with pkgs;
    * that do want 2.32 but not 2.0 or 2.36. Please give a day's notice for
    * objections before removal. The feature is libgraph.
    */
-  graphviz_2_32 = callPackage ../tools/graphics/graphviz/2.32.nix {
+  graphviz_2_32 = lib.overrideDerivation (callPackage ../tools/graphics/graphviz/2.32.nix {
     inherit (darwin.apple_sdk.frameworks) ApplicationServices;
-  };
+  }) (x: { configureFlags = x.configureFlags ++ ["--with-cgraph=no"];});
 
   grin = callPackage ../tools/text/grin { };
   ripgrep = callPackage ../tools/text/ripgrep { };
 
-  grive = callPackage ../tools/filesystems/grive {
-    json_c = json-c-0-11; # won't configure with 0.12; others are vulnerable
-  };
-
   grive2 = callPackage ../tools/filesystems/grive2 { };
 
   groff = callPackage ../tools/text/groff {
@@ -2661,9 +2671,7 @@ with pkgs;
 
   sbsigntool = callPackage ../tools/security/sbsigntool { };
 
-  gsmartcontrol = callPackage ../tools/misc/gsmartcontrol {
-    inherit (gnome2) libglademm;
-  };
+  gsmartcontrol = callPackage ../tools/misc/gsmartcontrol { };
 
   gssdp = callPackage ../development/libraries/gssdp {
     inherit (gnome2) libsoup;
@@ -3794,8 +3802,6 @@ with pkgs;
 
   networkmanager-openvpn = callPackage ../tools/networking/network-manager/openvpn.nix { };
 
-  networkmanager-pptp = callPackage ../tools/networking/network-manager/pptp.nix { };
-
   networkmanager-l2tp = callPackage ../tools/networking/network-manager/l2tp.nix { };
 
   networkmanager-vpnc = callPackage ../tools/networking/network-manager/vpnc.nix { };
@@ -3810,8 +3816,6 @@ with pkgs;
 
   networkmanager_dmenu = callPackage ../tools/networking/networkmanager_dmenu  { };
 
-  newsbeuter = callPackage ../applications/networking/feedreaders/newsbeuter { };
-
   newsboat = callPackage ../applications/networking/feedreaders/newsboat { };
 
   nextcloud = callPackage ../servers/nextcloud { };
@@ -4046,6 +4050,8 @@ with pkgs;
 
   otpw = callPackage ../os-specific/linux/otpw { };
 
+  overmind = callPackage ../applications/misc/overmind { };
+
   owncloud = owncloud70;
 
   inherit (callPackages ../servers/owncloud { })
@@ -4878,6 +4884,8 @@ with pkgs;
 
   ssss = callPackage ../tools/security/ssss { };
 
+  stabber = callPackage ../misc/stabber { };
+
   stress = callPackage ../tools/system/stress { };
 
   stress-ng = callPackage ../tools/system/stress-ng { };
@@ -5147,7 +5155,9 @@ with pkgs;
 
   udptunnel = callPackage ../tools/networking/udptunnel { };
 
-  ufraw = callPackage ../applications/graphics/ufraw { };
+  ufraw = callPackage ../applications/graphics/ufraw {
+    stdenv = overrideCC stdenv gcc6; # doesn't build with gcc7
+  };
 
   uget = callPackage ../tools/networking/uget { };
 
@@ -5506,7 +5516,7 @@ with pkgs;
 
   wv2 = callPackage ../tools/misc/wv2 { };
 
-  inherit (ocamlPackages) wyrd;
+  wyrd = callPackage ../tools/misc/wyrd { };
 
   x86info = callPackage ../os-specific/linux/x86info { };
 
@@ -5566,6 +5576,8 @@ with pkgs;
 
   xmlroff = callPackage ../tools/typesetting/xmlroff { };
 
+  xmloscopy = callPackage ../tools/text/xml/xmloscopy { };
+
   xmlstarlet = callPackage ../tools/text/xml/xmlstarlet { };
 
   xmlto = callPackage ../tools/typesetting/xmlto {
@@ -5586,7 +5598,9 @@ with pkgs;
 
   xsv = callPackage ../tools/text/xsv { };
 
-  xtreemfs = callPackage ../tools/filesystems/xtreemfs {};
+  xtreemfs = callPackage ../tools/filesystems/xtreemfs {
+    boost = boost165;
+  };
 
   xurls = callPackage ../tools/text/xurls {};
 
@@ -5744,7 +5758,8 @@ with pkgs;
   avra = callPackage ../development/compilers/avra { };
 
   avian = callPackage ../development/compilers/avian {
-    stdenv = overrideCC stdenv gcc49;
+    inherit (darwin.apple_sdk.frameworks) CoreServices Foundation;
+    stdenv = if stdenv.cc.isGNU then overrideCC stdenv gcc49 else stdenv;
   };
 
   bigloo = callPackage ../development/compilers/bigloo { };
@@ -5769,7 +5784,9 @@ with pkgs;
     chickenEggs = callPackage ../development/tools/egg2nix/chicken-eggs.nix { };
   };
 
-  ccl = callPackage ../development/compilers/ccl { };
+  ccl = callPackage ../development/compilers/ccl {
+    inherit (darwin) bootstrap_cmds;
+  };
 
   chez = callPackage ../development/compilers/chez {
     inherit (darwin) cctools;
@@ -5789,6 +5806,7 @@ with pkgs;
     };
   };
 
+  clang_6  = llvmPackages_6.clang;
   clang_5  = llvmPackages_5.clang;
   clang_4  = llvmPackages_4.clang;
   clang_39 = llvmPackages_39.clang;
@@ -6345,6 +6363,12 @@ with pkgs;
         inherit (gnome2) GConf gnome_vfs;
       };
 
+  openjdk10 =
+      callPackage ../development/compilers/openjdk/10.nix {
+        bootjdk = openjdk9;
+        inherit (gnome2) GConf gnome_vfs;
+      };
+
   openjdk = openjdk8;
 
   jdk7 = openjdk7 // { outputs = [ "out" ]; };
@@ -6380,6 +6404,20 @@ with pkgs;
         (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; }
           ((openjdk9.override { minimal = true; }).jre // { outputs = [ "jre" ]; }));
 
+  jdk10 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejdk10 else openjdk10 // { outputs = [ "out" ]; };
+  jre10 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejre10 else lib.setName "openjre-${lib.getVersion pkgs.openjdk10.jre}"
+    (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; }
+      (openjdk10.jre // { outputs = [ "jre" ]; }));
+  jre10_headless =
+    if stdenv.isAarch32 || stdenv.isAarch64 then
+      oraclejre10
+    else if stdenv.isDarwin then
+      jre10
+    else
+      lib.setName "openjre-${lib.getVersion pkgs.openjdk10.jre}-headless"
+        (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; }
+          ((openjdk10.override { minimal = true; }).jre // { outputs = [ "jre" ]; }));
+
   jdk = jdk8;
   jre = jre8;
   jre_headless = jre8_headless;
@@ -6474,13 +6512,16 @@ with pkgs;
   lld = llvmPackages.lld;
   lld_4 = llvmPackages_4.lld;
   lld_5 = llvmPackages_5.lld;
+  lld_6 = llvmPackages_6.lld;
 
   lldb = llvmPackages.lldb;
   lldb_4 = llvmPackages_4.lldb;
   lldb_5 = llvmPackages_5.lldb;
+  lldb_6 = llvmPackages_6.lldb;
 
   llvm = llvmPackages.llvm;
 
+  llvm_6  = llvmPackages_6.llvm;
   llvm_5  = llvmPackages_5.llvm;
   llvm_4  = llvmPackages_4.llvm;
   llvm_39 = llvmPackages_39.llvm;
@@ -6544,6 +6585,12 @@ with pkgs;
     stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4'
   });
 
+  llvmPackages_6 = callPackage ../development/compilers/llvm/6 ({
+    inherit (stdenvAdapters) overrideCC;
+  } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
+    stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4'
+  });
+
   manticore = callPackage ../development/compilers/manticore { };
 
   mentorToolchains = recurseIntoAttrs (
@@ -6842,8 +6889,7 @@ with pkgs;
   z88dk = callPackage ../development/compilers/z88dk { };
 
   zulu8 = callPackage ../development/compilers/zulu/8.nix { };
-  zulu9 = callPackage ../development/compilers/zulu { };
-  zulu = zulu9;
+  zulu = callPackage ../development/compilers/zulu { };
 
   ### DEVELOPMENT / INTERPRETERS
 
@@ -7154,6 +7200,8 @@ with pkgs;
     pythonPackages = python3Packages;
   };
 
+  setupcfg2nix = python3Packages.callPackage ../development/tools/setupcfg2nix {};
+
   # These pyside tools do not provide any Python modules and are meant to be here.
   # See ../development/python-modules/pyside/default.nix for details.
   pysideApiextractor = callPackage ../development/python-modules/pyside/apiextractor.nix { };
@@ -7355,6 +7403,8 @@ with pkgs;
   ansible  = ansible_2_4;
   ansible2 = ansible_2_4;
 
+  ansible-lint = callPackage ../development/tools/ansible-lint {};
+
   antlr = callPackage ../development/tools/parsing/antlr/2.7.7.nix { };
 
   antlr3_4 = callPackage ../development/tools/parsing/antlr/3.4.nix { };
@@ -7459,7 +7509,9 @@ with pkgs;
   bison3 = callPackage ../development/tools/parsing/bison/3.x.nix { };
   bison = bison3;
 
-  blackmagic = callPackage ../development/tools/misc/blackmagic { };
+  blackmagic = callPackage ../development/tools/misc/blackmagic {
+    stdenv = overrideCC stdenv gcc6;
+  };
 
   bloaty = callPackage ../development/tools/bloaty { };
 
@@ -7544,7 +7596,9 @@ with pkgs;
 
   cl-launch = callPackage ../development/tools/misc/cl-launch {};
 
-  cloudfoundry-cli = callPackage ../development/tools/cloudfoundry-cli { };
+  cloudfoundry-cli = callPackage ../development/tools/cloudfoundry-cli {
+    go = go_1_9;
+  };
 
   coan = callPackage ../development/tools/analysis/coan { };
 
@@ -7552,7 +7606,7 @@ with pkgs;
 
   complexity = callPackage ../development/tools/misc/complexity { };
 
-  conan = pythonPackages.callPackage ../development/tools/build-managers/conan { };
+  conan = callPackage ../development/tools/build-managers/conan { };
 
   cookiecutter = pythonPackages.cookiecutter;
 
@@ -7768,8 +7822,8 @@ with pkgs;
   gnumake42 = callPackage ../development/tools/build-managers/gnumake/4.2 { };
   gnumake = if hostPlatform.isRiscV # Technically this check should be for glibc version.
     then gnumake42HEAD
-  else gnumake42;
-  gnumake42HEAD = callPackage ../development/tools/build-managers/gnumake/4.2/head.nix { };
+    else gnumake42;
+  gnumake42HEAD = lowPrio (callPackage ../development/tools/build-managers/gnumake/4.2/head.nix { });
 
   gnustep = recurseIntoAttrs (callPackage ../desktops/gnustep {});
 
@@ -8163,7 +8217,9 @@ with pkgs;
 
   swfmill = callPackage ../tools/video/swfmill { };
 
-  swftools = callPackage ../tools/video/swftools { };
+  swftools = callPackage ../tools/video/swftools {
+    stdenv = gccStdenv;
+  };
 
   tcptrack = callPackage ../development/tools/misc/tcptrack { };
 
@@ -8425,7 +8481,9 @@ with pkgs;
 
   cdk = callPackage ../development/libraries/cdk {};
 
-  cdo = callPackage ../development/libraries/cdo {};
+  cdo = callPackage ../development/libraries/cdo {
+    stdenv = gccStdenv;
+  };
 
   cimg = callPackage  ../development/libraries/cimg { };
 
@@ -8656,7 +8714,9 @@ with pkgs;
     inherit (pkgs.gnome2) gtkglext;
   };
 
-  far2l = callPackage ../applications/misc/far2l { };
+  far2l = callPackage ../applications/misc/far2l {
+    stdenv = if stdenv.cc.isClang then llvmPackages_4.stdenv else stdenv;
+  };
 
   farbfeld = callPackage ../development/libraries/farbfeld { };
 
@@ -9364,7 +9424,6 @@ with pkgs;
 
   json-glib = callPackage ../development/libraries/json-glib { };
 
-  json-c-0-11 = callPackage ../development/libraries/json-c/0.11.nix { }; # vulnerable
   json_c = callPackage ../development/libraries/json-c { };
 
   jsoncpp = callPackage ../development/libraries/jsoncpp { };
@@ -9531,8 +9590,13 @@ with pkgs;
 
   libcddb = callPackage ../development/libraries/libcddb { };
 
-  libcdio = callPackage ../development/libraries/libcdio { };
-  libcdio-paranoia = callPackage ../development/libraries/libcdio-paranoia { };
+  libcdio = callPackage ../development/libraries/libcdio {
+    inherit (darwin.apple_sdk.frameworks) Carbon IOKit;
+  };
+
+  libcdio-paranoia = callPackage ../development/libraries/libcdio-paranoia {
+    inherit (darwin.apple_sdk.frameworks) DiskArbitration IOKit;
+  };
 
   libcdr = callPackage ../development/libraries/libcdr { lcms = lcms2; };
 
@@ -9889,7 +9953,9 @@ with pkgs;
 
   libplist = callPackage ../development/libraries/libplist { };
 
-  libqglviewer = callPackage ../development/libraries/libqglviewer { };
+  libqglviewer = callPackage ../development/libraries/libqglviewer {
+    inherit (darwin.apple_sdk.frameworks) AGL;
+  };
 
   libre = callPackage ../development/libraries/libre {};
   librem = callPackage ../development/libraries/librem {};
@@ -10281,6 +10347,9 @@ with pkgs;
   libva-full = libva.override { minimal = false; };
   libva-utils = callPackage ../development/libraries/libva-utils { };
 
+  libva1 = callPackage ../development/libraries/libva/1.0.0.nix { };
+  libva1-full = libva1.override { minimal = false; };
+
   libvdpau = callPackage ../development/libraries/libvdpau { };
 
   libvdpau-va-gl = callPackage ../development/libraries/libvdpau-va-gl {
@@ -10445,7 +10514,7 @@ with pkgs;
   ## libGL/libGLU/Mesa stuff
 
   # Default libGL implementation, should provide headers and libGL.so/libEGL.so/... to link agains them
-  # Default implementation is `mesa`, but can be eventually replaced with `libglvnd`, 
+  # Default implementation is `mesa`, but can be eventually replaced with `libglvnd`,
   # or other runtime dispatcher
   libGL = mesa_noglu;
 
@@ -10616,6 +10685,10 @@ with pkgs;
 
   nix-plugins = callPackage ../development/libraries/nix-plugins { };
 
+  nix-plugins_4 = callPackage ../development/libraries/nix-plugins/4.nix {
+    nix = nixUnstable;
+  };
+
   nlohmann_json = callPackage ../development/libraries/nlohmann_json { };
 
   nntp-proxy = callPackage ../applications/networking/nntp-proxy { };
@@ -10716,6 +10789,7 @@ with pkgs;
 
   opal = callPackage ../development/libraries/opal {
     ffmpeg = ffmpeg_2;
+    stdenv = overrideCC stdenv gcc6;
   };
 
   openh264 = callPackage ../development/libraries/openh264 { };
@@ -10897,8 +10971,10 @@ with pkgs;
   postgis = callPackage ../development/libraries/postgis { };
   postgis_2_3 = callPackage ../development/libraries/postgis/2.3.nix { };
 
-  protobuf = callPackage ../development/libraries/protobuf/3.4.nix { };
+  protobuf = protobuf3_4;
 
+  protobuf3_5 = callPackage ../development/libraries/protobuf/3.5.nix { };
+  protobuf3_4 = callPackage ../development/libraries/protobuf/3.4.nix { };
   protobuf3_1 = callPackage ../development/libraries/protobuf/3.1.nix { };
   protobuf2_5 = callPackage ../development/libraries/protobuf/2.5.nix { };
 
@@ -11591,11 +11667,14 @@ with pkgs;
     inherit (python2Packages) python;
   };
 
-  v8 = callPackage ../development/libraries/v8 {
+  v8 = callPackage ../development/libraries/v8 ({
     inherit (python2Packages) python gyp;
     cctools = darwin.cctools;
     icu = icu58; # v8-5.4.232 fails against icu4c-59.1
-  };
+  } // lib.optionalAttrs stdenv.isLinux {
+    # doesn't build with gcc7
+    stdenv = overrideCC stdenv gcc6;
+  });
 
   v8_static = lowPrio (self.v8.override { static = true; });
 
@@ -11645,6 +11724,7 @@ with pkgs;
 
   vxl = callPackage ../development/libraries/vxl {
     libpng = libpng12;
+    stdenv = overrideCC stdenv gcc6; # upstream code incompatible with gcc7
   };
 
   wavpack = callPackage ../development/libraries/wavpack {
@@ -11665,7 +11745,7 @@ with pkgs;
 
   wcslib = callPackage ../development/libraries/wcslib { };
 
-  webkitgtk = webkitgtk218x;
+  webkitgtk = webkitgtk220x;
 
   webkitgtk24x-gtk3 = callPackage ../development/libraries/webkitgtk/2.4.nix {
     harfbuzz = harfbuzz-icu-58;
@@ -11673,7 +11753,7 @@ with pkgs;
     inherit (darwin) libobjc;
   };
 
-  webkitgtk218x = callPackage ../development/libraries/webkitgtk/2.18.nix {
+  webkitgtk220x = callPackage ../development/libraries/webkitgtk/2.20.nix {
     harfbuzz = harfbuzz-icu;
     inherit (gst_all_1) gst-plugins-base gst-plugins-bad;
     stdenv = overrideCC stdenv gcc6;
@@ -11841,7 +11921,9 @@ with pkgs;
     czmq = czmq3;
   };
 
-  zig = callPackage ../development/compilers/zig {};
+  zig = callPackage ../development/compilers/zig {
+    llvmPackages = llvmPackages_6;
+  };
 
   zimlib = callPackage ../development/libraries/zimlib { };
 
@@ -12203,8 +12285,9 @@ with pkgs;
   hyp = callPackage ../servers/http/hyp/default.nix { };
 
   prosody = callPackage ../servers/xmpp/prosody {
-    lua5 = lua5_1;
-    inherit (lua51Packages) luasocket luasec luaexpat luafilesystem luabitop luaevent luazlib luadbi;
+    # _compat can probably be removed on next minor version after 0.10.0
+    lua5 = lua5_2_compat;
+    inherit (lua52Packages) luasocket luasec luaexpat luafilesystem luabitop luaevent luadbi;
   };
 
   biboumi = callPackage ../servers/xmpp/biboumi { };
@@ -12278,7 +12361,9 @@ with pkgs;
   knot-dns = callPackage ../servers/dns/knot-dns { };
   knot-resolver = callPackage ../servers/dns/knot-resolver {
     # TODO: vimNox after it gets fixed on Darwin or something lighter
-    hexdump = if stdenv.isLinux then utillinux.bin else vim/*xxd*/;
+    hexdump = if stdenv.isLinux then utillinux.bin
+              else if stdenv.isDarwin then darwin.shell_cmds
+              else vim/*xxd*/;
   };
 
   rdkafka = callPackage ../development/libraries/rdkafka { };
@@ -12371,7 +12456,6 @@ with pkgs;
   oauth2_proxy = callPackage ../servers/oauth2_proxy { };
 
   openafs = callPackage ../servers/openafs { tsmbac = null; ncurses = null; };
-  openpts = callPackage ../servers/openpts { };
 
   openresty = callPackage ../servers/http/openresty { };
 
@@ -12520,9 +12604,9 @@ with pkgs;
 
   qboot = callPackage ../applications/virtualization/qboot { stdenv = stdenv_32bit; };
 
-  OVMF = callPackage ../applications/virtualization/OVMF { seabios=false; openssl=null; };
-  OVMF-CSM = callPackage ../applications/virtualization/OVMF { openssl=null; };
-  #WIP: OVMF-secureBoot = callPackage ../applications/virtualization/OVMF { seabios=false; secureBoot=true; };
+  OVMF = callPackage ../applications/virtualization/OVMF { seabios = null; openssl = null; };
+  OVMF-CSM = callPackage ../applications/virtualization/OVMF { openssl = null; };
+  #WIP: OVMF-secureBoot = callPackage ../applications/virtualization/OVMF { seabios = null; secureBoot = true; };
 
   seabios = callPackage ../applications/virtualization/seabios { };
 
@@ -12588,6 +12672,7 @@ with pkgs;
 
   qpid-cpp = callPackage ../servers/amqp/qpid-cpp {
     boost = boost155;
+    inherit (pythonPackages) buildPythonPackage qpid-python;
   };
 
   quagga = callPackage ../servers/quagga { };
@@ -12832,6 +12917,13 @@ with pkgs;
   alsaOss = callPackage ../os-specific/linux/alsa-oss { };
   alsaTools = callPackage ../os-specific/linux/alsa-tools { };
 
+  inherit (callPackage ../misc/arm-trusted-firmware {})
+    buildArmTrustedFirmware
+    armTrustedFirmwareAllwinner
+    armTrustedFirmwareQemu
+    armTrustedFirmwareRK3328
+    ;
+
   microcodeAmd = callPackage ../os-specific/linux/microcode/amd.nix { };
 
   microcodeIntel = callPackage ../os-specific/linux/microcode/intel.nix { };
@@ -13086,7 +13178,9 @@ with pkgs;
 
   kmscube = callPackage ../os-specific/linux/kmscube { };
 
-  kmsxx = callPackage ../development/libraries/kmsxx { };
+  kmsxx = callPackage ../development/libraries/kmsxx {
+    stdenv = overrideCC stdenv gcc6;
+  };
 
   latencytop = callPackage ../os-specific/linux/latencytop { };
 
@@ -13327,7 +13421,6 @@ with pkgs;
 
     nvidiaPackages = callPackage ../os-specific/linux/nvidia-x11 { };
 
-    nvidia_x11_legacy173 = nvidiaPackages.legacy_173;
     nvidia_x11_legacy304 = nvidiaPackages.legacy_304;
     nvidia_x11_legacy340 = nvidiaPackages.legacy_340;
     nvidia_x11_beta      = nvidiaPackages.beta;
@@ -13430,12 +13523,25 @@ with pkgs;
   # Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds.
   linuxPackages_testing = linuxPackagesFor pkgs.linux_testing;
 
-  linuxPackages_custom = { version, src, configfile }:
+  linuxPackages_custom = { version, src, configfile, allowImportFromDerivation ? true }:
     recurseIntoAttrs (linuxPackagesFor (pkgs.linuxManualConfig {
-      inherit version src configfile stdenv;
-      allowImportFromDerivation = true;
+      inherit version src configfile stdenv allowImportFromDerivation;
+      inherit (stdenv) hostPlatform;
     }));
 
+  # This serves as a test for linuxPackages_custom
+  linuxPackages_custom_tinyconfig_kernel = let
+    base = pkgs.linuxPackages.kernel;
+    tinyLinuxPackages = pkgs.linuxPackages_custom {
+      inherit (base) version src;
+      allowImportFromDerivation = false;
+      configfile = pkgs.linuxConfig {
+        makeTarget = "tinyconfig";
+        src = base.src;
+      };
+    };
+    in tinyLinuxPackages.kernel;
+
   # Build a kernel with bcachefs module
   linuxPackages_testing_bcachefs = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing_bcachefs);
 
@@ -13475,6 +13581,19 @@ with pkgs;
   linuxManualConfig = makeOverridable (callPackage ../os-specific/linux/kernel/manual-config.nix {});
   buildLinux = makeOverridable (callPackage ../os-specific/linux/kernel/generic.nix {});
 
+  # Derive one of the default .config files
+  linuxConfig = { src, makeTarget ? "defconfig", name ? "kernel.config" }:
+    stdenv.mkDerivation {
+      inherit name src;
+      buildPhase = ''
+        set -x
+        make ${makeTarget}
+      '';
+      installPhase = ''
+        cp .config $out
+      '';
+    };
+
   keyutils = callPackage ../os-specific/linux/keyutils { };
 
   libselinux = callPackage ../os-specific/linux/libselinux { };
@@ -13649,6 +13768,8 @@ with pkgs;
     config = config.pcmciaUtils.config or null;
   };
 
+  pcstat = callPackage ../tools/system/pcstat { };
+
   perf-tools = callPackage ../os-specific/linux/perf-tools { };
 
   pipes = callPackage ../misc/screensavers/pipes { };
@@ -13697,6 +13818,7 @@ with pkgs;
   radeontop = callPackage ../os-specific/linux/radeontop { };
 
   raspberrypifw = callPackage ../os-specific/linux/firmware/raspberrypi {};
+  raspberrypi-tools = callPackage ../os-specific/linux/firmware/raspberrypi/tools.nix {};
 
   regionset = callPackage ../os-specific/linux/regionset { };
 
@@ -13811,25 +13933,28 @@ with pkgs;
     ubootBananaPi
     ubootBeagleboneBlack
     ubootClearfog
+    ubootGuruplug
     ubootJetsonTK1
     ubootOdroidXU3
     ubootOrangePiPc
     ubootPcduino3Nano
+    ubootPine64
+    ubootQemuAarch64
     ubootQemuArm
     ubootRaspberryPi
     ubootRaspberryPi2
     ubootRaspberryPi3_32bit
     ubootRaspberryPi3_64bit
+    ubootSheevaplug
+    ubootSopine
     ubootUtilite
     ubootWandboard
     ;
 
   # Non-upstream U-Boots:
-  ubootSheevaplug = callPackage ../misc/uboot/sheevaplug.nix { };
-
   ubootNanonote = callPackage ../misc/uboot/nanonote.nix { };
 
-  ubootGuruplug = callPackage ../misc/uboot/guruplug.nix { };
+  ubootRock64 = callPackage ../misc/uboot/rock64.nix { };
 
   uclibc = callPackage ../os-specific/linux/uclibc { };
 
@@ -14052,6 +14177,8 @@ with pkgs;
 
   docbook5_xsl = docbook_xsl_ns;
 
+  documentation-highlighter = callPackage ../misc/documentation-highlighter { };
+
   cabin = callPackage ../data/fonts/cabin { };
 
   camingo-code = callPackage ../data/fonts/camingo-code { };
@@ -14230,7 +14357,9 @@ with pkgs;
   inherit (callPackages ../data/fonts/noto-fonts {})
     noto-fonts noto-fonts-cjk noto-fonts-emoji;
 
-  nullmailer = callPackage ../servers/mail/nullmailer { };
+  nullmailer = callPackage ../servers/mail/nullmailer {
+    stdenv = gccStdenv;
+  };
 
   numix-icon-theme = callPackage ../data/icons/numix-icon-theme { };
 
@@ -14525,7 +14654,7 @@ with pkgs;
 
   androidStudioPackages = callPackage ../applications/editors/android-studio { };
   android-studio = androidStudioPackages.stable;
-  android-studio-preview = androidStudioPackages.preview;
+  android-studio-preview = androidStudioPackages.beta;
 
   antfs-cli = callPackage ../applications/misc/antfs-cli {};
 
@@ -14805,7 +14934,9 @@ with pkgs;
 
   centerim = callPackage ../applications/networking/instant-messengers/centerim { };
 
-  cgit = callPackage ../applications/version-management/git-and-tools/cgit { };
+  cgit = callPackage ../applications/version-management/git-and-tools/cgit {
+    inherit (python3Packages) python wrapPython pygments markdown;
+  };
 
   cgminer = callPackage ../applications/misc/cgminer {
     amdappsdk = amdappsdk28;
@@ -14996,11 +15127,11 @@ with pkgs;
 
   # go 1.9 pin until https://github.com/moby/moby/pull/35739
   inherit (callPackage ../applications/virtualization/docker { go = go_1_9; })
-    docker_17_12
-    docker_18_02;
+    docker_18_03
+    docker_18_04;
 
-  docker = docker_17_12;
-  docker-edge = docker_18_02;
+  docker = docker_18_03;
+  docker-edge = docker_18_04;
 
   docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { };
 
@@ -15048,9 +15179,6 @@ with pkgs;
     inherit (gnome2) libgnomeui;
   };
 
-  dwb-unwrapped = callPackage ../applications/networking/browsers/dwb { dconf = gnome3.dconf; };
-  dwb = wrapFirefox dwb-unwrapped { desktopName = "dwb"; };
-
   dwm = callPackage ../applications/window-managers/dwm {
     patches = config.dwm.patches or [];
   };
@@ -15989,7 +16117,9 @@ with pkgs;
 
   ifenslave = callPackage ../os-specific/linux/ifenslave { };
 
-  ii = callPackage ../applications/networking/irc/ii { };
+  ii = callPackage ../applications/networking/irc/ii {
+    stdenv = gccStdenv;
+  };
 
   ike = callPackage ../applications/networking/ike { };
 
@@ -16281,50 +16411,51 @@ with pkgs;
 
   libreoffice = hiPrio libreoffice-still;
 
-  libreoffice-fresh = lowPrio (callPackage ../applications/office/libreoffice {
-    inherit (perlPackages) ArchiveZip CompressZlib;
-    inherit (gnome2) GConf ORBit2 gnome_vfs;
-    inherit (gnome3) defaultIconTheme;
-    zip = zip.override { enableNLS = false; };
-    bluez5 = bluez5_28;
-    fontsConf = makeFontsConf {
-      fontDirectories = [
-        carlito dejavu_fonts
-        freefont_ttf xorg.fontmiscmisc
-        liberation_ttf_v1_binary
-        liberation_ttf_v2_binary
-      ];
-    };
-    clucene_core = clucene_core_2;
-    lcms = lcms2;
-    harfbuzz = harfbuzz.override {
-      withIcu = true; withGraphite2 = true;
-    };
-    # checking whether g++ supports C++14 or C++11... configure: error: no
-    stdenv = overrideCC stdenv gcc5;
-  });
-
-  libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/still.nix {
-    inherit (perlPackages) ArchiveZip CompressZlib;
-    inherit (gnome2) GConf ORBit2 gnome_vfs;
-    inherit (gnome3) defaultIconTheme;
-    zip = zip.override { enableNLS = false; };
-    bluez5 = bluez5_28;
-    fontsConf = makeFontsConf {
-      fontDirectories = [
-        freefont_ttf xorg.fontmiscmisc
-      ];
-    };
-    clucene_core = clucene_core_2;
-    lcms = lcms2;
-    harfbuzz = harfbuzz.override {
-      withIcu = true; withGraphite2 = true;
-    };
-    icu = icu58;
-    # checking whether g++ supports C++14 or C++11... configure: error: no
-    stdenv = overrideCC stdenv gcc5;
-  });
+  libreoffice-fresh = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix
+    { libreoffice = callPackage ../applications/office/libreoffice {
+      inherit (perlPackages) ArchiveZip CompressZlib;
+      inherit (gnome2) GConf ORBit2 gnome_vfs;
+      inherit (gnome3) defaultIconTheme;
+      zip = zip.override { enableNLS = false; };
+      bluez5 = bluez5_28;
+      fontsConf = makeFontsConf {
+        fontDirectories = [
+          carlito dejavu_fonts
+          freefont_ttf xorg.fontmiscmisc
+          liberation_ttf_v1_binary
+          liberation_ttf_v2_binary
+        ];
+      };
+      clucene_core = clucene_core_2;
+      lcms = lcms2;
+      harfbuzz = harfbuzz.override {
+        withIcu = true; withGraphite2 = true;
+      };
+      # checking whether g++ supports C++14 or C++11... configure: error: no
+      stdenv = overrideCC stdenv gcc5;
+  };});
 
+  libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix
+    { libreoffice = callPackage ../applications/office/libreoffice/still.nix {
+      inherit (perlPackages) ArchiveZip CompressZlib;
+      inherit (gnome2) GConf ORBit2 gnome_vfs;
+      inherit (gnome3) defaultIconTheme;
+      zip = zip.override { enableNLS = false; };
+      bluez5 = bluez5_28;
+      fontsConf = makeFontsConf {
+        fontDirectories = [
+          freefont_ttf xorg.fontmiscmisc
+        ];
+      };
+      clucene_core = clucene_core_2;
+      lcms = lcms2;
+      harfbuzz = harfbuzz.override {
+        withIcu = true; withGraphite2 = true;
+      };
+      icu = icu58;
+      # checking whether g++ supports C++14 or C++11... configure: error: no
+      stdenv = overrideCC stdenv gcc5;
+  };});
 
   liferea = callPackage ../applications/networking/newsreaders/liferea {
     inherit (gnome3) libpeas gsettings-desktop-schemas dconf;
@@ -16391,7 +16522,9 @@ with pkgs;
 
   looking-glass-client = callPackage ../applications/virtualization/looking-glass-client { };
 
-  lumail = callPackage ../applications/networking/mailreaders/lumail { };
+  lumail = callPackage ../applications/networking/mailreaders/lumail {
+    lua = lua5_1;
+  };
 
   lv2bm = callPackage ../applications/audio/lv2bm { };
 
@@ -16506,14 +16639,22 @@ with pkgs;
 
   mod-distortion = callPackage ../applications/audio/mod-distortion { };
 
-  monero = callPackage ../applications/altcoins/monero { };
+  monero = callPackage ../applications/altcoins/monero {
+    inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC;
+    boost = boost15x;
+  };
 
-  monero-gui = libsForQt5.callPackage ../applications/altcoins/monero-gui { };
+  monero-gui = libsForQt5.callPackage ../applications/altcoins/monero-gui {
+    boost = boost15x;
+  };
 
   xmr-stak = callPackage ../applications/misc/xmr-stak {
+    stdenvGcc6 = overrideCC stdenv gcc6;
     hwloc = hwloc-nox;
   };
 
+  xmrig = callPackage ../applications/misc/xmrig { };
+
   monkeysAudio = callPackage ../applications/audio/monkeys-audio { };
 
   monkeysphere = callPackage ../tools/security/monkeysphere { };
@@ -16618,6 +16759,7 @@ with pkgs;
     dvdreadSupport     = !stdenv.isDarwin;
     dvdnavSupport      = !stdenv.isDarwin;
     drmSupport         = !stdenv.isDarwin;
+    vaapiSupport       = !stdenv.isDarwin;
     x11Support         = !stdenv.isDarwin;
     xineramaSupport    = !stdenv.isDarwin;
     xvSupport          = !stdenv.isDarwin;
@@ -16788,7 +16930,7 @@ with pkgs;
 
   mypaint = callPackage ../applications/graphics/mypaint { };
 
-  mythtv = callPackage ../applications/video/mythtv { };
+  mythtv = libsForQt5.callPackage ../applications/video/mythtv { };
 
   micro = callPackage ../applications/editors/micro { };
 
@@ -17123,7 +17265,7 @@ with pkgs;
     inherit (darwin.stubs) rez setfile;
   };
 
-  qemu-riscv = callPackage ../applications/virtualization/qemu/riscv.nix {};
+  qemu-riscv = lowPrio (callPackage ../applications/virtualization/qemu/riscv.nix {});
 
   qgis = callPackage ../applications/gis/qgis {};
 
@@ -17150,6 +17292,7 @@ with pkgs;
   qsampler = libsForQt5.callPackage ../applications/audio/qsampler { };
 
   qscreenshot = callPackage ../applications/graphics/qscreenshot {
+    inherit (darwin.apple_sdk.frameworks) Carbon;
     qt = qt4;
   };
 
@@ -17548,6 +17691,8 @@ with pkgs;
     inherit (pkgs.vamp) vampSDK;
   };
 
+  soulseekqt = callPackage ../applications/networking/p2p/soulseekqt { };
+
   sox = callPackage ../applications/misc/audio/sox {
     enableLame = config.sox.enableLame or false;
   };
@@ -17562,6 +17707,9 @@ with pkgs;
     inherit (gnome2) GConf;
     libgcrypt = libgcrypt_1_5;
     libpng = libpng12;
+    curl = curl.override {
+      sslSupport = false; gnutlsSupport = true;
+    };
   };
 
   libspotify = callPackage ../development/libraries/libspotify {
@@ -18145,8 +18293,8 @@ with pkgs;
   worker = callPackage ../applications/misc/worker { };
 
   workrave = callPackage ../applications/misc/workrave {
-    inherit (gnome2) GConf gconfmm;
     inherit (python27Packages) cheetah;
+    inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good;
   };
 
   worldengine-cli = python3Packages.worldengine;
@@ -18232,7 +18380,9 @@ with pkgs;
 
   wtftw = callPackage ../applications/window-managers/wtftw {};
 
-  wxhexeditor = callPackage ../applications/editors/wxhexeditor { };
+  wxhexeditor = callPackage ../applications/editors/wxhexeditor {
+    wxGTK = wxGTK31;
+  };
 
   wxcam = callPackage ../applications/video/wxcam {
     inherit (gnome2) libglade;
@@ -18320,9 +18470,10 @@ with pkgs;
 
   xenPackages = recurseIntoAttrs (callPackage ../applications/virtualization/xen/packages.nix {});
 
-  xen = xenPackages.xen_4_5-vanilla;
-  xen-slim = xenPackages.xen_4_5-slim;
-  xen-light = xenPackages.xen_4_5-light;
+  xen = xenPackages.xen-vanilla;
+  xen-slim = xenPackages.xen-slim;
+  xen-light = xenPackages.xen-light;
+
   xen_4_8 = xenPackages.xen_4_8-vanilla;
   xen_4_8-slim = xenPackages.xen_4_8-slim;
   xen_4_8-light = xenPackages.xen_4_8-light;
@@ -18389,21 +18540,21 @@ with pkgs;
 
   xmonad_log_applet_gnome2 = callPackage ../applications/window-managers/xmonad-log-applet {
     desktopSupport = "gnome2";
-    inherit (xfce) libxfce4util xfce4panel;
+    inherit (xfce) libxfce4util xfce4-panel;
     gnome2_panel = gnome2.gnome_panel;
     GConf2 = gnome2.GConf;
   };
 
   xmonad_log_applet_gnome3 = callPackage ../applications/window-managers/xmonad-log-applet {
     desktopSupport = "gnome3";
-    inherit (xfce) libxfce4util xfce4panel;
+    inherit (xfce) libxfce4util xfce4-panel;
     gnome2_panel = gnome2.gnome_panel;
     GConf2 = gnome2.GConf;
   };
 
   xmonad_log_applet_xfce = callPackage ../applications/window-managers/xmonad-log-applet {
     desktopSupport = "xfce4";
-    inherit (xfce) libxfce4util xfce4panel;
+    inherit (xfce) libxfce4util xfce4-panel;
     gnome2_panel = gnome2.gnome_panel;
     GConf2 = gnome2.GConf;
   };
@@ -18713,6 +18864,8 @@ with pkgs;
 
   factorio-headless = callPackage ../games/factorio { releaseType = "headless"; };
 
+  factorio-headless-experimental = callPackage ../games/factorio { releaseType = "headless"; experimental = true; };
+
   factorio-demo = callPackage ../games/factorio { releaseType = "demo"; };
 
   factorio-mods = callPackage ../games/factorio/mods.nix { };
@@ -19194,6 +19347,8 @@ with pkgs;
 
   warmux = callPackage ../games/warmux { };
 
+  warsow-engine = callPackage ../games/warsow/engine.nix { };
+
   warsow = callPackage ../games/warsow { };
 
   warzone2100 = libsForQt5.callPackage ../games/warzone2100 { };
@@ -19467,7 +19622,9 @@ with pkgs;
   });
 
   samtools = callPackage ../applications/science/biology/samtools/default.nix { };
-  samtools_0_1_19 = callPackage ../applications/science/biology/samtools/samtools_0_1_19.nix { };
+  samtools_0_1_19 = callPackage ../applications/science/biology/samtools/samtools_0_1_19.nix {
+    stdenv = gccStdenv;
+  };
 
   snpeff = callPackage ../applications/science/biology/snpeff/default.nix { };
 
@@ -19501,7 +19658,9 @@ with pkgs;
 
   blas = callPackage ../development/libraries/science/math/blas { };
 
-  clblas = callPackage ../development/libraries/science/math/clblas { };
+  clblas = callPackage ../development/libraries/science/math/clblas {
+    inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo OpenCL;
+  };
 
   jags = callPackage ../applications/science/math/jags { };
 
@@ -19751,7 +19910,9 @@ with pkgs;
 
   saw-tools = callPackage ../applications/science/logic/saw-tools {};
 
-  spass = callPackage ../applications/science/logic/spass {};
+  spass = callPackage ../applications/science/logic/spass {
+    stdenv = gccStdenv;
+  };
 
   statverif = callPackage ../applications/science/logic/statverif { };
 
@@ -20607,9 +20768,7 @@ with pkgs;
   };
   vimprobable2 = wrapFirefox vimprobable2-unwrapped { };
 
-  vimb-unwrapped = callPackage ../applications/networking/browsers/vimb {
-    webkit = webkitgtk218x;
-  };
+  vimb-unwrapped = callPackage ../applications/networking/browsers/vimb { };
   vimb = wrapFirefox vimb-unwrapped { };
 
   vips = callPackage ../tools/graphics/vips { };
@@ -20903,6 +21062,8 @@ with pkgs;
     cc-wrapper-libcxx-4 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_4.libcxxStdenv; };
     cc-wrapper-clang-5 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_5.stdenv; };
     cc-wrapper-libcxx-5 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_5.libcxxStdenv; };
+    cc-wrapper-clang-6 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_6.stdenv; };
+    cc-wrapper-libcxx-6 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_6.libcxxStdenv; };
     stdenv-inputs = callPackage ../test/stdenv-inputs { };
 
     cc-multilib-gcc = callPackage ../test/cc-wrapper/multilib.nix { stdenv = gccMultiStdenv; };
diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix
index 9cf9eb4db65..da7fc1bed34 100644
--- a/pkgs/top-level/default.nix
+++ b/pkgs/top-level/default.nix
@@ -22,9 +22,9 @@
   # `*Platform`s.
   localSystem
 
-  # The system packages will ultimately be run on. Null if the two should be the
+, # The system packages will ultimately be run on. Null if the two should be the
   # same.
-, crossSystem ? null
+  crossSystem ? null
 
 , # Allow a configuration attribute set to be passed in as an argument.
   config ? {}
diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index a589ceb7e0c..2cac3e86c23 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -138,15 +138,14 @@ let
   };
 
   luaevent = buildLuaPackage rec {
-    version = "0.4.3";
+    version = "0.4.4";
     name = "luaevent-${version}";
-    disabled = isLua52;
 
     src = fetchFromGitHub {
       owner = "harningt";
       repo = "luaevent";
       rev = "v${version}";
-      sha256 = "1c1n2zqx5rwfwkqaq1jj8gvx1vswvbihj2sy445w28icz1xfhpik";
+      sha256 = "1krzxr0jkv3gmhpckp02byhdd9s5dd0hpyqc8irc8i79dd8x0p53";
     };
 
     preBuild = ''
diff --git a/pkgs/top-level/metrics.nix b/pkgs/top-level/metrics.nix
index 5f61c67b29c..77f620da724 100644
--- a/pkgs/top-level/metrics.nix
+++ b/pkgs/top-level/metrics.nix
@@ -35,7 +35,7 @@ runCommand "nixpkgs-metrics"
       [[ -n $x ]] || exit 1
       echo "$name.allocations $x B" >> $out/nix-support/hydra-metrics
 
-      x=$(sed -e 's/.*values allocated: \([0-9]\+\) .*/\1/ ; t ; d' stats)
+      x=$(sed -e 's/.*values allocated count: \([0-9]\+\).*/\1/ ; t ; d' stats)
       [[ -n $x ]] || exit 1
       echo "$name.values $x" >> $out/nix-support/hydra-metrics
     }
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 4a6e4e815bb..b7fa9c3cff8 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -955,10 +955,6 @@ let
 
     # Apps / from all-packages
 
-    wyrd = callPackage ../tools/misc/wyrd {
-      ncurses = pkgs.ncurses5;
-    };
-
     haxe = callPackage ../development/compilers/haxe { };
 
     ocamlnat = callPackage  ../development/ocaml-modules/ocamlnat { };
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 123e0c64c48..ab5a8ce5e4f 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6293,19 +6293,19 @@ let self = _self // overrides; _self = with self; {
   };
 
   GSSAPI = buildPerlPackage rec {
-    name = "GSSAPPI-0.28";
+    name = "GSSAPI-0.28";
     src = fetchurl {
-      url = "http://search.cpan.org/CPAN/authors/id/A/AG/AGROLMS/GSSAPI-0.28.tar.gz";
+      url = "mirror://cpan/authors/id/A/AG/AGROLMS/${name}.tar.gz";
       sha256 = "1mkhwxjjlhr58pd770i9gnf7zy7jj092iv6jfbnb8bvnc5xjr3vx";
     };
     buildInputs = [ TestPod ];
-    propagatedBuildInputs = [ pkgs.heimdalFull ];
+    propagatedBuildInputs = [ pkgs.krb5Full.dev ];
     meta = {
       maintainers = [ maintainers.limeytexan ];
       description = "Perl extension providing access to the GSSAPIv2 library";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
-    makeMakerFlags = "--gssapiimpl ${pkgs.heimdalFull.out}";
+    makeMakerFlags = "--gssapiimpl ${pkgs.krb5Full.dev}";
   };
 
   Gtk2 = buildPerlPackage rec {
@@ -12320,16 +12320,17 @@ let self = _self // overrides; _self = with self; {
   };
 
   Socket = buildPerlPackage {
-    name = "Socket-2.020";
+    name = "Socket-2.027";
     src = fetchurl {
-      url = mirror://cpan/authors/id/P/PE/PEVANS/Socket-2.020.tar.gz;
-      sha256 = "9ad4174c45b4c31d5e0b8019ada1fc767093849e77f268f0d1831eeb891dfdd7";
+      url = mirror://cpan/authors/id/P/PE/PEVANS/Socket-2.027.tar.gz;
+      sha256 = "1a725fbqx6bjzjf63bgs5wvzd20kffz1f94pbmv1670p9m4i270l";
     };
     postPatch = ''
       # requires network access
-      rm t/getnameinfo.t
+      rm t/getnameinfo.t t/getaddrinfo.t
     '';
     meta = {
+      homepage = https://metacpan.org/pod/Socket;
       description = "Networking constants and support functions";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7969765a95e..a0b4e6454f0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -66,6 +66,9 @@ let
     toPythonModule = x: x; # Application does not provide modules.
   }));
 
+  # See build-setupcfg/default.nix for documentation.
+  buildSetupcfg = import ../build-support/build-setupcfg self;
+
   graphiteVersion = "1.0.2";
 
   fetchPypi = makeOverridable( {format ? "setuptools", ... } @attrs:
@@ -98,6 +101,9 @@ let
   # providing Python modules.
   makePythonPath = drvs: stdenv.lib.makeSearchPath python.sitePackages (requiredPythonModules drvs);
 
+  removePythonPrefix = name:
+    removePrefix namePrefix name;
+
   # Convert derivation to a Python module.
   toPythonModule = drv:
     drv.overrideAttrs( oldAttrs: {
@@ -109,14 +115,28 @@ let
       };
     });
 
+  # Convert a Python library to an application.
+  toPythonApplication = drv:
+    drv.overrideAttrs( oldAttrs: {
+      passthru = (oldAttrs.passthru or {}) // {
+        # Remove Python prefix from name so we have a "normal" name.
+        # While the prefix shows up in the store path, it won't be
+        # used by `nix-env`.
+        name = removePythonPrefix oldAttrs.name;
+        pythonModule = false;
+      };
+    });
+
   disabledIf = x: drv:
-    if x then throw "${removePrefix namePrefix (drv.pname or drv.name)} not supported for interpreter ${python.executable}" else drv;
+    if x then throw "${removePythonPrefix (drv.pname or drv.name)} not supported for interpreter ${python.executable}" else drv;
 
 in {
 
   inherit python bootstrapped-pip pythonAtLeast pythonOlder isPy26 isPy27 isPy33 isPy34 isPy35 isPy36 isPyPy isPy3k buildPythonPackage buildPythonApplication;
   inherit fetchPypi callPackage;
   inherit hasPythonModule requiredPythonModules makePythonPath disabledIf;
+  inherit toPythonModule toPythonApplication;
+  inherit buildSetupcfg;
 
   # helpers
 
@@ -241,6 +261,8 @@ in {
     hdf5 = pkgs.hdf5-mpi;
   };
 
+  ha-ffmpeg = callPackage ../development/python-modules/ha-ffmpeg { };
+
   habanero = callPackage ../development/python-modules/habanero { };
 
   i3ipc = callPackage ../development/python-modules/i3ipc { };
@@ -249,6 +271,8 @@ in {
 
   lmtpd = callPackage ../development/python-modules/lmtpd { };
 
+  logster = callPackage ../development/python-modules/logster { };
+
   mpi4py = callPackage ../development/python-modules/mpi4py {
     mpi = pkgs.openmpi;
   };
@@ -287,6 +311,8 @@ in {
 
   pyatspi = disabledIf (!isPy3k) (callPackage ../development/python-modules/pyatspi { });
 
+  pyaxmlparser = callPackage ../development/python-modules/pyaxmlparser { };
+
   pycairo = callPackage ../development/python-modules/pycairo { };
 
   pycangjie = disabledIf (!isPy3k) (callPackage ../development/python-modules/pycangjie { });
@@ -319,6 +345,8 @@ in {
 
   pygobject3 = callPackage ../development/python-modules/pygobject/3.nix { };
 
+  pygtail = callPackage ../development/python-modules/pygtail { };
+
   pygtk = callPackage ../development/python-modules/pygtk { libglade = null; };
 
   pygtksourceview = callPackage ../development/python-modules/pygtksourceview { };
@@ -434,16 +462,14 @@ in {
 
   alembic = callPackage ../development/python-modules/alembic {};
 
+  allpairspy = callPackage ../development/python-modules/allpairspy { };
+
   ansicolors = callPackage ../development/python-modules/ansicolors {};
 
   aniso8601 = callPackage ../development/python-modules/aniso8601 {};
 
   asgiref = callPackage ../development/python-modules/asgiref { };
 
-  asgi_ipc = callPackage ../development/python-modules/asgi_ipc { };
-
-  asgi_redis = callPackage ../development/python-modules/asgi_redis { };
-
   python-editor = callPackage ../development/python-modules/python-editor { };
 
   python-gnupg = callPackage ../development/python-modules/python-gnupg {};
@@ -622,23 +648,10 @@ in {
     gui = false;
   };
 
+  deluge-client = callPackage ../development/python-modules/deluge-client { };
 
   arrow = callPackage ../development/python-modules/arrow { };
 
-  async = buildPythonPackage rec {
-    name = "async-0.6.1";
-    disabled = isPy3k;
-    meta.maintainers = with maintainers; [ ];
-
-    buildInputs = with self; [ pkgs.zlib ];
-    doCheck = false;
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/a/async/${name}.tar.gz";
-      sha256 = "1lfmjm8apy9qpnpbq8g641fd01qxh9jlya5g2d6z60vf8p04rla1";
-    };
-  };
-
   asynctest = callPackage ../development/python-modules/asynctest { };
 
   async-timeout = callPackage ../development/python-modules/async_timeout { };
@@ -1272,6 +1285,7 @@ in {
 
       homepage = https://github.com/skarra/CalDAVClientLibrary/tree/asynkdev/;
       maintainers = with maintainers; [ pjones ];
+      broken = true; # 2018-04-11
     };
   };
 
@@ -1514,6 +1528,8 @@ in {
     inherit (pkgs.dlib) name src nativeBuildInputs meta;
 
     buildInputs = pkgs.dlib.buildInputs ++ [ self.boost ];
+
+    checkInputs = with self; [ pytest ];
   };
 
   datadog = buildPythonPackage rec {
@@ -1621,37 +1637,11 @@ in {
 
   rarfile = callPackage ../development/python-modules/rarfile { inherit (pkgs) libarchive; };
 
-  proboscis = buildPythonPackage rec {
-    name = "proboscis-1.2.6.0";
+  proboscis = callPackage ../development/python-modules/proboscis {};
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/proboscis/proboscis-1.2.6.0.tar.gz";
-      sha256 = "b822b243a7c82030fce0de97bdc432345941306d2c24ef227ca561dd019cd238";
-    };
+  py4j = callPackage ../development/python-modules/py4j { };
 
-    propagatedBuildInputs = with self; [ nose ];
-    doCheck = false;
-
-    meta = {
-      description = "A Python test framework that extends Python's built-in unittest module and Nose with features from TestNG";
-      homepage = https://github.com/rackspace/python-proboscis;
-      license = licenses.asl20;
-    };
-  };
-
-  pyechonest = self.buildPythonPackage rec {
-    name = "pyechonest-8.0.2";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pyechonest/pyechonest-8.0.2.tar.gz";
-      sha256 = "496265f4b7d33483ec153b9e1b8333fe959b115f7e781510089c8313b7d86560";
-    };
-
-    meta = {
-      description = "Tap into The Echo Nest's Musical Brain for the best music search, information, recommendations and remix tools on the web";
-      homepage = https://github.com/echonest/pyechonest;
-    };
-  };
+  pyechonest = callPackage ../development/python-modules/pyechonest { };
 
   billiard = buildPythonPackage rec {
     name = "billiard-${version}";
@@ -1673,27 +1663,7 @@ in {
     };
   };
 
-
-  binaryornot = buildPythonPackage rec {
-    name = "binaryornot-${version}";
-    version = "0.4.0";
-
-    src = pkgs.fetchurl {
-      url ="mirror://pypi/b/binaryornot/${name}.tar.gz";
-      sha256 = "1j4f51dxic39mdwf6alj7gd769wy6mhk916v031wjali51xkh3xb";
-    };
-
-    buildInputs = with self; [ hypothesis ];
-
-    propagatedBuildInputs = with self; [ chardet ];
-
-    meta = {
-      homepage = https://github.com/audreyr/binaryornot;
-      description = "Ultra-lightweight pure Python package to check if a file is binary or text";
-      license = licenses.bsd3;
-    };
-  };
-
+  binaryornot = callPackage ../development/python-modules/binaryornot { };
 
   bitbucket_api = buildPythonPackage rec {
     name = "bitbucket-api-0.4.4";
@@ -2436,36 +2406,15 @@ in {
 
   colorlover = callPackage ../development/python-modules/colorlover { };
 
-  CommonMark = buildPythonPackage rec {
-    name = "CommonMark-${version}";
-    version = "0.6.3";
+  CommonMark = callPackage ../development/python-modules/commonmark { };
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/C/CommonMark/${name}.tar.gz";
-      sha256 = "ee5a88f23678794592efe3fc11033f17fc77b3296a85f5e1d5b715f8e110a773";
-    };
-
-    LC_ALL="en_US.UTF-8";
-
-    doCheck = false;
-
-    buildInputs = with self; [ flake8 pkgs.glibcLocales ];
-    propagatedBuildInputs = with self; [ future ];
-
-    meta = {
-      description = "Python parser for the CommonMark Markdown spec";
-      homepage = https://github.com/rolandshoemaker/CommonMark-py;
-      license = licenses.bsd3;
-    };
-  };
-
-  CommonMark_54 = self.CommonMark.override rec {
-    name = "CommonMark-0.5.4";
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/C/CommonMark/${name}.tar.gz";
+  CommonMark_54 = self.CommonMark.overridePythonAttrs (oldAttrs: rec {
+    version = "0.5.4";
+    src = oldAttrs.src.override {
+      inherit version;
       sha256 = "34d73ec8085923c023930dfc0bcd1c4286e28a2a82de094bb72fabcc0281cbe5";
     };
-  };
+  });
 
 
   coilmq = buildPythonPackage (rec {
@@ -2492,21 +2441,7 @@ in {
   });
 
 
-  colander = buildPythonPackage rec {
-    name = "colander-1.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/c/colander/${name}.tar.gz";
-      sha256 = "7389413266b9e680c9529c16d56284edf87e0d5de557948e75f41d65683c23b3";
-    };
-
-    propagatedBuildInputs = with self; [ self.translationstring self.iso8601 ];
-
-    meta = {
-      maintainers = with maintainers; [ garbas domenkozar ];
-      platforms = platforms.all;
-    };
-  };
+  colander = callPackage ../development/python-modules/colander { };
 
   # Backported version of the ConfigParser library of Python 3.3
   configparser = if isPy3k then null else buildPythonPackage rec {
@@ -2739,22 +2674,7 @@ in {
 
   pyunifi = callPackage ../development/python-modules/pyunifi { };
 
-  tablib = buildPythonPackage rec {
-    name = "tablib-${version}";
-    version = "0.12.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/t/tablib/tablib-${version}.tar.gz";
-      sha256 = "11wxchj0qz77dn79yiq30k4b4gsm429f4bizk4lm4rb63nk51kxq";
-    };
-
-    buildInputs = with self; [ pytest unicodecsv pandas ];
-    propagatedBuildInputs = with self; [ xlwt openpyxl pyyaml xlrd odfpy ];
-    meta = with stdenv.lib; {
-      description = "Tablib: format-agnostic tabular dataset library";
-      homepage = "http://python-tablib.org";
-    };
-  };
+  tablib = callPackage ../development/python-modules/tablib { };
 
   wakeonlan = callPackage ../development/python-modules/wakeonlan { };
 
@@ -2852,6 +2772,8 @@ in {
     };
   };
 
+  miniupnpc = callPackage ../development/python-modules/miniupnpc {};
+
   mixpanel = buildPythonPackage rec {
     version = "4.0.2";
     name = "mixpanel-${version}";
@@ -3033,37 +2955,14 @@ in {
 
   pydub = callPackage ../development/python-modules/pydub {};
 
-  pyjade = buildPythonPackage rec {
-    name = "${pname}-${version}";
-    pname = "pyjade";
-    version = "4.0.0";
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/${pname}/${name}.tar.gz";
-      sha256 = "1mycn5cc9cp4fb0i2vzgkkk6d0glnkbilggwb4i99i09vr0vg5cd";
-    };
-    buildInputs = with self; [ pyramid_mako nose django jinja2 tornado pyramid Mako ];
-    propagatedBuildInputs = with self; [ six ];
-    patchPhase = ''
-      sed -i 's/1.4.99/1.99/' setup.py
-    '';
-    checkPhase = ''
-      nosetests pyjade
-    '';
-    # No tests distributed. https://github.com/syrusakbary/pyjade/issues/262
-    doCheck = false;
-    meta = {
-      description = "Jade syntax template adapter for Django, Jinja2, Mako and Tornado templates";
-      homepage    = "http://github.com/syrusakbary/pyjade";
-      license     = licenses.mit;
-      maintainers = with maintainers; [ nand0p ];
-      platforms   = platforms.all;
-    };
-  };
+  pyjade = callPackage ../development/python-modules/pyjade {};
 
   PyLD = callPackage ../development/python-modules/PyLD { };
 
   python-jose = callPackage ../development/python-modules/python-jose {};
 
+  python-ly = callPackage ../development/python-modules/python-ly {};
+
   pyhepmc = buildPythonPackage rec {
     name = "pyhepmc-${version}";
     version = "0.5.0";
@@ -3807,32 +3706,7 @@ in {
 
   decorator = callPackage ../development/python-modules/decorator { };
 
-  deform = buildPythonPackage rec {
-    name = "deform-2.0a2";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/d/deform/${name}.tar.gz";
-      sha256 = "3fa4d287c8da77a83556e4a5686de006ddd69da359272120b915dc8f5a70cabd";
-    };
-
-    buildInputs = with self; [] ++ optional isPy26 unittest2;
-
-    propagatedBuildInputs =
-      [ self.beautifulsoup4
-        self.peppercorn
-        self.colander
-        self.translationstring
-        self.chameleon
-        self.zope_deprecation
-        self.coverage
-        self.nose
-      ];
-
-    meta = {
-      maintainers = with maintainers; [ garbas domenkozar ];
-      platforms = platforms.all;
-    };
-  };
+  deform = callPackage ../development/python-modules/deform { };
 
   demjson = callPackage ../development/python-modules/demjson { };
 
@@ -4481,24 +4355,7 @@ in {
     };
   };
 
-  ftputil = buildPythonPackage rec {
-    version = "3.3";
-    name = "ftputil-${version}";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/f/ftputil/${name}.tar.gz";
-      sha256 = "1714w0v6icw2xjx5m54yv2qgkq49qwxwllq4gdb7wkz25iiapr8b";
-    };
-
-    disabled = isPy3k;
-
-    meta = {
-      description = "High-level FTP client library (virtual file system and more)";
-      homepage    = https://pypi.python.org/pypi/ftputil;
-      platforms   = platforms.linux;
-      license     = licenses.bsd2; # "Modified BSD license, says pypi"
-    };
-  };
+  ftputil = callPackage ../development/python-modules/ftputil { };
 
   fudge = buildPythonPackage rec {
     name = "fudge-1.1.0";
@@ -4805,33 +4662,8 @@ in {
 
   google-compute-engine = callPackage ../tools/virtualization/google-compute-engine { };
 
-  gplaycli = buildPythonPackage rec {
-    version = "0.1.2";
-    name = "gplaycli-${version}";
-
-    src = pkgs.fetchFromGitHub {
-      owner = "matlink";
-      repo = "gplaycli";
-      rev = "${version}";
-      sha256 = "0yc09inzs3aggj0gw4irlhlzw5q562fsp0sks352y6z0vx31hcp3";
-    };
-
-   disabled = ! isPy27;
-
-   propagatedBuildInputs = with self; [ pkgs.libffi pyasn1 clint ndg-httpsclient protobuf requests args ];
-
-   preBuild = ''
-     substituteInPlace setup.py --replace "/etc" "$out/etc"
-     substituteInPlace gplaycli/gplaycli.py --replace "/etc" "$out/etc"
-   '';
-
-    meta = {
-      homepage = https://github.com/matlink/gplaycli;
-      description = "Google Play Downloader via Command line";
-      license = licenses.agpl3Plus;
-      maintainers = with maintainers; [ ];
-    };
-  };
+  gpapi = callPackage ../development/python-modules/gpapi { };
+  gplaycli = callPackage ../development/python-modules/gplaycli { };
 
   gpsoauth = buildPythonPackage rec {
     version = "0.2.0";
@@ -4965,7 +4797,6 @@ in {
       homepage = https://github.com/jmoiron/humanize;
       license = licenses.mit;
       maintainers = with maintainers; [ matthiasbeyer ];
-      platforms = platforms.linux; # can only test on linux
     };
 
   };
@@ -5077,29 +4908,7 @@ in {
 
   };
 
-  imbalanced-learn = buildPythonPackage rec {
-    name = "imbalanced-learn-${version}";
-    version = "0.3.2";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/i/imbalanced-learn/${name}.tar.gz";
-      sha256 = "0j76m0rrsvyqj9bimky9m7b609y5v6crf9apigww3xvcnchhj901";
-    };
-
-    preConfigure = ''
-      export HOME=$PWD
-    '';
-
-    propagatedBuildInputs = with self; [ scikitlearn ];
-    buildInputs = with self; [ nose pytest pandas ];
-
-    meta = {
-      description = "Library offering a number of re-sampling techniques commonly used in datasets showing strong between-class imbalance";
-      homepage = https://github.com/scikit-learn-contrib/imbalanced-learn;
-      license = with licenses; [ mit ];
-    };
-
-  };
+  imbalanced-learn = callPackage ../development/python-modules/imbalanced-learn { };
 
   imread = buildPythonPackage rec {
     name = "python-imread-${version}";
@@ -5327,6 +5136,7 @@ in {
     pname = "lightblue";
     version = "0.4";
     name = "${pname}-${version}";
+    disabled = isPy3k; # build fails, 2018-04-11
 
     src = pkgs.fetchurl {
       url = "mirror://sourceforge/${pname}/${name}.tar.gz";
@@ -5531,24 +5341,7 @@ in {
     };
   };
 
-  mt-940 = buildPythonPackage rec {
-    version = "4.10.0";
-    name = "mt-940-${version}";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/m/mt-940/mt-940-${version}.tar.gz";
-      sha256 = "1gyqf1k2r2ml45x08bk69ws865yrpcph514mn4xvjz779mlgh67j";
-    };
-
-    buildInputs = with self; [ pytestrunner pyyaml pytest ];
-    doCheck = false; # Can't find data files
-
-    meta = {
-      description = "A library to parse MT940 files and returns smart Python collections for statistics and manipulation";
-      homepage = "http://pythonhosted.org/mt-940/";
-      license = licenses.bsd3;
-    };
-  };
+  mt-940 = callPackage ../development/python-modules/mt-940 { };
 
   mwlib = let
     pyparsing = buildPythonPackage rec {
@@ -5649,15 +5442,6 @@ in {
 
   natsort = callPackage ../development/python-modules/natsort { };
 
-  logster = buildPythonPackage {
-    name = "logster-7475c53822";
-    src = pkgs.fetchgit {
-      url = git://github.com/etsy/logster;
-      rev = "7475c53822";
-      sha256 = "0565wxxiwksnly8rakb2r77k7lwzniq16kv861qd2ns9hgsjgy31";
-    };
-  };
-
   ncclient = callPackage ../development/python-modules/ncclient {};
 
   logfury = callPackage ../development/python-modules/logfury { };
@@ -5926,6 +5710,11 @@ in {
     };
   };
 
+  poppler-qt5 = callPackage ../development/python-modules/poppler-qt5 {
+    inherit (pkgs.qt5) qtbase;
+    inherit (pkgs.libsForQt5) poppler;
+  };
+
   poyo = buildPythonPackage rec {
     version = "0.4.0";
     name = "poyo-${version}";
@@ -6292,6 +6081,8 @@ in {
     };
   };
 
+  python-ctags3 = callPackage ../development/python-modules/python-ctags3 { };
+
   junos-eznc = callPackage ../development/python-modules/junos-eznc {};
 
   raven = callPackage ../development/python-modules/raven { };
@@ -6530,23 +6321,7 @@ in {
 
   schema = callPackage ../development/python-modules/schema {};
 
-  stem = buildPythonPackage rec {
-    name = "stem-${version}";
-    version = "1.6.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/s/stem/${name}.tar.gz";
-      sha256 = "1va9p3ij7lxg6ixfsvaql06dn11l3fgpxmss1dhlvafm7sqizznp";
-    };
-
-    meta = {
-      description = "Controller library that allows applications to interact with Tor (https://www.torproject.org/";
-      homepage = https://stem.torproject.org/;
-      license = licenses.gpl3;
-      maintainers = with maintainers; [ phreedom ];
-    };
-
-  };
+  stem = callPackage ../development/python-modules/stem { };
 
   svg-path = buildPythonPackage rec {
     name = "svg.path-${version}";
@@ -7089,52 +6864,9 @@ in {
     };
   };
 
-  django_pipeline = buildPythonPackage rec {
-    name = "django-pipeline-${version}";
-    version = "1.5.1";
+  django_pipeline = callPackage ../development/python-modules/django-pipeline { };
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/d/django-pipeline/${name}.tar.gz";
-      sha256 = "1y49fa8jj7x9qjj5wzhns3zxwj0s73sggvkrv660cqw5qb7d8hha";
-    };
-
-    propagatedBuildInputs = with self; [ django futures ];
-
-    meta = with stdenv.lib; {
-      description = "Pipeline is an asset packaging library for Django";
-      homepage = https://github.com/cyberdelia/django-pipeline;
-      license = stdenv.lib.licenses.mit;
-    };
-  };
-
-  django_pipeline_1_3 = self.django_pipeline.overrideDerivation (super: rec {
-    name = "django-pipeline-1.3.27";
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/d/django-pipeline/${name}.tar.gz";
-      sha256 = "0iva3cmnh5jw54c7w83nx9nqv523hjvkbjchzd2pb6vzilxf557k";
-    };
-  });
-
-
-  djblets = if (versionOlder self.django.version "1.6.11") ||
-               (versionAtLeast self.django.version "1.9")
-            then throw "djblets only suported for Django<1.8.999,>=1.6.11"
-            else buildPythonPackage rec {
-    name = "Djblets-0.9";
-
-    src = pkgs.fetchurl {
-      url = "http://downloads.reviewboard.org/releases/Djblets/0.9/${name}.tar.gz";
-      sha256 = "1rr5vjwiiw3kih4k9nawislf701l838dbk5xgizadvwp6lpbpdpl";
-    };
-
-    propagatedBuildInputs = with self; [
-      django feedparser django_pipeline_1_3 pillowfight pytz ];
-
-    meta = {
-      description = "A collection of useful extensions for Django";
-      homepage = https://github.com/djblets/djblets;
-    };
-  };
+  dj-database-url = callPackage ../development/python-modules/dj-database-url { };
 
   djmail = callPackage ../development/python-modules/djmail { };
 
@@ -7720,9 +7452,7 @@ in {
     };
   };
 
-  # py3k disabled, see https://travis-ci.org/NixOS/nixpkgs/builds/48759067
-  graph-tool = if isPy3k then throw "graph-tool in Nix doesn't support py3k yet"
-    else callPackage ../development/python-modules/graph-tool/2.x.x.nix { boost = pkgs.boost159; };
+  graph-tool = callPackage ../development/python-modules/graph-tool/2.x.x.nix { };
 
   grappelli_safe = buildPythonPackage rec {
     version = "0.3.13";
@@ -8571,17 +8301,7 @@ in {
     };
   };
 
-  hvac = buildPythonPackage rec {
-    name    = "hvac-${version}";
-    version = "0.2.15";
-
-    src = pkgs.fetchurl {
-      url    = "https://pypi.python.org/packages/11/ba/6101780891b9d55f6174fa78b47d462c8c1f0cde34072b45fc39f7f8a77c/hvac-0.2.15.tar.gz";
-      sha256 = "0qxa4g1ij1bj27mbp8l54lcr7d5krkb2rayisc6shkpf2b51ip4c";
-    };
-
-    propagatedBuildInputs = with self; [ requests ];
-  };
+  hvac = callPackage ../development/python-modules/hvac { };
 
   hypothesis = callPackage ../development/python-modules/hypothesis { };
 
@@ -9134,45 +8854,8 @@ in {
 
   keyutils = callPackage ../development/python-modules/keyutils { };
 
-  klaus = buildPythonPackage rec {
-    version = "0.9.1";
-    name = "klaus-${version}";
-
-    src = pkgs.fetchurl {
-      url = "https://github.com/jonashaag/klaus/archive/${version}.tar.gz";
-      sha256 = "0k3v3p56hq8alm083grrp98znxkz1zqx0pczm2lah8qddbyrdkgm";
-    };
-
-    propagatedBuildInputs = with self;
-      [ humanize httpauth dulwich pygments flask six ];
-
-    meta = {
-      description = "The first Git web viewer that Just Works";
-      homepage    = "https://github.com/jonashaag/klaus";
-      #license     = licenses.mit; # I'm not sure about the license
-      maintainers = with maintainers; [ matthiasbeyer ];
-      platforms   = platforms.linux; # Can only test linux
-    };
-  };
-
-  klein = buildPythonPackage rec {
-    name = "klein-15.3.1";
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/k/klein/${name}.tar.gz";
-      sha256 = "1hl2psnn1chm698rimyn9dgcpl1mxgc8dj11b3ipp8z37yfjs3z9";
-    };
-
-    disabled = isPy3k;
-
-    propagatedBuildInputs = with self; [ werkzeug twisted ];
-
-    meta = {
-      description = "Klein Web Micro-Framework";
-      homepage    = "https://github.com/twisted/klein";
-      license     = licenses.mit;
-    };
-  };
-
+  klein = callPackage ../development/python-modules/klein { };
+ 
   koji = callPackage ../development/python-modules/koji { };
 
   kombu = buildPythonPackage rec {
@@ -9203,44 +8886,7 @@ in {
     };
   };
 
-  konfig = buildPythonPackage rec {
-    name = "konfig-${version}";
-    version = "1.1";
-
-    # konfig unconditionaly depend on configparser, even if it is part of
-    # the standard library in python 3.2 or above.
-    disabled = isPy3k;
-
-    src = pkgs.fetchgit {
-      url = https://github.com/mozilla-services/konfig.git;
-      rev = "refs/tags/${version}";
-      sha256 = "1h780fbrv275dcik4cs3rincza805z6q726b48r4a0qmh5d8160c";
-    };
-
-    propagatedBuildInputs = with self; [ configparser six ];
-
-    patches = [ (pkgs.writeText "konfig.patch" ''
-      diff --git a/setup.py b/setup.py
-      index 96fd858..bb4db06 100644
-      --- a/setup.py
-      +++ b/setup.py
-      @@ -20,7 +20,7 @@ setup(name='konfig',
-             author_email="tarek@mozilla.com",
-             include_package_data=True,
-             install_requires = [
-      -        'configparser', 'argparse', 'six'
-      +        'configparser', 'six'
-             ],
-             zip_safe=False,
-             classifiers=classifiers,
-    '') ];
-
-    meta = {
-      description = "Yet Another Config Parser";
-      homepage    = "https://github.com/mozilla-services/konfig";
-      license     = licenses.mpl20;
-    };
-  };
+  konfig = callPackage ../development/python-modules/konfig { };
 
   kitchen = callPackage ../development/python-modules/kitchen/default.nix { };
 
@@ -10227,33 +9873,12 @@ in {
 
   };
 
-
-  mrbob = buildPythonPackage rec {
-    name = "mrbob-${version}";
-    version = "0.1.2";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/m/mr.bob/mr.bob-${version}.tar.gz";
-      sha256 = "6737eaf98aaeae85e07ebef844ee5156df2f06a8b28d7c3dcb056f811c588121";
-    };
-
-    buildInputs = [ pkgs.glibcLocales self.mock ];
-
-    disabled = isPy3k;
-
-    LC_ALL="en_US.UTF-8";
-
-    propagatedBuildInputs = with self; [ argparse jinja2 six ] ++
-                            (optionals isPy26 [ importlib ordereddict ]);
-
-    meta = {
-      homepage = https://github.com/domenkozar/mr.bob.git;
-      description = "A tool to generate code skeletons from templates";
-    };
-  };
+  mrbob = callPackage ../development/python-modules/mrbob {};
 
   msgpack = callPackage ../development/python-modules/msgpack {};
 
+  msgpack-numpy = callPackage ../development/python-modules/msgpack-numpy {};
+
   msgpack-python = self.msgpack.overridePythonAttrs {
     pname = "msgpack-python";
     postPatch = ''
@@ -10618,24 +10243,6 @@ in {
 
   mysql-connector = callPackage ../development/python-modules/mysql-connector { };
 
-  mysql_connector_repackaged = buildPythonPackage rec {
-    name = "mysql-connector-repackaged-0.3.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/m/mysql-connector-repackaged/${name}.tar.gz";
-      sha256 = "170fbf11c54def1b5fcc919be0a890b760bb2eca81f56123a5dda0c69b5b099e";
-    };
-
-    # Judging from SyntaxError
-    disabled = isPy3k;
-
-    meta = {
-      maintainers = with maintainers; [ garbas domenkozar ];
-      platforms = platforms.linux;
-    };
-  };
-
-
   namebench = buildPythonPackage (rec {
     name = "namebench-1.3.1";
     disabled = isPy3k || isPyPy;
@@ -10805,48 +10412,7 @@ in {
     };
   };
 
-  nevow = buildPythonPackage (rec {
-    name = "nevow-${version}";
-    version = "0.14.2";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/N/Nevow/Nevow-${version}.tar.gz";
-      sha256 = "0wsh40ysj5gvfc777nrdvf5vbkr606r1gh7ibvw7x8b5g8afdy3y";
-      name = "${name}.tar.gz";
-    };
-
-    disabled = isPy3k;
-
-    propagatedBuildInputs = with self; [ twisted ];
-
-    postInstall = "twistd --help > /dev/null";
-
-    meta = {
-      description = "Nevow, a web application construction kit for Python";
-
-      longDescription = ''
-        Nevow - Pronounced as the French "nouveau", or "noo-voh", Nevow
-        is a web application construction kit written in Python.  It is
-        designed to allow the programmer to express as much of the view
-        logic as desired in Python, and includes a pure Python XML
-        expression syntax named stan to facilitate this.  However it
-        also provides rich support for designer-edited templates, using
-        a very small XML attribute language to provide bi-directional
-        template manipulation capability.
-
-        Nevow also includes formless, a declarative syntax for
-        specifying the types of method parameters and exposing these
-        methods to the web.  Forms can be rendered automatically, and
-        form posts will be validated and input coerced, rendering error
-        pages if appropriate.  Once a form post has validated
-        successfully, the method will be called with the coerced values.
-      '';
-
-      homepage = http://divmod.org/trac/wiki/DivmodNevow;
-
-      license = "BSD-style";
-    };
-  });
+  nevow = callPackage ../development/python-modules/nevow { };
 
   nibabel = callPackage ../development/python-modules/nibabel {};
 
@@ -11170,7 +10736,7 @@ in {
   dynd = buildPythonPackage rec {
     version = "0.7.2";
     name = "dynd-${version}";
-    disabled = isPyPy;
+    disabled = isPyPy || !isPy3k; # tests fail on python2, 2018-04-11
 
     src = pkgs.fetchFromGitHub {
       owner = "libdynd";
@@ -11586,34 +11152,7 @@ in {
     };
   };
 
-  WSME = buildPythonPackage rec {
-    name = "WSME-${version}";
-    version = "0.8.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/W/WSME/${name}.tar.gz";
-      sha256 = "1nw827iz5g9jlfnfbdi8kva565v0kdjzba2lccziimj09r71w900";
-    };
-
-    checkPhase = ''
-      # remove turbogears tests as we don't have it packaged
-      rm tests/test_tg*
-      # remove flask since we don't have flask-restful
-      rm tests/test_flask*
-      # https://bugs.launchpad.net/wsme/+bug/1510823
-      ${if isPy3k then "rm tests/test_cornice.py" else ""}
-
-      nosetests tests/
-    '';
-
-    propagatedBuildInputs = with self; [
-      pbr six simplegeneric netaddr pytz webob
-    ];
-    buildInputs = with self; [
-      cornice nose webtest pecan transaction cherrypy sphinx
-    ];
-  };
-
+  WSME = callPackage ../development/python-modules/WSME { };
 
   zake = buildPythonPackage rec {
     name = "zake-${version}";
@@ -11707,23 +11246,7 @@ in {
     };
   };
 
-  ldappool = buildPythonPackage rec {
-    name = "ldappool-${version}";
-    version = "1.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/l/ldappool/${name}.tar.gz";
-      sha256 = "1akmzf51cjfvmd0nvvm562z1w9vq45zsx6fa72kraqgsgxhnrhqz";
-    };
-
-    # Judging from SyntaxError
-    disabled = isPy3k;
-
-    meta = with stdenv.lib; {
-      homepage = "https://github.com/mozilla-services/ldappool";
-    };
-  };
-
+  ldappool = callPackage ../development/python-modules/ldappool { };
 
   lz4 = buildPythonPackage rec {
     name = "lz4-0.8.2";
@@ -12172,22 +11695,7 @@ in {
 
   pathpy = callPackage ../development/python-modules/path.py { };
 
-  paypalrestsdk = buildPythonPackage rec {
-    name = "paypalrestsdk-0.7.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/paypalrestsdk/${name}.tar.gz";
-      sha256 = "117kfipzfahf9ysv414bh1mmm5cc9ck5zb6rhpslx1f8gk3frvd6";
-    };
-
-    propagatedBuildInputs = with self; [ httplib2 ];
-
-    meta = {
-      homepage = https://developer.paypal.com/;
-      description = "Python APIs to create, process and manage payment";
-      license = "PayPal SDK License";
-    };
-  };
+  paypalrestsdk = callPackage ../development/python-modules/paypalrestsdk { };
 
   pbr = callPackage ../development/python-modules/pbr { };
 
@@ -12414,7 +11922,11 @@ in {
   pika-pool = callPackage ../development/python-modules/pika-pool { };
   platformio = callPackage ../development/python-modules/platformio { };
 
-  kmsxx = callPackage ../development/libraries/kmsxx { };
+  kmsxx = (callPackage ../development/libraries/kmsxx {
+    inherit (pkgs.kmsxx) stdenv;
+  }).overrideAttrs (oldAttrs: {
+    name = "${python.libPrefix}-${pkgs.kmsxx.name}";
+  });
 
   pybase64 = callPackage ../development/python-modules/pybase64 { };
 
@@ -12547,25 +12059,7 @@ in {
 
   plumbum = callPackage ../development/python-modules/plumbum { };
 
-
-  polib = buildPythonPackage rec {
-    name = "polib-${version}";
-    version = "1.0.4";
-
-    src = pkgs.fetchurl {
-      url = "http://bitbucket.org/izi/polib/downloads/${name}.tar.gz";
-      sha256 = "16klwlswfbgmkzrra80fgzhic9447pk3mnr75r2fkz72bkvpcclb";
-    };
-
-    # error: invalid command 'test'
-    doCheck = false;
-
-    meta = {
-      description = "A library to manipulate gettext files (po and mo files)";
-      homepage = "http://bitbucket.org/izi/polib/";
-      license = licenses.mit;
-    };
-  };
+  polib = callPackage ../development/python-modules/polib {};
 
   posix_ipc = buildPythonPackage rec {
     name = "posix_ipc-${version}";
@@ -12678,6 +12172,12 @@ in {
     protobuf = pkgs.protobuf3_1;
   };
 
+  protobuf3_5 = callPackage ../development/python-modules/protobuf {
+    disabled = isPyPy;
+    doCheck = !isPy3k;
+    protobuf = pkgs.protobuf3_5;
+  };
+
   psd-tools = callPackage ../development/python-modules/psd-tools { };
 
   psutil = callPackage ../development/python-modules/psutil { };
@@ -12709,35 +12209,10 @@ in {
 
   ptpython = callPackage ../development/python-modules/ptpython {};
 
-  publicsuffix = buildPythonPackage rec {
-    name = "publicsuffix-${version}";
-    version = "1.1.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/publicsuffix/${name}.tar.gz";
-      sha256 = "1adx520249z2cy7ykwjr1k190mn2888wqn9jf8qm27ly4qymjxxf";
-    };
-
-    # fix the ASCII-mode LICENSE file read
-    # disable test_fetch and the doctests (which also invoke fetch)
-    patchPhase = optionalString isPy3k ''
-      sed -i "s/)\.read(/,encoding='utf-8'\0/" setup.py
-    '' + ''
-      sed -i -e "/def test_fetch/i\\
-      \\t@unittest.skip('requires internet')" -e "/def additional_tests():/,+1d" tests.py
-    '';
-
-    meta = {
-      description = "Allows to get the public suffix of a domain name";
-      homepage = "http://pypi.python.org/pypi/publicsuffix/";
-      license = licenses.mit;
-    };
-  };
-
+  publicsuffix = callPackage ../development/python-modules/publicsuffix {};
 
   py = callPackage ../development/python-modules/py { };
 
-
   pyacoustid = buildPythonPackage rec {
     name = "pyacoustid-1.1.0";
 
@@ -12847,6 +12322,8 @@ in {
     };
   };
 
+  python-pushover = callPackage ../development/python-modules/pushover {};
+
   mongodict = buildPythonPackage rec {
     name = "mongodict-${version}";
     version = "0.3.1";
@@ -12986,6 +12463,7 @@ in {
     meta = {
       description = "Interface for working with block devices";
       license = licenses.gpl2Plus;
+      broken = isPy3k; # doesn't build on python 3, 2018-04-11
     };
   };
 
@@ -13048,6 +12526,7 @@ in {
       license = licenses.bsd2;
       platforms = platforms.all;
       homepage = "http://jparyani.github.io/pycapnp/index.html";
+      broken = true; # 2018-04-11
     };
   };
 
@@ -13117,41 +12596,31 @@ in {
     };
   });
 
-  pycups = buildPythonPackage rec {
-    name = "pycups-${version}";
-    version = "1.9.73";
-
-    src = pkgs.fetchurl {
-      url = "http://cyberelk.net/tim/data/pycups/pycups-${version}.tar.bz2";
-      sha256 = "c381be011889ca6f728598578c89c8ac9f7ab1e95b614474df9f2fa831ae5335";
-    };
-
-    buildInputs = [ pkgs.cups ];
-
-    # Wants to connect to CUPS
-    doCheck = false;
-
-    meta = {
-      description = "Python bindings for libcups";
-      homepage = http://cyberelk.net/tim/software/pycups/;
-      license = with licenses; [ gpl2Plus ];
-    };
-
-  };
+  pycups = callPackage ../development/python-modules/pycups { };
 
   pycurl = buildPythonPackage (rec {
-    name = "pycurl-7.19.5.1";
+    pname = "pycurl";
+    version = "7.43.0.1";
     disabled = isPyPy; # https://github.com/pycurl/pycurl/issues/208
 
-    src = pkgs.fetchurl {
-      url = "http://pycurl.sourceforge.net/download/${name}.tar.gz";
-      sha256 = "0v5w66ir3siimfzg3kc8hfrrilwwnbxq5bvipmrpyxar0kw715vf";
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "1ali1gjs9iliwjra7w0y5hwg79a2fd0f4ydvv6k27sgxpbr1n8s3";
     };
 
     buildInputs = with self; [ pkgs.curl pkgs.openssl.out ];
 
-    # error: invalid command 'test'
-    doCheck = false;
+    checkInputs = with self; [ bottle pytest nose flaky ];
+
+    checkPhase = ''
+      py.test -k "not ssh_key_cb_test \
+                  and not test_libcurl_ssl_gnutls \
+                  and not test_libcurl_ssl_nss \
+                  and not test_libcurl_ssl_openssl \
+                  and not test_libcurl_ssl_unrecognized \
+                  and not test_request_with_verifypeer \
+                  and not test_ssl_in_static_libs" tests
+    '';
 
     preConfigure = ''
       substituteInPlace setup.py --replace '--static-libs' '--libs'
@@ -13161,7 +12630,6 @@ in {
     meta = {
       homepage = http://pycurl.sourceforge.net/;
       description = "Python wrapper for libcurl";
-      platforms = platforms.linux;
     };
   });
 
@@ -13977,24 +13445,7 @@ in {
     };
   };
 
-  progressbar = buildPythonPackage (rec {
-    name = "progressbar-2.2";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/progressbar/${name}.tar.gz";
-      sha256 = "dfee5201237ca0e942baa4d451fee8bf8a54065a337fabe7378b8585aeda56a3";
-    };
-
-    # invalid command 'test'
-    doCheck = false;
-
-    meta = {
-      homepage = http://code.google.com/p/python-progressbar/;
-      description = "Text progressbar library for python";
-      license = licenses.lgpl3Plus;
-      maintainers = with maintainers; [ domenkozar ];
-    };
-  });
+  progressbar = callPackage ../development/python-modules/progressbar {};
 
   progressbar2 = callPackage ../development/python-modules/progressbar2 { };
 
@@ -14305,23 +13756,6 @@ in {
     };
   };
 
-  pysphere = buildPythonPackage rec {
-    name = "pysphere-0.1.8";
-
-    src = pkgs.fetchurl {
-      url = "http://pysphere.googlecode.com/files/${name}.zip";
-      sha256 = "b3f9ba1f67afb17ac41725b01737cd42e8a39d9e745282dd9b692ae631af0add";
-    };
-
-    disabled = isPy3k;
-
-    meta = {
-      homepage    = "https://code.google.com/p/pysphere/";
-      license     = "BSD";
-      description = "Python API for interaction with the VMWare vSphere";
-    };
-  };
-
   pysqlite = buildPythonPackage rec {
     name = "pysqlite-2.8.3";
 
@@ -14757,22 +14191,7 @@ in {
 
   redis = callPackage ../development/python-modules/redis { };
 
-  rednose = buildPythonPackage rec {
-    name = "rednose-${version}";
-    version = "1.2.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/r/rednose/${name}.tar.gz";
-      sha256 = "0b0bsna217lr1nykyhl5fgjly15zhdvqd4prg4wy1zrgfv7al6m0";
-    };
-
-    meta = {
-      description = "A python nose plugin adding color to console results.";
-    };
-
-    buildInputs = with self; [ nose six ];
-    propagatedBuildInputs = with self; [ colorama termstyle ];
-  };
+  rednose = callPackage ../development/python-modules/rednose { };
 
   reikna = callPackage ../development/python-modules/reikna { };
 
@@ -14917,27 +14336,6 @@ in {
 
   django-multiselectfield = callPackage ../development/python-modules/django-multiselectfield { };
 
-  reviewboard = buildPythonPackage rec {
-    name = "ReviewBoard-2.5.1.1";
-
-    src = pkgs.fetchurl {
-      url = "http://downloads.reviewboard.org/releases/ReviewBoard/2.5/${name}.tar.gz";
-      sha256 = "14m8yy2aqxnnzi822b797wc9nmkfkp2fqmq24asdnm66bxhyzjwn";
-    };
-
-    patchPhase = ''
-      sed -i 's/mimeparse/python-mimeparse/' setup.py
-      sed -i 's/markdown>=2.4.0,<2.4.999/markdown/' setup.py
-    '';
-
-    propagatedBuildInputs = with self;
-      [ django recaptcha_client pytz memcached dateutil_1_5 paramiko flup
-        pygments djblets django_evolution pycrypto pysvn pillow
-        psycopg2 django-haystack python_mimeparse markdown django-multiselectfield
-      ];
-  };
-
-
   rdflib = callPackage ../development/python-modules/rdflib { };
 
   isodate = buildPythonPackage rec {
@@ -15534,6 +14932,8 @@ in {
     };
   };
 
+  slimit = callPackage ../development/python-modules/slimit { };
+
   slob = buildPythonPackage rec {
     name = "slob-unstable-2016-11-03";
 
@@ -15697,6 +15097,8 @@ in {
 
   stevedore = callPackage ../development/python-modules/stevedore {};
 
+  text-unidecode = callPackage ../development/python-modules/text-unidecode { };
+
   Theano = callPackage ../development/python-modules/Theano rec {
     cudaSupport = pkgs.config.cudaSupport or false;
     cudnnSupport = cudaSupport;
@@ -16910,13 +16312,14 @@ in {
       # Move the tkinter module
       mkdir -p $out/${py.sitePackages}
       mv lib/${py.libPrefix}/lib-dynload/_tkinter* $out/${py.sitePackages}/
+    '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
       # Update the rpath to point to python without x11Support
       old_rpath=$(patchelf --print-rpath $out/${py.sitePackages}/_tkinter*)
       new_rpath=$(sed "s#${py}#${python}#g" <<< "$old_rpath" )
       patchelf --set-rpath $new_rpath $out/${py.sitePackages}/_tkinter*
     '';
 
-    inherit (py) meta;
+    meta = py.meta;
   };
 
   tlslite = buildPythonPackage rec {
@@ -16954,21 +16357,7 @@ in {
     };
   };
 
-  tmdb3 = buildPythonPackage rec {
-    name = "tmdb3-${version}";
-    version = "0.6.17";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/t/tmdb3/${name}.zip";
-      sha256 = "64a6c3f1a60a9d8bf18f96a5403f3735b334040345ac3646064931c209720972";
-    };
-
-    meta = {
-      description = "Python implementation of the v3 API for TheMovieDB.org, allowing access to movie and cast information";
-      homepage = https://pypi.python.org/pypi/tmdb3;
-      license = licenses.bsd3;
-    };
-  };
+  tmdb3 = callPackage ../development/python-modules/tmdb3 { };
 
   toolz = callPackage ../development/python-modules/toolz { };
 
@@ -17497,23 +16886,7 @@ in {
 
   virtkey = callPackage ../development/python-modules/virtkey { };
 
-  virtual-display = buildPythonPackage rec {
-    name = "PyVirtualDisplay-0.1.5";
-
-    propagatedBuildInputs = with self; [ EasyProcess ];
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/P/PyVirtualDisplay/${name}.tar.gz";
-      sha256 = "aa6aef08995e14c20cc670d933bfa6e70d736d0b555af309b2e989e2faa9ee53";
-    };
-
-    meta = {
-      description = "Python wrapper for Xvfb, Xephyr and Xvnc";
-      homepage = "https://github.com/ponty/pyvirtualdisplay";
-      license = licenses.bsdOriginal;
-      maintainers = with maintainers; [ layus ];
-    };
-  };
+  virtual-display = callPackage ../development/python-modules/virtual-display { };
 
   virtualenv = callPackage ../development/python-modules/virtualenv { };
 
@@ -17980,23 +17353,7 @@ EOF
 
   persistent = callPackage ../development/python-modules/persistent {};
 
-  xdot = buildPythonPackage rec {
-    name = "xdot-0.9";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/x/xdot/${name}.tar.gz";
-      sha256 = "01v9vmgdxz1q2m2vq2b4aqx4ycw7grc0l4is673ygvyg9rk02dx3";
-    };
-
-    nativeBuildInputs = with pkgs; [ wrapGAppsHook ];
-    propagatedBuildInputs = with self; [ pkgs.gobjectIntrospection pygobject3 pkgs.graphviz pkgs.gnome3.gtk ];
-
-    meta = {
-      description = "xdot.py is an interactive viewer for graphs written in Graphviz's dot";
-      homepage = https://github.com/jrfonseca/xdot.py;
-      license = licenses.lgpl3Plus;
-    };
-  };
+  xdot = callPackage ../development/python-modules/xdot { };
 
   zetup = callPackage ../development/python-modules/zetup { };
 
@@ -18370,26 +17727,7 @@ EOF
     propagatedBuildInputs = with self; [ requests webob ];
   };
 
-  tunigo = buildPythonPackage rec {
-    name = "tunigo-${version}";
-    version = "1.0.0";
-    propagatedBuildInputs = with self; [ requests ];
-
-    src = pkgs.fetchFromGitHub {
-      owner = "trygveaa";
-      repo = "python-tunigo";
-      rev = "v${version}";
-      sha256 = "07q9girrjjffzkn8xj4l3ynf9m4psi809zf6f81f54jdb330p2fs";
-    };
-
-    buildInputs = with self; [ mock nose ];
-
-    meta = {
-      description = "Python API for the browse feature of Spotify";
-      homepage = https://github.com/trygveaa/python-tunigo;
-      license = licenses.asl20;
-    };
-  };
+  tunigo = callPackage ../development/python-modules/tunigo { };
 
   tarman = buildPythonPackage rec {
     version = "0.1.3";
@@ -18746,30 +18084,7 @@ EOF
 
   pyusb = callPackage ../development/python-modules/pyusb { libusb1 = pkgs.libusb1; };
 
-  BlinkStick = buildPythonPackage rec {
-    name = "BlinkStick-${version}";
-    version = "1.1.8";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/B/BlinkStick/${name}.tar.gz";
-      sha256 = "3edf4b83a3fa1a7bd953b452b76542d54285ff6f1145b6e19f9b5438120fa408";
-    };
-
-    # Requires pyusb 1.0.0b1.
-    # Likely current pyusb will work but we need to patch the hard requirement then.
-    broken = true;
-
-    patchPhase = "substituteInPlace setup.py --replace pyusb==1.0.0b1 pyusb==1.0.0";
-
-    propagatedBuildInputs = with self; [ pyusb ];
-
-    meta = {
-      description = "Python package to control BlinkStick USB devices";
-      homepage = https://pypi.python.org/pypi/BlinkStick/;
-      license = licenses.bsd3;
-      maintainers = with maintainers; [ np ];
-    };
-  };
+  BlinkStick = callPackage ../development/python-modules/blinkstick { };
 
   usbtmc = callPackage ../development/python-modules/usbtmc {};
 
@@ -19237,17 +18552,7 @@ EOF
     };
   };
 
-  pushbullet = buildPythonPackage rec {
-    name = "pushbullet.py-${version}";
-    version = "0.10.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pushbullet.py/pushbullet.py-0.10.0.tar.gz";
-      sha256 = "537d3132e1dbc91e31ade4cccf4c7def6f9d48e904a67f341d35b8a54a9be74d";
-    };
-
-    propagatedBuildInputs = with self; [requests websocket_client python_magic ];
-  };
+  pushbullet = callPackage ../development/python-modules/pushbullet { };
 
   power = buildPythonPackage rec {
     name = "power-1.4";
@@ -19521,51 +18826,7 @@ EOF
   };
 
 
-  thumbor = buildPythonPackage rec {
-    name = "thumbor-${version}";
-    version = "6.3.2";
-
-    disabled = ! isPy27;
-
-    buildInputs = with self; [ statsd nose ];
-
-    propagatedBuildInputs = with self; [
-      tornado
-      pycrypto
-      pycurl
-      pytz
-      pillow
-      derpconf
-      python_magic
-      # thumborPexif
-      pexif
-      libthumbor
-      opencv
-    ] ++ optionals (!isPy3k) [ futures ];
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/t/thumbor/${name}.tar.gz";
-      sha256 = "0787245x4yci34cdfc9xaxhds0lv60476qgp132pwa78hrpc9m31";
-    };
-
-    patches = [
-      (pkgs.fetchurl {
-          url = "https://github.com/thumbor/thumbor/commit/376f688a8a0b82e50388c885d9d733572f2eb3e6.patch";
-          sha256 = "1j2434yqb6pz61d65dsy8w6lvyzvh5ksizadi5hgjzfw6s46v6yn";
-      })
-    ];
-
-    prePatch = ''
-      substituteInPlace setup.py \
-        --replace '"argparse",' ""
-    '';
-
-    meta = {
-      description = "A smart imaging service";
-      homepage = https://github.com/globocom/thumbor/wiki;
-      license = licenses.mit;
-    };
-  };
+  thumbor = callPackage ../development/python-modules/thumbor { };
 
   thumborPexif = self.buildPythonPackage rec {
     name = "thumbor-pexif-0.14";
@@ -19660,21 +18921,7 @@ EOF
     };
   };
 
-  pychart = buildPythonPackage rec {
-    name = "pychart-1.39";
-    disabled = ! isPy27;
-
-    src = pkgs.fetchurl {
-      url = "http://download.gna.org/pychart/PyChart-1.39.tar.gz";
-      sha256 = "882650928776a7ca72e67054a9e0ac98f78645f279c0cfb5910db28f03f07c2e";
-    };
-
-    meta = {
-      description = "Library for creating high quality encapsulated Postscript, PDF, PNG, or SVG charts";
-      homepage = http://home.gna.org/pychart/;
-      license = licenses.gpl2;
-    };
-  };
+  pychart = callPackage ../development/python-modules/pychart {};
 
   parsimonious = buildPythonPackage rec {
     version = "0.7.0";
@@ -20440,39 +19687,9 @@ EOF
     };
   };
 
-  termstyle = buildPythonPackage rec {
-    name = "python-termstyle-${version}";
-    version = "0.1.10";
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/python-termstyle/${name}.tar.gz";
-      sha256 = "1qllzkx1alf14zcfapppf8w87si4cpa7lgjmdp3f5idzdyqnnapl";
-    };
+  termstyle = callPackage ../development/python-modules/termstyle { };
 
-    meta = {
-      description = "Console colouring for python";
-      homepage = "https://pypi.python.org/pypi/python-termstyle/0.1.10";
-      license = licenses.bsdOriginal;
-    };
-
-  };
-
-  green = buildPythonPackage rec {
-    name = "green-${version}";
-    version = "2.3.0";
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/g/green/${name}.tar.gz";
-      sha256 = "1888khfl9yxb8yfxq9b48dxwplqlxx8s0l530z5j7c6bx74v08b4";
-    };
-
-    propagatedBuildInputs = with self; [ termstyle colorama ];
-    buildInputs = with self; [ mock ];
-
-    meta = {
-      description = "Python test runner";
-      homepage = "https://github.com/CleanCut/green";
-      license = licenses.mit;
-    };
-  };
+  green = callPackage ../development/python-modules/green { };
 
   topydo = throw "python3Packages.topydo was moved to topydo"; # 2017-09-22
 
@@ -20536,30 +19753,7 @@ EOF
     };
   };
 
-  htmltreediff = buildPythonPackage rec{
-    version = "0.1.2";
-    pname = "htmltreediff";
-    name = pname + "-${version}";
-
-    # Does not work with Py >= 3
-    disabled = !isPy27;
-
-    src = pkgs.fetchFromGitHub {
-      owner = "christian-oudard";
-      repo = pname;
-      rev = "v" + version;
-      sha256 = "16mqp2jyznrw1mgd3qzybq28h2k5wz7vmmz1m6xpgscazyjhvvd1";
-    };
-
-    propagatedBuildInputs = with self; [ lxml html5lib ];
-
-    meta = {
-      description = " Structure-aware diff for html and xml documents";
-      homepage = https://github.com/christian-oudard/htmltreediff;
-      license = licenses.bsdOriginal;
-      maintainers = with maintainers; [];
-    };
-  };
+  htmltreediff = callPackage ../development/python-modules/htmltreediff { };
 
   repeated_test = buildPythonPackage rec {
     name = "repeated_test-${version}";
@@ -21176,18 +20370,6 @@ EOF
 
   whitenoise = callPackage ../development/python-modules/whitenoise { };
 
-  wp_export_parser = buildPythonPackage rec {
-    name = "${pname}-${version}";
-    pname = "wp_export_parser";
-    version = "1.0";
-    src = pkgs.fetchFromGitHub {
-      owner = "RealGeeks";
-      repo = "wp_export_parser";
-      rev = "479211f6c5a7d034fd77762dfed381c3315cd773";
-      sha256 = "1ad0mkixc0s86djwsvhp1qlvcfs25086nh0qw7bys49gz8shczzi";
-    };
-  };
-
   XlsxWriter = callPackage ../development/python-modules/XlsxWriter { };
 
   yowsup = callPackage ../development/python-modules/yowsup { };
@@ -21243,10 +20425,16 @@ EOF
 
   thinc = callPackage ../development/python-modules/thinc { };
 
+  yahooweather = callPackage ../development/python-modules/yahooweather { };
+
   spacy = callPackage ../development/python-modules/spacy { };
 
   spacy_models = callPackage ../development/python-modules/spacy/models.nix { };
 
+  pyspark = callPackage ../development/python-modules/pyspark { };
+
+  sseclient = callPackage ../development/python-modules/sseclient { };
+
   textacy = callPackage ../development/python-modules/textacy { };
 
   pyemd  = callPackage ../development/python-modules/pyemd { };
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index e7f8d3f2e4c..aee73f20669 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -119,7 +119,11 @@ let
               jobs.tests.cc-wrapper-clang-5.x86_64-linux
               jobs.tests.cc-wrapper-clang-5.x86_64-darwin
               jobs.tests.cc-wrapper-libcxx-5.x86_64-linux
-              jobs.tests.cc-wrapper-libcxx-5.x86_64-darwin
+              jobs.tests.cc-wrapper-libcxx-6.x86_64-darwin
+              jobs.tests.cc-wrapper-clang-6.x86_64-linux
+              jobs.tests.cc-wrapper-clang-6.x86_64-darwin
+              jobs.tests.cc-wrapper-libcxx-6.x86_64-linux
+              jobs.tests.cc-wrapper-libcxx-6.x86_64-darwin
               jobs.tests.cc-multilib-gcc.x86_64-linux
               jobs.tests.cc-multilib-clang.x86_64-linux
               jobs.tests.stdenv-inputs.x86_64-linux