diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2018-10-01 19:41:36 +0200 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2018-10-01 19:42:07 +0200 |
| commit | 1383c08f2c086cb0b90c8624ebab4ca1182e3384 (patch) | |
| tree | cce12f1295915db0a6861f148715764ad64ce0c9 | |
| parent | 9c4b11e9a060de2175aef4d36881f97812ab17fe (diff) | |
| parent | 83fd9785f65b8fd4cbaa146270f90b2a0d74b5f3 (diff) | |
| download | nixlib-1383c08f2c086cb0b90c8624ebab4ca1182e3384.tar nixlib-1383c08f2c086cb0b90c8624ebab4ca1182e3384.tar.gz nixlib-1383c08f2c086cb0b90c8624ebab4ca1182e3384.tar.bz2 nixlib-1383c08f2c086cb0b90c8624ebab4ca1182e3384.tar.lz nixlib-1383c08f2c086cb0b90c8624ebab4ca1182e3384.tar.xz nixlib-1383c08f2c086cb0b90c8624ebab4ca1182e3384.tar.zst nixlib-1383c08f2c086cb0b90c8624ebab4ca1182e3384.zip | |
Merge branch 'master' into staging-next
385 files changed, 12433 insertions, 6420 deletions
diff --git a/doc/functions.xml b/doc/functions.xml index 0c0d82b0342c..8223a8b0531c 100644 --- a/doc/functions.xml +++ b/doc/functions.xml @@ -682,6 +682,177 @@ hello latest de2bf4786de6 About a minute ago 25.2MB </example> </section> + <section xml:id="ssec-pkgs-dockerTools-buildLayeredImage"> + <title>buildLayeredImage</title> + + <para> + Create a Docker image with many of the store paths being on their own layer + to improve sharing between images. + </para> + + <variablelist> + <varlistentry> + <term> + <varname>name</varname> + </term> + <listitem> + <para> + The name of the resulting image. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <varname>tag</varname> <emphasis>optional</emphasis> + </term> + <listitem> + <para> + Tag of the generated image. + </para> + <para> + <emphasis>Default:</emphasis> the output path's hash + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <varname>contents</varname> <emphasis>optional</emphasis> + </term> + <listitem> + <para> + Top level paths in the container. Either a single derivation, or a list + of derivations. + </para> + <para> + <emphasis>Default:</emphasis> <literal>[]</literal> + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <varname>config</varname> <emphasis>optional</emphasis> + </term> + <listitem> + <para> + Run-time configuration of the container. A full list of the options are + available at in the + <link xlink:href="https://github.com/moby/moby/blob/master/image/spec/v1.2.md#image-json-field-descriptions"> + Docker Image Specification v1.2.0 </link>. + </para> + <para> + <emphasis>Default:</emphasis> <literal>{}</literal> + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <varname>created</varname> <emphasis>optional</emphasis> + </term> + <listitem> + <para> + Date and time the layers were created. Follows the same + <literal>now</literal> exception supported by + <literal>buildImage</literal>. + </para> + <para> + <emphasis>Default:</emphasis> <literal>1970-01-01T00:00:01Z</literal> + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <varname>maxLayers</varname> <emphasis>optional</emphasis> + </term> + <listitem> + <para> + Maximum number of layers to create. + </para> + <para> + <emphasis>Default:</emphasis> <literal>24</literal> + </para> + </listitem> + </varlistentry> + </variablelist> + + <section xml:id="dockerTools-buildLayeredImage-arg-contents"> + <title>Behavior of <varname>contents</varname> in the final image</title> + + <para> + Each path directly listed in <varname>contents</varname> will have a + symlink in the root of the image. + </para> + + <para> + For example: +<programlisting><![CDATA[ +pkgs.dockerTools.buildLayeredImage { + name = "hello"; + contents = [ pkgs.hello ]; +} +]]></programlisting> + will create symlinks for all the paths in the <literal>hello</literal> + package: +<screen><![CDATA[ +/bin/hello -> /nix/store/h1zb1padqbbb7jicsvkmrym3r6snphxg-hello-2.10/bin/hello +/share/info/hello.info -> /nix/store/h1zb1padqbbb7jicsvkmrym3r6snphxg-hello-2.10/share/info/hello.info +/share/locale/bg/LC_MESSAGES/hello.mo -> /nix/store/h1zb1padqbbb7jicsvkmrym3r6snphxg-hello-2.10/share/locale/bg/LC_MESSAGES/hello.mo +]]></screen> + </para> + </section> + + <section xml:id="dockerTools-buildLayeredImage-arg-config"> + <title>Automatic inclusion of <varname>config</varname> references</title> + + <para> + The closure of <varname>config</varname> is automatically included in the + closure of the final image. + </para> + + <para> + This allows you to make very simple Docker images with very little code. + This container will start up and run <command>hello</command>: +<programlisting><![CDATA[ +pkgs.dockerTools.buildLayeredImage { + name = "hello"; + config.Cmd = [ "${pkgs.hello}/bin/hello" ]; +} +]]></programlisting> + </para> + </section> + + <section xml:id="dockerTools-buildLayeredImage-arg-maxLayers"> + <title>Adjusting <varname>maxLayers</varname></title> + + <para> + Increasing the <varname>maxLayers</varname> increases the number of layers + which have a chance to be shared between different images. + </para> + + <para> + Modern Docker installations support up to 128 layers, however older + versions support as few as 42. + </para> + + <para> + If the produced image will not be extended by other Docker builds, it is + safe to set <varname>maxLayers</varname> to <literal>128</literal>. + However it will be impossible to extend the image further. + </para> + + <para> + The first (<literal>maxLayers-2</literal>) most "popular" paths will have + their own individual layers, then layer #<literal>maxLayers-1</literal> + will contain all the remaining "unpopular" paths, and finally layer + #<literal>maxLayers</literal> will contain the Image configuration. + </para> + + <para> + Docker's Layers are not inherently ordered, they are content-addressable + and are not explicitly layered until they are composed in to an Image. + </para> + </section> + </section> + <section xml:id="ssec-pkgs-dockerTools-fetchFromRegistry"> <title>pullImage</title> diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f3b0772faa86..3b7329a8d790 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -221,6 +221,11 @@ github = "amiloradovsky"; name = "Andrew Miloradovsky"; }; + aminb = { + email = "amin@aminb.org"; + github = "aminb"; + name = "Amin Bandali"; + }; aminechikhaoui = { email = "amine.chikhaoui91@gmail.com"; github = "AmineChikhaoui"; @@ -1327,6 +1332,11 @@ github = "etu"; name = "Elis Hirwing"; }; + evck = { + email = "eric@evenchick.com"; + github = "ericevenchick"; + name = "Eric Evenchick"; + }; exfalso = { email = "0slemi0@gmail.com"; github = "exfalso"; @@ -1630,6 +1640,11 @@ github = "hamhut1066"; name = "Hamish Hutchings"; }; + haslersn = { + email = "haslersn@fius.informatik.uni-stuttgart.de"; + github = "haslersn"; + name = "Sebastian Hasler"; + }; havvy = { email = "ryan.havvy@gmail.com"; github = "havvy"; @@ -2561,6 +2576,11 @@ github = "mdaiter"; name = "Matthew S. Daiter"; }; + mdevlamynck = { + email = "matthias.devlamynck@mailoo.org"; + github = "mdevlamynck"; + name = "Matthias Devlamynck"; + }; meditans = { email = "meditans@gmail.com"; github = "meditans"; @@ -3998,6 +4018,11 @@ github = "sztupi"; name = "Attila Sztupak"; }; + t184256 = { + email = "monk@unboiled.info"; + github = "t184256"; + name = "Alexander Sosedkin"; + }; tadfisher = { email = "tadfisher@gmail.com"; github = "tadfisher"; @@ -4431,6 +4456,11 @@ github = "vrthra"; name = "Rahul Gopinath"; }; + vskilet = { + email = "victor@sene.ovh"; + github = "vskilet"; + name = "Victor SENE"; + }; vyp = { email = "elisp.vim@gmail.com"; github = "vyp"; diff --git a/nixos/doc/manual/administration/imperative-containers.xml b/nixos/doc/manual/administration/imperative-containers.xml index 9bb62bc2ece9..fa380477f6cb 100644 --- a/nixos/doc/manual/administration/imperative-containers.xml +++ b/nixos/doc/manual/administration/imperative-containers.xml @@ -73,8 +73,7 @@ Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux </para> <para> - There are several ways to change the configuration of the container. First, - on the host, you can edit + To change the configuration of the container, you can edit <literal>/var/lib/container/<replaceable>name</replaceable>/etc/nixos/configuration.nix</literal>, and run <screen> @@ -87,8 +86,7 @@ Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux <xref linkend="opt-services.httpd.enable"/> = true; <xref linkend="opt-services.httpd.adminAddr"/> = "foo@example.org"; <xref linkend="opt-networking.firewall.allowedTCPPorts"/> = [ 80 ]; -' - + ' # curl http://$(nixos-container show-ip foo)/ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">… </screen> @@ -97,11 +95,13 @@ Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux </para> <para> - Alternatively, you can change the configuration from within the container - itself by running <command>nixos-rebuild switch</command> inside the - container. Note that the container by default does not have a copy of the - NixOS channel, so you should run <command>nix-channel --update</command> - first. + Note that in previous versions of NixOS (17.09 and earlier) one could also + use all nix-related commands (like <command>nixos-rebuild switch</command>) + from inside the container. However, since the release of Nix 2.0 this is not + supported anymore. Supporting Nix commands inside the container might be + possible again in future versions. See + <link xlink:href="https://github.com/NixOS/nixpkgs/issues/40355">the github + issue</link> for tracking progress on this issue. </para> <para> diff --git a/nixos/doc/manual/configuration/linux-kernel.xml b/nixos/doc/manual/configuration/linux-kernel.xml index 2f766f2b32f7..644d3a33ffd2 100644 --- a/nixos/doc/manual/configuration/linux-kernel.xml +++ b/nixos/doc/manual/configuration/linux-kernel.xml @@ -84,18 +84,17 @@ nixpkgs.config.packageOverrides = pkgs: allowImportFromDerivation = true; }; ]]></screen> - -You can edit the config with this snippet (by default <command>make menuconfig</command> won't work - out of the box on nixos): - <screen><![CDATA[ + You can edit the config with this snippet (by default <command>make + menuconfig</command> won't work out of the box on nixos): +<screen><![CDATA[ nix-shell -E 'with import <nixpkgs> {}; kernelToOverride.overrideAttrs (o: {nativeBuildInputs=o.nativeBuildInputs ++ [ pkgconfig ncurses ];})' ]]></screen> - - - or you can let nixpkgs generate the configuration. - Nixpkgs generates it via answering the interactive kernel utility <command>make config</command>. - The answers depend on parameters passed to <filename>pkgs/os-specific/linux/kernel/generic.nix</filename> - (which you can influence by overriding <literal>extraConfig, autoModules, modDirVersion, preferBuiltin, extraConfig</literal>). + or you can let nixpkgs generate the configuration. Nixpkgs generates it via + answering the interactive kernel utility <command>make config</command>. The + answers depend on parameters passed to + <filename>pkgs/os-specific/linux/kernel/generic.nix</filename> (which you + can influence by overriding <literal>extraConfig, autoModules, + modDirVersion, preferBuiltin, extraConfig</literal>). <screen><![CDATA[ mptcp93.override ({ diff --git a/nixos/doc/manual/development/debugging-nixos-tests.xml b/nixos/doc/manual/development/debugging-nixos-tests.xml new file mode 100644 index 000000000000..30e58e1e3554 --- /dev/null +++ b/nixos/doc/manual/development/debugging-nixos-tests.xml @@ -0,0 +1,37 @@ +<section xmlns="http://docbook.org/ns/docbook" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:xi="http://www.w3.org/2001/XInclude" + version="5.0" + xml:id="sec-debugging-nixos-tests"> + <title>Debugging NixOS tests</title> + + <para> + Tests may fail and infrastructure offers access to inspect machine state. + </para> + + <para> + To prevent test from stopping and cleaning up, insert a sleep command: + </para> + +<programlisting> +$machine->succeed("sleep 84000"); +</programlisting> + + <para> + As soon as machine starts run as root: + </para> + +<programlisting> +nix-shell -p socat --run "socat STDIO,raw,echo=0,escape=0x11 UNIX:/tmp/nix-build-vm-test-run-*.drv-0/vm-state-machine/backdoor" +</programlisting> + + <para> + You may need to find the correct path, replacing <literal>/tmp</literal>, + <literal>*</literal> or <literal>machine</literal>. + </para> + + <para> + Press "enter" to open up console and login as "root". After you're done, + press "ctrl-q" to exit the console. + </para> +</section> diff --git a/nixos/doc/manual/development/nixos-tests.xml b/nixos/doc/manual/development/nixos-tests.xml index 2695082e3867..d068887200a9 100644 --- a/nixos/doc/manual/development/nixos-tests.xml +++ b/nixos/doc/manual/development/nixos-tests.xml @@ -16,4 +16,5 @@ xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/tests">nixos/test <xi:include href="writing-nixos-tests.xml" /> <xi:include href="running-nixos-tests.xml" /> <xi:include href="running-nixos-tests-interactively.xml" /> + <xi:include href="debugging-nixos-tests.xml" /> </chapter> diff --git a/nixos/doc/manual/installation/installing-behind-a-proxy.xml b/nixos/doc/manual/installation/installing-behind-a-proxy.xml index c59d073c61c7..8f9baff44b51 100644 --- a/nixos/doc/manual/installation/installing-behind-a-proxy.xml +++ b/nixos/doc/manual/installation/installing-behind-a-proxy.xml @@ -5,28 +5,29 @@ xml:id="sec-installing-behind-proxy"> <title>Installing behind a proxy</title> -<para> + <para> To install NixOS behind a proxy, do the following before running <literal>nixos-install</literal>. -</para> -<orderedlist numeration="arabic"> + </para> + + <orderedlist numeration="arabic"> <listitem> - <para> - Update proxy configuration in - <literal>/mnt/etc/nixos/configuration.nix</literal> to keep the - internet accessible after reboot. - </para> - <programlisting> + <para> + Update proxy configuration in + <literal>/mnt/etc/nixos/configuration.nix</literal> to keep the internet + accessible after reboot. + </para> +<programlisting> networking.proxy.default = "http://user:password@proxy:port/"; networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; </programlisting> </listitem> <listitem> - <para> - Setup the proxy environment variables in the shell where you are - running <literal>nixos-install</literal>. - </para> - <programlisting> + <para> + Setup the proxy environment variables in the shell where you are running + <literal>nixos-install</literal>. + </para> +<programlisting> # proxy_url="http://user:password@proxy:port/" # export http_proxy="$proxy_url" # export HTTP_PROXY="$proxy_url" @@ -34,14 +35,14 @@ networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; # export HTTPS_PROXY="$proxy_url" </programlisting> </listitem> -</orderedlist> + </orderedlist> -<note> -<para> - If you are switching networks with different proxy configurations, use the - <literal>nesting.clone</literal> option in - <literal>configuration.nix</literal> to switch proxies at runtime. - Refer to <xref linkend="ch-options" /> for more information. -</para> -</note> + <note> + <para> + If you are switching networks with different proxy configurations, use the + <literal>nesting.clone</literal> option in + <literal>configuration.nix</literal> to switch proxies at runtime. Refer to + <xref linkend="ch-options" /> for more information. + </para> + </note> </section> diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index 916384559e24..1366e8f93596 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -327,8 +327,8 @@ Retype new UNIX password: *** <note> <para> For unattended installations, it is possible to use - <command>nixos-install --no-root-passwd</command> - in order to disable the password prompt entirely. + <command>nixos-install --no-root-passwd</command> in order to disable the + password prompt entirely. </para> </note> </para> diff --git a/nixos/doc/manual/manual.xml b/nixos/doc/manual/manual.xml index a5efde32885c..12f52e1997c8 100644 --- a/nixos/doc/manual/manual.xml +++ b/nixos/doc/manual/manual.xml @@ -17,8 +17,8 @@ <para> If you encounter problems, please report them on the <literal - xlink:href="https://discourse.nixos.org">Discourse</literal> - or on the <link + xlink:href="https://discourse.nixos.org">Discourse</literal> or + on the <link xlink:href="irc://irc.freenode.net/#nixos"> <literal>#nixos</literal> channel on Freenode</link>. Bugs should be reported in diff --git a/nixos/doc/manual/release-notes/rl-1509.xml b/nixos/doc/manual/release-notes/rl-1509.xml index 4eb2f9aa0a95..e500c9d63422 100644 --- a/nixos/doc/manual/release-notes/rl-1509.xml +++ b/nixos/doc/manual/release-notes/rl-1509.xml @@ -435,11 +435,11 @@ system.autoUpgrade.enable = true; <programlisting> system.stateVersion = "14.12"; </programlisting> - The new option <option>system.stateVersion</option> ensures that - certain configuration changes that could break existing systems (such as - the <command>sshd</command> host key setting) will maintain compatibility - with the specified NixOS release. NixOps sets the state version of - existing deployments automatically. + The new option <option>system.stateVersion</option> ensures that certain + configuration changes that could break existing systems (such as the + <command>sshd</command> host key setting) will maintain compatibility with + the specified NixOS release. NixOps sets the state version of existing + deployments automatically. </para> </listitem> <listitem> diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml index 5a565f08b2cb..f0797b51340d 100644 --- a/nixos/doc/manual/release-notes/rl-1809.xml +++ b/nixos/doc/manual/release-notes/rl-1809.xml @@ -19,13 +19,13 @@ <itemizedlist> <listitem> - <para> - Support for wrapping binaries using <literal>firejail</literal> has been - added through <varname>programs.firejail.wrappedBinaries</varname>. - </para> - <para> - For example - </para> + <para> + Support for wrapping binaries using <literal>firejail</literal> has been + added through <varname>programs.firejail.wrappedBinaries</varname>. + </para> + <para> + For example + </para> <programlisting> programs.firejail = { enable = true; @@ -35,9 +35,10 @@ programs.firejail = { }; }; </programlisting> - <para> - This will place <literal>firefox</literal> and <literal>mpv</literal> binaries in the global path wrapped by firejail. - </para> + <para> + This will place <literal>firefox</literal> and <literal>mpv</literal> + binaries in the global path wrapped by firejail. + </para> </listitem> <listitem> <para> @@ -75,16 +76,20 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' <itemizedlist> <listitem> <para> - The <varname>services.cassandra</varname> module has been reworked and - was rewritten from scratch. The service has succeeding tests for - the versions 2.1, 2.2, 3.0 and 3.11 of <link - xlink:href="https://cassandra.apache.org/">Apache Cassandra</link>. + The <varname>services.cassandra</varname> module has been reworked and was + rewritten from scratch. The service has succeeding tests for the versions + 2.1, 2.2, 3.0 and 3.11 of + <link + xlink:href="https://cassandra.apache.org/">Apache + Cassandra</link>. </para> </listitem> <listitem> <para> - There is a new <varname>services.foundationdb</varname> module for deploying - <link xlink:href="https://www.foundationdb.org">FoundationDB</link> clusters. + There is a new <varname>services.foundationdb</varname> module for + deploying + <link xlink:href="https://www.foundationdb.org">FoundationDB</link> + clusters. </para> </listitem> <listitem> @@ -97,24 +102,26 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' </listitem> <listitem> <para> - <varname>services.strongswan-swanctl</varname> - is a modern replacement for <varname>services.strongswan</varname>. - You can use either one of them to setup IPsec VPNs but not both at the same time. + <varname>services.strongswan-swanctl</varname> is a modern replacement for + <varname>services.strongswan</varname>. You can use either one of them to + setup IPsec VPNs but not both at the same time. </para> <para> - <varname>services.strongswan-swanctl</varname> uses the - <link xlink:href="https://wiki.strongswan.org/projects/strongswan/wiki/swanctl">swanctl</link> - command which uses the modern - <link xlink:href="https://github.com/strongswan/strongswan/blob/master/src/libcharon/plugins/vici/README.md">vici</link> - <emphasis>Versatile IKE Configuration Interface</emphasis>. - The deprecated <literal>ipsec</literal> command used in <varname>services.strongswan</varname> is using the legacy - <link xlink:href="https://github.com/strongswan/strongswan/blob/master/README_LEGACY.md">stroke configuration interface</link>. + <varname>services.strongswan-swanctl</varname> uses the + <link xlink:href="https://wiki.strongswan.org/projects/strongswan/wiki/swanctl">swanctl</link> + command which uses the modern + <link xlink:href="https://github.com/strongswan/strongswan/blob/master/src/libcharon/plugins/vici/README.md">vici</link> + <emphasis>Versatile IKE Configuration Interface</emphasis>. The deprecated + <literal>ipsec</literal> command used in + <varname>services.strongswan</varname> is using the legacy + <link xlink:href="https://github.com/strongswan/strongswan/blob/master/README_LEGACY.md">stroke + configuration interface</link>. </para> </listitem> <listitem> <para> - The new <varname>services.elasticsearch-curator</varname> service - periodically curates or manages, your Elasticsearch indices and snapshots. + The new <varname>services.elasticsearch-curator</varname> service + periodically curates or manages, your Elasticsearch indices and snapshots. </para> </listitem> </itemizedlist> @@ -135,8 +142,8 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' <itemizedlist> <listitem> <para> - The deprecated <varname>services.cassandra</varname> module has - seen a complete rewrite. (See above.) + The deprecated <varname>services.cassandra</varname> module has seen a + complete rewrite. (See above.) </para> </listitem> <listitem> @@ -186,41 +193,44 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' </listitem> <listitem> <para> - <varname>services.munge</varname> now runs as user (and group) <literal>munge</literal> instead of root. - Make sure the key file is accessible to the daemon. + <varname>services.munge</varname> now runs as user (and group) + <literal>munge</literal> instead of root. Make sure the key file is + accessible to the daemon. </para> </listitem> <listitem> <para> - <varname>dockerTools.buildImage</varname> now uses <literal>null</literal> as default value for <varname>tag</varname>, - which indicates that the nix output hash will be used as tag. + <varname>dockerTools.buildImage</varname> now uses <literal>null</literal> + as default value for <varname>tag</varname>, which indicates that the nix + output hash will be used as tag. </para> </listitem> <listitem> <para> - The ELK stack: <varname>elasticsearch</varname>, <varname>logstash</varname> and <varname>kibana</varname> - has been upgraded from 2.* to 6.3.*. - The 2.* versions have been <link xlink:href="https://www.elastic.co/support/eol">unsupported since last year</link> - so they have been removed. You can still use the 5.* versions under the names - <varname>elasticsearch5</varname>, <varname>logstash5</varname> and - <varname>kibana5</varname>. + The ELK stack: <varname>elasticsearch</varname>, + <varname>logstash</varname> and <varname>kibana</varname> has been + upgraded from 2.* to 6.3.*. The 2.* versions have been + <link xlink:href="https://www.elastic.co/support/eol">unsupported since + last year</link> so they have been removed. You can still use the 5.* + versions under the names <varname>elasticsearch5</varname>, + <varname>logstash5</varname> and <varname>kibana5</varname>. </para> <para> - The elastic beats: - <varname>filebeat</varname>, <varname>heartbeat</varname>, - <varname>metricbeat</varname> and <varname>packetbeat</varname> - have had the same treatment: they now target 6.3.* as well. - The 5.* versions are available under the names: + The elastic beats: <varname>filebeat</varname>, + <varname>heartbeat</varname>, <varname>metricbeat</varname> and + <varname>packetbeat</varname> have had the same treatment: they now target + 6.3.* as well. The 5.* versions are available under the names: <varname>filebeat5</varname>, <varname>heartbeat5</varname>, <varname>metricbeat5</varname> and <varname>packetbeat5</varname> </para> <para> The ELK-6.3 stack now comes with - <link xlink:href="https://www.elastic.co/products/x-pack/open">X-Pack by default</link>. - Since X-Pack is licensed under the - <link xlink:href="https://github.com/elastic/elasticsearch/blob/master/licenses/ELASTIC-LICENSE.txt">Elastic License</link> - the ELK packages now have an unfree license. To use them you need to specify - <literal>allowUnfree = true;</literal> in your nixpkgs configuration. + <link xlink:href="https://www.elastic.co/products/x-pack/open">X-Pack by + default</link>. Since X-Pack is licensed under the + <link xlink:href="https://github.com/elastic/elasticsearch/blob/master/licenses/ELASTIC-LICENSE.txt">Elastic + License</link> the ELK packages now have an unfree license. To use them + you need to specify <literal>allowUnfree = true;</literal> in your nixpkgs + configuration. </para> <para> Fortunately there is also a free variant of the ELK stack without X-Pack. @@ -231,20 +241,23 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' </listitem> <listitem> <para> - Options - <literal>boot.initrd.luks.devices.<replaceable>name</replaceable>.yubikey.ramfsMountPoint</literal> - <literal>boot.initrd.luks.devices.<replaceable>name</replaceable>.yubikey.storage.mountPoint</literal> - were removed. <literal>luksroot.nix</literal> module never supported more than one YubiKey at - a time anyway, hence those options never had any effect. You should be able to remove them - from your config without any issues. + Options + <literal>boot.initrd.luks.devices.<replaceable>name</replaceable>.yubikey.ramfsMountPoint</literal> + <literal>boot.initrd.luks.devices.<replaceable>name</replaceable>.yubikey.storage.mountPoint</literal> + were removed. <literal>luksroot.nix</literal> module never supported more + than one YubiKey at a time anyway, hence those options never had any + effect. You should be able to remove them from your config without any + issues. </para> </listitem> <listitem> <para> - <literal>stdenv.system</literal> and <literal>system</literal> in nixpkgs now refer to the host platform instead of the build platform. - For native builds this is not change, let alone a breaking one. - For cross builds, it is a breaking change, and <literal>stdenv.buildPlatform.system</literal> can be used instead for the old behavior. - They should be using that anyways for clarity. + <literal>stdenv.system</literal> and <literal>system</literal> in nixpkgs + now refer to the host platform instead of the build platform. For native + builds this is not change, let alone a breaking one. For cross builds, it + is a breaking change, and <literal>stdenv.buildPlatform.system</literal> + can be used instead for the old behavior. They should be using that + anyways for clarity. </para> </listitem> </itemizedlist> @@ -298,26 +311,33 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' </listitem> <listitem> <para> - The <literal>pkgs</literal> argument to NixOS modules can now be set directly using <literal>nixpkgs.pkgs</literal>. Previously, only the <literal>system</literal>, <literal>config</literal> and <literal>overlays</literal> arguments could be used to influence <literal>pkgs</literal>. + The <literal>pkgs</literal> argument to NixOS modules can now be set + directly using <literal>nixpkgs.pkgs</literal>. Previously, only the + <literal>system</literal>, <literal>config</literal> and + <literal>overlays</literal> arguments could be used to influence + <literal>pkgs</literal>. </para> </listitem> <listitem> <para> - A NixOS system can now be constructed more easily based on a preexisting invocation of Nixpkgs. For example: - <programlisting> + A NixOS system can now be constructed more easily based on a preexisting + invocation of Nixpkgs. For example: +<programlisting> inherit (pkgs.nixos { boot.loader.grub.enable = false; fileSystems."/".device = "/dev/xvda1"; }) toplevel kernel initialRamdisk manual; </programlisting> - - This benefits evaluation performance, lets you write Nixpkgs packages that depend on NixOS images and is consistent with a deployment architecture that would be centered around Nixpkgs overlays. + This benefits evaluation performance, lets you write Nixpkgs packages that + depend on NixOS images and is consistent with a deployment architecture + that would be centered around Nixpkgs overlays. </para> </listitem> <listitem> <para> - <literal>lib.traceValIfNot</literal> has been deprecated. Use - <literal>if/then/else</literal> and <literal>lib.traceValSeq</literal> instead. + <literal>lib.traceValIfNot</literal> has been deprecated. Use + <literal>if/then/else</literal> and <literal>lib.traceValSeq</literal> + instead. </para> </listitem> <listitem> @@ -336,9 +356,9 @@ inherit (pkgs.nixos { </listitem> <listitem> <para> - <literal>lib.recursiveUpdateUntil</literal> was not acting according to its - specification. It has been fixed to act according to the docstring, and a - test has been added. + <literal>lib.recursiveUpdateUntil</literal> was not acting according to + its specification. It has been fixed to act according to the docstring, + and a test has been added. </para> </listitem> <listitem> @@ -408,11 +428,11 @@ inherit (pkgs.nixos { </para> </listitem> <listitem> - <para> - The Kubernetes package has been bumped to major version 1.11. - Please consult the - <link xlink:href="https://github.com/kubernetes/kubernetes/blob/release-1.11/CHANGELOG-1.11.md">release notes</link> - for details on new features and api changes. + <para> + The Kubernetes package has been bumped to major version 1.11. Please + consult the + <link xlink:href="https://github.com/kubernetes/kubernetes/blob/release-1.11/CHANGELOG-1.11.md">release + notes</link> for details on new features and api changes. </para> </listitem> <listitem> @@ -432,8 +452,8 @@ inherit (pkgs.nixos { </listitem> <listitem> <para> - The option <varname>services.kubernetes.apiserver.address</varname> - was renamed to <varname>services.kubernetes.apiserver.bindAddress</varname>. + The option <varname>services.kubernetes.apiserver.address</varname> was + renamed to <varname>services.kubernetes.apiserver.bindAddress</varname>. Note that the default value has changed from 127.0.0.1 to 0.0.0.0. </para> </listitem> @@ -445,76 +465,86 @@ inherit (pkgs.nixos { </listitem> <listitem> <para> - The option <varname>services.kubernetes.addons.dashboard.enableRBAC</varname> - was renamed to <varname>services.kubernetes.addons.dashboard.rbac.enable</varname>. + The option + <varname>services.kubernetes.addons.dashboard.enableRBAC</varname> was + renamed to + <varname>services.kubernetes.addons.dashboard.rbac.enable</varname>. </para> </listitem> <listitem> <para> The Kubernetes Dashboard now has only minimal RBAC permissions by default. - If dashboard cluster-admin rights are desired, - set <varname>services.kubernetes.addons.dashboard.rbac.clusterAdmin</varname> to true. - On existing clusters, in order for the revocation of privileges to take effect, - the current ClusterRoleBinding for kubernetes-dashboard must be manually removed: - <literal>kubectl delete clusterrolebinding kubernetes-dashboard</literal> + If dashboard cluster-admin rights are desired, set + <varname>services.kubernetes.addons.dashboard.rbac.clusterAdmin</varname> + to true. On existing clusters, in order for the revocation of privileges + to take effect, the current ClusterRoleBinding for kubernetes-dashboard + must be manually removed: <literal>kubectl delete clusterrolebinding + kubernetes-dashboard</literal> </para> </listitem> <listitem> <para> The <varname>programs.screen</varname> module provides allows to configure - <literal>/etc/screenrc</literal>, however the module behaved fairly counterintuitive as - the config exists, but the package wasn't available. Since 18.09 <literal>pkgs.screen</literal> - will be added to <literal>environment.systemPackages</literal>. + <literal>/etc/screenrc</literal>, however the module behaved fairly + counterintuitive as the config exists, but the package wasn't available. + Since 18.09 <literal>pkgs.screen</literal> will be added to + <literal>environment.systemPackages</literal>. </para> </listitem> <listitem> <para> - The module <option>services.networking.hostapd</option> now uses WPA2 by default. + The module <option>services.networking.hostapd</option> now uses WPA2 by + default. </para> </listitem> <listitem> <para> - <varname>s6Dns</varname>, <varname>s6Networking</varname>, - <varname>s6LinuxUtils</varname> and <varname>s6PortableUtils</varname> - renamed to - <varname>s6-dns</varname>, <varname>s6-networking</varname>, - <varname>s6-linux-utils</varname> and <varname>s6-portable-utils</varname> respectively. + <varname>s6Dns</varname>, <varname>s6Networking</varname>, + <varname>s6LinuxUtils</varname> and <varname>s6PortableUtils</varname> + renamed to <varname>s6-dns</varname>, <varname>s6-networking</varname>, + <varname>s6-linux-utils</varname> and <varname>s6-portable-utils</varname> + respectively. </para> - </listitem> - <listitem> + </listitem> + <listitem> <para> - The module option <option>nix.useSandbox</option> is now defaulted to <literal>true</literal>. + The module option <option>nix.useSandbox</option> is now defaulted to + <literal>true</literal>. </para> - </listitem> - <listitem> + </listitem> + <listitem> <para> - The config activation script of <literal>nixos-rebuild</literal> now - <link xlink:href="https://www.freedesktop.org/software/systemd/man/systemctl.html#Manager%20Lifecycle%20Commands">reloads</link> - all user units for each authenticated user. + The config activation script of <literal>nixos-rebuild</literal> now + <link xlink:href="https://www.freedesktop.org/software/systemd/man/systemctl.html#Manager%20Lifecycle%20Commands">reloads</link> + all user units for each authenticated user. </para> - </listitem> - <listitem> + </listitem> + <listitem> <para> - The default display manager is now LightDM. - To use SLiM set <literal>services.xserver.displayManager.slim.enable</literal> - to <literal>true</literal>. + The default display manager is now LightDM. To use SLiM set + <literal>services.xserver.displayManager.slim.enable</literal> to + <literal>true</literal>. </para> - </listitem> - <listitem> + </listitem> + <listitem> <para> - NixOS option descriptions are now automatically broken up into individual - paragraphs if the text contains two consecutive newlines, so it's no - longer necessary to use <code></para><para></code> to start - a new paragraph. + NixOS option descriptions are now automatically broken up into individual + paragraphs if the text contains two consecutive newlines, so it's no + longer necessary to use <code></para><para></code> to start a + new paragraph. </para> - </listitem> - <listitem> + </listitem> + <listitem> <para> - Top-level <literal>buildPlatform</literal>, <literal>hostPlatform</literal>, and <literal>targetPlatform</literal> in Nixpkgs are deprecated. - Please use their equivalents in <literal>stdenv</literal> instead: - <literal>stdenv.buildPlatform</literal>, <literal>stdenv.hostPlatform</literal>, and <literal>stdenv.targetPlatform</literal>. + Top-level <literal>buildPlatform</literal>, + <literal>hostPlatform</literal>, and <literal>targetPlatform</literal> in + Nixpkgs are deprecated. Please use their equivalents in + <literal>stdenv</literal> instead: + <literal>stdenv.buildPlatform</literal>, + <literal>stdenv.hostPlatform</literal>, and + <literal>stdenv.targetPlatform</literal>. </para> - </listitem> + </listitem> </itemizedlist> </section> </section> diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml index 3e7f8d0681d2..1f26d4765b97 100644 --- a/nixos/doc/manual/release-notes/rl-1903.xml +++ b/nixos/doc/manual/release-notes/rl-1903.xml @@ -100,9 +100,10 @@ </itemizedlist> </listitem> <listitem> - <para> - Package <varname>rabbitmq_server</varname> is renamed to <varname>rabbitmq-server</varname>. - </para> + <para> + Package <varname>rabbitmq_server</varname> is renamed to + <varname>rabbitmq-server</varname>. + </para> </listitem> </itemizedlist> </section> diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm index b18f48464cee..a00fe25c2b8e 100644 --- a/nixos/lib/test-driver/Machine.pm +++ b/nixos/lib/test-driver/Machine.pm @@ -155,8 +155,10 @@ sub start { $ENV{USE_TMPDIR} = 1; $ENV{QEMU_OPTS} = ($self->{allowReboot} ? "" : "-no-reboot ") . - "-monitor unix:./monitor -chardev socket,id=shell,path=./shell " . - "-device virtio-serial -device virtconsole,chardev=shell " . + "-monitor unix:./monitor " . + "-chardev socket,id=shell,path=./shell -device virtio-serial -device virtconsole,chardev=shell " . + # socket backdoor, see "Debugging NixOS tests" section in NixOS manual + "-chardev socket,id=backdoor,path=./backdoor,server,nowait -device virtio-serial -device virtconsole,chardev=backdoor " . "-device virtio-rng-pci " . ($showGraphics ? "-serial stdio" : "-nographic") . " " . ($ENV{QEMU_OPTS} || ""); chdir $self->{stateDir} or die; diff --git a/nixos/modules/i18n/input-method/default.xml b/nixos/modules/i18n/input-method/default.xml index ab918a9fb23e..117482fb0d57 100644 --- a/nixos/modules/i18n/input-method/default.xml +++ b/nixos/modules/i18n/input-method/default.xml @@ -3,32 +3,50 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="module-services-input-methods"> - -<title>Input Methods</title> - -<para>Input methods are an operating system component that allows any data, such - as keyboard strokes or mouse movements, to be received as input. In this way - users can enter characters and symbols not found on their input devices. Using - an input method is obligatory for any language that has more graphemes than - there are keys on the keyboard.</para> - -<para>The following input methods are available in NixOS:</para> - -<itemizedlist> - <listitem><para>IBus: The intelligent input bus.</para></listitem> - <listitem><para>Fcitx: A customizable lightweight input - method.</para></listitem> - <listitem><para>Nabi: A Korean input method based on XIM.</para></listitem> - <listitem><para>Uim: The universal input method, is a library with a XIM - bridge.</para></listitem> -</itemizedlist> - -<section xml:id="module-services-input-methods-ibus"><title>IBus</title> - -<para>IBus is an Intelligent Input Bus. It provides full featured and user - friendly input method user interface.</para> - -<para>The following snippet can be used to configure IBus:</para> + <title>Input Methods</title> + <para> + Input methods are an operating system component that allows any data, such as + keyboard strokes or mouse movements, to be received as input. In this way + users can enter characters and symbols not found on their input devices. + Using an input method is obligatory for any language that has more graphemes + than there are keys on the keyboard. + </para> + <para> + The following input methods are available in NixOS: + </para> + <itemizedlist> + <listitem> + <para> + IBus: The intelligent input bus. + </para> + </listitem> + <listitem> + <para> + Fcitx: A customizable lightweight input method. + </para> + </listitem> + <listitem> + <para> + Nabi: A Korean input method based on XIM. + </para> + </listitem> + <listitem> + <para> + Uim: The universal input method, is a library with a XIM bridge. + </para> + </listitem> + </itemizedlist> + <section xml:id="module-services-input-methods-ibus"> + <title>IBus</title> + + <para> + IBus is an Intelligent Input Bus. It provides full featured and user + friendly input method user interface. + </para> + + <para> + The following snippet can be used to configure IBus: + </para> <programlisting> i18n.inputMethod = { @@ -37,57 +55,89 @@ i18n.inputMethod = { }; </programlisting> -<para><literal>i18n.inputMethod.ibus.engines</literal> is optional and can be - used to add extra IBus engines.</para> - -<para>Available extra IBus engines are:</para> - -<itemizedlist> - <listitem><para>Anthy (<literal>ibus-engines.anthy</literal>): Anthy is a - system for Japanese input method. It converts Hiragana text to Kana Kanji - mixed text.</para></listitem> - <listitem><para>Hangul (<literal>ibus-engines.hangul</literal>): Korean input - method.</para></listitem> - <listitem><para>m17n (<literal>ibus-engines.m17n</literal>): m17n is an input - method that uses input methods and corresponding icons in the m17n - database.</para></listitem> - <listitem><para>mozc (<literal>ibus-engines.mozc</literal>): A Japanese input - method from Google.</para></listitem> - <listitem><para>Table (<literal>ibus-engines.table</literal>): An input method - that load tables of input methods.</para></listitem> - <listitem><para>table-others (<literal>ibus-engines.table-others</literal>): - Various table-based input methods. To use this, and any other table-based - input methods, it must appear in the list of engines along with - <literal>table</literal>. For example: + <para> + <literal>i18n.inputMethod.ibus.engines</literal> is optional and can be used + to add extra IBus engines. + </para> + + <para> + Available extra IBus engines are: + </para> + + <itemizedlist> + <listitem> + <para> + Anthy (<literal>ibus-engines.anthy</literal>): Anthy is a system for + Japanese input method. It converts Hiragana text to Kana Kanji mixed text. + </para> + </listitem> + <listitem> + <para> + Hangul (<literal>ibus-engines.hangul</literal>): Korean input method. + </para> + </listitem> + <listitem> + <para> + m17n (<literal>ibus-engines.m17n</literal>): m17n is an input method that + uses input methods and corresponding icons in the m17n database. + </para> + </listitem> + <listitem> + <para> + mozc (<literal>ibus-engines.mozc</literal>): A Japanese input method from + Google. + </para> + </listitem> + <listitem> + <para> + Table (<literal>ibus-engines.table</literal>): An input method that load + tables of input methods. + </para> + </listitem> + <listitem> + <para> + table-others (<literal>ibus-engines.table-others</literal>): Various + table-based input methods. To use this, and any other table-based input + methods, it must appear in the list of engines along with + <literal>table</literal>. For example: <programlisting> ibus.engines = with pkgs.ibus-engines; [ table table-others ]; </programlisting> - </para></listitem> -</itemizedlist> - -<para>To use any input method, the package must be added in the configuration, - as shown above, and also (after running <literal>nixos-rebuild</literal>) the - input method must be added from IBus' preference dialog.</para> - -<simplesect xml:id="module-services-input-methods-troubleshooting"> - <title>Troubleshooting</title> - <para>If IBus works in some applications but not others, a likely cause of - this is that IBus is depending on a different version of - <literal>glib</literal> to what the applications are depending on. This can - be checked by running <literal>nix-store -q --requisites <path> | grep - glib</literal>, where <literal><path></literal> is the path of either - IBus or an application in the Nix store. The <literal>glib</literal> - packages must match exactly. If they do not, uninstalling and reinstalling - the application is a likely fix.</para> -</simplesect> -</section> - -<section xml:id="module-services-input-methods-fcitx"><title>Fcitx</title> - -<para>Fcitx is an input method framework with extension support. It has three - built-in Input Method Engine, Pinyin, QuWei and Table-based input - methods.</para> -<para>The following snippet can be used to configure Fcitx:</para> + </para> + </listitem> + </itemizedlist> + + <para> + To use any input method, the package must be added in the configuration, as + shown above, and also (after running <literal>nixos-rebuild</literal>) the + input method must be added from IBus' preference dialog. + </para> + + <simplesect xml:id="module-services-input-methods-troubleshooting"> + <title>Troubleshooting</title> + <para> + If IBus works in some applications but not others, a likely cause of this + is that IBus is depending on a different version of <literal>glib</literal> + to what the applications are depending on. This can be checked by running + <literal>nix-store -q --requisites <path> | grep glib</literal>, + where <literal><path></literal> is the path of either IBus or an + application in the Nix store. The <literal>glib</literal> packages must + match exactly. If they do not, uninstalling and reinstalling the + application is a likely fix. + </para> + </simplesect> + </section> + <section xml:id="module-services-input-methods-fcitx"> + <title>Fcitx</title> + + <para> + Fcitx is an input method framework with extension support. It has three + built-in Input Method Engine, Pinyin, QuWei and Table-based input methods. + </para> + + <para> + The following snippet can be used to configure Fcitx: + </para> <programlisting> i18n.inputMethod = { @@ -96,51 +146,89 @@ i18n.inputMethod = { }; </programlisting> -<para><literal>i18n.inputMethod.fcitx.engines</literal> is optional and can be - used to add extra Fcitx engines.</para> - -<para>Available extra Fcitx engines are:</para> - -<itemizedlist> - <listitem><para>Anthy (<literal>fcitx-engines.anthy</literal>): Anthy is a - system for Japanese input method. It converts Hiragana text to Kana Kanji - mixed text.</para></listitem> - <listitem><para>Chewing (<literal>fcitx-engines.chewing</literal>): Chewing is - an intelligent Zhuyin input method. It is one of the most popular input - methods among Traditional Chinese Unix users.</para></listitem> - <listitem><para>Hangul (<literal>fcitx-engines.hangul</literal>): Korean input - method.</para></listitem> - <listitem><para>Unikey (<literal>fcitx-engines.unikey</literal>): Vietnamese input - method.</para></listitem> - <listitem><para>m17n (<literal>fcitx-engines.m17n</literal>): m17n is an input - method that uses input methods and corresponding icons in the m17n - database.</para></listitem> - <listitem><para>mozc (<literal>fcitx-engines.mozc</literal>): A Japanese input - method from Google.</para></listitem> - <listitem><para>table-others (<literal>fcitx-engines.table-others</literal>): - Various table-based input methods.</para></listitem> -</itemizedlist> -</section> - -<section xml:id="module-services-input-methods-nabi"><title>Nabi</title> - -<para>Nabi is an easy to use Korean X input method. It allows you to enter - phonetic Korean characters (hangul) and pictographic Korean characters - (hanja).</para> -<para>The following snippet can be used to configure Nabi:</para> + <para> + <literal>i18n.inputMethod.fcitx.engines</literal> is optional and can be + used to add extra Fcitx engines. + </para> + + <para> + Available extra Fcitx engines are: + </para> + + <itemizedlist> + <listitem> + <para> + Anthy (<literal>fcitx-engines.anthy</literal>): Anthy is a system for + Japanese input method. It converts Hiragana text to Kana Kanji mixed text. + </para> + </listitem> + <listitem> + <para> + Chewing (<literal>fcitx-engines.chewing</literal>): Chewing is an + intelligent Zhuyin input method. It is one of the most popular input + methods among Traditional Chinese Unix users. + </para> + </listitem> + <listitem> + <para> + Hangul (<literal>fcitx-engines.hangul</literal>): Korean input method. + </para> + </listitem> + <listitem> + <para> + Unikey (<literal>fcitx-engines.unikey</literal>): Vietnamese input method. + </para> + </listitem> + <listitem> + <para> + m17n (<literal>fcitx-engines.m17n</literal>): m17n is an input method that + uses input methods and corresponding icons in the m17n database. + </para> + </listitem> + <listitem> + <para> + mozc (<literal>fcitx-engines.mozc</literal>): A Japanese input method from + Google. + </para> + </listitem> + <listitem> + <para> + table-others (<literal>fcitx-engines.table-others</literal>): Various + table-based input methods. + </para> + </listitem> + </itemizedlist> + </section> + <section xml:id="module-services-input-methods-nabi"> + <title>Nabi</title> + + <para> + Nabi is an easy to use Korean X input method. It allows you to enter + phonetic Korean characters (hangul) and pictographic Korean characters + (hanja). + </para> + + <para> + The following snippet can be used to configure Nabi: + </para> <programlisting> i18n.inputMethod = { <link linkend="opt-i18n.inputMethod.enabled">enabled</link> = "nabi"; }; </programlisting> -</section> + </section> + <section xml:id="module-services-input-methods-uim"> + <title>Uim</title> -<section xml:id="module-services-input-methods-uim"><title>Uim</title> + <para> + Uim (short for "universal input method") is a multilingual input method + framework. Applications can use it through so-called bridges. + </para> -<para>Uim (short for "universal input method") is a multilingual input method - framework. Applications can use it through so-called bridges.</para> -<para>The following snippet can be used to configure uim:</para> + <para> + The following snippet can be used to configure uim: + </para> <programlisting> i18n.inputMethod = { @@ -148,8 +236,9 @@ i18n.inputMethod = { }; </programlisting> -<para>Note: The <xref linkend="opt-i18n.inputMethod.uim.toolbar"/> option can be - used to choose uim toolbar.</para> - -</section> + <para> + Note: The <xref linkend="opt-i18n.inputMethod.uim.toolbar"/> option can be + used to choose uim toolbar. + </para> + </section> </chapter> diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 3d34fb973e74..0b4ed6d3b628 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -289,7 +289,7 @@ stanchion = 262; riak-cs = 263; infinoted = 264; - # keystone = 265; # unused, removed 2017-12-13 + sickbeard = 265; # glance = 266; # unused, removed 2017-12-13 couchpotato = 267; gogs = 268; @@ -330,6 +330,7 @@ # render = 303; # unused zeronet = 304; lirc = 305; + lidarr = 306; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -580,7 +581,7 @@ stanchion = 262; riak-cs = 263; infinoted = 264; - # keystone = 265; # unused, removed 2017-12-13 + sickbeard = 265; # glance = 266; # unused, removed 2017-12-13 couchpotato = 267; gogs = 268; @@ -620,6 +621,7 @@ render = 303; # default udev rules from systemd requires these zeronet = 304; lirc = 305; + lidarr = 306; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 1a8f522a969d..f4c7cf601bf1 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -365,6 +365,7 @@ ./services/misc/jackett.nix ./services/misc/logkeys.nix ./services/misc/leaps.nix + ./services/misc/lidarr.nix ./services/misc/mantisbt.nix ./services/misc/mathics.nix ./services/misc/matrix-synapse.nix @@ -395,6 +396,7 @@ ./services/misc/rogue.nix ./services/misc/serviio.nix ./services/misc/safeeyes.nix + ./services/misc/sickbeard.nix ./services/misc/siproxd.nix ./services/misc/snapper.nix ./services/misc/sonarr.nix diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix index 9c84d267a334..d51ed195580d 100644 --- a/nixos/modules/profiles/installation-device.nix +++ b/nixos/modules/profiles/installation-device.nix @@ -25,6 +25,7 @@ with lib; documentation.enable = mkForce true; # Show the manual. + documentation.nixos.enable = mkForce true; services.nixosManual.showManual = true; # Let the user play Rogue on TTY 8 during the installation. diff --git a/nixos/modules/programs/digitalbitbox/doc.xml b/nixos/modules/programs/digitalbitbox/doc.xml index a26653dda535..c63201628dbd 100644 --- a/nixos/modules/programs/digitalbitbox/doc.xml +++ b/nixos/modules/programs/digitalbitbox/doc.xml @@ -3,75 +3,64 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="module-programs-digitalbitbox"> - - <title>Digital Bitbox</title> - - <para> - Digital Bitbox is a hardware wallet and second-factor authenticator. - </para> - - <para> - The <literal>digitalbitbox</literal> programs module may be - installed by setting <literal>programs.digitalbitbox</literal> - to <literal>true</literal> in a manner similar to - + <title>Digital Bitbox</title> + <para> + Digital Bitbox is a hardware wallet and second-factor authenticator. + </para> + <para> + The <literal>digitalbitbox</literal> programs module may be installed by + setting <literal>programs.digitalbitbox</literal> to <literal>true</literal> + in a manner similar to <programlisting> <xref linkend="opt-programs.digitalbitbox.enable"/> = true; </programlisting> - - and bundles the <literal>digitalbitbox</literal> package (see <xref + and bundles the <literal>digitalbitbox</literal> package (see + <xref linkend="sec-digitalbitbox-package" />), which contains the - <literal>dbb-app</literal> and <literal>dbb-cli</literal> binaries, - along with the hardware module (see <xref + <literal>dbb-app</literal> and <literal>dbb-cli</literal> binaries, along + with the hardware module (see + <xref linkend="sec-digitalbitbox-hardware-module" />) which sets up the - necessary udev rules to access the device. - </para> - - <para> - Enabling the digitalbitbox module is pretty much the easiest way to - get a Digital Bitbox device working on your system. - </para> + necessary udev rules to access the device. + </para> + <para> + Enabling the digitalbitbox module is pretty much the easiest way to get a + Digital Bitbox device working on your system. + </para> + <para> + For more information, see + <link xlink:href="https://digitalbitbox.com/start_linux" />. + </para> + <section xml:id="sec-digitalbitbox-package"> + <title>Package</title> <para> - For more information, see - <link xlink:href="https://digitalbitbox.com/start_linux" />. - </para> - - <section xml:id="sec-digitalbitbox-package"> - <title>Package</title> - - <para> - The binaries, <literal>dbb-app</literal> (a GUI tool) and - <literal>dbb-cli</literal> (a CLI tool), are available through the - <literal>digitalbitbox</literal> package which could be installed - as follows: - + The binaries, <literal>dbb-app</literal> (a GUI tool) and + <literal>dbb-cli</literal> (a CLI tool), are available through the + <literal>digitalbitbox</literal> package which could be installed as + follows: <programlisting> <xref linkend="opt-environment.systemPackages"/> = [ pkgs.digitalbitbox ]; </programlisting> - </para> - </section> - - - <section xml:id="sec-digitalbitbox-hardware-module"> - <title>Hardware</title> - - <para> - The digitalbitbox hardware package enables the udev rules for - Digital Bitbox devices and may be installed as follows: + </para> + </section> + <section xml:id="sec-digitalbitbox-hardware-module"> + <title>Hardware</title> + <para> + The digitalbitbox hardware package enables the udev rules for Digital Bitbox + devices and may be installed as follows: <programlisting> <xref linkend="opt-hardware.digitalbitbox.enable"/> = true; </programlisting> - </para> - - <para> - In order to alter the udev rules, one may provide different values for - the <literal>udevRule51</literal> and <literal>udevRule52</literal> - attributes by means of overriding as follows: + </para> + <para> + In order to alter the udev rules, one may provide different values for the + <literal>udevRule51</literal> and <literal>udevRule52</literal> attributes + by means of overriding as follows: <programlisting> programs.digitalbitbox = { <link linkend="opt-programs.digitalbitbox.enable">enable</link> = true; @@ -80,6 +69,6 @@ programs.digitalbitbox = { }; }; </programlisting> - </para> - </section> + </para> + </section> </chapter> diff --git a/nixos/modules/programs/plotinus.xml b/nixos/modules/programs/plotinus.xml index 91740ee16ec2..902cd89e0c49 100644 --- a/nixos/modules/programs/plotinus.xml +++ b/nixos/modules/programs/plotinus.xml @@ -3,23 +3,28 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="module-program-plotinus"> - -<title>Plotinus</title> - -<para><emphasis>Source:</emphasis> <filename>modules/programs/plotinus.nix</filename></para> - -<para><emphasis>Upstream documentation:</emphasis> <link xlink:href="https://github.com/p-e-w/plotinus"/></para> - -<para>Plotinus is a searchable command palette in every modern GTK+ application.</para> - -<para>When in a GTK+3 application and Plotinus is enabled, you can press <literal>Ctrl+Shift+P</literal> to open the command palette. The command palette provides a searchable list of of all menu items in the application.</para> - -<para>To enable Plotinus, add the following to your <filename>configuration.nix</filename>: - + <title>Plotinus</title> + <para> + <emphasis>Source:</emphasis> + <filename>modules/programs/plotinus.nix</filename> + </para> + <para> + <emphasis>Upstream documentation:</emphasis> + <link xlink:href="https://github.com/p-e-w/plotinus"/> + </para> + <para> + Plotinus is a searchable command palette in every modern GTK+ application. + </para> + <para> + When in a GTK+3 application and Plotinus is enabled, you can press + <literal>Ctrl+Shift+P</literal> to open the command palette. The command + palette provides a searchable list of of all menu items in the application. + </para> + <para> + To enable Plotinus, add the following to your + <filename>configuration.nix</filename>: <programlisting> <xref linkend="opt-programs.plotinus.enable"/> = true; </programlisting> - -</para> - + </para> </chapter> diff --git a/nixos/modules/programs/zsh/oh-my-zsh.xml b/nixos/modules/programs/zsh/oh-my-zsh.xml index 6567d4a42fac..5cf690c1a560 100644 --- a/nixos/modules/programs/zsh/oh-my-zsh.xml +++ b/nixos/modules/programs/zsh/oh-my-zsh.xml @@ -3,18 +3,20 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="module-programs-zsh-ohmyzsh"> - -<title>Oh my ZSH</title> - -<para><literal><link xlink:href="https://ohmyz.sh/">oh-my-zsh</link></literal> is a framework -to manage your <link xlink:href="https://www.zsh.org/">ZSH</link> configuration -including completion scripts for several CLI tools or custom prompt themes.</para> - -<section xml:id="module-programs-oh-my-zsh-usage"><title>Basic usage</title> -<para>The module uses the <literal>oh-my-zsh</literal> package with all available features. The -initial setup using Nix expressions is fairly similar to the configuration format -of <literal>oh-my-zsh</literal>. - + <title>Oh my ZSH</title> + <para> + <literal><link xlink:href="https://ohmyz.sh/">oh-my-zsh</link></literal> is a + framework to manage your <link xlink:href="https://www.zsh.org/">ZSH</link> + configuration including completion scripts for several CLI tools or custom + prompt themes. + </para> + <section xml:id="module-programs-oh-my-zsh-usage"> + <title>Basic usage</title> + + <para> + The module uses the <literal>oh-my-zsh</literal> package with all available + features. The initial setup using Nix expressions is fairly similar to the + configuration format of <literal>oh-my-zsh</literal>. <programlisting> { programs.ohMyZsh = { @@ -24,39 +26,50 @@ of <literal>oh-my-zsh</literal>. }; } </programlisting> - -For a detailed explanation of these arguments please refer to the -<link xlink:href="https://github.com/robbyrussell/oh-my-zsh/wiki"><literal>oh-my-zsh</literal> docs</link>. -</para> -<para>The expression generates the needed -configuration and writes it into your <literal>/etc/zshrc</literal>. -</para></section> - -<section xml:id="module-programs-oh-my-zsh-additions"><title>Custom additions</title> - -<para>Sometimes third-party or custom scripts such as a modified theme may be needed. -<literal>oh-my-zsh</literal> provides the -<link xlink:href="https://github.com/robbyrussell/oh-my-zsh/wiki/Customization#overriding-internals"><literal>ZSH_CUSTOM</literal></link> -environment variable for this which points to a directory with additional scripts.</para> - -<para>The module can do this as well: - + For a detailed explanation of these arguments please refer to the + <link xlink:href="https://github.com/robbyrussell/oh-my-zsh/wiki"><literal>oh-my-zsh</literal> + docs</link>. + </para> + + <para> + The expression generates the needed configuration and writes it into your + <literal>/etc/zshrc</literal>. + </para> + </section> + <section xml:id="module-programs-oh-my-zsh-additions"> + <title>Custom additions</title> + + <para> + Sometimes third-party or custom scripts such as a modified theme may be + needed. <literal>oh-my-zsh</literal> provides the + <link xlink:href="https://github.com/robbyrussell/oh-my-zsh/wiki/Customization#overriding-internals"><literal>ZSH_CUSTOM</literal></link> + environment variable for this which points to a directory with additional + scripts. + </para> + + <para> + The module can do this as well: <programlisting> { programs.ohMyZsh.custom = "~/path/to/custom/scripts"; } </programlisting> -</para></section> - -<section xml:id="module-programs-oh-my-zsh-environments"><title>Custom environments</title> - -<para>There are several extensions for <literal>oh-my-zsh</literal> packaged in <literal>nixpkgs</literal>. -One of them is <link xlink:href="https://github.com/spwhitt/nix-zsh-completions">nix-zsh-completions</link> -which bundles completion scripts and a plugin for <literal>oh-my-zsh</literal>.</para> - -<para>Rather than using a single mutable path for <literal>ZSH_CUSTOM</literal>, it's also possible to -generate this path from a list of Nix packages: - + </para> + </section> + <section xml:id="module-programs-oh-my-zsh-environments"> + <title>Custom environments</title> + + <para> + There are several extensions for <literal>oh-my-zsh</literal> packaged in + <literal>nixpkgs</literal>. One of them is + <link xlink:href="https://github.com/spwhitt/nix-zsh-completions">nix-zsh-completions</link> + which bundles completion scripts and a plugin for + <literal>oh-my-zsh</literal>. + </para> + + <para> + Rather than using a single mutable path for <literal>ZSH_CUSTOM</literal>, + it's also possible to generate this path from a list of Nix packages: <programlisting> { pkgs, ... }: { @@ -66,42 +79,59 @@ generate this path from a list of Nix packages: ]; } </programlisting> - -Internally a single store path will be created using <literal>buildEnv</literal>. -Please refer to the docs of -<link xlink:href="https://nixos.org/nixpkgs/manual/#sec-building-environment"><literal>buildEnv</literal></link> -for further reference.</para> - -<para><emphasis>Please keep in mind that this is not compatible with <literal>programs.ohMyZsh.custom</literal> -as it requires an immutable store path while <literal>custom</literal> shall remain mutable! An evaluation failure -will be thrown if both <literal>custom</literal> and <literal>customPkgs</literal> are set.</emphasis> -</para></section> - -<section xml:id="module-programs-oh-my-zsh-packaging-customizations"><title>Package your own customizations</title> - -<para>If third-party customizations (e.g. new themes) are supposed to be added to <literal>oh-my-zsh</literal> -there are several pitfalls to keep in mind:</para> - -<itemizedlist> - <listitem> - <para>To comply with the default structure of <literal>ZSH</literal> the entire output needs to be written to - <literal>$out/share/zsh.</literal></para> - </listitem> - <listitem> - <para>Completion scripts are supposed to be stored at <literal>$out/share/zsh/site-functions</literal>. This directory - is part of the <literal><link xlink:href="http://zsh.sourceforge.net/Doc/Release/Functions.html">fpath</link></literal> - and the package should be compatible with pure <literal>ZSH</literal> setups. The module will automatically link - the contents of <literal>site-functions</literal> to completions directory in the proper store path.</para> - </listitem> - <listitem> - <para>The <literal>plugins</literal> directory needs the structure <literal>pluginname/pluginname.plugin.zsh</literal> - as structured in the <link xlink:href="https://github.com/robbyrussell/oh-my-zsh/tree/91b771914bc7c43dd7c7a43b586c5de2c225ceb7/plugins">upstream repo.</link> + Internally a single store path will be created using + <literal>buildEnv</literal>. Please refer to the docs of + <link xlink:href="https://nixos.org/nixpkgs/manual/#sec-building-environment"><literal>buildEnv</literal></link> + for further reference. + </para> + + <para> + <emphasis>Please keep in mind that this is not compatible with + <literal>programs.ohMyZsh.custom</literal> as it requires an immutable store + path while <literal>custom</literal> shall remain mutable! An evaluation + failure will be thrown if both <literal>custom</literal> and + <literal>customPkgs</literal> are set.</emphasis> + </para> + </section> + <section xml:id="module-programs-oh-my-zsh-packaging-customizations"> + <title>Package your own customizations</title> + + <para> + If third-party customizations (e.g. new themes) are supposed to be added to + <literal>oh-my-zsh</literal> there are several pitfalls to keep in mind: + </para> + + <itemizedlist> + <listitem> + <para> + To comply with the default structure of <literal>ZSH</literal> the entire + output needs to be written to <literal>$out/share/zsh.</literal> + </para> + </listitem> + <listitem> + <para> + Completion scripts are supposed to be stored at + <literal>$out/share/zsh/site-functions</literal>. This directory is part + of the + <literal><link xlink:href="http://zsh.sourceforge.net/Doc/Release/Functions.html">fpath</link></literal> + and the package should be compatible with pure <literal>ZSH</literal> + setups. The module will automatically link the contents of + <literal>site-functions</literal> to completions directory in the proper + store path. + </para> + </listitem> + <listitem> + <para> + The <literal>plugins</literal> directory needs the structure + <literal>pluginname/pluginname.plugin.zsh</literal> as structured in the + <link xlink:href="https://github.com/robbyrussell/oh-my-zsh/tree/91b771914bc7c43dd7c7a43b586c5de2c225ceb7/plugins">upstream + repo.</link> </para> - </listitem> -</itemizedlist> + </listitem> + </itemizedlist> -<para> -A derivation for <literal>oh-my-zsh</literal> may look like this: + <para> + A derivation for <literal>oh-my-zsh</literal> may look like this: <programlisting> { stdenv, fetchFromGitHub }: @@ -120,6 +150,6 @@ stdenv.mkDerivation rec { ''; } </programlisting> -</para> -</section> + </para> + </section> </chapter> diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix index b4ca8730958c..865d148c1629 100644 --- a/nixos/modules/programs/zsh/zsh.nix +++ b/nixos/modules/programs/zsh/zsh.nix @@ -11,7 +11,7 @@ let cfg = config.programs.zsh; zshAliases = concatStringsSep "\n" ( - mapAttrsFlatten (k: v: "alias ${k}='${v}'") cfg.shellAliases + mapAttrsFlatten (k: v: "alias ${k}=${escapeShellArg v}") cfg.shellAliases ); in diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index bc9ff9f63dd7..eb74b9bcac12 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -39,6 +39,7 @@ with lib; (mkRenamedOptionModule [ "services" "kubernetes" "apiserver" "address" ] ["services" "kubernetes" "apiserver" "bindAddress"]) (mkRemovedOptionModule [ "services" "kubernetes" "apiserver" "publicAddress" ] "") (mkRenamedOptionModule [ "services" "kubernetes" "addons" "dashboard" "enableRBAC" ] [ "services" "kubernetes" "addons" "dashboard" "rbac" "enable" ]) + (mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "cadvisorPort" ] "") (mkRenamedOptionModule [ "services" "logstash" "address" ] [ "services" "logstash" "listenAddress" ]) (mkRenamedOptionModule [ "services" "mpd" "network" "host" ] [ "services" "mpd" "network" "listenAddress" ]) (mkRenamedOptionModule [ "services" "neo4j" "host" ] [ "services" "neo4j" "defaultListenAddress" ]) diff --git a/nixos/modules/security/acme.xml b/nixos/modules/security/acme.xml index b4cd83f6632c..ef71fe53d0c7 100644 --- a/nixos/modules/security/acme.xml +++ b/nixos/modules/security/acme.xml @@ -3,23 +3,25 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="module-security-acme"> - -<title>SSL/TLS Certificates with ACME</title> - -<para>NixOS supports automatic domain validation & certificate -retrieval and renewal using the ACME protocol. This is currently only -implemented by and for Let's Encrypt. The alternative ACME client -<literal>simp_le</literal> is used under the hood.</para> - -<section xml:id="module-security-acme-prerequisites"><title>Prerequisites</title> - -<para>You need to have a running HTTP server for verification. The server must -have a webroot defined that can serve -<filename>.well-known/acme-challenge</filename>. This directory must be -writeable by the user that will run the ACME client.</para> - -<para>For instance, this generic snippet could be used for Nginx: - + <title>SSL/TLS Certificates with ACME</title> + <para> + NixOS supports automatic domain validation & certificate retrieval and + renewal using the ACME protocol. This is currently only implemented by and + for Let's Encrypt. The alternative ACME client <literal>simp_le</literal> is + used under the hood. + </para> + <section xml:id="module-security-acme-prerequisites"> + <title>Prerequisites</title> + + <para> + You need to have a running HTTP server for verification. The server must + have a webroot defined that can serve + <filename>.well-known/acme-challenge</filename>. This directory must be + writeable by the user that will run the ACME client. + </para> + + <para> + For instance, this generic snippet could be used for Nginx: <programlisting> http { server { @@ -37,43 +39,47 @@ http { } } </programlisting> -</para> - -</section> - -<section xml:id="module-security-acme-configuring"><title>Configuring</title> - -<para>To enable ACME certificate retrieval & renewal for a certificate for -<literal>foo.example.com</literal>, add the following in your -<filename>configuration.nix</filename>: - + </para> + </section> + <section xml:id="module-security-acme-configuring"> + <title>Configuring</title> + + <para> + To enable ACME certificate retrieval & renewal for a certificate for + <literal>foo.example.com</literal>, add the following in your + <filename>configuration.nix</filename>: <programlisting> <xref linkend="opt-security.acme.certs"/>."foo.example.com" = { <link linkend="opt-security.acme.certs._name_.webroot">webroot</link> = "/var/www/challenges"; <link linkend="opt-security.acme.certs._name_.email">email</link> = "foo@example.com"; }; </programlisting> -</para> - -<para>The private key <filename>key.pem</filename> and certificate -<filename>fullchain.pem</filename> will be put into -<filename>/var/lib/acme/foo.example.com</filename>. The target directory can -be configured with the option <xref linkend="opt-security.acme.directory"/>. -</para> - -<para>Refer to <xref linkend="ch-options" /> for all available configuration -options for the <link linkend="opt-security.acme.certs">security.acme</link> module.</para> - -</section> - -<section xml:id="module-security-acme-nginx"><title>Using ACME certificates in Nginx</title> -<para>NixOS supports fetching ACME certificates for you by setting - <literal><link linkend="opt-services.nginx.virtualHosts._name_.enableACME">enableACME</link> = true;</literal> in a virtualHost config. We -first create self-signed placeholder certificates in place of the -real ACME certs. The placeholder certs are overwritten when the ACME -certs arrive. For <literal>foo.example.com</literal> the config would -look like. -</para> + </para> + + <para> + The private key <filename>key.pem</filename> and certificate + <filename>fullchain.pem</filename> will be put into + <filename>/var/lib/acme/foo.example.com</filename>. The target directory can + be configured with the option <xref linkend="opt-security.acme.directory"/>. + </para> + + <para> + Refer to <xref linkend="ch-options" /> for all available configuration + options for the <link linkend="opt-security.acme.certs">security.acme</link> + module. + </para> + </section> + <section xml:id="module-security-acme-nginx"> + <title>Using ACME certificates in Nginx</title> + + <para> + NixOS supports fetching ACME certificates for you by setting + <literal><link linkend="opt-services.nginx.virtualHosts._name_.enableACME">enableACME</link> + = true;</literal> in a virtualHost config. We first create self-signed + placeholder certificates in place of the real ACME certs. The placeholder + certs are overwritten when the ACME certs arrive. For + <literal>foo.example.com</literal> the config would look like. + </para> <programlisting> services.nginx = { @@ -89,5 +95,5 @@ services.nginx = { }; } </programlisting> -</section> + </section> </chapter> diff --git a/nixos/modules/security/hidepid.xml b/nixos/modules/security/hidepid.xml index d69341eb3cde..5a17cb1da412 100644 --- a/nixos/modules/security/hidepid.xml +++ b/nixos/modules/security/hidepid.xml @@ -3,31 +3,26 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-hidepid"> - - <title>Hiding process information</title> - - <para> - Setting + <title>Hiding process information</title> + <para> + Setting <programlisting> <xref linkend="opt-security.hideProcessInformation"/> = true; </programlisting> - ensures that access to process information is restricted to the - owning user. This implies, among other things, that command-line - arguments remain private. Unless your deployment relies on unprivileged - users being able to inspect the process information of other users, this - option should be safe to enable. - </para> - - <para> - Members of the <literal>proc</literal> group are exempt from process - information hiding. - </para> - - <para> - To allow a service <replaceable>foo</replaceable> to run without process information hiding, set + ensures that access to process information is restricted to the owning user. + This implies, among other things, that command-line arguments remain private. + Unless your deployment relies on unprivileged users being able to inspect the + process information of other users, this option should be safe to enable. + </para> + <para> + Members of the <literal>proc</literal> group are exempt from process + information hiding. + </para> + <para> + To allow a service <replaceable>foo</replaceable> to run without process + information hiding, set <programlisting> <link linkend="opt-systemd.services._name_.serviceConfig">systemd.services.<replaceable>foo</replaceable>.serviceConfig</link>.SupplementaryGroups = [ "proc" ]; </programlisting> - </para> - + </para> </chapter> diff --git a/nixos/modules/services/cluster/kubernetes/default.nix b/nixos/modules/services/cluster/kubernetes/default.nix index aeaa6bd66c99..e63d91eb9aca 100644 --- a/nixos/modules/services/cluster/kubernetes/default.nix +++ b/nixos/modules/services/cluster/kubernetes/default.nix @@ -622,13 +622,6 @@ in { type = types.bool; }; - # TODO: remove this deprecated flag - cadvisorPort = mkOption { - description = "Kubernetes kubelet local cadvisor port."; - default = 4194; - type = types.int; - }; - clusterDns = mkOption { description = "Use alternative DNS."; default = "10.1.0.1"; @@ -862,7 +855,6 @@ in { --hostname-override=${cfg.kubelet.hostname} \ --allow-privileged=${boolToString cfg.kubelet.allowPrivileged} \ --root-dir=${cfg.dataDir} \ - --cadvisor_port=${toString cfg.kubelet.cadvisorPort} \ ${optionalString (cfg.kubelet.clusterDns != "") "--cluster-dns=${cfg.kubelet.clusterDns}"} \ ${optionalString (cfg.kubelet.clusterDomain != "") diff --git a/nixos/modules/services/databases/foundationdb.xml b/nixos/modules/services/databases/foundationdb.xml index 7883680d46cc..bf4b644c9b86 100644 --- a/nixos/modules/services/databases/foundationdb.xml +++ b/nixos/modules/services/databases/foundationdb.xml @@ -3,42 +3,50 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="module-services-foundationdb"> - -<title>FoundationDB</title> - -<para><emphasis>Source:</emphasis> <filename>modules/services/databases/foundationdb.nix</filename></para> - -<para><emphasis>Upstream documentation:</emphasis> <link xlink:href="https://apple.github.io/foundationdb/"/></para> - -<para><emphasis>Maintainer:</emphasis> Austin Seipp</para> - -<para><emphasis>Available version(s):</emphasis> 5.1.x, 5.2.x, 6.0.x</para> - -<para>FoundationDB (or "FDB") is an open source, distributed, transactional -key-value store.</para> - -<section xml:id="module-services-foundationdb-configuring"><title>Configuring and basic setup</title> - -<para>To enable FoundationDB, add the following to your -<filename>configuration.nix</filename>: - + <title>FoundationDB</title> + <para> + <emphasis>Source:</emphasis> + <filename>modules/services/databases/foundationdb.nix</filename> + </para> + <para> + <emphasis>Upstream documentation:</emphasis> + <link xlink:href="https://apple.github.io/foundationdb/"/> + </para> + <para> + <emphasis>Maintainer:</emphasis> Austin Seipp + </para> + <para> + <emphasis>Available version(s):</emphasis> 5.1.x, 5.2.x, 6.0.x + </para> + <para> + FoundationDB (or "FDB") is an open source, distributed, transactional + key-value store. + </para> + <section xml:id="module-services-foundationdb-configuring"> + <title>Configuring and basic setup</title> + + <para> + To enable FoundationDB, add the following to your + <filename>configuration.nix</filename>: <programlisting> services.foundationdb.enable = true; services.foundationdb.package = pkgs.foundationdb52; # FoundationDB 5.2.x </programlisting> -</para> - -<para>The <option>services.foundationdb.package</option> option is required, -and must always be specified. Due to the fact FoundationDB network protocols and -on-disk storage formats may change between (major) versions, and upgrades must -be explicitly handled by the user, you must always manually specify this -yourself so that the NixOS module will use the proper version. Note that minor, -bugfix releases are always compatible.</para> - -<para>After running <command>nixos-rebuild</command>, you can verify whether -FoundationDB is running by executing <command>fdbcli</command> (which is added -to <option>environment.systemPackages</option>): - + </para> + + <para> + The <option>services.foundationdb.package</option> option is required, and + must always be specified. Due to the fact FoundationDB network protocols and + on-disk storage formats may change between (major) versions, and upgrades + must be explicitly handled by the user, you must always manually specify + this yourself so that the NixOS module will use the proper version. Note + that minor, bugfix releases are always compatible. + </para> + + <para> + After running <command>nixos-rebuild</command>, you can verify whether + FoundationDB is running by executing <command>fdbcli</command> (which is + added to <option>environment.systemPackages</option>): <programlisting> $ sudo -u foundationdb fdbcli Using cluster file `/etc/foundationdb/fdb.cluster'. @@ -66,14 +74,14 @@ Cluster: fdb> </programlisting> -</para> - -<para>You can also write programs using the available client libraries. -For example, the following Python program can be run in order to grab the -cluster status, as a quick example. (This example uses -<command>nix-shell</command> shebang support to automatically supply the -necessary Python modules). - + </para> + + <para> + You can also write programs using the available client libraries. For + example, the following Python program can be run in order to grab the + cluster status, as a quick example. (This example uses + <command>nix-shell</command> shebang support to automatically supply the + necessary Python modules). <programlisting> a@link> cat fdb-status.py #! /usr/bin/env nix-shell @@ -100,255 +108,336 @@ a@link> ./fdb-status.py FoundationDB available: True a@link> </programlisting> -</para> - -<para>FoundationDB is run under the <command>foundationdb</command> user and -group by default, but this may be changed in the NixOS configuration. The -systemd unit <command>foundationdb.service</command> controls the -<command>fdbmonitor</command> process.</para> - -<para>By default, the NixOS module for FoundationDB creates a single -SSD-storage based database for development and basic usage. This storage engine -is designed for SSDs and will perform poorly on HDDs; however it can handle far -more data than the alternative "memory" engine and is a better default choice -for most deployments. (Note that you can change the storage backend on-the-fly -for a given FoundationDB cluster using <command>fdbcli</command>.)</para> - -<para>Furthermore, only 1 server process and 1 backup agent are started in the -default configuration. See below for more on scaling to increase this.</para> - -<para>FoundationDB stores all data for all server processes under -<filename>/var/lib/foundationdb</filename>. You can override this using -<option>services.foundationdb.dataDir</option>, e.g. - + </para> + + <para> + FoundationDB is run under the <command>foundationdb</command> user and group + by default, but this may be changed in the NixOS configuration. The systemd + unit <command>foundationdb.service</command> controls the + <command>fdbmonitor</command> process. + </para> + + <para> + By default, the NixOS module for FoundationDB creates a single SSD-storage + based database for development and basic usage. This storage engine is + designed for SSDs and will perform poorly on HDDs; however it can handle far + more data than the alternative "memory" engine and is a better default + choice for most deployments. (Note that you can change the storage backend + on-the-fly for a given FoundationDB cluster using + <command>fdbcli</command>.) + </para> + + <para> + Furthermore, only 1 server process and 1 backup agent are started in the + default configuration. See below for more on scaling to increase this. + </para> + + <para> + FoundationDB stores all data for all server processes under + <filename>/var/lib/foundationdb</filename>. You can override this using + <option>services.foundationdb.dataDir</option>, e.g. <programlisting> services.foundationdb.dataDir = "/data/fdb"; </programlisting> - -</para> - -<para>Similarly, logs are stored under -<filename>/var/log/foundationdb</filename> by default, and there is a -corresponding <option>services.foundationdb.logDir</option> as well.</para> - -</section> - -<section xml:id="module-services-foundationdb-scaling"><title>Scaling processes and backup agents</title> - -<para>Scaling the number of server processes is quite easy; simply specify -<option>services.foundationdb.serverProcesses</option> to be the number of -FoundationDB worker processes that should be started on the machine.</para> - -<para>FoundationDB worker processes typically require 4GB of RAM per-process at -minimum for good performance, so this option is set to 1 by default since the -maximum amount of RAM is unknown. You're advised to abide by this restriction, -so pick a number of processes so that each has 4GB or more.</para> - -<para>A similar option exists in order to scale backup agent processes, -<option>services.foundationdb.backupProcesses</option>. Backup agents are not -as performance/RAM sensitive, so feel free to experiment with the number of -available backup processes.</para> - -</section> - -<section xml:id="module-services-foundationdb-clustering"><title>Clustering</title> - -<para>FoundationDB on NixOS works similarly to other Linux systems, so this -section will be brief. Please refer to the full FoundationDB documentation for -more on clustering.</para> - -<para>FoundationDB organizes clusters using a set of -<emphasis>coordinators</emphasis>, which are just specially-designated worker -processes. By default, every installation of FoundationDB on NixOS will start -as its own individual cluster, with a single coordinator: the first worker -process on <command>localhost</command>.</para> - -<para>Coordinators are specified globally using the -<command>/etc/foundationdb/fdb.cluster</command> file, which all servers and -client applications will use to find and join coordinators. Note that this file -<emphasis>can not</emphasis> be managed by NixOS so easily: FoundationDB is -designed so that it will rewrite the file at runtime for all clients and nodes -when cluster coordinators change, with clients transparently handling this -without intervention. It is fundamentally a mutable file, and you should not -try to manage it in any way in NixOS.</para> - -<para>When dealing with a cluster, there are two main things you want to -do:</para> - -<itemizedlist> - <listitem><para>Add a node to the cluster for storage/compute.</para></listitem> - <listitem><para>Promote an ordinary worker to a coordinator.</para></listitem> -</itemizedlist> - -<para>A node must already be a member of the cluster in order to properly be -promoted to a coordinator, so you must always add it first if you wish to -promote it.</para> - -<para>To add a machine to a FoundationDB cluster:</para> - -<itemizedlist> - <listitem><para>Choose one of the servers to start as the initial coordinator. - </para></listitem> - <listitem><para>Copy the <command>/etc/foundationdb/fdb.cluster</command> file - from this server to all the other servers. Restart FoundationDB on all of - these other servers, so they join the cluster.</para></listitem> - <listitem><para>All of these servers are now connected and working together - in the cluster, under the chosen coordinator.</para></listitem> -</itemizedlist> - -<para>At this point, you can add as many nodes as you want by just repeating -the above steps. By default there will still be a single coordinator: you can -use <command>fdbcli</command> to change this and add new coordinators.</para> - -<para>As a convenience, FoundationDB can automatically assign coordinators -based on the redundancy mode you wish to achieve for the cluster. Once all the -nodes have been joined, simply set the replication policy, and then issue the -<command>coordinators auto</command> command</para> - -<para>For example, assuming we have 3 nodes available, we can enable double -redundancy mode, then auto-select coordinators. For double redundancy, 3 -coordinators is ideal: therefore FoundationDB will make -<emphasis>every</emphasis> node a coordinator automatically:</para> + </para> + + <para> + Similarly, logs are stored under <filename>/var/log/foundationdb</filename> + by default, and there is a corresponding + <option>services.foundationdb.logDir</option> as well. + </para> + </section> + <section xml:id="module-services-foundationdb-scaling"> + <title>Scaling processes and backup agents</title> + + <para> + Scaling the number of server processes is quite easy; simply specify + <option>services.foundationdb.serverProcesses</option> to be the number of + FoundationDB worker processes that should be started on the machine. + </para> + + <para> + FoundationDB worker processes typically require 4GB of RAM per-process at + minimum for good performance, so this option is set to 1 by default since + the maximum amount of RAM is unknown. You're advised to abide by this + restriction, so pick a number of processes so that each has 4GB or more. + </para> + + <para> + A similar option exists in order to scale backup agent processes, + <option>services.foundationdb.backupProcesses</option>. Backup agents are + not as performance/RAM sensitive, so feel free to experiment with the number + of available backup processes. + </para> + </section> + <section xml:id="module-services-foundationdb-clustering"> + <title>Clustering</title> + + <para> + FoundationDB on NixOS works similarly to other Linux systems, so this + section will be brief. Please refer to the full FoundationDB documentation + for more on clustering. + </para> + + <para> + FoundationDB organizes clusters using a set of + <emphasis>coordinators</emphasis>, which are just specially-designated + worker processes. By default, every installation of FoundationDB on NixOS + will start as its own individual cluster, with a single coordinator: the + first worker process on <command>localhost</command>. + </para> + + <para> + Coordinators are specified globally using the + <command>/etc/foundationdb/fdb.cluster</command> file, which all servers and + client applications will use to find and join coordinators. Note that this + file <emphasis>can not</emphasis> be managed by NixOS so easily: + FoundationDB is designed so that it will rewrite the file at runtime for all + clients and nodes when cluster coordinators change, with clients + transparently handling this without intervention. It is fundamentally a + mutable file, and you should not try to manage it in any way in NixOS. + </para> + + <para> + When dealing with a cluster, there are two main things you want to do: + </para> + + <itemizedlist> + <listitem> + <para> + Add a node to the cluster for storage/compute. + </para> + </listitem> + <listitem> + <para> + Promote an ordinary worker to a coordinator. + </para> + </listitem> + </itemizedlist> + + <para> + A node must already be a member of the cluster in order to properly be + promoted to a coordinator, so you must always add it first if you wish to + promote it. + </para> + + <para> + To add a machine to a FoundationDB cluster: + </para> + + <itemizedlist> + <listitem> + <para> + Choose one of the servers to start as the initial coordinator. + </para> + </listitem> + <listitem> + <para> + Copy the <command>/etc/foundationdb/fdb.cluster</command> file from this + server to all the other servers. Restart FoundationDB on all of these + other servers, so they join the cluster. + </para> + </listitem> + <listitem> + <para> + All of these servers are now connected and working together in the + cluster, under the chosen coordinator. + </para> + </listitem> + </itemizedlist> + + <para> + At this point, you can add as many nodes as you want by just repeating the + above steps. By default there will still be a single coordinator: you can + use <command>fdbcli</command> to change this and add new coordinators. + </para> + + <para> + As a convenience, FoundationDB can automatically assign coordinators based + on the redundancy mode you wish to achieve for the cluster. Once all the + nodes have been joined, simply set the replication policy, and then issue + the <command>coordinators auto</command> command + </para> + + <para> + For example, assuming we have 3 nodes available, we can enable double + redundancy mode, then auto-select coordinators. For double redundancy, 3 + coordinators is ideal: therefore FoundationDB will make + <emphasis>every</emphasis> node a coordinator automatically: + </para> <programlisting> fdbcli> configure double ssd fdbcli> coordinators auto </programlisting> -<para>This will transparently update all the servers within seconds, and -appropriately rewrite the <command>fdb.cluster</command> file, as well as -informing all client processes to do the same.</para> - -</section> - -<section xml:id="module-services-foundationdb-connectivity"><title>Client connectivity</title> - -<para>By default, all clients must use the current -<command>fdb.cluster</command> file to access a given FoundationDB cluster. -This file is located by default in -<command>/etc/foundationdb/fdb.cluster</command> on all machines with the -FoundationDB service enabled, so you may copy the active one from your cluster -to a new node in order to connect, if it is not part of the cluster.</para> - -</section> - -<section xml:id="module-services-foundationdb-authorization"><title>Client authorization and TLS</title> - -<para>By default, any user who can connect to a FoundationDB process with the -correct cluster configuration can access anything. FoundationDB uses a -pluggable design to transport security, and out of the box it supports a -LibreSSL-based plugin for TLS support. This plugin not only does in-flight -encryption, but also performs client authorization based on the given -endpoint's certificate chain. For example, a FoundationDB server may be -configured to only accept client connections over TLS, where the client TLS -certificate is from organization <emphasis>Acme Co</emphasis> in the -<emphasis>Research and Development</emphasis> unit.</para> - -<para>Configuring TLS with FoundationDB is done using the -<option>services.foundationdb.tls</option> options in order to control the peer -verification string, as well as the certificate and its private key.</para> - -<para>Note that the certificate and its private key must be accessible to the -FoundationDB user account that the server runs under. These files are also NOT -managed by NixOS, as putting them into the store may reveal private -information.</para> - -<para>After you have a key and certificate file in place, it is not enough to -simply set the NixOS module options -- you must also configure the -<command>fdb.cluster</command> file to specify that a given set of coordinators -use TLS. This is as simple as adding the suffix <command>:tls</command> to your -cluster coordinator configuration, after the port number. For example, assuming -you have a coordinator on localhost with the default configuration, simply -specifying:</para> + <para> + This will transparently update all the servers within seconds, and + appropriately rewrite the <command>fdb.cluster</command> file, as well as + informing all client processes to do the same. + </para> + </section> + <section xml:id="module-services-foundationdb-connectivity"> + <title>Client connectivity</title> + + <para> + By default, all clients must use the current <command>fdb.cluster</command> + file to access a given FoundationDB cluster. This file is located by default + in <command>/etc/foundationdb/fdb.cluster</command> on all machines with the + FoundationDB service enabled, so you may copy the active one from your + cluster to a new node in order to connect, if it is not part of the cluster. + </para> + </section> + <section xml:id="module-services-foundationdb-authorization"> + <title>Client authorization and TLS</title> + + <para> + By default, any user who can connect to a FoundationDB process with the + correct cluster configuration can access anything. FoundationDB uses a + pluggable design to transport security, and out of the box it supports a + LibreSSL-based plugin for TLS support. This plugin not only does in-flight + encryption, but also performs client authorization based on the given + endpoint's certificate chain. For example, a FoundationDB server may be + configured to only accept client connections over TLS, where the client TLS + certificate is from organization <emphasis>Acme Co</emphasis> in the + <emphasis>Research and Development</emphasis> unit. + </para> + + <para> + Configuring TLS with FoundationDB is done using the + <option>services.foundationdb.tls</option> options in order to control the + peer verification string, as well as the certificate and its private key. + </para> + + <para> + Note that the certificate and its private key must be accessible to the + FoundationDB user account that the server runs under. These files are also + NOT managed by NixOS, as putting them into the store may reveal private + information. + </para> + + <para> + After you have a key and certificate file in place, it is not enough to + simply set the NixOS module options -- you must also configure the + <command>fdb.cluster</command> file to specify that a given set of + coordinators use TLS. This is as simple as adding the suffix + <command>:tls</command> to your cluster coordinator configuration, after the + port number. For example, assuming you have a coordinator on localhost with + the default configuration, simply specifying: + </para> <programlisting> XXXXXX:XXXXXX@127.0.0.1:4500:tls </programlisting> -<para>will configure all clients and server processes to use TLS from now -on.</para> - -</section> - -<section xml:id="module-services-foundationdb-disaster-recovery"><title>Backups and Disaster Recovery</title> - -<para>The usual rules for doing FoundationDB backups apply on NixOS as written -in the FoundationDB manual. However, one important difference is the security -profile for NixOS: by default, the <command>foundationdb</command> systemd unit -uses <emphasis>Linux namespaces</emphasis> to restrict write access to the -system, except for the log directory, data directory, and the -<command>/etc/foundationdb/</command> directory. This is enforced by default -and cannot be disabled.</para> - -<para>However, a side effect of this is that the <command>fdbbackup</command> -command doesn't work properly for local filesystem backups: FoundationDB uses a -server process alongside the database processes to perform backups and copy the -backups to the filesystem. As a result, this process is put under the -restricted namespaces above: the backup process can only write to a limited -number of paths.</para> - -<para>In order to allow flexible backup locations on local disks, the -FoundationDB NixOS module supports a -<option>services.foundationdb.extraReadWritePaths</option> option. This option -takes a list of paths, and adds them to the systemd unit, allowing the -processes inside the service to write (and read) the specified -directories.</para> - -<para>For example, to create backups in <command>/opt/fdb-backups</command>, -first set up the paths in the module options:</para> + <para> + will configure all clients and server processes to use TLS from now on. + </para> + </section> + <section xml:id="module-services-foundationdb-disaster-recovery"> + <title>Backups and Disaster Recovery</title> + + <para> + The usual rules for doing FoundationDB backups apply on NixOS as written in + the FoundationDB manual. However, one important difference is the security + profile for NixOS: by default, the <command>foundationdb</command> systemd + unit uses <emphasis>Linux namespaces</emphasis> to restrict write access to + the system, except for the log directory, data directory, and the + <command>/etc/foundationdb/</command> directory. This is enforced by default + and cannot be disabled. + </para> + + <para> + However, a side effect of this is that the <command>fdbbackup</command> + command doesn't work properly for local filesystem backups: FoundationDB + uses a server process alongside the database processes to perform backups + and copy the backups to the filesystem. As a result, this process is put + under the restricted namespaces above: the backup process can only write to + a limited number of paths. + </para> + + <para> + In order to allow flexible backup locations on local disks, the FoundationDB + NixOS module supports a + <option>services.foundationdb.extraReadWritePaths</option> option. This + option takes a list of paths, and adds them to the systemd unit, allowing + the processes inside the service to write (and read) the specified + directories. + </para> + + <para> + For example, to create backups in <command>/opt/fdb-backups</command>, first + set up the paths in the module options: + </para> <programlisting> services.foundationdb.extraReadWritePaths = [ "/opt/fdb-backups" ]; </programlisting> -<para>Restart the FoundationDB service, and it will now be able to write to -this directory (even if it does not yet exist.) Note: this path -<emphasis>must</emphasis> exist before restarting the unit. Otherwise, systemd -will not include it in the private FoundationDB namespace (and it will not add -it dynamically at runtime).</para> + <para> + Restart the FoundationDB service, and it will now be able to write to this + directory (even if it does not yet exist.) Note: this path + <emphasis>must</emphasis> exist before restarting the unit. Otherwise, + systemd will not include it in the private FoundationDB namespace (and it + will not add it dynamically at runtime). + </para> -<para>You can now perform a backup:</para> + <para> + You can now perform a backup: + </para> <programlisting> $ sudo -u foundationdb fdbbackup start -t default -d file:///opt/fdb-backups $ sudo -u foundationdb fdbbackup status -t default </programlisting> - -</section> - -<section xml:id="module-services-foundationdb-limitations"><title>Known limitations</title> - -<para>The FoundationDB setup for NixOS should currently be considered beta. -FoundationDB is not new software, but the NixOS compilation and integration has -only undergone fairly basic testing of all the available functionality.</para> - -<itemizedlist> - <listitem><para>There is no way to specify individual parameters for - individual <command>fdbserver</command> processes. Currently, all server - processes inherit all the global <command>fdbmonitor</command> settings. - </para></listitem> - <listitem><para>Ruby bindings are not currently installed.</para></listitem> - <listitem><para>Go bindings are not currently installed.</para></listitem> -</itemizedlist> - -</section> - -<section xml:id="module-services-foundationdb-options"><title>Options</title> - -<para>NixOS's FoundationDB module allows you to configure all of the most -relevant configuration options for <command>fdbmonitor</command>, matching it -quite closely. A complete list of options for the FoundationDB module may be -found <link linkend="opt-services.foundationdb.enable">here</link>. You should -also read the FoundationDB documentation as well.</para> - -</section> - -<section xml:id="module-services-foundationdb-full-docs"><title>Full documentation</title> - -<para>FoundationDB is a complex piece of software, and requires careful -administration to properly use. Full documentation for administration can be -found here: <link xlink:href="https://apple.github.io/foundationdb/"/>.</para> - -</section> - + </section> + <section xml:id="module-services-foundationdb-limitations"> + <title>Known limitations</title> + + <para> + The FoundationDB setup for NixOS should currently be considered beta. + FoundationDB is not new software, but the NixOS compilation and integration + has only undergone fairly basic testing of all the available functionality. + </para> + + <itemizedlist> + <listitem> + <para> + There is no way to specify individual parameters for individual + <command>fdbserver</command> processes. Currently, all server processes + inherit all the global <command>fdbmonitor</command> settings. + </para> + </listitem> + <listitem> + <para> + Ruby bindings are not currently installed. + </para> + </listitem> + <listitem> + <para> + Go bindings are not currently installed. + </para> + </listitem> + </itemizedlist> + </section> + <section xml:id="module-services-foundationdb-options"> + <title>Options</title> + + <para> + NixOS's FoundationDB module allows you to configure all of the most relevant + configuration options for <command>fdbmonitor</command>, matching it quite + closely. A complete list of options for the FoundationDB module may be found + <link linkend="opt-services.foundationdb.enable">here</link>. You should + also read the FoundationDB documentation as well. + </para> + </section> + <section xml:id="module-services-foundationdb-full-docs"> + <title>Full documentation</title> + + <para> + FoundationDB is a complex piece of software, and requires careful + administration to properly use. Full documentation for administration can be + found here: <link xlink:href="https://apple.github.io/foundationdb/"/>. + </para> + </section> </chapter> diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index f59fb1c81772..de2a757196a5 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -188,6 +188,8 @@ in uid = config.ids.uids.postgres; group = "postgres"; description = "PostgreSQL server user"; + home = "${cfg.dataDir}"; + useDefaultShell = true; }; users.groups.postgres.gid = config.ids.gids.postgres; diff --git a/nixos/modules/services/databases/postgresql.xml b/nixos/modules/services/databases/postgresql.xml index 1aaf33963245..f89f0d653164 100644 --- a/nixos/modules/services/databases/postgresql.xml +++ b/nixos/modules/services/databases/postgresql.xml @@ -3,36 +3,39 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="module-postgresql"> - -<title>PostgreSQL</title> - + <title>PostgreSQL</title> <!-- FIXME: render nicely --> - <!-- FIXME: source can be added automatically --> -<para><emphasis>Source:</emphasis> <filename>modules/services/databases/postgresql.nix</filename></para> - -<para><emphasis>Upstream documentation:</emphasis> <link xlink:href="http://www.postgresql.org/docs/"/></para> - + <para> + <emphasis>Source:</emphasis> + <filename>modules/services/databases/postgresql.nix</filename> + </para> + <para> + <emphasis>Upstream documentation:</emphasis> + <link xlink:href="http://www.postgresql.org/docs/"/> + </para> <!-- FIXME: more stuff, like maintainer? --> - -<para>PostgreSQL is an advanced, free relational database.<!-- MORE --></para> - -<section xml:id="module-services-postgres-configuring"><title>Configuring</title> - -<para>To enable PostgreSQL, add the following to your -<filename>configuration.nix</filename>: - + <para> + PostgreSQL is an advanced, free relational database. +<!-- MORE --> + </para> + <section xml:id="module-services-postgres-configuring"> + <title>Configuring</title> + + <para> + To enable PostgreSQL, add the following to your + <filename>configuration.nix</filename>: <programlisting> <xref linkend="opt-services.postgresql.enable"/> = true; <xref linkend="opt-services.postgresql.package"/> = pkgs.postgresql94; </programlisting> - -Note that you are required to specify the desired version of -PostgreSQL (e.g. <literal>pkgs.postgresql94</literal>). Since -upgrading your PostgreSQL version requires a database dump and reload -(see below), NixOS cannot provide a default value for -<xref linkend="opt-services.postgresql.package"/> such as the most recent -release of PostgreSQL.</para> + Note that you are required to specify the desired version of PostgreSQL + (e.g. <literal>pkgs.postgresql94</literal>). Since upgrading your PostgreSQL + version requires a database dump and reload (see below), NixOS cannot + provide a default value for + <xref linkend="opt-services.postgresql.package"/> such as the most recent + release of PostgreSQL. + </para> <!-- <para>After running <command>nixos-rebuild</command>, you can verify @@ -47,31 +50,28 @@ alice=> </screen> --> -<para>By default, PostgreSQL stores its databases in -<filename>/var/db/postgresql</filename>. You can override this using -<xref linkend="opt-services.postgresql.dataDir"/>, e.g. - + <para> + By default, PostgreSQL stores its databases in + <filename>/var/db/postgresql</filename>. You can override this using + <xref linkend="opt-services.postgresql.dataDir"/>, e.g. <programlisting> <xref linkend="opt-services.postgresql.dataDir"/> = "/data/postgresql"; </programlisting> - -</para> - -</section> - - -<section xml:id="module-services-postgres-upgrading"><title>Upgrading</title> - -<para>FIXME: document dump/upgrade/load cycle.</para> - -</section> - - -<section xml:id="module-services-postgres-options"><title>Options</title> - - <para>A complete list of options for the PostgreSQL module may be found <link linkend="opt-services.postgresql.enable">here</link>.</para> - -</section> - - + </para> + </section> + <section xml:id="module-services-postgres-upgrading"> + <title>Upgrading</title> + + <para> + FIXME: document dump/upgrade/load cycle. + </para> + </section> + <section xml:id="module-services-postgres-options"> + <title>Options</title> + + <para> + A complete list of options for the PostgreSQL module may be found + <link linkend="opt-services.postgresql.enable">here</link>. + </para> + </section> </chapter> diff --git a/nixos/modules/services/desktops/flatpak.xml b/nixos/modules/services/desktops/flatpak.xml index d9c8b711c450..8045d5fa14f8 100644 --- a/nixos/modules/services/desktops/flatpak.xml +++ b/nixos/modules/services/desktops/flatpak.xml @@ -3,51 +3,54 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="module-services-flatpak"> - -<title>Flatpak</title> - -<para><emphasis>Source:</emphasis> <filename>modules/services/desktop/flatpak.nix</filename></para> - -<para><emphasis>Upstream documentation:</emphasis> <link xlink:href="https://github.com/flatpak/flatpak/wiki"/></para> - -<para>Flatpak is a system for building, distributing, and running sandboxed desktop applications on Linux.</para> - -<para> - To enable Flatpak, add the following to your <filename>configuration.nix</filename>: - - <programlisting> + <title>Flatpak</title> + <para> + <emphasis>Source:</emphasis> + <filename>modules/services/desktop/flatpak.nix</filename> + </para> + <para> + <emphasis>Upstream documentation:</emphasis> + <link xlink:href="https://github.com/flatpak/flatpak/wiki"/> + </para> + <para> + Flatpak is a system for building, distributing, and running sandboxed desktop + applications on Linux. + </para> + <para> + To enable Flatpak, add the following to your + <filename>configuration.nix</filename>: +<programlisting> <xref linkend="opt-services.flatpak.enable"/> = true; </programlisting> -</para> - -<para> - For the sandboxed apps to work correctly, desktop integration portals need to be installed. If you run GNOME, this will be handled automatically for you; in other cases, you will need to add something like the following to your <filename>configuration.nix</filename>: - - <programlisting> + </para> + <para> + For the sandboxed apps to work correctly, desktop integration portals need to + be installed. If you run GNOME, this will be handled automatically for you; + in other cases, you will need to add something like the following to your + <filename>configuration.nix</filename>: +<programlisting> <xref linkend="opt-services.flatpak.extraPortals"/> = [ pkgs.xdg-desktop-portal-gtk ]; </programlisting> -</para> - -<para> - Then, you will need to add a repository, for example, <link xlink:href="https://github.com/flatpak/flatpak/wiki">Flathub</link>, either using the following commands: - - <programlisting> + </para> + <para> + Then, you will need to add a repository, for example, + <link xlink:href="https://github.com/flatpak/flatpak/wiki">Flathub</link>, + either using the following commands: +<programlisting> flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo flatpak update </programlisting> - - or by opening the <link xlink:href="https://flathub.org/repo/flathub.flatpakrepo">repository file</link> in GNOME Software. -</para> - -<para> + or by opening the + <link xlink:href="https://flathub.org/repo/flathub.flatpakrepo">repository + file</link> in GNOME Software. + </para> + <para> Finally, you can search and install programs: - - <programlisting> +<programlisting> flatpak search bustle flatpak install flathub org.freedesktop.Bustle flatpak run org.freedesktop.Bustle </programlisting> - Again, GNOME Software offers graphical interface for these tasks. -</para> + </para> </chapter> diff --git a/nixos/modules/services/editors/emacs.xml b/nixos/modules/services/editors/emacs.xml index 94eb2e6a77bf..6cf20cf4aa7e 100644 --- a/nixos/modules/services/editors/emacs.xml +++ b/nixos/modules/services/editors/emacs.xml @@ -3,150 +3,148 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="module-services-emacs"> - - <title>Emacs</title> - - <!-- + <title>Emacs</title> +<!-- Documentation contributors: Damien Cassou @DamienCassou Thomas Tuegel @ttuegel Rodney Lorrimar @rvl --> + <para> + <link xlink:href="http://www.gnu.org/software/emacs/">Emacs</link> is an + extensible, customizable, self-documenting real-time display editor — and + more. At its core is an interpreter for Emacs Lisp, a dialect of the Lisp + programming language with extensions to support text editing. + </para> + <para> + Emacs runs within a graphical desktop environment using the X Window System, + but works equally well on a text terminal. Under + <productname>macOS</productname>, a "Mac port" edition is available, which + uses Apple's native GUI frameworks. + </para> + <para> + <productname>Nixpkgs</productname> provides a superior environment for + running <application>Emacs</application>. It's simple to create custom builds + by overriding the default packages. Chaotic collections of Emacs Lisp code + and extensions can be brought under control using declarative package + management. <productname>NixOS</productname> even provides a + <command>systemd</command> user service for automatically starting the Emacs + daemon. + </para> + <section xml:id="module-services-emacs-installing"> + <title>Installing <application>Emacs</application></title> <para> - <link xlink:href="http://www.gnu.org/software/emacs/">Emacs</link> - is an extensible, customizable, self-documenting real-time display - editor — and more. At its core is an interpreter for Emacs Lisp, a - dialect of the Lisp programming language with extensions to - support text editing. + Emacs can be installed in the normal way for Nix (see + <xref linkend="sec-package-management" />). In addition, a NixOS + <emphasis>service</emphasis> can be enabled. </para> - <para> - Emacs runs within a graphical desktop environment using the X - Window System, but works equally well on a text terminal. Under - <productname>macOS</productname>, a "Mac port" edition is - available, which uses Apple's native GUI frameworks. - </para> + <section xml:id="module-services-emacs-releases"> + <title>The Different Releases of Emacs</title> + + <para> + <productname>Nixpkgs</productname> defines several basic Emacs packages. + The following are attributes belonging to the <varname>pkgs</varname> set: + <variablelist> + <varlistentry> + <term> + <varname>emacs</varname> + </term> + <term> + <varname>emacs25</varname> + </term> + <listitem> + <para> + The latest stable version of Emacs 25 using the + <link + xlink:href="http://www.gtk.org">GTK+ 2</link> + widget toolkit. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <varname>emacs25-nox</varname> + </term> + <listitem> + <para> + Emacs 25 built without any dependency on X11 libraries. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <varname>emacsMacport</varname> + </term> + <term> + <varname>emacs25Macport</varname> + </term> + <listitem> + <para> + Emacs 25 with the "Mac port" patches, providing a more native look and + feel under macOS. + </para> + </listitem> + </varlistentry> + </variablelist> + </para> + + <para> + If those aren't suitable, then the following imitation Emacs editors are + also available in Nixpkgs: + <link xlink:href="https://www.gnu.org/software/zile/">Zile</link>, + <link xlink:href="http://homepage.boetes.org/software/mg/">mg</link>, + <link xlink:href="http://yi-editor.github.io/">Yi</link>. + </para> + </section> - <para> - <productname>Nixpkgs</productname> provides a superior environment - for running <application>Emacs</application>. It's simple to - create custom builds by overriding the default packages. Chaotic - collections of Emacs Lisp code and extensions can be brought under - control using declarative package - management. <productname>NixOS</productname> even provides a - <command>systemd</command> user service for automatically - starting the Emacs daemon. - </para> + <section xml:id="module-services-emacs-adding-packages"> + <title>Adding Packages to Emacs</title> - <section xml:id="module-services-emacs-installing"> - <title>Installing <application>Emacs</application></title> + <para> + Emacs includes an entire ecosystem of functionality beyond text editing, + including a project planner, mail and news reader, debugger interface, + calendar, and more. + </para> + <para> + Most extensions are gotten with the Emacs packaging system + (<filename>package.el</filename>) from + <link + xlink:href="https://elpa.gnu.org/">Emacs Lisp Package Archive + (<acronym>ELPA</acronym>)</link>, + <link xlink:href="https://melpa.org/"><acronym>MELPA</acronym></link>, + <link xlink:href="https://stable.melpa.org/">MELPA Stable</link>, and + <link xlink:href="http://orgmode.org/elpa.html">Org ELPA</link>. Nixpkgs is + regularly updated to mirror all these archives. + </para> + + <para> + Under NixOS, you can continue to use + <function>package-list-packages</function> and + <function>package-install</function> to install packages. You can also + declare the set of Emacs packages you need using the derivations from + Nixpkgs. The rest of this section discusses declarative installation of + Emacs packages through nixpkgs. + </para> + + <note> <para> - Emacs can be installed in the normal way for Nix (see - <xref linkend="sec-package-management" />). - In addition, a NixOS <emphasis>service</emphasis> - can be enabled. + This documentation describes the new Emacs packages framework in NixOS + 16.03 (<varname>emacsPackagesNg</varname>) which should not be confused + with the previous and deprecated framework + (<varname>emacs24Packages</varname>). </para> - - <section xml:id="module-services-emacs-releases"> - <title>The Different Releases of Emacs</title> - - <para> - <productname>Nixpkgs</productname> defines several basic Emacs - packages. The following are attributes belonging to the - <varname>pkgs</varname> set: - - <variablelist> - <varlistentry> - <term><varname>emacs</varname></term> - <term><varname>emacs25</varname></term> - <listitem> - <para> - The latest stable version of Emacs 25 using the <link - xlink:href="http://www.gtk.org">GTK+ 2</link> widget - toolkit. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term><varname>emacs25-nox</varname></term> - <listitem> - <para> - Emacs 25 built without any dependency on X11 - libraries. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term><varname>emacsMacport</varname></term> - <term><varname>emacs25Macport</varname></term> - <listitem> - <para> - Emacs 25 with the "Mac port" patches, providing a more - native look and feel under macOS. - </para> - </listitem> - </varlistentry> - </variablelist> - </para> - - <para> - If those aren't suitable, then the following imitation Emacs - editors are also available in Nixpkgs: - <link xlink:href="https://www.gnu.org/software/zile/">Zile</link>, - <link xlink:href="http://homepage.boetes.org/software/mg/">mg</link>, - <link xlink:href="http://yi-editor.github.io/">Yi</link>. - </para> - - </section> - <section xml:id="module-services-emacs-adding-packages"> - <title>Adding Packages to Emacs</title> - <para> - Emacs includes an entire ecosystem of functionality beyond - text editing, including a project planner, mail and news - reader, debugger interface, calendar, and more. - </para> - - <para> - Most extensions are gotten with the Emacs packaging system - (<filename>package.el</filename>) from <link - xlink:href="https://elpa.gnu.org/">Emacs Lisp Package Archive - (<acronym>ELPA</acronym>)</link>, - <link xlink:href="https://melpa.org/"><acronym>MELPA</acronym></link>, - <link xlink:href="https://stable.melpa.org/">MELPA Stable</link>, - and <link xlink:href="http://orgmode.org/elpa.html">Org ELPA</link>. - Nixpkgs is regularly updated to mirror all these archives. - </para> - - <para> - Under NixOS, you can continue to use - <function>package-list-packages</function> and - <function>package-install</function> to install packages. You - can also declare the set of Emacs packages you need using the - derivations from Nixpkgs. The rest of this section discusses - declarative installation of Emacs packages through nixpkgs. - </para> - - <note> - <para> - This documentation describes the new Emacs packages - framework in NixOS 16.03 - (<varname>emacsPackagesNg</varname>) which should not be - confused with the previous and deprecated framework - (<varname>emacs24Packages</varname>). - </para> - </note> - - <para> - The first step to declare the list of packages you want in - your Emacs installation is to create a dedicated - derivation. This can be done in a dedicated - <filename>emacs.nix</filename> file such as: - - <example xml:id="ex-emacsNix"> - <title>Nix expression to build Emacs with packages (<filename>emacs.nix</filename>)</title> - <programlisting language="nix"> + </note> + + <para> + The first step to declare the list of packages you want in your Emacs + installation is to create a dedicated derivation. This can be done in a + dedicated <filename>emacs.nix</filename> file such as: + <example xml:id="ex-emacsNix"> + <title>Nix expression to build Emacs with packages (<filename>emacs.nix</filename>)</title> +<programlisting language="nix"> /* This is a nix expression to build Emacs and some Emacs packages I like from source on any distribution where Nix is installed. This will install @@ -181,119 +179,104 @@ in pkgs.notmuch # From main packages set <co xml:id="ex-emacsNix-7" /> ]) </programlisting> - </example> - - <calloutlist> - <callout arearefs="ex-emacsNix-1"> - <para> - The first non-comment line in this file - (<literal>{ pkgs ? ... }</literal>) - indicates that the whole file represents a function. - </para> - </callout> - - <callout arearefs="ex-emacsNix-2"> - <para> - The <varname>let</varname> expression below defines a - <varname>myEmacs</varname> binding pointing to the current - stable version of Emacs. This binding is here to separate the - choice of the Emacs binary from the specification of the - required packages. - </para> - </callout> - - <callout arearefs="ex-emacsNix-3"> - <para> - This generates an <varname>emacsWithPackages</varname> - function. It takes a single argument: a function from a - package set to a list of packages (the packages that will - be available in Emacs). - </para> - </callout> - - <callout arearefs="ex-emacsNix-4"> - <para> - The rest of the file specifies the list of packages to - install. In the example, two packages - (<varname>magit</varname> and - <varname>zerodark-theme</varname>) are taken from MELPA - stable. - </para> - </callout> - - <callout arearefs="ex-emacsNix-5"> - <para> - Two packages (<varname>undo-tree</varname> and - <varname>zoom-frm</varname>) are taken from MELPA. - </para> - </callout> - - <callout arearefs="ex-emacsNix-6"> - <para>Three packages are taken from GNU ELPA.</para> - </callout> - - <callout arearefs="ex-emacsNix-7"> - <para> - <varname>notmuch</varname> is taken from a nixpkgs derivation - which contains an Emacs mode. - </para> - </callout> - - </calloutlist> + </example> + <calloutlist> + <callout arearefs="ex-emacsNix-1"> + <para> + The first non-comment line in this file (<literal>{ pkgs ? ... + }</literal>) indicates that the whole file represents a function. </para> - + </callout> + <callout arearefs="ex-emacsNix-2"> <para> - The result of this configuration will be an - <command>emacs</command> command which launches Emacs with all - of your chosen packages in the <varname>load-path</varname>. + The <varname>let</varname> expression below defines a + <varname>myEmacs</varname> binding pointing to the current stable + version of Emacs. This binding is here to separate the choice of the + Emacs binary from the specification of the required packages. </para> - + </callout> + <callout arearefs="ex-emacsNix-3"> <para> - You can check that it works by executing this in a terminal: - + This generates an <varname>emacsWithPackages</varname> function. It + takes a single argument: a function from a package set to a list of + packages (the packages that will be available in Emacs). + </para> + </callout> + <callout arearefs="ex-emacsNix-4"> + <para> + The rest of the file specifies the list of packages to install. In the + example, two packages (<varname>magit</varname> and + <varname>zerodark-theme</varname>) are taken from MELPA stable. + </para> + </callout> + <callout arearefs="ex-emacsNix-5"> + <para> + Two packages (<varname>undo-tree</varname> and + <varname>zoom-frm</varname>) are taken from MELPA. + </para> + </callout> + <callout arearefs="ex-emacsNix-6"> + <para> + Three packages are taken from GNU ELPA. + </para> + </callout> + <callout arearefs="ex-emacsNix-7"> + <para> + <varname>notmuch</varname> is taken from a nixpkgs derivation which + contains an Emacs mode. + </para> + </callout> + </calloutlist> + </para> + + <para> + The result of this configuration will be an <command>emacs</command> + command which launches Emacs with all of your chosen packages in the + <varname>load-path</varname>. + </para> + + <para> + You can check that it works by executing this in a terminal: <screen> $ nix-build emacs.nix $ ./result/bin/emacs -q </screen> + and then typing <literal>M-x package-initialize</literal>. Check that you + can use all the packages you want in this Emacs instance. For example, try + switching to the zerodark theme through <literal>M-x load-theme <RET> + zerodark <RET> y</literal>. + </para> - and then typing <literal>M-x package-initialize</literal>. - Check that you can use all the packages you want in this - Emacs instance. For example, try switching to the zerodark - theme through - <literal>M-x load-theme <RET> zerodark <RET> y</literal>. - </para> - - <tip> - <para> - A few popular extensions worth checking out are: auctex, - company, edit-server, flycheck, helm, iedit, magit, - multiple-cursors, projectile, and yasnippet. - </para> - </tip> - - <para> - The list of available packages in the various ELPA - repositories can be seen with the following commands: - <example xml:id="module-services-emacs-querying-packages"> - <title>Querying Emacs packages</title> - <programlisting><![CDATA[ + <tip> + <para> + A few popular extensions worth checking out are: auctex, company, + edit-server, flycheck, helm, iedit, magit, multiple-cursors, projectile, + and yasnippet. + </para> + </tip> + + <para> + The list of available packages in the various ELPA repositories can be seen + with the following commands: + <example xml:id="module-services-emacs-querying-packages"> + <title>Querying Emacs packages</title> +<programlisting><![CDATA[ nix-env -f "<nixpkgs>" -qaP -A emacsPackagesNg.elpaPackages nix-env -f "<nixpkgs>" -qaP -A emacsPackagesNg.melpaPackages nix-env -f "<nixpkgs>" -qaP -A emacsPackagesNg.melpaStablePackages nix-env -f "<nixpkgs>" -qaP -A emacsPackagesNg.orgPackages ]]></programlisting> - </example> - </para> - - <para> - If you are on NixOS, you can install this particular Emacs for - all users by adding it to the list of system packages - (see <xref linkend="sec-declarative-package-mgmt" />). Simply - modify your file <filename>configuration.nix</filename> to - make it contain: - <example xml:id="module-services-emacs-configuration-nix"> - <title>Custom Emacs in <filename>configuration.nix</filename></title> - <programlisting><![CDATA[ + </example> + </para> + + <para> + If you are on NixOS, you can install this particular Emacs for all users by + adding it to the list of system packages (see + <xref linkend="sec-declarative-package-mgmt" />). Simply modify your file + <filename>configuration.nix</filename> to make it contain: + <example xml:id="module-services-emacs-configuration-nix"> + <title>Custom Emacs in <filename>configuration.nix</filename></title> +<programlisting><![CDATA[ { environment.systemPackages = [ # [...] @@ -301,60 +284,59 @@ nix-env -f "<nixpkgs>" -qaP -A emacsPackagesNg.orgPackages ]; } ]]></programlisting> - </example> - </para> + </example> + </para> - <para> - In this case, the next <command>nixos-rebuild switch</command> - will take care of adding your <command>emacs</command> to the - <varname>PATH</varname> environment variable - (see <xref linkend="sec-changing-config" />). - </para> + <para> + In this case, the next <command>nixos-rebuild switch</command> will take + care of adding your <command>emacs</command> to the <varname>PATH</varname> + environment variable (see <xref linkend="sec-changing-config" />). + </para> <!-- fixme: i think the following is better done with config.nix https://nixos.org/nixpkgs/manual/#sec-modify-via-packageOverrides --> - <para> - If you are not on NixOS or want to install this particular - Emacs only for yourself, you can do so by adding it to your - <filename>~/.config/nixpkgs/config.nix</filename> - (see <link xlink:href="http://nixos.org/nixpkgs/manual/#sec-modify-via-packageOverrides">Nixpkgs manual</link>): - <example xml:id="module-services-emacs-config-nix"> - <title>Custom Emacs in <filename>~/.config/nixpkgs/config.nix</filename></title> - <programlisting><![CDATA[ + + <para> + If you are not on NixOS or want to install this particular Emacs only for + yourself, you can do so by adding it to your + <filename>~/.config/nixpkgs/config.nix</filename> (see + <link xlink:href="http://nixos.org/nixpkgs/manual/#sec-modify-via-packageOverrides">Nixpkgs + manual</link>): + <example xml:id="module-services-emacs-config-nix"> + <title>Custom Emacs in <filename>~/.config/nixpkgs/config.nix</filename></title> +<programlisting><![CDATA[ { packageOverrides = super: let self = super.pkgs; in { myemacs = import /path/to/emacs.nix { pkgs = self; }; }; } ]]></programlisting> - </example> - </para> - - <para> - In this case, the next - <literal>nix-env -f '<nixpkgs>' -iA myemacs</literal> - will take care of adding your emacs to the - <varname>PATH</varname> environment variable. - </para> - </section> - - <section xml:id="module-services-emacs-advanced"> - <title>Advanced Emacs Configuration</title> + </example> + </para> - <para> - If you want, you can tweak the Emacs package itself from your - <filename>emacs.nix</filename>. For example, if you want to - have a GTK+3-based Emacs instead of the default GTK+2-based - binary and remove the automatically generated - <filename>emacs.desktop</filename> (useful is you only use - <command>emacsclient</command>), you can change your file - <filename>emacs.nix</filename> in this way: - </para> + <para> + In this case, the next <literal>nix-env -f '<nixpkgs>' -iA + myemacs</literal> will take care of adding your emacs to the + <varname>PATH</varname> environment variable. + </para> + </section> - <example xml:id="ex-emacsGtk3Nix"> - <title>Custom Emacs build</title> - <programlisting><![CDATA[ + <section xml:id="module-services-emacs-advanced"> + <title>Advanced Emacs Configuration</title> + + <para> + If you want, you can tweak the Emacs package itself from your + <filename>emacs.nix</filename>. For example, if you want to have a + GTK+3-based Emacs instead of the default GTK+2-based binary and remove the + automatically generated <filename>emacs.desktop</filename> (useful is you + only use <command>emacsclient</command>), you can change your file + <filename>emacs.nix</filename> in this way: + </para> + + <example xml:id="ex-emacsGtk3Nix"> + <title>Custom Emacs build</title> +<programlisting><![CDATA[ { pkgs ? import <nixpkgs> {} }: let myEmacs = (pkgs.emacs.override { @@ -370,161 +352,143 @@ let }); in [...] ]]></programlisting> - </example> + </example> - <para> - After building this file as shown in <xref linkend="ex-emacsNix" />, - you will get an GTK3-based Emacs binary pre-loaded with your - favorite packages. - </para> - </section> + <para> + After building this file as shown in <xref linkend="ex-emacsNix" />, you + will get an GTK3-based Emacs binary pre-loaded with your favorite packages. + </para> </section> - -<section xml:id="module-services-emacs-running"> + </section> + <section xml:id="module-services-emacs-running"> <title>Running Emacs as a Service</title> + <para> - <productname>NixOS</productname> provides an optional - <command>systemd</command> service which launches - <link xlink:href="https://www.gnu.org/software/emacs/manual/html_node/emacs/Emacs-Server.html"> - Emacs daemon - </link> - with the user's login session. + <productname>NixOS</productname> provides an optional + <command>systemd</command> service which launches + <link xlink:href="https://www.gnu.org/software/emacs/manual/html_node/emacs/Emacs-Server.html"> + Emacs daemon </link> with the user's login session. </para> <para> - <emphasis>Source:</emphasis> - <filename>modules/services/editors/emacs.nix</filename> + <emphasis>Source:</emphasis> + <filename>modules/services/editors/emacs.nix</filename> </para> <section xml:id="module-services-emacs-enabling"> - <title>Enabling the Service</title> - - <para> - To install and enable the <command>systemd</command> - user service for Emacs daemon, add the following to your - <filename>configuration.nix</filename>: + <title>Enabling the Service</title> + <para> + To install and enable the <command>systemd</command> user service for Emacs + daemon, add the following to your <filename>configuration.nix</filename>: <programlisting> <xref linkend="opt-services.emacs.enable"/> = true; <xref linkend="opt-services.emacs.package"/> = import /home/cassou/.emacs.d { pkgs = pkgs; }; </programlisting> - </para> - - <para> - The <varname>services.emacs.package</varname> option allows a - custom derivation to be used, for example, one created by - <function>emacsWithPackages</function>. - </para> - - <para> - Ensure that the Emacs server is enabled for your user's Emacs - configuration, either by customizing the - <varname>server-mode</varname> variable, or by adding - <literal>(server-start)</literal> to - <filename>~/.emacs.d/init.el</filename>. - </para> - - <para> - To start the daemon, execute the following: - + </para> + + <para> + The <varname>services.emacs.package</varname> option allows a custom + derivation to be used, for example, one created by + <function>emacsWithPackages</function>. + </para> + + <para> + Ensure that the Emacs server is enabled for your user's Emacs + configuration, either by customizing the <varname>server-mode</varname> + variable, or by adding <literal>(server-start)</literal> to + <filename>~/.emacs.d/init.el</filename>. + </para> + + <para> + To start the daemon, execute the following: <screen> $ nixos-rebuild switch # to activate the new configuration.nix $ systemctl --user daemon-reload # to force systemd reload $ systemctl --user start emacs.service # to start the Emacs daemon </screen> - - The server should now be ready to serve Emacs clients. - </para> - + The server should now be ready to serve Emacs clients. + </para> </section> <section xml:id="module-services-emacs-starting-client"> - <title>Starting the client</title> - <para> - Ensure that the emacs server is enabled, either by customizing - the <varname>server-mode</varname> variable, or by adding - <literal>(server-start)</literal> to - <filename>~/.emacs</filename>. - </para> + <title>Starting the client</title> - <para> - To connect to the emacs daemon, run one of the following: - <programlisting><![CDATA[ + <para> + Ensure that the emacs server is enabled, either by customizing the + <varname>server-mode</varname> variable, or by adding + <literal>(server-start)</literal> to <filename>~/.emacs</filename>. + </para> + + <para> + To connect to the emacs daemon, run one of the following: +<programlisting><![CDATA[ emacsclient FILENAME emacsclient --create-frame # opens a new frame (window) emacsclient --create-frame --tty # opens a new frame on the current terminal ]]></programlisting> - </para> + </para> </section> <section xml:id="module-services-emacs-editor-variable"> - <title>Configuring the <varname>EDITOR</varname> variable</title> - <!--<title><command>emacsclient</command> as the Default Editor</title>--> - - <para> - If <xref linkend="opt-services.emacs.defaultEditor"/> is - <literal>true</literal>, the <varname>EDITOR</varname> variable - will be set to a wrapper script which launches - <command>emacsclient</command>. - </para> - - <para> - Any setting of <varname>EDITOR</varname> in the shell config - files will override - <varname>services.emacs.defaultEditor</varname>. - To make sure <varname>EDITOR</varname> refers to the Emacs - wrapper script, remove any existing <varname>EDITOR</varname> - assignment from <filename>.profile</filename>, - <filename>.bashrc</filename>, <filename>.zshenv</filename> or - any other shell config file. - </para> - - <para> - If you have formed certain bad habits when editing files, - these can be corrected with a shell alias to the wrapper - script: - <programlisting>alias vi=$EDITOR</programlisting> - </para> + <title>Configuring the <varname>EDITOR</varname> variable</title> + +<!--<title><command>emacsclient</command> as the Default Editor</title>--> + + <para> + If <xref linkend="opt-services.emacs.defaultEditor"/> is + <literal>true</literal>, the <varname>EDITOR</varname> variable will be set + to a wrapper script which launches <command>emacsclient</command>. + </para> + + <para> + Any setting of <varname>EDITOR</varname> in the shell config files will + override <varname>services.emacs.defaultEditor</varname>. To make sure + <varname>EDITOR</varname> refers to the Emacs wrapper script, remove any + existing <varname>EDITOR</varname> assignment from + <filename>.profile</filename>, <filename>.bashrc</filename>, + <filename>.zshenv</filename> or any other shell config file. + </para> + + <para> + If you have formed certain bad habits when editing files, these can be + corrected with a shell alias to the wrapper script: +<programlisting>alias vi=$EDITOR</programlisting> + </para> </section> <section xml:id="module-services-emacs-per-user"> - <title>Per-User Enabling of the Service</title> - - <para> - In general, <command>systemd</command> user services - are globally enabled by symlinks in - <filename>/etc/systemd/user</filename>. In the case where - Emacs daemon is not wanted for all users, it is possible to - install the service but not globally enable it: + <title>Per-User Enabling of the Service</title> + <para> + In general, <command>systemd</command> user services are globally enabled + by symlinks in <filename>/etc/systemd/user</filename>. In the case where + Emacs daemon is not wanted for all users, it is possible to install the + service but not globally enable it: <programlisting> <xref linkend="opt-services.emacs.enable"/> = false; <xref linkend="opt-services.emacs.install"/> = true; </programlisting> - </para> - - <para> - To enable the <command>systemd</command> user service for just - the currently logged in user, run: - - <programlisting>systemctl --user enable emacs</programlisting> - - This will add the symlink - <filename>~/.config/systemd/user/emacs.service</filename>. - </para> + </para> + + <para> + To enable the <command>systemd</command> user service for just the + currently logged in user, run: +<programlisting>systemctl --user enable emacs</programlisting> + This will add the symlink + <filename>~/.config/systemd/user/emacs.service</filename>. + </para> </section> -</section> - -<section xml:id="module-services-emacs-configuring"> + </section> + <section xml:id="module-services-emacs-configuring"> <title>Configuring Emacs</title> <para> - The Emacs init file should be changed to load the extension - packages at startup: - - <example xml:id="module-services-emacs-package-initialisation"> - <title>Package initialization in <filename>.emacs</filename></title> - <programlisting><![CDATA[ + The Emacs init file should be changed to load the extension packages at + startup: + <example xml:id="module-services-emacs-package-initialisation"> + <title>Package initialization in <filename>.emacs</filename></title> +<programlisting><![CDATA[ (require 'package) ;; optional. makes unpure packages archives unavailable @@ -533,66 +497,71 @@ emacsclient --create-frame --tty # opens a new frame on the current terminal (setq package-enable-at-startup nil) (package-initialize) ]]></programlisting> - </example> + </example> </para> <para> - After the declarative emacs package configuration has been - tested, previously downloaded packages can be cleaned up by - removing <filename>~/.emacs.d/elpa</filename> (do make a backup - first, in case you forgot a package). + After the declarative emacs package configuration has been tested, + previously downloaded packages can be cleaned up by removing + <filename>~/.emacs.d/elpa</filename> (do make a backup first, in case you + forgot a package). </para> - <!-- +<!-- todo: is it worth documenting customizations for server-switch-hook, server-done-hook? --> <section xml:id="module-services-emacs-major-mode"> - <title>A Major Mode for Nix Expressions</title> + <title>A Major Mode for Nix Expressions</title> - <para> - Of interest may be <varname>melpaPackages.nix-mode</varname>, - which provides syntax highlighting for the Nix language. This is - particularly convenient if you regularly edit Nix files. - </para> + <para> + Of interest may be <varname>melpaPackages.nix-mode</varname>, which + provides syntax highlighting for the Nix language. This is particularly + convenient if you regularly edit Nix files. + </para> </section> <section xml:id="module-services-emacs-man-pages"> - <title>Accessing man pages</title> - <para> - You can use <function>woman</function> to get completion of all - available man pages. For example, type <literal>M-x woman - <RET> nixos-rebuild <RET>.</literal> - </para> + <title>Accessing man pages</title> + + <para> + You can use <function>woman</function> to get completion of all available + man pages. For example, type <literal>M-x woman <RET> nixos-rebuild + <RET>.</literal> + </para> </section> <section xml:id="sec-emacs-docbook-xml"> - <title>Editing DocBook 5 XML Documents</title> - <para> - Emacs includes <link - xlink:href="https://www.gnu.org/software/emacs/manual/html_node/nxml-mode/Introduction.html">nXML</link>, - a major-mode for validating and editing XML documents. - When editing DocBook 5.0 documents, such as - <link linkend="book-nixos-manual">this one</link>, - nXML needs to be configured with the relevant schema, which is - not included. - </para> + <title>Editing DocBook 5 XML Documents</title> - <para> - To install the DocBook 5.0 schemas, either add - <varname>pkgs.docbook5</varname> to - <xref linkend="opt-environment.systemPackages"/> (<link + <para> + Emacs includes + <link + xlink:href="https://www.gnu.org/software/emacs/manual/html_node/nxml-mode/Introduction.html">nXML</link>, + a major-mode for validating and editing XML documents. When editing DocBook + 5.0 documents, such as <link linkend="book-nixos-manual">this one</link>, + nXML needs to be configured with the relevant schema, which is not + included. + </para> + + <para> + To install the DocBook 5.0 schemas, either add + <varname>pkgs.docbook5</varname> to + <xref linkend="opt-environment.systemPackages"/> + (<link linkend="sec-declarative-package-mgmt">NixOS</link>), or run - <literal>nix-env -i pkgs.docbook5</literal> - (<link linkend="sec-ad-hoc-packages">Nix</link>). - </para> - - <para> - Then customize the variable <varname>rng-schema-locating-files</varname> to include <filename>~/.emacs.d/schemas.xml</filename> and put the following text into that file: - <example xml:id="ex-emacs-docbook-xml"> - <title>nXML Schema Configuration (<filename>~/.emacs.d/schemas.xml</filename>)</title> - <programlisting language="xml"><![CDATA[ + <literal>nix-env -i pkgs.docbook5</literal> + (<link linkend="sec-ad-hoc-packages">Nix</link>). + </para> + + <para> + Then customize the variable <varname>rng-schema-locating-files</varname> to + include <filename>~/.emacs.d/schemas.xml</filename> and put the following + text into that file: + <example xml:id="ex-emacs-docbook-xml"> + <title>nXML Schema Configuration (<filename>~/.emacs.d/schemas.xml</filename>)</title> +<programlisting language="xml"><![CDATA[ <?xml version="1.0"?> <!-- To let emacs find this file, evaluate: @@ -612,9 +581,7 @@ emacsclient --create-frame --tty # opens a new frame on the current terminal </locatingRules> ]]></programlisting> </example> - </para> - + </para> </section> -</section> - + </section> </chapter> diff --git a/nixos/modules/services/mail/rspamd.nix b/nixos/modules/services/mail/rspamd.nix index b3dae60c2c7e..bba11796a3d3 100644 --- a/nixos/modules/services/mail/rspamd.nix +++ b/nixos/modules/services/mail/rspamd.nix @@ -115,36 +115,10 @@ let }; }; - indexOf = default: start: list: e: - if list == [] - then default - else if (head list) == e then start - else (indexOf default (start + (length (listenStreams (head list).socket))) (tail list) e); - - systemdSocket = indexOf (abort "Socket not found") 0 allSockets; - isUnixSocket = socket: hasPrefix "/" (if (isString socket) then socket else socket.socket); - isPort = hasPrefix "*:"; - isIPv4Socket = hasPrefix "*v4:"; - isIPv6Socket = hasPrefix "*v6:"; - isLocalHost = hasPrefix "localhost:"; - listenStreams = socket: - if (isLocalHost socket) then - let port = (removePrefix "localhost:" socket); - in [ "127.0.0.1:${port}" ] ++ (if config.networking.enableIPv6 then ["[::1]:${port}"] else []) - else if (isIPv6Socket socket) then [removePrefix "*v6:" socket] - else if (isPort socket) then [removePrefix "*:" socket] - else if (isIPv4Socket socket) then - throw "error: IPv4 only socket not supported in rspamd with socket activation" - else if (length (splitString " " socket)) != 1 then - throw "error: string options not supported in rspamd with socket activation" - else [socket]; - - mkBindSockets = enabled: socks: concatStringsSep "\n " (flatten (map (each: - if cfg.socketActivation && enabled != false then - let systemd = (systemdSocket each); - in (imap (idx: e: "bind_socket = \"systemd:${toString (systemd + idx - 1)}\";") (listenStreams each.socket)) - else "bind_socket = \"${each.rawEntry}\";") socks)); + + mkBindSockets = enabled: socks: concatStringsSep "\n " + (flatten (map (each: "bind_socket = \"${each.rawEntry}\";") socks)); rspamdConfFile = pkgs.writeText "rspamd.conf" '' @@ -175,18 +149,6 @@ let ${cfg.extraConfig} ''; - allMappedSockets = flatten (mapAttrsToList (name: value: - if value.enable != false - then imap (idx: each: { - name = "${name}"; - index = idx; - value = each; - }) value.bindSockets - else []) cfg.workers); - allSockets = map (e: e.value) allMappedSockets; - - allSocketNames = map (each: "rspamd-${each.name}-${toString each.index}.socket") allMappedSockets; - in { @@ -205,13 +167,6 @@ in description = "Whether to run the rspamd daemon in debug mode."; }; - socketActivation = mkOption { - type = types.bool; - description = '' - Enable systemd socket activation for rspamd. - ''; - }; - workers = mkOption { type = with types; attrsOf (submodule workerOpts); description = '' @@ -272,13 +227,6 @@ in config = mkIf cfg.enable { - services.rspamd.socketActivation = mkDefault (!opts.bindSocket.isDefined && !opts.bindUISocket.isDefined); - - assertions = [ { - assertion = !cfg.socketActivation || !(opts.bindSocket.isDefined || opts.bindUISocket.isDefined); - message = "Can't use socketActivation for rspamd when using renamed bind socket options"; - } ]; - # Allow users to run 'rspamc' and 'rspamadm'. environment.systemPackages = [ pkgs.rspamd ]; @@ -299,17 +247,14 @@ in systemd.services.rspamd = { description = "Rspamd Service"; - wantedBy = mkIf (!cfg.socketActivation) [ "multi-user.target" ]; - after = [ "network.target" ] ++ - (if cfg.socketActivation then allSocketNames else []); - requires = mkIf cfg.socketActivation allSocketNames; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; serviceConfig = { ExecStart = "${pkgs.rspamd}/bin/rspamd ${optionalString cfg.debug "-d"} --user=${cfg.user} --group=${cfg.group} --pid=/run/rspamd.pid -c ${rspamdConfFile} -f"; Restart = "always"; RuntimeDirectory = "rspamd"; PrivateTmp = true; - Sockets = mkIf cfg.socketActivation (concatStringsSep " " allSocketNames); }; preStart = '' @@ -317,24 +262,10 @@ in ${pkgs.coreutils}/bin/chown ${cfg.user}:${cfg.group} /var/lib/rspamd ''; }; - systemd.sockets = mkIf cfg.socketActivation - (listToAttrs (map (each: { - name = "rspamd-${each.name}-${toString each.index}"; - value = { - description = "Rspamd socket ${toString each.index} for worker ${each.name}"; - wantedBy = [ "sockets.target" ]; - listenStreams = (listenStreams each.value.socket); - socketConfig = { - BindIPv6Only = mkIf (isIPv6Socket each.value.socket) "ipv6-only"; - Service = "rspamd.service"; - SocketUser = mkIf (isUnixSocket each.value.socket) each.value.owner; - SocketGroup = mkIf (isUnixSocket each.value.socket) each.value.group; - SocketMode = mkIf (isUnixSocket each.value.socket) each.value.mode; - }; - }; - }) allMappedSockets)); }; imports = [ + (mkRemovedOptionModule [ "services" "rspamd" "socketActivation" ] + "Socket activation never worked correctly and could at this time not be fixed and so was removed") (mkRenamedOptionModule [ "services" "rspamd" "bindSocket" ] [ "services" "rspamd" "workers" "normal" "bindSockets" ]) (mkRenamedOptionModule [ "services" "rspamd" "bindUISocket" ] [ "services" "rspamd" "workers" "controller" "bindSockets" ]) ]; diff --git a/nixos/modules/services/misc/gitlab.xml b/nixos/modules/services/misc/gitlab.xml index 67b9f1d3e474..ab99d7bd3a60 100644 --- a/nixos/modules/services/misc/gitlab.xml +++ b/nixos/modules/services/misc/gitlab.xml @@ -3,20 +3,22 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="module-services-gitlab"> - -<title>Gitlab</title> - -<para>Gitlab is a feature-rich git hosting service.</para> - -<section xml:id="module-services-gitlab-prerequisites"><title>Prerequisites</title> - -<para>The gitlab service exposes only an Unix socket at -<literal>/run/gitlab/gitlab-workhorse.socket</literal>. You need to configure a -webserver to proxy HTTP requests to the socket.</para> - -<para>For instance, the following configuration could be used to use nginx as - frontend proxy: - + <title>Gitlab</title> + <para> + Gitlab is a feature-rich git hosting service. + </para> + <section xml:id="module-services-gitlab-prerequisites"> + <title>Prerequisites</title> + + <para> + The gitlab service exposes only an Unix socket at + <literal>/run/gitlab/gitlab-workhorse.socket</literal>. You need to + configure a webserver to proxy HTTP requests to the socket. + </para> + + <para> + For instance, the following configuration could be used to use nginx as + frontend proxy: <programlisting> <link linkend="opt-services.nginx.enable">services.nginx</link> = { <link linkend="opt-services.nginx.enable">enable</link> = true; @@ -31,21 +33,24 @@ webserver to proxy HTTP requests to the socket.</para> }; }; </programlisting> -</para> - -</section> - -<section xml:id="module-services-gitlab-configuring"><title>Configuring</title> - -<para>Gitlab depends on both PostgreSQL and Redis and will automatically enable -both services. In the case of PostgreSQL, a database and a role will be created. -</para> - -<para>The default state dir is <literal>/var/gitlab/state</literal>. This is where -all data like the repositories and uploads will be stored.</para> - -<para>A basic configuration with some custom settings could look like this: - + </para> + </section> + <section xml:id="module-services-gitlab-configuring"> + <title>Configuring</title> + + <para> + Gitlab depends on both PostgreSQL and Redis and will automatically enable + both services. In the case of PostgreSQL, a database and a role will be + created. + </para> + + <para> + The default state dir is <literal>/var/gitlab/state</literal>. This is where + all data like the repositories and uploads will be stored. + </para> + + <para> + A basic configuration with some custom settings could look like this: <programlisting> services.gitlab = { <link linkend="opt-services.gitlab.enable">enable</link> = true; @@ -105,40 +110,41 @@ services.gitlab = { }; }; </programlisting> -</para> - -<para>If you're setting up a new Gitlab instance, generate new secrets. You -for instance use <literal>tr -dc A-Za-z0-9 < /dev/urandom | head -c 128</literal> -to generate a new secret. Gitlab encrypts sensitive data stored in the database. -If you're restoring an existing Gitlab instance, you must specify the secrets -secret from <literal>config/secrets.yml</literal> located in your Gitlab state -folder.</para> - -<para>Refer to <xref linkend="ch-options" /> for all available configuration -options for the <link linkend="opt-services.gitlab.enable">services.gitlab</link> module.</para> - -</section> - -<section xml:id="module-services-gitlab-maintenance"><title>Maintenance</title> - -<para>You can run Gitlab's rake tasks with <literal>gitlab-rake</literal> -which will be available on the system when gitlab is enabled. You will -have to run the command as the user that you configured to run gitlab -with.</para> - -<para>For example, to backup a Gitlab instance: - + </para> + + <para> + If you're setting up a new Gitlab instance, generate new secrets. You for + instance use <literal>tr -dc A-Za-z0-9 < /dev/urandom | head -c + 128</literal> to generate a new secret. Gitlab encrypts sensitive data + stored in the database. If you're restoring an existing Gitlab instance, you + must specify the secrets secret from <literal>config/secrets.yml</literal> + located in your Gitlab state folder. + </para> + + <para> + Refer to <xref linkend="ch-options" /> for all available configuration + options for the + <link linkend="opt-services.gitlab.enable">services.gitlab</link> module. + </para> + </section> + <section xml:id="module-services-gitlab-maintenance"> + <title>Maintenance</title> + + <para> + You can run Gitlab's rake tasks with <literal>gitlab-rake</literal> which + will be available on the system when gitlab is enabled. You will have to run + the command as the user that you configured to run gitlab with. + </para> + + <para> + For example, to backup a Gitlab instance: <programlisting> $ sudo -u git -H gitlab-rake gitlab:backup:create </programlisting> - -A list of all availabe rake tasks can be obtained by running: - + A list of all availabe rake tasks can be obtained by running: <programlisting> $ sudo -u git -H gitlab-rake -T </programlisting> -</para> - -</section> - + </para> + </section> </chapter> diff --git a/nixos/modules/services/misc/lidarr.nix b/nixos/modules/services/misc/lidarr.nix new file mode 100644 index 000000000000..627f22334fe8 --- /dev/null +++ b/nixos/modules/services/misc/lidarr.nix @@ -0,0 +1,46 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.lidarr; +in +{ + options = { + services.lidarr = { + enable = mkEnableOption "Lidarr"; + }; + }; + + config = mkIf cfg.enable { + systemd.services.lidarr = { + description = "Lidarr"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + preStart = '' + [ ! -d /var/lib/lidarr ] && mkdir -p /var/lib/lidarr + chown -R lidarr:lidarr /var/lib/lidarr + ''; + + serviceConfig = { + Type = "simple"; + User = "lidarr"; + Group = "lidarr"; + PermissionsStartOnly = "true"; + ExecStart = "${pkgs.lidarr}/bin/Lidarr"; + Restart = "on-failure"; + + StateDirectory = "/var/lib/lidarr/"; + StateDirectoryMode = "0770"; + }; + }; + + users.users.lidarr = { + uid = config.ids.uids.lidarr; + home = "/var/lib/lidarr"; + group = "lidarr"; + }; + + users.groups.lidarr.gid = config.ids.gids.lidarr; + }; +} diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index c0eb882c58f3..24379ec27354 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -345,7 +345,6 @@ in type = types.listOf types.str; default = [ - "$HOME/.nix-defexpr/channels" "nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos" "nixos-config=/etc/nixos/configuration.nix" "/nix/var/nix/profiles/per-user/root/channels" @@ -436,7 +435,7 @@ in # Set up the environment variables for running Nix. environment.sessionVariables = cfg.envVars // - { NIX_PATH = concatStringsSep ":" cfg.nixPath; + { NIX_PATH = cfg.nixPath; }; environment.extraInit = optionalString (!isNix20) @@ -446,6 +445,10 @@ in if [ "$USER" != root -o ! -w /nix/var/nix/db ]; then export NIX_REMOTE=daemon fi + '' + '' + if [ -e "$HOME/.nix-defexpr/channels" ]; then + export NIX_PATH="$HOME/.nix-defexpr/channels''${NIX_PATH:+:$NIX_PATH}" + fi ''; nix.nrBuildUsers = mkDefault (lib.max 32 cfg.maxJobs); diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix index 7202269d3421..df3e71c80dea 100644 --- a/nixos/modules/services/misc/nixos-manual.nix +++ b/nixos/modules/services/misc/nixos-manual.nix @@ -44,29 +44,30 @@ in }; - config = mkIf cfg.showManual { - - assertions = [{ - assertion = cfgd.enable && cfgd.nixos.enable; - message = "Can't enable `service.nixosManual.showManual` without `documentation.nixos.enable`"; - }]; - - boot.extraTTYs = [ "tty${toString cfg.ttyNumber}" ]; - - systemd.services."nixos-manual" = { - description = "NixOS Manual"; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - ExecStart = "${cfg.browser} ${config.system.build.manual.manualHTMLIndex}"; - StandardInput = "tty"; - StandardOutput = "tty"; - TTYPath = "/dev/tty${toString cfg.ttyNumber}"; - TTYReset = true; - TTYVTDisallocate = true; - Restart = "always"; + config = mkMerge [ + (mkIf cfg.showManual { + assertions = singleton { + assertion = cfgd.enable && cfgd.nixos.enable; + message = "Can't enable `services.nixosManual.showManual` without `documentation.nixos.enable`"; }; - }; - - }; + }) + (mkIf (cfg.showManual && cfgd.enable && cfgd.nixos.enable) { + boot.extraTTYs = [ "tty${toString cfg.ttyNumber}" ]; + + systemd.services."nixos-manual" = { + description = "NixOS Manual"; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = "${cfg.browser} ${config.system.build.manual.manualHTMLIndex}"; + StandardInput = "tty"; + StandardOutput = "tty"; + TTYPath = "/dev/tty${toString cfg.ttyNumber}"; + TTYReset = true; + TTYVTDisallocate = true; + Restart = "always"; + }; + }; + }) + ]; } diff --git a/nixos/modules/services/misc/sickbeard.nix b/nixos/modules/services/misc/sickbeard.nix new file mode 100644 index 000000000000..5cfbbe516ae1 --- /dev/null +++ b/nixos/modules/services/misc/sickbeard.nix @@ -0,0 +1,92 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + name = "sickbeard"; + + cfg = config.services.sickbeard; + sickbeard = cfg.package; + +in +{ + + ###### interface + + options = { + services.sickbeard = { + enable = mkOption { + type = types.bool; + default = false; + description = "Whether to enable the sickbeard server."; + }; + package = mkOption { + type = types.package; + default = pkgs.sickbeard; + example = literalExample "pkgs.sickrage"; + description ='' + Enable <literal>pkgs.sickrage</literal> or <literal>pkgs.sickgear</literal> + as an alternative to SickBeard + ''; + }; + dataDir = mkOption { + type = types.path; + default = "/var/lib/${name}"; + description = "Path where to store data files."; + }; + configFile = mkOption { + type = types.path; + default = "${cfg.dataDir}/config.ini"; + description = "Path to config file."; + }; + port = mkOption { + type = types.ints.u16; + default = 8081; + description = "Port to bind to."; + }; + user = mkOption { + type = types.str; + default = name; + description = "User to run the service as"; + }; + group = mkOption { + type = types.str; + default = name; + description = "Group to run the service as"; + }; + }; + }; + + + ###### implementation + + config = mkIf cfg.enable { + + users.users = optionalAttrs (cfg.user == name) (singleton { + name = name; + uid = config.ids.uids.sickbeard; + group = cfg.group; + description = "sickbeard user"; + home = cfg.dataDir; + createHome = true; + }); + + users.groups = optionalAttrs (cfg.group == name) (singleton { + name = name; + gid = config.ids.gids.sickbeard; + }); + + systemd.services.sickbeard = { + description = "Sickbeard Server"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + serviceConfig = { + User = cfg.user; + Group = cfg.group; + ExecStart = "${sickbeard}/SickBeard.py --datadir ${cfg.dataDir} --config ${cfg.configFile} --port ${toString cfg.port}"; + }; + }; + }; +} diff --git a/nixos/modules/services/misc/taskserver/doc.xml b/nixos/modules/services/misc/taskserver/doc.xml index 21d25ecf391f..5eac8d9ef784 100644 --- a/nixos/modules/services/misc/taskserver/doc.xml +++ b/nixos/modules/services/misc/taskserver/doc.xml @@ -2,101 +2,93 @@ xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="module-taskserver"> - - <title>Taskserver</title> + <title>Taskserver</title> + <para> + Taskserver is the server component of + <link xlink:href="https://taskwarrior.org/">Taskwarrior</link>, a free and + open source todo list application. + </para> + <para> + <emphasis>Upstream documentation:</emphasis> + <link xlink:href="https://taskwarrior.org/docs/#taskd"/> + </para> + <section xml:id="module-services-taskserver-configuration"> + <title>Configuration</title> <para> - Taskserver is the server component of - <link xlink:href="https://taskwarrior.org/">Taskwarrior</link>, a free and - open source todo list application. + Taskserver does all of its authentication via TLS using client certificates, + so you either need to roll your own CA or purchase a certificate from a + known CA, which allows creation of client certificates. These certificates + are usually advertised as <quote>server certificates</quote>. </para> <para> - <emphasis>Upstream documentation:</emphasis> - <link xlink:href="https://taskwarrior.org/docs/#taskd"/> + So in order to make it easier to handle your own CA, there is a helper tool + called <command>nixos-taskserver</command> which manages the custom CA along + with Taskserver organisations, users and groups. </para> - <section xml:id="module-services-taskserver-configuration"> - <title>Configuration</title> - - <para> - Taskserver does all of its authentication via TLS using client - certificates, so you either need to roll your own CA or purchase a - certificate from a known CA, which allows creation of client - certificates. - - These certificates are usually advertised as - <quote>server certificates</quote>. - </para> - - <para> - So in order to make it easier to handle your own CA, there is a helper - tool called <command>nixos-taskserver</command> which manages the custom - CA along with Taskserver organisations, users and groups. - </para> - - <para> - While the client certificates in Taskserver only authenticate whether a - user is allowed to connect, every user has its own UUID which identifies - it as an entity. - </para> - - <para> - With <command>nixos-taskserver</command> the client certificate is created - along with the UUID of the user, so it handles all of the credentials - needed in order to setup the Taskwarrior client to work with a Taskserver. - </para> - </section> + <para> + While the client certificates in Taskserver only authenticate whether a user + is allowed to connect, every user has its own UUID which identifies it as an + entity. + </para> - <section xml:id="module-services-taskserver-nixos-taskserver-tool"> - <title>The nixos-taskserver tool</title> + <para> + With <command>nixos-taskserver</command> the client certificate is created + along with the UUID of the user, so it handles all of the credentials needed + in order to setup the Taskwarrior client to work with a Taskserver. + </para> + </section> + <section xml:id="module-services-taskserver-nixos-taskserver-tool"> + <title>The nixos-taskserver tool</title> - <para> - Because Taskserver by default only provides scripts to setup users - imperatively, the <command>nixos-taskserver</command> tool is used for - addition and deletion of organisations along with users and groups defined - by <xref linkend="opt-services.taskserver.organisations"/> and as well for - imperative set up. - </para> + <para> + Because Taskserver by default only provides scripts to setup users + imperatively, the <command>nixos-taskserver</command> tool is used for + addition and deletion of organisations along with users and groups defined + by <xref linkend="opt-services.taskserver.organisations"/> and as well for + imperative set up. + </para> - <para> - The tool is designed to not interfere if the command is used to manually - set up some organisations, users or groups. - </para> + <para> + The tool is designed to not interfere if the command is used to manually set + up some organisations, users or groups. + </para> - <para> - For example if you add a new organisation using - <command>nixos-taskserver org add foo</command>, the organisation is not - modified and deleted no matter what you define in - <option>services.taskserver.organisations</option>, even if you're adding - the same organisation in that option. - </para> + <para> + For example if you add a new organisation using <command>nixos-taskserver + org add foo</command>, the organisation is not modified and deleted no + matter what you define in + <option>services.taskserver.organisations</option>, even if you're adding + the same organisation in that option. + </para> - <para> - The tool is modelled to imitate the official <command>taskd</command> - command, documentation for each subcommand can be shown by using the - <option>--help</option> switch. - </para> - </section> - <section xml:id="module-services-taskserver-declarative-ca-management"> - <title>Declarative/automatic CA management</title> + <para> + The tool is modelled to imitate the official <command>taskd</command> + command, documentation for each subcommand can be shown by using the + <option>--help</option> switch. + </para> + </section> + <section xml:id="module-services-taskserver-declarative-ca-management"> + <title>Declarative/automatic CA management</title> - <para> - Everything is done according to what you specify in the module options, - however in order to set up a Taskwarrior client for synchronisation with a - Taskserver instance, you have to transfer the keys and certificates to the - client machine. - </para> + <para> + Everything is done according to what you specify in the module options, + however in order to set up a Taskwarrior client for synchronisation with a + Taskserver instance, you have to transfer the keys and certificates to the + client machine. + </para> - <para> - This is done using - <command>nixos-taskserver user export $orgname $username</command> which - is printing a shell script fragment to stdout which can either be used - verbatim or adjusted to import the user on the client machine. - </para> + <para> + This is done using <command>nixos-taskserver user export $orgname + $username</command> which is printing a shell script fragment to stdout + which can either be used verbatim or adjusted to import the user on the + client machine. + </para> - <para> - For example, let's say you have the following configuration: + <para> + For example, let's say you have the following configuration: <screen> { <xref linkend="opt-services.taskserver.enable"/> = true; @@ -105,40 +97,39 @@ <link linkend="opt-services.taskserver.organisations._name_.users">services.taskserver.organisations.my-company.users</link> = [ "alice" ]; } </screen> - This creates an organisation called <literal>my-company</literal> with the - user <literal>alice</literal>. - </para> + This creates an organisation called <literal>my-company</literal> with the + user <literal>alice</literal>. + </para> - <para> - Now in order to import the <literal>alice</literal> user to another - machine <literal>alicebox</literal>, all we need to do is something like - this: + <para> + Now in order to import the <literal>alice</literal> user to another machine + <literal>alicebox</literal>, all we need to do is something like this: <screen> $ ssh server nixos-taskserver user export my-company alice | sh </screen> - Of course, if no SSH daemon is available on the server you can also copy - & paste it directly into a shell. - </para> + Of course, if no SSH daemon is available on the server you can also copy + & paste it directly into a shell. + </para> - <para> - After this step the user should be set up and you can start synchronising - your tasks for the first time with <command>task sync init</command> on - <literal>alicebox</literal>. - </para> + <para> + After this step the user should be set up and you can start synchronising + your tasks for the first time with <command>task sync init</command> on + <literal>alicebox</literal>. + </para> - <para> - Subsequent synchronisation requests merely require the command - <command>task sync</command> after that stage. - </para> - </section> - <section xml:id="module-services-taskserver-manual-ca-management"> - <title>Manual CA management</title> + <para> + Subsequent synchronisation requests merely require the command <command>task + sync</command> after that stage. + </para> + </section> + <section xml:id="module-services-taskserver-manual-ca-management"> + <title>Manual CA management</title> - <para> - If you set any options within - <link linkend="opt-services.taskserver.pki.manual.ca.cert">service.taskserver.pki.manual</link>.*, - <command>nixos-taskserver</command> won't issue certificates, but you can - still use it for adding or removing user accounts. - </para> - </section> + <para> + If you set any options within + <link linkend="opt-services.taskserver.pki.manual.ca.cert">service.taskserver.pki.manual</link>.*, + <command>nixos-taskserver</command> won't issue certificates, but you can + still use it for adding or removing user accounts. + </para> + </section> </chapter> diff --git a/nixos/modules/services/misc/weechat.xml b/nixos/modules/services/misc/weechat.xml index de86dede2eb5..9c9ee0448c92 100644 --- a/nixos/modules/services/misc/weechat.xml +++ b/nixos/modules/services/misc/weechat.xml @@ -3,22 +3,24 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="module-services-weechat"> + <title>WeeChat</title> + <para> + <link xlink:href="https://weechat.org/">WeeChat</link> is a fast and + extensible IRC client. + </para> + <section> + <title>Basic Usage</title> -<title>WeeChat</title> -<para><link xlink:href="https://weechat.org/">WeeChat</link> is a fast and extensible IRC client.</para> - -<section><title>Basic Usage</title> -<para> -By default, the module creates a -<literal><link xlink:href="https://www.freedesktop.org/wiki/Software/systemd/">systemd</link></literal> unit -which runs the chat client in a detached -<literal><link xlink:href="https://www.gnu.org/software/screen/">screen</link></literal> session. - -</para> - -<para> -This can be done by enabling the <literal>weechat</literal> service: + <para> + By default, the module creates a + <literal><link xlink:href="https://www.freedesktop.org/wiki/Software/systemd/">systemd</link></literal> + unit which runs the chat client in a detached + <literal><link xlink:href="https://www.gnu.org/software/screen/">screen</link></literal> + session. + </para> + <para> + This can be done by enabling the <literal>weechat</literal> service: <programlisting> { ... }: @@ -26,19 +28,22 @@ This can be done by enabling the <literal>weechat</literal> service: <link linkend="opt-services.weechat.enable">services.weechat.enable</link> = true; } </programlisting> -</para> -<para> -The service is managed by a dedicated user -named <literal>weechat</literal> in the state directory -<literal>/var/lib/weechat</literal>. -</para> -</section> -<section><title>Re-attaching to WeeChat</title> -<para> -WeeChat runs in a screen session owned by a dedicated user. To explicitly -allow your another user to attach to this session, the <literal>screenrc</literal> needs to be tweaked -by adding <link xlink:href="https://www.gnu.org/software/screen/manual/html_node/Multiuser.html#Multiuser">multiuser</link> support: + </para> + + <para> + The service is managed by a dedicated user named <literal>weechat</literal> + in the state directory <literal>/var/lib/weechat</literal>. + </para> + </section> + <section> + <title>Re-attaching to WeeChat</title> + <para> + WeeChat runs in a screen session owned by a dedicated user. To explicitly + allow your another user to attach to this session, the + <literal>screenrc</literal> needs to be tweaked by adding + <link xlink:href="https://www.gnu.org/software/screen/manual/html_node/Multiuser.html#Multiuser">multiuser</link> + support: <programlisting> { <link linkend="opt-programs.screen.screenrc">programs.screen.screenrc</link> = '' @@ -47,15 +52,15 @@ by adding <link xlink:href="https://www.gnu.org/software/screen/manual/html_node ''; } </programlisting> - -Now, the session can be re-attached like this: - + Now, the session can be re-attached like this: <programlisting> screen -r weechat-screen </programlisting> -</para> -<para> -<emphasis>The session name can be changed using <link linkend="opt-services.weechat.sessionName">services.weechat.sessionName.</link></emphasis> -</para> -</section> + </para> + + <para> + <emphasis>The session name can be changed using + <link linkend="opt-services.weechat.sessionName">services.weechat.sessionName.</link></emphasis> + </para> + </section> </chapter> diff --git a/nixos/modules/services/monitoring/prometheus/exporters.xml b/nixos/modules/services/monitoring/prometheus/exporters.xml index be86abb74b44..7a0a1bdf2c14 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.xml +++ b/nixos/modules/services/monitoring/prometheus/exporters.xml @@ -3,13 +3,19 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="module-services-prometheus-exporters"> + <title>Prometheus exporters</title> + <para> + Prometheus exporters provide metrics for the + <link xlink:href="https://prometheus.io">prometheus monitoring system</link>. + </para> + <section xml:id="module-services-prometheus-exporters-configuration"> + <title>Configuration</title> -<title>Prometheus exporters</title> - -<para>Prometheus exporters provide metrics for the <link xlink:href="https://prometheus.io">prometheus monitoring system</link>.</para> - -<section xml:id="module-services-prometheus-exporters-configuration"><title>Configuration</title> - <para>One of the most common exporters is the <link xlink:href="https://github.com/prometheus/node_exporter">node exporter</link>, it provides hardware and OS metrics from the host it's running on. The exporter could be configured as follows: + <para> + One of the most common exporters is the + <link xlink:href="https://github.com/prometheus/node_exporter">node + exporter</link>, it provides hardware and OS metrics from the host it's + running on. The exporter could be configured as follows: <programlisting> services.promtheus.exporters.node = { enable = true; @@ -24,43 +30,88 @@ firewallFilter = "-i br0 -p tcp -m tcp --dport 9100"; }; </programlisting> -It should now serve all metrics from the collectors -that are explicitly enabled and the ones that are -<link xlink:href="https://github.com/prometheus/node_exporter#enabled-by-default">enabled by default</link>, via http under <literal>/metrics</literal>. In this example the firewall should just -allow incoming connections to the exporter's port on the bridge interface <literal>br0</literal> -(this would have to be configured seperately of course). -For more information about configuration see <literal>man configuration.nix</literal> or -search through the <link xlink:href="https://nixos.org/nixos/options.html#prometheus.exporters">available options</link>. -</para> -</section> -<section xml:id="module-services-prometheus-exporters-new-exporter"><title>Adding a new exporter</title> - <para>To add a new exporter, it has to be packaged first (see <literal>nixpkgs/pkgs/servers/monitoring/prometheus/</literal> for examples), then a module can be added. The postfix exporter is used in this example:</para> -<itemizedlist> - <listitem> + It should now serve all metrics from the collectors that are explicitly + enabled and the ones that are + <link xlink:href="https://github.com/prometheus/node_exporter#enabled-by-default">enabled + by default</link>, via http under <literal>/metrics</literal>. In this + example the firewall should just allow incoming connections to the + exporter's port on the bridge interface <literal>br0</literal> (this would + have to be configured seperately of course). For more information about + configuration see <literal>man configuration.nix</literal> or search through + the + <link xlink:href="https://nixos.org/nixos/options.html#prometheus.exporters">available + options</link>. + </para> + </section> + <section xml:id="module-services-prometheus-exporters-new-exporter"> + <title>Adding a new exporter</title> + + <para> + To add a new exporter, it has to be packaged first (see + <literal>nixpkgs/pkgs/servers/monitoring/prometheus/</literal> for + examples), then a module can be added. The postfix exporter is used in this + example: + </para> + + <itemizedlist> + <listitem> <para> - Some default options for all exporters are provided by - <literal>nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix</literal>: + Some default options for all exporters are provided by + <literal>nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix</literal>: </para> - </listitem> - <listitem override='none'> + </listitem> + <listitem override='none'> <itemizedlist> - <listitem><para><literal>enable</literal></para></listitem> - <listitem><para><literal>port</literal></para></listitem> - <listitem><para><literal>listenAddress</literal></para></listitem> - <listitem><para><literal>extraFlags</literal></para></listitem> - <listitem><para><literal>openFirewall</literal></para></listitem> - <listitem><para><literal>firewallFilter</literal></para></listitem> - <listitem><para><literal>user</literal></para></listitem> - <listitem><para><literal>group</literal></para></listitem> + <listitem> + <para> + <literal>enable</literal> + </para> + </listitem> + <listitem> + <para> + <literal>port</literal> + </para> + </listitem> + <listitem> + <para> + <literal>listenAddress</literal> + </para> + </listitem> + <listitem> + <para> + <literal>extraFlags</literal> + </para> + </listitem> + <listitem> + <para> + <literal>openFirewall</literal> + </para> + </listitem> + <listitem> + <para> + <literal>firewallFilter</literal> + </para> + </listitem> + <listitem> + <para> + <literal>user</literal> + </para> + </listitem> + <listitem> + <para> + <literal>group</literal> + </para> + </listitem> </itemizedlist> - </listitem> - <listitem> - <para>As there is already a package available, the module can now be added. - This is accomplished by adding a new file to the - <literal>nixos/modules/services/monitoring/prometheus/exporters/</literal> directory, - which will be called postfix.nix and contains all exporter specific options - and configuration: - <programlisting> + </listitem> + <listitem> + <para> + As there is already a package available, the module can now be added. This + is accomplished by adding a new file to the + <literal>nixos/modules/services/monitoring/prometheus/exporters/</literal> + directory, which will be called postfix.nix and contains all exporter + specific options and configuration: +<programlisting> # nixpgs/nixos/modules/services/prometheus/exporters/postfix.nix { config, lib, pkgs }: @@ -121,15 +172,16 @@ search through the <link xlink:href="https://nixos.org/nixos/options.html#promet } </programlisting> </para> - </listitem> - <listitem> + </listitem> + <listitem> <para> - 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: - <literal>nixpkgs/nixos/modules/services/prometheus/exporters.nix</literal> + 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: + <literal>nixpkgs/nixos/modules/services/prometheus/exporters.nix</literal> </para> - </listitem> -</itemizedlist> -</section> + </listitem> + </itemizedlist> + </section> </chapter> diff --git a/nixos/modules/services/networking/dnscrypt-proxy.xml b/nixos/modules/services/networking/dnscrypt-proxy.xml index a97579202523..f90eef69848c 100644 --- a/nixos/modules/services/networking/dnscrypt-proxy.xml +++ b/nixos/modules/services/networking/dnscrypt-proxy.xml @@ -3,67 +3,64 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-dnscrypt-proxy"> - - <title>DNSCrypt client proxy</title> + <title>DNSCrypt client proxy</title> + <para> + The DNSCrypt client proxy relays DNS queries to a DNSCrypt enabled upstream + resolver. The traffic between the client and the upstream resolver is + encrypted and authenticated, mitigating the risk of MITM attacks, DNS + poisoning attacks, and third-party snooping (assuming the upstream is + trustworthy). + </para> + <sect1 xml:id="sec-dnscrypt-proxy-configuration"> + <title>Basic configuration</title> <para> - The DNSCrypt client proxy relays DNS queries to a DNSCrypt enabled - upstream resolver. The traffic between the client and the upstream - resolver is encrypted and authenticated, mitigating the risk of MITM - attacks, DNS poisoning attacks, and third-party snooping (assuming the - upstream is trustworthy). - </para> - - <sect1 xml:id="sec-dnscrypt-proxy-configuration"><title>Basic configuration</title> - - <para> - To enable the client proxy, set - <programlisting> + To enable the client proxy, set +<programlisting> <xref linkend="opt-services.dnscrypt-proxy.enable"/> = true; </programlisting> </para> <para> - Enabling the client proxy does not alter the system nameserver; to - relay local queries, prepend <literal>127.0.0.1</literal> to - <option>networking.nameservers</option>. + Enabling the client proxy does not alter the system nameserver; to relay + local queries, prepend <literal>127.0.0.1</literal> to + <option>networking.nameservers</option>. </para> - - </sect1> - - <sect1 xml:id="sec-dnscrypt-proxy-forwarder"><title>As a forwarder for another DNS client</title> + </sect1> + <sect1 xml:id="sec-dnscrypt-proxy-forwarder"> + <title>As a forwarder for another DNS client</title> <para> - To run the DNSCrypt proxy client as a forwarder for another - DNS client, change the default proxy listening port to a - non-standard value and point the other client to it: - <programlisting> + To run the DNSCrypt proxy client as a forwarder for another DNS client, + change the default proxy listening port to a non-standard value and point + the other client to it: +<programlisting> <xref linkend="opt-services.dnscrypt-proxy.localPort"/> = 43; </programlisting> </para> - <sect2 xml:id="sec-dnscrypt-proxy-forwarder-dsnmasq"><title>dnsmasq</title> - <para> - <programlisting> + <sect2 xml:id="sec-dnscrypt-proxy-forwarder-dsnmasq"> + <title>dnsmasq</title> + <para> +<programlisting> { <xref linkend="opt-services.dnsmasq.enable"/> = true; <xref linkend="opt-services.dnsmasq.servers"/> = [ "127.0.0.1#43" ]; } </programlisting> - </para> + </para> </sect2> - <sect2 xml:id="sec-dnscrypt-proxy-forwarder-unbound"><title>unbound</title> - <para> - <programlisting> + <sect2 xml:id="sec-dnscrypt-proxy-forwarder-unbound"> + <title>unbound</title> + <para> +<programlisting> { <xref linkend="opt-services.unbound.enable"/> = true; <xref linkend="opt-services.unbound.forwardAddresses"/> = [ "127.0.0.1@43" ]; } </programlisting> - </para> + </para> </sect2> - - </sect1> - + </sect1> </chapter> diff --git a/nixos/modules/services/networking/shairport-sync.nix b/nixos/modules/services/networking/shairport-sync.nix index 0b87140b0d8d..36ecb74ffc95 100644 --- a/nixos/modules/services/networking/shairport-sync.nix +++ b/nixos/modules/services/networking/shairport-sync.nix @@ -27,7 +27,7 @@ in }; arguments = mkOption { - default = "-v -o pulse"; + default = "-v -d pulse"; description = '' Arguments to pass to the daemon. Defaults to a local pulseaudio server. @@ -72,6 +72,7 @@ in serviceConfig = { User = cfg.user; ExecStart = "${pkgs.shairport-sync}/bin/shairport-sync ${cfg.arguments}"; + RuntimeDirectory = "shairport-sync"; }; }; diff --git a/nixos/modules/services/web-apps/matomo-doc.xml b/nixos/modules/services/web-apps/matomo-doc.xml index 6f878015c514..510a335edc3b 100644 --- a/nixos/modules/services/web-apps/matomo-doc.xml +++ b/nixos/modules/services/web-apps/matomo-doc.xml @@ -3,28 +3,24 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="module-services-matomo"> + <title>Matomo</title> + <para> + Matomo is a real-time web analytics application. This module configures + php-fpm as backend for Matomo, optionally configuring an nginx vhost as well. + </para> + <para> + An automatic setup is not suported by Matomo, so you need to configure Matomo + itself in the browser-based Matomo setup. + </para> + <section xml:id="module-services-matomo-database-setup"> + <title>Database Setup</title> - <title>Matomo</title> <para> - Matomo is a real-time web analytics application. - This module configures php-fpm as backend for Matomo, optionally configuring an nginx vhost as well. - </para> - - <para> - An automatic setup is not suported by Matomo, so you need to configure Matomo itself in the browser-based Matomo setup. - </para> - - - <section xml:id="module-services-matomo-database-setup"> - <title>Database Setup</title> - - <para> - You also need to configure a MariaDB or MySQL database and -user for Matomo yourself, - and enter those credentials in your browser. - You can use passwordless database authentication via the UNIX_SOCKET authentication plugin - with the following SQL commands: - - <programlisting> + You also need to configure a MariaDB or MySQL database and -user for Matomo + yourself, and enter those credentials in your browser. You can use + passwordless database authentication via the UNIX_SOCKET authentication + plugin with the following SQL commands: +<programlisting> # For MariaDB INSTALL PLUGIN unix_socket SONAME 'auth_socket'; CREATE DATABASE matomo; @@ -37,59 +33,58 @@ CREATE USER 'matomo'@'localhost' IDENTIFIED WITH auth_socket; GRANT ALL PRIVILEGES ON matomo.* TO 'matomo'@'localhost'; </programlisting> + Then fill in <literal>matomo</literal> as database user and database name, + and leave the password field blank. This authentication works by allowing + only the <literal>matomo</literal> unix user to authenticate as the + <literal>matomo</literal> database user (without needing a password), but no + other users. For more information on passwordless login, see + <link xlink:href="https://mariadb.com/kb/en/mariadb/unix_socket-authentication-plugin/" />. + </para> - Then fill in <literal>matomo</literal> as database user and database name, and leave the password field blank. - This authentication works by allowing only the <literal>matomo</literal> unix user to authenticate as the - <literal>matomo</literal> database user (without needing a password), but no other users. - For more information on passwordless login, see - <link xlink:href="https://mariadb.com/kb/en/mariadb/unix_socket-authentication-plugin/" />. - </para> - - <para> - Of course, you can use password based authentication as well, e.g. when the database is not on the same host. - </para> - </section> + <para> + Of course, you can use password based authentication as well, e.g. when the + database is not on the same host. + </para> + </section> + <section xml:id="module-services-matomo-backups"> + <title>Backup</title> + <para> + You only need to take backups of your MySQL database and the + <filename>/var/lib/matomo/config/config.ini.php</filename> file. Use a user + in the <literal>matomo</literal> group or root to access the file. For more + information, see + <link xlink:href="https://matomo.org/faq/how-to-install/faq_138/" />. + </para> + </section> + <section xml:id="module-services-matomo-issues"> + <title>Issues</title> - <section xml:id="module-services-matomo-backups"> - <title>Backup</title> + <itemizedlist> + <listitem> <para> - You only need to take backups of your MySQL database and the - <filename>/var/lib/matomo/config/config.ini.php</filename> file. - Use a user in the <literal>matomo</literal> group or root to access the file. - For more information, see <link xlink:href="https://matomo.org/faq/how-to-install/faq_138/" />. + Matomo's file integrity check will warn you. This is due to the patches + necessary for NixOS, you can safely ignore this. </para> - </section> - - - <section xml:id="module-services-matomo-issues"> - <title>Issues</title> - <itemizedlist> - <listitem> - <para> - Matomo's file integrity check will warn you. - This is due to the patches necessary for NixOS, you can safely ignore this. - </para> - </listitem> - - <listitem> - <para> - Matomo will warn you that the JavaScript tracker is not writable. - This is because it's located in the read-only nix store. - You can safely ignore this, unless you need a plugin that needs JavaScript tracker access. - </para> - </listitem> - </itemizedlist> - </section> - - - <section xml:id="module-services-matomo-other-web-servers"> - <title>Using other Web Servers than nginx</title> - + </listitem> + <listitem> <para> - You can use other web servers by forwarding calls for <filename>index.php</filename> and - <filename>piwik.php</filename> to the <literal>/run/phpfpm-matomo.sock</literal> fastcgi unix socket. - You can use the nginx configuration in the module code as a reference to what else should be configured. + Matomo will warn you that the JavaScript tracker is not writable. This is + because it's located in the read-only nix store. You can safely ignore + this, unless you need a plugin that needs JavaScript tracker access. </para> - </section> + </listitem> + </itemizedlist> + </section> + <section xml:id="module-services-matomo-other-web-servers"> + <title>Using other Web Servers than nginx</title> + + <para> + You can use other web servers by forwarding calls for + <filename>index.php</filename> and <filename>piwik.php</filename> to the + <literal>/run/phpfpm-matomo.sock</literal> fastcgi unix socket. You can use + the nginx configuration in the module code as a reference to what else + should be configured. + </para> + </section> </chapter> diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index 254e9266e89e..413543df88c6 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -93,49 +93,52 @@ let ${config.system.extraSystemBuilderCmds} ''; - # Handle assertions - - failed = map (x: x.message) (filter (x: !x.assertion) config.assertions); - - showWarnings = res: fold (w: x: builtins.trace "[1;31mwarning: ${w}[0m" x) res config.warnings; - # Putting it all together. This builds a store path containing # symlinks to the various parts of the built configuration (the # kernel, systemd units, init scripts, etc.) as well as a script # `switch-to-configuration' that activates the configuration and # makes it bootable. - baseSystem = showWarnings ( - if [] == failed then pkgs.stdenvNoCC.mkDerivation { - name = let hn = config.networking.hostName; - nn = if (hn != "") then hn else "unnamed"; - in "nixos-system-${nn}-${config.system.nixos.label}"; - preferLocalBuild = true; - allowSubstitutes = false; - buildCommand = systemBuilder; - - inherit (pkgs) utillinux coreutils; - systemd = config.systemd.package; - shell = "${pkgs.bash}/bin/sh"; - - inherit children; - kernelParams = config.boot.kernelParams; - installBootLoader = - config.system.build.installBootLoader - or "echo 'Warning: do not know how to make this configuration bootable; please enable a boot loader.' 1>&2; true"; - activationScript = config.system.activationScripts.script; - nixosLabel = config.system.nixos.label; - - configurationName = config.boot.loader.grub.configurationName; - - # Needed by switch-to-configuration. - - perl = "${pkgs.perl}/bin/perl " + (concatMapStringsSep " " (lib: "-I${lib}/${pkgs.perl.libPrefix}") (with pkgs.perlPackages; [ FileSlurp NetDBus XMLParser XMLTwig ])); - } else throw "\nFailed assertions:\n${concatStringsSep "\n" (map (x: "- ${x}") failed)}"); + baseSystem = pkgs.stdenvNoCC.mkDerivation { + name = let hn = config.networking.hostName; + nn = if (hn != "") then hn else "unnamed"; + in "nixos-system-${nn}-${config.system.nixos.label}"; + preferLocalBuild = true; + allowSubstitutes = false; + buildCommand = systemBuilder; + + inherit (pkgs) utillinux coreutils; + systemd = config.systemd.package; + shell = "${pkgs.bash}/bin/sh"; + + inherit children; + kernelParams = config.boot.kernelParams; + installBootLoader = + config.system.build.installBootLoader + or "echo 'Warning: do not know how to make this configuration bootable; please enable a boot loader.' 1>&2; true"; + activationScript = config.system.activationScripts.script; + nixosLabel = config.system.nixos.label; + + configurationName = config.boot.loader.grub.configurationName; + + # Needed by switch-to-configuration. + + perl = "${pkgs.perl}/bin/perl " + (concatMapStringsSep " " (lib: "-I${lib}/${pkgs.perl.libPrefix}") (with pkgs.perlPackages; [ FileSlurp NetDBus XMLParser XMLTwig ])); + }; + + # Handle assertions and warnings + + failedAssertions = map (x: x.message) (filter (x: !x.assertion) config.assertions); + + showWarnings = res: fold (w: x: builtins.trace "[1;31mwarning: ${w}[0m" x) res config.warnings; + + baseSystemAssertWarn = if failedAssertions != [] + then throw "\nFailed assertions:\n${concatStringsSep "\n" (map (x: "- ${x}") failedAssertions)}" + else showWarnings baseSystem; # Replace runtime dependencies system = fold ({ oldDependency, newDependency }: drv: pkgs.replaceDependency { inherit oldDependency newDependency drv; } - ) baseSystem config.system.replaceRuntimeDependencies; + ) baseSystemAssertWarn config.system.replaceRuntimeDependencies; in diff --git a/nixos/modules/system/boot/kexec.nix b/nixos/modules/system/boot/kexec.nix index 3e5d7b40f2c5..61f9c6d0e7eb 100644 --- a/nixos/modules/system/boot/kexec.nix +++ b/nixos/modules/system/boot/kexec.nix @@ -1,7 +1,7 @@ { pkgs, lib, ... }: { - config = lib.mkIf (pkgs.kexectools.meta.available) { + config = lib.mkIf (lib.any (lib.meta.platformMatch pkgs.stdenv.hostPlatform) pkgs.kexectools.meta.platforms) { environment.systemPackages = [ pkgs.kexectools ]; systemd.services."prepare-kexec" = diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 12e029ae57f8..3ac4c02b61f5 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -886,6 +886,9 @@ in #systemd.services.systemd-logind.restartTriggers = [ config.environment.etc."systemd/logind.conf".source ]; systemd.services.systemd-logind.restartIfChanged = false; systemd.services.systemd-logind.stopIfChanged = false; + # The user-runtime-dir@ service is managed by systemd-logind we should not touch it or else we break the users' sessions. + systemd.services."user-runtime-dir@".stopIfChanged = false; + systemd.services."user-runtime-dir@".restartIfChanged = false; systemd.services.systemd-journald.restartTriggers = [ config.environment.etc."systemd/journald.conf".source ]; systemd.services.systemd-journald.stopIfChanged = false; systemd.targets.local-fs.unitConfig.X-StopOnReconfiguration = true; diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix index ed4cfa7805e2..aa0db4afd978 100644 --- a/nixos/modules/testing/test-instrumentation.nix +++ b/nixos/modules/testing/test-instrumentation.nix @@ -55,7 +55,8 @@ with import ../../lib/qemu-flags.nix { inherit pkgs; }; systemd.services."serial-getty@hvc0".enable = false; # Only use a serial console, no TTY. - virtualisation.qemu.consoles = [ qemuSerialDevice ]; + # hvc1: socket backdoor, see "Debugging NixOS tests" section in NixOS manual + virtualisation.qemu.consoles = [ "hvc1" qemuSerialDevice ]; boot.initrd.preDeviceCommands = '' diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index 4c7cffcf4557..caaf6c0aa59d 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -97,8 +97,8 @@ in "google-instance-setup.service" "google-network-setup.service" ]; - wantedBy = [ "multi-user.target" ]; requires = ["network.target"]; + wantedBy = ["multi-user.target"]; path = with pkgs; [ shadow ]; serviceConfig = { Type = "simple"; @@ -113,8 +113,8 @@ in "google-instance-setup.service" "google-network-setup.service" ]; - requires = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; + requires = ["network.target"]; + wantedBy = ["multi-user.target"]; serviceConfig = { Type = "simple"; ExecStart = "${gce}/bin/google_clock_skew_daemon --debug"; @@ -123,7 +123,7 @@ in systemd.services.google-instance-setup = { description = "Google Compute Engine Instance Setup"; - after = ["fs.target" "network-online.target" "network.target" "rsyslog.service"]; + after = ["local-fs.target" "network-online.target" "network.target" "rsyslog.service"]; before = ["sshd.service"]; wants = ["local-fs.target" "network-online.target" "network.target"]; wantedBy = [ "sshd.service" "multi-user.target" ]; @@ -134,15 +134,17 @@ in }; }; - systemd.services.google-ip-forwarding-daemon = { - description = "Google Compute Engine IP Forwarding Daemon"; - after = ["network.target" "google-instance-setup.service" "google-network-setup.service"]; + systemd.services.google-network-daemon = { + description = "Google Compute Engine Network Daemon"; + after = ["local-fs.target" "network-online.target" "network.target" "rsyslog.service" "google-instance-setup.service"]; + wants = ["local-fs.target" "network-online.target" "network.target"]; requires = ["network.target"]; + partOf = ["network.target"]; wantedBy = [ "multi-user.target" ]; path = with pkgs; [ iproute ]; serviceConfig = { - Type = "simple"; - ExecStart = "${gce}/bin/google_ip_forwarding_daemon --debug"; + ExecStart = "${gce}/bin/google_network_daemon --debug"; + Type = "oneshot"; }; }; @@ -153,8 +155,9 @@ in "network-online.target" "network.target" "rsyslog.service" + "systemd-resolved.service" "google-instance-setup.service" - "google-network-setup.service" + "google-network-daemon.service" ]; wants = [ "local-fs.target" "network-online.target" "network.target"]; wantedBy = [ "multi-user.target" ]; @@ -167,23 +170,6 @@ in }; }; - systemd.services.google-network-setup = { - description = "Google Compute Engine Network Setup"; - after = [ - "local-fs.target" - "network-online.target" - "network.target" - "rsyslog.service" - ]; - wants = [ "local-fs.target" "network-online.target" "network.target"]; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - ExecStart = "${gce}/bin/google_network_setup --debug"; - KillMode = "process"; - Type = "oneshot"; - }; - }; - systemd.services.google-startup-scripts = { description = "Google Compute Engine Startup Scripts"; after = [ @@ -192,9 +178,9 @@ in "network.target" "rsyslog.service" "google-instance-setup.service" - "google-network-setup.service" + "google-network-daemon.service" ]; - wants = [ "local-fs.target" "network-online.target" "network.target"]; + wants = ["local-fs.target" "network-online.target" "network.target"]; wantedBy = [ "multi-user.target" ]; serviceConfig = { ExecStart = "${gce}/bin/google_metadata_script_runner --debug --script-type startup"; diff --git a/nixos/release.nix b/nixos/release.nix index cce2c54f02bf..e53ebff9b6dc 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -1,10 +1,12 @@ -{ nixpkgs ? { outPath = (import ../lib).cleanSource ./..; revCount = 130979; shortRev = "gfedcba"; } +with import ../lib; + +{ nixpkgs ? { outPath = cleanSource ./..; revCount = 130979; shortRev = "gfedcba"; } , stableBranch ? false , supportedSystems ? [ "x86_64-linux" "aarch64-linux" ] +, configuration ? {} }: with import ../pkgs/top-level/release-lib.nix { inherit supportedSystems; }; -with import ../lib; let @@ -51,7 +53,7 @@ let hydraJob ((import lib/eval-config.nix { inherit system; - modules = [ module versionModule { isoImage.isoBaseName = "nixos-${type}"; } ]; + modules = [ configuration module versionModule { isoImage.isoBaseName = "nixos-${type}"; } ]; }).config.system.build.isoImage); @@ -62,7 +64,7 @@ let hydraJob ((import lib/eval-config.nix { inherit system; - modules = [ module versionModule ]; + modules = [ configuration module versionModule ]; }).config.system.build.sdImage); @@ -75,7 +77,7 @@ let config = (import lib/eval-config.nix { inherit system; - modules = [ module versionModule ]; + modules = [ configuration module versionModule ]; }).config; tarball = config.system.build.tarball; @@ -95,16 +97,19 @@ let buildFromConfig = module: sel: forAllSystems (system: hydraJob (sel (import ./lib/eval-config.nix { inherit system; - modules = [ module versionModule ] ++ singleton + modules = [ configuration module versionModule ] ++ singleton ({ ... }: { fileSystems."/".device = mkDefault "/dev/sda1"; boot.loader.grub.device = mkDefault "/dev/sda"; }); }).config)); - makeNetboot = config: + makeNetboot = { module, system, ... }: let - configEvaled = import lib/eval-config.nix config; + configEvaled = import lib/eval-config.nix { + inherit system; + modules = [ module versionModule ]; + }; build = configEvaled.config.system.build; kernelTarget = configEvaled.pkgs.stdenv.hostPlatform.platform.kernelTarget; in @@ -140,11 +145,8 @@ in rec { initialRamdisk = buildFromConfig ({ ... }: { }) (config: config.system.build.initialRamdisk); netboot = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system: makeNetboot { + module = ./modules/installer/netboot/netboot-minimal.nix; inherit system; - modules = [ - ./modules/installer/netboot/netboot-minimal.nix - versionModule - ]; }); iso_minimal = forAllSystems (system: makeIso { diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix index 5a7590cbf364..360b32faae72 100644 --- a/nixos/tests/docker-tools.nix +++ b/nixos/tests/docker-tools.nix @@ -58,5 +58,9 @@ import ./make-test.nix ({ pkgs, ... }: { # Ensure Docker images can use an unstable date $docker->succeed("docker load --input='${pkgs.dockerTools.examples.bash}'"); $docker->succeed("[ '1970-01-01T00:00:01Z' != \"\$(docker inspect ${pkgs.dockerTools.examples.unstableDate.imageName} | ${pkgs.jq}/bin/jq -r .[].Created)\" ]"); + + # Ensure Layered Docker images work + $docker->succeed("docker load --input='${pkgs.dockerTools.examples.layered-image}'"); + $docker->succeed("docker run --rm ${pkgs.dockerTools.examples.layered-image.imageName}"); ''; }) diff --git a/nixos/tests/rspamd.nix b/nixos/tests/rspamd.nix index 6b2e2dd3a531..a12622b6aa0b 100644 --- a/nixos/tests/rspamd.nix +++ b/nixos/tests/rspamd.nix @@ -13,13 +13,10 @@ let $machine->succeed("[[ \"\$(stat -c %G ${socket})\" == \"${group}\" ]]"); $machine->succeed("[[ \"\$(stat -c %a ${socket})\" == \"${mode}\" ]]"); ''; - simple = name: socketActivation: enableIPv6: makeTest { + simple = name: enableIPv6: makeTest { name = "rspamd-${name}"; machine = { - services.rspamd = { - enable = true; - socketActivation = socketActivation; - }; + services.rspamd.enable = true; networking.enableIPv6 = enableIPv6; }; testScript = '' @@ -32,13 +29,6 @@ let sleep 10; $machine->log($machine->succeed("cat /etc/rspamd.conf")); $machine->log($machine->succeed("systemctl cat rspamd.service")); - ${if socketActivation then '' - $machine->log($machine->succeed("systemctl cat rspamd-controller-1.socket")); - $machine->log($machine->succeed("systemctl cat rspamd-normal-1.socket")); - '' else '' - $machine->fail("systemctl cat rspamd-controller-1.socket"); - $machine->fail("systemctl cat rspamd-normal-1.socket"); - ''} $machine->log($machine->succeed("curl http://localhost:11334/auth")); $machine->log($machine->succeed("curl http://127.0.0.1:11334/auth")); ${optionalString enableIPv6 '' @@ -48,10 +38,8 @@ let }; in { - simple = simple "simple" false true; - ipv4only = simple "ipv4only" false false; - simple-socketActivated = simple "simple-socketActivated" true true; - ipv4only-socketActivated = simple "ipv4only-socketActivated" true false; + simple = simple "simple" true; + ipv4only = simple "ipv4only" false; deprecated = makeTest { name = "rspamd-deprecated"; machine = { @@ -68,7 +56,6 @@ in ${checkSocket "/run/rspamd.sock" "root" "root" "600" } ${checkSocket "/run/rspamd-worker.sock" "root" "root" "666" } $machine->log($machine->succeed("cat /etc/rspamd.conf")); - $machine->fail("systemctl cat rspamd-normal-1.socket"); $machine->log($machine->succeed("rspamc -h /run/rspamd-worker.sock stat")); $machine->log($machine->succeed("curl --unix-socket /run/rspamd-worker.sock http://localhost/ping")); ''; @@ -79,7 +66,6 @@ in machine = { services.rspamd = { enable = true; - socketActivation = false; workers.normal.bindSockets = [{ socket = "/run/rspamd.sock"; mode = "0600"; @@ -101,38 +87,6 @@ in ${checkSocket "/run/rspamd.sock" "root" "root" "600" } ${checkSocket "/run/rspamd-worker.sock" "root" "root" "666" } $machine->log($machine->succeed("cat /etc/rspamd.conf")); - $machine->fail("systemctl cat rspamd-normal-1.socket"); - $machine->log($machine->succeed("rspamc -h /run/rspamd-worker.sock stat")); - $machine->log($machine->succeed("curl --unix-socket /run/rspamd-worker.sock http://localhost/ping")); - ''; - }; - socketActivated = makeTest { - name = "rspamd-socketActivated"; - machine = { - services.rspamd = { - enable = true; - workers.normal.bindSockets = [{ - socket = "/run/rspamd.sock"; - mode = "0600"; - owner = "root"; - group = "root"; - }]; - workers.controller.bindSockets = [{ - socket = "/run/rspamd-worker.sock"; - mode = "0666"; - owner = "root"; - group = "root"; - }]; - }; - }; - - testScript = '' - startAll - $machine->waitForFile("/run/rspamd.sock"); - ${checkSocket "/run/rspamd.sock" "root" "root" "600" } - ${checkSocket "/run/rspamd-worker.sock" "root" "root" "666" } - $machine->log($machine->succeed("cat /etc/rspamd.conf")); - $machine->log($machine->succeed("systemctl cat rspamd-normal-1.socket")); $machine->log($machine->succeed("rspamc -h /run/rspamd-worker.sock stat")); $machine->log($machine->succeed("curl --unix-socket /run/rspamd-worker.sock http://localhost/ping")); ''; diff --git a/pkgs/applications/altcoins/parity/beta.nix b/pkgs/applications/altcoins/parity/beta.nix index fe58579e6b57..fc772246cfc1 100644 --- a/pkgs/applications/altcoins/parity/beta.nix +++ b/pkgs/applications/altcoins/parity/beta.nix @@ -1,7 +1,7 @@ let - version = "2.0.1"; - sha256 = "0rfq0izpswfwbyvr5kb6zjyf6sd7l1706c0sp7ccy6ykdfb4v6zs"; - cargoSha256 = "1ij17bfwvikqi5aj71j1nwf3jhkf3y9a0kwydajviwal47p9grl9"; + version = "2.0.3"; + sha256 = "1yf3ln4ksk8613kqkpsh16cj8xwx761q6czy57rs8kfh7pgc2pzb"; + cargoSha256 = "1jayk4ngwbg0rv7x1slkl2z46czgy2hnfcxc0dhaz4xpbp2bjqq8"; patches = [ ./patches/vendored-sources-2.0.patch ]; in import ./parity.nix { inherit version sha256 cargoSha256 patches; } diff --git a/pkgs/applications/altcoins/parity/default.nix b/pkgs/applications/altcoins/parity/default.nix index 993bc3615aa8..234364e73364 100644 --- a/pkgs/applications/altcoins/parity/default.nix +++ b/pkgs/applications/altcoins/parity/default.nix @@ -1,6 +1,6 @@ let - version = "1.11.8"; - sha256 = "0qk5vl8ql3pr9pz5iz7whahwqi1fcbsf8kphn6z4grgc87id7b19"; + version = "1.11.10"; + sha256 = "15sk6dvc8h1bdm6v7xlq517km0bakb9f13h1n7ixj311vahnmk15"; cargoSha256 = "0p2idd36cyzp2ax81k533bdma4hz0ws2981qj2s7jnhvmj4941l8"; patches = [ ./patches/vendored-sources-1.11.patch ]; in diff --git a/pkgs/applications/audio/csa/default.nix b/pkgs/applications/audio/csa/default.nix new file mode 100644 index 000000000000..c3b3b9441357 --- /dev/null +++ b/pkgs/applications/audio/csa/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "csa-${version}"; + version = "0.5.100810"; + + src = fetchurl { + url = "mirror://sourceforge/csa/${name}.tar.gz"; + sha256 = "1syg81dzdil0dyx1mlx1n7if3qsf2iz243p2zv34a1acfqm509r3"; + }; + + # after running either cellular leveler mono or stereo, the other stops working, + # so we remove one of them: + postInstall = "rm $out/lib/ladspa/celllm_3890.*"; + + meta = with stdenv.lib; { + homepage = https://sourceforge.net/projects/csa/; + description = "A group of LADSPA Audio plugins for FM broadcast and more"; + longDescription = '' + CSA means : Contrôle Signal Audio. + It contains the following plugins: + Emphazised Limiter, Cellular Leveler, Simple right/left amplifier. Blind Peak Meter. + ''; + license = licenses.gpl3; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/redoflacs/default.nix b/pkgs/applications/audio/redoflacs/default.nix new file mode 100644 index 000000000000..1918fa9e3a99 --- /dev/null +++ b/pkgs/applications/audio/redoflacs/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, makeWrapper +, flac, sox }: + +stdenv.mkDerivation rec { + name = "redoflacs-${version}"; + version = "0.30.20150202"; + + src = fetchFromGitHub { + owner = "sirjaren"; + repo = "redoflacs"; + rev = "86c6f5becca0909dcb2a0cb9ed747a575d7a4735"; + sha256 = "1gzlmh4vnf2fl0x8ig2n1f76082ngldsv85i27dv15y2m1kffw2j"; + }; + + dontBuild = true; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + install -Dm755 -t $out/bin redoflacs + install -Dm644 -t $out/share/doc/redoflacs LICENSE *.md + + runHook postInstall + ''; + + postFixup = '' + wrapProgram $out/bin/redoflacs \ + --prefix PATH : ${stdenv.lib.makeBinPath [ flac sox ]} + ''; + + meta = with stdenv.lib; { + description = "Parallel BASH commandline FLAC compressor, verifier, organizer, analyzer, and retagger"; + homepage = src.meta.homepage; + license = licenses.gpl2; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix index 7ae854cee3cc..51cb28d02d26 100644 --- a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix +++ b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix @@ -9,14 +9,14 @@ let ver_branch = "2.0"; - version = "2.0.5"; + version = "2.0.6"; in stdenv.mkDerivation rec { name = "lightdm-gtk-greeter-${version}"; src = fetchurl { url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.gz"; - sha256 = "1pw70db8320wvkhkrw4i2qprxlrqy3jmb6yrr4bm3lgrizahiijx"; + sha256 = "1pis5qyg95pg31dvnfqq34bzgj00hg4vs547r8h60lxjk81z8p15"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 7b99e06446b3..682c1c0a6e7e 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -8,19 +8,15 @@ let inherit (gnome2) GConf gnome_vfs; }; stableVersion = { - version = "3.1.4.0"; # "Android Studio 3.1.4" - build = "173.4907809"; - sha256Hash = "0xx6yprylmcb32ipmwdcfkgddlm1nrxi1w68miclvgrbk015brf2"; - }; - betaVersion = { - version = "3.2.0.25"; # "Android Studio 3.2 RC 3" - build = "181.4987877"; - sha256Hash = "0mriakxxchc0wbqkl236pp4fsqbq3gb2qrkdg5hx9zz763dc59gp"; + version = "3.2.0.26"; # "Android Studio 3.2.0" + build = "181.5014246"; + sha256Hash = "0v1a3b0n8dq5p8f6jap2ypqw724v61ki31qhqmh9hn36mn6d8wg6"; }; + betaVersion = stableVersion; latestVersion = { # canary & dev - version = "3.3.0.10"; # "Android Studio 3.3 Canary 11" - build = "182.5012296"; - sha256Hash = "0gqwf904y2pvp10l96gr055gjl1zf9pkb7840abqhl26liliwdm4"; + version = "3.3.0.11"; # "Android Studio 3.3 Canary 12" + build = "182.5026711"; + sha256Hash = "0k1f8yw3gdil78iqxlwhbz71w1307hwwf8z9m7hs0v9b4ri6x2wk"; }; in rec { # Old alias diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index d5e0259d2adc..25b5cad34dd2 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -73,13 +73,13 @@ let }; in stdenv.lib.mapAttrs common { atom = { - version = "1.30.0"; - sha256 = "1hqizfn9c249l51rlpfgk0h374maqgw6pagswlh4xa278qzb6qzs"; + version = "1.31.0"; + sha256 = "184vsj7qcpzwiq2v5kh8i21wfzhinhybxmr71y41sjqp78s2gy57"; }; atom-beta = { - version = "1.31.0"; + version = "1.32.0"; beta = 0; - sha256 = "11nlaz89rg6lgzsxp83qdqk4bnn2cij2p5aqjd9a3phd7v70xmy5"; + sha256 = "12k5cn70a0diyaqbmq6s6l2sbi9i3d9p7i38qnm97lnw0y1kh0jm"; }; } diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 8d47a551c93e..4d77c47695a3 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -96,22 +96,7 @@ rec { ### Eclipse Platform - eclipse-platform = eclipse-platform-48; # always point to latest - - eclipse-platform-46 = buildEclipse { - name = "eclipse-platform-4.6.2"; - description = "Eclipse Platform Neon 2"; - sources = { - "x86_64-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6.2-201611241400/eclipse-platform-4.6.2-linux-gtk-x86_64.tar.gz; - sha256 = "1fmpirjkp210angyfz3nr5jp58snjy6784zkkbmdxkiyg9kg2wqq"; - }; - "i686-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6.2-201611241400/eclipse-platform-4.6.2-linux-gtk.tar.gz; - sha256 = "0274g6ypiqsqkch10868ygbm6avc5pa57saz9wd196kdivl1bdpm"; - }; - }; - }; + eclipse-platform = eclipse-platform-49; # always point to latest eclipse-platform-47 = buildEclipse { name = "eclipse-platform-4.7.3a"; @@ -143,6 +128,21 @@ rec { }; }; + eclipse-platform-49 = buildEclipse { + name = "eclipse-platform-4.9"; + description = "Eclipse Platform 2018-09"; + sources = { + "x86_64-linux" = fetchurl { + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.9-201809060745/eclipse-platform-4.9-linux-gtk-x86_64.tar.gz; + sha512 = "875714bb411145c917fccedf2f7c4fd2757640b2debf4a18f775604233abd6f0da893b350cc03da44413d7ec6fae3f773ef08634e632058e4b705e6cda2893eb"; + }; + "i686-linux" = fetchurl { + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.9-201809060745/eclipse-platform-4.9-linux-gtk.tar.gz; + sha512 = "758bc0de30fa5c4b76b343ea0325611d87b6928ef5002244f2f1ba2a9fa937de89b2a94ce2c8d33d79344fd574d6e8a72c5d127fe416d785f48600e9e85fce86"; + }; + }; + }; + ### Eclipse Scala SDK eclipse-scala-sdk = eclipse-scala-sdk-441; # always point to latest @@ -165,22 +165,7 @@ rec { ### Eclipse SDK - eclipse-sdk = eclipse-sdk-48; # always point to latest - - eclipse-sdk-46 = buildEclipse { - name = "eclipse-sdk-4.6.2"; - description = "Eclipse Neon 2 Classic"; - sources = { - "x86_64-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6.2-201611241400/eclipse-SDK-4.6.2-linux-gtk-x86_64.tar.gz; - sha256 = "0g3nk1gcz178j8xk6nblkfsaysm8gq8101383fx60x6w25rdfgjb"; - }; - "i686-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6.2-201611241400/eclipse-SDK-4.6.2-linux-gtk.tar.gz; - sha256 = "09wlkcxs5h3j8habqxgr4all99vkgmyixc0vr9dj3qs0kl85k5mz"; - }; - }; - }; + eclipse-sdk = eclipse-sdk-49; # always point to latest eclipse-sdk-47 = buildEclipse { name = "eclipse-sdk-4.7.3a"; @@ -212,6 +197,21 @@ rec { }; }; + eclipse-sdk-49 = buildEclipse { + name = "eclipse-sdk-4.9"; + description = "Eclipse 2018-09 Classic"; + sources = { + "x86_64-linux" = fetchurl { + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.9-201809060745/eclipse-SDK-4.9-linux-gtk-x86_64.tar.gz; + sha512 = "5e74a0411f56b3973b7c6d8c3727392297d55ad458a814b4cc3f2f6a57dbeebc64852d1a6a958db5c3b08c620093bfb5bcc0d2c6a400f5594b82c2ef5d5fa9fb"; + }; + "i686-linux" = fetchurl { + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.9-201809060745/eclipse-SDK-4.9-linux-gtk.tar.gz; + sha512 = "b1861bd99c8e43f1d04247226584246aa7844af5e2da820fe98a51018dbe8ff4c25dbb9fa655f56e103f95c0696f40a65dcce13430c63aa080f786738e70eb8b"; + }; + }; + }; + eclipse-sdk-37 = buildEclipse { name = "eclipse-sdk-3.7"; description = "Eclipse Classic"; diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index 84371d152493..fa83975b8d97 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -470,12 +470,12 @@ rec { jdt = buildEclipseUpdateSite rec { name = "jdt-${version}"; - version = "4.8"; + version = "4.9"; src = fetchzip { stripRoot = false; - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.8-201806110500/org.eclipse.jdt-4.8.zip; - sha256 = "1my0d1114mx5gzxmwqlx0rcny39ly97ixlwx53ljk6qcryhdnr88"; + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.9-201809060745/org.eclipse.jdt-4.9.zip; + sha256 = "144rqrw0crxd2v862dqxm2p5y60n4pbzdryv709xnhcw54rycm7n"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index addae2674684..777d8e62541d 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -59,8 +59,11 @@ self: inherit (self.melpaPackages) easy-kill; }; - # missing git - egg = markBroken super.egg; + egg = super.egg.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); # upstream issue: missing file header elmine = markBroken super.elmine; @@ -146,6 +149,18 @@ self: (attrs.nativeBuildInputs or []) ++ [ external.git ]; }); + magithub = super.magithub.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + + magit-svn = super.magit-svn.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + magit-todos = super.magit-todos.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = diff --git a/pkgs/applications/editors/flpsed/default.nix b/pkgs/applications/editors/flpsed/default.nix index 67f789eee782..1c40b509bfe4 100644 --- a/pkgs/applications/editors/flpsed/default.nix +++ b/pkgs/applications/editors/flpsed/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, fltk13, ghostscript}: +{ stdenv, fetchurl, fltk13, ghostscript, xlibs }: stdenv.mkDerivation rec { name = "flpsed-${version}"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { description = "WYSIWYG PostScript annotator"; homepage = http://flpsed.org/flpsed.html; license = licenses.gpl3; - platforms = platforms.mesaPlatforms; + platforms = platforms.linux; maintainers = with maintainers; [ fuuzetsu ]; }; } diff --git a/pkgs/applications/editors/jetbrains/common.nix b/pkgs/applications/editors/jetbrains/common.nix index 2bb84bce0b12..38996008f46f 100644 --- a/pkgs/applications/editors/jetbrains/common.nix +++ b/pkgs/applications/editors/jetbrains/common.nix @@ -26,7 +26,7 @@ with stdenv; lib.makeOverridable mkDerivation rec { ''; }; - buildInputs = [ makeWrapper patchelf p7zip unzip ]; + nativeBuildInputs = [ makeWrapper patchelf p7zip unzip ]; patchPhase = '' get_file_size() { diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index 0cf0c7bcbc69..3f23021b6d82 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -2,7 +2,7 @@ gtk2, wrapGAppsHook, libXScrnSaver, libxkbfile, libsecret }: let - version = "1.26.1"; + version = "1.27.2"; channel = "stable"; plat = { @@ -12,9 +12,9 @@ let }.${stdenv.hostPlatform.system}; sha256 = { - "i686-linux" = "1g7kqbz6mrf8ngx2bnwpi9fifq5rjznxgsgwjb532z3nh92ypa8n"; - "x86_64-linux" = "02yldycakn5zxj1ji4nmhdyazqlkjqpzdj3g8j501c3j28pgiwjy"; - "x86_64-darwin" = "0pnsfkh20mj7pzqw7wlfd98jqc6a1mnsq1iira15n7fafqgj8zpl"; + "i686-linux" = "33704d089b03c636e8c46d434068c97b66e5a9d323b991bd327067aa90e87afa"; + "x86_64-linux" = "11023c652dd89bde1b7fbc8a7dc04fd4f87df3bfe6952a1c0ad75ab861e3196d"; + "x86_64-darwin" = "d1f2d046775406e6f339883dab432fcaa149e763ccfcd017556a46e890de6476"; }.${stdenv.hostPlatform.system}; archive_fmt = if stdenv.hostPlatform.system == "x86_64-darwin" then "zip" else "tar.gz"; diff --git a/pkgs/applications/graphics/kgraphviewer/default.nix b/pkgs/applications/graphics/kgraphviewer/default.nix index 0d898df14b3f..e70fafa24b60 100644 --- a/pkgs/applications/graphics/kgraphviewer/default.nix +++ b/pkgs/applications/graphics/kgraphviewer/default.nix @@ -6,11 +6,11 @@ mkDerivation rec { name = "kgraphviewer-${version}"; - version = "2.4.2"; + version = "2.4.3"; src = fetchurl { url = "mirror://kde/stable/kgraphviewer/${version}/${name}.tar.xz"; - sha256 = "1jc5zfgy4narwgn7rscfwz7l5pjy0jghal6yb3kd4sfadi78nhs9"; + sha256 = "1h6pgg89gvxl8gw7wmkabyqqrzad5pxyv5lsmn1fl4ir8lcc5q2l"; }; buildInputs = [ diff --git a/pkgs/applications/graphics/openimageio/default.nix b/pkgs/applications/graphics/openimageio/default.nix index 49835298f132..bc669e9e1a01 100644 --- a/pkgs/applications/graphics/openimageio/default.nix +++ b/pkgs/applications/graphics/openimageio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "openimageio-${version}"; - version = "1.8.9"; + version = "1.8.14"; src = fetchFromGitHub { owner = "OpenImageIO"; repo = "oiio"; rev = "Release-${version}"; - sha256 = "0xyfb41arvi3cc5jvgj2m8skzjrb0xma8sml74svygjgagxfj65h"; + sha256 = "07axn7bziy9h5jawpwcchag0nkczivaajsw69mxgmr508gw9r0xn"; }; outputs = [ "bin" "out" "dev" "doc" ]; diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index 8be3db97c2b0..34e46e9fa0f0 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, - fetchFromGitHub, + fetchgit, rustPlatform, cmake, makeWrapper, @@ -50,17 +50,19 @@ let OpenGL ]; in buildRustPackage rec { - name = "alacritty-${version}"; + name = "alacritty-unstable-${version}"; version = "0.2.0"; - src = fetchFromGitHub { - owner = "jwilm"; - repo = "alacritty"; - rev = "v${version}"; - sha256 = "11z7diji64x6n3m5m2d0a9215aajg7mpklflvpwrglmghnvi74y6"; + # At the moment we cannot handle git dependencies in buildRustPackage. + # This fork only replaces rust-fontconfig/libfontconfig with a git submodules. + src = fetchgit { + url = https://github.com/Mic92/alacritty.git; + rev = "rev-${version}"; + sha256 = "1c9izflacm693rwkxwakxgnpkvxwc8mqasr5p7x0ys6xg91h9sxn"; + fetchSubmodules = true; }; - cargoSha256 = "0ms0248bb2lgbzcqks6i0qhn1gaiim3jf1kl17qw52c8an3rc652"; + cargoSha256 = "1ijgkwv9ij4haig1h6n2b9xbhp5vahy9vp1sx72wxaaj9476msjx"; nativeBuildInputs = [ cmake @@ -117,5 +119,6 @@ in buildRustPackage rec { homepage = https://github.com/jwilm/alacritty; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ mic92 ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; } diff --git a/pkgs/applications/misc/chirp/default.nix b/pkgs/applications/misc/chirp/default.nix index 8a26631d5c0d..051e2c010a81 100644 --- a/pkgs/applications/misc/chirp/default.nix +++ b/pkgs/applications/misc/chirp/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "chirp-daily-${version}"; - version = "20180815"; + version = "20180906"; src = fetchurl { url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${name}.tar.gz"; - sha256 = "0z3jh9sbszs8x0xjmkgxa3b1xnw3w9b13pml4i5apx3mj171npyv"; + sha256 = "00cq15892p46z1j1fl2pd17y7k4rc6cfz7gaxb446mshxrvbfgam"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/gcalcli/default.nix b/pkgs/applications/misc/gcalcli/default.nix index 6a7a7ae604de..25ea9ef06b84 100644 --- a/pkgs/applications/misc/gcalcli/default.nix +++ b/pkgs/applications/misc/gcalcli/default.nix @@ -33,14 +33,14 @@ let }; in with py.pkgs; buildPythonApplication rec { - version = "3.4.0"; + version = "4.0.0a4"; name = "gcalcli-${version}"; src = fetchFromGitHub { owner = "insanum"; repo = "gcalcli"; rev = "v${version}"; - sha256 = "171awccgnmfv4j7m2my9387sjy60g18kzgvscl6pzdid9fn9rrm8"; + sha256 = "00giq5cdigidzv5bz4wgzi1yp6xlf2rdcy6ynmsc6bcf0cl5x64d"; }; propagatedBuildInputs = [ @@ -55,7 +55,7 @@ in with py.pkgs; buildPythonApplication rec { "command = '${libnotify}/bin/notify-send -i view-calendar-upcoming-events -u critical -a Calendar %s'" ''; - # There are no tests as of 3.4.0 + # There are no tests as of 4.0.0a4 doCheck = false; meta = with lib; { diff --git a/pkgs/applications/misc/gnuradio/default.nix b/pkgs/applications/misc/gnuradio/default.nix index 0224d5fd68c7..a7c00cceaa72 100644 --- a/pkgs/applications/misc/gnuradio/default.nix +++ b/pkgs/applications/misc/gnuradio/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { name = "gnuradio-${version}"; - version = "3.7.13.3"; + version = "3.7.13.4"; src = fetchFromGitHub { owner = "gnuradio"; repo = "gnuradio"; rev = "v${version}"; - sha256 = "1qpa53axqavdv2ykby7rwh7xmhvv964xq1d7rcvbwkry7dngrbib"; + sha256 = "0ybfn2zfr9lc1bi3c794l4bzpj8y6vas9c4rbcj4nqlx0zf3p8fn"; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix index eecc34b3d94f..01447281fe76 100644 --- a/pkgs/applications/misc/golden-cheetah/default.nix +++ b/pkgs/applications/misc/golden-cheetah/default.nix @@ -1,8 +1,19 @@ { stdenv, fetchurl , qtbase, qtsvg, qtserialport, qtwebkit, qtmultimedia, qttools, qtconnectivity -, yacc, flex, zlib, qmake, makeWrapper +, yacc, flex, zlib, qmake, makeDesktopItem, makeWrapper }: -stdenv.mkDerivation rec { + +let + desktopItem = makeDesktopItem { + name = "goldencheetah"; + exec = "GoldenCheetah"; + icon = "goldencheetah"; + desktopName = "GoldenCheetah"; + genericName = "GoldenCheetah"; + comment = "Performance software for cyclists, runners and triathletes"; + categories = "Application;Utility;"; + }; +in stdenv.mkDerivation rec { name = "golden-cheetah-${version}"; version = "3.4"; src = fetchurl { @@ -27,6 +38,8 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp src/GoldenCheetah $out/bin wrapProgram $out/bin/GoldenCheetah --set LD_LIBRARY_PATH "${zlib.out}/lib" + install -Dm644 "${desktopItem}/share/applications/"* -t $out/share/applications/ + install -Dm644 src/Resources/images/gc.png $out/share/pixmaps/goldencheetah.png runHook postInstall ''; diff --git a/pkgs/applications/misc/googler/default.nix b/pkgs/applications/misc/googler/default.nix index ca6ccdcdb2ae..45b4ad88cff3 100644 --- a/pkgs/applications/misc/googler/default.nix +++ b/pkgs/applications/misc/googler/default.nix @@ -1,14 +1,14 @@ {stdenv, fetchFromGitHub, python}: stdenv.mkDerivation rec { - version = "3.6"; + version = "3.7"; name = "googler-${version}"; src = fetchFromGitHub { owner = "jarun"; repo = "googler"; rev = "v${version}"; - sha256 = "1j1755b9mfmkqkgjrlsi4wr82352pqc9rfyalammqn6qrm3v3lb6"; + sha256 = "0dxg849ckyy181zlrb57hd959cgvx105c35ksmvi4wl285sh5kpj"; }; propagatedBuildInputs = [ python ]; diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 33ffb6b5acb3..2f61ba683f3f 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "gpxsee-${version}"; - version = "5.17"; + version = "5.18"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "0fr835glvwnpq6sy181z0gskvwfrmvh7115r3d92xy71v8b1l5ib"; + sha256 = "0dl10fr881b8fwf2yj14bd6gagb8hm0s46q18y2y56rw98nk4vrq"; }; nativeBuildInputs = [ qmake ]; diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/applications/misc/ipmiview/default.nix index 58fcd59a2b2f..b5fa9143ddbb 100644 --- a/pkgs/applications/misc/ipmiview/default.nix +++ b/pkgs/applications/misc/ipmiview/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1wp22wm7smlsb25x0cck4p660cycfczxj381930crd1qrf68mw4h"; }; - buildInputs = [ patchelf makeWrapper ]; + nativeBuildInputs = [ patchelf makeWrapper ]; buildPhase = with xorg; '' patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ libX11 libXext libXrender libXtst libXi ]}" ./jre/lib/amd64/xawt/libmawt.so diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix index 53b965a1bb70..b954d2d3cdb8 100644 --- a/pkgs/applications/misc/keepass/default.nix +++ b/pkgs/applications/misc/keepass/default.nix @@ -3,11 +3,11 @@ with builtins; buildDotnetPackage rec { baseName = "keepass"; - version = "2.39.1"; + version = "2.40"; src = fetchurl { url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip"; - sha256 = "0y69w9zzxqj7xrn632bw6bibrknjbx1k3qcvi9axn67sqmzaka00"; + sha256 = "1gldl74wz2lvsci6rn71d6q1zmnhr52z6fjib9nsragsazq5byz9"; }; sourceRoot = "."; diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix index 3c5184d54632..35c3c9748492 100644 --- a/pkgs/applications/misc/khard/default.nix +++ b/pkgs/applications/misc/khard/default.nix @@ -40,6 +40,10 @@ in with python.pkgs; buildPythonApplication rec { unidecode ]; + postInstall = '' + install -D misc/zsh/_khard $out/share/zsh/site-functions/ + ''; + # Fails; but there are no tests anyway. doCheck = false; diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix index 70b580cd0f8a..4febac10806f 100644 --- a/pkgs/applications/misc/kitty/default.nix +++ b/pkgs/applications/misc/kitty/default.nix @@ -7,7 +7,7 @@ with python3Packages; buildPythonApplication rec { - version = "0.12.0"; + version = "0.12.3"; name = "kitty-${version}"; format = "other"; @@ -15,7 +15,7 @@ buildPythonApplication rec { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "1n2pi9pc903inls1fvz257q7wpif76rj394qkgq7pixpisijdyjm"; + sha256 = "1nhk8pbwr673gw9qjgca4lzjgp8rw7sf99ra4wsh8jplf3kvgq5c"; }; buildInputs = [ @@ -33,8 +33,8 @@ buildPythonApplication rec { --replace "find_library('startup-notification-1')" "'${libstartup_notification}/lib/libstartup-notification-1.so'" substituteInPlace docs/Makefile \ - --replace 'python3 .. +launch $(shell which sphinx-build)' \ - 'PYTHONPATH=$PYTHONPATH:.. HOME=$TMPDIR/nowhere $(shell which sphinx-build)' + --replace 'python3 .. +launch :sphinx-build' \ + 'PYTHONPATH=$PYTHONPATH:.. HOME=$TMPDIR/nowhere sphinx-build' ''; buildPhase = '' diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix index 3ff07ba20084..185cd82435b2 100644 --- a/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/pkgs/applications/misc/mediainfo-gui/default.nix @@ -2,11 +2,11 @@ , desktop-file-utils, libSM, imagemagick }: stdenv.mkDerivation rec { - version = "18.08"; + version = "18.08.1"; name = "mediainfo-gui-${version}"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "0l4bhrgwfn3da6cr0jz5vs17sk7k0bc26nk7hymv04xifns5999n"; + sha256 = "0rq2dczjq26g5i0ac8px7xmxjvqq4h0rzd97fy5824yb2c5ksxs9"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/applications/misc/menumaker/default.nix b/pkgs/applications/misc/menumaker/default.nix new file mode 100644 index 000000000000..56854e7863fe --- /dev/null +++ b/pkgs/applications/misc/menumaker/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, pythonPackages }: + +pythonPackages.buildPythonApplication rec { + name = "menumaker-${version}"; + version = "0.99.10"; + + src = fetchurl { + url = "mirror://sourceforge/menumaker/${name}.tar.gz"; + sha256 = "1mm4cvg3kphkkd8nwrhcg6d9nm5ar7mgc0wf6fxk6zck1l7xn8ky"; + }; + + format = "other"; + + meta = with stdenv.lib; { + description = "Heuristics-driven menu generator for several window managers"; + homepage = http://menumaker.sourceforge.net; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/applications/misc/neap/default.nix b/pkgs/applications/misc/neap/default.nix new file mode 100644 index 000000000000..21a5ab0cd0f6 --- /dev/null +++ b/pkgs/applications/misc/neap/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchFromGitHub, python2Packages }: + +stdenv.mkDerivation rec { + name = "neap-${version}"; + version = "0.7.2"; + + src = fetchFromGitHub { + owner = "vzxwco"; + repo = "neap"; + rev = "v${version}"; + sha256 = "04da8rq23rl1qcvrdm5m3l90xbwyli7x601sckv7hmkip2q3g1kz"; + }; + + nativeBuildInputs = [ + python2Packages.wrapPython + ]; + + buildInputs = [ + python2Packages.python + ]; + + pythonPath = [ + python2Packages.xlib + python2Packages.pygtk + ]; + + installPhase = '' + install -D -t $out/bin neap + install -D -t $out/share/man/man1 neap.1 + install -D -t $out/share/applications neap.desktop + ''; + + postFixup = '' + wrapPythonPrograms + ''; + + meta = with stdenv.lib; { + description = "Systray workspace pager"; + homepage = https://github.com/vzxwco/neap; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/applications/misc/netsurf/buildsystem/default.nix b/pkgs/applications/misc/netsurf/buildsystem/default.nix index f25180505e87..882bb75219d6 100644 --- a/pkgs/applications/misc/netsurf/buildsystem/default.nix +++ b/pkgs/applications/misc/netsurf/buildsystem/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "netsurf-buildsystem-${version}"; - version = "1.6"; + version = "1.7"; src = fetchurl { url = "http://download.netsurf-browser.org/libs/releases/buildsystem-${version}.tar.gz"; - sha256 = "0p5k708lcq8dip9xxck6hml32bjrbyipprm22bbsvdnsc0pqm71x"; + sha256 = "1q23aaycv35ma5471l1gxib8lfq2s9kprrkaqgfc926d04rlbmhw"; }; makeFlags = [ diff --git a/pkgs/applications/misc/plasma-applet-volumewin7mixer/cmake.patch b/pkgs/applications/misc/plasma-applet-volumewin7mixer/cmake.patch new file mode 100644 index 000000000000..b33a3e174bc4 --- /dev/null +++ b/pkgs/applications/misc/plasma-applet-volumewin7mixer/cmake.patch @@ -0,0 +1,20 @@ +diff -Naur org.kde.plasma.volumewin7mixer/CMakeLists.txt org.kde.plasma.volumewin7mixer.patch/CMakeLists.txt +--- org.kde.plasma.volumewin7mixer/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 ++++ org.kde.plasma.volumewin7mixer.patch/CMakeLists.txt 2016-04-19 11:23:35.137866949 +0200 +@@ -0,0 +1,15 @@ ++# Set minimum CMake version (required for CMake 3.0 or later) ++cmake_minimum_required(VERSION 2.8.12) ++ ++# Use Extra CMake Modules (ECM) for common functionality. ++# See http://api.kde.org/ecm/manual/ecm.7.html ++# and http://api.kde.org/ecm/manual/ecm-kde-modules.7.html ++find_package(ECM REQUIRED NO_MODULE) ++# Needed by find_package(KF5Plasma) below. ++set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_MODULE_PATH}) ++ ++# Locate plasma_install_package macro. ++find_package(KF5Plasma REQUIRED) ++ ++# Add installatation target ("make install"). ++plasma_install_package(package org.kde.plasma.volumewin7mixer) + diff --git a/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix b/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix new file mode 100644 index 000000000000..6c23d160f47c --- /dev/null +++ b/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix @@ -0,0 +1,26 @@ +{ stdenv, cmake, extra-cmake-modules, plasma-framework, kwindowsystem, plasma-pa, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "plasma-applet-volumewin7mixer-${version}"; + version = "23"; + + src = fetchFromGitHub { + owner = "Zren"; + repo = "plasma-applet-volumewin7mixer"; + rev = "v${version}"; + sha256 = "1j2bq343lnhwqz26qfsvg7vjxv84ibzbc4y86rjkh07nqjwb3xsc"; + }; + + patches = [ ./cmake.patch ]; + postPatch = '' rm build ''; + nativeBuildInputs = [ cmake extra-cmake-modules ]; + buildInputs = [ plasma-framework kwindowsystem plasma-pa ]; + + meta = with stdenv.lib; { + description = "A fork of the default volume plasmoid with a Windows 7 theme (vertical sliders)."; + homepage = "https://github.com/Zren/plasma-applet-volumewin7mixer"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ mdevlamynck ]; + }; +} diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix index 6d883d89de31..5417a135dda4 100644 --- a/pkgs/applications/misc/ranger/default.nix +++ b/pkgs/applications/misc/ranger/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3Packages, file, less +{ stdenv, lib, fetchFromGitHub, python3Packages, file, less, highlight , imagePreviewSupport ? true, w3m ? null}: with stdenv.lib; @@ -24,6 +24,11 @@ python3Packages.buildPythonApplication rec { ''; preConfigure = '' + ${lib.optionalString (highlight != null) '' + sed -i -e 's|^\s*highlight\b|${highlight}/bin/highlight|' \ + ranger/data/scope.sh + ''} + substituteInPlace ranger/data/scope.sh \ --replace "/bin/echo" "echo" @@ -36,7 +41,7 @@ python3Packages.buildPythonApplication rec { # give file previews out of the box substituteInPlace ranger/config/rc.conf \ - --replace "set preview_script ~/.config/ranger/scope.sh" "set preview_script $out/share/doc/ranger/config/scope.sh" + --replace "#set preview_script ~/.config/ranger/scope.sh" "set preview_script $out/share/doc/ranger/config/scope.sh" '' + optionalString imagePreviewSupport '' substituteInPlace ranger/ext/img_display.py \ --replace /usr/lib/w3m ${w3m}/libexec/w3m @@ -46,7 +51,7 @@ python3Packages.buildPythonApplication rec { --replace "set preview_images false" "set preview_images true" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "File manager with minimalistic curses interface"; homepage = http://ranger.github.io/; license = licenses.gpl3; diff --git a/pkgs/applications/misc/stupidterm/default.nix b/pkgs/applications/misc/stupidterm/default.nix index f6286bfece3d..483fb9cf95a0 100644 --- a/pkgs/applications/misc/stupidterm/default.nix +++ b/pkgs/applications/misc/stupidterm/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, vte, gtk }: stdenv.mkDerivation rec { - name = "stupidterm-2018-03-10"; + name = "stupidterm-2018-09-25"; nativeBuildInputs = [ pkgconfig ]; @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "esmil"; repo = "stupidterm"; - rev = "0463519a96c9e4f9ce9fdc99d8e776499346ccba"; - sha256 = "1vbk53xyjn33myb3fix6y7sxb1x3rndrkk5l9qa60qaw2ivkr965"; + rev = "d1bc020797330df83d427e361d3620e346a4e792"; + sha256 = "1yh2vhq3d0qbh0dh2h9yc7s9gkffgkb987vvwz2bdnvlskrjmmdj"; }; makeFlags = "PKGCONFIG=${pkgconfig}/bin/pkg-config binary=stupidterm"; diff --git a/pkgs/applications/misc/workrave/default.nix b/pkgs/applications/misc/workrave/default.nix index 6e92e98481ea..4a16793b1c65 100644 --- a/pkgs/applications/misc/workrave/default.nix +++ b/pkgs/applications/misc/workrave/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "workrave-${version}"; - version = "1.10.20"; + version = "1.10.21"; src = let in fetchFromGitHub { - sha256 = "099a87zkrkmsgfz9isrfm89dh545x52891jh6qxmn19h6wwsi941"; + sha256 = "150qca8c552fakjlzkgarsxgp87l1xcwn19svqsa9d0cygqxjgia"; rev = with stdenv.lib; "v" + concatStringsSep "_" (splitString "." version); repo = "workrave"; diff --git a/pkgs/applications/networking/browsers/browsh/default.nix b/pkgs/applications/networking/browsers/browsh/default.nix index cf90d2afd000..a910f1d14bdf 100644 --- a/pkgs/applications/networking/browsers/browsh/default.nix +++ b/pkgs/applications/networking/browsers/browsh/default.nix @@ -1,14 +1,14 @@ { stdenv, buildGoPackage, fetchurl, fetchFromGitHub, go-bindata }: let - version = "1.4.10"; + version = "1.4.13"; # TODO: must build the extension instead of downloading it. But since it's # literally an asset that is indifferent regardless of the platform, this # might be just enough. webext = fetchurl { url = "https://github.com/browsh-org/browsh/releases/download/v${version}/browsh-${version}-an.fx.xpi"; - sha256 = "0rgwzv1qahqy52q7zz4dklnwx7w4x3gj92ka8n0ypgf9fjjnmqas"; + sha256 = "11477z7mva8lwfxsrfxckvgqkxrjhc80czra8cqhpakf0fih1a4g"; }; in buildGoPackage rec { diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 8b06c35fe005..1c214230e4ed 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -4,7 +4,7 @@ , flashplayer, hal-flash , MPlayerPlugin, ffmpeg, xorg, libpulseaudio, libcanberra-gtk2 , jrePlugin, icedtea_web -, trezor-bridge, bluejeans, djview4, adobe-reader +, bluejeans, djview4, adobe-reader , google_talk_plugin, fribid, gnome3/*.gnome-shell*/ , esteidfirefoxplugin , browserpass, chrome-gnome-shell, uget-integrator, plasma-browser-integration, bukubrow @@ -55,7 +55,6 @@ let ++ lib.optional (cfg.enableGoogleTalkPlugin or false) google_talk_plugin ++ lib.optional (cfg.enableFriBIDPlugin or false) fribid ++ lib.optional (cfg.enableGnomeExtensions or false) gnome3.gnome-shell - ++ lib.optional (cfg.enableTrezor or false) trezor-bridge ++ lib.optional (cfg.enableBluejeans or false) bluejeans ++ lib.optional (cfg.enableAdobeReader or false) adobe-reader ++ lib.optional (cfg.enableEsteid or false) esteidfirefoxplugin diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index 52a2ccb292bb..0d86e4f8294c 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -71,9 +71,8 @@ in stdenv.mkDerivation rec { src = chromium.upstream-info.binary; + nativeBuildInputs = [ patchelf makeWrapper ]; buildInputs = [ - patchelf makeWrapper - # needed for GSETTINGS_SCHEMAS_PATH gsettings-desktop-schemas glib gtk diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix deleted file mode 100644 index 5f7f601b3545..000000000000 --- a/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ stdenv, fetchurl, dpkg }: - -stdenv.mkDerivation { - name = "TREZOR-bridge-1.0.5"; - - passthru = { - mozillaPlugin = "/lib/mozilla/plugins"; - }; - - src = - if stdenv.hostPlatform.system == "x86_64-linux" then - fetchurl { - url = https://mytrezor.com/data/plugin/1.0.5/browser-plugin-trezor_1.0.5_amd64.deb; - sha256 = "0097h4v88yca4aayzprrh4pk03xvvj7ncz2mi83chm81gsr2v67z"; - } - else - fetchurl { - url = https://mytrezor.com/data/plugin/1.0.5/browser-plugin-trezor_1.0.5_i386.deb; - sha256 = "0xzbq78s3ivg00f0bj6gyjgf47pvjx2l4mm05jjmdar60bf1xr1n"; - }; - - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; - - dontStrip = true; - dontPatchELF = true; - - unpackPhase = "${dpkg}/bin/dpkg-deb -x $src ."; - - installPhase = '' - mkdir -p $out/etc/udev/rules.d/ $out/lib/mozilla/plugins - cp ./lib/udev/rules.d/51-trezor-udev.rules $out/etc/udev/rules.d/ - cp ./usr/lib/mozilla/plugins/npBitcoinTrezorPlugin.so $out/lib/mozilla/plugins - ''; - - meta = with stdenv.lib; - { description = "Plugin for browser to TREZOR device communication"; - homepage = https://mytrezor.com; - license = licenses.unfree; - maintainers = with maintainers; [ ehmry ]; - # Download URL, .deb content & hash (yikes) changed, not version. - # New archive doesn't contain any Mozilla plugin at all. - broken = true; - platforms = platforms.linux; - }; - -} diff --git a/pkgs/applications/networking/browsers/otter/default.nix b/pkgs/applications/networking/browsers/otter/default.nix index d1f50627d905..321980757b9b 100644 --- a/pkgs/applications/networking/browsers/otter/default.nix +++ b/pkgs/applications/networking/browsers/otter/default.nix @@ -1,7 +1,7 @@ { stdenv, cmake, fetchFromGitHub , qtbase, qtmultimedia, qtwebengine -, version ? "0.9.96" -, sourceSha ? "1xzfy3jjx9sskwwbk7l8hnwnjf8af62p4kjkydp0ld0j50apc39p" +, version ? "0.9.99.3" +, sourceSha ? "0dkismjs3daz5afx6s5arwvynsw5qpvv2rqbzvmpihn6khnhap55" }: stdenv.mkDerivation { name = "otter-browser-${version}"; diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 1c45efaddf81..8a21f2f0cc2a 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { name = "${product}-${version}"; product = "vivaldi"; - version = "1.15.1147.64-1"; + version = "2.0.1309.29-2"; src = fetchurl { url = "https://downloads.vivaldi.com/stable/${product}-stable_${version}_amd64.deb"; - sha256 = "01xbfrrq2kj75cb6grpq9a4y88j1s87h2nnvy1fmyb4a2db6y0ag"; + sha256 = "09vaf191djbrfijvhklivh2ifj8w68car2vz956gsw4lhz07kzck"; }; unpackPhase = '' diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 96dab6aa66a1..776a1667514f 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -15,13 +15,13 @@ with lib; stdenv.mkDerivation rec { name = "kubernetes-${version}"; - version = "1.11.3"; + version = "1.12.0"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "1gwb5gs9l0adv3qc70wf8dwvbjh1mmgd3hh1jkwsbbnach28dvzb"; + sha256 = "0bnfhrli9xqf7ygfq5i5p6nsgv7ic57b5b705zbqsxrc24pvsy4s"; }; buildInputs = [ removeReferencesTo makeWrapper which go_1_10 rsync go-bindata ]; diff --git a/pkgs/applications/networking/cluster/kubetail/default.nix b/pkgs/applications/networking/cluster/kubetail/default.nix index 201e3e8b30d2..91f1d958ab61 100644 --- a/pkgs/applications/networking/cluster/kubetail/default.nix +++ b/pkgs/applications/networking/cluster/kubetail/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "kubetail-${version}"; - version = "1.6.1"; + version = "1.6.4"; src = fetchFromGitHub { owner = "johanhaleby"; repo = "kubetail"; rev = "${version}"; - sha256 = "10ql1kdsmyrk73jb6f5saf2q38znm0vdihscj3c9n0qhyhk9blpl"; + sha256 = "13y3g27z2v4jx1cvphcwl0a5xshm6vcqcxasid5sbg6cpwc2xc66"; }; installPhase = '' diff --git a/pkgs/applications/networking/cluster/terraform-provider-nixos/default.nix b/pkgs/applications/networking/cluster/terraform-provider-nixos/default.nix deleted file mode 100644 index f4ad171c267e..000000000000 --- a/pkgs/applications/networking/cluster/terraform-provider-nixos/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: -buildGoPackage rec { - name = "terraform-provider-nixos-${version}"; - version = "0.0.1"; - goPackagePath = "github.com/tweag/terraform-provider-nixos"; - src = fetchFromGitHub { - owner = "tweag"; - repo = "terraform-provider-nixos"; - sha256 = "00vz6qjq1pk39iqg4356b8g3c6slla9jifkv2knk46gc9q93q0lf"; - rev = "v${version}"; - }; - - # Terraform allow checking the provider versions, but this breaks - # if the versions are not provided via file paths. - postBuild = "mv go/bin/terraform-provider-nixos{,_v${version}}"; - - meta = with stdenv.lib; { - description = "Terraform plugin for outputting NixOS configuration files from Terraform resources."; - homepage = "https://github.com/tweag/terraform-provider-nixos"; - license = licenses.mpl20; - maintainers = with maintainers; [ grahamc ]; - }; -} diff --git a/pkgs/applications/networking/cluster/terraform/providers/data.nix b/pkgs/applications/networking/cluster/terraform-providers/data.nix index 4ae44cafbf44..fead9af601f7 100644 --- a/pkgs/applications/networking/cluster/terraform/providers/data.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/data.nix @@ -1,11 +1,18 @@ # Generated with ./update-all { + acme = + { + owner = "terraform-providers"; + repo = "terraform-provider-acme"; + version = "1.0.1"; + sha256 = "1yh0dqmrwa1gqpnzj4mdv9p9081azpcskqjrbmy2lzmn3di2ag3r"; + }; alicloud = { owner = "terraform-providers"; repo = "terraform-provider-alicloud"; - version = "1.10.0"; - sha256 = "19lplakpl8dz4a8xw9va86gd774yq4gayq4kzv3pvr62b03a999x"; + version = "1.17.0"; + sha256 = "1zmywmcgfmx5ccp0qxj912sqymisxdg2s84b4qclfa225hrbaqpn"; }; archive = { @@ -18,8 +25,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-arukas"; - version = "0.1.0"; - sha256 = "1msfr0rlzjfds02h35p99d1f541a1fzndjcpgijb41yx74h2v5dl"; + version = "1.0.0"; + sha256 = "1v8jzns8czy8navdrabsvc9zk1s9vs1718ngjlx9vs13r3bkm2fc"; }; atlas = { @@ -32,22 +39,29 @@ { owner = "terraform-providers"; repo = "terraform-provider-aws"; - version = "1.30.0"; - sha256 = "1si2fm5nm7gad90lf410zwjf2q5kd8mv6nkkbfnfdzkpkchavr95"; + version = "1.38.0"; + sha256 = "1jhr2l8p7wf7kgr2y0c40n1jb9p2153xkpcp4b2half2vhsh1nwi"; }; azurerm = { owner = "terraform-providers"; repo = "terraform-provider-azurerm"; - version = "1.12.0"; - sha256 = "1avp2vhlj60iw17pw39003p30byms7xvq5lkippm60ak4ky9p51b"; + version = "1.15.0"; + sha256 = "1pdmj0ww5y2nwxivlf5l886nwd76hpqhwdayab2fp16zyl1qbpfd"; }; azurestack = { owner = "terraform-providers"; repo = "terraform-provider-azurestack"; - version = "0.2.0"; - sha256 = "0s1ga0ga0rbpp552hbq1dfnkpdjvk1c40i7qqnqmm20xlz6k55mb"; + version = "0.4.0"; + sha256 = "1c9am0v4aq95k1jblc767vykk76dp0d6z2fvy148ag77cy2jgryc"; + }; + bigip = + { + owner = "terraform-providers"; + repo = "terraform-provider-bigip"; + version = "0.12.0"; + sha256 = "0fmmlx757hph45ffm19zafjfkldg41qkw83vz0jjmvxicza1afbd"; }; bitbucket = { @@ -74,8 +88,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-circonus"; - version = "0.1.0"; - sha256 = "0v05g91yg2zh4wczp8mi3hmvwb35z0y9044bwy67nm1l624xlj64"; + version = "0.1.1"; + sha256 = "05n1q9hc0h31icxsmyi2y60wiwd5fs2hz1dqm3bl6hgh5x3ss1im"; }; clc = { @@ -88,8 +102,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-cloudflare"; - version = "1.1.0"; - sha256 = "1rmg7gndhmb1wp0zszhwx9vrax8411iy24yrpkmayjify3vsvdpx"; + version = "1.5.0"; + sha256 = "0l8bmnxmjr2g3xxw8w0ay91cvs4kzc65wkdwybfahvq9r6mww45n"; }; cloudscale = { @@ -123,8 +137,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-datadog"; - version = "1.1.0"; - sha256 = "0ckmjpw9dkj5490kwxamdvnnidnjdgxnb1biqpvwj4139hlcl628"; + version = "1.3.0"; + sha256 = "0d3xccfkzibjp4jl8irja1cdhppdn3b7nh4wy857zvfxpfhz7aj2"; }; digitalocean = { @@ -158,8 +172,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-docker"; - version = "1.0.0"; - sha256 = "09ribvyv02r907pdvyrwaklr14xyvyn14rijslnm16xp8d4waz9h"; + version = "1.0.1"; + sha256 = "1q5bsdvp47gvpiyqlzgrpxczlh6m9g870pn84ks49xfkwk5izpz6"; }; dyn = { @@ -193,8 +207,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-github"; - version = "1.1.0"; - sha256 = "1f0yg2qpr9ffimscy17csh20cq9czkcs96ac79s3kl56f8c95ijm"; + version = "1.3.0"; + sha256 = "1k7816dbpsjjbm3pa6l0qlrxw5hh8z5iwdr8mp1mp5liidhl6bqs"; }; gitlab = { @@ -207,8 +221,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-google"; - version = "1.16.2"; - sha256 = "1d8by6rb4s2dggapcbb4b2g5hf280bjayz9p5q9njgsn83579pnm"; + version = "1.18.0"; + sha256 = "0zwy1imby0xqvb86a82rdvglipf2sfpi3rmsj72iikp7vi3mqk64"; }; grafana = { @@ -221,15 +235,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-hcloud"; - version = "1.2.0"; - sha256 = "17zrdzvb9hp02710khvh9pwkavp79zy3y2qzaydgmnrbkks4s8cg"; + version = "1.3.0"; + sha256 = "0sb9pajsy0if18vgw5pllgv8qvb4v7pv65m2f3hfkck2za82ndwb"; }; heroku = { owner = "terraform-providers"; repo = "terraform-provider-heroku"; - version = "1.2.0"; - sha256 = "1w2r0wnfcr9aqij5ckq0apd8az8yzdg704hi1zjb1ggb54v97n31"; + version = "1.4.0"; + sha256 = "159a9add5v4dj2bry1b85i74q2lb4pjjypkm5hzrbqys6gn2imhn"; }; http = { @@ -242,8 +256,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-huaweicloud"; - version = "1.1.0"; - sha256 = "1jsvv5yfxgz998p4wbldbq82hl4ykn1yp21igphl94n3b0jj33dj"; + version = "1.2.0"; + sha256 = "0r05dfgpzci0lpc2ivbrj6ivib8svbks9612by3w3zakzclpv467"; }; icinga2 = { @@ -263,15 +277,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-influxdb"; - version = "1.0.1"; - sha256 = "0713h50675njnpdy4w1azfq8h6yai40gx6w2fbvw4n59h6jlfny4"; + version = "1.0.2"; + sha256 = "05l2i0z35x6462mm1inn6jhp1pfi7df6hv52lhcyypk0lv2rgqf9"; }; kubernetes = { owner = "terraform-providers"; repo = "terraform-provider-kubernetes"; - version = "1.1.0"; - sha256 = "1lhdmglc6nd24ss7z41qqbpsiy71ajvixhq4pfiq0b19hwj6awgn"; + version = "1.2.0"; + sha256 = "0slvhj8f7p27r9v4vb5vjyqpmzlpaji1djzwsxsf247df68mka61"; }; librato = { @@ -315,6 +329,13 @@ version = "1.1.0"; sha256 = "06alk5vd20wzf493dw8hb80q0sx0kw4j8g1sd0193fhni0k4rflw"; }; + netlify = + { + owner = "terraform-providers"; + repo = "terraform-provider-netlify"; + version = "0.1.0"; + sha256 = "1lf66nzqcgzjwvh1lv2jp8gcj6apdanlinci5pri8mgv5r1pv40l"; + }; newrelic = { owner = "terraform-providers"; @@ -350,26 +371,33 @@ version = "1.0.0"; sha256 = "12vpa09xrq8z1pjq0bwzq3889c4fl6c5kvynwqy0z1pdx21m60ha"; }; + oci = + { + owner = "terraform-providers"; + repo = "terraform-provider-oci"; + version = "3.1.1"; + sha256 = "0wrvb44gs0c1khvam5lrq53l2889japg7d4nyk2hrpywy9japc8m"; + }; oneandone = { owner = "terraform-providers"; repo = "terraform-provider-oneandone"; - version = "1.2.0"; - sha256 = "1lrcy05zklv7vc8653f8cn3jjc9zjjwi488dpaphsmsl1md3m88b"; + version = "1.3.0"; + sha256 = "0c412nqg3k17124i51nn3ffra6gcll904h37h7hyvz97cdblcncn"; }; opc = { owner = "terraform-providers"; repo = "terraform-provider-opc"; - version = "1.2.0"; - sha256 = "19rfm12w97ccyrzpdw0qlwfn7gh64lqh17kj3cv11y1f731z8rlw"; + version = "1.2.1"; + sha256 = "0mnvi47kbdwwpfzdlcd1mhd15w5b0ivwxi1a5lvs0zyqf0g0cas8"; }; openstack = { owner = "terraform-providers"; repo = "terraform-provider-openstack"; - version = "1.7.0"; - sha256 = "0sw2kmcsi9sjzi549fj6knida01q0lnpqvc3cpyjyv92f6w4bznn"; + version = "1.9.0"; + sha256 = "0prmdj78jsyrns876cglfp8a3dbpfl33bwb0dj072flh4yknfrdr"; }; opentelekomcloud = { @@ -389,8 +417,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-oraclepaas"; - version = "1.3.0"; - sha256 = "09vsb52cbf2h1rdwfg4xb54gklwgmaxdgjcdq1yx5gxj7lfbdl9v"; + version = "1.3.2"; + sha256 = "138522cidaiy2akqqblik3w6qnx8zgn70ih7am1sxn13vqm1vlhb"; }; ovh = { @@ -410,15 +438,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-pagerduty"; - version = "1.1.1"; - sha256 = "1dpl6cnii9kzx9lr1f9vndh7w6mfg5kv6az7dq49lhi16sxwwb6a"; + version = "1.2.0"; + sha256 = "037mdcvpcpjj0dpwg0nny862j631ajhv472a847p2ajgk02bq1wf"; }; panos = { owner = "terraform-providers"; repo = "terraform-provider-panos"; - version = "1.3.0"; - sha256 = "1isnhaszld96zpkcbwkf70nhhwmsl2z3s9868cjsac44b27gsvrq"; + version = "1.4.0"; + sha256 = "033xpglbn0q805b129kf1ywl13m4pgrkwlvgl347nldysryiasxq"; }; postgresql = { @@ -438,8 +466,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-profitbricks"; - version = "1.3.2"; - sha256 = "0mk77n833np6ahm6bzvpg31a0m1qazaipd0vqzccqfkbz78sm3jb"; + version = "1.4.0"; + sha256 = "1yrmlpqc1bzgs3c8pxhfbscf4anjri6gv6sd8i8rn764z8xhwaff"; }; rabbitmq = { @@ -459,8 +487,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-random"; - version = "1.3.1"; - sha256 = "0zcvw0vz7mxx46m2jamhmkl7l0k8v0q5fha5z6cra3y2ikhqrnfl"; + version = "2.0.0"; + sha256 = "0plg139pbvqwbs5hcl7d5kjn7vwknjr4n0ysc2j5s25iyhikkv9s"; + }; + rightscale = + { + owner = "terraform-providers"; + repo = "terraform-provider-rightscale"; + version = "1.3.0"; + sha256 = "1brzxyd5hg99x75qh0p707lr9cvqpzx2az1swr624w3rzhjl2ygm"; }; rundeck = { @@ -473,15 +508,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-runscope"; - version = "0.3.0"; - sha256 = "1srnnlw94q1av8rzy8753fk4vazv5ldbimgr9gd51vrmpvmlgxas"; + version = "0.4.0"; + sha256 = "1n3q2hdwvkkn5rphrcl5qfv4ry2mrr13dcjwzhbym2i1nhpxkld0"; }; scaleway = { owner = "terraform-providers"; repo = "terraform-provider-scaleway"; - version = "1.5.1"; - sha256 = "1b42fh7mwj2cx3g16lgp4sw6ca5qqj0mhm6i7qid8agwsga34v0y"; + version = "1.6.0"; + sha256 = "1ykcakfw0gp239jp4brpjynxzzvlhldfpv12hkgymj22s37n5jnn"; }; softlayer = { @@ -494,8 +529,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-spotinst"; - version = "1.2.0"; - sha256 = "09k79xg5cbs4qhxr0b4f42qpxj6j2795z5vmwbxfkirb5bkpqdq1"; + version = "1.4.0"; + sha256 = "0kb09v18ksh2r4b5k9iv4rzq403zk1shpakk54pmq8s6i5jd085g"; }; statuscake = { @@ -525,12 +560,19 @@ version = "1.0.2"; sha256 = "1aj6g6l68n9kqmxfjlkwwxnac7fhha6wrmvsw4yylf0qyssww75v"; }; + tfe = + { + owner = "terraform-providers"; + repo = "terraform-provider-tfe"; + version = "0.2.0"; + sha256 = "1d3yiaxmmlnnjmx6vnckvdnqgyxakc9i70dgxdbn8ihw5i6anvik"; + }; tls = { owner = "terraform-providers"; repo = "terraform-provider-tls"; - version = "1.1.0"; - sha256 = "1kzq6al9rzpmk98bmxcf5gjx5s28gfjp1xvdsnd4a113pljn0ddb"; + version = "1.2.0"; + sha256 = "0hvj00j8a820j18yi90xzhd635pkffivp1116d84wyqxya5acd4p"; }; triton = { @@ -550,8 +592,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-vault"; - version = "1.1.1"; - sha256 = "0kiqpnb4669xw9b8nf6a8ky0jhnp14bipaizml3gdh1hnda6hflw"; + version = "1.1.4"; + sha256 = "00i9rl9pnmicvndkmvcmlj6y80341dmkqnhq09f94yljh1w1zpvv"; }; vcd = { @@ -564,7 +606,14 @@ { owner = "terraform-providers"; repo = "terraform-provider-vsphere"; - version = "1.6.0"; - sha256 = "1xav341bal7lyb206zw2nzgzjvwkda54cgksza44q3jhqznxma47"; + version = "1.8.1"; + sha256 = "0y6n7mvv1f3jqsxlvf68iq85k69fj7a333203vkvc83dba84aqki"; + }; + nixos = + { + owner = "tweag"; + repo = "terraform-provider-nixos"; + version = "0.0.1"; + sha256 = "00vz6qjq1pk39iqg4356b8g3c6slla9jifkv2knk46gc9q93q0lf"; }; } diff --git a/pkgs/applications/networking/cluster/terraform/providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index a535ab06f453..b3b13539ff50 100644 --- a/pkgs/applications/networking/cluster/terraform/providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -1,4 +1,8 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib +, buildGoPackage +, fetchFromGitHub +, callPackage +}: let list = import ./data.nix; @@ -17,4 +21,7 @@ let postBuild = "mv go/bin/${repo}{,_v${version}}"; }; in - lib.mapAttrs (n: v: toDrv v) list + { + ibm = callPackage ./ibm {}; + libvirt = callPackage ./libvirt {}; + } // lib.mapAttrs (n: v: toDrv v) list diff --git a/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix b/pkgs/applications/networking/cluster/terraform-providers/ibm/default.nix index fddf13795f3e..fddf13795f3e 100644 --- a/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/ibm/default.nix diff --git a/pkgs/applications/networking/cluster/terraform-provider-libvirt/default.nix b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix index 2beceddc7fba..2beceddc7fba 100644 --- a/pkgs/applications/networking/cluster/terraform-provider-libvirt/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.txt b/pkgs/applications/networking/cluster/terraform-providers/providers.txt new file mode 100644 index 000000000000..d0c4a6505981 --- /dev/null +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.txt @@ -0,0 +1,13 @@ +# lines starting with a # are comments + +# The accepted format (double escape all grep expresssions): +# <organisation> [grep-expression] [grep-v-expression] - include all repositories in the organisation. +# grep-expression: filter repo matching the expression +# grep-v-expression: filter repo not matching the expression +# <organisation>/<repo> - include only the named repository. + +# include all terraform-providers +terraform-providers terraform-provider- terraform-provider-\\(azure-classic\\|scaffolding\\|google-beta\\) + +# include terraform-provider-nixos +tweag/terraform-provider-nixos diff --git a/pkgs/applications/networking/cluster/terraform/providers/update-all b/pkgs/applications/networking/cluster/terraform-providers/update-all index 31a5a4a750dc..2009d474db7b 100755 --- a/pkgs/applications/networking/cluster/terraform/providers/update-all +++ b/pkgs/applications/networking/cluster/terraform-providers/update-all @@ -4,13 +4,24 @@ # # This scripts scans the github terraform-providers repo for new releases, # generates the corresponding nix code and finally generates an index of -# all the providers. +# all the providers given in ./providers.txt. set -euo pipefail +# the maximum number of attempts before giving up inside of GET and prefetch_github +readonly maxAttempts=30 + GET() { local url=$1 + local retry=1 echo "fetching $url" >&2 - curl -#fL -u "$GITHUB_AUTH" "$url" + while ! curl -#fL -u "$GITHUB_AUTH" "$url"; do + echo "The curl command has failed. Attempt $retry/${maxAttempts}" >&2 + if [[ "${retry}" -eq "${maxAttempts}" ]]; then + exit 1 + fi + retry=$(( retry + 1 )) + sleep 5 + done } get_org_repos() { @@ -24,6 +35,7 @@ get_repo_tags() { local repo=$2 GET "https://api.github.com/repos/$owner/$repo/git/refs/tags?per_page=100" | \ jq -r '.[].ref' | \ + grep -v 'v\.' | \ cut -d '/' -f 3- | \ sort --version-sort } @@ -32,7 +44,15 @@ prefetch_github() { local owner=$1 local repo=$2 local rev=$3 - nix-prefetch-url --unpack "https://github.com/$owner/$repo/archive/$rev.tar.gz" + local retry=1 + while ! nix-prefetch-url --unpack "https://github.com/$owner/$repo/archive/$rev.tar.gz"; do + echo "The nix-prefetch-url command has failed. Attempt $retry/${maxAttempts}" >&2 + if [[ "${retry}" -eq "${maxAttempts}" ]]; then + exit 1 + fi + retry=$(( retry + 1 )) + sleep 5 + done } echo_entry() { @@ -52,6 +72,21 @@ EOF indent() { sed 's/^/ /'; } +add_repo() { + org="${1}" + repo="${2}" + + echo "*** $repo ***" + name=$(echo "$repo" | cut -d - -f 3-) + last_tag=$(get_repo_tags "$org" "$repo" | tail -1) + last_tag_sha256=$(prefetch_github "$org" "$repo" "$last_tag") + + { + echo " $name =" + echo_entry "$org" "$repo" "$last_tag" "$last_tag_sha256" | indent + } >> data.nix +} + ## Main ## cd "$(dirname "$0")" @@ -69,29 +104,37 @@ HELP exit 1 fi -org=terraform-providers - -repos=$(get_org_repos "$org" | grep terraform-provider- | grep -v terraform-provider-scaffolding | grep -v terraform-provider-azure-classic | sort) - - -# Get all the providers with index - cat <<HEADER > data.nix # Generated with ./update-all { HEADER -for repo in $repos; do - echo "*** $repo ***" - name=$(echo "$repo" | cut -d - -f 3-) - last_tag=$(get_repo_tags "$org" "$repo" | tail -1) - last_tag_sha256=$(prefetch_github "$org" "$repo" "$last_tag") - - { - echo " $name =" - echo_entry "$org" "$repo" "$last_tag" "$last_tag_sha256" | indent - } >> data.nix -done +while read line; do + IFS=' ' read -r -a fields <<< "$line" + if [[ "${#fields[@]}" -eq 0 ]]; then + continue + fi + + if [[ "${fields[0]}" = *"/"* ]]; then + org="$(echo "${fields[0]}" | cut -d/ -f1)" + repo="$(echo "${fields[0]}" | cut -d/ -f2)" + add_repo "${org}" "${repo}" + else + org="${fields[0]}" + repos=$(get_org_repos "$org") + if [[ "${#fields[@]}" -ge 2 ]] && [[ -n "${fields[1]}" ]]; then + repos="$( echo "${repos[@]}" | grep "${fields[1]}" )" + fi + if [[ "${#fields[@]}" -eq 3 ]] && [[ -n "${fields[2]}" ]]; then + repos="$( echo "${repos[@]}" | grep -v "${fields[2]}" )" + fi + repos="$( echo "${repos[@]}" | sort )" + + for repo in $repos; do + add_repo "$org" "$repo" + done + fi +done < <(grep -v '^#\|^$' providers.txt) cat <<FOOTER >> data.nix } diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index edeac9671c16..767eb94454d8 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -1,4 +1,11 @@ -{ stdenv, lib, buildEnv, buildGoPackage, fetchFromGitHub, makeWrapper }: +{ stdenv +, lib +, buildEnv +, buildGoPackage +, fetchFromGitHub +, makeWrapper +, terraform-providers +}: let goPackagePath = "github.com/hashicorp/terraform"; @@ -34,7 +41,7 @@ let description = "Tool for building, changing, and versioning infrastructure"; homepage = https://www.terraform.io/; license = licenses.mpl20; - maintainers = with maintainers; [ jgeerds zimbatm peterhoeg ]; + maintainers = with maintainers; [ jgeerds zimbatm peterhoeg kalbasit ]; }; } // attrs'); @@ -75,7 +82,7 @@ let }); in withPlugins (_: []); - plugins = import ./providers { inherit lib buildGoPackage fetchFromGitHub; }; + plugins = removeAttrs terraform-providers ["override" "overrideDerivation" "recurseForDerivations"]; in rec { terraform_0_8_5 = generic { version = "0.8.5"; diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix index bee4c3bea20b..e7ea7eea7ba1 100644 --- a/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "newsboat-${version}"; - version = "2.12"; + version = "2.13"; src = fetchurl { url = "https://newsboat.org/releases/${version}/${name}.tar.xz"; - sha256 = "1x23zlgljaqf46v7sp8wnkyf6wighvirvn48ankpa34yr8mvrgcv"; + sha256 = "0pik1d98ydzqi6055vdbkjg5krwifbk2hy2f5jp5p1wcy2s16dn7"; }; prePatch = '' diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 53ee46e20606..70639e364c3e 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -36,11 +36,11 @@ with python'.pkgs; buildPythonApplication rec { pname = "FlexGet"; - version = "2.14.18"; + version = "2.14.21"; src = fetchPypi { inherit pname version; - sha256 = "1pyvm1d23qy71rg7fzxcal8978kni7sn09zw4s4dsq56g8w80ay9"; + sha256 = "08z0pf1g5xp3760da48v9h9hja2j8cgrwkgim156drk259bf5vm2"; }; postPatch = '' diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index 4260c3608522..3343141801eb 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -1,7 +1,7 @@ { callPackage, stdenv }: let - stableVersion = "2.1.10"; + stableVersion = "2.1.11"; # Currently there is no preview version. previewVersion = stableVersion; addVersion = args: @@ -10,8 +10,8 @@ let in args // { inherit version branch; }; mkGui = args: callPackage (import ./gui.nix (addVersion args)) { }; mkServer = args: callPackage (import ./server.nix (addVersion args)) { }; - guiSrcHash = "0vn33dcd3sfj5gna79vwm35l8aznga91a8r7i6q06dr4c2svml15"; - serverSrcHash = "062dai1rb04dyrlrjgk0gr5hx0la8n1nalx0il1i7k1inwy52gj5"; + guiSrcHash = "1skcb47r0wvv7l7z487b2165pwvc397b23abfq24kw79806vknzn"; + serverSrcHash = "09j2nafxvgc6plk7s3qwv5qc0cc2bi41h4fhg8g7c85ixfx5yz8a"; in { guiStable = mkGui { stable = true; diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix new file mode 100644 index 000000000000..a2ba2f09f764 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchurl, rpmextract, patchelf, libnotify, libcap, cairo, pango, fontconfig, udev, dbus +, gtk2, atk, expat, gdk_pixbuf, freetype, nspr, glib, nss, gconf, libX11, libXrender, libXtst, libXdamage +, libXi, libXext, libXfixes, libXcomposite, alsaLib, bash +}: + +stdenv.mkDerivation rec { + name = "bluejeans-${version}"; + version = "1.36.9"; + + src = + fetchurl { + url = "https://swdl.bluejeans.com/desktop/linux/1.36/${version}/bluejeans-${version}.x86_64.rpm"; + sha256 = "0sbv742pzqd2cxn3kq10lfi16jah486i9kyrmi8l1rpb9fhyw2m1"; + }; + + nativeBuildInputs = [ patchelf rpmextract ]; + + libPath = + stdenv.lib.makeLibraryPath + [ libnotify libcap cairo pango fontconfig gtk2 atk expat gdk_pixbuf dbus udev.lib + freetype nspr glib stdenv.cc stdenv.cc.cc.lib nss gconf libX11 libXrender libXtst libXdamage + libXi libXext libXfixes libXcomposite alsaLib + ]; + + buildCommand = '' + mkdir -p $out/bin/ + cd $out + rpmextract $src + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + opt/bluejeans/bluejeans-bin + patchelf \ + --set-rpath ${libPath} \ + opt/bluejeans/bluejeans-bin + patchelf \ + --replace-needed libudev.so.0 libudev.so.1 \ + opt/bluejeans/bluejeans-bin + ln -s $out/opt/bluejeans/bluejeans $out/bin/bluejeans + substituteInPlace $out/bin/bluejeans \ + --replace '#!/bin/bash' '#!${bash}/bin/bash' + chmod +x $out/bin/bluejeans + ''; + + meta = { + description = "Video, audio, and web conferencing that works together with the collaboration tools you use every day."; + license = stdenv.lib.licenses.unfree; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index 6716305df8b5..810720baa7ca 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchurl -, cmake, lmdb, qt5, qtmacextras, mtxclient +, cmake, cmark, lmdb, qt5, qtmacextras, mtxclient , boost, spdlog, olm, pkgconfig }: @@ -20,13 +20,13 @@ let in stdenv.mkDerivation rec { name = "nheko-${version}"; - version = "0.5.5"; + version = "0.6.1"; src = fetchFromGitHub { owner = "mujx"; repo = "nheko"; rev = "v${version}"; - sha256 = "0k5gmfwmisfavliyz0nfsmwy317ps8a4r3l1d831giqp9pvqvi0i"; + sha256 = "00jigca7kcqwm57qalz7ifz9p6v7p3pnamjvpkxjjix2rm9wmg2q"; }; # If, on Darwin, you encounter the error @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ - mtxclient olm boost lmdb spdlog + mtxclient olm boost lmdb spdlog cmark qt5.qtbase qt5.qtmultimedia qt5.qttools ] ++ lib.optional stdenv.isDarwin qtmacextras; diff --git a/pkgs/applications/networking/instant-messengers/spectral/default.nix b/pkgs/applications/networking/instant-messengers/spectral/default.nix new file mode 100644 index 000000000000..5dd8bf5f69ab --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/spectral/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchgit +, pkgconfig +, qmake, qtbase, qtquickcontrols2, qtmultimedia +, libpulseaudio +# Not mentioned but seems needed +, qtgraphicaleffects +# Unsure but needed by similar +, qtdeclarative, qtsvg +}: + +stdenv.mkDerivation rec { + name = "spectral-${version}"; + version = "2018-09-24"; + + src = fetchgit { + url = "https://gitlab.com/b0/spectral.git"; + rev = "c9d1d6887722860a52b597a0f74d0ce39c8622e1"; + sha256 = "1ym8jlqls4lcq5rd81vxw1dni79fc6ph00ip8nsydl6i16fngl4c"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ pkgconfig qmake ]; + buildInputs = [ qtbase qtquickcontrols2 qtmultimedia qtgraphicaleffects qtdeclarative qtsvg ] + ++ stdenv.lib.optional stdenv.hostPlatform.isLinux libpulseaudio; + + meta = with stdenv.lib; { + description = "A glossy client for Matrix, written in QtQuick Controls 2 and C++"; + homepage = https://gitlab.com/b0/spectral; + license = licenses.gpl3; + platforms = with platforms; linux ++ darwin; + maintainers = with maintainers; [ dtzWill ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 5d8e2c52c218..df627f57de5d 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -4,11 +4,11 @@ let mkTelegram = args: qt5.callPackage (import ./generic.nix args) { }; stableVersion = { stable = true; - version = "1.3.14"; - sha256Hash = "107m9iqw78b691pcq65s3m3zhamn8slh0wiyipwbbp0w13rqna3v"; + version = "1.4.0"; + sha256Hash = "1zlsvbk9vgsqwplcswh2q0mqjdqf5md1043paab02wy3qg2x37d8"; # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk - archPatchesRevision = "359861"; - archPatchesHash = "15xybfs9k6dww747if8z6m9sh7anvqi76zsx2gxyna2j1z36i0r0"; + archPatchesRevision = "388448"; + archPatchesHash = "06a1j7fxg55d3wgab9rnwv93dvwdwkx7mvsxaywwwiz7ng20rgs1"; }; in { stable = mkTelegram stableVersion; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix index 2d9a9d10aed9..e8f2c135fa8a 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix @@ -2,7 +2,7 @@ { mkDerivation, lib, fetchgit, fetchsvn , pkgconfig, pythonPackages, cmake, wrapGAppsHook -, qtbase, qtimageformats, gtk3, libappindicator-gtk3, libnotify +, qtbase, qtimageformats, gtk3, libappindicator-gtk3, libnotify, xdg_utils , dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 }: @@ -131,6 +131,7 @@ mkDerivation rec { wrapProgram $out/bin/telegram-desktop \ "''${gappsWrapperArgs[@]}" \ --prefix QT_PLUGIN_PATH : "${qtbase}/${qtbase.qtPluginPrefix}" \ + --prefix PATH : ${xdg_utils}/bin \ --set XDG_RUNTIME_DIR "XDG-RUNTIME-DIR" sed -i $out/bin/telegram-desktop \ -e "s,'XDG-RUNTIME-DIR',\"\''${XDG_RUNTIME_DIR:-/run/user/\$(id --user)}\"," diff --git a/pkgs/applications/networking/mailreaders/inboxer/default.nix b/pkgs/applications/networking/mailreaders/inboxer/default.nix index 4edf61ceaaed..e033e532ec1a 100644 --- a/pkgs/applications/networking/mailreaders/inboxer/default.nix +++ b/pkgs/applications/networking/mailreaders/inboxer/default.nix @@ -22,7 +22,8 @@ stdenv.mkDerivation rec { unpackPhase = '' ar p $src data.tar.xz | tar xJ ''; - buildInputs = [ binutils patchelf makeWrapper ]; + nativeBuildInputs = [ patchelf makeWrapper ]; + buildInputs = [ binutils ]; preFixup = with stdenv.lib; let lpath = makeLibraryPath [ diff --git a/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix b/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix index dbdd64d06b5e..f99a192889c9 100644 --- a/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "notmuch-bower-${version}"; - version = "2017-09-27"; + version = "0.8.1"; src = fetchFromGitHub { owner = "wangp"; repo = "bower"; - rev = "e4918ed581984bf2813f51f007a0aaaa7fa0da7f"; - sha256 = "13np5yharjik1pp23cfgffi0g0ikl6pl5sqqyy0ki7gk7gyy913i"; + rev = version; + sha256 = "0rdjip6jq7qlfn640ci81m9vfgcn4q5vaj72zp3bria8m55a56rf"; }; nativeBuildInputs = [ gawk mercury pandoc ]; diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix index 34b4780633b8..2d523cc07dd9 100644 --- a/pkgs/applications/networking/p2p/retroshare/default.nix +++ b/pkgs/applications/networking/p2p/retroshare/default.nix @@ -54,5 +54,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.domenkozar ]; + broken = true; # broken by libupnp: 1.6.21 -> 1.8.3 (#41684) }; } diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index 06c84759a590..245d673bc5a4 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -5,14 +5,14 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "6.2.4"; + version = "6.2.5"; name = "seafile-client-${version}"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile-client"; rev = "v${version}"; - sha256 = "0z5li1d7ipsm1mp0lk6mls220v4vlmsqm8ym8kxlkinqbmkky0hz"; + sha256 = "1g09gsaqr4swgwnjxz994xgjsv7mlfaypp6r37bbsiy89a7ppzfl"; }; nativeBuildInputs = [ pkgconfig cmake makeWrapper ]; diff --git a/pkgs/applications/networking/spideroak/default.nix b/pkgs/applications/networking/spideroak/default.nix index c07ad715afd2..fdb4206d340f 100644 --- a/pkgs/applications/networking/spideroak/default.nix +++ b/pkgs/applications/networking/spideroak/default.nix @@ -57,7 +57,7 @@ in stdenv.mkDerivation { sed -i 's/^Exec=.*/Exec=spideroak/' $out/share/applications/SpiderOakONE.desktop ''; - buildInputs = [ patchelf makeWrapper ]; + nativeBuildInputs = [ patchelf makeWrapper ]; meta = { homepage = https://spideroak.com; diff --git a/pkgs/applications/office/cb2bib/default.nix b/pkgs/applications/office/cb2bib/default.nix index e4dc86ebd8db..1faf47d680aa 100644 --- a/pkgs/applications/office/cb2bib/default.nix +++ b/pkgs/applications/office/cb2bib/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { name = pname + "-" + version; pname = "cb2bib"; - version = "1.9.8"; + version = "1.9.9"; src = fetchurl { url = "https://www.molspaces.com/dl/progs/${name}.tar.gz"; - sha256 = "0fpa0znlabk0nrzgj4c0l6qbg8l16lp9d7lvb9ijv1y0ih9igf0f"; + sha256 = "12x7zv964r26cfmf3yx5pa8ihc5bd9p199w2g4vc0sb44izryg47"; }; buildInputs = [ qtbase qtwebkit qtx11extras lzo libX11 ]; nativeBuildInputs = [ qmake ]; diff --git a/pkgs/applications/office/libreoffice/default-primary-src.nix b/pkgs/applications/office/libreoffice/default-primary-src.nix index 711411cd0124..d775ae411f70 100644 --- a/pkgs/applications/office/libreoffice/default-primary-src.nix +++ b/pkgs/applications/office/libreoffice/default-primary-src.nix @@ -3,8 +3,8 @@ rec { major = "6"; minor = "1"; - patch = "1"; - tweak = "2"; + patch = "2"; + tweak = "1"; subdir = "${major}.${minor}.${patch}"; @@ -12,6 +12,6 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "228166908a3404cbb8e6e662f44b1af8644c0589b2309fadce89dcef112fd09d"; + sha256 = "650c57b60f880db28e49e584f42018da9e714865dfa94fbb8391de15b58a3f91"; }; } diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index aa0cdc703455..93c14929aa42 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -48,14 +48,14 @@ let translations = fetchSrc { name = "translations"; - sha256 = "2933d0898fbc8ea32cb39b773cf49c5f7da165f75a33522ff91c88d7bd0c7440"; + sha256 = "33e13d07e9328cdbccbd019ab2491f74f5bb897707886c074791080881544bcc"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "41e1af094f2ca5a9ab88894c2dceca2d91e6c28568d7f002f56c647e973cc595"; + sha256 = "dffee97ffce5b4979140aa56fa333608e7b004bfc2451245bab33ed97fc4c205"; }; }; diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix index aac3ed155202..ce3b3533bec3 100644 --- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix +++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix @@ -658,11 +658,11 @@ md5name = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824-openldap-2.4.45.tgz"; } { - name = "openssl-1.0.2o.tar.gz"; - url = "http://dev-www.libreoffice.org/src/openssl-1.0.2o.tar.gz"; - sha256 = "ec3f5c9714ba0fd45cb4e087301eb1336c317e0d20b575a125050470e8089e4d"; + name = "openssl-1.0.2p.tar.gz"; + url = "http://dev-www.libreoffice.org/src/openssl-1.0.2p.tar.gz"; + sha256 = "50a98e07b1a89eb8f6a99477f262df71c6fa7bef77df4dc83025a2845c827d00"; md5 = ""; - md5name = "ec3f5c9714ba0fd45cb4e087301eb1336c317e0d20b575a125050470e8089e4d-openssl-1.0.2o.tar.gz"; + md5name = "50a98e07b1a89eb8f6a99477f262df71c6fa7bef77df4dc83025a2845c827d00-openssl-1.0.2p.tar.gz"; } { name = "liborcus-0.13.4.tar.gz"; diff --git a/pkgs/applications/office/paperwork/backend.nix b/pkgs/applications/office/paperwork/backend.nix index 9e17d807fb14..7f82780fbe92 100644 --- a/pkgs/applications/office/paperwork/backend.nix +++ b/pkgs/applications/office/paperwork/backend.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, lib, fetchFromGitHub +{ buildPythonPackage, lib, fetchFromGitLab , isPy3k, isPyPy @@ -10,18 +10,26 @@ buildPythonPackage rec { pname = "paperwork-backend"; - version = "1.2.2"; + version = "1.2.4"; - src = fetchFromGitHub { - owner = "openpaperwork"; - repo = "paperwork-backend"; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + repo = "paperwork"; + group = "World"; + owner = "OpenPaperwork"; rev = version; - sha256 = "1rvf06vphm32601ja1bfkfkfpgjxiv0lh4yxjy31jll0bfnsf7pf"; + sha256 = "0wjjiw99aswmppnhzq3jir0p5p78r3m8hjinhdirkgm6h7skq5p4"; }; + sourceRoot = "source/paperwork-backend"; + # Python 2.x is not supported. disabled = !isPy3k && !isPyPy; + patchPhase = '' + echo 'version = "${version}"' > paperwork_backend/_version.py + ''; + preCheck = "\"$out/bin/paperwork-shell\" chkdeps paperwork_backend"; propagatedBuildInputs = [ diff --git a/pkgs/applications/office/paperwork/default.nix b/pkgs/applications/office/paperwork/default.nix index 14cde8415fd7..a48b6e1e1168 100644 --- a/pkgs/applications/office/paperwork/default.nix +++ b/pkgs/applications/office/paperwork/default.nix @@ -1,20 +1,14 @@ -{ lib, python3Packages, fetchFromGitHub, gtk3, cairo +{ lib, python3Packages, fetchFromGitLab, gtk3, cairo , aspellDicts, buildEnv , gnome3, hicolor-icon-theme, librsvg , xvfb_run, dbus, libnotify }: python3Packages.buildPythonApplication rec { + inherit (python3Packages.paperwork-backend) version src; name = "paperwork-${version}"; - # Don't forget to also update paperwork-backend when updating this! - version = "1.2.2"; - src = fetchFromGitHub { - repo = "paperwork"; - owner = "openpaperwork"; - rev = version; - sha256 = "1nb5sna2s952xb7c89qccg9qp693pyqj8g7xz16ll16ydfqnzsdk"; - }; + sourceRoot = "source/paperwork-gtk"; # Patch out a few paths that assume that we're using the FHS: postPatch = '' @@ -39,6 +33,12 @@ python3Packages.buildPythonApplication rec { sed -i -e 's/"logo"/"logo-icon-name"/g' \ src/paperwork/frontend/aboutdialog/aboutdialog.glade + + cat - ../AUTHORS.py > src/paperwork/_version.py <<EOF + # -*- coding: utf-8 -*- + version = "${version}" + authors_code="" + EOF ''; ASPELL_CONF = "dict-dir ${buildEnv { diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index c141e6087bfc..e825d1e8454f 100644 --- a/pkgs/applications/science/biology/picard-tools/default.nix +++ b/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "picard-tools-${version}"; - version = "2.18.12"; + version = "2.18.14"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "0r5w71fcji4j3xjdhip9jlvmqi66x52af8b7mfxp4nz6xxl9ilxm"; + sha256 = "0xc5mqifav2j4zbln04q07wjlzpwp3w0y5iv5bkp4v5486cp2ha9"; }; buildInputs = [ jre makeWrapper ]; diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index 80415189d457..b89b28ed0479 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -17,7 +17,7 @@ let }; in stdenv.mkDerivation rec { - version = "14.29.19"; + version = "14.29.22"; pname = "jmol"; name = "${pname}-${version}"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - sha256 = "0sfbbi6mgj9hqzvcz19cr5s96rna2f2b1nc1d4j28xvva7qaqjm5"; + sha256 = "1wnrrn2wza9z6bp5axg191qf32sx4q8fj4xz404zp278rc4i2fpv"; }; patchPhase = '' diff --git a/pkgs/applications/science/chemistry/openmolcas/default.nix b/pkgs/applications/science/chemistry/openmolcas/default.nix index 5e1628a4fba7..70e79023c0ff 100644 --- a/pkgs/applications/science/chemistry/openmolcas/default.nix +++ b/pkgs/applications/science/chemistry/openmolcas/default.nix @@ -5,8 +5,8 @@ } : let - version = "20180529"; - gitLabRev = "b6b9ceffccae0dd7f14c099468334fee0b1071fc"; + version = "18.09"; + gitLabRev = "v${version}"; python = python3.withPackages (ps : with ps; [ six pyparsing ]); @@ -17,7 +17,7 @@ in stdenv.mkDerivation { owner = "Molcas"; repo = "OpenMolcas"; rev = gitLabRev; - sha256 = "1wbjjdv07lg1x4kdnf28anyrjgy33gdgrd5d7zi1c97nz7vhdjaz"; + sha256 = "1di1ygifx7ycfpwh25mv76xlv15wqfdmqzjsg5nani2d5z0arri2"; }; nativeBuildInputs = [ perl cmake texlive.combined.scheme-minimal makeWrapper ]; diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index c0048740193f..e4f0cb8d0b1a 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gtkwave-${version}"; - version = "3.3.93"; + version = "3.3.94"; src = fetchurl { url = "mirror://sourceforge/gtkwave/${name}.tar.gz"; - sha256 = "0a92zlwvshp75k7cv11rc4ab11fzsy0a5qfvxkh0bjvrq1k946ys"; + sha256 = "1v14sdd4lykly6szal6ky79b0s5pv6f1xifk5mkqkg5bkpjq71fg"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index dbfec66789a3..0ede4230aa6d 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -24,6 +24,7 @@ let "8.7.2" = "0a0657xby8wdq4aqb2xsxp3n7pmc2w4yxjmrb2l4kccs1aqvaj4w"; "8.8.0" = "13a4fka22hdxsjk11mgjb9ffzplfxyxp1sg5v1c8nk1grxlscgw8"; "8.8.1" = "1hlf58gwazywbmfa48219amid38vqdl94yz21i11b4map6jfwhbk"; + "8.8.2" = "1lip3xja924dm6qblisk1bk0x8ai24s5xxqxphbdxj6djglj68fd"; }."${version}"; coq-version = builtins.substring 0 3 version; camlp5 = ocamlPackages.camlp5_strict; diff --git a/pkgs/applications/science/logic/tptp/default.nix b/pkgs/applications/science/logic/tptp/default.nix index a1d613e6295e..f3c4f22eae36 100644 --- a/pkgs/applications/science/logic/tptp/default.nix +++ b/pkgs/applications/science/logic/tptp/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "0slqbqv4y43wz6wnh72s4n540ssapah0d12mndi0c7xr04kf2v2d"; }; - buildInputs = [ tcsh yap perl patchelf ]; + nativeBuildInputs = [ patchelf ]; + buildInputs = [ tcsh yap perl ]; installPhase = '' sharedir=$out/share/tptp diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix index 7bc8729c3fe5..7973fa8b3efb 100644 --- a/pkgs/applications/science/math/gmsh/default.nix +++ b/pkgs/applications/science/math/gmsh/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, cmake, blas, liblapack, gfortran, gmm, fltk, libjpeg , zlib, libGLU_combined, libGLU, xorg }: -let version = "4.0.0"; in +let version = "4.0.1"; in stdenv.mkDerivation { name = "gmsh-${version}"; src = fetchurl { url = "http://gmsh.info/src/gmsh-${version}-source.tgz"; - sha256 = "0pqm0ippj0j07919hld3f3rgq0p1x4j32fxb2m1nyp226zx8l37v"; + sha256 = "0s9pay32kci03qx3dlpf9h2n3hihf8zpidjnn8p9vmhnn0vav7rz"; }; # The original CMakeLists tries to use some version of the Lapack lib diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index aa6073479668..5ae10dd68b61 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -114,6 +114,8 @@ let pre-commit = callPackage ./pre-commit { }; + pass-git-helper = python3Packages.callPackage ./pass-git-helper { }; + qgit = qt5.callPackage ./qgit { }; stgit = callPackage ./stgit { diff --git a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix index 1ea60272c338..7b6dd8aacb44 100644 --- a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix @@ -13,6 +13,10 @@ stdenv.mkDerivation rec { installFlags = [ "DESTDIR=$(out) PREFIX=" ]; + postInstall = '' + install -D etc/git-extras-completion.zsh $out/share/zsh/site-functions/_git_extras + ''; + meta = with stdenv.lib; { homepage = https://github.com/tj/git-extras; description = "GIT utilities -- repo summary, repl, changelog population, author commit percentages and more"; diff --git a/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix b/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix new file mode 100644 index 000000000000..d0d60b193437 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonApplication, fetchFromGitHub, pyxdg }: + +buildPythonApplication rec { + pname = "pass-git-helper"; + version = "0.4"; + + src = fetchFromGitHub { + owner = "languitar"; + repo = "pass-git-helper"; + rev = "${version}"; + sha256 = "1zccbmq5l6asl9qm1f90vg9467y3spmv3ayrw07qizrj43yfd9ap"; + }; + + propagatedBuildInputs = [ pyxdg ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/languitar/pass-git-helper"; + description = "A git credential helper interfacing with pass, the standard unix password manager"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ vanzef ]; + }; +} diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 051ea080fb4e..0fcbe54be175 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { name = "gitkraken-${version}"; - version = "4.0.2"; + version = "4.0.5"; src = fetchurl { - url = "https://release.gitkraken.com/linux/v${version}.deb"; - sha256 = "0dnckd75fcgc9wa4ivbnw2djmk4phzzr891snhxpsvb1dhlc7rgx"; + url = "https://release.axocdn.com/linux/GitKraken-v${version}.deb"; + sha256 = "15wxcahlnz2k3331wqv30d5gq38fqh178hv87xky9b9vyh8qpcvz"; }; libPath = makeLibraryPath [ diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix index 71369709b5da..c7a51508a8ce 100644 --- a/pkgs/applications/version-management/tortoisehg/default.nix +++ b/pkgs/applications/version-management/tortoisehg/default.nix @@ -2,11 +2,11 @@ python2Packages.buildPythonApplication rec { name = "tortoisehg-${version}"; - version = "4.7"; + version = "4.7.1"; src = fetchurl { url = "https://bitbucket.org/tortoisehg/targz/downloads/${name}.tar.gz"; - sha256 = "1s99dmz8izsyj5mpnqlx9dasw8ar2lr68r3m1wyafzbqlqmbjbqm"; + sha256 = "0x7hz4v882xy2r3k43fbndkq1kqwl3rl1zjmi8pxgpf05qcn950d"; }; pythonPath = with python2Packages; [ pyqt4 mercurial qscintilla iniparse ]; diff --git a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix index db6ceedbbf72..9e275464f05c 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "libopenshot-audio-${version}"; - version = "0.1.6"; + version = "0.1.7"; src = fetchFromGitHub { owner = "OpenShot"; repo = "libopenshot-audio"; rev = "v${version}"; - sha256 = "0cf8wx6a8ba4rhfby6abpr8ks2a0hxj76mas9751ihz59w1vdisy"; + sha256 = "08a8wbi28kwrdz4h0rs1b9vsr28ldfi8g75q54rj676y1vwg3qys"; }; nativeBuildInputs = diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix index 422b50a85854..64bbb07f0aaa 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.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "OpenShot"; repo = "libopenshot"; rev = "v${version}"; - sha256 = "15i7wir1ph4g47634f8j3s8ay20zypj6p6fq8781g4w9gzgwrz2c"; + sha256 = "0n8ksnv6y2qh9iz352zqibfhnfvyjq7pkvy51prl47620ac40pc3"; }; patchPhase = '' diff --git a/pkgs/applications/video/smtube/default.nix b/pkgs/applications/video/smtube/default.nix index 32610d08f339..0188bb4784d6 100644 --- a/pkgs/applications/video/smtube/default.nix +++ b/pkgs/applications/video/smtube/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, qmake, qtscript, qtwebkit }: stdenv.mkDerivation rec { - version = "18.3.0"; + version = "18.9.0"; name = "smtube-${version}"; src = fetchurl { url = "mirror://sourceforge/smtube/SMTube/${version}/${name}.tar.bz2"; - sha256 = "05r7xmzc7i95nwzgcn7p0kwlhybryf7f0dpadgdnbz6xinz9a0mb"; + sha256 = "1211vqgmbrqr8mcsyawirmqkzq05g1xwigx6lswnyxd88x37w6fg"; }; makeFlags = [ diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 6fedc227e447..b08ff812ace4 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -20,11 +20,11 @@ assert (withQt5 -> qtbase != null && qtsvg != null && qtx11extras != null); stdenv.mkDerivation rec { name = "vlc-${version}"; - version = "3.0.3"; + version = "3.0.4"; src = fetchurl { url = "http://get.videolan.org/vlc/${version}/${name}.tar.xz"; - sha256 = "0lavzly8l0ll1d9iris9cnirgcs77g48lxj14058dxqkvd5v1a4v"; + sha256 = "17jsq0zqpqyxw4ckvjba0hf6zk8ywc4wf8sy3z03hh3ij0vxpwq1"; }; # VLC uses a *ton* of libraries for various pieces of functionality, many of @@ -52,18 +52,6 @@ stdenv.mkDerivation rec { # set the path to the compiler BUILDCC = "${stdenv.cc}/bin/gcc"; - patches = [ - (fetchpatch { - name = "vlc-qt5.11.patch"; - url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/vlc-qt5.11.patch?h=packages/vlc"; - sha256 = "0yh65bhhaz876cazhagnafs1dr61184lpj3y0m3y7k37bswykj8p"; - }) - (fetchpatch { - url = "https://github.com/videolan/vlc/commit/26e2d3906658c30f2f88f4b1bc9630ec43bf5525.patch"; - sha256 = "0sm73cbzxva8sww526bh5yin1k2pdkvj826wdlmqnj7xf0f3mki4"; - }) - ]; - postPatch = '' substituteInPlace configure \ --replace /bin/echo echo diff --git a/pkgs/applications/virtualization/qboot/default.nix b/pkgs/applications/virtualization/qboot/default.nix index 0c6e3991b1c0..0678591fc2a3 100644 --- a/pkgs/applications/virtualization/qboot/default.nix +++ b/pkgs/applications/virtualization/qboot/default.nix @@ -1,12 +1,13 @@ -{ stdenv, fetchgit }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation { - name = "qboot-pre-release"; + name = "qboot-20170330"; - src = fetchgit { - url = "https://github.com/yangchengwork/qboot"; - rev = "b2bdaf4c878ef34f309c8c79613fabd1b9c4bf75"; - sha256 = "00f24125733d24713880e430f409d6ded416286d209c9fabb45541311b01cf8d"; + src = fetchFromGitHub { + owner = "bonzini"; + repo = "qboot"; + rev = "ac9488f26528394856b94bda0797f5bd9c69a26a"; + sha256 = "0l83nbjndin1cbcimkqkiqr5df8d76cnhyk26rd3aygb2bf7cspy"; }; installPhase = '' diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 94fc9697e54e..72b2131764d5 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -32,12 +32,12 @@ in stdenv.mkDerivation { outputs = [ "out" "modsrc" ]; - nativeBuildInputs = [ pkgconfig which docbook_xsl docbook_xml_dtd_43 ]; + nativeBuildInputs = [ pkgconfig which docbook_xsl docbook_xml_dtd_43 patchelfUnstable ]; buildInputs = [ iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor libIDL libcap glib lvm2 alsaLib curl libvpx pam xorriso makeself perl - libXmu libpng patchelfUnstable python ] + libXmu libpng python ] ++ optional javaBindings jdk ++ optional pythonBindings python # Python is needed even when not building bindings ++ optional pulseSupport libpulseaudio diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index cb7bcad3592d..fc957f6f4615 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -36,7 +36,8 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=implicit-function-declaration"; - buildInputs = [ patchelf cdrkit makeWrapper dbus ] ++ kernel.moduleBuildDependencies; + nativeBuildInputs = [ patchelf makeWrapper ]; + buildInputs = [ cdrkit dbus ] ++ kernel.moduleBuildDependencies; installPhase = '' mkdir -p $out diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index 11b7c49f5ebe..366657b8827e 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "i3status-rust-${version}"; - version = "0.9.0.2018-06-22"; + version = "0.9.0.2018-09-30"; src = fetchFromGitHub { owner = "greshake"; repo = "i3status-rust"; - rev = "fdca01e88a7ce9bf4de0f58a922de5131e33dd00"; - sha256 = "12dfvamf9a13b3fa7mqrwhjk3rl53463h03arqd8pvbch006hhqd"; + rev = "82ea033250c3fc51a112ac68c389da5264840492"; + sha256 = "06r1nnv3a5vq3s17rgavq639wrq09z0nd2ck50bj1c8i2ggkpvq9"; }; - cargoSha256 = "01pwknfzkv49cip6asqd4pzkh9l42v06abyd9lb09ip5pkcs60lq"; + cargoSha256 = "02in0hz2kgbmrd8i8s21vbm9pgfnn4axcji5f2a14pha6lx5rnvv"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 0cee1dd2916f..2d6d6c1fc91d 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -1,4 +1,5 @@ { + symlinkJoin, coreutils, docker, e2fsprogs, @@ -9,7 +10,7 @@ lib, pkgs, pigz, - nixUnstable, + nix, perl, runCommand, rsync, @@ -19,6 +20,7 @@ utillinux, vmTools, writeReferencesToFile, + referencesByPopularity, writeScript, writeText, }: @@ -77,7 +79,9 @@ rec { ln -sT ${docker.src}/components/engine/pkg/tarsum src/github.com/docker/docker/pkg/tarsum go build - cp tarsum $out + mkdir -p $out/bin + + cp tarsum $out/bin/ ''; # buildEnv creates symlinks to dirs, which is hard to edit inside the overlay VM @@ -258,7 +262,7 @@ rec { ''; nixRegistration = contents: runCommand "nix-registration" { - buildInputs = [ nixUnstable perl ]; + buildInputs = [ nix perl ]; # For obtaining the closure of `contents'. exportReferencesGraph = let contentsList = if builtins.isList contents then contents else [ contents ]; @@ -270,6 +274,81 @@ rec { perl ${pkgs.pathsFromGraph} closure-* > $out/storePaths ''; + # Create $maxLayers worth of Docker Layers, one layer per store path + # unless there are more paths than $maxLayers. In that case, create + # $maxLayers-1 for the most popular layers, and smush the remainaing + # store paths in to one final layer. + mkManyPureLayers = { + name, + # Files to add to the layer. + closure, + configJson, + # Docker has a 42-layer maximum, we pick 24 to ensure there is plenty + # of room for extension + maxLayers ? 24 + }: + runCommand "${name}-granular-docker-layers" { + inherit maxLayers; + paths = referencesByPopularity closure; + buildInputs = [ jshon rsync tarsum ]; + enableParallelBuilding = true; + } + '' + # Delete impurities for store path layers, so they don't get + # shared and taint other projects. + cat ${configJson} \ + | jshon -d config \ + | jshon -s "1970-01-01T00:00:01Z" -i created > generic.json + + # WARNING! + # The following code is fiddly w.r.t. ensuring every layer is + # created, and that no paths are missed. If you change the + # following head and tail call lines, double-check that your + # code behaves properly when the number of layers equals: + # maxLayers-1, maxLayers, and maxLayers+1 + head -n $((maxLayers - 1)) $paths | cat -n | xargs -P$NIX_BUILD_CORES -n2 ${./store-path-to-layer.sh} + if [ $(cat $paths | wc -l) -ge $maxLayers ]; then + tail -n+$maxLayers $paths | xargs ${./store-path-to-layer.sh} $maxLayers + fi + + echo "Finished building layer '$name'" + + mv ./layers $out + ''; + + # Create a "Customisation" layer which adds symlinks at the root of + # the image to the root paths of the closure. Also add the config + # data like what command to run and the environment to run it in. + mkCustomisationLayer = { + name, + # Files to add to the layer. + contents, + baseJson, + uid ? 0, gid ? 0, + }: + runCommand "${name}-customisation-layer" { + buildInputs = [ jshon rsync tarsum ]; + } + '' + cp -r ${contents}/ ./layer + + # Tar up the layer and throw it into 'layer.tar'. + echo "Packing layer..." + mkdir $out + tar -C layer --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..." + tarhash=$(tarsum < $out/layer.tar) + + # Add a 'checksum' field to the JSON, with the value set to the + # checksum of the tarball. + cat ${baseJson} | jshon -s "$tarhash" -i checksum > $out/json + + # Indicate to docker that we're using schema version 1.0. + echo -n "1.0" > $out/VERSION + ''; + # Create a "layer" (set of files). mkPureLayer = { # Name of the layer @@ -287,7 +366,7 @@ rec { }: runCommand "docker-layer-${name}" { inherit baseJson contents extraCommands; - buildInputs = [ jshon rsync ]; + buildInputs = [ jshon rsync tarsum ]; } '' mkdir layer @@ -314,11 +393,11 @@ rec { # Compute a checksum of the tarball. echo "Computing layer checksum..." - tarsum=$(${tarsum} < $out/layer.tar) + tarhash=$(tarsum < $out/layer.tar) # Add a 'checksum' field to the JSON, with the value set to the # checksum of the tarball. - cat ${baseJson} | jshon -s "$tarsum" -i checksum > $out/json + cat ${baseJson} | jshon -s "$tarhash" -i checksum > $out/json # Indicate to docker that we're using schema version 1.0. echo -n "1.0" > $out/VERSION @@ -402,8 +481,8 @@ rec { # Compute the tar checksum and add it to the output json. echo "Computing checksum..." - ts=$(${tarsum} < $out/layer.tar) - cat ${baseJson} | jshon -s "$ts" -i checksum > $out/json + tarhash=$(${tarsum}/bin/tarsum < $out/layer.tar) + cat ${baseJson} | jshon -s "$tarhash" -i checksum > $out/json # Indicate to docker that we're using schema version 1.0. echo -n "1.0" > $out/VERSION @@ -411,6 +490,104 @@ rec { ''; }; + buildLayeredImage = { + # Image Name + name, + # Image tag, the Nix's output hash will be used if null + tag ? null, + # Files to put on the image (a nix store path or list of paths). + contents ? [], + # Docker config; e.g. what command to run on the container. + config ? {}, + # Time of creation of the image. Passing "now" will make the + # created date be the time of building. + created ? "1970-01-01T00:00:01Z", + # Docker's lowest maximum layer limit is 42-layers for an old + # version of the AUFS graph driver. We pick 24 to ensure there is + # plenty of room for extension. I believe the actual maximum is + # 128. + maxLayers ? 24 + }: + let + uid = 0; + gid = 0; + baseName = baseNameOf name; + contentsEnv = symlinkJoin { name = "bulk-layers"; paths = (if builtins.isList contents then contents else [ contents ]); }; + + configJson = let + pure = writeText "${baseName}-config.json" (builtins.toJSON { + inherit created config; + architecture = "amd64"; + os = "linux"; + }); + impure = runCommand "${baseName}-standard-dynamic-date.json" + { buildInputs = [ jq ]; } + '' + jq ".created = \"$(TZ=utc date --iso-8601="seconds")\"" ${pure} > $out + ''; + in if created == "now" then impure else pure; + + bulkLayers = mkManyPureLayers { + name = baseName; + closure = writeText "closure" "${contentsEnv} ${configJson}"; + # One layer will be taken up by the customisationLayer, so + # take up one less. + maxLayers = maxLayers - 1; + inherit configJson; + }; + customisationLayer = mkCustomisationLayer { + name = baseName; + contents = contentsEnv; + baseJson = configJson; + inherit uid gid; + }; + result = runCommand "docker-image-${baseName}.tar.gz" { + buildInputs = [ jshon pigz coreutils findutils jq ]; + # Image name and tag must be lowercase + imageName = lib.toLower name; + imageTag = if tag == null then "" else lib.toLower tag; + baseJson = configJson; + } '' + ${lib.optionalString (tag == null) '' + outName="$(basename "$out")" + outHash=$(echo "$outName" | cut -d - -f 1) + + imageTag=$outHash + ''} + + find ${bulkLayers} -mindepth 1 -maxdepth 1 | sort -t/ -k5 -n > layer-list + echo ${customisationLayer} >> layer-list + + mkdir image + imageJson=$(cat ${configJson} | jq ". + {\"rootfs\": {\"diff_ids\": [], \"type\": \"layers\"}}") + manifestJson=$(jq -n "[{\"RepoTags\":[\"$imageName:$imageTag\"]}]") + for layer in $(cat layer-list); do + layerChecksum=$(sha256sum $layer/layer.tar | cut -d ' ' -f1) + layerID=$(sha256sum "$layer/json" | cut -d ' ' -f 1) + ln -s "$layer" "./image/$layerID" + + manifestJson=$(echo "$manifestJson" | jq ".[0].Layers |= [\"$layerID/layer.tar\"] + .") + imageJson=$(echo "$imageJson" | jq ".history |= [{\"created\": \"$(jq -r .created ${configJson})\"}] + .") + imageJson=$(echo "$imageJson" | jq ".rootfs.diff_ids |= [\"sha256:$layerChecksum\"] + .") + done + imageJsonChecksum=$(echo "$imageJson" | sha256sum | cut -d ' ' -f1) + echo "$imageJson" > "image/$imageJsonChecksum.json" + manifestJson=$(echo "$manifestJson" | jq ".[0].Config = \"$imageJsonChecksum.json\"") + echo "$manifestJson" > image/manifest.json + + jshon -n object \ + -n object -s "$layerID" -i "$imageTag" \ + -i "$imageName" > image/repositories + + echo "Cooking the image..." + tar -C image --dereference --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" --owner=0 --group=0 --mode=a-w --xform s:'^./':: -c . | pigz -nT > $out + + echo "Finished." + ''; + + in + result; + # 1. extract the base image # 2. create the layer # 3. add layer deps to the layer itself, diffing with the base image @@ -626,7 +803,7 @@ rec { echo " be better to only have one layer that contains a nix store." # This requires Nix 1.12 or higher export NIX_REMOTE=local?root=$PWD - ${nixUnstable}/bin/nix-store --load-db < ${nixRegistration contents}/db.dump + ${nix}/bin/nix-store --load-db < ${nixRegistration contents}/db.dump # We fill the store in order to run the 'verify' command that # generates hash and size of output paths. @@ -637,7 +814,7 @@ rec { storePaths=$(cat ${nixRegistration contents}/storePaths) echo "Copying everything to /nix/store (will take a while)..." cp -prd $storePaths nix/store/ - ${nixUnstable}/bin/nix-store --verify --check-contents + ${nix}/bin/nix-store --verify --check-contents mkdir -p nix/var/nix/gcroots/docker/ for i in ${lib.concatStringsSep " " contents}; do diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index 822e0dbb31f2..003e7429a81b 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -150,4 +150,11 @@ rec { contents = [ pkgs.coreutils ]; created = "now"; }; + + # 10. Create a layered image + layered-image = pkgs.dockerTools.buildLayeredImage { + name = "layered-image"; + tag = "latest"; + config.Cmd = [ "${pkgs.hello}/bin/hello" ]; + }; } diff --git a/pkgs/build-support/docker/store-path-to-layer.sh b/pkgs/build-support/docker/store-path-to-layer.sh new file mode 100755 index 000000000000..ff814c1f6130 --- /dev/null +++ b/pkgs/build-support/docker/store-path-to-layer.sh @@ -0,0 +1,24 @@ +#!/bin/sh + +set -eu + +layerNumber=$1 +shift + +layerPath="./layers/$layerNumber" +echo "Creating layer #$layerNumber for $@" + +mkdir -p "$layerPath" +tar -rpf "$layerPath/layer.tar" --hard-dereference --sort=name \ + --mtime="@$SOURCE_DATE_EPOCH" \ + --owner=0 --group=0 "$@" + +# Compute a checksum of the tarball. +tarhash=$(tarsum < $layerPath/layer.tar) + +# Add a 'checksum' field to the JSON, with the value set to the +# checksum of the tarball. +cat ./generic.json | jshon -s "$tarhash" -i checksum > $layerPath/json + +# Indicate to docker that we're using schema version 1.0. +echo -n "1.0" > $layerPath/VERSION diff --git a/pkgs/build-support/references-by-popularity/closure-graph.py b/pkgs/build-support/references-by-popularity/closure-graph.py new file mode 100644 index 000000000000..d67a5dfcf140 --- /dev/null +++ b/pkgs/build-support/references-by-popularity/closure-graph.py @@ -0,0 +1,520 @@ +# IMPORTANT: Making changes? +# +# Validate your changes with python3 ./closure-graph.py --test + + +# Using a simple algorithm, convert the references to a path in to a +# sorted list of dependent paths based on how often they're referenced +# and how deep in the tree they live. Equally-"popular" paths are then +# sorted by name. +# +# The existing writeReferencesToFile prints the paths in a simple +# ascii-based sorting of the paths. +# +# Sorting the paths by graph improves the chances that the difference +# between two builds appear near the end of the list, instead of near +# the beginning. This makes a difference for Nix builds which export a +# closure for another program to consume, if that program implements its +# own level of binary diffing. +# +# For an example, Docker Images. If each store path is a separate layer +# then Docker Images can be very efficiently transfered between systems, +# and we get very good cache reuse between images built with the same +# version of Nixpkgs. However, since Docker only reliably supports a +# small number of layers (42) it is important to pick the individual +# layers carefully. By storing very popular store paths in the first 40 +# layers, we improve the chances that the next Docker image will share +# many of those layers.* +# +# Given the dependency tree: +# +# A - B - C - D -\ +# \ \ \ \ +# \ \ \ \ +# \ \ - E ---- F +# \- G +# +# Nodes which have multiple references are duplicated: +# +# A - B - C - D - F +# \ \ \ +# \ \ \- E - F +# \ \ +# \ \- E - F +# \ +# \- G +# +# Each leaf node is now replaced by a counter defaulted to 1: +# +# A - B - C - D - (F:1) +# \ \ \ +# \ \ \- E - (F:1) +# \ \ +# \ \- E - (F:1) +# \ +# \- (G:1) +# +# Then each leaf counter is merged with its parent node, replacing the +# parent node with a counter of 1, and each existing counter being +# incremented by 1. That is to say `- D - (F:1)` becomes `- (D:1, F:2)`: +# +# A - B - C - (D:1, F:2) +# \ \ \ +# \ \ \- (E:1, F:2) +# \ \ +# \ \- (E:1, F:2) +# \ +# \- (G:1) +# +# Then each leaf counter is merged with its parent node again, merging +# any counters, then incrementing each: +# +# A - B - (C:1, D:2, E:2, F:5) +# \ \ +# \ \- (E:1, F:2) +# \ +# \- (G:1) +# +# And again: +# +# A - (B:1, C:2, D:3, E:4, F:8) +# \ +# \- (G:1) +# +# And again: +# +# (A:1, B:2, C:3, D:4, E:5, F:9, G:2) +# +# and then paths have the following "popularity": +# +# A 1 +# B 2 +# C 3 +# D 4 +# E 5 +# F 9 +# G 2 +# +# and the popularity contest would result in the paths being printed as: +# +# F +# E +# D +# C +# B +# G +# A +# +# * Note: People who have used a Dockerfile before assume Docker's +# Layers are inherently ordered. However, this is not true -- Docker +# layers are content-addressable and are not explicitly layered until +# they are composed in to an Image. + +import sys +import json +import unittest + +from pprint import pprint +from collections import defaultdict + +# Find paths in the original dataset which are never referenced by +# any other paths +def find_roots(closures): + roots = []; + + for closure in closures: + path = closure['path'] + if not any_refer_to(path, closures): + roots.append(path) + + return roots + +class TestFindRoots(unittest.TestCase): + def test_find_roots(self): + self.assertCountEqual( + find_roots([ + { + "path": "/nix/store/foo", + "references": [ + "/nix/store/foo", + "/nix/store/bar" + ] + }, + { + "path": "/nix/store/bar", + "references": [ + "/nix/store/bar", + "/nix/store/tux" + ] + }, + { + "path": "/nix/store/hello", + "references": [ + ] + } + ]), + ["/nix/store/foo", "/nix/store/hello"] + ) + + +def any_refer_to(path, closures): + for closure in closures: + if path != closure['path']: + if path in closure['references']: + return True + return False + +class TestAnyReferTo(unittest.TestCase): + def test_has_references(self): + self.assertTrue( + any_refer_to( + "/nix/store/bar", + [ + { + "path": "/nix/store/foo", + "references": [ + "/nix/store/bar" + ] + }, + ] + ), + ) + def test_no_references(self): + self.assertFalse( + any_refer_to( + "/nix/store/foo", + [ + { + "path": "/nix/store/foo", + "references": [ + "/nix/store/foo", + "/nix/store/bar" + ] + }, + ] + ), + ) + +def all_paths(closures): + paths = [] + for closure in closures: + paths.append(closure['path']) + paths.extend(closure['references']) + paths.sort() + return list(set(paths)) + + +class TestAllPaths(unittest.TestCase): + def test_returns_all_paths(self): + self.assertCountEqual( + all_paths([ + { + "path": "/nix/store/foo", + "references": [ + "/nix/store/foo", + "/nix/store/bar" + ] + }, + { + "path": "/nix/store/bar", + "references": [ + "/nix/store/bar", + "/nix/store/tux" + ] + }, + { + "path": "/nix/store/hello", + "references": [ + ] + } + ]), + ["/nix/store/foo", "/nix/store/bar", "/nix/store/hello", "/nix/store/tux",] + ) + def test_no_references(self): + self.assertFalse( + any_refer_to( + "/nix/store/foo", + [ + { + "path": "/nix/store/foo", + "references": [ + "/nix/store/foo", + "/nix/store/bar" + ] + }, + ] + ), + ) + +# Convert: +# +# [ +# { path: /nix/store/foo, references: [ /nix/store/foo, /nix/store/bar, /nix/store/baz ] }, +# { path: /nix/store/bar, references: [ /nix/store/bar, /nix/store/baz ] }, +# { path: /nix/store/baz, references: [ /nix/store/baz, /nix/store/tux ] }, +# { path: /nix/store/tux, references: [ /nix/store/tux ] } +# ] +# +# To: +# { +# /nix/store/foo: [ /nix/store/bar, /nix/store/baz ], +# /nix/store/bar: [ /nix/store/baz ], +# /nix/store/baz: [ /nix/store/tux ] }, +# /nix/store/tux: [ ] +# } +# +# Note that it drops self-references to avoid loops. +def make_lookup(closures): + lookup = {} + + for closure in closures: + # paths often self-refer + nonreferential_paths = [ref for ref in closure['references'] if ref != closure['path']] + lookup[closure['path']] = nonreferential_paths + + return lookup + +class TestMakeLookup(unittest.TestCase): + def test_returns_lookp(self): + self.assertDictEqual( + make_lookup([ + { + "path": "/nix/store/foo", + "references": [ + "/nix/store/foo", + "/nix/store/bar" + ] + }, + { + "path": "/nix/store/bar", + "references": [ + "/nix/store/bar", + "/nix/store/tux" + ] + }, + { + "path": "/nix/store/hello", + "references": [ + ] + } + ]), + { + "/nix/store/foo": [ "/nix/store/bar" ], + "/nix/store/bar": [ "/nix/store/tux" ], + "/nix/store/hello": [ ], + } + ) + +# Convert: +# +# /nix/store/foo with +# { +# /nix/store/foo: [ /nix/store/bar, /nix/store/baz ], +# /nix/store/bar: [ /nix/store/baz ], +# /nix/store/baz: [ /nix/store/tux ] }, +# /nix/store/tux: [ ] +# } +# +# To: +# +# { +# /nix/store/bar: { +# /nix/store/baz: { +# /nix/store/tux: {} +# } +# }, +# /nix/store/baz: { +# /nix/store/tux: {} +# } +# } +def make_graph_segment_from_root(root, lookup): + children = {} + for ref in lookup[root]: + children[ref] = make_graph_segment_from_root(ref, lookup) + return children + +class TestMakeGraphSegmentFromRoot(unittest.TestCase): + def test_returns_graph(self): + self.assertDictEqual( + make_graph_segment_from_root("/nix/store/foo", { + "/nix/store/foo": [ "/nix/store/bar" ], + "/nix/store/bar": [ "/nix/store/tux" ], + "/nix/store/tux": [ ], + "/nix/store/hello": [ ], + }), + { + "/nix/store/bar": { + "/nix/store/tux": {} + } + } + ) + def test_returns_graph_tiny(self): + self.assertDictEqual( + make_graph_segment_from_root("/nix/store/tux", { + "/nix/store/foo": [ "/nix/store/bar" ], + "/nix/store/bar": [ "/nix/store/tux" ], + "/nix/store/tux": [ ], + }), + {} + ) + +# Convert a graph segment in to a popularity-counted dictionary: +# +# From: +# { +# /nix/store/foo: { +# /nix/store/bar: { +# /nix/store/baz: { +# /nix/store/tux: {} +# } +# } +# /nix/store/baz: { +# /nix/store/tux: {} +# } +# } +# } +# +# to: +# [ +# /nix/store/foo: 1 +# /nix/store/bar: 2 +# /nix/store/baz: 4 +# /nix/store/tux: 6 +# ] +def graph_popularity_contest(full_graph): + popularity = defaultdict(int) + for path, subgraph in full_graph.items(): + popularity[path] += 1 + subcontest = graph_popularity_contest(subgraph) + for subpath, subpopularity in subcontest.items(): + popularity[subpath] += subpopularity + 1 + + return popularity + +class TestGraphPopularityContest(unittest.TestCase): + def test_counts_popularity(self): + self.assertDictEqual( + graph_popularity_contest({ + "/nix/store/foo": { + "/nix/store/bar": { + "/nix/store/baz": { + "/nix/store/tux": {} + } + }, + "/nix/store/baz": { + "/nix/store/tux": {} + } + } + }), + { + "/nix/store/foo": 1, + "/nix/store/bar": 2, + "/nix/store/baz": 4, + "/nix/store/tux": 6, + } + ) + +# Emit a list of packages by popularity, most first: +# +# From: +# [ +# /nix/store/foo: 1 +# /nix/store/bar: 1 +# /nix/store/baz: 2 +# /nix/store/tux: 2 +# ] +# +# To: +# [ /nix/store/baz /nix/store/tux /nix/store/bar /nix/store/foo ] +def order_by_popularity(paths): + paths_by_popularity = defaultdict(list) + popularities = [] + for path, popularity in paths.items(): + popularities.append(popularity) + paths_by_popularity[popularity].append(path) + + popularities = list(set(popularities)) + popularities.sort() + + flat_ordered = [] + for popularity in popularities: + paths = paths_by_popularity[popularity] + paths.sort(key=package_name) + + flat_ordered.extend(reversed(paths)) + return list(reversed(flat_ordered)) + + +class TestOrderByPopularity(unittest.TestCase): + def test_returns_in_order(self): + self.assertEqual( + order_by_popularity({ + "/nix/store/foo": 1, + "/nix/store/bar": 1, + "/nix/store/baz": 2, + "/nix/store/tux": 2, + }), + [ + "/nix/store/baz", + "/nix/store/tux", + "/nix/store/bar", + "/nix/store/foo" + ] + ) + +def package_name(path): + parts = path.split('-') + start = parts.pop(0) + # don't throw away any data, so the order is always the same. + # even in cases where only the hash at the start has changed. + parts.append(start) + return '-'.join(parts) + +def main(): + filename = sys.argv[1] + key = sys.argv[2] + + with open(filename) as f: + data = json.load(f) + + # Data comes in as: + # [ + # { path: /nix/store/foo, references: [ /nix/store/foo, /nix/store/bar, /nix/store/baz ] }, + # { path: /nix/store/bar, references: [ /nix/store/bar, /nix/store/baz ] }, + # { path: /nix/store/baz, references: [ /nix/store/baz, /nix/store/tux ] }, + # { path: /nix/store/tux, references: [ /nix/store/tux ] } + # ] + # + # and we want to get out a list of paths ordered by how universally, + # important they are, ie: tux is referenced by every path, transitively + # so it should be #1 + # + # [ + # /nix/store/tux, + # /nix/store/baz, + # /nix/store/bar, + # /nix/store/foo, + # ] + graph = data[key] + + roots = find_roots(graph); + lookup = make_lookup(graph) + + full_graph = {} + for root in roots: + full_graph[root] = make_graph_segment_from_root(root, lookup) + + ordered = order_by_popularity(graph_popularity_contest(full_graph)) + missing = [] + for path in all_paths(graph): + if path not in ordered: + missing.append(path) + + ordered.extend(missing) + print("\n".join(ordered)) + +if "--test" in sys.argv: + # Don't pass --test otherwise unittest gets mad + unittest.main(argv = [f for f in sys.argv if f != "--test" ]) +else: + main() diff --git a/pkgs/build-support/references-by-popularity/default.nix b/pkgs/build-support/references-by-popularity/default.nix new file mode 100644 index 000000000000..4cae2dcf3ca9 --- /dev/null +++ b/pkgs/build-support/references-by-popularity/default.nix @@ -0,0 +1,15 @@ +{ runCommand, python3, coreutils }: +# Write the references of `path' to a file, in order of how "popular" each +# reference is. Nix 2 only. +path: runCommand "closure-paths" +{ + exportReferencesGraph.graph = path; + __structuredAttrs = true; + PATH = "${coreutils}/bin:${python3}/bin"; + builder = builtins.toFile "builder" + '' + . .attrs.sh + python3 ${./closure-graph.py} .attrs.json graph > ''${outputs[out]} + ''; + } + "" diff --git a/pkgs/data/fonts/fira-code/default.nix b/pkgs/data/fonts/fira-code/default.nix index 191e52c427a7..b0b58b0ebfcc 100644 --- a/pkgs/data/fonts/fira-code/default.nix +++ b/pkgs/data/fonts/fira-code/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip }: let - version = "1.205"; + version = "1.206"; in fetchzip { name = "fira-code-${version}"; @@ -12,7 +12,7 @@ in fetchzip { unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype ''; - sha256 = "0h8b89d1n3y56k7x9zrwm9fic09ccg1mc7g1258g152m5g6z6zms"; + sha256 = "0074d8q4m802f5yms8yxdx4rdz5xnpgv1w5hs330zg2p9ksicgzy"; meta = with stdenv.lib; { homepage = https://github.com/tonsky/FiraCode; diff --git a/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix b/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix index cb68c30a4a2c..f8df39c95652 100644 --- a/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix +++ b/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix @@ -1,24 +1,16 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "ultimate-oldschool-pc-font-pack-${version}"; +let version = "1.0"; +in +fetchzip rec { + name = "ultimate-oldschool-pc-font-pack-${version}"; + url = "http://int10h.org/oldschool-pc-fonts/download/ultimate_oldschool_pc_font_pack_v${version}.zip"; + sha256 = "0hid4dgqfy2w26734vcw2rxmpacd9vd1r2qpdr9ww1n3kgc92k9y"; - src = fetchurl { - url = "http://int10h.org/oldschool-pc-fonts/download/ultimate_oldschool_pc_font_pack_v${version}.zip"; - sha256 = "7666cf23176e34ea03a218b5c1500f4ad729d97150ab7bdb7cf2adf4c99a9a7a"; - }; - - buildInputs = [ unzip ]; - - dontBuild = true; - - sourceRoot = "."; - - installPhase = '' + postFetch= '' mkdir -p $out/share/fonts/truetype - cp 'Px437 (TrueType - DOS charset)'/*.ttf $out/share/fonts/truetype - cp 'PxPlus (TrueType - extended charset)'/*.ttf $out/share/fonts/truetype + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype ''; meta = with stdenv.lib; { diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index 3c837feb6be5..3126269a6e7a 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/b16aa9c85633ea49e19aee5e1678d082ce953a17.tar.gz"; - sha256 = "185p6112b35s2vgbswrmy5lwf09q27gzkpcfla6dbddmbk948d38"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/3715ae81be1a8e0c6a1cb5902c054b6cedfb7f41.tar.gz"; + sha256 = "05bsk99d4k2nq8dfiagpby0cllx19crzn2rh29v26p0irzagrqfb"; } diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix index 93ee6d38c7c3..0a5f7b313065 100644 --- a/pkgs/data/misc/osinfo-db/default.nix +++ b/pkgs/data/misc/osinfo-db/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, osinfo-db-tools, intltool, libxml2 }: stdenv.mkDerivation rec { - name = "osinfo-db-20180903"; + name = "osinfo-db-20180920"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${name}.tar.xz"; - sha256 = "0xkxqyn2b03d4rd91f5rw3xar5vnv2n8l5pp8sm3hqm1wm5z5my9"; + sha256 = "19jbzf1g523bkckli043q21hgbfv0043b5ib4zjiz8x98h7ngiac"; }; nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ]; diff --git a/pkgs/desktops/deepin/deepin-menu/default.nix b/pkgs/desktops/deepin/deepin-menu/default.nix index df0dcc379070..eeed3579f459 100644 --- a/pkgs/desktops/deepin/deepin-menu/default.nix +++ b/pkgs/desktops/deepin/deepin-menu/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-menu"; - version = "3.3.10"; + version = "3.4.0"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "1666821c2irs2hjgr3kvivij6c2fgjva8323kplrz75w2lz518xb"; + sha256 = "15v2v7pg53csxmhmnkglxv5mj9cpn0ph8kv3hj44973sdwyrl51f"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/deepin/dtkcore/default.nix b/pkgs/desktops/deepin/dtkcore/default.nix index 1dfb627c605d..3fc9a1b4a03e 100644 --- a/pkgs/desktops/deepin/dtkcore/default.nix +++ b/pkgs/desktops/deepin/dtkcore/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "dtkcore"; - version = "2.0.9"; + version = "2.0.9.4"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0jfl4w3sviy59rl41a5507dbhqhsxy7hqw3gf64a57gjlbdskmm1"; + sha256 = "184yg1501hvv7n1c7r0fl2y4d4nhif368rrbrd1phwzfvh6x1ji4"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/deepin/dtkwidget/default.nix b/pkgs/desktops/deepin/dtkwidget/default.nix index c9dbd124b038..268f9518495e 100644 --- a/pkgs/desktops/deepin/dtkwidget/default.nix +++ b/pkgs/desktops/deepin/dtkwidget/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "dtkwidget"; - version = "2.0.9.3"; + version = "2.0.9.4"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "1ngspvjvws1d2nkyqjh9y45ilahkd1fqwxnlmazgik4355mb76bv"; + sha256 = "06iyb3ryxrqkwxdazpv8cgabqa4djldgm3q5icsa2grqrgy8vw5m"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnustep/systempreferences/default.nix b/pkgs/desktops/gnustep/systempreferences/default.nix index 2bc4f688184a..096520f08f36 100644 --- a/pkgs/desktops/gnustep/systempreferences/default.nix +++ b/pkgs/desktops/gnustep/systempreferences/default.nix @@ -1,12 +1,12 @@ { back, base, gui, gsmakeDerivation, fetchurl }: let - version = "1.1.0"; + version = "1.2.0"; in gsmakeDerivation { name = "system_preferences-${version}"; src = fetchurl { url = "ftp://ftp.gnustep.org/pub/gnustep/usr-apps/SystemPreferences-${version}.tar.gz"; - sha256 = "1q68bs8rlq0dxkar01qs5wfyas4iivddnama371jd7ll6cxzmpy7"; + sha256 = "1fg7c3ihfgvl6n21rd17fs9ivx3l8ps874m80vz86n1callgs339"; }; # GNUSTEP_MAKEFILES = "${gnustep_make}/share/GNUstep/Makefiles"; buildInputs = [ back base gui ]; diff --git a/pkgs/development/compilers/dotnet/sdk/default.nix b/pkgs/development/compilers/dotnet/sdk/default.nix index d1db965bc814..eb7a1e737193 100644 --- a/pkgs/development/compilers/dotnet/sdk/default.nix +++ b/pkgs/development/compilers/dotnet/sdk/default.nix @@ -12,13 +12,14 @@ let rpath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc libunwind libuuid icu openssl zlib curl ]; in stdenv.mkDerivation rec { - version = "2.1.401"; + version = "2.1.402"; + netCoreVersion = "2.1.4"; name = "dotnet-sdk-${version}"; src = fetchurl { url = "https://dotnetcli.azureedge.net/dotnet/Sdk/${version}/dotnet-sdk-${version}-linux-x64.tar.gz"; # use sha512 from the download page - sha512 = "639f9f68f225246d9cce798d72d011f65c7eda0d775914d1394df050bddf93e2886555f5eed85a75d6c72e9063a54d8aa053c64c326c683b94e9e0a0570e5654"; + sha512 = "dd7f15a8202ffa2a435b7289865af4483bb0f642ffcf98a1eb10464cb9c51dd1d771efbb6120f129fe9666f62707ba0b7c476cf1fd3536d3a29329f07456de48"; }; unpackPhase = '' @@ -49,7 +50,7 @@ in meta = with stdenv.lib; { homepage = https://dotnet.github.io/; - description = ".NET Core SDK 2.0.2 with .NET Core 2.0.0"; + description = ".NET Core SDK ${version} with .NET Core ${netCoreVersion}"; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ kuznero ]; license = licenses.mit; diff --git a/pkgs/development/compilers/gcc-arm-embedded/default.nix b/pkgs/development/compilers/gcc-arm-embedded/default.nix index 7908d6d06ef8..039b5a9ce362 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { sha256 = sha256; }; - buildInputs = [ bzip2 patchelf ]; + nativeBuildInputs = [ bzip2 patchelf ]; dontPatchELF = true; diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix index a4374a452402..b69ae80d0db5 100644 --- a/pkgs/development/compilers/ghc/7.10.3.nix +++ b/pkgs/development/compilers/ghc/7.10.3.nix @@ -15,7 +15,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 ? !(gmp.meta.available or false), gmp + enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp , # If enabled, use -fPIC when compiling static libs. enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix index 0946db713783..f7422d150ac0 100644 --- a/pkgs/development/compilers/ghc/8.0.2.nix +++ b/pkgs/development/compilers/ghc/8.0.2.nix @@ -14,7 +14,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 ? !(gmp.meta.available or false), gmp + enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp , # If enabled, use -fPIC when compiling static libs. enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index 6a1914a9c2c8..aac8cf4fd220 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -15,7 +15,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 ? !(gmp.meta.available or false), gmp + enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp , # If enabled, use -fPIC when compiling static libs. enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform diff --git a/pkgs/development/compilers/ghc/8.4.3.nix b/pkgs/development/compilers/ghc/8.4.3.nix index 8fba60d527fd..e43f9a57d0a4 100644 --- a/pkgs/development/compilers/ghc/8.4.3.nix +++ b/pkgs/development/compilers/ghc/8.4.3.nix @@ -14,7 +14,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 ? !(gmp.meta.available or false), gmp + enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp , # If enabled, use -fPIC when compiling static libs. enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform diff --git a/pkgs/development/compilers/ghc/8.6.1.nix b/pkgs/development/compilers/ghc/8.6.1.nix index c12401f05778..62ea39791b90 100644 --- a/pkgs/development/compilers/ghc/8.6.1.nix +++ b/pkgs/development/compilers/ghc/8.6.1.nix @@ -14,7 +14,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 ? !(gmp.meta.available or false), gmp + enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp , # If enabled, use -fPIC when compiling static libs. enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index af5efbd7df8c..87045815a37f 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -14,7 +14,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 ? !(gmp.meta.available or false), gmp + enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp , # If enabled, use -fPIC when compiling static libs. enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix index 92211042acd9..025d74bcda04 100644 --- a/pkgs/development/compilers/ghcjs-ng/default.nix +++ b/pkgs/development/compilers/ghcjs-ng/default.nix @@ -42,6 +42,7 @@ let targetPrefix = ""; inherit bootGhcjs; inherit (bootGhcjs) version; + ghcVersion = bootPkgs.ghc.version; isGhcjs = true; enableShared = true; diff --git a/pkgs/development/compilers/ghcjs/ghcjs.patch b/pkgs/development/compilers/ghcjs/7.10/boot.patch index 9f4fa3a8b7ae..9f4fa3a8b7ae 100644 --- a/pkgs/development/compilers/ghcjs/ghcjs.patch +++ b/pkgs/development/compilers/ghcjs/7.10/boot.patch diff --git a/pkgs/development/compilers/ghcjs/7.10/default.nix b/pkgs/development/compilers/ghcjs/7.10/default.nix new file mode 100644 index 000000000000..f18a094aa3cf --- /dev/null +++ b/pkgs/development/compilers/ghcjs/7.10/default.nix @@ -0,0 +1,50 @@ +{ fetchgit, fetchFromGitHub, bootPkgs, cabal-install }: + +bootPkgs.callPackage ../base.nix { + version = "0.2.0"; + + inherit bootPkgs cabal-install; + + ghcjsSrc = fetchFromGitHub { + owner = "ghcjs"; + repo = "ghcjs"; + rev = "689c7753f50353dd05606ed79c51cd5a94d3922a"; + sha256 = "076020a9gjv8ldj5ckm43sbzq9s6c5xj6lpd8v28ybpiama3m6b4"; + }; + ghcjsBootSrc = fetchgit { + url = git://github.com/ghcjs/ghcjs-boot.git; + rev = "8c549931da27ba9e607f77195208ec156c840c8a"; + sha256 = "0yg9bnabja39qysh9pg1335qbvbc0r2mdw6cky94p7kavacndfdv"; + fetchSubmodules = true; + }; + + shims = import ./shims.nix { inherit fetchFromGitHub; }; + stage1Packages = [ + "array" + "base" + "binary" + "bytestring" + "containers" + "deepseq" + "directory" + "filepath" + "ghc-boot" + "ghc-boot-th" + "ghc-prim" + "ghci" + "ghcjs-prim" + "ghcjs-th" + "integer-gmp" + "pretty" + "primitive" + "process" + "rts" + "template-haskell" + "time" + "transformers" + "unix" + ]; + stage2 = import ./stage2.nix; + + patches = [ ./boot.patch ]; +} diff --git a/pkgs/development/compilers/ghcjs/shims.nix b/pkgs/development/compilers/ghcjs/7.10/shims.nix index fa706699449a..fa706699449a 100644 --- a/pkgs/development/compilers/ghcjs/shims.nix +++ b/pkgs/development/compilers/ghcjs/7.10/shims.nix diff --git a/pkgs/development/compilers/ghcjs/stage2.nix b/pkgs/development/compilers/ghcjs/7.10/stage2.nix index 3483afc99ef0..3483afc99ef0 100644 --- a/pkgs/development/compilers/ghcjs/stage2.nix +++ b/pkgs/development/compilers/ghcjs/7.10/stage2.nix diff --git a/pkgs/development/compilers/ghcjs/ghcjs-head.patch b/pkgs/development/compilers/ghcjs/8.0/boot.patch index bbb5b30468cb..bbb5b30468cb 100644 --- a/pkgs/development/compilers/ghcjs/ghcjs-head.patch +++ b/pkgs/development/compilers/ghcjs/8.0/boot.patch diff --git a/pkgs/development/compilers/ghcjs/head.nix b/pkgs/development/compilers/ghcjs/8.0/default.nix index 84eb2d8bd0da..a786f536eb9b 100644 --- a/pkgs/development/compilers/ghcjs/head.nix +++ b/pkgs/development/compilers/ghcjs/8.0/default.nix @@ -1,6 +1,6 @@ { fetchgit, fetchFromGitHub, bootPkgs, cabal-install }: -bootPkgs.callPackage ./base.nix { +bootPkgs.callPackage ../base.nix { version = "0.2.020170323"; inherit bootPkgs cabal-install; @@ -18,7 +18,7 @@ bootPkgs.callPackage ./base.nix { fetchSubmodules = true; }; - shims = import ./head_shims.nix { inherit fetchFromGitHub; }; + shims = import ./shims.nix { inherit fetchFromGitHub; }; stage1Packages = [ "array" "base" @@ -44,7 +44,7 @@ bootPkgs.callPackage ./base.nix { "transformers" "unix" ]; - stage2 = import ./head_stage2.nix; + stage2 = import ./stage2.nix; - patches = [ ./ghcjs-head.patch ]; + patches = [ ./boot.patch ]; } diff --git a/pkgs/development/compilers/ghcjs/head_shims.nix b/pkgs/development/compilers/ghcjs/8.0/shims.nix index a9a7f8d45e27..a9a7f8d45e27 100644 --- a/pkgs/development/compilers/ghcjs/head_shims.nix +++ b/pkgs/development/compilers/ghcjs/8.0/shims.nix diff --git a/pkgs/development/compilers/ghcjs/head_stage2.nix b/pkgs/development/compilers/ghcjs/8.0/stage2.nix index 18c7a76dd3af..18c7a76dd3af 100644 --- a/pkgs/development/compilers/ghcjs/head_stage2.nix +++ b/pkgs/development/compilers/ghcjs/8.0/stage2.nix diff --git a/pkgs/development/compilers/ghcjs/base.nix b/pkgs/development/compilers/ghcjs/base.nix index 46e9d8d72bed..93e6a47934fc 100644 --- a/pkgs/development/compilers/ghcjs/base.nix +++ b/pkgs/development/compilers/ghcjs/base.nix @@ -37,57 +37,23 @@ , coreutils , libiconv -, version ? "0.2.0" -, ghcjsSrc ? fetchFromGitHub { - owner = "ghcjs"; - repo = "ghcjs"; - rev = "689c7753f50353dd05606ed79c51cd5a94d3922a"; - sha256 = "076020a9gjv8ldj5ckm43sbzq9s6c5xj6lpd8v28ybpiama3m6b4"; - } -, ghcjsBootSrc ? fetchgit { - url = git://github.com/ghcjs/ghcjs-boot.git; - rev = "8c549931da27ba9e607f77195208ec156c840c8a"; - sha256 = "0yg9bnabja39qysh9pg1335qbvbc0r2mdw6cky94p7kavacndfdv"; - fetchSubmodules = true; - } +, version +, ghcjsSrc +, ghcjsBootSrc , ghcjsBoot ? import ./ghcjs-boot.nix { inherit runCommand; src = ghcjsBootSrc; } -, shims ? import ./shims.nix { inherit fetchFromGitHub; } +, shims # This is the list of the Stage 1 packages that are built into a booted ghcjs installation # It can be generated with the command: # nix-shell -p haskell.packages.ghcjs.ghc --command "ghcjs-pkg list | sed -n 's/^ \(.*\)-\([0-9.]*\)$/\1_\2/ p' | sed 's/\./_/g' | sed 's/^\([^_]*\)\(.*\)$/ \"\1\"/'" -, stage1Packages ? [ - "array" - "base" - "binary" - "bytestring" - "containers" - "deepseq" - "directory" - "filepath" - "ghc-boot" - "ghc-boot-th" - "ghc-prim" - "ghci" - "ghcjs-prim" - "ghcjs-th" - "integer-gmp" - "pretty" - "primitive" - "process" - "rts" - "template-haskell" - "time" - "transformers" - "unix" - ] +, stage1Packages , stage2 ? import ./stage2.nix -, patches ? [ ./ghcjs.patch ] +, patches # used for resolving compiler plugins , ghcLibdir ? null @@ -167,6 +133,7 @@ in mkDerivation (rec { ''; passthru = { inherit bootPkgs; + ghcVersion = ghc.version; isCross = true; isGhcjs = true; inherit nodejs ghcjsBoot; diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix deleted file mode 100644 index 7f3cc9440015..000000000000 --- a/pkgs/development/compilers/ghcjs/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ bootPkgs, cabal-install }: - -bootPkgs.callPackage ./base.nix { - inherit bootPkgs cabal-install; -} diff --git a/pkgs/development/compilers/mentor/default.nix b/pkgs/development/compilers/mentor/default.nix index 7cd3c1793661..4f09df7f2ea0 100644 --- a/pkgs/development/compilers/mentor/default.nix +++ b/pkgs/development/compilers/mentor/default.nix @@ -10,7 +10,7 @@ let stdenv.mkDerivation rec { inherit name src; - buildInputs = [ patchelf ]; + nativeBuildInputs = [ patchelf ]; buildCommand = '' # Unpack tarball diff --git a/pkgs/development/compilers/mint/default.nix b/pkgs/development/compilers/mint/default.nix index 2896c0c09139..de7e3bd6a07e 100644 --- a/pkgs/development/compilers/mint/default.nix +++ b/pkgs/development/compilers/mint/default.nix @@ -1,9 +1,9 @@ # Updating the dependencies for this package: # -# wget https://github.com/mint-lang/mint/blob/0.2.1/shard.lock +# wget https://raw.githubusercontent.com/mint-lang/mint/0.3.1/shard.lock # nix-shell -p crystal libyaml --run 'crystal run crystal2nix.cr' # -{stdenv, lib, fetchFromGitHub, crystal, zlib, openssl, duktape, which }: +{stdenv, lib, fetchFromGitHub, crystal, zlib, openssl, duktape, which, libyaml }: let crystalPackages = lib.mapAttrs (name: src: stdenv.mkDerivation { @@ -33,17 +33,16 @@ let }; in stdenv.mkDerivation rec { - version = "0.2.1"; + version = "0.3.1"; name = "mint-${version}"; src = fetchFromGitHub { owner = "mint-lang"; repo = "mint"; rev = version; - sha256 = "0r8hv2j5yz0rlvrbpnybihj44562pkmsssa8f0hjs45m1ifvf4b1"; + sha256 = "1f49ax045zdjj0ypc2j4ms9gx80rl63qcsfzm3r0k0lcavfp57zr"; }; - nativeBuildInputs = [ which ]; - buildInputs = [ crystal zlib openssl duktape ]; + nativeBuildInputs = [ which crystal zlib openssl duktape libyaml ]; buildPhase = '' mkdir -p $out/bin tmp diff --git a/pkgs/development/compilers/mint/shards.nix b/pkgs/development/compilers/mint/shards.nix index 069df52ba12d..fbf85ef80426 100644 --- a/pkgs/development/compilers/mint/shards.nix +++ b/pkgs/development/compilers/mint/shards.nix @@ -8,8 +8,8 @@ ameba = { owner = "veelenga"; repo = "ameba"; - rev = "v0.7.0"; - sha256 = "01h0a1ba5l254r04mgkqhjdfn21cs0q7fmvk4gj35cj5lpr2bp17"; + rev = "v0.8.0"; + sha256 = "0i9vc5xy05kzxgjid2rnvc7ksvxm9gba25qqi6939q2m1s07qjka"; }; baked_file_system = { owner = "schovi"; diff --git a/pkgs/development/compilers/mlton/default.nix b/pkgs/development/compilers/mlton/default.nix index 6b6907b0b2e6..0b991e22fa98 100644 --- a/pkgs/development/compilers/mlton/default.nix +++ b/pkgs/development/compilers/mlton/default.nix @@ -38,7 +38,8 @@ stdenv.mkDerivation rec { sourceRoot = name; - buildInputs = [ gmp ] ++ stdenv.lib.optional stdenv.isLinux patchelf; + buildInputs = [ gmp ]; + nativeBuildInputs = stdenv.lib.optional stdenv.isLinux patchelf; makeFlags = [ "all-no-docs" ]; diff --git a/pkgs/development/compilers/opendylan/bin.nix b/pkgs/development/compilers/opendylan/bin.nix index 9b721312bb78..e11bb7251a60 100644 --- a/pkgs/development/compilers/opendylan/bin.nix +++ b/pkgs/development/compilers/opendylan/bin.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { } else throw "platform ${stdenv.hostPlatform.system} not supported."; - buildInputs = [ patchelf boehmgc gnused makeWrapper ]; + nativeBuildInputs = [ patchelf boehmgc gnused makeWrapper ]; buildCommand = '' mkdir -p "$out" diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix index 8a20066becb7..2d6c060e89e0 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.6"; + name = "scala-2.12.7"; src = fetchurl { url = "https://www.scala-lang.org/files/archive/${name}.tgz"; - sha256 = "05ili2959yrshqi44wpmwy0dyfm4kvp6i8mlbnj1xvc5b9649iqs"; + sha256 = "116i6sviziynbm7yffakkcnzb2jmrhvjrnbqbbnhyyi806shsnyn"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/zig/default.nix b/pkgs/development/compilers/zig/default.nix index 44d1f7bfe4a2..fd95635616fc 100644 --- a/pkgs/development/compilers/zig/default.nix +++ b/pkgs/development/compilers/zig/default.nix @@ -1,30 +1,23 @@ -{ stdenv, fetchFromGitHub, cmake, llvmPackages, libxml2 }: +{ stdenv, fetchFromGitHub, cmake, llvmPackages, libxml2, zlib }: stdenv.mkDerivation rec { - version = "0.2.0"; + version = "0.3.0"; name = "zig-${version}"; src = fetchFromGitHub { - owner = "zig-lang"; + owner = "ziglang"; repo = "zig"; rev = "${version}"; - sha256 = "0lym28z9mj6hfiq78x1fsd8y89h8xyfc1jgqyazi1g9r72427n07"; + sha256 = "089ywagxjjh7gxv8h8yg7jpmryzjf7n4m5irhdkhp2966d03kyxm"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ llvmPackages.clang-unwrapped llvmPackages.llvm libxml2 ]; + buildInputs = [ llvmPackages.clang-unwrapped llvmPackages.llvm libxml2 zlib ]; cmakeFlags = [ - "-DZIG_LIBC_INCLUDE_DIR=${stdenv.cc.libc_dev}/include" - "-DZIG_LIBC_LIB_DIR=${stdenv.cc.libc}/lib" "-DCMAKE_BUILD_TYPE=Release" - "-DZIG_EACH_LIB_RPATH=On" ]; - preConfigure = '' - cmakeFlags="$cmakeFlags -DZIG_LIBC_STATIC_LIB_DIR=$(dirname $(cc -print-file-name=crtbegin.o)) -DZIG_DYNAMIC_LINKER=$(cc -print-file-name=ld-linux-x86-64.so.2)" - ''; - meta = with stdenv.lib; { description = "Programming languaged designed for robustness, optimality, and clarity"; homepage = https://ziglang.org/; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 8beca9572e7e..40bd4a7f0c9a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -86,7 +86,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "1y56dlhx3azny5hzixn9x4kmzzpmakzyvw45qk8x4ffsc7jqq5bs"; + sha256 = "09rhss1s6gxmqvb8k2l0f55mv38igyvikmm6d07zxkw6049q3maz"; }; }).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; @@ -999,6 +999,9 @@ self: super: { ''; }); + # https://github.com/haskell-rewriting/term-rewriting/issues/11 + term-rewriting = dontCheck (doJailbreak super.term-rewriting); + # https://github.com/nick8325/twee/pull/1 twee-lib = dontHaddock super.twee-lib; @@ -1150,4 +1153,10 @@ self: super: { }; }; + # https://github.com/kcsongor/generic-lens/pull/60 + generic-lens = appendPatch super.generic-lens (pkgs.fetchpatch { + url = https://github.com/kcsongor/generic-lens/commit/d9af1ec22785d6c21e928beb88fc3885c6f05bed.patch; + sha256 = "0ljwcha9l52gs5bghxq3gbzxfqmfz3hxxcg9arjsjw8f7kw946xq"; + }); + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index b49b9cea60bb..dbe3bafc41b3 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -46,11 +46,21 @@ self: super: { # LTS-12.x versions do not compile. contravariant = self.contravariant_1_5; + control-monad-free = markBrokenVersion "0.6.1" super.control-monad-free; doctest = self.doctest_0_16_0_1; + doctest_0_16_0_1 = dontCheck super.doctest_0_16_0_1; + Glob = self.Glob_0_9_3; + haddock-library = markBroken super.haddock-library; + hslogger = self.hslogger_1_2_12; + hspec = self.hspec_2_5_7; hspec-core = self.hspec-core_2_5_7; hspec-core_2_5_7 = super.hspec-core_2_5_7.overrideScope (self: super: { QuickCheck = self.QuickCheck_2_12_4; }); + hspec-discover = self.hspec-discover_2_5_7; hspec-meta = self.hspec-meta_2_5_6; hspec-meta_2_5_6 = super.hspec-meta_2_5_6.overrideScope (self: super: { QuickCheck = self.QuickCheck_2_12_4; }); + JuicyPixels = self.JuicyPixels_3_3_1; + lens = dontCheck super.lens; # avoid depending on broken polyparse + polyparse = markBrokenVersion "1.12" super.polyparse; primitive = self.primitive_0_6_4_0; tagged = self.tagged_0_8_6; unordered-containers = dontCheck super.unordered-containers; @@ -62,8 +72,17 @@ self: super: { hashable-time = doJailbreak super.hashable-time; # base >=4.7 && <4.12 integer-logarithms = doJailbreak super.integer-logarithms; # base >=4.3 && <4.12 optparse-applicative = doJailbreak super.optparse-applicative; # https://github.com/pcapriotti/optparse-applicative/issues/319 - polyparse = markBrokenVersion "1.12" super.polyparse; # version 1.12 fails to compile tar = doJailbreak super.tar; # containers >=0.2 && <0.6 test-framework = doJailbreak super.test-framework; # containers >=0.1 && <0.6 + # https://github.com/haskell/fgl/issues/79 + # https://github.com/haskell/fgl/issues/81 + fgl = appendPatch super.fgl ./patches/fgl-monad-fail.patch; + + # https://github.com/jgm/texmath/pull/121 + texmath = appendPatch (doJailbreak super.texmath) (pkgs.fetchpatch + { url = https://github.com/jgm/texmath/pull/121.patch; + sha256 = "14pz2cpz9rvmy7mlmnz8iz76rsdyv5v442ij2i8k9zrbxj6nai7l"; + }); + } diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 1007be349fc9..93e36fa78890 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2770,6 +2770,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ChasingBottoms_1_3_1_5" = callPackage + ({ mkDerivation, array, base, containers, mtl, QuickCheck, random + , syb + }: + mkDerivation { + pname = "ChasingBottoms"; + version = "1.3.1.5"; + sha256 = "0hfk2cb9da5fvr96x8lzij93yl3rvax2id9a8gihd5j5aq4kxx30"; + 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 { @@ -4998,10 +5017,8 @@ self: { }: mkDerivation { pname = "Euterpea"; - version = "2.0.5"; - sha256 = "186r8a2829sqx4l6n80vifc7g8b5ap66jl3hnqdwzg7s2c0r9saq"; - revision = "1"; - editedCabalFile = "1fy3f610i8nwfipfm1dxgb8807k1vix9d65rgn59k579390xfvw8"; + version = "2.0.6"; + sha256 = "0smaa34s0yz90q4qx104glyx8s93k6vn6r60m6aq9infm7rkffxw"; libraryHaskellDepends = [ array arrows base bytestring containers deepseq ghc-prim HCodecs heap PortMidi random stm @@ -5432,6 +5449,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Fin_0_2_6_0" = callPackage + ({ mkDerivation, alg, base, foldable1, natural-induction, peano + , universe-base + }: + mkDerivation { + pname = "Fin"; + version = "0.2.6.0"; + sha256 = "18qc3ih3l9zd13knxxsh657iq3c742pfaz4i45bq1ir60qwjqmhw"; + libraryHaskellDepends = [ + alg base foldable1 natural-induction peano universe-base + ]; + description = "Finite totally-ordered sets"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Finance-Quote-Yahoo" = callPackage ({ mkDerivation, base, bytestring, http-conduit, network , old-locale, time @@ -13138,8 +13171,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "NoTrace"; - version = "0.3.0.2"; - sha256 = "0nqjjhfycvalva0l660cxgqj793kcsyb75rd3dlp58d2i947isir"; + version = "0.3.0.3"; + sha256 = "0cdva0d5xp0fw4jfwmhaz8m4pm1d00wazg32hcqjli4blc9s1hvf"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Remove all the functions come from Debug.Trace after debugging"; @@ -13601,6 +13634,8 @@ self: { pname = "OneTuple"; version = "0.2.2"; sha256 = "1p14cvjk3rgfc0xxcn7ffaajd2ii1ljnlayil2yyzgdwhlj70bnq"; + revision = "1"; + editedCabalFile = "07jd23glblzmnlw7sn565sk9gm7vj9h459j46bkbcrrxnp0n0myq"; libraryHaskellDepends = [ base ]; description = "Singleton Tuple"; license = stdenv.lib.licenses.bsd3; @@ -21529,22 +21564,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "aeson_1_4_0_0" = callPackage + "aeson_1_4_1_0" = callPackage ({ mkDerivation, attoparsec, base, base-compat, base-orphans , base16-bytestring, bytestring, containers, deepseq, directory , dlist, filepath, generic-deriving, ghc-prim, hashable - , hashable-time, integer-logarithms, QuickCheck + , hashable-time, integer-logarithms, primitive, QuickCheck , quickcheck-instances, scientific, tagged, tasty, tasty-hunit , tasty-quickcheck, template-haskell, text, th-abstraction, time , time-locale-compat, unordered-containers, uuid-types, vector }: mkDerivation { pname = "aeson"; - version = "1.4.0.0"; - sha256 = "042phqkabjrlrl3azr3ba9q7naz4c2cjl5nplbfz8iidpf6j0sli"; + version = "1.4.1.0"; + sha256 = "1mf29mxdqkpgbvqx1acbbv75wpzhwpnnf4iapmm5v3zg2k7g3hyi"; + revision = "1"; + editedCabalFile = "12zvcm121dc0fpyzm1wr0b9k5lwyca298vgvf192sp2dykxkj9m7"; libraryHaskellDepends = [ attoparsec base base-compat bytestring containers deepseq dlist - ghc-prim hashable scientific tagged template-haskell text + ghc-prim hashable primitive scientific tagged template-haskell text th-abstraction time time-locale-compat unordered-containers uuid-types vector ]; @@ -21674,6 +21711,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "aeson-compat_0_3_9" = callPackage + ({ mkDerivation, aeson, attoparsec, attoparsec-iso8601, base + , base-compat, base-orphans, bytestring, containers, exceptions + , hashable, QuickCheck, quickcheck-instances, scientific, tagged + , tasty, tasty-hunit, tasty-quickcheck, text, time + , time-locale-compat, unordered-containers, vector + }: + mkDerivation { + pname = "aeson-compat"; + version = "0.3.9"; + sha256 = "1j13gykv4ryvmr14w5blz0nnpdb4p0hpa27wahw3mhb1lwdr8hz0"; + libraryHaskellDepends = [ + aeson attoparsec attoparsec-iso8601 base base-compat bytestring + containers exceptions hashable scientific tagged text time + time-locale-compat unordered-containers vector + ]; + testHaskellDepends = [ + aeson attoparsec base base-compat base-orphans bytestring + containers exceptions hashable QuickCheck quickcheck-instances + scientific tagged tasty tasty-hunit tasty-quickcheck text time + time-locale-compat unordered-containers vector + ]; + description = "Compatibility layer for aeson"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "aeson-decode" = callPackage ({ mkDerivation, aeson, aeson-qq, base, containers, data-default , hedgehog, text, time, unordered-containers, vector @@ -21751,8 +21815,8 @@ self: { pname = "aeson-extra"; version = "0.4.1.1"; sha256 = "1y7xss382hdxrv4jzprsm3b7ij7wiw8jgjg9wp49dx6bfvcnb2nl"; - revision = "1"; - editedCabalFile = "14blp4jmcd81ipxany6q7x706xj8fhy019a73c391n767r1nwpq1"; + revision = "2"; + editedCabalFile = "1iiibpr8pcdr0bjp0rhf1sxvs0kv66jm01nwlhj4243864qx476r"; libraryHaskellDepends = [ aeson aeson-compat attoparsec attoparsec-iso8601 base base-compat-batteries bytestring containers deepseq exceptions @@ -22274,16 +22338,17 @@ self: { "affection" = callPackage ({ mkDerivation, base, bytestring, clock, containers, glib, linear , monad-loops, monad-parallel, mtl, OpenGL, sdl2, stm, text, uuid + , vector }: mkDerivation { pname = "affection"; - version = "0.0.0.7"; - sha256 = "0qnlh1ny4cysxzh45vsh1d49gk4kc2kzpdjrqnn3mh66wz2fc177"; + version = "0.0.0.9"; + sha256 = "0knb8j96nn2gh1dbyavcqi6wnn8rfvw0lmmw3vk2mbalxlzfvznr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring clock containers glib linear monad-loops - monad-parallel mtl OpenGL sdl2 stm text uuid + monad-parallel mtl OpenGL sdl2 stm text uuid vector ]; description = "A simple Game Engine using SDL"; license = stdenv.lib.licenses.lgpl3; @@ -23361,6 +23426,8 @@ self: { pname = "alphachar"; version = "0.0.3"; sha256 = "1wrd881kwzzfnjkp9ajy1gaxizd17zb60f7sbalwg4n38lk7qvhx"; + revision = "1"; + editedCabalFile = "06pnq2fvz02i6dhx2rq1p63jp3pqvxy15n2vs6696ry5mkq1zjkc"; libraryHaskellDepends = [ base lens parsers semigroups ]; testHaskellDepends = [ ansi-wl-pprint base hedgehog lens parsec parsers pretty tasty @@ -28152,6 +28219,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {arbb_dev = null;}; + "arbor-lru-cache" = callPackage + ({ mkDerivation, base, containers, generic-lens, hedgehog, hspec + , hw-hspec-hedgehog, lens, stm + }: + mkDerivation { + pname = "arbor-lru-cache"; + version = "0.1.1.0"; + sha256 = "0npyc9knih4qpxayz6wpsgw83rlv4bdw6d2jksrsh7rdxhidyiwg"; + libraryHaskellDepends = [ base containers generic-lens lens stm ]; + testHaskellDepends = [ + base containers generic-lens hedgehog hspec hw-hspec-hedgehog lens + stm + ]; + license = stdenv.lib.licenses.mit; + }) {}; + "arbor-postgres" = callPackage ({ mkDerivation, base, bytestring, generic-lens, lens, network-uri , optparse-applicative, postgresql-simple, text @@ -29144,41 +29227,40 @@ self: { }) {}; "asif" = callPackage - ({ mkDerivation, arbor-ip, attoparsec, base, binary, bytestring - , conduit, conduit-combinators, conduit-extra, containers, cpu - , directory, either, exceptions, generic-lens, hedgehog, hspec - , hw-bits, hw-hspec-hedgehog, iproute, lens, old-locale + ({ mkDerivation, attoparsec, base, binary, bytestring, conduit + , conduit-combinators, conduit-extra, containers, cpu, directory + , either, exceptions, generic-lens, hedgehog, hspec, hw-bits + , hw-hspec-hedgehog, hw-ip, iproute, lens, old-locale , optparse-applicative, resourcet, temporary-resourcet, text, thyme , vector }: mkDerivation { pname = "asif"; - version = "2.0.0"; - sha256 = "1wp3g3nmymw9zkfyhi2jc7qqcb14v9pp788xg77acsx4i83ca5fm"; + version = "3.0.0"; + sha256 = "01ic071i7cgc888xqdjjq3srihnjxcqx33f9m97ilsp7dxi7a03q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ attoparsec base binary bytestring conduit conduit-combinators conduit-extra containers cpu either exceptions generic-lens hw-bits - iproute lens old-locale resourcet temporary-resourcet text thyme - vector + hw-ip iproute lens old-locale resourcet temporary-resourcet text + thyme vector ]; executableHaskellDepends = [ attoparsec base binary bytestring conduit conduit-combinators conduit-extra containers cpu directory either exceptions - generic-lens hw-bits iproute lens old-locale optparse-applicative - resourcet temporary-resourcet text thyme vector + generic-lens hw-bits hw-ip iproute lens old-locale + optparse-applicative resourcet temporary-resourcet text thyme + vector ]; testHaskellDepends = [ - arbor-ip attoparsec base binary bytestring conduit - conduit-combinators conduit-extra containers cpu either exceptions - generic-lens hedgehog hspec hw-bits hw-hspec-hedgehog iproute lens + attoparsec base binary bytestring conduit conduit-combinators + conduit-extra containers cpu either exceptions generic-lens + hedgehog hspec hw-bits hw-hspec-hedgehog hw-ip iproute lens old-locale resourcet temporary-resourcet text thyme vector ]; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {arbor-ip = null;}; + }) {}; "asil" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers @@ -29426,6 +29508,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) assimp;}; + "assoc-list" = callPackage + ({ mkDerivation, base, contravariant, doctest, hedgehog }: + mkDerivation { + pname = "assoc-list"; + version = "0.1.0.0"; + sha256 = "13n847aypm39djgpyrkr428y11xj7glpwavp5qxfd49n93ii8zy3"; + libraryHaskellDepends = [ base contravariant ]; + testHaskellDepends = [ base contravariant doctest hedgehog ]; + description = "Association lists (lists of tuples)"; + license = stdenv.lib.licenses.mit; + }) {}; + + "assoc-listlike" = callPackage + ({ mkDerivation, base, contravariant, doctest, hedgehog, ListLike + }: + mkDerivation { + pname = "assoc-listlike"; + version = "0.1.0.0"; + sha256 = "0nph5yvawxk1afnlqm0vizg8dv53wl1cziqqnnlqgv45yimp4fbz"; + libraryHaskellDepends = [ base contravariant ListLike ]; + testHaskellDepends = [ base contravariant doctest hedgehog ]; + description = "Association lists (list-like collections of tuples)"; + license = stdenv.lib.licenses.mit; + }) {}; + "ast-monad" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -30122,8 +30229,8 @@ self: { }: mkDerivation { pname = "ats-format"; - version = "0.2.0.29"; - sha256 = "02zk3qbg2h14wc5x7sizllgj39zprgx63j8rbf2lk9nd3yiqc4va"; + version = "0.2.0.30"; + sha256 = "19i3g3njmmhkhyx02q37r7n373n6h0yha6g5hrx0ix5nn8bp4k4w"; isLibrary = false; isExecutable = true; setupHaskellDepends = [ base Cabal cli-setup filepath ]; @@ -30245,8 +30352,8 @@ self: { }: mkDerivation { pname = "atto-lisp"; - version = "0.2.2.2"; - sha256 = "0rh01bxqsny73b4dgssv87flq9asjd5z6cyba3gqmvp3hvlcvfi4"; + version = "0.2.2.3"; + sha256 = "00a7w4jysx55y5xxmgm09akvhxxa3fs68wqn6mp789bvhvdk9khd"; libraryHaskellDepends = [ attoparsec base blaze-builder blaze-textual bytestring containers deepseq text @@ -30453,6 +30560,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "attoparsec-iso8601_1_0_1_0" = callPackage + ({ mkDerivation, attoparsec, base, base-compat, text, time }: + mkDerivation { + pname = "attoparsec-iso8601"; + version = "1.0.1.0"; + sha256 = "0hj10w15qp2z5bz2v4xahhmbgzclpyfi5l2sv97wqycysg9gp7s9"; + libraryHaskellDepends = [ attoparsec base base-compat text time ]; + description = "Parsing of ISO 8601 dates, originally from aeson"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "attoparsec-iteratee" = callPackage ({ mkDerivation, attoparsec, base, bytestring, iteratee , transformers @@ -31108,8 +31227,8 @@ self: { pname = "avers"; version = "0.0.17.1"; sha256 = "1x96fvx0z7z75c39qcggw70qvqnw7kzjf0qqxb3jwg3b0fmdhi8v"; - revision = "22"; - editedCabalFile = "040kvq16wknnjq0kr5j6y17xvjfh87y22hska3whs3ci6zw1fr30"; + revision = "24"; + editedCabalFile = "02n8p020d3p52ddsh38w5ih9kmx7qlp7axvxanli945fybjb2m5b"; libraryHaskellDepends = [ aeson attoparsec base bytestring clock containers cryptonite filepath inflections memory MonadRandom mtl network network-uri @@ -31979,28 +32098,29 @@ self: { "axel" = callPackage ({ mkDerivation, base, bytestring, directory, filepath - , haskell-src-exts, hedgehog, lens, lens-aeson, mtl - , optparse-applicative, parsec, process, regex-pcre, split, strict - , tasty, tasty-discover, tasty-golden, tasty-hedgehog, tasty-hspec - , template-haskell, text, transformers, typed-process, vector, yaml + , freer-simple, haskell-src-exts, hedgehog, lens, lens-aeson + , optparse-applicative, parsec, process, regex-pcre, singletons + , split, strict, tasty, tasty-discover, tasty-golden + , tasty-hedgehog, tasty-hspec, template-haskell, text, transformers + , typed-process, vector, yaml }: mkDerivation { pname = "axel"; - version = "0.0.5"; - sha256 = "0xkkb78wjggv5vnrzxgfxfirsfzazdbhjsb8bg9xsl9jgafbz6fq"; - revision = "1"; - editedCabalFile = "0cyygds6277zbm01b8x7sx700c83z20hdimlnk4wzhm1v2zya3a4"; + version = "0.0.6"; + sha256 = "17601gv4rjdxmg2qqp2y9b5lk9ia0z1izhympmwf6zs7wkjs6fyh"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base bytestring directory filepath haskell-src-exts lens lens-aeson - mtl optparse-applicative parsec process regex-pcre strict text - transformers typed-process vector yaml + base bytestring directory filepath freer-simple haskell-src-exts + lens lens-aeson optparse-applicative parsec process regex-pcre + singletons strict text typed-process vector yaml + ]; + executableHaskellDepends = [ + base freer-simple optparse-applicative ]; - executableHaskellDepends = [ base mtl optparse-applicative ]; testHaskellDepends = [ - base bytestring filepath hedgehog lens mtl split tasty + base bytestring filepath freer-simple hedgehog lens split tasty tasty-discover tasty-golden tasty-hedgehog tasty-hspec template-haskell transformers ]; @@ -33035,8 +33155,8 @@ self: { pname = "base64-bytestring-type"; version = "1"; sha256 = "0h74c0qhf4n0pamrl29ha5hgf940bay0dhl8rifaw4l03z8rn0bl"; - revision = "3"; - editedCabalFile = "18p6iz3b73qyf76azhfpcpgsc1fb2qhv889l0cj1niqlyp7kw69s"; + revision = "4"; + editedCabalFile = "0yfhy4a9n67l9w3amqrzzy79q47yyj6qbv5i5lqym5z7ygwmlzn6"; libraryHaskellDepends = [ aeson base base-compat base64-bytestring binary bytestring cereal deepseq hashable QuickCheck text @@ -34773,8 +34893,8 @@ self: { pname = "binary-orphans"; version = "0.1.8.0"; sha256 = "1k6067wn9zki7xvbslvxx8cq1wrmz3kjb3q3x8mxycc9v765fxgi"; - revision = "4"; - editedCabalFile = "1hsp8y26g51rjskmgfkgmggzpdg5y30sv8g7rb3id9r43w37zj1q"; + revision = "5"; + editedCabalFile = "1dny1jvwwcyrbzhqvymmn6n7ib48bpy0nasbrcrdrpzjypkmg500"; libraryHaskellDepends = [ aeson base binary case-insensitive hashable scientific tagged text text-binary time unordered-containers vector @@ -35006,6 +35126,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "binary-tagged_0_1_5_1" = callPackage + ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors + , binary, binary-orphans, bytestring, containers, criterion + , deepseq, generics-sop, hashable, nats, quickcheck-instances + , scientific, semigroups, SHA, tagged, tasty, tasty-quickcheck + , text, time, unordered-containers, vector + }: + mkDerivation { + pname = "binary-tagged"; + version = "0.1.5.1"; + sha256 = "196msm7v0r41d7gx8aghl0c1gvir60sf0w9sfpcz2dq9akzqzjvh"; + libraryHaskellDepends = [ + aeson array base base16-bytestring binary bytestring containers + generics-sop hashable scientific SHA tagged text time + unordered-containers vector + ]; + testHaskellDepends = [ + aeson array base base16-bytestring bifunctors binary binary-orphans + bytestring containers generics-sop hashable quickcheck-instances + scientific SHA tagged tasty tasty-quickcheck text time + unordered-containers vector + ]; + benchmarkHaskellDepends = [ + aeson array base base16-bytestring binary binary-orphans bytestring + containers criterion deepseq generics-sop hashable nats scientific + semigroups SHA tagged text time unordered-containers vector + ]; + description = "Tagged binary serialisation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "binary-tree" = callPackage ({ mkDerivation, base, ChasingBottoms, checkers, criterion, deepseq , doctest, ghc-prim, HUnit, QuickCheck, random, test-framework @@ -37430,6 +37582,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "blaze-markup_0_8_2_2" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit + , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text + }: + mkDerivation { + pname = "blaze-markup"; + version = "0.8.2.2"; + sha256 = "1qc2mn2zb2sdj3xvv73asibqnb11l7b5l30ff05qrfh7sy7wzw66"; + libraryHaskellDepends = [ base blaze-builder bytestring text ]; + testHaskellDepends = [ + base blaze-builder bytestring containers HUnit QuickCheck tasty + tasty-hunit tasty-quickcheck text + ]; + description = "A blazingly fast markup combinator library for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "blaze-shields" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, blaze-svg, text }: mkDerivation { @@ -38516,6 +38686,8 @@ self: { pname = "boring"; version = "0.1"; sha256 = "0r263cc8bdwsaw33x96fgd8npsma9a2ffv6mfz9z72d7qclhimkk"; + revision = "1"; + editedCabalFile = "0hdvr4rkkj2mapqha335rhncfmrw70qzjmfis2w9l4iqx617fv9m"; libraryHaskellDepends = [ adjunctions base base-compat constraints fin generics-sop streams tagged transformers transformers-compat vec @@ -38624,6 +38796,8 @@ self: { pname = "bound-extras"; version = "0"; sha256 = "0j010sbdm0bc9dq4lsyw1vb2x0j6gcjxp7ywjn8izdh6yqr2r3qq"; + revision = "1"; + editedCabalFile = "0qcxcpn8hdmkg3mqz80i0j9jrym2pk11k5hyjhqbmrqlhf3fr7qw"; libraryHaskellDepends = [ base bound deepseq hashable transformers ]; @@ -38919,7 +39093,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "brick_0_41_1" = callPackage + "brick_0_41_2" = callPackage ({ mkDerivation, base, config-ini, containers, contravariant , data-clist, deepseq, dlist, microlens, microlens-mtl , microlens-th, QuickCheck, stm, template-haskell, text @@ -38927,8 +39101,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.41.1"; - sha256 = "1sgxw18n3261gz0yfpig3p9vi84b2rlrsdkmvn5az26qrwrycqfd"; + version = "0.41.2"; + sha256 = "04b4gyzb0c66idl19k0v3g9z48bcii728ivbpvm8zjkzq2m2hqix"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -39169,19 +39343,21 @@ self: { pname = "broadcast-chan"; version = "0.1.1"; sha256 = "1wl5x7qi00z7q9k6rbmzszzbrqycfcpg04a1ikrnvzqs61ddcnxd"; + revision = "1"; + editedCabalFile = "03bmddz9bryh3viskh2nldj4hbzl5b9xkkx2pml73vq9bn2aq5s4"; libraryHaskellDepends = [ base ]; description = "Broadcast channel type that avoids 0 reader space leaks"; license = stdenv.lib.licenses.bsd3; }) {}; - "broadcast-chan_0_2_0" = callPackage + "broadcast-chan_0_2_0_1" = callPackage ({ mkDerivation, async, base, criterion, deepseq, stm , unliftio-core }: mkDerivation { pname = "broadcast-chan"; - version = "0.2.0"; - sha256 = "1hpc7hi7xbzc03391byxgyinknsdgsd0dgsvs7m7g3jdpdckw5g7"; + version = "0.2.0.1"; + sha256 = "0kbs3yz53x7117fykapy70qlmaxkj9zr5r4n9wf126n4g0i6gcpf"; libraryHaskellDepends = [ base unliftio-core ]; benchmarkHaskellDepends = [ async base criterion deepseq stm ]; description = "Closable, fair, single-wakeup channel type that avoids 0 reader space leaks"; @@ -39195,8 +39371,8 @@ self: { }: mkDerivation { pname = "broadcast-chan-conduit"; - version = "0.2.0"; - sha256 = "020g2lrhp27dp5hyq23dhypxlmlymf6alw9jc5nwp4xv3992kfzx"; + version = "0.2.0.1"; + sha256 = "0q3kikryj38macxnwmlk6xijcmvxys0acryj419n7749n7bpc59s"; libraryHaskellDepends = [ base broadcast-chan conduit resourcet transformers unliftio-core ]; @@ -39214,8 +39390,8 @@ self: { }: mkDerivation { pname = "broadcast-chan-pipes"; - version = "0.2.0"; - sha256 = "04p9h3wzx4qv00yl1hfrxyhl5rylhxn1psfvkppdz5in2h88a7f7"; + version = "0.2.0.1"; + sha256 = "0m2g14rlqladhwfvphmnpsddlbc5bhsjdsb4a9r475vkib30gdp2"; libraryHaskellDepends = [ base broadcast-chan pipes pipes-safe ]; testHaskellDepends = [ base broadcast-chan-tests containers foldl pipes pipes-safe @@ -39233,8 +39409,8 @@ self: { }: mkDerivation { pname = "broadcast-chan-tests"; - version = "0.2.0"; - sha256 = "1np0w4pv36hnifrklgybazhnwh4pfm73d7mx51p1flp9czaj0zz6"; + version = "0.2.0.1"; + sha256 = "1l3zqc693jmvxmb5lln6fmwn01rjpwhvlllkrn3v6hs2bwibrp5n"; libraryHaskellDepends = [ async base broadcast-chan clock containers optparse-applicative paramtree stm tagged tasty tasty-golden tasty-hunit tasty-travis @@ -40292,6 +40468,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bytestring-builder_0_10_8_2_0" = callPackage + ({ mkDerivation, base, bytestring, deepseq }: + mkDerivation { + pname = "bytestring-builder"; + version = "0.10.8.2.0"; + sha256 = "0grcrgwwwcvwrs9az7l4d3kf0lsqfa9qpmjzf6iyanvwn9nyzyi7"; + libraryHaskellDepends = [ base bytestring deepseq ]; + doHaddock = false; + description = "The new bytestring builder, packaged outside of GHC"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bytestring-builder-varword" = callPackage ({ mkDerivation, attoparsec, attoparsec-varword, base, bytestring , hspec, QuickCheck @@ -40884,6 +41073,32 @@ self: { pname = "c2hs"; version = "0.28.5"; sha256 = "1xid997cc38rym6hsgv8xz5dg8jcsh8hs5rrwaxkij7mc09an45x"; + revision = "1"; + editedCabalFile = "1d6i1wr1kbn61yi7nk1scjfm2800vm2ynnx7555fjkdx4d8va711"; + isLibrary = false; + isExecutable = true; + enableSeparateDataOutput = true; + executableHaskellDepends = [ + array base bytestring containers directory dlist filepath + language-c pretty process + ]; + testHaskellDepends = [ + base filepath HUnit shelly test-framework test-framework-hunit text + transformers + ]; + description = "C->Haskell FFI tool that gives some cross-language type safety"; + license = stdenv.lib.licenses.gpl2; + }) {}; + + "c2hs_0_28_6" = callPackage + ({ mkDerivation, array, base, bytestring, containers, directory + , dlist, filepath, HUnit, language-c, pretty, process, shelly + , test-framework, test-framework-hunit, text, transformers + }: + mkDerivation { + pname = "c2hs"; + version = "0.28.6"; + sha256 = "1nplgxfin139x12sb656f5870rpdclrhzi8mq8pry035qld15pci"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -40897,6 +41112,7 @@ self: { ]; description = "C->Haskell FFI tool that gives some cross-language type safety"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "c2hs-extra" = callPackage @@ -42151,6 +42367,59 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cachix_0_1_2" = callPackage + ({ mkDerivation, async, base, base16-bytestring, base64-bytestring + , bifunctors, bytestring, cachix-api, conduit, conduit-extra + , cookie, cryptonite, dhall, directory, ed25519, filepath, fsnotify + , here, hspec, hspec-discover, http-client, http-client-tls + , http-conduit, http-types, lzma-conduit, megaparsec, memory + , mmorph, optparse-applicative, process, protolude, resourcet + , safe-exceptions, servant, servant-auth, servant-auth-client + , servant-client, servant-client-core, servant-streaming-client + , streaming, text, unix, uri-bytestring, versions + }: + mkDerivation { + pname = "cachix"; + version = "0.1.2"; + sha256 = "1pm2cjlllg1sq7vkig8lr9y1gsxa9w4h61rzq47w1mnhn476gv67"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base base16-bytestring base64-bytestring bifunctors + bytestring cachix-api conduit conduit-extra cookie cryptonite dhall + directory ed25519 filepath fsnotify here http-client + http-client-tls http-conduit http-types lzma-conduit megaparsec + memory mmorph optparse-applicative process protolude resourcet + safe-exceptions servant servant-auth servant-auth-client + servant-client servant-client-core servant-streaming-client + streaming text unix uri-bytestring versions + ]; + executableHaskellDepends = [ + async base base16-bytestring base64-bytestring bifunctors + bytestring cachix-api conduit conduit-extra cookie cryptonite dhall + directory ed25519 filepath fsnotify here http-client + http-client-tls http-conduit http-types lzma-conduit megaparsec + memory mmorph optparse-applicative process protolude resourcet + safe-exceptions servant servant-auth servant-auth-client + servant-client servant-client-core servant-streaming-client + streaming text unix uri-bytestring versions + ]; + executableToolDepends = [ hspec-discover ]; + testHaskellDepends = [ + async base base16-bytestring base64-bytestring bifunctors + bytestring cachix-api conduit conduit-extra cookie cryptonite dhall + directory ed25519 filepath fsnotify here hspec http-client + http-client-tls http-conduit http-types lzma-conduit megaparsec + memory mmorph optparse-applicative process protolude resourcet + safe-exceptions servant servant-auth servant-auth-client + servant-client servant-client-core servant-streaming-client + streaming text unix uri-bytestring versions + ]; + description = "Command line client for Nix binary cache hosting https://cachix.org"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cachix-api" = callPackage ({ mkDerivation, aeson, amazonka, base, base16-bytestring , bytestring, conduit, conduit-combinators, cookie, cryptonite @@ -42193,6 +42462,47 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "cachix-api_0_1_0_2" = callPackage + ({ mkDerivation, aeson, amazonka, base, base16-bytestring + , bytestring, conduit, cookie, cryptonite, hspec, hspec-discover + , http-api-data, http-media, lens, memory, protolude, servant + , servant-auth, servant-auth-server, servant-auth-swagger + , servant-streaming, servant-swagger, servant-swagger-ui-core + , string-conv, swagger2, text, transformers + }: + mkDerivation { + pname = "cachix-api"; + version = "0.1.0.2"; + sha256 = "0jqak93ixqzr76lm0mgn9fqfsmkz1ik41j5l629d3hbl7sah15gn"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson amazonka base base16-bytestring bytestring conduit cookie + cryptonite http-api-data http-media lens memory servant + servant-auth servant-auth-server servant-auth-swagger + servant-streaming servant-swagger servant-swagger-ui-core + string-conv swagger2 text transformers + ]; + executableHaskellDepends = [ + aeson amazonka base base16-bytestring bytestring conduit cookie + cryptonite http-api-data http-media lens memory servant + servant-auth servant-auth-server servant-auth-swagger + servant-streaming servant-swagger servant-swagger-ui-core + string-conv swagger2 text transformers + ]; + testHaskellDepends = [ + aeson amazonka base base16-bytestring bytestring conduit cookie + cryptonite hspec http-api-data http-media lens memory protolude + servant servant-auth servant-auth-server servant-auth-swagger + servant-streaming servant-swagger servant-swagger-ui-core + string-conv swagger2 text transformers + ]; + testToolDepends = [ hspec-discover ]; + description = "Servant HTTP API specification for https://cachix.org"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cacophony" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, base16-bytestring , bytestring, criterion, cryptonite, deepseq, directory, exceptions @@ -42845,8 +43155,8 @@ self: { }: mkDerivation { pname = "capnp"; - version = "0.2.0.0"; - sha256 = "06frfg1dl2cxbksy07pp9njfdgmyamyywd9wn2izpgixpxhv6d7d"; + version = "0.3.0.0"; + sha256 = "17i7m168bqp57m5lb04sbfh2amc1sicv2jajkl61jb1gsidwdkrz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -43609,18 +43919,15 @@ self: { }) {}; "cassava-megaparsec" = callPackage - ({ mkDerivation, base, bytestring, cassava, containers, hspec - , hspec-megaparsec, megaparsec, unordered-containers, vector + ({ mkDerivation, base, bytestring, cassava, hspec, hspec-megaparsec + , megaparsec, unordered-containers, vector }: mkDerivation { pname = "cassava-megaparsec"; - version = "1.0.0"; - sha256 = "14d1idyw4pm8gq41383sy6cid6v1dr9zc7wviy4vd786406j2n28"; - revision = "1"; - editedCabalFile = "0dk6bxyvlg0iq83m81cbyysiydcj3dsvhlishjc119hzpy8g8xd6"; + version = "2.0.0"; + sha256 = "0jwhvgfkgxpxp6cci9ahp3kryr4vaxbpqgjzf8ylr2592dm2irnf"; libraryHaskellDepends = [ - base bytestring cassava containers megaparsec unordered-containers - vector + base bytestring cassava megaparsec unordered-containers vector ]; testHaskellDepends = [ base bytestring cassava hspec hspec-megaparsec vector @@ -44131,8 +44438,8 @@ self: { }: mkDerivation { pname = "cdeps"; - version = "0.1.1.8"; - sha256 = "15a3sk4xsr9qz30chf4bzpkhp1s24vw30nhi0vibgshlminfbxv4"; + version = "0.1.2.2"; + sha256 = "1p2razfnqzg9ya421al80db3ag62gwx5l55l2hyw7ka617jpagyd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -44896,6 +45203,8 @@ self: { pname = "charset"; version = "0.3.7.1"; sha256 = "1gn0m96qpjww8hpp2g1as5yy0wcwy4iq73h3kz6g0yxxhcl5sh9x"; + revision = "1"; + editedCabalFile = "1z6nxw2g9vgsjq0g159sk8mwj68lwzxzi5iv5ynha0h85jcqxszy"; libraryHaskellDepends = [ array base bytestring containers semigroups unordered-containers ]; @@ -46602,6 +46911,36 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "classify-frog" = callPackage + ({ mkDerivation, array, audacity, base, bifunctors, Cabal, carray + , concurrent-split, containers, deepseq, explicit-exception, fft + , filemanip, gnuplot, hmatrix, hmm-hmatrix, lazy-csv, llvm-extra + , llvm-tf, non-empty, numeric-prelude, optparse-applicative + , parallel, pathtype, pooled-io, semigroups, soxlib + , storable-record, storablevector, storablevector-carray + , synthesizer-core, synthesizer-llvm, tagchup, text, time + , transformers, utility-ht, xml-basic + }: + mkDerivation { + pname = "classify-frog"; + version = "0.2.3"; + sha256 = "1fhiia335snb14nkvn3sglv0z7mkc7y5vj6jsaa8v9l72fwacz9a"; + isLibrary = false; + isExecutable = true; + enableSeparateDataOutput = true; + executableHaskellDepends = [ + array audacity base bifunctors Cabal carray concurrent-split + containers deepseq explicit-exception fft filemanip gnuplot hmatrix + hmm-hmatrix lazy-csv llvm-extra llvm-tf non-empty numeric-prelude + optparse-applicative parallel pathtype pooled-io semigroups soxlib + storable-record storablevector storablevector-carray + synthesizer-core synthesizer-llvm tagchup text time transformers + utility-ht xml-basic + ]; + description = "Classify sounds produced by Xenopus laevis"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "classy-influxdb-simple" = callPackage ({ mkDerivation, aeson, async-io-either, base, bytestring, lens , mtl, scientific, text, time, vector, wreq @@ -48153,6 +48492,40 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "co-log" = callPackage + ({ mkDerivation, ansi-terminal, base-noprelude, bytestring + , co-log-core, containers, contravariant, markdown-unlit, mtl + , relude, text, time, transformers, typerep-map + }: + mkDerivation { + pname = "co-log"; + version = "0.0.0"; + sha256 = "0bx45ffb1d7sdxcc7srx8sxb6qwjjs8gf90mnr3q1b76b2iczklp"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base-noprelude bytestring co-log-core containers + contravariant mtl relude text time transformers typerep-map + ]; + executableHaskellDepends = [ + base-noprelude relude text typerep-map + ]; + executableToolDepends = [ markdown-unlit ]; + description = "Logging library"; + license = stdenv.lib.licenses.mpl20; + }) {}; + + "co-log-core" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "co-log-core"; + version = "0.0.0"; + sha256 = "1xml4qbvjlgcqvh0kmgqm2wr50bzd252a40zpc84sk6kg8a3x734"; + libraryHaskellDepends = [ base ]; + description = "Logging library"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "coalpit" = callPackage ({ mkDerivation, base, generic-random, megaparsec, network-uri , scientific, tasty, tasty-quickcheck, tasty-travis, time @@ -49605,26 +49978,26 @@ self: { }) {}; "compdata" = callPackage - ({ mkDerivation, base, containers, criterion, deepseq, derive - , HUnit, mtl, QuickCheck, random, template-haskell, test-framework + ({ mkDerivation, base, containers, criterion, deepseq, HUnit, mtl + , QuickCheck, random, template-haskell, test-framework , test-framework-hunit, test-framework-quickcheck2, th-expand-syns , transformers, tree-view, uniplate }: mkDerivation { pname = "compdata"; - version = "0.11"; - sha256 = "1h8ri808zaggfi4n4anq8sdz76f8pij9p5g9wpf4w6zvcghg5jn4"; + version = "0.12"; + sha256 = "0b08mmj04bbi735hvvdbg1nmg66qg1c11r0kvq7m569r91bmy54v"; libraryHaskellDepends = [ - base containers deepseq derive mtl QuickCheck template-haskell + base containers deepseq mtl QuickCheck template-haskell th-expand-syns transformers tree-view ]; testHaskellDepends = [ - base containers deepseq derive HUnit mtl QuickCheck - template-haskell test-framework test-framework-hunit - test-framework-quickcheck2 th-expand-syns transformers + base containers deepseq HUnit mtl QuickCheck template-haskell + test-framework test-framework-hunit test-framework-quickcheck2 + th-expand-syns transformers ]; benchmarkHaskellDepends = [ - base containers criterion deepseq derive mtl QuickCheck random + base containers criterion deepseq mtl QuickCheck random template-haskell th-expand-syns transformers uniplate ]; description = "Compositional Data Types"; @@ -49637,8 +50010,8 @@ self: { }: mkDerivation { pname = "compdata-automata"; - version = "0.9.1"; - sha256 = "1d4q6ssck7jknkxarkz3zcgc5mk60f16wp58kzf1dgv2ar42w4cy"; + version = "0.9.2"; + sha256 = "0yb0mlkvk25fmypad4pmg31vk6v5xqi2sqz1jpnjkgn9jhcn8p19"; libraryHaskellDepends = [ base compdata containers projection ]; benchmarkHaskellDepends = [ base compdata containers criterion projection @@ -49655,8 +50028,8 @@ self: { }: mkDerivation { pname = "compdata-dags"; - version = "0.2"; - sha256 = "0z5vjfm0c4bcixnh951mzc06977l3lcs0v8mz6pbn65qbvv0d27c"; + version = "0.2.1"; + sha256 = "0h2ijhwpxv4bzfz81zhvhi7f42slzqsxawgqd9swk4kmqqzlfr58"; libraryHaskellDepends = [ base compdata containers mtl unordered-containers vector ]; @@ -49692,8 +50065,8 @@ self: { }: mkDerivation { pname = "compdata-param"; - version = "0.9.1"; - sha256 = "079pnr11y2ra1p236h7hlwgm7az7094h2s3g5x43r4q9kzdym5zc"; + version = "0.9.2"; + sha256 = "1cfs7q6pw642dg1xjibrsvpkw1bg15g9lmj70y25xka192d9c2w2"; libraryHaskellDepends = [ base compdata mtl template-haskell transformers ]; @@ -50952,6 +51325,42 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "conduit-algorithms_0_0_8_2" = callPackage + ({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit + , conduit-combinators, conduit-extra, containers, criterion + , deepseq, directory, exceptions, HUnit, lzma-conduit + , monad-control, mtl, pqueue, resourcet, stm, stm-conduit + , streaming-commons, test-framework, test-framework-hunit + , test-framework-th, transformers, unliftio-core, vector + }: + mkDerivation { + pname = "conduit-algorithms"; + version = "0.0.8.2"; + sha256 = "1s423n2hybxdsady7spi4iy9s5lm07dsl0rjxn400y09faizm5x8"; + libraryHaskellDepends = [ + async base bytestring bzlib-conduit conduit conduit-combinators + conduit-extra containers deepseq exceptions lzma-conduit + monad-control mtl pqueue resourcet stm stm-conduit + streaming-commons transformers unliftio-core vector + ]; + testHaskellDepends = [ + async base bytestring bzlib-conduit conduit conduit-combinators + conduit-extra containers deepseq directory exceptions HUnit + lzma-conduit monad-control mtl pqueue resourcet stm stm-conduit + streaming-commons test-framework test-framework-hunit + test-framework-th transformers unliftio-core vector + ]; + benchmarkHaskellDepends = [ + async base bytestring bzlib-conduit conduit conduit-combinators + conduit-extra containers criterion deepseq exceptions lzma-conduit + monad-control mtl pqueue resourcet stm stm-conduit + streaming-commons transformers unliftio-core vector + ]; + description = "Conduit-based algorithms"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "conduit-audio" = callPackage ({ mkDerivation, base, conduit, vector }: mkDerivation { @@ -51305,8 +51714,8 @@ self: { }: mkDerivation { pname = "conduit-zstd"; - version = "0.0.1.0"; - sha256 = "0psy03s9w9gw5s4a2grvfk9xwjd3g63qch7w4i2kvl3cf9yddsa0"; + version = "0.0.1.1"; + sha256 = "04h7w2903hgw4gjcx2pg29yinnmfapawvc19hd3r57rr12fzb0c6"; libraryHaskellDepends = [ base bytestring conduit zstd ]; testHaskellDepends = [ base bytestring conduit conduit-combinators conduit-extra directory @@ -52457,6 +52866,8 @@ self: { pname = "contravariant-extras"; version = "0.3.4"; sha256 = "0gg62ccl94kvh7mnvdq09pifqxjx2kgs189si90nmg44bafj7a9n"; + revision = "1"; + editedCabalFile = "1h2955ahga6i4fn7k8v66l03v77p6fhsac6ck8gpabkc08ij60wp"; libraryHaskellDepends = [ base base-prelude contravariant semigroups template-haskell tuple-th @@ -54667,8 +55078,8 @@ self: { pname = "crypt-sha512"; version = "0"; sha256 = "1wsma9frdrn39i506zydlzlk1ir6jh1pidqfjms8rwqjpx965gn2"; - revision = "1"; - editedCabalFile = "0wi8d12i2v76irrv0f16y4sfcn2a9sg92l11499djidmdq50vji9"; + revision = "2"; + editedCabalFile = "071lxiwsf23ga1fkbjd47ykz7f5irhsh7q7zz2qczzjgnvzadadh"; libraryHaskellDepends = [ attoparsec base bytestring cryptohash-sha512 ]; @@ -60664,8 +61075,8 @@ self: { }: mkDerivation { pname = "dense-int-set"; - version = "0.1.5"; - sha256 = "0xhr7iyhh38nipqb0dkxflh4xr5a10i8zsf8vv11pfqy62irhj6g"; + version = "0.2"; + sha256 = "02gfghbpgfcr8vnbahz9y025cb5cvh4ns5xwz9gavpbi8vbcbyv9"; libraryHaskellDepends = [ base cereal cereal-vector deferred-folds hashable vector vector-algorithms @@ -61414,28 +61825,33 @@ self: { }) {}; "dfinity-radix-tree" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, bloomfilter - , BoundedChan, bytestring, cmdargs, concurrent-extra, conduit - , containers, cryptohash-sha256, data-default-class, deepseq - , ghc-prim, lens-simple, leveldb-haskell, lrucaching, mtl - , resourcet, semigroups, serialise, text, unordered-containers + ({ mkDerivation, aeson, base, base16-bytestring, blake2 + , bloomfilter, BoundedChan, bytestring, cmdargs, concurrent-extra + , conduit, containers, criterion, data-default-class, deepseq + , ghc-prim, lens-simple, leveldb-haskell, lmdb-simple, lrucaching + , mtl, QuickCheck, resourcet, semigroups, serialise, tasty + , tasty-hunit, tasty-quickcheck, temporary, text + , unordered-containers }: mkDerivation { pname = "dfinity-radix-tree"; - version = "0.3.1"; - sha256 = "0fzkhibixdzf4wm7kia224r6bqz8mks9m2c25b5qw31sf7m70zx1"; + version = "0.4.0"; + sha256 = "1bx82andqa7jd682ky0ga14jzfidkcsbgcb6md0wjyy8qgh18sg8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base base16-bytestring bloomfilter BoundedChan bytestring - concurrent-extra conduit containers cryptohash-sha256 - data-default-class deepseq ghc-prim lens-simple leveldb-haskell - lrucaching mtl resourcet semigroups serialise + base base16-bytestring blake2 bloomfilter BoundedChan bytestring + concurrent-extra conduit containers data-default-class deepseq + ghc-prim lens-simple leveldb-haskell lmdb-simple lrucaching mtl + resourcet semigroups serialise ]; executableHaskellDepends = [ - aeson base base16-bytestring bytestring cmdargs containers - cryptohash-sha256 data-default-class leveldb-haskell mtl resourcet - text unordered-containers + base blake2 bytestring cmdargs criterion data-default-class + leveldb-haskell lmdb-simple resourcet temporary + ]; + testHaskellDepends = [ + aeson base base16-bytestring bytestring containers mtl QuickCheck + tasty tasty-hunit tasty-quickcheck text unordered-containers ]; description = "A generic data integrity layer"; license = stdenv.lib.licenses.gpl3; @@ -62970,8 +63386,8 @@ self: { pname = "digit"; version = "0.7"; sha256 = "0451nlmf2ggg1dy82qkdxqlg4lgnsvkrxl3qrcjr5dzmi2ghk3ql"; - revision = "1"; - editedCabalFile = "1zdy8jmsn3a065vapl8lf4kzxafbqdwhp99b9s3ff8dj8q5nx4qj"; + revision = "2"; + editedCabalFile = "0335fzcbrf4hciz9gdkk41y9jkd5vm5vbz99v9ick76q48h2bs6p"; libraryHaskellDepends = [ base lens parsers scientific semigroupoids semigroups template-haskell @@ -64696,8 +65112,8 @@ self: { pname = "dlist-nonempty"; version = "0.1.1"; sha256 = "0csbspdy43pzvasb5mhs5pz2f49ws78pi253cx7pp84wjx6ads20"; - revision = "3"; - editedCabalFile = "0gy0xkfy3811xz7jjz451a3rldlzg8crmrl5gn0a8fgyjdgqxc46"; + revision = "4"; + editedCabalFile = "10kkj4sf1bn87z6744p9gn6mkciqri2d3l9vmg9ylpi8g7priil2"; libraryHaskellDepends = [ base base-compat deepseq dlist semigroupoids ]; @@ -67937,8 +68353,8 @@ self: { }: mkDerivation { pname = "egison-tutorial"; - version = "3.7.9"; - sha256 = "04xy76737zp1vpnn1b76xd5z4d6hfxd4l707v8s1cd8vb18y3dc0"; + version = "3.7.12"; + sha256 = "16dpqwp96ngc15igzxhkn7waxynnxy87lx5j1flp5dj2v71fx17m"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -69490,6 +69906,34 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "entwine" = callPackage + ({ mkDerivation, async, base, containers, criterion, directory + , exceptions, monad-loops, process, QuickCheck + , quickcheck-instances, quickcheck-properties, quickcheck-text + , random, SafeSemaphore, stm, text, time, transformers + , transformers-either + }: + mkDerivation { + pname = "entwine"; + version = "0.0.1"; + sha256 = "08yy72lgc8cg12hbz51q06zx7fslhhnk0rjjszba8aj0qbrj8yr4"; + libraryHaskellDepends = [ + async base containers exceptions monad-loops SafeSemaphore stm text + time transformers transformers-either + ]; + testHaskellDepends = [ + async base directory exceptions process QuickCheck + quickcheck-instances text time transformers transformers-either + ]; + benchmarkHaskellDepends = [ + base criterion directory process QuickCheck quickcheck-instances + quickcheck-properties quickcheck-text random text transformers + transformers-either + ]; + description = "entwine - Concurrency tools"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "enum-subset-generate" = callPackage ({ mkDerivation, base, generic-random, hspec, microlens, QuickCheck , template-haskell @@ -71967,8 +72411,8 @@ self: { pname = "exitcode"; version = "0.1.0.1"; sha256 = "1h4qv29g59dxwsb2i4qrnf2f96xsmzngc9rnrqfkh8nkkcr71br5"; - revision = "1"; - editedCabalFile = "0p2kmkgqbfcf5za5n210a6ra6758dkmkwvs516aj3y895na6j14z"; + revision = "2"; + editedCabalFile = "0g30lnsl947bsxcw53swl0vv3qg8c7vqf8axpdnhl28mdrxa0ax9"; libraryHaskellDepends = [ base lens mmorph mtl semigroupoids semigroups transformers ]; @@ -72547,14 +72991,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "extra_1_6_11" = callPackage + "extra_1_6_12" = callPackage ({ mkDerivation, base, clock, directory, filepath, process , QuickCheck, time, unix }: mkDerivation { pname = "extra"; - version = "1.6.11"; - sha256 = "0qqjhlvf9m9wph5c6xwvv2fb8l7cvwkc98f1r27nl4bjrxqag8sh"; + version = "1.6.12"; + sha256 = "177m9f3hdc8sy6m791q6bmns01avzb0j9wj113rm4748k0bnqngz"; libraryHaskellDepends = [ base clock directory filepath process time unix ]; @@ -72741,6 +73185,8 @@ self: { pname = "facts"; version = "0.0.1.0"; sha256 = "12ifja6vgm8hafs23fzb2jfk0jiz4nss1if5b86950y3mc995rfx"; + revision = "1"; + editedCabalFile = "03v6p3vlilz6vk5xlvw3r31cqicx3m1xjii9shcqpacxvlh2zzlp"; libraryHaskellDepends = [ base exceptions mtl template-haskell ]; description = "Refined types"; license = stdenv.lib.licenses.bsd3; @@ -73709,8 +74155,8 @@ self: { pname = "fclabels"; version = "2.0.3.3"; sha256 = "1q62p41bj991s7i15ciayw1v1xq8szn4bls50p65lfy2dnj7554s"; - revision = "2"; - editedCabalFile = "0mn82r0h9zhdsaf7qz45fcps6y1kdkqi8xf8dsz8419by2x5ygfx"; + revision = "3"; + editedCabalFile = "1wncfnvh4mv87gh0ddhiqf839d63rqs1qzi3y386y6r8hfnvra0l"; libraryHaskellDepends = [ base mtl template-haskell transformers ]; testHaskellDepends = [ base HUnit mtl template-haskell transformers @@ -74652,8 +75098,8 @@ self: { pname = "file-embed-lzma"; version = "0"; sha256 = "0xqcgx4ysyjqrygnfabs169y4w986kwzvsaqh64h7x3wfi7z8v78"; - revision = "1"; - editedCabalFile = "18q9dgfdsr7r5mlqzhhgbx0bp4bv2xkpcsrihl655pwaj1lz1v2s"; + revision = "2"; + editedCabalFile = "0dmg69gsj2k9lf112bvqw6z2w8hl0p1lx5zxdvlvk85bb3qz6304"; libraryHaskellDepends = [ base base-compat bytestring directory filepath lzma template-haskell text th-lift-instances transformers @@ -75028,6 +75474,8 @@ self: { pname = "fin"; version = "0.0.1"; sha256 = "0mqs6qayj2n54siz3bpab9z6sk9030wdaxgvgg9g36983yaqmlil"; + revision = "1"; + editedCabalFile = "056d22f1j1xv5ka2qr7a3z5ad5w1im76qdf77v6dqdi4vaz52vd1"; libraryHaskellDepends = [ base deepseq hashable ]; testHaskellDepends = [ base inspection-testing tagged ]; description = "Nat and Fin: peano naturals and finite numbers"; @@ -75846,8 +76294,8 @@ self: { pname = "flac"; version = "0.1.2"; sha256 = "0adc88h5dmazf9m2xah0qkcav3pm0l3jiy8wbg9fxjv1qpgv74jn"; - revision = "3"; - editedCabalFile = "09xml5mv63q0wzw09s0ssjdzgnq041gr6gjhk63dr252rydnn4zh"; + revision = "4"; + editedCabalFile = "0bmhd56fg4idz62maig3kykk7dyqy9dpm27fdljqg8jccl0vbwbm"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers data-default-class directory exceptions @@ -76889,6 +77337,8 @@ self: { pname = "foldl"; version = "1.4.4"; sha256 = "0dy8dhpys2bq6pn0m6klsykk4mfxi6q8hr8gqbfcvqk6g4i5wyn7"; + revision = "1"; + editedCabalFile = "1qdllf16djf7w5h8jq1f8sb5a0k5ihr9psai8wgkvnhd9addsk0f"; libraryHaskellDepends = [ base bytestring comonad containers contravariant hashable mwc-random primitive profunctors semigroupoids semigroups text @@ -76928,8 +77378,8 @@ self: { }: mkDerivation { pname = "foldl-statistics"; - version = "0.1.5.0"; - sha256 = "1z9qx7kiaidl3icz6g3rd6pyycwnvyv7xyw8g6p1n7rpvz60633b"; + version = "0.1.5.1"; + sha256 = "196vkbgj6c5dhwfw6l73z8dw505hsjsrx4w1f3zfczm0jfc4fsxl"; libraryHaskellDepends = [ base containers foldl hashable math-functions profunctors unordered-containers @@ -77381,8 +77831,8 @@ self: { pname = "forma"; version = "1.1.0"; sha256 = "09f377ak1208lr8sskdga3nq47a151whd7z982pwv552w1q75p5p"; - revision = "1"; - editedCabalFile = "0yn650g1x3v56d45iqks1x7bz6ji8454ppr0qx48bmjnlbb34s1q"; + revision = "2"; + editedCabalFile = "1yc9gv1rjbl4lsxscp5idfpn7jp27c38j6gm9v7isxgyaih0j4v4"; libraryHaskellDepends = [ aeson base containers mtl text unordered-containers ]; @@ -77487,6 +77937,8 @@ self: { pname = "formatting"; version = "6.3.6"; sha256 = "06nkm9scy3a41v4m7npgkl9lvy5py6v7chsx0yhdy4pr4mvdna3a"; + revision = "1"; + editedCabalFile = "0vw77ji2d7rhwhq2g7dmln9ifsghgzdlnxg4wjipb128f6gwclh7"; libraryHaskellDepends = [ array base bytestring clock ghc-prim integer-gmp old-locale scientific semigroups text time transformers @@ -78119,8 +78571,8 @@ self: { }: mkDerivation { pname = "free-functors"; - version = "1.0"; - sha256 = "061xly5fl7a28dsjw9m8dzyh59fkjrs6ijhcqfn2n4y8azch9f6c"; + version = "1.0.1"; + sha256 = "1y1cmm4z5s5a1ivs30vwb2rbgc9q24y6z2a9in3azwpgfb1x4fw0"; libraryHaskellDepends = [ algebraic-classes base bifunctors comonad contravariant profunctors template-haskell transformers @@ -79483,8 +79935,8 @@ self: { pname = "functor-classes-compat"; version = "1"; sha256 = "0vrnl5crr7d2wsm4ryx26g98j23dpk7x5p31xrbnckd78i7zj4gg"; - revision = "2"; - editedCabalFile = "07ldwmqfwi2lgnmia5bb0885664a54g2q55f91swgafb11n0csqg"; + revision = "3"; + editedCabalFile = "1jx552ysdnxvd8wdvsf4bgxlsgldpb7a8zi54abyjmxv6mkp98ys"; libraryHaskellDepends = [ base containers hashable unordered-containers vector ]; @@ -81121,10 +81573,8 @@ self: { ({ mkDerivation, base, containers, mtl, template-haskell }: mkDerivation { pname = "generics-mrsop"; - version = "1.0.0.1"; - sha256 = "1spnsr127rhcpjwd7604pp7rpqp3q4rc8lb9msgl424hf62xbqq3"; - revision = "1"; - editedCabalFile = "1f3wg5sq8cm1bz210j4haxs511x786yq8wchfmdllw7cimhvw452"; + version = "1.2.2"; + sha256 = "0xlvvcnmv24f0j3j4jaaymhdgz7klfdx15lxi9214d4ak4fnxjyv"; libraryHaskellDepends = [ base containers mtl template-haskell ]; description = "Generic Programming with Mutually Recursive Sums of Products"; license = stdenv.lib.licenses.mit; @@ -81137,8 +81587,8 @@ self: { pname = "generics-sop"; version = "0.3.2.0"; sha256 = "168v62i845jh9jbfaz3ldz8svz4wmzq9mf2vhb7pxlnbkk8fqq1h"; - revision = "2"; - editedCabalFile = "0hc00hjgxm7vzq146d9kwapgqnjbhdi0c7icyvrpc2fhc4cnwlwf"; + revision = "3"; + editedCabalFile = "0lw5n8npdrdd1h7j000flaig4z30b8pig4q52sj34zhwccjkdzq2"; libraryHaskellDepends = [ base deepseq ghc-prim template-haskell ]; testHaskellDepends = [ base ]; description = "Generic Programming using True Sums of Products"; @@ -81151,8 +81601,8 @@ self: { pname = "generics-sop-lens"; version = "0.1.2.1"; sha256 = "0p2ji955hy9r6c1wmiziga9pbbli24my3vmx19gf4i8db36d8jaf"; - revision = "4"; - editedCabalFile = "1ms3y1cqpzlzl9yr2v53971vvnaapa3bni9yv19l1ilxhr8xzqfr"; + revision = "5"; + editedCabalFile = "1q6953xi46qvbknaq2j8x2zqmk2q1mmf8xczjyib3abxz0rp3608"; libraryHaskellDepends = [ base generics-sop lens ]; description = "Lenses for types in generics-sop"; license = stdenv.lib.licenses.bsd3; @@ -81896,21 +82346,21 @@ self: { }) {}; "geojson" = callPackage - ({ mkDerivation, aeson, base, bytestring, deepseq, hlint, lens - , scientific, semigroups, tasty, tasty-hspec, tasty-quickcheck - , text, transformers, validation, vector + ({ mkDerivation, aeson, base, bytestring, containers, deepseq + , hlint, lens, scientific, semigroups, tasty, tasty-hspec + , tasty-quickcheck, text, transformers, validation }: mkDerivation { pname = "geojson"; - version = "2.0.0"; - sha256 = "0pbdd34z09l7z4alqs92x6aw0s74rcv6hs5nr7gqrhc0wzrsmi5q"; + version = "3.0.3"; + sha256 = "05kifzlw077ggxish1hmpqlk180w46qpj4b2c8pjqngk5j0jd5vv"; libraryHaskellDepends = [ - aeson base deepseq lens scientific semigroups text transformers - validation vector + aeson base containers deepseq lens scientific semigroups text + transformers validation ]; testHaskellDepends = [ - aeson base bytestring hlint tasty tasty-hspec tasty-quickcheck text - validation vector + aeson base bytestring containers hlint tasty tasty-hspec + tasty-quickcheck text validation ]; description = "A thin GeoJSON Layer above the aeson library"; license = stdenv.lib.licenses.bsd3; @@ -82492,6 +82942,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ghc-hotswap" = callPackage + ({ mkDerivation, base, concurrent-extra, deepseq, ghci }: + mkDerivation { + pname = "ghc-hotswap"; + version = "0.1.0.0"; + sha256 = "1j88ddasmcffby14d1105cawsv713qc4hjz2g23h1swlnvy375i1"; + libraryHaskellDepends = [ base concurrent-extra deepseq ghci ]; + description = "Library for hot-swapping shared objects in GHC"; + license = "unknown"; + }) {}; + "ghc-imported-from" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, directory , exceptions, filepath, ghc, ghc-mod, ghc-paths, ghc-syb-utils @@ -82795,6 +83256,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-prof_1_4_1_4" = callPackage + ({ mkDerivation, attoparsec, base, containers, directory, filepath + , process, scientific, tasty, tasty-hunit, temporary, text, time + }: + mkDerivation { + pname = "ghc-prof"; + version = "1.4.1.4"; + sha256 = "1wrlz2x9zsrip92m254vh0s07j9afjli6n1kcass8z0lw17m26mh"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base containers scientific text time + ]; + testHaskellDepends = [ + attoparsec base containers directory filepath process tasty + tasty-hunit temporary text + ]; + description = "Library for parsing GHC time and allocation profiling reports"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-prof-aeson" = callPackage ({ mkDerivation, aeson, base, bytestring, hspec, text, vector }: mkDerivation { @@ -84665,8 +85148,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "6.20180913"; - sha256 = "0rsmzbfd4i275c6baa1l9rnyd9a510yyb7g9g8dk8d89f5v6dddb"; + version = "6.20180926"; + sha256 = "1251rj8h63y30sfqk0zh670yhz14p256y59n3590pg015pf3575d"; configureFlags = [ "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns" "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-f-s3" @@ -85114,6 +85597,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "github_0_20" = callPackage + ({ mkDerivation, aeson, base, base-compat, base16-bytestring + , binary, binary-orphans, byteable, bytestring, containers + , cryptohash, deepseq, deepseq-generics, exceptions, file-embed + , hashable, hspec, hspec-discover, http-client, http-client-tls + , http-link-header, http-types, iso8601-time, mtl, network-uri + , semigroups, text, time, tls, transformers, transformers-compat + , unordered-containers, vector, vector-instances + }: + mkDerivation { + pname = "github"; + version = "0.20"; + sha256 = "0gyinmrdwbqd6h5bvlv5jkv2rfp48p11088w5ayms8h361ck3kdp"; + libraryHaskellDepends = [ + aeson base base-compat base16-bytestring binary binary-orphans + byteable bytestring containers cryptohash deepseq deepseq-generics + exceptions hashable http-client http-client-tls http-link-header + http-types iso8601-time mtl network-uri semigroups text time tls + transformers transformers-compat unordered-containers vector + vector-instances + ]; + testHaskellDepends = [ + aeson base base-compat bytestring file-embed hspec + unordered-containers vector + ]; + testToolDepends = [ hspec-discover ]; + description = "Access to the GitHub API, v3"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "github-backup" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, directory , exceptions, filepath, git, github, hslogger, IfElse, mtl, network @@ -85689,8 +86203,8 @@ self: { pname = "gl"; version = "0.8.0"; sha256 = "0f8l1ra05asqjnk97sliqb3wqvr6lic18rfs1f9dm1kw2lw2hkda"; - revision = "1"; - editedCabalFile = "17m5vagiq1v7zg6409f56qqy28jd0xp13yk44s661rcwj0f4pd14"; + revision = "2"; + editedCabalFile = "0zbpf559ajlcwnylpbm6dbi4m3g3s08fciqfp5am3i2vrmw0wpi9"; setupHaskellDepends = [ base Cabal containers directory filepath hxt transformers ]; @@ -93031,25 +93545,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haddock-library_1_4_4" = callPackage - ({ mkDerivation, base, base-compat, bytestring, deepseq, hspec - , hspec-discover, QuickCheck, transformers - }: - mkDerivation { - pname = "haddock-library"; - version = "1.4.4"; - sha256 = "0dx5hawfanglhkj5nqq1dwr2j1v35p0syz30xvdk8gld8rif06p9"; - libraryHaskellDepends = [ base bytestring deepseq transformers ]; - testHaskellDepends = [ - base base-compat bytestring deepseq hspec QuickCheck transformers - ]; - testToolDepends = [ hspec-discover ]; - doHaddock = false; - description = "Library exposing some functionality of Haddock"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "haddock-library" = callPackage ({ mkDerivation, base, base-compat, bytestring, containers, deepseq , directory, filepath, hspec, hspec-discover, optparse-applicative @@ -94579,6 +95074,33 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hapistrano_0_3_6_0" = 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.6.0"; + sha256 = "094jv3plkh515mn49hp5bylpxfn7c74n9bdk4843bm88q5hxlnk2"; + 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 + ]; + 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 @@ -95948,10 +96470,8 @@ self: { ({ mkDerivation, base, hashable, time }: mkDerivation { pname = "hashable-time"; - version = "0.2.0.1"; - sha256 = "0k932nyd08l3xxbh2g3n76py2f4kd9yw4s5a065vjz0xp6wjnxdm"; - revision = "1"; - editedCabalFile = "0rv40xkg3gj8jnqsry1gq3f5s5la6d5arg8fzkirnwdpcgha1as6"; + version = "0.2.0.2"; + sha256 = "1q7y4plqqwy5286hhx2fygn12h8lqk0y047b597sbdckskxzfqgs"; libraryHaskellDepends = [ base hashable time ]; description = "Hashable instances for Data.Time"; license = stdenv.lib.licenses.bsd3; @@ -96631,8 +97151,8 @@ self: { }: mkDerivation { pname = "haskell-dap"; - version = "0.0.7.0"; - sha256 = "1xrjrdrn8an1w5dig134jcy9whwjfm2vnb8s4vvd1aa8iq37p87p"; + version = "0.0.8.0"; + sha256 = "1zj1lkvxhn7l9pgivl7bgzs5mzg8kbzriixwpf8si2nrfx20avkf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -96856,12 +97376,12 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib;}; - "haskell-gi-base_0_21_2" = callPackage + "haskell-gi-base_0_21_3" = callPackage ({ mkDerivation, base, bytestring, containers, glib, text }: mkDerivation { pname = "haskell-gi-base"; - version = "0.21.2"; - sha256 = "075x1jxm1r038ajy0raxrm2m3d1j7lc91cq9ik26fvp1vd6p13xg"; + version = "0.21.3"; + sha256 = "1nh2cb8l0yvn6hp5bw273yyj0y15f1sd8115wi7sxyvas5h5q7m4"; libraryHaskellDepends = [ base bytestring containers text ]; libraryPkgconfigDepends = [ glib ]; description = "Foundation for libraries generated by haskell-gi"; @@ -97023,6 +97543,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haskell-lexer_1_0_2" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "haskell-lexer"; + version = "1.0.2"; + sha256 = "1wyxd8x33x4v5vxyzkhm610pl86gbkc8y439092fr1735q9g7kfq"; + libraryHaskellDepends = [ base ]; + description = "A fully compliant Haskell 98 lexer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-lsp" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, data-default , directory, filepath, hashable, haskell-lsp-types, hslogger, hspec @@ -100266,6 +100798,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haxl_2_0_1_1" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, containers + , deepseq, exceptions, filepath, ghc-prim, hashable, HUnit, pretty + , stm, test-framework, test-framework-hunit, text, time + , transformers, unordered-containers, vector + }: + mkDerivation { + pname = "haxl"; + version = "2.0.1.1"; + sha256 = "1wfnwi3impv4cv359a65yh50c6kdfxhvbwycf5h76w3cvqdhvwsr"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base binary bytestring containers deepseq exceptions filepath + ghc-prim hashable pretty stm text time transformers + unordered-containers vector + ]; + testHaskellDepends = [ + aeson base binary bytestring containers deepseq filepath hashable + HUnit test-framework test-framework-hunit text time + unordered-containers + ]; + description = "A Haskell library for efficient, concurrent, and concise data access"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haxl-amazonka" = callPackage ({ mkDerivation, amazonka, amazonka-core, async, base, conduit , hashable, haxl, transformers @@ -101619,6 +102178,8 @@ self: { pname = "hedgehog"; version = "0.6.1"; sha256 = "0xz10ycdm5vk9nrcym1fi83k19frfwqz18bz8bnpzwvaj0j41yfj"; + revision = "1"; + editedCabalFile = "1fj3m5p5nm3dip93a1z7yrrq3fmqk30qgljdspia13y3lyqlcrf1"; libraryHaskellDepends = [ ansi-terminal async base bytestring concurrent-output containers directory exceptions lifted-async mmorph monad-control mtl @@ -101719,8 +102280,8 @@ self: { pname = "hedgehog-quickcheck"; version = "0.1"; sha256 = "04l4dyk662wf6a0p6bnv9n2x2qi5sqm65ni5bdznakfvzk6mq2k1"; - revision = "2"; - editedCabalFile = "0fxd4ain7sfxw7q0h3hj2rlp9385zcf9n7lh98i0gqpjqs55dwnd"; + revision = "3"; + editedCabalFile = "08pglka9hc7q3fql7fsmqn17wm1xmixkpqfslv86l79hn4y3rfq3"; libraryHaskellDepends = [ base hedgehog QuickCheck transformers ]; description = "Use QuickCheck generators in Hedgehog and vice versa"; license = stdenv.lib.licenses.bsd3; @@ -105078,17 +105639,20 @@ self: { }) {}; "hjugement" = callPackage - ({ mkDerivation, base, containers, QuickCheck, tasty, tasty-hunit - , tasty-quickcheck, text, transformers + ({ mkDerivation, base, containers, hashable, QuickCheck, random + , tasty, tasty-hunit, tasty-quickcheck, text, transformers + , unordered-containers }: mkDerivation { pname = "hjugement"; - version = "1.0.0.20170808"; - sha256 = "1za90csf836zc4iv2gn5m4049zknzp5ydham0axga13987bs2j1w"; - libraryHaskellDepends = [ base containers ]; + version = "2.0.0.20180903"; + sha256 = "0zvgabj0myn5ssfpj8l50z0jwcrqkfsixdhg1wq916y8ay7yi71n"; + libraryHaskellDepends = [ + base containers hashable unordered-containers + ]; testHaskellDepends = [ - base containers QuickCheck tasty tasty-hunit tasty-quickcheck text - transformers + base containers hashable QuickCheck random tasty tasty-hunit + tasty-quickcheck text transformers unordered-containers ]; description = "Majority Judgment"; license = stdenv.lib.licenses.gpl3; @@ -106852,6 +107416,8 @@ self: { pname = "hoist-error"; version = "0.2.1.0"; sha256 = "028lczd80nhj3yj5dq9qixzdzkyisl34qpi6bb28r8b9nj2i2nss"; + revision = "1"; + editedCabalFile = "0abzpyxr46kk9vh5yxy8wawmyn1x1zrhl9mdxwfz0s938z4s7nr5"; libraryHaskellDepends = [ base either mtl ]; description = "Some convenience facilities for hoisting errors into a monad"; license = stdenv.lib.licenses.mit; @@ -108385,8 +108951,8 @@ self: { pname = "hpc"; version = "0.6.0.3"; sha256 = "1am2fcxg7d3j3kpyhz48wzbpg83dk2jmzhqm4yiib649alzcgnhn"; - revision = "1"; - editedCabalFile = "1bddfsgn48kh8qa72asgmx7z4ym00zkh09g3hqp6l6yl919drn2i"; + revision = "2"; + editedCabalFile = "0ywki1w4kld0m3z8v1i287g6hcsjgmyq4nxx8b9jij721ad9b9w3"; libraryHaskellDepends = [ base containers directory filepath time ]; @@ -108918,6 +109484,8 @@ self: { pname = "hreader"; version = "1.1.0"; sha256 = "0fkxk9sz9hnnacnsv8dq7xb0sfq0b9abch6ky1zsnhxkb7004ara"; + revision = "1"; + editedCabalFile = "0kz3yzah7m4c2r9yaawhljcgb579masx3lx4mrr4lmqy39kmsvcb"; libraryHaskellDepends = [ base exceptions hset mmorph monad-control mtl tagged transformers transformers-base @@ -109003,6 +109571,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) ruby;}; + "hruby_0_3_6" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal + , process, QuickCheck, ruby, scientific, stm, text + , unordered-containers, vector + }: + mkDerivation { + pname = "hruby"; + version = "0.3.6"; + sha256 = "068mvb6bf583bldx07whc3cc0s3xbjlibi55r0ajjq9v4kxv98yx"; + setupHaskellDepends = [ base Cabal process ]; + libraryHaskellDepends = [ + aeson attoparsec base bytestring scientific stm text + unordered-containers vector + ]; + librarySystemDepends = [ ruby ]; + testHaskellDepends = [ + aeson attoparsec base QuickCheck text vector + ]; + description = "Embed a Ruby intepreter in your Haskell program !"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) ruby;}; + "hs-GeoIP" = callPackage ({ mkDerivation, base, bytestring, deepseq, GeoIP }: mkDerivation { @@ -111049,6 +111640,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hslogger_1_2_12" = callPackage + ({ mkDerivation, base, containers, directory, mtl, network + , old-locale, process, time, unix + }: + mkDerivation { + pname = "hslogger"; + version = "1.2.12"; + sha256 = "0ykcsk7wqygvrg60r5kpl6xfinr706al8pfyk5wj67wjs24lqypr"; + libraryHaskellDepends = [ + base containers directory mtl network old-locale process time unix + ]; + description = "Versatile logging framework"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hslogger-reader" = callPackage ({ mkDerivation, attoparsec, base, hslogger, optparse-applicative , text, text-icu, time @@ -111140,6 +111747,30 @@ self: { license = stdenv.lib.licenses.mit; }) {inherit (pkgs) lua5_3;}; + "hslua_1_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, criterion, deepseq + , exceptions, fail, lua5_3, mtl, QuickCheck, quickcheck-instances + , tasty, tasty-hunit, tasty-quickcheck, text + }: + mkDerivation { + pname = "hslua"; + version = "1.0.0"; + sha256 = "0xd47h1f2y3k6qrhbadiczx58ykcsm66hbkwd022r6hd2hfqk34c"; + configureFlags = [ "-fsystem-lua" "-f-use-pkgconfig" ]; + libraryHaskellDepends = [ + base bytestring containers exceptions fail mtl text + ]; + librarySystemDepends = [ lua5_3 ]; + testHaskellDepends = [ + base bytestring containers exceptions fail mtl QuickCheck + quickcheck-instances tasty tasty-hunit tasty-quickcheck text + ]; + benchmarkHaskellDepends = [ base bytestring criterion deepseq ]; + description = "Bindings to Lua, an embeddable scripting language"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) lua5_3;}; + "hslua-aeson" = callPackage ({ mkDerivation, aeson, base, hashable, hslua, hspec, HUnit , ieee754, QuickCheck, quickcheck-instances, scientific, text @@ -111161,6 +111792,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hslua-aeson_1_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, hashable, hslua, hspec + , HUnit, ieee754, QuickCheck, quickcheck-instances, scientific + , text, unordered-containers, vector + }: + mkDerivation { + pname = "hslua-aeson"; + version = "1.0.0"; + sha256 = "0wvcf0adv2b5fn7mvi8p6ydzsyzbn43qyk1kjvvi9achrgvc59zz"; + libraryHaskellDepends = [ + aeson base hashable hslua scientific text unordered-containers + vector + ]; + testHaskellDepends = [ + aeson base bytestring hashable hslua hspec HUnit ieee754 QuickCheck + quickcheck-instances scientific text unordered-containers vector + ]; + description = "Allow aeson data types to be used with lua"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hslua-module-text" = callPackage ({ mkDerivation, base, hslua, tasty, tasty-hunit, text }: mkDerivation { @@ -111175,6 +111828,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hslua-module-text_0_2_0" = callPackage + ({ mkDerivation, base, bytestring, hslua, tasty, tasty-hunit, text + }: + mkDerivation { + pname = "hslua-module-text"; + version = "0.2.0"; + sha256 = "0zlgin87cck5ccw82jf0bfjcrpdnqlylh4sfqifbdjgspswha5vi"; + libraryHaskellDepends = [ base bytestring hslua text ]; + testHaskellDepends = [ base hslua tasty tasty-hunit text ]; + description = "Lua module for text"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hsluv-haskell" = callPackage ({ mkDerivation, aeson, base, bytestring, colour, containers }: mkDerivation { @@ -111993,6 +112660,8 @@ self: { pname = "hspec-megaparsec"; version = "2.0.0"; sha256 = "0c4vb0c2y8yar0jjhh24wkkp1g7pbg2wc8h8nw3avfznbil6zyd8"; + revision = "1"; + editedCabalFile = "15hpf1v1d4dwzdvk7xhgj37yd37pcyj6yzw750k1fcj6j0hk4rb7"; libraryHaskellDepends = [ base containers hspec-expectations megaparsec ]; @@ -113811,6 +114480,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "http-api-data_0_3_9" = callPackage + ({ mkDerivation, attoparsec, attoparsec-iso8601, base, bytestring + , Cabal, cabal-doctest, containers, cookie, directory, doctest + , filepath, hashable, hspec, hspec-discover, http-types, HUnit + , QuickCheck, quickcheck-instances, text, time, time-locale-compat + , unordered-containers, uuid-types + }: + mkDerivation { + pname = "http-api-data"; + version = "0.3.9"; + sha256 = "013m662vn02vw37gpffnvffwjirhg8lprknav5rinxffq7ra4cr8"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + attoparsec attoparsec-iso8601 base bytestring containers cookie + hashable http-types text time time-locale-compat + unordered-containers uuid-types + ]; + testHaskellDepends = [ + base bytestring directory doctest filepath hspec HUnit QuickCheck + quickcheck-instances text time unordered-containers uuid-types + ]; + testToolDepends = [ hspec-discover ]; + description = "Converting to/from HTTP API data like URL pieces, headers and query parameters"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-attoparsec" = callPackage ({ mkDerivation, attoparsec, base, bytestring, http-types }: mkDerivation { @@ -114356,8 +115052,8 @@ self: { pname = "http-media"; version = "0.7.1.2"; sha256 = "01vvrd6yb2aykha7y1c13ylnkyws2wy68vqbdb7kmbzwbdxdb4zy"; - revision = "1"; - editedCabalFile = "0lxlig3mhw52ixqq65c9fzawviia2fl00d7hn1diny964h8klwgc"; + revision = "2"; + editedCabalFile = "0in3xw1hqdz0s8pqvkfqw5qr186cd1yr4zxc5rnr0q95asi8s0rh"; libraryHaskellDepends = [ base bytestring case-insensitive containers utf8-string ]; @@ -114669,6 +115365,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "http-types_0_12_2" = callPackage + ({ mkDerivation, array, base, bytestring, case-insensitive, doctest + , hspec, QuickCheck, quickcheck-instances, text + }: + mkDerivation { + pname = "http-types"; + version = "0.12.2"; + sha256 = "01ck5wmzvl5cqd3w2kwkrmp18n78474a3lngk6ry28w9pbbh4caj"; + libraryHaskellDepends = [ + array base bytestring case-insensitive text + ]; + testHaskellDepends = [ + base bytestring doctest hspec QuickCheck quickcheck-instances text + ]; + description = "Generic HTTP types for Haskell (for both client and server code)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-wget" = callPackage ({ mkDerivation, base, failure, process, transformers }: mkDerivation { @@ -115564,37 +116279,37 @@ self: { }) {}; "hw-dsv" = callPackage - ({ mkDerivation, base, bits-extra, bytestring, cassava, criterion - , deepseq, directory, hedgehog, hspec, hspec-discover, hw-bits + ({ mkDerivation, base, bits-extra, bytestring, c2hs, cassava + , criterion, deepseq, directory, ghc-prim, hedgehog, hspec, hw-bits , hw-hspec-hedgehog, hw-prim, hw-rankselect, hw-rankselect-base - , lens, mmap, optparse-applicative, resourcet, text, vector, weigh + , hw-simd, lens, mmap, optparse-applicative, resourcet, text + , vector, weigh }: mkDerivation { pname = "hw-dsv"; - version = "0.2.1"; - sha256 = "1kb8dc05dfslpqnjw42qnnxg16xfd2jz17ag9vgmci88rnsanaxv"; - revision = "1"; - editedCabalFile = "1di1vdj6c0s0n2zjhjhy8iszlgk29gbh7a46pc4q0hp587avff04"; + version = "0.3.0"; + sha256 = "0cpnzf8f4mk28jpxx66q8mv0gm3rassjp48r17hwzkalvw3ng3ni"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bits-extra bytestring deepseq hw-bits hw-prim hw-rankselect - hw-rankselect-base vector + base bits-extra bytestring deepseq ghc-prim hw-bits hw-prim + hw-rankselect hw-rankselect-base hw-simd vector ]; + libraryToolDepends = [ c2hs ]; executableHaskellDepends = [ - base bits-extra bytestring deepseq hedgehog hw-bits hw-prim - hw-rankselect hw-rankselect-base lens optparse-applicative - resourcet vector + base bits-extra bytestring deepseq ghc-prim hedgehog hw-bits + hw-prim hw-rankselect hw-rankselect-base hw-simd lens + optparse-applicative resourcet vector ]; testHaskellDepends = [ - base bits-extra bytestring cassava deepseq directory hedgehog hspec - hw-bits hw-hspec-hedgehog hw-prim hw-rankselect hw-rankselect-base - text vector weigh + base bits-extra bytestring cassava deepseq directory ghc-prim + hedgehog hspec hw-bits hw-hspec-hedgehog hw-prim hw-rankselect + hw-rankselect-base hw-simd text vector weigh ]; - testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ base bits-extra bytestring cassava criterion deepseq directory - hw-bits hw-prim hw-rankselect hw-rankselect-base mmap vector + ghc-prim hw-bits hw-prim hw-rankselect hw-rankselect-base hw-simd + mmap vector ]; description = "Unbelievably fast streaming DSV file parser"; license = stdenv.lib.licenses.bsd3; @@ -115726,14 +116441,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hw-ip_0_2_1_0" = callPackage + "hw-ip_0_2_1_1" = callPackage ({ mkDerivation, attoparsec, base, generic-lens, hedgehog, hspec , hw-bits, hw-hspec-hedgehog, text }: mkDerivation { pname = "hw-ip"; - version = "0.2.1.0"; - sha256 = "09qfimmf8dsp1pf0vxjpf5v9ih8rk414jkh50inc83zygzp9if29"; + version = "0.2.1.1"; + sha256 = "1vcg2n0ar5j5w02caswjxi549qfkgy7p63vfasbq3a8w3d109931"; libraryHaskellDepends = [ attoparsec base generic-lens hw-bits text ]; @@ -119391,21 +120106,21 @@ self: { }) {}; "indexation" = callPackage - ({ mkDerivation, base, bytestring, cereal, cereal-vector + ({ mkDerivation, base, bitvec, bytestring, cereal, cereal-vector , contravariant, deepseq, deferred-folds, dense-int-set, focus , foldl, hashable, list-t, mmorph, potoki, potoki-cereal , profunctors, stm-containers, text, transformers - , unordered-containers, vector + , unordered-containers, vector, vector-th-unbox }: mkDerivation { pname = "indexation"; - version = "0.6.2.1"; - sha256 = "016srnm3mqvfz1ki0bzxr88frav8zkj8l2nkknfrhx194cxwiahn"; + version = "0.6.4"; + sha256 = "1lm5ahr57lhwnfvz7kawl211chs4wjkykyicrrg748g4f03sm5a2"; libraryHaskellDepends = [ - base bytestring cereal cereal-vector contravariant deepseq + base bitvec bytestring cereal cereal-vector contravariant deepseq deferred-folds dense-int-set focus foldl hashable list-t mmorph potoki potoki-cereal profunctors stm-containers text transformers - unordered-containers vector + unordered-containers vector vector-th-unbox ]; description = "Tools for entity indexation"; license = stdenv.lib.licenses.mit; @@ -119841,6 +120556,8 @@ self: { pname = "inline-c"; version = "0.5.6.1"; sha256 = "0kpbwrri9idllwd7gfamghrdrz16zqjphmb3cp5nq160dxz73brd"; + revision = "1"; + editedCabalFile = "0q8wxvsi2gycyv98hw910p87633l9azchnn9783vsknbycsi1c64"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -120024,8 +120741,8 @@ self: { pname = "insert-ordered-containers"; version = "0.2.1.0"; sha256 = "1612f455dw37da9g7bsd1s5kyi84mnr1ifnjw69892amyimi47fp"; - revision = "8"; - editedCabalFile = "0ry5jsyimf1dx6013k1bhvsy3vjpg94q7z0sy9yxhmfdf16zb1fa"; + revision = "9"; + editedCabalFile = "02d4zqyb9dbahkpcbpgxylrc5xxc0zbw1awj5w0jyrql2g2b6a5f"; libraryHaskellDepends = [ aeson base base-compat hashable lens semigroupoids semigroups text transformers unordered-containers @@ -120092,6 +120809,8 @@ self: { pname = "inspection-testing"; version = "0.3"; sha256 = "0drrfl1k9y7vm270iwr1l451vifffn3qmxjm92rmdq9sk3kij3al"; + revision = "1"; + editedCabalFile = "06lb7gkgv5hns2kpslabl1zhd4i45wnnhcd4kmcz0n7d3hdx35cg"; libraryHaskellDepends = [ base containers ghc mtl template-haskell transformers ]; @@ -122697,8 +123416,8 @@ self: { }: mkDerivation { pname = "ixset"; - version = "1.1"; - sha256 = "147fr6hqvbnlrhy7zpxzg1iiciz4gzk2g281fkp4ylklq1lz9c4v"; + version = "1.1.1"; + sha256 = "1wjv6jfkv5z5j3af6dg7zlbir780mshq01x2wzlyav5dwr40di3m"; libraryHaskellDepends = [ base containers safecopy syb syb-with-class template-haskell ]; @@ -126716,6 +127435,8 @@ self: { pname = "kleene"; version = "0"; sha256 = "00hbrmsm19azxxql14y6k7h7z8k4azlmy4y0gimyqbx4nb7swln6"; + revision = "1"; + editedCabalFile = "1izdmr7a2d7qssnj732m2qc02inm3hrc882x9nyvz68648pvwwsx"; libraryHaskellDepends = [ base base-compat-batteries containers lattices MemoTrie QuickCheck range-set-list regex-applicative step-function text transformers @@ -128184,6 +128905,8 @@ self: { pname = "language-c"; version = "0.8.1"; sha256 = "0sdkjj0hq8p69fcdm6ljbjkjvrsrb8a6rl5dq6dj6byj32ajrm3d"; + revision = "2"; + editedCabalFile = "08h8a747k68nbv2mmbjlq2y2pqs738v8z54glrrh94963b2bh4h1"; libraryHaskellDepends = [ array base bytestring containers deepseq directory filepath pretty process syb @@ -128202,6 +128925,8 @@ self: { pname = "language-c"; version = "0.8.2"; sha256 = "05ff3ywh2lpxgd00nv6y3jnqpdl6bg0f2yn3csd043rv4srd6adp"; + revision = "1"; + editedCabalFile = "1xg49j4bykgdm6l14m65wyz8r3s4v4dqc7a9zjcsr12ffkiv8nam"; libraryHaskellDepends = [ array base bytestring containers deepseq directory filepath pretty process syb @@ -129524,6 +130249,8 @@ self: { pname = "lattices"; version = "1.7.1.1"; sha256 = "1byx2hmmh2213afdcsjxf3mvq3h9bwkl5wrvzxv1yqvd9jiqjz3r"; + revision = "1"; + editedCabalFile = "18182vlzaz5kzcn2j0k1jmdl8kgqmnpjc3ynsi7v6jdl3vig89dr"; libraryHaskellDepends = [ base base-compat containers deepseq hashable semigroupoids tagged universe-base universe-reverse-instances unordered-containers @@ -130041,6 +130768,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "leancheck_0_7_5" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "leancheck"; + version = "0.7.5"; + sha256 = "01hmbcp5kn4k0mgv7y5jap54d65ljdd3sm954s5y28h4xvk6dn7g"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base ]; + description = "Enumerative property-based testing"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "leankit-api" = callPackage ({ mkDerivation, aeson, base, bytestring, colour, curl, split }: mkDerivation { @@ -130517,6 +131257,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lens-family_1_2_3" = callPackage + ({ mkDerivation, base, containers, lens-family-core, mtl + , transformers + }: + mkDerivation { + pname = "lens-family"; + version = "1.2.3"; + sha256 = "0a8fvvc3fsi5fzk5bnqvbgdz22xvvw55nyfac6411q0pm6vy4nc0"; + libraryHaskellDepends = [ + base containers lens-family-core mtl transformers + ]; + description = "Lens Families"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lens-family-core" = callPackage ({ mkDerivation, base, containers, transformers }: mkDerivation { @@ -130528,6 +131284,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lens-family-core_1_2_3" = callPackage + ({ mkDerivation, base, containers, transformers }: + mkDerivation { + pname = "lens-family-core"; + version = "1.2.3"; + sha256 = "009rf10pj1cb50v44cc1pq7qvfrmkkk9dikahs9qmvbvgl3mykwi"; + libraryHaskellDepends = [ base containers transformers ]; + description = "Haskell 98 Lens Families"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lens-family-th" = callPackage ({ mkDerivation, base, hspec, template-haskell, transformers }: mkDerivation { @@ -131963,6 +132731,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lifted-async_0_10_0_3" = callPackage + ({ mkDerivation, async, base, constraints, criterion, deepseq + , HUnit, lifted-base, monad-control, mtl, tasty + , tasty-expected-failure, tasty-hunit, tasty-th, transformers-base + }: + mkDerivation { + pname = "lifted-async"; + version = "0.10.0.3"; + sha256 = "131bh83yc3jhy0hwgslvs9p9clgl4i2hhvwz2xgx7igpbhsrrl43"; + libraryHaskellDepends = [ + async base constraints lifted-base monad-control transformers-base + ]; + testHaskellDepends = [ + async base HUnit lifted-base monad-control mtl tasty + tasty-expected-failure tasty-hunit tasty-th + ]; + benchmarkHaskellDepends = [ async base criterion deepseq ]; + description = "Run lifted IO operations asynchronously and wait for their results"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lifted-base" = callPackage ({ mkDerivation, base, criterion, HUnit, monad-control, monad-peel , test-framework, test-framework-hunit, transformers @@ -136982,6 +137772,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "main-tester_0_2_0_0" = callPackage + ({ mkDerivation, base, bytestring, directory, hspec, hspec-core + , QuickCheck, text + }: + mkDerivation { + pname = "main-tester"; + version = "0.2.0.0"; + sha256 = "0iqb7p90hsygpscyddpvrxdaxka8hdc5xk3acacfns0didc7icnc"; + libraryHaskellDepends = [ base bytestring directory ]; + testHaskellDepends = [ + base bytestring hspec hspec-core QuickCheck text + ]; + description = "Capture stdout/stderr/exit code, and replace stdin of your main function"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mainland-pretty_0_6_2" = callPackage ({ mkDerivation, base, containers, srcloc, text, transformers }: mkDerivation { @@ -137667,8 +138474,8 @@ self: { }: mkDerivation { pname = "manifolds"; - version = "0.5.0.0"; - sha256 = "1261vap8raffngdxmzv042carjdlcssqbpa9vs3qi0x3jbbwiywc"; + version = "0.5.0.1"; + sha256 = "1l2rbf0axlbyvxdd62dhik4pk8n9jf2c6pxl86yi48hhvc3wyx07"; libraryHaskellDepends = [ array base call-stack comonad constrained-categories containers deepseq free free-vector-spaces ieee754 lens linear @@ -137690,8 +138497,8 @@ self: { ({ mkDerivation, base, call-stack, tagged, vector-space }: mkDerivation { pname = "manifolds-core"; - version = "0.5.0.0"; - sha256 = "0b8ac9l2asqlhazl0wlgb0qiyj1adk89m5fvhqqx1nw829dly6gw"; + version = "0.5.0.1"; + sha256 = "0bq102vfxq47if5nf0az92inzxgbla9by09nggi2nww4gqrd37v3"; libraryHaskellDepends = [ base call-stack tagged vector-space ]; description = "The basic classes for the manifolds hierarchy"; license = stdenv.lib.licenses.gpl3; @@ -140723,8 +141530,8 @@ self: { pname = "microstache"; version = "1.0.1.1"; sha256 = "0851sqr1ppdj6m822635pa3j6qzdf25gyrhkjs25zdry6518bsax"; - revision = "2"; - editedCabalFile = "0rl6vgmjnf1a14kiynh4gnmy6n6kkik9hqj9k5vqw68h4f110i4b"; + revision = "3"; + editedCabalFile = "1pq0h64vxc7zlncn2ld6k02wi6rfa5ccqc4z0hfkvaldj41y2sb1"; libraryHaskellDepends = [ aeson base bytestring containers deepseq directory filepath parsec text transformers unordered-containers vector @@ -142098,7 +142905,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "modern-uri_0_3_0_0" = callPackage + "modern-uri_0_3_0_1" = callPackage ({ mkDerivation, base, bytestring, containers, contravariant , criterion, deepseq, exceptions, hspec, hspec-discover , hspec-megaparsec, megaparsec, mtl, profunctors, QuickCheck @@ -142106,8 +142913,8 @@ self: { }: mkDerivation { pname = "modern-uri"; - version = "0.3.0.0"; - sha256 = "059p1lzfk7bwshlgy0sgms651003992jgxv2lr7r714sy5brfwb4"; + version = "0.3.0.1"; + sha256 = "01a5jnv8kbl2c9ka9dgqm4a8b7n6frmg7yi8f417qcnwgn1lbs78"; libraryHaskellDepends = [ base bytestring containers contravariant deepseq exceptions megaparsec mtl profunctors QuickCheck reflection tagged @@ -144139,6 +144946,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "monopati" = callPackage + ({ mkDerivation, base, comonad, directory, free, split }: + mkDerivation { + pname = "monopati"; + version = "0.1.0"; + sha256 = "18bx5xy3d3mk47499anrl1xlmxb8g3l35ibyllkcqhsx822zk9ij"; + libraryHaskellDepends = [ base comonad directory free split ]; + description = "Well-typed paths"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "montage" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, ListLike , old-locale, pool-conduit, protocol-buffers @@ -145696,6 +146514,8 @@ self: { pname = "multiset"; version = "0.3.4"; sha256 = "0kdmf0ba946pxq1m8q0x5bk2my2fd5frhaw3cj2i3x88nc9f0ycp"; + revision = "1"; + editedCabalFile = "0m7xk2217a5zpwb1hwp5j5r6yzlf0f4lmlnln2lb9bqihjl3j9x8"; libraryHaskellDepends = [ base containers deepseq ]; testHaskellDepends = [ base doctest Glob ]; description = "The Data.MultiSet container type"; @@ -148151,6 +148971,24 @@ self: { broken = true; }) {ghc-binary = null;}; + "net-spider" = callPackage + ({ mkDerivation, aeson, base, containers, greskell + , greskell-websocket, hashable, hspec, safe-exceptions, text, time + , unordered-containers, vector + }: + mkDerivation { + pname = "net-spider"; + version = "0.1.0.0"; + sha256 = "0vhvq29dr8s3w5acjpaha3k4g14li970rpx405dpj66l96pk2a7x"; + libraryHaskellDepends = [ + aeson base containers greskell greskell-websocket hashable + safe-exceptions text time unordered-containers vector + ]; + testHaskellDepends = [ base hspec vector ]; + description = "A graph database middleware to maintain a time-varying graph"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "netclock" = callPackage ({ mkDerivation, base, bytestring, hosc, network }: mkDerivation { @@ -149225,6 +150063,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "network-simple_0_4_3" = callPackage + ({ mkDerivation, base, bytestring, network, safe-exceptions, socks + , transformers + }: + mkDerivation { + pname = "network-simple"; + version = "0.4.3"; + sha256 = "0a4hag26ry6lg90q4ppchvrm5xaij50jd4633mhfkfq8scgczm8d"; + libraryHaskellDepends = [ + base bytestring network safe-exceptions socks transformers + ]; + description = "Simple network sockets usage patterns"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "network-simple-sockaddr" = callPackage ({ mkDerivation, base, bytestring, directory, exceptions, network , transformers @@ -149258,6 +150112,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "network-simple-tls_0_3_1" = callPackage + ({ mkDerivation, base, bytestring, data-default, network + , network-simple, safe-exceptions, tls, transformers, x509 + , x509-store, x509-system, x509-validation + }: + mkDerivation { + pname = "network-simple-tls"; + version = "0.3.1"; + sha256 = "12kwi2jc8g310wrw7ynq2hfhkxhh95qn0fy205g7a48xrw75npyj"; + libraryHaskellDepends = [ + base bytestring data-default network network-simple safe-exceptions + tls transformers x509 x509-store x509-system x509-validation + ]; + description = "Simple interface to TLS secured network sockets"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "network-socket-options" = callPackage ({ mkDerivation, base, network }: mkDerivation { @@ -149877,8 +150749,8 @@ self: { }: mkDerivation { pname = "ngx-export"; - version = "1.4.1"; - sha256 = "1a9swysq72igyfbqw078fj3j8vw6hw1v5h4f64kh9wvvdcrdl2rh"; + version = "1.4.2"; + sha256 = "10rfhx29b5l43i4fw7inp38i9a296gb0dsjs6jsm6g4d09pfjljs"; libraryHaskellDepends = [ async base binary bytestring deepseq monad-loops template-haskell unix @@ -151625,6 +152497,8 @@ self: { pname = "numtype-dk"; version = "0.5.0.2"; sha256 = "0avkdbhxijcja9i9g3cqh699mys8nhsxgrrpkknycmqpvp07sy4q"; + revision = "1"; + editedCabalFile = "0892xm8vyyvl1glg4vniz8r5ydg1nz3zmbpgk5mxdih6wi6nmpy4"; libraryHaskellDepends = [ base ]; description = "Type-level integers, using TypeNats, Data Kinds, and Closed Type Families"; license = stdenv.lib.licenses.bsd3; @@ -154832,12 +155706,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "packcheck_0_4_0" = callPackage + "packcheck_0_4_1" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "packcheck"; - version = "0.4.0"; - sha256 = "1dlvrad746ns76ah07wr9jgw454srag1wjrfp39pld26i70isif6"; + version = "0.4.1"; + sha256 = "056sjs771gdfvbyynb3vaxgabqj747hyhnbfjq83d0nnqyks8rdy"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; benchmarkHaskellDepends = [ base ]; @@ -156539,17 +157413,18 @@ self: { }) {}; "parconc-examples" = callPackage - ({ mkDerivation, abstract-par, accelerate, array, async, base + ({ mkDerivation, abstract-par, accelerate, alex, array, async, base , binary, bytestring, containers, deepseq, directory , distributed-process, distributed-process-simplelocalnet - , distributed-static, filepath, http-conduit, monad-par, network - , network-uri, normaldistribution, parallel, random, repa, stm - , template-haskell, time, transformers, utf8-string, vector, xml + , distributed-static, filepath, happy, http-conduit, monad-par + , network, network-uri, normaldistribution, parallel, random, repa + , stm, template-haskell, time, transformers, utf8-string, vector + , xml }: mkDerivation { pname = "parconc-examples"; - version = "0.4.5"; - sha256 = "172y33s74jx4cs0fykn5qg2c5s95kg5lngrins9ql9n97rb63pwh"; + version = "0.4.7"; + sha256 = "1r05ai6n6dgkqlcv4qlb10yzrjj86408ybz5zlh63qi2y34h9ga7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -156560,6 +157435,7 @@ self: { parallel random repa stm template-haskell time transformers utf8-string vector xml ]; + executableToolDepends = [ alex happy ]; description = "Examples to accompany the book \"Parallel and Concurrent Programming in Haskell\""; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -157244,6 +158120,8 @@ self: { pname = "passman-cli"; version = "0.2.0.0"; sha256 = "0l0cbhngg2dxsy95a24x1g19cpnmngcgdkxklzjymmcnqmxp7jd8"; + revision = "1"; + editedCabalFile = "197mlc2v7azdgdnvr2pxm2whhpqj4v2czwn5vi6ksrax82xswcnc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -157257,25 +158135,23 @@ self: { "passman-core" = callPackage ({ mkDerivation, aeson, async, base, bcrypt, bytestring, conduit - , conduit-extra, containers, cryptohash-md5, csv-conduit - , data-ordlist, directory, filepath, int-cast, memory, QuickCheck - , quickcheck-unicode, resourcet, template-haskell, temporary, text + , containers, cryptohash-md5, csv-conduit, data-ordlist, directory + , filepath, int-cast, memory, QuickCheck, quickcheck-instances + , quickcheck-unicode, template-haskell, temporary, text , unix-compat, yaml }: mkDerivation { pname = "passman-core"; - version = "0.2.0.0"; - sha256 = "03l43n8r0jdxbc07qjdazkanzd7lj1kp814ylhvn0ri9zzyfcgm7"; - revision = "1"; - editedCabalFile = "1840hm9wiym9jlgij1b2d8fa90pdscg2rqhzhvrl7qawd3jjxq5x"; + version = "0.2.0.1"; + sha256 = "1j258waghli2ahg25ihc13qjwz8zmy6ppld0y6sz3jphpg2azybs"; libraryHaskellDepends = [ - aeson base bcrypt bytestring conduit conduit-extra containers - cryptohash-md5 csv-conduit data-ordlist directory filepath int-cast - memory resourcet text unix-compat yaml + aeson base bcrypt bytestring conduit containers cryptohash-md5 + csv-conduit data-ordlist directory filepath int-cast memory text + unix-compat yaml ]; testHaskellDepends = [ - async base conduit filepath QuickCheck quickcheck-unicode - template-haskell temporary text yaml + async base conduit filepath QuickCheck quickcheck-instances + quickcheck-unicode template-haskell temporary text yaml ]; doHaddock = false; description = "Deterministic password generator core"; @@ -157613,6 +158489,8 @@ self: { pname = "patience"; version = "0.1.1"; sha256 = "0qyv20gqy9pb1acy700ahv70lc6vprcwb26cc7fcpcs4scsc7irm"; + revision = "1"; + editedCabalFile = "0xj4hypjnhsn5jhs66l9wwhpkn5pbd8xmx7pgcy2ib08cz1087y7"; libraryHaskellDepends = [ base containers ]; description = "Patience diff and longest increasing subsequence"; license = stdenv.lib.licenses.bsd3; @@ -160948,6 +161826,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pipes-concurrency_2_0_12" = callPackage + ({ mkDerivation, async, base, contravariant, pipes, semigroups, stm + , void + }: + mkDerivation { + pname = "pipes-concurrency"; + version = "2.0.12"; + sha256 = "17aqh6p1az09n6b6vs06pxcha5aq6dvqjwskgjcdiz7221vwchs3"; + libraryHaskellDepends = [ + async base contravariant pipes semigroups stm void + ]; + testHaskellDepends = [ async base pipes stm ]; + description = "Concurrency for the pipes ecosystem"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pipes-conduit" = callPackage ({ mkDerivation, base, conduit, mtl, pipes-core }: mkDerivation { @@ -163141,8 +164036,8 @@ self: { pname = "polyvariadic"; version = "0.3.0.3"; sha256 = "0zf7znslayjmcnajmsymc79f0lyyk7ph9zfczq78inirg0hv7hq1"; - revision = "2"; - editedCabalFile = "0bcckgz6v7707rdgipaahqws6gkcmmrq5wyl407awb3fssnqxfkn"; + revision = "3"; + editedCabalFile = "10lqcrp16v1h0lzr931haramkxkxz2bkfsyadxnc7ki73k39g11p"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base ]; description = "Creation and application of polyvariadic functions"; @@ -163956,6 +164851,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) postgresql;}; + "postgresql-libpq_0_9_4_2" = callPackage + ({ mkDerivation, base, bytestring, Cabal, postgresql, unix }: + mkDerivation { + pname = "postgresql-libpq"; + version = "0.9.4.2"; + sha256 = "1y86kysakfcf3zq252yl2llrx3765vxvkdwda4q5ql7ikv3m786f"; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ base bytestring unix ]; + librarySystemDepends = [ postgresql ]; + testHaskellDepends = [ base bytestring ]; + description = "low-level binding to libpq"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) postgresql;}; + "postgresql-named" = callPackage ({ mkDerivation, base, bytestring, extra, generics-sop, hspec, mtl , postgresql-libpq, postgresql-simple, utf8-string @@ -164015,6 +164925,8 @@ self: { pname = "postgresql-query"; version = "3.5.0"; sha256 = "1sh8kgfqy1kipz99v74xkxzfggbxxjq2gwswa94m1spy6r7k7avp"; + revision = "1"; + editedCabalFile = "11clkx7j4k3wgk6h1g0flq7frvkfxhh4dhbjjrchc5f7rd5gmjbp"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder bytestring containers data-default exceptions file-embed haskell-src-meta hreader hset @@ -164462,10 +165374,8 @@ self: { ({ mkDerivation, potoki-core }: mkDerivation { pname = "potoki"; - version = "2.1.2"; - sha256 = "1f4yf50zawxm6z2lidwrgcvc71f71aichqjihycibkrhp0s34ppj"; - revision = "1"; - editedCabalFile = "1qg6s7ppmz505r63k13qvm2ig6lknypji4jlkzpacricmkr3lymm"; + version = "2.1.3"; + sha256 = "1cg89jh2s2dim874h8vv52ab2dzvq01zvjn45fwdzs3j6815nlj4"; libraryHaskellDepends = [ potoki-core ]; description = "Simple streaming in IO"; license = stdenv.lib.licenses.mit; @@ -164480,8 +165390,8 @@ self: { }: mkDerivation { pname = "potoki-cereal"; - version = "0.3.1"; - sha256 = "1y6sgfafhnbgaifspli90ww4aj4r69vhkgl9v1jvspgrk67nzssj"; + version = "0.3.2"; + sha256 = "1fq36ahdrr16mxas2xh4qiwcagy61z2zfvc68p7r5hgdf36yz4d9"; libraryHaskellDepends = [ acquire attoparsec base base-prelude bytestring cereal potoki-core profunctors text @@ -164497,24 +165407,25 @@ self: { "potoki-core" = callPackage ({ mkDerivation, acquire, attoparsec, base, bytestring, criterion - , deepseq, directory, foldl, hashable, ilist, primitive - , profunctors, ptr, QuickCheck, quickcheck-instances, random - , rerebase, scanner, split, stm, tasty, tasty-hunit + , deepseq, deferred-folds, directory, foldl, hashable, ilist + , primitive, profunctors, ptr, QuickCheck, quickcheck-instances + , random, rerebase, scanner, split, stm, tasty, tasty-hunit , tasty-quickcheck, text, text-builder, time, transformers , unordered-containers, vector }: mkDerivation { pname = "potoki-core"; - version = "2.3.2"; - sha256 = "1438wvf81zx208l1sqxcly4rvvgw14vwhlmrh4zbkkn7pgxqlnky"; + version = "2.3.3"; + sha256 = "1f6rr75h4cqgy1qjh5qplcq1qz2pwc11mi4k61z691clz5yfmbm0"; libraryHaskellDepends = [ - acquire attoparsec base bytestring deepseq directory foldl hashable - primitive profunctors ptr scanner stm text text-builder time - transformers unordered-containers vector + acquire attoparsec base bytestring deepseq deferred-folds directory + foldl hashable primitive profunctors ptr scanner stm text + text-builder time transformers unordered-containers vector ]; testHaskellDepends = [ - acquire attoparsec foldl ilist QuickCheck quickcheck-instances - random rerebase split tasty tasty-hunit tasty-quickcheck + acquire attoparsec deferred-folds foldl ilist QuickCheck + quickcheck-instances random rerebase split tasty tasty-hunit + tasty-quickcheck ]; benchmarkHaskellDepends = [ criterion rerebase ]; description = "Low-level components of \"potoki\""; @@ -164739,6 +165650,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pqueue_1_4_1_2" = callPackage + ({ mkDerivation, base, deepseq, QuickCheck }: + mkDerivation { + pname = "pqueue"; + version = "1.4.1.2"; + sha256 = "1v4zhv2sc1zsw91hvnarkjhayx2dnf7ccxz6rrhsqpcs0szaranj"; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ base deepseq QuickCheck ]; + description = "Reliable, persistent, fast priority queues"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pqueue-mtl" = callPackage ({ mkDerivation, base, containers, ghc-prim, MaybeT, mtl , stateful-mtl, uvector @@ -169417,8 +170341,8 @@ self: { }: mkDerivation { pname = "qr-imager"; - version = "2.0.0.1"; - sha256 = "0n3f5zhyp0pvrb4ixvrvzs9af2x1mjprlnyjbhhldb3rc64jl7yd"; + version = "2.0.0.2"; + sha256 = "18fhvvnmd7nv9ls5jy4ng807q01m2dr4m0znjav57v9mc37vspqk"; libraryHaskellDepends = [ base binary bytestring cryptonite directory haskell-qrencode jose-jwt JuicyPixels microlens process split vector @@ -170018,8 +170942,8 @@ self: { }: mkDerivation { pname = "quickcheck-classes"; - version = "0.4.14.3"; - sha256 = "1vzn20bci14hlkbdrgjqzb16yyqg332rb1aspsdh19grj0cvr4l8"; + version = "0.5.0.0"; + sha256 = "1jg4wkysz2hdfkl9ah9lyvasnr01dvp3lfzzn1cin2ac6b1inj6v"; libraryHaskellDepends = [ aeson base bifunctors containers primitive QuickCheck semigroupoids semigroups semirings tagged transformers @@ -171585,6 +172509,8 @@ self: { pname = "range-set-list"; version = "0.1.3"; sha256 = "1pwnriv5r093qvqzzg9s868613nf92d3h8qmqaqc5qq95hykj6z5"; + revision = "1"; + editedCabalFile = "00ddj7if8lcrqf5c882m4slm15sdwcghz7d2fz222c7jcw1ahvdr"; libraryHaskellDepends = [ base containers deepseq hashable ]; testHaskellDepends = [ base containers deepseq hashable tasty tasty-quickcheck @@ -173319,8 +174245,8 @@ self: { pname = "recursion-schemes"; version = "5.0.3"; sha256 = "17x0kjl3yqanx234mb838yy21gw4if6qgzpi5l0b17m8llvp086v"; - revision = "1"; - editedCabalFile = "0r0qwxa0yg6814w8zfdla3k25x971a7pdr06sqws7fz5zri8rrn8"; + revision = "2"; + editedCabalFile = "13n38bchrkkijvy6jvhjskqn1b2kahfa9rvjvjcdn4bih4ylivk7"; libraryHaskellDepends = [ base base-orphans comonad free template-haskell th-abstraction transformers @@ -173802,6 +174728,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "refined_0_3_0_0" = callPackage + ({ mkDerivation, base, deepseq, exceptions, mtl, prettyprinter + , template-haskell, transformers + }: + mkDerivation { + pname = "refined"; + version = "0.3.0.0"; + sha256 = "106gh7wv6nldgl8rw722n7cam59x34vnr2an6l9hkivfp4pgkkks"; + libraryHaskellDepends = [ + base deepseq exceptions mtl prettyprinter template-haskell + transformers + ]; + description = "Refinement types with static and runtime checking"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "reflection" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -174270,8 +175213,8 @@ self: { pname = "regex-applicative-text"; version = "0.1.0.1"; sha256 = "1ng2qhk4mvpzl8fx91ig7ldv09v9aqdsvn6yl9yjapc6h0ghb4xh"; - revision = "2"; - editedCabalFile = "19sdafr0i252xyy017yxmz76ipl5bdg3hiv3ka8sjbwryj16gdwi"; + revision = "3"; + editedCabalFile = "1h911harqgfgkhdr22cndj2fdsl48sqhn8q0akgjngpf3p8z0bvv"; libraryHaskellDepends = [ base regex-applicative text ]; description = "regex-applicative on text"; license = stdenv.lib.licenses.bsd3; @@ -174882,20 +175825,20 @@ self: { "registry" = callPackage ({ mkDerivation, async, base, exceptions, hedgehog, hedgehog-corpus - , io-memoize, protolude, resourcet, tasty, tasty-discover - , tasty-hedgehog, tasty-th, text, transformers-base + , io-memoize, MonadRandom, protolude, random, resourcet, tasty + , tasty-discover, tasty-hedgehog, tasty-th, text, transformers-base }: mkDerivation { pname = "registry"; - version = "0.1.0.5"; - sha256 = "0yqv58ra2h7cmnwvbpbdxma69qr1n44gw8mckrr0sq38rah9dxg3"; + version = "0.1.1.0"; + sha256 = "0in2kb12848g4ggph2m2h2csc3j0jg9572vi25pdlvr5xrlvxm0m"; libraryHaskellDepends = [ base exceptions protolude resourcet text transformers-base ]; testHaskellDepends = [ - async base exceptions hedgehog hedgehog-corpus io-memoize protolude - resourcet tasty tasty-discover tasty-hedgehog tasty-th text - transformers-base + async base exceptions hedgehog hedgehog-corpus io-memoize + MonadRandom protolude random resourcet tasty tasty-discover + tasty-hedgehog tasty-th text transformers-base ]; testToolDepends = [ tasty-discover ]; description = "data structure for assembling \"components\""; @@ -175329,6 +176272,8 @@ self: { pname = "relude"; version = "0.3.0"; sha256 = "10cbgz1xzw67q3y9fw8px7wwxblv5qym51qpdljmjz4ilpy0k35j"; + revision = "1"; + editedCabalFile = "04jfgc38pwrqir1j91l8jfzsp0hzggxr7kmbnfqcgrlpqidpj7mh"; libraryHaskellDepends = [ base bytestring containers deepseq ghc-prim hashable mtl stm text transformers unordered-containers utf8-string @@ -177406,19 +178351,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "rhine_0_4_0_4" = callPackage - ({ mkDerivation, base, containers, dunai, free, time, transformers + "rhine_0_5_0_1" = callPackage + ({ mkDerivation, base, containers, deepseq, dunai, free, time + , transformers, vector-sized }: mkDerivation { pname = "rhine"; - version = "0.4.0.4"; - sha256 = "00s2rsj3h7wamlrh2p7a600pwqlrrishxy2q2f6av0pzyc8dkc89"; - isLibrary = true; - isExecutable = true; + version = "0.5.0.1"; + sha256 = "0mxqr441bav2gs856qmvivl9cd53gh28ycary112vxinalijjh23"; libraryHaskellDepends = [ - base containers dunai free time transformers + base containers deepseq dunai free time transformers vector-sized ]; - executableHaskellDepends = [ base ]; description = "Functional Reactive Programming with type-level clocks"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -177428,8 +178371,8 @@ self: { ({ mkDerivation, base, dunai, gloss, rhine }: mkDerivation { pname = "rhine-gloss"; - version = "0.4.0.4"; - sha256 = "0xbmqhznacmxvcrx1gaq4cy6f98fb2p4f07g16qp50zhs9mb2a63"; + version = "0.5.0.1"; + sha256 = "0pj0in2xyz3g81rf175m65gwbwndabd0k2icsdcp3jcyqakzwari"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base dunai gloss rhine ]; @@ -179623,8 +180566,8 @@ self: { pname = "safe-exceptions"; version = "0.1.7.0"; sha256 = "0sd0zfsm9pcll5bzzj523rbn45adjrnavdkz52hgmdjjgdcdrk8q"; - revision = "3"; - editedCabalFile = "0y1b9pw5wriyiffcmvk9g53imh6lm5fgfbjsgpn2w96qspaagdb5"; + revision = "4"; + editedCabalFile = "0fid41gishzsyb47wzxhd5falandfirqcp760hcja81qjpfmqd32"; libraryHaskellDepends = [ base deepseq exceptions transformers ]; testHaskellDepends = [ base hspec void ]; description = "Safe, consistent, and easy exception handling"; @@ -180821,8 +181764,8 @@ self: { }: mkDerivation { pname = "sbv"; - version = "7.11"; - sha256 = "16kbhpfpzqxhc1zbxpjyvq89bnmhgm20v48np53dhqbpwjnphvva"; + version = "7.12"; + sha256 = "1lbihjy2nbr77xm1jnvqdjqkabpxjlbdddsdvsr7n9a60bjcr2yx"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array async base containers crackNum deepseq directory filepath @@ -183136,8 +184079,8 @@ self: { }: mkDerivation { pname = "semirings"; - version = "0.2.0.1"; - sha256 = "1larh2rp9sa3zd0d7bn6wc0i3hy455dr5zixmp34i8v135wqay2b"; + version = "0.2.1.0"; + sha256 = "0jmd7qgdwbyzck8x9i4acs9fx1ww26qr8s74raf0fv9bykynzyy2"; libraryHaskellDepends = [ base containers hashable integer-gmp unordered-containers vector ]; @@ -183361,8 +184304,8 @@ self: { pname = "separated"; version = "0.3.2.1"; sha256 = "0xnpxaz9qr2qqg7kmgv1qsbd4943r54m1vva3xivn4cxf1gnxcaw"; - revision = "1"; - editedCabalFile = "0d0721vf4lcixbrm24jlrvjjc1m1w1638ds7pkgz7hy4armznik1"; + revision = "2"; + editedCabalFile = "1q501zsxf5kl65aqp8cdaxj2y61jq3480r31cnr81w14ikrd5wdy"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bifunctors deriving-compat lens semigroupoids semigroups @@ -186699,8 +187642,10 @@ self: { }: mkDerivation { pname = "shake-ats"; - version = "1.9.0.5"; - sha256 = "1j417h6nkwkjgprcaf59lilv6d151qhc8ibzd0jimkx08pv414rz"; + version = "1.10.0.1"; + sha256 = "1p95r4ksfrb4hs9v75iq9iz565qz43k3cw63sz32nphqn204dbxz"; + revision = "1"; + editedCabalFile = "0x23r58i4yhf9rcaxfdy09nr93cpkr0cmxrwcn11hgcr1nkzaa0d"; libraryHaskellDepends = [ base binary dependency directory hs2ats language-ats microlens shake shake-c shake-cabal shake-ext text @@ -186727,8 +187672,8 @@ self: { }: mkDerivation { pname = "shake-cabal"; - version = "0.1.0.5"; - sha256 = "1h8a3c3fwg2jz1p6k5253hjfaqbwwwdygrj2hdsgwn6laq75kd6s"; + version = "0.2.0.0"; + sha256 = "13fzc57jl52c6j1wjmp4z39jwbqrnlwl5l8vxqk6hz814apsd555"; libraryHaskellDepends = [ base Cabal composition-prelude directory filepath shake ]; @@ -186964,7 +187909,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; - "shakespeare_2_0_17" = callPackage + "shakespeare_2_0_18" = callPackage ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec , process, scientific, template-haskell, text, time, transformers @@ -186972,8 +187917,8 @@ self: { }: mkDerivation { pname = "shakespeare"; - version = "2.0.17"; - sha256 = "1j6habv4glf8bvxiil9f59b553lfsi7mr7i30r63sy3g85qi09jg"; + version = "2.0.18"; + sha256 = "1ny9j1p12c134q5y7k2lg8qgf8sqa328vrb8md9ib44w3xwy6wjr"; libraryHaskellDepends = [ aeson base blaze-html blaze-markup bytestring containers directory exceptions ghc-prim parsec process scientific template-haskell text @@ -189177,6 +190122,8 @@ self: { pname = "singleton-bool"; version = "0.1.4"; sha256 = "0apvzb6ym0fnm4rx7paz6ivv72ahzn2bxhvyd1drw50ypvicd581"; + revision = "1"; + editedCabalFile = "0ccd49z9xwa8gr8sclmmn0zc4xq39yyjws4zr6lrw3xjql130nsx"; libraryHaskellDepends = [ base ]; description = "Type level booleans"; license = stdenv.lib.licenses.bsd3; @@ -189979,15 +190926,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "slave-thread_1_0_2_1" = callPackage + "slave-thread_1_0_2_2" = callPackage ({ mkDerivation, base, deferred-folds, foldl, HTF, mmorph , partial-handler, QuickCheck, quickcheck-instances, rerebase , SafeSemaphore, stm-containers, transformers }: mkDerivation { pname = "slave-thread"; - version = "1.0.2.1"; - sha256 = "1bnx07zy89ym45bs1dhnwgxls7jz8yv64j5j0wsym3qqzqdk04dh"; + version = "1.0.2.2"; + sha256 = "1jf8n989gsxbqkyxj8kd523dxp5bxs9cs4s6jd4j95mvij6pgpgl"; libraryHaskellDepends = [ base deferred-folds foldl mmorph partial-handler stm-containers transformers @@ -190669,8 +191616,8 @@ self: { }: mkDerivation { pname = "smuggler"; - version = "0.0.1"; - sha256 = "16f2s1gp5ww2ingil60fq5w6ghs3f1cscsl8qn7ibg0jqj0w5q89"; + version = "0.1.0"; + sha256 = "0iyisn5s39haik3g1wld67pdpnl8h3zafxhkgyd3ajx9lg9nf741"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -190679,7 +191626,7 @@ self: { ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base directory filepath ]; - description = "Smuggling"; + description = "GHC Source Plugin that helps to manage imports"; license = stdenv.lib.licenses.mpl20; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -193266,10 +194213,10 @@ self: { }: mkDerivation { pname = "spatial-rotations"; - version = "0.1.0.0"; - sha256 = "1315zk74kznhizi7wvd48n0j06d1ja3z16240hv16cbsh14lsxhm"; + version = "0.1.0.1"; + sha256 = "02nysw4dbg5l37j83kdybxkrdzgjxn20h3lknnphwz0hr0n489ii"; revision = "1"; - editedCabalFile = "1qsnkxg0r68c675fsvg2wsqkkimlzx9zw92zwmpv69ww42qxrrhy"; + editedCabalFile = "1g2ib60nhwwdb9fjdnmn7z0bzrsac6xcsl6bs7wi6s5rr991pp1c"; libraryHaskellDepends = [ base linear manifolds-core vector-space ]; @@ -193830,6 +194777,8 @@ self: { pname = "splitmix"; version = "0.0.1"; sha256 = "0bvpx3hnyhz449s2c2mi5h78024yysnqldfwp7m0qr21m41q0v1a"; + revision = "1"; + editedCabalFile = "0c38sajdpqcmicdh4lfy6vpg8wnzpiyamvbximdsqs605frs3mqs"; libraryHaskellDepends = [ base deepseq random time ]; testHaskellDepends = [ async base base-compat-batteries bytestring deepseq process random @@ -194861,6 +195810,8 @@ self: { pname = "stache"; version = "2.0.1"; sha256 = "0awyh8zjvly18s4gnqy4970fj1hr4zpb38lisfy6px42m38g17vk"; + revision = "1"; + editedCabalFile = "1mpx4wddn17vki1yz8kq4ra5yzxnrndx8rg8w21lg6cjgvlp81f0"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers deepseq directory filepath @@ -196368,6 +197319,8 @@ self: { pname = "step-function"; version = "0.2"; sha256 = "1mg7zqqs32zdh1x1738kk0yydyksbhx3y3x8n31f7byk5fvzqq6j"; + revision = "1"; + editedCabalFile = "03ga9vwaxsf0c73fciavkm925l7lkgya1a6xghyb8ainrav0bfq4"; libraryHaskellDepends = [ base base-compat-batteries containers deepseq QuickCheck ]; @@ -196518,6 +197471,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "stm-conduit_4_0_1" = callPackage + ({ mkDerivation, async, base, cereal, cereal-conduit, conduit + , conduit-extra, directory, doctest, exceptions, HUnit, monad-loops + , QuickCheck, resourcet, stm, stm-chans, test-framework + , test-framework-hunit, test-framework-quickcheck2, transformers + , unliftio + }: + mkDerivation { + pname = "stm-conduit"; + version = "4.0.1"; + sha256 = "0hhlxvpp7mah8dcvkknh6skx44jfk3092zz2w52zlr255bkmn3p8"; + libraryHaskellDepends = [ + async base cereal cereal-conduit conduit conduit-extra directory + exceptions monad-loops resourcet stm stm-chans transformers + unliftio + ]; + testHaskellDepends = [ + base conduit directory doctest HUnit QuickCheck resourcet stm + stm-chans test-framework test-framework-hunit + test-framework-quickcheck2 transformers unliftio + ]; + description = "Introduces conduits to channels, and promotes using conduits concurrently"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "stm-containers" = callPackage ({ mkDerivation, async, base, base-prelude, containers, criterion , focus, free, hashable, hashtables, HTF, list-t, loch-th, mtl @@ -197155,15 +198134,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stratosphere_0_25_0" = callPackage + "stratosphere_0_26_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , hashable, hspec, hspec-discover, lens, template-haskell, text , unordered-containers }: mkDerivation { pname = "stratosphere"; - version = "0.25.0"; - sha256 = "0blrdrqhjh3cfddx8y3ra3vzicrcp8zin8fxnjk8hpz546d3a5a4"; + version = "0.26.0"; + sha256 = "126fhymf1n96z40lima2kyh2sm68v63f1b7agmdpp6ihjd96xy0i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -198647,6 +199626,8 @@ self: { pname = "structured-haskell-mode"; version = "1.1.0"; sha256 = "1d1qv9d8qifcxbxqb6a6j0fsi65lg8sndn7hn2s38hgnxdb7llf5"; + revision = "1"; + editedCabalFile = "0z3rd0wpnw9xrz2jrda6n8lg0mnzmgkjrjc48vzdjsf76ysjnfka"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -199617,15 +200598,17 @@ self: { "sv" = callPackage ({ mkDerivation, attoparsec, base, bifunctors, bytestring, cassava - , contravariant, hedgehog, hw-dsv, lens, Only, parsers - , semigroupoids, semigroups, sv-core, tasty, tasty-hedgehog - , tasty-hunit, text, transformers, trifecta, utf8-string - , validation, vector + , contravariant, criterion, deepseq, hedgehog, hw-dsv, lens, Only + , parsers, semigroupoids, semigroups, sv-core, tasty + , tasty-hedgehog, tasty-hunit, text, transformers, trifecta + , utf8-string, validation, vector }: mkDerivation { pname = "sv"; - version = "1.1.1"; - sha256 = "1d4f7l2k8vpskwf6iywfj7ivmfhdk2b10c9k8qrk6lms2mx0mwmh"; + version = "1.2"; + sha256 = "148d8jircfyrp0y2rqchs1k3kfmis3bdvc6rib39fkbj699pyw2s"; + revision = "2"; + editedCabalFile = "1aa4pxzqyk3xqqadi52aa257h7440jawws9mh9l02qswypn87jq4"; libraryHaskellDepends = [ attoparsec base bifunctors bytestring contravariant hw-dsv semigroupoids sv-core transformers utf8-string validation @@ -199635,6 +200618,10 @@ self: { semigroupoids semigroups tasty tasty-hedgehog tasty-hunit text trifecta utf8-string validation vector ]; + benchmarkHaskellDepends = [ + attoparsec base bytestring criterion deepseq hw-dsv lens text + vector + ]; description = "Encode and decode separated values (CSV, PSV, ...)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -199646,10 +200633,8 @@ self: { }: mkDerivation { pname = "sv-cassava"; - version = "0.2"; - sha256 = "01bhh3b85gsbgm3fb0ppb1ihcm2p0rkv6bsmw16l3b2jgj806zin"; - revision = "1"; - editedCabalFile = "1manx0gs4rzsrg9mg83g7ipv36bplxl466c2ypf5dx5f2pn1xvjx"; + version = "0.3"; + sha256 = "1c4wacp7k5sgr5fy73h9if98d08apmcs6p4p3f3fvpqkm8jmf71b"; libraryHaskellDepends = [ attoparsec base bytestring cassava sv-core utf8-string validation vector @@ -199671,8 +200656,8 @@ self: { }: mkDerivation { pname = "sv-core"; - version = "0.2.2"; - sha256 = "08wd9ajzzhkqg5ghqr3vilq1w8h8vypd3yy63ql6amnqdnjw02mf"; + version = "0.3"; + sha256 = "12mjv13rgix4h064ch01hbmkxxz7dp69nazpksvj1fjx16m5dvw6"; libraryHaskellDepends = [ attoparsec base bifunctors bytestring containers contravariant deepseq lens mtl parsec profunctors readable semigroupoids @@ -199694,8 +200679,8 @@ self: { }: mkDerivation { pname = "sv-svfactor"; - version = "0.1"; - sha256 = "0j97va25p30x3q07084mbv4lsls6p2yky8y7zmf9w6i7i42r3bi0"; + version = "0.2"; + sha256 = "1fjgryypq6i4r3w9zdb282aq5lqp4577mzzycafklphc0d2ancgb"; libraryHaskellDepends = [ base bytestring lens profunctors sv-core svfactor validation ]; @@ -200209,8 +201194,8 @@ self: { }: mkDerivation { pname = "syb-with-class"; - version = "0.6.1.9"; - sha256 = "1apvvzzc19lbchmbginmhxzcrvrcg76dvdgsk51pxrnr4glnva86"; + version = "0.6.1.10"; + sha256 = "0fhkxzcvalaqv554cmjmc56b3h7vxai3k2dd1fsp7ca124ikyzm7"; libraryHaskellDepends = [ array base bytestring containers template-haskell ]; @@ -202683,6 +203668,8 @@ self: { pname = "tasty-expected-failure"; version = "0.11.1.1"; sha256 = "1i2s809m644b7hgiblqay9j364r3fjj1rwbrahsn1pgr5q6mr6ji"; + revision = "1"; + editedCabalFile = "1b3fn7d3zwhhwm3gp8cmmsdcrvn9dhshd665xrx1mk6cmy4m8k16"; libraryHaskellDepends = [ base tagged tasty ]; description = "Mark tasty tests as failure expected"; license = stdenv.lib.licenses.mit; @@ -202752,8 +203739,8 @@ self: { pname = "tasty-hedgehog"; version = "0.2.0.0"; sha256 = "10m1akbiblnjq9ljk469725k30b254d36d267rk51z2f171py42s"; - revision = "4"; - editedCabalFile = "04d7lhn0dlqna0pqz7wxmz2y6vq7qar2m2g432z38cvm5na9w4y0"; + revision = "5"; + editedCabalFile = "1ykmjb00whqq1hap4l8d4187qflxi6xdnm86czxrzmz4l3lj33gr"; libraryHaskellDepends = [ base hedgehog tagged tasty ]; testHaskellDepends = [ base hedgehog tasty tasty-expected-failure @@ -203025,6 +204012,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tasty-silver_3_1_12" = callPackage + ({ mkDerivation, ansi-terminal, async, base, bytestring, containers + , deepseq, directory, filepath, mtl, optparse-applicative, process + , process-extras, regex-tdfa, semigroups, stm, tagged, tasty + , tasty-hunit, temporary, text, transformers + }: + mkDerivation { + pname = "tasty-silver"; + version = "3.1.12"; + sha256 = "0s6cz0z8xmhc3gqyb68lkx0j94kagbdgc5gagknmfj6an2i33fly"; + libraryHaskellDepends = [ + ansi-terminal async base bytestring containers deepseq directory + filepath mtl optparse-applicative process process-extras regex-tdfa + semigroups stm tagged tasty temporary text + ]; + testHaskellDepends = [ + base directory filepath process tasty tasty-hunit temporary + transformers + ]; + description = "A fancy test runner, including support for golden tests"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-smallcheck" = callPackage ({ mkDerivation, async, base, smallcheck, tagged, tasty }: mkDerivation { @@ -205082,6 +206093,8 @@ self: { pname = "texmath"; version = "0.11.1"; sha256 = "169jp9y6azpkkcbx0h03kbjg7f58wsk7bs18dn3h9m3sia6bnw99"; + revision = "1"; + editedCabalFile = "0szpd2kbwb9yqial0q583czy21dnkgyrhizmi7hp38kkhqp7vr9y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -205964,10 +206977,8 @@ self: { }: mkDerivation { pname = "text1"; - version = "0.0.6"; - sha256 = "105y6dbmc3bdbh02v5m6bjsm932d68i262csii1n8kls6rggnfy2"; - revision = "1"; - editedCabalFile = "0qlgv9aabmj7lky55ah8qq7x2w0w6j3m1kykq8iy2d3ymss2jasw"; + version = "0.0.6.1"; + sha256 = "10kzl1gwi08pxzs8flr5bhfcwqgcl0jz9cadw3hqmbmynpij95ij"; libraryHaskellDepends = [ base binary lens semigroups text ]; testHaskellDepends = [ base HUnit lens QuickCheck semigroups text @@ -207311,6 +208322,8 @@ self: { pname = "thumbnail-plus"; version = "1.0.5"; sha256 = "0320yfgnsazl7bxm9zf077mi4dgfmlcfnzy1qpdl9w3jl5i7z441"; + revision = "1"; + editedCabalFile = "0ghmlvcwy8klfq2f0brsg0zyqd0rbclfb990b50clmd2dsmx83wl"; libraryHaskellDepends = [ base bytestring conduit conduit-extra data-default directory either gd imagesize-conduit resourcet temporary transformers @@ -207880,8 +208893,8 @@ self: { pname = "time-parsers"; version = "0.1.2.0"; sha256 = "091wpcqj1kjvyjgj1y1invn0g5lhdxc92az2bcbwbrpq2c7x8l2f"; - revision = "2"; - editedCabalFile = "1qvhmwkdb4a0msxpfssyqdz0fmi45iv7iwmw7b1mf4flqz6jvaql"; + revision = "3"; + editedCabalFile = "0im963wjcmwf6ii9a00mbi8lhmx5cy7cs6rmp0qi2j2jddba78j2"; libraryHaskellDepends = [ base parsers template-haskell time ]; testHaskellDepends = [ attoparsec base bifunctors parsec parsers tasty tasty-hunit @@ -210525,8 +211538,8 @@ self: { pname = "tree-diff"; version = "0.0.1"; sha256 = "049v44c520jy3icxlnrvbdblh3mjmvd7m6qmkzxbzkf02x63xqmz"; - revision = "4"; - editedCabalFile = "1rqxxyj6hqllahs11693g855cxz8mgnb490s7j1ksd300i5xgjsp"; + revision = "5"; + editedCabalFile = "1rj2n9d6mmk6zijnlc0q72s2qs8hhwhf25gpqqswaiqhbbh7gxi2"; libraryHaskellDepends = [ aeson ansi-terminal ansi-wl-pprint base base-compat bytestring containers generics-sop hashable MemoTrie parsec parsers pretty @@ -214810,8 +215823,8 @@ self: { pname = "universe-instances-base"; version = "1.0"; sha256 = "04njgl32lk5a0masjdjkm4l2wsyrr29g0fsp599864mp7gp504d2"; - revision = "1"; - editedCabalFile = "13s8gxsvkw6phwvd79h9f3xaqbyzsx1svpysbmq72z1hv3mqyz8a"; + revision = "2"; + editedCabalFile = "0c9zxmifhy2qjvsikgm168n8k8ka8ia88ldy8qjqkz5pqknlr9sj"; libraryHaskellDepends = [ base containers universe-base ]; description = "Universe instances for types from the base package"; license = stdenv.lib.licenses.bsd3; @@ -214857,8 +215870,8 @@ self: { pname = "universe-reverse-instances"; version = "1.0"; sha256 = "0jcd7qyvzq8xxv9d3hfi0f1h48xdsy9r9xnxgxc7ggga4szirm79"; - revision = "1"; - editedCabalFile = "0rq6h7yghnzrnv56pxnlfr6cfih8dbnhc6hh5416pgy5bxsa0ydj"; + revision = "2"; + editedCabalFile = "0cpnsip1iakwkgnwnd21gwrc8qbifzpff6agjwm34jgkq9j646k8"; libraryHaskellDepends = [ base containers universe-instances-base ]; @@ -215194,6 +216207,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "unliftio-streams" = callPackage + ({ mkDerivation, base, bytestring, io-streams, text, unliftio-core + }: + mkDerivation { + pname = "unliftio-streams"; + version = "0.1.0.0"; + sha256 = "0ylyk1g00isqzr7nbhrkf3m0yc36lfjb020lb1ip4s3ymlvkkp22"; + libraryHaskellDepends = [ + base bytestring io-streams text unliftio-core + ]; + description = "Generalization of io-streams to MonadUnliftIO"; + license = stdenv.lib.licenses.asl20; + }) {}; + "unlit" = callPackage ({ mkDerivation, base, directory, text }: mkDerivation { @@ -217018,6 +218045,8 @@ self: { pname = "validate-input"; version = "0.4.0.0"; sha256 = "1yd187xa762b6zwjsyh3qp11sn3cnwh8g5imp0izk7a22x5y5yi0"; + revision = "1"; + editedCabalFile = "0qfwr05111adjfy6j0cbhrzyxgl3ngfpm0irf1hcgmfxnb8psqli"; libraryHaskellDepends = [ base bytestring either mtl pcre-heavy semigroups string-conversions text @@ -217689,8 +218718,8 @@ self: { pname = "vec"; version = "0.1"; sha256 = "0m70ld5vy96vca4wdm45q1ixwznl3yfj8jzil2kjfkzzac5fym5y"; - revision = "2"; - editedCabalFile = "00z6y4a5hi5pwnnakj00qs3kglaykf4i3kwd9iz8bi2kmm6b09lx"; + revision = "3"; + editedCabalFile = "093q5qlhlia12ckhvax322lyy3sb554pg46ghabvsvx8znixw2hh"; libraryHaskellDepends = [ adjunctions base base-compat deepseq distributive fin hashable lens semigroupoids @@ -217947,6 +218976,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "vector-extras" = callPackage + ({ mkDerivation, base, containers, deferred-folds, hashable + , unordered-containers, vector + }: + mkDerivation { + pname = "vector-extras"; + version = "0.2"; + sha256 = "0c0wq7ymjhfhxdwkgjd7iwp4vb22495ajrv2ddq6iihc4svakzlw"; + libraryHaskellDepends = [ + base containers deferred-folds hashable unordered-containers vector + ]; + description = "Utilities for the \"vector\" library"; + license = stdenv.lib.licenses.mit; + }) {}; + "vector-fftw" = callPackage ({ mkDerivation, base, fftw, primitive, storable-complex, vector }: mkDerivation { @@ -218090,8 +219134,8 @@ self: { pname = "vector-space"; version = "0.13"; sha256 = "05yn93vnhzhpp2i6qb4b3dasvmpk71rab6vhssqvpb3qhdvxb482"; - revision = "1"; - editedCabalFile = "0iakf0srv3lpkyjvivj7w5swv2ybwas0kx59igkq2b7bwp0y82wn"; + revision = "2"; + editedCabalFile = "1p9vibym0ggr1rjyak0wphswdl4vik2b2w85afgvyj9zn32w28bw"; libraryHaskellDepends = [ base Boolean MemoTrie NumInstances ]; description = "Vector & affine spaces, linear maps, and derivatives"; license = stdenv.lib.licenses.bsd3; @@ -218103,6 +219147,8 @@ self: { pname = "vector-space"; version = "0.14"; sha256 = "1kfziqdnsjr540y8iajpfmdkarhmjnc5xm897bswjhrpgyh2k6h3"; + revision = "2"; + editedCabalFile = "0rz23fkpx6fgn3pjmmnz0mj5iyq70wv4j9z0c4c9ar7g72dalch7"; libraryHaskellDepends = [ base Boolean MemoTrie NumInstances ]; description = "Vector & affine spaces, linear maps, and derivatives"; license = stdenv.lib.licenses.bsd3; @@ -222414,6 +223460,41 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "websockets_0_12_5_2" = callPackage + ({ mkDerivation, attoparsec, base, base64-bytestring, binary + , bytestring, bytestring-builder, case-insensitive, containers + , criterion, entropy, HUnit, network, QuickCheck, random, SHA + , streaming-commons, test-framework, test-framework-hunit + , test-framework-quickcheck2, text + }: + mkDerivation { + pname = "websockets"; + version = "0.12.5.2"; + sha256 = "0wacifjbskkfv6xq1sbmc8p60wn767xcjhz8hn8hyijxrrmjabci"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base base64-bytestring binary bytestring + bytestring-builder case-insensitive containers entropy network + random SHA streaming-commons text + ]; + testHaskellDepends = [ + attoparsec base base64-bytestring binary bytestring + bytestring-builder case-insensitive containers entropy HUnit + network QuickCheck random SHA streaming-commons test-framework + test-framework-hunit test-framework-quickcheck2 text + ]; + benchmarkHaskellDepends = [ + attoparsec base base64-bytestring binary bytestring + bytestring-builder case-insensitive containers criterion entropy + network random SHA text + ]; + doCheck = false; + description = "A sensible and clean way to write WebSocket-capable servers in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "websockets-rpc" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers , exceptions, hashable, monad-control, mtl, QuickCheck @@ -223343,21 +224424,21 @@ self: { }) {}; "wkt-geom" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring, geojson - , hspec, lens, QuickCheck, scientific, trifecta, utf8-string - , vector + ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring + , containers, geojson, hspec, lens, QuickCheck, scientific + , trifecta, utf8-string, vector }: mkDerivation { pname = "wkt-geom"; - version = "0.0.1"; - sha256 = "069jwfycqjg5dz4w80ywwjn3pky5kzg7wlwd7qk9y8lwca0bv4ij"; + version = "0.0.4"; + sha256 = "00v2zqgy41zd13yyadiw9x3s2napz0wl3jcq10xbb3i59jb03fa2"; libraryHaskellDepends = [ - base binary bytestring geojson scientific trifecta utf8-string - vector + base binary bytestring containers geojson scientific trifecta + utf8-string vector ]; testHaskellDepends = [ - ansi-wl-pprint base binary bytestring geojson hspec lens QuickCheck - scientific trifecta vector + ansi-wl-pprint base binary bytestring containers geojson hspec lens + QuickCheck scientific trifecta vector ]; description = "A parser of WKT, WKB and eWKB"; license = stdenv.lib.licenses.asl20; @@ -226430,6 +227511,8 @@ self: { pname = "xmonad-contrib"; version = "0.14"; sha256 = "1660w3xhbfrlq8b8s1rviq2mcn1vyqpypli4023gqxwry52brk6y"; + revision = "2"; + editedCabalFile = "0412lfkq9y2s7avzm7ajx5fmyacqrad3yzv9cz9xp5dg66dn5h60"; libraryHaskellDepends = [ base bytestring containers directory extensible-exceptions filepath mtl old-locale old-time process random semigroups unix utf8-string @@ -226593,6 +227676,8 @@ self: { pname = "xmonad-volume"; version = "0.1.0.1"; sha256 = "0lv1009d8w2xyx98c6g65z4mxp31jz79lqayvdw26a02kq63cild"; + revision = "1"; + editedCabalFile = "0wj87ijsfdzibx0k6m1pq2m47gkaddbdy282hcqiishfibkqrig5"; libraryHaskellDepends = [ alsa-mixer base composition-prelude containers X11 ]; @@ -231541,6 +232626,8 @@ self: { pname = "zip"; version = "1.2.0"; sha256 = "1jbxnbiizdklv0pw8f22h38xbmk6d4wggy27w8injdsfi18f27dn"; + revision = "1"; + editedCabalFile = "084dfylc1h45r4v2zyld1vvrxs6x1ljq8hzinqrkv2ii748cmzdb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ diff --git a/pkgs/development/haskell-modules/patches/fgl-monad-fail.patch b/pkgs/development/haskell-modules/patches/fgl-monad-fail.patch new file mode 100644 index 000000000000..d0df9b774e48 --- /dev/null +++ b/pkgs/development/haskell-modules/patches/fgl-monad-fail.patch @@ -0,0 +1,61 @@ +From 344a7e452630ace0f5c647e525e0299d99de5902 Mon Sep 17 00:00:00 2001 +From: Alex Washburn <github@recursion.ninja> +Date: Mon, 20 Aug 2018 23:46:32 -0400 +Subject: [PATCH] Fixing issue with MonadFailDesugaring. + +--- + .travis.yml | 9 +++++++++ + Data/Graph/Inductive/Monad.hs | 14 ++++++++++++-- + fgl.cabal | 3 ++- + 3 files changed, 23 insertions(+), 3 deletions(-) + +diff --git a/.travis.yml b/.travis.yml +index db5eeb1..f026dd1 100644 +--- a/Data/Graph/Inductive/Monad.hs ++++ b/Data/Graph/Inductive/Monad.hs +@@ -1,4 +1,4 @@ +-{-# LANGUAGE MultiParamTypeClasses #-} ++{-# LANGUAGE CPP, MultiParamTypeClasses #-} + + -- (c) 2002 by Martin Erwig [see file COPYRIGHT] + -- | Monadic Graphs +@@ -19,6 +19,10 @@ module Data.Graph.Inductive.Monad( + + + import Data.Graph.Inductive.Graph ++#if MIN_VERSION_base(4,12,0) ++import Control.Monad.Fail ++import Prelude hiding (fail) ++#endif + + {-# ANN module "HLint: ignore Redundant lambda" #-} + +@@ -39,7 +43,13 @@ import Data.Graph.Inductive.Graph + + -- Monadic Graph + -- +-class (Monad m) => GraphM m gr where ++class ++#if MIN_VERSION_base(4,12,0) ++ (MonadFail m) ++#else ++ (Monad m) ++#endif ++ => GraphM m gr where + {-# MINIMAL emptyM, isEmptyM, matchM, mkGraphM, labNodesM #-} + + emptyM :: m (gr a b) +diff --git a/fgl.cabal b/fgl.cabal +index 4251a21..4b2a039 100644 +--- a/fgl.cabal ++++ b/fgl.cabal +@@ -18,7 +18,8 @@ extra-source-files: + ChangeLog + + tested-with: GHC == 7.0.4, GHC == 7.2.2, GHC == 7.4.2, GHC == 7.6.3, +- GHC == 7.8.4, GHC == 7.10.2, GHC == 8.0.1, GHC == 8.1.* ++ GHC == 7.8.4, GHC == 7.10.2, GHC == 8.0.1, GHC == 8.2.2, ++ GHC == 8.4.3, GHC == 8.6.1 + + source-repository head + type: git diff --git a/pkgs/development/interpreters/dart/default.nix b/pkgs/development/interpreters/dart/default.nix index 4c697ec4e802..fa8996f0fb56 100644 --- a/pkgs/development/interpreters/dart/default.nix +++ b/pkgs/development/interpreters/dart/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, version ? "1.24.3" }: +{ stdenv, fetchurl, unzip, version ? "2.0.0" }: let @@ -25,6 +25,14 @@ let url = "${stable}/${version}/sdk/dartsdk-linux-ia32-release.zip"; sha256 = "d67b8f8f9186e7d460320e6bce25ab343c014b6af4b2f61369ee83755d4da528"; }; + "2.0.0-x86_64-linux" = fetchurl { + url = "${stable}/${version}/sdk/dartsdk-linux-x64-release.zip"; + sha256 = "4014a1e8755d2d32cc1573b731a4a53acdf6dfca3e26ee437f63fe768501d336"; + }; + "2.0.0-i686-linux" = fetchurl { + url = "${stable}/${version}/sdk/dartsdk-linux-ia32-release.zip"; + sha256 = "3164a9de70bf11ab5b20af0d51c8b3303f2dce584604dce33bea0040bdc0bbba"; + }; "2.0.0-dev.26.0-x86_64-linux" = fetchurl { url = "${dev}/${version}/sdk/dartsdk-linux-x64-release.zip"; sha256 = "18360489a7914d5df09b34934393e16c7627ba673c1e9ab5cfd11cd1d58fd7df"; diff --git a/pkgs/development/interpreters/erlang/R19.nix b/pkgs/development/interpreters/erlang/R19.nix index d94d4a5a14d0..e0d4ecbc95ac 100644 --- a/pkgs/development/interpreters/erlang/R19.nix +++ b/pkgs/development/interpreters/erlang/R19.nix @@ -1,8 +1,8 @@ { mkDerivation, fetchpatch }: mkDerivation rec { - version = "19.3.6.6"; - sha256 = "05l81gig0hmr951pjvwknc9x2qvpm95ph9z072hn4jqg13rzbgvg"; + version = "19.3.6.11"; + sha256 = "0b02iv8dly1vkc2xnqqi030sdj34h4gji2h4qgilllajr1f868vm"; 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 19ac6d355926..c408d21d9b31 100644 --- a/pkgs/development/interpreters/erlang/R20.nix +++ b/pkgs/development/interpreters/erlang/R20.nix @@ -1,8 +1,8 @@ { mkDerivation }: mkDerivation rec { - version = "20.3.8"; - sha256 = "1griiszz1x34idmwi6234br7bqd1d7mimim63amjgi9ds79jh6jj"; + version = "20.3.8.9"; + sha256 = "0v2iiyzss8hiih98wvj0gi2qzdmmhh7bvc9p025wlfm4k7r1109a"; prePatch = '' substituteInPlace configure.in --replace '`sw_vers -productVersion`' '10.10' diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index f6bd96af40f5..cbe919c70929 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.2"; + version = "4.4.1"; name = "octave-${version}"; src = fetchurl { url = "mirror://gnu/octave/${name}.tar.gz"; - sha256 = "0vkjfrpv7aikcn73bxqkph1qrhrdx7jqy193n8d8lwp7v2al7f3p"; + sha256 = "15xfcx6dc7p204b92i7va2a7ygff637l370x7zjj3vzl2brd1yq9"; }; buildInputs = [ gfortran readline ncurses perl flex texinfo qhull @@ -46,17 +46,15 @@ stdenv.mkDerivation rec { substituteInPlace libinterp/corefcn/help.cc \ --replace 'Vmakeinfo_program = "makeinfo"' \ 'Vmakeinfo_program = "${texinfo}/bin/makeinfo"' - '' - # REMOVE ON VERSION BUMP - # Needed for Octave-4.2.1 on darwin. See https://savannah.gnu.org/bugs/?50234 - + stdenv.lib.optionalString stdenv.isDarwin '' - sed 's/inline file_stat::~file_stat () { }/file_stat::~file_stat () { }/' -i ./liboctave/system/file-stat.cc ''; doCheck = !stdenv.isDarwin; enableParallelBuilding = true; + # See https://savannah.gnu.org/bugs/?50339 + F77_INTEGER_8_FLAG = if openblas.blas64 then "-fdefault-integer-8" else ""; + configureFlags = [ "--enable-readline" "--enable-dl" @@ -82,6 +80,7 @@ stdenv.mkDerivation rec { homepage = http://octave.org/; license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [raskin]; + description = "Scientific Pragramming Language"; platforms = if overridePlatforms == null then (with stdenv.lib.platforms; linux ++ darwin) else overridePlatforms; diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index e4eca36b266b..f2b900412081 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -79,6 +79,7 @@ let "-Dlocincpth=${libcInc}/include" "-Dloclibpth=${libcLib}/lib" ] + ++ optionals ((builtins.match ''5\.[0-9]*[13579]\..+'' version) != null) [ "-Dusedevel" "-Uversiononly" ] ++ optional stdenv.isSunOS "-Dcc=gcc" ++ optional enableThreading "-Dusethreads"; @@ -174,23 +175,20 @@ let setupHook = ./setup-hook-cross.sh; }); in rec { - perl522 = common { - version = "5.22.4"; - sha256 = "1yk1xn4wmnrf2ph02j28khqarpyr24qwysjzkjnjv7vh5dygb7ms"; - }; - - perl524 = common { - version = "5.24.4"; - sha256 = "0w0r6v5k5hw5q1k3p4c7krcxidkj2qzsj5dlrlrxhm01n7fksbxz"; - }; - perl526 = common { version = "5.26.2"; sha256 = "03gpnxx1g6hvlh0v4aqx00580h787sfywp1vlvw64q2xcbm9qbsp"; }; + # the latest Maint version perl528 = common { version = "5.28.0"; sha256 = "1a3f822lcl8dr8v0hk80yyhpzqlljg49z9flb48rs3nbsij9z4ky"; }; + + # the latest Devel version + perldevel = common { + version = "5.29.3"; + sha256 = "054xi629408p2hv9475jghv6zd1bj69qqpiby8cy9qw5vismgi17"; + }; } diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index df8e6ebf89ff..2609c053d95b 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -240,7 +240,10 @@ in stdenv.mkDerivation { ''; passthru = let - pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;}; + pythonPackages = callPackage ../../../../../top-level/python-packages.nix { + python = self; + overrides = packageOverrides; + }; in rec { inherit libPrefix sitePackages x11Support hasDistutilsCxxPatch ucsEncoding; executable = libPrefix; diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix index c8a544c601af..18b90cd1da46 100644 --- a/pkgs/development/interpreters/python/cpython/3.4/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix @@ -175,7 +175,10 @@ in stdenv.mkDerivation { ''; passthru = let - pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;}; + pythonPackages = callPackage ../../../../../top-level/python-packages.nix { + python = self; + overrides = packageOverrides; + }; in rec { inherit libPrefix sitePackages x11Support hasDistutilsCxxPatch; executable = "${libPrefix}m"; diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix index 2de337a83955..92c277aacd4f 100644 --- a/pkgs/development/interpreters/python/cpython/3.5/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix @@ -175,7 +175,10 @@ in stdenv.mkDerivation { ''; passthru = let - pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;}; + pythonPackages = callPackage ../../../../../top-level/python-packages.nix { + python = self; + overrides = packageOverrides; + }; in rec { inherit libPrefix sitePackages x11Support hasDistutilsCxxPatch; executable = "${libPrefix}m"; diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix index 6b9e26e99fcd..5b5041f5bcd3 100644 --- a/pkgs/development/interpreters/python/cpython/3.6/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix @@ -196,7 +196,10 @@ in stdenv.mkDerivation { ''; passthru = let - pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;}; + pythonPackages = callPackage ../../../../../top-level/python-packages.nix { + python = self; + overrides = packageOverrides; + }; in rec { inherit libPrefix sitePackages x11Support hasDistutilsCxxPatch; executable = "${libPrefix}m"; diff --git a/pkgs/development/interpreters/python/cpython/3.7/default.nix b/pkgs/development/interpreters/python/cpython/3.7/default.nix index adee8d594f18..be503d29b3a7 100644 --- a/pkgs/development/interpreters/python/cpython/3.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.7/default.nix @@ -159,7 +159,10 @@ in stdenv.mkDerivation { ''; passthru = let - pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;}; + pythonPackages = callPackage ../../../../../top-level/python-packages.nix { + python = self; + overrides = packageOverrides; + }; in rec { inherit libPrefix sitePackages x11Support hasDistutilsCxxPatch; executable = "${libPrefix}m"; diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/development/libraries/ace/default.nix index a1741513642f..560ccb768b1e 100644 --- a/pkgs/development/libraries/ace/default.nix +++ b/pkgs/development/libraries/ace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ace-${version}"; - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { url = "http://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2"; - sha256 = "1vwhyk0lrpnn78xx212d16lf7vl2q6651wc8vxqbd296x6wbnh2y"; + sha256 = "1ibc62r3nh33c5w9mbnmzzhalb0jry6ccfb5ph62xsayy9nksfgh"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/alembic/default.nix b/pkgs/development/libraries/alembic/default.nix index 015c48d01411..7dd0fcb55905 100644 --- a/pkgs/development/libraries/alembic/default.nix +++ b/pkgs/development/libraries/alembic/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "alembic-${version}"; - version = "1.7.8"; + version = "1.7.9"; src = fetchFromGitHub { owner = "alembic"; repo = "alembic"; rev = "${version}"; - sha256 = "1xmndhcliz25cgdzb7ybkvb05w4klmngpk76fzghamwyi79zfs2c"; + sha256 = "0xyclln1m4079akr31vib242912004lln678prda0qwmwvsdrf7z"; }; outputs = [ "bin" "dev" "out" "lib" ]; diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index 4e2de01e9adb..fe159afe6854 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -61,10 +61,11 @@ stdenv.mkDerivation rec { inherit sslSupport bdbSupport ldapSupport; }; - meta = { + meta = with stdenv.lib; { homepage = http://apr.apache.org/; description = "A companion library to APR, the Apache Portable Runtime"; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.unix; + maintainers = [ maintainers.eelco ]; + platforms = platforms.unix; + license = licenses.asl20; }; } diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix index 8c31c89947cd..ea84609868cf 100644 --- a/pkgs/development/libraries/apr/default.nix +++ b/pkgs/development/libraries/apr/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { homepage = http://apr.apache.org/; description = "The Apache Portable Runtime library"; platforms = platforms.all; + license = licenses.asl20; maintainers = [ maintainers.eelco ]; }; } diff --git a/pkgs/development/libraries/boringssl/default.nix b/pkgs/development/libraries/boringssl/default.nix index ff48ffe67f0a..9d65fb554ffe 100644 --- a/pkgs/development/libraries/boringssl/default.nix +++ b/pkgs/development/libraries/boringssl/default.nix @@ -27,10 +27,11 @@ stdenv.mkDerivation rec { mv ../include/openssl $out/include ''; - meta = { + meta = with stdenv.lib; { description = "Free TLS/SSL implementation"; homepage = "https://boringssl.googlesource.com"; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + platforms = platforms.all; + maintainers = [ maintainers.thoughtpolice ]; + license = with licenses; [ openssl isc mit bsd3 ]; }; } diff --git a/pkgs/development/libraries/cln/default.nix b/pkgs/development/libraries/cln/default.nix index e39386dca3f4..7764e9c67ed2 100644 --- a/pkgs/development/libraries/cln/default.nix +++ b/pkgs/development/libraries/cln/default.nix @@ -11,10 +11,10 @@ stdenv.mkDerivation rec { buildInputs = [ gmp ]; - meta = { + meta = with stdenv.lib; { description = "C/C++ library for numbers, a part of GiNaC"; homepage = http://www.ginac.de/CLN/; - maintainers = [ ]; - platforms = stdenv.lib.platforms.unix; # Once had cygwin problems + license = licenses.gpl2; + platforms = platforms.unix; # Once had cygwin problems }; } diff --git a/pkgs/development/libraries/clucene-core/2.x.nix b/pkgs/development/libraries/clucene-core/2.x.nix index 0db253bbec26..a14dec370479 100644 --- a/pkgs/development/libraries/clucene-core/2.x.nix +++ b/pkgs/development/libraries/clucene-core/2.x.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails with "Unable to find executable: /build/clucene-core-2.3.3.4/build/bin/cl_test" - meta = { + meta = with stdenv.lib; { description = "Core library for full-featured text search engine"; longDescription = '' CLucene is a high-performance, scalable, cross platform, full-featured, @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { CLucene is a port of the very popular Java Lucene text search engine API. ''; homepage = http://clucene.sourceforge.net; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = with licenses; [ asl20 lgpl2 ]; }; } diff --git a/pkgs/development/libraries/clucene-core/default.nix b/pkgs/development/libraries/clucene-core/default.nix index b65e794a92aa..8451b0853729 100644 --- a/pkgs/development/libraries/clucene-core/default.nix +++ b/pkgs/development/libraries/clucene-core/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { patches = [ ./gcc6.patch ]; - meta = { + meta = with stdenv.lib; { description = "Core library for full-featured text search engine"; longDescription = '' CLucene is a high-performance, scalable, cross platform, full-featured, @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { CLucene is a port of the very popular Java Lucene text search engine API. ''; homepage = http://clucene.sourceforge.net; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + license = with licenses; [ asl20 lgpl2 ]; }; } diff --git a/pkgs/development/libraries/cmark/default.nix b/pkgs/development/libraries/cmark/default.nix index 81df7e863193..fce02dac950f 100644 --- a/pkgs/development/libraries/cmark/default.nix +++ b/pkgs/development/libraries/cmark/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/jgm/cmark; maintainers = [ maintainers.michelk ]; platforms = platforms.unix; + license = licenses.bsd2; }; } diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index c624f9537fb3..085bab6475c2 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -73,6 +73,7 @@ in stdenv.mkDerivation rec { render without stepping on each other's toes. ''; - platforms = stdenv.lib.platforms.mesaPlatforms; + platforms = platforms.mesaPlatforms; + license = with licenses; [ mit bsd3 publicDomain sgi-b-20 ]; }; } diff --git a/pkgs/development/libraries/ctpl/default.nix b/pkgs/development/libraries/ctpl/default.nix index d50aca1679b8..fd81de5139d6 100644 --- a/pkgs/development/libraries/ctpl/default.nix +++ b/pkgs/development/libraries/ctpl/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { description = "Template engine library written in C"; platforms = platforms.linux; maintainers = [ maintainers.lethalman ]; + license = licenses.gpl3Plus; }; } diff --git a/pkgs/development/libraries/ctpp2/default.nix b/pkgs/development/libraries/ctpp2/default.nix index 55835cdb63db..5a2a53ef24d5 100644 --- a/pkgs/development/libraries/ctpp2/default.nix +++ b/pkgs/development/libraries/ctpp2/default.nix @@ -18,10 +18,11 @@ stdenv.mkDerivation rec { doCheck = false; # fails - meta = { + meta = with stdenv.lib; { description = "A high performance templating engine"; homepage = http://ctpp.havoc.ru; - maintainers = with stdenv.lib.maintainers; [ robbinch ]; - platforms = with stdenv.lib.platforms; linux; + maintainers = [ maintainers.robbinch ]; + platforms = platforms.linux; + license = licenses.bsd2; }; } diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index bc5e23581ffa..cec7e1a2d516 100644 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/pkgs/development/libraries/cyrus-sasl/default.nix @@ -58,5 +58,6 @@ stdenv.mkDerivation rec { homepage = https://www.cyrusimap.org/sasl; description = "Library for adding authentication support to connection-based protocols"; platforms = platforms.unix; + license = licenses.bsdOriginal; }; } diff --git a/pkgs/development/libraries/easyloggingpp/default.nix b/pkgs/development/libraries/easyloggingpp/default.nix index 8c6337cfaf60..96e294ab2fbd 100644 --- a/pkgs/development/libraries/easyloggingpp/default.nix +++ b/pkgs/development/libraries/easyloggingpp/default.nix @@ -4,12 +4,12 @@ { stdenv, fetchFromGitHub, cmake, gtest }: stdenv.mkDerivation rec { name = "easyloggingpp-${version}"; - version = "9.96.4"; + version = "9.96.5"; src = fetchFromGitHub { owner = "muflihun"; repo = "easyloggingpp"; rev = "v${version}"; - sha256 = "0l0b8cssxkj0wlfqjj8hfnfvrjcxa81h947d54w86iadrilrsprb"; + sha256 = "03jycliki3h6lc8kci26s6lnx5bap47xsnsjd375qgr9l11g76f5"; }; nativeBuildInputs = [cmake]; diff --git a/pkgs/development/libraries/exempi/default.nix b/pkgs/development/libraries/exempi/default.nix index ac2c21d4cf0e..3bc5270f0537 100644 --- a/pkgs/development/libraries/exempi/default.nix +++ b/pkgs/development/libraries/exempi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, expat, zlib, boost, libiconv, darwin }: +{ stdenv, fetchurl, fetchpatch, expat, zlib, boost, libiconv, darwin }: stdenv.mkDerivation rec { name = "exempi-2.4.5"; @@ -8,6 +8,17 @@ stdenv.mkDerivation rec { sha256 = "07i29xmg8bqriviaf4vi1mwha4lrw85kfla29cfym14fp3z8aqa0"; }; + patches = [ + # CVE-2018-12648 + # https://gitlab.freedesktop.org/libopenraw/exempi/issues/9 + # remove with exempi > 2.4.5 + (fetchpatch { + name = "CVE-2018-12648.patch"; + url = https://gitlab.freedesktop.org/libopenraw/exempi/commit/8ed2f034705fd2d032c81383eee8208fd4eee0ac.patch; + sha256 = "1nh8irk5p26868875wq5n8g92xp4crfb8fdd8gyna76ldyzqqx9q"; + }) + ]; + configureFlags = [ "--with-boost=${boost.dev}" ]; @@ -15,6 +26,8 @@ stdenv.mkDerivation rec { buildInputs = [ expat zlib boost ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.CoreServices ]; + doCheck = stdenv.isLinux; + meta = with stdenv.lib; { homepage = https://libopenraw.freedesktop.org/wiki/Exempi/; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index d188cb9810a7..9694765bb93f 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "folly-${version}"; - version = "2018.08.13.00"; + version = "2018.08.27.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "1lhq3l7rirhi4vwgiym0r3rff1i69c7bdpi1hm8r4axs2dfjvxdr"; + sha256 = "0slnhn8q26mj23gm36c61b4ar857q8c844ifpvw4q329nndbrgcz"; }; nativeBuildInputs = [ autoreconfHook python pkgconfig ]; diff --git a/pkgs/development/libraries/fox/default.nix b/pkgs/development/libraries/fox/default.nix index 8dd78c41b14a..40430f34334c 100644 --- a/pkgs/development/libraries/fox/default.nix +++ b/pkgs/development/libraries/fox/default.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { homepage = http://fox-toolkit.org; license = licenses.lgpl3; maintainers = []; + broken = stdenv.isDarwin; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 7f680b6b59bf..a21e2aacde2a 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -1,11 +1,13 @@ -{ stdenv, fetchurl, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags }: +{ stdenv, fetchFromGitHub, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags }: stdenv.mkDerivation rec { - version = "1.10.1"; + version = "1.15.0"; name = "grpc-${version}"; - src = fetchurl { - url = "https://github.com/grpc/grpc/archive/v${version}.tar.gz"; - sha256 = "0l721r24d6wz889vz4g6i67ijz0zc0ah967i3immi90zdmjwlyjg"; + src = fetchFromGitHub { + owner = "grpc"; + repo = "grpc"; + rev= "d2c7d4dea492b9a86a53555aabdbfa90c2b01730"; + sha256 = "1dpnhc5kw7znivrnjx1gva57v6b548am4v5nvh3dkwwzsa1k6vkv"; }; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ]; diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix index a269069fb048..b01d902fd91a 100644 --- a/pkgs/development/libraries/leatherman/default.nix +++ b/pkgs/development/libraries/leatherman/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "leatherman-${version}"; - version = "1.4.2"; + version = "1.5.0"; src = fetchFromGitHub { - sha256 = "0lhdncwg2xbd3gy65rx8w2qcxvcwfirzkl762zdwqxf6bj6p2hvb"; + sha256 = "1plx111mfci8z33mwy56y54n597gi8965s7bmnribkk8bvdn10dy"; rev = version; repo = "leatherman"; owner = "puppetlabs"; diff --git a/pkgs/development/libraries/libburn/default.nix b/pkgs/development/libraries/libburn/default.nix index 76977b745197..f68141ef3b47 100644 --- a/pkgs/development/libraries/libburn/default.nix +++ b/pkgs/development/libraries/libburn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libburn-${version}"; - version = "1.4.8"; + version = "1.5.0"; src = fetchurl { url = "http://files.libburnia-project.org/releases/${name}.tar.gz"; - sha256 = "19lxnzn8bz70glrrrn2hs43gf5g7gfbcka9rcbckhv1pb7is509y"; + sha256 = "1gg2kgnqvaa2fwghai62prxz6slpak1f6bvgjh8m4dn16v114asq"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libgaminggear/default.nix b/pkgs/development/libraries/libgaminggear/default.nix new file mode 100644 index 000000000000..a6fe2bc1435f --- /dev/null +++ b/pkgs/development/libraries/libgaminggear/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl, cmake, pkgconfig, gettext +, gtk2, libcanberra, libnotify, pcre, sqlite, xorg +}: + +stdenv.mkDerivation rec { + name = "libgaminggear-${version}"; + version = "0.15.1"; + + src = fetchurl { + url = "mirror://sourceforge/libgaminggear/${name}.tar.bz2"; + sha256 = "0jf5i1iv8j842imgiixbhwcr6qcwa93m27lzr6gb01ri5v35kggz"; + }; + + outputs = [ "dev" "out" "bin" ]; + + nativeBuildInputs = [ cmake pkgconfig gettext ]; + + propagatedBuildInputs = [ + gtk2 libcanberra libnotify pcre sqlite xorg.libXdmcp xorg.libpthreadstubs + ]; + + enableParallelBuilding = true; + + cmakeFlags = [ + "-DINSTALL_CMAKE_MODULESDIR=lib/cmake" + "-DINSTALL_PKGCONFIGDIR=lib/pkgconfig" + "-DINSTALL_LIBDIR=lib" + ]; + + postFixup = '' + moveToOutput bin "$bin" + ''; + + meta = { + description = "Provides functionality for gaming input devices"; + homepage = https://sourceforge.net/projects/libgaminggear/; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2Plus; + }; +} diff --git a/pkgs/development/libraries/libiio/default.nix b/pkgs/development/libraries/libiio/default.nix index defb17bcd88a..51cdc289d626 100644 --- a/pkgs/development/libraries/libiio/default.nix +++ b/pkgs/development/libraries/libiio/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub , cmake, flex, bison -, libxml2 +, libxml2, python }: stdenv.mkDerivation rec { @@ -14,11 +14,20 @@ stdenv.mkDerivation rec { sha256 = "05sbvvjka03qi080ad6g2y6gfwqp3n3zv7dpv237dym0zjyxqfa7"; }; - outputs = [ "out" "lib" "dev" ]; + outputs = [ "out" "lib" "dev" "python" ]; nativeBuildInputs = [ cmake flex bison ]; buildInputs = [ libxml2 ]; + postInstall = '' + mkdir -p $python/lib/${python.libPrefix}/site-packages/ + touch $python/lib/${python.libPrefix}/site-packages/ + cp ../bindings/python/iio.py $python/lib/${python.libPrefix}/site-packages/ + + substitute ../bindings/python/iio.py $python/lib/${python.libPrefix}/site-packages/iio.py \ + --replace 'libiio.so.0' $lib/lib/libiio.so.0 + ''; + meta = with stdenv.lib; { description = "API for interfacing with the Linux Industrial I/O Subsystem"; homepage = https://github.com/analogdevicesinc/libiio; diff --git a/pkgs/development/libraries/libisofs/default.nix b/pkgs/development/libraries/libisofs/default.nix index d0217a908b9f..d52814483870 100644 --- a/pkgs/development/libraries/libisofs/default.nix +++ b/pkgs/development/libraries/libisofs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libisofs-${version}"; - version = "1.4.8"; + version = "1.5.0"; src = fetchurl { url = "http://files.libburnia-project.org/releases/${name}.tar.gz"; - sha256 = "0scvqb72qq24wcg814p1iw1dknldl21hr1hxsc1wy9vc6vgyk7fw"; + sha256 = "001l3akf3wb6msl9man776w560iqyvsbwwzs7d7y7msx13irspys"; }; buildInputs = [ attr zlib ]; diff --git a/pkgs/development/libraries/liblangtag/default.nix b/pkgs/development/libraries/liblangtag/default.nix index 8ebfa53b7d13..d57d75c5cae7 100644 --- a/pkgs/development/libraries/liblangtag/default.nix +++ b/pkgs/development/libraries/liblangtag/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { language_subtag_registry = fetchurl { url = "http://www.iana.org/assignments/language-subtag-registry"; - sha256 = "1qfkvllyqcy40vmnvjn5w9fxw7g6ww46cb306vkgcfghnjjfhv3b"; + sha256 = "0y9x5gra6jri4sk16f0dp69p06almnsl48rs85605f035kf539qm"; }; postPatch = '' @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ''--with-locale-alias=${stdenv.cc.libc}/share/locale/locale.alias'' ]; - buildInputs = [ gettext glib libxml2 gobjectIntrospection gnome-common + buildInputs = [ gettext glib libxml2 gobjectIntrospection gnome-common unzip ]; nativeBuildInputs = [ autoreconfHook gtkdoc gettext pkgconfig ]; diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/development/libraries/libosinfo/default.nix index 111bea61eb65..ba267b797870 100644 --- a/pkgs/development/libraries/libosinfo/default.nix +++ b/pkgs/development/libraries/libosinfo/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gobjectIntrospection, gtk-doc, docbook_xsl +{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, gobjectIntrospection, gtk-doc, docbook_xsl , glib, libsoup, libxml2, libxslt, check, curl, perl, hwdata, osinfo-db, vala ? null }: stdenv.mkDerivation rec { - name = "libosinfo-1.1.0"; + name = "libosinfo-1.2.0"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${name}.tar.gz"; - sha256 = "0diigllgni6m0sc2h8aid6hmyaq9qb54pm5305m0irfsm2j463v0"; + sha256 = "0y2skfrcg38y212qqd26vs3sg566j3qnsgvvm23pfi4j7z7ly9gf"; }; outputs = [ "out" "dev" "devdoc" ]; @@ -20,6 +20,16 @@ stdenv.mkDerivation rec { patches = [ ./osinfo-db-data-dir.patch + # Fix bug causing tests to fail (and presumably the real scenarios they're representative of) + # using upstream commits: + (fetchpatch { + url = "https://gitlab.com/libosinfo/libosinfo/commit/b9cb227842948b1b2289cdd3e9b8d925664c2ee7.patch"; + sha256 = "0nj0wmibq52j8qbzmxfzj76fpkqjs18kssbb9lmfhz16s30darbw"; + }) + (fetchpatch { + url = "https://gitlab.com/libosinfo/libosinfo/commit/e6168463f4fc659b9827b5c8694dc1c6d7d5239a.patch"; + sha256 = "135yfhjm2wxip5dnng3r9k9igfhdi1083ys4a4f3ipjxfskcs9rv"; + }) ]; postPatch = '' diff --git a/pkgs/development/libraries/librelp/default.nix b/pkgs/development/libraries/librelp/default.nix index 521f963e277c..e5d64c4143f1 100644 --- a/pkgs/development/libraries/librelp/default.nix +++ b/pkgs/development/libraries/librelp/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gnutls, zlib }: stdenv.mkDerivation rec { - name = "librelp-1.2.17"; + name = "librelp-1.2.18"; src = fetchurl { url = "http://download.rsyslog.com/librelp/${name}.tar.gz"; - sha256 = "1w6blhfr3rlmvjj0fbr8rsycrkm5b92n44zaaijg1jnvxjfqpy0v"; + sha256 = "0grrnxhazd9iirj07al524xykk0k33vs0dgnpajz5vpqig4qyk53"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index fd35864fe343..733482ce2687 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -16,19 +16,19 @@ let buildFromTarball = stdenv.isDarwin; in stdenv.mkDerivation rec { name = "libvirt-${version}"; - version = "4.5.0"; + version = "4.7.0"; src = if buildFromTarball then fetchurl { url = "http://libvirt.org/sources/${name}.tar.xz"; - sha256 = "02dbfyi80im37gdsxglb4fja78q63b8ahmgdc5kh8lx51kf5xsg7"; + sha256 = "1r37aw1xxlwjkk4n6k503mw1caldijz8n7x86xdaq90n6bvpkhlj"; } else fetchgit { url = git://libvirt.org/libvirt.git; rev = "v${version}"; - sha256 = "0ija9a02znajsa2pbxamrmz87zwpmba9s29vdzzqqqw5c1rdpcr6"; + sha256 = "17byylhx0bny4b771hqv92d87a5dg21a5qjv861y50sckgwwi6f1"; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix index 0546bdc6359b..ebae2a6c3be0 100644 --- a/pkgs/development/libraries/mapnik/default.nix +++ b/pkgs/development/libraries/mapnik/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchzip, fetchpatch , boost, cairo, freetype, gdal, harfbuzz, icu, libjpeg, libpng, libtiff -, libwebp, libxml2, proj, python2, scons, sqlite, zlib +, libwebp, libxml2, proj, python, scons, sqlite, zlib # supply a postgresql package to enable the PostGIS input plugin , postgresql ? null @@ -8,28 +8,22 @@ stdenv.mkDerivation rec { name = "mapnik-${version}"; - version = "3.0.13"; + version = "3.0.20"; src = fetchzip { # this one contains all git submodules and is cheaper than fetchgit url = "https://github.com/mapnik/mapnik/releases/download/v${version}/mapnik-v${version}.tar.bz2"; - sha256 = "189wsd6l6awblkiha666l1sdyp7ifmnfsa87y0j37rvym6w4r065"; + sha256 = "05a2hvvk5s4x3wjvh4spd717vd5ri7h0sql7aarpi9jpc5h6xicc"; }; - patches = [(fetchpatch { - name = "icu-59.diff"; - url = https://github.com/mapnik/mapnik/commit/9e58c890430d.diff; - sha256 = "0h546qq8g19gw9s4979hla9vkq5kcwh3q45ryajyjhmlr2z9fi6p"; - })]; - # a distinct dev output makes python-mapnik fail outputs = [ "out" ]; - nativeBuildInputs = [ python2 scons ]; + nativeBuildInputs = [ python scons ]; buildInputs = [ boost cairo freetype gdal harfbuzz icu libjpeg libpng libtiff - libwebp libxml2 proj python2 sqlite zlib + libwebp libxml2 proj python sqlite zlib # optional inputs postgresql diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix index 465a70576356..15c82cb12825 100644 --- a/pkgs/development/libraries/mtxclient/default.nix +++ b/pkgs/development/libraries/mtxclient/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "mtxclient-${version}"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "mujx"; repo = "mtxclient"; rev = "v${version}"; - sha256 = "0i58y45diysayjzy5ick15356972z67dfxm0w41ay88nm42x1imp"; + sha256 = "19v1qa6mzvc65m7wy7x0g4i24bcg9xk31y1grwvd3zr0l4v6xcgs"; }; postPatch = '' diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index a279fe79940f..b5651e8f02ad 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -10,14 +10,14 @@ let majorVersion = "3.1"; - minorVersion = "0"; + minorVersion = "2"; in stdenv.mkDerivation rec { name = "openmpi-${majorVersion}.${minorVersion}"; src = fetchurl { url = "http://www.open-mpi.org/software/ompi/v${majorVersion}/downloads/${name}.tar.bz2"; - sha256 = "0v7hrmf1z5d1rmm0z5gi79l536j3z5s5b0kf9q5rr1fc4i0h8p5j"; + sha256 = "1ibniapqki763agpfh65y284las083fqmj8m5b2pi8ilgy2fsm66"; }; postPatch = '' diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix index bcc57f09af45..acf531390226 100644 --- a/pkgs/development/libraries/podofo/default.nix +++ b/pkgs/development/libraries/podofo/default.nix @@ -4,7 +4,8 @@ }: stdenv.mkDerivation rec { - name = "podofo-0.9.6"; + version = "0.9.6"; + name = "podofo-${version}"; src = fetchurl { url = "mirror://sourceforge/podofo/${name}.tar.gz"; @@ -30,6 +31,12 @@ stdenv.mkDerivation rec { cmakeFlags = "-DPODOFO_BUILD_SHARED=ON -DPODOFO_BUILD_STATIC=OFF"; + postFixup = stdenv.lib.optionalString stdenv.isDarwin '' + for i in $out/bin/* ; do + install_name_tool -change libpodofo.${version}.dylib $out/lib/libpodofo.${version}.dylib "$i" + done + ''; + meta = { homepage = http://podofo.sourceforge.net; description = "A library to work with the PDF file format"; diff --git a/pkgs/development/libraries/postgis/default.nix b/pkgs/development/libraries/postgis/default.nix index a577d318523d..0da66acbde2a 100644 --- a/pkgs/development/libraries/postgis/default.nix +++ b/pkgs/development/libraries/postgis/default.nix @@ -42,8 +42,8 @@ let - version = "2.4.4"; - sha256 = "1hm8migjb53cymp4qvg1h20yqllmy9f7x0awv5450391i6syyqq6"; + version = "2.4.5"; + sha256 = "0saxj3w7j9yb9sa1ig3ccxvh2pk0bj47hp7m6199p1a1fpfjgrrg"; in stdenv.mkDerivation rec { name = "postgis-${version}"; diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix index 55c1a641fc3d..2a6c4af43fc3 100644 --- a/pkgs/development/libraries/science/math/arpack/default.nix +++ b/pkgs/development/libraries/science/math/arpack/default.nix @@ -4,14 +4,14 @@ with stdenv.lib; let - version = "3.5.0"; + version = "3.6.3"; in stdenv.mkDerivation { name = "arpack-${version}"; src = fetchurl { url = "https://github.com/opencollab/arpack-ng/archive/${version}.tar.gz"; - sha256 = "0f8jx3fifmj9qdp289zr7r651y1q48k1jya859rqxq62mvis7xsh"; + sha256 = "0lzlcsrjsi36pv5bnipwjnyg2fx3nrv31bw2klwrg11gb8g5bwv4"; }; nativeBuildInputs = [ autoconf automake gettext libtool ]; diff --git a/pkgs/development/libraries/scmccid/default.nix b/pkgs/development/libraries/scmccid/default.nix index b305fecc3933..c9c26ca0d66c 100644 --- a/pkgs/development/libraries/scmccid/default.nix +++ b/pkgs/development/libraries/scmccid/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }) else throw "Architecture not supported"; - buildInputs = [ patchelf ]; + nativeBuildInputs = [ patchelf ]; installPhase = '' RPATH=${libusb.out}/lib:${stdenv.cc.libc.out}/lib diff --git a/pkgs/development/libraries/wiredtiger/default.nix b/pkgs/development/libraries/wiredtiger/default.nix index c4d94af850dd..56068c435d80 100644 --- a/pkgs/development/libraries/wiredtiger/default.nix +++ b/pkgs/development/libraries/wiredtiger/default.nix @@ -14,7 +14,7 @@ let mkEnable = mkFlag "enable-" "disable-"; mkWith = mkFlag "with-" "without-"; - shouldUsePkg = pkg: if pkg != null && pkg.meta.available then pkg else null; + shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null; optLz4 = shouldUsePkg lz4; optSnappy = shouldUsePkg snappy; diff --git a/pkgs/development/libraries/wxSVG/default.nix b/pkgs/development/libraries/wxSVG/default.nix index 59f6af7eddb2..27b95208432e 100644 --- a/pkgs/development/libraries/wxSVG/default.nix +++ b/pkgs/development/libraries/wxSVG/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "wxSVG-${version}"; srcName = "wxsvg-${version}"; - version = "1.5.14"; + version = "1.5.15"; src = fetchurl { url = "mirror://sourceforge/project/wxsvg/wxsvg/${version}/${srcName}.tar.bz2"; - sha256 = "0xl5ghd8yj1ciwf87f12ii7vg38ir0snrds2rhi47pv5gypfkiq5"; + sha256 = "1f6fhkdmcfs8w7x08vhiqygss4qzcsimhd91h0j58zw25ky6rzqn"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/xercesc/default.nix b/pkgs/development/libraries/xercesc/default.nix index 9fa1768f4dce..7ed20ed7432b 100644 --- a/pkgs/development/libraries/xercesc/default.nix +++ b/pkgs/development/libraries/xercesc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "xerces-c-${version}"; - version = "3.2.1"; + version = "3.2.2"; src = fetchurl { url = "mirror://apache/xerces/c/3/sources/${name}.tar.gz"; - sha256 = "18045nyjkr2hygkjc43pi2fmz6qcbn9p00kf42my3aa4i0mn1m3d"; + sha256 = "04q4c460wqzyzmprjm22igcm1d52xr20ajxnhr33nv95mbw92qfx"; }; meta = { diff --git a/pkgs/development/libraries/zxcvbn-c/default.nix b/pkgs/development/libraries/zxcvbn-c/default.nix index 1ba073943483..65509d766b96 100644 --- a/pkgs/development/libraries/zxcvbn-c/default.nix +++ b/pkgs/development/libraries/zxcvbn-c/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { name = "zxcvbn-c-${version}"; - version = "2.3"; + version = "2.4"; src = fetchFromGitHub { owner = "tsyrogit"; repo = "zxcvbn-c"; rev = "v${version}"; - sha256 = "1m097b4qq1r3kk4b236pc3mpaj22il9fh43ifagad5wy54x8zf7b"; + sha256 = "12ksdnpxlqlmg9zhyyk3bspcf0sfj5zk735vr4ry635qi7gzcaas"; }; installPhase = '' diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix index b3b1977cdb4a..ae7130375524 100644 --- a/pkgs/development/node-packages/node-packages-v10.nix +++ b/pkgs/development/node-packages/node-packages-v10.nix @@ -238,13 +238,13 @@ let sha1 = "1b681c21ff84033c826543090689420d187151dc"; }; }; - "chownr-1.0.1" = { + "chownr-1.1.1" = { name = "chownr"; packageName = "chownr"; - version = "1.0.1"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz"; - sha1 = "e2a75042a9551908bebd25b8523d5f9769d79181"; + url = "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz"; + sha512 = "j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g=="; }; }; "class-utils-0.3.6" = { @@ -288,10 +288,19 @@ let packageName = "combined-stream"; version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz"; + url = "http://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz"; sha1 = "723e7df6e801ac5613113a7e445a9b69cb632818"; }; }; + "combined-stream-1.0.7" = { + name = "combined-stream"; + packageName = "combined-stream"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz"; + sha512 = "brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w=="; + }; + }; "component-emitter-1.2.1" = { name = "component-emitter"; packageName = "component-emitter"; @@ -1215,7 +1224,7 @@ let packageName = "minimist"; version = "0.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; + url = "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; }; }; @@ -1224,7 +1233,7 @@ let packageName = "minimist"; version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"; + url = "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"; sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; }; }; @@ -1260,7 +1269,7 @@ let packageName = "mkdirp"; version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; + url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; }; }; @@ -1282,13 +1291,13 @@ let sha512 = "fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA=="; }; }; - "needle-2.2.2" = { + "needle-2.2.4" = { name = "needle"; packageName = "needle"; - version = "2.2.2"; + version = "2.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/needle/-/needle-2.2.2.tgz"; - sha512 = "mW7W8dKuVYefCpNzE3Z7xUmPI9wSrSL/1qH31YGMxmSOAnjatS3S9Zv3cmiHrhx3Jkp1SrWWBdOFXjfF48Uq3A=="; + url = "https://registry.npmjs.org/needle/-/needle-2.2.4.tgz"; + sha512 = "HyoqEb4wr/rsoaIDfTH2aVL9nWtQqba2/HvMv+++m8u0dz808MaagKILxtfeSN7QU7nvbQ79zk3vYOJp9zsNEA=="; }; }; "nopt-3.0.6" = { @@ -1575,7 +1584,7 @@ let packageName = "readable-stream"; version = "2.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz"; + url = "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz"; sha512 = "tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw=="; }; }; @@ -2398,7 +2407,7 @@ in sources."caseless-0.12.0" sources."co-4.6.0" sources."code-point-at-1.1.0" - sources."combined-stream-1.0.6" + sources."combined-stream-1.0.7" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" @@ -2411,7 +2420,11 @@ in 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.2" + (sources."form-data-2.3.2" // { + dependencies = [ + sources."combined-stream-1.0.6" + ]; + }) sources."fs.realpath-1.0.0" sources."fstream-1.0.11" sources."gauge-2.7.4" @@ -2518,7 +2531,7 @@ in sources."are-we-there-yet-1.1.5" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" - sources."chownr-1.0.1" + sources."chownr-1.1.1" sources."code-point-at-1.1.0" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" @@ -2545,7 +2558,7 @@ in sources."minizlib-1.1.0" sources."mkdirp-0.5.1" sources."ms-2.0.0" - sources."needle-2.2.2" + sources."needle-2.2.4" sources."nopt-4.0.1" sources."npm-bundled-1.0.5" sources."npm-packlist-1.1.11" @@ -2593,10 +2606,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "2.13.6"; + version = "2.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-2.13.6.tgz"; - sha512 = "X8zmtUzmEIa/QMg0t0eeq6hSd7kmL5Zvneqpj3Tcbyn2g/FEFTPb9kaghR+DW1WdViOE51eo4ECLK7uY9oogkA=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-2.16.2.tgz"; + sha512 = "MYb5lDNvYE3f0UfbZqV6HSMHWOiVveTRbT7+f3IocRgLaEIJTEy1QTuuXOUUuAmbSOkjJ11euYb+qy4HTNZaUg=="; }; buildInputs = globalBuildInputs; meta = { diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index c7701f553ed7..842e1a165314 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -238,13 +238,13 @@ let sha1 = "1b681c21ff84033c826543090689420d187151dc"; }; }; - "chownr-1.0.1" = { + "chownr-1.1.1" = { name = "chownr"; packageName = "chownr"; - version = "1.0.1"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz"; - sha1 = "e2a75042a9551908bebd25b8523d5f9769d79181"; + url = "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz"; + sha512 = "j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g=="; }; }; "class-utils-0.3.6" = { @@ -288,10 +288,19 @@ let packageName = "combined-stream"; version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz"; + url = "http://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz"; sha1 = "723e7df6e801ac5613113a7e445a9b69cb632818"; }; }; + "combined-stream-1.0.7" = { + name = "combined-stream"; + packageName = "combined-stream"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz"; + sha512 = "brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w=="; + }; + }; "component-emitter-1.2.1" = { name = "component-emitter"; packageName = "component-emitter"; @@ -1215,7 +1224,7 @@ let packageName = "minimist"; version = "0.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; + url = "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; }; }; @@ -1224,7 +1233,7 @@ let packageName = "minimist"; version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"; + url = "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"; sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; }; }; @@ -1260,7 +1269,7 @@ let packageName = "mkdirp"; version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; + url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; }; }; @@ -1282,13 +1291,13 @@ let sha512 = "fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA=="; }; }; - "needle-2.2.2" = { + "needle-2.2.4" = { name = "needle"; packageName = "needle"; - version = "2.2.2"; + version = "2.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/needle/-/needle-2.2.2.tgz"; - sha512 = "mW7W8dKuVYefCpNzE3Z7xUmPI9wSrSL/1qH31YGMxmSOAnjatS3S9Zv3cmiHrhx3Jkp1SrWWBdOFXjfF48Uq3A=="; + url = "https://registry.npmjs.org/needle/-/needle-2.2.4.tgz"; + sha512 = "HyoqEb4wr/rsoaIDfTH2aVL9nWtQqba2/HvMv+++m8u0dz808MaagKILxtfeSN7QU7nvbQ79zk3vYOJp9zsNEA=="; }; }; "nopt-3.0.6" = { @@ -1575,7 +1584,7 @@ let packageName = "readable-stream"; version = "2.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz"; + url = "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz"; sha512 = "tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw=="; }; }; @@ -2398,7 +2407,7 @@ in sources."caseless-0.12.0" sources."co-4.6.0" sources."code-point-at-1.1.0" - sources."combined-stream-1.0.6" + sources."combined-stream-1.0.7" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" @@ -2411,7 +2420,11 @@ in 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.2" + (sources."form-data-2.3.2" // { + dependencies = [ + sources."combined-stream-1.0.6" + ]; + }) sources."fs.realpath-1.0.0" sources."fstream-1.0.11" sources."gauge-2.7.4" @@ -2518,7 +2531,7 @@ in sources."are-we-there-yet-1.1.5" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" - sources."chownr-1.0.1" + sources."chownr-1.1.1" sources."code-point-at-1.1.0" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" @@ -2545,7 +2558,7 @@ in sources."minizlib-1.1.0" sources."mkdirp-0.5.1" sources."ms-2.0.0" - sources."needle-2.2.2" + sources."needle-2.2.4" sources."nopt-4.0.1" sources."npm-bundled-1.0.5" sources."npm-packlist-1.1.11" @@ -2593,10 +2606,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "2.13.6"; + version = "2.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-2.13.6.tgz"; - sha512 = "X8zmtUzmEIa/QMg0t0eeq6hSd7kmL5Zvneqpj3Tcbyn2g/FEFTPb9kaghR+DW1WdViOE51eo4ECLK7uY9oogkA=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-2.16.2.tgz"; + sha512 = "MYb5lDNvYE3f0UfbZqV6HSMHWOiVveTRbT7+f3IocRgLaEIJTEy1QTuuXOUUuAmbSOkjJ11euYb+qy4HTNZaUg=="; }; buildInputs = globalBuildInputs; meta = { diff --git a/pkgs/development/node-packages/node-packages-v8.json b/pkgs/development/node-packages/node-packages-v8.json index 38d5008ad8c5..a754f3bef61e 100644 --- a/pkgs/development/node-packages/node-packages-v8.json +++ b/pkgs/development/node-packages/node-packages-v8.json @@ -39,6 +39,7 @@ , "hipache" , "htmlhint" , "html-minifier" +, "http-server" , "ionic" , "ios-deploy" , "istanbul" diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix index 3efef820a9b5..287623d03e43 100644 --- a/pkgs/development/node-packages/node-packages-v8.nix +++ b/pkgs/development/node-packages/node-packages-v8.nix @@ -58,22 +58,22 @@ let sha512 = "UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw=="; }; }; - "@babel/runtime-7.0.0" = { + "@babel/runtime-7.1.1" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.0.0"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.0.0.tgz"; - sha512 = "7hGhzlcmg01CvH1EHdSPVXYX1aJ8KCEyz6I9xYIi/asDtzBPMyMhVibhM/K6g/5qnKBwjZtp10bNZIEFTRW1MA=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.1.1.tgz"; + sha512 = "5ruvezIb2ccAGj538SRRz6YyZOAVubhUfOq+57LuGd9ADAdiqGWYk1DQ0ReVEdvaAfZfS9+kK3N+BwAuJlzzjQ=="; }; }; - "@babel/runtime-corejs2-7.0.0" = { + "@babel/runtime-corejs2-7.1.1" = { name = "_at_babel_slash_runtime-corejs2"; packageName = "@babel/runtime-corejs2"; - version = "7.0.0"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.0.0.tgz"; - sha512 = "Yww0jXgolNtkhcK+Txo5JN+DjBpNmmAtD7G99HOebhEjBzjnACG09Tip9C8lSOF6PrhA56OeJWeOZduNJaKxBA=="; + url = "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.1.1.tgz"; + sha512 = "J36jrmX2YeGHx+mIF/KV6By0XS4uCxt8JveYnx4LZaCkXDLopanQmbH7kp4VhSolU6nz3cggwCfkbFWwfxQI3Q=="; }; }; "@babel/types-7.0.0-beta.38" = { @@ -103,6 +103,141 @@ let sha512 = "O/IyiB5pfztCdmxQZg0/xeq5w+YiP3gtJz8d4We2EpLPKzbDVjOrtfLKYgVfm6Ya6mbvDge1uLkSRwaoVCWKnA=="; }; }; + "@commitlint/cli-7.1.2" = { + name = "_at_commitlint_slash_cli"; + packageName = "@commitlint/cli"; + version = "7.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@commitlint/cli/-/cli-7.1.2.tgz"; + sha512 = "Dck7MqJCzrATYm4UqIKPdJvLVUuVZcpFw9KicrLw+a9YNIjsaXG9XojgPomTxFBNJZabAYBqKWkqNoFLrFA77w=="; + }; + }; + "@commitlint/config-conventional-7.1.2" = { + name = "_at_commitlint_slash_config-conventional"; + packageName = "@commitlint/config-conventional"; + version = "7.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-7.1.2.tgz"; + sha512 = "DmA4ixkpv03qA1TVs1Bl25QsVym2bPL6pKapesALWIVggG3OpwqGZ55vN75Tx8xZoG7LFKrVyrt7kwhA7X8njQ=="; + }; + }; + "@commitlint/ensure-7.1.2" = { + name = "_at_commitlint_slash_ensure"; + packageName = "@commitlint/ensure"; + version = "7.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@commitlint/ensure/-/ensure-7.1.2.tgz"; + sha512 = "F0U4UEMgB5lnscgiZtuUolFkQ/dRD4RzXs8KgCik2D0wL3fUXSB5hmfbrbMF9ERseVQCHsxCHWm7bKzxKmXgIA=="; + }; + }; + "@commitlint/execute-rule-7.1.2" = { + name = "_at_commitlint_slash_execute-rule"; + packageName = "@commitlint/execute-rule"; + version = "7.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@commitlint/execute-rule/-/execute-rule-7.1.2.tgz"; + sha512 = "EP/SqX2U2L4AQHglZ2vGM1pvHJOh3sbYtHn1QhtllqEpsdmhuNpVPSGHP/r9OD2h4i90vtnWgZQoskt2MkbknA=="; + }; + }; + "@commitlint/format-7.1.2" = { + name = "_at_commitlint_slash_format"; + packageName = "@commitlint/format"; + version = "7.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@commitlint/format/-/format-7.1.2.tgz"; + sha512 = "l+eQChtIeNOddi4t5p+T9ViFXQMMFWIbzKh708YCI8BoByhqedhLsEhEn1nzGq1cVYT2AdGRhY8ed6/Nc5z85w=="; + }; + }; + "@commitlint/is-ignored-7.1.2" = { + name = "_at_commitlint_slash_is-ignored"; + packageName = "@commitlint/is-ignored"; + version = "7.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-7.1.2.tgz"; + sha512 = "29SHreGSAKxOTtIdG1swo9E14E8KZbyE0Y1u0wz9iKjb6i0m7ahZW0l4Ty+j3pACiYDOOXDW1BWSOFaBwwKlxQ=="; + }; + }; + "@commitlint/lint-7.1.2" = { + name = "_at_commitlint_slash_lint"; + packageName = "@commitlint/lint"; + version = "7.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@commitlint/lint/-/lint-7.1.2.tgz"; + sha512 = "HCkMlnUZD4yVnGDHcJQN/PkJRQpKgsiLojUaUHE8b1YjWW+qviolizbZjcqs/nimzCWlAkaU5KPs+3pzGBfVug=="; + }; + }; + "@commitlint/load-7.1.2" = { + name = "_at_commitlint_slash_load"; + packageName = "@commitlint/load"; + version = "7.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@commitlint/load/-/load-7.1.2.tgz"; + sha512 = "BEQ9k3iZjB1NDAblmB88WU+256p8xHCWYuqZmJOerx6Upbam7XrpDTurMOKFUxk8tZU9OBqHQtBapX8UxJWi9A=="; + }; + }; + "@commitlint/message-7.1.2" = { + name = "_at_commitlint_slash_message"; + packageName = "@commitlint/message"; + version = "7.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@commitlint/message/-/message-7.1.2.tgz"; + sha512 = "6FQeK5LAs1Bde6W/jULg+I/XZhj3gbqCWlS2Q11A2JbaTRpRJZzm7WdD9nK3I0+De41EOqW2t4mBnrpio3o1Zg=="; + }; + }; + "@commitlint/parse-7.1.2" = { + name = "_at_commitlint_slash_parse"; + packageName = "@commitlint/parse"; + version = "7.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@commitlint/parse/-/parse-7.1.2.tgz"; + sha512 = "wrdLwJZL3cs89MfgPtnbbKByijUo3Wrug55aTke5k/F0XNxGaDaNJyH4QXgidgXk57r2t4NJVAKwjnY4wjfNwg=="; + }; + }; + "@commitlint/read-7.1.2" = { + name = "_at_commitlint_slash_read"; + packageName = "@commitlint/read"; + version = "7.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@commitlint/read/-/read-7.1.2.tgz"; + sha512 = "sarYQgfTay2Eu7onHz53EYyRw7pI5QmLE7tP5Ri9op6eu4LadjSoA/4dfc+VE7avsq21J2ewSbz+9f0uvhDxgg=="; + }; + }; + "@commitlint/resolve-extends-7.1.2" = { + name = "_at_commitlint_slash_resolve-extends"; + packageName = "@commitlint/resolve-extends"; + version = "7.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-7.1.2.tgz"; + sha512 = "zwbifMB9DeHP4sYQdrkx+XJh5Q1lyP/OdlErUCC34NV4Lkxw/XxXF4St3e+y1X28/SgrEc2XSOS6n/vQQfUlLA=="; + }; + }; + "@commitlint/rules-7.1.2" = { + name = "_at_commitlint_slash_rules"; + packageName = "@commitlint/rules"; + version = "7.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@commitlint/rules/-/rules-7.1.2.tgz"; + sha512 = "O9fONZXiJ6NN2mfy+enHmeTzBHcfDVVYjxTdBJFp99yUSvVyHaD+jc2r795gcMv3oP5594BDXSKcD/3yb8sLzA=="; + }; + }; + "@commitlint/to-lines-7.1.2" = { + name = "_at_commitlint_slash_to-lines"; + packageName = "@commitlint/to-lines"; + version = "7.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@commitlint/to-lines/-/to-lines-7.1.2.tgz"; + sha512 = "Nz3qZwrIEYiN9v/ThJqXAwu4X5+hvT9H8yRPHfjc538R8WhwEfhvym7/4YznDHSvWrQgwqtNPdrb6b2OSBsHmg=="; + }; + }; + "@commitlint/top-level-7.1.2" = { + name = "_at_commitlint_slash_top-level"; + packageName = "@commitlint/top-level"; + version = "7.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@commitlint/top-level/-/top-level-7.1.2.tgz"; + sha512 = "YKugOAKy3hgM/ITezPp7Ns51U3xoJfuOsVnMGW4oDcHLhuQ/Qd58ROv/Hgedtk8HugKX3DdZ8XoEnRG70RDGqQ=="; + }; + }; "@cycle/dom-18.3.0" = { name = "_at_cycle_slash_dom"; packageName = "@cycle/dom"; @@ -175,22 +310,22 @@ let sha1 = "890ae7c5d8c877f6d384860215ace9d7ec945bda"; }; }; - "@ionic/cli-framework-1.0.6" = { + "@ionic/cli-framework-1.0.7" = { name = "_at_ionic_slash_cli-framework"; packageName = "@ionic/cli-framework"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-1.0.6.tgz"; - sha512 = "vUKqtMCYTGr7mhNSjVKsl5VYLP+XyNltiVp+afSzOOlNx+GdEDzzxAhpJSryhu77EVtlJEUvkTq0pQIqptC1QA=="; + url = "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-1.0.7.tgz"; + sha512 = "e6yaPkqom2KVNgUpJJMJbClkc8n4r4pOieiVEgfVmjC0ZC1wRZ3hYHzUMbsY/QOnB3UceCBGuYZMScaF/QNY8g=="; }; }; - "@ionic/cli-utils-2.2.0" = { + "@ionic/cli-utils-2.2.1" = { name = "_at_ionic_slash_cli-utils"; packageName = "@ionic/cli-utils"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/cli-utils/-/cli-utils-2.2.0.tgz"; - sha512 = "9FJHRZU4oNh2pwkm3mPgGCQolBvLj5o6llshcH4L9OEHtJUrYSolttuglOh3p6kgmqpJfUbRF/mmoAX7jo2XXA=="; + url = "https://registry.npmjs.org/@ionic/cli-utils/-/cli-utils-2.2.1.tgz"; + sha512 = "/fAsYbgNOVcQhihW3EBy//FtBD/uhZyLA/fCd42UbHloR1uNo0KsGW7dh2i5NBYsaYsOequV5ZxGk2p0Wr5HWw=="; }; }; "@ionic/discover-1.0.4" = { @@ -202,6 +337,24 @@ let sha512 = "/9WbB31cv0nr2M8Vi4O2coDiX27IJ5EXwGKrgnV0X0/dfavObNVqV9ksNcHnZTuNArqBXywOsWPIES0+tHXIhA=="; }; }; + "@ionic/utils-fs-0.0.1" = { + name = "_at_ionic_slash_utils-fs"; + packageName = "@ionic/utils-fs"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-0.0.1.tgz"; + sha512 = "l5+RM7lEIKSsxAUyNiarHuNJBioJhFM4CAezZ7YRyFoX6J7Y4paZIfZzoFa6UdNsyucE51lZ1X/6ZOf/gVj73Q=="; + }; + }; + "@ionic/utils-network-0.0.1" = { + name = "_at_ionic_slash_utils-network"; + packageName = "@ionic/utils-network"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@ionic/utils-network/-/utils-network-0.0.1.tgz"; + sha512 = "qpzZ+k94PCWbWmub2XHP0XJKcoBflGeOAW64RlIbthoIzj0SRwoYjn4DrFVbYhScQ/xmLe1hSD2Hq8NZ4HEM5g=="; + }; + }; "@kbrandwijk/swagger-to-graphql-2.4.3" = { name = "_at_kbrandwijk_slash_swagger-to-graphql"; packageName = "@kbrandwijk/swagger-to-graphql"; @@ -211,13 +364,13 @@ let sha512 = "CNVsCrMge/jq6DCT5buNZ8PACY9RTvPJbCNoIcndfkJOCsNxOx9dnc5qw4pHZdHi8GS6l3qlgkuFKp33iD8J2Q=="; }; }; - "@lerna/add-3.2.0" = { + "@lerna/add-3.3.2" = { name = "_at_lerna_slash_add"; packageName = "@lerna/add"; - version = "3.2.0"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/add/-/add-3.2.0.tgz"; - sha512 = "qGA7agAWcKlrXZR3FwFJXTr26Q2rqjOVMNhtm8uyawImqfdKp4WJXuGdioiWOSW20jMvzLIFhWZh5lCh0UyMBw=="; + url = "https://registry.npmjs.org/@lerna/add/-/add-3.3.2.tgz"; + sha512 = "nKRRRKb4wt/GAywi8P++NY1TUiyhMs2g2KHSb41I4/qiCFQnTj2zkeshPyNmtBGjKzFXnOqrmc/8Wa2vmHHZVg=="; }; }; "@lerna/batch-packages-3.1.2" = { @@ -229,49 +382,49 @@ let sha512 = "HAkpptrYeUVlBYbLScXgeCgk6BsNVXxDd53HVWgzzTWpXV4MHpbpeKrByyt7viXlNhW0w73jJbipb/QlFsHIhQ=="; }; }; - "@lerna/bootstrap-3.2.0" = { + "@lerna/bootstrap-3.3.2" = { name = "_at_lerna_slash_bootstrap"; packageName = "@lerna/bootstrap"; - version = "3.2.0"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-3.2.0.tgz"; - sha512 = "xh6dPpdzsAEWF7lqASaym5AThkmP3ArR7Q+P/tiPWCT+OT7QT5QI2IQAz1aAYEBQL3ACzpE6kq+VOGi0m+9bxw=="; + url = "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-3.3.2.tgz"; + sha512 = "f0/FZ6iCXHNpHoUiM3wfmiJebHetrquP9mdNT7t//2iTGm1nz8iuKSLhfu9APazDXtqo3aDFx7JvuYKMg+GiXQ=="; }; }; - "@lerna/changed-3.2.0" = { + "@lerna/changed-3.3.2" = { name = "_at_lerna_slash_changed"; packageName = "@lerna/changed"; - version = "3.2.0"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/changed/-/changed-3.2.0.tgz"; - sha512 = "R+vGzzXPN5s5lJT0v1zSTLw43O2ek2yekqCqvw7p9UFqgqYSbxUsyWXMdhku/mOIFWTc6DzrsOi+U7CX3TXmHg=="; + url = "https://registry.npmjs.org/@lerna/changed/-/changed-3.3.2.tgz"; + sha512 = "wLH6RzYPQAryrsJakc9I3k0aFWE/cJyWoUD8dQy186jxwtLgeQdVc0+NegNyab7MIPi7Hsv9A3hx6lM1rPH94A=="; }; }; - "@lerna/check-working-tree-3.1.0" = { + "@lerna/check-working-tree-3.3.0" = { name = "_at_lerna_slash_check-working-tree"; packageName = "@lerna/check-working-tree"; - version = "3.1.0"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/check-working-tree/-/check-working-tree-3.1.0.tgz"; - sha512 = "ruy6s44IUcaPEa4JlDDDk6nbacMESUPRSb+dohzLJxfhXx1wFnEVF6L91TGxFP+C0lt5V6zd8rnJxkW/uZzNAA=="; + url = "https://registry.npmjs.org/@lerna/check-working-tree/-/check-working-tree-3.3.0.tgz"; + sha512 = "oeEP1dNhiiKUaO0pmcIi73YXJpaD0n5JczNctvVNZ8fGZmrALZtEnmC28o6Z7JgQaqq5nd2kO7xbnjoitrC51g=="; }; }; - "@lerna/child-process-3.0.0" = { + "@lerna/child-process-3.3.0" = { name = "_at_lerna_slash_child-process"; packageName = "@lerna/child-process"; - version = "3.0.0"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/child-process/-/child-process-3.0.0.tgz"; - sha512 = "8vHRDkpGhzSaMsXgyXVgY80mUSC5WSkDmhWWA3bnB/n5FBK1gK8EKQUpHTk14SckwvUgEJzBd35gR5/XKGOgmQ=="; + url = "https://registry.npmjs.org/@lerna/child-process/-/child-process-3.3.0.tgz"; + sha512 = "q2d/OPlNX/cBXB6Iz1932RFzOmOHq6ZzPjqebkINNaTojHWuuRpvJJY4Uz3NGpJ3kEtPDvBemkZqUBTSO5wb1g=="; }; }; - "@lerna/clean-3.1.3" = { + "@lerna/clean-3.3.2" = { name = "_at_lerna_slash_clean"; packageName = "@lerna/clean"; - version = "3.1.3"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/clean/-/clean-3.1.3.tgz"; - sha512 = "XVdcIOjhudXlk5pTXjrpsnNLqeVi2rBu2oWzPH2GHrxWGBZBW8thGIFhQf09da/RbRT3uzBWXpUv+sbL2vbX3g=="; + url = "https://registry.npmjs.org/@lerna/clean/-/clean-3.3.2.tgz"; + sha512 = "mvqusgSp2ou5SGqQgTEoTvGJpGfH4+L6XSeN+Ims+eNFGXuMazmKCf+rz2PZBMFufaHJ/Os+JF0vPCcWI1Fzqg=="; }; }; "@lerna/cli-3.2.0" = { @@ -283,85 +436,85 @@ let sha512 = "JdbLyTxHqxUlrkI+Ke+ltXbtyA+MPu9zR6kg/n8Fl6uaez/2fZWtReXzYi8MgLxfUFa7+1OHWJv4eAMZlByJ+Q=="; }; }; - "@lerna/collect-updates-3.1.0" = { + "@lerna/collect-updates-3.3.2" = { name = "_at_lerna_slash_collect-updates"; packageName = "@lerna/collect-updates"; - version = "3.1.0"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/collect-updates/-/collect-updates-3.1.0.tgz"; - sha512 = "zHxHRZOteTqcW9mAyLrmoWEKpfxgA3c6LJj4nauB2pM3MKyKNhg0gqiy2RHFu7EGivPki4Q1624I301iAXtUVA=="; + url = "https://registry.npmjs.org/@lerna/collect-updates/-/collect-updates-3.3.2.tgz"; + sha512 = "9WyBJI2S5sYgEZEScu525Lbi6nknNrdBKop35sCDIC9y6AIGvH6Dr5tkTd+Kg3n1dE+kHwW/xjERkx3+h7th3w=="; }; }; - "@lerna/command-3.1.3" = { + "@lerna/command-3.3.0" = { name = "_at_lerna_slash_command"; packageName = "@lerna/command"; - version = "3.1.3"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/command/-/command-3.1.3.tgz"; - sha512 = "ptaFNsfcTpxnSkaNrGgW3fRbWWVSVDUx4BpkjUUnRTgy9mwoykQWgQB3inhgTYHwW6e4PzO79F2hovfUMzHuzg=="; + url = "https://registry.npmjs.org/@lerna/command/-/command-3.3.0.tgz"; + sha512 = "NTOkLEKlWcBLHSvUr9tzVpV7RJ4GROLeOuZ6RfztGOW/31JPSwVVBD2kPifEXNZunldOx5GVWukR+7+NpAWhsg=="; }; }; - "@lerna/conventional-commits-3.0.2" = { + "@lerna/conventional-commits-3.3.0" = { name = "_at_lerna_slash_conventional-commits"; packageName = "@lerna/conventional-commits"; - version = "3.0.2"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/conventional-commits/-/conventional-commits-3.0.2.tgz"; - sha512 = "Cxd1eWXn3usADKXIUvYmTERx2+1N7oJD4Whz+FVu8kTfufsfTO7fYOan1RVkg86ukZbNDyS+iOxZ8DJ2JspS9g=="; + url = "https://registry.npmjs.org/@lerna/conventional-commits/-/conventional-commits-3.3.0.tgz"; + sha512 = "nUFardc5G4jG5LI/Jlw0kblzlRLJ08ut6uJjHXTnUE/QJuKYaqBZm6goGG8OSxp/WltklndkQUOtThyZpefviA=="; }; }; - "@lerna/create-3.1.3" = { + "@lerna/create-3.3.1" = { name = "_at_lerna_slash_create"; packageName = "@lerna/create"; - version = "3.1.3"; + version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/create/-/create-3.1.3.tgz"; - sha512 = "CmXKCBc6AE3F9O6mMg4Y76cQ8eTCy3ksqDFKxVQMdYDtHKnTrH1s0l8sn3J1AiylqVDnvxhb3Rjyj+OWyzmFPQ=="; + url = "https://registry.npmjs.org/@lerna/create/-/create-3.3.1.tgz"; + sha512 = "4VASkTLvN66euTcWMPN2vIzEoP07hgutx7V70CXSOc+DiWV8S22z0PjXATi2yli83TC/Qj4gHYtU2futQrdY1A=="; }; }; - "@lerna/create-symlink-3.0.0" = { + "@lerna/create-symlink-3.3.0" = { name = "_at_lerna_slash_create-symlink"; packageName = "@lerna/create-symlink"; - version = "3.0.0"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/create-symlink/-/create-symlink-3.0.0.tgz"; - sha512 = "Q9qAzGGqQtVzHWrCz+Md4SH0tW99DrgFJ68cnFqilOO6H3Y/y/H0gwHICqM9YxRwLs6GJdkzoqJATFShM7PKJA=="; + url = "https://registry.npmjs.org/@lerna/create-symlink/-/create-symlink-3.3.0.tgz"; + sha512 = "0lb88Nnq1c/GG+fwybuReOnw3+ah4dB81PuWwWwuqUNPE0n50qUf/M/7FfSb5JEh/93fcdbZI0La8t3iysNW1w=="; }; }; - "@lerna/describe-ref-3.1.0" = { + "@lerna/describe-ref-3.3.0" = { name = "_at_lerna_slash_describe-ref"; packageName = "@lerna/describe-ref"; - version = "3.1.0"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/describe-ref/-/describe-ref-3.1.0.tgz"; - sha512 = "0a7WFKDSmdEwwmEj+ZfhI7SkkG1CDcVhfW8VhPqr6gnCMY+ryt6iV/rR7ygb0eCDg8wEe9eQsiwbnrbXDLjIDw=="; + url = "https://registry.npmjs.org/@lerna/describe-ref/-/describe-ref-3.3.0.tgz"; + sha512 = "4t7M4OupnYMSPNLrLUau8qkS+dgLEi4w+DkRkV0+A+KNYga1W0jVgNLPIIsxta7OHfodPkCNAqZCzNCw/dmAwA=="; }; }; - "@lerna/diff-3.1.3" = { + "@lerna/diff-3.3.0" = { name = "_at_lerna_slash_diff"; packageName = "@lerna/diff"; - version = "3.1.3"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/diff/-/diff-3.1.3.tgz"; - sha512 = "30G74DxdQC4dR3U0yqh5mjcioLDUmSy1ntntdF3khvKV9oiMVzCSOO0oOlSwIdmohke+bQ//oF+oyl0Dy1TUTQ=="; + url = "https://registry.npmjs.org/@lerna/diff/-/diff-3.3.0.tgz"; + sha512 = "sIoMjsm3NVxvmt6ofx8Uu/2fxgldQqLl0zmC9X1xW00j831o5hBffx1EoKj9CnmaEvoSP6j/KFjxy2RWjebCIg=="; }; }; - "@lerna/exec-3.1.3" = { + "@lerna/exec-3.3.2" = { name = "_at_lerna_slash_exec"; packageName = "@lerna/exec"; - version = "3.1.3"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/exec/-/exec-3.1.3.tgz"; - sha512 = "r0yQj9Rza5a42Shts8rXYGU1/Va8hO2atk/TEZgrA1EcTwgZyAuXsuML5UWbC/eLgwEjVDmc3MUSj8O1JijBMQ=="; + url = "https://registry.npmjs.org/@lerna/exec/-/exec-3.3.2.tgz"; + sha512 = "mN6vGxNir7JOGvWLwKr3DW3LNy1ecCo2ziZj5rO9Mw5Rew3carUu1XLmhF/4judtsvXViUY+rvGIcqHe0vvb+w=="; }; }; - "@lerna/filter-options-3.1.2" = { + "@lerna/filter-options-3.3.2" = { name = "_at_lerna_slash_filter-options"; packageName = "@lerna/filter-options"; - version = "3.1.2"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/filter-options/-/filter-options-3.1.2.tgz"; - sha512 = "smbvSGK/eU+7PDKO4jbJ7XYO2XTfhnwPeOTuwSm1mlWS5dUGasYkhAuFzouFh60aZBvmW0e6APe0XYeofQNcCg=="; + url = "https://registry.npmjs.org/@lerna/filter-options/-/filter-options-3.3.2.tgz"; + sha512 = "0WHqdDgAnt5WKoByi1q+lFw8HWt5tEKP2DnLlGqWv3YFwVF5DsPRlO7xbzjY9sJgvyJtZcnkMtccdBPFhGGyIQ=="; }; }; "@lerna/filter-packages-3.0.0" = { @@ -391,49 +544,49 @@ let sha512 = "LVeZU/Zgc0XkHdGMRYn+EmHfDmmYNwYRv3ta59iCVFXLVp7FRFWF7oB1ss/WRa9x/pYU0o6L8as/5DomLUGASA=="; }; }; - "@lerna/has-npm-version-3.0.4" = { + "@lerna/has-npm-version-3.3.0" = { name = "_at_lerna_slash_has-npm-version"; packageName = "@lerna/has-npm-version"; - version = "3.0.4"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/has-npm-version/-/has-npm-version-3.0.4.tgz"; - sha512 = "RisEWZBROi8corPb/PUIQqT+xGPLeriJ/n6VCeO6GROCO1fyYBX7kgFmVpFOytufWFkI04qBgLaUs+CEc8Yspg=="; + url = "https://registry.npmjs.org/@lerna/has-npm-version/-/has-npm-version-3.3.0.tgz"; + sha512 = "GX7omRep1eBRZHgjZLRw3MpBJSdA5gPZFz95P7rxhpvsiG384Tdrr/cKFMhm0A09yq27Tk/nuYTaZIj7HsVE6g=="; }; }; - "@lerna/import-3.1.3" = { + "@lerna/import-3.3.1" = { name = "_at_lerna_slash_import"; packageName = "@lerna/import"; - version = "3.1.3"; + version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/import/-/import-3.1.3.tgz"; - sha512 = "+XV/EHXEHbyMmprz8zQa0VF0TZ+txRIrcF3Q/PsuZ4isVxawIbP1CmgE0yn0/1XSNJwGKsuPfGauRtnjUi2LJw=="; + url = "https://registry.npmjs.org/@lerna/import/-/import-3.3.1.tgz"; + sha512 = "2OzTQDkYKbBPpyP2iOI1sWfcvMjNLjjHjmREq/uOWJaSIk5J3Ukt71OPpcOHh4V2CBOlXidCcO+Hyb4FVIy8fw=="; }; }; - "@lerna/init-3.1.3" = { + "@lerna/init-3.3.0" = { name = "_at_lerna_slash_init"; packageName = "@lerna/init"; - version = "3.1.3"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/init/-/init-3.1.3.tgz"; - sha512 = "c418p6fAfJ+b/tidB8/O/ABGLX7a5y5uJSWxH2/Mp7i5da/RD27XJ6E6818hGAbUbVQw04+XuXHtrWYlWLEJCw=="; + url = "https://registry.npmjs.org/@lerna/init/-/init-3.3.0.tgz"; + sha512 = "HvgRLkIG6nDIeAO6ix5sUVIVV+W9UMk2rSSmFT66CDOefRi7S028amiyYnFUK1QkIAaUbVUyOnYaErtbJwICuw=="; }; }; - "@lerna/link-3.1.4" = { + "@lerna/link-3.3.0" = { name = "_at_lerna_slash_link"; packageName = "@lerna/link"; - version = "3.1.4"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/link/-/link-3.1.4.tgz"; - sha512 = "AAl4ctKtE6975zxdrsr16CAh/K4y0ZjjY9XDdD+zMxsSPELvRVG6M36O1A72AmKz5Nhh1l82bPrw7w54TbQ8hA=="; + url = "https://registry.npmjs.org/@lerna/link/-/link-3.3.0.tgz"; + sha512 = "8CeXzGL7okrsVXsy2sHXI2KuBaczw3cblAnA2+FJPUqSKMPNbUTRzeU3bOlCjYtK0LbxC4ngENJTL3jJ8RaYQQ=="; }; }; - "@lerna/list-3.1.3" = { + "@lerna/list-3.3.2" = { name = "_at_lerna_slash_list"; packageName = "@lerna/list"; - version = "3.1.3"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/list/-/list-3.1.3.tgz"; - sha512 = "/ncX5Kj1ddLgZuBkjaoluJgcmAAm/L4/AymVNBgVrw6dOad0C0RB6oIcRAbxDennEQ25wSOFmuXRZHYHY9VYyg=="; + url = "https://registry.npmjs.org/@lerna/list/-/list-3.3.2.tgz"; + sha512 = "XXEVy7w+i/xx8NeJmGirw4upEoEF9OfD6XPLjISNQc24VgQV+frXdVJ02QcP7Y/PkY1rdIVrOjvo3ipKVLUxaQ=="; }; }; "@lerna/listable-3.0.0" = { @@ -463,40 +616,40 @@ let sha512 = "xXG7qt349t+xzaHTQELmIDjbq8Q49HOMR8Nx/gTDBkMl02Fno91LXFnA4A7ErPiyUSGqNSfLw+zgij0hgpeN7w=="; }; }; - "@lerna/npm-dist-tag-3.0.0" = { + "@lerna/npm-dist-tag-3.3.0" = { name = "_at_lerna_slash_npm-dist-tag"; packageName = "@lerna/npm-dist-tag"; - version = "3.0.0"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/npm-dist-tag/-/npm-dist-tag-3.0.0.tgz"; - sha512 = "ZOcfcsNJlCoVHvLOROdCTvqD3keG3TJ78Cu8sALsz8n0kEz2ga7tNy5wbQ67SGyY7+jq4YiBv5BwXjV+56Sv+A=="; + url = "https://registry.npmjs.org/@lerna/npm-dist-tag/-/npm-dist-tag-3.3.0.tgz"; + sha512 = "EtZJXzh3w5tqXEev+EBBPrWKWWn0WgJfxm4FihfS9VgyaAW8udIVZHGkIQ3f+tBtupcAzA9Q8cQNUkGF2efwmA=="; }; }; - "@lerna/npm-install-3.0.0" = { + "@lerna/npm-install-3.3.0" = { name = "_at_lerna_slash_npm-install"; packageName = "@lerna/npm-install"; - version = "3.0.0"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/npm-install/-/npm-install-3.0.0.tgz"; - sha512 = "e0sspVUfzEKhqsRIxzWqZ/uMBHzZSzOa4HCeORErEZu+dmDoI145XYhqvCVn7EvbAb407FV2H9GVeoP0JeG8GQ=="; + url = "https://registry.npmjs.org/@lerna/npm-install/-/npm-install-3.3.0.tgz"; + sha512 = "WoVvKdS8ltROTGSNQwo6NDq0YKnjwhvTG4li1okcN/eHKOS3tL9bxbgPx7No0wOq5DKBpdeS9KhAfee6LFAZ5g=="; }; }; - "@lerna/npm-publish-3.2.0" = { + "@lerna/npm-publish-3.3.1" = { name = "_at_lerna_slash_npm-publish"; packageName = "@lerna/npm-publish"; - version = "3.2.0"; + version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/npm-publish/-/npm-publish-3.2.0.tgz"; - sha512 = "x13EGrjZk9w8gCQAE44aKbeO1xhLizLJ4tKjzZmQqKEaUCugF4UU8ZRGshPMRFBdsHTEWh05dkKx2oPMoaf0dw=="; + url = "https://registry.npmjs.org/@lerna/npm-publish/-/npm-publish-3.3.1.tgz"; + sha512 = "bVTlWIcBL6Zpyzqvr9C7rxXYcoPw+l7IPz5eqQDNREj1R39Wj18OWB2KTJq8l7LIX7Wf4C2A1uT5hJaEf9BuvA=="; }; }; - "@lerna/npm-run-script-3.0.0" = { + "@lerna/npm-run-script-3.3.0" = { name = "_at_lerna_slash_npm-run-script"; packageName = "@lerna/npm-run-script"; - version = "3.0.0"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/npm-run-script/-/npm-run-script-3.0.0.tgz"; - sha512 = "Y1H4Myer1S7an33FDK0eqyR+95PujUePC/xJZKq/H50SaQNwBw7KMlxXxy6kXVEcQhmvQsER4Bw3msgqwwGYIw=="; + url = "https://registry.npmjs.org/@lerna/npm-run-script/-/npm-run-script-3.3.0.tgz"; + sha512 = "YqDguWZzp4jIomaE4aWMUP7MIAJAFvRAf6ziQLpqwoQskfWLqK5mW0CcszT1oLjhfb3cY3MMfSTFaqwbdKmICg=="; }; }; "@lerna/output-3.0.0" = { @@ -535,58 +688,58 @@ let sha512 = "XhDFVfqj79jG2Speggd15RpYaE8uiR25UKcQBDmumbmqvTS7xf2cvl2pq2UTvDafaJ0YwFF3xkxQZeZnFMwdkw=="; }; }; - "@lerna/prompt-3.0.0" = { + "@lerna/prompt-3.3.1" = { name = "_at_lerna_slash_prompt"; packageName = "@lerna/prompt"; - version = "3.0.0"; + version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/prompt/-/prompt-3.0.0.tgz"; - sha512 = "EzvNexDTh//GlpOz68zRo16NdOIqWqiiXMs9tIxpELQubH+kUGKvBSiBrZ2Zyrfd8pQhIf+8qARtkCG+G7wzQQ=="; + url = "https://registry.npmjs.org/@lerna/prompt/-/prompt-3.3.1.tgz"; + sha512 = "eJhofrUCUaItMIH6et8kI7YqHfhjWqGZoTsE+40NRCfAraOMWx+pDzfRfeoAl3qeRAH2HhNj1bkYn70FbUOxuQ=="; }; }; - "@lerna/publish-3.2.1" = { + "@lerna/publish-3.4.0" = { name = "_at_lerna_slash_publish"; packageName = "@lerna/publish"; - version = "3.2.1"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/publish/-/publish-3.2.1.tgz"; - sha512 = "SnSBstK/G9qLt5rS56pihNacgsu3UgxXiCexWb57GGEp2eDguQ7rFzxVs4JMQQWmVG97EMJQxfFV54tW2sqtIw=="; + url = "https://registry.npmjs.org/@lerna/publish/-/publish-3.4.0.tgz"; + sha512 = "wcqWDKbkDjyj6F9Mw4/LL2CtpCN61RazNKxYm+fyJ20P2zfcAwLEwxttA6ZWIO8xUiLXkCTFIhwOulHyAPAq3w=="; }; }; - "@lerna/resolve-symlink-3.0.0" = { + "@lerna/resolve-symlink-3.3.0" = { name = "_at_lerna_slash_resolve-symlink"; packageName = "@lerna/resolve-symlink"; - version = "3.0.0"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/resolve-symlink/-/resolve-symlink-3.0.0.tgz"; - sha512 = "MqjW9e+QVXts5IK5dk1XnYx7JKb+g+tQkOnnpAxYWHjahf3rGJ7Ru8maWh8KoPE+nIHAekk4WcjpiA9nLKvkFQ=="; + url = "https://registry.npmjs.org/@lerna/resolve-symlink/-/resolve-symlink-3.3.0.tgz"; + sha512 = "KmoPDcFJ2aOK2inYHbrsiO9SodedUj0L1JDvDgirVNIjMUaQe2Q6Vi4Gh+VCJcyB27JtfHioV9R2NxU72Pk2hg=="; }; }; - "@lerna/rimraf-dir-3.0.0" = { + "@lerna/rimraf-dir-3.3.0" = { name = "_at_lerna_slash_rimraf-dir"; packageName = "@lerna/rimraf-dir"; - version = "3.0.0"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/rimraf-dir/-/rimraf-dir-3.0.0.tgz"; - sha512 = "epvh/RGWSOYdrNgrizMcRq9VyCHkeY0LpIE4074r4ouKdYNhBT0LlpT0yMLvQgQKJkKRlqcfhJHvZeGHhXQyGg=="; + url = "https://registry.npmjs.org/@lerna/rimraf-dir/-/rimraf-dir-3.3.0.tgz"; + sha512 = "vSqOcZ4kZduiSprbt+y40qziyN3VKYh+ygiCdnbBbsaxpdKB6CfrSMUtrLhVFrqUfBHIZRzHIzgjTdtQex1KLw=="; }; }; - "@lerna/run-3.1.3" = { + "@lerna/run-3.3.2" = { name = "_at_lerna_slash_run"; packageName = "@lerna/run"; - version = "3.1.3"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/run/-/run-3.1.3.tgz"; - sha512 = "O26WdR+sQFSG2Fpc67nw+m8oVq3R+H6jsscKuB6VJafU+V4/hPURSbuFZIcmnD9MLmzAIhlQiCf0Fy6s/1MPPA=="; + url = "https://registry.npmjs.org/@lerna/run/-/run-3.3.2.tgz"; + sha512 = "cruwRGZZWnQ5I0M+AqcoT3Xpq2wj3135iVw4n59/Op6dZu50sMFXZNLiTTTZ15k8rTKjydcccJMdPSpTHbH7/A=="; }; }; - "@lerna/run-lifecycle-3.2.0" = { + "@lerna/run-lifecycle-3.3.1" = { name = "_at_lerna_slash_run-lifecycle"; packageName = "@lerna/run-lifecycle"; - version = "3.2.0"; + version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/run-lifecycle/-/run-lifecycle-3.2.0.tgz"; - sha512 = "kGGdHJRyeZF+VTtal1DBptg6qwIsOLg3pKtmRm1rCMNN7j4kgrA9L07ZoRar8LjQXvfuheB1LSKHd5d04pr4Tg=="; + url = "https://registry.npmjs.org/@lerna/run-lifecycle/-/run-lifecycle-3.3.1.tgz"; + sha512 = "xy4K3amlXk0LjSa5d3VqmrW9SsxMyvI7lw2dHDMb5PqjjcjMQgb6+nFbycwyJMhCP8u7MwQIZ4hFYF9XYbWSzQ=="; }; }; "@lerna/run-parallel-batches-3.0.0" = { @@ -598,22 +751,22 @@ let sha512 = "Mj1ravlXF7AkkewKd9YFq9BtVrsStNrvVLedD/b2wIVbNqcxp8lS68vehXVOzoL/VWNEDotvqCQtyDBilCodGw=="; }; }; - "@lerna/symlink-binary-3.1.4" = { + "@lerna/symlink-binary-3.3.0" = { name = "_at_lerna_slash_symlink-binary"; packageName = "@lerna/symlink-binary"; - version = "3.1.4"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/symlink-binary/-/symlink-binary-3.1.4.tgz"; - sha512 = "uQ8pYxzygahshXJAeC/vY4eSi+kFM0S2Pi15hJsJI3W7Ec6ysSYU1lXemb6kqoIqkTDJZWnfKXEq/3FLE+JYhg=="; + url = "https://registry.npmjs.org/@lerna/symlink-binary/-/symlink-binary-3.3.0.tgz"; + sha512 = "zRo6CimhvH/VJqCFl9T4IC6syjpWyQIxEfO2sBhrapEcfwjtwbhoGgKwucsvt4rIpFazCw63jQ/AXMT27KUIHg=="; }; }; - "@lerna/symlink-dependencies-3.1.4" = { + "@lerna/symlink-dependencies-3.3.0" = { name = "_at_lerna_slash_symlink-dependencies"; packageName = "@lerna/symlink-dependencies"; - version = "3.1.4"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/symlink-dependencies/-/symlink-dependencies-3.1.4.tgz"; - sha512 = "iModwb0Xh0N0t55C6S4K2mzLdu1zXVsBc0qubUY1x0RSul92z8NeAe1aM5JzwMzuSoMA/LRiD1lNMWMRBf4JVg=="; + url = "https://registry.npmjs.org/@lerna/symlink-dependencies/-/symlink-dependencies-3.3.0.tgz"; + sha512 = "IRngSNCmuD5uBKVv23tHMvr7Mplti0lKHilFKcvhbvhAfu6m/Vclxhkfs/uLyHzG+DeRpl/9o86SQET3h4XDhg=="; }; }; "@lerna/validation-error-3.0.0" = { @@ -625,13 +778,13 @@ let sha512 = "5wjkd2PszV0kWvH+EOKZJWlHEqCTTKrWsvfHnHhcUaKBe/NagPZFWs+0xlsDPZ3DJt5FNfbAPAnEBQ05zLirFA=="; }; }; - "@lerna/version-3.2.0" = { + "@lerna/version-3.3.2" = { name = "_at_lerna_slash_version"; packageName = "@lerna/version"; - version = "3.2.0"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/version/-/version-3.2.0.tgz"; - sha512 = "1AVDMpeecSMiG1cacduE+f2KO0mC7F/9MvWsHtp+rjkpficMcsVme7IMtycuvu/F07wY4Xr9ioFKYTwTcybbIA=="; + url = "https://registry.npmjs.org/@lerna/version/-/version-3.3.2.tgz"; + sha512 = "2MHP6mA1f0t3UdzqPpfgAhsT1L64HOedlJxrQUoHrkou/G25Od4wjmKr9OZ0Oc4CLDbXD/sYEmE/9fZi1GGgKg=="; }; }; "@lerna/write-log-file-3.0.0" = { @@ -643,6 +796,15 @@ let sha512 = "SfbPp29lMeEVOb/M16lJwn4nnx5y+TwCdd7Uom9umd7KcZP0NOvpnX0PHehdonl7TyHZ1Xx2maklYuCLbQrd/A=="; }; }; + "@marionebl/sander-0.6.1" = { + name = "_at_marionebl_slash_sander"; + packageName = "@marionebl/sander"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@marionebl/sander/-/sander-0.6.1.tgz"; + sha1 = "1958965874f24bc51be48875feb50d642fc41f7b"; + }; + }; "@mrmlnc/readdir-enhanced-2.2.1" = { name = "_at_mrmlnc_slash_readdir-enhanced"; packageName = "@mrmlnc/readdir-enhanced"; @@ -652,13 +814,13 @@ let sha512 = "bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g=="; }; }; - "@nodelib/fs.stat-1.1.1" = { + "@nodelib/fs.stat-1.1.2" = { name = "_at_nodelib_slash_fs.stat"; packageName = "@nodelib/fs.stat"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.1.tgz"; - sha512 = "KU/VDjC5RwtDUZiz3d+DHXJF2lp5hB9dn552TXIyptj8SH1vXmR40mG0JgGq03IlYsOgGfcv8xrLpSQ0YUMQdA=="; + url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.2.tgz"; + sha512 = "yprFYuno9FtNsSHVlSWd+nRlmGoAbqbeCwOryP6sC/zoCjhpArcRMYp19EvpSUSizJAlsXEwJv+wcWS9XaXdMw=="; }; }; "@protobufjs/aspromise-1.1.2" = { @@ -841,24 +1003,6 @@ let sha512 = "ipZjBVsm2tF/n8qFGOuGBkUij9X9ZswVi9G3bx/6dz7POpVa6gVHcj1wsX/LVEn9MMF41fxK/PnZPPoTD1UFPw=="; }; }; - "@types/cross-spawn-6.0.0" = { - name = "_at_types_slash_cross-spawn"; - packageName = "@types/cross-spawn"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/cross-spawn/-/cross-spawn-6.0.0.tgz"; - sha512 = "evp2ZGsFw9YKprDbg8ySgC9NA15g3YgiI8ANkGmKKvvi0P2aDGYLPxQIC5qfeKNUOe3TjABVGuah6omPRpIYhg=="; - }; - }; - "@types/debug-0.0.30" = { - name = "_at_types_slash_debug"; - packageName = "@types/debug"; - version = "0.0.30"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/debug/-/debug-0.0.30.tgz"; - sha512 = "orGL5LXERPYsLov6CWs3Fh6203+dXzJkR7OnddIr2514Hsecwc8xRpzCapshBbKFImCsvS/mk6+FWiN5LyZJAQ=="; - }; - }; "@types/events-1.2.0" = { name = "_at_types_slash_events"; packageName = "@types/events"; @@ -886,51 +1030,6 @@ let sha512 = "lTeoCu5NxJU4OD9moCgm0ESZzweAx0YqsAcab6OB0EB3+As1OaHtKnaGJvcngQxYsi9UNv0abn4/DRavrRxt4w=="; }; }; - "@types/glob-5.0.35" = { - name = "_at_types_slash_glob"; - packageName = "@types/glob"; - version = "5.0.35"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/glob/-/glob-5.0.35.tgz"; - sha512 = "wc+VveszMLyMWFvXLkloixT4n0harUIVZjnpzztaZ0nKLuul7Z32iMt2fUFGAaZ4y1XWjFRMtCI5ewvyh4aIeg=="; - }; - }; - "@types/graphql-0.12.6" = { - name = "_at_types_slash_graphql"; - packageName = "@types/graphql"; - version = "0.12.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/graphql/-/graphql-0.12.6.tgz"; - sha512 = "wXAVyLfkG1UMkKOdMijVWFky39+OD/41KftzqfX1Oejd0Gm6dOIKjCihSVECg6X7PHjftxXmfOKA/d1H79ZfvQ=="; - }; - }; - "@types/inquirer-0.0.43" = { - name = "_at_types_slash_inquirer"; - packageName = "@types/inquirer"; - version = "0.0.43"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/inquirer/-/inquirer-0.0.43.tgz"; - sha512 = "xgyfKZVMFqE8aIKy1xfFVsX2MxyXUNgjgmbF6dRbR3sL+ZM5K4ka/9L4mmTwX8eTeVYtduyXu0gUVwVJa1HbNw=="; - }; - }; - "@types/klaw-2.1.1" = { - name = "_at_types_slash_klaw"; - packageName = "@types/klaw"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/klaw/-/klaw-2.1.1.tgz"; - sha512 = "awiTDstwQfX6026T7oC01AoP7knJoM5IT1tgx9STIM4hQzNQlkW8keTxNC+/xxpMgP657ebHMTqrsQ4qtfSJKg=="; - }; - }; - "@types/lodash-4.14.116" = { - name = "_at_types_slash_lodash"; - packageName = "@types/lodash"; - version = "4.14.116"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.116.tgz"; - sha512 = "lRnAtKnxMXcYYXqOiotTmJd74uawNWuPnsnPrrO7HiFuE3npE2iQhfABatbYDyxTNqZNuXzcKGhw37R7RjBFLg=="; - }; - }; "@types/long-4.0.0" = { name = "_at_types_slash_long"; packageName = "@types/long"; @@ -940,15 +1039,6 @@ let sha512 = "1w52Nyx4Gq47uuu0EVcsHBxZFJgurQ+rTKS3qMHxR1GY2T8c2AJYd6vZoZ9q1rupaDjU0yT+Jc2XTyXkjeMA+Q=="; }; }; - "@types/make-dir-1.0.3" = { - name = "_at_types_slash_make-dir"; - packageName = "@types/make-dir"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/make-dir/-/make-dir-1.0.3.tgz"; - sha512 = "bFRvlvUdPwxj47K2yVh7OBL8Mu8h//5k/hQJkz0iAZAlxhnIDydFezGA96zehtnRfrZDuIyPd+RC2kmBGtcs0w=="; - }; - }; "@types/mime-2.0.0" = { name = "_at_types_slash_mime"; packageName = "@types/mime"; @@ -958,58 +1048,22 @@ let sha512 = "A2TAGbTFdBw9azHbpVd+/FkdW2T6msN1uct1O9bH3vTerEHKZhTXJUQXy+hNq1B0RagfU8U+KBdqiZpxjhOUQA=="; }; }; - "@types/minimatch-3.0.3" = { - name = "_at_types_slash_minimatch"; - packageName = "@types/minimatch"; - version = "3.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz"; - sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="; - }; - }; - "@types/minimist-1.2.0" = { - name = "_at_types_slash_minimist"; - packageName = "@types/minimist"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.0.tgz"; - sha1 = "69a23a3ad29caf0097f06eda59b361ee2f0639f6"; - }; - }; - "@types/ncp-2.0.1" = { - name = "_at_types_slash_ncp"; - packageName = "@types/ncp"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/ncp/-/ncp-2.0.1.tgz"; - sha512 = "TeiJ7uvv/92ugSqZ0v9l0eNXzutlki0aK+R1K5bfA5SYUil46ITlxLW4iNTCf55P4L5weCmaOdtxGeGWvudwPg=="; - }; - }; - "@types/node-10.9.4" = { + "@types/node-10.11.2" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.9.4"; + version = "10.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.9.4.tgz"; - sha512 = "fCHV45gS+m3hH17zgkgADUSi2RR1Vht6wOZ0jyHP8rjiQra9f+mIcgwPQHllmDocYOstIEbKlxbFDYlgrTPYqw=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.11.2.tgz"; + sha512 = "XubfQDIg88PGJ7netQPf3QOKHF7Xht4WXGtg5W7cGBeQs9ETbYKwfchR9o+tRRA9iLTQ7nAre85M205JbYsjJA=="; }; }; - "@types/node-6.0.117" = { + "@types/node-8.10.30" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "6.0.117"; + version = "8.10.30"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-6.0.117.tgz"; - sha512 = "sihk0SnN8PpiS5ihu5xJQ5ddnURNq4P+XPmW+nORlKkHy21CoZO/IVHK/Wq/l3G8fFW06Fkltgnqx229uPlnRg=="; - }; - }; - "@types/node-8.10.29" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "8.10.29"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-8.10.29.tgz"; - sha512 = "zbteaWZ2mdduacm0byELwtRyhYE40aK+pAanQk415gr1eRuu67x7QGOLmn8jz5zI8LDK7d0WI/oT6r5Trz4rzQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-8.10.30.tgz"; + sha512 = "Le8HGMI5gjFSBqcCuKP/wfHC19oURzkU2D+ERIescUoJd+CmNEMYBib9LQ4zj1HHEZOJQWhw2ZTnbD8weASh/Q=="; }; }; "@types/range-parser-1.2.2" = { @@ -1021,132 +1075,6 @@ let sha512 = "HtKGu+qG1NPvYe1z7ezLsyIaXYyi8SoAVqWDZgDQ8dLrsZvSzUNCwZyfX33uhWxL/SU0ZDQZ3nwZ0nimt507Kw=="; }; }; - "@types/rimraf-2.0.2" = { - name = "_at_types_slash_rimraf"; - packageName = "@types/rimraf"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/rimraf/-/rimraf-2.0.2.tgz"; - sha512 = "Hm/bnWq0TCy7jmjeN5bKYij9vw5GrDFWME4IuxV08278NtU/VdGbzsBohcCUJ7+QMqmUq5hpRKB39HeQWJjztQ=="; - }; - }; - "@types/rx-4.1.1" = { - name = "_at_types_slash_rx"; - packageName = "@types/rx"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/rx/-/rx-4.1.1.tgz"; - sha1 = "598fc94a56baed975f194574e0f572fd8e627a48"; - }; - }; - "@types/rx-core-4.0.3" = { - name = "_at_types_slash_rx-core"; - packageName = "@types/rx-core"; - version = "4.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/rx-core/-/rx-core-4.0.3.tgz"; - sha1 = "0b3354b1238cedbe2b74f6326f139dbc7a591d60"; - }; - }; - "@types/rx-core-binding-4.0.4" = { - name = "_at_types_slash_rx-core-binding"; - packageName = "@types/rx-core-binding"; - version = "4.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/rx-core-binding/-/rx-core-binding-4.0.4.tgz"; - sha512 = "5pkfxnC4w810LqBPUwP5bg7SFR/USwhMSaAeZQQbEHeBp57pjKXRlXmqpMrLJB4y1oglR/c2502853uN0I+DAQ=="; - }; - }; - "@types/rx-lite-4.0.5" = { - name = "_at_types_slash_rx-lite"; - packageName = "@types/rx-lite"; - version = "4.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/rx-lite/-/rx-lite-4.0.5.tgz"; - sha512 = "KZk5XTR1dm/kNgBx8iVpjno6fRYtAUQWBOmj+O8j724+nk097sz4fOoHJNpCkOJUtHUurZlJC7QvSFCZHbkC+w=="; - }; - }; - "@types/rx-lite-aggregates-4.0.3" = { - name = "_at_types_slash_rx-lite-aggregates"; - packageName = "@types/rx-lite-aggregates"; - version = "4.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/rx-lite-aggregates/-/rx-lite-aggregates-4.0.3.tgz"; - sha512 = "MAGDAHy8cRatm94FDduhJF+iNS5//jrZ/PIfm+QYw9OCeDgbymFHChM8YVIvN2zArwsRftKgE33QfRWvQk4DPg=="; - }; - }; - "@types/rx-lite-async-4.0.2" = { - name = "_at_types_slash_rx-lite-async"; - packageName = "@types/rx-lite-async"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/rx-lite-async/-/rx-lite-async-4.0.2.tgz"; - sha512 = "vTEv5o8l6702ZwfAM5aOeVDfUwBSDOs+ARoGmWAKQ6LOInQ8J4/zjM7ov12fuTpktUKdMQjkeCp07Vd73mPkxw=="; - }; - }; - "@types/rx-lite-backpressure-4.0.3" = { - name = "_at_types_slash_rx-lite-backpressure"; - packageName = "@types/rx-lite-backpressure"; - version = "4.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/rx-lite-backpressure/-/rx-lite-backpressure-4.0.3.tgz"; - sha512 = "Y6aIeQCtNban5XSAF4B8dffhIKu6aAy/TXFlScHzSxh6ivfQBQw6UjxyEJxIOt3IT49YkS+siuayM2H/Q0cmgA=="; - }; - }; - "@types/rx-lite-coincidence-4.0.3" = { - name = "_at_types_slash_rx-lite-coincidence"; - packageName = "@types/rx-lite-coincidence"; - version = "4.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/rx-lite-coincidence/-/rx-lite-coincidence-4.0.3.tgz"; - sha512 = "1VNJqzE9gALUyMGypDXZZXzR0Tt7LC9DdAZQ3Ou/Q0MubNU35agVUNXKGHKpNTba+fr8GdIdkC26bRDqtCQBeQ=="; - }; - }; - "@types/rx-lite-experimental-4.0.1" = { - name = "_at_types_slash_rx-lite-experimental"; - packageName = "@types/rx-lite-experimental"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/rx-lite-experimental/-/rx-lite-experimental-4.0.1.tgz"; - sha1 = "c532f5cbdf3f2c15da16ded8930d1b2984023cbd"; - }; - }; - "@types/rx-lite-joinpatterns-4.0.1" = { - name = "_at_types_slash_rx-lite-joinpatterns"; - packageName = "@types/rx-lite-joinpatterns"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/rx-lite-joinpatterns/-/rx-lite-joinpatterns-4.0.1.tgz"; - sha1 = "f70fe370518a8432f29158cc92ffb56b4e4afc3e"; - }; - }; - "@types/rx-lite-testing-4.0.1" = { - name = "_at_types_slash_rx-lite-testing"; - packageName = "@types/rx-lite-testing"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/rx-lite-testing/-/rx-lite-testing-4.0.1.tgz"; - sha1 = "21b19d11f4dfd6ffef5a9d1648e9c8879bfe21e9"; - }; - }; - "@types/rx-lite-time-4.0.3" = { - name = "_at_types_slash_rx-lite-time"; - packageName = "@types/rx-lite-time"; - version = "4.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/rx-lite-time/-/rx-lite-time-4.0.3.tgz"; - sha512 = "ukO5sPKDRwCGWRZRqPlaAU0SKVxmWwSjiOrLhoQDoWxZWg6vyB9XLEZViKOzIO6LnTIQBlk4UylYV0rnhJLxQw=="; - }; - }; - "@types/rx-lite-virtualtime-4.0.3" = { - name = "_at_types_slash_rx-lite-virtualtime"; - packageName = "@types/rx-lite-virtualtime"; - version = "4.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/rx-lite-virtualtime/-/rx-lite-virtualtime-4.0.3.tgz"; - sha512 = "3uC6sGmjpOKatZSVHI2xB1+dedgml669ZRvqxy+WqmGJDVusOdyxcKfyzjW0P3/GrCiN4nmRkLVMhPwHCc5QLg=="; - }; - }; "@types/semver-5.5.0" = { name = "_at_types_slash_semver"; packageName = "@types/semver"; @@ -1165,24 +1093,6 @@ let sha512 = "/BZ4QRLpH/bNYgZgwhKEh+5AsboDBcUdlBYgzoLX0fpj3Y2gp6EApyOlM3bK53wQS/OE1SrdSYBAbux2D1528Q=="; }; }; - "@types/string-width-2.0.0" = { - name = "_at_types_slash_string-width"; - packageName = "@types/string-width"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/string-width/-/string-width-2.0.0.tgz"; - sha512 = "dA5z2WlP7uurAiveIWTDRgfr1U58Qdmo6doDeAyJlYFQ3vnUOW7BqJ+tl+M8FaLcflhrVvwIfzxJJvlz6anx4A=="; - }; - }; - "@types/strip-ansi-3.0.0" = { - name = "_at_types_slash_strip-ansi"; - packageName = "@types/strip-ansi"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/strip-ansi/-/strip-ansi-3.0.0.tgz"; - sha1 = "9b63d453a6b54aa849182207711a08be8eea48ae"; - }; - }; "@types/superagent-3.8.2" = { name = "_at_types_slash_superagent"; packageName = "@types/superagent"; @@ -1192,42 +1102,6 @@ let sha512 = "kdU8ydio1weSvhIIh9rptZ6MdMiR2NQGFnlnZ5qQ7OiQS1ej79zK4GaJ9qX3naSTpOA7iWqwUnZCQpd7SpD1NA=="; }; }; - "@types/through-0.0.29" = { - name = "_at_types_slash_through"; - packageName = "@types/through"; - version = "0.0.29"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/through/-/through-0.0.29.tgz"; - sha512 = "9a7C5VHh+1BKblaYiq+7Tfc+EOmjMdZaD1MYtkQjSoxgB69tBjW98ry6SKsi4zEIWztLOMRuL87A3bdT/Fc/4w=="; - }; - }; - "@types/untildify-3.0.0" = { - name = "_at_types_slash_untildify"; - packageName = "@types/untildify"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/untildify/-/untildify-3.0.0.tgz"; - sha512 = "FTktI3Y1h+gP9GTjTvXBP5v8xpH4RU6uS9POoBcGy4XkS2Np6LNtnP1eiNNth4S7P+qw2c/rugkwBasSHFzJEg=="; - }; - }; - "@types/wrap-ansi-3.0.0" = { - name = "_at_types_slash_wrap-ansi"; - packageName = "@types/wrap-ansi"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/wrap-ansi/-/wrap-ansi-3.0.0.tgz"; - sha512 = "ltIpx+kM7g/MLRZfkbL7EsCEjfzCcScLpkg37eXEtx5kmrAKBkTJwd1GIAjDSL8wTpM6Hzn5YO4pSb91BEwu1g=="; - }; - }; - "@types/write-file-atomic-2.1.1" = { - name = "_at_types_slash_write-file-atomic"; - packageName = "@types/write-file-atomic"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/write-file-atomic/-/write-file-atomic-2.1.1.tgz"; - sha512 = "mROQhTxpJsOm/S0eOxDHUy5WJ0yS8fmqsq/s+u5OuAh1TxBFSqVBTkLjbyxDPcKh7DeJXk0OYrCkxXlkf8zu1g=="; - }; - }; "@types/ws-5.1.2" = { name = "_at_types_slash_ws"; packageName = "@types/ws"; @@ -1246,202 +1120,229 @@ let sha512 = "te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg=="; }; }; - "@vue/cli-shared-utils-3.0.1" = { + "@vue/cli-shared-utils-3.0.4" = { name = "_at_vue_slash_cli-shared-utils"; packageName = "@vue/cli-shared-utils"; - version = "3.0.1"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-3.0.1.tgz"; - sha512 = "bdFxerHn/Tz/yIsZH9d1QkegdJR2KzkVHcn1ejDM/QV1RM3OteFbDcTBEIaAOd3OcAtyikzkRrsr1o9iBsBqVg=="; + url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-3.0.4.tgz"; + sha512 = "st6f/s1nCo45r3yZDYCuWaFME/ECB9Mz4bPxlC9cl/3McMSESJvhnJAlh75DVdsp5teNr8HSzHwfTRfmQtKKyw=="; }; }; - "@vue/cli-ui-3.0.1" = { + "@vue/cli-ui-3.0.4" = { name = "_at_vue_slash_cli-ui"; packageName = "@vue/cli-ui"; - version = "3.0.1"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-3.0.1.tgz"; - sha512 = "Mpj6la1XxjbLE0DdfNbqd3Bi71hhheMhXZfBsgD+xujzW/VCRevrZ/utbR1/NDhl0OXC1eBrvyyDoFWSPCagog=="; + url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-3.0.4.tgz"; + sha512 = "tdqcHDyXm/sqO7LQWJ8g1DItez6dJQyeiTn/xJIU/vsTOoUhi2s+PslTB7acPrzgya3j1ORDPJ9nHfkpE0xM8Q=="; }; }; - "@vue/cli-ui-addon-webpack-3.0.1" = { + "@vue/cli-ui-addon-webpack-3.0.4" = { name = "_at_vue_slash_cli-ui-addon-webpack"; packageName = "@vue/cli-ui-addon-webpack"; - version = "3.0.1"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-3.0.1.tgz"; - sha512 = "QVAeazXILNcdSfBhxkoeXme/BgwXj0qUJVPrtXydsmk68GDUj7gz4xXoucaTbor8zDS3hIUfs6XRdl+KPN+Tfg=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-3.0.4.tgz"; + sha512 = "93cZaZxPUUg/hxxkFNUTrtMNP8Yk2KzI3ndX25yPi2THm5gNPYMXiDE/9s8lzs6kzX2VOO1bxbukOdkJ0ZdkNw=="; }; }; - "@webassemblyjs/ast-1.5.13" = { + "@webassemblyjs/ast-1.7.8" = { name = "_at_webassemblyjs_slash_ast"; packageName = "@webassemblyjs/ast"; - version = "1.5.13"; + version = "1.7.8"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.5.13.tgz"; - sha512 = "49nwvW/Hx9i+OYHg+mRhKZfAlqThr11Dqz8TsrvqGKMhdI2ijy3KBJOun2Z4770TPjrIJhR6KxChQIDaz8clDA=="; + url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.7.8.tgz"; + sha512 = "dOrtdtEyB8sInpl75yLPNksY4sRl0j/+t6aHyB/YA+ab9hV3Fo7FmG12FHzP+2MvWVAJtDb+6eXR5EZbZJ+uVg=="; }; }; - "@webassemblyjs/floating-point-hex-parser-1.5.13" = { + "@webassemblyjs/floating-point-hex-parser-1.7.8" = { name = "_at_webassemblyjs_slash_floating-point-hex-parser"; packageName = "@webassemblyjs/floating-point-hex-parser"; - version = "1.5.13"; + version = "1.7.8"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.5.13.tgz"; - sha512 = "vrvvB18Kh4uyghSKb0NTv+2WZx871WL2NzwMj61jcq2bXkyhRC+8Q0oD7JGVf0+5i/fKQYQSBCNMMsDMRVAMqA=="; + url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.8.tgz"; + sha512 = "kn2zNKGsbql5i56VAgRYkpG+VazqHhQQZQycT2uXAazrAEDs23gy+Odkh5VblybjnwX2/BITkDtNmSO76hdIvQ=="; }; }; - "@webassemblyjs/helper-api-error-1.5.13" = { + "@webassemblyjs/helper-api-error-1.7.8" = { name = "_at_webassemblyjs_slash_helper-api-error"; packageName = "@webassemblyjs/helper-api-error"; - version = "1.5.13"; + version = "1.7.8"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.5.13.tgz"; - sha512 = "dBh2CWYqjaDlvMmRP/kudxpdh30uXjIbpkLj9HQe+qtYlwvYjPRjdQXrq1cTAAOUSMTtzqbXIxEdEZmyKfcwsg=="; + url = "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.8.tgz"; + sha512 = "xUwxDXsd1dUKArJEP5wWM5zxgCSwZApSOJyP1XO7M8rNUChUDblcLQ4FpzTpWG2YeylMwMl1MlP5Ztryiz1x4g=="; }; }; - "@webassemblyjs/helper-buffer-1.5.13" = { + "@webassemblyjs/helper-buffer-1.7.8" = { name = "_at_webassemblyjs_slash_helper-buffer"; packageName = "@webassemblyjs/helper-buffer"; - version = "1.5.13"; + version = "1.7.8"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.5.13.tgz"; - sha512 = "v7igWf1mHcpJNbn4m7e77XOAWXCDT76Xe7Is1VQFXc4K5jRcFrl9D0NrqM4XifQ0bXiuTSkTKMYqDxu5MhNljA=="; + url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.8.tgz"; + sha512 = "WXiIMnuvuwlhWvVOm8xEXU9DnHaa3AgAU0ZPfvY8vO1cSsmYb2WbGbHnMLgs43vXnA7XAob9b56zuZaMkxpCBg=="; }; }; - "@webassemblyjs/helper-code-frame-1.5.13" = { + "@webassemblyjs/helper-code-frame-1.7.8" = { name = "_at_webassemblyjs_slash_helper-code-frame"; packageName = "@webassemblyjs/helper-code-frame"; - version = "1.5.13"; + version = "1.7.8"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.5.13.tgz"; - sha512 = "yN6ScQQDFCiAXnVctdVO/J5NQRbwyTbQzsGzEgXsAnrxhjp0xihh+nNHQTMrq5UhOqTb5LykpJAvEv9AT0jnAQ=="; + url = "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.8.tgz"; + sha512 = "TLQxyD9qGOIdX5LPQOPo0Ernd88U5rHkFb8WAjeMIeA0sPjCHeVPaGqUGGIXjUcblUkjuDAc07bruCcNHUrHDA=="; }; }; - "@webassemblyjs/helper-fsm-1.5.13" = { + "@webassemblyjs/helper-fsm-1.7.8" = { name = "_at_webassemblyjs_slash_helper-fsm"; packageName = "@webassemblyjs/helper-fsm"; - version = "1.5.13"; + version = "1.7.8"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.5.13.tgz"; - sha512 = "hSIKzbXjVMRvy3Jzhgu+vDd/aswJ+UMEnLRCkZDdknZO3Z9e6rp1DAs0tdLItjCFqkz9+0BeOPK/mk3eYvVzZg=="; + url = "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.8.tgz"; + sha512 = "TjK0CnD8hAPkV5mbSp5aWl6SO1+H3WFcjWtixWoy8EMA99YnNzYhpc/WSYWhf7yrhpzkq5tZB0tvLK3Svr3IXA=="; }; }; - "@webassemblyjs/helper-module-context-1.5.13" = { + "@webassemblyjs/helper-module-context-1.7.8" = { name = "_at_webassemblyjs_slash_helper-module-context"; packageName = "@webassemblyjs/helper-module-context"; - version = "1.5.13"; + version = "1.7.8"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.5.13.tgz"; - sha512 = "zxJXULGPLB7r+k+wIlvGlXpT4CYppRz8fLUM/xobGHc9Z3T6qlmJD9ySJ2jknuktuuiR9AjnNpKYDECyaiX+QQ=="; + url = "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.8.tgz"; + sha512 = "uCutAKR7Nm0VsFixcvnB4HhAyHouNbj0Dx1p7eRjFjXGGZ+N7ftTaG1ZbWCasAEbtwGj54LP8+lkBZdTCPmLGg=="; }; }; - "@webassemblyjs/helper-wasm-bytecode-1.5.13" = { + "@webassemblyjs/helper-wasm-bytecode-1.7.8" = { name = "_at_webassemblyjs_slash_helper-wasm-bytecode"; packageName = "@webassemblyjs/helper-wasm-bytecode"; - version = "1.5.13"; + version = "1.7.8"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.5.13.tgz"; - sha512 = "0n3SoNGLvbJIZPhtMFq0XmmnA/YmQBXaZKQZcW8maGKwLpVcgjNrxpFZHEOLKjXJYVN5Il8vSfG7nRX50Zn+aw=="; + url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.8.tgz"; + sha512 = "AdCCE3BMW6V34WYaKUmPgVHa88t2Z14P4/0LjLwuGkI0X6pf7nzp0CehzVVk51cKm2ymVXjl9dCG+gR1yhITIQ=="; }; }; - "@webassemblyjs/helper-wasm-section-1.5.13" = { + "@webassemblyjs/helper-wasm-section-1.7.8" = { name = "_at_webassemblyjs_slash_helper-wasm-section"; packageName = "@webassemblyjs/helper-wasm-section"; - version = "1.5.13"; + version = "1.7.8"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.5.13.tgz"; - sha512 = "IJ/goicOZ5TT1axZFSnlAtz4m8KEjYr12BNOANAwGFPKXM4byEDaMNXYowHMG0yKV9a397eU/NlibFaLwr1fbw=="; + url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.8.tgz"; + sha512 = "BkBhYQuzyl4hgTGOKo87Vdw6f9nj8HhI7WYpI0MCC5qFa5ahrAPOGgyETVdnRbv+Rjukl9MxxfDmVcVC435lDg=="; }; }; - "@webassemblyjs/ieee754-1.5.13" = { + "@webassemblyjs/ieee754-1.7.8" = { name = "_at_webassemblyjs_slash_ieee754"; packageName = "@webassemblyjs/ieee754"; - version = "1.5.13"; + version = "1.7.8"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.5.13.tgz"; - sha512 = "TseswvXEPpG5TCBKoLx9tT7+/GMACjC1ruo09j46ULRZWYm8XHpDWaosOjTnI7kr4SRJFzA6MWoUkAB+YCGKKg=="; + url = "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.7.8.tgz"; + sha512 = "tOarWChdG1a3y1yqCX0JMDKzrat5tQe4pV6K/TX19BcXsBLYxFQOL1DEDa5KG9syeyvCrvZ+i1+Mv1ExngvktQ=="; }; }; - "@webassemblyjs/leb128-1.5.13" = { + "@webassemblyjs/leb128-1.7.8" = { name = "_at_webassemblyjs_slash_leb128"; packageName = "@webassemblyjs/leb128"; - version = "1.5.13"; + version = "1.7.8"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.5.13.tgz"; - sha512 = "0NRMxrL+GG3eISGZBmLBLAVjphbN8Si15s7jzThaw1UE9e5BY1oH49/+MA1xBzxpf1OW5sf9OrPDOclk9wj2yg=="; + url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.7.8.tgz"; + sha512 = "GCYeGPgUFWJiZuP4NICbcyUQNxNLJIf476Ei+K+jVuuebtLpfvwkvYT6iTUE7oZYehhkor4Zz2g7SJ/iZaPudQ=="; }; }; - "@webassemblyjs/utf8-1.5.13" = { + "@webassemblyjs/utf8-1.7.8" = { name = "_at_webassemblyjs_slash_utf8"; packageName = "@webassemblyjs/utf8"; - version = "1.5.13"; + version = "1.7.8"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.5.13.tgz"; - sha512 = "Ve1ilU2N48Ew0lVGB8FqY7V7hXjaC4+PeZM+vDYxEd+R2iQ0q+Wb3Rw8v0Ri0+rxhoz6gVGsnQNb4FjRiEH/Ng=="; + url = "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.7.8.tgz"; + sha512 = "9X+f0VV+xNXW2ujfIRSXBJENGE6Qh7bNVKqu3yDjTFB3ar3nsThsGBBKdTG58aXOm2iUH6v28VIf88ymPXODHA=="; }; }; - "@webassemblyjs/wasm-edit-1.5.13" = { + "@webassemblyjs/wasm-edit-1.7.8" = { name = "_at_webassemblyjs_slash_wasm-edit"; packageName = "@webassemblyjs/wasm-edit"; - version = "1.5.13"; + version = "1.7.8"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.5.13.tgz"; - sha512 = "X7ZNW4+Hga4f2NmqENnHke2V/mGYK/xnybJSIXImt1ulxbCOEs/A+ZK/Km2jgihjyVxp/0z0hwIcxC6PrkWtgw=="; + url = "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.8.tgz"; + sha512 = "6D3Hm2gFixrfyx9XjSON4ml1FZTugqpkIz5Awvrou8fnpyprVzcm4X8pyGRtA2Piixjl3DqmX/HB1xdWyE097A=="; }; }; - "@webassemblyjs/wasm-gen-1.5.13" = { + "@webassemblyjs/wasm-gen-1.7.8" = { name = "_at_webassemblyjs_slash_wasm-gen"; packageName = "@webassemblyjs/wasm-gen"; - version = "1.5.13"; + version = "1.7.8"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.5.13.tgz"; - sha512 = "yfv94Se8R73zmr8GAYzezFHc3lDwE/lBXQddSiIZEKZFuqy7yWtm3KMwA1uGbv5G1WphimJxboXHR80IgX1hQA=="; + url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.8.tgz"; + sha512 = "a7O/wE6eBeVKKUYgpMK7NOHmMADD85rSXLe3CqrWRDwWff5y3cSVbzpN6Qv3z6C4hdkpq9qyij1Ga1kemOZGvQ=="; }; }; - "@webassemblyjs/wasm-opt-1.5.13" = { + "@webassemblyjs/wasm-opt-1.7.8" = { name = "_at_webassemblyjs_slash_wasm-opt"; packageName = "@webassemblyjs/wasm-opt"; - version = "1.5.13"; + version = "1.7.8"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.5.13.tgz"; - sha512 = "IkXSkgzVhQ0QYAdIayuCWMmXSYx0dHGU8Ah/AxJf1gBvstMWVnzJnBwLsXLyD87VSBIcsqkmZ28dVb0mOC3oBg=="; + url = "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.8.tgz"; + sha512 = "3lbQ0PT81NHCdi1sR/7+SNpZadM4qYcTSr62nFFAA7e5lFwJr14M1Gi+A/Y3PgcDWOHYjsaNGPpPU0H03N6Blg=="; }; }; - "@webassemblyjs/wasm-parser-1.5.13" = { + "@webassemblyjs/wasm-parser-1.7.8" = { name = "_at_webassemblyjs_slash_wasm-parser"; packageName = "@webassemblyjs/wasm-parser"; - version = "1.5.13"; + version = "1.7.8"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.5.13.tgz"; - sha512 = "XnYoIcu2iqq8/LrtmdnN3T+bRjqYFjRHqWbqK3osD/0r/Fcv4d9ecRzjVtC29ENEuNTK4mQ9yyxCBCbK8S/cpg=="; + url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.8.tgz"; + sha512 = "rZ/zlhp9DHR/05zh1MbAjT2t624sjrPP/OkJCjXqzm7ynH+nIdNcn9Ixc+qzPMFXhIrk0rBoQ3to6sEIvHh9jQ=="; }; }; - "@webassemblyjs/wast-parser-1.5.13" = { + "@webassemblyjs/wast-parser-1.7.8" = { name = "_at_webassemblyjs_slash_wast-parser"; packageName = "@webassemblyjs/wast-parser"; - version = "1.5.13"; + version = "1.7.8"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.5.13.tgz"; - sha512 = "Lbz65T0LQ1LgzKiUytl34CwuhMNhaCLgrh0JW4rJBN6INnBB8NMwUfQM+FxTnLY9qJ+lHJL/gCM5xYhB9oWi4A=="; + url = "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.7.8.tgz"; + sha512 = "Q/zrvtUvzWuSiJMcSp90fi6gp2nraiHXjTV2VgAluVdVapM4gy1MQn7akja2p6eSBDQpKJPJ6P4TxRkghRS5dg=="; }; }; - "@webassemblyjs/wast-printer-1.5.13" = { + "@webassemblyjs/wast-printer-1.7.8" = { name = "_at_webassemblyjs_slash_wast-printer"; packageName = "@webassemblyjs/wast-printer"; - version = "1.5.13"; + version = "1.7.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.7.8.tgz"; + sha512 = "GllIthRtwTxRDAURRNXscu7Napzmdf1jt1gpiZiK/QN4fH0lSGs3OTmvdfsMNP7tqI4B3ZtfaaWRlNIQug6Xyg=="; + }; + }; + "@xtuc/ieee754-1.2.0" = { + name = "_at_xtuc_slash_ieee754"; + packageName = "@xtuc/ieee754"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz"; + sha512 = "DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA=="; + }; + }; + "@xtuc/long-4.2.1" = { + name = "_at_xtuc_slash_long"; + packageName = "@xtuc/long"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.5.13.tgz"; - sha512 = "QcwogrdqcBh8Z+eUF8SG+ag5iwQSXxQJELBEHmLkk790wgQgnIMmntT2sMAMw53GiFNckArf5X0bsCA44j3lWQ=="; + url = "https://registry.npmjs.org/@xtuc/long/-/long-4.2.1.tgz"; + sha512 = "FZdkNBDqBRHKQ2MEbSC17xnPFOhZxeJ2YGSfr2BKf3sujG49Qe3bB+rGCwQfIaA7WHnGeGkSijX4FuBCdrzW/g=="; }; }; - "@zeit/schemas-2.1.1" = { + "@yarnpkg/lockfile-1.1.0" = { + name = "_at_yarnpkg_slash_lockfile"; + packageName = "@yarnpkg/lockfile"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz"; + sha512 = "GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ=="; + }; + }; + "@zeit/schemas-2.6.0" = { name = "_at_zeit_slash_schemas"; packageName = "@zeit/schemas"; - version = "2.1.1"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@zeit/schemas/-/schemas-2.1.1.tgz"; - sha512 = "7uBms9Uwzq1GnLK7ar4FvhUONW5PuuASBomeMJ5rREMYxWdm2R0/5iXH2gUm8uqVT1x8U51CGuoaF40Tc0xoJA=="; + url = "https://registry.npmjs.org/@zeit/schemas/-/schemas-2.6.0.tgz"; + sha512 = "uUrgZ8AxS+Lio0fZKAipJjAh415JyrOZowliZAzmnJSsf7piVL5w+G0+gFJ0KSu3QRhvui/7zuvpLz03YjXAhg=="; }; }; "CSSselect-0.4.1" = { @@ -1606,13 +1507,13 @@ let sha1 = "eb777df6011723a3b14e8a72c0805c8e86746bd2"; }; }; - "accord-0.28.0" = { + "accord-0.29.0" = { name = "accord"; packageName = "accord"; - version = "0.28.0"; + version = "0.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/accord/-/accord-0.28.0.tgz"; - sha512 = "sPF34gqHegaCSryKf5wHJ8wREK1dTZnHmC9hsB7D8xjntRdd30DXDPKf0YVIcSvnXJmcYu5SCvZRz28H++kFhQ=="; + url = "https://registry.npmjs.org/accord/-/accord-0.29.0.tgz"; + sha512 = "3OOR92FTc2p5/EcOzPcXp+Cbo+3C15nV9RXHlOUBCBpHhcB+0frbSNR9ehED/o7sTcyGVtqGJpguToEdlXhD0w=="; }; }; "acorn-1.2.2" = { @@ -1620,7 +1521,7 @@ let packageName = "acorn"; version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz"; + url = "http://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz"; sha1 = "c8ce27de0acc76d896d2b1fad3df588d9e82f014"; }; }; @@ -1629,7 +1530,7 @@ let packageName = "acorn"; version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz"; + url = "http://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz"; sha1 = "ab6e7d9d886aaca8b085bc3312b79a198433f0e7"; }; }; @@ -1638,7 +1539,7 @@ let packageName = "acorn"; version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz"; + url = "http://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz"; sha1 = "45e37fb39e8da3f25baee3ff5369e2bb5f22017a"; }; }; @@ -1651,13 +1552,13 @@ let sha1 = "105495ae5361d697bd195c825192e1ad7f253787"; }; }; - "acorn-5.7.2" = { + "acorn-5.7.3" = { name = "acorn"; packageName = "acorn"; - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-5.7.2.tgz"; - sha512 = "cJrKCNcr2kv8dlDnbw+JPUGjHZzo4myaxOLmpOX8a+rgX94YeTcTMv/LFJUSByRpc+i4GgVnnhLxvMu/2Y+rqw=="; + url = "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz"; + sha512 = "T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw=="; }; }; "acorn-dynamic-import-3.0.0" = { @@ -1674,7 +1575,7 @@ let packageName = "acorn-globals"; version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/acorn-globals/-/acorn-globals-1.0.9.tgz"; + url = "http://registry.npmjs.org/acorn-globals/-/acorn-globals-1.0.9.tgz"; sha1 = "55bb5e98691507b74579d0513413217c380c54cf"; }; }; @@ -1692,7 +1593,7 @@ let packageName = "acorn-jsx"; version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz"; + url = "http://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz"; sha1 = "afdf9488fb1ecefc8348f6fb22f464e32a58b36b"; }; }; @@ -1939,6 +1840,15 @@ let sha512 = "LqZ9wY+fx3UMiiPd741yB2pj3hhil+hQc8taf4o2QGRFpWgZ2V5C8HA165DY9sS3fJwsk7uT7ZlFEyC3Ig3lLg=="; }; }; + "ajv-6.5.4" = { + name = "ajv"; + packageName = "ajv"; + version = "6.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-6.5.4.tgz"; + sha512 = "4Wyjt8+t6YszqaXnLDfMmG/8AlO5Zbcsy3ATHncCzjW/NoPzAId8AK6749Ybjmdt+kUY1gP60fCu46oDxPv/mg=="; + }; + }; "ajv-keywords-1.5.1" = { name = "ajv-keywords"; packageName = "ajv-keywords"; @@ -2043,10 +1953,19 @@ let packageName = "ansi-colors"; version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz"; + url = "http://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz"; sha512 = "SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA=="; }; }; + "ansi-colors-2.0.5" = { + name = "ansi-colors"; + packageName = "ansi-colors"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-2.0.5.tgz"; + sha512 = "yAdfUZ+c2wetVNIFsNRn44THW+Lty6S5TwMpUfLA/UaGhiXbBv/F8E60/1hMLd0cnF/CDoWH8vzVaI5bAcHCjw=="; + }; + }; "ansi-cyan-0.1.1" = { name = "ansi-cyan"; packageName = "ansi-cyan"; @@ -2106,7 +2025,7 @@ let packageName = "ansi-regex"; version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"; + url = "http://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"; sha1 = "0d8e946967a3d8143f93e24e298525fc1b2235f9"; }; }; @@ -2115,7 +2034,7 @@ let packageName = "ansi-regex"; version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz"; + url = "http://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz"; sha1 = "41c847194646375e6a1a5d10c3ca054ef9fc980d"; }; }; @@ -2263,40 +2182,40 @@ let sha1 = "ee49736b639b4f108b6e9e626c6da99306b41692"; }; }; - "apollo-cache-1.1.16" = { + "apollo-cache-1.1.17" = { name = "apollo-cache"; packageName = "apollo-cache"; - version = "1.1.16"; + version = "1.1.17"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-cache/-/apollo-cache-1.1.16.tgz"; - sha512 = "gVWKYyXF0SlpMyZ/i//AthzyPjjmAVYciEjwepLqMzIf0+7bzIwekpHDuzME8jf4XQepXcNNY571+BRyYHysmg=="; + url = "https://registry.npmjs.org/apollo-cache/-/apollo-cache-1.1.17.tgz"; + sha512 = "7sp24n2HZO4vXgTaKNomLyIfGxG4gDdDkBB0jkRzRi7HhnKmfwhiF/RCiKNbgLdrPX151INdls0KwIVliD0dHQ=="; }; }; - "apollo-cache-control-0.2.3" = { + "apollo-cache-control-0.2.5" = { name = "apollo-cache-control"; packageName = "apollo-cache-control"; - version = "0.2.3"; + version = "0.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.2.3.tgz"; - sha512 = "W/SJouLRv1VqVd79yeMbDNrv77zJ+8vKbZW2aDjbzMUEyA1nODdJhsrxqlxlh+naK5L4i12DEEG/YhfQjnzM2w=="; + url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.2.5.tgz"; + sha512 = "xEDrUvo3U2mQKSzA8NzQmgeqK4ytwFnTGl2YKGKPfG0+r8fZdswKp6CDBue29KLO8KkSuqW/hntveWrAdK51FQ=="; }; }; - "apollo-cache-inmemory-1.2.9" = { + "apollo-cache-inmemory-1.3.0" = { name = "apollo-cache-inmemory"; packageName = "apollo-cache-inmemory"; - version = "1.2.9"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-cache-inmemory/-/apollo-cache-inmemory-1.2.9.tgz"; - sha512 = "Z4m4NpT2eboM4qUww/46CsjOyITavxrKPBrsCugDlmwSzonqMLZmAyZEQgnYXCj8L5q5epnOuf0sqyYK/6sGIQ=="; + url = "https://registry.npmjs.org/apollo-cache-inmemory/-/apollo-cache-inmemory-1.3.0.tgz"; + sha512 = "7NXKkICo/JswTfTf7E3XAt5qcmt8xydUk86LbFrNiM9w3mHNIJnCJZdycuy34bx4DWsA+Bex4oYDB4H70v4maQ=="; }; }; - "apollo-client-2.4.1" = { + "apollo-client-2.4.2" = { name = "apollo-client"; packageName = "apollo-client"; - version = "2.4.1"; + version = "2.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-client/-/apollo-client-2.4.1.tgz"; - sha512 = "E6pQD+BwI1zboM9oX83yzH9BmBjJWU5pL36CpGC2+XaaBDc6UvrPtacxQsg/h7Fq5T5IKJoIhuBEWtefJIb9xg=="; + url = "https://registry.npmjs.org/apollo-client/-/apollo-client-2.4.2.tgz"; + sha512 = "g1z23umaVSoKLj9xNl0aAnk2KBF4JeBi7MeKFc9CGTixH7TkqeQUQtxcjrC7j2h4KmDbuhOAHOFUGf8YshN+ag=="; }; }; "apollo-codegen-0.19.1" = { @@ -2304,7 +2223,7 @@ let packageName = "apollo-codegen"; version = "0.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen/-/apollo-codegen-0.19.1.tgz"; + url = "http://registry.npmjs.org/apollo-codegen/-/apollo-codegen-0.19.1.tgz"; sha512 = "jlxz/b5iinRWfh48hXdmMtrjTPn/rDok0Z3b7icvkiaD6I30w4sq9B+JDkFbLnkldzsFLV2BZtBDa/dkZhx8Ng=="; }; }; @@ -2317,13 +2236,13 @@ let sha512 = "yEGEe5Cjzqqu5ml1VV3O8+C+thzdknZri9Ny0P3daTGNO+45J3vBOMcmaANeeI2+OOeWxdqUNa5aPOx/35kniw=="; }; }; - "apollo-engine-reporting-0.0.3" = { + "apollo-engine-reporting-0.0.6" = { name = "apollo-engine-reporting"; packageName = "apollo-engine-reporting"; - version = "0.0.3"; + version = "0.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-0.0.3.tgz"; - sha512 = "zkgPDB5w5/v450xOqqcV0/lJuaD1vk0cCeS7pAvaaTPGBGUVpSbZaGcsHUhmh1AJOL0it81u/i/6WVwWS3TJXQ=="; + url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-0.0.6.tgz"; + sha512 = "JmfNJ9v3QEJQ8ZhLfCKEDiww53n5kj5HarP85p8LreoYNojbvcWN8Qm6RgvSG5N/ZJrAYHeTRQbSxm1vWwGubw=="; }; }; "apollo-engine-reporting-protobuf-0.0.1" = { @@ -2335,49 +2254,40 @@ let sha512 = "AySoDgog2p1Nph44FyyqaU4AfRZOXx8XZxRsVHvYY4dHlrMmDDhhjfF3Jswa7Wr8X/ivvx3xA0jimRn6rsG8Ew=="; }; }; - "apollo-link-1.2.2" = { + "apollo-link-1.2.3" = { name = "apollo-link"; packageName = "apollo-link"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-link/-/apollo-link-1.2.2.tgz"; - sha512 = "Uk/BC09dm61DZRDSu52nGq0nFhq7mcBPTjy5EEH1eunJndtCaNXQhQz/BjkI2NdrfGI+B+i5he6YSoRBhYizdw=="; + url = "https://registry.npmjs.org/apollo-link/-/apollo-link-1.2.3.tgz"; + sha512 = "iL9yS2OfxYhigme5bpTbmRyC+Htt6tyo2fRMHT3K1XRL/C5IQDDz37OjpPy4ndx7WInSvfSZaaOTKFja9VWqSw=="; }; }; - "apollo-link-context-1.0.8" = { + "apollo-link-context-1.0.9" = { name = "apollo-link-context"; packageName = "apollo-link-context"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-link-context/-/apollo-link-context-1.0.8.tgz"; - sha512 = "wgDwBbWqHblf7W0DD2b80kXLtSAfvbXnsxSrli0GuF77VwxjLChijiHinW5bjurzZvP8YRMNhitmrrF5ia7NsA=="; + url = "https://registry.npmjs.org/apollo-link-context/-/apollo-link-context-1.0.9.tgz"; + sha512 = "gcC1WH7mTyNtS0bF4fPijepXqnERwZjm1JCkuOT6ADBTpDTXIqK+Ec+/QkVawDO26EV9OX5ujWe4kI1qC6T6tA=="; }; }; - "apollo-link-dedup-1.0.9" = { + "apollo-link-dedup-1.0.10" = { name = "apollo-link-dedup"; packageName = "apollo-link-dedup"; - version = "1.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/apollo-link-dedup/-/apollo-link-dedup-1.0.9.tgz"; - sha512 = "RbuEKpmSHVMtoREMPh2wUFTeh65q+0XPVeqgaOP/rGEAfvLyOMvX0vT2nVaejMohoMxuUnfZwpldXaDFWnlVbg=="; - }; - }; - "apollo-link-http-1.5.4" = { - name = "apollo-link-http"; - packageName = "apollo-link-http"; - version = "1.5.4"; + version = "1.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-link-http/-/apollo-link-http-1.5.4.tgz"; - sha512 = "e9Ng3HfnW00Mh3TI6DhNRfozmzQOtKgdi+qUAsHBOEcTP0PTAmb+9XpeyEEOueLyO0GXhB92HUCIhzrWMXgwyg=="; + url = "https://registry.npmjs.org/apollo-link-dedup/-/apollo-link-dedup-1.0.10.tgz"; + sha512 = "tpUI9lMZsidxdNygSY1FxflXEkUZnvKRkMUsXXuQUNoSLeNtEvUX7QtKRAl4k9ubLl8JKKc9X3L3onAFeGTK8w=="; }; }; - "apollo-link-http-common-0.2.4" = { + "apollo-link-http-common-0.2.5" = { name = "apollo-link-http-common"; packageName = "apollo-link-http-common"; - version = "0.2.4"; + version = "0.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-link-http-common/-/apollo-link-http-common-0.2.4.tgz"; - sha512 = "4j6o6WoXuSPen9xh4NBaX8/vL98X1xY2cYzUEK1F8SzvHe2oFONfxJBTekwU8hnvapcuq8Qh9Uct+gelu8T10g=="; + url = "https://registry.npmjs.org/apollo-link-http-common/-/apollo-link-http-common-0.2.5.tgz"; + sha512 = "6FV1wr5AqAyJ64Em1dq5hhGgiyxZE383VJQmhIoDVc3MyNcFL92TkhxREOs4rnH2a9X2iJMko7nodHSGLC6d8w=="; }; }; "apollo-link-persisted-queries-0.2.1" = { @@ -2389,22 +2299,22 @@ let sha512 = "OxBum5e5vn8XBBEURXpoYstwcKNtK/p3K3bAQ5yGjj7IyzpLmBcKLzfjk3wAnEyJJYbOUXIvPg7XnxQbcIlNGA=="; }; }; - "apollo-link-state-0.4.1" = { + "apollo-link-state-0.4.2" = { name = "apollo-link-state"; packageName = "apollo-link-state"; - version = "0.4.1"; + version = "0.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-link-state/-/apollo-link-state-0.4.1.tgz"; - sha512 = "69/til4ENfl/Fvf7br2xSsLSBcxcXPbOHVNkzLLejvUZickl93HLO4/fO+uvoBi4dCYRgN17Zr8FwI41ueRx0g=="; + url = "https://registry.npmjs.org/apollo-link-state/-/apollo-link-state-0.4.2.tgz"; + sha512 = "xMPcAfuiPVYXaLwC6oJFIZrKgV3GmdO31Ag2eufRoXpvT0AfJZjdaPB4450Nu9TslHRePN9A3quxNueILlQxlw=="; }; }; - "apollo-link-ws-1.0.8" = { + "apollo-link-ws-1.0.9" = { name = "apollo-link-ws"; packageName = "apollo-link-ws"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-link-ws/-/apollo-link-ws-1.0.8.tgz"; - sha512 = "ucuGvr8CBBwCHl/Rbtyuv9Fn0FN5Qoyvy84KHtuMl2Uux2Sq+jt3bUum+pZ+hZntEd9k8M1OjrrXqRJ4PtEpyA=="; + url = "https://registry.npmjs.org/apollo-link-ws/-/apollo-link-ws-1.0.9.tgz"; + sha512 = "CtKwLE61bCJTW5jrucOMm5PubeAlCl/9i45pg4GKKlAbl0zR4i2dww8TJkYoIY6iCyj4qjKW/uqGD6v5/aVwhg=="; }; }; "apollo-server-caching-0.1.2" = { @@ -2416,13 +2326,13 @@ let sha512 = "jBRnsTgXN0m8yVpumoelaUq9mXR7YpJ3EE+y/alI7zgXY+0qFDqksRApU8dEfg3q6qUnO7rFxRhdG5eyc0+1ig=="; }; }; - "apollo-server-core-2.0.5" = { + "apollo-server-core-2.1.0" = { name = "apollo-server-core"; packageName = "apollo-server-core"; - version = "2.0.5"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.0.5.tgz"; - sha512 = "bGeutygUhajJoc1hcuVWbZfHMn6eh0XBZK8evrnZkzG9zwuPSiJRdEu/sXPIeJ2iX7HbhOpHuMVImbhkPq+Haw=="; + url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.1.0.tgz"; + sha512 = "D1Tw0o3NzCQ2KGM8EWh9AHELHmn/SE361dtlqJxkbelxXqAkCIGIFywF30h+0ezhMbgbO7eqBBJfvRilF/oJHA=="; }; }; "apollo-server-env-2.0.3" = { @@ -2443,22 +2353,22 @@ let sha512 = "zyWDqAVDCkj9espVsoUpZr9PwDznM8UW6fBfhV+i1br//s2AQb07N6ektZ9pRIEvkhykDZW+8tQbDwAO0vUROg=="; }; }; - "apollo-server-express-2.0.5" = { + "apollo-server-express-2.1.0" = { name = "apollo-server-express"; packageName = "apollo-server-express"; - version = "2.0.5"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.0.5.tgz"; - sha512 = "0Bun2wVflgMMhp9+LKz7tuJXIGmnNbWjvNHwxOtLfz3L6tmG+1Y+dLYBPLA7h1bzwYsACFP+glNTYn6/ErL/tA=="; + url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.1.0.tgz"; + sha512 = "jLFIz1VLduMA/rme4OAy3IPeoaMEZOPoQXpio8AhfjIqCijRPPfoWJ2QMqz56C/g3vas7rZtgcVOrHpjBKudjw=="; }; }; - "apollo-tracing-0.2.3" = { + "apollo-tracing-0.2.5" = { name = "apollo-tracing"; packageName = "apollo-tracing"; - version = "0.2.3"; + version = "0.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.2.3.tgz"; - sha512 = "N3CwLGSiTms4BqEz1IpjaJWLNdWiEmdfowU2+vPvvCQj8SN/HuAwK9BxRnr6BH8PD3i5Gzq7tFiMB0D0sN1+LA=="; + url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.2.5.tgz"; + sha512 = "DZO7pfL5LATHeJdVFoTZ/N3HwA+IMf1YnIt5K+uMQW+/MrRgYOtTszUv5tYX2cUIqHYHcbdDaBQUuIXwSpaV2Q=="; }; }; "apollo-upload-client-8.1.0" = { @@ -2470,13 +2380,13 @@ let sha512 = "JEgStzhnwybj1ifE2nViLEl7NTM5+zS++fKbDL95PIpodg2AdYeeN7eEa7RXpYD14iC3FVcsfqgGMREv2+cSxw=="; }; }; - "apollo-utilities-1.0.20" = { + "apollo-utilities-1.0.21" = { name = "apollo-utilities"; packageName = "apollo-utilities"; - version = "1.0.20"; + version = "1.0.21"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.0.20.tgz"; - sha512 = "2M4BJCyX/9UXGJFoV4sTnVTZ4Q29aM18Z1avDrwvlCGGwoRTz50sGBAfTiWnUnnNQyPIIJEYElScw46DgIu0Rg=="; + url = "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.0.21.tgz"; + sha512 = "ZcxELlEl+sDCYBgEMdNXJAsZtRVm8wk4HIA58bMsqYfd1DSAJQEtZ93F0GZgYNAGy3QyaoBeZtbb0/01++G8JQ=="; }; }; "append-0.1.1" = { @@ -2515,6 +2425,15 @@ let sha1 = "6ddc58fa083c7bc545d3c5995b2830cc2366d44a"; }; }; + "append-field-1.0.0" = { + name = "append-field"; + packageName = "append-field"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/append-field/-/append-field-1.0.0.tgz"; + sha1 = "1e3440e915f0b1203d23748e78edd7b9b5b43e56"; + }; + }; "append-tree-2.4.4" = { name = "append-tree"; packageName = "append-tree"; @@ -2551,6 +2470,15 @@ let sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="; }; }; + "aproba-2.0.0" = { + name = "aproba"; + packageName = "aproba"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz"; + sha512 = "lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ=="; + }; + }; "arch-2.1.1" = { name = "arch"; packageName = "arch"; @@ -2619,7 +2547,7 @@ let packageName = "arg"; version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/arg/-/arg-2.0.0.tgz"; + url = "http://registry.npmjs.org/arg/-/arg-2.0.0.tgz"; sha512 = "XxNTUzKnz1ctK3ZIcI2XUPlD96wbHP2nGqkPKpvk/HNRlPveYrXIVSTk9m3LcqOgDPg3B1nMvdV/K8wZd7PG4w=="; }; }; @@ -3199,13 +3127,13 @@ let sha512 = "jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg=="; }; }; - "async-retry-1.2.1" = { + "async-retry-1.2.3" = { name = "async-retry"; packageName = "async-retry"; - version = "1.2.1"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/async-retry/-/async-retry-1.2.1.tgz"; - sha512 = "FadV8UDcyZDjzb6eV7MCJj0bfrNjwKw7/X0QHPFCbYP6T20FXgZCYXpJKlQC8RxEQP1E6Xs8pNHdh3bcrZAuAw=="; + url = "https://registry.npmjs.org/async-retry/-/async-retry-1.2.3.tgz"; + sha512 = "tfDb02Th6CE6pJUF2gjW5ZVjsgwlucVXOEQMvEX9JgSJMs9gAX+Nz3xRuJBKuUYjTSYORqvDBORdAQ3LU59g7Q=="; }; }; "async-single-1.0.5" = { @@ -3307,13 +3235,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.307.0" = { + "aws-sdk-2.325.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.307.0"; + version = "2.325.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.307.0.tgz"; - sha512 = "+RTDZvmn2tlyCUCUQvbj7XN3ZtSiqoSuxvQQCqXlrGxUvGbQ9wO4I3zcKQRlSsp1OGBgr5+jgBVjzEPLPGlxOg=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.325.0.tgz"; + sha512 = "26V/4vzInQ5EO/+HCoZaXO5YB6XWo4sRXbNtc3bFEcUfMZ5Psin2M8McY/zasJyYbZuNisK608kjio+AXm8vig=="; }; }; "aws-sign-0.2.1" = { @@ -3366,7 +3294,7 @@ let packageName = "azure-arm-authorization"; version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-authorization/-/azure-arm-authorization-2.0.0.tgz"; + url = "http://registry.npmjs.org/azure-arm-authorization/-/azure-arm-authorization-2.0.0.tgz"; sha1 = "56b558ba43b9cb5657662251dabe3cb34c16c56f"; }; }; @@ -3438,7 +3366,7 @@ let packageName = "azure-arm-dns"; version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-dns/-/azure-arm-dns-2.1.0.tgz"; + url = "http://registry.npmjs.org/azure-arm-dns/-/azure-arm-dns-2.1.0.tgz"; sha512 = "/y0tOM9qNijPYqB381JFYiEyfF+L5B8z+F8JS1OMV1JXIb45vZKXeoe82ZNMZ5g38Vme3uAblxpvp5OtIcvW6Q=="; }; }; @@ -3510,7 +3438,7 @@ let packageName = "azure-arm-resource"; version = "1.6.1-preview"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-resource/-/azure-arm-resource-1.6.1-preview.tgz"; + url = "http://registry.npmjs.org/azure-arm-resource/-/azure-arm-resource-1.6.1-preview.tgz"; sha1 = "aa9a49fb9081a210f2f4cc6596ca4653b68306e6"; }; }; @@ -4077,7 +4005,7 @@ let packageName = "basic-auth"; version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/basic-auth/-/basic-auth-1.0.4.tgz"; + url = "http://registry.npmjs.org/basic-auth/-/basic-auth-1.0.4.tgz"; sha1 = "030935b01de7c9b94a824b29f3fccb750d3a5290"; }; }; @@ -4086,7 +4014,7 @@ let packageName = "basic-auth"; version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/basic-auth/-/basic-auth-1.1.0.tgz"; + url = "http://registry.npmjs.org/basic-auth/-/basic-auth-1.1.0.tgz"; sha1 = "45221ee429f7ee1e5035be3f51533f1cdfd29884"; }; }; @@ -4099,6 +4027,15 @@ let sha1 = "015db3f353e02e56377755f962742e8981e7bbba"; }; }; + "basic-auth-2.0.1" = { + name = "basic-auth"; + packageName = "basic-auth"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz"; + sha512 = "NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg=="; + }; + }; "basic-auth-connect-1.0.0" = { name = "basic-auth-connect"; packageName = "basic-auth-connect"; @@ -4234,13 +4171,13 @@ let sha1 = "159a49b9a9714c1fb102f2e0ed1906fab6a450f4"; }; }; - "big-integer-1.6.35" = { + "big-integer-1.6.36" = { name = "big-integer"; packageName = "big-integer"; - version = "1.6.35"; + version = "1.6.36"; src = fetchurl { - url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.35.tgz"; - sha512 = "jqLsX6dzmPHOhApAUyGwrpzqn3DXpdTqbOM6baPys7A423ys7IsTpcucDVGP0PmzxGsPYbW3xVOJ4SxAzI0vqQ=="; + url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.36.tgz"; + sha512 = "t70bfa7HYEA1D9idDbmuv7YbsbVkQ+Hp+8KFSul4aE5e/i1bjCNIRYJZlA8Q8p0r9T8cF/RVvwUgRA//FydEyg=="; }; }; "big.js-3.2.0" = { @@ -4288,13 +4225,13 @@ let sha1 = "9f60553bc5ce8c3386f3b553cff47462adecaa79"; }; }; - "binary-extensions-1.11.0" = { + "binary-extensions-1.12.0" = { name = "binary-extensions"; packageName = "binary-extensions"; - version = "1.11.0"; + version = "1.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.11.0.tgz"; - sha1 = "46aa1751fb6a2f93ee5e689bb1087d4b14c6c205"; + url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.12.0.tgz"; + sha512 = "DYWGk01lDcxeS/K9IHPGWfT8PsJmbXRtRd2Sx72Tnb8pcYZQFF1oSDb8hJtS1vhp212q1Rzi5dUf9+nq0o9UIg=="; }; }; "binary-search-1.3.4" = { @@ -4338,7 +4275,7 @@ let packageName = "binstall"; version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/binstall/-/binstall-1.2.0.tgz"; + url = "http://registry.npmjs.org/binstall/-/binstall-1.2.0.tgz"; sha1 = "6b2c0f580b9e3c607f50ef7a22a54ce9fdc8d933"; }; }; @@ -4707,7 +4644,7 @@ let packageName = "bottleneck"; version = "1.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/bottleneck/-/bottleneck-1.5.3.tgz"; + url = "http://registry.npmjs.org/bottleneck/-/bottleneck-1.5.3.tgz"; sha1 = "55fa64920d9670087d44150404525d59f9511c20"; }; }; @@ -4765,15 +4702,6 @@ let sha1 = "fef069bee85975b2ddcc2264aaa7c50dc17a3c7e"; }; }; - "bplist-creator-0.0.7" = { - name = "bplist-creator"; - packageName = "bplist-creator"; - version = "0.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.0.7.tgz"; - sha1 = "37df1536092824b87c42f957b01344117372ae45"; - }; - }; "bplist-parser-0.1.1" = { name = "bplist-parser"; packageName = "bplist-parser"; @@ -4887,7 +4815,7 @@ let packageName = "browserify"; version = "13.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserify/-/browserify-13.3.0.tgz"; + url = "http://registry.npmjs.org/browserify/-/browserify-13.3.0.tgz"; sha1 = "b5a9c9020243f0c70e4675bec8223bc627e415ce"; }; }; @@ -4905,7 +4833,7 @@ let packageName = "browserify-aes"; version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz"; + url = "http://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz"; sha512 = "+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA=="; }; }; @@ -4968,7 +4896,7 @@ let packageName = "browserify-rsa"; version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz"; + url = "http://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz"; sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524"; }; }; @@ -5013,7 +4941,7 @@ let packageName = "bson"; version = "0.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/bson/-/bson-0.1.8.tgz"; + url = "http://registry.npmjs.org/bson/-/bson-0.1.8.tgz"; sha1 = "cf34fdcff081a189b589b4b3e5e9309cd6506c81"; }; }; @@ -5121,7 +5049,7 @@ let packageName = "buffer-equals"; version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/buffer-equals/-/buffer-equals-1.0.4.tgz"; + url = "http://registry.npmjs.org/buffer-equals/-/buffer-equals-1.0.4.tgz"; sha1 = "0353b54fd07fd9564170671ae6f66b9cf10d27f5"; }; }; @@ -5701,13 +5629,13 @@ let sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad"; }; }; - "chai-4.1.2" = { + "chai-4.2.0" = { name = "chai"; packageName = "chai"; - version = "4.1.2"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/chai/-/chai-4.1.2.tgz"; - sha1 = "0f64584ba642f0f2ace2806279f4f06ca23ad73c"; + url = "https://registry.npmjs.org/chai/-/chai-4.2.0.tgz"; + sha512 = "XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw=="; }; }; "chai-as-promised-7.1.1" = { @@ -5962,13 +5890,13 @@ let sha1 = "178686a85e9278045112e96e8c791793f9a10aea"; }; }; - "chmodr-1.0.2" = { + "chmodr-1.2.0" = { name = "chmodr"; packageName = "chmodr"; - version = "1.0.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/chmodr/-/chmodr-1.0.2.tgz"; - sha1 = "04662b932d0f02ec66deaa2b0ea42811968e3eb9"; + url = "https://registry.npmjs.org/chmodr/-/chmodr-1.2.0.tgz"; + sha512 = "Y5uI7Iq/Az6HgJEL6pdw7THVd7jbVOTPwsmcPOBjQL8e3N+pz872kzK5QxYGEy21iRys+iHWV0UZQXDFJo1hyA=="; }; }; "chokidar-1.6.0" = { @@ -5976,7 +5904,7 @@ let packageName = "chokidar"; version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-1.6.0.tgz"; + url = "http://registry.npmjs.org/chokidar/-/chokidar-1.6.0.tgz"; sha1 = "90c32ad4802901d7713de532dc284e96a63ad058"; }; }; @@ -6003,17 +5931,17 @@ let packageName = "chownr"; version = "0.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/chownr/-/chownr-0.0.2.tgz"; + url = "http://registry.npmjs.org/chownr/-/chownr-0.0.2.tgz"; sha1 = "2f9aebf746f90808ce00607b72ba73b41604c485"; }; }; - "chownr-1.0.1" = { + "chownr-1.1.1" = { name = "chownr"; packageName = "chownr"; - version = "1.0.1"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz"; - sha1 = "e2a75042a9551908bebd25b8523d5f9769d79181"; + url = "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz"; + sha512 = "j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g=="; }; }; "chrome-trace-event-1.0.0" = { @@ -6070,13 +5998,13 @@ let sha512 = "GA1NIFDZKElhkjiO6QOyzfK1QbUt6M3gFhUU/aR05JYaDqXbU5d7U92cLvGKdItJEDfojky6NQefy5VL5PpDBA=="; }; }; - "ci-info-1.4.0" = { + "ci-info-1.6.0" = { name = "ci-info"; packageName = "ci-info"; - version = "1.4.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/ci-info/-/ci-info-1.4.0.tgz"; - sha512 = "Oqmw2pVfCl8sCL+1QgMywPfdxPJPkC51y4usw0iiE2S9qnEOAqXy8bwl1CpMpnoU39g4iKJTz6QZj+28FvOnjQ=="; + url = "https://registry.npmjs.org/ci-info/-/ci-info-1.6.0.tgz"; + sha512 = "vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A=="; }; }; "cint-8.2.1" = { @@ -6115,13 +6043,13 @@ let sha512 = "UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A=="; }; }; - "circular-json-0.5.5" = { + "circular-json-0.5.7" = { name = "circular-json"; packageName = "circular-json"; - version = "0.5.5"; + version = "0.5.7"; src = fetchurl { - url = "https://registry.npmjs.org/circular-json/-/circular-json-0.5.5.tgz"; - sha512 = "13YaR6kiz0kBNmIVM87Io8Hp7bWOo4r61vkEANy8iH9R9bc6avud/1FT0SBpqR1RpIQADOh/Q+yHZDA1iL6ysA=="; + url = "https://registry.npmjs.org/circular-json/-/circular-json-0.5.7.tgz"; + sha512 = "/pXoV1JA847qRKPrHbBK6YIBGFF8GOP4wzSgUOA7q0ew0vAv0iJswP+2/nZQ9uzA3Azi7eTrg9L2yzXc/7ZMIA=="; }; }; "clarinet-0.11.0" = { @@ -6786,7 +6714,7 @@ let packageName = "combined-stream"; version = "0.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz"; + url = "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz"; sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f"; }; }; @@ -6795,10 +6723,19 @@ let packageName = "combined-stream"; version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz"; + url = "http://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz"; sha1 = "723e7df6e801ac5613113a7e445a9b69cb632818"; }; }; + "combined-stream-1.0.7" = { + name = "combined-stream"; + packageName = "combined-stream"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz"; + sha512 = "brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w=="; + }; + }; "command-exists-1.2.7" = { name = "command-exists"; packageName = "command-exists"; @@ -6813,7 +6750,7 @@ let packageName = "commander"; version = "0.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz"; + url = "http://registry.npmjs.org/commander/-/commander-0.6.1.tgz"; sha1 = "fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06"; }; }; @@ -6822,7 +6759,7 @@ let packageName = "commander"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-1.0.0.tgz"; + url = "http://registry.npmjs.org/commander/-/commander-1.0.0.tgz"; sha1 = "5e6a88e7070ff5908836ead19169548c30f90bcd"; }; }; @@ -6831,7 +6768,7 @@ let packageName = "commander"; version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-1.0.4.tgz"; + url = "http://registry.npmjs.org/commander/-/commander-1.0.4.tgz"; sha1 = "5edeb1aee23c4fb541a6b70d692abef19669a2d3"; }; }; @@ -6840,7 +6777,7 @@ let packageName = "commander"; version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-1.1.1.tgz"; + url = "http://registry.npmjs.org/commander/-/commander-1.1.1.tgz"; sha1 = "50d1651868ae60eccff0a2d9f34595376bc6b041"; }; }; @@ -6849,7 +6786,7 @@ let packageName = "commander"; version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-1.3.1.tgz"; + url = "http://registry.npmjs.org/commander/-/commander-1.3.1.tgz"; sha1 = "02443e02db96f4b32b674225451abb6e9510000e"; }; }; @@ -6858,7 +6795,7 @@ let packageName = "commander"; version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-1.3.2.tgz"; + url = "http://registry.npmjs.org/commander/-/commander-1.3.2.tgz"; sha1 = "8a8f30ec670a6fdd64af52f1914b907d79ead5b5"; }; }; @@ -6867,7 +6804,7 @@ let packageName = "commander"; version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.0.0.tgz"; + url = "http://registry.npmjs.org/commander/-/commander-2.0.0.tgz"; sha1 = "d1b86f901f8b64bd941bdeadaf924530393be928"; }; }; @@ -6876,7 +6813,7 @@ let packageName = "commander"; version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.1.0.tgz"; + url = "http://registry.npmjs.org/commander/-/commander-2.1.0.tgz"; sha1 = "d121bbae860d9992a3d517ba96f56588e47c6781"; }; }; @@ -6903,7 +6840,7 @@ let packageName = "commander"; version = "2.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.14.1.tgz"; + url = "http://registry.npmjs.org/commander/-/commander-2.14.1.tgz"; sha512 = "+YR16o3rK53SmWHU3rEM3tPAh2rwb1yPcQX5irVn7mb0gXbwuCCrnkbV5+PBfETdfg1vui07nM6PCG1zndcjQw=="; }; }; @@ -6912,7 +6849,7 @@ let packageName = "commander"; version = "2.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz"; + url = "http://registry.npmjs.org/commander/-/commander-2.15.1.tgz"; sha512 = "VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag=="; }; }; @@ -6925,12 +6862,21 @@ let sha512 = "wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg=="; }; }; + "commander-2.18.0" = { + name = "commander"; + packageName = "commander"; + version = "2.18.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.18.0.tgz"; + sha512 = "6CYPa+JP2ftfRU2qkDK+UTVeQYosOg/2GbcjIcKPHfinyOLPVGXu/ovN86RP49Re5ndJK1N0kuiidFFuepc4ZQ=="; + }; + }; "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"; + url = "http://registry.npmjs.org/commander/-/commander-2.3.0.tgz"; sha1 = "fd430e889832ec353b9acd1de217c11cb3eef873"; }; }; @@ -6939,7 +6885,7 @@ let packageName = "commander"; version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.6.0.tgz"; + url = "http://registry.npmjs.org/commander/-/commander-2.6.0.tgz"; sha1 = "9df7e52fb2a0cb0fb89058ee80c3104225f37e1d"; }; }; @@ -6948,7 +6894,7 @@ let packageName = "commander"; version = "2.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz"; + url = "http://registry.npmjs.org/commander/-/commander-2.8.1.tgz"; sha1 = "06be367febfda0c330aa1e2a072d3dc9762425d4"; }; }; @@ -6957,7 +6903,7 @@ let packageName = "commander"; version = "2.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz"; + url = "http://registry.npmjs.org/commander/-/commander-2.9.0.tgz"; sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; }; }; @@ -7006,6 +6952,15 @@ let sha1 = "a99cd96ea000525684b269683ae2222d6eea7b49"; }; }; + "compare-at-paths-1.0.0" = { + name = "compare-at-paths"; + packageName = "compare-at-paths"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/compare-at-paths/-/compare-at-paths-1.0.0.tgz"; + sha512 = "Ke1ejo/RZ+Hzku4gcW34uPMOR4Cpq87MAotELgV9mwiAzDN726cu+eWo0zWg1vRIfyf6yK5bW9uIW+c/SksQ5w=="; + }; + }; "compare-func-1.3.2" = { name = "compare-func"; packageName = "compare-func"; @@ -7060,13 +7015,13 @@ let sha1 = "524a9f10903f3a813389b0225d27c48bb751890f"; }; }; - "compressible-2.0.14" = { + "compressible-2.0.15" = { name = "compressible"; packageName = "compressible"; - version = "2.0.14"; + version = "2.0.15"; src = fetchurl { - url = "https://registry.npmjs.org/compressible/-/compressible-2.0.14.tgz"; - sha1 = "326c5f507fbb055f54116782b969a81b67a29da7"; + url = "https://registry.npmjs.org/compressible/-/compressible-2.0.15.tgz"; + sha512 = "4aE67DL33dSW9gw4CI2H/yTxqHLNcxp0yS6jB+4h+wr3e43+1z7vm0HU9qXOH8j+qjKuL8+UtkOxYQSMq60Ylw=="; }; }; "compression-1.5.2" = { @@ -7141,13 +7096,13 @@ let sha1 = "d43ddf58b8df5637fdd1314fc816ccae7bfbcd18"; }; }; - "config-chain-1.1.11" = { + "config-chain-1.1.12" = { name = "config-chain"; packageName = "config-chain"; - version = "1.1.11"; + version = "1.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.11.tgz"; - sha1 = "aba09747dfbe4c3e70e766a6e41586e1859fc6f2"; + url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz"; + sha512 = "a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA=="; }; }; "configstore-1.4.0" = { @@ -7159,15 +7114,6 @@ let sha1 = "c35781d0501d268c25c54b8b17f6240e8a4fb021"; }; }; - "configstore-2.1.0" = { - name = "configstore"; - packageName = "configstore"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/configstore/-/configstore-2.1.0.tgz"; - sha1 = "737a3a7036e9886102aa6099e47bb33ab1aba1a1"; - }; - }; "configstore-3.1.2" = { name = "configstore"; packageName = "configstore"; @@ -7258,13 +7204,13 @@ let sha1 = "82b381d61a12b651437df1c259c1f1c841239b88"; }; }; - "connect-multiparty-2.1.1" = { + "connect-multiparty-2.2.0" = { name = "connect-multiparty"; packageName = "connect-multiparty"; - version = "2.1.1"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/connect-multiparty/-/connect-multiparty-2.1.1.tgz"; - sha1 = "6ee8212fdb2204d3f135f8c12e3afa495d181fd7"; + url = "https://registry.npmjs.org/connect-multiparty/-/connect-multiparty-2.2.0.tgz"; + sha512 = "zKcpA7cuXGEhuw9Pz7JmVCFmp85jzGLGm/iiagXTwyEAJp4ypLPtRS/V4IGuGb9KjjrgHBs6P/gDCpZHnFzksA=="; }; }; "connect-pause-0.1.1" = { @@ -7570,17 +7516,17 @@ let 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"; + url = "http://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.3.tgz"; sha1 = "4829c877e9fe49b3161f3bf3673888e204699860"; }; }; - "convert-source-map-1.5.1" = { + "convert-source-map-1.6.0" = { name = "convert-source-map"; packageName = "convert-source-map"; - version = "1.5.1"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.1.tgz"; - sha1 = "b8278097b9bc229365de5c62cf5fcaed8b5599e5"; + url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz"; + sha512 = "eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A=="; }; }; "cookie-0.0.4" = { @@ -7727,13 +7673,13 @@ let sha512 = "Mw+adcfzPxcPeI+0WlvRrr/3lGVO0bD75SxX6811cxSh1Wbxx7xZBGK1eVtDf6si8rg2lhnUjsVLMFMfbRIuwA=="; }; }; - "cookies-0.7.1" = { + "cookies-0.7.2" = { name = "cookies"; packageName = "cookies"; - version = "0.7.1"; + version = "0.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/cookies/-/cookies-0.7.1.tgz"; - sha1 = "7c8a615f5481c61ab9f16c833731bcb8f663b99b"; + url = "https://registry.npmjs.org/cookies/-/cookies-0.7.2.tgz"; + sha512 = "J2JjH9T3PUNKPHknprxgCrCaZshIfxW2j49gq1E1CP5Micj1LppWAR2y9EHSQAzEiX84zOsScWNwUZ0b/ChlMw=="; }; }; "copy-concurrently-1.0.5" = { @@ -7781,13 +7727,13 @@ let sha1 = "83b09271b378d1c03bc7d9a786fedd60485c3ccf"; }; }; - "cordova-fetch-1.3.0" = { + "cordova-fetch-1.3.1" = { name = "cordova-fetch"; packageName = "cordova-fetch"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-fetch/-/cordova-fetch-1.3.0.tgz"; - sha1 = "4986d0779b36eb239822c2ab413a47ff9f097fea"; + url = "https://registry.npmjs.org/cordova-fetch/-/cordova-fetch-1.3.1.tgz"; + sha512 = "/0PNQUPxHvVcjlzVQcydD5BQtfx1XdCfzQ2KigdtZma5oVVUtR4IxfnYB15RuT/GVb/SGRLvR5AIi2Gd5Gb+mg=="; }; }; "cordova-js-4.2.4" = { @@ -7799,13 +7745,13 @@ let sha512 = "Qy0O3w/gwbIqIJzlyCy60nPwJlF1c74ELpsfDIGXB92/uST5nQSSUDVDP4UOfb/c6OU7yPqxhCWOGROyTYKPDw=="; }; }; - "cordova-lib-8.0.0" = { + "cordova-lib-8.1.0" = { name = "cordova-lib"; packageName = "cordova-lib"; - version = "8.0.0"; + version = "8.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-lib/-/cordova-lib-8.0.0.tgz"; - sha1 = "864bd5de6b79fc4944361460aa3214e59da936f2"; + url = "https://registry.npmjs.org/cordova-lib/-/cordova-lib-8.1.0.tgz"; + sha512 = "VLLRhEaqi5bD1AxAndlPGiRD5ZX2EwUnxGxIvEUUbgZxwOceGWHM2wdI4V2nJOieJ0N8CbDRsLsOwFJQsRLOyQ=="; }; }; "cordova-registry-mapper-1.1.15" = { @@ -7862,6 +7808,15 @@ let sha1 = "2bd381f2eb201020105cd50ea59da63090694686"; }; }; + "corser-2.0.1" = { + name = "corser"; + packageName = "corser"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/corser/-/corser-2.0.1.tgz"; + sha1 = "8eda252ecaab5840dcd975ceb90d9370c819ff87"; + }; + }; "corsify-2.1.0" = { name = "corsify"; packageName = "corsify"; @@ -7880,6 +7835,15 @@ let sha512 = "zedsBhLSbPBms+kE7AH4vHg6JsKDz6epSv2/+5XHs8ILHlgDciSJfSWf8sX9aQ52Jb7KI7VswUTsLpR/G0cr2Q=="; }; }; + "cosmiconfig-4.0.0" = { + name = "cosmiconfig"; + packageName = "cosmiconfig"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-4.0.0.tgz"; + sha512 = "6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ=="; + }; + }; "cosmiconfig-5.0.6" = { name = "cosmiconfig"; packageName = "cosmiconfig"; @@ -7984,7 +7948,7 @@ let packageName = "create-hash"; version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz"; + url = "http://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz"; sha512 = "z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg=="; }; }; @@ -7993,7 +7957,7 @@ let packageName = "create-hmac"; version = "1.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz"; + url = "http://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz"; sha512 = "MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg=="; }; }; @@ -8006,13 +7970,13 @@ let sha512 = "KMd0KuvwVUg1grlRd5skG9ZkSbBYDDkAjDUMLnvxdRn0rL7ph3IwoOk7I8u1yLX4HYjGiLVlWYO55YWNNPjJFA=="; }; }; - "cron-1.3.0" = { + "cron-1.4.1" = { name = "cron"; packageName = "cron"; - version = "1.3.0"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/cron/-/cron-1.3.0.tgz"; - sha512 = "K/SF7JlgMmNjcThWxkKvsHhey2EDB4CeOEWJ9aXWj3fbQJppsvTPIeyLdHfNq5IbbsMUUjRW1nr5dSO95f2E4w=="; + url = "https://registry.npmjs.org/cron/-/cron-1.4.1.tgz"; + sha512 = "HlglwQUNh6bhgfoDR6aEzyHN2T4bc0XhxJxkNPp+Ry7lK7Noby94pHcngYf634+MtxplwZm8okFgNe+R9PGDjg=="; }; }; "cross-fetch-2.2.2" = { @@ -8173,17 +8137,17 @@ let packageName = "css"; version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/css/-/css-1.0.8.tgz"; + url = "http://registry.npmjs.org/css/-/css-1.0.8.tgz"; sha1 = "9386811ca82bccc9ee7fb5a732b1e2a317c8a3e7"; }; }; - "css-2.2.3" = { + "css-2.2.4" = { name = "css"; packageName = "css"; - version = "2.2.3"; + version = "2.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/css/-/css-2.2.3.tgz"; - sha512 = "0W171WccAjQGGTKLhw4m2nnl0zPHUlTO/I8td4XzJgIB8Hg3ZZx71qT4G4eX8OVsSiaAKiUMy73E3nsbPlg2DQ=="; + url = "https://registry.npmjs.org/css/-/css-2.2.4.tgz"; + sha512 = "oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw=="; }; }; "css-parse-1.0.4" = { @@ -8213,13 +8177,13 @@ let sha1 = "2b3a110539c5355f1cd8d314623e870b121ec858"; }; }; - "css-select-1.3.0-rc0" = { + "css-select-2.0.0" = { name = "css-select"; packageName = "css-select"; - version = "1.3.0-rc0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/css-select/-/css-select-1.3.0-rc0.tgz"; - sha1 = "6f93196aaae737666ea1036a8cb14a8fcb7a9231"; + url = "https://registry.npmjs.org/css-select/-/css-select-2.0.0.tgz"; + sha512 = "MGhoq1S9EyPgZIGnts8Yz5WwUOyHmPMdlqeifsYs/xFX7AAm3hY0RJe1dqVlXtYPI66Nsk39R/sa5/ree6L2qg=="; }; }; "css-select-base-adapter-0.1.0" = { @@ -8240,22 +8204,22 @@ let sha1 = "b0d042946db2953bb9d292900a6cb5f6d0122031"; }; }; - "css-tree-1.0.0-alpha.29" = { + "css-tree-1.0.0-alpha.28" = { name = "css-tree"; packageName = "css-tree"; - version = "1.0.0-alpha.29"; + version = "1.0.0-alpha.28"; src = fetchurl { - url = "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.29.tgz"; - sha512 = "sRNb1XydwkW9IOci6iB2xmy8IGCj6r/fr+JWitvJ2JxQRPzN3T4AGGVWCMlVmVwM1gtgALJRmGIlWv5ppnGGkg=="; + url = "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.28.tgz"; + sha512 = "joNNW1gCp3qFFzj4St6zk+Wh/NBv0vM5YbEreZk0SD4S23S+1xBKb6cLDg2uj4P4k/GUMlIm6cKIDqIG+vdt0w=="; }; }; - "css-tree-1.0.0-alpha25" = { + "css-tree-1.0.0-alpha.29" = { name = "css-tree"; packageName = "css-tree"; - version = "1.0.0-alpha25"; + version = "1.0.0-alpha.29"; src = fetchurl { - url = "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha25.tgz"; - sha512 = "XC6xLW/JqIGirnZuUWHXCHRaAjje2b3OIB0Vj5RIJo6mIi/AdJo30quQl5LxUl0gkXDIrTrFGbMlcZjyFplz1A=="; + url = "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.29.tgz"; + sha512 = "sRNb1XydwkW9IOci6iB2xmy8IGCj6r/fr+JWitvJ2JxQRPzN3T4AGGVWCMlVmVwM1gtgALJRmGIlWv5ppnGGkg=="; }; }; "css-url-regex-1.1.0" = { @@ -8362,7 +8326,7 @@ let packageName = "csv-stringify"; version = "0.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/csv-stringify/-/csv-stringify-0.0.8.tgz"; + url = "http://registry.npmjs.org/csv-stringify/-/csv-stringify-0.0.8.tgz"; sha1 = "52cc3b3dfc197758c55ad325a95be85071f9e51b"; }; }; @@ -8429,13 +8393,13 @@ let sha1 = "5d02a46850adf1b4a317946a3928fccb5bfd0425"; }; }; - "cvss-1.0.3" = { + "cvss-1.0.4" = { name = "cvss"; packageName = "cvss"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/cvss/-/cvss-1.0.3.tgz"; - sha512 = "1FfNhEFVfeC+fgZpEr6oCOOTXifJicZS+Lq/mmUKI4Om+2O8zYspc/uhw51He+CTM5givI1dqIw5JUqyi1BWtA=="; + url = "https://registry.npmjs.org/cvss/-/cvss-1.0.4.tgz"; + sha512 = "NvyksySgKXK/98Cdc0IqP7UU/LKFy0O//hoCSQdahcP5w1oSZvOhAeb7PmTmIAkELfyoWGX1jeQKqYCBWy4RyQ=="; }; }; "cycle-1.0.3" = { @@ -8600,13 +8564,13 @@ let sha512 = "oK6R74WV8TdhGR9VCLym7D/vlN8lXND5AyhJhrjtm1WNDrg/6Clx1Tk7k3Dt8quy2AmmGO7vbIk7iwFtzTAJfA=="; }; }; - "dat-node-3.5.12" = { + "dat-node-3.5.13" = { name = "dat-node"; packageName = "dat-node"; - version = "3.5.12"; + version = "3.5.13"; src = fetchurl { - url = "https://registry.npmjs.org/dat-node/-/dat-node-3.5.12.tgz"; - sha512 = "XYxdkeNYk8gM6nb125XrOQKAXLZlICLYZUk7bZAktpQUrSjAQnc9qPY2a/KCvHSbdoJf//PwyB00K0UiBTqawQ=="; + url = "https://registry.npmjs.org/dat-node/-/dat-node-3.5.13.tgz"; + sha512 = "ArpqeRgc/c/zsCs2Z6ZvK8Xm6EhzAo64UflspEffV2XqO7SoCKzj+qdkdfoYWGRvvp2IoOO0KaZ7PvFy0jdipg=="; }; }; "dat-registry-4.0.0" = { @@ -8627,13 +8591,13 @@ let sha512 = "BUhemnKpXUhKNl/1DuUwfFUyjzomlNF940uHPsOa3okmYu9z6mrp/EGQsLO3lO0YQomDUqS0G0DmHTse9vTU1A=="; }; }; - "dat-storage-1.0.4" = { + "dat-storage-1.1.1" = { name = "dat-storage"; packageName = "dat-storage"; - version = "1.0.4"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/dat-storage/-/dat-storage-1.0.4.tgz"; - sha512 = "THxtCBzrt+AJzhGxXedlxLYeW+AVi5eFLi9Ke9JQ7fTA/j84m1Ci7KPuZ1q44Um/BeIYZ3LO01FWS2MlAOTFRg=="; + url = "https://registry.npmjs.org/dat-storage/-/dat-storage-1.1.1.tgz"; + sha512 = "PjKjUatJN4ztBDI5nR94VuofyrVKOm6W3/DgqFO6U4ixdX351Jkuj+GiGScEmMOqn8vJgTmlUPTxJaBf38Fmkw=="; }; }; "dat-swarm-defaults-1.0.1" = { @@ -8731,7 +8695,7 @@ let packageName = "debug"; version = "0.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-0.5.0.tgz"; + url = "http://registry.npmjs.org/debug/-/debug-0.5.0.tgz"; sha1 = "9d48c946fb7d7d59807ffe07822f515fd76d7a9e"; }; }; @@ -8740,7 +8704,7 @@ let packageName = "debug"; version = "0.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-0.6.0.tgz"; + url = "http://registry.npmjs.org/debug/-/debug-0.6.0.tgz"; sha1 = "ce9d5d025d5294b3f0748a494bebaf3c9fd8734f"; }; }; @@ -8749,7 +8713,7 @@ let packageName = "debug"; version = "0.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz"; + url = "http://registry.npmjs.org/debug/-/debug-0.7.4.tgz"; sha1 = "06e1ea8082c2cb14e39806e22e2f6f757f92af39"; }; }; @@ -8767,7 +8731,7 @@ let packageName = "debug"; version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.1.3.tgz"; + url = "http://registry.npmjs.org/debug/-/debug-2.1.3.tgz"; sha1 = "ce8ab1b5ee8fbee2bfa3b633cab93d366b63418e"; }; }; @@ -8776,7 +8740,7 @@ let packageName = "debug"; version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz"; + url = "http://registry.npmjs.org/debug/-/debug-2.2.0.tgz"; sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da"; }; }; @@ -8785,7 +8749,7 @@ let packageName = "debug"; version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz"; + url = "http://registry.npmjs.org/debug/-/debug-2.3.3.tgz"; sha1 = "40c453e67e6e13c901ddec317af8986cda9eff8c"; }; }; @@ -8807,6 +8771,24 @@ let sha512 = "OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g=="; }; }; + "debug-3.2.5" = { + name = "debug"; + packageName = "debug"; + version = "3.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-3.2.5.tgz"; + sha512 = "D61LaDQPQkxJ5AUM2mbSJRbPkNs/TmdmOeLAi1hgDkpDfIfetSrjmWhccwtuResSwMbACjx/xXQofvM9CE/aeg=="; + }; + }; + "debug-4.0.1" = { + name = "debug"; + packageName = "debug"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-4.0.1.tgz"; + sha512 = "K23FHJ/Mt404FSlp6gSZCevIbTMLX0j3fmHhUEhQ3Wq0FMODW3+cUSoLdy1Gx4polAf4t/lphhmHH35BB8cLYw=="; + }; + }; "debug-fabulous-1.1.0" = { name = "debug-fabulous"; packageName = "debug-fabulous"; @@ -9442,7 +9424,7 @@ let packageName = "diffie-hellman"; version = "5.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz"; + url = "http://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz"; sha512 = "kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg=="; }; }; @@ -9554,13 +9536,13 @@ let sha512 = "bvjUS5Cylrm1uJJop/dFhEpnYtz2NQFOO0/z6vk0ORtx0AqKvUwPToc4reJk+TnHV9GBxbtZXj7ad5dJT/Dqkg=="; }; }; - "dns-discovery-6.1.0" = { + "dns-discovery-6.2.2" = { name = "dns-discovery"; packageName = "dns-discovery"; - version = "6.1.0"; + version = "6.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/dns-discovery/-/dns-discovery-6.1.0.tgz"; - sha512 = "Kl2tL2zuNR1w6SnsoRaqrOFm7gGP3/i/HzRXtyVBqaOq/5L1D2TUdViUAZ8e/NDbt+jQCJFWoaKCnmDC343usQ=="; + url = "https://registry.npmjs.org/dns-discovery/-/dns-discovery-6.2.2.tgz"; + sha512 = "EZQxH4I5ZAQbV8Njlb4JXhgeIKtcXdCzLCLSJIyzEXbzEm6hNsJdX5F6oW+4a02etsaSPBX3iEDFyPg7VB91PQ=="; }; }; "dns-equal-1.0.0" = { @@ -9595,7 +9577,7 @@ let packageName = "dns-packet"; version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/dns-packet/-/dns-packet-4.2.0.tgz"; + url = "http://registry.npmjs.org/dns-packet/-/dns-packet-4.2.0.tgz"; sha512 = "bn1AKpfkFbm0MIioOMHZ5qJzl2uypdBwI4nYNsqvhjsegBhcKJUlCrMPWLx6JEezRjxZmxhtIz/FkBEur2l8Cw=="; }; }; @@ -9838,7 +9820,7 @@ let packageName = "dotenv"; version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/dotenv/-/dotenv-4.0.0.tgz"; + url = "http://registry.npmjs.org/dotenv/-/dotenv-4.0.0.tgz"; sha1 = "864ef1379aced55ce6f95debecdce179f7a0cd1d"; }; }; @@ -9847,7 +9829,7 @@ let packageName = "dotenv"; version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/dotenv/-/dotenv-5.0.1.tgz"; + url = "http://registry.npmjs.org/dotenv/-/dotenv-5.0.1.tgz"; sha512 = "4As8uPrjfwb7VXC+WnLCbXK7y+Ueb2B3zgNCePYfhxS1PYeaO1YTeplffTEcbfLhvFNGLAz90VvJs9yomG7bow=="; }; }; @@ -9910,7 +9892,7 @@ let packageName = "duplexer"; version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz"; + url = "http://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz"; sha1 = "ace6ff808c1ce66b57d1ebf97977acb02334cfc1"; }; }; @@ -9950,6 +9932,15 @@ let sha512 = "fO3Di4tBKJpYTFHAxTU00BcfWMY9w24r/x21a6rZRbsD/ToUgGxsMbiGRmB7uVAXeGKXD9MwiLZa5E97EVgIRQ=="; }; }; + "dynamic-dijkstra-1.0.0" = { + name = "dynamic-dijkstra"; + packageName = "dynamic-dijkstra"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dynamic-dijkstra/-/dynamic-dijkstra-1.0.0.tgz"; + sha512 = "AUbCFABXNoon689xft5ROX/fO9pdttZ6wZcMXZ4oH85Bn9rtiMdVHVBbAZ9kxAewdm5L1m+y+n97s8ofwya8WA=="; + }; + }; "each-async-1.1.1" = { name = "each-async"; packageName = "each-async"; @@ -10527,13 +10518,13 @@ let sha512 = "C8Fx/0jFmV5IPoMOFPA9P9G5NtqW+4cOPit3MIuvR2t7Ag2K15EJTpxnHAYTzL+aYQJIESYeXZmDBfOBE1HcpA=="; }; }; - "es-to-primitive-1.1.1" = { + "es-to-primitive-1.2.0" = { name = "es-to-primitive"; packageName = "es-to-primitive"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz"; - sha1 = "45355248a88979034b6792e19bb81f2b7975dd0d"; + url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz"; + sha512 = "qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg=="; }; }; "es5-ext-0.10.46" = { @@ -10604,7 +10595,7 @@ let packageName = "es6-promise"; version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/es6-promise/-/es6-promise-2.3.0.tgz"; + url = "http://registry.npmjs.org/es6-promise/-/es6-promise-2.3.0.tgz"; sha1 = "96edb9f2fdb01995822b263dd8aadab6748181bc"; }; }; @@ -10613,7 +10604,7 @@ let packageName = "es6-promise"; version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/es6-promise/-/es6-promise-3.0.2.tgz"; + url = "http://registry.npmjs.org/es6-promise/-/es6-promise-3.0.2.tgz"; sha1 = "010d5858423a5f118979665f46486a95c6ee2bb6"; }; }; @@ -10622,17 +10613,17 @@ let packageName = "es6-promise"; version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz"; + url = "http://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz"; sha1 = "a08cdde84ccdbf34d027a1451bc91d4bcd28a613"; }; }; - "es6-promise-4.2.4" = { + "es6-promise-4.2.5" = { name = "es6-promise"; packageName = "es6-promise"; - version = "4.2.4"; + version = "4.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.4.tgz"; - sha512 = "/NdNZVJg+uZgtm9eS3O6lrOLYmQag2DjdEXuPaHlZ6RuVqgqaVZfgYCepEIKsLqwdQArOPtC3XzRLqGGfT8KQQ=="; + url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.5.tgz"; + sha512 = "n6wvpdE43VFtJq+lUDYDBFUwV8TZbuGXLV4D6wKafg13ldznKsyEvatubnmUe31zcvelSzOHF+XbaT+Bl9ObDg=="; }; }; "es6-promisify-5.0.0" = { @@ -10779,13 +10770,13 @@ let sha512 = "D5nG2rErquLUstgUaxJlWB5+gu+U/3VDY0fk/Iuq8y9CUFy/7Y6oF4N2cR1tV8knzQvciIbfqfohd359xTLIKQ=="; }; }; - "eslint-5.5.0" = { + "eslint-5.6.1" = { name = "eslint"; packageName = "eslint"; - version = "5.5.0"; + version = "5.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-5.5.0.tgz"; - sha512 = "m+az4vYehIJgl1Z0gb25KnFXeqQRdNreYsei1jdvkd9bB+UNQD3fsuiC2AWSQ56P+/t++kFSINZXFbfai+krOw=="; + url = "https://registry.npmjs.org/eslint/-/eslint-5.6.1.tgz"; + sha512 = "hgrDtGWz368b7Wqf+v1Z69O3ZebNR0+GA7PtDdbmuz4rInFVUV9uw7whjZEiWyLzCjVb5Rs5WRN1TAS6eo7AYA=="; }; }; "eslint-plugin-no-unsafe-innerhtml-1.0.16" = { @@ -10824,6 +10815,15 @@ let sha512 = "qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ=="; }; }; + "esm-3.0.84" = { + name = "esm"; + packageName = "esm"; + version = "3.0.84"; + src = fetchurl { + url = "https://registry.npmjs.org/esm/-/esm-3.0.84.tgz"; + sha512 = "SzSGoZc17S7P+12R9cg21Bdb7eybX25RnIeRZ80xZs+VZ3kdQKzqTp2k4hZJjR7p9l0186TTXSgrxzlMDBktlw=="; + }; + }; "espree-3.5.4" = { name = "espree"; packageName = "espree"; @@ -11013,13 +11013,22 @@ let sha1 = "f79f9984c07ee3fd9b44ffb3cd0422b13e24084d"; }; }; - "event-stream-3.3.4" = { + "event-stream-3.3.6" = { + name = "event-stream"; + packageName = "event-stream"; + version = "3.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/event-stream/-/event-stream-3.3.6.tgz"; + sha512 = "dGXNg4F/FgVzlApjzItL+7naHutA3fDqbV/zAZqDDlXTjiMnQmZKu+prImWKszeBM5UQeGvAl3u1wBiKeDh61g=="; + }; + }; + "event-stream-4.0.0" = { name = "event-stream"; packageName = "event-stream"; - version = "3.3.4"; + version = "4.0.0"; src = fetchurl { - url = "http://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz"; - sha1 = "4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571"; + url = "https://registry.npmjs.org/event-stream/-/event-stream-4.0.0.tgz"; + sha512 = "DOB0pW11hF+A572U9vmYbQuLVvzXb2ZQhP14wAhMesOLoWVmWNKZ05niYwgUEEO7Ex+lbPpsqT+pch4O7Ijqmg=="; }; }; "event-to-promise-0.8.0" = { @@ -11081,7 +11090,7 @@ let packageName = "events"; version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/events/-/events-1.1.1.tgz"; + url = "http://registry.npmjs.org/events/-/events-1.1.1.tgz"; sha1 = "9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"; }; }; @@ -11184,6 +11193,15 @@ let sha1 = "d8d76bbc1b55217ed190fd6dd49d3c774ecfc8da"; }; }; + "execa-1.0.0" = { + name = "execa"; + packageName = "execa"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz"; + sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA=="; + }; + }; "execall-1.0.0" = { name = "execall"; packageName = "execall"; @@ -11306,7 +11324,7 @@ let packageName = "express"; version = "2.5.11"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-2.5.11.tgz"; + url = "http://registry.npmjs.org/express/-/express-2.5.11.tgz"; sha1 = "4ce8ea1f3635e69e49f0ebb497b6a4b0a51ce6f0"; }; }; @@ -11315,7 +11333,7 @@ let packageName = "express"; version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-3.2.0.tgz"; + url = "http://registry.npmjs.org/express/-/express-3.2.0.tgz"; sha1 = "7b66d6c66b038038eedf452804222b3077374ae0"; }; }; @@ -11324,7 +11342,7 @@ let packageName = "express"; version = "3.21.2"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-3.21.2.tgz"; + url = "http://registry.npmjs.org/express/-/express-3.21.2.tgz"; sha1 = "0c2903ee5c54e63d65a96170764703550665a3de"; }; }; @@ -11333,7 +11351,7 @@ let packageName = "express"; version = "3.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-3.4.4.tgz"; + url = "http://registry.npmjs.org/express/-/express-3.4.4.tgz"; sha1 = "0b63ae626c96b71b78d13dfce079c10351635a86"; }; }; @@ -11342,7 +11360,7 @@ let packageName = "express"; version = "4.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.11.2.tgz"; + url = "http://registry.npmjs.org/express/-/express-4.11.2.tgz"; sha1 = "8df3d5a9ac848585f00a0777601823faecd3b148"; }; }; @@ -11351,7 +11369,7 @@ let packageName = "express"; version = "4.16.3"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.16.3.tgz"; + url = "http://registry.npmjs.org/express/-/express-4.16.3.tgz"; sha1 = "6af8a502350db3246ecc4becf6b5a34d22f7ed53"; }; }; @@ -11400,13 +11418,13 @@ let sha1 = "b2664f15c636d5248e60fdbe29131c4440552eda"; }; }; - "express-request-proxy-2.2.0" = { + "express-request-proxy-2.2.2" = { name = "express-request-proxy"; packageName = "express-request-proxy"; - version = "2.2.0"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/express-request-proxy/-/express-request-proxy-2.2.0.tgz"; - sha512 = "tObSNa1H5NMltFxg/UAB7tG2PdjkBeQI7fOTUTWyZWHchS7wY9TKqW1RAe3rn/Tq+EwsPTFRYptuLvBK722ipg=="; + url = "https://registry.npmjs.org/express-request-proxy/-/express-request-proxy-2.2.2.tgz"; + sha512 = "0Dzn6LQG0ohd2S+zJVMhsntwcDakEzm/uKJSZxH7B66ZBvTsB5LU/HvfO1dHG+RRiKuCg0aWfUa66PljnDjEdw=="; }; }; "express-session-1.11.3" = { @@ -11769,13 +11787,13 @@ let sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; }; }; - "fast-redact-1.1.14" = { + "fast-redact-1.2.0" = { name = "fast-redact"; packageName = "fast-redact"; - version = "1.1.14"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/fast-redact/-/fast-redact-1.1.14.tgz"; - sha512 = "jWvfd9kIZeRdwIRTUmLrxEaNgr3b8VW6uAAz5rcQwFhvA3TOK/LXv0kTJytjBjVIQWLdeK7YzM6zVY0kHGuGVw=="; + url = "https://registry.npmjs.org/fast-redact/-/fast-redact-1.2.0.tgz"; + sha512 = "k/uSk9PtFmvYx0m7bRk5B2gZChQk4euWhrn7Mf3vYSmwZBLh7cGNuMuc/vhH1MKMPyVJMMtl9oMwPnwlKqs7CQ=="; }; }; "fast-safe-stringify-1.2.3" = { @@ -11814,6 +11832,15 @@ let sha1 = "f0efe18c4f56e4f40afc7e06c719fd5ee6188f38"; }; }; + "fclone-1.0.11" = { + name = "fclone"; + packageName = "fclone"; + version = "1.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/fclone/-/fclone-1.0.11.tgz"; + sha1 = "10e85da38bfea7fc599341c296ee1d77266ee640"; + }; + }; "fd-read-stream-1.1.0" = { name = "fd-read-stream"; packageName = "fd-read-stream"; @@ -12026,7 +12053,7 @@ let packageName = "finalhandler"; version = "0.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.3.3.tgz"; + url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.3.3.tgz"; sha1 = "b1a09aa1e6a607b3541669b09bcb727f460cd426"; }; }; @@ -12035,7 +12062,7 @@ let packageName = "finalhandler"; version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.0.tgz"; + url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.4.0.tgz"; sha1 = "965a52d9e8d05d2b857548541fb89b53a2497d9b"; }; }; @@ -12044,7 +12071,7 @@ let packageName = "finalhandler"; version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.1.tgz"; + url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.5.1.tgz"; sha1 = "2c400d8d4530935bc232549c5fa385ec07de6fcd"; }; }; @@ -12071,7 +12098,7 @@ let packageName = "finalhandler"; version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz"; + url = "http://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz"; sha512 = "Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg=="; }; }; @@ -12273,6 +12300,15 @@ let sha1 = "248cf79a3da7d7dc379e2a11c92a2719cbb540f6"; }; }; + "flatmap-stream-0.1.0" = { + name = "flatmap-stream"; + packageName = "flatmap-stream"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/flatmap-stream/-/flatmap-stream-0.1.0.tgz"; + sha512 = "Nlic4ZRYxikqnK5rj3YoxDVKGGtUjcNDUtvQ7XsdGLZmMwdUYnXf10o1zcXtzEZTBgc6GxeRpQxV/Wu3WPIIHA=="; + }; + }; "flatstr-1.0.8" = { name = "flatstr"; packageName = "flatstr"; @@ -12336,22 +12372,22 @@ let sha1 = "ae049a714386bb83e342657a82924b70364a90d6"; }; }; - "flumedb-0.4.9" = { + "flumedb-0.5.1" = { name = "flumedb"; packageName = "flumedb"; - version = "0.4.9"; + version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/flumedb/-/flumedb-0.4.9.tgz"; - sha512 = "z932cCXHteJXKcwoev8/RfJ9tQ10FeRCZ6Jh55UnxN/ayZraYZvNYObl8ujbho7xQZB1CDt2WTHCN5gEYGBqGw=="; + url = "https://registry.npmjs.org/flumedb/-/flumedb-0.5.1.tgz"; + sha512 = "WB/q5YYEvVB2ozp7xhp3ur5NfX03HZywx6EEV6AlKjd1PodZdHVspz3NpakV++mVB89CRoH2nq+WdY33ntbfQw=="; }; }; - "flumelog-offset-3.3.1" = { + "flumelog-offset-3.3.2" = { name = "flumelog-offset"; packageName = "flumelog-offset"; - version = "3.3.1"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/flumelog-offset/-/flumelog-offset-3.3.1.tgz"; - sha512 = "4yYdr8tTL0qOkKqhxAxvNnIwDBaBcLEsJWbyc2wU4Ycaewts9xxcBaxNbORp2KBbTwFaqZAV13HVpfZcO1X/AA=="; + url = "https://registry.npmjs.org/flumelog-offset/-/flumelog-offset-3.3.2.tgz"; + sha512 = "KG0TCb+cWuEvnL44xjBhVNu+jRmJ8Msh2b1krYb4FllLwSbjreaCU/hH3uzv+HmUrtU/EhJepcAu79WxLH3EZQ=="; }; }; "flumeview-hashtable-1.0.4" = { @@ -12363,13 +12399,13 @@ let sha512 = "4L52hBelX7dYVAQQ9uPjksqxOCxLwI4NsfEG/+sTM423axT2Poq5cnfdvGm3HzmNowzwDIKtdy429r6PbfKEIw=="; }; }; - "flumeview-level-3.0.5" = { + "flumeview-level-3.0.6" = { name = "flumeview-level"; packageName = "flumeview-level"; - version = "3.0.5"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/flumeview-level/-/flumeview-level-3.0.5.tgz"; - sha512 = "LKW+YdJGemOo7TnUwpFHq4cBBiYAIKtWk+G2CK7zrxbCIiAHemBRudohBOUKuSUZZ0CReR5fJ73peBHW02VerA=="; + url = "https://registry.npmjs.org/flumeview-level/-/flumeview-level-3.0.6.tgz"; + sha512 = "omfYDMixWGL8Xx/mFl7xoALZvvOePiN/7jzY/kUJz3TR4px55QV4tZMba63QPyKj7NZVAPE61wq//P5sdiqvQw=="; }; }; "flumeview-query-6.3.0" = { @@ -12381,14 +12417,13 @@ let sha512 = "8QBannTFLICARmflhHpXNeR5hh6IzIyJz4XhKTofzmxq/hXEn1un7aF6P6dRQkOwthENDTbSB07eWKqwnYDKtw=="; }; }; - "flumeview-query-git://github.com/mmckegg/flumeview-query#map" = { + "flumeview-query-7.0.0" = { name = "flumeview-query"; packageName = "flumeview-query"; - version = "6.2.0"; - src = fetchgit { - url = "git://github.com/mmckegg/flumeview-query"; - rev = "59afdf210dbd8bdf53aeea7dcfaaec1c77e7d733"; - sha256 = "e6f1f768a0911a52c7a4d7f1ee0d60531d174fe30a96879a030a019ff3cb069f"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/flumeview-query/-/flumeview-query-7.0.0.tgz"; + sha512 = "lk3Gs5wf6BwZKDafjE95/r0wv4nkMRsZULmulDCybFu1mPFeqUMR4H+ENcg+fgOpQBGaiNRTyHPQyg0OLur2wA=="; }; }; "flumeview-reduce-1.3.13" = { @@ -12414,17 +12449,17 @@ let packageName = "follow-redirects"; version = "0.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-0.0.3.tgz"; + url = "http://registry.npmjs.org/follow-redirects/-/follow-redirects-0.0.3.tgz"; sha1 = "6ce67a24db1fe13f226c1171a72a7ef2b17b8f65"; }; }; - "follow-redirects-1.5.7" = { + "follow-redirects-1.5.8" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.5.7"; + version = "1.5.8"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.7.tgz"; - sha512 = "NONJVIFiX7Z8k2WxfqBjtwqMifx7X42ORLFrOZ2LTKGj71G3C0kfdyTqGqr8fx5zSX6Foo/D95dgGWbPUiwnew=="; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.8.tgz"; + sha512 = "sy1mXPmv7kLAMKW/8XofG7o9T+6gAjzdZK4AJF6ryqQYUa/hnzgiypoeUecZ53x7XiqKNEpNqLtS97MshW2nxg=="; }; }; "for-each-0.3.3" = { @@ -13201,6 +13236,15 @@ let sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14"; }; }; + "get-stream-4.0.0" = { + name = "get-stream"; + packageName = "get-stream"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stream/-/get-stream-4.0.0.tgz"; + sha512 = "FneLKMENeOR7wOK0/ZXCh+lwqtnPwkeunJjRN28LPqzGvNAhYvrTAhXv6xDm4vsJ0M7lcRbIYHQudKsSy2RtSQ=="; + }; + }; "get-uri-2.0.2" = { name = "get-uri"; packageName = "get-uri"; @@ -13426,15 +13470,6 @@ let sha1 = "211bafaf49e525b8cd93260d14ab136152b3f57a"; }; }; - "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"; - }; - }; "glob-7.1.2" = { name = "glob"; packageName = "glob"; @@ -13607,13 +13642,13 @@ let sha1 = "dbf743c6c14992593c655568cb66ed32c0122ebe"; }; }; - "global-tunnel-ng-2.5.4" = { + "global-tunnel-ng-2.6.0" = { name = "global-tunnel-ng"; packageName = "global-tunnel-ng"; - version = "2.5.4"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/global-tunnel-ng/-/global-tunnel-ng-2.5.4.tgz"; - sha1 = "5ef9d5ff2f2a6bed1b305abd463837d47e85b5f4"; + url = "https://registry.npmjs.org/global-tunnel-ng/-/global-tunnel-ng-2.6.0.tgz"; + sha512 = "glWGTgPzsOQs0mPRxHnWIwqYrEuQcxYpUFWF7BJxJL+c2F4fW304vdn53pqgod4PzOqZKDr1cex+a/pXCwrncA=="; }; }; "globals-11.7.0" = { @@ -13697,15 +13732,6 @@ let sha1 = "d9430ba32f6a30218243884418767340aafc0400"; }; }; - "got-3.3.1" = { - name = "got"; - packageName = "got"; - version = "3.3.1"; - src = fetchurl { - url = "http://registry.npmjs.org/got/-/got-3.3.1.tgz"; - sha1 = "e5d0ed4af55fc3eef4d56007769d98192bcb2eca"; - }; - }; "got-6.7.1" = { name = "got"; packageName = "got"; @@ -13823,13 +13849,13 @@ let sha512 = "QZ5BL8ZO/B20VA8APauGBg3GyEgZ19eduvpLWoq5x7gMmWnHoy8rlQWPLmWgFvo1yNgjSEFMesmS4R6pPr7xog=="; }; }; - "graphql-anywhere-4.1.18" = { + "graphql-anywhere-4.1.19" = { name = "graphql-anywhere"; packageName = "graphql-anywhere"; - version = "4.1.18"; + version = "4.1.19"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-anywhere/-/graphql-anywhere-4.1.18.tgz"; - sha512 = "n0jsAEpGpQxsF0RDaxSjtEQdIP3tx2C3q++QuHYFyUl+4Npl5t64zFjWwO3ZhotxmTgs8zaSbZPVFpydn6k0dQ=="; + url = "https://registry.npmjs.org/graphql-anywhere/-/graphql-anywhere-4.1.19.tgz"; + sha512 = "mQlvbECzYPBcgBC9JsdM4v+DSvNmcIP+8Vwr+ij3gktbaLSE0Iza30mztuz40Jlf7ooMs+0emBZucNjLzqz7tA=="; }; }; "graphql-cli-prepare-1.4.19" = { @@ -13855,7 +13881,7 @@ let packageName = "graphql-config"; version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-config/-/graphql-config-2.0.0.tgz"; + url = "http://registry.npmjs.org/graphql-config/-/graphql-config-2.0.0.tgz"; sha512 = "//hZmROEk79zzPlH6SVTQeXd8NVV65rquz1zxZeO6oEuX5KNnii8+oznLu7d897EfJ+NShTZtsY9FMmxxkWmJw=="; }; }; @@ -13864,7 +13890,7 @@ let packageName = "graphql-config"; version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-config/-/graphql-config-2.0.1.tgz"; + url = "http://registry.npmjs.org/graphql-config/-/graphql-config-2.0.1.tgz"; sha512 = "eb4FzlODifHE/Q+91QptAmkGw39wL5ToinJ2556UUsGt2drPc4tzifL+HSnHSaxiIbH8EUhc/Fa6+neinF04qA=="; }; }; @@ -13873,7 +13899,7 @@ let packageName = "graphql-config-extension-graphcool"; version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-config-extension-graphcool/-/graphql-config-extension-graphcool-1.0.8.tgz"; + url = "http://registry.npmjs.org/graphql-config-extension-graphcool/-/graphql-config-extension-graphcool-1.0.8.tgz"; sha512 = "eMvL/RAo88EHo8SmP40Zcsrx7nrLTE82G4ZochsHYoEvP+QMo0XA+Vq9lxYeRTJEtGMFD4imjHXGHWh4B0srQw=="; }; }; @@ -13886,22 +13912,22 @@ let sha512 = "Do6tHyQyxaPhaZdJ+ZCpYbVhczlqNqMVuO46aG/YkMuRQPoj/FRmeH9BFXniFkz60TZyRpLTQNel2sllMekRLQ=="; }; }; - "graphql-config-extension-prisma-0.0.11" = { + "graphql-config-extension-prisma-0.2.1" = { name = "graphql-config-extension-prisma"; packageName = "graphql-config-extension-prisma"; - version = "0.0.11"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-config-extension-prisma/-/graphql-config-extension-prisma-0.0.11.tgz"; - sha512 = "Mlj/VYshHbwDrVHgNyNAl2cBU7+Rh503S43UYXcBtR9Am2KNvmPPPccXEeP6yist0yY2WM0WTwL8JoIGrWeFOw=="; + url = "https://registry.npmjs.org/graphql-config-extension-prisma/-/graphql-config-extension-prisma-0.2.1.tgz"; + sha512 = "OIqa5hjX3bqHR5x2uPE5ssdaI6DEr/P/+utAaqdM6ZEAi8vgupye4AT5AOyDzwK5iDmbJAkShgwQlHiAm4Srvg=="; }; }; - "graphql-extensions-0.1.3" = { + "graphql-extensions-0.2.1" = { name = "graphql-extensions"; packageName = "graphql-extensions"; - version = "0.1.3"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.1.3.tgz"; - sha512 = "q+d1bTR7GW4qRiZP17SXN0TZo+k/I1FEKYd6H4JMbxzpY8mqTLbg8MzrLu7LxafF+mPEJwRfipcEcA375k3eXA=="; + url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.2.1.tgz"; + sha512 = "/1FTPSWSffDjlRyMAV2UwQhojLmca9aQD0ieo1IYiqT5SE+uOWi4r83QF1CoER0sREIsH3s+nTmdH3cvQVG3MA=="; }; }; "graphql-import-0.4.5" = { @@ -13909,7 +13935,7 @@ let packageName = "graphql-import"; version = "0.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-import/-/graphql-import-0.4.5.tgz"; + url = "http://registry.npmjs.org/graphql-import/-/graphql-import-0.4.5.tgz"; sha512 = "G/+I08Qp6/QGTb9qapknCm3yPHV0ZL7wbaalWFpxsfR8ZhZoTBe//LsbsCKlbALQpcMegchpJhpTSKiJjhaVqQ=="; }; }; @@ -13963,10 +13989,19 @@ let packageName = "graphql-subscriptions"; version = "0.5.8"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-subscriptions/-/graphql-subscriptions-0.5.8.tgz"; + url = "http://registry.npmjs.org/graphql-subscriptions/-/graphql-subscriptions-0.5.8.tgz"; sha512 = "0CaZnXKBw2pwnIbvmVckby5Ge5e2ecmjofhYCdyeACbCly2j3WXDP/pl+s+Dqd2GQFC7y99NB+53jrt55CKxYQ=="; }; }; + "graphql-subscriptions-1.0.0" = { + name = "graphql-subscriptions"; + packageName = "graphql-subscriptions"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/graphql-subscriptions/-/graphql-subscriptions-1.0.0.tgz"; + sha512 = "+ytmryoHF1LVf58NKEaNPRUzYyXplm120ntxfPcgOBC7TnK7Tv/4VRHeh4FAR9iL+O1bqhZs4nkibxQ+OA5cDQ=="; + }; + }; "graphql-tag-2.9.2" = { name = "graphql-tag"; packageName = "graphql-tag"; @@ -14075,13 +14110,13 @@ let sha512 = "7Isf9Y690o/Q5MVjEylH1H7L8WeZ89woW7DnhD5unTintOdZb67KdOayRgp9trUFo+f9UyJtuatV42e/+kghPg=="; }; }; - "gulp-less-3.5.0" = { + "gulp-less-4.0.1" = { name = "gulp-less"; packageName = "gulp-less"; - version = "3.5.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/gulp-less/-/gulp-less-3.5.0.tgz"; - sha512 = "FQLY7unaHdTOXG0jlwxeBQcWoPPrTMQZRA7HfYwSNi9IPVx5l7GJEN72mG4ri2yigp/f/VNGUAJnFMJHBmH3iw=="; + url = "https://registry.npmjs.org/gulp-less/-/gulp-less-4.0.1.tgz"; + sha512 = "hmM2k0FfQp7Ptm3ZaqO2CkMX3hqpiIOn4OHtuSsCeFym63F7oWlEua5v6u1cIjVUKYsVIs9zPg9vbqTEb/udpA=="; }; }; "gulp-sourcemaps-2.6.4" = { @@ -14093,13 +14128,13 @@ let sha1 = "cbb2008450b1bcce6cd23bf98337be751bf6e30a"; }; }; - "gulp-typescript-4.0.2" = { + "gulp-typescript-5.0.0-alpha.3" = { name = "gulp-typescript"; packageName = "gulp-typescript"; - version = "4.0.2"; + version = "5.0.0-alpha.3"; src = fetchurl { - url = "https://registry.npmjs.org/gulp-typescript/-/gulp-typescript-4.0.2.tgz"; - sha512 = "Hhbn5Aa2l3T+tnn0KqsG6RRJmcYEsr3byTL2nBpNBeAK8pqug9Od4AwddU4JEI+hRw7mzZyjRbB8DDWR6paGVA=="; + url = "https://registry.npmjs.org/gulp-typescript/-/gulp-typescript-5.0.0-alpha.3.tgz"; + sha512 = "6iSBjqBXAUqRsLUh/9XtlOnSzpPMbLrr5rqGj4UPLtGpDwFHW/fVTuRgv6LAWiKesLIUDDM0ourxvcpu2trecQ=="; }; }; "gulp-uglify-3.0.1" = { @@ -14134,17 +14169,17 @@ let packageName = "handlebars"; version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/handlebars/-/handlebars-2.0.0.tgz"; + url = "http://registry.npmjs.org/handlebars/-/handlebars-2.0.0.tgz"; sha1 = "6e9d7f8514a3467fa5e9f82cc158ecfc1d5ac76f"; }; }; - "handlebars-4.0.11" = { + "handlebars-4.0.12" = { name = "handlebars"; packageName = "handlebars"; - version = "4.0.11"; + version = "4.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/handlebars/-/handlebars-4.0.11.tgz"; - sha1 = "630a35dfe0294bc281edae6ffc5d329fc7982dcc"; + url = "https://registry.npmjs.org/handlebars/-/handlebars-4.0.12.tgz"; + sha512 = "RhmTekP+FZL+XNhwS1Wf+bTTZpdLougwt5pcgA1tuz6Jcx0fpH/7z0qd71RKnZHBCxIRBHfBOnio4gViPemNzA=="; }; }; "har-schema-1.0.5" = { @@ -14539,7 +14574,7 @@ let packageName = "he"; version = "0.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/he/-/he-0.5.0.tgz"; + url = "http://registry.npmjs.org/he/-/he-0.5.0.tgz"; sha1 = "2c05ffaef90b68e860f3fd2b54ef580989277ee2"; }; }; @@ -14552,6 +14587,15 @@ let sha1 = "93410fd21b009735151f8868c2f271f3427e23fd"; }; }; + "he-1.2.0" = { + name = "he"; + packageName = "he"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/he/-/he-1.2.0.tgz"; + sha512 = "F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="; + }; + }; "header-case-1.0.1" = { name = "header-case"; packageName = "header-case"; @@ -14809,7 +14853,7 @@ let packageName = "http-errors"; version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/http-errors/-/http-errors-1.3.1.tgz"; + url = "http://registry.npmjs.org/http-errors/-/http-errors-1.3.1.tgz"; sha1 = "197e22cdebd4198585e8694ef6786197b91ed942"; }; }; @@ -14827,17 +14871,17 @@ let packageName = "http-errors"; version = "1.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz"; + url = "http://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz"; sha1 = "8b55680bb4be283a0b5bf4ea2e38580be1d9320d"; }; }; - "http-errors-1.7.0" = { + "http-errors-1.7.1" = { name = "http-errors"; packageName = "http-errors"; - version = "1.7.0"; + version = "1.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/http-errors/-/http-errors-1.7.0.tgz"; - sha512 = "hz3BtSHB7Z6dNWzYc+gUbWqG4dIpJedwwOhe1cvGUq5tGmcTTIRkPiAbyh/JlZx+ksSJyGJlgcHo5jGahiXnKw=="; + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.7.1.tgz"; + sha512 = "jWEUgtZWGSMba9I1N3gc1HmvpBUaNC9vDdA46yScAdp+C5rdEuKWUBLWTQpW9FwSWSbYYs++b6SDCxf9UEJzfw=="; }; }; "http-headers-3.0.2" = { @@ -15029,13 +15073,13 @@ let sha512 = "PH5GBkXqFxw5+4eKaKRIkD23y6vRd/IXSl7IldyJxEXpDH9SEIXRORkBtkGni/ae2P7RVOw6Wxypd2tGXhha1w=="; }; }; - "hypercore-6.18.2" = { + "hypercore-6.19.1" = { name = "hypercore"; packageName = "hypercore"; - version = "6.18.2"; + version = "6.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/hypercore/-/hypercore-6.18.2.tgz"; - sha512 = "aPnBx3nyrZGia0D17/+GrGBWCRhM/+0HABRNugva1Z+Cr1LSRlwMeYM/V1goFWity48thoYae5AAJ+WduknZLw=="; + url = "https://registry.npmjs.org/hypercore/-/hypercore-6.19.1.tgz"; + sha512 = "CnpaH6+qlt0w1ynt3y+q9alZh23lK0nD7bbuG0vNtQzFefmTYoLexq/Vpss8CYjoQfh6qeG90g2F8GjCl8/Eag=="; }; }; "hypercore-crypto-1.0.0" = { @@ -15047,13 +15091,13 @@ let sha512 = "xFwOnNlOt8L+SovC7dTNchKaNYJb5l8rKZZwpWQnCme1r7CU4Hlhp1RDqPES6b0OpS7DkTo9iU0GltQGkpsjMw=="; }; }; - "hypercore-protocol-6.6.4" = { + "hypercore-protocol-6.7.1" = { name = "hypercore-protocol"; packageName = "hypercore-protocol"; - version = "6.6.4"; + version = "6.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/hypercore-protocol/-/hypercore-protocol-6.6.4.tgz"; - sha512 = "9TU7P+uve0e5v1ZiBx70DFhkpepW4iNSGYlZthK+Unm0EbZ+Yppc6clH7JTffPBNUMSnDrE552MfXMilpCHZMw=="; + url = "https://registry.npmjs.org/hypercore-protocol/-/hypercore-protocol-6.7.1.tgz"; + sha512 = "6jjMwL/XgeAl9BDUWmAJmIum7ynHGqajCnXt5VbJuxNLKkPI8WQS2kpMfcvotI5QHKMu/15+92ZPM6WoYDtd8g=="; }; }; "hyperdrive-9.14.0" = { @@ -15115,7 +15159,7 @@ let packageName = "iconv-lite"; version = "0.4.11"; src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.11.tgz"; + url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.11.tgz"; sha1 = "2ecb42fd294744922209a2e7c404dac8793d8ade"; }; }; @@ -15124,7 +15168,7 @@ let packageName = "iconv-lite"; version = "0.4.13"; src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz"; + url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz"; sha1 = "1f88aba4ab0b1508e8312acc39345f36e992e2f2"; }; }; @@ -15133,7 +15177,7 @@ let packageName = "iconv-lite"; version = "0.4.15"; src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz"; + url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz"; sha1 = "fe265a218ac6a57cfe854927e9d04c19825eddeb"; }; }; @@ -15169,7 +15213,7 @@ let packageName = "iconv-lite"; version = "0.4.8"; src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.8.tgz"; + url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.8.tgz"; sha1 = "c6019a7595f2cefca702eab694a010bcd9298d20"; }; }; @@ -15281,6 +15325,15 @@ let sha512 = "5s6NiCGbtWc+OQA60jrre54w12U7tynIyUNjO5LJjNA5lWwvCv6640roq8Wk/wIuaqnd4Pgtp453OyJ7hbONkQ=="; }; }; + "immutable-tuple-0.4.8" = { + name = "immutable-tuple"; + packageName = "immutable-tuple"; + version = "0.4.8"; + src = fetchurl { + url = "https://registry.npmjs.org/immutable-tuple/-/immutable-tuple-0.4.8.tgz"; + sha512 = "1m29EVSrF+LJJAyVo1v12NsIalVKjyi4HNQVQDBx+LNCIuRXnfeMCHuLao5CyN1m3Sn0T63U5JEkmPArPCipQA=="; + }; + }; "import-global-0.1.0" = { name = "import-global"; packageName = "import-global"; @@ -15371,15 +15424,6 @@ let sha1 = "15dcf56ee9cf65c0234c513c27fbd580e70fbc50"; }; }; - "infinity-agent-2.0.3" = { - name = "infinity-agent"; - packageName = "infinity-agent"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/infinity-agent/-/infinity-agent-2.0.3.tgz"; - sha1 = "45e0e2ff7a9eb030b27d62b74b3744b7a7ac4216"; - }; - }; "inflected-2.0.4" = { name = "inflected"; packageName = "inflected"; @@ -15493,7 +15537,7 @@ let packageName = "inquirer"; version = "0.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-0.10.1.tgz"; + url = "http://registry.npmjs.org/inquirer/-/inquirer-0.10.1.tgz"; sha1 = "ea25e4ce69ca145e05c99e46dcfec05e4012594a"; }; }; @@ -15502,7 +15546,7 @@ let packageName = "inquirer"; version = "0.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz"; + url = "http://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz"; sha1 = "1ef2bfd63504df0bc75785fff8c2c41df12f077e"; }; }; @@ -15511,7 +15555,7 @@ let packageName = "inquirer"; version = "0.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-0.8.5.tgz"; + url = "http://registry.npmjs.org/inquirer/-/inquirer-0.8.5.tgz"; sha1 = "dbd740cf6ca3b731296a63ce6f6d961851f336df"; }; }; @@ -15520,7 +15564,7 @@ let packageName = "inquirer"; version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-1.2.3.tgz"; + url = "http://registry.npmjs.org/inquirer/-/inquirer-1.2.3.tgz"; sha1 = "4dec6f32f37ef7bb0b2ed3f1d1a5c3f545074918"; }; }; @@ -15547,7 +15591,7 @@ let packageName = "inquirer"; version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-5.2.0.tgz"; + url = "http://registry.npmjs.org/inquirer/-/inquirer-5.2.0.tgz"; sha512 = "E9BmnJbAKLPGonz0HeWHtbKf+EeSP93paWO3ZYoUpq/aowXvYGjjCSuashhXPpzbArIjBbji39THkxTz9ZeEUQ=="; }; }; @@ -15898,7 +15942,7 @@ let packageName = "is-builtin-module"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz"; + url = "http://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz"; sha1 = "540572d34f7ac3119f8f76c30cbc1b1e037affbe"; }; }; @@ -15911,13 +15955,13 @@ let sha512 = "r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA=="; }; }; - "is-ci-1.2.0" = { + "is-ci-1.2.1" = { name = "is-ci"; packageName = "is-ci"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-ci/-/is-ci-1.2.0.tgz"; - sha512 = "plgvKjQtalH2P3Gytb7L61Lmz95g2DlpzFiQyRSFew8WoJKxtKRzrZMeyRN2supblm3Psc8OQGy7Xjb6XG11jw=="; + url = "https://registry.npmjs.org/is-ci/-/is-ci-1.2.1.tgz"; + sha512 = "s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg=="; }; }; "is-data-descriptor-0.1.4" = { @@ -16109,6 +16153,15 @@ let sha1 = "12cfb98b65b57dd3d193a3121f5f6e2f437602b5"; }; }; + "is-git-url-1.0.0" = { + name = "is-git-url"; + packageName = "is-git-url"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-git-url/-/is-git-url-1.0.0.tgz"; + sha1 = "53f684cd143285b52c3244b4e6f28253527af66b"; + }; + }; "is-glob-2.0.1" = { name = "is-glob"; packageName = "is-glob"; @@ -16267,7 +16320,7 @@ let packageName = "is-obj"; version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz"; + url = "http://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz"; sha1 = "3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"; }; }; @@ -16505,13 +16558,13 @@ let sha512 = "3vcJecUUrpgCqc/ca0aWeNu64UGgxcvO60K/Fkr1N6RSvfGCTU60UKN68JDmKokgba0rFFJs12EnzOQa14ubKQ=="; }; }; - "is-symbol-1.0.1" = { + "is-symbol-1.0.2" = { name = "is-symbol"; packageName = "is-symbol"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz"; - sha1 = "3cc59f00025194b6ab2e38dbae6689256b660572"; + url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz"; + sha512 = "HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw=="; }; }; "is-text-path-1.0.1" = { @@ -16586,13 +16639,13 @@ let sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72"; }; }; - "is-valid-domain-0.0.5" = { + "is-valid-domain-0.0.6" = { name = "is-valid-domain"; packageName = "is-valid-domain"; - version = "0.0.5"; + version = "0.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/is-valid-domain/-/is-valid-domain-0.0.5.tgz"; - sha1 = "48e70319fcb43009236e96b37f9843889ce7b513"; + url = "https://registry.npmjs.org/is-valid-domain/-/is-valid-domain-0.0.6.tgz"; + sha512 = "XXiNRcLcNKeb0LB3PzB39gJa8QiA+6nnc4NX9zNvFQcaITWU+64hfVqaVppbSd3tSVlJttW6sINkX3xLKPax7A=="; }; }; "is-valid-glob-1.0.0" = { @@ -16991,15 +17044,6 @@ let sha1 = "a55a6e4706b01d06326259a6f4bfc42e6ae38b1f"; }; }; - "js-yaml-3.10.0" = { - name = "js-yaml"; - packageName = "js-yaml"; - version = "3.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz"; - sha512 = "O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA=="; - }; - }; "js-yaml-3.12.0" = { name = "js-yaml"; packageName = "js-yaml"; @@ -17077,7 +17121,7 @@ let packageName = "json-buffer"; version = "2.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/json-buffer/-/json-buffer-2.0.11.tgz"; + url = "http://registry.npmjs.org/json-buffer/-/json-buffer-2.0.11.tgz"; sha1 = "3e441fda3098be8d1e3171ad591bc62a33e2d55f"; }; }; @@ -17266,7 +17310,7 @@ let packageName = "json5"; version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz"; + url = "http://registry.npmjs.org/json5/-/json5-0.5.1.tgz"; sha1 = "1eade7acc012034ad84e2396767ead9fa5495821"; }; }; @@ -17275,7 +17319,7 @@ let packageName = "json5"; version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz"; + url = "http://registry.npmjs.org/json5/-/json5-1.0.1.tgz"; sha512 = "aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow=="; }; }; @@ -17293,7 +17337,7 @@ let packageName = "jsonfile"; version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsonfile/-/jsonfile-1.0.1.tgz"; + url = "http://registry.npmjs.org/jsonfile/-/jsonfile-1.0.1.tgz"; sha1 = "ea5efe40b83690b98667614a7392fc60e842c0dd"; }; }; @@ -17302,7 +17346,7 @@ let packageName = "jsonfile"; version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz"; + url = "http://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz"; sha1 = "3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"; }; }; @@ -17401,7 +17445,7 @@ let packageName = "jsonwebtoken"; version = "8.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.2.1.tgz"; + url = "http://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.2.1.tgz"; sha512 = "l8rUBr0fqYYwPc8/ZGrue7GiW7vWdZtZqelxo4Sd5lMvuEeCK8/wS54sEo6tJhdZ6hqfutsj6COgC0d1XdbHGw=="; }; }; @@ -17703,13 +17747,13 @@ let sha1 = "79d93d2d33363d6fdd2970b335d9141ad591d79b"; }; }; - "keygrip-1.0.2" = { + "keygrip-1.0.3" = { name = "keygrip"; packageName = "keygrip"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/keygrip/-/keygrip-1.0.2.tgz"; - sha1 = "ad3297c557069dea8bcfe7a4fa491b75c5ddeb91"; + url = "https://registry.npmjs.org/keygrip/-/keygrip-1.0.3.tgz"; + sha512 = "/PpesirAIfaklxUzp4Yb7xBper9MwP6hNRA6BGGUFCgbJ+BM5CKBtsoxinNXkLHAr+GXS1/lSlF2rP7cv5Fl+g=="; }; }; "keypress-0.1.0" = { @@ -17811,15 +17855,6 @@ let sha1 = "59c128e0dc5ce410201151194eeb9cbf858650f6"; }; }; - "klaw-3.0.0" = { - name = "klaw"; - packageName = "klaw"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/klaw/-/klaw-3.0.0.tgz"; - sha512 = "0Fo5oir+O9jnXu5EefYbVK+mHMBeEVEy2cmctR1O1NECcCkPRreJKrS6Qt/j3KC2C148Dfo9i3pCmCMsdqGr0g=="; - }; - }; "klaw-sync-4.0.0" = { name = "klaw-sync"; packageName = "klaw-sync"; @@ -17829,13 +17864,13 @@ let sha512 = "go/5tXbgLkgwxQ2c2ewaMen6TpQtI9fTzzmTdlSGK8XxKcFSsJvn/Sgn75Vg+mOJwkKVPrqLw2Xq7x/zP1v7PQ=="; }; }; - "knockout-3.5.0-rc" = { + "knockout-3.5.0-rc2" = { name = "knockout"; packageName = "knockout"; - version = "3.5.0-rc"; + version = "3.5.0-rc2"; src = fetchurl { - url = "https://registry.npmjs.org/knockout/-/knockout-3.5.0-rc.tgz"; - sha512 = "eROh551BD9dDQ2ItCF60IPcZZXP46WiEcFCU6pVlekeQ6mv3L+in4u8BIIUDp1h0OtL7IXLwvwEY8HkG/BPtrQ=="; + url = "https://registry.npmjs.org/knockout/-/knockout-3.5.0-rc2.tgz"; + sha512 = "ncKkcfOX5hV6QyvNLMLe+s9uYbP+jRKljj01Fcg/BPk3PvfcdZF3dV52qkfpR0IC0iRh0AAP7NXFJEt0ofy14g=="; }; }; "kuduscript-1.0.16" = { @@ -17883,15 +17918,6 @@ let sha1 = "c1bfd0cbcb46790ec9156b8d1aee8fcb86cda22a"; }; }; - "latest-version-1.0.1" = { - name = "latest-version"; - packageName = "latest-version"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/latest-version/-/latest-version-1.0.1.tgz"; - sha1 = "72cfc46e3e8d1be651e1ebb54ea9f6ea96f374bb"; - }; - }; "latest-version-3.1.0" = { name = "latest-version"; packageName = "latest-version"; @@ -17910,6 +17936,15 @@ let sha512 = "On+V7K2uZK6wK7x691ycSUbLD/FyKKelArkbaAMSSJU8JmqmhwN2+mnJDNINuJWSrh2L0kDk+ZQtbC/gOWUwLw=="; }; }; + "layered-graph-1.1.0" = { + name = "layered-graph"; + packageName = "layered-graph"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/layered-graph/-/layered-graph-1.1.0.tgz"; + sha512 = "PSQEdXbmwffcwZ0i7HNfJI/cGnUqVTyt2caanHH/ixxzBqapONxAWYlnj13r3Q79V5ALiCtGrkRnaUo3zwKfzA=="; + }; + }; "lazy-1.0.11" = { name = "lazy"; packageName = "lazy"; @@ -18000,6 +18035,15 @@ let sha512 = "KPdIJKWcEAb02TuJtaLrhue0krtRLoRoo7x6BNJIBelO00t/CCdJQUnHW5V34OnHMWzIktSalJxRO+FvytQlCQ=="; }; }; + "less-3.8.1" = { + name = "less"; + packageName = "less"; + version = "3.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/less/-/less-3.8.1.tgz"; + sha512 = "8HFGuWmL3FhQR0aH89escFNBQH/nEiYPP2ltDFdQw2chE28Yx2E3lhAIq9Y2saYwLSwa699s4dBVEfCY8Drf7Q=="; + }; + }; "less-middleware-2.2.1" = { name = "less-middleware"; packageName = "less-middleware"; @@ -18198,6 +18242,24 @@ let sha1 = "51a1a9e7448ecbd32cda54421675bb21bc093da6"; }; }; + "libnested-1.3.2" = { + name = "libnested"; + packageName = "libnested"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/libnested/-/libnested-1.3.2.tgz"; + sha512 = "YvMQglpk/DyB8vFL5usJe6IZTqOU/fRopoUpoOt9TavYh5CaGdTp6zYqrA7DW8tHmZAr8fj+pDXbHBwlVrcVXQ=="; + }; + }; + "libnpmaccess-3.0.0" = { + name = "libnpmaccess"; + packageName = "libnpmaccess"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/libnpmaccess/-/libnpmaccess-3.0.0.tgz"; + sha512 = "SiE4AZAzMpD7pmmXHfgD7rof8QIQGoKaeyAS8exgx2CKA6tzRTbRljq1xM4Tgj8/tIg+KBJPJWkR0ifqKT3irQ=="; + }; + }; "libqp-1.1.0" = { name = "libqp"; packageName = "libqp"; @@ -18311,7 +18373,7 @@ let packageName = "load-json-file"; version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz"; + url = "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz"; sha1 = "956905708d58b4bab4c2261b04f59f31c99374c0"; }; }; @@ -18320,7 +18382,7 @@ let packageName = "load-json-file"; version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz"; + url = "http://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz"; sha1 = "7947e42149af80d696cbf797bcaabcfe1fe29ca8"; }; }; @@ -18333,13 +18395,13 @@ let sha1 = "2f5f45ab91e33216234fd53adab668eb4ec0993b"; }; }; - "loader-runner-2.3.0" = { + "loader-runner-2.3.1" = { name = "loader-runner"; packageName = "loader-runner"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/loader-runner/-/loader-runner-2.3.0.tgz"; - sha1 = "f482aea82d543e07921700d5a46ef26fdac6b8a2"; + url = "https://registry.npmjs.org/loader-runner/-/loader-runner-2.3.1.tgz"; + sha512 = "By6ZFY7ETWOc9RFaAIb23IjJVcM4dvJC/N57nmdz9RSkMXvAXGI7SyVlAw3v8vjtDRlqThgVDVmTnr9fqMlxkw=="; }; }; "loader-utils-1.1.0" = { @@ -18387,13 +18449,13 @@ let sha1 = "259933d1327cbaf0fd3662f8fffde36809d84ced"; }; }; - "locutus-2.0.9" = { + "locutus-2.0.10" = { name = "locutus"; packageName = "locutus"; - version = "2.0.9"; + version = "2.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/locutus/-/locutus-2.0.9.tgz"; - sha1 = "e265af1e85fd19173e74386373888560783a02fc"; + url = "https://registry.npmjs.org/locutus/-/locutus-2.0.10.tgz"; + sha512 = "AZg2kCqrquMJ5FehDsBidV0qHl98NrsYtseUClzjAQ3HFnsDBJTCwGVplSQ82t9/QfgahqvTjaKcZqZkHmS0wQ=="; }; }; "lodash-1.0.2" = { @@ -18459,6 +18521,15 @@ let sha512 = "UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg=="; }; }; + "lodash-4.17.11" = { + name = "lodash"; + packageName = "lodash"; + version = "4.17.11"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz"; + sha512 = "cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="; + }; + }; "lodash-4.17.5" = { name = "lodash"; packageName = "lodash"; @@ -18846,6 +18917,15 @@ let sha1 = "7ae3017e939622ac31b7d7d7dcb1b34db1690d35"; }; }; + "lodash.camelcase-4.3.0" = { + name = "lodash.camelcase"; + packageName = "lodash.camelcase"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz"; + sha1 = "b28aa6288a2b9fc651035c7711f65ab6190331a6"; + }; + }; "lodash.clone-4.3.2" = { name = "lodash.clone"; packageName = "lodash.clone"; @@ -19143,6 +19223,15 @@ let sha1 = "d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"; }; }; + "lodash.kebabcase-4.1.1" = { + name = "lodash.kebabcase"; + packageName = "lodash.kebabcase"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz"; + sha1 = "8489b1cb0d29ff88195cceca448ff6d6cc295c36"; + }; + }; "lodash.keys-2.4.1" = { name = "lodash.keys"; packageName = "lodash.keys"; @@ -19215,6 +19304,15 @@ let sha1 = "4fb54f816652e5ae10e8f72f717a388c7326538a"; }; }; + "lodash.omit-4.5.0" = { + name = "lodash.omit"; + packageName = "lodash.omit"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.omit/-/lodash.omit-4.5.0.tgz"; + sha1 = "6eb19ae5a1ee1dd9df0b969e66ce0b7fa30b5e60"; + }; + }; "lodash.once-4.1.1" = { name = "lodash.once"; packageName = "lodash.once"; @@ -19305,6 +19403,15 @@ let sha1 = "d8757b1da807dde24816b0d6a84bea1a76230b23"; }; }; + "lodash.snakecase-4.1.1" = { + name = "lodash.snakecase"; + packageName = "lodash.snakecase"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz"; + sha1 = "39d714a35357147837aefd64b5dcbb16becd8f8d"; + }; + }; "lodash.some-4.6.0" = { name = "lodash.some"; packageName = "lodash.some"; @@ -19323,6 +19430,15 @@ let sha1 = "edd14c824e2cc9c1e0b0a1b42bb5210516a42438"; }; }; + "lodash.startcase-4.4.0" = { + name = "lodash.startcase"; + packageName = "lodash.startcase"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.startcase/-/lodash.startcase-4.4.0.tgz"; + sha1 = "9436e34ed26093ed7ffae1936144350915d9add8"; + }; + }; "lodash.support-2.4.1" = { name = "lodash.support"; packageName = "lodash.support"; @@ -19386,6 +19502,15 @@ let sha1 = "24c4bfcd6b2fba38bfd0594db1179d8e9b656561"; }; }; + "lodash.topairs-4.3.0" = { + name = "lodash.topairs"; + packageName = "lodash.topairs"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.topairs/-/lodash.topairs-4.3.0.tgz"; + sha1 = "3b6deaa37d60fb116713c46c5f17ea190ec48d64"; + }; + }; "lodash.union-4.6.0" = { name = "lodash.union"; packageName = "lodash.union"; @@ -19413,6 +19538,15 @@ let sha1 = "a3a17bbf62eeb6240f491846e97c1c4e2a5e1e21"; }; }; + "lodash.upperfirst-4.3.1" = { + name = "lodash.upperfirst"; + packageName = "lodash.upperfirst"; + version = "4.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz"; + sha1 = "1365edf431480481ef0d1c68957a5ed99d49f7ce"; + }; + }; "log-symbols-1.0.2" = { name = "log-symbols"; packageName = "log-symbols"; @@ -19485,15 +19619,6 @@ let sha1 = "9fa180bb1d9500cdc29c4156766a1995e1f4524f"; }; }; - "long-3.2.0" = { - name = "long"; - packageName = "long"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/long/-/long-3.2.0.tgz"; - sha1 = "d821b7138ca1cb581c172990ef14db200b5c474b"; - }; - }; "long-4.0.0" = { name = "long"; packageName = "long"; @@ -19769,7 +19894,7 @@ let packageName = "lunr"; version = "0.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/lunr/-/lunr-0.7.2.tgz"; + url = "http://registry.npmjs.org/lunr/-/lunr-0.7.2.tgz"; sha1 = "79a30e932e216cba163541ee37a3607c12cd7281"; }; }; @@ -19890,13 +20015,13 @@ let sha512 = "pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw=="; }; }; - "mamacro-0.0.3" = { - name = "mamacro"; - packageName = "mamacro"; - version = "0.0.3"; + "map-age-cleaner-0.1.2" = { + name = "map-age-cleaner"; + packageName = "map-age-cleaner"; + version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/mamacro/-/mamacro-0.0.3.tgz"; - sha512 = "qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA=="; + url = "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.2.tgz"; + sha512 = "UN1dNocxQq44IhJyMI4TU8phc2m9BddacHRPRjKGLYaF0jqd3xLz0jS0skpAU9WgYyoR4gHtUpzytNBS385FWQ=="; }; }; "map-cache-0.2.2" = { @@ -19913,17 +20038,17 @@ let packageName = "map-filter-reduce"; version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/map-filter-reduce/-/map-filter-reduce-2.2.1.tgz"; + url = "http://registry.npmjs.org/map-filter-reduce/-/map-filter-reduce-2.2.1.tgz"; sha1 = "632b127c3ae5d6ad9e21cfdd9691b63b8944fcd2"; }; }; - "map-filter-reduce-3.1.0" = { + "map-filter-reduce-3.2.1" = { name = "map-filter-reduce"; packageName = "map-filter-reduce"; - version = "3.1.0"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/map-filter-reduce/-/map-filter-reduce-3.1.0.tgz"; - sha512 = "os2GlG1lEWRSAvAb9iqfapQ0I1GRXSA+alSjQl0DB7XxNyDx2/VOVAEVhK7EMsqwDDCWNTBSstoo1roc7U5H0w=="; + url = "https://registry.npmjs.org/map-filter-reduce/-/map-filter-reduce-3.2.1.tgz"; + sha512 = "0+0C/3IVCX8PLXRyBL0umF/YMy3/ch7Zgxu91ZUIXS6YHyv4UVMZlkclUk9rQI63FQ+uvBdHYzo8VPJbIxKTVw=="; }; }; "map-merge-1.1.0" = { @@ -19931,7 +20056,7 @@ let packageName = "map-merge"; version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/map-merge/-/map-merge-1.1.0.tgz"; + url = "http://registry.npmjs.org/map-merge/-/map-merge-1.1.0.tgz"; sha1 = "6a6fc58c95d8aab46c2bdde44d515b6ee06fce34"; }; }; @@ -19953,12 +20078,21 @@ let sha1 = "a65cd29087a92598b8791257a523e021222ac1f9"; }; }; + "map-stream-0.0.7" = { + name = "map-stream"; + packageName = "map-stream"; + version = "0.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/map-stream/-/map-stream-0.0.7.tgz"; + sha1 = "8a1f07896d82b10926bd3744a2420009f88974a8"; + }; + }; "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"; + url = "http://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz"; sha1 = "e56aa94c4c8055a16404a0674b78f215f7c8e194"; }; }; @@ -20030,7 +20164,7 @@ let packageName = "marked"; version = "0.3.19"; src = fetchurl { - url = "https://registry.npmjs.org/marked/-/marked-0.3.19.tgz"; + url = "http://registry.npmjs.org/marked/-/marked-0.3.19.tgz"; sha512 = "ea2eGWOqNxPcXv8dyERdSr/6FmzvWwzjMxpfGB/sbMccXoct+xY+YukPD+QTUZwyvK7BZwcr4m21WBOW41pAkg=="; }; }; @@ -20088,15 +20222,6 @@ let sha512 = "FSYbp3lyKjyj3E7fMl6rYvUdX0FBXaluGqlFoYESWQlyUTq8R+wp0rkFxoYFqZlHCvsUXGjyJmLQSnXToYhOSA=="; }; }; - "mdn-data-1.2.0" = { - name = "mdn-data"; - packageName = "mdn-data"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mdn-data/-/mdn-data-1.2.0.tgz"; - sha512 = "esDqNvsJB2q5V28+u7NdtdMg6Rmg4khQmAVSjUiX7BY/7haIv0K2yWM43hYp0or+3nvG7+UaTF1JHz31hgU1TA=="; - }; - }; "mdns-js-0.5.0" = { name = "mdns-js"; packageName = "mdns-js"; @@ -20178,6 +20303,15 @@ let sha512 = "QKs47bslvOE0NbXOqG6lMxn6Bk0Iuw0vfrIeLykmQle2LkCw1p48dZDdzE+D88b/xqRJcZGcMNeDvSVma+NuIQ=="; }; }; + "mem-4.0.0" = { + name = "mem"; + packageName = "mem"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mem/-/mem-4.0.0.tgz"; + sha512 = "WQxG/5xYc3tMbYLXoXPm81ET2WDULiU5FxbuIoNbJqLOOI8zehXFdZuiUEgfdrU2mVB1pxBZUGlYORSrpuJreA=="; + }; + }; "mem-fs-1.1.3" = { name = "mem-fs"; packageName = "mem-fs"; @@ -20286,6 +20420,15 @@ let sha512 = "xcSBHD5Z86zaOc+781KrupuHAzeGXSLtiAOmBsiLDiPSaYSB6hdew2ng9EBAnZ62jagG9MHAOdxpDi/lWBFJ/A=="; }; }; + "meow-5.0.0" = { + name = "meow"; + packageName = "meow"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/meow/-/meow-5.0.0.tgz"; + sha512 = "CbTqYU17ABaLefO8vCU153ZZlprKYWDljcndKKDCFcYQITzWCXZAVk4QMFZPgvzrnUQ3uItnIE/LoUOwrT15Ig=="; + }; + }; "merge-1.2.0" = { name = "merge"; packageName = "merge"; @@ -20682,15 +20825,6 @@ let sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; }; }; - "minimist-0.1.0" = { - name = "minimist"; - packageName = "minimist"; - version = "0.1.0"; - src = fetchurl { - url = "http://registry.npmjs.org/minimist/-/minimist-0.1.0.tgz"; - sha1 = "99df657a52574c21c9057497df742790b2b4c0de"; - }; - }; "minimist-0.2.0" = { name = "minimist"; packageName = "minimist"; @@ -20948,7 +21082,7 @@ let packageName = "mongodb"; version = "1.2.14"; src = fetchurl { - url = "https://registry.npmjs.org/mongodb/-/mongodb-1.2.14.tgz"; + url = "http://registry.npmjs.org/mongodb/-/mongodb-1.2.14.tgz"; sha1 = "269665552066437308d0942036646e6795c3a9a3"; }; }; @@ -20997,13 +21131,13 @@ let sha1 = "5fd818398c6819cba28a7cd6664f292fe1c0bbf2"; }; }; - "morgan-1.9.0" = { + "morgan-1.9.1" = { name = "morgan"; packageName = "morgan"; - version = "1.9.0"; + version = "1.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/morgan/-/morgan-1.9.0.tgz"; - sha1 = "d01fa6c65859b76fcf31b3cb53a3821a311d8051"; + url = "https://registry.npmjs.org/morgan/-/morgan-1.9.1.tgz"; + sha512 = "HQStPIV4y3afTiCYVxirakhlCfGkI161c76kKFca7Fk1JusM//Qeo1ej2XaMniiNeaZklMVrh3vTtIzpzwbpmA=="; }; }; "move-concurrently-1.0.1" = { @@ -21060,13 +21194,13 @@ let sha1 = "fbbdc28cb0207e49b8a4eb1a4c0cea6c2de794c8"; }; }; - "mqtt-2.18.5" = { + "mqtt-2.18.8" = { name = "mqtt"; packageName = "mqtt"; - version = "2.18.5"; + version = "2.18.8"; src = fetchurl { - url = "https://registry.npmjs.org/mqtt/-/mqtt-2.18.5.tgz"; - sha512 = "VkQeH81VIS0nOL3Ilf58ypPtM3I6VzVsE5as+k/AgrnX7xjcrCSfgSJdYGa6rW3px4DLAnh2gCD3URUZ23riKQ=="; + url = "https://registry.npmjs.org/mqtt/-/mqtt-2.18.8.tgz"; + sha512 = "3h6oHlPY/yWwtC2J3geraYRtVVoRM6wdI+uchF4nvSSafXPZnaKqF8xnX+S22SU/FcgEAgockVIlOaAX3fkMpA=="; }; }; "mqtt-packet-5.6.0" = { @@ -21159,13 +21293,13 @@ let sha1 = "400515e05b1924889cb61a1ec6054290a68e1207"; }; }; - "ms-rest-2.3.6" = { + "ms-rest-2.3.7" = { name = "ms-rest"; packageName = "ms-rest"; - version = "2.3.6"; + version = "2.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/ms-rest/-/ms-rest-2.3.6.tgz"; - sha512 = "M+Lx9P7Wy4TeAk7jqPLwGS1QS1gvxF6Xo+OHv5j1g3Kcb44T/GTUuSjxTKarF6aKyeacZH1ZD++Nt7pcql7dDA=="; + url = "https://registry.npmjs.org/ms-rest/-/ms-rest-2.3.7.tgz"; + sha512 = "zZwuckC/Uv8F1Jr1bW+U1tsDTErWhtH6W4mpxvRrta4YrKwkFeLMt53RsaDOWTqMFsVpjNuCfznV1uxeGUF3/g=="; }; }; "ms-rest-azure-1.15.7" = { @@ -21177,13 +21311,13 @@ let sha1 = "8bce09f053b1565dbaa8bd022ca40155c35b0fde"; }; }; - "ms-rest-azure-2.5.7" = { + "ms-rest-azure-2.5.9" = { name = "ms-rest-azure"; packageName = "ms-rest-azure"; - version = "2.5.7"; + version = "2.5.9"; src = fetchurl { - url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-2.5.7.tgz"; - sha512 = "e4lgB0z29Dx4ufu/c+PmEAYY1WXq98GYUBkE+iRx7WsxsN04lrM3B1vj8y+B8rKt7clPUE0niqB9VovVL8zvag=="; + url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-2.5.9.tgz"; + sha512 = "qonobzWLS7Jl6qwgTuA/SfyCtnv7olvCRKrcF8nzXSj68ds4Oj3K64ntzgQajroKa0hKVMcPUFbTk1IYMGvu8w=="; }; }; "msgpack-1.0.2" = { @@ -21213,6 +21347,15 @@ let sha512 = "JHdEoxkA/5NgZRo91RNn4UT+HdcJV9XUo01DTkKC7vo1erNIngtuaw9Y0WI8RdTlyi+wMIbunflhghzVLuGJyw=="; }; }; + "multer-1.4.0" = { + name = "multer"; + packageName = "multer"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/multer/-/multer-1.4.0.tgz"; + sha512 = "/JATgsDPdb/D9u8A2dFD8MhZYqgDKrWibpA9etSUt8CVzSHtsA13Y8LH9pR2/crsaYFua9g29UBgZB/g6nmOEg=="; + }; + }; "multi-random-access-2.1.1" = { name = "multi-random-access"; packageName = "multi-random-access"; @@ -21222,13 +21365,13 @@ let sha1 = "6462f1b204109ccc644601650110a828443d66e2"; }; }; - "multiblob-1.13.0" = { + "multiblob-1.13.1" = { name = "multiblob"; packageName = "multiblob"; - version = "1.13.0"; + version = "1.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/multiblob/-/multiblob-1.13.0.tgz"; - sha1 = "e284d5e4a944e724bee2e3896cb3007f069a41bb"; + url = "https://registry.npmjs.org/multiblob/-/multiblob-1.13.1.tgz"; + sha512 = "AvU9tbDqf3TxYgF1ldo3nVz4HoKI/ZDJBo/znLc6KCRiqr7dQv5vW3i3xh0JKZdLzgKG9JpUiKtwB8E92gn3ZQ=="; }; }; "multiblob-http-0.4.2" = { @@ -21245,7 +21388,7 @@ let packageName = "multicast-dns"; version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-4.0.1.tgz"; + url = "http://registry.npmjs.org/multicast-dns/-/multicast-dns-4.0.1.tgz"; sha1 = "abf022fc866727055a9e0c2bc98097f5ebad97a2"; }; }; @@ -21258,13 +21401,13 @@ let sha512 = "ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g=="; }; }; - "multicast-dns-7.0.1" = { + "multicast-dns-7.2.0" = { name = "multicast-dns"; packageName = "multicast-dns"; - version = "7.0.1"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.0.1.tgz"; - sha512 = "jx8bO2QZvx5oJXWhiuEb6I8XgufpPXvKFSAoSvurD2nECVhbQQTilY33IfChreWqhqPgzKZbpgsyHapjnRTnlw=="; + url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.0.tgz"; + sha512 = "Tu2QORGOFANB124NWQ/JTRhMf/ODouVLEuvu5Dz8YWEU55zQgRgFGnBHfIh5PbfNDAuaRl7yLB+pgWhSqVxi2Q=="; }; }; "multicast-dns-service-types-1.1.0" = { @@ -21312,13 +21455,13 @@ let sha1 = "35de6804dc19643e5249f3d3e3bdc6c8ce301d3f"; }; }; - "multiparty-4.1.4" = { + "multiparty-4.2.1" = { name = "multiparty"; packageName = "multiparty"; - version = "4.1.4"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/multiparty/-/multiparty-4.1.4.tgz"; - sha1 = "4c96dcbdc11e3f7917e1615e640b4b5022be64fd"; + url = "https://registry.npmjs.org/multiparty/-/multiparty-4.2.1.tgz"; + sha512 = "AvESCnNoQlZiOfP9R4mxN8M9csy2L16EIbWIkt3l4FuGti9kXBS8QVzlfyg4HEnarJhrzZilgNFlZtqmoiAIIA=="; }; }; "multipipe-0.1.2" = { @@ -21330,13 +21473,13 @@ let sha1 = "2a8f2ddf70eed564dff2d57f1e1a137d9f05078b"; }; }; - "multiserver-1.13.3" = { + "multiserver-1.13.5" = { name = "multiserver"; packageName = "multiserver"; - version = "1.13.3"; + version = "1.13.5"; src = fetchurl { - url = "https://registry.npmjs.org/multiserver/-/multiserver-1.13.3.tgz"; - sha512 = "9x0bO59YVcfT1jNIBcqz1SUI+mPxQWjjPOTzmLew/VS17yot3JOXLloK6g1+ky+uj+AHqRhKfm1zUFMKhlfqWg=="; + url = "https://registry.npmjs.org/multiserver/-/multiserver-1.13.5.tgz"; + sha512 = "1bxts3gFkHKJsGAaWR9D4nFLVH995eiEt38n/jPf1dni/FI0o6PH3hlar3ge/bMs58FX/T+DzrGNXZhEkMVFqA=="; }; }; "multistream-2.1.1" = { @@ -21375,13 +21518,13 @@ let sha1 = "5041049269c96633c866386960b2f4289e75e5b0"; }; }; - "mustache-2.3.1" = { + "mustache-2.3.2" = { name = "mustache"; packageName = "mustache"; - version = "2.3.1"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/mustache/-/mustache-2.3.1.tgz"; - sha512 = "20dW38oeiTzauvbxs1YxQbr3gbu/Lfo15J4V0EqbspYnn/GwSeTSDNtESy2nak28BW0k8qp7dnrFhrsejLPUtw=="; + url = "https://registry.npmjs.org/mustache/-/mustache-2.3.2.tgz"; + sha512 = "KpMNwdQsYz3O/SBS1qJ/o3sqUJ5wSb8gb0pul8CO0S56b9Y2ALm8zCfsjPXsqGFfoNBkDwZuZIAjhsZI03gYVQ=="; }; }; "mutate.js-0.2.0" = { @@ -21555,22 +21698,22 @@ let sha1 = "4f3152e09540fde28c76f44b19bbcd1d5a42478d"; }; }; - "nanobus-4.3.3" = { + "nanobus-4.3.4" = { name = "nanobus"; packageName = "nanobus"; - version = "4.3.3"; + version = "4.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/nanobus/-/nanobus-4.3.3.tgz"; - sha512 = "4/uzl+LkMGoVv/9eMzH2QFvefmlJErT0KR7EmuYbmht2QvxSEqTjhFFOZ/KHE6chH58fKL3njrOcEwbYV0h9Yw=="; + url = "https://registry.npmjs.org/nanobus/-/nanobus-4.3.4.tgz"; + sha512 = "N1IBreECNaxmsaOLMqqm01K7XIp+sMvoVX8mvmT/p1VjM2FLcBU0lj0FalKooi2/2i+ph9WsEoEogOJevqQ6LQ=="; }; }; - "nanoid-1.2.2" = { + "nanoid-1.2.4" = { name = "nanoid"; packageName = "nanoid"; - version = "1.2.2"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-1.2.2.tgz"; - sha512 = "o4eK+NomkjYEn6cN9rImXMz1st/LdRP+tricKyoH834ikDwp/M/PJlYWTd7E7/OhvObzLJpuuVvwjg+jDpD4hA=="; + url = "https://registry.npmjs.org/nanoid/-/nanoid-1.2.4.tgz"; + sha512 = "VbM1HbXvDxZhcONUEJ0olXwg5MgOWS89KPL0PlchtB9NJ2dOTva64RR3fypJuEMQffJ7b1rjcPyR39SsV2W5PA=="; }; }; "nanolru-1.0.0" = { @@ -21667,13 +21810,13 @@ let sha1 = "20a318c30cb45f71fe7adfbf7b21c99c1472ef11"; }; }; - "natives-1.1.4" = { + "natives-1.1.5" = { name = "natives"; packageName = "natives"; - version = "1.1.4"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/natives/-/natives-1.1.4.tgz"; - sha512 = "Q29yeg9aFKwhLVdkTAejM/HvYG0Y1Am1+HUkFQGn5k2j8GS+v60TVmZh6nujpEAj/qql+wGUrlryO8bF+b1jEg=="; + url = "https://registry.npmjs.org/natives/-/natives-1.1.5.tgz"; + sha512 = "1pJ+02gl2KJgCPFtpZGtuD4lGSJnIZvvFHCQTOeDRMSXjfu2GmYWuhI8NFMA4W2I5NNFRbfy/YCiVt4CgNpP8A=="; }; }; "natural-compare-1.4.0" = { @@ -21726,7 +21869,7 @@ let packageName = "ncp"; version = "0.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz"; + url = "http://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz"; sha1 = "abcc6cbd3ec2ed2a729ff6e7c1fa8f01784a8574"; }; }; @@ -21735,7 +21878,7 @@ let packageName = "ncp"; version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/ncp/-/ncp-1.0.1.tgz"; + url = "http://registry.npmjs.org/ncp/-/ncp-1.0.1.tgz"; sha1 = "d15367e5cb87432ba117d2bf80fdf45aecfb4246"; }; }; @@ -21744,7 +21887,7 @@ let packageName = "ncp"; version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz"; + url = "http://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz"; sha1 = "195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"; }; }; @@ -21807,7 +21950,7 @@ let packageName = "needle"; version = "0.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/needle/-/needle-0.10.0.tgz"; + url = "http://registry.npmjs.org/needle/-/needle-0.10.0.tgz"; sha1 = "16a24d63f2a61152eb74cce1d12af85c507577d4"; }; }; @@ -21816,17 +21959,17 @@ let packageName = "needle"; version = "0.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/needle/-/needle-0.11.0.tgz"; + url = "http://registry.npmjs.org/needle/-/needle-0.11.0.tgz"; sha1 = "02a71b008eaf7d55ae89fb9fd7685b7b88d7bc29"; }; }; - "needle-2.2.2" = { + "needle-2.2.4" = { name = "needle"; packageName = "needle"; - version = "2.2.2"; + version = "2.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/needle/-/needle-2.2.2.tgz"; - sha512 = "mW7W8dKuVYefCpNzE3Z7xUmPI9wSrSL/1qH31YGMxmSOAnjatS3S9Zv3cmiHrhx3Jkp1SrWWBdOFXjfF48Uq3A=="; + url = "https://registry.npmjs.org/needle/-/needle-2.2.4.tgz"; + sha512 = "HyoqEb4wr/rsoaIDfTH2aVL9nWtQqba2/HvMv+++m8u0dz808MaagKILxtfeSN7QU7nvbQ79zk3vYOJp9zsNEA=="; }; }; "negotiator-0.3.0" = { @@ -21875,15 +22018,6 @@ let sha512 = "vdqTKI9GBIYcAEbFAcpKPErKINfPF5zIuz3/niBfq8WUZjpT2tytLlFVrBgWdOtqI4uaA/Rb6No0hux39XXDuw=="; }; }; - "nested-error-stacks-1.0.2" = { - name = "nested-error-stacks"; - packageName = "nested-error-stacks"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-1.0.2.tgz"; - sha1 = "19f619591519f096769a5ba9a86e6eeec823c3cf"; - }; - }; "net-browserify-alt-1.1.0" = { name = "net-browserify-alt"; packageName = "net-browserify-alt"; @@ -21992,13 +22126,13 @@ let sha512 = "rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ=="; }; }; - "node-abi-2.4.3" = { + "node-abi-2.4.4" = { name = "node-abi"; packageName = "node-abi"; - version = "2.4.3"; + version = "2.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/node-abi/-/node-abi-2.4.3.tgz"; - sha512 = "b656V5C0628gOOA2kwcpNA/bxdlqYF9FvxJ+qqVX0ctdXNVZpS8J6xEUYir3WAKc7U0BH/NRlSpNbGsy+azjeg=="; + url = "https://registry.npmjs.org/node-abi/-/node-abi-2.4.4.tgz"; + sha512 = "DQ9Mo2mf/XectC+s6+grPPRQ1Z9gI3ZbrGv6nyXRkjwT3HrE0xvtvrfnH7YHYBLgC/KLadg+h3XHnhZw1sv88A=="; }; }; "node-alias-1.0.4" = { @@ -22181,13 +22315,13 @@ let sha512 = "+tqda0bNT8A0PM9G47XqFiUP9gEe1zvB/9f+JJhbLWTEk9TeRB4UeyycubmCbR1/TzJnk2v9yCDogFhDJQWbOw=="; }; }; - "node-red-node-feedparser-0.1.12" = { + "node-red-node-feedparser-0.1.14" = { name = "node-red-node-feedparser"; packageName = "node-red-node-feedparser"; - version = "0.1.12"; + version = "0.1.14"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-feedparser/-/node-red-node-feedparser-0.1.12.tgz"; - sha512 = "kwo7k7pXhl9wANXqgQTRo1WqxyrpJFelvZ2u9EnKfDA2yKrsZq0ZeYB8BDc/uVIycqh8XEJeX44EnAHkidddvQ=="; + url = "https://registry.npmjs.org/node-red-node-feedparser/-/node-red-node-feedparser-0.1.14.tgz"; + sha512 = "Bb9M5bFrOqoFxBVxfstBM/g+VPaV4EPQptXQBMrlsCd3P40CXcGL0mDylXU+3cekWNd5hLHfqTHvXJdkowHGDw=="; }; }; "node-red-node-rbe-0.2.3" = { @@ -22226,13 +22360,13 @@ let sha1 = "2d6ba8e7eff9bf5b338564f91f7ac5d5cdddc55b"; }; }; - "node-static-0.7.10" = { + "node-static-0.7.11" = { name = "node-static"; packageName = "node-static"; - version = "0.7.10"; + version = "0.7.11"; src = fetchurl { - url = "https://registry.npmjs.org/node-static/-/node-static-0.7.10.tgz"; - sha512 = "bd7zO5hvCWzdglgwz9t82T4mYTEUzEG5pXnSqEzitvmEacusbhl8/VwuCbMaYR9g2PNK5191yBtAEQLJEmQh1A=="; + url = "https://registry.npmjs.org/node-static/-/node-static-0.7.11.tgz"; + sha512 = "zfWC/gICcqb74D9ndyvxZWaI1jzcoHmf4UTHWQchBNuNMxdBLJMDiUgZ1tjGLEIe/BMhj2DxKD8HOuc2062pDQ=="; }; }; "node-swt-0.1.1" = { @@ -22433,15 +22567,6 @@ let sha1 = "2aa09b7d1768487b3b89a9c5aa52335bff0baea7"; }; }; - "nopt-3.0.1" = { - name = "nopt"; - packageName = "nopt"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/nopt/-/nopt-3.0.1.tgz"; - sha1 = "bce5c42446a3291f47622a370abbf158fbbacbfd"; - }; - }; "nopt-3.0.6" = { name = "nopt"; packageName = "nopt"; @@ -23199,13 +23324,13 @@ let sha1 = "067428230fd67443b2794b22bba528b6867962d4"; }; }; - "ono-4.0.7" = { + "ono-4.0.8" = { name = "ono"; packageName = "ono"; - version = "4.0.7"; + version = "4.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/ono/-/ono-4.0.7.tgz"; - sha512 = "FJiGEETwfSVyOwVTwQZD7XN69FRekvgtlobtvPwtilc7PxIHg3gKUykdNP7E9mC/VTF2cxqKZxUZfNKA3MuQLA=="; + url = "https://registry.npmjs.org/ono/-/ono-4.0.8.tgz"; + sha512 = "x7IM7JLrarP9WxfjDHTBs6io1D1ixEZnhKqnjMnwz+9waPZSapkGYe7jBAqnMTL+HAMfsN6rSHW3Pi+C/9dyjg=="; }; }; "open-0.0.2" = { @@ -23235,13 +23360,22 @@ let sha512 = "XAe80GycLe2yRGnJsUtt+EO5lk06XYRQt4kJJe53O2kJHPZJOZ+XMF/b47HW96e6LhfKVpwnXVr/s56jhV98jg=="; }; }; - "opener-1.4.2" = { + "opener-1.4.3" = { name = "opener"; packageName = "opener"; - version = "1.4.2"; + version = "1.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/opener/-/opener-1.4.2.tgz"; - sha1 = "b32582080042af8680c389a499175b4c54fff523"; + url = "https://registry.npmjs.org/opener/-/opener-1.4.3.tgz"; + sha1 = "5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8"; + }; + }; + "opener-1.5.1" = { + name = "opener"; + packageName = "opener"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/opener/-/opener-1.5.1.tgz"; + sha512 = "goYSy5c2UXE4Ra1xixabeVh1guIX/ZV/YokJksb6q2lubWu6UbvPQ20p542/sFIll1nl8JnCyK9oBaOcCWXwvA=="; }; }; "openid-2.0.6" = { @@ -23285,10 +23419,28 @@ let packageName = "opn"; version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/opn/-/opn-5.3.0.tgz"; + url = "http://registry.npmjs.org/opn/-/opn-5.3.0.tgz"; sha512 = "bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g=="; }; }; + "opn-5.4.0" = { + name = "opn"; + packageName = "opn"; + version = "5.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/opn/-/opn-5.4.0.tgz"; + sha512 = "YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw=="; + }; + }; + "optimism-0.6.6" = { + name = "optimism"; + packageName = "optimism"; + version = "0.6.6"; + src = fetchurl { + url = "https://registry.npmjs.org/optimism/-/optimism-0.6.6.tgz"; + sha512 = "1Y6LY7pYbXP5y6yeXYfXhxJi9hsxYAZWpt7bBp4seAwfcYtaN7tq9wot/pdrhyI809/K4gDm3BcZcEkmwGevjg=="; + }; + }; "optimist-0.2.8" = { name = "optimist"; packageName = "optimist"; @@ -23460,6 +23612,15 @@ let sha512 = "4mi6ZXIp4OtcV/Bwzl9p9Cvae7KJv/czGIm/HK0iaXCuRh7BMpy4l4o4CLjN+atsRQpCW9Rs4FdhfnK0zaR1Jg=="; }; }; + "os-locale-3.0.1" = { + name = "os-locale"; + packageName = "os-locale"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/os-locale/-/os-locale-3.0.1.tgz"; + sha512 = "7g5e7dmXPtzcP4bgsZ8ixDVqA7oWYuEz4lOSujeWyliPai4gfVDiFIcwBg3aGCPnmSGfzOKTK3ccPn0CKv3DBw=="; + }; + }; "os-name-1.0.3" = { name = "os-name"; packageName = "os-name"; @@ -23546,10 +23707,19 @@ let packageName = "p-cancelable"; version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.1.tgz"; + url = "http://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.1.tgz"; sha512 = "HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ=="; }; }; + "p-defer-1.0.0" = { + name = "p-defer"; + packageName = "p-defer"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz"; + sha1 = "9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"; + }; + }; "p-finally-1.0.0" = { name = "p-finally"; packageName = "p-finally"; @@ -23564,7 +23734,7 @@ let packageName = "p-is-promise"; version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz"; + url = "http://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz"; sha1 = "9c9456989e9f6588017b0434d56097675c3da05e"; }; }; @@ -23712,15 +23882,6 @@ let sha512 = "tcc38bsjuE3XZ5+4vP96OfhOugrX+JcnpUbhfuc4LuXBLQhoTthOstZeoQJBDnQUDYzYmdImKsbz0xSl1/9qeA=="; }; }; - "package-json-1.2.0" = { - name = "package-json"; - packageName = "package-json"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/package-json/-/package-json-1.2.0.tgz"; - sha1 = "c8ecac094227cdf76a316874ed05e27cc939a0e0"; - }; - }; "package-json-4.0.1" = { name = "package-json"; packageName = "package-json"; @@ -23843,17 +24004,17 @@ let packageName = "parse-asn1"; version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz"; + url = "http://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz"; sha512 = "KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw=="; }; }; - "parse-entities-1.1.2" = { + "parse-entities-1.2.0" = { name = "parse-entities"; packageName = "parse-entities"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/parse-entities/-/parse-entities-1.1.2.tgz"; - sha512 = "5N9lmQ7tmxfXf+hO3X6KRG6w7uYO/HL9fHalSySTdyn63C3WNvTM/1R8tn1u1larNcEbo3Slcy2bsVDQqvEpUg=="; + url = "https://registry.npmjs.org/parse-entities/-/parse-entities-1.2.0.tgz"; + sha512 = "XXtDdOPLSB0sHecbEapQi6/58U/ODj/KWfIXmmMCJF/eRn8laX6LZbOyioMoETOOJoWRW8/qTSl5VQkUIfKM5g=="; }; }; "parse-filepath-1.0.2" = { @@ -24306,13 +24467,13 @@ let sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40"; }; }; - "path-loader-1.0.8" = { + "path-loader-1.0.9" = { name = "path-loader"; packageName = "path-loader"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/path-loader/-/path-loader-1.0.8.tgz"; - sha512 = "/JQCrTcrteaPB8IHefEAQbmBQReKj51A+yTyc745TBbO4FOySw+/l3Rh0zyad0Nrd87TMROlmFANQwCRsuvN4w=="; + url = "https://registry.npmjs.org/path-loader/-/path-loader-1.0.9.tgz"; + sha512 = "pD37gArtr+/72Tst9oJoDB9k7gB9A09Efj7yyBi5HDUqaxqULXBWW8Rnw2TfNF+3sN7QZv0ZNdW1Qx2pFGW5Jg=="; }; }; "path-parse-1.0.6" = { @@ -24446,17 +24607,17 @@ let packageName = "pause-stream"; version = "0.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz"; + url = "http://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz"; sha1 = "fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445"; }; }; - "pbkdf2-3.0.16" = { + "pbkdf2-3.0.17" = { name = "pbkdf2"; packageName = "pbkdf2"; - version = "3.0.16"; + version = "3.0.17"; src = fetchurl { - url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.16.tgz"; - sha512 = "y4CXP3thSxqf7c0qmOF+9UeOTrifiVTIM+u7NWlq+PRsHbr7r7dpCmvzrZxa96JJUNi0Y5w9VqG5ZNeCVMoDcA=="; + url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz"; + sha512 = "U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA=="; }; }; "peer-wire-protocol-0.7.1" = { @@ -24491,7 +24652,7 @@ let packageName = "pegjs"; version = "0.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/pegjs/-/pegjs-0.10.0.tgz"; + url = "http://registry.npmjs.org/pegjs/-/pegjs-0.10.0.tgz"; sha1 = "cf8bafae6eddff4b5a7efb185269eaaf4610ddbd"; }; }; @@ -24780,7 +24941,7 @@ let packageName = "po2json"; version = "0.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/po2json/-/po2json-0.4.5.tgz"; + url = "http://registry.npmjs.org/po2json/-/po2json-0.4.5.tgz"; sha1 = "47bb2952da32d58a1be2f256a598eebc0b745118"; }; }; @@ -25000,22 +25161,22 @@ let sha1 = "c438ca2ca33e3927671db4ab69c0e52f936a4f0f"; }; }; - "prisma-json-schema-0.0.4" = { + "prisma-json-schema-0.1.1" = { name = "prisma-json-schema"; packageName = "prisma-json-schema"; - version = "0.0.4"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/prisma-json-schema/-/prisma-json-schema-0.0.4.tgz"; - sha512 = "NTbourUhkmhM18rrcnp+IdxTdWftUsepZcNX2QntOqkOOwccYADmmZJpTr9tuvCYsW3i48B8LVEwvm0v1pAhxQ=="; + url = "https://registry.npmjs.org/prisma-json-schema/-/prisma-json-schema-0.1.1.tgz"; + sha512 = "epi2cDTQu/xk//H79dqRIzqk9ZEEqgcvHR7M/UhG/9UcSYY3OP/tJKDj5AYk86Xt2p5muDp3+y8ZGVNGZVQgNw=="; }; }; - "prisma-yml-1.0.50" = { + "prisma-yml-1.0.93" = { name = "prisma-yml"; packageName = "prisma-yml"; - version = "1.0.50"; + version = "1.0.93"; src = fetchurl { - url = "https://registry.npmjs.org/prisma-yml/-/prisma-yml-1.0.50.tgz"; - sha512 = "Vpt6q+YzS6yozMnIPU75hlHzmDR1Hj4Z3FXaazJrOXUyeQx/xDqeEwRJ+ii4xl/GRYiFnMEVSLfsPzjLehA1Zw=="; + url = "https://registry.npmjs.org/prisma-yml/-/prisma-yml-1.0.93.tgz"; + sha512 = "np7VXqA4t+qhmn2GXGIOL19IMWSyrI1T8uJH8Lrla9uslvSxch6bzarYcQgKsc+sTL/g1zbvNgRl19cr/CUuNQ=="; }; }; "prismjs-1.15.0" = { @@ -25036,13 +25197,13 @@ let sha512 = "VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg=="; }; }; - "private-box-0.2.1" = { + "private-box-0.3.0" = { name = "private-box"; packageName = "private-box"; - version = "0.2.1"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/private-box/-/private-box-0.2.1.tgz"; - sha1 = "1df061afca5b3039c7feaadd0daf0f56f07e3ec0"; + url = "https://registry.npmjs.org/private-box/-/private-box-0.3.0.tgz"; + sha512 = "zsK6DDEC+cnNiunYamcVbx4ZCLbKnzTOZa09K4Pj3/tH3nQFPUO9K2QoYy4kfxLqmoyw6RPDtACN9OYviMQZ2Q=="; }; }; "probe-image-size-4.0.0" = { @@ -25122,7 +25283,7 @@ let packageName = "promiscuous"; version = "0.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/promiscuous/-/promiscuous-0.6.0.tgz"; + url = "http://registry.npmjs.org/promiscuous/-/promiscuous-0.6.0.tgz"; sha1 = "54014cd3d62cafe831e3354990c05ff5b78c8892"; }; }; @@ -25131,7 +25292,7 @@ let packageName = "promise"; version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/promise/-/promise-2.0.0.tgz"; + url = "http://registry.npmjs.org/promise/-/promise-2.0.0.tgz"; sha1 = "46648aa9d605af5d2e70c3024bf59436da02b80e"; }; }; @@ -25140,7 +25301,7 @@ let packageName = "promise"; version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/promise/-/promise-6.1.0.tgz"; + url = "http://registry.npmjs.org/promise/-/promise-6.1.0.tgz"; sha1 = "2ce729f6b94b45c26891ad0602c5c90e04c6eef6"; }; }; @@ -25347,7 +25508,7 @@ let packageName = "proxy-agent"; version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/proxy-agent/-/proxy-agent-2.3.1.tgz"; + url = "http://registry.npmjs.org/proxy-agent/-/proxy-agent-2.3.1.tgz"; sha512 = "CNKuhC1jVtm8KJYFTS2ZRO71VCBx3QSA92So/e6NrY6GoJonkx3Irnk4047EsCcswczwqAekRj3s8qLRGahSKg=="; }; }; @@ -25437,7 +25598,7 @@ let packageName = "public-encrypt"; version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.2.tgz"; + url = "http://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.2.tgz"; sha512 = "4kJ5Esocg8X3h8YgJsKAuoesBgB7mqH3eowiDzMUPKiRDDE7E/BqqZD1hnTByIaAFiwAw246YEltSq7tdrOH0Q=="; }; }; @@ -25932,7 +26093,7 @@ let packageName = "pull-sink-through"; version = "0.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/pull-sink-through/-/pull-sink-through-0.0.0.tgz"; + url = "http://registry.npmjs.org/pull-sink-through/-/pull-sink-through-0.0.0.tgz"; sha1 = "d3c0492f3a80b4ed204af67c4b4f935680fc5b1f"; }; }; @@ -25945,12 +26106,21 @@ let sha1 = "95d0c60ce6ea9c8bab8ca0b16e1f518352ed4e4f"; }; }; + "pull-sort-1.0.1" = { + name = "pull-sort"; + packageName = "pull-sort"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-sort/-/pull-sort-1.0.1.tgz"; + sha1 = "a8ab0c70c86f45343c9accc939fc42769ad3dc6d"; + }; + }; "pull-stream-2.27.0" = { name = "pull-stream"; packageName = "pull-stream"; version = "2.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/pull-stream/-/pull-stream-2.27.0.tgz"; + url = "http://registry.npmjs.org/pull-stream/-/pull-stream-2.27.0.tgz"; sha1 = "fdf0eb910cdc4041d65956c00bee30dbbd00a068"; }; }; @@ -25959,7 +26129,7 @@ let packageName = "pull-stream"; version = "2.28.4"; src = fetchurl { - url = "https://registry.npmjs.org/pull-stream/-/pull-stream-2.28.4.tgz"; + url = "http://registry.npmjs.org/pull-stream/-/pull-stream-2.28.4.tgz"; sha1 = "7ea97413c1619c20bc3bdf9e10e91347b03253e4"; }; }; @@ -25968,7 +26138,7 @@ let packageName = "pull-stream"; version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.5.0.tgz"; + url = "http://registry.npmjs.org/pull-stream/-/pull-stream-3.5.0.tgz"; sha1 = "1ee5b6f76fd3b3a49a5afb6ded5c0320acb3cfc7"; }; }; @@ -25995,7 +26165,7 @@ let packageName = "pull-stringify"; version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/pull-stringify/-/pull-stringify-1.2.2.tgz"; + url = "http://registry.npmjs.org/pull-stringify/-/pull-stringify-1.2.2.tgz"; sha1 = "5a1c34e0075faf2f2f6d46004e36dccd33bd7c7c"; }; }; @@ -26134,13 +26304,13 @@ let sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; }; }; - "push-stream-10.0.3" = { + "push-stream-10.0.4" = { name = "push-stream"; packageName = "push-stream"; - version = "10.0.3"; + version = "10.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/push-stream/-/push-stream-10.0.3.tgz"; - sha1 = "13d6aef4b506c65bbc3aa62409a8da6ce147ef87"; + url = "https://registry.npmjs.org/push-stream/-/push-stream-10.0.4.tgz"; + sha512 = "IrP96RziNzT4UR7ZffM26o2NQ/Dq0dlRi1p8S/HE4+pHF6OaKWS1DyaJevsxJ6Q8bHafLqin6/pwI36FCmiV0w=="; }; }; "push-stream-to-pull-stream-1.0.3" = { @@ -26539,13 +26709,13 @@ let sha1 = "f49be6b487894ddc40dcc94a322f611092e00d5e"; }; }; - "range-slice-stream-1.2.0" = { + "range-slice-stream-2.0.0" = { name = "range-slice-stream"; packageName = "range-slice-stream"; - version = "1.2.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/range-slice-stream/-/range-slice-stream-1.2.0.tgz"; - sha1 = "01ba954276052b783900e63d6118d8fcf3875d7f"; + url = "https://registry.npmjs.org/range-slice-stream/-/range-slice-stream-2.0.0.tgz"; + sha512 = "PPYLwZ63lXi6Tv2EZ8w3M4FzC0rVqvxivaOVS8pXSp5FMIHFnvi4MWHL3UdFLhwSy50aNtJsgjY0mBC6oFL26Q=="; }; }; "raven-js-3.26.4" = { @@ -26629,15 +26799,6 @@ let sha1 = "ce24a2029ad94c3a40d09604a87227027d7210d3"; }; }; - "rc-0.5.5" = { - name = "rc"; - packageName = "rc"; - version = "0.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/rc/-/rc-0.5.5.tgz"; - sha1 = "541cc3300f464b6dfe6432d756f0f2dd3e9eb199"; - }; - }; "rc-1.2.8" = { name = "rc"; packageName = "rc"; @@ -26674,13 +26835,13 @@ let sha1 = "b3da19bd052431a97671d44a42634adf710b40c4"; }; }; - "read-all-stream-3.1.0" = { - name = "read-all-stream"; - packageName = "read-all-stream"; - version = "3.1.0"; + "read-chunk-2.1.0" = { + name = "read-chunk"; + packageName = "read-chunk"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz"; - sha1 = "35c3e177f2078ef789ee4bfafa4373074eaef4fa"; + url = "https://registry.npmjs.org/read-chunk/-/read-chunk-2.1.0.tgz"; + sha1 = "6a04c0928005ed9d42e1a6ac5600e19cbc7ff655"; }; }; "read-cmd-shim-1.0.1" = { @@ -26805,7 +26966,7 @@ let packageName = "readable-stream"; version = "1.0.27-1"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.27-1.tgz"; + url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.27-1.tgz"; sha1 = "6b67983c20357cefd07f0165001a16d710d91078"; }; }; @@ -26814,7 +26975,7 @@ let packageName = "readable-stream"; version = "1.0.34"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz"; + url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz"; sha1 = "125820e34bc842d2f2aaafafe4c2916ee32c157c"; }; }; @@ -26823,7 +26984,7 @@ let packageName = "readable-stream"; version = "1.1.14"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz"; + url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz"; sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9"; }; }; @@ -26832,7 +26993,7 @@ let packageName = "readable-stream"; version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"; + url = "http://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"; sha1 = "8f90341e68a53ccc928788dacfcd11b36eb9b78e"; }; }; @@ -26841,17 +27002,17 @@ let packageName = "readable-stream"; version = "2.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz"; + url = "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz"; sha512 = "tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw=="; }; }; - "readable-stream-3.0.2" = { + "readable-stream-3.0.3" = { name = "readable-stream"; packageName = "readable-stream"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.0.2.tgz"; - sha512 = "E3RfQoPuKDBhec0s8fOsgFXDVFlEipbsheGBX/NNByfKMfzPEEQJXcLy6fJ7bDD820HG/d+eXQ1ezCj29KoAJA=="; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.0.3.tgz"; + sha512 = "CzN1eAu5Pmh4EaDlJp1g5E37LIHR24b82XlMWRQlPFjhvOYKa4HhClRsQO21zhdDWUpdWfiKt9/L/ZL2+vwxCw=="; }; }; "readdir-scoped-modules-1.0.2" = { @@ -26863,13 +27024,13 @@ let sha1 = "9fafa37d286be5d92cbaebdee030dc9b5f406747"; }; }; - "readdirp-2.1.0" = { + "readdirp-2.2.1" = { name = "readdirp"; packageName = "readdirp"; - version = "2.1.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz"; - sha1 = "4ed0ad060df3073300c48440373f72d1cc642d78"; + url = "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz"; + sha512 = "1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ=="; }; }; "readline2-0.1.1" = { @@ -26899,13 +27060,13 @@ let sha1 = "451fd3004ab1e4df9b4e4b66376b2a21912462d3"; }; }; - "recast-0.15.3" = { + "recast-0.15.5" = { name = "recast"; packageName = "recast"; - version = "0.15.3"; + version = "0.15.5"; src = fetchurl { - url = "https://registry.npmjs.org/recast/-/recast-0.15.3.tgz"; - sha512 = "xqnagxQH7mL4+UpcCVMObPPdjCEE2dmfGcTwcdpyNgZOd9W0rfdLRF3+smoA+AQqMw6xK6G4021dAQK8XfPYIQ=="; + url = "https://registry.npmjs.org/recast/-/recast-0.15.5.tgz"; + sha512 = "nkAYNqarh73cMWRKFiPQ8I9dOLFvFk6SnG8u/LUlOYfArDOD/EjsVRAs860TlBLrpxqAXHGET/AUAVjdEymL5w=="; }; }; "rechoir-0.6.2" = { @@ -27129,7 +27290,7 @@ let packageName = "relative-url"; version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/relative-url/-/relative-url-1.0.2.tgz"; + url = "http://registry.npmjs.org/relative-url/-/relative-url-1.0.2.tgz"; sha1 = "d21c52a72d6061018bcee9f9c9fc106bf7d65287"; }; }; @@ -27250,15 +27411,6 @@ let sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; }; }; - "repeating-1.1.3" = { - name = "repeating"; - packageName = "repeating"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz"; - sha1 = "3d4114218877537494f97f77f9785fab810fa4ac"; - }; - }; "repeating-2.0.1" = { name = "repeating"; packageName = "repeating"; @@ -27565,6 +27717,15 @@ let sha512 = "pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="; }; }; + "resolve-global-0.1.0" = { + name = "resolve-global"; + packageName = "resolve-global"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-global/-/resolve-global-0.1.0.tgz"; + sha1 = "8fb02cfd5b7db20118e886311f15af95bd15fbd9"; + }; + }; "resolve-options-1.1.0" = { name = "resolve-options"; packageName = "resolve-options"; @@ -27682,6 +27843,15 @@ let sha1 = "e76388d217992c252750241d3d3956fed98d8ff4"; }; }; + "retry-0.12.0" = { + name = "retry"; + packageName = "retry"; + version = "0.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz"; + sha1 = "1b42a6266a21f07421d1b0b54b7dc167b01c013b"; + }; + }; "retry-0.6.0" = { name = "retry"; packageName = "retry"; @@ -27961,13 +28131,13 @@ let sha512 = "xx2itnL5sBbqeeiVgNPVuQQ1nC8Jp2WfNJhXWHmElW9YmrpS9UVnNzhP3EH3HFqexO5Tlp8GhYY+WEcqcVMvGw=="; }; }; - "rxjs-6.3.1" = { + "rxjs-6.3.3" = { name = "rxjs"; packageName = "rxjs"; - version = "6.3.1"; + version = "6.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/rxjs/-/rxjs-6.3.1.tgz"; - sha512 = "hRVfb1Mcf8rLXq1AZEjYpzBnQbO7Duveu1APXkWRTvqzhmkoQ40Pl2F9Btacx+gJCOqsMiugCGG4I2HPQgJRtA=="; + url = "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz"; + sha512 = "JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw=="; }; }; "safe-buffer-5.0.1" = { @@ -28042,13 +28212,13 @@ let sha1 = "612da1c96473fa02dccda92dcd5b4ab164a6772a"; }; }; - "sanitize-html-1.18.4" = { + "sanitize-html-1.19.1" = { name = "sanitize-html"; packageName = "sanitize-html"; - version = "1.18.4"; + version = "1.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.18.4.tgz"; - sha512 = "hjyDYCYrQuhnEjq+5lenLlIfdPBtnZ7z0DkQOC8YGxvkuOInH+1SrkNTj30t4f2/SSv9c5kLniB+uCIpBvYuew=="; + url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.19.1.tgz"; + sha512 = "zNYr6FvBn4bZukr9x2uny6od/9YdjCLwF+FqxivqI0YOt/m9GIxfX+tWhm52tBAPUXiTTb4bJTGVagRz5b06bw=="; }; }; "sax-0.3.5" = { @@ -28056,7 +28226,7 @@ let packageName = "sax"; version = "0.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/sax/-/sax-0.3.5.tgz"; + url = "http://registry.npmjs.org/sax/-/sax-0.3.5.tgz"; sha1 = "88fcfc1f73c0c8bbd5b7c776b6d3f3501eed073d"; }; }; @@ -28065,7 +28235,7 @@ let packageName = "sax"; version = "0.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/sax/-/sax-0.5.2.tgz"; + url = "http://registry.npmjs.org/sax/-/sax-0.5.2.tgz"; sha1 = "735ffaa39a1cff8ffb9598f0223abdb03a9fb2ea"; }; }; @@ -28074,7 +28244,7 @@ let packageName = "sax"; version = "0.5.8"; src = fetchurl { - url = "https://registry.npmjs.org/sax/-/sax-0.5.8.tgz"; + url = "http://registry.npmjs.org/sax/-/sax-0.5.8.tgz"; sha1 = "d472db228eb331c2506b0e8c15524adb939d12c1"; }; }; @@ -28083,7 +28253,7 @@ let packageName = "sax"; version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/sax/-/sax-1.1.4.tgz"; + url = "http://registry.npmjs.org/sax/-/sax-1.1.4.tgz"; sha1 = "74b6d33c9ae1e001510f179a91168588f1aedaa9"; }; }; @@ -28092,7 +28262,7 @@ let packageName = "sax"; version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz"; + url = "http://registry.npmjs.org/sax/-/sax-1.2.1.tgz"; sha1 = "7b8e656190b228e81a66aea748480d828cd2d37a"; }; }; @@ -28132,22 +28302,22 @@ let sha512 = "MuCAyrGZcTLfQoH2XoBlQ8C6bzwN88XT/0slOGz0pn8+gIP85BOAfYa44ZXQUTOwRwPU0QvgU+V+OSajl/59Xg=="; }; }; - "secret-handshake-1.1.13" = { + "secret-handshake-1.1.14" = { name = "secret-handshake"; packageName = "secret-handshake"; - version = "1.1.13"; + version = "1.1.14"; src = fetchurl { - url = "https://registry.npmjs.org/secret-handshake/-/secret-handshake-1.1.13.tgz"; - sha512 = "jDpA1kPJGg+jEUOZGvqksQFGPWIx0aA96HpjU+AqIBKIKzmvZeOq0Lfl/XqVC5jviWTVZZM2B8+NqYR38Blz8A=="; + url = "https://registry.npmjs.org/secret-handshake/-/secret-handshake-1.1.14.tgz"; + sha512 = "e4hiMTahaLiN5XKap1YrifoyT8yRu9yQEZrMTglTBgq8Lv8iChFKLpbmXYeNxy2rCnutuWaQDFbp3sBgl4NQ4g=="; }; }; - "secret-stack-4.1.0" = { + "secret-stack-4.2.1" = { name = "secret-stack"; packageName = "secret-stack"; - version = "4.1.0"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/secret-stack/-/secret-stack-4.1.0.tgz"; - sha512 = "tCxjylkvEvUqxlWSVALtPMGKGyed225oDf7zoxCOsvj5SaVolUzOaixS07IK74mjcq7D1TvEJ4kofcaTMhQq1w=="; + url = "https://registry.npmjs.org/secret-stack/-/secret-stack-4.2.1.tgz"; + sha512 = "R4pn1zVaspQUqpC3iKLvA476pfftzE8AZTfMnd7TQpuVdGML0wsLYp4wmU4NZERHYsr0g99JnwUH5ll9n0APjg=="; }; }; "secure-keys-1.0.0" = { @@ -28159,13 +28329,13 @@ let sha1 = "f0c82d98a3b139a8776a8808050b824431087fca"; }; }; - "secure-scuttlebutt-18.2.0" = { + "secure-scuttlebutt-18.3.3" = { name = "secure-scuttlebutt"; packageName = "secure-scuttlebutt"; - version = "18.2.0"; + version = "18.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/secure-scuttlebutt/-/secure-scuttlebutt-18.2.0.tgz"; - sha512 = "rBK6P3A4MsZI4lrzaf/dbJJDIxuJXO6y3GUeNngb5IJlcagCNJ+zNZcd19rDURfU8tMgOyw+rEwGIs2ExLQTdg=="; + url = "https://registry.npmjs.org/secure-scuttlebutt/-/secure-scuttlebutt-18.3.3.tgz"; + sha512 = "f1APqe25N1Te++xtP1ZFnZ9hff/9lbj1o2fMnvFcGD+BezvwkKuR2RURRdu1NApDp0Xmglki45UeVqMfvs73iw=="; }; }; "seek-bzip-1.0.5" = { @@ -28483,13 +28653,13 @@ let sha1 = "935d240cdfe0f5805307fdfe967d88942a2cbcf0"; }; }; - "serve-handler-5.0.0" = { + "serve-handler-5.0.3" = { name = "serve-handler"; packageName = "serve-handler"; - version = "5.0.0"; + version = "5.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/serve-handler/-/serve-handler-5.0.0.tgz"; - sha512 = "VbNr1Yk4cDMAdIyVr5J1vPtGuXUsuu0R8iht+reK0g8t48fSuGWqnsIYVh3xXFJynFDHMLbPQ9mll+/hhmuGEQ=="; + url = "https://registry.npmjs.org/serve-handler/-/serve-handler-5.0.3.tgz"; + sha512 = "qtIOHXC+pgEQO+bMwtcQBP3IjuKH5vXwnTb0J9SzTORDqGHvQmPXO3v/DEIEHI1oENWLmbDRBezRnJiw3t/2nA=="; }; }; "serve-index-1.7.3" = { @@ -28632,7 +28802,7 @@ let packageName = "sha.js"; version = "2.4.11"; src = fetchurl { - url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz"; + url = "http://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz"; sha512 = "QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ=="; }; }; @@ -28641,7 +28811,7 @@ let packageName = "sha.js"; version = "2.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.5.tgz"; + url = "http://registry.npmjs.org/sha.js/-/sha.js-2.4.5.tgz"; sha1 = "27d171efcc82a118b99639ff581660242b506e7c"; }; }; @@ -28659,7 +28829,7 @@ let packageName = "shasum"; version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/shasum/-/shasum-1.0.2.tgz"; + url = "http://registry.npmjs.org/shasum/-/shasum-1.0.2.tgz"; sha1 = "e7012310d8f417f4deb5712150e5678b87ae565f"; }; }; @@ -28861,13 +29031,13 @@ let sha512 = "Wvre/Jq5vgoz31Z9stYWPLn0PqRqmBDpFSdypAnHu5AvRVCYPRYGnvryNLiXu8GOBNDH82J2FRHUGMjjHUpXFw=="; }; }; - "simple-git-1.96.0" = { + "simple-git-1.102.0" = { name = "simple-git"; packageName = "simple-git"; - version = "1.96.0"; + version = "1.102.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-1.96.0.tgz"; - sha512 = "+gXuzJFpGtK9zCa7rPMMNs8AF2weWMsB0Vlyym5VkFX2VGQ3VBzKhnxPN//PWrGuPFGQ/u0F1yL6rZoPhj/KPQ=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-1.102.0.tgz"; + sha512 = "ox/EDIYtyxG9pFBuboxnmR1FFFS2vsrJejuble9d2W0EWvvMB02/ruMUHp1ROPS0OH5Nzr9+/W7JkRRRXDMs8Q=="; }; }; "simple-lru-cache-0.0.2" = { @@ -28897,15 +29067,6 @@ let sha512 = "MUWWno5o5cvISKOH4pYQ18PQJLpDaNWoKUbrPPKuspCLCkkh+zhtuQyTE8h2U2Ags+/OUN5wnUe92+9B8/Sm2Q=="; }; }; - "simple-plist-0.2.1" = { - name = "simple-plist"; - packageName = "simple-plist"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/simple-plist/-/simple-plist-0.2.1.tgz"; - sha1 = "71766db352326928cf3a807242ba762322636723"; - }; - }; "simple-sha1-2.1.1" = { name = "simple-sha1"; packageName = "simple-sha1"; @@ -29230,13 +29391,13 @@ let sha512 = "FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg=="; }; }; - "snyk-1.94.0" = { + "snyk-1.99.1" = { name = "snyk"; packageName = "snyk"; - version = "1.94.0"; + version = "1.99.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.94.0.tgz"; - sha512 = "65dc0lnzmXc4kAwMOCPu/2I6nY0Sx0FcmO5NIzhnxvsSy6K508RMh1SQcF40V7eUFhOD3uQ/HTHTN0JW/4zYBA=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.99.1.tgz"; + sha512 = "vN2jUGwHPHAbqqOeZQsBrnWgTvuCnbxsP8i9BIaqZxINeKbuBOS1t5Kg9KMMCRJyqqCB/y76PQSdoqavh4yxkg=="; }; }; "snyk-config-2.2.0" = { @@ -29248,13 +29409,13 @@ let sha512 = "mq0wbP/AgjcmRq5i5jg2akVVV3iSYUPTowZwKn7DChRLDL8ySOzWAwan+ImXiyNbrWo87FNI/15O6MpOnTxOIg=="; }; }; - "snyk-docker-plugin-1.10.4" = { + "snyk-docker-plugin-1.11.0" = { name = "snyk-docker-plugin"; packageName = "snyk-docker-plugin"; - version = "1.10.4"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-1.10.4.tgz"; - sha512 = "79yWMaISNbtfTY9UtTF7K24cE4k1tRsxDOZo4/a8WlyO/dmmvbdcyz3jtHiFnS8NZqOkXf7ngqae1hmcR7CdPA=="; + url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-1.11.0.tgz"; + sha512 = "rJrSj4FfGtaFGNybWTb0bULEqoQEeZfZBpGoDumiXsGqoSWf61Tr1V/Ck9NGcmHWNEVsLZLcE9CXp6Y6Kbo8qA=="; }; }; "snyk-go-plugin-1.5.2" = { @@ -29266,13 +29427,13 @@ let sha512 = "XWajcSh6Ld+I+WdcyU3DGDuE2ydThQd8ORkESy0nQ2LwekygLYVYN66OBy0uxpqYfd4qoqeg+J8lb4oGzCmyGA=="; }; }; - "snyk-gradle-plugin-1.3.0" = { + "snyk-gradle-plugin-2.0.1" = { name = "snyk-gradle-plugin"; packageName = "snyk-gradle-plugin"; - version = "1.3.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-1.3.0.tgz"; - sha512 = "rKZcPwbDM9zk3pFcO0w77MIKOZTkk5ZBVBkBlTlUiFg+eNOKqPTmw2hBGF5NB4ASQmMnx3uB1C8+hrQ405CthA=="; + url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-2.0.1.tgz"; + sha512 = "dL9MRlwmDP4OmOk4b61pMqvbu8gG+HVCBTryBEU+vkvjloX0lslKvA5NTUPAM2M8SShnOic54cSegGQChBhYHw=="; }; }; "snyk-module-1.8.2" = { @@ -29284,22 +29445,22 @@ let sha512 = "XqhdbZ/CUuJ5gSaYdYfapLqx9qm2Mp6nyRMBCLXe9tJSiohOJsc9fQuUDbdOiRCqpA4BD6WLl+qlwOJmJoszBg=="; }; }; - "snyk-mvn-plugin-1.2.0" = { + "snyk-mvn-plugin-2.0.0" = { name = "snyk-mvn-plugin"; packageName = "snyk-mvn-plugin"; - version = "1.2.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-1.2.0.tgz"; - sha512 = "ieTWhn1MB88gEQ6nUtGCeUKQ6Xoxm+u+QmD9u3zfP1QS5ep9fWt3YYDUQjgUiDTJJy7QyVQdZ/fsz3RECnOA7w=="; + url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.0.0.tgz"; + sha512 = "9jAhZhv+7YcqtoQYCYlgMoxK+dWBKlk+wkX27Ebg3vNddNop9q5jZitRXTjsXwfSUZHRt+Ptw1f8vei9kjzZVg=="; }; }; - "snyk-nodejs-lockfile-parser-1.4.1" = { + "snyk-nodejs-lockfile-parser-1.5.1" = { name = "snyk-nodejs-lockfile-parser"; packageName = "snyk-nodejs-lockfile-parser"; - version = "1.4.1"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.4.1.tgz"; - sha512 = "xjkf1BHk7HQlp4ABIWPtEvAOAvWhwMtJ7ElQVUvKBHPVHjMEz3mucBRfrtpuyDBJ3DaBlN8Wiw+kcEinX6f09w=="; + url = "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.5.1.tgz"; + sha512 = "rfFcW+ZrOEH3NxufUCpMBpNLSb4BPOxLbAM6MoRqfYH5DhSdTHsecwRDf1gU6XzQok/9Koav+1qtP8+welJC2A=="; }; }; "snyk-nuget-plugin-1.6.5" = { @@ -29356,13 +29517,13 @@ let sha512 = "YVAelR+dTpqLgfk6lf6WgOlw+MGmGI0r3/Dny8tUbJJ9uVTHTRAOdZCbUyTFqJG7oEmEZxUwmfjqgAuniYwx8Q=="; }; }; - "snyk-sbt-plugin-1.3.1" = { + "snyk-sbt-plugin-2.0.0" = { name = "snyk-sbt-plugin"; packageName = "snyk-sbt-plugin"; - version = "1.3.1"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-1.3.1.tgz"; - sha512 = "un9ddM4M+7Ye/zhkh5Cm6EYMXU0Z/aM8wuYZvu4O+wd8sonoUClwckzJlsaI2BA7xvfDL9qQUaImtpgy94v5JQ=="; + url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-2.0.0.tgz"; + sha512 = "bOUqsQ1Lysnwfnvf4QQIBfC0M0ZVuhlshTKd7pNwgAJ41YEPJNrPEpzOePl/HfKtwilEEwHh5YHvjYGegEKx0A=="; }; }; "snyk-tree-1.0.0" = { @@ -29572,13 +29733,13 @@ let sha1 = "b5537ffcbb9f74ebc443b8b6a211b291e8fcbc8e"; }; }; - "sodium-chloride-1.1.0" = { + "sodium-chloride-1.1.2" = { name = "sodium-chloride"; packageName = "sodium-chloride"; - version = "1.1.0"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/sodium-chloride/-/sodium-chloride-1.1.0.tgz"; - sha1 = "247a234b88867f6dff51332b605f193a65bf6839"; + url = "https://registry.npmjs.org/sodium-chloride/-/sodium-chloride-1.1.2.tgz"; + sha512 = "8AVzr9VHueXqfzfkzUA0aXe/Q4XG3UTmhlP6Pt+HQc5bbAPIJFo7ZIMh9tvn+99QuiMcyDJdYumegGAczl0N+g=="; }; }; "sodium-javascript-0.5.5" = { @@ -29590,13 +29751,13 @@ let sha512 = "UMmCHovws/sxIBZsIRhIl8uRPou/RFDD0vVop81T1hG106NLLgqajKKuHAOtAP6hflnZ0UrVA2VFwddTd/NQyA=="; }; }; - "sodium-native-2.2.1" = { + "sodium-native-2.2.2" = { name = "sodium-native"; packageName = "sodium-native"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/sodium-native/-/sodium-native-2.2.1.tgz"; - sha512 = "3CfftYV2ATXQFMIkLOvcNUk/Ma+lran0855j5Z/HEjUkSTzjLZi16CK362udOoNVrwn/TwGV8bKEt5OylsFrQA=="; + url = "https://registry.npmjs.org/sodium-native/-/sodium-native-2.2.2.tgz"; + sha512 = "TdAa+PlmWki2Spx3TJyGFVkj6gLsxs5HV/i/j2COZ5INEaCmLz15NIHgUAT/GQ0KrG8Ddy6tkvuP7B5YJpmW6g=="; }; }; "sodium-universal-2.0.0" = { @@ -29761,6 +29922,15 @@ let sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; }; }; + "source-map-0.7.3" = { + name = "source-map"; + packageName = "source-map"; + version = "0.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz"; + sha512 = "CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="; + }; + }; "source-map-resolve-0.5.2" = { name = "source-map-resolve"; packageName = "source-map-resolve"; @@ -29824,13 +29994,13 @@ let sha1 = "3e935d7ddd73631b97659956d55128e87b5084a3"; }; }; - "sourcemap-codec-1.4.1" = { + "sourcemap-codec-1.4.3" = { name = "sourcemap-codec"; packageName = "sourcemap-codec"; - version = "1.4.1"; + version = "1.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.1.tgz"; - sha512 = "hX1eNBNuilj8yfFnECh0DzLgwKpBLMIvmhgEhixXNui8lMLBInTI8Kyxt++RwJnMNu7cAUo635L2+N1TxMJCzA=="; + url = "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.3.tgz"; + sha512 = "vFrY/x/NdsD7Yc8mpTJXuao9S8lq08Z/kOITHz6b7YbfI9xL8Spe5EvSQUHOI7SbpY8bRPr0U3kKSsPuqEGSfA=="; }; }; "spark-md5-1.0.1" = { @@ -29878,13 +30048,13 @@ let sha1 = "b00799557eb7fb0c8376c29d44e8a1ea67e57476"; }; }; - "spdx-correct-3.0.0" = { + "spdx-correct-3.0.1" = { name = "spdx-correct"; packageName = "spdx-correct"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.0.tgz"; - sha512 = "N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g=="; + url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.1.tgz"; + sha512 = "hxSPZbRZvSDuOvADntOElzJpenIR7wXJkuoUcUtS0erbgt2fgeaoPIYretfKpslMhfFDY4k0MZ2F5CUzhBsSvQ=="; }; }; "spdx-exceptions-2.1.0" = { @@ -29905,13 +30075,13 @@ let sha512 = "Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg=="; }; }; - "spdx-license-ids-3.0.0" = { + "spdx-license-ids-3.0.1" = { name = "spdx-license-ids"; packageName = "spdx-license-ids"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz"; - sha512 = "2+EPwgbnmOIl8HjGBXXMd9NAu02vLjOO1nWw4kmeRDFyHn+M/ETfHxQUK0oXg8ctgVnl9t3rosNVsZ1jG61nDA=="; + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.1.tgz"; + sha512 = "TfOfPcYGBB5sDuPn3deByxPhmfegAhpDYKSOXZQN81Oyrrif8ZCodOLzK3AesELnCx03kikhyDwh0pfvvQvF8w=="; }; }; "spdy-1.32.5" = { @@ -29946,7 +30116,7 @@ let packageName = "split"; version = "0.2.10"; src = fetchurl { - url = "https://registry.npmjs.org/split/-/split-0.2.10.tgz"; + url = "http://registry.npmjs.org/split/-/split-0.2.10.tgz"; sha1 = "67097c601d697ce1368f418f06cd201cf0521a57"; }; }; @@ -29955,7 +30125,7 @@ let packageName = "split"; version = "0.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/split/-/split-0.3.3.tgz"; + url = "http://registry.npmjs.org/split/-/split-0.3.3.tgz"; sha1 = "cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f"; }; }; @@ -29973,7 +30143,7 @@ let packageName = "split-buffer"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/split-buffer/-/split-buffer-1.0.0.tgz"; + url = "http://registry.npmjs.org/split-buffer/-/split-buffer-1.0.0.tgz"; sha1 = "b7e8e0ab51345158b72c1f6dbef2406d51f1d027"; }; }; @@ -30076,31 +30246,31 @@ let sha512 = "LyH5Y/U7xvafmAuG1puyhNv4G3Ew9xC67dYgRX0wwbUf5iT422WB1Cvat9qGFAu3/BQbdctXtdEQPxaAn0+hYA=="; }; }; - "ssb-config-2.2.0" = { + "ssb-config-2.3.2" = { name = "ssb-config"; packageName = "ssb-config"; - version = "2.2.0"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-config/-/ssb-config-2.2.0.tgz"; - sha1 = "41cad038a8575af4062d3fd57d3b167be85b03bc"; + url = "https://registry.npmjs.org/ssb-config/-/ssb-config-2.3.2.tgz"; + sha512 = "u+pUKX+ZL8KbfdwL49GuHaVD8kh+LkdLcKyCO+Rxn/MKLfZ1JFfuhm6yZ4ppQu9oTmq/1C49eLpNwZtrLIjVCg=="; }; }; - "ssb-ebt-5.2.2" = { + "ssb-ebt-5.2.3" = { name = "ssb-ebt"; packageName = "ssb-ebt"; - version = "5.2.2"; + version = "5.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-ebt/-/ssb-ebt-5.2.2.tgz"; - sha512 = "De3dUnmgs/8aYl2fmi/MtJljR9qw1mUmpdM4qeCf+4uniqlNNhfn1Ux+M5A8XYVuI+TD4GkgmIDeZH6miey2kw=="; + url = "https://registry.npmjs.org/ssb-ebt/-/ssb-ebt-5.2.3.tgz"; + sha512 = "LTIry3qRZRLqv3l97tcd22dNiLjZHz7Ynot0OQFG10zL4jsECSkSxMUqSwrFUTfZEySUxhAx92TDcafDy+/J3A=="; }; }; - "ssb-friends-2.4.0" = { + "ssb-friends-3.1.3" = { name = "ssb-friends"; packageName = "ssb-friends"; - version = "2.4.0"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-friends/-/ssb-friends-2.4.0.tgz"; - sha1 = "0d40cd96a12f2339c9064a8ad1d5a713e91c57ae"; + url = "https://registry.npmjs.org/ssb-friends/-/ssb-friends-3.1.3.tgz"; + sha512 = "bufgvAcqjAyjKfmh788dr3fV9YYrIgdkIhfETPHidbgIKgx15clNUzjP/s7FZk2PwwrjHyQ54kE0BR2em6u/nQ=="; }; }; "ssb-git-0.5.0" = { @@ -30130,13 +30300,13 @@ let sha1 = "9e857d170dff152c53a273eb9004a0a914a106e5"; }; }; - "ssb-keys-7.0.16" = { + "ssb-keys-7.1.3" = { name = "ssb-keys"; packageName = "ssb-keys"; - version = "7.0.16"; + version = "7.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-keys/-/ssb-keys-7.0.16.tgz"; - sha512 = "EhLkRzgF7YaRc47L8YZb+TcxEXZy9DPWCF+vCt5nSNm8Oj+Pz8pBVSOlrLKZVbcAKFjIJhqY32oTjknu3E1KVQ=="; + url = "https://registry.npmjs.org/ssb-keys/-/ssb-keys-7.1.3.tgz"; + sha512 = "f66vIZ3LkeMx73enLTkPC9ecTUcUrjtVHvRt45nDmubGMom21Z82JQLWYbQ++09v3JG3B4XEir8inhv6AAISSQ=="; }; }; "ssb-links-3.0.3" = { @@ -30202,31 +30372,31 @@ let sha1 = "dfd30cd50eecd8546bd4aa7f06e7c8f501c08118"; }; }; - "ssb-query-2.2.1" = { + "ssb-query-2.3.0" = { name = "ssb-query"; packageName = "ssb-query"; - version = "2.2.1"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-query/-/ssb-query-2.2.1.tgz"; - sha512 = "eAbTVPHYLJ/Cp8jO7uFFXY7L3RhYKlGIhTEM1xjbz3p4/Dysl6DPyWTz7JF+lXhz5AznfjzZNfZjMnX3GJtIbA=="; + url = "https://registry.npmjs.org/ssb-query/-/ssb-query-2.3.0.tgz"; + sha512 = "y4OA2MvGl1jU7bUTYsTmMNSqlPt4eh9401THUW1DO4aFyBFEWvpa3eKJHc8aTmaph2hutPPbdKgEFsWDzw26uw=="; }; }; - "ssb-ref-2.11.2" = { + "ssb-ref-2.12.0" = { name = "ssb-ref"; packageName = "ssb-ref"; - version = "2.11.2"; + version = "2.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-ref/-/ssb-ref-2.11.2.tgz"; - sha512 = "40A+o3iNAgr/sMH4V6/f3l2dhzUb5ZhTwZdrlKFu1ti+uZrKNUkH/E8j5NIZpj2rDq0PDXkACSVJgPGwltfQRA=="; + url = "https://registry.npmjs.org/ssb-ref/-/ssb-ref-2.12.0.tgz"; + sha512 = "xcVFLYgvWkxZoNDCOQHLqgHYsjmfunVkdby9OPEygjufXbiW6zpnFTBqlqEBojBetxxtVdwCgZreD9kYXED/ZA=="; }; }; - "ssb-validate-3.0.10" = { + "ssb-validate-3.0.11" = { name = "ssb-validate"; packageName = "ssb-validate"; - version = "3.0.10"; + version = "3.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-validate/-/ssb-validate-3.0.10.tgz"; - sha512 = "9wJE1i+4vW/F/TYQQl15BVoiZb9kaqIRBhl2I/TXyhjngfx/yBzXFAuiXhaiDfqJ3YnUXzY4JMUSx0gIvpePnQ=="; + url = "https://registry.npmjs.org/ssb-validate/-/ssb-validate-3.0.11.tgz"; + sha512 = "mZPI9HKZtqPP7Qi26B0GR7HqYmmcELEaoj5zr8TlUcULg9BOZy7f4VSzcKZ36LIkvpuK2sfA6znxIlBLq78fjg=="; }; }; "ssb-ws-2.1.1" = { @@ -30252,7 +30422,7 @@ let packageName = "ssh-key-to-pem"; version = "0.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/ssh-key-to-pem/-/ssh-key-to-pem-0.11.0.tgz"; + url = "http://registry.npmjs.org/ssh-key-to-pem/-/ssh-key-to-pem-0.11.0.tgz"; sha1 = "512675a28f08f1e581779e1989ab1e13effb49e4"; }; }; @@ -30468,10 +30638,19 @@ let packageName = "stream-combiner"; version = "0.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz"; + url = "http://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz"; sha1 = "4d5e433c185261dde623ca3f44c586bcf5c4ad14"; }; }; + "stream-combiner-0.2.2" = { + name = "stream-combiner"; + packageName = "stream-combiner"; + version = "0.2.2"; + src = fetchurl { + url = "http://registry.npmjs.org/stream-combiner/-/stream-combiner-0.2.2.tgz"; + sha1 = "aec8cbac177b56b6f4fa479ced8c1912cee52858"; + }; + }; "stream-combiner2-1.1.1" = { name = "stream-combiner2"; packageName = "stream-combiner2"; @@ -30706,15 +30885,6 @@ let sha1 = "5ea211cd92d228e184294990a6cc97b366a77cb0"; }; }; - "string-length-1.0.1" = { - name = "string-length"; - packageName = "string-length"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/string-length/-/string-length-1.0.1.tgz"; - sha1 = "56970fb1c38558e9e70b728bf3de269ac45adfac"; - }; - }; "string-length-2.0.0" = { name = "string-length"; packageName = "string-length"; @@ -30724,13 +30894,13 @@ let sha1 = "d40dbb686a3ace960c1cffca562bf2c45f8363ed"; }; }; - "string-similarity-1.2.1" = { + "string-similarity-1.2.2" = { name = "string-similarity"; packageName = "string-similarity"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/string-similarity/-/string-similarity-1.2.1.tgz"; - sha512 = "XqC6lRZF3UIYdxBRHjIfJwU2nYzPm+E8udKFHjIplnRQflkXP1A1Ie3HoEv04W/zY1wGnV6TQpklM2WwZO3gIA=="; + url = "https://registry.npmjs.org/string-similarity/-/string-similarity-1.2.2.tgz"; + sha512 = "IoHUjcw3Srl8nsPlW04U3qwWPk3oG2ffLM0tN853d/E/JlIvcmZmDY2Kz5HzKp4lEi2T7QD7Zuvjq/1rDw+XcQ=="; }; }; "string-stream-0.0.7" = { @@ -31057,13 +31227,13 @@ let sha512 = "zhzBZev0uhT2IrFUerenXhfaE0vFUYwAZsnG0gIKGpfM/Gi6jOUQ3cmcvyTsXeDLIPiTubHESeO7EbD6FoPmzw=="; }; }; - "strong-log-transformer-1.0.6" = { + "strong-log-transformer-2.0.0" = { name = "strong-log-transformer"; packageName = "strong-log-transformer"; - version = "1.0.6"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/strong-log-transformer/-/strong-log-transformer-1.0.6.tgz"; - sha1 = "f7fb93758a69a571140181277eea0c2eb1301fa3"; + url = "https://registry.npmjs.org/strong-log-transformer/-/strong-log-transformer-2.0.0.tgz"; + sha512 = "FQmNqAXJgOX8ygOcvPLlGWBNT41mvNJ9ALoYf0GTwVt9t30mGTqpmp/oJx5gLcu52DXK10kS7dVWhx8aPXDTlg=="; }; }; "strsplit-1.0.0" = { @@ -31093,13 +31263,13 @@ let sha1 = "5e4ceca5a3779e3365b1511e05f866877302f760"; }; }; - "subscriptions-transport-ws-0.9.14" = { + "subscriptions-transport-ws-0.9.15" = { name = "subscriptions-transport-ws"; packageName = "subscriptions-transport-ws"; - version = "0.9.14"; + version = "0.9.15"; src = fetchurl { - url = "https://registry.npmjs.org/subscriptions-transport-ws/-/subscriptions-transport-ws-0.9.14.tgz"; - sha512 = "n1+mgupVdJn1MIls1ZhSJurJjc+islp7Tv9EIaEJ3HAd9DaINneKq0KRqOYNOrvUI7orVWGomEnlIxoudjfbeA=="; + url = "https://registry.npmjs.org/subscriptions-transport-ws/-/subscriptions-transport-ws-0.9.15.tgz"; + sha512 = "f9eBfWdHsePQV67QIX+VRhf++dn1adyC/PZHP6XI5AfKnZ4n0FW+v5omxwdHVpd4xq2ZijaHEcmlQrhBY79ZWQ=="; }; }; "sudo-block-1.2.0" = { @@ -31143,7 +31313,7 @@ let packageName = "superagent-proxy"; version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/superagent-proxy/-/superagent-proxy-1.0.3.tgz"; + url = "http://registry.npmjs.org/superagent-proxy/-/superagent-proxy-1.0.3.tgz"; sha512 = "79Ujg1lRL2ICfuHUdX+H2MjIw73kB7bXsIkxLwHURz3j0XUmEEEoJ+u/wq+mKwna21Uejsm2cGR3OESA00TIjA=="; }; }; @@ -31341,7 +31511,7 @@ let packageName = "table"; version = "3.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/table/-/table-3.8.3.tgz"; + url = "http://registry.npmjs.org/table/-/table-3.8.3.tgz"; sha1 = "2bbc542f0fda9861a755d3947fefd8b3f513855f"; }; }; @@ -31350,7 +31520,7 @@ let packageName = "table"; version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/table/-/table-4.0.3.tgz"; + url = "http://registry.npmjs.org/table/-/table-4.0.3.tgz"; sha512 = "S7rnFITmBH1EnyKcvxBh1LjYeQMmnZtCXSEbHcH6S0NoKit24ZuFO/T1vDcLdYsLQkM188PVVhQmzKIuThNkKg=="; }; }; @@ -31409,13 +31579,13 @@ let sha1 = "99372a5c999bf2df160afc0d74bed4f47948cd22"; }; }; - "tapable-1.0.0" = { + "tapable-1.1.0" = { name = "tapable"; packageName = "tapable"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/tapable/-/tapable-1.0.0.tgz"; - sha512 = "dQRhbNQkRnaqauC7WqSJ21EEksgT0fYZX2lqXzGkpo8JNig9zGZTYoMGvyI2nWmXlE2VSVXVDu7wLVGu/mQEsg=="; + url = "https://registry.npmjs.org/tapable/-/tapable-1.1.0.tgz"; + sha512 = "IlqtmLVaZA2qab8epUXbVWRn3aB1imbDMJtjB3nu4X0NqPkcY/JH9ZtCBWKHWPxs8Svi9tyo8w2dBoi07qZbBA=="; }; }; "tape-2.3.3" = { @@ -31490,13 +31660,13 @@ let sha512 = "PPRybI9+jM5tjtCbN2cxmmRU7YmqT3Zv/UDy48tAh2XRkLa9bAORtSWLkVc13+GJF+cdTh1yEnHEk3cpTaL5Kg=="; }; }; - "tar-stream-1.6.1" = { + "tar-stream-1.6.2" = { name = "tar-stream"; packageName = "tar-stream"; - version = "1.6.1"; + version = "1.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.1.tgz"; - sha512 = "IFLM5wp3QrJODQFPm6/to3LJZrONdBY/otxcvDIQzu217zKye6yVR3hhi9lAjrC2Z+m/j5oDxMPb1qcd8cIvpA=="; + url = "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.2.tgz"; + sha512 = "rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A=="; }; }; "temp-0.6.0" = { @@ -31562,13 +31732,13 @@ let sha1 = "a87ee424be01a1d28f2f301045043a5bcd679a05"; }; }; - "text-extensions-1.7.0" = { + "text-extensions-1.8.0" = { name = "text-extensions"; packageName = "text-extensions"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/text-extensions/-/text-extensions-1.7.0.tgz"; - sha512 = "AKXZeDq230UaSzaO5s3qQUZOaC7iKbzq0jOFL614R7d9R593HLqAOL0cYoqLdkNrjBSOdmoQI06yigq1TSBXAg=="; + url = "https://registry.npmjs.org/text-extensions/-/text-extensions-1.8.0.tgz"; + sha512 = "mVzjRxuWnDKs/qH1rbOJEVHLlSX9kty9lpi7lMvLgU9S74mQ8/Ozg9UPcKxShh0qG2NZ+NyPOPpcZU4C1Eld9A=="; }; }; "text-table-0.2.0" = { @@ -31675,7 +31845,7 @@ let packageName = "through"; version = "2.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/through/-/through-2.2.7.tgz"; + url = "http://registry.npmjs.org/through/-/through-2.2.7.tgz"; sha1 = "6e8e21200191d4eb6a99f6f010df46aa1c6eb2bd"; }; }; @@ -31684,7 +31854,7 @@ let packageName = "through"; version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/through/-/through-2.3.4.tgz"; + url = "http://registry.npmjs.org/through/-/through-2.3.4.tgz"; sha1 = "495e40e8d8a8eaebc7c275ea88c2b8fc14c56455"; }; }; @@ -31693,7 +31863,7 @@ let packageName = "through"; version = "2.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/through/-/through-2.3.8.tgz"; + url = "http://registry.npmjs.org/through/-/through-2.3.8.tgz"; sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; }; }; @@ -31787,15 +31957,6 @@ let sha1 = "764a5a11af50561921b133f3b44e618687e0f5c3"; }; }; - "timed-out-2.0.0" = { - name = "timed-out"; - packageName = "timed-out"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/timed-out/-/timed-out-2.0.0.tgz"; - sha1 = "f38b0ae81d3747d628001f41dafc652ace671c0a"; - }; - }; "timed-out-4.0.1" = { name = "timed-out"; packageName = "timed-out"; @@ -32111,13 +32272,13 @@ let sha512 = "H/Z/yCuvZJj1vl1IQHI8dvF2QrUuXRJoptT5DW5967/dsLpXlCg+uyhFR5lfNj5mNaYePUbKtnL+qKWZGXv4Nw=="; }; }; - "torrent-stream-1.0.4" = { + "torrent-stream-1.1.0" = { name = "torrent-stream"; packageName = "torrent-stream"; - version = "1.0.4"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/torrent-stream/-/torrent-stream-1.0.4.tgz"; - sha512 = "IIAoMzagHFzjRQrFjwAZrE3yQYAPsmkbx0gYMCu/x5vf/Cj5yBjZqW1/98vOcaGGGelH/LhkmrJ56VYhiAKi5g=="; + url = "https://registry.npmjs.org/torrent-stream/-/torrent-stream-1.1.0.tgz"; + sha512 = "yjKU8l985+/D2CdnAR2+pEpyMX13rlQ1kNYik34EHxcul7BjifW5sMizT+u47suOeBTji3lHBA7eZGhBjpnM6g=="; }; }; "tosource-1.0.0" = { @@ -32354,6 +32515,15 @@ let sha1 = "405923909592d56f78a5818434b0b78489ca5f2b"; }; }; + "ts-node-7.0.1" = { + name = "ts-node"; + packageName = "ts-node"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ts-node/-/ts-node-7.0.1.tgz"; + sha512 = "BVwVbPJRspzNh2yfslyT1PSbl5uIk03EZlb493RKHN4qej/D06n1cEhjlOJG69oFsE7OT8XjpTUcYf6pKTLMhw=="; + }; + }; "tslib-1.9.3" = { name = "tslib"; packageName = "tslib"; @@ -32404,7 +32574,7 @@ let packageName = "tunnel"; version = "0.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/tunnel/-/tunnel-0.0.2.tgz"; + url = "http://registry.npmjs.org/tunnel/-/tunnel-0.0.2.tgz"; sha1 = "f23bcd8b7a7b8a864261b2084f66f93193396334"; }; }; @@ -32516,13 +32686,13 @@ let sha512 = "HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q=="; }; }; - "typechecker-4.5.0" = { + "typechecker-4.6.0" = { name = "typechecker"; packageName = "typechecker"; - version = "4.5.0"; + version = "4.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/typechecker/-/typechecker-4.5.0.tgz"; - sha512 = "bqPE/ck3bVIaXP7gMKTKSHrypT32lpYTpiqzPYeYzdSQnmaGvaGhy7TnN/M/+5R+2rs/kKcp9ZLPRp/Q9Yj+4w=="; + url = "https://registry.npmjs.org/typechecker/-/typechecker-4.6.0.tgz"; + sha512 = "83OrXpyP3LNr7aRbLkt2nkjE/d7q8su8/uRvrKxCpswqVCVGOgyaKpaz8/MTjQqBYe4eLNuJ44pNakFZKqyPMA=="; }; }; "typedarray-0.0.6" = { @@ -32543,31 +32713,31 @@ let sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q=="; }; }; - "typescript-2.7.2" = { + "typescript-2.9.2" = { name = "typescript"; packageName = "typescript"; - version = "2.7.2"; + version = "2.9.2"; src = fetchurl { - url = "http://registry.npmjs.org/typescript/-/typescript-2.7.2.tgz"; - sha512 = "p5TCYZDAO0m4G344hD+wx/LATebLWZNkkh2asWUFqSsD2OrDNhbAHuSjobrmsUmdzjJjEeZVU9g1h3O6vpstnw=="; + url = "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz"; + sha512 = "Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w=="; }; }; - "typescript-2.8.3" = { + "typescript-3.0.3" = { name = "typescript"; packageName = "typescript"; - version = "2.8.3"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-2.8.3.tgz"; - sha512 = "K7g15Bb6Ra4lKf7Iq2l/I5/En+hLIHmxWZGq3D4DIRNFxMNV6j2SHSvDOqs2tGd4UvD/fJvrwopzQXjLrT7Itw=="; + url = "https://registry.npmjs.org/typescript/-/typescript-3.0.3.tgz"; + sha512 = "kk80vLW9iGtjMnIv11qyxLqZm20UklzuR2tL0QAnDIygIUIemcZMxlMWudl9OOt76H3ntVzcTiddQ1/pAAJMYg=="; }; }; - "typescript-2.9.2" = { + "typescript-3.1.1" = { name = "typescript"; packageName = "typescript"; - version = "2.9.2"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz"; - sha512 = "Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w=="; + url = "https://registry.npmjs.org/typescript/-/typescript-3.1.1.tgz"; + sha512 = "Veu0w4dTc/9wlWNf2jeRInNodKlcdLgemvPsrNpfu5Pq39sgfFjvIIgTsvUHCoLBnMhPoUA+tFxsXjU6VexVRQ=="; }; }; "typewise-1.0.3" = { @@ -32660,15 +32830,6 @@ let sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd"; }; }; - "uglify-js-3.4.8" = { - name = "uglify-js"; - packageName = "uglify-js"; - version = "3.4.8"; - src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.8.tgz"; - sha512 = "WatYTD84gP/867bELqI2F/2xC9PQBETn/L+7RGq9MQOA/7yFBNvY1UwXqvtILeE6n0ITwBXxp34M0/o70dzj6A=="; - }; - }; "uglify-js-3.4.9" = { name = "uglify-js"; packageName = "uglify-js"; @@ -32813,13 +32974,13 @@ let sha512 = "4IcGSufhFshvLNcMCV80UnQVlZ5pMOC8mvNPForqwA4+lzYQuetTESLDQkeLmihq8bRcnpbQa48Wb8Lh16/xow=="; }; }; - "unbzip2-stream-1.2.5" = { + "unbzip2-stream-1.3.0" = { name = "unbzip2-stream"; packageName = "unbzip2-stream"; - version = "1.2.5"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.2.5.tgz"; - sha512 = "izD3jxT8xkzwtXRUZjtmRwKnZoeECrfZ8ra/ketwOcusbZEp4mjULMnJOCfTDZBgGQAAY1AJ/IgxcwkavcX9Og=="; + url = "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.3.0.tgz"; + sha512 = "kE2WkurNnPUMcryNioS68DDbhoPB8Qxsd8btHSj+sd5Pjh2GsjmeHLzMSqV9HHziAo8FzVxVCJl9ZYhk7yY1pA=="; }; }; "unc-path-regex-0.1.2" = { @@ -32975,6 +33136,15 @@ let sha1 = "14bc6cd40d98ffff75b405506bad873ecbbac3ba"; }; }; + "union-0.4.6" = { + name = "union"; + packageName = "union"; + version = "0.4.6"; + src = fetchurl { + url = "https://registry.npmjs.org/union/-/union-0.4.6.tgz"; + sha1 = "198fbdaeba254e788b0efcb630bc11f24a2959e0"; + }; + }; "union-value-1.0.0" = { name = "union-value"; packageName = "union-value"; @@ -32993,22 +33163,22 @@ let sha1 = "b31c5ae8254844a3a8281541ce2b04b865a734ff"; }; }; - "unique-filename-1.1.0" = { + "unique-filename-1.1.1" = { name = "unique-filename"; packageName = "unique-filename"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.0.tgz"; - sha1 = "d05f2fe4032560871f30e93cbe735eea201514f3"; + url = "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz"; + sha512 = "Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ=="; }; }; - "unique-slug-2.0.0" = { + "unique-slug-2.0.1" = { name = "unique-slug"; packageName = "unique-slug"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.0.tgz"; - sha1 = "db6676e7c7cc0629878ff196097c78855ae9f4ab"; + url = "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.1.tgz"; + sha512 = "n9cU6+gITaVu7VGj1Z8feKMmfAjEAQGhwD9fE3zvpRRa0wEIx8ODYkVGfSc94M2OX00tUFV8wH3zYbm1I8mxFg=="; }; }; "unique-stream-1.0.0" = { @@ -33218,15 +33388,6 @@ let sha512 = "1TrmYLuLj/5ZovwUS7fFd1jMH3NnFDN1y1A8dboedIDt7zs/zJMo6TwwlhYKkSeEwzleeiSBV5/3c9ufAQWDaQ=="; }; }; - "update-notifier-0.5.0" = { - name = "update-notifier"; - packageName = "update-notifier"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/update-notifier/-/update-notifier-0.5.0.tgz"; - sha1 = "07b5dc2066b3627ab3b4f530130f7eddda07a4cc"; - }; - }; "update-notifier-2.3.0" = { name = "update-notifier"; packageName = "update-notifier"; @@ -33614,15 +33775,6 @@ let sha1 = "67e2e863797215530dff318e5bf9dcebfd47b21a"; }; }; - "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"; - }; - }; "uuid-3.1.0" = { name = "uuid"; packageName = "uuid"; @@ -33713,13 +33865,13 @@ let sha1 = "5fa912d81eb7d0c74afc140de7317f0ca7df437e"; }; }; - "validator-10.7.1" = { + "validator-10.8.0" = { name = "validator"; packageName = "validator"; - version = "10.7.1"; + version = "10.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/validator/-/validator-10.7.1.tgz"; - sha512 = "tbB5JrTczfeHKLw3PnFRzGFlF1xUAwSgXEDb66EuX1ffCirspYpDEZo3Vc9j38gPdL4JKrDc5UPFfgYiw1IWRQ=="; + url = "https://registry.npmjs.org/validator/-/validator-10.8.0.tgz"; + sha512 = "mXqMxfCh5NLsVgYVKl9WvnHNDPCcbNppHSPPowu0VjtSsGWVY+z8hJF44edLR1nbLNzi3jYoYsIl8KZpioIk6g=="; }; }; "validator-5.2.0" = { @@ -33929,13 +34081,13 @@ let sha1 = "2fb1decd4c466aa88b0f9341af33dc1aff2478d5"; }; }; - "videostream-2.5.1" = { + "videostream-2.6.0" = { name = "videostream"; packageName = "videostream"; - version = "2.5.1"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/videostream/-/videostream-2.5.1.tgz"; - sha512 = "S3f34WE6NB1d/YUAa/EYcTURTkGaxsUqcDmsGWV1jQpQQJxeagc79/XA7ygNjzBf3DoQQ1MKTD+SocPsWSniAg=="; + url = "https://registry.npmjs.org/videostream/-/videostream-2.6.0.tgz"; + sha512 = "nSsullx1BYClJxVSt4Fa+Ulsv0Cf7UwaHq+4LQdLkAUdmqNhY1DlGxXDWVY2gui5XV4FvDiSbXmSbGryMrrUCQ=="; }; }; "vinyl-0.4.6" = { @@ -34078,7 +34230,7 @@ let packageName = "vscode-jsonrpc"; version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.6.0.tgz"; + url = "http://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.6.0.tgz"; sha512 = "PqHHjuTlz3ks0vyZv3IkdduJReA/lqe6OP5zRl5nXn2ptMLW++fBotNyayyZEQLIF6nNrx/Rn6WhMSHElf02Yw=="; }; }; @@ -34091,12 +34243,21 @@ let sha512 = "T24Jb5V48e4VgYliUXMnZ379ItbrXgOimweKaJshD84z+8q7ZOZjJan0MeDe+Ugb+uqERDVV8SBmemaGMSMugA=="; }; }; + "vscode-jsonrpc-4.0.0" = { + name = "vscode-jsonrpc"; + packageName = "vscode-jsonrpc"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-4.0.0.tgz"; + sha512 = "perEnXQdQOJMTDFNv+UF3h1Y0z4iSiaN9jIlb0OqIYgosPCZGYh/MCUlkFtV2668PL69lRDO32hmvL2yiidUYg=="; + }; + }; "vscode-languageclient-4.0.1" = { name = "vscode-languageclient"; packageName = "vscode-languageclient"; version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-4.0.1.tgz"; + url = "http://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-4.0.1.tgz"; sha512 = "0fuBZj9pMkeJ8OMyIvSGeRaRVhUaJt+yeFxi7a3sz/AbrngQdcxOovMXPgKuieoBSBKS05gXPS88BsWpJZfBkA=="; }; }; @@ -34105,26 +34266,26 @@ let packageName = "vscode-languageserver"; version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-4.0.0.tgz"; + url = "http://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-4.0.0.tgz"; sha512 = "bxj9nRadNkXYfVG/fjA5a+KA5WaJCeP1F2Tnj3rYFS0pKALZQCPNqk3KO/LdiGFidjyICMG7xoHvYO9J9xosXg=="; }; }; - "vscode-languageserver-4.4.2" = { + "vscode-languageserver-5.1.0" = { name = "vscode-languageserver"; packageName = "vscode-languageserver"; - version = "4.4.2"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-4.4.2.tgz"; - sha512 = "61y8Raevi9EigDgg9NelvT9cUAohiEbUl1LOwQQgOCAaNX62yKny/ddi0uC+FUTm4CzsjhBu+06R+vYgfCYReA=="; + url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-5.1.0.tgz"; + sha512 = "CIsrgx2Y5VHS317g/HwkSTWYBIQmy0DwEyZPmB2pEpVOhYFwVsYpbiJwHIIyLQsQtmRaO4eA2xM8KPjNSdXpBw=="; }; }; - "vscode-languageserver-protocol-3.12.0" = { + "vscode-languageserver-protocol-3.13.0" = { name = "vscode-languageserver-protocol"; packageName = "vscode-languageserver-protocol"; - version = "3.12.0"; + version = "3.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.12.0.tgz"; - sha512 = "evY6hmyzLnwQrqlQWPrNBq1z8wrSNjLesmgPzeS6Zv11mVS5UJRel26hbM/DH5tHdn45huNzRW0eFHRmIm8LpA=="; + url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.13.0.tgz"; + sha512 = "2ZGKwI+P2ovQll2PGAp+2UfJH+FK9eait86VBUdkPd9HRlm8e58aYT9pV/NYanHOcp3pL6x2yTLVCFMcTer0mg=="; }; }; "vscode-languageserver-protocol-3.6.0" = { @@ -34132,17 +34293,17 @@ let 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"; + url = "http://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.6.0.tgz"; sha512 = "PN5hVQQQxrtHSZR8UCstqaoI9f2H9JctFTtdIpONWjzQNurWrc48qSXXU/vTfnbSrNou8qrJgkZ4QEZsyozOMA=="; }; }; - "vscode-languageserver-types-3.12.0" = { + "vscode-languageserver-types-3.13.0" = { name = "vscode-languageserver-types"; packageName = "vscode-languageserver-types"; - version = "3.12.0"; + version = "3.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.12.0.tgz"; - sha512 = "UxqnpzBToPO7Mi2tr/s5JeyPOSKSJtLB8lIdxCg9ZNdvP2cU8wS7iTDtwQKz91Ne4CUmTdf85ddR5SIZKXmMjQ=="; + url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.13.0.tgz"; + sha512 = "BnJIxS+5+8UWiNKCP7W3g9FlE7fErFw0ofP5BXJe7c2tl0VeWh+nNHFbwAS2vmVC4a5kYxHBjRy0UeOtziemVA=="; }; }; "vscode-uri-1.0.3" = { @@ -34172,13 +34333,13 @@ let sha1 = "13587190f34e72ba7a07ebbaa7e70ac147b1fb7d"; }; }; - "vue-cli-plugin-apollo-0.14.6" = { + "vue-cli-plugin-apollo-0.16.6" = { name = "vue-cli-plugin-apollo"; packageName = "vue-cli-plugin-apollo"; - version = "0.14.6"; + version = "0.16.6"; src = fetchurl { - url = "https://registry.npmjs.org/vue-cli-plugin-apollo/-/vue-cli-plugin-apollo-0.14.6.tgz"; - sha512 = "wQf4kCiUGhsKpc52GSwDVAjZlGP77YnjD+p+6TFOVg4RoMZgiFAx/qHZ6N1bUhNS0sEVJZd7wSKauiFr2elRrg=="; + url = "https://registry.npmjs.org/vue-cli-plugin-apollo/-/vue-cli-plugin-apollo-0.16.6.tgz"; + sha512 = "2GFJQg84BrdgLZXkvwxndlAljOvPOhoNVXrVChSTpiOgEu5JqPkVn71fAeVZ/OYzlcs+48trQQ32SXoHrJyQ0A=="; }; }; "walk-2.3.14" = { @@ -34271,13 +34432,13 @@ let sha512 = "YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="; }; }; - "webpack-sources-1.2.0" = { + "webpack-sources-1.3.0" = { name = "webpack-sources"; packageName = "webpack-sources"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.2.0.tgz"; - sha512 = "9BZwxR85dNsjWz3blyxdOhTgtnQvv3OEs5xofI0wPYTwu5kaWxS08UuD1oI7WLBLpRO+ylf0ofnXLXWmGb2WMw=="; + url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.3.0.tgz"; + sha512 = "OiVgSrbGu7NEnEvQJJgdSFPl2qWKkWq5lHMhgiToIiN9w34EBnjYzSYs+VbL5KoYiLNtFFa7BZIKxRED3I32pA=="; }; }; "websocket-driver-0.7.0" = { @@ -34321,7 +34482,7 @@ let packageName = "whatwg-fetch"; version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz"; + url = "http://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz"; sha512 = "dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng=="; }; }; @@ -34334,6 +34495,15 @@ let sha512 = "rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ=="; }; }; + "whatwg-url-7.0.0" = { + name = "whatwg-url"; + packageName = "whatwg-url"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.0.0.tgz"; + sha512 = "37GeVSIJ3kn1JgKyjiYNmSLP1yzbpb29jdmwBSgkD9h40/hyrR/OifpVUndji3tmwGgD8qpw7iQu3RSbCrBpsQ=="; + }; + }; "whatwg-url-compat-0.6.5" = { name = "whatwg-url-compat"; packageName = "whatwg-url-compat"; @@ -34528,7 +34698,7 @@ let packageName = "winston"; version = "0.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-0.6.2.tgz"; + url = "http://registry.npmjs.org/winston/-/winston-0.6.2.tgz"; sha1 = "4144fe2586cdc19a612bf8c035590132c9064bd2"; }; }; @@ -34537,7 +34707,7 @@ let packageName = "winston"; version = "0.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-0.8.0.tgz"; + url = "http://registry.npmjs.org/winston/-/winston-0.8.0.tgz"; sha1 = "61d0830fa699706212206b0a2b5ca69a93043668"; }; }; @@ -34546,7 +34716,7 @@ let packageName = "winston"; version = "0.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-0.8.3.tgz"; + url = "http://registry.npmjs.org/winston/-/winston-0.8.3.tgz"; sha1 = "64b6abf4cd01adcaefd5009393b1d8e8bec19db0"; }; }; @@ -34555,7 +34725,7 @@ let packageName = "winston"; version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-1.1.2.tgz"; + url = "http://registry.npmjs.org/winston/-/winston-1.1.2.tgz"; sha1 = "68edd769ff79d4f9528cf0e5d80021aade67480c"; }; }; @@ -34564,7 +34734,7 @@ let packageName = "winston"; version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-2.1.1.tgz"; + url = "http://registry.npmjs.org/winston/-/winston-2.1.1.tgz"; sha1 = "3c9349d196207fd1bdff9d4bc43ef72510e3a12e"; }; }; @@ -34658,6 +34828,15 @@ let sha1 = "288a04d87eda5c286e060dfe8f135ce8d007f8ba"; }; }; + "wrap-ansi-4.0.0" = { + name = "wrap-ansi"; + packageName = "wrap-ansi"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-4.0.0.tgz"; + sha512 = "uMTsj9rDb0/7kk1PbcbCcwvHUxp60fGDB/NNXpVa0Q+ic/e7y5+BwTxKfQ33VYgDppSwi/FBzpetYzo8s6tfbg=="; + }; + }; "wrap-fn-0.1.5" = { name = "wrap-fn"; packageName = "wrap-fn"; @@ -34811,15 +34990,6 @@ let sha1 = "7f6194154fd1786cf261e68b5488c47127a04977"; }; }; - "xcode-1.0.0" = { - name = "xcode"; - packageName = "xcode"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/xcode/-/xcode-1.0.0.tgz"; - sha1 = "e1f5b1443245ded38c180796df1a10fdeda084ec"; - }; - }; "xdg-basedir-2.0.0" = { name = "xdg-basedir"; packageName = "xdg-basedir"; @@ -35186,7 +35356,7 @@ let packageName = "yargs"; version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-1.3.3.tgz"; + url = "http://registry.npmjs.org/yargs/-/yargs-1.3.3.tgz"; sha1 = "054de8b61f22eefdb7207059eaef9d6b83fb931a"; }; }; @@ -35226,12 +35396,21 @@ let sha512 = "B0vRAp1hRX4jgIOWFtjfNjd9OA9RWYZ6tqGA9/I/IrTMsxmKvtWy+ersM+jzpQqbC3YfLzeABPdeTgcJ9eu1qQ=="; }; }; + "yargs-12.0.2" = { + name = "yargs"; + packageName = "yargs"; + version = "12.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-12.0.2.tgz"; + sha512 = "e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ=="; + }; + }; "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"; + url = "http://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz"; sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"; }; }; @@ -35240,7 +35419,7 @@ let packageName = "yargs"; version = "3.32.0"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz"; + url = "http://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz"; sha1 = "03088e9ebf9e756b69751611d2a5ef591482c995"; }; }; @@ -35249,7 +35428,7 @@ let packageName = "yargs"; version = "6.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz"; + url = "http://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz"; sha1 = "782ec21ef403345f830a808ca3d513af56065208"; }; }; @@ -35397,6 +35576,15 @@ let sha512 = "HBpXdNw8V66EwqIFt01rNhSgX33BOzgVb9CxpIvESvCI4ELeOSniB6gV6RXwrBur8kmHZCIAkYQYpib7Qxx8FQ=="; }; }; + "yn-2.0.0" = { + name = "yn"; + packageName = "yn"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yn/-/yn-2.0.0.tgz"; + sha1 = "e5adabc8acf408f6385fc76495684c88e6af689a"; + }; + }; "yosay-2.0.2" = { name = "yosay"; packageName = "yosay"; @@ -35406,13 +35594,13 @@ let sha512 = "avX6nz2esp7IMXGag4gu6OyQBsMh/SEn+ZybGu3yKPlOTE6z9qJrzG/0X5vCq/e0rPFy0CUYCze0G5hL310ibA=="; }; }; - "z-schema-3.23.0" = { + "z-schema-3.24.1" = { name = "z-schema"; packageName = "z-schema"; - version = "3.23.0"; + version = "3.24.1"; src = fetchurl { - url = "https://registry.npmjs.org/z-schema/-/z-schema-3.23.0.tgz"; - sha512 = "D8XV0BiHuQbWNEgu68RpjFZJ0C7jt+WYoszXKOohe54TdoTTauUvBQx+lsYCdalGIjGTFdQs5dxKvCUonUERzQ=="; + url = "https://registry.npmjs.org/z-schema/-/z-schema-3.24.1.tgz"; + sha512 = "2eR8eq/v1coNqyBc5HzswEcoLbw+S33RMnR326uiuOIr97ve5vwPNMDrKS1IRCB12bZ3a8BrfGxrRwuSXUyPvw=="; }; }; "zen-observable-0.5.2" = { @@ -35433,13 +35621,13 @@ let sha512 = "Y9kPzjGvIZ5jchSlqlCpBW3I82zBBL4z+ulXDRVA1NwsKzjt5kwAi+gOYIy0htNkfuehGZZtP5mRXHRV6TjDWw=="; }; }; - "zen-observable-ts-0.8.9" = { + "zen-observable-ts-0.8.10" = { name = "zen-observable-ts"; packageName = "zen-observable-ts"; - version = "0.8.9"; + version = "0.8.10"; src = fetchurl { - url = "https://registry.npmjs.org/zen-observable-ts/-/zen-observable-ts-0.8.9.tgz"; - sha512 = "KJz2O8FxbAdAU5CSc8qZ1K2WYEJb1HxS6XDRF+hOJ1rOYcg6eTMmS9xYHCXzqZZzKw6BbXWyF4UpwSsBQnHJeA=="; + url = "https://registry.npmjs.org/zen-observable-ts/-/zen-observable-ts-0.8.10.tgz"; + sha512 = "5vqMtRggU/2GhePC9OU4sYEWOdvmayp2k3gjPf4F0mXwB3CSbbNznfDUvDJx9O2ZTa1EIXdJhPchQveFKwNXPQ=="; }; }; "zeparser-0.0.5" = { @@ -35535,11 +35723,11 @@ in sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."chalk-1.1.3" - sources."chmodr-1.0.2" + sources."chmodr-1.2.0" sources."colors-1.3.2" - sources."commander-2.17.1" + sources."commander-2.18.0" sources."concat-map-0.0.1" - sources."convert-source-map-1.5.1" + sources."convert-source-map-1.6.0" sources."core-js-2.5.7" sources."debug-2.6.9" sources."detect-indent-4.0.0" @@ -35576,7 +35764,7 @@ in sources."json5-0.5.1" sources."jsonfile-4.0.0" sources."jsonlint-1.6.2" - sources."lodash-4.17.10" + sources."lodash-4.17.11" sources."loose-envify-1.4.0" sources."matcher-collection-1.0.5" sources."minimatch-3.0.4" @@ -35603,6 +35791,7 @@ in sources."regenerator-runtime-0.11.1" sources."repeating-2.0.1" sources."resolve-1.8.1" + sources."safe-buffer-5.1.2" sources."sax-0.5.8" sources."slash-1.0.0" sources."source-map-0.6.1" @@ -35657,8 +35846,8 @@ in sources."chainsaw-0.1.0" sources."chromium-pickle-js-0.2.0" sources."co-4.6.0" - sources."combined-stream-1.0.6" - sources."commander-2.17.1" + sources."combined-stream-1.0.7" + sources."commander-2.18.0" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" sources."cuint-0.2.2" @@ -35671,7 +35860,11 @@ in 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.2" + (sources."form-data-2.3.2" // { + dependencies = [ + sources."combined-stream-1.0.6" + ]; + }) sources."fs-extra-0.26.7" sources."fs.realpath-1.0.0" sources."getpass-0.1.7" @@ -35752,7 +35945,7 @@ in sha512 = "9OBihy+L53g9ALssKTY/vTWEiz8mGEJ1asWiCdfPdQ1Uf++tewiNrN7Fq2Eb6ZYtvK0BYvPZlh3bHguKmKO3yA=="; }; dependencies = [ - sources."@types/node-8.10.29" + sources."@types/node-8.10.30" sources."JSV-4.0.2" sources."adal-node-0.1.28" sources."ajv-5.5.2" @@ -35905,7 +36098,7 @@ in sources."clone-1.0.4" sources."co-4.6.0" sources."colors-1.1.2" - sources."combined-stream-1.0.6" + sources."combined-stream-1.0.7" sources."commander-1.0.4" sources."concat-map-0.0.1" (sources."concat-stream-1.6.2" // { @@ -35964,7 +36157,7 @@ in sources."har-schema-2.0.0" (sources."har-validator-2.0.6" // { dependencies = [ - sources."commander-2.17.1" + sources."commander-2.18.0" ]; }) sources."has-ansi-2.0.0" @@ -36012,7 +36205,7 @@ in sources."streamline-0.4.11" ]; }) - sources."lodash-4.17.10" + sources."lodash-4.17.11" sources."map-stream-0.1.0" sources."md5.js-1.3.4" sources."mime-db-1.36.0" @@ -36021,13 +36214,13 @@ in sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."moment-2.22.2" - (sources."ms-rest-2.3.6" // { + (sources."ms-rest-2.3.7" // { dependencies = [ sources."through-2.3.8" sources."tunnel-0.0.5" ]; }) - (sources."ms-rest-azure-2.5.7" // { + (sources."ms-rest-azure-2.5.9" // { dependencies = [ sources."async-2.6.0" ]; @@ -36083,7 +36276,11 @@ in sources."assert-plus-1.0.0" sources."aws-sign2-0.7.0" sources."caseless-0.12.0" - sources."form-data-2.3.2" + (sources."form-data-2.3.2" // { + dependencies = [ + sources."combined-stream-1.0.6" + ]; + }) sources."har-validator-5.1.0" sources."http-signature-1.2.0" sources."oauth-sign-0.9.0" @@ -36260,7 +36457,7 @@ in ]; }) sources."ms-2.0.0" - sources."natives-1.1.4" + sources."natives-1.1.5" sources."normalize-package-data-2.4.0" sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" @@ -36292,10 +36489,10 @@ in sources."signal-exit-3.0.2" sources."sort-keys-1.1.2" sources."sort-keys-length-1.0.1" - sources."spdx-correct-3.0.0" + sources."spdx-correct-3.0.1" sources."spdx-exceptions-2.1.0" sources."spdx-expression-parse-3.0.0" - sources."spdx-license-ids-3.0.0" + sources."spdx-license-ids-3.0.1" sources."sprintf-js-1.0.3" sources."strip-bom-2.0.0" sources."strip-indent-1.0.1" @@ -36320,14 +36517,14 @@ in browserify = nodeEnv.buildNodePackage { name = "browserify"; packageName = "browserify"; - version = "16.2.2"; + version = "16.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/browserify/-/browserify-16.2.2.tgz"; - sha512 = "fMES05wq1Oukts6ksGUU2TMVHHp06LyQt0SIwbXIHm7waSrQmNBZePsU0iM/4f94zbvb/wHma+D1YrdzWYnF/A=="; + url = "https://registry.npmjs.org/browserify/-/browserify-16.2.3.tgz"; + sha512 = "zQt/Gd1+W+IY+h/xX2NYMW4orQWhqSwyV+xsblycTtpOuB27h1fZhhNQuipJ4t79ohw4P4mMem0jp/ZkISQtjQ=="; }; dependencies = [ sources."JSONStream-1.3.4" - sources."acorn-5.7.2" + sources."acorn-5.7.3" sources."acorn-dynamic-import-3.0.0" sources."acorn-node-1.5.2" sources."array-filter-0.0.1" @@ -36428,7 +36625,7 @@ in sources."path-is-absolute-1.0.1" sources."path-parse-1.0.6" sources."path-platform-0.11.15" - sources."pbkdf2-3.0.16" + sources."pbkdf2-3.0.17" sources."process-0.11.10" sources."process-nextick-args-2.0.0" sources."public-encrypt-4.0.2" @@ -36552,7 +36749,7 @@ in sources."codepage-1.4.0" sources."colour-0.7.1" sources."combined-stream-0.0.7" - sources."commander-2.17.1" + sources."commander-2.18.0" sources."compact2string-1.4.0" sources."concat-map-0.0.1" (sources."concat-stream-1.6.2" // { @@ -36648,7 +36845,8 @@ in sources."map-obj-1.0.1" (sources."mdns-js-1.0.1" // { dependencies = [ - sources."debug-3.1.0" + sources."debug-3.2.5" + sources."ms-2.1.1" ]; }) (sources."meow-3.7.0" // { @@ -36797,10 +36995,10 @@ in }) sources."single-line-log-0.4.1" sources."sntp-0.1.4" - sources."spdx-correct-3.0.0" + sources."spdx-correct-3.0.1" sources."spdx-exceptions-2.1.0" sources."spdx-expression-parse-3.0.0" - sources."spdx-license-ids-3.0.0" + sources."spdx-license-ids-3.0.1" sources."speedometer-0.1.4" sources."srt2vtt-1.3.1" sources."stream-transcoder-0.0.5" @@ -36817,7 +37015,7 @@ in sources."time-line-1.0.1" sources."torrent-discovery-5.4.0" sources."torrent-piece-1.1.2" - (sources."torrent-stream-1.0.4" // { + (sources."torrent-stream-1.1.0" // { dependencies = [ sources."end-of-stream-0.1.5" sources."magnet-uri-4.2.3" @@ -36919,10 +37117,10 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."colors-1.3.2" - sources."commander-2.17.1" + sources."commander-2.18.0" sources."debug-3.1.0" sources."escape-string-regexp-1.0.5" - sources."follow-redirects-1.5.7" + sources."follow-redirects-1.5.8" sources."has-flag-3.0.0" sources."humanize-plus-1.8.2" sources."is-buffer-1.1.6" @@ -36986,24 +37184,27 @@ in cordova = nodeEnv.buildNodePackage { name = "cordova"; packageName = "cordova"; - version = "8.0.0"; + version = "8.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/cordova/-/cordova-8.0.0.tgz"; - sha1 = "2e8446d9493caafd870b1090785e7f03e2ae6a43"; + url = "https://registry.npmjs.org/cordova/-/cordova-8.1.1.tgz"; + sha512 = "YmsGlgz8yiPFcRphTW3LO+6YaCZU5FmoVMOxIti5tbd4Td3JiXiJblpklijryc7jCY6B6seifu9xCVCpfc0AMA=="; }; dependencies = [ sources."JSONStream-1.3.4" sources."abbrev-1.1.1" sources."accepts-1.3.5" - sources."acorn-5.7.2" + sources."acorn-5.7.3" sources."acorn-dynamic-import-3.0.0" sources."acorn-node-1.5.2" + sources."ajv-5.5.2" sources."aliasify-2.1.0" sources."ansi-0.3.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."array-filter-0.0.1" + sources."array-find-index-1.0.2" sources."array-flatten-1.1.1" sources."array-map-0.0.0" sources."array-reduce-0.0.0" @@ -37015,20 +37216,24 @@ in sources."util-0.10.3" ]; }) - sources."assert-plus-0.2.0" + sources."assert-plus-1.0.0" sources."async-1.5.2" sources."asynckit-0.4.0" - sources."aws-sign2-0.6.0" + sources."aws-sign2-0.7.0" sources."aws4-1.8.0" sources."balanced-match-1.0.0" sources."base64-js-1.2.0" sources."bcrypt-pbkdf-1.0.2" - sources."big-integer-1.6.35" - sources."block-stream-0.0.9" + sources."big-integer-1.6.36" sources."bn.js-4.11.8" sources."body-parser-1.18.2" - sources."boom-2.10.1" - sources."bplist-creator-0.0.7" + (sources."boxen-1.3.0" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."chalk-2.4.1" + sources."supports-color-5.5.0" + ]; + }) sources."bplist-parser-0.1.1" sources."brace-expansion-1.1.11" sources."brorand-1.1.0" @@ -37058,16 +37263,23 @@ in sources."builtins-1.0.3" sources."bytes-3.0.0" sources."cached-path-relative-1.0.1" - sources."caseless-0.11.0" + sources."camelcase-4.1.0" + sources."capture-stack-trace-1.0.1" + sources."caseless-0.12.0" sources."chalk-1.1.3" + sources."chownr-1.1.1" + sources."ci-info-1.6.0" sources."cipher-base-1.0.4" + sources."cli-boxes-1.0.0" sources."cli-cursor-1.0.2" sources."cli-width-1.1.1" + sources."co-4.6.0" sources."code-point-at-1.1.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" sources."combine-source-map-0.8.0" - sources."combined-stream-1.0.6" - sources."commander-2.17.1" - sources."compressible-2.0.14" + sources."combined-stream-1.0.7" + sources."compressible-2.0.15" sources."compression-1.7.3" sources."concat-map-0.0.1" (sources."concat-stream-1.5.2" // { @@ -37077,7 +37289,7 @@ in sources."string_decoder-0.10.31" ]; }) - sources."configstore-2.1.0" + sources."configstore-3.1.2" sources."console-browserify-1.1.0" sources."constants-browserify-1.0.0" sources."content-disposition-0.5.2" @@ -37093,37 +37305,35 @@ in sources."shelljs-0.3.0" ]; }) - (sources."cordova-fetch-1.3.0" // { + (sources."cordova-fetch-1.3.1" // { dependencies = [ sources."glob-7.1.3" sources."shelljs-0.7.8" ]; }) sources."cordova-js-4.2.4" - (sources."cordova-lib-8.0.0" // { + (sources."cordova-lib-8.1.0" // { dependencies = [ sources."base64-js-1.1.2" - sources."glob-7.1.1" - sources."nopt-4.0.1" + sources."elementtree-0.1.7" + sources."glob-7.1.3" sources."plist-2.0.1" - sources."q-1.0.1" + sources."sax-1.1.4" sources."shelljs-0.3.0" - sources."underscore-1.8.3" ]; }) sources."cordova-registry-mapper-1.1.15" sources."cordova-serve-2.0.1" sources."core-util-is-1.0.2" sources."create-ecdh-4.0.3" + sources."create-error-class-3.0.2" sources."create-hash-1.2.0" sources."create-hmac-1.1.7" - sources."cryptiles-2.0.5" + sources."cross-spawn-5.1.0" sources."crypto-browserify-3.12.0" - (sources."dashdash-1.14.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."crypto-random-string-1.0.0" + sources."currently-unhandled-0.4.1" + sources."dashdash-1.14.1" sources."date-now-0.1.4" sources."debug-2.6.9" sources."deep-extend-0.6.0" @@ -37147,21 +37357,21 @@ in sources."detective-4.7.1" sources."diffie-hellman-5.0.3" sources."domain-browser-1.1.7" - sources."dot-prop-3.0.0" + sources."dot-prop-4.2.0" sources."duplexer2-0.1.4" - sources."duplexify-3.6.0" + sources."duplexer3-0.1.4" sources."ecc-jsbn-0.1.2" sources."editor-1.0.0" sources."ee-first-1.1.1" sources."elementtree-0.1.6" sources."elliptic-6.4.1" sources."encodeurl-1.0.2" - sources."end-of-stream-1.4.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" sources."etag-1.8.1" sources."events-1.1.1" sources."evp_bytestokey-1.0.3" + sources."execa-0.7.0" sources."exit-hook-1.1.1" (sources."express-4.16.3" // { dependencies = [ @@ -37171,49 +37381,47 @@ in sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."falafel-2.1.0" + sources."fast-deep-equal-1.1.0" + sources."fast-json-stable-stringify-2.0.0" sources."figures-1.7.0" sources."finalhandler-1.1.1" sources."foreach-2.0.5" sources."forever-agent-0.6.1" - sources."form-data-2.1.4" + (sources."form-data-2.3.2" // { + dependencies = [ + sources."combined-stream-1.0.6" + ]; + }) sources."forwarded-0.1.2" sources."fresh-0.5.2" + sources."fs-minipass-1.2.5" sources."fs.realpath-1.0.0" - sources."fstream-1.0.11" sources."function-bind-1.1.1" - sources."generate-function-2.3.1" - sources."generate-object-property-1.2.0" sources."get-assigned-identifiers-1.2.0" - (sources."getpass-0.1.7" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."get-stream-3.0.0" + sources."getpass-0.1.7" sources."glob-5.0.15" - (sources."got-3.3.1" // { - dependencies = [ - sources."object-assign-3.0.0" - ]; - }) + sources."global-dirs-0.1.1" + sources."got-6.7.1" sources."graceful-fs-4.1.11" - sources."har-validator-2.0.6" + sources."har-schema-2.0.0" + sources."har-validator-5.1.0" sources."has-1.0.3" sources."has-ansi-2.0.0" + sources."has-flag-3.0.0" sources."hash-base-3.0.4" sources."hash.js-1.1.5" - sources."hawk-3.1.3" sources."hmac-drbg-1.0.1" - sources."hoek-2.16.3" sources."hosted-git-info-2.7.1" sources."htmlescape-1.1.1" sources."http-errors-1.6.3" - sources."http-signature-1.1.1" + sources."http-signature-1.2.0" sources."https-browserify-1.0.0" sources."iconv-lite-0.4.19" sources."ieee754-1.1.12" + 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" @@ -37236,51 +37444,57 @@ in sources."uuid-2.0.3" ]; }) - sources."uuid-3.3.2" + sources."write-file-atomic-1.3.4" + sources."xdg-basedir-2.0.0" ]; }) sources."interpret-1.1.0" sources."ipaddr.js-1.8.0" sources."is-buffer-1.1.6" sources."is-builtin-module-1.0.0" - sources."is-finite-1.0.2" + sources."is-ci-1.2.1" sources."is-fullwidth-code-point-1.0.0" - sources."is-my-ip-valid-1.0.0" - sources."is-my-json-valid-2.19.0" + sources."is-git-url-1.0.0" + sources."is-installed-globally-0.1.0" sources."is-npm-1.0.0" sources."is-obj-1.0.1" - sources."is-property-1.0.2" + sources."is-path-inside-1.0.1" 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-url-1.2.4" sources."is-wsl-1.1.0" sources."isarray-0.0.1" + sources."isexe-2.0.0" sources."isstream-0.1.2" sources."jsbn-0.1.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-0.0.1" sources."json-stringify-safe-5.0.1" sources."jsonify-0.0.0" sources."jsonparse-1.3.1" - sources."jsonpointer-4.0.1" - (sources."jsprim-1.4.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."jsprim-1.4.1" (sources."labeled-stream-splicer-2.0.1" // { dependencies = [ sources."isarray-2.0.4" ]; }) - sources."latest-version-1.0.1" + sources."latest-version-3.1.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."loud-rejection-1.6.0" sources."lowercase-keys-1.0.1" + (sources."lru-cache-4.1.3" // { + dependencies = [ + sources."yallist-2.1.2" + ]; + }) + sources."make-dir-1.3.0" sources."md5.js-1.3.4" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" @@ -37292,50 +37506,54 @@ in sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.4" - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" + sources."minimist-1.2.0" + sources."minipass-2.3.4" + sources."minizlib-1.1.0" + (sources."mkdirp-0.5.1" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) sources."module-deps-4.1.1" sources."ms-2.0.0" sources."mute-stream-0.0.7" sources."negotiator-0.6.1" - sources."nested-error-stacks-1.0.2" - sources."nopt-3.0.1" + sources."nopt-4.0.1" sources."normalize-package-data-2.4.0" sources."npm-package-arg-6.1.0" + sources."npm-run-path-2.0.2" sources."number-is-nan-1.0.1" - sources."oauth-sign-0.8.2" + sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" sources."object-keys-1.0.12" sources."on-finished-2.3.0" sources."on-headers-1.0.1" sources."once-1.4.0" sources."onetime-1.1.0" - sources."opener-1.4.2" - sources."opn-5.3.0" + sources."opener-1.5.1" + sources."opn-5.4.0" sources."os-browserify-0.1.2" sources."os-homedir-1.0.2" sources."os-name-1.0.3" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" - (sources."osx-release-1.1.0" // { - dependencies = [ - sources."minimist-1.2.0" - ]; - }) - sources."package-json-1.2.0" + sources."osx-release-1.1.0" + sources."p-finally-1.0.0" + sources."package-json-4.0.1" sources."pako-0.2.9" sources."parents-1.0.1" sources."parse-asn1-5.1.1" sources."parseurl-1.3.2" sources."path-browserify-0.0.1" 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.6" sources."path-platform-0.11.15" sources."path-to-regexp-0.1.7" - sources."pbkdf2-3.0.16" - sources."pegjs-0.10.0" - sources."pinkie-2.0.4" - sources."pinkie-promise-2.0.1" + sources."pbkdf2-3.0.17" + sources."performance-now-2.1.0" + sources."pify-3.0.0" sources."plist-2.1.0" sources."prepend-http-1.0.4" sources."process-0.11.10" @@ -37343,6 +37561,8 @@ in sources."promzard-0.3.0" sources."properties-parser-0.3.1" sources."proxy-addr-2.0.4" + sources."pseudomap-1.0.2" + sources."psl-1.1.29" sources."public-encrypt-4.0.2" sources."punycode-1.4.1" sources."q-1.5.1" @@ -37359,13 +37579,9 @@ in sources."setprototypeof-1.0.3" ]; }) - (sources."rc-1.2.8" // { - dependencies = [ - sources."minimist-1.2.0" - ]; - }) + sources."rc-1.2.8" sources."read-1.0.7" - sources."read-all-stream-3.1.0" + sources."read-chunk-2.1.0" sources."read-only-stream-2.0.0" (sources."read-package-json-2.0.13" // { dependencies = [ @@ -37385,21 +37601,15 @@ in ]; }) sources."rechoir-0.6.2" + sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" - sources."repeating-1.1.3" - (sources."request-2.79.0" // { + (sources."request-2.88.0" // { dependencies = [ - sources."qs-6.3.2" - sources."uuid-3.3.2" + sources."qs-6.5.2" ]; }) sources."resolve-1.8.1" sources."restore-cursor-1.0.1" - (sources."rimraf-2.6.2" // { - dependencies = [ - sources."glob-7.1.3" - ]; - }) sources."ripemd160-2.0.2" sources."run-async-0.1.0" sources."rx-lite-3.1.2" @@ -37413,68 +37623,65 @@ in sources."setprototypeof-1.1.0" sources."sha.js-2.4.11" sources."shasum-1.0.2" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" sources."shell-quote-1.6.1" sources."shelljs-0.5.3" + sources."signal-exit-3.0.2" sources."simple-concat-1.0.0" - (sources."simple-plist-0.2.1" // { - dependencies = [ - sources."base64-js-1.1.2" - sources."plist-2.0.1" - ]; - }) sources."slash-1.0.0" sources."slide-1.1.6" - sources."sntp-1.0.9" sources."source-map-0.5.7" - sources."spdx-correct-3.0.0" + sources."spdx-correct-3.0.1" sources."spdx-exceptions-2.1.0" sources."spdx-expression-parse-3.0.0" - sources."spdx-license-ids-3.0.0" - (sources."sshpk-1.14.2" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."spdx-license-ids-3.0.1" + sources."sshpk-1.14.2" 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.3" - sources."stream-shift-1.0.0" sources."stream-splicer-2.0.0" - sources."string-length-1.0.1" + (sources."string-width-2.1.1" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."is-fullwidth-code-point-2.0.0" + sources."strip-ansi-4.0.0" + ]; + }) sources."string.prototype.codepointat-0.2.1" sources."string_decoder-1.0.3" - sources."stringstream-0.0.6" sources."strip-ansi-3.0.1" + sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" - (sources."subarg-1.0.0" // { - dependencies = [ - sources."minimist-1.2.0" - ]; - }) + sources."subarg-1.0.0" sources."supports-color-2.0.0" sources."syntax-error-1.4.0" - sources."tar-2.2.1" + sources."tar-4.4.6" + sources."term-size-1.2.0" sources."through-2.3.8" sources."through2-2.0.3" - sources."timed-out-2.0.0" + sources."timed-out-4.0.1" sources."timers-browserify-1.4.2" sources."to-arraybuffer-1.0.1" - sources."tough-cookie-2.3.4" + sources."tough-cookie-2.4.3" sources."tty-browserify-0.0.1" - sources."tunnel-agent-0.4.3" + sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.16" sources."typedarray-0.0.6" sources."umd-3.0.3" sources."undeclared-identifiers-1.1.2" sources."underscore-1.9.1" + sources."unique-string-1.0.0" sources."unorm-1.4.1" sources."unpipe-1.0.0" - (sources."update-notifier-0.5.0" // { + sources."unzip-response-2.0.1" + (sources."update-notifier-2.5.0" // { dependencies = [ - sources."configstore-1.4.0" + sources."ansi-styles-3.2.1" + sources."chalk-2.4.1" + sources."supports-color-5.5.0" ]; }) (sources."url-0.11.0" // { @@ -37482,32 +37689,27 @@ in sources."punycode-1.3.2" ]; }) + sources."url-parse-lax-1.0.0" sources."util-0.10.4" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" - sources."uuid-2.0.3" + sources."uuid-3.3.2" sources."valid-identifier-0.0.1" sources."validate-npm-package-license-3.0.4" sources."validate-npm-package-name-3.0.0" sources."vary-1.1.2" - (sources."verror-1.10.0" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."verror-1.10.0" sources."vm-browserify-0.0.4" + sources."which-1.3.1" + sources."widest-line-2.0.0" sources."win-release-1.1.1" sources."wrappy-1.0.2" - sources."write-file-atomic-1.3.4" - (sources."xcode-1.0.0" // { - dependencies = [ - sources."uuid-3.0.1" - ]; - }) - sources."xdg-basedir-2.0.0" + sources."write-file-atomic-2.3.0" + sources."xdg-basedir-3.0.0" sources."xmlbuilder-8.2.2" sources."xmldom-0.1.27" sources."xtend-4.0.1" + sources."yallist-3.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -37537,7 +37739,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.0" - sources."@types/node-10.9.4" + sources."@types/node-10.11.2" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.1.0" sources."ansi-regex-2.1.1" @@ -37564,7 +37766,7 @@ in sources."custom-error-instance-2.1.1" sources."cycle-onionify-4.0.0" sources."d-1.0.0" - sources."debug-3.1.0" + sources."debug-3.2.5" sources."delayed-stream-1.0.0" sources."es5-ext-0.10.46" sources."es6-iterator-2.0.3" @@ -37592,7 +37794,7 @@ in sources."is-promise-2.1.0" sources."isarray-1.0.0" sources."isexe-2.0.0" - sources."lodash-4.17.10" + sources."lodash-4.17.11" sources."lodash._baseiteratee-4.7.0" sources."lodash._basetostring-4.12.0" sources."lodash._baseuniq-4.6.0" @@ -37607,7 +37809,7 @@ in sources."mime-types-2.1.20" sources."mimic-fn-1.2.0" sources."minimist-1.2.0" - sources."ms-2.0.0" + sources."ms-2.1.1" sources."mute-stream-0.0.7" sources."next-tick-1.0.0" sources."object-assign-4.1.1" @@ -37670,7 +37872,7 @@ in packageName = "create-react-app"; version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/create-react-app/-/create-react-app-1.5.2.tgz"; + url = "http://registry.npmjs.org/create-react-app/-/create-react-app-1.5.2.tgz"; sha512 = "vnYIzsfTaqai2l07P9qtxhsZgHbzirC2omxKmf16wqvpXao9CNCDmpk+BCZRElih7HTn/mpO3soe8DTZV4DsgQ=="; }; dependencies = [ @@ -37682,7 +37884,7 @@ in sources."buffer-from-0.1.2" sources."builtins-1.0.3" sources."chalk-1.1.3" - sources."commander-2.17.1" + sources."commander-2.18.0" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" sources."cross-spawn-4.0.2" @@ -37762,10 +37964,10 @@ in create-react-native-app = nodeEnv.buildNodePackage { name = "create-react-native-app"; packageName = "create-react-native-app"; - version = "1.0.0"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/create-react-native-app/-/create-react-native-app-1.0.0.tgz"; - sha1 = "fc6046f4407bde2727ce0c4eb1354bb1a8c0f9e6"; + url = "https://registry.npmjs.org/create-react-native-app/-/create-react-native-app-2.0.2.tgz"; + sha512 = "xsPgOifP3TJtd+UvqhB4X9amYJq548m8vupcqBukWll2gi3UBu2KigWNtASwVUd6UTYlrJHw3g5Bow9c+/UBmQ=="; }; dependencies = [ sources."ansi-styles-3.2.1" @@ -37888,7 +38090,7 @@ in sources."capture-stack-trace-1.0.1" sources."caseless-0.12.0" sources."chalk-2.4.1" - sources."ci-info-1.4.0" + sources."ci-info-1.6.0" sources."circular-append-file-1.0.1" sources."cli-boxes-1.0.0" sources."cli-spinners-1.3.1" @@ -37899,7 +38101,7 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."colors-1.3.2" - sources."combined-stream-1.0.6" + sources."combined-stream-1.0.7" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" sources."configstore-3.1.2" @@ -37932,12 +38134,16 @@ in sources."neat-log-2.4.0" ]; }) - sources."dat-node-3.5.12" + sources."dat-node-3.5.13" sources."dat-registry-4.0.0" sources."dat-secret-storage-4.0.1" - sources."dat-storage-1.0.4" + sources."dat-storage-1.1.1" sources."dat-swarm-defaults-1.0.1" - sources."debug-3.1.0" + (sources."debug-3.2.5" // { + dependencies = [ + sources."ms-2.1.1" + ]; + }) sources."deep-equal-0.2.2" sources."deep-extend-0.6.0" sources."delayed-stream-1.0.0" @@ -37950,7 +38156,7 @@ in ]; }) sources."discovery-swarm-5.1.2" - (sources."dns-discovery-6.1.0" // { + (sources."dns-discovery-6.2.2" // { dependencies = [ sources."debug-2.6.9" sources."lru-2.0.1" @@ -37984,7 +38190,11 @@ in sources."for-in-1.0.2" sources."for-own-0.1.5" sources."forever-agent-0.6.1" - sources."form-data-2.3.2" + (sources."form-data-2.3.2" // { + dependencies = [ + sources."combined-stream-1.0.6" + ]; + }) sources."from2-2.3.0" sources."fs.realpath-1.0.0" sources."get-stream-3.0.0" @@ -38001,14 +38211,14 @@ in sources."has-flag-3.0.0" sources."http-methods-0.1.0" sources."http-signature-1.2.0" - (sources."hypercore-6.18.2" // { + (sources."hypercore-6.19.1" // { dependencies = [ sources."process-nextick-args-1.0.7" sources."unordered-set-2.0.1" ]; }) sources."hypercore-crypto-1.0.0" - (sources."hypercore-protocol-6.6.4" // { + (sources."hypercore-protocol-6.7.1" // { dependencies = [ sources."varint-5.0.0" ]; @@ -38026,7 +38236,7 @@ in sources."ip-1.1.5" sources."is-buffer-1.1.6" sources."is-callable-1.1.4" - sources."is-ci-1.2.0" + sources."is-ci-1.2.1" sources."is-dotfile-1.0.3" sources."is-equal-shallow-0.1.3" sources."is-extendable-0.1.1" @@ -38097,14 +38307,14 @@ in }) sources."ms-2.0.0" sources."multi-random-access-2.1.1" - sources."multicast-dns-7.0.1" + sources."multicast-dns-7.2.0" sources."multicb-1.2.2" sources."multistream-2.1.1" sources."mute-stream-0.0.7" sources."mutexify-1.2.0" sources."nan-2.11.0" sources."nanoassert-1.1.0" - sources."nanobus-4.3.3" + sources."nanobus-4.3.4" sources."nanoscheduler-1.0.3" sources."nanotiming-7.3.1" sources."ncp-1.0.1" @@ -38191,7 +38401,7 @@ in sources."siphash24-1.1.1" sources."slice-ansi-1.0.0" sources."sodium-javascript-0.5.5" - sources."sodium-native-2.2.1" + sources."sodium-native-2.2.2" sources."sodium-universal-2.0.0" sources."sorted-array-functions-1.2.0" sources."sorted-indexof-1.0.0" @@ -38572,7 +38782,7 @@ in ]; }) sources."string_decoder-0.10.31" - (sources."tar-stream-1.6.1" // { + (sources."tar-stream-1.6.2" // { dependencies = [ sources."bl-1.2.2" sources."isarray-1.0.0" @@ -38608,10 +38818,10 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "3.3.19"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.3.19.tgz"; - sha512 = "vGWC/duKn+EgF3wQMQa2x21w1L1KTqKNydAvw0e2kShD1n/iNVekeF1e8juND/ttZW4yDvHLp4y10ZfoZ4st/Q=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.4.0.tgz"; + sha512 = "DHK6WpqZf5VTW9PK2UjkRADDacT6c2fsHFCy0pQ8c1VYUWz/zI5OGzBBPg5HTZbvTgY+AXJ3JHUB3E7Esktlog=="; }; dependencies = [ sources."JSONStream-1.3.4" @@ -38620,7 +38830,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.1" sources."asynckit-0.4.0" - sources."aws-sdk-2.307.0" + sources."aws-sdk-2.325.0" sources."aws-sign2-0.7.0" sources."aws4-1.8.0" sources."base64-js-1.3.0" @@ -38628,7 +38838,7 @@ in sources."buffer-4.9.1" sources."caseless-0.12.0" sources."co-4.6.0" - sources."combined-stream-1.0.6" + sources."combined-stream-1.0.7" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" sources."decimal.js-10.0.1" @@ -38640,7 +38850,11 @@ in 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.2" + (sources."form-data-2.3.2" // { + dependencies = [ + sources."combined-stream-1.0.6" + ]; + }) sources."getpass-0.1.7" sources."har-schema-2.0.0" sources."har-validator-5.1.0" @@ -38657,7 +38871,7 @@ in sources."json-stringify-safe-5.0.1" sources."jsonparse-1.3.1" sources."jsprim-1.4.1" - sources."lodash-4.17.10" + sources."lodash-4.17.11" sources."lossless-json-1.0.3" sources."mime-db-1.36.0" sources."mime-types-2.1.20" @@ -38733,21 +38947,35 @@ in sources."anymatch-1.3.2" sources."arr-diff-2.0.0" sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" sources."array-unique-0.2.1" sources."asn1-0.2.4" sources."assert-plus-0.2.0" + sources."assign-symbols-1.0.0" sources."async-each-1.0.1" sources."asynckit-0.4.0" + sources."atob-2.1.2" sources."aws-sign2-0.6.0" sources."aws4-1.8.0" sources."balanced-match-1.0.0" + (sources."base-0.11.2" // { + dependencies = [ + sources."define-property-1.0.0" + sources."isobject-3.0.1" + ]; + }) sources."bcrypt-pbkdf-1.0.2" - sources."binary-extensions-1.11.0" + sources."binary-extensions-1.12.0" sources."binstall-1.2.0" sources."block-stream-0.0.9" sources."boom-2.10.1" sources."brace-expansion-1.1.11" sources."braces-1.8.5" + (sources."cache-base-1.0.1" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) sources."caseless-0.11.0" (sources."chalk-2.1.0" // { dependencies = [ @@ -38755,11 +38983,32 @@ in ]; }) sources."chokidar-1.6.0" + (sources."class-utils-0.3.6" // { + dependencies = [ + sources."define-property-0.2.5" + (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."isobject-3.0.1" + sources."kind-of-5.1.0" + ]; + }) + sources."collection-visit-1.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."combined-stream-1.0.6" - sources."commander-2.17.1" + sources."combined-stream-1.0.7" + sources."commander-2.18.0" + sources."component-emitter-1.2.1" sources."concat-map-0.0.1" + sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" sources."cross-spawn-4.0.0" sources."cryptiles-2.0.5" @@ -38768,12 +39017,24 @@ in sources."assert-plus-1.0.0" ]; }) + sources."debug-2.6.9" + sources."decode-uri-component-0.2.0" + (sources."define-property-2.0.2" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.2" sources."escape-string-regexp-1.0.5" sources."expand-brackets-0.1.5" sources."expand-range-1.8.2" sources."extend-3.0.2" + (sources."extend-shallow-3.0.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) sources."extglob-0.3.2" sources."extsprintf-1.3.0" sources."filename-regex-2.0.1" @@ -38790,12 +39051,14 @@ in sources."for-own-0.1.5" sources."forever-agent-0.6.1" sources."form-data-2.1.4" + sources."fragment-cache-0.2.1" sources."fs-extra-0.30.0" sources."fs.realpath-1.0.0" sources."fsevents-1.1.2" sources."fstream-1.0.11" sources."generate-function-2.3.1" sources."generate-object-property-1.2.0" + sources."get-value-2.0.6" (sources."getpass-0.1.7" // { dependencies = [ sources."assert-plus-1.0.0" @@ -38813,13 +39076,43 @@ in }) sources."has-ansi-2.0.0" sources."has-flag-2.0.0" + (sources."has-value-1.0.0" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) + (sources."has-values-1.0.0" // { + dependencies = [ + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."kind-of-4.0.0" + ]; + }) sources."hawk-3.1.3" sources."hoek-2.16.3" sources."http-signature-1.1.1" sources."inflight-1.0.6" sources."inherits-2.0.3" + (sources."is-accessor-descriptor-1.0.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" + (sources."is-data-descriptor-1.0.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + (sources."is-descriptor-1.0.2" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) sources."is-dotfile-1.0.3" sources."is-equal-shallow-0.1.3" sources."is-extendable-0.1.1" @@ -38828,10 +39121,16 @@ in sources."is-my-ip-valid-1.0.0" sources."is-my-json-valid-2.19.0" sources."is-number-2.1.0" + (sources."is-plain-object-2.0.4" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) sources."is-posix-bracket-0.1.1" sources."is-primitive-2.0.0" sources."is-property-1.0.2" sources."is-typedarray-1.0.0" + sources."is-windows-1.0.2" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-2.1.0" @@ -38850,19 +39149,34 @@ in sources."klaw-1.3.1" sources."lodash-4.13.1" sources."lru-cache-4.1.3" + sources."map-cache-0.2.2" + sources."map-visit-1.0.0" sources."math-random-1.0.1" sources."micromatch-2.3.11" sources."mime-db-1.36.0" sources."mime-types-2.1.20" sources."minimatch-3.0.4" sources."minimist-1.2.0" + (sources."mixin-deep-1.3.1" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" ]; }) + sources."ms-2.0.0" sources."murmur-hash-js-1.0.0" sources."nan-2.11.0" + (sources."nanomatch-1.2.13" // { + dependencies = [ + sources."arr-diff-4.0.0" + sources."array-unique-0.3.2" + sources."kind-of-6.0.2" + ]; + }) (sources."node-elm-compiler-4.3.3" // { dependencies = [ sources."lodash-4.14.2" @@ -38870,13 +39184,37 @@ in }) sources."normalize-path-2.1.1" sources."oauth-sign-0.8.2" + (sources."object-copy-0.1.0" // { + dependencies = [ + sources."define-property-0.2.5" + sources."is-accessor-descriptor-0.1.6" + sources."is-data-descriptor-0.1.4" + (sources."is-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + ]; + }) + (sources."object-visit-1.0.1" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) sources."object.omit-2.0.1" + (sources."object.pick-1.3.0" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) sources."once-1.4.0" sources."os-tmpdir-1.0.2" sources."parse-glob-3.0.4" + sources."pascalcase-0.1.1" sources."path-is-absolute-1.0.1" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" + sources."posix-character-classes-0.1.1" sources."preserve-0.2.0" sources."process-nextick-args-2.0.0" sources."pseudomap-1.0.2" @@ -38889,23 +39227,127 @@ in ]; }) sources."readable-stream-2.3.6" - sources."readdirp-2.1.0" + (sources."readdirp-2.2.1" // { + dependencies = [ + sources."arr-diff-4.0.0" + sources."array-unique-0.3.2" + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + ]; + }) + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + ]; + }) + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (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" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."isobject-3.0.1" + sources."kind-of-6.0.2" + sources."micromatch-3.1.10" + ]; + }) sources."regex-cache-0.4.4" + sources."regex-not-1.0.2" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" sources."request-2.79.0" + sources."resolve-url-0.2.1" + sources."ret-0.1.15" sources."rimraf-2.6.2" sources."safe-buffer-5.1.2" + sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - sources."set-immediate-shim-1.0.1" + (sources."set-value-2.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (sources."snapdragon-0.8.2" // { + dependencies = [ + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (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."kind-of-5.1.0" + ]; + }) + (sources."snapdragon-node-2.1.1" // { + dependencies = [ + sources."define-property-1.0.0" + sources."isobject-3.0.1" + ]; + }) + sources."snapdragon-util-3.0.1" sources."sntp-1.0.9" + sources."source-map-0.5.7" + sources."source-map-resolve-0.5.2" + sources."source-map-url-0.4.0" sources."split-1.0.1" + sources."split-string-3.1.0" (sources."sshpk-1.14.2" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) + (sources."static-extend-0.1.2" // { + dependencies = [ + sources."define-property-0.2.5" + (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."kind-of-5.1.0" + ]; + }) sources."string_decoder-1.1.1" sources."stringstream-0.0.6" sources."strip-ansi-3.0.1" @@ -38917,9 +39359,35 @@ in ]; }) sources."through-2.3.8" + sources."to-object-path-0.3.0" + sources."to-regex-3.0.2" + (sources."to-regex-range-2.1.1" // { + dependencies = [ + sources."is-number-3.0.0" + ]; + }) sources."tough-cookie-2.3.4" sources."tunnel-agent-0.4.3" sources."tweetnacl-0.14.5" + (sources."union-value-1.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + 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."has-values-0.1.4" + sources."isobject-3.0.1" + ]; + }) + sources."urix-0.1.0" + sources."use-3.1.1" sources."util-deprecate-1.0.2" sources."uuid-3.3.2" (sources."verror-1.10.0" // { @@ -38995,7 +39463,7 @@ in sources."color-name-1.1.3" sources."concat-map-0.0.1" sources."conf-1.4.0" - sources."convert-source-map-1.5.1" + sources."convert-source-map-1.6.0" sources."core-js-2.5.7" sources."cross-spawn-5.1.0" sources."currently-unhandled-0.4.1" @@ -39055,7 +39523,7 @@ in ]; }) sources."locate-path-2.0.0" - sources."lodash-4.17.10" + sources."lodash-4.17.11" sources."lodash.debounce-4.0.8" sources."lodash.flattendeep-4.4.0" sources."lodash.isequal-4.5.0" @@ -39134,10 +39602,10 @@ in sources."slash-1.0.0" sources."source-map-0.5.7" sources."source-map-support-0.4.18" - sources."spdx-correct-3.0.0" + sources."spdx-correct-3.0.1" sources."spdx-exceptions-2.1.0" sources."spdx-expression-parse-3.0.0" - sources."spdx-license-ids-3.0.0" + sources."spdx-license-ids-3.0.1" (sources."string-width-2.1.1" // { dependencies = [ sources."strip-ansi-4.0.0" @@ -39181,17 +39649,17 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "5.5.0"; + version = "5.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-5.5.0.tgz"; - sha512 = "m+az4vYehIJgl1Z0gb25KnFXeqQRdNreYsei1jdvkd9bB+UNQD3fsuiC2AWSQ56P+/t++kFSINZXFbfai+krOw=="; + url = "https://registry.npmjs.org/eslint/-/eslint-5.6.1.tgz"; + sha512 = "hgrDtGWz368b7Wqf+v1Z69O3ZebNR0+GA7PtDdbmuz4rInFVUV9uw7whjZEiWyLzCjVb5Rs5WRN1TAS6eo7AYA=="; }; dependencies = [ sources."@babel/code-frame-7.0.0" sources."@babel/highlight-7.0.0" - sources."acorn-5.7.2" + sources."acorn-5.7.3" sources."acorn-jsx-4.1.1" - sources."ajv-6.5.3" + sources."ajv-6.5.4" sources."ajv-keywords-3.2.0" sources."ansi-escapes-3.1.0" sources."ansi-regex-3.0.0" @@ -39213,7 +39681,7 @@ in sources."color-name-1.1.3" sources."concat-map-0.0.1" sources."cross-spawn-6.0.5" - sources."debug-3.1.0" + sources."debug-4.0.1" sources."deep-is-0.1.3" sources."del-2.2.2" sources."doctrine-2.1.0" @@ -39259,12 +39727,12 @@ in sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."levn-0.3.0" - sources."lodash-4.17.10" + sources."lodash-4.17.11" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."ms-2.0.0" + sources."ms-2.1.1" sources."mute-stream-0.0.7" sources."natural-compare-1.4.0" sources."nice-try-1.0.5" @@ -39289,7 +39757,7 @@ in sources."restore-cursor-2.0.0" sources."rimraf-2.6.2" sources."run-async-2.3.0" - sources."rxjs-6.3.1" + sources."rxjs-6.3.3" sources."safer-buffer-2.1.2" sources."semver-5.5.1" sources."shebang-command-1.2.0" @@ -39325,17 +39793,17 @@ in eslint_d = nodeEnv.buildNodePackage { name = "eslint_d"; packageName = "eslint_d"; - version = "7.1.0"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint_d/-/eslint_d-7.1.0.tgz"; - sha512 = "NjFiFcKPEjDlleLlngMyVcD6oLu6L8BctLJ3saPZfC4yLD+AJteII5E8meGqTislKxiVMMWHWXed61siXz3mCA=="; + url = "https://registry.npmjs.org/eslint_d/-/eslint_d-7.1.1.tgz"; + sha512 = "kmFnV0ohxSzVNA7/axp4MlLX+uZEY8uDF70RCtrpFcSgEB8PE9mWStv4JJMfYfSVIaJdsZBkhzj8S+BLIN7A+w=="; }; dependencies = [ sources."@babel/code-frame-7.0.0" sources."@babel/highlight-7.0.0" - sources."acorn-5.7.2" + sources."acorn-5.7.3" sources."acorn-jsx-4.1.1" - sources."ajv-6.5.3" + sources."ajv-6.5.4" sources."ajv-keywords-3.2.0" sources."ansi-escapes-3.1.0" sources."ansi-regex-3.0.0" @@ -39357,12 +39825,12 @@ in sources."color-name-1.1.3" sources."concat-map-0.0.1" sources."cross-spawn-6.0.5" - sources."debug-3.1.0" + sources."debug-4.0.1" sources."deep-is-0.1.3" sources."del-2.2.2" sources."doctrine-2.1.0" sources."escape-string-regexp-1.0.5" - sources."eslint-5.5.0" + sources."eslint-5.6.1" sources."eslint-scope-4.0.0" sources."eslint-utils-1.3.1" sources."eslint-visitor-keys-1.0.0" @@ -39404,12 +39872,12 @@ in sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."levn-0.3.0" - sources."lodash-4.17.10" + sources."lodash-4.17.11" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."ms-2.0.0" + sources."ms-2.1.1" sources."mute-stream-0.0.7" sources."nanolru-1.0.0" sources."natural-compare-1.4.0" @@ -39437,7 +39905,7 @@ in sources."restore-cursor-2.0.0" sources."rimraf-2.6.2" sources."run-async-2.3.0" - sources."rxjs-6.3.1" + sources."rxjs-6.3.3" sources."safer-buffer-2.1.2" sources."semver-5.5.1" sources."shebang-command-1.2.0" @@ -39517,7 +39985,7 @@ in sources."co-4.6.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."combined-stream-1.0.6" + sources."combined-stream-1.0.7" sources."concat-stream-1.6.2" sources."core-util-is-1.0.2" sources."currently-unhandled-0.4.1" @@ -39527,7 +39995,7 @@ in sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.2" sources."error-ex-1.3.2" - sources."es6-promise-4.2.4" + sources."es6-promise-4.2.5" sources."escape-string-regexp-1.0.5" sources."exit-hook-1.1.1" sources."extend-3.0.2" @@ -39538,7 +40006,11 @@ in sources."fd-slicer-1.0.1" sources."find-up-1.1.2" sources."forever-agent-0.6.1" - sources."form-data-2.3.2" + (sources."form-data-2.3.2" // { + dependencies = [ + sources."combined-stream-1.0.6" + ]; + }) sources."fs-extra-1.0.0" sources."get-stdin-4.0.1" sources."getpass-0.1.7" @@ -39636,10 +40108,10 @@ in sources."safer-buffer-2.1.2" sources."semver-5.5.1" sources."signal-exit-3.0.2" - sources."spdx-correct-3.0.0" + sources."spdx-correct-3.0.1" sources."spdx-exceptions-2.1.0" sources."spdx-expression-parse-3.0.0" - sources."spdx-license-ids-3.0.0" + sources."spdx-license-ids-3.0.1" sources."sshpk-1.14.2" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" @@ -39708,11 +40180,20 @@ in sources."anymatch-1.3.2" sources."arr-diff-2.0.0" sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" sources."array-unique-0.2.1" + sources."assign-symbols-1.0.0" sources."async-0.2.10" sources."async-each-1.0.1" + sources."atob-2.1.2" sources."balanced-match-1.0.0" - sources."binary-extensions-1.11.0" + (sources."base-0.11.2" // { + dependencies = [ + sources."define-property-1.0.0" + sources."isobject-3.0.1" + ]; + }) + sources."binary-extensions-1.12.0" sources."brace-expansion-1.1.11" sources."braces-1.8.5" (sources."broadway-0.3.6" // { @@ -39721,19 +40202,52 @@ in sources."winston-0.8.0" ]; }) + (sources."cache-base-1.0.1" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) sources."caller-0.0.1" sources."chokidar-1.7.0" + (sources."class-utils-0.3.6" // { + dependencies = [ + sources."define-property-0.2.5" + (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."isobject-3.0.1" + sources."kind-of-5.1.0" + ]; + }) (sources."cliff-0.1.10" // { dependencies = [ sources."colors-1.0.3" ]; }) sources."clone-1.0.4" + sources."collection-visit-1.0.0" sources."colors-0.6.2" + sources."component-emitter-1.2.1" sources."concat-map-0.0.1" + sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" sources."cycle-1.0.3" + sources."debug-2.6.9" + sources."decode-uri-component-0.2.0" sources."deep-equal-0.1.2" + (sources."define-property-2.0.2" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) sources."defined-0.0.0" sources."director-1.2.7" (sources."event-stream-0.5.3" // { @@ -39744,6 +40258,11 @@ in sources."eventemitter2-0.4.14" sources."expand-brackets-0.1.5" sources."expand-range-1.8.2" + (sources."extend-shallow-3.0.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) sources."extglob-0.3.2" sources."eyes-0.1.8" sources."filename-regex-2.0.1" @@ -39756,43 +40275,96 @@ in sources."for-in-1.0.2" sources."for-own-0.1.5" sources."forever-monitor-1.7.1" + sources."fragment-cache-0.2.1" sources."fs.realpath-1.0.0" sources."fsevents-1.2.4" + sources."get-value-2.0.6" sources."glob-7.1.3" sources."glob-base-0.3.0" sources."glob-parent-2.0.0" sources."graceful-fs-4.1.11" + (sources."has-value-1.0.0" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) + (sources."has-values-1.0.0" // { + dependencies = [ + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."kind-of-4.0.0" + ]; + }) sources."i-0.3.6" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.5" + (sources."is-accessor-descriptor-1.0.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" + (sources."is-data-descriptor-1.0.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + (sources."is-descriptor-1.0.2" // { + dependencies = [ + sources."kind-of-6.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-number-2.1.0" + (sources."is-plain-object-2.0.4" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) 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-2.1.0" sources."isstream-0.1.2" sources."jsonify-0.0.0" sources."kind-of-3.2.2" sources."lazy-1.0.11" + sources."map-cache-0.2.2" + sources."map-visit-1.0.0" sources."math-random-1.0.1" sources."micromatch-2.3.11" sources."minimatch-3.0.4" sources."minimist-0.0.10" + (sources."mixin-deep-1.3.1" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" ]; }) + sources."ms-2.0.0" sources."mute-stream-0.0.7" sources."nan-2.11.0" + (sources."nanomatch-1.2.13" // { + dependencies = [ + sources."arr-diff-4.0.0" + sources."array-unique-0.3.2" + sources."kind-of-6.0.2" + ]; + }) (sources."nconf-0.6.9" // { dependencies = [ sources."async-0.2.9" @@ -39803,12 +40375,36 @@ in sources."normalize-path-2.1.1" sources."nssocket-0.5.3" sources."object-assign-3.0.0" + (sources."object-copy-0.1.0" // { + dependencies = [ + sources."define-property-0.2.5" + sources."is-accessor-descriptor-0.1.6" + sources."is-data-descriptor-0.1.4" + (sources."is-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + ]; + }) + (sources."object-visit-1.0.1" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) sources."object.omit-2.0.1" + (sources."object.pick-1.3.0" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) sources."once-1.4.0" sources."optimist-0.6.1" sources."parse-glob-3.0.4" + sources."pascalcase-0.1.1" sources."path-is-absolute-1.0.1" sources."pkginfo-0.3.1" + sources."posix-character-classes-0.1.1" sources."preserve-0.2.0" (sources."prettyjson-1.2.1" // { dependencies = [ @@ -39827,23 +40423,153 @@ in }) sources."read-1.0.7" sources."readable-stream-2.3.6" - sources."readdirp-2.1.0" + (sources."readdirp-2.2.1" // { + dependencies = [ + sources."arr-diff-4.0.0" + sources."array-unique-0.3.2" + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + ]; + }) + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + ]; + }) + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (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" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."isobject-3.0.1" + sources."kind-of-6.0.2" + sources."micromatch-3.1.10" + ]; + }) sources."regex-cache-0.4.4" + sources."regex-not-1.0.2" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" + sources."resolve-url-0.2.1" sources."resumer-0.0.0" + sources."ret-0.1.15" sources."revalidator-0.1.8" sources."rimraf-2.6.2" sources."safe-buffer-5.1.2" - sources."set-immediate-shim-1.0.1" + sources."safe-regex-1.1.0" + (sources."set-value-2.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) sources."shush-1.0.0" + (sources."snapdragon-0.8.2" // { + dependencies = [ + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (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."kind-of-5.1.0" + ]; + }) + (sources."snapdragon-node-2.1.1" // { + dependencies = [ + sources."define-property-1.0.0" + sources."isobject-3.0.1" + ]; + }) + sources."snapdragon-util-3.0.1" + sources."source-map-0.5.7" + sources."source-map-resolve-0.5.2" + sources."source-map-url-0.4.0" + sources."split-string-3.1.0" sources."stack-trace-0.0.10" + (sources."static-extend-0.1.2" // { + dependencies = [ + sources."define-property-0.2.5" + (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."kind-of-5.1.0" + ]; + }) sources."string_decoder-1.1.1" sources."strip-json-comments-0.1.3" sources."tape-2.3.3" sources."through-2.3.8" sources."timespan-2.3.0" + sources."to-object-path-0.3.0" + sources."to-regex-3.0.2" + (sources."to-regex-range-2.1.1" // { + dependencies = [ + sources."is-number-3.0.0" + ]; + }) + (sources."union-value-1.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + 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."has-values-0.1.4" + sources."isobject-3.0.1" + ]; + }) + sources."urix-0.1.0" + sources."use-3.1.1" sources."util-deprecate-1.0.2" sources."utile-0.2.1" sources."winston-0.8.3" @@ -39869,13 +40595,13 @@ in }; dependencies = [ sources."async-2.6.1" - sources."debug-3.1.0" - sources."lodash-4.17.10" + sources."debug-4.0.1" + sources."lodash-4.17.11" sources."lodash.groupby-4.6.0" sources."microee-0.0.6" sources."minilog-3.1.0" - sources."ms-2.0.0" - sources."simple-git-1.96.0" + sources."ms-2.1.1" + sources."simple-git-1.102.0" sources."tabtab-git+https://github.com/mixu/node-tabtab.git" ]; buildInputs = globalBuildInputs; @@ -39900,7 +40626,7 @@ in sources."chloride-2.2.10" sources."chloride-test-1.2.2" sources."deep-equal-1.0.1" - sources."deep-extend-0.4.2" + sources."deep-extend-0.6.0" sources."diff-3.5.0" sources."ed2curve-0.1.4" sources."emoji-named-characters-1.0.2" @@ -39920,7 +40646,7 @@ in sources."is-my-ip-valid-1.0.0" sources."is-my-json-valid-2.19.0" sources."is-property-1.0.2" - sources."is-valid-domain-0.0.5" + sources."is-valid-domain-0.0.6" sources."json-buffer-2.0.11" sources."jsonpointer-4.0.1" sources."kvgraph-0.1.0" @@ -39939,7 +40665,7 @@ in }) sources."moment-2.22.2" sources."multicb-1.2.2" - sources."multiserver-1.13.3" + sources."multiserver-1.13.5" sources."muxrpc-6.4.1" sources."nan-2.11.0" sources."node-gyp-build-3.4.0" @@ -39950,7 +40676,7 @@ in sources."packet-stream-2.0.4" sources."packet-stream-codec-1.1.2" sources."pako-1.0.6" - sources."private-box-0.2.1" + sources."private-box-0.3.0" sources."progress-1.1.8" sources."pull-block-filter-1.0.0" sources."pull-box-stream-1.0.13" @@ -39996,15 +40722,11 @@ in ]; }) sources."pull-ws-3.3.1" - (sources."rc-1.2.8" // { - dependencies = [ - sources."deep-extend-0.6.0" - ]; - }) + sources."rc-1.2.8" sources."relative-url-1.0.2" sources."remove-markdown-0.1.0" sources."safe-buffer-5.1.2" - sources."secret-handshake-1.1.13" + sources."secret-handshake-1.1.14" sources."semver-5.5.1" sources."separator-escape-0.0.0" sources."sha.js-2.4.5" @@ -40016,16 +40738,16 @@ in sources."sha.js-2.4.11" ]; }) - sources."sodium-chloride-1.1.0" - sources."sodium-native-2.2.1" + sources."sodium-chloride-1.1.2" + sources."sodium-native-2.2.2" sources."split-buffer-1.0.0" sources."ssb-avatar-0.2.0" sources."ssb-client-4.6.0" - sources."ssb-config-2.2.0" + sources."ssb-config-2.3.2" sources."ssb-git-0.5.0" sources."ssb-git-repo-2.8.3" sources."ssb-issues-1.0.0" - sources."ssb-keys-7.0.16" + sources."ssb-keys-7.1.3" sources."ssb-marked-0.6.0" (sources."ssb-mentions-0.1.2" // { dependencies = [ @@ -40039,7 +40761,7 @@ in }) sources."ssb-msgs-5.2.0" sources."ssb-pull-requests-1.0.0" - sources."ssb-ref-2.11.2" + sources."ssb-ref-2.12.0" (sources."stream-to-pull-stream-1.7.2" // { dependencies = [ sources."looper-3.0.0" @@ -40082,10 +40804,10 @@ in graphql-cli = nodeEnv.buildNodePackage { name = "graphql-cli"; packageName = "graphql-cli"; - version = "2.16.5"; + version = "2.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-cli/-/graphql-cli-2.16.5.tgz"; - sha512 = "a2QYKmjc6H/39ZGpcKGNQIGAtz84BIVYw9LyYy3Iv1cxJ46zeRgyLBdl8vk+f1aYjQ80TAGHL2+qlIKBD7mDfg=="; + url = "https://registry.npmjs.org/graphql-cli/-/graphql-cli-2.16.7.tgz"; + sha512 = "I1kkJ9mqgctjOHDTo3bg7CLpZDeuLrOhKeNmohWhka2bWb0jf5T9IspHLDDTIEsOB56KEnvW2fUwRsTFHJK2HQ=="; }; dependencies = [ sources."@babel/generator-7.0.0-beta.38" @@ -40150,7 +40872,7 @@ in sources."chalk-2.4.1" sources."change-case-3.0.2" sources."chardet-0.4.2" - sources."ci-info-1.4.0" + sources."ci-info-1.6.0" sources."cli-boxes-1.0.0" sources."cli-cursor-2.1.0" sources."cli-spinners-1.3.1" @@ -40167,9 +40889,9 @@ in sources."strip-ansi-3.0.1" ]; }) - sources."combined-stream-1.0.6" + sources."combined-stream-1.0.7" sources."command-exists-1.2.7" - sources."commander-2.17.1" + sources."commander-2.18.0" sources."common-tags-1.8.0" sources."concat-map-0.0.1" sources."configstore-3.1.2" @@ -40224,7 +40946,7 @@ in sources."encoding-0.1.12" sources."errno-0.1.7" sources."error-ex-1.3.2" - sources."es6-promise-4.2.4" + sources."es6-promise-4.2.5" sources."es6-promisify-5.0.0" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" @@ -40238,15 +40960,16 @@ in }) sources."expand-tilde-2.0.2" sources."express-4.16.3" - (sources."express-request-proxy-2.2.0" // { + (sources."express-request-proxy-2.2.2" // { dependencies = [ (sources."body-parser-1.18.3" // { dependencies = [ sources."debug-2.6.9" ]; }) - sources."debug-3.1.0" + sources."debug-3.2.5" sources."iconv-lite-0.4.23" + sources."ms-2.1.1" sources."path-to-regexp-1.7.0" sources."qs-6.5.2" sources."raw-body-2.3.3" @@ -40262,7 +40985,11 @@ in sources."find-0.2.9" sources."find-up-2.1.0" sources."forever-agent-0.6.1" - sources."form-data-2.3.2" + (sources."form-data-2.3.2" // { + dependencies = [ + sources."combined-stream-1.0.6" + ]; + }) sources."format-util-1.0.3" sources."forwarded-0.1.2" sources."fresh-0.5.2" @@ -40280,9 +41007,10 @@ in sources."graphcool-json-schema-1.2.1" (sources."graphcool-yml-0.4.15" // { dependencies = [ - sources."debug-3.1.0" + sources."debug-3.2.5" sources."dotenv-4.0.0" sources."fs-extra-4.0.3" + sources."ms-2.1.1" ]; }) (sources."graphql-0.13.2" // { @@ -40299,7 +41027,7 @@ in sources."graphql-config-2.0.1" sources."graphql-config-extension-graphcool-1.0.8" sources."graphql-config-extension-openapi-1.0.6" - sources."graphql-config-extension-prisma-0.0.11" + sources."graphql-config-extension-prisma-0.2.1" sources."graphql-import-0.4.5" (sources."graphql-playground-html-1.5.5" // { dependencies = [ @@ -40325,7 +41053,8 @@ in sources."http-signature-1.2.0" (sources."https-proxy-agent-2.2.1" // { dependencies = [ - sources."debug-3.1.0" + sources."debug-3.2.5" + sources."ms-2.1.1" ]; }) sources."iconv-lite-0.4.24" @@ -40341,7 +41070,7 @@ in sources."ipaddr.js-1.8.0" sources."is-arrayish-0.2.1" sources."is-builtin-module-1.0.0" - sources."is-ci-1.2.0" + sources."is-ci-1.2.1" sources."is-directory-0.3.1" sources."is-fullwidth-code-point-1.0.0" sources."is-installed-globally-0.1.0" @@ -40374,7 +41103,8 @@ in sources."json-schema-0.2.3" (sources."json-schema-ref-parser-3.3.1" // { dependencies = [ - sources."debug-3.1.0" + sources."debug-3.2.5" + sources."ms-2.1.1" ]; }) sources."json-schema-traverse-0.3.1" @@ -40394,7 +41124,7 @@ in sources."lcid-1.0.0" sources."load-json-file-2.0.0" sources."locate-path-2.0.0" - sources."lodash-4.17.10" + sources."lodash-4.17.11" sources."lodash.get-4.4.2" sources."lodash.includes-4.3.0" sources."lodash.isboolean-3.0.3" @@ -40448,9 +41178,9 @@ in sources."on-finished-2.3.0" sources."once-1.4.0" sources."onetime-2.0.1" - sources."ono-4.0.7" + sources."ono-4.0.8" sources."open-0.0.5" - sources."opn-5.3.0" + sources."opn-5.4.0" sources."ora-1.4.0" sources."os-locale-2.1.0" sources."os-tmpdir-1.0.2" @@ -40475,11 +41205,12 @@ in sources."performance-now-2.1.0" sources."pify-2.3.0" sources."prepend-http-1.0.4" - sources."prisma-json-schema-0.0.4" - (sources."prisma-yml-1.0.50" // { + sources."prisma-json-schema-0.1.1" + (sources."prisma-yml-1.0.93" // { dependencies = [ - sources."debug-3.1.0" + sources."debug-3.2.5" sources."dotenv-4.0.0" + sources."ms-2.1.1" ]; }) sources."process-nextick-args-2.0.0" @@ -40553,10 +41284,10 @@ in sources."source-map-0.6.1" ]; }) - sources."spdx-correct-3.0.0" + sources."spdx-correct-3.0.1" sources."spdx-exceptions-2.1.0" sources."spdx-expression-parse-3.0.0" - sources."spdx-license-ids-3.0.0" + sources."spdx-license-ids-3.0.1" sources."sprintf-js-1.0.3" sources."sshpk-1.14.2" sources."statuses-1.4.0" @@ -40602,7 +41333,7 @@ in sources."utils-merge-1.0.1" sources."uuid-3.3.2" sources."validate-npm-package-license-3.0.4" - sources."validator-10.7.1" + sources."validator-10.8.0" sources."vary-1.1.2" sources."verror-1.10.0" sources."wcwidth-1.0.1" @@ -40630,7 +41361,7 @@ in ]; }) sources."yargs-parser-8.1.0" - sources."z-schema-3.23.0" + sources."z-schema-3.24.1" ]; buildInputs = globalBuildInputs; meta = { @@ -41222,7 +41953,7 @@ in sources."ms-2.0.0" sources."multipipe-0.1.2" sources."nanomatch-1.2.13" - sources."natives-1.1.4" + sources."natives-1.1.5" sources."object-assign-3.0.0" (sources."object-copy-0.1.0" // { dependencies = [ @@ -41418,15 +42149,26 @@ in htmlhint = nodeEnv.buildNodePackage { name = "htmlhint"; packageName = "htmlhint"; - version = "0.10.0"; + version = "0.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/htmlhint/-/htmlhint-0.10.0.tgz"; - sha512 = "g/bNE3G7D8N1pgfGeL8FTgv4lhA04cWiCTofi8F20f4s+tkcIAL/j2FsD8iVlRCzVpNDYbXCmYtGmQzQe0FKGw=="; + url = "https://registry.npmjs.org/htmlhint/-/htmlhint-0.10.1.tgz"; + sha512 = "Zn+mo0NNXIW7+pWfdIZx49IfmuVI4I1UPjZhXFvc0Rq7fHul//gbVASrnxtiTbOOCNvD4JKVvKkpo4BNDzHi6w=="; }; dependencies = [ + sources."@yarnpkg/lockfile-1.1.0" + sources."abbrev-1.1.1" + sources."agent-base-4.2.1" sources."ajv-5.5.2" + sources."ansi-escapes-3.1.0" + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" + sources."ansicolors-0.3.2" + sources."archy-1.0.0" + sources."argparse-1.0.10" + sources."asap-2.0.6" sources."asn1-0.2.4" sources."assert-plus-1.0.0" + sources."ast-types-0.11.5" sources."async-2.6.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" @@ -41435,29 +42177,49 @@ in sources."bcrypt-pbkdf-1.0.2" sources."brace-expansion-1.1.11" sources."buffer-from-1.1.1" + sources."bytes-3.0.0" + sources."camelcase-2.1.1" sources."caseless-0.12.0" + sources."chalk-2.4.1" + sources."chardet-0.4.2" sources."cli-1.0.1" + sources."cli-cursor-2.1.0" + sources."cli-width-2.2.0" + (sources."cliui-3.2.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."is-fullwidth-code-point-1.0.0" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + ]; + }) sources."clone-2.1.2" + sources."clone-deep-0.3.0" sources."co-4.6.0" + sources."code-point-at-1.1.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" sources."colors-1.3.2" - sources."combined-stream-1.0.6" + sources."combined-stream-1.0.7" sources."commander-2.17.1" sources."concat-map-0.0.1" - (sources."concat-stream-1.6.2" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.6" - sources."string_decoder-1.1.1" - ]; - }) + sources."concat-stream-1.6.2" + sources."configstore-3.1.2" sources."console-browserify-1.1.0" + sources."core-js-2.3.0" sources."core-util-is-1.0.2" + sources."crypto-random-string-1.0.0" sources."csslint-1.0.5" sources."cycle-1.0.3" sources."dashdash-1.14.1" + sources."data-uri-to-buffer-1.2.0" sources."date-now-0.1.4" - sources."debug-2.6.9" + sources."debug-3.2.5" + sources."decamelize-1.2.0" + sources."deep-is-0.1.3" + sources."degenerator-1.0.4" sources."delayed-stream-1.0.0" + sources."depd-1.1.2" (sources."dom-serializer-0.1.0" // { dependencies = [ sources."domelementtype-1.1.3" @@ -41467,41 +42229,115 @@ in sources."domelementtype-1.3.0" sources."domhandler-2.3.0" sources."domutils-1.5.1" + sources."dot-prop-4.2.0" sources."ecc-jsbn-0.1.2" + sources."email-validator-2.0.4" sources."entities-1.0.0" - sources."es6-promise-4.2.4" + sources."es6-promise-4.2.5" + sources."es6-promisify-5.0.0" + sources."escape-string-regexp-1.0.5" + sources."escodegen-1.11.0" + sources."esprima-3.1.3" + sources."estraverse-4.2.0" + sources."esutils-2.0.2" sources."exit-0.1.2" sources."extend-3.0.2" - sources."extract-zip-1.6.7" + sources."external-editor-2.2.0" + (sources."extract-zip-1.6.7" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) sources."extsprintf-1.3.0" sources."eyes-0.1.8" sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" + sources."fast-levenshtein-2.0.6" sources."fd-slicer-1.0.1" + sources."figures-2.0.0" + sources."file-uri-to-path-1.0.0" + sources."for-in-1.0.2" + sources."for-own-1.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.3.2" + (sources."form-data-2.3.2" // { + dependencies = [ + sources."combined-stream-1.0.6" + ]; + }) sources."fs-extra-1.0.0" sources."fs.realpath-1.0.0" + (sources."ftp-0.3.10" // { + dependencies = [ + sources."readable-stream-1.1.14" + ]; + }) + (sources."get-uri-2.0.2" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) sources."getpass-0.1.7" sources."glob-7.1.3" sources."glob-base-0.3.0" sources."glob-parent-2.0.0" sources."graceful-fs-4.1.11" + sources."graphlib-2.1.5" sources."har-schema-2.0.0" sources."har-validator-5.1.0" + sources."has-flag-3.0.0" + (sources."hasbin-1.2.3" // { + dependencies = [ + sources."async-1.5.2" + ]; + }) sources."hasha-2.2.0" - sources."htmlparser2-3.8.3" + sources."hosted-git-info-2.7.1" + (sources."htmlparser2-3.8.3" // { + dependencies = [ + sources."readable-stream-1.1.14" + ]; + }) + sources."http-errors-1.6.3" + (sources."http-proxy-agent-2.1.0" // { + dependencies = [ + sources."debug-3.1.0" + sources."ms-2.0.0" + ]; + }) sources."http-signature-1.2.0" + sources."https-proxy-agent-2.2.1" + sources."iconv-lite-0.4.24" + sources."immediate-3.0.6" + sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.3" + sources."ini-1.3.5" + sources."inquirer-3.3.0" + sources."invert-kv-1.0.0" + sources."ip-1.1.5" + sources."is-buffer-1.1.6" sources."is-dotfile-1.0.3" + sources."is-extendable-0.1.1" sources."is-extglob-1.0.0" + sources."is-fullwidth-code-point-2.0.0" sources."is-glob-2.0.1" + sources."is-obj-1.0.1" + sources."is-plain-object-2.0.4" + sources."is-promise-2.1.0" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" + sources."is-wsl-1.1.0" sources."isarray-0.0.1" sources."isexe-2.0.0" + sources."isobject-3.0.1" sources."isstream-0.1.2" + (sources."js-yaml-3.12.0" // { + dependencies = [ + sources."esprima-4.0.1" + ]; + }) sources."jsbn-0.1.1" (sources."jshint-2.9.6" // { dependencies = [ @@ -41513,62 +42349,220 @@ in sources."json-stringify-safe-5.0.1" sources."jsonfile-2.4.0" sources."jsprim-1.4.1" + (sources."jszip-3.1.5" // { + dependencies = [ + sources."es6-promise-3.0.2" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."readable-stream-2.0.6" + ]; + }) sources."kew-0.7.0" + sources."kind-of-3.2.2" sources."klaw-1.3.1" - sources."lodash-4.17.10" + sources."lazy-cache-0.2.7" + sources."lcid-1.0.0" + sources."levn-0.3.0" + sources."lie-3.1.1" + sources."lodash-4.17.11" + sources."lodash.assign-4.2.0" + sources."lodash.assignin-4.2.0" + sources."lodash.clonedeep-4.5.0" + sources."lodash.flatten-4.4.0" + sources."lodash.get-4.4.2" + sources."lodash.set-4.3.2" + sources."lru-cache-4.1.3" + sources."macos-release-1.1.0" + sources."make-dir-1.3.0" sources."mime-db-1.36.0" sources."mime-types-2.1.20" + sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" + (sources."mixin-object-2.0.1" // { + dependencies = [ + sources."for-in-0.1.8" + ]; + }) sources."mkdirp-0.5.1" - sources."ms-2.0.0" + sources."ms-2.1.1" + sources."mute-stream-0.0.7" + (sources."nconf-0.10.0" // { + dependencies = [ + sources."async-1.5.2" + ]; + }) + (sources."needle-2.2.4" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) + sources."netmask-1.0.6" + sources."number-is-nan-1.0.1" sources."oauth-sign-0.9.0" sources."once-1.4.0" + sources."onetime-2.0.1" + sources."opn-5.4.0" + sources."optionator-0.8.2" + sources."os-locale-1.4.0" + sources."os-name-2.0.1" + sources."os-tmpdir-1.0.2" + sources."pac-proxy-agent-2.0.2" + sources."pac-resolver-3.0.0" + sources."pako-1.0.6" sources."parse-glob-3.0.4" sources."parserlib-1.1.1" + sources."path-0.12.7" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.6" sources."pend-1.2.0" sources."performance-now-2.1.0" sources."phantom-4.0.12" sources."phantomjs-prebuilt-2.1.16" + sources."pify-3.0.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" + sources."prelude-ls-1.1.2" + sources."process-0.11.10" sources."process-nextick-args-2.0.0" sources."progress-1.1.8" + sources."promise-7.3.1" + sources."proxy-agent-2.3.1" + sources."proxy-from-env-1.0.0" + sources."pseudomap-1.0.2" sources."psl-1.1.29" sources."punycode-1.4.1" sources."qs-6.5.2" - sources."readable-stream-1.1.14" + (sources."raw-body-2.3.3" // { + dependencies = [ + sources."iconv-lite-0.4.23" + ]; + }) + (sources."readable-stream-2.3.6" // { + dependencies = [ + sources."isarray-1.0.0" + sources."string_decoder-1.1.1" + ]; + }) + sources."recursive-readdir-2.2.2" sources."request-2.88.0" sources."request-progress-2.0.1" + sources."restore-cursor-2.0.0" + sources."run-async-2.3.0" + sources."rx-lite-4.0.8" + sources."rx-lite-aggregates-4.0.8" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" + sources."sax-1.2.4" + sources."secure-keys-1.0.0" + sources."semver-5.5.1" + sources."setprototypeof-1.1.0" + (sources."shallow-clone-0.1.2" // { + dependencies = [ + sources."kind-of-2.0.1" + ]; + }) sources."shelljs-0.3.0" + sources."signal-exit-3.0.2" + sources."smart-buffer-1.1.15" + sources."snyk-1.99.1" + sources."snyk-config-2.2.0" + sources."snyk-docker-plugin-1.11.0" + sources."snyk-go-plugin-1.5.2" + sources."snyk-gradle-plugin-2.0.1" + sources."snyk-module-1.8.2" + sources."snyk-mvn-plugin-2.0.0" + (sources."snyk-nodejs-lockfile-parser-1.5.1" // { + dependencies = [ + sources."lodash-4.17.10" + ]; + }) + sources."snyk-nuget-plugin-1.6.5" + sources."snyk-php-plugin-1.5.1" + sources."snyk-policy-1.12.0" + sources."snyk-python-plugin-1.8.1" + sources."snyk-resolve-1.0.1" + sources."snyk-resolve-deps-3.1.0" + sources."snyk-sbt-plugin-2.0.0" + sources."snyk-tree-1.0.0" + sources."snyk-try-require-1.3.1" + sources."socks-1.1.10" + sources."socks-proxy-agent-3.0.1" + sources."source-map-0.6.1" + sources."source-map-support-0.5.9" sources."split-1.0.1" + sources."sprintf-js-1.0.3" sources."sshpk-1.14.2" sources."stack-trace-0.0.10" + sources."statuses-1.5.0" + sources."string-width-2.1.1" sources."string_decoder-0.10.31" + sources."strip-ansi-4.0.0" sources."strip-json-comments-2.0.1" + sources."supports-color-5.5.0" + sources."temp-dir-1.0.0" + sources."tempfile-2.0.0" + sources."then-fs-2.0.0" sources."throttleit-1.0.0" sources."through-2.3.8" + sources."thunkify-2.1.2" + sources."tmp-0.0.33" + sources."toml-2.3.3" sources."tough-cookie-2.4.3" + sources."tslib-1.9.3" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" + sources."type-check-0.3.2" sources."typedarray-0.0.6" + (sources."undefsafe-2.0.2" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) sources."unicode-5.2.0-0.7.5" + sources."unique-string-1.0.0" + sources."unpipe-1.0.0" + sources."util-0.10.4" sources."util-deprecate-1.0.2" sources."uuid-3.3.2" sources."verror-1.10.0" sources."which-1.3.1" + sources."win-release-1.1.1" + sources."window-size-0.1.4" (sources."winston-2.4.4" // { dependencies = [ sources."async-1.0.0" sources."colors-1.0.3" ]; }) + sources."wordwrap-1.0.0" + (sources."wrap-ansi-2.1.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."is-fullwidth-code-point-1.0.0" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + ]; + }) sources."wrappy-1.0.2" + sources."write-file-atomic-2.3.0" + sources."xdg-basedir-3.0.0" sources."xml-1.0.1" + sources."xml2js-0.4.19" + sources."xmlbuilder-9.0.7" + sources."xregexp-2.0.0" + sources."y18n-3.2.1" + sources."yallist-2.1.2" + (sources."yargs-3.32.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."is-fullwidth-code-point-1.0.0" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + ]; + }) sources."yauzl-2.4.1" ]; buildInputs = globalBuildInputs; @@ -41610,50 +42604,72 @@ in production = true; bypassCache = true; }; + http-server = nodeEnv.buildNodePackage { + name = "http-server"; + packageName = "http-server"; + version = "0.11.1"; + src = fetchurl { + url = "https://registry.npmjs.org/http-server/-/http-server-0.11.1.tgz"; + sha512 = "6JeGDGoujJLmhjiRGlt8yK8Z9Kl0vnl/dQoQZlc4oeqaUoAKQg94NILLfrY3oWzSyFaQCVNTcKE5PZ3cH8VP9w=="; + }; + dependencies = [ + sources."async-1.5.2" + sources."colors-1.0.3" + sources."corser-2.0.1" + sources."debug-3.1.0" + sources."ecstatic-3.3.0" + sources."eventemitter3-3.1.0" + sources."follow-redirects-1.5.8" + sources."he-1.2.0" + sources."http-proxy-1.17.0" + sources."mime-1.6.0" + sources."minimist-1.2.0" + (sources."mkdirp-0.5.1" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) + sources."ms-2.0.0" + sources."opener-1.4.3" + (sources."optimist-0.6.1" // { + dependencies = [ + sources."minimist-0.0.10" + ]; + }) + (sources."portfinder-1.0.17" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + sources."qs-2.3.3" + sources."requires-port-1.0.0" + sources."union-0.4.6" + sources."url-join-2.0.5" + sources."wordwrap-0.0.3" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A simple zero-configuration command-line http server"; + homepage = "https://github.com/indexzero/http-server#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; ionic = nodeEnv.buildNodePackage { name = "ionic"; packageName = "ionic"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/ionic/-/ionic-4.1.1.tgz"; - sha512 = "KIBfTmB2d1ZWs9xuaZomqp7LnpkCsyUh5ywP2q109zDE8SNviP0Qs/NeRbX7MMr3ujZozddCZ1BcFtyIRrgKEA=="; + url = "https://registry.npmjs.org/ionic/-/ionic-4.1.2.tgz"; + sha512 = "iZOKZI7MRcIi2zgmPJ20Gj4SWPBp7FG87yw3akHhFdGR+OnPqsm/6Zy7/b0jRdMjFk6srlhtVmKgHvXYX3EZhw=="; }; dependencies = [ - sources."@ionic/cli-framework-1.0.6" - sources."@ionic/cli-utils-2.2.0" + sources."@ionic/cli-framework-1.0.7" + sources."@ionic/cli-utils-2.2.1" sources."@ionic/discover-1.0.4" - sources."@types/cross-spawn-6.0.0" - sources."@types/debug-0.0.30" - sources."@types/events-1.2.0" - sources."@types/glob-5.0.35" - sources."@types/inquirer-0.0.43" - sources."@types/klaw-2.1.1" - sources."@types/lodash-4.14.116" - sources."@types/make-dir-1.0.3" - sources."@types/minimatch-3.0.3" - sources."@types/minimist-1.2.0" - sources."@types/ncp-2.0.1" - sources."@types/node-6.0.117" - sources."@types/rimraf-2.0.2" - sources."@types/rx-4.1.1" - sources."@types/rx-core-4.0.3" - sources."@types/rx-core-binding-4.0.4" - sources."@types/rx-lite-4.0.5" - sources."@types/rx-lite-aggregates-4.0.3" - sources."@types/rx-lite-async-4.0.2" - sources."@types/rx-lite-backpressure-4.0.3" - sources."@types/rx-lite-coincidence-4.0.3" - sources."@types/rx-lite-experimental-4.0.1" - sources."@types/rx-lite-joinpatterns-4.0.1" - sources."@types/rx-lite-testing-4.0.1" - sources."@types/rx-lite-time-4.0.3" - sources."@types/rx-lite-virtualtime-4.0.3" - sources."@types/string-width-2.0.0" - sources."@types/strip-ansi-3.0.0" - sources."@types/through-0.0.29" - sources."@types/untildify-3.0.0" - sources."@types/wrap-ansi-3.0.0" - sources."@types/write-file-atomic-2.1.1" + sources."@ionic/utils-fs-0.0.1" + sources."@ionic/utils-network-0.0.1" sources."agent-base-4.2.1" sources."ansi-align-2.0.0" sources."ansi-escapes-3.1.0" @@ -41670,8 +42686,8 @@ in sources."capture-stack-trace-1.0.1" sources."chalk-2.4.1" sources."chardet-0.7.0" - sources."chownr-1.0.1" - sources."ci-info-1.4.0" + sources."chownr-1.1.1" + sources."ci-info-1.6.0" sources."cli-boxes-1.0.0" sources."cli-cursor-2.1.0" sources."cli-width-2.2.0" @@ -41688,7 +42704,11 @@ in sources."cross-spawn-5.1.0" sources."crypto-random-string-1.0.0" sources."data-uri-to-buffer-1.2.0" - sources."debug-3.1.0" + (sources."debug-3.2.5" // { + dependencies = [ + sources."ms-2.1.1" + ]; + }) sources."deep-extend-0.6.0" sources."deep-is-0.1.3" sources."degenerator-1.0.4" @@ -41699,7 +42719,7 @@ in sources."duplexer2-0.1.4" sources."duplexer3-0.1.4" sources."elementtree-0.1.7" - sources."es6-promise-4.2.4" + sources."es6-promise-4.2.5" sources."es6-promisify-5.0.0" sources."escape-string-regexp-1.0.5" sources."escodegen-1.11.0" @@ -41735,7 +42755,11 @@ in sources."graceful-fs-4.1.11" sources."has-flag-3.0.0" sources."http-errors-1.6.3" - sources."http-proxy-agent-2.1.0" + (sources."http-proxy-agent-2.1.0" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) sources."https-proxy-agent-2.2.1" sources."iconv-lite-0.4.24" sources."import-lazy-2.1.0" @@ -41745,7 +42769,7 @@ in sources."ini-1.3.5" sources."inquirer-6.2.0" sources."ip-1.1.5" - sources."is-ci-1.2.0" + sources."is-ci-1.2.1" sources."is-fullwidth-code-point-2.0.0" sources."is-installed-globally-0.1.0" sources."is-npm-1.0.0" @@ -41758,7 +42782,6 @@ in sources."is-wsl-1.1.0" sources."isarray-1.0.0" sources."isexe-2.0.0" - sources."klaw-3.0.0" sources."latest-version-3.1.0" (sources."leek-0.0.24" // { dependencies = [ @@ -41766,7 +42789,7 @@ in ]; }) sources."levn-0.3.0" - sources."lodash-4.17.10" + sources."lodash-4.17.11" sources."lodash._baseassign-3.2.0" sources."lodash._basecopy-3.0.1" sources."lodash._bindcallback-3.0.1" @@ -41807,7 +42830,7 @@ in sources."npm-run-path-2.0.2" sources."once-1.4.0" sources."onetime-2.0.1" - sources."opn-5.3.0" + sources."opn-5.4.0" sources."optionator-0.8.2" sources."os-name-2.0.1" sources."os-tmpdir-1.0.2" @@ -41839,7 +42862,7 @@ in sources."rimraf-2.6.2" sources."rsvp-3.6.2" sources."run-async-2.3.0" - sources."rxjs-6.3.1" + sources."rxjs-6.3.3" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.1.4" @@ -41892,7 +42915,7 @@ in sources."widest-line-2.0.0" sources."win-release-1.1.1" sources."wordwrap-1.0.0" - sources."wrap-ansi-3.0.1" + sources."wrap-ansi-4.0.0" sources."wrappy-1.0.2" sources."write-file-atomic-2.3.0" sources."ws-6.0.0" @@ -41937,21 +42960,13 @@ in }; dependencies = [ sources."abbrev-1.0.9" - sources."align-text-0.1.4" sources."amdefine-1.0.1" sources."argparse-1.0.10" sources."async-1.5.2" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" - sources."camelcase-1.2.1" - sources."center-align-0.1.3" - (sources."cliui-2.1.0" // { - dependencies = [ - sources."wordwrap-0.0.2" - ]; - }) + sources."commander-2.17.1" sources."concat-map-0.0.1" - sources."decamelize-1.2.0" sources."deep-is-0.1.3" sources."escodegen-1.8.1" sources."esprima-2.7.3" @@ -41959,25 +42974,23 @@ in sources."esutils-2.0.2" sources."fast-levenshtein-2.0.6" sources."glob-5.0.15" - (sources."handlebars-4.0.11" // { + (sources."handlebars-4.0.12" // { dependencies = [ - sources."source-map-0.4.4" + sources."async-2.6.1" + sources."source-map-0.6.1" ]; }) sources."has-flag-1.0.0" sources."inflight-1.0.6" sources."inherits-2.0.3" - sources."is-buffer-1.1.6" sources."isexe-2.0.0" (sources."js-yaml-3.12.0" // { dependencies = [ sources."esprima-4.0.1" ]; }) - sources."kind-of-3.2.2" - sources."lazy-cache-1.0.4" sources."levn-0.3.0" - sources."longest-1.0.1" + sources."lodash-4.17.11" sources."minimatch-3.0.4" sources."minimist-0.0.10" (sources."mkdirp-0.5.1" // { @@ -41995,24 +43008,19 @@ in sources."optionator-0.8.2" sources."path-is-absolute-1.0.1" sources."prelude-ls-1.1.2" - sources."repeat-string-1.6.1" sources."resolve-1.1.7" - sources."right-align-0.1.3" sources."source-map-0.2.0" sources."sprintf-js-1.0.3" sources."supports-color-3.2.3" sources."type-check-0.3.2" - (sources."uglify-js-2.8.29" // { + (sources."uglify-js-3.4.9" // { dependencies = [ - sources."source-map-0.5.7" + sources."source-map-0.6.1" ]; }) - sources."uglify-to-browserify-1.0.2" sources."which-1.3.1" - sources."window-size-0.1.0" sources."wordwrap-1.0.0" sources."wrappy-1.0.2" - sources."yargs-3.10.0" ]; buildInputs = globalBuildInputs; meta = { @@ -42122,80 +43130,234 @@ in javascript-typescript-langserver = nodeEnv.buildNodePackage { name = "javascript-typescript-langserver"; packageName = "javascript-typescript-langserver"; - version = "2.9.4"; + version = "2.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.9.4.tgz"; - sha512 = "kJTsyRj6KZZ5yVvoFyaxMkBOpiJbQeaFXihDJqWlKIYLwBL1SbkBdFOWPbfY9hf7N7gT6ifsqAhYberaqBZ66A=="; + url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.11.1.tgz"; + sha512 = "Kkal2i0jcXsgwgn61gnhVJuh0R0J+HqyzREVaeBvZHgMCAQVW02kYwVbY8xzpBfcZmDBYcT5LrPBBQa27C9tRA=="; }; dependencies = [ + (sources."@commitlint/cli-7.1.2" // { + dependencies = [ + sources."chalk-2.3.1" + ]; + }) + sources."@commitlint/config-conventional-7.1.2" + sources."@commitlint/ensure-7.1.2" + sources."@commitlint/execute-rule-7.1.2" + sources."@commitlint/format-7.1.2" + sources."@commitlint/is-ignored-7.1.2" + sources."@commitlint/lint-7.1.2" + sources."@commitlint/load-7.1.2" + sources."@commitlint/message-7.1.2" + sources."@commitlint/parse-7.1.2" + sources."@commitlint/read-7.1.2" + sources."@commitlint/resolve-extends-7.1.2" + sources."@commitlint/rules-7.1.2" + sources."@commitlint/to-lines-7.1.2" + sources."@commitlint/top-level-7.1.2" + sources."@marionebl/sander-0.6.1" + sources."JSONStream-1.3.4" sources."ansi-color-0.2.1" sources."ansi-styles-3.2.1" sources."any-promise-1.3.0" + sources."argparse-1.0.10" + sources."array-find-index-1.0.2" + sources."array-ify-1.0.0" + sources."arrify-1.0.1" sources."assertion-error-1.1.0" + (sources."babel-polyfill-6.26.0" // { + dependencies = [ + sources."regenerator-runtime-0.10.5" + ]; + }) + sources."babel-runtime-6.26.0" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."bufrw-1.2.1" - sources."chai-4.1.2" + sources."builtin-modules-1.1.1" + sources."caller-path-0.1.0" + sources."callsites-0.2.0" + sources."camelcase-4.1.0" + sources."camelcase-keys-4.2.0" + sources."chai-4.2.0" sources."chai-as-promised-7.1.1" sources."chalk-2.4.1" sources."check-error-1.0.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."commander-2.17.1" + sources."commander-2.18.0" + sources."compare-func-1.3.2" sources."concat-map-0.0.1" + sources."conventional-changelog-angular-1.6.6" + (sources."conventional-commits-parser-2.1.7" // { + dependencies = [ + sources."meow-4.0.1" + ]; + }) + sources."core-js-2.5.7" + sources."core-util-is-1.0.2" + sources."cosmiconfig-4.0.0" + sources."currently-unhandled-0.4.1" + sources."dargs-4.1.0" + sources."decamelize-1.2.0" + (sources."decamelize-keys-1.1.0" // { + dependencies = [ + sources."map-obj-1.0.1" + ]; + }) sources."deep-eql-3.0.1" sources."deep-equal-1.0.1" + sources."dot-prop-3.0.0" sources."error-7.0.2" + sources."error-ex-1.3.2" sources."escape-string-regexp-1.0.5" + sources."esprima-4.0.1" sources."fast-json-patch-2.0.7" + sources."find-up-2.1.0" sources."fs.realpath-1.0.0" sources."get-func-name-2.0.0" + sources."get-stdin-5.0.1" + (sources."git-raw-commits-1.3.6" // { + dependencies = [ + sources."meow-4.0.1" + ]; + }) sources."glob-7.1.3" + sources."global-dirs-0.1.1" + sources."graceful-fs-4.1.11" sources."has-flag-3.0.0" + sources."hosted-git-info-2.7.1" + sources."indent-string-3.2.0" sources."inflight-1.0.6" sources."inherits-2.0.3" + sources."ini-1.3.5" + sources."is-arrayish-0.2.1" + sources."is-builtin-module-1.0.0" + sources."is-directory-0.3.1" + sources."is-obj-1.0.1" + sources."is-plain-obj-1.1.0" + sources."is-text-path-1.0.1" + sources."isarray-1.0.0" sources."iterare-0.0.8" (sources."jaeger-client-3.12.0" // { dependencies = [ sources."opentracing-0.13.0" ]; }) - sources."lodash-4.17.10" + sources."js-yaml-3.12.0" + sources."json-parse-better-errors-1.0.2" + sources."jsonparse-1.3.1" + sources."load-json-file-4.0.0" + sources."locate-path-2.0.0" + sources."lodash-4.17.11" + sources."lodash._reinterpolate-3.0.0" + sources."lodash.camelcase-4.3.0" sources."lodash.every-4.6.0" sources."lodash.flattendeep-4.4.0" sources."lodash.foreach-4.5.0" + sources."lodash.kebabcase-4.1.1" sources."lodash.map-4.6.0" sources."lodash.maxby-4.6.0" + sources."lodash.merge-4.6.1" + sources."lodash.mergewith-4.6.1" + sources."lodash.omit-4.5.0" + sources."lodash.pick-4.4.0" + sources."lodash.snakecase-4.1.1" + sources."lodash.startcase-4.4.0" + sources."lodash.template-4.4.0" + sources."lodash.templatesettings-4.1.0" + sources."lodash.topairs-4.3.0" + sources."lodash.upperfirst-4.3.1" sources."long-2.4.0" + sources."loud-rejection-1.6.0" + sources."map-obj-2.0.0" + sources."meow-5.0.0" sources."minimatch-3.0.4" + sources."minimist-1.2.0" + sources."minimist-options-3.0.2" + (sources."mkdirp-0.5.1" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) sources."mz-2.7.0" sources."node-int64-0.4.0" + sources."normalize-package-data-2.4.0" + sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" sources."object-hash-1.3.0" sources."once-1.4.0" sources."opentracing-0.14.3" + sources."p-limit-1.3.0" + sources."p-locate-2.0.0" + sources."p-try-1.0.0" + sources."parse-json-4.0.0" + sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" + sources."path-type-3.0.0" sources."pathval-1.1.0" + sources."pify-3.0.0" + sources."process-nextick-args-2.0.0" + sources."q-1.5.1" + sources."quick-lru-1.1.0" + sources."read-pkg-3.0.0" + sources."read-pkg-up-3.0.0" + sources."readable-stream-2.3.6" + sources."redent-2.0.0" + sources."regenerator-runtime-0.11.1" + sources."require-from-string-2.0.2" + (sources."require-uncached-1.0.3" // { + dependencies = [ + sources."resolve-from-1.0.1" + ]; + }) + sources."resolve-from-4.0.0" + sources."resolve-global-0.1.0" + sources."rimraf-2.6.2" sources."rxjs-5.5.12" + sources."safe-buffer-5.1.2" sources."semaphore-async-await-1.5.1" - sources."string-similarity-1.2.1" + sources."semver-5.5.0" + sources."signal-exit-3.0.2" + sources."spdx-correct-3.0.1" + sources."spdx-exceptions-2.1.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.1" + sources."split2-2.2.0" + sources."sprintf-js-1.0.3" + sources."string-similarity-1.2.2" sources."string-template-0.2.1" + sources."string_decoder-1.1.1" + sources."strip-bom-3.0.0" + sources."strip-indent-2.0.0" sources."supports-color-5.5.0" sources."symbol-observable-1.0.1" + sources."text-extensions-1.8.0" sources."thenify-3.3.0" sources."thenify-all-1.6.0" sources."thriftrw-3.11.2" + sources."through-2.3.8" + sources."through2-2.0.3" + sources."trim-newlines-2.0.0" + sources."trim-off-newlines-1.0.1" sources."type-detect-4.0.8" - sources."typescript-2.8.3" + sources."typescript-3.0.3" + sources."util-deprecate-1.0.2" sources."uuid-3.3.2" + sources."validate-npm-package-license-3.0.4" sources."vscode-jsonrpc-3.6.2" - sources."vscode-languageserver-4.4.2" - sources."vscode-languageserver-protocol-3.12.0" - sources."vscode-languageserver-types-3.12.0" + sources."vscode-languageserver-5.1.0" + (sources."vscode-languageserver-protocol-3.13.0" // { + dependencies = [ + sources."vscode-jsonrpc-4.0.0" + ]; + }) + sources."vscode-languageserver-types-3.13.0" sources."vscode-uri-1.0.6" sources."wrappy-1.0.2" sources."xorshift-0.2.1" sources."xtend-4.0.1" + sources."yargs-parser-10.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -42293,7 +43455,7 @@ in sources."cli-1.0.1" sources."co-4.6.0" sources."colors-1.0.3" - sources."combined-stream-1.0.6" + sources."combined-stream-1.0.7" sources."concat-map-0.0.1" (sources."concat-stream-1.6.2" // { dependencies = [ @@ -42320,7 +43482,7 @@ in sources."domutils-1.5.1" sources."ecc-jsbn-0.1.2" sources."entities-1.0.0" - sources."es6-promise-4.2.4" + sources."es6-promise-4.2.5" sources."exit-0.1.2" sources."extend-3.0.2" sources."extract-zip-1.6.7" @@ -42330,7 +43492,11 @@ in sources."fast-json-stable-stringify-2.0.0" sources."fd-slicer-1.0.1" sources."forever-agent-0.6.1" - sources."form-data-2.3.2" + (sources."form-data-2.3.2" // { + dependencies = [ + sources."combined-stream-1.0.6" + ]; + }) sources."fs-extra-1.0.0" sources."fs.realpath-1.0.0" sources."getpass-0.1.7" @@ -42356,7 +43522,7 @@ in sources."jsprim-1.4.1" sources."kew-0.7.0" sources."klaw-1.3.1" - sources."lodash-4.17.10" + sources."lodash-4.17.11" sources."mime-db-1.36.0" sources."mime-types-2.1.20" sources."minimatch-3.0.4" @@ -42431,17 +43597,17 @@ in js-beautify = nodeEnv.buildNodePackage { name = "js-beautify"; packageName = "js-beautify"; - version = "1.8.1"; + version = "1.8.6"; src = fetchurl { - url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.8.1.tgz"; - sha512 = "e6Ij+fcwlnhxwfEWH148AV240ocW6z6LTZtWc9V7QEOUMu7pe2EINYbO1sM4GPHFwTVWMUWBCXGgsJGRpaQPLQ=="; + url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.8.6.tgz"; + sha512 = "TYDZa+lg8vEC5U0OmGQEEwiZ0XFBfvZAUeNOtqflLe+woKuIqF4JzlsBx/C1KVYW5lUewZy2ODL4Obq6sH7a4Q=="; }; dependencies = [ sources."@types/commander-2.12.2" sources."@types/semver-5.5.0" sources."abbrev-1.1.1" - sources."commander-2.17.1" - sources."config-chain-1.1.11" + sources."commander-2.18.0" + sources."config-chain-1.1.12" sources."editorconfig-0.15.0" sources."ini-1.3.5" sources."lru-cache-4.1.3" @@ -42459,8 +43625,8 @@ in ]; buildInputs = globalBuildInputs; meta = { - description = "jsbeautifier.org for node"; - homepage = http://jsbeautifier.org/; + description = "beautifier.io for node"; + homepage = https://beautifier.io/; license = "MIT"; }; production = true; @@ -42510,10 +43676,10 @@ in json-diff = nodeEnv.buildNodePackage { name = "json-diff"; packageName = "json-diff"; - version = "0.5.2"; + version = "0.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/json-diff/-/json-diff-0.5.2.tgz"; - sha512 = "N7oapTQdD4rLMUtA7d1HATCPY/BpHuSNL1mhvIuoS0u5NideDvyR+gB/ntXB7ejFz/LM0XzPLNUJQcC68n5sBw=="; + url = "https://registry.npmjs.org/json-diff/-/json-diff-0.5.3.tgz"; + sha512 = "3F9MMFWpZmb8A9VEOAo1xll+z0JGPLN/2mclRm9NyfPi8cynkTNwzqTDw1MZpadEnEHcCtDy6mzReM4O0BLIEA=="; }; dependencies = [ sources."cli-color-0.1.7" @@ -42547,7 +43713,7 @@ in sources."component-emitter-1.2.1" sources."cookiejar-2.1.2" sources."core-util-is-1.0.2" - sources."debug-3.1.0" + sources."debug-3.2.5" sources."delayed-stream-1.0.0" sources."esprima-4.0.1" sources."extend-3.0.2" @@ -42557,14 +43723,14 @@ in sources."inherits-2.0.3" sources."isarray-1.0.0" sources."js-yaml-3.12.0" - sources."lodash-4.17.10" + sources."lodash-4.17.11" sources."methods-1.1.2" sources."mime-1.6.0" sources."mime-db-1.36.0" sources."mime-types-2.1.20" - sources."ms-2.0.0" + sources."ms-2.1.1" sources."native-promise-only-0.8.1" - sources."path-loader-1.0.8" + sources."path-loader-1.0.9" sources."process-nextick-args-2.0.0" sources."punycode-2.1.1" sources."qs-6.5.2" @@ -42606,11 +43772,7 @@ in sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.8.0" - (sources."basic-auth-2.0.0" // { - dependencies = [ - sources."safe-buffer-5.1.1" - ]; - }) + sources."basic-auth-2.0.1" sources."bcrypt-pbkdf-1.0.2" sources."body-parser-1.18.3" sources."boxen-1.3.0" @@ -42619,15 +43781,15 @@ in sources."capture-stack-trace-1.0.1" sources."caseless-0.12.0" sources."chalk-2.4.1" - sources."ci-info-1.4.0" + sources."ci-info-1.6.0" sources."cli-boxes-1.0.0" sources."cliui-4.1.0" sources."co-4.6.0" sources."code-point-at-1.1.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."combined-stream-1.0.6" - sources."compressible-2.0.14" + sources."combined-stream-1.0.7" + sources."compressible-2.0.15" sources."compression-1.7.3" sources."configstore-3.1.2" sources."connect-pause-0.1.1" @@ -42689,7 +43851,11 @@ in }) sources."find-up-2.1.0" sources."forever-agent-0.6.1" - sources."form-data-2.3.2" + (sources."form-data-2.3.2" // { + dependencies = [ + sources."combined-stream-1.0.6" + ]; + }) sources."forwarded-0.1.2" sources."fresh-0.5.2" sources."get-caller-file-1.0.3" @@ -42710,7 +43876,7 @@ in sources."ini-1.3.5" sources."invert-kv-1.0.0" sources."ipaddr.js-1.8.0" - sources."is-ci-1.2.0" + sources."is-ci-1.2.1" sources."is-fullwidth-code-point-2.0.0" sources."is-installed-globally-0.1.0" sources."is-npm-1.0.0" @@ -42734,7 +43900,7 @@ in sources."latest-version-3.1.0" sources."lcid-1.0.0" sources."locate-path-2.0.0" - sources."lodash-4.17.10" + sources."lodash-4.17.11" sources."lodash-id-0.14.0" sources."lowdb-0.15.5" sources."lowercase-keys-1.0.1" @@ -42750,9 +43916,9 @@ in sources."mime-types-2.1.20" sources."mimic-fn-1.2.0" sources."minimist-1.2.0" - sources."morgan-1.9.0" + sources."morgan-1.9.1" sources."ms-2.0.0" - sources."nanoid-1.2.2" + sources."nanoid-1.2.4" sources."negotiator-0.6.1" sources."npm-run-path-2.0.2" sources."number-is-nan-1.0.1" @@ -42910,7 +44076,7 @@ in sources."base64-arraybuffer-0.1.5" sources."base64id-1.0.0" sources."better-assert-1.0.2" - sources."binary-extensions-1.11.0" + sources."binary-extensions-1.12.0" sources."blob-0.0.4" sources."bluebird-3.5.2" sources."body-parser-1.18.3" @@ -42928,7 +44094,7 @@ in sources."cache-base-1.0.1" sources."callsite-1.0.0" sources."chokidar-2.0.4" - sources."circular-json-0.5.5" + sources."circular-json-0.5.7" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" @@ -43034,7 +44200,7 @@ in sources."statuses-1.3.1" ]; }) - (sources."follow-redirects-1.5.7" // { + (sources."follow-redirects-1.5.8" // { dependencies = [ sources."debug-3.1.0" ]; @@ -43088,11 +44254,12 @@ in sources."isbinaryfile-3.0.3" sources."isobject-3.0.1" sources."kind-of-6.0.2" - sources."lodash-4.17.10" + sources."lodash-4.17.11" sources."lodash.debounce-4.0.8" (sources."log4js-3.0.5" // { dependencies = [ - sources."debug-3.1.0" + sources."debug-3.2.5" + sources."ms-2.1.1" ]; }) sources."lru-cache-2.2.4" @@ -43145,7 +44312,7 @@ in sources."range-parser-1.2.0" sources."raw-body-2.3.3" sources."readable-stream-2.3.6" - sources."readdirp-2.1.0" + sources."readdirp-2.2.1" sources."regex-not-1.0.2" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" @@ -43158,7 +44325,6 @@ in sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - sources."set-immediate-shim-1.0.1" (sources."set-value-2.0.0" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -43237,7 +44403,8 @@ in sources."statuses-1.5.0" (sources."streamroller-0.7.0" // { dependencies = [ - sources."debug-3.1.0" + sources."debug-3.2.5" + sources."ms-2.1.1" ]; }) sources."string_decoder-1.1.1" @@ -43310,7 +44477,7 @@ in sources."body-parser-1.13.3" sources."bytes-2.1.0" sources."commander-2.6.0" - sources."compressible-2.0.14" + sources."compressible-2.0.15" sources."compression-1.5.2" sources."connect-2.30.2" sources."connect-restreamer-1.0.3" @@ -43468,7 +44635,7 @@ in sources."clone-stats-1.0.0" sources."cloneable-readable-1.1.2" sources."concat-map-0.0.1" - sources."convert-source-map-1.5.1" + sources."convert-source-map-1.6.0" sources."core-util-is-1.0.2" sources."define-properties-1.1.3" sources."duplexify-3.6.0" @@ -43587,7 +44754,7 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."colors-1.3.2" - sources."combined-stream-1.0.6" + sources."combined-stream-1.0.7" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" sources."cross-spawn-5.1.0" @@ -43630,7 +44797,11 @@ in sources."fast-levenshtein-2.0.6" sources."find-up-2.1.0" sources."forever-agent-0.6.1" - sources."form-data-2.3.2" + (sources."form-data-2.3.2" // { + dependencies = [ + sources."combined-stream-1.0.6" + ]; + }) sources."fs.realpath-1.0.0" sources."get-caller-file-1.0.3" sources."get-stream-3.0.0" @@ -43668,7 +44839,7 @@ in sources."lcid-1.0.0" sources."levn-0.3.0" sources."locate-path-2.0.0" - sources."lodash-4.17.10" + sources."lodash-4.17.11" sources."log-symbols-2.2.0" sources."lru-cache-4.1.3" sources."mem-1.1.0" @@ -43806,73 +44977,67 @@ in lerna = nodeEnv.buildNodePackage { name = "lerna"; packageName = "lerna"; - version = "3.2.1"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/lerna/-/lerna-3.2.1.tgz"; - sha512 = "nHa/TgRLOHlBm+NfeW62ffVO7hY7wJxnu6IJmZA3lrSmRlqrXZk2BPvnq0FSaCinVYjW0w0XeSNZdRKR//HAwQ=="; + url = "https://registry.npmjs.org/lerna/-/lerna-3.4.0.tgz"; + sha512 = "RCLm0gMi8PESEF8PzMxo35foA2NGGC/NKnKiUmJyRrhLybOIUfVPdPStSAWCjW1c+DYCgLZCbxu57/KWt4ZWZA=="; }; dependencies = [ - sources."@lerna/add-3.2.0" + sources."@lerna/add-3.3.2" sources."@lerna/batch-packages-3.1.2" - sources."@lerna/bootstrap-3.2.0" - sources."@lerna/changed-3.2.0" - sources."@lerna/check-working-tree-3.1.0" - sources."@lerna/child-process-3.0.0" - sources."@lerna/clean-3.1.3" + sources."@lerna/bootstrap-3.3.2" + sources."@lerna/changed-3.3.2" + sources."@lerna/check-working-tree-3.3.0" + sources."@lerna/child-process-3.3.0" + sources."@lerna/clean-3.3.2" sources."@lerna/cli-3.2.0" - sources."@lerna/collect-updates-3.1.0" - sources."@lerna/command-3.1.3" - sources."@lerna/conventional-commits-3.0.2" - sources."@lerna/create-3.1.3" - sources."@lerna/create-symlink-3.0.0" - sources."@lerna/describe-ref-3.1.0" - sources."@lerna/diff-3.1.3" - sources."@lerna/exec-3.1.3" - sources."@lerna/filter-options-3.1.2" + sources."@lerna/collect-updates-3.3.2" + sources."@lerna/command-3.3.0" + sources."@lerna/conventional-commits-3.3.0" + sources."@lerna/create-3.3.1" + sources."@lerna/create-symlink-3.3.0" + sources."@lerna/describe-ref-3.3.0" + sources."@lerna/diff-3.3.0" + sources."@lerna/exec-3.3.2" + sources."@lerna/filter-options-3.3.2" sources."@lerna/filter-packages-3.0.0" sources."@lerna/get-npm-exec-opts-3.0.0" sources."@lerna/global-options-3.1.3" - sources."@lerna/has-npm-version-3.0.4" - sources."@lerna/import-3.1.3" - sources."@lerna/init-3.1.3" - sources."@lerna/link-3.1.4" - sources."@lerna/list-3.1.3" + sources."@lerna/has-npm-version-3.3.0" + sources."@lerna/import-3.3.1" + sources."@lerna/init-3.3.0" + sources."@lerna/link-3.3.0" + sources."@lerna/list-3.3.2" sources."@lerna/listable-3.0.0" sources."@lerna/log-packed-3.0.4" sources."@lerna/npm-conf-3.0.0" - sources."@lerna/npm-dist-tag-3.0.0" - sources."@lerna/npm-install-3.0.0" - sources."@lerna/npm-publish-3.2.0" - sources."@lerna/npm-run-script-3.0.0" + sources."@lerna/npm-dist-tag-3.3.0" + sources."@lerna/npm-install-3.3.0" + sources."@lerna/npm-publish-3.3.1" + sources."@lerna/npm-run-script-3.3.0" sources."@lerna/output-3.0.0" sources."@lerna/package-3.0.0" sources."@lerna/package-graph-3.1.2" sources."@lerna/project-3.0.0" - sources."@lerna/prompt-3.0.0" - sources."@lerna/publish-3.2.1" - sources."@lerna/resolve-symlink-3.0.0" - sources."@lerna/rimraf-dir-3.0.0" - sources."@lerna/run-3.1.3" - sources."@lerna/run-lifecycle-3.2.0" + sources."@lerna/prompt-3.3.1" + sources."@lerna/publish-3.4.0" + sources."@lerna/resolve-symlink-3.3.0" + sources."@lerna/rimraf-dir-3.3.0" + sources."@lerna/run-3.3.2" + sources."@lerna/run-lifecycle-3.3.1" sources."@lerna/run-parallel-batches-3.0.0" - sources."@lerna/symlink-binary-3.1.4" - sources."@lerna/symlink-dependencies-3.1.4" + sources."@lerna/symlink-binary-3.3.0" + sources."@lerna/symlink-dependencies-3.3.0" sources."@lerna/validation-error-3.0.0" - sources."@lerna/version-3.2.0" + sources."@lerna/version-3.3.2" sources."@lerna/write-log-file-3.0.0" sources."@mrmlnc/readdir-enhanced-2.2.1" - sources."@nodelib/fs.stat-1.1.1" + sources."@nodelib/fs.stat-1.1.2" sources."JSONStream-1.3.4" sources."abbrev-1.1.1" sources."agent-base-4.2.1" sources."agentkeepalive-3.5.1" sources."ajv-5.5.2" - (sources."align-text-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."amdefine-1.0.1" sources."ansi-escapes-3.1.0" sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" @@ -43893,7 +45058,7 @@ in sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" - sources."async-1.5.2" + sources."async-2.6.1" sources."asynckit-0.4.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" @@ -43924,11 +45089,10 @@ in sources."camelcase-4.1.0" sources."camelcase-keys-4.2.0" sources."caseless-0.12.0" - sources."center-align-0.1.3" sources."chalk-2.4.1" - sources."chardet-0.4.2" - sources."chownr-1.0.1" - sources."ci-info-1.4.0" + sources."chardet-0.7.0" + sources."chownr-1.1.1" + sources."ci-info-1.6.0" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" @@ -43962,7 +45126,8 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."columnify-1.5.4" - sources."combined-stream-1.0.6" + sources."combined-stream-1.0.7" + sources."commander-2.17.1" (sources."compare-func-1.3.2" // { dependencies = [ sources."dot-prop-3.0.0" @@ -43971,7 +45136,7 @@ in sources."component-emitter-1.2.1" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" - sources."config-chain-1.1.11" + sources."config-chain-1.1.12" sources."console-control-strings-1.1.0" sources."conventional-changelog-angular-1.6.6" (sources."conventional-changelog-core-2.0.11" // { @@ -44025,11 +45190,11 @@ in sources."end-of-stream-1.4.1" sources."err-code-1.1.2" sources."error-ex-1.3.2" - sources."es6-promise-4.2.4" + sources."es6-promise-4.2.5" sources."es6-promisify-5.0.0" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" - sources."execa-0.10.0" + sources."execa-1.0.0" (sources."expand-brackets-2.1.4" // { dependencies = [ sources."define-property-0.2.5" @@ -44054,7 +45219,7 @@ in sources."is-extendable-1.0.1" ]; }) - sources."external-editor-2.2.0" + sources."external-editor-3.0.3" (sources."extglob-2.0.4" // { dependencies = [ sources."define-property-1.0.0" @@ -44080,10 +45245,14 @@ in sources."flush-write-stream-1.0.3" sources."for-in-1.0.2" sources."forever-agent-0.6.1" - sources."form-data-2.3.2" + (sources."form-data-2.3.2" // { + dependencies = [ + sources."combined-stream-1.0.6" + ]; + }) sources."fragment-cache-0.2.1" sources."from2-2.3.0" - sources."fs-extra-6.0.1" + sources."fs-extra-7.0.0" sources."fs-minipass-1.2.5" sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" @@ -44104,7 +45273,6 @@ in sources."indent-string-2.1.0" sources."map-obj-1.0.1" sources."meow-3.7.0" - sources."minimist-1.2.0" sources."redent-1.0.0" sources."strip-indent-1.0.1" sources."trim-newlines-1.0.0" @@ -44112,7 +45280,7 @@ in }) sources."get-port-3.2.0" sources."get-stdin-4.0.1" - sources."get-stream-3.0.0" + sources."get-stream-4.0.0" sources."get-value-2.0.6" sources."getpass-0.1.7" sources."git-raw-commits-1.3.6" @@ -44128,9 +45296,9 @@ in sources."glob-to-regexp-0.3.0" sources."globby-8.0.1" sources."graceful-fs-4.1.11" - (sources."handlebars-4.0.11" // { + (sources."handlebars-4.0.12" // { dependencies = [ - sources."source-map-0.4.4" + sources."source-map-0.6.1" ]; }) sources."har-schema-2.0.0" @@ -44153,7 +45321,8 @@ in sources."http-signature-1.2.0" (sources."https-proxy-agent-2.2.1" // { dependencies = [ - sources."debug-3.1.0" + sources."debug-3.2.5" + sources."ms-2.1.1" ]; }) sources."humanize-ms-1.2.1" @@ -44168,19 +45337,19 @@ in sources."inherits-2.0.3" sources."ini-1.3.5" sources."init-package-json-1.10.3" - (sources."inquirer-5.2.0" // { + (sources."inquirer-6.2.0" // { dependencies = [ sources."ansi-regex-3.0.0" sources."strip-ansi-4.0.0" ]; }) - sources."invert-kv-1.0.0" + sources."invert-kv-2.0.0" sources."ip-1.1.5" sources."is-accessor-descriptor-1.0.0" sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" sources."is-builtin-module-1.0.0" - sources."is-ci-1.2.0" + sources."is-ci-1.2.1" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-directory-0.3.1" @@ -44218,29 +45387,32 @@ in sources."jsonparse-1.3.1" sources."jsprim-1.4.1" sources."kind-of-6.0.2" - sources."lazy-cache-1.0.4" - sources."lcid-1.0.0" + sources."lcid-2.0.0" + (sources."libnpmaccess-3.0.0" // { + dependencies = [ + sources."aproba-2.0.0" + ]; + }) sources."load-json-file-4.0.0" sources."locate-path-3.0.0" - sources."lodash-4.17.10" + sources."lodash-4.17.11" sources."lodash._reinterpolate-3.0.0" sources."lodash.sortby-4.7.0" sources."lodash.template-4.4.0" sources."lodash.templatesettings-4.1.0" - sources."longest-1.0.1" sources."loud-rejection-1.6.0" sources."lru-cache-4.1.3" sources."make-dir-1.3.0" sources."make-fetch-happen-4.0.1" + sources."map-age-cleaner-0.1.2" sources."map-cache-0.2.2" sources."map-obj-2.0.0" sources."map-visit-1.0.0" - sources."mem-1.1.0" + sources."mem-4.0.0" (sources."meow-4.0.1" // { dependencies = [ sources."find-up-2.1.0" sources."locate-path-2.0.0" - sources."minimist-1.2.0" sources."p-limit-1.3.0" sources."p-locate-2.0.0" sources."p-try-1.0.0" @@ -44253,7 +45425,7 @@ in sources."mime-types-2.1.20" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" - sources."minimist-0.1.0" + sources."minimist-1.2.0" sources."minimist-options-3.0.2" (sources."minipass-2.3.4" // { dependencies = [ @@ -44273,7 +45445,6 @@ in ]; }) sources."modify-values-1.0.1" - sources."moment-2.22.2" sources."move-concurrently-1.0.1" sources."ms-2.0.0" sources."multimatch-2.1.0" @@ -44323,15 +45494,17 @@ in ]; }) sources."os-homedir-1.0.2" - (sources."os-locale-2.1.0" // { + (sources."os-locale-3.0.1" // { dependencies = [ - sources."cross-spawn-5.1.0" - sources."execa-0.7.0" + sources."execa-0.10.0" + sources."get-stream-3.0.0" ]; }) sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" + sources."p-defer-1.0.0" sources."p-finally-1.0.0" + sources."p-is-promise-1.1.0" sources."p-limit-2.0.0" sources."p-locate-3.0.0" sources."p-map-1.2.0" @@ -44340,7 +45513,11 @@ in sources."p-reduce-1.0.0" sources."p-try-2.0.0" sources."p-waterfall-1.0.0" - sources."pacote-9.1.0" + (sources."pacote-9.1.0" // { + dependencies = [ + sources."get-stream-3.0.0" + ]; + }) sources."parallel-transform-1.1.0" sources."parse-github-repo-url-1.4.1" sources."parse-json-4.0.0" @@ -44419,11 +45596,10 @@ in sources."restore-cursor-2.0.0" sources."ret-0.1.15" sources."retry-0.10.1" - sources."right-align-0.1.3" sources."rimraf-2.6.2" sources."run-async-2.3.0" sources."run-queue-1.0.3" - sources."rxjs-5.5.12" + sources."rxjs-6.3.3" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -44474,10 +45650,10 @@ in sources."source-map-0.5.7" sources."source-map-resolve-0.5.2" sources."source-map-url-0.4.0" - sources."spdx-correct-3.0.0" + sources."spdx-correct-3.0.1" sources."spdx-exceptions-2.1.0" sources."spdx-expression-parse-3.0.0" - sources."spdx-license-ids-3.0.0" + sources."spdx-license-ids-3.0.1" sources."split-1.0.1" sources."split-string-3.1.0" sources."split2-2.2.0" @@ -44514,9 +45690,8 @@ in sources."strip-bom-3.0.0" sources."strip-eof-1.0.0" sources."strip-indent-2.0.0" - sources."strong-log-transformer-1.0.6" + sources."strong-log-transformer-2.0.0" sources."supports-color-5.5.0" - sources."symbol-observable-1.0.1" (sources."tar-4.4.6" // { dependencies = [ sources."yallist-3.0.2" @@ -44524,7 +45699,7 @@ in }) sources."temp-dir-1.0.0" sources."temp-write-3.4.0" - sources."text-extensions-1.7.0" + sources."text-extensions-1.8.0" sources."through-2.3.8" sources."through2-2.0.3" sources."tmp-0.0.33" @@ -44543,19 +45718,15 @@ in }) sources."trim-newlines-2.0.0" sources."trim-off-newlines-1.0.1" + sources."tslib-1.9.3" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."typedarray-0.0.6" - (sources."uglify-js-2.8.29" // { + (sources."uglify-js-3.4.9" // { dependencies = [ - sources."camelcase-1.2.1" - sources."cliui-2.1.0" - sources."decamelize-1.2.0" - sources."wordwrap-0.0.2" - sources."yargs-3.10.0" + sources."source-map-0.6.1" ]; }) - sources."uglify-to-browserify-1.0.2" sources."uid-number-0.0.6" sources."umask-1.1.0" (sources."union-value-1.0.0" // { @@ -44564,8 +45735,8 @@ in sources."set-value-0.4.3" ]; }) - sources."unique-filename-1.1.0" - sources."unique-slug-2.0.0" + sources."unique-filename-1.1.1" + sources."unique-slug-2.0.1" sources."universalify-0.1.2" (sources."unset-value-1.0.0" // { dependencies = [ @@ -44586,11 +45757,10 @@ in sources."verror-1.10.0" sources."wcwidth-1.0.1" sources."webidl-conversions-4.0.2" - sources."whatwg-url-6.5.0" + sources."whatwg-url-7.0.0" sources."which-1.3.1" sources."which-module-2.0.0" sources."wide-align-1.1.3" - sources."window-size-0.1.0" sources."wordwrap-0.0.3" (sources."wrap-ansi-2.1.0" // { dependencies = [ @@ -44606,7 +45776,7 @@ in sources."xtend-4.0.1" sources."y18n-4.0.0" sources."yallist-2.1.2" - sources."yargs-12.0.1" + sources."yargs-12.0.2" sources."yargs-parser-10.1.0" ]; buildInputs = globalBuildInputs; @@ -44638,7 +45808,7 @@ in sources."caseless-0.12.0" sources."clone-2.1.2" sources."co-4.6.0" - sources."combined-stream-1.0.6" + sources."combined-stream-1.0.7" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" sources."delayed-stream-1.0.0" @@ -44649,7 +45819,11 @@ in 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.2" + (sources."form-data-2.3.2" // { + dependencies = [ + sources."combined-stream-1.0.6" + ]; + }) sources."getpass-0.1.7" sources."graceful-fs-4.1.11" sources."har-schema-2.0.0" @@ -44733,26 +45907,65 @@ in sources."apache-md5-1.1.2" sources."arr-diff-2.0.0" sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" sources."array-unique-0.2.1" + sources."assign-symbols-1.0.0" sources."async-each-1.0.1" - sources."balanced-match-1.0.0" - (sources."basic-auth-2.0.0" // { + sources."atob-2.1.2" + (sources."base-0.11.2" // { dependencies = [ - sources."safe-buffer-5.1.1" + sources."define-property-1.0.0" + sources."isobject-3.0.1" ]; }) + sources."basic-auth-2.0.1" sources."batch-0.6.1" sources."bcryptjs-2.4.3" - sources."binary-extensions-1.11.0" - sources."brace-expansion-1.1.11" + sources."binary-extensions-1.12.0" sources."braces-1.8.5" + (sources."cache-base-1.0.1" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) sources."chokidar-1.7.0" + (sources."class-utils-0.3.6" // { + dependencies = [ + sources."define-property-0.2.5" + (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."isobject-3.0.1" + sources."kind-of-5.1.0" + ]; + }) + sources."collection-visit-1.0.0" sources."colors-1.3.2" - sources."concat-map-0.0.1" - sources."connect-3.5.1" + sources."component-emitter-1.2.1" + (sources."connect-3.5.1" // { + dependencies = [ + sources."debug-2.2.0" + sources."ms-0.7.1" + ]; + }) + sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" sources."cors-2.8.4" - sources."debug-2.2.0" + sources."debug-2.6.9" + sources."decode-uri-component-0.2.0" + (sources."define-property-2.0.2" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) sources."depd-1.1.2" sources."destroy-1.0.4" sources."duplexer-0.1.1" @@ -44760,22 +45973,49 @@ in sources."encodeurl-1.0.2" sources."escape-html-1.0.3" sources."etag-1.8.1" - sources."event-stream-3.3.4" + sources."event-stream-4.0.0" sources."expand-brackets-0.1.5" sources."expand-range-1.8.2" + (sources."extend-shallow-3.0.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) sources."extglob-0.3.2" sources."faye-websocket-0.11.1" sources."filename-regex-2.0.1" sources."fill-range-2.2.4" - sources."finalhandler-0.5.1" + (sources."finalhandler-0.5.1" // { + dependencies = [ + sources."debug-2.2.0" + sources."ms-0.7.1" + ]; + }) sources."for-in-1.0.2" sources."for-own-0.1.5" + sources."fragment-cache-0.2.1" sources."fresh-0.5.2" sources."from-0.1.7" sources."fsevents-1.2.4" + sources."get-value-2.0.6" sources."glob-base-0.3.0" sources."glob-parent-2.0.0" sources."graceful-fs-4.1.11" + (sources."has-value-1.0.0" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) + (sources."has-values-1.0.0" // { + dependencies = [ + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."kind-of-4.0.0" + ]; + }) sources."http-auth-3.1.3" (sources."http-errors-1.6.3" // { dependencies = [ @@ -44784,46 +46024,99 @@ in }) sources."http-parser-js-0.4.13" sources."inherits-2.0.3" + (sources."is-accessor-descriptor-1.0.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" + (sources."is-data-descriptor-1.0.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + (sources."is-descriptor-1.0.2" // { + dependencies = [ + sources."kind-of-6.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-number-2.1.0" + (sources."is-plain-object-2.0.4" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) sources."is-posix-bracket-0.1.1" sources."is-primitive-2.0.0" + sources."is-windows-1.0.2" sources."is-wsl-1.1.0" sources."isarray-1.0.0" sources."isobject-2.1.0" sources."kind-of-3.2.2" - sources."map-stream-0.1.0" + sources."map-cache-0.2.2" + sources."map-stream-0.0.7" + sources."map-visit-1.0.0" sources."math-random-1.0.1" sources."micromatch-2.3.11" sources."mime-1.4.1" sources."mime-db-1.36.0" sources."mime-types-2.1.20" - sources."minimatch-3.0.4" - (sources."morgan-1.9.0" // { + (sources."mixin-deep-1.3.1" // { dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" + sources."is-extendable-1.0.1" ]; }) - sources."ms-0.7.1" + sources."morgan-1.9.1" + sources."ms-2.0.0" sources."nan-2.11.0" + (sources."nanomatch-1.2.13" // { + dependencies = [ + sources."arr-diff-4.0.0" + sources."array-unique-0.3.2" + sources."kind-of-6.0.2" + ]; + }) sources."negotiator-0.6.1" sources."normalize-path-2.1.1" sources."object-assign-4.1.1" + (sources."object-copy-0.1.0" // { + dependencies = [ + sources."define-property-0.2.5" + sources."is-accessor-descriptor-0.1.6" + sources."is-data-descriptor-0.1.4" + (sources."is-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + ]; + }) + (sources."object-visit-1.0.1" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) sources."object.omit-2.0.1" + (sources."object.pick-1.3.0" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) sources."on-finished-2.3.0" sources."on-headers-1.0.1" - sources."opn-5.3.0" + sources."opn-5.4.0" sources."parse-glob-3.0.4" sources."parseurl-1.3.2" + sources."pascalcase-0.1.1" sources."path-is-absolute-1.0.1" sources."pause-stream-0.0.11" + sources."posix-character-classes-0.1.1" sources."preserve-0.2.0" sources."process-nextick-args-2.0.0" sources."proxy-middleware-0.15.0" @@ -44835,34 +46128,157 @@ in }) sources."range-parser-1.2.0" sources."readable-stream-2.3.6" - sources."readdirp-2.1.0" + (sources."readdirp-2.2.1" // { + dependencies = [ + sources."arr-diff-4.0.0" + sources."array-unique-0.3.2" + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + ]; + }) + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + ]; + }) + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (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" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."isobject-3.0.1" + sources."kind-of-6.0.2" + sources."micromatch-3.1.10" + ]; + }) sources."regex-cache-0.4.4" + sources."regex-not-1.0.2" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" + sources."resolve-url-0.2.1" + sources."ret-0.1.15" sources."safe-buffer-5.1.2" + sources."safe-regex-1.1.0" (sources."send-0.16.2" // { dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" sources."statuses-1.4.0" ]; }) - (sources."serve-index-1.9.1" // { + sources."serve-index-1.9.1" + (sources."set-value-2.0.0" // { dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" + sources."extend-shallow-2.0.1" ]; }) - sources."set-immediate-shim-1.0.1" sources."setprototypeof-1.1.0" - sources."split-0.3.3" + (sources."snapdragon-0.8.2" // { + dependencies = [ + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (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."kind-of-5.1.0" + ]; + }) + (sources."snapdragon-node-2.1.1" // { + dependencies = [ + sources."define-property-1.0.0" + sources."isobject-3.0.1" + ]; + }) + sources."snapdragon-util-3.0.1" + sources."source-map-0.5.7" + sources."source-map-resolve-0.5.2" + sources."source-map-url-0.4.0" + sources."split-1.0.1" + sources."split-string-3.1.0" + (sources."static-extend-0.1.2" // { + dependencies = [ + sources."define-property-0.2.5" + (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."kind-of-5.1.0" + ]; + }) sources."statuses-1.3.1" - sources."stream-combiner-0.0.4" + sources."stream-combiner-0.2.2" sources."string_decoder-1.1.1" sources."through-2.3.8" + sources."to-object-path-0.3.0" + sources."to-regex-3.0.2" + (sources."to-regex-range-2.1.1" // { + dependencies = [ + sources."is-number-3.0.0" + ]; + }) + (sources."union-value-1.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + sources."set-value-0.4.3" + ]; + }) sources."unix-crypt-td-js-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."has-values-0.1.4" + sources."isobject-3.0.1" + ]; + }) + sources."urix-0.1.0" + sources."use-3.1.1" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.0" sources."uuid-3.3.2" @@ -44895,44 +46311,81 @@ in sources."argparse-1.0.10" sources."arr-diff-2.0.0" sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" sources."array-flatten-1.1.1" sources."array-unique-0.2.1" sources."arraybuffer.slice-0.0.7" sources."asn1-0.2.4" sources."assert-plus-1.0.0" + sources."assign-symbols-1.0.0" sources."async-each-1.0.1" sources."async-limiter-1.0.0" sources."asynckit-0.4.0" + sources."atob-2.1.2" sources."aws-sign2-0.7.0" sources."aws4-1.8.0" sources."backo2-1.0.2" - sources."balanced-match-1.0.0" + (sources."base-0.11.2" // { + dependencies = [ + sources."define-property-1.0.0" + sources."isobject-3.0.1" + ]; + }) sources."base64-arraybuffer-0.1.5" sources."base64id-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."better-assert-1.0.2" - sources."binary-extensions-1.11.0" + sources."binary-extensions-1.12.0" sources."blob-0.0.4" sources."body-parser-1.18.3" - sources."brace-expansion-1.1.11" sources."braces-1.8.5" sources."bytes-3.0.0" + (sources."cache-base-1.0.1" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) sources."callsite-1.0.0" sources."caseless-0.12.0" sources."chokidar-1.7.0" + (sources."class-utils-0.3.6" // { + dependencies = [ + sources."define-property-0.2.5" + (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."isobject-3.0.1" + sources."kind-of-5.1.0" + ]; + }) sources."co-4.6.0" - sources."combined-stream-1.0.6" + sources."collection-visit-1.0.0" + sources."combined-stream-1.0.7" sources."component-bind-1.0.0" sources."component-emitter-1.2.1" sources."component-inherit-0.0.3" - sources."concat-map-0.0.1" sources."content-disposition-0.5.2" sources."content-type-1.0.4" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" + sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" sources."debug-2.6.9" + sources."decode-uri-component-0.2.0" + (sources."define-property-2.0.2" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) sources."delayed-stream-1.0.0" sources."depd-1.1.2" sources."destroy-1.0.4" @@ -44973,6 +46426,11 @@ in ]; }) sources."extend-3.0.2" + (sources."extend-shallow-3.0.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) sources."extglob-0.3.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-1.1.0" @@ -44987,10 +46445,16 @@ in sources."for-in-1.0.2" sources."for-own-0.1.5" sources."forever-agent-0.6.1" - sources."form-data-2.3.2" + (sources."form-data-2.3.2" // { + dependencies = [ + sources."combined-stream-1.0.6" + ]; + }) sources."forwarded-0.1.2" + sources."fragment-cache-0.2.1" sources."fresh-0.5.2" sources."fsevents-1.2.4" + sources."get-value-2.0.6" sources."getpass-0.1.7" sources."github-slugger-1.2.0" sources."glob-base-0.3.0" @@ -45004,6 +46468,21 @@ in ]; }) sources."has-cors-1.1.0" + (sources."has-value-1.0.0" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) + (sources."has-values-1.0.0" // { + dependencies = [ + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."kind-of-4.0.0" + ]; + }) sources."html-entities-1.2.1" sources."http-errors-1.6.3" sources."http-signature-1.2.0" @@ -45012,17 +46491,38 @@ in sources."inherits-2.0.3" sources."innertext-1.0.3" sources."ipaddr.js-1.8.0" + (sources."is-accessor-descriptor-1.0.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" + (sources."is-data-descriptor-1.0.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + (sources."is-descriptor-1.0.2" // { + dependencies = [ + sources."kind-of-6.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-number-2.1.0" + (sources."is-plain-object-2.0.4" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) sources."is-posix-bracket-0.1.1" sources."is-primitive-2.0.0" sources."is-typedarray-1.0.0" + sources."is-windows-1.0.2" sources."is-wsl-1.1.0" sources."isarray-1.0.0" sources."isobject-2.1.0" @@ -45034,6 +46534,8 @@ in sources."jsprim-1.4.1" sources."kind-of-3.2.2" sources."linkify-it-2.0.3" + sources."map-cache-0.2.2" + sources."map-visit-1.0.0" sources."markdown-it-8.4.2" sources."markdown-it-emoji-1.4.0" sources."markdown-it-github-headings-1.1.1" @@ -45047,24 +46549,59 @@ in sources."mime-1.4.1" sources."mime-db-1.36.0" sources."mime-types-2.1.20" - sources."minimatch-3.0.4" sources."minimist-1.2.0" + (sources."mixin-deep-1.3.1" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) sources."ms-2.0.0" sources."nan-2.11.0" + (sources."nanomatch-1.2.13" // { + dependencies = [ + sources."arr-diff-4.0.0" + sources."array-unique-0.3.2" + sources."kind-of-6.0.2" + ]; + }) sources."negotiator-0.6.1" sources."normalize-path-2.1.1" sources."oauth-sign-0.9.0" sources."object-component-0.0.3" + (sources."object-copy-0.1.0" // { + dependencies = [ + sources."define-property-0.2.5" + sources."is-accessor-descriptor-0.1.6" + sources."is-data-descriptor-0.1.4" + (sources."is-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + ]; + }) + (sources."object-visit-1.0.1" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) sources."object.omit-2.0.1" + (sources."object.pick-1.3.0" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) sources."on-finished-2.3.0" - sources."opn-5.3.0" + sources."opn-5.4.0" sources."parse-glob-3.0.4" sources."parseqs-0.0.5" sources."parseuri-0.0.5" sources."parseurl-1.3.2" + sources."pascalcase-0.1.1" sources."path-is-absolute-1.0.1" sources."path-to-regexp-0.1.7" sources."performance-now-2.1.0" + sources."posix-character-classes-0.1.1" sources."preserve-0.2.0" sources."process-nextick-args-2.0.0" sources."proxy-addr-2.0.4" @@ -45080,13 +46617,67 @@ in sources."range-parser-1.2.0" sources."raw-body-2.3.3" sources."readable-stream-2.3.6" - sources."readdirp-2.1.0" + (sources."readdirp-2.2.1" // { + dependencies = [ + sources."arr-diff-4.0.0" + sources."array-unique-0.3.2" + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + ]; + }) + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + ]; + }) + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (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" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."isobject-3.0.1" + sources."kind-of-6.0.2" + sources."micromatch-3.1.10" + ]; + }) sources."regex-cache-0.4.4" + sources."regex-not-1.0.2" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" sources."request-2.88.0" + sources."resolve-url-0.2.1" + sources."ret-0.1.15" sources."safe-buffer-5.1.2" + sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" (sources."send-0.16.2" // { dependencies = [ @@ -45094,8 +46685,37 @@ in ]; }) sources."serve-static-1.13.2" - sources."set-immediate-shim-1.0.1" + (sources."set-value-2.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) sources."setprototypeof-1.1.0" + (sources."snapdragon-0.8.2" // { + dependencies = [ + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (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."kind-of-5.1.0" + ]; + }) + (sources."snapdragon-node-2.1.1" // { + dependencies = [ + sources."define-property-1.0.0" + sources."isobject-3.0.1" + ]; + }) + sources."snapdragon-util-3.0.1" (sources."socket.io-2.1.1" // { dependencies = [ sources."debug-3.1.0" @@ -45113,18 +46733,65 @@ in sources."isarray-2.0.1" ]; }) + sources."source-map-0.5.7" + sources."source-map-resolve-0.5.2" + sources."source-map-url-0.4.0" + sources."split-string-3.1.0" sources."sprintf-js-1.0.3" sources."sshpk-1.14.2" + (sources."static-extend-0.1.2" // { + dependencies = [ + sources."define-property-0.2.5" + (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."kind-of-5.1.0" + ]; + }) sources."statuses-1.5.0" sources."string_decoder-1.1.1" sources."to-array-0.1.4" + sources."to-object-path-0.3.0" + sources."to-regex-3.0.2" + (sources."to-regex-range-2.1.1" // { + dependencies = [ + sources."is-number-3.0.0" + ]; + }) sources."tough-cookie-2.4.3" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.16" sources."uc.micro-1.0.5" sources."ultron-1.1.1" + (sources."union-value-1.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + sources."set-value-0.4.3" + ]; + }) 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."has-values-0.1.4" + sources."isobject-3.0.1" + ]; + }) + sources."urix-0.1.0" + sources."use-3.1.1" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uuid-3.3.2" @@ -45221,10 +46888,10 @@ in meguca = nodeEnv.buildNodePackage { name = "meguca"; packageName = "meguca"; - version = "1.0.9"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/meguca/-/meguca-1.0.9.tgz"; - sha512 = "Q2O9s9cqu19UfhsA6+XDnuuYflxFKck5TvvYF2LMhtKWVVmIGuqVZiDAhx1XV3qO22B5A0vjU4gckaeQLALmPQ=="; + url = "https://registry.npmjs.org/meguca/-/meguca-1.1.2.tgz"; + sha512 = "WW3e3r7fCcjX5GH793OaF2SVMdMAhljVZNNCLBXrQhe7RhbhZiEVIGR/6lDLxgySfIF7Hf33ANoH1ytehnxnbg=="; }; dependencies = [ (sources."@gulp-sourcemaps/identity-map-1.0.2" // { @@ -45242,7 +46909,7 @@ in sources."through2-2.0.3" ]; }) - (sources."accord-0.28.0" // { + (sources."accord-0.29.0" // { dependencies = [ sources."glob-7.1.3" sources."minimatch-3.0.4" @@ -45250,15 +46917,14 @@ in sources."uglify-js-2.8.29" ]; }) - sources."acorn-5.7.2" - sources."ajv-4.11.8" + sources."acorn-5.7.3" + sources."ajv-5.5.2" (sources."align-text-0.1.4" // { dependencies = [ sources."kind-of-3.2.2" ]; }) sources."almond-0.3.3" - sources."amdefine-1.0.1" sources."ansi-colors-1.1.0" sources."ansi-cyan-0.1.1" sources."ansi-gray-0.1.1" @@ -45278,11 +46944,11 @@ in sources."array-unique-0.3.2" sources."asap-2.0.6" sources."asn1-0.2.4" - sources."assert-plus-0.2.0" + sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" sources."asynckit-0.4.0" sources."atob-2.1.2" - sources."aws-sign2-0.6.0" + sources."aws-sign2-0.7.0" sources."aws4-1.8.0" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { @@ -45292,7 +46958,6 @@ in }) sources."bcrypt-pbkdf-1.0.2" sources."beeper-1.1.1" - sources."boom-2.10.1" sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { dependencies = [ @@ -45340,31 +47005,27 @@ in sources."co-4.6.0" sources."collection-visit-1.0.0" sources."color-support-1.1.3" - sources."combined-stream-1.0.6" + sources."combined-stream-1.0.7" sources."commander-2.17.1" sources."component-emitter-1.2.1" sources."concat-map-0.0.1" - sources."convert-source-map-1.5.1" + sources."convert-source-map-1.6.0" sources."copy-descriptor-0.1.1" sources."core-js-2.5.7" sources."core-util-is-1.0.2" - sources."cryptiles-2.0.5" - (sources."css-2.2.3" // { + (sources."css-2.2.4" // { dependencies = [ - sources."source-map-0.1.43" + sources."source-map-0.6.1" ]; }) sources."d-1.0.0" - (sources."dashdash-1.14.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."dashdash-1.14.1" sources."dateformat-2.2.0" sources."debug-2.6.9" (sources."debug-fabulous-1.1.0" // { dependencies = [ - sources."debug-3.1.0" + sources."debug-3.2.5" + sources."ms-2.1.1" ]; }) sources."decamelize-1.2.0" @@ -45433,6 +47094,8 @@ in }) sources."extsprintf-1.3.0" sources."fancy-log-1.3.2" + sources."fast-deep-equal-1.1.0" + sources."fast-json-stable-stringify-2.0.0" (sources."fill-range-4.0.0" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -45452,7 +47115,11 @@ in sources."for-in-1.0.2" sources."for-own-1.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.4" + (sources."form-data-2.3.2" // { + dependencies = [ + sources."combined-stream-1.0.6" + ]; + }) sources."fragment-cache-0.2.1" (sources."fs-mkdirp-stream-1.0.0" // { dependencies = [ @@ -45466,11 +47133,7 @@ in sources."function-bind-1.1.1" sources."gaze-0.5.2" sources."get-value-2.0.6" - (sources."getpass-0.1.7" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."getpass-0.1.7" sources."glob-4.5.3" sources."glob-parent-3.1.0" sources."glob-stream-3.1.18" @@ -45496,7 +47159,7 @@ in sources."through2-2.0.3" ]; }) - (sources."gulp-less-3.5.0" // { + (sources."gulp-less-4.0.1" // { dependencies = [ sources."arr-diff-1.1.0" sources."arr-union-2.1.0" @@ -45518,23 +47181,18 @@ in sources."through2-2.0.3" ]; }) - (sources."gulp-typescript-4.0.2" // { + (sources."gulp-typescript-5.0.0-alpha.3" // { dependencies = [ - sources."arr-diff-1.1.0" - sources."arr-union-2.1.0" - sources."array-slice-0.2.3" + sources."ansi-colors-2.0.5" sources."clone-2.1.2" sources."clone-stats-1.0.0" - sources."extend-shallow-1.1.4" sources."glob-7.1.3" sources."glob-stream-6.1.0" sources."graceful-fs-4.1.11" - sources."kind-of-1.1.0" sources."minimatch-3.0.4" sources."ordered-read-streams-1.0.1" - sources."plugin-error-0.1.2" sources."readable-stream-2.3.6" - sources."source-map-0.6.1" + sources."source-map-0.7.3" sources."string_decoder-1.1.1" sources."through2-2.0.3" sources."unique-stream-2.2.1" @@ -45544,7 +47202,7 @@ in }) (sources."gulp-uglify-3.0.1" // { dependencies = [ - sources."lodash-4.17.10" + sources."lodash-4.17.11" sources."readable-stream-2.3.6" sources."string_decoder-1.1.1" sources."through2-2.0.3" @@ -45561,8 +47219,8 @@ in ]; }) sources."gulplog-1.0.0" - sources."har-schema-1.0.5" - sources."har-validator-4.2.1" + sources."har-schema-2.0.0" + sources."har-validator-5.1.0" sources."has-ansi-2.0.0" sources."has-gulplog-0.1.0" sources."has-symbols-1.0.0" @@ -45572,10 +47230,8 @@ in sources."kind-of-4.0.0" ]; }) - sources."hawk-3.1.3" - sources."hoek-2.16.3" sources."homedir-polyfill-1.0.1" - sources."http-signature-1.1.1" + sources."http-signature-1.2.0" sources."image-size-0.5.5" sources."indx-0.2.3" sources."inflight-1.0.6" @@ -45610,14 +47266,11 @@ in 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-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."jsprim-1.4.1" sources."kind-of-6.0.2" sources."lazy-cache-1.0.4" (sources."lazystream-1.0.0" // { @@ -45627,9 +47280,11 @@ in ]; }) sources."lead-1.0.0" - (sources."less-2.7.3" // { + (sources."less-3.8.1" // { dependencies = [ + sources."clone-2.1.2" sources."graceful-fs-4.1.11" + sources."source-map-0.6.1" ]; }) sources."liftoff-2.5.0" @@ -45685,11 +47340,11 @@ in sources."ms-2.0.0" sources."multipipe-0.1.2" sources."nanomatch-1.2.13" - sources."natives-1.1.4" + sources."natives-1.1.5" sources."next-tick-1.0.0" sources."normalize-path-2.1.1" sources."now-and-later-2.0.0" - sources."oauth-sign-0.8.2" + sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" (sources."object-copy-0.1.0" // { dependencies = [ @@ -45722,13 +47377,14 @@ in sources."path-parse-1.0.6" sources."path-root-0.1.1" sources."path-root-regex-0.1.2" - sources."performance-now-0.2.0" + sources."performance-now-2.1.0" sources."plugin-error-1.0.1" sources."posix-character-classes-0.1.1" sources."pretty-hrtime-1.0.3" sources."process-nextick-args-2.0.0" sources."promise-7.3.1" sources."prr-1.0.1" + sources."psl-1.1.29" (sources."pump-2.0.1" // { dependencies = [ (sources."end-of-stream-1.4.1" // { @@ -45740,7 +47396,7 @@ in }) sources."pumpify-1.5.1" sources."punycode-1.4.1" - sources."qs-6.4.0" + sources."qs-6.5.2" (sources."readable-stream-1.0.34" // { dependencies = [ sources."isarray-0.0.1" @@ -45760,7 +47416,7 @@ in sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" sources."replace-ext-1.0.0" - sources."request-2.81.0" + sources."request-2.88.0" sources."resolve-1.8.1" sources."resolve-dir-1.0.1" sources."resolve-options-1.1.0" @@ -45806,17 +47462,12 @@ in sources."kind-of-3.2.2" ]; }) - sources."sntp-1.0.9" sources."source-map-0.5.7" sources."source-map-resolve-0.5.2" sources."source-map-url-0.4.0" sources."sparkles-1.0.1" sources."split-string-3.1.0" - (sources."sshpk-1.14.2" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."sshpk-1.14.2" (sources."static-extend-0.1.2" // { dependencies = [ sources."define-property-0.2.5" @@ -45837,7 +47488,6 @@ in sources."stream-consume-0.1.1" sources."stream-shift-1.0.0" sources."string_decoder-0.10.31" - sources."stringstream-0.0.6" sources."strip-ansi-3.0.1" sources."strip-bom-1.0.0" sources."strip-bom-string-1.0.0" @@ -45868,10 +47518,10 @@ in sources."through2-2.0.3" ]; }) - sources."tough-cookie-2.3.4" + sources."tough-cookie-2.4.3" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."typescript-2.7.2" + sources."typescript-3.1.1" (sources."uglify-js-3.4.9" // { dependencies = [ sources."source-map-0.6.1" @@ -45903,11 +47553,7 @@ in sources."uuid-3.3.2" sources."v8flags-2.1.1" sources."value-or-function-3.0.0" - (sources."verror-1.10.0" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."verror-1.10.0" (sources."vinyl-0.4.6" // { dependencies = [ sources."clone-0.2.0" @@ -45923,7 +47569,6 @@ in ]; }) sources."vinyl-sourcemaps-apply-0.2.1" - sources."whatwg-fetch-2.0.4" sources."when-3.7.8" sources."which-1.3.1" sources."window-size-0.1.0" @@ -45934,7 +47579,7 @@ in ]; buildInputs = globalBuildInputs; meta = { - description = "[](https://godoc.org/github.com/bakape/meguca) [](https://travis-ci.org/bakape/meguca)"; + description = "[](https://godoc.org/github.com/bakape/meguca) [](https://travis-ci.org/bakape/meguca)"; homepage = "https://github.com/bakape/meguca#readme"; license = "AGPL-3.0"; }; @@ -45995,11 +47640,11 @@ in sources."argparse-1.0.10" sources."asynckit-0.4.0" sources."combined-stream-1.0.6" - sources."commander-2.17.1" + sources."commander-2.18.0" sources."component-emitter-1.2.1" sources."cookiejar-2.1.2" sources."core-util-is-1.0.2" - sources."debug-3.1.0" + sources."debug-3.2.5" sources."delayed-stream-1.0.0" sources."esprima-4.0.1" sources."extend-3.0.2" @@ -46010,14 +47655,14 @@ in sources."isarray-1.0.0" sources."js-yaml-3.12.0" sources."json-refs-2.1.7" - sources."lodash-4.17.10" + sources."lodash-4.17.11" sources."methods-1.1.2" sources."mime-1.6.0" sources."mime-db-1.36.0" sources."mime-types-2.1.20" - sources."ms-2.0.0" + sources."ms-2.1.1" sources."native-promise-only-0.8.1" - sources."path-loader-1.0.8" + sources."path-loader-1.0.9" sources."process-nextick-args-2.0.0" sources."punycode-2.1.1" sources."qs-6.5.2" @@ -46086,9 +47731,9 @@ in sources."caseless-0.12.0" sources."co-4.6.0" sources."code-point-at-1.1.0" - sources."combined-stream-1.0.6" + sources."combined-stream-1.0.7" sources."concat-stream-1.6.2" - sources."config-chain-1.1.11" + sources."config-chain-1.1.12" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" @@ -46102,7 +47747,11 @@ in sources."findit-2.0.0" sources."foreachasync-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.3.2" + (sources."form-data-2.3.2" // { + dependencies = [ + sources."combined-stream-1.0.6" + ]; + }) (sources."fs-extra-0.6.4" // { dependencies = [ sources."mkdirp-0.3.5" @@ -46178,10 +47827,10 @@ in sources."signal-exit-3.0.2" sources."slasp-0.0.4" sources."slide-1.1.6" - sources."spdx-correct-3.0.0" + sources."spdx-correct-3.0.1" sources."spdx-exceptions-2.1.0" sources."spdx-expression-parse-3.0.0" - sources."spdx-license-ids-3.0.0" + sources."spdx-license-ids-3.0.1" sources."sshpk-1.14.2" sources."ssri-5.3.0" sources."string-width-1.0.2" @@ -46239,7 +47888,7 @@ in sources."caseless-0.12.0" sources."co-4.6.0" sources."code-point-at-1.1.0" - sources."combined-stream-1.0.6" + sources."combined-stream-1.0.7" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" @@ -46252,7 +47901,11 @@ in 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.2" + (sources."form-data-2.3.2" // { + dependencies = [ + sources."combined-stream-1.0.6" + ]; + }) sources."fs.realpath-1.0.0" sources."fstream-1.0.11" sources."gauge-2.7.4" @@ -46372,7 +48025,7 @@ in sources."base64-js-0.0.8" sources."bcrypt-pbkdf-1.0.2" sources."biased-opener-0.2.8" - sources."big-integer-1.6.35" + sources."big-integer-1.6.36" sources."block-stream-0.0.9" sources."body-parser-1.18.2" sources."boom-2.10.1" @@ -46387,7 +48040,7 @@ in sources."cliui-3.2.0" sources."co-4.6.0" sources."code-point-at-1.1.0" - sources."combined-stream-1.0.6" + sources."combined-stream-1.0.7" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."content-disposition-0.5.2" @@ -46564,10 +48217,10 @@ in sources."setprototypeof-1.1.0" sources."signal-exit-3.0.2" sources."sntp-1.0.9" - sources."spdx-correct-3.0.0" + sources."spdx-correct-3.0.1" sources."spdx-exceptions-2.1.0" sources."spdx-expression-parse-3.0.0" - sources."spdx-license-ids-3.0.0" + sources."spdx-license-ids-3.0.1" (sources."sshpk-1.14.2" // { dependencies = [ sources."assert-plus-1.0.0" @@ -46657,7 +48310,7 @@ in sources."are-we-there-yet-1.1.5" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" - sources."chownr-1.0.1" + sources."chownr-1.1.1" sources."code-point-at-1.1.0" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" @@ -46684,7 +48337,7 @@ in sources."minizlib-1.1.0" sources."mkdirp-0.5.1" sources."ms-2.0.0" - sources."needle-2.2.2" + sources."needle-2.2.4" sources."nopt-4.0.1" sources."npm-bundled-1.0.5" sources."npm-packlist-1.1.11" @@ -46756,7 +48409,7 @@ in sources."define-property-1.0.0" ]; }) - sources."binary-extensions-1.11.0" + sources."binary-extensions-1.12.0" sources."boxen-1.3.0" sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { @@ -46770,7 +48423,7 @@ in sources."capture-stack-trace-1.0.1" sources."chalk-2.4.1" sources."chokidar-2.0.4" - sources."ci-info-1.4.0" + sources."ci-info-1.6.0" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" @@ -46800,7 +48453,11 @@ in sources."create-error-class-3.0.2" sources."cross-spawn-5.1.0" sources."crypto-random-string-1.0.0" - sources."debug-3.1.0" + (sources."debug-3.2.5" // { + dependencies = [ + sources."ms-2.1.1" + ]; + }) sources."decode-uri-component-0.2.0" sources."deep-extend-0.6.0" sources."define-property-2.0.2" @@ -46808,7 +48465,7 @@ in sources."duplexer-0.1.1" sources."duplexer3-0.1.4" sources."escape-string-regexp-1.0.5" - sources."event-stream-3.3.4" + sources."event-stream-3.3.6" sources."execa-0.7.0" (sources."expand-brackets-2.1.4" // { dependencies = [ @@ -46844,6 +48501,7 @@ in sources."is-extendable-0.1.1" ]; }) + sources."flatmap-stream-0.1.0" sources."for-in-1.0.2" sources."fragment-cache-0.2.1" sources."from-0.1.7" @@ -46873,7 +48531,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.2.0" + sources."is-ci-1.2.1" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-extendable-1.0.1" @@ -46904,7 +48562,7 @@ in sources."lru-cache-4.1.3" sources."make-dir-1.3.0" sources."map-cache-0.2.2" - sources."map-stream-0.1.0" + sources."map-stream-0.0.7" sources."map-visit-1.0.0" sources."micromatch-3.1.10" sources."minimatch-3.0.4" @@ -46948,7 +48606,7 @@ in sources."pstree.remy-1.1.0" sources."rc-1.2.8" sources."readable-stream-2.3.6" - sources."readdirp-2.1.0" + sources."readdirp-2.2.1" sources."regex-not-1.0.2" sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" @@ -46961,7 +48619,6 @@ in sources."safe-regex-1.1.0" sources."semver-5.5.1" sources."semver-diff-2.1.0" - sources."set-immediate-shim-1.0.1" (sources."set-value-2.0.0" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -47004,7 +48661,7 @@ in sources."source-map-0.5.7" sources."source-map-resolve-0.5.2" sources."source-map-url-0.4.0" - sources."split-0.3.3" + sources."split-1.0.1" sources."split-string-3.1.0" (sources."static-extend-0.1.2" // { dependencies = [ @@ -47023,7 +48680,7 @@ in sources."kind-of-5.1.0" ]; }) - sources."stream-combiner-0.0.4" + sources."stream-combiner-0.2.2" sources."string-width-2.1.1" sources."string_decoder-1.1.1" sources."strip-ansi-4.0.0" @@ -47089,15 +48746,16 @@ in node-red = nodeEnv.buildNodePackage { name = "node-red"; packageName = "node-red"; - version = "0.19.2"; + version = "0.19.4"; src = fetchurl { - url = "https://registry.npmjs.org/node-red/-/node-red-0.19.2.tgz"; - sha512 = "788MCJSRjfYhsGsuRDlWL3Q1E2LheTPjnXzvIdX5/94buaczJifGdoqi2lNxQuCjHXPUvWVTeZCF0ot0igdz7Q=="; + url = "https://registry.npmjs.org/node-red/-/node-red-0.19.4.tgz"; + sha512 = "BcFaU1bCAl0fsu6t3sSPXXPuvUiIKcHj3jrpV3zvVols+dp0zgM9xPX9N8D7978h402H8h2A+0DDQA1vENQIEA=="; }; dependencies = [ sources."abbrev-1.1.1" sources."accepts-1.3.5" sources."addressparser-0.3.2" + sources."agent-base-4.2.1" sources."ajv-6.5.3" sources."append-field-0.1.0" sources."argparse-1.0.10" @@ -47138,7 +48796,7 @@ in sources."cheerio-0.22.0" sources."clone-2.1.2" sources."co-4.6.0" - sources."combined-stream-1.0.6" + sources."combined-stream-1.0.7" sources."commander-2.17.1" sources."commist-1.0.0" sources."concat-map-0.0.1" @@ -47151,7 +48809,7 @@ in sources."core-util-is-1.0.2" sources."cors-2.8.4" sources."crc-3.4.4" - sources."cron-1.3.0" + sources."cron-1.4.1" sources."css-select-1.2.0" sources."css-what-2.1.0" sources."d-1.0.0" @@ -47186,6 +48844,8 @@ in sources."es5-ext-0.10.46" sources."es6-iterator-2.0.3" sources."es6-map-0.1.5" + sources."es6-promise-4.2.5" + sources."es6-promisify-5.0.0" sources."es6-set-0.1.5" sources."es6-symbol-3.1.1" sources."escape-html-1.0.3" @@ -47224,7 +48884,11 @@ in ]; }) sources."forever-agent-0.6.1" - sources."form-data-2.3.2" + (sources."form-data-2.3.2" // { + dependencies = [ + sources."combined-stream-1.0.6" + ]; + }) sources."forwarded-0.1.2" sources."fresh-0.5.2" sources."fs-extra-5.0.0" @@ -47248,6 +48912,12 @@ in sources."htmlparser2-3.9.2" sources."http-errors-1.6.3" sources."http-signature-1.2.0" + (sources."https-proxy-agent-2.2.1" // { + dependencies = [ + sources."debug-3.2.5" + sources."ms-2.1.1" + ]; + }) sources."i18next-11.6.0" sources."iconv-lite-0.4.23" (sources."imap-0.8.19" // { @@ -47329,7 +48999,7 @@ in }) sources."moment-2.22.2" sources."moment-timezone-0.5.21" - sources."mqtt-2.18.5" + sources."mqtt-2.18.8" sources."mqtt-packet-5.6.0" sources."mri-1.1.1" sources."ms-2.0.0" @@ -47338,13 +49008,13 @@ in sources."object-assign-3.0.0" ]; }) - sources."mustache-2.3.1" + sources."mustache-2.3.2" sources."nan-2.10.0" sources."needle-0.11.0" sources."negotiator-0.6.1" sources."next-tick-1.0.0" sources."node-red-node-email-0.1.29" - sources."node-red-node-feedparser-0.1.12" + sources."node-red-node-feedparser-0.1.14" sources."node-red-node-rbe-0.2.3" sources."node-red-node-twitter-1.1.2" sources."nodemailer-1.11.0" @@ -47443,7 +49113,7 @@ in sources."twitter-ng-0.6.2" sources."type-is-1.6.16" sources."typedarray-0.0.6" - sources."uglify-js-3.4.8" + sources."uglify-js-3.4.9" sources."uid-safe-2.1.5" sources."uid2-0.0.3" sources."ultron-1.1.1" @@ -47527,9 +49197,9 @@ in sources."connect-flash-0.1.0" sources."cookie-0.0.5" sources."cookie-signature-1.0.1" - (sources."debug-3.1.0" // { + (sources."debug-4.0.1" // { dependencies = [ - sources."ms-2.0.0" + sources."ms-2.1.1" ]; }) sources."diff-1.0.8" @@ -47666,9 +49336,9 @@ in sources."co-4.6.0" sources."code-point-at-1.1.0" sources."coffee-script-1.12.7" - sources."combined-stream-1.0.6" + sources."combined-stream-1.0.7" sources."concat-map-0.0.1" - (sources."config-chain-1.1.11" // { + (sources."config-chain-1.1.12" // { dependencies = [ sources."ini-1.3.5" ]; @@ -47687,7 +49357,11 @@ in sources."findit-1.2.0" sources."foreachasync-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.3.2" + (sources."form-data-2.3.2" // { + dependencies = [ + sources."combined-stream-1.0.6" + ]; + }) (sources."fs-extra-0.6.4" // { dependencies = [ sources."rimraf-2.2.8" @@ -47727,7 +49401,7 @@ in sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.3.5" - sources."natives-1.1.4" + sources."natives-1.1.5" sources."ncp-0.4.2" sources."nopt-2.2.1" (sources."npm-registry-client-0.2.27" // { @@ -47824,19 +49498,19 @@ in sources."camelcase-4.1.0" sources."capture-stack-trace-1.0.1" sources."chalk-1.1.3" - sources."ci-info-1.4.0" + sources."ci-info-1.6.0" sources."cint-8.2.1" sources."cli-boxes-1.0.0" sources."cli-table-0.3.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."colors-1.0.3" - sources."commander-2.17.1" + sources."commander-2.18.0" sources."configstore-3.1.2" sources."create-error-class-3.0.2" sources."cross-spawn-5.1.0" sources."crypto-random-string-1.0.0" - sources."debug-3.1.0" + sources."debug-3.2.5" sources."deep-extend-0.6.0" sources."dot-prop-4.2.0" sources."duplexer3-0.1.4" @@ -47855,7 +49529,7 @@ in sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" sources."ini-1.3.5" - sources."is-ci-1.2.0" + sources."is-ci-1.2.1" sources."is-fullwidth-code-point-2.0.0" sources."is-installed-globally-0.1.0" sources."is-npm-1.0.0" @@ -47870,12 +49544,12 @@ in sources."json-parse-helpfulerror-1.0.3" sources."json5-1.0.1" sources."latest-version-3.1.0" - sources."lodash-4.17.10" + sources."lodash-4.17.11" sources."lowercase-keys-1.0.1" sources."lru-cache-4.1.3" sources."make-dir-1.3.0" sources."minimist-1.2.0" - sources."ms-2.0.0" + sources."ms-2.1.1" sources."node-alias-1.0.4" sources."npm-3.10.10" sources."npm-run-path-2.0.2" @@ -47978,11 +49652,11 @@ in sources."color-name-1.1.3" sources."colors-1.3.2" sources."cross-spawn-5.1.0" - sources."cvss-1.0.3" - sources."debug-3.1.0" + sources."cvss-1.0.4" + sources."debug-3.2.5" sources."decamelize-1.2.0" sources."error-ex-1.3.2" - sources."es6-promise-4.2.4" + sources."es6-promise-4.2.5" sources."es6-promisify-5.0.0" sources."escape-string-regexp-1.0.5" sources."execa-0.7.0" @@ -48001,7 +49675,7 @@ in dependencies = [ sources."ansi-regex-3.0.0" sources."is-fullwidth-code-point-2.0.0" - sources."lodash-4.17.10" + sources."lodash-4.17.11" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" ]; @@ -48020,7 +49694,7 @@ in sources."lru-cache-4.1.3" sources."mem-1.1.0" sources."mimic-fn-1.2.0" - sources."ms-2.0.0" + sources."ms-2.1.1" sources."mute-stream-0.0.7" sources."nodesecurity-npm-utils-6.0.0" sources."normalize-package-data-2.4.0" @@ -48053,10 +49727,10 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" - sources."spdx-correct-3.0.0" + sources."spdx-correct-3.0.1" sources."spdx-exceptions-2.1.0" sources."spdx-expression-parse-3.0.0" - sources."spdx-license-ids-3.0.0" + sources."spdx-license-ids-3.0.1" sources."string-width-1.0.2" sources."strip-ansi-3.0.1" sources."strip-bom-3.0.0" @@ -48118,7 +49792,7 @@ in sources."vscode-languageclient-4.0.1" sources."vscode-languageserver-4.0.0" sources."vscode-languageserver-protocol-3.6.0" - sources."vscode-languageserver-types-3.12.0" + sources."vscode-languageserver-types-3.13.0" sources."vscode-uri-1.0.3" sources."wrappy-1.0.2" ]; @@ -48143,8 +49817,6 @@ in dependencies = [ sources."accepts-1.3.5" sources."ajv-5.5.2" - sources."align-text-0.1.4" - sources."amdefine-1.0.1" sources."ansi-regex-2.1.1" sources."argparse-1.0.10" sources."array-flatten-1.1.1" @@ -48177,20 +49849,16 @@ in sources."bunyan-syslog-udp-0.1.0" sources."busboy-0.2.14" sources."bytes-3.0.0" - sources."camelcase-1.2.1" + sources."camelcase-3.0.0" sources."caseless-0.12.0" - sources."center-align-0.1.3" sources."clarinet-0.11.0" - (sources."cliui-2.1.0" // { - dependencies = [ - sources."wordwrap-0.0.2" - ]; - }) + sources."cliui-3.2.0" sources."co-4.6.0" sources."code-point-at-1.1.0" sources."colors-1.3.2" - sources."combined-stream-1.0.6" - sources."compressible-2.0.14" + sources."combined-stream-1.0.7" + sources."commander-2.17.1" + sources."compressible-2.0.15" sources."compression-1.7.3" sources."concat-map-0.0.1" sources."connect-busboy-0.0.2" @@ -48250,7 +49918,11 @@ in }) sources."find-up-1.1.2" sources."forever-agent-0.6.1" - sources."form-data-2.3.2" + (sources."form-data-2.3.2" // { + dependencies = [ + sources."combined-stream-1.0.6" + ]; + }) sources."forwarded-0.1.2" sources."fresh-0.5.2" sources."function-bind-1.1.1" @@ -48260,9 +49932,9 @@ in sources."getpass-0.1.7" sources."glob-6.0.4" sources."graceful-fs-4.1.11" - (sources."handlebars-4.0.11" // { + (sources."handlebars-4.0.12" // { dependencies = [ - sources."async-1.5.2" + sources."async-2.6.1" ]; }) sources."har-schema-2.0.0" @@ -48280,7 +49952,6 @@ in sources."ipaddr.js-1.8.0" sources."is-arguments-1.0.2" sources."is-arrayish-0.2.1" - sources."is-buffer-1.1.6" sources."is-builtin-module-1.0.0" sources."is-fullwidth-code-point-1.0.0" sources."is-typedarray-1.0.0" @@ -48295,6 +49966,7 @@ in sources."jsprim-1.4.1" (sources."kad-git+https://github.com/gwicke/kad.git#master" // { dependencies = [ + sources."lodash-3.10.1" sources."ms-0.7.3" ]; }) @@ -48313,8 +49985,6 @@ in sources."string_decoder-1.1.1" ]; }) - sources."kind-of-3.2.2" - sources."lazy-cache-1.0.4" sources."lcid-1.0.0" (sources."limitation-0.2.0" // { dependencies = [ @@ -48324,10 +49994,9 @@ in ]; }) sources."load-json-file-1.1.0" - sources."lodash-3.10.1" + sources."lodash-4.17.11" sources."lodash._baseclone-4.5.7" sources."lodash.clone-4.3.2" - sources."longest-1.0.1" sources."media-typer-0.3.0" sources."mediawiki-title-0.6.5" sources."merge-1.2.0" @@ -48389,11 +50058,9 @@ in 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.88.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."right-align-0.1.3" sources."rimraf-2.4.5" sources."safe-buffer-5.1.2" sources."safe-json-stringify-1.2.0" @@ -48415,11 +50082,11 @@ in sources."set-blocking-2.0.0" sources."setprototypeof-1.1.0" sources."simplediff-0.1.1" - sources."source-map-0.4.4" - sources."spdx-correct-3.0.0" + sources."source-map-0.6.1" + sources."spdx-correct-3.0.1" sources."spdx-exceptions-2.1.0" sources."spdx-expression-parse-3.0.0" - sources."spdx-license-ids-3.0.0" + sources."spdx-license-ids-3.0.1" sources."sprintf-js-1.0.3" sources."sshpk-1.14.2" sources."statuses-1.5.0" @@ -48432,13 +50099,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.16" - (sources."uglify-js-2.8.29" // { - dependencies = [ - sources."source-map-0.5.7" - sources."yargs-3.10.0" - ]; - }) - sources."uglify-to-browserify-1.0.2" + sources."uglify-js-3.4.9" sources."unpipe-1.0.0" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" @@ -48447,22 +50108,12 @@ in sources."vary-1.1.2" sources."verror-1.10.0" sources."which-module-1.0.0" - sources."window-size-0.1.0" sources."wordwrap-0.0.3" sources."wrap-ansi-2.1.0" sources."wrappy-1.0.2" sources."y18n-3.2.1" - (sources."yargs-7.1.0" // { - dependencies = [ - sources."camelcase-3.0.0" - sources."cliui-3.2.0" - ]; - }) - (sources."yargs-parser-5.0.0" // { - dependencies = [ - sources."camelcase-3.0.0" - ]; - }) + sources."yargs-7.1.0" + sources."yargs-parser-5.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -48497,7 +50148,7 @@ in sources."balanced-match-1.0.0" sources."base64-js-0.0.8" sources."bencode-2.0.0" - sources."big-integer-1.6.35" + sources."big-integer-1.6.36" sources."bitfield-0.1.0" (sources."bittorrent-dht-6.4.2" // { dependencies = [ @@ -48586,7 +50237,7 @@ in sources."ansi-styles-3.2.1" sources."chalk-2.4.1" sources."is-fullwidth-code-point-2.0.0" - sources."lodash-4.17.10" + sources."lodash-4.17.11" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" sources."supports-color-5.5.0" @@ -48714,10 +50365,10 @@ in ]; }) sources."single-line-log-1.1.2" - sources."spdx-correct-3.0.0" + sources."spdx-correct-3.0.1" sources."spdx-exceptions-2.1.0" sources."spdx-expression-parse-3.0.0" - sources."spdx-license-ids-3.0.0" + sources."spdx-license-ids-3.0.1" sources."speedometer-0.1.4" sources."stream-buffers-2.2.0" sources."string-width-1.0.2" @@ -48735,7 +50386,7 @@ in sources."tmp-0.0.33" sources."torrent-discovery-5.4.0" sources."torrent-piece-1.1.2" - (sources."torrent-stream-1.0.4" // { + (sources."torrent-stream-1.1.0" // { dependencies = [ sources."end-of-stream-0.1.5" sources."magnet-uri-4.2.3" @@ -48775,10 +50426,10 @@ in peerflix-server = nodeEnv.buildNodePackage { name = "peerflix-server"; packageName = "peerflix-server"; - version = "0.4.1"; + version = "0.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.4.1.tgz"; - sha512 = "R69EPwlRGmvk976x3KVBaRclnPgK+wCex/Th4eQWWMSoTq+EzSAANRxe/QnEr0k0SQmiiJYsWWv7L7mBmvnD2A=="; + url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.4.2.tgz"; + sha512 = "UuY4QsKFEPpB52Ee0y0jOOrTN1Mm2Lee/EJN3RdOxJxEupBujBypqZAfxQrjtsKle8QkZHG3z4j/DnwkroYnUQ=="; }; dependencies = [ sources."accepts-1.2.13" @@ -48814,6 +50465,8 @@ in sources."bncode-0.5.3" (sources."body-parser-1.13.3" // { dependencies = [ + sources."depd-1.0.1" + sources."http-errors-1.3.1" sources."qs-4.0.0" ]; }) @@ -48840,11 +50493,13 @@ in sources."normalize-path-2.1.1" ]; }) - sources."compressible-2.0.14" + sources."compressible-2.0.15" sources."compression-1.5.2" sources."concat-map-0.0.1" (sources."connect-2.30.2" // { dependencies = [ + sources."depd-1.0.1" + sources."http-errors-1.3.1" sources."isarray-0.0.1" sources."multiparty-3.3.2" sources."qs-4.0.0" @@ -48852,8 +50507,12 @@ in sources."string_decoder-0.10.31" ]; }) - sources."connect-multiparty-2.1.1" - sources."connect-timeout-1.6.2" + sources."connect-multiparty-2.2.0" + (sources."connect-timeout-1.6.2" // { + dependencies = [ + sources."http-errors-1.3.1" + ]; + }) sources."content-disposition-0.5.0" sources."content-type-1.0.4" sources."cookie-0.1.3" @@ -48864,13 +50523,21 @@ in sources."crc-3.8.0" sources."crc32-stream-2.0.0" sources."cryptiles-0.1.3" - sources."csrf-3.0.6" - sources."csurf-1.8.3" + (sources."csrf-3.0.6" // { + dependencies = [ + sources."uid-safe-2.1.4" + ]; + }) + (sources."csurf-1.8.3" // { + dependencies = [ + sources."http-errors-1.3.1" + ]; + }) sources."cyclist-0.1.1" sources."debug-2.2.0" sources."decompress-response-3.3.0" sources."delayed-stream-0.0.5" - sources."depd-1.0.1" + sources."depd-1.1.2" sources."destroy-1.0.4" sources."ee-first-1.1.1" sources."end-of-stream-1.4.1" @@ -48901,16 +50568,18 @@ in sources."etag-1.7.0" (sources."express-3.21.2" // { dependencies = [ + sources."depd-1.0.1" sources."range-parser-1.0.3" ]; }) (sources."express-session-1.11.3" // { dependencies = [ sources."crc-3.3.0" + sources."depd-1.0.1" sources."uid-safe-2.0.0" ]; }) - sources."fd-slicer-1.0.1" + sources."fd-slicer-1.1.0" sources."fifo-0.1.4" sources."finalhandler-0.4.0" sources."flatten-0.0.1" @@ -48939,7 +50608,7 @@ in sources."hat-0.0.3" sources."hawk-0.10.2" sources."hoek-0.7.6" - sources."http-errors-1.3.1" + sources."http-errors-1.7.1" sources."iconv-lite-0.4.11" sources."ieee754-1.1.12" sources."immediate-chunk-store-1.0.8" @@ -48965,7 +50634,7 @@ in ]; }) sources."lazystream-1.0.0" - sources."lodash-4.17.10" + sources."lodash-4.17.11" sources."lodash.assign-4.2.0" sources."lodash.defaults-4.2.0" sources."lodash.difference-4.5.0" @@ -48992,9 +50661,13 @@ in sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."morgan-1.6.1" + (sources."morgan-1.6.1" // { + dependencies = [ + sources."depd-1.0.1" + ]; + }) sources."ms-0.7.1" - sources."multiparty-4.1.4" + sources."multiparty-4.2.1" sources."negotiator-0.5.3" sources."node-uuid-1.4.8" sources."normalize-path-3.0.0" @@ -49053,11 +50726,7 @@ in sources."qs-0.5.6" ]; }) - (sources."response-time-2.3.2" // { - dependencies = [ - sources."depd-1.1.2" - ]; - }) + sources."response-time-2.3.2" sources."rimraf-2.6.2" sources."rndm-1.2.0" sources."run-parallel-1.1.9" @@ -49066,7 +50735,9 @@ in sources."safe-buffer-5.1.2" (sources."send-0.13.0" // { dependencies = [ + sources."depd-1.0.1" sources."destroy-1.0.3" + sources."http-errors-1.3.1" sources."range-parser-1.0.3" sources."statuses-1.2.1" ]; @@ -49079,17 +50750,19 @@ in (sources."serve-index-1.7.3" // { dependencies = [ sources."escape-html-1.0.3" + sources."http-errors-1.3.1" ]; }) (sources."serve-static-1.10.3" // { dependencies = [ - sources."depd-1.1.2" sources."escape-html-1.0.3" + sources."http-errors-1.3.1" sources."range-parser-1.0.3" sources."send-0.13.2" sources."statuses-1.2.1" ]; }) + sources."setprototypeof-1.1.0" sources."simple-concat-1.0.0" sources."simple-get-2.8.1" sources."simple-peer-6.4.4" @@ -49137,14 +50810,15 @@ in }) sources."string2compact-1.3.0" sources."string_decoder-1.1.1" - sources."tar-stream-1.6.1" + sources."tar-stream-1.6.2" sources."thirty-two-0.0.2" sources."thunky-1.0.2" sources."to-array-0.1.4" sources."to-buffer-1.1.1" + sources."toidentifier-1.0.0" sources."torrent-discovery-5.4.0" sources."torrent-piece-1.1.2" - (sources."torrent-stream-1.0.4" // { + (sources."torrent-stream-1.1.0" // { dependencies = [ sources."end-of-stream-0.1.5" sources."mkdirp-0.3.5" @@ -49154,7 +50828,7 @@ in sources."tsscmp-1.0.5" sources."tunnel-agent-0.2.0" sources."type-is-1.6.16" - sources."uid-safe-2.1.4" + sources."uid-safe-2.1.5" sources."ultron-1.0.2" sources."uniq-1.0.1" sources."unpipe-1.0.0" @@ -49203,8 +50877,8 @@ in sources."brace-expansion-1.1.11" sources."caseless-0.11.0" sources."chalk-1.1.3" - sources."combined-stream-1.0.6" - sources."commander-2.17.1" + sources."combined-stream-1.0.7" + sources."commander-2.18.0" sources."concat-map-0.0.1" sources."concat-stream-1.5.0" sources."core-util-is-1.0.2" @@ -49263,7 +50937,7 @@ in }) sources."kew-0.7.0" sources."klaw-1.3.1" - sources."lodash-4.17.10" + sources."lodash-4.17.11" sources."mime-db-1.36.0" sources."mime-types-2.1.20" sources."minimatch-3.0.4" @@ -49322,10 +50996,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "2.15.0"; + version = "2.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-2.15.0.tgz"; - sha512 = "bMS1ShnuwRtg1SRrauo9gYFXn4CxO+tyYNRe40DsY4cDpycbLs3Lr54ulQrFZtE4Yn6m3keu3sft7f36eg0gbw=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-2.16.2.tgz"; + sha512 = "MYb5lDNvYE3f0UfbZqV6HSMHWOiVveTRbT7+f3IocRgLaEIJTEy1QTuuXOUUuAmbSOkjJ11euYb+qy4HTNZaUg=="; }; buildInputs = globalBuildInputs; meta = { @@ -49339,10 +51013,10 @@ in prettier = nodeEnv.buildNodePackage { name = "prettier"; packageName = "prettier"; - version = "1.14.2"; + version = "1.14.3"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-1.14.2.tgz"; - sha512 = "McHPg0n1pIke+A/4VcaS2en+pTNjy4xF+Uuq86u/5dyDO59/TtFZtQ708QIRkEZ3qwKz3GVkVa6mpxK/CpB8Rg=="; + url = "https://registry.npmjs.org/prettier/-/prettier-1.14.3.tgz"; + sha512 = "qZDVnCrnpsRJJq5nSsiHCE3BYMED2OtsI+cmzIzF1QIfqm5ALf8tEJcO27zV1gKNKRPdhjO0dNWnrzssDQ1tFg=="; }; buildInputs = globalBuildInputs; meta = { @@ -49363,7 +51037,7 @@ in }; dependencies = [ sources."JSONStream-1.3.4" - sources."acorn-5.7.2" + sources."acorn-5.7.3" sources."acorn-dynamic-import-3.0.0" sources."acorn-node-1.5.2" sources."anymatch-2.0.0" @@ -49392,7 +51066,7 @@ in ]; }) sources."base64-js-1.3.0" - sources."binary-extensions-1.11.0" + sources."binary-extensions-1.12.0" sources."bn.js-4.11.8" sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { @@ -49615,7 +51289,7 @@ in sources."nan-2.11.0" sources."nanomatch-1.2.13" sources."neo-async-2.5.2" - sources."node-static-0.7.10" + sources."node-static-0.7.11" sources."normalize-path-2.1.1" (sources."object-copy-0.1.0" // { dependencies = [ @@ -49650,7 +51324,7 @@ in sources."path-is-absolute-1.0.1" sources."path-parse-1.0.6" sources."path-platform-0.11.15" - sources."pbkdf2-3.0.16" + sources."pbkdf2-3.0.17" sources."posix-character-classes-0.1.1" sources."process-0.11.10" sources."process-nextick-args-1.0.7" @@ -49668,7 +51342,7 @@ in sources."string_decoder-1.1.1" ]; }) - sources."readdirp-2.1.0" + sources."readdirp-2.2.1" sources."regex-not-1.0.2" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" @@ -49681,7 +51355,6 @@ in sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."sander-0.5.1" - sources."set-immediate-shim-1.0.1" (sources."set-value-2.0.0" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -49725,7 +51398,7 @@ in sources."source-map-0.5.7" sources."source-map-resolve-0.5.2" sources."source-map-url-0.4.0" - sources."sourcemap-codec-1.4.1" + sources."sourcemap-codec-1.4.3" sources."split-string-3.1.0" (sources."static-extend-0.1.2" // { dependencies = [ @@ -49849,7 +51522,11 @@ in sources."babel-runtime-6.26.0" sources."babel-types-6.26.0" sources."babylon-6.18.0" - sources."basic-auth-2.0.0" + (sources."basic-auth-2.0.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."bcrypt-pbkdf-1.0.2" sources."bindings-1.2.1" sources."bl-1.2.2" @@ -49864,7 +51541,7 @@ in sources."caseless-0.12.0" sources."center-align-0.1.3" sources."character-parser-2.2.0" - sources."chownr-1.0.1" + sources."chownr-1.1.1" (sources."clean-css-4.2.1" // { dependencies = [ sources."source-map-0.6.1" @@ -49873,8 +51550,8 @@ in 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.17.1" + sources."combined-stream-1.0.7" + sources."commander-2.18.0" sources."console-control-strings-1.1.0" sources."constantinople-3.1.2" sources."content-disposition-0.5.2" @@ -49989,7 +51666,7 @@ in sources."less-2.7.3" sources."less-middleware-2.2.1" sources."libquassel-2.1.9" - sources."lodash-4.17.10" + sources."lodash-4.17.11" sources."longest-1.0.1" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" @@ -49999,12 +51676,12 @@ in sources."mime-types-2.1.20" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."morgan-1.9.0" + sources."morgan-1.9.1" sources."ms-2.0.0" sources."nan-2.5.1" sources."negotiator-0.6.1" sources."net-browserify-alt-1.1.0" - sources."node-abi-2.4.3" + sources."node-abi-2.4.4" sources."node.extend-2.0.0" sources."noop-logger-0.1.1" sources."npmlog-4.1.2" @@ -50096,7 +51773,7 @@ in sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" sources."tar-fs-1.16.3" - sources."tar-stream-1.6.1" + sources."tar-stream-1.6.2" sources."to-buffer-1.1.1" sources."to-fast-properties-1.0.3" sources."token-stream-0.0.1" @@ -50150,13 +51827,13 @@ in sha1 = "da6ac7d4d7777a59a5e951cf46e72fd4b6b40a2c"; }; dependencies = [ - sources."acorn-5.7.2" + sources."acorn-5.7.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.17.1" + sources."commander-2.18.0" sources."commoner-0.10.8" sources."concat-map-0.0.1" sources."defined-1.0.0" @@ -50281,7 +51958,7 @@ in sources."caseless-0.12.0" sources."co-4.6.0" sources."coffee-script-1.6.3" - sources."combined-stream-1.0.6" + sources."combined-stream-1.0.7" sources."commander-2.0.0" (sources."connect-2.11.0" // { dependencies = [ @@ -50294,7 +51971,7 @@ in sources."crc-0.2.0" sources."crypto-0.0.3" sources."dashdash-1.14.1" - sources."debug-3.1.0" + sources."debug-4.0.1" sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.2" sources."events.node-0.4.9" @@ -50320,7 +51997,11 @@ in 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.2" + (sources."form-data-2.3.2" // { + dependencies = [ + sources."combined-stream-1.0.6" + ]; + }) sources."formidable-1.0.11" sources."fresh-0.2.0" sources."getpass-0.1.7" @@ -50343,7 +52024,7 @@ in sources."mime-db-1.36.0" sources."mime-types-2.1.20" sources."mkdirp-0.3.5" - sources."ms-2.0.0" + sources."ms-2.1.1" sources."multiparty-2.2.0" sources."negotiator-0.3.0" sources."node-swt-0.1.1" @@ -50393,10 +52074,10 @@ in scuttlebot = nodeEnv.buildNodePackage { name = "scuttlebot"; packageName = "scuttlebot"; - version = "11.4.2"; + version = "12.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/scuttlebot/-/scuttlebot-11.4.2.tgz"; - sha512 = "JbOKdMFCyoALwpiK5FM8qikpFvEqCdRycbFGiOdhhQT0VrTWCO1PXDFuDAHnCBTDYvjjO88M9njq2BOXVypvAg=="; + url = "https://registry.npmjs.org/scuttlebot/-/scuttlebot-12.2.0.tgz"; + sha512 = "zSB0mcodvOOXumXDqITpB6mjmqPnW32pN3SreOF/cr4mpBpWSvSmvlmHQqAVH0RnorNVu0djjDXUO8SMjc+cWQ=="; }; dependencies = [ sources."abstract-leveldown-4.0.3" @@ -50414,20 +52095,29 @@ in sources."are-we-there-yet-1.1.5" sources."arr-diff-2.0.0" sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" sources."array-union-1.0.2" sources."array-uniq-1.0.3" sources."array-unique-0.2.1" sources."arrify-1.0.1" + sources."assign-symbols-1.0.0" sources."async-each-1.0.1" sources."async-single-1.0.5" sources."async-write-2.1.0" + sources."atob-2.1.2" sources."atomic-file-0.0.1" sources."attach-ware-1.1.1" sources."bail-1.0.3" sources."balanced-match-1.0.0" + (sources."base-0.11.2" // { + dependencies = [ + sources."define-property-1.0.0" + sources."isobject-3.0.1" + ]; + }) sources."base64-url-2.2.0" sources."bash-color-0.0.4" - sources."binary-extensions-1.11.0" + sources."binary-extensions-1.12.0" sources."binary-search-1.3.4" sources."bindings-1.3.0" sources."bl-1.2.2" @@ -50441,6 +52131,11 @@ in sources."buffer-from-1.1.1" sources."bytewise-1.1.0" sources."bytewise-core-1.2.3" + (sources."cache-base-1.0.1" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) sources."camelcase-2.1.1" sources."ccount-1.0.3" sources."chalk-1.1.3" @@ -50452,12 +52147,33 @@ in sources."chloride-2.2.10" sources."chloride-test-1.2.2" sources."chokidar-1.7.0" - sources."chownr-1.0.1" + sources."chownr-1.1.1" + (sources."class-utils-0.3.6" // { + dependencies = [ + sources."define-property-0.2.5" + (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."isobject-3.0.1" + sources."kind-of-5.1.0" + ]; + }) sources."cli-cursor-1.0.2" sources."co-3.1.0" sources."code-point-at-1.1.0" sources."collapse-white-space-1.0.4" - sources."commander-2.17.1" + sources."collection-visit-1.0.0" + sources."commander-2.18.0" + sources."compare-at-paths-1.0.0" + sources."component-emitter-1.2.1" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" sources."console-control-strings-1.1.0" @@ -50475,18 +52191,26 @@ in }) sources."continuable-para-1.2.0" sources."continuable-series-1.2.0" + sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" sources."cross-spawn-5.1.0" sources."debug-2.6.9" + sources."decode-uri-component-0.2.0" sources."decompress-response-3.3.0" sources."deep-equal-1.0.1" sources."deep-extend-0.6.0" sources."deferred-leveldown-3.0.0" sources."define-properties-1.1.3" + (sources."define-property-2.0.2" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) sources."defined-1.0.0" sources."delegates-1.0.0" sources."detab-1.0.2" sources."detect-libc-1.0.3" + sources."dynamic-dijkstra-1.0.0" sources."ed2curve-0.1.4" sources."elegant-spinner-1.0.1" sources."emoji-named-characters-1.0.2" @@ -50500,7 +52224,7 @@ in sources."epidemic-broadcast-trees-6.3.4" sources."errno-0.1.7" sources."es-abstract-1.12.0" - sources."es-to-primitive-1.1.1" + sources."es-to-primitive-1.2.0" sources."escape-string-regexp-1.0.5" sources."exit-hook-1.1.1" sources."expand-brackets-0.1.5" @@ -50508,14 +52232,19 @@ in sources."expand-template-1.1.1" sources."explain-error-1.0.4" sources."extend-3.0.2" + (sources."extend-shallow-3.0.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) sources."extend.js-0.0.2" sources."extglob-0.3.2" sources."fast-future-1.0.2" sources."filename-regex-2.0.1" sources."fill-range-2.2.4" sources."flumecodec-0.0.1" - sources."flumedb-0.4.9" - (sources."flumelog-offset-3.3.1" // { + sources."flumedb-0.5.1" + (sources."flumelog-offset-3.3.2" // { dependencies = [ sources."looper-4.0.0" ]; @@ -50525,14 +52254,14 @@ in sources."atomic-file-1.1.5" ]; }) - (sources."flumeview-level-3.0.5" // { + (sources."flumeview-level-3.0.6" // { dependencies = [ sources."obv-0.0.0" ]; }) (sources."flumeview-query-6.3.0" // { dependencies = [ - sources."map-filter-reduce-3.1.0" + sources."map-filter-reduce-3.2.1" ]; }) (sources."flumeview-reduce-1.3.13" // { @@ -50545,11 +52274,13 @@ in sources."for-each-0.3.3" sources."for-in-1.0.2" sources."for-own-0.1.5" + sources."fragment-cache-0.2.1" sources."fs-constants-1.0.0" sources."fs.realpath-1.0.0" sources."fsevents-1.2.4" sources."function-bind-1.1.1" sources."gauge-2.7.4" + sources."get-value-2.0.6" sources."github-from-package-0.0.0" sources."glob-6.0.4" sources."glob-base-0.3.0" @@ -50560,9 +52291,26 @@ in sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-network-0.0.1" + sources."has-symbols-1.0.0" sources."has-unicode-2.0.1" + (sources."has-value-1.0.0" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) + (sources."has-values-1.0.0" // { + dependencies = [ + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."kind-of-4.0.0" + ]; + }) sources."hashlru-2.2.1" sources."he-0.5.0" + sources."heap-0.2.6" sources."hoox-0.0.1" sources."increment-buffer-1.0.1" sources."inflight-1.0.6" @@ -50571,13 +52319,28 @@ in sources."int53-0.2.4" sources."ip-0.3.3" sources."irregular-plurals-1.4.0" + (sources."is-accessor-descriptor-1.0.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) sources."is-alphabetical-1.0.2" sources."is-alphanumerical-1.0.2" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" sources."is-callable-1.1.4" + (sources."is-data-descriptor-1.0.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) sources."is-date-object-1.0.1" sources."is-decimal-1.0.2" + (sources."is-descriptor-1.0.2" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) sources."is-dotfile-1.0.3" sources."is-electron-2.1.0" sources."is-equal-shallow-0.1.3" @@ -50587,16 +52350,27 @@ in sources."is-glob-2.0.1" sources."is-hexadecimal-1.0.2" sources."is-number-2.1.0" + (sources."is-plain-object-2.0.4" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) sources."is-posix-bracket-0.1.1" sources."is-primitive-2.0.0" sources."is-regex-1.0.4" - sources."is-symbol-1.0.1" - sources."is-valid-domain-0.0.5" + sources."is-symbol-1.0.2" + sources."is-valid-domain-0.0.6" + sources."is-windows-1.0.2" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-2.1.0" sources."json-buffer-2.0.11" sources."kind-of-3.2.2" + (sources."layered-graph-1.1.0" // { + dependencies = [ + sources."pull-cont-0.1.1" + ]; + }) sources."level-3.0.2" sources."level-codec-6.2.0" sources."level-errors-1.1.2" @@ -50631,6 +52405,7 @@ in ]; }) sources."levelup-2.0.2" + sources."libnested-1.3.2" sources."libsodium-0.7.3" sources."libsodium-wrappers-0.7.3" sources."log-symbols-1.0.2" @@ -50640,8 +52415,10 @@ in sources."lossy-store-1.2.3" sources."lru-cache-4.1.3" sources."ltgt-2.2.1" + sources."map-cache-0.2.2" sources."map-filter-reduce-2.2.1" sources."map-merge-1.1.0" + sources."map-visit-1.0.0" sources."markdown-table-0.4.0" sources."math-random-1.0.1" sources."mdmanifest-1.0.8" @@ -50649,6 +52426,11 @@ in sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.0" + (sources."mixin-deep-1.3.1" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -50656,19 +52438,15 @@ in }) sources."monotonic-timestamp-0.0.9" sources."ms-2.0.0" - (sources."multiblob-1.13.0" // { + (sources."multiblob-1.13.1" // { dependencies = [ - sources."deep-extend-0.2.11" - sources."minimist-0.0.10" sources."pull-file-0.5.0" - sources."rc-0.5.5" sources."rimraf-2.2.8" - sources."strip-json-comments-0.1.3" ]; }) sources."multiblob-http-0.4.2" sources."multicb-1.2.2" - sources."multiserver-1.13.3" + sources."multiserver-1.13.5" sources."muxrpc-6.4.1" (sources."muxrpc-validation-2.0.1" // { dependencies = [ @@ -50686,8 +52464,15 @@ in ]; }) sources."nan-2.11.0" + (sources."nanomatch-1.2.13" // { + dependencies = [ + sources."arr-diff-4.0.0" + sources."array-unique-0.3.2" + sources."kind-of-6.0.2" + ]; + }) sources."ncp-2.0.0" - sources."node-abi-2.4.3" + sources."node-abi-2.4.4" sources."node-gyp-build-3.4.0" (sources."non-private-ip-1.4.4" // { dependencies = [ @@ -50701,9 +52486,31 @@ in sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" + (sources."object-copy-0.1.0" // { + dependencies = [ + sources."define-property-0.2.5" + sources."is-accessor-descriptor-0.1.6" + sources."is-data-descriptor-0.1.4" + (sources."is-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + ]; + }) sources."object-inspect-1.6.0" sources."object-keys-1.0.12" + (sources."object-visit-1.0.1" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) sources."object.omit-2.0.1" + (sources."object.pick-1.3.0" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) sources."observ-0.2.0" sources."observ-debounce-1.1.1" sources."obv-0.0.1" @@ -50718,17 +52525,19 @@ in sources."osenv-0.1.5" sources."packet-stream-2.0.4" sources."packet-stream-codec-1.1.2" - sources."parse-entities-1.1.2" + sources."parse-entities-1.2.0" sources."parse-glob-3.0.4" + sources."pascalcase-0.1.1" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.6" sources."pify-2.3.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."plur-2.1.2" + sources."posix-character-classes-0.1.1" sources."prebuild-install-4.0.0" sources."preserve-0.2.0" - sources."private-box-0.2.1" + sources."private-box-0.3.0" sources."process-nextick-args-2.0.0" sources."prr-1.0.1" sources."pseudomap-1.0.2" @@ -50784,6 +52593,7 @@ in sources."pull-rate-1.0.2" sources."pull-reader-1.3.1" sources."pull-sink-through-0.0.0" + sources."pull-sort-1.0.1" sources."pull-stream-3.6.9" sources."pull-stream-to-stream-1.3.4" sources."pull-stringify-1.2.2" @@ -50803,7 +52613,7 @@ in sources."pull-write-file-0.2.4" sources."pull-ws-3.3.1" sources."pump-2.0.1" - sources."push-stream-10.0.3" + sources."push-stream-10.0.4" sources."push-stream-to-pull-stream-1.0.3" (sources."randomatic-3.1.0" // { dependencies = [ @@ -50813,8 +52623,59 @@ in }) sources."rc-1.2.8" sources."readable-stream-2.3.6" - sources."readdirp-2.1.0" + (sources."readdirp-2.2.1" // { + dependencies = [ + sources."arr-diff-4.0.0" + sources."array-unique-0.3.2" + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + ]; + }) + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + ]; + }) + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (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" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."isobject-3.0.1" + sources."kind-of-6.0.2" + sources."micromatch-3.1.10" + ]; + }) sources."regex-cache-0.4.4" + sources."regex-not-1.0.2" sources."relative-url-1.0.2" sources."remark-3.2.3" sources."remark-html-2.0.2" @@ -50822,21 +52683,24 @@ in sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" sources."resolve-1.7.1" + sources."resolve-url-0.2.1" sources."restore-cursor-1.0.1" sources."resumer-0.0.0" + sources."ret-0.1.15" (sources."rimraf-2.6.2" // { dependencies = [ sources."glob-7.1.3" ]; }) sources."safe-buffer-5.1.2" - sources."secret-handshake-1.1.13" - (sources."secret-stack-4.1.0" // { + sources."safe-regex-1.1.0" + sources."secret-handshake-1.1.14" + (sources."secret-stack-4.2.1" // { dependencies = [ sources."ip-1.1.5" ]; }) - (sources."secure-scuttlebutt-18.2.0" // { + (sources."secure-scuttlebutt-18.3.3" // { dependencies = [ sources."deep-equal-0.2.2" ]; @@ -50844,7 +52708,11 @@ in sources."semver-5.5.1" sources."separator-escape-0.0.0" sources."set-blocking-2.0.0" - sources."set-immediate-shim-1.0.1" + (sources."set-value-2.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) sources."sha.js-2.4.5" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" @@ -50853,6 +52721,31 @@ in sources."simple-concat-1.0.0" sources."simple-get-2.8.1" sources."smart-buffer-4.0.1" + (sources."snapdragon-0.8.2" // { + dependencies = [ + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (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."kind-of-5.1.0" + ]; + }) + (sources."snapdragon-node-2.1.1" // { + dependencies = [ + sources."define-property-1.0.0" + sources."isobject-3.0.1" + ]; + }) + sources."snapdragon-util-3.0.1" (sources."socks-2.2.1" // { dependencies = [ sources."ip-1.1.5" @@ -50864,39 +52757,56 @@ in sources."sha.js-2.4.11" ]; }) - sources."sodium-chloride-1.1.0" - sources."sodium-native-2.2.1" + sources."sodium-chloride-1.1.2" + sources."sodium-native-2.2.2" + sources."source-map-0.5.7" + sources."source-map-resolve-0.5.2" + sources."source-map-url-0.4.0" sources."split-buffer-1.0.0" + sources."split-string-3.1.0" sources."ssb-blobs-1.1.5" sources."ssb-client-4.6.0" - (sources."ssb-config-2.2.0" // { - dependencies = [ - sources."deep-extend-0.4.2" - ]; - }) - sources."ssb-ebt-5.2.2" - (sources."ssb-friends-2.4.0" // { + sources."ssb-config-2.3.2" + sources."ssb-ebt-5.2.3" + (sources."ssb-friends-3.1.3" // { dependencies = [ sources."pull-cont-0.1.1" ]; }) - sources."ssb-keys-7.0.16" + sources."ssb-keys-7.1.3" sources."ssb-links-3.0.3" sources."ssb-msgs-5.2.0" - (sources."ssb-query-2.2.1" // { + (sources."ssb-query-2.3.0" // { dependencies = [ - sources."flumeview-query-git://github.com/mmckegg/flumeview-query#map" - sources."map-filter-reduce-3.1.0" + sources."flumeview-query-7.0.0" + sources."map-filter-reduce-3.2.1" ]; }) - (sources."ssb-ref-2.11.2" // { + (sources."ssb-ref-2.12.0" // { dependencies = [ sources."ip-1.1.5" ]; }) - sources."ssb-validate-3.0.10" + sources."ssb-validate-3.0.11" sources."ssb-ws-2.1.1" sources."stack-0.1.0" + (sources."static-extend-0.1.2" // { + dependencies = [ + sources."define-property-0.2.5" + (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."kind-of-5.1.0" + ]; + }) sources."statistics-3.3.0" sources."stream-to-pull-stream-1.7.2" sources."string-width-1.0.2" @@ -50916,10 +52826,17 @@ in sources."pump-1.0.3" ]; }) - sources."tar-stream-1.6.1" + sources."tar-stream-1.6.2" sources."text-table-0.2.0" sources."through-2.3.8" sources."to-buffer-1.1.1" + sources."to-object-path-0.3.0" + sources."to-regex-3.0.2" + (sources."to-regex-range-2.1.1" // { + dependencies = [ + sources."is-number-3.0.0" + ]; + }) sources."to-vfile-1.0.0" sources."trim-0.0.1" sources."trim-lines-1.1.1" @@ -50935,10 +52852,29 @@ in sources."ultron-1.0.2" sources."unherit-1.1.1" sources."unified-2.1.4" + (sources."union-value-1.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + sources."set-value-0.4.3" + ]; + }) sources."unist-util-is-2.1.2" sources."unist-util-visit-1.4.0" sources."unist-util-visit-parents-2.0.1" + (sources."unset-value-1.0.0" // { + dependencies = [ + (sources."has-value-0.3.1" // { + dependencies = [ + sources."isobject-2.1.0" + ]; + }) + sources."has-values-0.1.4" + sources."isobject-3.0.1" + ]; + }) sources."untildify-2.1.0" + sources."urix-0.1.0" + sources."use-3.1.1" sources."user-home-2.0.0" sources."util-deprecate-1.0.2" sources."vfile-1.4.0" @@ -50987,13 +52923,13 @@ in serve = nodeEnv.buildNodePackage { name = "serve"; packageName = "serve"; - version = "10.0.0"; + version = "10.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/serve/-/serve-10.0.0.tgz"; - sha512 = "S9q9cIVeaT78DVk70/JWubco89P5KXIR5IEuVz83YUfvUaqQ7cpVw62eGZsA/ftaTZNmAkQnqn2mBMx+NDLN3A=="; + url = "https://registry.npmjs.org/serve/-/serve-10.0.2.tgz"; + sha512 = "9BDXCSpCUDjoPhb37JJGqgnMSfO0HjU5I6g8KxwBA40TvMk9pDxTuDWNKzBJEGXhH5h55Qe8fqSqwpeyQmnhJQ=="; }; dependencies = [ - sources."@zeit/schemas-2.1.1" + sources."@zeit/schemas-2.6.0" sources."ajv-6.5.3" sources."ansi-align-2.0.0" sources."ansi-regex-3.0.0" @@ -51052,7 +52988,7 @@ in sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" sources."safe-buffer-5.1.2" - sources."serve-handler-5.0.0" + sources."serve-handler-5.0.3" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" @@ -51110,8 +53046,8 @@ in sources."caseless-0.12.0" sources."cheerio-0.17.0" sources."co-4.6.0" - sources."combined-stream-1.0.6" - sources."commander-2.17.1" + sources."combined-stream-1.0.7" + sources."commander-2.18.0" sources."component-bind-1.0.0" sources."component-emitter-1.1.2" sources."component-inherit-0.0.3" @@ -51152,15 +53088,20 @@ in sources."entities-1.1.1" sources."escape-html-1.0.3" sources."etag-1.8.1" - sources."event-stream-3.3.4" + sources."event-stream-3.3.6" sources."express-4.16.3" sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" sources."finalhandler-1.1.1" + sources."flatmap-stream-0.1.0" sources."forever-agent-0.6.1" - sources."form-data-2.3.2" + (sources."form-data-2.3.2" // { + dependencies = [ + sources."combined-stream-1.0.6" + ]; + }) sources."forwarded-0.1.2" sources."fresh-0.5.2" sources."from-0.1.7" @@ -51194,7 +53135,7 @@ in sources."jsprim-1.4.1" sources."linewise-0.0.3" sources."lodash-2.4.2" - sources."map-stream-0.1.0" + sources."map-stream-0.0.7" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" @@ -51272,10 +53213,10 @@ in sources."debug-0.7.4" ]; }) - sources."split-0.3.3" + sources."split-1.0.1" sources."sshpk-1.14.2" sources."statuses-1.4.0" - sources."stream-combiner-0.0.4" + sources."stream-combiner-0.2.2" sources."string_decoder-0.10.31" sources."through-2.3.8" sources."tinycolor-0.0.1" @@ -51350,9 +53291,9 @@ in sources."co-4.6.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."combined-stream-1.0.6" - sources."commander-2.17.1" - sources."compressible-2.0.14" + sources."combined-stream-1.0.7" + sources."commander-2.18.0" + sources."compressible-2.0.15" (sources."compression-1.7.3" // { dependencies = [ sources."bytes-3.0.0" @@ -51363,7 +53304,7 @@ in sources."content-type-1.0.4" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" - sources."cookies-0.7.1" + sources."cookies-0.7.2" sources."core-util-is-1.0.2" sources."crypt3-0.2.0" sources."dashdash-1.14.1" @@ -51397,7 +53338,11 @@ in sources."fast-json-stable-stringify-2.0.0" sources."finalhandler-1.0.6" sources."forever-agent-0.6.1" - sources."form-data-2.3.2" + (sources."form-data-2.3.2" // { + dependencies = [ + sources."combined-stream-1.0.6" + ]; + }) sources."forwarded-0.1.2" sources."fresh-0.5.2" sources."fs-ext-0.6.0" @@ -51417,7 +53362,7 @@ in sources."readable-stream-2.3.6" ]; }) - (sources."http-errors-1.7.0" // { + (sources."http-errors-1.7.1" // { dependencies = [ sources."setprototypeof-1.1.0" sources."statuses-1.5.0" @@ -51439,7 +53384,7 @@ in sources."json-stringify-safe-5.0.1" sources."jsonparse-1.3.1" sources."jsprim-1.4.1" - sources."keygrip-1.0.2" + sources."keygrip-1.0.3" sources."linkify-it-1.2.4" sources."lodash.clonedeep-4.5.0" sources."lodash.escaperegexp-4.1.2" @@ -51509,7 +53454,7 @@ in sources."safe-buffer-5.1.2" sources."safe-json-stringify-1.2.0" sources."safer-buffer-2.1.2" - sources."sanitize-html-1.18.4" + sources."sanitize-html-1.19.1" sources."semver-4.3.6" (sources."send-0.15.6" // { dependencies = [ @@ -51575,26 +53520,230 @@ in sha1 = "b42d3da1a442a489f454c32c628e8ebf0007875c"; }; dependencies = [ + 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-2.1.5" - sources."balanced-match-1.0.0" - sources."brace-expansion-1.1.11" + sources."atob-2.1.2" + (sources."base-0.11.2" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."cache-base-1.0.1" + (sources."class-utils-0.3.6" // { + dependencies = [ + sources."define-property-0.2.5" + (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."kind-of-5.1.0" + ]; + }) sources."cli-table-0.3.1" + sources."collection-visit-1.0.0" sources."colors-1.0.3" sources."commander-2.9.0" - sources."concat-map-0.0.1" + sources."component-emitter-1.2.1" + sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" + sources."debug-2.6.9" + sources."decode-uri-component-0.2.0" + sources."define-property-2.0.2" + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (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."kind-of-5.1.0" + ]; + }) + (sources."extend-shallow-3.0.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + ]; + }) + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."for-in-1.0.2" + sources."fragment-cache-0.2.1" + sources."get-value-2.0.6" sources."graceful-fs-4.1.11" sources."graceful-readlink-1.0.1" + sources."has-value-1.0.0" + (sources."has-values-1.0.0" // { + dependencies = [ + sources."kind-of-4.0.0" + ]; + }) sources."inherits-2.0.3" + sources."is-accessor-descriptor-1.0.0" + sources."is-buffer-1.1.6" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + sources."is-extendable-0.1.1" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-plain-object-2.0.4" + sources."is-windows-1.0.2" sources."isarray-1.0.0" - sources."lodash-4.17.10" - sources."minimatch-3.0.4" + sources."isobject-3.0.1" + sources."kind-of-6.0.2" + sources."lodash-4.17.11" + sources."map-cache-0.2.2" + sources."map-visit-1.0.0" + sources."micromatch-3.1.10" + (sources."mixin-deep-1.3.1" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + sources."ms-2.0.0" + sources."nanomatch-1.2.13" + (sources."object-copy-0.1.0" // { + dependencies = [ + sources."define-property-0.2.5" + sources."is-accessor-descriptor-0.1.6" + sources."is-data-descriptor-0.1.4" + (sources."is-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."kind-of-3.2.2" + ]; + }) + sources."object-visit-1.0.1" + sources."object.pick-1.3.0" + sources."pascalcase-0.1.1" + sources."posix-character-classes-0.1.1" sources."process-nextick-args-2.0.0" sources."readable-stream-2.3.6" - sources."readdirp-2.1.0" + sources."readdirp-2.2.1" + sources."regex-not-1.0.2" + sources."repeat-element-1.1.3" + sources."repeat-string-1.6.1" + sources."resolve-url-0.2.1" + sources."ret-0.1.15" sources."safe-buffer-5.1.2" - sources."set-immediate-shim-1.0.1" + sources."safe-regex-1.1.0" + (sources."set-value-2.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (sources."snapdragon-0.8.2" // { + dependencies = [ + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (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."kind-of-5.1.0" + ]; + }) + (sources."snapdragon-node-2.1.1" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + (sources."snapdragon-util-3.0.1" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."source-map-0.5.7" + sources."source-map-resolve-0.5.2" + sources."source-map-url-0.4.0" + sources."split-string-3.1.0" + (sources."static-extend-0.1.2" // { + dependencies = [ + sources."define-property-0.2.5" + (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."kind-of-5.1.0" + ]; + }) sources."string_decoder-1.1.1" + (sources."to-object-path-0.3.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."to-regex-3.0.2" + sources."to-regex-range-2.1.1" + (sources."union-value-1.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + 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."has-values-0.1.4" + ]; + }) + sources."urix-0.1.0" + sources."use-3.1.1" sources."util-deprecate-1.0.2" ]; buildInputs = globalBuildInputs; @@ -51902,7 +54051,7 @@ in sources."brace-expansion-1.1.11" sources."concat-map-0.0.1" sources."css-parse-1.7.0" - sources."debug-3.1.0" + sources."debug-4.0.1" sources."fs.realpath-1.0.0" sources."glob-7.0.6" sources."inflight-1.0.6" @@ -51910,7 +54059,7 @@ in sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."ms-2.0.0" + sources."ms-2.1.1" sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."sax-0.5.8" @@ -51929,25 +54078,24 @@ in svgo = nodeEnv.buildNodePackage { name = "svgo"; packageName = "svgo"; - version = "1.0.5"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/svgo/-/svgo-1.0.5.tgz"; - sha512 = "nYrifviB77aNKDNKKyuay3M9aYiK6Hv5gJVDdjj2ZXTQmI8WZc8+UPLR5IpVlktJfSu3co/4XcWgrgI6seGBPg=="; + url = "https://registry.npmjs.org/svgo/-/svgo-1.1.1.tgz"; + sha512 = "GBkJbnTuFpM4jFbiERHDWhZc/S/kpHToqmZag3aEBjPYK44JAN2QBjvrGIxLOoCyMZjuFQIfTO2eJd8uwLY/9g=="; }; dependencies = [ sources."argparse-1.0.10" sources."boolbase-1.0.0" sources."coa-2.0.1" sources."colors-1.1.2" - sources."css-select-1.3.0-rc0" + sources."css-select-2.0.0" sources."css-select-base-adapter-0.1.0" - sources."css-tree-1.0.0-alpha25" + sources."css-tree-1.0.0-alpha.28" sources."css-url-regex-1.1.0" sources."css-what-2.1.0" (sources."csso-3.5.1" // { dependencies = [ sources."css-tree-1.0.0-alpha.29" - sources."mdn-data-1.1.4" ]; }) sources."define-properties-1.1.3" @@ -51957,19 +54105,20 @@ in ]; }) sources."domelementtype-1.3.0" - sources."domutils-1.5.1" + sources."domutils-1.7.0" sources."entities-1.1.1" sources."es-abstract-1.12.0" - sources."es-to-primitive-1.1.1" + sources."es-to-primitive-1.2.0" sources."esprima-4.0.1" sources."function-bind-1.1.1" sources."has-1.0.3" + sources."has-symbols-1.0.0" sources."is-callable-1.1.4" sources."is-date-object-1.0.1" sources."is-regex-1.0.4" - sources."is-symbol-1.0.1" - sources."js-yaml-3.10.0" - sources."mdn-data-1.2.0" + sources."is-symbol-1.0.2" + sources."js-yaml-3.12.0" + sources."mdn-data-1.1.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."nth-check-1.0.1" @@ -52004,18 +54153,12 @@ in dependencies = [ sources."URIjs-1.16.1" sources."abbrev-1.1.1" - (sources."align-text-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - 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" - sources."append-field-0.1.0" + sources."append-field-1.0.0" sources."argparse-1.0.10" sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" @@ -52032,7 +54175,7 @@ in sources."define-property-1.0.0" ]; }) - sources."binary-extensions-1.11.0" + sources."binary-extensions-1.12.0" (sources."body-parser-1.12.4" // { dependencies = [ sources."debug-2.2.0" @@ -52069,11 +54212,10 @@ in sources."cache-base-1.0.1" sources."camelcase-4.1.0" sources."capture-stack-trace-1.0.1" - sources."center-align-0.1.3" sources."chalk-1.1.3" sources."charenc-0.0.2" sources."chokidar-2.0.4" - sources."ci-info-1.4.0" + sources."ci-info-1.6.0" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" @@ -52094,18 +54236,13 @@ in sources."cli-boxes-1.0.0" sources."cli-cursor-1.0.2" sources."cli-width-1.1.1" - (sources."cliui-2.1.0" // { - dependencies = [ - sources."wordwrap-0.0.2" - ]; - }) sources."clone-2.0.0" sources."code-point-at-1.1.0" sources."collection-visit-1.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."combined-stream-1.0.6" - sources."commander-2.17.1" + sources."commander-2.18.0" sources."component-emitter-1.2.1" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" @@ -52114,6 +54251,7 @@ in sources."content-type-1.0.4" sources."cookiejar-2.1.2" sources."copy-descriptor-0.1.1" + sources."core-js-2.5.7" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" (sources."cross-spawn-5.1.0" // { @@ -52125,7 +54263,6 @@ in 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.6.0" sources."define-property-2.0.2" @@ -52149,7 +54286,7 @@ in sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."etag-1.8.1" - sources."event-stream-3.3.4" + sources."event-stream-3.3.6" sources."execa-0.7.0" sources."exit-hook-1.1.1" (sources."expand-brackets-2.1.4" // { @@ -52188,6 +54325,7 @@ in ]; }) sources."finalhandler-1.1.0" + sources."flatmap-stream-0.1.0" sources."for-in-1.0.2" sources."form-data-2.3.2" sources."formidable-1.2.1" @@ -52210,13 +54348,15 @@ in sources."graceful-fs-4.1.11" (sources."graphlib-2.1.5" // { dependencies = [ - sources."lodash-4.17.10" + sources."lodash-4.17.11" ]; }) sources."growl-1.9.2" - (sources."handlebars-4.0.11" // { + (sources."handlebars-4.0.12" // { dependencies = [ - sources."source-map-0.4.4" + sources."async-2.6.1" + sources."lodash-4.17.11" + sources."source-map-0.6.1" ]; }) sources."has-ansi-2.0.0" @@ -52243,7 +54383,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.2.0" + sources."is-ci-1.2.1" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-extendable-1.0.1" @@ -52284,13 +54424,12 @@ in sources."json-refs-2.1.7" (sources."json-schema-deref-sync-0.3.4" // { dependencies = [ - sources."lodash-4.17.10" + sources."lodash-4.17.11" ]; }) 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" @@ -52323,12 +54462,11 @@ in 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.3.0" sources."map-cache-0.2.2" - sources."map-stream-0.1.0" + sources."map-stream-0.0.7" sources."map-visit-1.0.0" sources."md5-2.2.1" sources."media-typer-0.3.0" @@ -52355,18 +54493,15 @@ in }) sources."mpath-0.2.1" sources."ms-2.0.0" - (sources."multer-1.3.1" // { - dependencies = [ - sources."object-assign-3.0.0" - ]; - }) + sources."multer-1.4.0" sources."mute-stream-0.0.5" sources."nan-2.11.0" sources."nanomatch-1.2.13" sources."native-promise-only-0.8.1" (sources."nodemon-1.18.4" // { dependencies = [ - sources."debug-3.1.0" + sources."debug-3.2.5" + sources."ms-2.1.1" sources."supports-color-5.5.0" ]; }) @@ -52402,9 +54537,10 @@ in 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.8" // { + (sources."path-loader-1.0.9" // { dependencies = [ - sources."debug-3.1.0" + sources."debug-3.2.5" + sources."ms-2.1.1" sources."qs-6.5.2" sources."superagent-3.8.3" ]; @@ -52436,7 +54572,7 @@ in ]; }) sources."readable-stream-2.3.6" - sources."readdirp-2.1.0" + sources."readdirp-2.2.1" sources."readline2-1.0.1" sources."reduce-component-1.0.1" sources."regex-not-1.0.2" @@ -52448,7 +54584,6 @@ in 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" @@ -52463,7 +54598,6 @@ in ]; }) sources."serve-static-1.13.2" - sources."set-immediate-shim-1.0.1" (sources."set-value-2.0.0" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -52509,7 +54643,7 @@ in sources."source-map-resolve-0.5.2" sources."source-map-url-0.4.0" sources."spark-md5-1.0.1" - sources."split-0.3.3" + sources."split-1.0.1" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" (sources."static-extend-0.1.2" // { @@ -52530,7 +54664,7 @@ in ]; }) sources."statuses-1.3.1" - sources."stream-combiner-0.0.4" + sources."stream-combiner-0.2.2" sources."streamsearch-0.1.2" sources."string-3.3.3" (sources."string-width-2.1.1" // { @@ -52582,8 +54716,12 @@ in sources."truncate-utf8-bytes-1.0.2" sources."type-is-1.6.16" sources."typedarray-0.0.6" - sources."uglify-js-2.8.29" - sources."uglify-to-browserify-1.0.2" + (sources."uglify-js-3.4.9" // { + dependencies = [ + sources."commander-2.17.1" + sources."source-map-0.6.1" + ]; + }) sources."undefsafe-2.0.2" (sources."union-value-1.0.0" // { dependencies = [ @@ -52621,22 +54759,16 @@ in sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."valid-url-1.0.9" - sources."validator-10.7.1" + sources."validator-10.8.0" sources."which-1.3.1" 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" // { - dependencies = [ - sources."camelcase-1.2.1" - ]; - }) - sources."z-schema-3.23.0" + sources."z-schema-3.24.1" ]; buildInputs = globalBuildInputs; meta = { @@ -52650,13 +54782,13 @@ in tern = nodeEnv.buildNodePackage { name = "tern"; packageName = "tern"; - version = "0.22.0"; + version = "0.22.3"; src = fetchurl { - url = "https://registry.npmjs.org/tern/-/tern-0.22.0.tgz"; - sha512 = "YTb3uVStaPA1Ul0KFmfqBH4xc3kLL/9jUvkt/ZKh+FYUtjUckUWAicRiaAwugpRm4IveKBgFKVCggbaT4uwe/A=="; + url = "https://registry.npmjs.org/tern/-/tern-0.22.3.tgz"; + sha512 = "A2C8GbR6uJWjHUwxtxF14oY1g8oJDEhM+n9ugRowX+jr8JHgNUeOLrYTOi/LV/JK9KHpxnYwyuhnal9YDXeeDQ=="; }; dependencies = [ - sources."acorn-5.7.2" + sources."acorn-5.7.3" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."concat-map-0.0.1" @@ -52696,10 +54828,10 @@ in three = nodeEnv.buildNodePackage { name = "three"; packageName = "three"; - version = "0.96.0"; + version = "0.97.0"; src = fetchurl { - url = "https://registry.npmjs.org/three/-/three-0.96.0.tgz"; - sha512 = "tS+A5kelQgBblElc/E1G5zR3m6wNjbqmrf6OAjijuNJM7yoYQjOktPoa+Lglx73OTiTOJ3+Ff+pgWdOFt7cOhQ=="; + url = "https://registry.npmjs.org/three/-/three-0.97.0.tgz"; + sha512 = "ctZF79O1R2aMIDnz9cV5GUIONyFnYvfQKg4+EAwEVaEr1mgy99rglstH6hhRdIThu3SOa4Ns5da/Ee5fTbWc9A=="; }; buildInputs = globalBuildInputs; meta = { @@ -52749,7 +54881,7 @@ in sources."caseless-0.12.0" sources."co-4.6.0" sources."colors-1.3.0" - sources."combined-stream-1.0.6" + sources."combined-stream-1.0.7" sources."commander-2.17.1" sources."core-util-is-1.0.2" sources."cycle-1.0.3" @@ -52768,7 +54900,11 @@ in ]; }) sources."forever-agent-0.6.1" - sources."form-data-2.3.2" + (sources."form-data-2.3.2" // { + dependencies = [ + sources."combined-stream-1.0.6" + ]; + }) sources."fs-extra-7.0.0" sources."getpass-0.1.7" sources."graceful-fs-4.1.11" @@ -52785,7 +54921,7 @@ in sources."jsonfile-4.0.0" sources."jsprim-1.4.1" sources."keypress-0.2.1" - sources."lodash-4.17.10" + sources."lodash-4.17.11" sources."longjohn-0.2.12" sources."mime-db-1.36.0" sources."mime-types-2.1.20" @@ -52901,7 +55037,7 @@ in ]; }) sources."keep-alive-agent-0.0.1" - sources."lodash-4.17.10" + sources."lodash-4.17.11" (sources."lomstream-1.1.0" // { dependencies = [ sources."assert-plus-0.1.5" @@ -53025,10 +55161,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "3.0.3"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-3.0.3.tgz"; - sha512 = "kk80vLW9iGtjMnIv11qyxLqZm20UklzuR2tL0QAnDIygIUIemcZMxlMWudl9OOt76H3ntVzcTiddQ1/pAAJMYg=="; + url = "https://registry.npmjs.org/typescript/-/typescript-3.1.1.tgz"; + sha512 = "Veu0w4dTc/9wlWNf2jeRInNodKlcdLgemvPsrNpfu5Pq39sgfFjvIIgTsvUHCoLBnMhPoUA+tFxsXjU6VexVRQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -53072,7 +55208,7 @@ in sources."camelcase-4.1.0" sources."capture-stack-trace-1.0.1" sources."chalk-1.1.3" - sources."ci-info-1.4.0" + sources."ci-info-1.6.0" sources."cli-boxes-1.0.0" sources."cli-cursor-1.0.2" sources."cli-truncate-1.1.0" @@ -53123,7 +55259,7 @@ in sources."invariant-2.2.4" sources."is-absolute-0.2.6" sources."is-arrayish-0.2.1" - sources."is-ci-1.2.0" + sources."is-ci-1.2.1" sources."is-fullwidth-code-point-2.0.0" sources."is-installed-globally-0.1.0" sources."is-npm-1.0.0" @@ -53363,7 +55499,7 @@ in sources."cookiejar-2.0.1" sources."core-util-is-1.0.2" sources."crc-3.4.4" - sources."cross-spawn-5.1.0" + sources."cross-spawn-6.0.5" sources."crossroads-0.12.2" sources."cycle-1.0.3" sources."dashdash-1.14.1" @@ -53406,7 +55542,7 @@ in sources."escape-html-1.0.3" sources."etag-1.8.1" sources."eve-0.5.4" - sources."execa-0.7.0" + sources."execa-0.10.0" (sources."express-4.16.3" // { dependencies = [ sources."body-parser-1.18.2" @@ -53480,7 +55616,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.5" - sources."invert-kv-1.0.0" + sources."invert-kv-2.0.0" sources."ipaddr.js-1.8.0" sources."is-arrayish-0.3.2" sources."is-builtin-module-1.0.0" @@ -53507,14 +55643,15 @@ in sources."superagent-0.21.0" ]; }) - sources."knockout-3.5.0-rc" - sources."lcid-1.0.0" + sources."knockout-3.5.0-rc2" + sources."lcid-2.0.0" sources."locate-path-3.0.0" sources."locks-0.2.2" - sources."lodash-4.17.10" + sources."lodash-4.17.11" sources."lru-cache-4.1.3" + sources."map-age-cleaner-0.1.2" sources."media-typer-0.3.0" - sources."mem-1.1.0" + sources."mem-4.0.0" (sources."memorystore-1.6.0" // { dependencies = [ sources."debug-3.1.0" @@ -53532,6 +55669,7 @@ in sources."moment-2.22.2" sources."ms-2.0.0" sources."negotiator-0.6.1" + sources."nice-try-1.0.5" sources."node-cache-4.2.0" sources."nopt-1.0.10" sources."normalize-package-data-2.4.0" @@ -53551,10 +55689,12 @@ in sources."once-1.4.0" sources."opn-5.3.0" sources."os-homedir-1.0.2" - sources."os-locale-2.1.0" + sources."os-locale-3.0.1" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" + sources."p-defer-1.0.0" sources."p-finally-1.0.0" + sources."p-is-promise-1.1.0" sources."p-limit-2.0.0" sources."p-locate-3.0.0" sources."p-try-2.0.0" @@ -53589,10 +55729,14 @@ in sources."reduce-component-1.0.1" (sources."request-2.88.0" // { dependencies = [ - sources."combined-stream-1.0.6" + sources."combined-stream-1.0.7" sources."delayed-stream-1.0.0" sources."extend-3.0.2" - sources."form-data-2.3.2" + (sources."form-data-2.3.2" // { + dependencies = [ + sources."combined-stream-1.0.6" + ]; + }) sources."safe-buffer-5.1.2" ]; }) @@ -53637,10 +55781,10 @@ in sources."isarray-2.0.1" ]; }) - sources."spdx-correct-3.0.0" + sources."spdx-correct-3.0.1" sources."spdx-exceptions-2.1.0" sources."spdx-expression-parse-3.0.0" - sources."spdx-license-ids-3.0.0" + sources."spdx-license-ids-3.0.1" sources."sshpk-1.14.2" sources."ssri-5.3.0" sources."stack-trace-0.0.10" @@ -53655,12 +55799,13 @@ in sources."combined-stream-1.0.6" sources."component-emitter-1.2.1" sources."cookiejar-2.1.2" - sources."debug-3.1.0" + sources."debug-3.2.5" sources."delayed-stream-1.0.0" sources."extend-3.0.2" sources."form-data-2.3.2" sources."formidable-1.2.1" sources."isarray-1.0.0" + sources."ms-2.1.1" sources."readable-stream-2.3.6" sources."string_decoder-1.1.1" ]; @@ -53675,11 +55820,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.16" - (sources."typechecker-4.5.0" // { - dependencies = [ - sources."editions-1.3.4" - ]; - }) + sources."typechecker-4.6.0" sources."typedarray-0.0.6" sources."uid-safe-2.1.5" sources."ultron-1.1.1" @@ -53708,7 +55849,7 @@ in sources."xregexp-4.0.0" sources."y18n-4.0.0" sources."yallist-2.1.2" - (sources."yargs-12.0.1" // { + (sources."yargs-12.0.2" // { dependencies = [ sources."ansi-regex-3.0.0" sources."is-fullwidth-code-point-2.0.0" @@ -53743,8 +55884,6 @@ in sources."co-4.6.0" ]; }) - 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" @@ -53773,21 +55912,14 @@ in sources."buffer-crc32-0.2.13" sources."buffer-fill-1.0.0" sources."builtins-1.0.3" - sources."camelcase-1.2.1" sources."capture-stack-trace-1.0.1" sources."caseless-0.12.0" sources."caw-2.0.1" - sources."center-align-0.1.3" sources."chalk-2.4.1" sources."chardet-0.7.0" sources."cli-cursor-2.1.0" sources."cli-spinners-1.3.1" sources."cli-width-2.2.0" - (sources."cliui-2.1.0" // { - dependencies = [ - sources."wordwrap-0.0.2" - ]; - }) sources."clone-1.0.4" sources."co-3.1.0" sources."co-from-stream-0.0.0" @@ -53796,15 +55928,14 @@ in sources."coffee-script-1.12.7" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."combined-stream-1.0.6" - sources."commander-2.17.1" + sources."combined-stream-1.0.7" + sources."commander-2.18.0" sources."concat-map-0.0.1" - sources."config-chain-1.1.11" + sources."config-chain-1.1.12" sources."consolidate-0.14.5" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" sources."dashdash-1.14.1" - sources."decamelize-1.2.0" sources."decompress-4.2.0" sources."decompress-tar-4.1.1" (sources."decompress-tarbz2-4.1.1" // { @@ -53840,7 +55971,11 @@ in sources."filename-reserved-regex-2.0.0" sources."filenamify-2.1.0" sources."forever-agent-0.6.1" - sources."form-data-2.3.2" + (sources."form-data-2.3.2" // { + dependencies = [ + sources."combined-stream-1.0.6" + ]; + }) sources."fs-constants-1.0.0" sources."fs-extra-0.26.7" sources."fs.realpath-1.0.0" @@ -53853,11 +55988,7 @@ in 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."handlebars-4.0.12" sources."har-schema-2.0.0" sources."har-validator-5.1.0" (sources."has-ansi-2.0.0" // { @@ -53877,7 +56008,6 @@ in sources."ini-1.3.5" sources."inquirer-6.2.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" @@ -53898,12 +56028,9 @@ in 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.10" + sources."lodash-4.17.11" sources."log-symbols-2.2.0" - sources."longest-1.0.1" sources."lowercase-keys-1.0.1" (sources."make-dir-1.3.0" // { dependencies = [ @@ -53955,13 +56082,11 @@ in sources."read-metadata-1.0.0" sources."readable-stream-2.3.6" sources."recursive-readdir-2.2.2" - sources."repeat-string-1.6.1" sources."request-2.88.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."rxjs-6.3.1" + sources."rxjs-6.3.3" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" (sources."seek-bzip-1.0.5" // { @@ -53971,7 +56096,7 @@ in }) sources."semver-5.5.1" sources."signal-exit-3.0.2" - sources."source-map-0.4.4" + sources."source-map-0.6.1" sources."sprintf-js-1.0.3" sources."sshpk-1.14.2" sources."stat-mode-0.2.2" @@ -53981,7 +56106,7 @@ in sources."strip-dirs-2.1.0" sources."strip-outer-1.0.1" sources."supports-color-5.5.0" - sources."tar-stream-1.6.1" + sources."tar-stream-1.6.2" sources."through-2.3.8" sources."thunkify-2.1.2" sources."thunkify-wrap-1.0.4" @@ -53995,14 +56120,13 @@ in sources."tslib-1.9.3" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - (sources."uglify-js-2.8.29" // { + (sources."uglify-js-3.4.9" // { dependencies = [ - sources."source-map-0.5.7" + sources."commander-2.17.1" ]; }) - sources."uglify-to-browserify-1.0.2" sources."uid-0.0.2" - sources."unbzip2-stream-1.2.5" + sources."unbzip2-stream-1.3.0" sources."unyield-0.0.1" sources."unzip-response-2.0.1" sources."url-parse-lax-1.0.0" @@ -54014,13 +56138,11 @@ in 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.10.0" ]; buildInputs = globalBuildInputs; @@ -54035,19 +56157,19 @@ in "@vue/cli" = nodeEnv.buildNodePackage { name = "_at_vue_slash_cli"; packageName = "@vue/cli"; - version = "3.0.1"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli/-/cli-3.0.1.tgz"; - sha512 = "z61IlDhTpgDhM6cjbVynkpZzkfhmRKns8DhuuF/OK8VIEI9mwLLn+9df5lFe6Ij/5S9KURXwNeaTLiA1m2R/Yw=="; + url = "https://registry.npmjs.org/@vue/cli/-/cli-3.0.4.tgz"; + sha512 = "HC7u3pIjzPV7/5vdZYRpY1VtBsp8xpTxzZLVF61ijQ61bt+cTpF17qOdPW0Tu1muRzD1Qc5d6K15USvtvWg5YQ=="; }; dependencies = [ sources."@akryum/winattr-3.0.0" sources."@apollographql/apollo-upload-server-5.0.3" sources."@apollographql/graphql-playground-html-1.6.0" - sources."@babel/runtime-7.0.0" - sources."@babel/runtime-corejs2-7.0.0" + sources."@babel/runtime-7.1.1" + sources."@babel/runtime-corejs2-7.1.1" sources."@mrmlnc/readdir-enhanced-2.2.1" - sources."@nodelib/fs.stat-1.1.1" + sources."@nodelib/fs.stat-1.1.2" sources."@protobufjs/aspromise-1.1.2" sources."@protobufjs/base64-1.1.2" sources."@protobufjs/codegen-2.0.4" @@ -54066,21 +56188,20 @@ in sources."@types/events-1.2.0" sources."@types/express-4.16.0" sources."@types/express-serve-static-core-4.16.0" - sources."@types/graphql-0.12.6" sources."@types/long-4.0.0" sources."@types/mime-2.0.0" - sources."@types/node-10.9.4" + sources."@types/node-10.11.2" sources."@types/range-parser-1.2.2" sources."@types/serve-static-1.13.2" sources."@types/ws-5.1.2" sources."@types/zen-observable-0.8.0" - sources."@vue/cli-shared-utils-3.0.1" - (sources."@vue/cli-ui-3.0.1" // { + sources."@vue/cli-shared-utils-3.0.4" + (sources."@vue/cli-ui-3.0.4" // { dependencies = [ sources."clone-2.1.2" ]; }) - sources."@vue/cli-ui-addon-webpack-3.0.1" + sources."@vue/cli-ui-addon-webpack-3.0.4" sources."abbrev-1.1.1" sources."accepts-1.3.5" sources."ajv-5.5.2" @@ -54089,29 +56210,36 @@ in sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" sources."anymatch-2.0.0" - sources."apollo-cache-1.1.16" - sources."apollo-cache-control-0.2.3" - sources."apollo-cache-inmemory-1.2.9" - sources."apollo-client-2.4.1" + sources."apollo-cache-1.1.17" + sources."apollo-cache-control-0.2.5" + sources."apollo-cache-inmemory-1.3.0" + sources."apollo-client-2.4.2" sources."apollo-datasource-0.1.3" - sources."apollo-engine-reporting-0.0.3" + sources."apollo-engine-reporting-0.0.6" sources."apollo-engine-reporting-protobuf-0.0.1" - sources."apollo-link-1.2.2" - sources."apollo-link-context-1.0.8" - sources."apollo-link-dedup-1.0.9" - sources."apollo-link-http-1.5.4" - sources."apollo-link-http-common-0.2.4" + sources."apollo-link-1.2.3" + sources."apollo-link-context-1.0.9" + sources."apollo-link-dedup-1.0.10" + sources."apollo-link-http-common-0.2.5" sources."apollo-link-persisted-queries-0.2.1" - sources."apollo-link-state-0.4.1" - sources."apollo-link-ws-1.0.8" + sources."apollo-link-state-0.4.2" + sources."apollo-link-ws-1.0.9" sources."apollo-server-caching-0.1.2" - sources."apollo-server-core-2.0.5" + (sources."apollo-server-core-2.1.0" // { + dependencies = [ + sources."graphql-subscriptions-0.5.8" + ]; + }) sources."apollo-server-env-2.0.3" sources."apollo-server-errors-2.0.2" - sources."apollo-server-express-2.0.5" - sources."apollo-tracing-0.2.3" + (sources."apollo-server-express-2.1.0" // { + dependencies = [ + sources."graphql-subscriptions-0.5.8" + ]; + }) + sources."apollo-tracing-0.2.5" sources."apollo-upload-client-8.1.0" - sources."apollo-utilities-1.0.20" + sources."apollo-utilities-1.0.21" sources."argparse-1.0.10" sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" @@ -54131,7 +56259,7 @@ in sources."async-1.5.2" sources."async-each-1.0.1" sources."async-limiter-1.0.0" - sources."async-retry-1.2.1" + sources."async-retry-1.2.3" sources."asynckit-0.4.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" @@ -54145,7 +56273,7 @@ in }) sources."base64-js-0.0.8" sources."bcrypt-pbkdf-1.0.2" - sources."binary-extensions-1.11.0" + sources."binary-extensions-1.12.0" (sources."bl-1.2.2" // { dependencies = [ sources."isarray-1.0.0" @@ -54170,6 +56298,7 @@ in sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" sources."buffer-fill-1.0.0" + sources."buffer-from-1.1.1" sources."builtins-1.0.3" sources."busboy-0.2.14" sources."bytes-3.0.0" @@ -54182,7 +56311,7 @@ in sources."chalk-2.4.1" sources."chardet-0.7.0" sources."chokidar-2.0.4" - sources."ci-info-1.4.0" + sources."ci-info-1.6.0" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" @@ -54211,11 +56340,11 @@ in sources."collection-visit-1.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."combined-stream-1.0.6" - sources."commander-2.17.1" + sources."combined-stream-1.0.7" + sources."commander-2.18.0" sources."component-emitter-1.2.1" sources."concat-map-0.0.1" - sources."config-chain-1.1.11" + sources."config-chain-1.1.12" sources."configstore-3.1.2" sources."content-disposition-0.5.2" sources."content-type-1.0.4" @@ -54229,7 +56358,11 @@ in sources."cross-spawn-5.1.0" sources."crypto-random-string-1.0.0" sources."dashdash-1.14.1" - sources."debug-3.1.0" + (sources."debug-3.2.5" // { + dependencies = [ + sources."ms-2.1.1" + ]; + }) sources."decode-uri-component-0.2.0" (sources."decompress-4.2.0" // { dependencies = [ @@ -54261,6 +56394,7 @@ in sources."deprecated-decorator-0.1.6" sources."destroy-1.0.4" sources."dicer-0.2.5" + sources."diff-3.5.0" sources."dir-glob-2.0.0" sources."dot-prop-4.2.0" (sources."download-5.0.3" // { @@ -54278,13 +56412,14 @@ in sources."encodeurl-1.0.2" sources."end-of-stream-1.4.1" sources."es-abstract-1.12.0" - sources."es-to-primitive-1.1.1" + sources."es-to-primitive-1.2.0" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" + sources."esm-3.0.84" sources."esprima-4.0.1" sources."etag-1.8.1" sources."event-pubsub-4.3.0" - sources."event-stream-3.3.4" + sources."event-stream-3.3.6" sources."eventemitter3-3.1.0" sources."exec-sh-0.2.2" (sources."execa-0.10.0" // { @@ -54345,6 +56480,7 @@ in sources."fast-deep-equal-1.1.0" sources."fast-glob-2.2.2" sources."fast-json-stable-stringify-2.0.0" + sources."fclone-1.0.11" sources."fd-slicer-1.1.0" sources."figures-2.0.0" sources."file-type-5.2.0" @@ -54357,9 +56493,14 @@ in sources."statuses-1.4.0" ]; }) + sources."flatmap-stream-0.1.0" sources."for-in-1.0.2" sources."forever-agent-0.6.1" - sources."form-data-2.3.2" + (sources."form-data-2.3.2" // { + dependencies = [ + sources."combined-stream-1.0.6" + ]; + }) sources."forwarded-0.1.2" sources."fragment-cache-0.2.1" sources."fresh-0.5.2" @@ -54395,9 +56536,9 @@ in sources."graceful-fs-4.1.11" sources."graceful-readlink-1.0.1" sources."graphql-0.13.2" - sources."graphql-anywhere-4.1.18" - sources."graphql-extensions-0.1.3" - sources."graphql-subscriptions-0.5.8" + sources."graphql-anywhere-4.1.19" + sources."graphql-extensions-0.2.1" + sources."graphql-subscriptions-1.0.0" sources."graphql-tag-2.9.2" sources."graphql-tools-3.1.1" sources."graphql-type-json-0.2.1" @@ -54407,6 +56548,7 @@ in sources."has-1.0.3" sources."has-flag-3.0.0" sources."has-symbol-support-x-1.4.2" + sources."has-symbols-1.0.0" sources."has-to-string-tag-x-1.4.1" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -54423,6 +56565,7 @@ in sources."ieee754-1.1.12" sources."ignore-3.3.10" sources."ignore-by-default-1.0.1" + sources."immutable-tuple-0.4.8" sources."import-global-0.1.0" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" @@ -54435,7 +56578,7 @@ in sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" sources."is-callable-1.1.4" - sources."is-ci-1.2.0" + sources."is-ci-1.2.1" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.1" sources."is-descriptor-1.0.2" @@ -54460,7 +56603,7 @@ in sources."is-regex-1.0.4" sources."is-retry-allowed-1.1.0" sources."is-stream-1.1.0" - sources."is-symbol-1.0.1" + sources."is-symbol-1.0.2" sources."is-typedarray-1.0.0" sources."is-windows-1.0.2" sources."is-wsl-1.1.0" @@ -54488,7 +56631,7 @@ in sources."klaw-sync-4.0.0" sources."latest-version-3.1.0" sources."launch-editor-2.2.1" - sources."lodash-4.17.10" + sources."lodash-4.17.11" sources."lodash.clonedeep-4.5.0" sources."lodash.debounce-4.0.8" sources."lodash.merge-4.6.1" @@ -54498,8 +56641,9 @@ in sources."lowercase-keys-1.0.1" sources."lru-cache-4.1.3" sources."make-dir-1.3.0" + sources."make-error-1.3.5" sources."map-cache-0.2.2" - sources."map-stream-0.1.0" + sources."map-stream-0.0.7" sources."map-visit-1.0.0" sources."media-typer-0.3.0" sources."merge-1.2.0" @@ -54532,7 +56676,7 @@ in sources."ms-2.0.0" sources."mute-stream-0.0.7" sources."nan-2.11.0" - sources."nanoid-1.2.2" + sources."nanoid-1.2.4" (sources."nanomatch-1.2.13" // { dependencies = [ sources."extend-shallow-3.0.2" @@ -54572,7 +56716,8 @@ in sources."on-finished-2.3.0" sources."once-1.4.0" sources."onetime-2.0.1" - sources."opn-5.3.0" + sources."opn-5.4.0" + sources."optimism-0.6.6" sources."ora-2.1.0" sources."os-tmpdir-1.0.2" sources."p-finally-1.0.0" @@ -54617,14 +56762,14 @@ in sources."raw-body-2.3.3" sources."rc-1.2.8" sources."readable-stream-1.1.14" - (sources."readdirp-2.1.0" // { + (sources."readdirp-2.2.1" // { dependencies = [ sources."isarray-1.0.0" sources."readable-stream-2.3.6" sources."string_decoder-1.1.1" ]; }) - (sources."recast-0.15.3" // { + (sources."recast-0.15.5" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -54652,10 +56797,10 @@ in sources."resolve-url-0.2.1" sources."restore-cursor-2.0.0" sources."ret-0.1.15" - sources."retry-0.10.1" + sources."retry-0.12.0" sources."rimraf-2.6.2" sources."run-async-2.3.0" - sources."rxjs-6.3.1" + sources."rxjs-6.3.3" sources."safe-buffer-5.1.1" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -54674,7 +56819,6 @@ in ]; }) sources."serve-static-1.13.2" - sources."set-immediate-shim-1.0.1" sources."set-value-2.0.0" sources."setprototypeof-1.1.0" sources."shebang-command-1.2.0" @@ -54714,8 +56858,13 @@ in }) sources."source-map-0.5.7" sources."source-map-resolve-0.5.2" + (sources."source-map-support-0.5.9" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) sources."source-map-url-0.4.0" - sources."split-0.3.3" + sources."split-1.0.1" (sources."split-string-3.1.0" // { dependencies = [ sources."extend-shallow-3.0.2" @@ -54744,7 +56893,7 @@ in sources."statuses-1.5.0" sources."stealthy-require-1.1.1" sources."steno-0.4.4" - sources."stream-combiner-0.0.4" + sources."stream-combiner-0.2.2" sources."streamsearch-0.1.2" sources."string-width-2.1.1" sources."string.prototype.padstart-3.0.0" @@ -54754,10 +56903,10 @@ in sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" sources."strip-outer-1.0.1" - sources."subscriptions-transport-ws-0.9.14" + sources."subscriptions-transport-ws-0.9.15" sources."supports-color-5.5.0" sources."symbol-observable-1.2.0" - (sources."tar-stream-1.6.1" // { + (sources."tar-stream-1.6.2" // { dependencies = [ sources."isarray-1.0.0" sources."readable-stream-2.3.6" @@ -54795,11 +56944,12 @@ in ]; }) sources."trim-repeated-1.0.0" + sources."ts-node-7.0.1" sources."tslib-1.9.3" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.16" - sources."unbzip2-stream-1.2.5" + sources."unbzip2-stream-1.3.0" (sources."undefsafe-2.0.2" // { dependencies = [ sources."debug-2.6.9" @@ -54838,7 +56988,7 @@ in sources."validate-npm-package-name-3.0.0" sources."vary-1.1.2" sources."verror-1.10.0" - sources."vue-cli-plugin-apollo-0.14.6" + sources."vue-cli-plugin-apollo-0.16.6" sources."watch-1.0.2" sources."wcwidth-1.0.1" sources."which-1.3.1" @@ -54855,8 +57005,9 @@ in ]; }) sources."yauzl-2.10.0" + sources."yn-2.0.0" sources."zen-observable-0.8.9" - sources."zen-observable-ts-0.8.9" + sources."zen-observable-ts-0.8.10" ]; buildInputs = globalBuildInputs; meta = { @@ -54891,11 +57042,11 @@ in sources."brace-expansion-1.1.11" sources."caseless-0.11.0" sources."chalk-1.1.3" - sources."combined-stream-1.0.6" - sources."commander-2.17.1" + sources."combined-stream-1.0.7" + sources."commander-2.18.0" sources."concat-map-0.0.1" sources."concat-stream-1.5.0" - (sources."config-chain-1.1.11" // { + (sources."config-chain-1.1.12" // { dependencies = [ sources."ini-1.3.5" ]; @@ -54962,7 +57113,7 @@ in }) sources."kew-0.1.7" sources."klaw-1.3.1" - sources."lodash-4.17.10" + sources."lodash-4.17.11" sources."mime-db-1.36.0" sources."mime-types-2.1.20" sources."minimatch-3.0.4" @@ -55034,37 +57185,35 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "4.17.1"; + version = "4.20.2"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.17.1.tgz"; - sha512 = "vdPYogljzWPhFKDj3Gcp01Vqgu7K3IQlybc3XIdKSQHelK1C3eIQuysEUR7MxKJmdandZlQB/9BG2Jb1leJHaw=="; + url = "https://registry.npmjs.org/webpack/-/webpack-4.20.2.tgz"; + sha512 = "75WFUMblcWYcocjSLlXCb71QuGyH7egdBZu50FtBGl2Nso8CK3Ej+J7bTZz2FPFq5l6fzCisD9modB7t30ikuA=="; }; dependencies = [ - sources."@webassemblyjs/ast-1.5.13" - sources."@webassemblyjs/floating-point-hex-parser-1.5.13" - sources."@webassemblyjs/helper-api-error-1.5.13" - sources."@webassemblyjs/helper-buffer-1.5.13" - sources."@webassemblyjs/helper-code-frame-1.5.13" - sources."@webassemblyjs/helper-fsm-1.5.13" - sources."@webassemblyjs/helper-module-context-1.5.13" - sources."@webassemblyjs/helper-wasm-bytecode-1.5.13" - sources."@webassemblyjs/helper-wasm-section-1.5.13" - sources."@webassemblyjs/ieee754-1.5.13" - (sources."@webassemblyjs/leb128-1.5.13" // { - dependencies = [ - sources."long-4.0.0" - ]; - }) - sources."@webassemblyjs/utf8-1.5.13" - sources."@webassemblyjs/wasm-edit-1.5.13" - sources."@webassemblyjs/wasm-gen-1.5.13" - sources."@webassemblyjs/wasm-opt-1.5.13" - sources."@webassemblyjs/wasm-parser-1.5.13" - sources."@webassemblyjs/wast-parser-1.5.13" - sources."@webassemblyjs/wast-printer-1.5.13" - sources."acorn-5.7.2" + sources."@webassemblyjs/ast-1.7.8" + sources."@webassemblyjs/floating-point-hex-parser-1.7.8" + sources."@webassemblyjs/helper-api-error-1.7.8" + sources."@webassemblyjs/helper-buffer-1.7.8" + sources."@webassemblyjs/helper-code-frame-1.7.8" + sources."@webassemblyjs/helper-fsm-1.7.8" + sources."@webassemblyjs/helper-module-context-1.7.8" + sources."@webassemblyjs/helper-wasm-bytecode-1.7.8" + sources."@webassemblyjs/helper-wasm-section-1.7.8" + sources."@webassemblyjs/ieee754-1.7.8" + sources."@webassemblyjs/leb128-1.7.8" + sources."@webassemblyjs/utf8-1.7.8" + sources."@webassemblyjs/wasm-edit-1.7.8" + sources."@webassemblyjs/wasm-gen-1.7.8" + sources."@webassemblyjs/wasm-opt-1.7.8" + sources."@webassemblyjs/wasm-parser-1.7.8" + sources."@webassemblyjs/wast-parser-1.7.8" + sources."@webassemblyjs/wast-printer-1.7.8" + sources."@xtuc/ieee754-1.2.0" + sources."@xtuc/long-4.2.1" + sources."acorn-5.7.3" sources."acorn-dynamic-import-3.0.0" - sources."ajv-6.5.3" + sources."ajv-6.5.4" sources."ajv-keywords-3.2.0" sources."anymatch-2.0.0" sources."aproba-1.2.0" @@ -55090,7 +57239,7 @@ in }) sources."base64-js-1.3.0" sources."big.js-3.2.0" - sources."binary-extensions-1.11.0" + sources."binary-extensions-1.12.0" sources."bluebird-3.5.2" sources."bn.js-4.11.8" sources."brace-expansion-1.1.11" @@ -55113,7 +57262,7 @@ in sources."cacache-10.0.4" sources."cache-base-1.0.1" sources."chokidar-2.0.4" - sources."chownr-1.0.1" + sources."chownr-1.1.1" sources."chrome-trace-event-1.0.0" sources."cipher-base-1.0.4" (sources."class-utils-0.3.6" // { @@ -55150,7 +57299,7 @@ in sources."crypto-browserify-3.12.0" sources."cyclist-0.2.2" sources."date-now-0.1.4" - sources."debug-3.1.0" + sources."debug-2.6.9" sources."decode-uri-component-0.2.0" sources."define-property-2.0.2" sources."des.js-1.0.0" @@ -55169,7 +57318,6 @@ in sources."evp_bytestokey-1.0.3" (sources."expand-brackets-2.1.4" // { dependencies = [ - sources."debug-2.6.9" sources."define-property-0.2.5" sources."extend-shallow-2.0.1" (sources."is-accessor-descriptor-0.1.6" // { @@ -55258,14 +57406,12 @@ in sources."json-schema-traverse-0.4.1" sources."json5-0.5.1" sources."kind-of-6.0.2" - sources."loader-runner-2.3.0" + sources."loader-runner-2.3.1" sources."loader-utils-1.1.0" sources."locate-path-2.0.0" sources."lodash.debounce-4.0.8" - sources."long-3.2.0" sources."lru-cache-4.1.3" sources."make-dir-1.3.0" - sources."mamacro-0.0.3" sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."md5.js-1.3.4" @@ -55322,7 +57468,7 @@ in sources."path-dirname-1.0.2" sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" - sources."pbkdf2-3.0.16" + sources."pbkdf2-3.0.17" sources."pify-3.0.0" sources."pkg-dir-2.0.0" sources."posix-character-classes-0.1.1" @@ -55340,7 +57486,7 @@ in sources."randombytes-2.0.6" sources."randomfill-1.0.4" sources."readable-stream-2.3.6" - sources."readdirp-2.1.0" + sources."readdirp-2.2.1" sources."regex-not-1.0.2" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" @@ -55354,7 +57500,6 @@ in sources."safe-regex-1.1.0" sources."schema-utils-0.4.7" sources."serialize-javascript-1.5.0" - sources."set-immediate-shim-1.0.1" (sources."set-value-2.0.0" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -55364,7 +57509,6 @@ in sources."sha.js-2.4.11" (sources."snapdragon-0.8.2" // { dependencies = [ - sources."debug-2.6.9" sources."define-property-0.2.5" sources."extend-shallow-2.0.1" (sources."is-accessor-descriptor-0.1.6" // { @@ -55419,7 +57563,7 @@ in sources."stream-http-2.8.3" sources."stream-shift-1.0.0" sources."string_decoder-1.1.1" - sources."tapable-1.0.0" + sources."tapable-1.1.0" sources."through2-2.0.3" sources."timers-browserify-2.0.10" sources."to-arraybuffer-1.0.1" @@ -55449,8 +57593,8 @@ in sources."set-value-0.4.3" ]; }) - sources."unique-filename-1.1.0" - sources."unique-slug-2.0.0" + sources."unique-filename-1.1.1" + sources."unique-slug-2.0.1" (sources."unset-value-1.0.0" // { dependencies = [ (sources."has-value-0.3.1" // { @@ -55474,7 +57618,7 @@ in sources."util-deprecate-1.0.2" sources."vm-browserify-0.0.4" sources."watchpack-1.6.0" - (sources."webpack-sources-1.2.0" // { + (sources."webpack-sources-1.3.0" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -55513,19 +57657,22 @@ in sources."bitfield-2.0.0" (sources."bittorrent-dht-9.0.0" // { dependencies = [ - sources."debug-3.1.0" + sources."debug-3.2.5" + sources."ms-2.1.1" ]; }) sources."bittorrent-peerid-1.3.0" (sources."bittorrent-protocol-3.0.1" // { dependencies = [ - sources."debug-3.1.0" + sources."debug-3.2.5" + sources."ms-2.1.1" sources."readable-stream-2.3.6" ]; }) (sources."bittorrent-tracker-9.10.1" // { dependencies = [ - sources."debug-3.1.0" + sources."debug-3.2.5" + sources."ms-2.1.1" sources."simple-get-3.0.3" ]; }) @@ -55604,7 +57751,7 @@ in sources."get-browser-rtc-1.0.2" sources."get-stdin-6.0.0" sources."glob-7.1.3" - sources."he-1.1.1" + sources."he-1.2.0" sources."immediate-chunk-store-2.0.0" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -55701,16 +57848,13 @@ in sources."random-iterate-1.0.1" sources."randombytes-2.0.6" sources."range-parser-1.2.0" - (sources."range-slice-stream-1.2.0" // { - dependencies = [ - sources."readable-stream-2.3.6" - ]; - }) - sources."readable-stream-3.0.2" + sources."range-slice-stream-2.0.0" + sources."readable-stream-3.0.3" sources."record-cache-1.1.0" (sources."render-media-3.1.3" // { dependencies = [ - sources."debug-3.1.0" + sources."debug-3.2.5" + sources."ms-2.1.1" ]; }) sources."rimraf-2.6.2" @@ -55725,14 +57869,16 @@ in sources."simple-get-2.8.1" (sources."simple-peer-9.1.2" // { dependencies = [ - sources."debug-3.1.0" + sources."debug-3.2.5" + sources."ms-2.1.1" sources."readable-stream-2.3.6" ]; }) sources."simple-sha1-2.1.1" (sources."simple-websocket-7.2.0" // { dependencies = [ - sources."debug-3.1.0" + sources."debug-3.2.5" + sources."ms-2.1.1" sources."readable-stream-2.3.6" ]; }) @@ -55749,7 +57895,8 @@ in sources."to-arraybuffer-1.0.1" (sources."torrent-discovery-9.1.1" // { dependencies = [ - sources."debug-3.1.0" + sources."debug-3.2.5" + sources."ms-2.1.1" ]; }) sources."torrent-piece-2.0.0" @@ -55763,17 +57910,19 @@ in sources."url-join-2.0.5" (sources."ut_metadata-3.3.0" // { dependencies = [ - sources."debug-3.1.0" + sources."debug-3.2.5" + sources."ms-2.1.1" ]; }) sources."ut_pex-1.2.1" sources."utf-8-validate-5.0.1" sources."util-deprecate-1.0.2" - sources."videostream-2.5.1" + sources."videostream-2.6.0" sources."vlc-command-1.1.2" (sources."webtorrent-0.102.4" // { dependencies = [ - sources."debug-3.1.0" + sources."debug-3.2.5" + sources."ms-2.1.1" sources."simple-get-3.0.3" ]; }) @@ -55805,10 +57954,11 @@ in dependencies = [ sources."@cliqz-oss/firefox-client-0.3.1" sources."@cliqz-oss/node-firefox-connect-1.2.1" - sources."@types/node-10.9.4" + sources."@types/node-10.11.2" + sources."@yarnpkg/lockfile-1.1.0" sources."JSONSelect-0.2.1" sources."abbrev-1.1.1" - sources."acorn-5.7.2" + sources."acorn-5.7.3" (sources."acorn-jsx-3.0.1" // { dependencies = [ sources."acorn-3.3.0" @@ -55819,6 +57969,11 @@ in sources."adbkit-monkey-1.0.1" (sources."addons-linter-1.3.1" // { dependencies = [ + sources."cross-spawn-5.1.0" + sources."execa-0.7.0" + sources."invert-kv-1.0.0" + sources."lcid-1.0.0" + sources."mem-1.1.0" sources."source-map-0.6.1" sources."source-map-support-0.5.6" (sources."yargs-12.0.1" // { @@ -55903,7 +58058,7 @@ in }) sources."base64-js-1.3.0" sources."bcrypt-pbkdf-1.0.2" - sources."binary-extensions-1.11.0" + sources."binary-extensions-1.12.0" sources."bl-1.2.2" sources."bluebird-2.9.34" sources."boolbase-1.0.0" @@ -55975,22 +58130,22 @@ in 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.17.1" + sources."combined-stream-1.0.7" + sources."commander-2.18.0" sources."common-tags-1.8.0" sources."component-emitter-1.2.1" sources."compress-commons-1.2.2" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" sources."configstore-3.1.2" - sources."convert-source-map-1.5.1" + sources."convert-source-map-1.6.0" sources."copy-descriptor-0.1.1" sources."core-js-2.5.7" sources."core-util-is-1.0.2" sources."crc-3.8.0" sources."crc32-stream-2.0.0" sources."create-error-class-3.0.2" - sources."cross-spawn-5.1.0" + sources."cross-spawn-6.0.5" sources."crx-parser-0.1.2" sources."crypto-random-string-1.0.0" sources."css-select-1.2.0" @@ -56022,10 +58177,9 @@ in (sources."dispensary-0.22.0" // { dependencies = [ sources."async-2.6.1" - sources."os-locale-2.1.0" sources."source-map-0.6.1" sources."source-map-support-0.5.9" - sources."yargs-12.0.1" + sources."yargs-12.0.2" ]; }) sources."doctrine-2.1.0" @@ -56048,7 +58202,7 @@ in sources."entities-1.1.1" sources."error-ex-1.3.2" sources."es-abstract-1.12.0" - sources."es-to-primitive-1.1.1" + sources."es-to-primitive-1.2.0" sources."es5-ext-0.10.46" sources."es6-error-4.1.1" sources."es6-iterator-2.0.3" @@ -56056,7 +58210,7 @@ in sources."es6-promise-2.3.0" (sources."es6-promisify-5.0.0" // { dependencies = [ - sources."es6-promise-4.2.4" + sources."es6-promise-4.2.5" ]; }) sources."es6-set-0.1.5" @@ -56072,9 +58226,9 @@ in (sources."eslint-5.0.1" // { dependencies = [ sources."ansi-regex-3.0.0" - sources."cross-spawn-6.0.5" - sources."debug-3.1.0" + sources."debug-3.2.5" sources."globals-11.7.0" + sources."ms-2.1.1" sources."strip-ansi-4.0.0" ]; }) @@ -56121,7 +58275,7 @@ in sources."esutils-2.0.2" sources."event-emitter-0.3.5" sources."event-to-promise-0.8.0" - sources."execa-0.7.0" + sources."execa-0.10.0" sources."exit-hook-1.1.1" (sources."expand-brackets-2.1.4" // { dependencies = [ @@ -56160,7 +58314,7 @@ in sources."fast-json-patch-2.0.7" sources."fast-json-stable-stringify-2.0.0" sources."fast-levenshtein-2.0.6" - sources."fast-redact-1.1.14" + sources."fast-redact-1.2.0" sources."fast-safe-stringify-2.0.6" sources."fd-slicer-1.1.0" sources."figures-2.0.0" @@ -56175,7 +58329,6 @@ in (sources."firefox-profile-1.2.0" // { dependencies = [ sources."async-2.5.0" - sources."fs-extra-4.0.3" ]; }) sources."first-chunk-stream-2.0.0" @@ -56185,10 +58338,14 @@ in sources."for-in-1.0.2" sources."for-own-1.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.3.2" + (sources."form-data-2.3.2" // { + dependencies = [ + sources."combined-stream-1.0.6" + ]; + }) sources."fragment-cache-0.2.1" sources."fs-constants-1.0.0" - sources."fs-extra-5.0.0" + sources."fs-extra-4.0.3" sources."fs.realpath-1.0.0" sources."fsevents-1.2.4" (sources."ftp-0.3.10" // { @@ -56204,6 +58361,7 @@ in dependencies = [ sources."commander-2.9.0" sources."isexe-1.1.2" + sources."lodash-4.17.10" sources."which-1.2.4" ]; }) @@ -56270,7 +58428,8 @@ in sources."http-signature-1.2.0" (sources."https-proxy-agent-2.2.1" // { dependencies = [ - sources."debug-3.1.0" + sources."debug-3.2.5" + sources."ms-2.1.1" ]; }) sources."iconv-lite-0.4.24" @@ -56290,7 +58449,7 @@ in }) sources."interpret-1.1.0" sources."invariant-2.2.4" - sources."invert-kv-1.0.0" + sources."invert-kv-2.0.0" sources."ip-1.1.5" sources."is-absolute-0.1.7" (sources."is-accessor-descriptor-1.0.0" // { @@ -56338,7 +58497,7 @@ in sources."is-resolvable-1.1.0" sources."is-retry-allowed-1.1.0" sources."is-stream-1.1.0" - sources."is-symbol-1.0.1" + sources."is-symbol-1.0.2" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" sources."is-windows-1.0.2" @@ -56390,7 +58549,7 @@ in sources."latest-version-3.1.0" sources."lazy-cache-0.2.7" sources."lazystream-1.0.0" - sources."lcid-1.0.0" + sources."lcid-2.0.0" sources."levn-0.3.0" sources."lie-3.1.1" (sources."load-json-file-1.1.0" // { @@ -56400,7 +58559,7 @@ in ]; }) sources."locate-path-3.0.0" - sources."lodash-4.17.10" + sources."lodash-4.17.11" sources."lodash.assign-4.2.0" sources."lodash.assignin-4.2.0" sources."lodash.clonedeep-4.5.0" @@ -56427,7 +58586,7 @@ in }) sources."map-cache-0.2.2" sources."map-visit-1.0.0" - sources."mem-1.1.0" + sources."mem-3.0.1" (sources."micromatch-3.1.10" // { dependencies = [ sources."kind-of-6.0.2" @@ -56478,6 +58637,8 @@ in sources."camelcase-2.1.1" sources."cliui-3.2.0" sources."decamelize-1.2.0" + sources."invert-kv-1.0.0" + sources."lcid-1.0.0" sources."os-locale-1.4.0" sources."string-width-1.0.2" sources."y18n-3.2.1" @@ -56485,7 +58646,7 @@ in ]; }) sources."ncp-2.0.0" - sources."needle-2.2.2" + sources."needle-2.2.4" sources."neo-async-2.5.2" sources."netmask-1.0.6" sources."next-tick-1.0.0" @@ -56526,15 +58687,7 @@ in sources."opn-5.3.0" sources."optionator-0.8.2" sources."os-homedir-1.0.2" - (sources."os-locale-3.0.0" // { - dependencies = [ - sources."cross-spawn-6.0.5" - sources."execa-0.10.0" - sources."invert-kv-2.0.0" - sources."lcid-2.0.0" - sources."mem-3.0.1" - ]; - }) + sources."os-locale-3.0.0" sources."os-name-2.0.1" sources."os-shim-0.1.3" sources."os-tmpdir-1.0.2" @@ -56545,7 +58698,8 @@ in sources."p-try-2.0.0" (sources."pac-proxy-agent-2.0.2" // { dependencies = [ - sources."debug-3.1.0" + sources."debug-3.2.5" + sources."ms-2.1.1" ]; }) sources."pac-resolver-3.0.0" @@ -56590,7 +58744,8 @@ in sources."promise-7.3.1" (sources."proxy-agent-2.3.1" // { dependencies = [ - sources."debug-3.1.0" + sources."debug-3.2.5" + sources."ms-2.1.1" ]; }) sources."proxy-from-env-1.0.0" @@ -56614,7 +58769,7 @@ in ]; }) sources."readable-stream-2.3.6" - sources."readdirp-2.1.0" + sources."readdirp-2.2.1" (sources."readline2-1.0.1" // { dependencies = [ sources."mute-stream-0.0.5" @@ -56660,7 +58815,6 @@ in 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."set-value-2.0.0" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -56727,77 +58881,86 @@ in ]; }) sources."snapdragon-util-3.0.1" - (sources."snyk-1.94.0" // { + (sources."snyk-1.99.1" // { dependencies = [ sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" sources."chalk-2.4.1" - sources."debug-3.1.0" + sources."debug-3.2.5" sources."inquirer-3.3.0" + sources."ms-2.1.1" sources."rx-lite-4.0.8" + sources."source-map-0.6.1" + sources."source-map-support-0.5.9" sources."strip-ansi-4.0.0" sources."supports-color-5.5.0" ]; }) (sources."snyk-config-2.2.0" // { dependencies = [ - sources."debug-3.1.0" + sources."debug-3.2.5" + sources."ms-2.1.1" ]; }) - (sources."snyk-docker-plugin-1.10.4" // { + (sources."snyk-docker-plugin-1.11.0" // { dependencies = [ - sources."debug-3.1.0" + sources."debug-3.2.5" + sources."ms-2.1.1" ]; }) sources."snyk-go-plugin-1.5.2" - sources."snyk-gradle-plugin-1.3.0" + sources."snyk-gradle-plugin-2.0.1" (sources."snyk-module-1.8.2" // { dependencies = [ - sources."debug-3.1.0" + sources."debug-3.2.5" + sources."ms-2.1.1" ]; }) - sources."snyk-mvn-plugin-1.2.0" - (sources."snyk-nodejs-lockfile-parser-1.4.1" // { + sources."snyk-mvn-plugin-2.0.0" + (sources."snyk-nodejs-lockfile-parser-1.5.1" // { dependencies = [ + sources."lodash-4.17.10" sources."source-map-0.6.1" sources."source-map-support-0.5.9" ]; }) (sources."snyk-nuget-plugin-1.6.5" // { dependencies = [ - sources."debug-3.1.0" + sources."debug-3.2.5" + sources."ms-2.1.1" ]; }) (sources."snyk-php-plugin-1.5.1" // { dependencies = [ - sources."debug-3.1.0" + sources."debug-3.2.5" + sources."ms-2.1.1" ]; }) (sources."snyk-policy-1.12.0" // { dependencies = [ - sources."debug-3.1.0" + sources."debug-3.2.5" + sources."ms-2.1.1" ]; }) sources."snyk-python-plugin-1.8.1" (sources."snyk-resolve-1.0.1" // { dependencies = [ - sources."debug-3.1.0" + sources."debug-3.2.5" + sources."ms-2.1.1" ]; }) (sources."snyk-resolve-deps-3.1.0" // { dependencies = [ - sources."debug-3.1.0" - ]; - }) - (sources."snyk-sbt-plugin-1.3.1" // { - dependencies = [ - sources."debug-3.1.0" + sources."debug-3.2.5" + sources."ms-2.1.1" ]; }) + sources."snyk-sbt-plugin-2.0.0" sources."snyk-tree-1.0.0" (sources."snyk-try-require-1.3.1" // { dependencies = [ - sources."debug-3.1.0" + sources."debug-3.2.5" + sources."ms-2.1.1" ]; }) sources."socks-1.1.10" @@ -56812,10 +58975,10 @@ in }) sources."source-map-url-0.4.0" sources."spawn-sync-1.0.15" - sources."spdx-correct-3.0.0" + sources."spdx-correct-3.0.1" sources."spdx-exceptions-2.1.0" sources."spdx-expression-parse-3.0.0" - sources."spdx-license-ids-3.0.0" + sources."spdx-license-ids-3.0.1" sources."split-0.3.3" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" @@ -56864,10 +59027,15 @@ in sources."supports-color-2.0.0" sources."symbol-observable-1.0.1" sources."table-4.0.3" - sources."tar-stream-1.6.1" + sources."tar-stream-1.6.2" sources."temp-dir-1.0.0" sources."tempfile-2.0.0" - sources."term-size-1.2.0" + (sources."term-size-1.2.0" // { + dependencies = [ + sources."cross-spawn-5.1.0" + sources."execa-0.7.0" + ]; + }) sources."text-table-0.2.0" sources."then-fs-2.0.0" sources."thenify-3.3.0" @@ -56891,6 +59059,7 @@ in sources."tr46-1.0.1" sources."traverse-0.4.6" sources."trim-right-1.0.1" + sources."tslib-1.9.3" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" @@ -56962,6 +59131,8 @@ in sources."camelcase-3.0.0" sources."cliui-3.2.0" sources."decamelize-1.2.0" + sources."invert-kv-1.0.0" + sources."lcid-1.0.0" sources."os-locale-1.4.0" sources."string-width-1.0.2" sources."which-module-1.0.0" @@ -57008,10 +59179,10 @@ in yarn = nodeEnv.buildNodePackage { name = "yarn"; packageName = "yarn"; - version = "1.9.4"; + version = "1.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/yarn/-/yarn-1.9.4.tgz"; - sha1 = "3b82d8446b652775723900b470d966861976924b"; + url = "https://registry.npmjs.org/yarn/-/yarn-1.10.1.tgz"; + sha512 = "EH0H1fyfFxkE4UpG4b+VCaVY4I488I2EyQNmGjGGKmvsSIb0G3b+1IcfGYPI2gqa1du43g4ZA3jH8fXlq6oVxg=="; }; buildInputs = globalBuildInputs; meta = { @@ -57032,7 +59203,7 @@ in }; dependencies = [ sources."@mrmlnc/readdir-enhanced-2.2.1" - sources."@nodelib/fs.stat-1.1.1" + sources."@nodelib/fs.stat-1.1.2" sources."@sindresorhus/is-0.7.0" sources."aggregate-error-1.0.0" sources."ajv-5.5.2" @@ -57098,7 +59269,7 @@ in sources."caseless-0.12.0" sources."chalk-2.4.1" sources."chardet-0.7.0" - sources."ci-info-1.4.0" + sources."ci-info-1.6.0" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" @@ -57130,12 +59301,12 @@ in sources."collection-visit-1.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."combined-stream-1.0.6" + sources."combined-stream-1.0.7" sources."component-emitter-1.2.1" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" sources."conf-1.4.0" - sources."config-chain-1.1.11" + sources."config-chain-1.1.12" sources."configstore-3.1.2" sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" @@ -57169,6 +59340,7 @@ in ]; }) sources."ecc-jsbn-0.1.2" + sources."encodeurl-1.0.2" sources."env-paths-1.0.0" sources."error-ex-1.3.2" sources."escape-string-regexp-1.0.5" @@ -57227,7 +59399,11 @@ in sources."for-in-1.0.2" sources."foreachasync-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.3.2" + (sources."form-data-2.3.2" // { + dependencies = [ + sources."combined-stream-1.0.6" + ]; + }) sources."fragment-cache-0.2.1" sources."from2-2.3.0" sources."fs.realpath-1.0.0" @@ -57245,7 +59421,7 @@ in }) sources."glob-to-regexp-0.3.0" sources."global-dirs-0.1.1" - sources."global-tunnel-ng-2.5.4" + sources."global-tunnel-ng-2.6.0" sources."globby-8.0.1" sources."got-8.3.2" sources."graceful-fs-4.1.11" @@ -57293,7 +59469,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.2.0" + sources."is-ci-1.2.1" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-docker-1.1.0" @@ -57354,8 +59530,8 @@ in ]; }) sources."locate-path-2.0.0" - sources."locutus-2.0.9" - sources."lodash-4.17.10" + sources."locutus-2.0.10" + sources."lodash-4.17.11" sources."lodash.debounce-4.0.8" sources."lodash.pad-4.5.1" sources."lodash.padend-4.6.1" @@ -57435,7 +59611,7 @@ in sources."object.pick-1.3.0" sources."once-1.4.0" sources."onetime-2.0.1" - sources."opn-5.3.0" + sources."opn-5.4.0" sources."os-homedir-1.0.2" sources."os-name-2.0.1" sources."os-shim-0.1.3" @@ -57523,7 +59699,7 @@ in sources."root-check-1.0.0" sources."run-async-2.3.0" sources."rx-4.1.0" - sources."rxjs-6.3.1" + sources."rxjs-6.3.3" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -57576,10 +59752,10 @@ in sources."source-map-resolve-0.5.2" sources."source-map-url-0.4.0" sources."spawn-sync-1.0.15" - sources."spdx-correct-3.0.0" + sources."spdx-correct-3.0.1" sources."spdx-exceptions-2.1.0" sources."spdx-expression-parse-3.0.0" - sources."spdx-license-ids-3.0.0" + sources."spdx-license-ids-3.0.1" sources."split-string-3.1.0" sources."sshpk-1.14.2" (sources."static-extend-0.1.2" // { @@ -57729,7 +59905,8 @@ in sources."yeoman-doctor-3.0.2" (sources."yeoman-environment-2.3.3" // { dependencies = [ - sources."debug-3.1.0" + sources."debug-3.2.5" + sources."ms-2.1.1" ]; }) (sources."yosay-2.0.2" // { diff --git a/pkgs/development/ocaml-modules/elpi/default.nix b/pkgs/development/ocaml-modules/elpi/default.nix new file mode 100644 index 000000000000..db188a720b88 --- /dev/null +++ b/pkgs/development/ocaml-modules/elpi/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, ocaml, findlib, camlp5_strict +, ppx_tools_versioned, ppx_deriving, re +}: + +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-elpi-${version}"; + version = "1.0.5"; + src = fetchFromGitHub { + owner = "LPCIC"; + repo = "elpi"; + rev = "v${version}"; + sha256 = "1n1m183l4ms949m2l24w0887m1rmvc9b3j8alnbw8ckn6wwnhpmk"; + }; + + buildInputs = [ ocaml findlib ppx_tools_versioned ]; + + propagatedBuildInputs = [ camlp5_strict ppx_deriving re ]; + + createFindlibDestdir = true; + + preInstall = "make byte"; + + postInstall = '' + mkdir -p $out/bin + make install-bin BIN=$out/bin + make install-bin BYTE=1 BIN=$out/bin + ''; + + meta = { + description = "Embeddable λProlog Interpreter"; + license = stdenv.lib.licenses.lgpl21Plus; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (src.meta) homepage; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/ocaml-modules/odoc/default.nix b/pkgs/development/ocaml-modules/odoc/default.nix index 4c5da695eb6c..3b1005106272 100644 --- a/pkgs/development/ocaml-modules/odoc/default.nix +++ b/pkgs/development/ocaml-modules/odoc/default.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ bos doc-ock-html doc-ock-xml ]; + configurePhase = "ocaml bin/set-etc bin/odoc_etc.ml $out/etc/odoc"; + inherit (dune) installPhase; meta = { diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index 6edad2d01619..08a455eb40c3 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { patches = fetchpatch { name = "cheroot-fix-setup-python3.patch"; - url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/cheroot-fix-setup-python3.patch?h=packages/python-cheroot"; + url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/cheroot-fix-setup-python3.patch?h=packages/python-cheroot&id=9b33cb0885b3c0d91adeacae23761a4321eb0e64"; sha256 = "1rlgz0qln536y00mfqlf0i9hz3f53id73wh47cg5q2vcsw1w2bpc"; }; diff --git a/pkgs/development/python-modules/django/2_1.nix b/pkgs/development/python-modules/django/2_1.nix index f63822f363ab..f66215c84db1 100644 --- a/pkgs/development/python-modules/django/2_1.nix +++ b/pkgs/development/python-modules/django/2_1.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "Django"; - version = "2.1"; + version = "2.1.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0dv184lgp7scq8cr4422rrvkd8npyiqww0zw50ygcim5smw6093z"; + sha256 = "0b7p6d77xqs2hdq2k1amqgbr3050zn5i8asz5w2lxajqnvb1rk71"; }; patches = stdenv.lib.optionals withGdal [ diff --git a/pkgs/development/python-modules/flask-jwt-extended/default.nix b/pkgs/development/python-modules/flask-jwt-extended/default.nix new file mode 100644 index 000000000000..b14ec9e3eb2a --- /dev/null +++ b/pkgs/development/python-modules/flask-jwt-extended/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildPythonPackage, fetchPypi, flask, pyjwt, werkzeug, pytest }: + +buildPythonPackage rec { + pname = "Flask-JWT-Extended"; + version = "3.13.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "10qz3ljr2kpd93al2km6iijxp23z33kvvwd0y5bc840f86b4mra8"; + }; + + propagatedBuildInputs = [ flask pyjwt werkzeug ]; + checkInputs = [ pytest ]; + + checkPhase = '' + pytest tests/ + ''; + + meta = with stdenv.lib; { + description = "JWT extension for Flask"; + homepage = https://flask-jwt-extended.readthedocs.io/; + license = licenses.mit; + maintainers = with maintainers; [ gerschtli ]; + }; +} diff --git a/pkgs/development/python-modules/flask-sqlalchemy/default.nix b/pkgs/development/python-modules/flask-sqlalchemy/default.nix new file mode 100644 index 000000000000..aa7b40675b89 --- /dev/null +++ b/pkgs/development/python-modules/flask-sqlalchemy/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildPythonPackage, fetchPypi, flask, sqlalchemy, pytest }: + +buildPythonPackage rec { + pname = "Flask-SQLAlchemy"; + version = "2.3.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0lvfynbk9y0whpkhqz7kf3hk342sfa3lwqyv25gnb22q5f2vjwar"; + }; + + propagatedBuildInputs = [ flask sqlalchemy ]; + checkInputs = [ pytest ]; + + checkPhase = '' + pytest + ''; + + meta = with stdenv.lib; { + description = "SQLAlchemy extension for Flask"; + homepage = http://flask-sqlalchemy.pocoo.org/; + license = licenses.bsd3; + maintainers = with maintainers; [ gerschtli ]; + }; +} diff --git a/pkgs/development/python-modules/glances/default.nix b/pkgs/development/python-modules/glances/default.nix new file mode 100644 index 000000000000..f25723e7ec72 --- /dev/null +++ b/pkgs/development/python-modules/glances/default.nix @@ -0,0 +1,37 @@ +{ buildPythonPackage, fetchFromGitHub, isPyPy, lib +, psutil, setuptools, bottle, batinfo, pysnmp +, hddtemp +, unittest2 +}: + +buildPythonPackage rec { + name = "glances-${version}"; + version = "3.0.2"; + disabled = isPyPy; + + src = fetchFromGitHub { + owner = "nicolargo"; + repo = "glances"; + rev = "v${version}"; + sha256 = "1jkjblfk4gbr00j7lny7ajiizzqnp0p1yhzfi14074gwk38z0q14"; + }; + + patches = lib.optional doCheck ./skip-failing-tests.patch; + + # Requires access to /sys/class/power_supply + doCheck = true; + + buildInputs = [ unittest2 ]; + propagatedBuildInputs = [ psutil setuptools bottle batinfo pysnmp hddtemp ]; + + preConfigure = '' + sed -i 's/data_files\.append((conf_path/data_files.append(("etc\/glances"/' setup.py; + ''; + + meta = with lib; { + homepage = https://nicolargo.github.io/glances/; + description = "Cross-platform curses-based monitoring tool"; + license = licenses.lgpl3; + maintainers = with maintainers; [ primeos koral ]; + }; +} diff --git a/pkgs/development/python-modules/glances/skip-failing-tests.patch b/pkgs/development/python-modules/glances/skip-failing-tests.patch new file mode 100644 index 000000000000..f47f1218aea5 --- /dev/null +++ b/pkgs/development/python-modules/glances/skip-failing-tests.patch @@ -0,0 +1,52 @@ +diff --git a/unitest.py b/unitest.py +--- a/unitest.py ++++ b/unitest.py +@@ -59,6 +59,7 @@ class TestGlances(unittest.TestCase): + """The function is called *every time* before test_*.""" + print('\n' + '=' * 78) + ++ @unittest.skip("Requires access to /etc/mtab") + def test_000_update(self): + """Update stats (mandatory step for all the stats). + +@@ -87,6 +88,7 @@ class TestGlances(unittest.TestCase): + for plugin in plugins_to_check: + self.assertTrue(plugin in plugins_list) + ++ @unittest.skip("Fails on NixOS") + def test_002_system(self): + """Check SYSTEM plugin.""" + stats_to_check = ['hostname', 'os_name'] +@@ -97,6 +99,7 @@ class TestGlances(unittest.TestCase): + self.assertTrue(stat in stats_grab, msg='Cannot find key: %s' % stat) + print('INFO: SYSTEM stats: %s' % stats_grab) + ++ @unittest.skip("Fails on NixOS") + def test_003_cpu(self): + """Check CPU plugin.""" + stats_to_check = ['system', 'user', 'idle'] +@@ -110,7 +113,7 @@ class TestGlances(unittest.TestCase): + self.assertLessEqual(stats_grab[stat], 100) + print('INFO: CPU stats: %s' % stats_grab) + +- @unittest.skipIf(WINDOWS, "Load average not available on Windows") ++ @unittest.skip("Fails on NixOS") + def test_004_load(self): + """Check LOAD plugin.""" + stats_to_check = ['cpucore', 'min1', 'min5', 'min15'] +@@ -123,6 +126,7 @@ class TestGlances(unittest.TestCase): + self.assertGreaterEqual(stats_grab[stat], 0) + print('INFO: LOAD stats: %s' % stats_grab) + ++ @unittest.skip("Fails on NixOS") + def test_005_mem(self): + """Check MEM plugin.""" + stats_to_check = ['available', 'used', 'free', 'total'] +@@ -135,6 +139,7 @@ class TestGlances(unittest.TestCase): + self.assertGreaterEqual(stats_grab[stat], 0) + print('INFO: MEM stats: %s' % stats_grab) + ++ @unittest.skip("Fails on NixOS") + def test_006_swap(self): + """Check MEMSWAP plugin.""" + stats_to_check = ['used', 'free', 'total'] diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index 3d3824cdabe4..6141e4a389c2 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; buildPythonPackage rec { pname = "grpcio"; - version = "1.14.1"; + version = "1.15.0"; src = fetchPypi { inherit pname version; - sha256 = "4bf23666e763ca7ff6010465864e9f088f4ac7ecc1e11abd6f85b250e66b2c05"; + sha256 = "1lhh76kgyibgsk6c54nbzzhkskknkbvn71xvixsk0prfp8izr98m"; }; nativeBuildInputs = [ pkgconfig ] ++ optional stdenv.isDarwin darwin.cctools; diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix index 26b42020fc34..063245c0d4dd 100644 --- a/pkgs/development/python-modules/libvirt/default.nix +++ b/pkgs/development/python-modules/libvirt/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "libvirt"; - version = "4.5.0"; + version = "4.7.0"; src = assert version == libvirt.version; fetchgit { url = git://libvirt.org/libvirt-python.git; rev = "v${version}"; - sha256 = "0w2rzkxv7jsq4670m0j5c6p4hpyi0r0ja6wd3wdvixcwc6hhx407"; + sha256 = "1zv3fgwmnkvqif0qsnvpx8hhb6bdfr2b4v55z3nh93bfg8s4rbm8"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix index 1b4ad50c781f..6d3897475ad4 100644 --- a/pkgs/development/python-modules/mpi4py/default.nix +++ b/pkgs/development/python-modules/mpi4py/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, python, buildPythonPackage, mpi, openssh }: +{ stdenv, fetchPypi, fetchpatch, python, buildPythonPackage, mpi, openssh }: buildPythonPackage rec { pname = "mpi4py"; @@ -13,6 +13,13 @@ buildPythonPackage rec { inherit mpi; }; + patches = [ (fetchpatch { + # Disable tests failing with 3.1.x and MPI_THREAD_MULTIPLE + url = "https://bitbucket.org/mpi4py/mpi4py/commits/c2b6b7e642a182f9b00a2b8e9db363214470548a/raw"; + sha256 = "0n6bz3kj4vcqb6q7d0mlj5vl6apn7i2bvfc9mpg59vh3wy47119q"; + }) + ]; + postPatch = '' substituteInPlace test/test_spawn.py --replace \ "unittest.skipMPI('openmpi(<3.0.0)')" \ diff --git a/pkgs/development/python-modules/py-cpuinfo/default.nix b/pkgs/development/python-modules/py-cpuinfo/default.nix index 37cf601695ee..c90f81ae28f8 100644 --- a/pkgs/development/python-modules/py-cpuinfo/default.nix +++ b/pkgs/development/python-modules/py-cpuinfo/default.nix @@ -1,6 +1,7 @@ { lib , fetchFromGitHub , buildPythonPackage +, pytest }: buildPythonPackage rec { @@ -14,6 +15,16 @@ buildPythonPackage rec { sha256 = "1pp561lj80jnvr2038nrzhmks2akxsbdqxvfrqa6n340x81981lm"; }; + checkInputs = [ + pytest + ]; + + checkPhase = '' + runHook preCheck + pytest -k "not TestActual" + runHook postCheck + ''; + meta = { description = "Get CPU info with pure Python 2 & 3"; homepage = https://github.com/workhorsy/py-cpuinfo; diff --git a/pkgs/development/python-modules/pynacl/default.nix b/pkgs/development/python-modules/pynacl/default.nix index 463cd8044e1d..3fe1952213e0 100644 --- a/pkgs/development/python-modules/pynacl/default.nix +++ b/pkgs/development/python-modules/pynacl/default.nix @@ -2,18 +2,15 @@ buildPythonPackage rec { pname = "pynacl"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "pyca"; repo = pname; rev = version; - sha256 = "0z9i1z4hjzmp23igyhvg131gikbrr947506lwfb3fayf0agwfv8f"; + sha256 = "0ac00d5bfdmz1x428h2scq5b34llp61yhxradl94qjwz7ikqv052"; }; - # set timeout to unlimited, remove deadline from tests, see https://github.com/pyca/pynacl/issues/370 - patches = [ ./pynacl-no-timeout-and-deadline.patch ]; - checkInputs = [ pytest hypothesis ]; propagatedBuildInputs = [ libsodium cffi six ]; @@ -22,7 +19,7 @@ buildPythonPackage rec { checkPhase = '' py.test ''; - + meta = with stdenv.lib; { maintainers = with maintainers; [ va1entin ]; description = "Python binding to the Networking and Cryptography (NaCl) library"; diff --git a/pkgs/development/python-modules/pynacl/pynacl-no-timeout-and-deadline.patch b/pkgs/development/python-modules/pynacl/pynacl-no-timeout-and-deadline.patch deleted file mode 100644 index 5f831df3c48d..000000000000 --- a/pkgs/development/python-modules/pynacl/pynacl-no-timeout-and-deadline.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/tests/test_pwhash.py b/tests/test_pwhash.py -index 9634c85..7f20316 100644 ---- a/tests/test_pwhash.py -+++ b/tests/test_pwhash.py -@@ -20,7 +20,7 @@ import os - import sys - import unicodedata as ud - --from hypothesis import given, settings -+from hypothesis import given, settings, unlimited - from hypothesis.strategies import integers, text - - import pytest -@@ -411,7 +411,7 @@ def test_str_verify_argon2_ref_fail(password_hash, password): - integers(min_value=1024 * 1024, - max_value=16 * 1024 * 1024) - ) --@settings(deadline=1500, max_examples=20) -+@settings(timeout=unlimited, deadline=None, max_examples=20) - def test_argon2i_str_and_verify(password, ops, mem): - _psw = password.encode('utf-8') - pw_hash = nacl.pwhash.argon2i.str(_psw, opslimit=ops, memlimit=mem) -@@ -425,7 +425,7 @@ def test_argon2i_str_and_verify(password, ops, mem): - integers(min_value=1024 * 1024, - max_value=16 * 1024 * 1024) - ) --@settings(deadline=1500, max_examples=20) -+@settings(timeout=unlimited, deadline=None, max_examples=20) - def test_argon2id_str_and_verify(password, ops, mem): - _psw = password.encode('utf-8') - pw_hash = nacl.pwhash.argon2id.str(_psw, opslimit=ops, memlimit=mem) -@@ -439,7 +439,7 @@ def test_argon2id_str_and_verify(password, ops, mem): - integers(min_value=1024 * 1024, - max_value=16 * 1024 * 1024) - ) --@settings(deadline=1500, max_examples=20) -+@settings(timeout=unlimited, deadline=None, max_examples=20) - def test_argon2i_str_and_verify_fail(password, ops, mem): - _psw = password.encode('utf-8') - pw_hash = nacl.pwhash.argon2i.str(_psw, opslimit=ops, memlimit=mem) -@@ -448,7 +448,7 @@ def test_argon2i_str_and_verify_fail(password, ops, mem): - - - @given(text(alphabet=PASSWD_CHARS, min_size=5, max_size=20)) --@settings(deadline=1500, max_examples=5) -+@settings(timeout=unlimited, deadline=None, max_examples=5) - def test_pwhash_str_and_verify(password): - _psw = password.encode('utf-8') - diff --git a/pkgs/development/python-modules/pyocr/default.nix b/pkgs/development/python-modules/pyocr/default.nix index c30d80a00155..47a73c9c80af 100644 --- a/pkgs/development/python-modules/pyocr/default.nix +++ b/pkgs/development/python-modules/pyocr/default.nix @@ -1,47 +1,39 @@ -{ lib, fetchFromGitHub, buildPythonPackage, pillow, six -, tesseract, cuneiform, isPy3k +{ lib, fetchFromGitLab, buildPythonPackage, pillow, six +, tesseract, cuneiform, isPy3k, substituteAll, pytest, tox }: buildPythonPackage rec { pname = "pyocr"; - version = "0.4.7"; + version = "0.5.3"; name = pname + "-" + version; disabled = !isPy3k; # Don't fetch from PYPI because it doesn't contain tests. - src = fetchFromGitHub { - owner = "jflesch"; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + group = "World"; + owner = "OpenPaperwork"; repo = "pyocr"; rev = version; - sha256 = "1iw73r8yrgjf8g00yzpz62ymqbf89cqhyhl9g430srmsrq7mn2yd"; + sha256 = "1nihf0qmbpg3yj3yp11jp6hp5z5dqf39nz6j9lqbvgi1nqbs7x15"; }; - NIX_CUNEIFORM_CMD = "${cuneiform}/bin/cuneiform"; - NIX_CUNEIFORM_DATA = "${cuneiform}/share/cuneiform"; - NIX_LIBTESSERACT_PATH = "${tesseract}/lib/libtesseract.so"; - NIX_TESSDATA_PREFIX = "${tesseract}/share/tessdata"; - NIX_TESSERACT_CMD = "${tesseract}/bin/tesseract"; - - patches = [ ./paths.patch ]; + patches = [ (substituteAll { + src = ./paths.patch; + inherit cuneiform tesseract; + }) + ]; postPatch = '' - substituteInPlace src/pyocr/cuneiform.py \ - --subst-var NIX_CUNEIFORM_CMD \ - --subst-var NIX_CUNEIFORM_CMD - - substituteInPlace src/pyocr/tesseract.py \ - --subst-var NIX_TESSERACT_CMD - - substituteInPlace src/pyocr/libtesseract/tesseract_raw.py \ - --subst-var NIX_TESSDATA_PREFIX \ - --subst-var NIX_LIBTESSERACT_PATH + echo 'version = "${version}"' > src/pyocr/_version.py # Disable specific tests that are probably failing because of this issue: # https://github.com/jflesch/pyocr/issues/52 for test in $disabledTests; do file="''${test%%:*}" fun="''${test#*:}" - echo "$fun = unittest.skip($fun)" >> "tests/tests_$file.py" + echo "import pytest" >> "tests/tests_$file.py" + echo "$fun = pytest.mark.skip($fun)" >> "tests/tests_$file.py" done ''; @@ -57,14 +49,18 @@ buildPythonPackage rec { "libtesseract:TestLineBox.test_japanese" "libtesseract:TestTxt.test_japanese" "libtesseract:TestWordBox.test_japanese" + "libtesseract:TestTxt.test_multi" + "tesseract:TestTxt.test_multi" "tesseract:TestDigitLineBox.test_digits" "tesseract:TestTxt.test_japanese" ]; propagatedBuildInputs = [ pillow six ]; + checkInputs = [ pytest tox ]; + checkPhase = "pytest"; meta = { - homepage = "https://github.com/jflesch/pyocr"; + inherit (src.meta) homepage; description = "A Python wrapper for Tesseract and Cuneiform"; license = lib.licenses.gpl3Plus; }; diff --git a/pkgs/development/python-modules/pyocr/paths.patch b/pkgs/development/python-modules/pyocr/paths.patch index 3fe11598b7d3..9350d4050dad 100644 --- a/pkgs/development/python-modules/pyocr/paths.patch +++ b/pkgs/development/python-modules/pyocr/paths.patch @@ -1,28 +1,28 @@ -diff --git a/src/pyocr/cuneiform.py b/src/pyocr/cuneiform.py -index a461d92..1f2b914 100644 ---- a/src/pyocr/cuneiform.py -+++ b/src/pyocr/cuneiform.py +Index: current/src/pyocr/cuneiform.py +=================================================================== +--- current.orig/src/pyocr/cuneiform.py ++++ current/src/pyocr/cuneiform.py @@ -27,13 +27,9 @@ from . import error from . import util -# CHANGE THIS IF CUNEIFORM IS NOT IN YOUR PATH, OR IS NAMED DIFFERENTLY -CUNEIFORM_CMD = 'cuneiform' -+CUNEIFORM_CMD = '@NIX_CUNEIFORM_CMD@' ++CUNEIFORM_CMD = '@cuneiform@/bin/cuneiform' -CUNEIFORM_DATA_POSSIBLE_PATHS = [ - "/usr/local/share/cuneiform", - "/usr/share/cuneiform", -] -+CUNEIFORM_DATA_POSSIBLE_PATHS = ['@NIX_CUNEIFORM_DATA@'] ++CUNEIFORM_DATA_POSSIBLE_PATHS = ['@cuneiform@/share/cuneiform'] LANGUAGES_LINE_PREFIX = "Supported languages: " LANGUAGES_SPLIT_RE = re.compile("[^a-z]") -diff --git a/src/pyocr/libtesseract/tesseract_raw.py b/src/pyocr/libtesseract/tesseract_raw.py -index b4e7bda..47505f7 100644 ---- a/src/pyocr/libtesseract/tesseract_raw.py -+++ b/src/pyocr/libtesseract/tesseract_raw.py -@@ -1,55 +1,13 @@ +Index: current/src/pyocr/libtesseract/tesseract_raw.py +=================================================================== +--- current.orig/src/pyocr/libtesseract/tesseract_raw.py ++++ current/src/pyocr/libtesseract/tesseract_raw.py +@@ -1,52 +1,13 @@ import ctypes import logging import os @@ -56,7 +56,13 @@ index b4e7bda..47505f7 100644 - # Jflesch> Don't they have the equivalent of LD_LIBRARY_PATH on - # Windows ? - "../vs2010/DLL_Release/libtesseract302.dll", +- # prefer the most recent first +- "libtesseract305.dll", +- "libtesseract304.dll", +- "libtesseract303.dll", - "libtesseract302.dll", +- "libtesseract400.dll", # Tesseract 4 is still in alpha stage +- "libtesseract.dll", - "C:\\Program Files (x86)\\Tesseract-OCR\\libtesseract-4.dll", - "C:\\Program Files (x86)\\Tesseract-OCR\\libtesseract-3.dll", - ] @@ -66,27 +72,18 @@ index b4e7bda..47505f7 100644 - "libtesseract.so.3", - ] - -- --g_libtesseract = None -- --for libname in libnames: -- try: -- g_libtesseract = ctypes.cdll.LoadLibrary(libname) -- break -- except OSError: -- pass -+g_libtesseract = ctypes.cdll.LoadLibrary('@NIX_LIBTESSERACT_PATH@') ++libnames = [ "@tesseract@/lib/libtesseract.so" ] + g_libtesseract = None - class PageSegMode(object): -@@ -326,12 +284,11 @@ def init(lang=None): +@@ -346,12 +307,11 @@ def init(lang=None): try: if lang: lang = lang.encode("utf-8") - prefix = None - if TESSDATA_PREFIX: - prefix = TESSDATA_PREFIX.encode("utf-8") -+ prefix = os.getenv('TESSDATA_PREFIX', '@NIX_TESSDATA_PREFIX@') ++ prefix = os.getenv('TESSDATA_PREFIX', '@tesseract@/share/tessdata') + os.environ['TESSDATA_PREFIX'] = prefix g_libtesseract.TessBaseAPIInit3( ctypes.c_void_p(handle), @@ -95,17 +92,17 @@ index b4e7bda..47505f7 100644 ctypes.c_char_p(lang) ) g_libtesseract.TessBaseAPISetVariable( -diff --git a/src/pyocr/tesseract.py b/src/pyocr/tesseract.py -index c935881..7139ffe 100755 ---- a/src/pyocr/tesseract.py -+++ b/src/pyocr/tesseract.py -@@ -31,8 +31,7 @@ from .builders import DigitBuilder # backward compatibility +Index: current/src/pyocr/tesseract.py +=================================================================== +--- current.orig/src/pyocr/tesseract.py ++++ current/src/pyocr/tesseract.py +@@ -31,8 +31,7 @@ from .builders import DigitBuilder # ba from .error import TesseractError # backward compatibility from .util import digits_only -# CHANGE THIS IF TESSERACT IS NOT IN YOUR PATH, OR IS NAMED DIFFERENTLY -TESSERACT_CMD = 'tesseract.exe' if os.name == 'nt' else 'tesseract' -+TESSERACT_CMD = '@NIX_TESSERACT_CMD@' ++TESSERACT_CMD = '@tesseract@/bin/tesseract' TESSDATA_EXTENSION = ".traineddata" diff --git a/pkgs/development/python-modules/pypillowfight/default.nix b/pkgs/development/python-modules/pypillowfight/default.nix new file mode 100644 index 000000000000..76503122a1b1 --- /dev/null +++ b/pkgs/development/python-modules/pypillowfight/default.nix @@ -0,0 +1,38 @@ +{ stdenv, buildPythonPackage, fetchFromGitLab, nose, pillow +, isPy3k, isPyPy +}: +buildPythonPackage rec { + name = "pypillowfight-${version}"; + version = "0.2.4"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + group = "World"; + owner = "OpenPaperwork"; + repo = "libpillowfight"; + rev = version; + sha256 = "0wbzfhbzim61fmkm7p7f2rwslacla1x00a6xp50haawjh9zfwc4y"; + }; + + prePatch = '' + echo '#define INTERNAL_PILLOWFIGHT_VERSION "${version}"' > src/pillowfight/_version.h + ''; + + # Disable tests because they're designed to only work on Debian: + # https://github.com/jflesch/libpillowfight/issues/2#issuecomment-268259174 + doCheck = false; + + # Python 2.x is not supported, see: + # https://github.com/jflesch/libpillowfight/issues/1 + disabled = !isPy3k && !isPyPy; + + # This is needed by setup.py regardless of whether tests are enabled. + buildInputs = [ nose ]; + propagatedBuildInputs = [ pillow ]; + + meta = with stdenv.lib; { + description = "Library containing various image processing algorithms"; + inherit (src.meta) homepage; + license = licenses.gpl3Plus; + }; +} diff --git a/pkgs/development/python-modules/pystemd/default.nix b/pkgs/development/python-modules/pystemd/default.nix new file mode 100644 index 000000000000..fc269641ecfd --- /dev/null +++ b/pkgs/development/python-modules/pystemd/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, mock, pytest, six, systemd }: + +buildPythonPackage rec { + pname = "pystemd"; + version = "0.5.0"; + src = fetchPypi { + inherit pname version; + sha256 = "000001hxv25vwcsvc0avg42v89c7qcjdpw6dr8419prmcb9186i5"; + }; + + buildInputs = [ systemd ]; + propagatedBuildInputs = [ six ]; + + checkInputs = [ pytest mock ]; + checkPhase = "pytest tests"; + + meta = with stdenv.lib; { + description = "A thin Cython-based wrapper on top of libsystemd, focused on exposing the dbus API via sd-bus in an automated and easy to consume way."; + homepage = https://github.com/facebookincubator/pystemd/; + license = licenses.bsd0; + maintainers = with maintainers; [ flokli ]; + }; +} diff --git a/pkgs/development/tools/alloy/default.nix b/pkgs/development/tools/alloy/default.nix index c965e5a937a4..7ff5633072e1 100644 --- a/pkgs/development/tools/alloy/default.nix +++ b/pkgs/development/tools/alloy/default.nix @@ -1,58 +1,72 @@ -{ stdenv, fetchurl, jre, makeDesktopItem }: +{ stdenv, fetchurl, jre, makeWrapper, makeDesktopItem }: -stdenv.mkDerivation rec { - name = "alloy-${version}"; - version = "4.2_2015-02-22"; +let generic = { major, version, src }: - src = fetchurl { - sha256 = "0p93v8jwx9prijpikkgmfdzb9qn8ljmvga5d9wvrkxddccjx9k28"; - url = "http://alloy.mit.edu/alloy/downloads/alloy${version}.jar"; - }; - - desktopItem = makeDesktopItem rec { - name = "alloy"; - exec = name; - icon = name; - desktopName = "Alloy"; - genericName = "Relational modelling tool"; - comment = meta.description; - categories = "Development;IDE;Education;"; - }; + stdenv.mkDerivation rec { + name = "${nameMajor}-${version}"; + nameMajor = "alloy${major}"; - buildInputs = [ jre ]; + desktopItem = makeDesktopItem rec { + name = "${nameMajor}"; + exec = name; + icon = name; + desktopName = "Alloy ${major}"; + genericName = "Relational modelling tool"; + comment = meta.description; + categories = "Development;IDE;Education;"; + }; - phases = [ "installPhase" ]; + nativeBuildInputs = [ makeWrapper ]; - installPhase = '' - jar=$out/share/alloy/alloy${version}.jar + buildCommand = '' + jar=$out/share/alloy/${nameMajor}.jar + install -Dm644 ${src} $jar - install -Dm644 ${src} $jar + mkdir -p $out/bin + makeWrapper ${jre}/bin/java $out/bin/${nameMajor} --add-flags \ + "-jar $jar" - cat << EOF > alloy - #!${stdenv.shell} - exec ${jre}/bin/java -jar $jar "\''${@}" - EOF + install -Dm644 ${./icon.png} $out/share/pixmaps/${nameMajor}.png + cp -r ${desktopItem}/share/applications $out/share + ''; - install -Dm755 alloy $out/bin/alloy + meta = with stdenv.lib; { + description = "Language & tool for relational models"; + longDescription = '' + Alloy is a language for describing structures and a tool for exploring + them. An Alloy model is a collection of constraints that describes a set + of structures, e.g. all the possible security configurations of a web + application, or all the possible topologies of a switching network. The + Alloy Analyzer is a solver that takes the constraints of a model and + finds structures that satisfy them. Structures are displayed graphically, + and their appearance can be customized for the domain at hand. + ''; + homepage = http://alloytools.org/; + downloadPage = http://alloytools.org/download.html; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ aminb ]; + }; + }; - install -Dm644 ${./icon.png} $out/share/pixmaps/alloy.png - cp -r ${desktopItem}/share/applications $out/share - ''; +in rec { + alloy4 = let version = "4.2_2015-02-22"; in generic { + major = "4"; + inherit version; + src = fetchurl { + sha256 = "0p93v8jwx9prijpikkgmfdzb9qn8ljmvga5d9wvrkxddccjx9k28"; + url = "http://alloytools.org/download/alloy${version}.jar"; + }; + }; - meta = with stdenv.lib; { - description = "Language & tool for relational models"; - longDescription = '' - Alloy is a language for describing structures and a tool for exploring - them. An Alloy model is a collection of constraints that describes a set - of structures, e.g. all the possible security configurations of a web - application, or all the possible topologies of a switching network. The - Alloy Analyzer is a solver that takes the constraints of a model and - finds structures that satisfy them. Structures are displayed graphically, - and their appearance can be customized for the domain at hand. - ''; - homepage = http://alloy.mit.edu/; - downloadPage = http://alloy.mit.edu/alloy/download.html; - license = licenses.mit; - platforms = platforms.linux; + alloy5 = let version = "5.0.0.1"; in generic { + major = "5"; + inherit version; + src = fetchurl { + sha256 = "0kz6i9av9ksjk62lx0dxx8xr542iqvbqd14m1f9h8xpf72c25xw4"; + url = "https://github.com/AlloyTools/org.alloytools.alloy/releases/download/v${version}/Alloy-${version}.jar"; + }; }; + + alloy = alloy4; } diff --git a/pkgs/development/tools/analysis/include-what-you-use/default.nix b/pkgs/development/tools/analysis/include-what-you-use/default.nix index 9aac638d0a80..4222f72248a8 100644 --- a/pkgs/development/tools/analysis/include-what-you-use/default.nix +++ b/pkgs/development/tools/analysis/include-what-you-use/default.nix @@ -1,22 +1,27 @@ -{ stdenv, fetchurl, cmake, llvmPackages }: +{ stdenv, fetchurl, cmake, llvmPackages, python2 }: stdenv.mkDerivation rec { name = "include-what-you-use-${version}"; # Also bump llvmPackages in all-packages.nix to the supported version! - version = "0.8"; + version = "0.10"; src = fetchurl { - sha256 = "0r6n5gqicl0f9c8jrphq40kc2cis952gmnkm3643m3jwad0mn33d"; + sha256 = "16alan9rwbhpyfxmlpc7gbfnbqd877wdqrkvgqrjb1jlqkzpg55s"; url = "${meta.homepage}/downloads/${name}.src.tar.gz"; }; - buildInputs = with llvmPackages; [ clang-unwrapped llvm ]; + buildInputs = with llvmPackages; [ clang-unwrapped llvm python2 ]; nativeBuildInputs = [ cmake ]; cmakeFlags = [ "-DIWYU_LLVM_ROOT_PATH=${llvmPackages.clang-unwrapped}" ]; enableParallelBuilding = true; + postInstall = '' + substituteInPlace $out/bin/iwyu_tool.py \ + --replace "['include-what-you-use']" "['$out/bin/include-what-you-use']" + ''; + meta = with stdenv.lib; { description = "Analyze #includes in C/C++ source files with clang"; longDescription = '' diff --git a/pkgs/development/tools/apktool/default.nix b/pkgs/development/tools/apktool/default.nix index 91caf0348a4e..42deae45a25d 100644 --- a/pkgs/development/tools/apktool/default.nix +++ b/pkgs/development/tools/apktool/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "apktool-${version}"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { urls = [ "https://bitbucket.org/iBotPeaches/apktool/downloads/apktool_${version}.jar" "https://github.com/iBotPeaches/Apktool/releases/download/v${version}/apktool_${version}.jar" ]; - sha256 = "1wjpn1wxg8fid2mch5ili35xqvasa3pk8h1xaiygw5idpxh3cm0f"; + sha256 = "07fwp5sczyivdz37ag9fa258gr9jbz3k3395hp5db7cwizaip2vm"; }; phases = [ "installPhase" ]; diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix index d8ba99fbf1a8..81dbc54cece0 100644 --- a/pkgs/development/tools/continuous-integration/drone/default.nix +++ b/pkgs/development/tools/continuous-integration/drone/default.nix @@ -2,8 +2,8 @@ buildGoPackage rec { name = "drone.io-${version}"; - version = "0.8.5-20180329-${stdenv.lib.strings.substring 0 7 revision}"; - revision = "81103a98208b0bfc76be5b07194f359fbc80183b"; + version = "0.8.6-20180727-${stdenv.lib.strings.substring 0 7 revision}"; + revision = "c48150767c2700d35dcc29b110a81c8b5969175e"; goPackagePath = "github.com/drone/drone"; # These dependencies pulled (in `drone` buildprocess) via Makefile, @@ -16,7 +16,7 @@ buildGoPackage rec { owner = "drone"; repo = "drone"; rev = revision; - sha256 = "1890bwhxr62adv261v4kn1azhq7qvcj2zpll68i9nsvjib8a52bq"; + sha256 = "0miq2012nivvr1ysi3aa2xrr5ak3mf0l3drybyc83iycy0kp4bda"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/development/tools/delve/default.nix index b101e52aad9c..6ddc778c95c4 100644 --- a/pkgs/development/tools/delve/default.nix +++ b/pkgs/development/tools/delve/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "delve-${version}"; - version = "1.0.0"; + version = "1.1.0"; goPackagePath = "github.com/derekparker/delve"; excludedPackages = "\\(_fixtures\\|scripts\\|service/test\\)"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "derekparker"; repo = "delve"; rev = "v${version}"; - sha256 = "08hsairhrifh41d288jhc65zbhs9k0hs738dbdzsbcvlmycrhvgx"; + sha256 = "0gpsd9hb7r65rn4ml9jzsmy72b8j0id6wik2l48ghzkwjm72rsdz"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/easyjson/default.nix b/pkgs/development/tools/easyjson/default.nix index 3ae172213639..ed650f37698a 100644 --- a/pkgs/development/tools/easyjson/default.nix +++ b/pkgs/development/tools/easyjson/default.nix @@ -2,15 +2,15 @@ buildGoPackage rec { name = "easyjson-unstable-${version}"; - version = "2018-07-30"; + version = "2018-08-23"; goPackagePath = "github.com/mailru/easyjson"; goDeps = ./deps.nix; src = fetchFromGitHub { owner = "mailru"; repo = "easyjson"; - rev = "03f2033d19d5860aef995fe360ac7d395cd8ce65"; - sha256 = "0r62ym6m1ijby7nwplq0gdnhak8in63njyisrwhr3xpx9vkira97"; + rev = "60711f1a8329503b04e1c88535f419d0bb440bff"; + sha256 = "0234jp6134wkihdpdwq1hvzqblgl5khc1wp6dyi2h0hgh88bhdk1"; }; enableParallelBuilding = true; diff --git a/pkgs/development/tools/gauge/default.nix b/pkgs/development/tools/gauge/default.nix index f4f7af0e084a..983df980a591 100644 --- a/pkgs/development/tools/gauge/default.nix +++ b/pkgs/development/tools/gauge/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "gauge-${version}"; - version = "1.0.0"; + version = "1.0.2"; goPackagePath = "github.com/getgauge/gauge"; excludedPackages = ''\(build\|man\)''; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "getgauge"; repo = "gauge"; rev = "v${version}"; - sha256 = "1dnlqnpzqsikpxy2mndrmxpcsj4r1zcjmv8px1idzblp117vsnw1"; + sha256 = "0cnhkxfw78i4lgkbrk87hgrjh98f0z6a97g77c9av20z4962hmfy"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/go-symbols/default.nix b/pkgs/development/tools/go-symbols/default.nix index 38ceea7d417b..07cd267b0e9e 100644 --- a/pkgs/development/tools/go-symbols/default.nix +++ b/pkgs/development/tools/go-symbols/default.nix @@ -1,17 +1,18 @@ -{ stdenv, buildGoPackage, fetchgit }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "go-symbols-${version}"; - version = "unstable-2017-02-06"; - rev = "5a7f75904fb552189036c640d04cd6afef664836"; + version = "unstable-2018-05-23"; + rev = "953befd75e223f514580fcb698aead0dd6ad3421"; goPackagePath = "github.com/acroca/go-symbols"; goDeps = ./deps.nix; - src = fetchgit { + src = fetchFromGitHub { inherit rev; - url = "https://github.com/acroca/go-symbols"; - sha256 = "0qh2jjhwwk48gi8yii0z031bah11anxfz81nwflsiww7n426a8bb"; + owner = "acroca"; + repo = "go-symbols"; + sha256 = "0dwf7w3zypv5brk68n7siakz222jwnhrhkzvwk1iwdffk79gqp3x"; }; meta = { diff --git a/pkgs/development/tools/gomodifytags/default.nix b/pkgs/development/tools/gomodifytags/default.nix index 86b7246b4113..112e1769f212 100644 --- a/pkgs/development/tools/gomodifytags/default.nix +++ b/pkgs/development/tools/gomodifytags/default.nix @@ -1,16 +1,17 @@ -{ stdenv, buildGoPackage, fetchgit }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "gomodifytags-${version}"; - version = "unstable-2017-12-14"; - rev = "20644152db4fe0ac406d81f3848e8a15f0cdeefa"; + name = "gomodifytags-unstable-${version}"; + version = "2018-09-14"; + rev = "141225bf62b6e5c9c0c9554a2e993e8c30aebb1d"; goPackagePath = "github.com/fatih/gomodifytags"; - src = fetchgit { + src = fetchFromGitHub { inherit rev; - url = "https://github.com/fatih/gomodifytags"; - sha256 = "0k0ly3mmm9zcaxwlzdbvdxr2gn7kvcqzk1bb7blgq7fkkzpp7i1q"; + owner = "fatih"; + repo = "gomodifytags"; + sha256 = "16qbp594l90qpvf388wlv0kf6wvqj1vz2mqq0g3qcz6dkrc4cjqa"; }; meta = { diff --git a/pkgs/development/tools/gopkgs/default.nix b/pkgs/development/tools/gopkgs/default.nix index ea9c92c0d0a1..89a1da772701 100644 --- a/pkgs/development/tools/gopkgs/default.nix +++ b/pkgs/development/tools/gopkgs/default.nix @@ -2,17 +2,16 @@ buildGoPackage rec { name = "gopkgs-${version}"; - version = "unstable-2017-12-29"; - rev = "b2ea2ecd37740e6ce0e020317d90c729aab4dc6d"; + version = "2.0.1"; goPackagePath = "github.com/uudashr/gopkgs"; goDeps = ./deps.nix; src = fetchFromGitHub { - inherit rev; + rev = "v${version}"; owner = "uudashr"; repo = "gopkgs"; - sha256 = "1hwzxrf2h8xjbbx6l86mjpjh4csxxsy17zkh8h3qzncyfnsnczzg"; + sha256 = "03zfwkmzwx2knkghky3irb2r78lbc1ccszjcg9y445b4pbqkn6w4"; }; meta = { diff --git a/pkgs/development/tools/gopkgs/deps.nix b/pkgs/development/tools/gopkgs/deps.nix index 0f72ee3e5e0f..715c7bbbc824 100644 --- a/pkgs/development/tools/gopkgs/deps.nix +++ b/pkgs/development/tools/gopkgs/deps.nix @@ -1,11 +1,21 @@ +# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) [ { - goPackagePath = "github.com/MichaelTJones/walk"; + goPackagePath = "github.com/karrick/godirwalk"; fetch = { type = "git"; - url = "https://github.com/MichaelTJones/walk"; - rev = "4748e29d5718c2df4028a6543edf86fd8cc0f881"; - sha256 = "03bc3cql3w8cx05xlnzxsff59c6679rcpx4njzk86k00blkkizv7"; + url = "https://github.com/karrick/godirwalk"; + rev = "5cc8b3875be6c21825a1b54d3029ed415c93c4f7"; + sha256 = "02nlyr0sa0lj1f27fsrxlspcsrx7fs60qwr33l5r6yq52axcikcd"; }; } -] + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "645ef00459ed84a119197bfb8d8205042c6df63d"; + sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; + }; + } +] \ No newline at end of file diff --git a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix index 1403194925d3..2d1ce7f8758c 100644 --- a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix +++ b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix @@ -9,8 +9,8 @@ mkDerivation { src = fetchFromGitHub { owner = "haskell-CI"; repo = "haskell-ci"; - rev = "f67bc41621d40d6559684be5406d65409df4c480"; - sha256 = "1r79dbgjq97h30xa3xhf75l0bivag8an9ag00mgzgpglvgc96czm"; + rev = "18a7f5edcde360cea0740ff143eff1113ecda7d2"; + sha256 = "00gxpxb5n1a1v562fd4cg1j92vwmd2zp00c2j60piyl8ppxxa115"; }; isLibrary = true; isExecutable = true; diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix index 4f9512b22137..ce297df13c3a 100644 --- a/pkgs/development/tools/kustomize/default.nix +++ b/pkgs/development/tools/kustomize/default.nix @@ -3,12 +3,21 @@ buildGoPackage rec { name = "kustomize-${version}"; - version = "1.0.4"; + version = "1.0.8"; + # rev is the 1.0.8 commit, mainly for kustomize version command output + rev = "58492e2d83c59ed63881311f46ad6251f77dabc3"; - goPackagePath = "github.com/kubernetes-sigs/kustomize"; + goPackagePath = "sigs.k8s.io/kustomize"; + + buildFlagsArray = let t = "${goPackagePath}/pkg/commands"; in '' + -ldflags= + -s -X ${t}.kustomizeVersion=${version} + -X ${t}.gitCommit=${rev} + -X ${t}.buildDate=unknow + ''; src = fetchFromGitHub { - sha256 = "0lbf94wz34axaf8ps7h79qbj4dpihrpvnqa12zrawcmmgqallwhm"; + sha256 = "0y6dqwhm7lczjy0zk2fnc1i43lvnjhcvihvm7qknky05z9f0v8bx"; rev = "v${version}"; repo = "kustomize"; owner = "kubernetes-sigs"; @@ -23,6 +32,6 @@ buildGoPackage rec { ''; homepage = https://github.com/kubernetes-sigs/kustomize; license = licenses.asl20; - maintainers = [ maintainers.carlosdagos ]; + maintainers = [ maintainers.carlosdagos maintainers.vdemeester ]; }; } diff --git a/pkgs/development/tools/libsigrokdecode/default.nix b/pkgs/development/tools/libsigrokdecode/default.nix index 9fd70cb60c96..097f0f105447 100644 --- a/pkgs/development/tools/libsigrokdecode/default.nix +++ b/pkgs/development/tools/libsigrokdecode/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, python3, libsigrok, check }: stdenv.mkDerivation rec { - name = "libsigrokdecode-0.5.1"; + name = "libsigrokdecode-0.5.2"; src = fetchurl { url = "https://sigrok.org/download/source/libsigrokdecode/${name}.tar.gz"; - sha256 = "07mmb6s62ncqqgsc6szilj2yxixf6gg99ggbzsjlbhp4b9aqnga9"; + sha256 = "1w434nl1syjkvwl08lji3r9sr60lbxp1nqys8hqwzv2lgiwrx3g0"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix index 15b8f82d0ab2..f6ff4ad3650d 100644 --- a/pkgs/development/tools/misc/arcanist/default.nix +++ b/pkgs/development/tools/misc/arcanist/default.nix @@ -4,19 +4,19 @@ let libphutil = fetchFromGitHub { owner = "phacility"; repo = "libphutil"; - rev = "01b33af6f4d570b34ad791cd5ccaa3ea7f77dcb9"; - sha256 = "0glrxlj4cr2821pdc2yy2m5bss4yr1zx3sdgw3r5d8hbfz361nx7"; + rev = "3215e4e291ed4468faeed4542d47a571b5bc559a"; + sha256 = "0bbinaxny0j4iniz2grf0s9cysbl3x24yc32f3jra9mwsgh2v2zj"; }; arcanist = fetchFromGitHub { owner = "phacility"; repo = "arcanist"; - rev = "3b6b523c2b236e3724a1e115f126cb6fd05fa128"; - sha256 = "1pr2izwj446rf2v6x6v2wsj7iwnaxq3xg3qqipybyf1xpqfmh5q8"; + rev = "2650e8627a20e1bfe334a4a2b787f44ef5d6ebc5"; + sha256 = "0x0xxiar202ypbgxh19swzjil546bbp8li4k5yrpvab55y8ymkd4"; }; in stdenv.mkDerivation rec { name = "arcanist-${version}"; - version = "20170323"; + version = "20180916"; src = [ arcanist libphutil ]; buildInputs = [ php makeWrapper flex ]; diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/development/tools/misc/lttng-tools/default.nix index 6be23c171a6a..e016882c8ef5 100644 --- a/pkgs/development/tools/misc/lttng-tools/default.nix +++ b/pkgs/development/tools/misc/lttng-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "lttng-tools-${version}"; - version = "2.10.4"; + version = "2.10.5"; src = fetchurl { url = "https://lttng.org/files/lttng-tools/${name}.tar.bz2"; - sha256 = "1p3y7p8m5i5f8qvsib4da2m41rkw7pamvsngplh7wspgvg0zxvay"; + sha256 = "04bll20lqb76xi6hcjrlankvyqc1hkyj8kvc4gf867lnxxw811m4"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/misc/patchelf/default.nix b/pkgs/development/tools/misc/patchelf/default.nix index df24f6003d7f..77d03f299f4a 100644 --- a/pkgs/development/tools/misc/patchelf/default.nix +++ b/pkgs/development/tools/misc/patchelf/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { doCheck = false; # fails 8 out of 24 tests, problems when loading libc.so.6 - meta = { + meta = with stdenv.lib; { homepage = https://nixos.org/patchelf.html; - license = "GPL"; + license = licenses.gpl3; description = "A small utility to modify the dynamic linker and RPATH of ELF executables"; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.all; + maintainers = [ maintainers.eelco ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix index de68a4066d7d..0c5ec6404260 100644 --- a/pkgs/development/tools/misc/patchelf/unstable.nix +++ b/pkgs/development/tools/misc/patchelf/unstable.nix @@ -1,19 +1,24 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "patchelf-0.10-pre-20180108"; + name = "patchelf-${version}"; + version = "0.10-pre-20180509"; src = fetchFromGitHub { owner = "NixOS"; repo = "patchelf"; - rev = "48452cf6b4ccba1c1f47a09f4284a253634ab7d1"; - sha256 = "1f1s8q3as3nrhcc1a8qc2z7imm644jfz44msn9sfv4mdynp2m2yb"; + rev = "27ffe8ae871e7a186018d66020ef3f6162c12c69"; + sha256 = "1sfkqsvwqqm2kdgkiddrxni86ilbrdw5my29szz81nj1m2j16asr"; }; # Drop test that fails on musl (?) postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' substituteInPlace tests/Makefile.am \ --replace "set-rpath-library.sh" "" + '' + + # extend version identifier to more informative than "0.10". + '' + echo -n ${version} > version ''; setupHook = [ ./setup-hook.sh ]; @@ -21,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ ]; - doCheck = true; + doCheck = !stdenv.isDarwin; meta = { homepage = https://nixos.org/patchelf.html; diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix index bd0c7f5002c3..04cbdb6f5748 100644 --- a/pkgs/development/tools/nwjs/default.nix +++ b/pkgs/development/tools/nwjs/default.nix @@ -30,12 +30,12 @@ let in stdenv.mkDerivation rec { name = "nwjs-${version}"; - version = "0.32.2"; + version = "0.32.4"; src = fetchurl { url = "https://dl.nwjs.io/v${version}/nwjs-v${version}-linux-${bits}.tar.gz"; sha256 = if bits == "x64" then - "0f0p17mbr24zhzm2cf77ddy6yj4k0k181dzf4gxdf8szd5vxpliy" else + "0hzyiy6sbbjll1b946y3v7bv6sav3rhy4c48d4vcvamyv9pkfn45" else "0a3b712abfa0c3e7e808b1d08ea5d53375a71060e7d144fdcb58c4fe88fa2250"; }; diff --git a/pkgs/development/tools/ocaml/dune/default.nix b/pkgs/development/tools/ocaml/dune/default.nix index 857d6ff1b7c2..41e0084b28ff 100644 --- a/pkgs/development/tools/ocaml/dune/default.nix +++ b/pkgs/development/tools/ocaml/dune/default.nix @@ -1,26 +1,26 @@ -{ stdenv, fetchFromGitHub, ocamlPackages, opaline }: +{ stdenv, fetchurl, ocamlPackages, opaline }: stdenv.mkDerivation rec { name = "dune-${version}"; - version = "1.2.1"; - src = fetchFromGitHub { - owner = "ocaml"; - repo = "dune"; - rev = "${version}"; - sha256 = "14m5zg1b6d0y03c5qsmqmwiwz2h0iys02rlgn6kzm519ck679bkq"; + version = "1.3.0"; + src = fetchurl { + url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; + sha256 = "15bzakiclipsyjgcfrj83xdpwwww3aaijyw01bn5cx96cmcqyjad"; }; buildInputs = with ocamlPackages; [ ocaml findlib ]; + buildFlags = "release"; + dontAddPrefix = true; installPhase = "${opaline}/bin/opaline -prefix $out -libdir $OCAMLFIND_DESTDIR"; meta = { - inherit (src.meta) homepage; - description = "Fast, portable and opinionated build system"; + homepage = "https://github.com/ocaml/dune"; + description = "A composable build system"; maintainers = [ stdenv.lib.maintainers.vbgl ]; - license = stdenv.lib.licenses.asl20; + license = stdenv.lib.licenses.mit; inherit (ocamlPackages.ocaml.meta) platforms; }; } diff --git a/pkgs/development/tools/quicktemplate/default.nix b/pkgs/development/tools/quicktemplate/default.nix index e66500ac8339..147883afd428 100644 --- a/pkgs/development/tools/quicktemplate/default.nix +++ b/pkgs/development/tools/quicktemplate/default.nix @@ -2,15 +2,15 @@ buildGoPackage rec { name = "quicktemplate-unstable-${version}"; - version = "2018-04-30"; + version = "2018-09-06"; goPackagePath = "github.com/valyala/quicktemplate"; goDeps = ./deps.nix; src = fetchFromGitHub { owner = "valyala"; repo = "quicktemplate"; - rev = "a91e0946457b6583004fbfc159339b8171423aed"; - sha256 = "1z89ang5pkq5qs5b2nwhzyrw0zjlsas539l9kix374fhka49n8yc"; + rev = "dc50ff9977a68a543145ce34e0e0030bebcc89be"; + sha256 = "1980q2c5w4jhrlhf1pimc8yrkz005x3jbsi7hk4hnx6d5iy5lmb6"; }; enableParallelBuilding = true; diff --git a/pkgs/development/tools/quicktemplate/deps.nix b/pkgs/development/tools/quicktemplate/deps.nix index 11a65c415c69..6064f7646818 100644 --- a/pkgs/development/tools/quicktemplate/deps.nix +++ b/pkgs/development/tools/quicktemplate/deps.nix @@ -5,8 +5,8 @@ fetch = { type = "git"; url = "https://github.com/valyala/bytebufferpool"; - rev = "e746df99fe4a3986f4d4f79e13c1e0117ce9c2f7"; - sha256 = "01lqzjddq6kz9v41nkky7wbgk7f1cw036sa7ldz10d82g5klzl93"; + rev = "cdfbe9377474227bb42120c1e22fd4433e7f69bf"; + sha256 = "0c6cixd85dvl2gvs7sdh0k2wm8r3grl4fw0jg4w7d78cp8s2k7ag"; }; } ] diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix index 68df0af6ee46..0463ab3ba0af 100644 --- a/pkgs/development/tools/rust/bindgen/default.nix +++ b/pkgs/development/tools/rust/bindgen/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, fetchpatch, rustPlatform, clang, llvmPackages, rustfmt, writeScriptBin }: +{ stdenv, fetchFromGitHub, rustPlatform, clang, llvmPackages, rustfmt, writeScriptBin }: rustPlatform.buildRustPackage rec { name = "rust-bindgen-${version}"; - version = "0.37.0"; + version = "0.40.0"; src = fetchFromGitHub { owner = "rust-lang-nursery"; repo = "rust-bindgen"; rev = "v${version}"; - sha256 = "0cqjr7qspjrfgqcp4nqxljmhhbqyijb2jpw3lajgjj48y6wrnw93"; + sha256 = "0d7jqgi3aadwqcxiaz7axsq9h6n2i42yd3q0p1hc5l0kcdwwbj5k"; }; - cargoSha256 = "0b8v6c7q1abibzygrigldpd31lyd5ngmj4vq5d7zni96m20mm85w"; + cargoSha256 = "1rjyazhnk9xihqw1qzkkcrab627lqbj789g5d5nb8bn2hkbdx5d6"; libclang = llvmPackages.libclang.lib; #for substituteAll @@ -19,14 +19,6 @@ rustPlatform.buildRustPackage rec { propagatedBuildInputs = [ clang ]; # to populate NIX_CXXSTDLIB_COMPILE - patches = [ - # https://github.com/rust-lang-nursery/rust-bindgen/pull/1376 - (fetchpatch { - url = https://github.com/rust-lang-nursery/rust-bindgen/commit/c8b5406f08af82a92bf8faf852c21ba941d9c176.patch; - sha256 = "16ibr2rplh0qz8rsq6gir45xlz5nasad4y8fprwhrb7ssv8wfkss"; - }) - ]; - configurePhase = '' export LIBCLANG_PATH="${libclang}/lib" ''; diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index abbd2a9116ca..b19bd67c307f 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -6,7 +6,7 @@ let allSpecs = { "x86_64-linux" = { system = "linux64"; - sha256 = "1iwmdkkxfmmiqzvj2bjh98db6j6zfb8s2m5kq15wmnq0g44gxski"; + sha256 = "10phyz7ffzzx5ysbpyidssvwjdrcyszxf3lnba8qsrcajzm21nff"; }; "x86_64-darwin" = { @@ -28,7 +28,7 @@ let in stdenv.mkDerivation rec { name = "chromedriver-${version}"; - version = "2.41"; + version = "2.42"; src = fetchurl { url = "https://chromedriver.storage.googleapis.com/${version}/chromedriver_${spec.system}.zip"; diff --git a/pkgs/development/tools/uftrace/default.nix b/pkgs/development/tools/uftrace/default.nix new file mode 100644 index 000000000000..fa57ce9df21f --- /dev/null +++ b/pkgs/development/tools/uftrace/default.nix @@ -0,0 +1,26 @@ +{stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "uftrace-${version}"; + version = "0.9"; + + src = fetchFromGitHub { + owner = "namhyung"; + repo = "uftrace"; + rev = "f0fed0b24a9727ffed04673b62f66baad21a1f99"; + sha256 = "0rn2xwd87qy5ihn5zq9pwq8cs1vfmcqqz0wl70wskkgp2ccsd9x8"; + }; + + postUnpack = '' + patchShebangs . + ''; + + meta = { + description = "Function (graph) tracer for user-space"; + homepage = https://github.com/namhyung/uftrace; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + maintainers = [stdenv.lib.maintainers.nthorne]; + }; +} + diff --git a/pkgs/development/tools/vndr/default.nix b/pkgs/development/tools/vndr/default.nix index 0fbcd7b71a60..42cf6f07f4d0 100644 --- a/pkgs/development/tools/vndr/default.nix +++ b/pkgs/development/tools/vndr/default.nix @@ -1,9 +1,9 @@ { lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "vndr-${version}"; - version = "20171005-${lib.strings.substring 0 7 rev}"; - rev = "b57c5799efd5ed743f347a025482babf01ba963e"; + name = "vndr-unstable-${version}"; + version = "2018-06-23"; + rev = "81cb8916aad3c8d06193f008dba3e16f82851f52"; goPackagePath = "github.com/LK4D4/vndr"; excludedPackages = "test"; @@ -12,7 +12,7 @@ buildGoPackage rec { inherit rev; owner = "LK4D4"; repo = "vndr"; - sha256 = "15mmy4a06jgzvlbjbmd89f0xx695x8wg7jqi76kiz495i6figk2v"; + sha256 = "0c0k0cic35d1141az72gbf8r0vm9zaq4xi8v1sqpxhlzf28m297l"; }; meta = { diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix index dae90569a90b..69545a764c52 100644 --- a/pkgs/development/tools/yarn/default.nix +++ b/pkgs/development/tools/yarn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "yarn-${version}"; - version = "1.9.4"; + version = "1.10.1"; src = fetchzip { url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz"; - sha256 = "0lxncqvz66167ijhsi76ds2yp8140d9ywn89y5vm92010irsgs20"; + sha256 = "0j9y53k0wxgwjvvpbs6rr4nbydg3bn4khcxsrnzyrakym0ihgmr1"; }; buildInputs = [ nodejs ]; diff --git a/pkgs/development/web/nodejs/v10.nix b/pkgs/development/web/nodejs/v10.nix index ee88b2313662..784c59c7c1e1 100644 --- a/pkgs/development/web/nodejs/v10.nix +++ b/pkgs/development/web/nodejs/v10.nix @@ -5,6 +5,6 @@ let in buildNodejs { inherit enableNpm; - version = "10.9.0"; - sha256 = "00hdachbmcf9pyd1iksprsi5mddwp6z59mb3lr81z8ynfbmzhzni"; + version = "10.11.0"; + sha256 = "16wfgwnb2yd6y608svj2fizdq3sid44m0wqn4swkvclxb71444mr"; } diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix index b444f5b0be0f..b2015a28947a 100644 --- a/pkgs/games/crawl/default.nix +++ b/pkgs/games/crawl/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "crawl-${version}${lib.optionalString tileMode "-tiles"}"; - version = "0.22.0"; + version = "0.22.1"; src = fetchFromGitHub { owner = "crawl-ref"; repo = "crawl-ref"; rev = version; - sha256 = "1bzhqrc944rgpdnnid3c5h2r3dvyw70cs70hazzm0cv5aipdkhbl"; + sha256 = "19yzl241glv2zazifgz59bw3jlh4hj59xx5w002hnh9rp1w15rnr"; }; # Patch hard-coded paths in the makefile diff --git a/pkgs/games/empty-epsilon/default.nix b/pkgs/games/empty-epsilon/default.nix index bf3b16dc9a40..fcefc5989b0e 100644 --- a/pkgs/games/empty-epsilon/default.nix +++ b/pkgs/games/empty-epsilon/default.nix @@ -2,7 +2,11 @@ let - version = "2018.02.15"; + major = "2018"; + minor = "02"; + patch = "15"; + + version = "${major}.${minor}.${patch}"; serious-proton = stdenv.mkDerivation rec { name = "serious-proton-${version}"; @@ -46,6 +50,10 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DSERIOUS_PROTON_DIR=${serious-proton.src}" + "-DCPACK_PACKAGE_VERSION=${version}" + "-DCPACK_PACKAGE_VERSION_MAJOR=${major}" + "-DCPACK_PACKAGE_VERSION_MINOR=${minor}" + "-DCPACK_PACKAGE_VERSION_PATCH=${patch}" ]; meta = with lib; { diff --git a/pkgs/games/freedroidrpg/default.nix b/pkgs/games/freedroidrpg/default.nix index 875af8e06642..2ebb60f3d5db 100644 --- a/pkgs/games/freedroidrpg/default.nix +++ b/pkgs/games/freedroidrpg/default.nix @@ -58,5 +58,6 @@ in stdenv.mkDerivation rec { maintainers = with maintainers; [ jtojnar ]; platforms = platforms.unix; + hydraPlatforms = platforms.linux; # sdl-config times out on darwin }; } diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix index 3720c109ced7..0f95fa9aaf7f 100644 --- a/pkgs/games/gzdoom/default.nix +++ b/pkgs/games/gzdoom/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "gzdoom-${version}"; - version = "3.5.0"; + version = "3.5.1"; src = fetchFromGitHub { owner = "coelckers"; repo = "gzdoom"; rev = "g${version}"; - sha256 = "04wdcm7jky8bm01ndx46q3pq7ma6npjwmp204gxidmdwjhn0bfyp"; + sha256 = "109qmjkafr1xghpn0k1a8a0zgladc8r6hyw99v8r51ryjf5qf9sd"; }; nativeBuildInputs = [ cmake makeWrapper ]; diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix index 2a39e3499ed9..56904ae2dfe1 100644 --- a/pkgs/games/nethack/default.nix +++ b/pkgs/games/nethack/default.nix @@ -1,6 +1,7 @@ { stdenv, lib, fetchurl, coreutils, ncurses, gzip, flex, bison , less, makeWrapper -, x11Mode ? false, qtMode ? false, libXaw, libXext, mkfontdir, pkgconfig, qt5 +, buildPackages +, x11Mode ? false, qtMode ? false, libXaw, libXext, bdftopcf, mkfontdir, pkgconfig, qt5 }: let @@ -33,10 +34,11 @@ in stdenv.mkDerivation rec { ++ lib.optionals qtMode [ gzip qt5.qtbase.bin qt5.qtmultimedia.bin ]; nativeBuildInputs = [ flex bison ] - ++ lib.optionals x11Mode [ mkfontdir ] + ++ lib.optionals x11Mode [ mkfontdir bdftopcf ] ++ lib.optionals qtMode [ pkgconfig mkfontdir qt5.qtbase.dev qt5.qtmultimedia.dev makeWrapper + bdftopcf ]; makeFlags = [ "PREFIX=$(out)" ]; @@ -64,12 +66,24 @@ in stdenv.mkDerivation rec { -e 's,^CFLAGS=-g,CFLAGS=,' \ -i sys/unix/hints/macosx10.10 sed -e '/define CHDIR/d' -i include/config.h + ${lib.optionalString qtMode '' sed \ -e 's,^QTDIR *=.*,QTDIR=${qt5.qtbase.dev},' \ -e 's,CFLAGS.*QtGui.*,CFLAGS += `pkg-config Qt5Gui --cflags`,' \ -e 's,CFLAGS+=-DCOMPRESS.*,CFLAGS+=-DCOMPRESS=\\"${gzip}/bin/gzip\\" \\\ -DCOMPRESS_EXTENSION=\\".gz\\",' \ -i sys/unix/hints/linux-qt4 + ''} + ${lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) + # If we're cross-compiling, replace the paths to the data generation tools + # with the ones from the build platform's nethack package, since we can't + # run the ones we've built here. + '' + ${buildPackages.perl}/bin/perl -p \ + -e 's,[a-z./]+/(makedefs|dgn_comp|lev_comp|dlb)(?!\.),${buildPackages.nethack}/libexec/nethack/\1,g' \ + -i sys/unix/Makefile.* + ''} + sed -i -e '/rm -f $(MAKEDEFS)/d' sys/unix/Makefile.src ''; configurePhase = '' @@ -80,6 +94,8 @@ in stdenv.mkDerivation rec { popd ''; + enableParallelBuilding = true; + postInstall = '' mkdir -p $out/games/lib/nethackuserdir for i in xlogfile logfile perm record save; do @@ -116,6 +132,8 @@ in stdenv.mkDerivation rec { chmod +x $out/bin/nethack ${lib.optionalString x11Mode "mv $out/bin/nethack $out/bin/nethack-x11"} ${lib.optionalString qtMode "mv $out/bin/nethack $out/bin/nethack-qt"} + install -Dm 555 util/{makedefs,dgn_comp,lev_comp} -t $out/libexec/nethack/ + ${lib.optionalString (!(x11Mode || qtMode)) "install -Dm 555 util/dlb -t $out/libexec/nethack/"} ''; postFixup = lib.optionalString qtMode '' diff --git a/pkgs/games/openarena/default.nix b/pkgs/games/openarena/default.nix index 19e608f393a1..d5592e4f7404 100644 --- a/pkgs/games/openarena/default.nix +++ b/pkgs/games/openarena/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0jmc1cmdz1rcvqc9ilzib1kilpwap6v0d331l6q53wsibdzsz3ss"; }; - buildInputs = [ pkgs.unzip patchelf makeWrapper]; + nativeBuildInputs = [ pkgs.unzip patchelf makeWrapper]; installPhase = let gameDir = "$out/openarena-$version"; diff --git a/pkgs/games/planetaryannihilation/default.nix b/pkgs/games/planetaryannihilation/default.nix index 95674822aa36..391ced362075 100644 --- a/pkgs/games/planetaryannihilation/default.nix +++ b/pkgs/games/planetaryannihilation/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { inherit (config.planetary_annihilation) url sha256; }; - buildInputs = [ patchelf makeWrapper ]; + nativeBuildInputs = [ patchelf makeWrapper ]; installPhase = '' mkdir -p $out/{bin,lib} diff --git a/pkgs/games/snipes/default.nix b/pkgs/games/snipes/default.nix new file mode 100644 index 000000000000..e8d915dd31a5 --- /dev/null +++ b/pkgs/games/snipes/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchFromGitHub, fetchurl, SDL2, SDL2_ttf }: + +let + font = fetchurl { + url = "http://kingbird.myphotos.cc/ee22d44076adb8a34d8e20df4be3730a/SnipesConsole.ttf"; + sha256 = "06n8gq18js0bv4svx84ljzhs9zmi81wy0zqcqj3b4g0rsrkr20a7"; + }; + +in stdenv.mkDerivation rec { + name = "snipes-${version}"; + version = "20180930"; + + src = fetchFromGitHub { + owner = "Davidebyzero"; + repo = "Snipes"; + rev = "343e14104b7848eb1f882401888e685b7918ef9f"; + sha256 = "1rl70d5miak34warbwfv27z11vln4lvf7maqqc78z0gdc5zivdv2"; + }; + + postPatch = '' + substitute config-sample.h config.h \ + --replace SnipesConsole.ttf $out/share/snipes/SnipesConsole.ttf + ''; + + enableParallelBuilding = true; + + buildInputs = [ SDL2 SDL2_ttf ]; + + installPhase = '' + runHook preInstall + + install -Dm755 -t $out/bin snipes + install -Dm644 -t $out/share/doc/snipes *.md + install -Dm644 ${font} $out/share/snipes/SnipesConsole.ttf + + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Modern port of the classic 1982 text-mode game Snipes"; + homepage = https://www.vogons.org/viewtopic.php?f=7&t=49073; + license = licenses.free; # This reverse-engineered source code is released with the original authors' permission. + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/games/ue4demos/default.nix b/pkgs/games/ue4demos/default.nix index 0bdb759048ad..b8b165ee0518 100644 --- a/pkgs/games/ue4demos/default.nix +++ b/pkgs/games/ue4demos/default.nix @@ -5,7 +5,7 @@ let stdenv.mkDerivation rec { inherit name src; - buildInputs = [ unzip patchelf ]; + nativeBuildInputs = [ unzip patchelf ]; rtdeps = stdenv.lib.makeLibraryPath [ xorg.libXxf86vm xorg.libXext openal ] diff --git a/pkgs/misc/brightnessctl/default.nix b/pkgs/misc/brightnessctl/default.nix index b8821d335b26..f90baee91fcf 100644 --- a/pkgs/misc/brightnessctl/default.nix +++ b/pkgs/misc/brightnessctl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "brightnessctl-${version}"; - version = "0.3.2"; + version = "0.4"; src = fetchFromGitHub { owner = "Hummer12007"; repo = "brightnessctl"; rev = "${version}"; - sha256 = "0amxhcikcgj04z81272kz35m5h5q4jx9x7v71h8yl1rv4b2lzh7z"; + sha256 = "1n1gb8ldgqv3vs565yhk1w4jfvrviczp94r8wqlkv5q6ab43c8w9"; }; makeFlags = [ "MODE=0755" "PREFIX=" "DESTDIR=$(out)" ]; diff --git a/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix b/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix index 18dd6c14822b..35b0ba3684fe 100644 --- a/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix +++ b/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix @@ -26,7 +26,8 @@ in stdenv.mkDerivation rec { sha256 = "144b4xggbzjfq7ga5nza7nra2cf6qn63z5ls7ba1jybkx1vm369k"; }; - buildInputs = [ cups' gcc ghostscript glibc patchelf ]; + nativeBuildInputs = [ patchelf ]; + buildInputs = [ cups' gcc ghostscript glibc ]; inherit gcc ghostscript glibc; cups = cups'; diff --git a/pkgs/misc/drivers/epkowa/default.nix b/pkgs/misc/drivers/epkowa/default.nix index ca7ac4b41528..3359f9e94acc 100644 --- a/pkgs/misc/drivers/epkowa/default.nix +++ b/pkgs/misc/drivers/epkowa/default.nix @@ -30,7 +30,7 @@ let plugins = { version = "1.0.1"; pluginVersion = "2.1.2-1"; - buildInputs = [ patchelf rpm ]; + nativeBuildInputs = [ patchelf rpm ]; src = fetchurl { url = "https://download2.ebz.epson.net/iscan/plugin/gt-x770/rpm/x64/iscan-gt-x770-bundle-${version}.x64.rpm.tar.gz"; sha256 = "0m9c60rszzdvq1pqfzygzzrjycm1giy465lj29108j7hsnfcv56r"; diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index 05b75312646d..8717d9355d2b 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -20,13 +20,13 @@ let }; in stdenv.mkDerivation rec { name = "dolphin-emu-${version}"; - version = "2018-08-17"; + version = "2018-09-24"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; - rev = "12a5fd80bde3c1f5557ea647ebb127d37e74040d"; - sha256 = "0sk3jn5sm9fabs5bvwy75zw2szrb19qqwns2ypzqpgd4d5zjrs4x"; + rev = "97b1a9bb2a0c29f0f68963483156d5285e1fb1d5"; + sha256 = "0dwc4l7a7r1f65gh1rhxa854xsknrgp62rr3a0y67lk3xf5y38d7"; }; enableParallelBuilding = true; diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index 391ac107ab71..efd5aa4e9194 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -14,7 +14,7 @@ with stdenv.lib; let inherit (python2Packages) python dbus-python; - shouldUsePkg = pkg: if pkg != null && pkg.meta.available then pkg else null; + shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null; libOnly = prefix == "lib"; diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/misc/jackaudio/jack1.nix index c11be4ad0c0c..2e349cf691c9 100644 --- a/pkgs/misc/jackaudio/jack1.nix +++ b/pkgs/misc/jackaudio/jack1.nix @@ -5,7 +5,7 @@ }: let - shouldUsePkg = pkg: if pkg != null && pkg.meta.available then pkg else null; + shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null; optAlsaLib = shouldUsePkg alsaLib; optDb = shouldUsePkg db; diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix index 09fc7a4b4475..37e7af95a910 100644 --- a/pkgs/misc/themes/adapta/default.nix +++ b/pkgs/misc/themes/adapta/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "adapta-gtk-theme-${version}"; - version = "3.94.0.132"; + version = "3.94.0.149"; src = fetchFromGitHub { owner = "adapta-project"; repo = "adapta-gtk-theme"; rev = version; - sha256 = "11j4mpbw8x2vg0w740v8q3rnwannw2zhp60aj8kirqlgz76lbadl"; + sha256 = "1rb07yv4iz4yp6cnigzy690mw3w6fcf7szlcbbna6wnjaf1rbf2i"; }; preferLocalBuild = true; diff --git a/pkgs/misc/themes/arc/default.nix b/pkgs/misc/themes/arc/default.nix index b9c0d0d4436f..0fc86e096f3d 100644 --- a/pkgs/misc/themes/arc/default.nix +++ b/pkgs/misc/themes/arc/default.nix @@ -1,43 +1,53 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gnome3, gtk-engine-murrine }: +{ stdenv, fetchFromGitHub, sassc, autoreconfHook, pkgconfig, gtk3 +, gnome-themes-extra, gtk-engine-murrine, optipng, inkscape}: let - # treat versions newer than 3.22 as 3.22 - gnomeVersion = if stdenv.lib.versionOlder "3.22" gnome3.version then "3.22" else gnome3.version; pname = "arc-theme"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "2017-05-12"; + version = "20180715"; src = fetchFromGitHub { - owner = "horst3180"; + owner = "NicoHood"; repo = pname; - rev = "8290cb813f157a22e64ae58ac3dfb5983b0416e6"; - sha256 = "1lxiw5iq9n62xzs0fks572c5vkz202jigndxaankxb44wcgn9zyf"; + rev = version; + sha256 = "1kkfnkiih0i3pds5mgd1v9lrdrp4nh4hk42mw7sa4fpbjff4jh6j"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ gnome3.gtk ]; + preBuild = '' + # Shut up inkscape's warnings + export HOME="$NIX_BUILD_ROOT" + ''; + + nativeBuildInputs = [ autoreconfHook pkgconfig sassc optipng inkscape ]; + buildInputs = [ gtk3 ]; - propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + propagatedUserEnvPkgs = [ gnome-themes-extra gtk-engine-murrine ]; - preferLocalBuild = true; + postPatch = '' + find . -name render-assets.sh | + while read filename + do + substituteInPlace "$filename" \ + --replace "/usr/bin/inkscape" "${inkscape.out}/bin/inkscape" \ + --replace "/usr/bin/optipng" "${optipng.out}/bin/optipng" + done + patchShebangs . + ''; - configureFlags = [ "--disable-unity" "--with-gnome=${gnomeVersion}" ]; + configureFlags = [ "--disable-unity" ]; postInstall = '' - mkdir -p $out/share/plank/themes - cp -r extra/*-Plank $out/share/plank/themes - install -Dm644 -t $out/share/doc/${pname}/Chrome extra/Chrome/*.crx install -Dm644 -t $out/share/doc/${pname} AUTHORS *.md ''; meta = with stdenv.lib; { description = "A flat theme with transparent elements for GTK 3, GTK 2 and Gnome-Shell"; - homepage = https://github.com/horst3180/arc-theme; + homepage = https://github.com/NicoHood/arc-theme; license = licenses.gpl3; maintainers = with maintainers; [ simonvandel romildo ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } diff --git a/pkgs/misc/themes/materia-theme/default.nix b/pkgs/misc/themes/materia-theme/default.nix index 8f2cdb0fcff7..0dd490a35b59 100644 --- a/pkgs/misc/themes/materia-theme/default.nix +++ b/pkgs/misc/themes/materia-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "materia-theme-${version}"; - version = "20180519"; + version = "20180928"; src = fetchFromGitHub { owner = "nana-4"; repo = "materia-theme"; rev = "v${version}"; - sha256 = "0javva2a3kmwb7xss2zmbpc988gagrkjgxncy7i1jifyvbnamf70"; + sha256 = "0v4mvc4rrf3jwf77spn9f5sqxp72v66k2k467r0aw3nglcpm4wpv"; }; nativeBuildInputs = [ gnome3.glib libxml2 bc ]; diff --git a/pkgs/misc/themes/sierra/default.nix b/pkgs/misc/themes/sierra/default.nix index 057b96febf3a..529553c9211f 100644 --- a/pkgs/misc/themes/sierra/default.nix +++ b/pkgs/misc/themes/sierra/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "sierra-gtk-theme-${version}"; - version = "2018-09-14"; + version = "2018-10-01"; src = fetchFromGitHub { owner = "vinceliuice"; repo = "sierra-gtk-theme"; - rev = "4c07f9e4978ab2d87ce0f8d4a5d60da21784172c"; - sha256 = "0mp5v462wbjq157hfnqzd8sw374mc611kpk92is2c3qhvj5qb6qd"; + rev = version; + sha256 = "10rjk2lyhlkhhfx6f6r0cykbkxa2jhri4wirc3h2wbzzsx7ch3ix"; }; nativeBuildInputs = [ libxml2 ]; diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index ad181c7bf953..bb6d60e33fb5 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -53,12 +53,12 @@ }; ale = buildVimPluginFrom2Nix { - name = "ale-2018-09-19"; + name = "ale-2018-09-29"; src = fetchFromGitHub { owner = "w0rp"; repo = "ale"; - rev = "169a6e26b2ca63ab0f2f5bb3d2176ff0a2f68bc3"; - sha256 = "09pc3a9wkql7j9rc3yfgwns94s7rrldichxwhq37ily139596wkm"; + rev = "04ed87c8829015ff3653a35fb4f6d7a71668d736"; + sha256 = "1iw0chk1sg60yaxzj3m7dp9j7cn8wpklxvz082isk5y1ndcfqz5w"; }; }; @@ -83,12 +83,12 @@ }; auto-pairs = buildVimPluginFrom2Nix { - name = "auto-pairs-2017-07-03"; + name = "auto-pairs-2018-09-23"; src = fetchFromGitHub { owner = "jiangmiao"; repo = "auto-pairs"; - rev = "f0019fc6423e7ce7bbd01d196a7e027077687fda"; - sha256 = "1kzrdq3adwxwm3fw65g05ww9405lwqi368win5kayamyj9i0z7r6"; + rev = "9086ce897a616d78baf69ddb07ad557c5ceb1d7c"; + sha256 = "02ds4i7aiq1a68qwz2gnmiigp25hi8qa9d4zcfazc3bgh855bx0l"; }; }; @@ -133,12 +133,12 @@ }; caw-vim = buildVimPluginFrom2Nix { - name = "caw-vim-2018-09-13"; + name = "caw-vim-2018-09-22"; src = fetchFromGitHub { owner = "tyru"; repo = "caw.vim"; - rev = "2427ba1379b1bb3c7b737921219a346f10a21ad8"; - sha256 = "1cwx0lpf0xvrqmbjg83y79j9f4gjdkl7iickg9ypzhdxhld0i972"; + rev = "2b88f9978b25892d918d8c7b564d3e05fc24656f"; + sha256 = "1njbyg5l4k6f0fnpfwg058rwyffxj43jf4lsfai5gjl3dckk9yw4"; }; }; @@ -264,12 +264,12 @@ }; csv-vim = buildVimPluginFrom2Nix { - name = "csv-vim-2018-08-21"; + name = "csv-vim-2018-09-26"; src = fetchFromGitHub { owner = "chrisbra"; repo = "csv.vim"; - rev = "23bc07d2f6b755f2194210dcebf912093849404d"; - sha256 = "0c2m2nvm5j6hsyhhjqlh9g1df7zhxwxsb9n2mamicncaqay7kx9x"; + rev = "41e9bd08371c253e7c8d1cb4d16066f8132c5a1c"; + sha256 = "1fvlw39a8vv3vxrpsg6f25is3drp2j83giydp06h3fyzgqgqfsfx"; }; }; @@ -314,12 +314,12 @@ }; denite-extra = buildVimPluginFrom2Nix { - name = "denite-extra-2018-08-13"; + name = "denite-extra-2018-09-20"; src = fetchFromGitHub { owner = "chemzqm"; repo = "denite-extra"; - rev = "8e46f87ceb619d0db93bac58120fe01584e565fd"; - sha256 = "0pm63yi1qv1r4s098skr8pqx956d87f34cvj4vly67gj59lfyzzz"; + rev = "57ab8e6d8756e294c12a6177bef0155b736eaf1f"; + sha256 = "0in7dg23gh6h39jjn84b2sqkcyd02dvv8pvnp6c3413dnjzmiryz"; }; }; @@ -334,12 +334,12 @@ }; denite-nvim = buildVimPluginFrom2Nix { - name = "denite-nvim-2018-09-15"; + name = "denite-nvim-2018-09-27"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "8685cfbb7f0a4bea173a6b08a72a33ef70780334"; - sha256 = "0zc15802hda59x42k0962fmawjq021y7ys10h4ypnwy50cn1vjzj"; + rev = "67351fc647450ed17f164ca68758d8753e8f0f13"; + sha256 = "1zxqdwx351z5hf8yr3b86ymxajlywkv9jr3dvnn8lhpipavkvmwf"; }; }; @@ -477,13 +477,33 @@ }; }; + falcon = buildVimPluginFrom2Nix { + name = "falcon-2018-09-15"; + src = fetchFromGitHub { + owner = "fenetikm"; + repo = "falcon"; + rev = "0dbdbf568321bc29ac143370d1b75dc651fd083f"; + sha256 = "0scds1fc433qcnghxplczama83w65iza9dhq3qnyhr085hyisck3"; + }; + }; + fastfold = buildVimPluginFrom2Nix { - name = "fastfold-2018-06-03"; + name = "fastfold-2018-09-24"; src = fetchFromGitHub { owner = "konfekt"; repo = "fastfold"; - rev = "4150ebdc6e226e8797d42dcabb7463952de9dc30"; - sha256 = "0mdb77np2vf564q18fvj1klr99pwrx2sw0jhxify9g7i0177qs4r"; + rev = "cdd44dcf54dd6900e9699e957ba4b203d3021d1d"; + sha256 = "1a7x026cjd6nc9l0gx3cvfvhwalxj8d4361yvy6krpjaha4yk43j"; + }; + }; + + ferret = buildVimPluginFrom2Nix { + name = "ferret-2018-03-23"; + src = fetchFromGitHub { + owner = "wincent"; + repo = "ferret"; + rev = "b1ef0cf4af92c3a896821597d0d1a44b9c93dc5a"; + sha256 = "1gpbk396a7pihi6pg2jmxwv6nibprbcr8fg73kxs6kj0d60wgasy"; }; }; @@ -678,23 +698,33 @@ }; }; + iosvkem = buildVimPluginFrom2Nix { + name = "iosvkem-2018-08-26"; + src = fetchFromGitHub { + owner = "neutaaaaan"; + repo = "iosvkem"; + rev = "ac6ad259a5aa8be243d5e343d231942b026f1ec1"; + sha256 = "15ci15drs93qphmga0rr79hrlggrgmaia099j7n59sllhqn5zfbm"; + }; + }; + Jenkinsfile-vim-syntax = buildVimPluginFrom2Nix { - name = "Jenkinsfile-vim-syntax-2018-04-04"; + name = "Jenkinsfile-vim-syntax-2018-09-25"; src = fetchFromGitHub { owner = "martinda"; repo = "Jenkinsfile-vim-syntax"; - rev = "45418b171e06f63e0814cac6a656832384708aba"; - sha256 = "0vfx22fzp0894lclmbsp6l8apvw0znd3cbah8r7r5la9qzyiwi4p"; + rev = "030cd312f7de1786bb5a1f392fa59f7a105054df"; + sha256 = "17lw8rd2fhybwkhrz8lg1p7b552ki669kr2wlpjb6agkgaiifj8q"; }; }; julia-vim = buildVimPluginFrom2Nix { - name = "julia-vim-2018-09-09"; + name = "julia-vim-2018-09-26"; src = fetchFromGitHub { owner = "JuliaEditorSupport"; repo = "julia-vim"; - rev = "3018668f89ca4bf125d1d57effdea88b07a3b466"; - sha256 = "13fn3566ql4fcqzh6lfb6qj2xyqyvz70psc67k184k88arqm3y55"; + rev = "9fe5ce6e4e373ed34a4462bbfac6cedfceb30c22"; + sha256 = "1xww17h56q1fl83yvfz1kw6v57070ab904l3c0r97s9x0mirlvxb"; }; }; @@ -779,12 +809,12 @@ }; ncm2 = buildVimPluginFrom2Nix { - name = "ncm2-2018-09-03"; + name = "ncm2-2018-09-20"; src = fetchFromGitHub { owner = "ncm2"; repo = "ncm2"; - rev = "08f026d84b50e8db3d3a4124da63c8c3e0e5e558"; - sha256 = "07d411p3shm27qmir8hsw88mx3wdmz3am4qi0fqzkhkpkgli70jw"; + rev = "5b5984b5528a90c40bf1d98c48bda1eda6b5e0f0"; + sha256 = "1fwg5y3kbxdv64kglkd028kyvp8k9i5wppvw56iwf4qncpd66sdg"; }; }; @@ -878,13 +908,23 @@ }; }; + neodark-vim = buildVimPluginFrom2Nix { + name = "neodark-vim-2018-05-26"; + src = fetchFromGitHub { + owner = "KeitaNakamura"; + repo = "neodark.vim"; + rev = "c966731b54a64b379ca5519c25d3cedb90df1d31"; + sha256 = "0rimpx3569lr4whg7lc0nym0irminwf6r6f2wr320pdhhfx7a0ch"; + }; + }; + neoformat = buildVimPluginFrom2Nix { - name = "neoformat-2018-09-05"; + name = "neoformat-2018-09-22"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "c8bc4ec044a0d8c96291426b5ce10f741d63e6b6"; - sha256 = "140f1q1wbn7d7mxb2q08421a8qgxii3ffd8lmhsjj7mjsdvxmcks"; + rev = "5ea3abc08f3f0db3600e9f6f36f096c64bffdc07"; + sha256 = "0yb2mias9pc4f2hgb5lrc7k5xs3pq96c6zsahd74jb1hcjb5j5sw"; }; }; @@ -899,12 +939,12 @@ }; neomake = buildVimPluginFrom2Nix { - name = "neomake-2018-09-17"; + name = "neomake-2018-09-21"; src = fetchFromGitHub { owner = "benekastah"; repo = "neomake"; - rev = "5c0e5c5de14a03c438a370a5ef79a3165a2e705f"; - sha256 = "0ffkpidgc9lki5h4x8w3yvf5vj6rdip6n0wd89dax81bk7579pcb"; + rev = "1686a91cc4ea4b48152e314decb827946221b1ad"; + sha256 = "1radvd8nvbgjf158jdymvwi050fncqsf7vw3kw7hcz4adk97a1pr"; }; }; @@ -1028,6 +1068,16 @@ }; }; + onehalf = buildVimPluginFrom2Nix { + name = "onehalf-2018-09-16"; + src = fetchFromGitHub { + owner = "sonph"; + repo = "onehalf"; + rev = "ecc3d8d5691b8d3b39345a4400e631638bc078f7"; + sha256 = "13w5n64wlwp70m74j2k12csm6ajq7jwgg7dq25azwrvxixi3iy9p"; + }; + }; + open-browser-vim = buildVimPluginFrom2Nix { name = "open-browser-vim-2018-04-26"; src = fetchFromGitHub { @@ -1038,6 +1088,16 @@ }; }; + papercolor-theme = buildVimPluginFrom2Nix { + name = "papercolor-theme-2018-09-04"; + src = fetchFromGitHub { + owner = "NLKNguyen"; + repo = "papercolor-theme"; + rev = "5bd7d5b3f9dd0650e6bbd1756feebe1651fa6ba8"; + sha256 = "061551ih3pndnlimxqwa5hrxwn8knpzf87hr6q3zwr9pdfmqpm9l"; + }; + }; + peskcolor-vim = buildVimPluginFrom2Nix { name = "peskcolor-vim-2016-06-11"; src = fetchFromGitHub { @@ -1449,12 +1509,12 @@ }; unite-vim = buildVimPluginFrom2Nix { - name = "unite-vim-2018-08-06"; + name = "unite-vim-2018-09-26"; src = fetchFromGitHub { owner = "Shougo"; repo = "unite.vim"; - rev = "7ed231f2dbceb82b3ed81dc5ef999c94c2528586"; - sha256 = "0p2xfsyflds74lrpk14nb388nh2rc3hmqg3i9kgzxqns4i6w5s8v"; + rev = "e68ccde4192b3faa3717897e65dc7dd8ab87524a"; + sha256 = "1r22lwzs92ylzl0hs0ny36vr787jwkf65da9dv0zvz2p5ank5ykw"; }; }; @@ -1469,12 +1529,12 @@ }; vim = buildVimPluginFrom2Nix { - name = "vim-2018-09-13"; + name = "vim-2018-09-20"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "72a0d0d584e2b64dd7cd44047688d470e6e39f8f"; - sha256 = "0n2cyxkwfpy95033zisb5q1jrf17vzi11mprhkm01vfxjp5xh4hy"; + rev = "15d0ff9f1a1a5455201dbf62221e8b119cfa9161"; + sha256 = "1cmmx99hs10mnr5x5kmac39kxjf9n3riphirhmijsnym8yijrcz1"; }; }; @@ -1679,12 +1739,12 @@ }; vim-airline = buildVimPluginFrom2Nix { - name = "vim-airline-2018-09-18"; + name = "vim-airline-2018-09-25"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "251ed064e84dc684a944edbe37d3c559af3e02bf"; - sha256 = "1nmcir24f9mlnnfnkbcn3ww5dhn96k6nh0kdpjz1hdh4wd659vhm"; + rev = "a0298263b7fd55827839862ffd3a8d5b2a787a5c"; + sha256 = "115mwvkqhfrssihrlb1ds3f82gqmp6ph75nw24l4lwdr1nv6p1r0"; }; }; @@ -2039,12 +2099,12 @@ }; vim-fugitive = buildVimPluginFrom2Nix { - name = "vim-fugitive-2018-09-19"; + name = "vim-fugitive-2018-09-24"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "9fec8aadc54372cbea6ac3c9cf6909054140b573"; - sha256 = "0pkfhbaka6gsabmz74v5dpwd72rwjrrq9wchcda86rmb6nxqsgmg"; + rev = "a9100fafb8c6deb187ee1cfaa37a4a02018d6c9a"; + sha256 = "0p37gywcwbdd2sl09s2c3dhr0cvf2s53jpwyz93jls2dgnlbdri8"; }; }; @@ -2099,12 +2159,12 @@ }; vim-go = buildVimPluginFrom2Nix { - name = "vim-go-2018-09-19"; + name = "vim-go-2018-09-26"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "1656f2ff1bb8c4865b2e9870c2be3468974c6ea9"; - sha256 = "1k6gyzh3sm5ndmh6r8k07q8gmr6190qfvk8cxcj1i37hr6ari0zd"; + rev = "3d8e82ecb4f66a151f3c1bff84728fa4e3db0ca9"; + sha256 = "1fy7xsqrdqs569g03hccxpi17qjkibspjjcpddw7a9n5hb7zp8rv"; }; }; @@ -2189,12 +2249,12 @@ }; vim-highlightedyank = buildVimPluginFrom2Nix { - name = "vim-highlightedyank-2018-06-01"; + name = "vim-highlightedyank-2018-09-28"; src = fetchFromGitHub { owner = "machakann"; repo = "vim-highlightedyank"; - rev = "eafae05916e670da8bc99e44b1534cd8c7f87c7a"; - sha256 = "1z6xjb9244fgnhmw21m7y3bd9vs9gvxbb9ig73iwy0ny886hjlnk"; + rev = "ac2eeb8b384c27a4167fdf1788c2cae93f34ab07"; + sha256 = "0i4ddagfbrii96msgfsmjsg356z3y71nab84850xqy74m2iivl8m"; }; }; @@ -2218,6 +2278,16 @@ }; }; + vim-husk = buildVimPluginFrom2Nix { + name = "vim-husk-2015-11-29"; + src = fetchFromGitHub { + owner = "vim-utils"; + repo = "vim-husk"; + rev = "ad89559ff8a6c4b1e94a18b2d494a69a1f701d08"; + sha256 = "09kqzaqa4jdh31q0a3nxbx9li7zg890qxh68rfzblzyx22xv4mka"; + }; + }; + vim-iced-coffee-script = buildVimPluginFrom2Nix { name = "vim-iced-coffee-script-2013-12-26"; src = fetchFromGitHub { @@ -2278,6 +2348,16 @@ }; }; + vim-janah = buildVimPluginFrom2Nix { + name = "vim-janah-2017-04-09"; + src = fetchFromGitHub { + owner = "mhinz"; + repo = "vim-janah"; + rev = "684a3343f36bb0f1e7c33281321fa3a70c08aa26"; + sha256 = "0hq626cvyz5x6fmsqgdfp46pr783p6cz8bl49278gkcdgfb91wnr"; + }; + }; + vim-javacomplete2 = buildVimPluginFrom2Nix { name = "vim-javacomplete2-2018-09-18"; src = fetchFromGitHub { @@ -2360,12 +2440,12 @@ }; vim-latex-live-preview = buildVimPluginFrom2Nix { - name = "vim-latex-live-preview-2018-09-15"; + name = "vim-latex-live-preview-2018-09-25"; src = fetchFromGitHub { owner = "xuhdev"; repo = "vim-latex-live-preview"; - rev = "c573115642e1a991e0dd763f25dc02b3d99acea5"; - sha256 = "1s1p8mi9n6qxfd9847fbzc12sy9ala5jnkjicrcdcbn7irlvvwcg"; + rev = "855c30915547c7e9c19b7e6efb528730c071d2e8"; + sha256 = "14fgbq7wyyhhzkd8832g07z97jg1b9awibzf3sn33ih7p5bb3hhp"; }; }; @@ -2400,12 +2480,12 @@ }; vim-localvimrc = buildVimPluginFrom2Nix { - name = "vim-localvimrc-2018-08-21"; + name = "vim-localvimrc-2018-09-24"; src = fetchFromGitHub { owner = "embear"; repo = "vim-localvimrc"; - rev = "7f8fbfedaaf217488bbc9ae3fbd2539a5d825623"; - sha256 = "1q12lxblymv0j594161lpy5a6dlsg4510gmsdf2p70kbd8jfp1ar"; + rev = "e0ce126a2a8baf3816ae722b604121951a73e092"; + sha256 = "0wi5gyafzdfwin6bxk369fz59gbw5w4xm4pgq2jpz5hxk7krwkll"; }; }; @@ -2449,6 +2529,16 @@ }; }; + vim-monokai-pro = buildVimPluginFrom2Nix { + name = "vim-monokai-pro-2018-06-14"; + src = fetchFromGitHub { + owner = "phanviet"; + repo = "vim-monokai-pro"; + rev = "75b2794a057f0ea6b2485ae622e92bb0687d4c9b"; + sha256 = "1l9cdsilpzyg9y0az7627gi10qyfyjxn9dvi571q7n1vrv6nhl2d"; + }; + }; + vim-multiple-cursors = buildVimPluginFrom2Nix { name = "vim-multiple-cursors-2018-08-10"; src = fetchFromGitHub { @@ -2499,6 +2589,16 @@ }; }; + vim-one = buildVimPluginFrom2Nix { + name = "vim-one-2018-07-22"; + src = fetchFromGitHub { + owner = "rakr"; + repo = "vim-one"; + rev = "08aca1b5d8cd83106a430f150aa77b4148f6cd5e"; + sha256 = "13ldimmm839s8a96l37s8pjx1rrr0cnkjyfiapp1c1n640qn1rd9"; + }; + }; + vim-operator-replace = buildVimPluginFrom2Nix { name = "vim-operator-replace-2015-02-24"; src = fetchFromGitHub { @@ -2660,12 +2760,12 @@ }; vim-puppet = buildVimPluginFrom2Nix { - name = "vim-puppet-2018-04-12"; + name = "vim-puppet-2018-09-24"; src = fetchFromGitHub { owner = "rodjek"; repo = "vim-puppet"; - rev = "dc1f681045c4d8bd126063ce000f7cc7b2f95097"; - sha256 = "18z2d2wpn5c3g857wprmdwp5pdb719dciyy0682hqpw8lfjn6zhv"; + rev = "5680f0dca2d6b5e98687e091a544e4e0ae41d74b"; + sha256 = "134x4z88qrzfxyqa1kxmwwmhlcqa3n8qj7f71bn9w9h4ac2v650v"; }; }; @@ -2710,12 +2810,12 @@ }; vim-rhubarb = buildVimPluginFrom2Nix { - name = "vim-rhubarb-2018-08-22"; + name = "vim-rhubarb-2018-09-20"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-rhubarb"; - rev = "b6cbbb0ad3e22870a3cd8d79a22722c63d98d18b"; - sha256 = "13mndz5p7slhn7ba8nnmzkh20ixhsq5rsy07y61sm5fxnb128r4n"; + rev = "3a9ddb8ffa46b9fa49f3d9372bbb5d64bdc5fd23"; + sha256 = "1swybc30vyf309w1a34jf94xja1kikvrr3xpixfban50s6aiyips"; }; }; @@ -2830,12 +2930,12 @@ }; vim-snippets = buildVimPluginFrom2Nix { - name = "vim-snippets-2018-09-18"; + name = "vim-snippets-2018-09-25"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "39219ca29234a7e28e56379308f59e7190358092"; - sha256 = "1hnvpkqipa82qqhn68fr1qi71dj4khjgjqzhj85w6chdii1bf6qp"; + rev = "b51c01137259ac7cd59381001279fa36baefbc5f"; + sha256 = "00ydadqq5nj94ldcd9ld45hkx6micd3mfllvn5csxbg4vw0p5472"; }; }; @@ -2950,12 +3050,12 @@ }; vim-test = buildVimPluginFrom2Nix { - name = "vim-test-2018-08-30"; + name = "vim-test-2018-09-23"; src = fetchFromGitHub { owner = "janko-m"; repo = "vim-test"; - rev = "0941cfc91cdaa896f16f5e32d20940aab902f88c"; - sha256 = "0zggwjyiyiipykw42b5qxgz8zhh10vi5ci3ywj1rh5h7kl858bwb"; + rev = "5aa77d57d22d453bd53f28a18f80e7bfecccf811"; + sha256 = "1w0x4xfj3fl5zwnk14sh9sp1hkj25grrw1wan0g3y7ar8ygjyl7f"; }; }; @@ -2990,12 +3090,12 @@ }; vim-toml = buildVimPluginFrom2Nix { - name = "vim-toml-2018-06-15"; + name = "vim-toml-2018-09-25"; src = fetchFromGitHub { owner = "cespare"; repo = "vim-toml"; - rev = "85ba8277a6e331a56fce920d62bfdacce5bc5a80"; - sha256 = "0nnm4ja5j9gcsl9cv7ra30slrlpjpy4dsl0ykg0yhdq1vbby3m6n"; + rev = "2069e7413d8eaab567fa320723c4af24bb437f3a"; + sha256 = "0ffngrry8ambv27wwzp0czgccdag1qcmbcvazjklm2i5b3ads39i"; }; }; @@ -3050,12 +3150,12 @@ }; vim-wakatime = buildVimPluginFrom2Nix { - name = "vim-wakatime-2018-07-14"; + name = "vim-wakatime-2018-09-24"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "25aa400fd1f1e3d689c721605a65e015024dc4cf"; - sha256 = "11lk5k8wl3kxp6p2i0nnp56f4wcaniy40kzs3anjdwlzya631rg2"; + rev = "17e5d1b21128b955dba244d5d0d5ad9f359a5c68"; + sha256 = "0v2hb6hzcdn4ks691m511las5mli6igfg3srxnr3a09krgxi512f"; }; }; @@ -3160,12 +3260,12 @@ }; vimtex = buildVimPluginFrom2Nix { - name = "vimtex-2018-09-19"; + name = "vimtex-2018-09-28"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "fb09eed5336b6540f8350f2792fded0956362d7b"; - sha256 = "0g3pw5qw6y9vpdmdnw4x478m5c34g2wll01gdy76yf8r5vysyv41"; + rev = "196a8aa7e9f9d04c69adfa7643b0e6ae6b0d3b3b"; + sha256 = "0d7322cflmi3sxh6nncslp3qdgd766k2mcplgji2744xff65bvma"; }; }; @@ -3189,6 +3289,16 @@ }; }; + wal-vim = buildVimPluginFrom2Nix { + name = "wal-vim-2018-06-04"; + src = fetchFromGitHub { + owner = "dylanaraps"; + repo = "wal.vim"; + rev = "fb6ce53632f93c31cad66398636bfb383ad64d52"; + sha256 = "1f0rpaff7q9xswc1p5pmwzmhb70s4q148dj2apg98d4qywa9j8ah"; + }; + }; + webapi-vim = buildVimPluginFrom2Nix { name = "webapi-vim-2018-03-14"; src = fetchFromGitHub { @@ -3209,6 +3319,16 @@ }; }; + workflowish = buildVimPluginFrom2Nix { + name = "workflowish-2015-12-03"; + src = fetchFromGitHub { + owner = "lukaszkorecki"; + repo = "workflowish"; + rev = "65472189814dddd060aaa558103d837c2f9a5ec9"; + sha256 = "044jxkcbycmmahi98qd0ynpc8baay72i45qymv4mxvl1d96fjbmd"; + }; + }; + xptemplate = buildVimPluginFrom2Nix { name = "xptemplate-2017-12-06"; src = fetchFromGitHub { @@ -3244,8 +3364,8 @@ src = fetchFromGitHub { owner = "valloric"; repo = "youcompleteme"; - rev = "a020cbc0fc4b535f81d9f8db33150b92df68694a"; - sha256 = "1i9hqmns7hyc15cz565g8xzlf6ryk03xwg714sfbcmkai9vl61w3"; + rev = "e37923a752c7eee184cd6d96ac34e303fb7cfae9"; + sha256 = "1dhh88f1mz7rajxyjbarqf3qiia6n34salknri3a0dffbih5y8rc"; fetchSubmodules = true; }; }; @@ -3281,12 +3401,12 @@ }; zig-vim = buildVimPluginFrom2Nix { - name = "zig-vim-2018-09-17"; + name = "zig-vim-2018-09-21"; src = fetchFromGitHub { owner = "zig-lang"; repo = "zig.vim"; - rev = "9986edc96f220bb9208473a5ad61339c1567df23"; - sha256 = "03grs1ha5r4cfh8hczfawj7x7xwb6j716rl52gbkhbxhlk72w5kq"; + rev = "febf2fc8d7aa27809758fd90be29d3a9b501efc2"; + sha256 = "1zp1bz3fzcwvdw3qgiyvmd5imrzjh7rnpnjpxm8mma0kxi2bnl3g"; }; }; } \ No newline at end of file diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 5f664c39e3c5..b6c1d584d6a4 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -42,6 +42,7 @@ dhruvasagar/vim-table-mode digitaltoad/vim-jade dleonard0/pony-vim-syntax dracula/vim +dylanaraps/wal.vim drmingdrmer/xptemplate eagletmt/ghcmod-vim eagletmt/neco-ghc @@ -60,6 +61,7 @@ esneider/YUNOcommit.vim farmergreg/vim-lastplace fatih/vim-go FelikZ/ctrlp-py-matcher +fenetikm/falcon fisadev/vim-isort flazz/vim-colorschemes floobits/floobits-neovim @@ -119,6 +121,7 @@ kana/vim-operator-replace kana/vim-operator-user kana/vim-tabpagecd kchmck/vim-coffee-script +KeitaNakamura/neodark.vim keith/swift.vim kien/rainbow_parentheses.vim konfekt/fastfold @@ -134,6 +137,7 @@ lfilho/cosco.vim LnL7/vim-nix ludovicchabant/vim-gutentags ludovicchabant/vim-lawrencium +lukaszkorecki/workflowish luochen1990/rainbow lyokha/vim-xkbswitch machakann/vim-highlightedyank @@ -166,6 +170,7 @@ megaannum/forms megaannum/self mfukar/robotframework-vim mhinz/vim-grepper +mhinz/vim-janah mhinz/vim-sayonara mhinz/vim-signify mhinz/vim-startify @@ -185,7 +190,9 @@ ncm2/ncm2-ultisnips neoclide/vim-easygit neovimhaskell/haskell-vim neovim/nvimdev.nvim +neutaaaaan/iosvkem nixprime/cpsm +NLKNguyen/papercolor-theme noc7c9/vim-iced-coffee-script osyo-manga/shabadou.vim osyo-manga/vim-anzu @@ -194,6 +201,7 @@ osyo-manga/vim-watchdogs pangloss/vim-javascript parsonsmatt/intero-neovim peterhoeg/vim-qml +phanviet/vim-monokai-pro plasticboy/vim-markdown powerman/vim-plugin-AnsiEsc python-mode/python-mode @@ -203,6 +211,7 @@ rafaqz/ranger.vim rafi/awesome-vim-colorschemes raghur/vim-ghost raichoo/purescript-vim +rakr/vim-one reedes/vim-pencil reedes/vim-wordy rhysd/committia.vim @@ -245,6 +254,7 @@ sjl/gundo.vim sjl/splice.vim sk1418/last256 slashmili/alchemist.vim +sonph/onehalf t9md/vim-smalls takac/vim-hardtime ternjs/tern_for_vim @@ -311,6 +321,7 @@ vim-scripts/tabmerge vim-scripts/taglist.vim vim-scripts/wombat256.vim vim-scripts/YankRing.vim +vim-utils/vim-husk vimwiki/vimwiki vmchale/dhall-vim w0rp/ale @@ -318,6 +329,7 @@ wakatime/vim-wakatime wellle/targets.vim will133/vim-dirdiff wincent/command-t +wincent/ferret xolox/vim-easytags xolox/vim-misc xuhdev/vim-latex-live-preview diff --git a/pkgs/misc/vscode-extensions/cpptools/default.nix b/pkgs/misc/vscode-extensions/cpptools/default.nix index 5bc1dddeab8e..e3463246ab2c 100644 --- a/pkgs/misc/vscode-extensions/cpptools/default.nix +++ b/pkgs/misc/vscode-extensions/cpptools/default.nix @@ -67,8 +67,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "cpptools"; publisher = "ms-vscode"; - version = "0.17.6"; - sha256 = "2625be8b922ffc199e1c776f784d39b6e004523212f7956c93ae40f9040ce6d5"; + version = "0.19.0"; + sha256 = "1x97mz859bzr4gxy6cnqgd8qmvnrjn9zdxh457slsxsk4wqcfmgj"; }; buildInputs = [ diff --git a/pkgs/misc/vscode-extensions/python/default.nix b/pkgs/misc/vscode-extensions/python/default.nix index f08181d9068c..db6826b2d7e8 100644 --- a/pkgs/misc/vscode-extensions/python/default.nix +++ b/pkgs/misc/vscode-extensions/python/default.nix @@ -20,8 +20,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "python"; publisher = "ms-python"; - version = "2018.7.0"; - sha256 = "0ab6ce722b23274a8f70d156f55d02123dd3b686397b11d4eec0831ec69dbec5"; + version = "2018.8.0"; + sha256 = "1x1wkqbc0d6h5w2m5qczv6gd5j6yrzhwp0c6wk49bhg2l0ibvyx6"; }; postPatch = '' diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index 08428f95b06c..3ffaef8109f3 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, fetchpatch, makeWrapper, autoreconfHook +{ stdenv, lib, fetchurl, fetchpatch, makeWrapper, autoreconfHook , pkgconfig, which , flex, bison , linuxHeaders ? stdenv.cc.libc.linuxHeaders , gawk -, withPerl ? stdenv.hostPlatform == stdenv.buildPlatform && perl.meta.available or false, perl -, withPython ? stdenv.hostPlatform == stdenv.buildPlatform && python.meta.available or false, python +, withPerl ? stdenv.hostPlatform == stdenv.buildPlatform && lib.any (lib.meta.platformMatch stdenv.hostPlatform) perl.meta.platforms, perl +, withPython ? stdenv.hostPlatform == stdenv.buildPlatform && lib.any (lib.meta.platformMatch stdenv.hostPlatform) python.meta.platforms, python , swig , ncurses , pam diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix index 9ccda9178f10..fdb6ea3695e8 100644 --- a/pkgs/os-specific/linux/batman-adv/batctl.nix +++ b/pkgs/os-specific/linux/batman-adv/batctl.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, libnl }: let - ver = "2018.2"; + ver = "2018.3"; in stdenv.mkDerivation rec { name = "batctl-${ver}"; src = fetchurl { url = "https://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; - sha256 = "09bxh4yifqiphn0ljc3msbxid62ynd9kk3vn82h13gcpfnyckw6z"; + sha256 = "1rljx2jlh3wlk6l9p068mhbqpdr5p5qnwm0336ay1316x0zjvqr4"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/can-isotp/default.nix b/pkgs/os-specific/linux/can-isotp/default.nix new file mode 100644 index 000000000000..0c32c3f5e62a --- /dev/null +++ b/pkgs/os-specific/linux/can-isotp/default.nix @@ -0,0 +1,36 @@ +{ stdenv, kernel, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "can-isotp-${version}"; + version = "20180629"; + + hardeningDisable = [ "pic" ]; + + src = fetchFromGitHub { + owner = "hartkopp"; + repo = "can-isotp"; + rev = "6003f9997587e6a563cebf1f246bcd0eb6deff3d"; + sha256 = "0b2pqb0vd1wgv2zpl7lvfavqkzr8mrwhrv7zdqkq3rz9givcv8w7"; + }; + + KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; + INSTALL_MOD_PATH = "\${out}"; + + buildPhase = '' + make modules + ''; + + installPhase = '' + make modules_install + ''; + + nativeBuildInputs = kernel.moduleBuildDependencies; + + meta = with stdenv.lib; { + description = "Kernel module for ISO-TP (ISO 15765-2)"; + homepage = "https://github.com/hartkopp/can-isotp"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.evck ]; + }; +} diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix index 4e3e373d244c..85218042cf76 100644 --- a/pkgs/os-specific/linux/ffado/default.nix +++ b/pkgs/os-specific/linux/ffado/default.nix @@ -11,7 +11,7 @@ let - shouldUsePkg = pkg: if pkg != null && pkg.meta.available then pkg else null; + shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null; libOnly = prefix == "lib"; diff --git a/pkgs/os-specific/linux/jool/default.nix b/pkgs/os-specific/linux/jool/default.nix index 84a621e7f120..d65be175fc1d 100644 --- a/pkgs/os-specific/linux/jool/default.nix +++ b/pkgs/os-specific/linux/jool/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, kernel }: -assert stdenv.lib.versionOlder kernel.version "4.17"; +assert stdenv.lib.versionOlder kernel.version "4.18"; let sourceAttrs = (import ./source.nix) { inherit fetchFromGitHub; }; diff --git a/pkgs/os-specific/linux/jool/source.nix b/pkgs/os-specific/linux/jool/source.nix index f15b91f9f142..24134b8b8182 100644 --- a/pkgs/os-specific/linux/jool/source.nix +++ b/pkgs/os-specific/linux/jool/source.nix @@ -1,11 +1,11 @@ { fetchFromGitHub }: rec { - version = "3.5.7"; + version = "unstable-20180706"; src = fetchFromGitHub { owner = "NICMx"; repo = "Jool"; - rev = "v${version}"; - sha256 = "1qxhrchhm4lbyxkp6wm47a85aa4d9wlyy3kdijl8rarngvh8j1yx"; + rev = "de791931d94e972c36bb3c102a9cadab5230c285"; + sha256 = "09mr7lc9k17znpslsfmndx4vgl240llcgblxm92fizmwz23y1d6c"; }; } diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index fcec5fd0df41..6c1740ea2e43 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.71"; + version = "4.14.73"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "12blj3zzvzs2nz8rp1g5ykibfvm355442c31l4ijr4mxphylg93n"; + sha256 = "07p3w3p8izgk1d0dblvn9ckk4ay10f40pqbwpzvpsi6c3ha3i7lr"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.18.nix b/pkgs/os-specific/linux/kernel/linux-4.18.nix index 48fc823ee084..00e8a04f1b9d 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.18.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.18.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.18.9"; + version = "4.18.11"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0yli3qr9rygqk5zc4w70xb49b8jbgd09cdz4ji5a00krwm8m76ac"; + sha256 = "131chbsavavz2hnjyx1xjvsnxdcr0y02p054n9mdvxfalvsiklrn"; }; } // (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 3106dc981055..bafa975b6184 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, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.157"; + version = "4.4.159"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0kb23pq0q7nkrri4bir5x6285wbi17fn5mpbm9awzjablq5bq400"; + sha256 = "1hivz1pyy4scp4s09ibz36ni4d1pwivizwls5dbh5qjy0pdvn00f"; }; } // (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 6e5d310075e2..5c4bee036d86 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, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.128"; + version = "4.9.130"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "04kgdci8xndml2fwbam59pjwwxqd4kf7y3qgkk4asshs9546zdxx"; + sha256 = "0zqaidirnr3v9xibp04rr2cjww3nd3phg28cgid0s8q0idm3xnv0"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index 6e3a7614a56b..f58ab5c95cc4 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, fetchgit, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.18.2018.08.31"; + version = "4.18.2018.09.21"; modDirVersion = "4.18.0"; src = fetchgit { url = "https://evilpiepirate.org/git/bcachefs.git"; - rev = "9c08efd02b827e6ee2a6e5a751045c6c6bd484d4"; - sha256 = "0xnkg0fpilmwckyb1drspggv3ibx8vkqic9ai53d5vx2rrnvvafw"; + rev = "2fe17e38d355271a8212a8123a9281e2f9df811f"; + sha256 = "1p35qf7fdwpr8sz4alblmbq6rmhd87rwrrwk6xpgxsfkkhmf36d6"; }; extraConfig = "BCACHEFS_FS m"; diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 4b6be2556637..cabaa59966c1 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args: buildLinux (args // rec { - version = "4.19-rc5"; - modDirVersion = "4.19.0-rc5"; + version = "4.19-rc6"; + modDirVersion = "4.19.0-rc6"; extraMeta.branch = "4.19"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "0fpv2g6x1hgdrxvh1acjcxmyk2fzqcx1ypi0mqw72swbm587irck"; + sha256 = "0cq0xr4lwvngyiyall62hddbk27gy72zjiigb8xdsry96a8ccvgl"; }; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 97921f07e82c..5e6023582082 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -247,7 +247,7 @@ let maintainers.thoughtpolice ]; platforms = platforms.linux; - timeout = 7200; # 2 hours + timeout = 14400; # 4 hours } // extraMeta; }; in diff --git a/pkgs/os-specific/linux/mbpfan/default.nix b/pkgs/os-specific/linux/mbpfan/default.nix index 77b0d915edb6..7351712b887d 100644 --- a/pkgs/os-specific/linux/mbpfan/default.nix +++ b/pkgs/os-specific/linux/mbpfan/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "mbpfan-${version}"; - version = "2.0.2"; + version = "2.1.0"; src = fetchFromGitHub { owner = "dgraziotin"; repo = "mbpfan"; rev = "v${version}"; - sha256 = "1l8fj92jxfp0sldvznsdsm3pn675b35clq3371h6d5wk4jx67fvg"; + sha256 = "1gysq778rkl6dvvj9a1swxcl15wvz0bng5bn4nwq118cl8p8pask"; }; installPhase = '' mkdir -p $out/bin $out/etc diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index 657f17c16849..86e9e0d3d4d0 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -14,11 +14,11 @@ let in stdenv.mkDerivation rec { name = "nfs-utils-${version}"; - version = "2.3.2"; + version = "2.3.3"; src = fetchurl { url = "https://kernel.org/pub/linux/utils/nfs-utils/${version}/${name}.tar.xz"; - sha256 = "06av6cjf8h18dpaxh8cd1awsra75zf6s5sj5r2z5g7scbj051ziw"; + sha256 = "08k36d7l8yqylscnln3p85lcfwi7r7g6n3bnslgmzc1i71wk92zn"; }; # libnfsidmap is built together with nfs-utils from the same source, diff --git a/pkgs/os-specific/linux/paxctl/default.nix b/pkgs/os-specific/linux/paxctl/default.nix index 270be695f03a..52e4c512f9a2 100644 --- a/pkgs/os-specific/linux/paxctl/default.nix +++ b/pkgs/os-specific/linux/paxctl/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv }: +{ fetchurl, stdenv, elf-header }: stdenv.mkDerivation rec { name = "paxctl-${version}"; @@ -9,7 +9,17 @@ stdenv.mkDerivation rec { sha256 = "0biw882fp1lmgs6kpxznp1v6758r7dg9x8iv5a06k0b82bcdsc53"; }; - preBuild = '' + # TODO Always do first way next mass rebuild. + buildInputs = stdenv.lib.optional + (!stdenv.hostPlatform.isLinux || !stdenv.buildPlatform.isLinux) + elf-header; + + # TODO Always do first way next mass rebuild. + preBuild = if !stdenv.hostPlatform.isLinux || !stdenv.buildPlatform.isLinux then '' + sed -i Makefile \ + -e 's|--owner 0 --group 0||g' \ + -e '/CC:=gcc/d' + '' else '' sed "s|--owner 0 --group 0||g" -i Makefile ''; @@ -24,7 +34,7 @@ stdenv.mkDerivation rec { description = "A tool for controlling PaX flags on a per binary basis"; homepage = "https://pax.grsecurity.net"; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.all; maintainers = with maintainers; [ thoughtpolice ]; }; } diff --git a/pkgs/os-specific/linux/psmisc/default.nix b/pkgs/os-specific/linux/psmisc/default.nix index 1eec10860f72..8b3906dedb1f 100644 --- a/pkgs/os-specific/linux/psmisc/default.nix +++ b/pkgs/os-specific/linux/psmisc/default.nix @@ -1,19 +1,30 @@ -{stdenv, fetchurl, ncurses}: +{stdenv, fetchFromGitLab, autoconf, automake, gettext, ncurses}: stdenv.mkDerivation rec { - name = "psmisc-23.1"; + pname = "psmisc"; + version = "23.2"; + name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://sourceforge/psmisc/${name}.tar.xz"; - sha256 = "0c5s94hqpwfmyswx2f96gifa6wdbpxxpkyxcrlzbxpvmrxsd911f"; + src = fetchFromGitLab { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "0d90wmibxpkl0d7sdibvvkwpyxyg6m6ksh5gwrjh15vf1swvd5i1"; }; - buildInputs = [ncurses]; + nativeBuildInputs = [ autoconf automake gettext ]; + buildInputs = [ ncurses ]; - meta = { - homepage = http://psmisc.sourceforge.net/; + preConfigure = '' + echo $version > .tarball-version + ./autogen.sh + ''; + + meta = with stdenv.lib; { + homepage = https://gitlab.com/psmisc/psmisc; description = "A set of small useful utilities that use the proc filesystem (such as fuser, killall and pstree)"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2Plus; + platforms = platforms.linux; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ ryantm ]; }; } diff --git a/pkgs/os-specific/linux/roccat-tools/default.nix b/pkgs/os-specific/linux/roccat-tools/default.nix new file mode 100644 index 000000000000..a413008ffd1a --- /dev/null +++ b/pkgs/os-specific/linux/roccat-tools/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, cmake, pkgconfig, gettext +, dbus, dbus_glib, libgaminggear, libgudev, lua +}: + +stdenv.mkDerivation rec { + name = "roccat-tools-${version}"; + version = "5.7.0"; + + src = fetchurl { + url = "mirror://sourceforge/roccat/${name}.tar.bz2"; + sha256 = "15gxplcm62167xhk65k8v6gg3j6jr0c5a64wlz72y1vfq0ai7qm6"; + }; + + postPatch = '' + sed -i -re 's,/(etc/xdg),\1,' roccateventhandler/CMakeLists.txt + + sed -i -e '/roccat_profile_dir(void).*{/,/}/ { + /return/c \ + return g_build_path("/", g_get_user_data_dir(), "roccat", NULL); + }' libroccat/roccat_helper.c + ''; + + nativeBuildInputs = [ cmake pkgconfig gettext ]; + buildInputs = [ dbus dbus_glib libgaminggear libgudev lua ]; + + enableParallelBuilding = true; + + cmakeFlags = [ + "-DUDEVDIR=\${out}/lib/udev/rules.d" + "-DCMAKE_MODULE_PATH=${libgaminggear.dev}/lib/cmake" + "-DWITH_LUA=${lua.luaversion}" + "-DLIBDIR=lib" + ]; + + meta = { + description = "Tools to configure ROCCAT devices"; + homepage = http://roccat.sourceforge.net/; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2Plus; + }; +} diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index dd8105c8c058..db64b8e6f6de 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, intltool, gperf, libcap, kmod +{ stdenv, lib, fetchFromGitHub, fetchpatch, pkgconfig, intltool, gperf, libcap, kmod , xz, pam, acl, libuuid, m4, utillinux, libffi , glib, kbd, libxslt, coreutils, libgcrypt, libgpgerror, libidn2, libapparmor , audit, lz4, bzip2, libmicrohttpd, pcre2 @@ -10,8 +10,8 @@ , getent , buildPackages , withSelinux ? false, libselinux -, withLibseccomp ? libseccomp.meta.available, libseccomp -, withKexectools ? kexectools.meta.available, kexectools +, withLibseccomp ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) libseccomp.meta.platforms, libseccomp +, withKexectools ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) kexectools.meta.platforms, kexectools }: let diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix index 78ab6b37532d..a816a2139395 100644 --- a/pkgs/os-specific/linux/udisks/2-default.nix +++ b/pkgs/os-specific/linux/udisks/2-default.nix @@ -6,7 +6,7 @@ }: let - version = "2.8.0"; + version = "2.8.1"; in stdenv.mkDerivation rec { name = "udisks-${version}"; @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { owner = "storaged-project"; repo = "udisks"; rev = name; - sha256 = "110g3vyai3p6vjzy01yd0bbvxk7n7dl5glxf54f3jvqf0zmaqipx"; + sha256 = "073iqa0pwa7ab0qw33h3ic89508a78incmg6rq914d6br7s030zy"; }; outputs = [ "out" "man" "dev" "devdoc" ]; diff --git a/pkgs/servers/http/apt-cacher-ng/default.nix b/pkgs/servers/http/apt-cacher-ng/default.nix index 415b1fb48a2a..aa826a9c528b 100644 --- a/pkgs/servers/http/apt-cacher-ng/default.nix +++ b/pkgs/servers/http/apt-cacher-ng/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { name = "apt-cacher-ng-${version}"; - version = "3.1"; + version = "3.2"; src = fetchurl { url = "http://ftp.debian.org/debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_${version}.orig.tar.xz"; - sha256 = "0p8cdig70vz1dgw2v8brjin5wqrk8amncphyf11f53bza5grlc91"; + sha256 = "1kas5xq44rx33pczhrz05dsdhjaavxdmcs5h1ygfi76bpqvyhpa0"; }; nativeBuildInputs = [ cmake doxygen pkgconfig ]; diff --git a/pkgs/servers/hydron/default.nix b/pkgs/servers/hydron/default.nix index 03fdf7908cc4..012b66e19809 100644 --- a/pkgs/servers/hydron/default.nix +++ b/pkgs/servers/hydron/default.nix @@ -3,15 +3,15 @@ buildGoPackage rec { name = "hydron-unstable-${version}"; - version = "2018-08-18"; + version = "2018-09-25"; goPackagePath = "github.com/bakape/hydron"; goDeps = ./deps.nix; src = fetchFromGitHub { owner = "bakape"; repo = "hydron"; - rev = "78257f1c1f34cdad1931531601163071f7f29aa9"; - sha256 = "0rpvbayx48xncy70vzbxn3cs0lslza0i3hxmywlngyl17da97bf0"; + rev = "ad88ec03e5c7a527fddebb6b54909f50ecaae00c"; + sha256 = "074bzl38f4y4xs4vavbn7mgi4srv1fbzkcx4p17mrqipzk6ffbca"; }; enableParallelBuilding = true; diff --git a/pkgs/servers/hydron/deps.nix b/pkgs/servers/hydron/deps.nix index c5d584f1bcd3..b2c367cf42d6 100644 --- a/pkgs/servers/hydron/deps.nix +++ b/pkgs/servers/hydron/deps.nix @@ -5,8 +5,8 @@ fetch = { type = "git"; url = "https://github.com/Masterminds/squirrel"; - rev = "8a7e65843414bc07f3d85bebaa10d7cc96253c29"; - sha256 = "0n7msdji0h7iysyqsi0iiq9i1hdgyyz9cwzxpc6qppz7cllnfpnn"; + rev = "3b6e9e96624526bce05b577b76ca726a20bb3c83"; + sha256 = "16jw3af3lyb5x9yn7anx0rb3mz70bivnixkvh8dzrq16wkkn760h"; }; } { @@ -23,8 +23,8 @@ fetch = { type = "git"; url = "https://github.com/dimfeld/httptreemux"; - rev = "7f532489e7739b3d49df5c602bf63549881fe753"; - sha256 = "0hkw04rsvljvx8ynqjgz9cb743x09fd2xiiycrgz5vbsa8q9iyyk"; + rev = "a53c8f73d4b7d82c30b7e5ab6aa155b981c42fb5"; + sha256 = "08s90ggydcwz2683bbsrc33h2b7x2q5ws104gva838b573xzrhqj"; }; } { @@ -32,8 +32,8 @@ fetch = { type = "git"; url = "https://github.com/gorilla/handlers"; - rev = "7e0847f9db758cdebd26c149d0ae9d5d0b9c98ce"; - sha256 = "0mnw81ayjm4d8462qg8spmcwxmchn24158bf93zxjab51pg8n9gm"; + rev = "7e0369fae54b097612a946bc6709f3a3fbccb3de"; + sha256 = "00i2is2z7101igf7sr8prmd8m59x7k7xdkhm5h4bjs37k157zm38"; }; } { @@ -59,17 +59,8 @@ fetch = { type = "git"; url = "https://github.com/lib/pq"; - rev = "90697d60dd844d5ef6ff15135d0203f65d2f53b8"; - sha256 = "0hb4bfsk8g5473yzbf3lzrb373xicakjznkf0v085xgimz991i9r"; - }; - } - { - goPackagePath = "github.com/mailru/easyjson"; - fetch = { - type = "git"; - url = "https://github.com/mailru/easyjson"; - rev = "03f2033d19d5860aef995fe360ac7d395cd8ce65"; - sha256 = "0r62ym6m1ijby7nwplq0gdnhak8in63njyisrwhr3xpx9vkira97"; + rev = "4ded0e9383f75c197b3a2aaa6d590ac52df6fd79"; + sha256 = "1zqnnyczaf00xi6xh53vq758v5bdlf0iz7kf22l02cal4i6px47i"; }; } { @@ -77,8 +68,8 @@ fetch = { type = "git"; url = "https://github.com/mattn/go-sqlite3"; - rev = "b3511bfdd742af558b54eb6160aca9446d762a19"; - sha256 = "1v41is0h05p4jgv8nal3l8lcdcggylsyblq0ihycnprkdzwls808"; + rev = "e85a2792f3166972d6619b7051f01a2df254192a"; + sha256 = "088bckqifg61xdda0f0hrcyzm3dslr3jzcsgdyk8ccjmjv2112sd"; }; } { @@ -86,8 +77,8 @@ fetch = { type = "git"; url = "https://github.com/valyala/bytebufferpool"; - rev = "e746df99fe4a3986f4d4f79e13c1e0117ce9c2f7"; - sha256 = "01lqzjddq6kz9v41nkky7wbgk7f1cw036sa7ldz10d82g5klzl93"; + rev = "cdfbe9377474227bb42120c1e22fd4433e7f69bf"; + sha256 = "0c6cixd85dvl2gvs7sdh0k2wm8r3grl4fw0jg4w7d78cp8s2k7ag"; }; } { @@ -95,8 +86,8 @@ fetch = { type = "git"; url = "https://github.com/valyala/quicktemplate"; - rev = "a91e0946457b6583004fbfc159339b8171423aed"; - sha256 = "1z89ang5pkq5qs5b2nwhzyrw0zjlsas539l9kix374fhka49n8yc"; + rev = "dc50ff9977a68a543145ce34e0e0030bebcc89be"; + sha256 = "1980q2c5w4jhrlhf1pimc8yrkz005x3jbsi7hk4hnx6d5iy5lmb6"; }; } { @@ -104,8 +95,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "aaf60122140d3fcf75376d319f0554393160eb50"; - sha256 = "03i6ij7jcf5mp9dc8ps8b63g1k843z7c823qyzn5a276gpxvxlvv"; + rev = "f04abc6bdfa7a0171a8a0c9fd2ada9391044d056"; + sha256 = "0mygvmprcssixj3bm2djl3xzdnyh4zqhkwhynzml5rha8mvrxknd"; }; } ] diff --git a/pkgs/servers/lidarr/default.nix b/pkgs/servers/lidarr/default.nix new file mode 100644 index 000000000000..3290d8ba1d1a --- /dev/null +++ b/pkgs/servers/lidarr/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper }: + +stdenv.mkDerivation rec { + name = "lidarr-${version}"; + version = "0.3.1.471"; + + src = fetchurl { + url = "https://github.com/lidarr/Lidarr/releases/download/v${version}/Lidarr.develop.${version}.linux.tar.gz"; + sha256 = "1x8q5yivkz8rwpkz0gdi73iaszb253bm1c3rdzar7xgrqr3g11nm"; + }; + + buildInputs = [ + makeWrapper + ]; + + installPhase = '' + mkdir -p $out/bin + cp -r * $out/bin/ + + # Mark all executable files as non-executable + find $out/bin -type f -executable | xargs chmod -x + + makeWrapper "${mono}/bin/mono" $out/bin/Lidarr \ + --add-flags "$out/bin/Lidarr.exe" \ + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ + curl sqlite libmediainfo ]} + ''; + + meta = with stdenv.lib; { + description = "A Usenet/BitTorrent music downloader"; + homepage = https://lidarr.audio/; + license = licenses.gpl3; + maintainers = [ maintainers.etu ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 41dfebab7907..d88b9f8b0dbc 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -13,7 +13,7 @@ let ] ++ lib.optional withPgSQL "-DHAS_PGSQL" ++ lib.optionals withMySQL [ "-DHAS_MYSQL" "-I${mysql.connector-c}/include/mysql" "-L${mysql.connector-c}/lib/mysql" ] ++ lib.optional withSQLite "-DHAS_SQLITE" - ++ lib.optional withLDAP "-DHAS_LDAP"); + ++ lib.optionals withLDAP ["-DHAS_LDAP" "-DUSE_LDAP_SASL"]); auxlibs = lib.concatStringsSep " " ([ "-ldb" "-lnsl" "-lresolv" "-lsasl2" "-lcrypto" "-lssl" ] ++ lib.optional withPgSQL "-lpq" diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix index 4de63d694667..c8da0ea630e1 100644 --- a/pkgs/servers/mail/rspamd/default.nix +++ b/pkgs/servers/mail/rspamd/default.nix @@ -6,13 +6,13 @@ in stdenv.mkDerivation rec { name = "rspamd-${version}"; - version = "1.7.3"; + version = "1.7.9"; src = fetchFromGitHub { owner = "vstakhov"; repo = "rspamd"; rev = version; - sha256 = "1gb4zg8i1nj337f65s434h299ad19c0d7jyawb2glvv3n4cshm97"; + sha256 = "1qfkmcrcswh7k7bvr1ki1n83lnjmfd9h0281qgia0dlam7y81bcy"; }; nativeBuildInputs = [ cmake pkgconfig perl ]; diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix index bab3faa79695..dd56bc89c0d0 100644 --- a/pkgs/servers/monitoring/cadvisor/default.nix +++ b/pkgs/servers/monitoring/cadvisor/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "cadvisor-${version}"; - version = "0.30.2"; + version = "0.31.0"; src = fetchFromGitHub { owner = "google"; repo = "cadvisor"; rev = "v${version}"; - sha256 = "143jsm0pbfhsa2iwkg5zanl9qxbpmsdvay5djyac4rvgl53m0wy9"; + sha256 = "0dnn2vgjbbb82kvbmgrfq0hqwfk0jh5gc3xrcfqwvvq673yf4f2m"; }; nativeBuildInputs = [ go ]; diff --git a/pkgs/servers/mpd/clientlib.nix b/pkgs/servers/mpd/clientlib.nix index 478d43722679..5201e150e2ab 100644 --- a/pkgs/servers/mpd/clientlib.nix +++ b/pkgs/servers/mpd/clientlib.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, meson, ninja, fixDarwinDylibNames }: stdenv.mkDerivation rec { - version = "2.14"; + version = "2.15"; name = "libmpdclient-${version}"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "libmpdclient"; rev = "v${version}"; - sha256 = "15vn9m4qcsccff5rg7jkzy5503skz6bmqqk6qc2smgvjgwn533sm"; + sha256 = "18x6drzh867afwaakyfb8hcx37pnxxwvvpcs3n2fimnfa6vxgwaa"; }; nativeBuildInputs = [ meson ninja ] diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix index 88a8d0e87071..f0f89c3f0fa0 100644 --- a/pkgs/servers/plex/default.nix +++ b/pkgs/servers/plex/default.nix @@ -6,9 +6,9 @@ let plexPass = throw "Plex pass has been removed at upstream's request; please unset nixpkgs.config.plex.pass"; plexpkg = if enablePlexPass then plexPass else { - version = "1.13.5.5291"; - vsnHash = "6fa5e50a8"; - sha256 = "1h0r7hxxw5jf2dn8w4cnj71dm873y2j0l87rg8pf0r3cyx6rhxnx"; + version = "1.13.8.5395"; + vsnHash = "10d48da0d"; + sha256 = "0lpsh87kcrqwi2qqkj1ccb86hif535yb45hhc41c0ixsfxbqk5cw"; }; in stdenv.mkDerivation rec { @@ -39,7 +39,6 @@ in stdenv.mkDerivation rec { for bin in "Plex Media Server" \ "Plex DLNA Server" \ "Plex Media Scanner" \ - "Plex Media Server Tests" \ "Plex Relay" \ "Plex Script Host" \ "Plex Transcoder" \ @@ -66,7 +65,7 @@ in stdenv.mkDerivation rec { RSC=$out/usr/lib/plexmediaserver/Resources for db in "com.plexapp.plugins.library.db"; do mv $RSC/$db $RSC/base_$db - ln -s ${dataDir}/.skeleton/$db $RSC/$db + ln -s "${dataDir}/.skeleton/$db" $RSC/$db done ''; diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/servers/roundcube/default.nix new file mode 100644 index 000000000000..40afd7043e41 --- /dev/null +++ b/pkgs/servers/roundcube/default.nix @@ -0,0 +1,23 @@ +{ lib, stdenv, fetchzip }: +let + version = "1.3.7"; +in +fetchzip rec { + name= "roundcube-${version}"; + + url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz"; + sha256 = "0xwqy0adynx7066a0cvz9vyg85waax1i4p70kcdkz7q5jnw4jzhf"; + + extraPostFetch = '' + ln -sf /etc/roundcube/config.inc.php $out/config/config.inc.php + rm -rf $out/installer + ''; + + meta = { + description = "Open Source Webmail Software"; + maintainers = with stdenv.lib.maintainers; [ vskilet ]; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.all; + }; +} + diff --git a/pkgs/servers/shairport-sync/default.nix b/pkgs/servers/shairport-sync/default.nix index fbce457aedc2..eef975881117 100644 --- a/pkgs/servers/shairport-sync/default.nix +++ b/pkgs/servers/shairport-sync/default.nix @@ -28,9 +28,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; configureFlags = [ - "--with-alsa" "--with-pipe" "--with-pulseaudio" "--with-stdout" + "--with-alsa" "--with-pipe" "--with-pa" "--with-stdout" "--with-avahi" "--with-ssl=openssl" "--with-soxr" - "--without-configfiles" "--without-initscript" + "--without-configfiles" ]; meta = with stdenv.lib; { diff --git a/pkgs/servers/shishi/default.nix b/pkgs/servers/shishi/default.nix index 1540a6f1fd18..b066ff18bfdc 100644 --- a/pkgs/servers/shishi/default.nix +++ b/pkgs/servers/shishi/default.nix @@ -14,7 +14,7 @@ let mkWith = mkFlag "with-" "without-"; mkOther = mkFlag "" "" true; - shouldUsePkg = pkg: if pkg != null && pkg.meta.available then pkg else null; + shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null; optPam = shouldUsePkg pam; optLibidn = shouldUsePkg libidn; diff --git a/pkgs/servers/sickbeard/default.nix b/pkgs/servers/sickbeard/default.nix new file mode 100644 index 000000000000..4d6e181c61d2 --- /dev/null +++ b/pkgs/servers/sickbeard/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, python2, makeWrapper }: + +let + pythonEnv = python2.withPackages(ps: with ps; [ cheetah ]); +in python2.pkgs.buildPythonApplication rec { + name = "sickbeard-${version}"; + version = "2016-03-21"; + + src = fetchFromGitHub { + owner = "midgetspy"; + repo = "Sick-Beard"; + rev = "171a607e41b7347a74cc815f6ecce7968d9acccf"; + sha256 = "16bn13pvzl8w6nxm36ii724x48z1cnf8y5fl0m5ig1vpqfypk5vq"; + }; + + dontBuild = true; + doCheck = false; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ pythonEnv ]; + + installPhase = '' + mkdir -p $out/bin + cp -R {autoProcessTV,cherrypy,data,lib,sickbeard,SickBeard.py} $out/ + + makeWrapper $out/SickBeard.py $out/bin/sickbeard + ''; + + meta = with stdenv.lib; { + description = "PVR & episode guide that downloads and manages all your TV shows"; + license = licenses.gpl3; + homepage = https:/github.com/midgetspy/Sick-Beard; + maintainers = with stdenv.lib.maintainers; [ ]; + }; +} diff --git a/pkgs/servers/sickbeard/sickgear.nix b/pkgs/servers/sickbeard/sickgear.nix new file mode 100644 index 000000000000..21254f557530 --- /dev/null +++ b/pkgs/servers/sickbeard/sickgear.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, python2, makeWrapper }: + +let + pythonEnv = python2.withPackages(ps: with ps; [ cheetah ]); +in python2.pkgs.buildPythonApplication rec { + name = "sickgear-${version}"; + version = "0.17.5"; + + src = fetchFromGitHub { + owner = "SickGear"; + repo = "SickGear"; + rev = "release_${version}"; + sha256 = "1lx060klgxz8gjanfjvya6p6kd8842qbpp1qhhiw49a25r8gyxpk"; + }; + + dontBuild = true; + doCheck = false; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ pythonEnv ]; + + installPhase = '' + mkdir -p $out/bin + cp -R {autoProcessTV,gui,lib,sickbeard,SickBeard.py} $out/ + + makeWrapper $out/SickBeard.py $out/bin/sickgear + ''; + + meta = with stdenv.lib; { + description = "The most reliable stable TV fork of the great Sick-Beard to fully automate TV enjoyment with innovation"; + license = licenses.gpl3; + homepage = https:/github.com/SickGear/SickGear; + maintainers = with stdenv.lib.maintainers; [ ]; + }; +} diff --git a/pkgs/servers/sickbeard/sickrage.nix b/pkgs/servers/sickbeard/sickrage.nix new file mode 100644 index 000000000000..6ee119520b41 --- /dev/null +++ b/pkgs/servers/sickbeard/sickrage.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, python2, makeWrapper }: + +python2.pkgs.buildPythonApplication rec { + name = "sickrage-${version}"; + version = "v2018.07.21-1"; + + src = fetchFromGitHub { + owner = "SickRage"; + repo = "SickRage"; + rev = "${version}"; + sha256 = "0lzklpsxqrb73inbv8almnhbnb681pmi44gzc8i4sjwmdksiiif9"; + }; + + dontBuild = true; + doCheck = false; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ python2 ]; + + installPhase = '' + mkdir -p $out/bin + cp -R {gui,lib,locale,sickbeard,sickrage,SickBeard.py} $out/ + + makeWrapper $out/SickBeard.py $out/bin/sickrage + ''; + + meta = with stdenv.lib; { + description = "Automatic Video Library Manager for TV Shows"; + longDescription = "It watches for new episodes of your favorite shows, and when they are posted it does its magic."; + license = licenses.gpl3; + homepage = https://sickrage.github.io; + maintainers = [ "sterfield@gmail.com" ]; + }; +} diff --git a/pkgs/servers/sql/postgresql/pgroonga/default.nix b/pkgs/servers/sql/postgresql/pgroonga/default.nix index f4c7bfb1b85f..615a199ddb53 100644 --- a/pkgs/servers/sql/postgresql/pgroonga/default.nix +++ b/pkgs/servers/sql/postgresql/pgroonga/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pgroonga-${version}"; - version = "2.0.9"; + version = "2.1.3"; src = fetchurl { url = "https://packages.groonga.org/source/pgroonga/${name}.tar.gz"; - sha256 = "0dfkhl2im4cn2lczbsvb8zyylrzlm0vqk9ixjsalcaqxgxph2dpz"; + sha256 = "0qv82libl4rv6cq9klvzwx4g767mjl4jaap34sxbd3x0wvm364yd"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index 58054c34225b..be279937ef8a 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "traefik-${version}"; - version = "1.6.5"; + version = "1.7.0"; goPackagePath = "github.com/containous/traefik"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "containous"; repo = "traefik"; rev = "v${version}"; - sha256 = "0swiyyw7j7264avfk0a5jqs7h1hv4bq1k1kr92v4830azc9fxrvn"; + sha256 = "1nv2w174vw5dq60cz8a2riwjyl9rzxqwp7z7v5zv7ch0bxq9cvhn"; }; buildInputs = [ go-bindata bash ]; diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix index 11671aba633d..2b6877cb25f5 100644 --- a/pkgs/tools/admin/ansible/default.nix +++ b/pkgs/tools/admin/ansible/default.nix @@ -19,6 +19,8 @@ let ''; postInstall = '' + wrapPythonProgramsIn "$out/bin" "$out $PYTHONPATH" + for m in docs/man/man1/*; do install -vD $m -t $man/share/man/man1 done @@ -30,7 +32,7 @@ let dontPatchShebangs = false; propagatedBuildInputs = with py.pkgs; [ - pycrypto paramiko jinja2 pyyaml httplib2 boto six netaddr dnspython jmespath + pycrypto paramiko jinja2 pyyaml httplib2 boto six netaddr dnspython jmespath dopy ] ++ stdenv.lib.optional windowsSupport pywinrm; meta = with stdenv.lib; { diff --git a/pkgs/tools/admin/gixy/default.nix b/pkgs/tools/admin/gixy/default.nix index 029c09afdad4..ab5aad6d68cd 100644 --- a/pkgs/tools/admin/gixy/default.nix +++ b/pkgs/tools/admin/gixy/default.nix @@ -2,7 +2,7 @@ python.pkgs.buildPythonApplication rec { pname = "gixy"; - version = "0.1.9"; + version = "0.1.20"; # package is only compatible with python 2.7 and 3.5+ disabled = with python.pkgs; !(pythonAtLeast "3.5" || isPy27); @@ -12,7 +12,7 @@ python.pkgs.buildPythonApplication rec { owner = "yandex"; repo = "gixy"; rev = "v${version}"; - sha256 = "11aps8a8xg1nlw36jgrmnaf38imfz2rj67wnlalrrsqb616xipcv"; + sha256 = "14arz3fjidb8z37m08xcpih1391varj8s0v3gri79z3qb4zq5k6b"; }; postPatch = '' diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix index 14fedd6610e1..c4856d925299 100644 --- a/pkgs/tools/filesystems/ceph/generic.nix +++ b/pkgs/tools/filesystems/ceph/generic.nix @@ -37,7 +37,8 @@ with stdenv.lib; let shouldUsePkg = pkg_: let pkg = (builtins.tryEval pkg_).value; - in if pkg.meta.available or false then pkg else null; + in if lib.any (lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms + then pkg else null; optYasm = shouldUsePkg yasm; optFcgi = shouldUsePkg fcgi; diff --git a/pkgs/tools/filesystems/mkspiffs/default.nix b/pkgs/tools/filesystems/mkspiffs/default.nix new file mode 100644 index 000000000000..48f13925ab08 --- /dev/null +++ b/pkgs/tools/filesystems/mkspiffs/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, git }: + +# Changing the variables CPPFLAGS and BUILD_CONFIG_NAME can be done by +# overriding the same-named attributes. See ./presets.nix for examples. + +stdenv.mkDerivation rec { + name = "mkspiffs-${version}"; + version = "0.2.3"; + + src = fetchFromGitHub { + owner = "igrr"; + repo = "mkspiffs"; + rev = version; + fetchSubmodules = true; + sha256 = "1fgw1jqdlp83gv56mgnxpakky0q6i6f922niis4awvxjind8pbm1"; + }; + + nativeBuildInputs = [ git ]; + buildFlags = [ "dist" ]; + installPhase = '' + mkdir -p $out/bin + cp mkspiffs $out/bin + ''; + + meta = with stdenv.lib; { + description = "Tool to build and unpack SPIFFS images"; + license = licenses.mit; + homepage = https://github.com/igrr/mkspiffs; + maintainers = with maintainers; [ haslersn ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/filesystems/mkspiffs/presets.nix b/pkgs/tools/filesystems/mkspiffs/presets.nix new file mode 100644 index 000000000000..c0b74d9cf1b7 --- /dev/null +++ b/pkgs/tools/filesystems/mkspiffs/presets.nix @@ -0,0 +1,20 @@ +{ lib, mkspiffs }: + +# We provide the same presets as the upstream + +lib.mapAttrs ( + name: { CPPFLAGS }: + mkspiffs.overrideAttrs (drv: { + inherit CPPFLAGS; + BUILD_CONFIG_NAME = "-${name}"; + }) +) { + arduino-esp8266.CPPFLAGS = [ + "-DSPIFFS_USE_MAGIC_LENGTH=0" + "-DSPIFFS_ALIGNED_OBJECT_INDEX_TABLES=1" + ]; + + arduino-esp32.CPPFLAGS = [ "-DSPIFFS_OBJ_META_LEN=4" ]; + + esp-idf.CPPFLAGS = [ "-DSPIFFS_OBJ_META_LEN=4" ]; +} diff --git a/pkgs/tools/graphics/feedgnuplot/default.nix b/pkgs/tools/graphics/feedgnuplot/default.nix index 3708bc9c0fc6..fef5c657a7a2 100644 --- a/pkgs/tools/graphics/feedgnuplot/default.nix +++ b/pkgs/tools/graphics/feedgnuplot/default.nix @@ -10,13 +10,13 @@ in buildPerlPackage rec { name = "feedgnuplot-${version}"; - version = "1.49"; + version = "1.51"; src = fetchFromGitHub { owner = "dkogan"; repo = "feedgnuplot"; rev = "v${version}"; - sha256 = "1bjnx36rsxlj845w9apvdjpza8vd9rbs3dlmgvky6yznrwa6sm02"; + sha256 = "0npk2l032cnmibjj5zf3ii09mpxciqn32lx6g5bal91bkxwn7r5i"; }; outputs = [ "out" ]; diff --git a/pkgs/tools/graphics/gmic_krita_qt/default.nix b/pkgs/tools/graphics/gmic_krita_qt/default.nix new file mode 100644 index 000000000000..14d47dc30bd8 --- /dev/null +++ b/pkgs/tools/graphics/gmic_krita_qt/default.nix @@ -0,0 +1,82 @@ +{ stdenv, fetchurl, fetchFromGitHub, cmake, ninja, pkgconfig +, opencv, openexr, graphicsmagick, fftw, zlib, libjpeg, libtiff, libpng +, curl, krita, qtbase, qttools +, fetchgit }: + +let + version = "2.3.6"; + +in stdenv.mkDerivation rec { + name = "gmic_krita_qt-${version}"; + + gmic-community = fetchFromGitHub { + owner = "dtschump"; + repo = "gmic-community"; + rev = "3fd528f20a2a7d651e96078c205ff21efb9cdd1a"; + sha256 = "08d37b49qgh5d4rds7hvr5wjj4p1y8cnbidz1cyqsibq0555pwq2"; + }; + + CImg = fetchgit { + url = "https://framagit.org/dtschump/CImg"; + rev = "90f5657d8eab7b549ef945103ef680e747385805"; + sha256 = "1af3dwqq18dkw0lz2gvnlw8y0kc1cw01hnc72rf3pg2wyjcp0pvc"; + }; + + gmic_stdlib = fetchurl { + name = "gmic_stdlib.h"; + # Version should e in sync with gmic. Basically the version string without dots + url = "http://gmic.eu/gmic_stdlib236.h"; + sha256 = "0q5g87dsn9byd2qqsa9xrsggfb9qv055s3l2gc0jrcvpx2qbza4q"; + }; + + gmic = fetchFromGitHub { + owner = "dtschump"; + repo = "gmic"; + rev = "v.${version}"; + sha256 = "1yg9ri3n07drv8gz4x0mn39ryi801ibl26jaza47m19ma893m8fi"; + }; + + gmic_qt = fetchFromGitHub { + owner = "c-koi"; + repo = "gmic-qt"; + rev = "v.${version}"; + sha256= "0j9wqlq67dwzir36yg58xy5lbblwizvgcvlmzcv9d6l901d5ayf3"; + }; + + unpackPhase = '' + cp -r ${gmic} gmic + ln -s ${gmic-community} gmic-community + cp -r ${gmic_qt} gmic_qt + chmod -R +w gmic gmic_qt + ln -s ${CImg} CImg + + cp ${gmic_stdlib} gmic/src/gmic_stdlib.h + + cd gmic_qt + ''; + + preConfigure = '' + make -C ../gmic/src CImg.h gmic_stdlib.h + ''; + + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ + qtbase qttools fftw zlib libjpeg libtiff libpng + opencv openexr graphicsmagick curl krita + ]; + + cmakeFlags = [ "-DGMIC_QT_HOST=krita" ]; + + installPhase = '' + mkdir -p $out/bin; + install -Dm755 gmic_krita_qt "$out/bin/gmic_krita_qt" + ''; + + meta = with stdenv.lib; { + description = "Krita plugin for the G'MIC image processing framework"; + homepage = http://gmic.eu/; + license = licenses.gpl3; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/misc/bibutils/default.nix b/pkgs/tools/misc/bibutils/default.nix index d0434ebe28b4..d7cca2a77bdc 100644 --- a/pkgs/tools/misc/bibutils/default.nix +++ b/pkgs/tools/misc/bibutils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "bibutils-${version}"; - version = "6.6"; + version = "6.7"; src = fetchurl { url = "mirror://sourceforge/bibutils/bibutils_${version}_src.tgz"; - sha256 = "1zqwhjsngnflzdp2nd3762bvmkjq5mal417fly1n2xfgdqpg37ps"; + sha256 = "072cmhv692nk1lfcwmaqid5gpg8q4jc4vai5ss8lj72zms32p882"; }; configureFlags = [ "--dynamic" "--install-dir" "$(out)/bin" "--install-lib" "$(out)/lib" ]; diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix index 12c199801c71..b7ce52f49b36 100644 --- a/pkgs/tools/misc/goaccess/default.nix +++ b/pkgs/tools/misc/goaccess/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Real-time web log analyzer and interactive viewer that runs in a terminal in *nix systems"; - homepage = http://goaccess.prosoftcorp.com; + homepage = https://goaccess.io; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; maintainers = with stdenv.lib.maintainers; [ ederoyd46 garbas ]; diff --git a/pkgs/tools/misc/lnav/default.nix b/pkgs/tools/misc/lnav/default.nix index 4d7c27a39445..85e4ecd3229b 100644 --- a/pkgs/tools/misc/lnav/default.nix +++ b/pkgs/tools/misc/lnav/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "tstack"; repo = "lnav"; rev = "v${meta.version}"; - sha256 = "0hq9ri6a18z682gihxlbh1rndka0v6brkdqsyfsgh4c2fgib4fb7"; + sha256 = "0wzzny0sgrq1ga9qw9nr8ly4j3vy4agszma73902dsw2rwf17j6y"; inherit name; }; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ''; downloadPage = "https://github.com/tstack/lnav/releases"; license = licenses.bsd2; - version = "0.8.3"; + version = "0.8.4"; maintainers = [ maintainers.dochang ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/misc/phraseapp-client/default.nix b/pkgs/tools/misc/phraseapp-client/default.nix index b4cfe7b26c0e..74d24db574ff 100644 --- a/pkgs/tools/misc/phraseapp-client/default.nix +++ b/pkgs/tools/misc/phraseapp-client/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "phraseapp-client-${version}"; - version = "1.6.0"; + version = "1.11.0"; goPackagePath = "github.com/phrase/phraseapp-client"; subPackages = [ "." ]; @@ -11,9 +11,13 @@ buildGoPackage rec { owner = "phrase"; repo = "phraseapp-client"; rev = version; - sha256 = "0rgwl0rgkci045hg36s0q8jwkni1hzapqpi0mc0gk3rl7nagw622"; + sha256 = "0lfx0wv95hgczi74qnkw2cripwgvl53z2gi5i6nyflisy4r7vvkr"; }; + postInstall = '' + ln -s $bin/bin/phraseapp-client $bin/bin/phraseapp + ''; + meta = with stdenv.lib; { homepage = http://docs.phraseapp.com; description = "PhraseApp API v2 Command Line Client"; diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index 08df665aede6..b3ceb41191de 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -1,37 +1,34 @@ -{ stdenv, fetchurl, jre, graphviz }: +{ stdenv, fetchurl, makeWrapper, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2018.10"; + version = "1.2018.11"; name = "plantuml-${version}"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; - sha256 = "19s3zrfri388nfykcs67sfk0dhmiw0rcv0dvj1j4c0fkyhl41bjs"; + sha256 = "006bpxz6zsjypxscxbnz3b7icg47bfwcq1v7rvijflchw12hq9nm"; }; - # It's only a .jar file and a shell wrapper - phases = [ "installPhase" ]; + nativeBuildInputs = [ makeWrapper ]; - installPhase = '' - mkdir -p "$out/bin" - mkdir -p "$out/lib" + buildCommand = '' + install -Dm644 $src $out/lib/plantuml.jar - cp "$src" "$out/lib/plantuml.jar" + mkdir -p $out/bin + makeWrapper ${jre}/bin/java $out/bin/plantuml \ + --argv0 plantuml \ + --set GRAPHVIZ_DOT ${graphviz}/bin/dot \ + --add-flags "-jar $out/lib/plantuml.jar" - cat > "$out/bin/plantuml" << EOF - #!${stdenv.shell} - export GRAPHVIZ_DOT="${graphviz}/bin/dot" - exec "${jre}/bin/java" -jar "$out/lib/plantuml.jar" "\$@" - EOF - chmod a+x "$out/bin/plantuml" + $out/bin/plantuml -help ''; meta = with stdenv.lib; { description = "Draw UML diagrams using a simple and human readable text description"; homepage = http://plantuml.sourceforge.net/; - # "java -jar plantuml.jar -license" says GPLv3 or later + # "plantuml -license" says GPLv3 or later license = licenses.gpl3Plus; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix index 21d81507dee0..60851b467ed1 100644 --- a/pkgs/tools/misc/pspg/default.nix +++ b/pkgs/tools/misc/pspg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pspg-${version}"; - version = "1.4.2"; + version = "1.6.2"; src = fetchFromGitHub { owner = "okbob"; repo = "pspg"; rev = "${version}"; - sha256 = "0hmx9p5pbydnf8sil4vqpmly5mq2rvcj8a33s9fvfisnxxsqz73v"; + sha256 = "0gg94isnmng1qigghc2lrk4mvim20clbfhacwlxnd237ypv4mn2s"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/misc/recoverjpeg/default.nix b/pkgs/tools/misc/recoverjpeg/default.nix index 72ea7f2ea0b0..484bb765c0db 100644 --- a/pkgs/tools/misc/recoverjpeg/default.nix +++ b/pkgs/tools/misc/recoverjpeg/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "recoverjpeg-${version}"; - version = "2.6.2"; + version = "2.6.3"; src = fetchurl { url = "https://www.rfc1149.net/download/recoverjpeg/${name}.tar.gz"; - sha256 = "01vayn2b3mqmyqz2ka2j3k4a93bjdvkhv5ry9207v04r83r7iwfp"; + sha256 = "009jgxi8lvdp00dwfj0n4x5yqrf64x00xdkpxpwgl2v8wcqn56fv"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/woeusb/default.nix b/pkgs/tools/misc/woeusb/default.nix index e75baac669a3..0f0455fe0fe3 100644 --- a/pkgs/tools/misc/woeusb/default.nix +++ b/pkgs/tools/misc/woeusb/default.nix @@ -3,14 +3,14 @@ , wxGTK30 }: stdenv.mkDerivation rec { - version = "3.2.2"; + version = "3.2.9"; name = "woeusb-${version}"; src = fetchFromGitHub { owner = "slacka"; repo = "WoeUSB"; rev = "v${version}"; - sha256 = "08spc7r5zgn483y7jmnlqi5417p6h1v6izyx10jnk39md6lv8pb3"; + sha256 = "1h2msp45slcd2s5jgw7ma9r7pl7schrvifw3kp53skxfpyax4j35"; }; buildInputs = [ wxGTK30 autoreconfHook makeWrapper ]; diff --git a/pkgs/tools/misc/yank/default.nix b/pkgs/tools/misc/yank/default.nix index 36aa4ab09c46..eaefd6d61aa6 100644 --- a/pkgs/tools/misc/yank/default.nix +++ b/pkgs/tools/misc/yank/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "mptre"; repo = "yank"; rev = "v${meta.version}"; - sha256 = "0v5aynrilm4fj7gz03q0yz6806ssjxhlv4bsa0213bgkin5iiws7"; + sha256 = "03h99i59kq8jlmshfwas1qm4y5ksw9lxaf9kr14l2mp028g7930n"; inherit name; }; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; downloadPage = "https://github.com/mptre/yank/releases"; license = licenses.mit; - version = "0.8.3"; + version = "1.0.0"; maintainers = [ maintainers.dochang ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/misc/yubico-piv-tool/default.nix b/pkgs/tools/misc/yubico-piv-tool/default.nix index d0b7ebf3fc83..ab9eb5d001b2 100644 --- a/pkgs/tools/misc/yubico-piv-tool/default.nix +++ b/pkgs/tools/misc/yubico-piv-tool/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, openssl, pcsclite, check }: stdenv.mkDerivation rec { - name = "yubico-piv-tool-1.6.1"; + name = "yubico-piv-tool-1.6.2"; src = fetchurl { url = "https://developers.yubico.com/yubico-piv-tool/Releases/${name}.tar.gz"; - sha256 = "10xgdc51xvszkxmsvqnbjs8ixxz7rfnfahh3wn8glllynmszbhwi"; + sha256 = "06r3vxgj7qrk8si7khjy696sm45h3w9d0rrrj0hyswalqzavqqga"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/networking/fping/default.nix b/pkgs/tools/networking/fping/default.nix index adcb59135ee1..e0cd0ff8849a 100644 --- a/pkgs/tools/networking/fping/default.nix +++ b/pkgs/tools/networking/fping/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "fping-4.0"; + name = "fping-4.1"; src = fetchurl { url = "https://www.fping.org/dist/${name}.tar.gz"; - sha256 = "1kp81wchi79l8z8rrj602fpjrd8bi84y3i7fsaclzlwap5943sv7"; + sha256 = "0wxbvm480vij8dy4v1pi8f0c7010rx6bidg3qhsvkdf2ijhy4cr7"; }; configureFlags = [ "--enable-ipv6" "--enable-ipv4" ]; diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix index 581a45eaebb9..5bdbe17e4d10 100644 --- a/pkgs/tools/networking/isync/default.nix +++ b/pkgs/tools/networking/isync/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, openssl, pkgconfig, db, cyrus_sasl, perl }: +{ fetchurl, stdenv, openssl, pkgconfig, db, zlib, cyrus_sasl, perl }: stdenv.mkDerivation rec { name = "isync-1.3.0"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig perl ]; - buildInputs = [ openssl db cyrus_sasl ]; + buildInputs = [ openssl db cyrus_sasl zlib ]; meta = with stdenv.lib; { homepage = http://isync.sourceforge.net/; diff --git a/pkgs/tools/networking/kail/default.nix b/pkgs/tools/networking/kail/default.nix index 1444c398e20c..e13511487170 100644 --- a/pkgs/tools/networking/kail/default.nix +++ b/pkgs/tools/networking/kail/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "kail-${version}"; - version = "0.6.0"; + version = "0.7.0"; goPackagePath = "github.com/boz/kail"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "boz"; repo = "kail"; rev = "v${version}"; - sha256 = "17ybcncdjssil4bn3n2jp1asfcpl8vj560afb2mry9032qrryvx9"; + sha256 = "0j0948wjn0jsk89fp0l29pd90n86wi85yghrbdhwihhgyqcdmhi0"; }; # regenerate deps.nix using following steps: @@ -26,6 +26,6 @@ buildGoPackage rec { description = "Kubernetes log viewer"; homepage = https://github.com/boz/kail; license = licenses.mit; - maintainers = with maintainers; [ offline ]; + maintainers = with maintainers; [ offline vdemeester ]; }; } diff --git a/pkgs/tools/networking/kail/deps.nix b/pkgs/tools/networking/kail/deps.nix index b7b4bfb38560..ee5d2fb8271f 100644 --- a/pkgs/tools/networking/kail/deps.nix +++ b/pkgs/tools/networking/kail/deps.nix @@ -14,26 +14,8 @@ fetch = { type = "git"; url = "https://github.com/Azure/go-autorest"; - rev = "f6be1abbb5abd0517522f850dd785990d373da7e"; - sha256 = "1dgmvvp2lk5z2mc9f6wg5jgi2szgljy02k69lqbym8zqlph3h01n"; - }; - } - { - goPackagePath = "github.com/PuerkitoBio/purell"; - fetch = { - type = "git"; - url = "https://github.com/PuerkitoBio/purell"; - rev = "7cf257f0a33260797b0febf39f95fccd86aab2a3"; - sha256 = "1j4dcv8ryqxwpmb6k12ilkgkjwa0viymygfa3ilvfw0149jh0syk"; - }; - } - { - goPackagePath = "github.com/PuerkitoBio/urlesc"; - fetch = { - type = "git"; - url = "https://github.com/PuerkitoBio/urlesc"; - rev = "de5bf2ad457846296e2031421a34e2568e304e35"; - sha256 = "0n0srpqwbaan1wrhh2b7ysz543pjs1xw2rghvqyffg9l0g8kzgcw"; + rev = "1ff28809256a84bb6966640ff3d0371af82ccba4"; + sha256 = "0sxvj2j1833bqwxvhq3wq3jgq73rnb81pnzvl0x3y1m0hzpaf2zv"; }; } { @@ -77,8 +59,8 @@ fetch = { type = "git"; url = "https://github.com/boz/kcache"; - rev = "fb1338d323013e9456687dc080038aa0bb211783"; - sha256 = "05y7j3sxpa9nhpq53af9ad42fvwx7l3cpjm69nminrlqjmjs63zd"; + rev = "a012826955254d3f31548911e75a9dbd817f9470"; + sha256 = "0xqw4mgz0scjrcfsyfwfdhggq1q80dv4mdqgdaryy5ir18srg15l"; }; } { @@ -95,26 +77,8 @@ fetch = { type = "git"; url = "https://github.com/dgrijalva/jwt-go"; - rev = "a539ee1a749a2b895533f979515ac7e6e0f5b650"; - sha256 = "1kxvm6zyawisl3w4pcycqjld4r0x6hqpfh9jwqsg5y9pi330n5z9"; - }; - } - { - goPackagePath = "github.com/emicklei/go-restful"; - fetch = { - type = "git"; - url = "https://github.com/emicklei/go-restful"; - rev = "68c9750c36bb8cb433f1b88c807b4b30df4acc40"; - sha256 = "0bc0wd5nipz1x078vpq82acyc7ip0qv1sddl451d7f7bvfms6h67"; - }; - } - { - goPackagePath = "github.com/emicklei/go-restful-swagger12"; - fetch = { - type = "git"; - url = "https://github.com/emicklei/go-restful-swagger12"; - rev = "dcef7f55730566d41eae5db10e7d6981829720f6"; - sha256 = "0zz1f6n1qfbyrp592mgyrkyfhki3r0ksic6ja9lxisg8br1ibrvq"; + rev = "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e"; + sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp"; }; } { @@ -136,42 +100,6 @@ }; } { - goPackagePath = "github.com/go-openapi/jsonpointer"; - fetch = { - type = "git"; - url = "https://github.com/go-openapi/jsonpointer"; - rev = "779f45308c19820f1a69e9a4cd965f496e0da10f"; - sha256 = "10vv0xsabkvv81xpqqq95fvxnlpf07x9zwzl41g8x2lx05ibxsnc"; - }; - } - { - goPackagePath = "github.com/go-openapi/jsonreference"; - fetch = { - type = "git"; - url = "https://github.com/go-openapi/jsonreference"; - rev = "36d33bfe519efae5632669801b180bf1a245da3b"; - sha256 = "0d163wv3mj9cbhdqc9jqzw2kwi961lg4p30d8gcd6ddz0q752ykh"; - }; - } - { - goPackagePath = "github.com/go-openapi/spec"; - fetch = { - type = "git"; - url = "https://github.com/go-openapi/spec"; - rev = "3faa0055dbbf2110abc1f3b4e3adbb22721e96e7"; - sha256 = "1a3q073zaq5d10kzgba7a85l4g389r5qgbpwk4nkbawpdzm8svaz"; - }; - } - { - goPackagePath = "github.com/go-openapi/swag"; - fetch = { - type = "git"; - url = "https://github.com/go-openapi/swag"; - rev = "f3f9494671f93fcff853e3c6e9e948b3eb71e590"; - sha256 = "13lqn4xqy9vma9aqsjb0fzfzi0q8l6dmg65sjxqdxf3q6gzkvmjy"; - }; - } - { goPackagePath = "github.com/gogo/protobuf"; fetch = { type = "git"; @@ -244,15 +172,6 @@ }; } { - goPackagePath = "github.com/howeyc/gopass"; - fetch = { - type = "git"; - url = "https://github.com/howeyc/gopass"; - rev = "bf9dde6d0d2c004a008c27aaee91170c786f6db8"; - sha256 = "1jxzyfnqi0h1fzlsvlkn10bncic803bfhslyijcxk55mgh297g45"; - }; - } - { goPackagePath = "github.com/imdario/mergo"; fetch = { type = "git"; @@ -266,44 +185,44 @@ fetch = { type = "git"; url = "https://github.com/json-iterator/go"; - rev = "abe3c4016bd3f50fa9c5b0e909641e2b8370b0cf"; - sha256 = "18v04mxgssjw2wivrbrfm8v7k617szjjdndgink00pla03pga0cc"; + rev = "ab8a2e0c74be9d3be70b3184d9acc634935ded82"; + sha256 = "1x3wz44p1238gpyzkiiilvvrq9q8dwjdm9kdidq65yjq0zcn0sq4"; }; } { - goPackagePath = "github.com/juju/ratelimit"; + goPackagePath = "github.com/mattn/go-colorable"; fetch = { type = "git"; - url = "https://github.com/juju/ratelimit"; - rev = "5b9ff866471762aa2ab2dced63c9fb6f53921342"; - sha256 = "12fsx3wqg49wisigbybdzic7gc2p5a0fk55714mpv7zq8jr6i46k"; + url = "https://github.com/mattn/go-colorable"; + rev = "6df6d4d004b64986bbb0d1b25945f42b44787e90"; + sha256 = "0ha2biq708is9i3hqc30vihcpajak3qawn0rnacb9k1gyxsxwb60"; }; } { - goPackagePath = "github.com/mailru/easyjson"; + goPackagePath = "github.com/mattn/go-isatty"; fetch = { type = "git"; - url = "https://github.com/mailru/easyjson"; - rev = "2f5df55504ebc322e4d52d34df6a1f5b503bf26d"; - sha256 = "0d9m8kyhbawa452vnwn255xxnh6pkp3im0d2310rw1k14nh3yh1p"; + url = "https://github.com/mattn/go-isatty"; + rev = "fc9e8d8ef48496124e79ae0df75490096eccf6fe"; + sha256 = "1r5f9gkavkb1w6sr0qs5kj16706xirl3qnlq3hqpszkw9w27x65a"; }; } { - goPackagePath = "github.com/mattn/go-colorable"; + goPackagePath = "github.com/modern-go/concurrent"; fetch = { type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "6df6d4d004b64986bbb0d1b25945f42b44787e90"; - sha256 = "0ha2biq708is9i3hqc30vihcpajak3qawn0rnacb9k1gyxsxwb60"; + url = "https://github.com/modern-go/concurrent"; + rev = "bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94"; + sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs"; }; } { - goPackagePath = "github.com/mattn/go-isatty"; + goPackagePath = "github.com/modern-go/reflect2"; fetch = { type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "fc9e8d8ef48496124e79ae0df75490096eccf6fe"; - sha256 = "1r5f9gkavkb1w6sr0qs5kj16706xirl3qnlq3hqpszkw9w27x65a"; + url = "https://github.com/modern-go/reflect2"; + rev = "94122c33edd36123c84d5368cfb2b69df93a0ec8"; + sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf"; }; } { @@ -415,6 +334,15 @@ }; } { + goPackagePath = "golang.org/x/time"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/time"; + rev = "fbb02b2291d28baffd63558aa44b4b56f178d650"; + sha256 = "0jjqcv6rzihlgg4i797q80g1f6ch5diz2kxqh6488gwkb6nds4h4"; + }; + } + { goPackagePath = "google.golang.org/appengine"; fetch = { type = "git"; @@ -455,8 +383,8 @@ fetch = { type = "git"; url = "https://github.com/kubernetes/api"; - rev = "218912509d74a117d05a718bb926d0948e531c20"; - sha256 = "076jca9c4rsg2kwjwv4kr6qgpbj4w1z0xprkxz5f5glxjnffdifk"; + rev = "2d6f90ab1293a1fb871cf149423ebb72aa7423aa"; + sha256 = "1cwrwdm104xd3608b1a5mw6a19w45532p647xdwnyn62rw2f08jx"; }; } { @@ -464,8 +392,8 @@ fetch = { type = "git"; url = "https://github.com/kubernetes/apimachinery"; - rev = "18a564baac720819100827c16fdebcadb05b2d0d"; - sha256 = "0x6sxr79rmnjyk0m53n66xr58xb8mza716jdn9f0djjwd10d1p1i"; + rev = "103fd098999dc9c0c88536f5c9ad2e5da39373ae"; + sha256 = "04navnpm59d75dhlz07rmay7m2izrf4m0i9xklxzqg7mlk9g20jc"; }; } { @@ -473,17 +401,8 @@ fetch = { type = "git"; url = "https://github.com/kubernetes/client-go"; - rev = "82aa063804cf055e16e8911250f888bc216e8b61"; - sha256 = "1l8dakfsawgxhiaqq0k9360gl13vr44sbjdxf7sbg3pl2csmi6pf"; - }; - } - { - goPackagePath = "k8s.io/kube-openapi"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/kube-openapi"; - rev = "abfc5fbe1cf87ee697db107fdfd24c32fe4397a8"; - sha256 = "1hvrdbpf8w6jr533pa3cqws42plasl5vzcr8fj89gxdbhga6b10j"; + rev = "1f13a808da65775f22cbf47862c4e5898d8f4ca1"; + sha256 = "1vkcjg80l49hxiadqmkkd031kj6kc10m8mwcnla3k1ml8fv4qna9"; }; } -] +] \ No newline at end of file diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix index 1a2086810724..c83ab66b27a0 100644 --- a/pkgs/tools/networking/mosh/default.nix +++ b/pkgs/tools/networking/mosh/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/mosh --prefix PERL5LIB : $PERL5LIB ''; + CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11"; + meta = { homepage = https://mosh.org/; description = "Mobile shell (ssh replacement)"; diff --git a/pkgs/tools/networking/nss-pam-ldapd/default.nix b/pkgs/tools/networking/nss-pam-ldapd/default.nix index e5fde0f80385..fc961675c7f1 100644 --- a/pkgs/tools/networking/nss-pam-ldapd/default.nix +++ b/pkgs/tools/networking/nss-pam-ldapd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "nss-pam-ldapd-${version}"; - version = "0.9.7"; + version = "0.9.10"; src = fetchurl { url = "https://arthurdejong.org/nss-pam-ldapd/${name}.tar.gz"; - sha256 = "1sw36w6zkzvabvjckqick032j5p5xi0qi3sgnh0znzxz31jqvf0d"; + sha256 = "1cqamcr6qpgwxijlr6kg7jspjamjra8w0haan0qssn0yxn95d7c0"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/networking/pdsh/default.nix b/pkgs/tools/networking/pdsh/default.nix index 9239b9e118dc..812d335e8087 100644 --- a/pkgs/tools/networking/pdsh/default.nix +++ b/pkgs/tools/networking/pdsh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, readline, rsh, ssh, pam }: +{ stdenv, fetchurl, perl, readline, rsh, ssh }: stdenv.mkDerivation rec { name = "pdsh-2.33"; @@ -8,12 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0bwlkl9inj66iwvafg00pi3sk9n673phdi0kcc59y9nn55s0hs3k"; }; - buildInputs = [perl readline ssh pam]; - - /* pdsh uses pthread_cancel(), which requires libgcc_s.so.1 to be - loadable at run-time. Adding the flag below ensures that the - library can be found. Obviously, though, this is a hack. */ - NIX_LDFLAGS="-lgcc_s"; + buildInputs = [ perl readline ssh ]; preConfigure = '' configureFlagsArray=( @@ -22,11 +17,11 @@ stdenv.mkDerivation rec { "--with-machines=/etc/pdsh/machines" ${if readline == null then "--without-readline" else "--with-readline"} ${if ssh == null then "--without-ssh" else "--with-ssh"} - ${if pam == null then "--without-pam" else "--with-pam"} ${if rsh == false then "--without-rsh" else "--with-rsh"} "--with-dshgroups" "--with-xcpu" "--disable-debug" + '--with-rcmd-rank-list=ssh,krb4,exec,xcpu,rsh' ) ''; diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index 4f71d6bc2e4f..3f1949d4bb68 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { sourceRoot = "source/src/tools"; - nativeBuildInputs = [ (optional stdenv.isDarwin makeWrapper) ]; - buildInputs = [ (optional stdenv.isLinux libmnl) ]; + nativeBuildInputs = optional stdenv.isDarwin makeWrapper; + buildInputs = optional stdenv.isLinux libmnl; makeFlags = [ "DESTDIR=$(out)" diff --git a/pkgs/tools/package-management/cargo-edit/default.nix b/pkgs/tools/package-management/cargo-edit/default.nix index e2cc49a3e99a..afb9fc70a739 100644 --- a/pkgs/tools/package-management/cargo-edit/default.nix +++ b/pkgs/tools/package-management/cargo-edit/default.nix @@ -4,16 +4,16 @@ rustPlatform.buildRustPackage rec { name = "cargo-edit-${version}"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "killercup"; repo = "cargo-edit"; rev = "v${version}"; - sha256 = "0ngxyzqy5pfc0fqbvqw7kd40jhqzp67qvpzvh3yggk9yxa1jzsp0"; + sha256 = "0g3dikwk6n48dmhx9qchmzyrhcr40242lhvlcyk1nqbpvs3b51fm"; }; - cargoSha256 = "1j7fqswdx6f2i5wr0pdavdvcv18j1l27a8ighr75p7f54apa27l8"; + cargoSha256 = "1bq0mjn44f0sn94nb9wqal4swhkzn7f3vbk5jyay4v3wqfz1gb7r"; nativeBuildInputs = lib.optional (!stdenv.isDarwin) pkgconfig; buildInputs = lib.optional (!stdenv.isDarwin) openssl; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index ea0cdf9bd0f1..71c5bd53909f 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -5,7 +5,7 @@ , storeDir ? "/nix/store" , stateDir ? "/nix/var" , confDir ? "/etc" -, withLibseccomp ? libseccomp.meta.available, libseccomp +, withLibseccomp ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) libseccomp.meta.platforms, libseccomp , withAWS ? stdenv.isLinux || stdenv.isDarwin, aws-sdk-cpp }: diff --git a/pkgs/tools/security/2fa/default.nix b/pkgs/tools/security/2fa/default.nix new file mode 100644 index 000000000000..68b9194015b1 --- /dev/null +++ b/pkgs/tools/security/2fa/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + version = "1.1.0"; + name = "2fa-${version}"; + + goPackagePath = "rsc.io/2fa"; + + src = fetchFromGitHub { + owner = "rsc"; + repo = "2fa"; + rev = "v${version}"; + sha256 = "0827vl2bxd6m2rbj00x7857cs7cic3mlg5nlhqzd0n73dm5vk2za"; + }; + + meta = with stdenv.lib; { + homepage = https://rsc.io/2fa; + description = "Two-factor authentication on the command line"; + platforms = platforms.all; + maintainers = with maintainers; [ rvolosatovs ]; + license = licenses.bsd3; + }; +} diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix index 0f515c518040..67252453743b 100644 --- a/pkgs/tools/security/ccid/default.nix +++ b/pkgs/tools/security/ccid/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pcsclite, pkgconfig, libusb1, perl }: stdenv.mkDerivation rec { - version = "1.4.29"; + version = "1.4.30"; name = "ccid-${version}"; src = fetchurl { url = "https://ccid.apdu.fr/files/${name}.tar.bz2"; - sha256 = "0kdqmbma6sclsrbxy9w85h7cs0v11if4nc2r9v09613k8pl2lhx5"; + sha256 = "0z7zafdg75fr1adlv2x0zz34s07gljcjg2lsz76s1048w1xhh5xc"; }; postPatch = '' diff --git a/pkgs/tools/security/gorilla-bin/default.nix b/pkgs/tools/security/gorilla-bin/default.nix index df9d42211f6c..152ff40e7a22 100644 --- a/pkgs/tools/security/gorilla-bin/default.nix +++ b/pkgs/tools/security/gorilla-bin/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "19ir6x4c01825hpx2wbbcxkk70ymwbw4j03v8b2xc13ayylwzx0r"; }; - buildInputs = [ patchelf makeWrapper ]; + nativeBuildInputs = [ patchelf makeWrapper ]; phases = [ "unpackPhase" "installPhase" ]; unpackCmd = '' diff --git a/pkgs/tools/security/lynis/default.nix b/pkgs/tools/security/lynis/default.nix index 8158a4fbfd74..ad345afb5fcc 100644 --- a/pkgs/tools/security/lynis/default.nix +++ b/pkgs/tools/security/lynis/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "lynis"; - version = "2.6.8"; + version = "2.6.9"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "CISOfy"; repo = "${pname}"; rev = "${version}"; - sha256 = "1g7jxjqvzl78fy770vlg6n6l003nvm452i2g3wnrb1fqcwkrm6ax"; + sha256 = "125p5vpc2ksn0nab8y4ckfgx13rlv3w95amgighiqkh15ccji5kq"; }; nativeBuildInputs = [ makeWrapper perl ]; diff --git a/pkgs/tools/security/pcsc-cyberjack/default.nix b/pkgs/tools/security/pcsc-cyberjack/default.nix index b74905b6e7e2..23a744f8e23d 100644 --- a/pkgs/tools/security/pcsc-cyberjack/default.nix +++ b/pkgs/tools/security/pcsc-cyberjack/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "pcsc-cyberjack-${version}"; - version = "3.99.5_SP09"; + version = "3.99.5_SP12"; src = with stdenv.lib; let splittedVer = splitString "_" version; @@ -12,13 +12,20 @@ stdenv.mkDerivation rec { in fetchurl { url = "http://support.reiner-sct.de/downloads/LINUX/V${version}" + "/pcsc-cyberjack-${tarballVersion}.tar.bz2"; - sha256 = "1m1r26q0k2hrxfi73j4v25qfh20x4b1hcbcpgjgv7qxa33dbi30z"; + sha256 = "04pkmybal56s5xnjld09vl1s1h6qf8mvhm41b758d6hi240kgp1j"; }; + outputs = [ "out" "tools" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libusb pcsclite ]; - configureFlags = [ "--with-usbdropdir=\${prefix}/pcsc/drivers" ]; + configureFlags = [ + "--with-usbdropdir=${placeholder "out"}/pcsc/drivers" + "--bindir=${placeholder "tools"}/bin" + ]; + + postInstall = "make -C tools/cjflash install"; meta = with stdenv.lib; { description = "REINER SCT cyberJack USB chipcard reader user space driver"; diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 091b17c6ffe1..a0f7d0f6287f 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -1,6 +1,8 @@ { stdenv, fetchFromGitHub, go, gox, removeReferencesTo }: let + # Deprecated since vault 0.8.2: use `vault -autocomplete-install` instead + # to install auto-complete for bash, zsh and fish vaultBashCompletions = fetchFromGitHub { owner = "iljaweis"; repo = "vault-bash-completion"; diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix index 261f4cee2b83..41016dc49fa5 100644 --- a/pkgs/tools/system/fio/default.nix +++ b/pkgs/tools/system/fio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "fio-${version}"; - version = "3.8"; + version = "3.10"; src = fetchFromGitHub { owner = "axboe"; repo = "fio"; rev = "fio-${version}"; - sha256 = "1krifr4ms7x229a3p088zl5rpdrfwz6bw4c2lrz3hksignjxaw91"; + sha256 = "0cg6knaja32g46j1vlf0qw4q8yng7hrnnvh6b768pbjdxpn3wvi0"; }; buildInputs = [ python zlib ] diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index 1367871ded41..fa2d40949e53 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -11,11 +11,11 @@ let mkFlag = cond: name: if cond then "--enable-${name}" else "--disable-${name}"; in stdenv.mkDerivation rec { - name = "rsyslog-8.37.0"; + name = "rsyslog-8.38.0"; src = fetchurl { url = "https://www.rsyslog.com/files/download/rsyslog/${name}.tar.gz"; - sha256 = "1rs7y7xgjm82j4mp0897x2myv73kkcj86np37y7qzgca9jdjhp19"; + sha256 = "0b52pcamj2g27zdg0szzk03kigm9lanj0v0w80alwy5fpk9qwcjd"; }; #patches = [ ./fix-gnutls-detection.patch ]; diff --git a/pkgs/tools/system/sg3_utils/default.nix b/pkgs/tools/system/sg3_utils/default.nix index 8be7203fb3d4..67145bc3cc54 100644 --- a/pkgs/tools/system/sg3_utils/default.nix +++ b/pkgs/tools/system/sg3_utils/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "sg3_utils-1.42"; + name = "sg3_utils-1.44"; src = fetchurl { url = "http://sg.danny.cz/sg/p/${name}.tgz"; - sha256 = "1wwy7iiz1lvc32c777yd4vp0c0dqfdlm5jrsm3aa62xx141pmjqx"; + sha256 = "0yxfbkd48mbzipwmggcvpq60zybsb6anrca878si26z7496nibld"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/virtualization/google-compute-engine/default.nix b/pkgs/tools/virtualization/google-compute-engine/default.nix index 51fcbb572053..c0b9954206ad 100644 --- a/pkgs/tools/virtualization/google-compute-engine/default.nix +++ b/pkgs/tools/virtualization/google-compute-engine/default.nix @@ -11,14 +11,14 @@ buildPythonApplication rec { name = "google-compute-engine-${version}"; - version = "20180510"; + version = "20180905"; namePrefix = ""; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "compute-image-packages"; rev = version; - sha256 = "13hmg29s1pljcvf40lrv5yickg8x51rcnv68wxhs6zkkg75k448p"; + sha256 = "0095f000kgk2lc5p1y4080sbc0r7ly60a7i9id8hydfnkhqqz75n"; }; postPatch = '' diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 26bc7ebc6f1a..92a0f2b45709 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -277,6 +277,9 @@ mapAliases ({ telepathy_qt5 = libsForQt5.telepathy; # added 2015-12-19 telepathy_salut = telepathy-salut; # added 2018-02-25 telnet = inetutils; # added 2018-05-15 + terraform-provider-ibm = terraform-providers.ibm; # added 2018-09-28 + terraform-provider-libvirt = terraform-providers.libvirt; # added 2018-09-28 + terraform-provider-nixos = terraform-providers.nixos; # added 2018-09-28 tex-gyre-bonum-math = tex-gyre-math.bonum; # added 2018-04-03 tex-gyre-pagella-math = tex-gyre-math.pagella; # added 2018-04-03 tex-gyre-schola-math = tex-gyre-math.schola; # added 2018-04-03 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 91dc2f35f067..514ab3f7244e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -288,13 +288,13 @@ with pkgs; # gitlab example fetchFromGitLab = { - owner, repo, rev, domain ? "gitlab.com", name ? "source", + owner, repo, rev, domain ? "gitlab.com", name ? "source", group ? null, ... # For hash agility }@args: fetchzip ({ inherit name; - url = "https://${domain}/api/v4/projects/${owner}%2F${repo}/repository/archive.tar.gz?sha=${rev}"; - meta.homepage = "https://${domain}/${owner}/${repo}/"; - } // removeAttrs args [ "domain" "owner" "repo" "rev" ]) // { inherit rev; }; + url = "https://${domain}/api/v4/projects/${lib.optionalString (group != null) "${group}%2F"}${owner}%2F${repo}/repository/archive.tar.gz?sha=${rev}"; + meta.homepage = "https://${domain}/${lib.optionalString (group != null) "${group}/"}${owner}/${repo}/"; + } // removeAttrs args [ "domain" "owner" "group" "repo" "rev" ]) // { inherit rev; }; # gitweb example, snapshot support is optional in gitweb fetchFromRepoOrCz = { @@ -365,6 +365,8 @@ with pkgs; nukeReferences = callPackage ../build-support/nuke-references { }; + referencesByPopularity = callPackage ../build-support/references-by-popularity { }; + removeReferencesTo = callPackage ../build-support/remove-references-to { }; vmTools = callPackage ../build-support/vm { }; @@ -1338,6 +1340,8 @@ with pkgs; gdrive = callPackage ../applications/networking/gdrive { }; + go-2fa = callPackage ../tools/security/2fa {}; + go-dependency-manager = callPackage ../development/tools/gdm { }; geckodriver = callPackage ../development/tools/geckodriver { }; @@ -1368,6 +1372,8 @@ with pkgs; gmic = callPackage ../tools/graphics/gmic { }; + gmic_krita_qt = libsForQt5.callPackage ../tools/graphics/gmic_krita_qt { }; + goa = callPackage ../development/tools/goa { buildGoPackage = buildGo110Package; }; @@ -1454,6 +1460,10 @@ with pkgs; metabase = callPackage ../servers/metabase { }; + mkspiffs = callPackage ../tools/filesystems/mkspiffs { }; + + mkspiffs-presets = recurseIntoAttrs (callPackages ../tools/filesystems/mkspiffs/presets.nix { }); + monetdb = callPackage ../servers/sql/monetdb { }; mp3blaster = callPackage ../applications/audio/mp3blaster { }; @@ -1510,6 +1520,8 @@ with pkgs; simg2img = callPackage ../tools/filesystems/simg2img { }; + snipes = callPackage ../games/snipes { }; + socklog = callPackage ../tools/system/socklog { }; staccato = callPackage ../tools/text/staccato { }; @@ -1536,6 +1548,8 @@ with pkgs; conf = config.riot-web.conf or null; }; + roundcube = callPackage ../servers/roundcube { }; + rsbep = callPackage ../tools/backup/rsbep { }; rsyslog = callPackage ../tools/system/rsyslog { @@ -3777,6 +3791,8 @@ with pkgs; libfann = callPackage ../development/libraries/libfann { }; + libgaminggear = callPackage ../development/libraries/libgaminggear { }; + libipfix = callPackage ../development/libraries/libipfix { }; libircclient = callPackage ../development/libraries/libircclient { }; @@ -3850,6 +3866,8 @@ with pkgs; libwebsockets = callPackage ../development/libraries/libwebsockets { }; + lidarr = callPackage ../servers/lidarr { }; + limesuite = callPackage ../applications/misc/limesuite { }; limesurvey = callPackage ../servers/limesurvey { }; @@ -5719,6 +5737,8 @@ with pkgs; stdenv = overrideCC stdenv gcc6; # doesn't build with gcc7 }; + uftrace = callPackage ../development/tools/uftrace { }; + uget = callPackage ../tools/networking/uget { }; uget-integrator = callPackage ../tools/networking/uget-integrator { }; @@ -7605,7 +7625,7 @@ with pkgs; ocropus = callPackage ../applications/misc/ocropus { }; - inherit (callPackages ../development/interpreters/perl {}) perl522 perl524 perl526 perl528; + inherit (callPackages ../development/interpreters/perl {}) perl526 perl528 perldevel; pachyderm = callPackage ../applications/networking/cluster/pachyderm { }; @@ -7930,7 +7950,10 @@ with pkgs; for more information. ''; - alloy = callPackage ../development/tools/alloy { }; + inherit (callPackage ../development/tools/alloy { }) + alloy4 + alloy5 + alloy; adtool = callPackage ../tools/admin/adtool { }; @@ -8439,7 +8462,7 @@ with pkgs; }; include-what-you-use = callPackage ../development/tools/analysis/include-what-you-use { - llvmPackages = llvmPackages_4; + llvmPackages = llvmPackages_6; }; indent = callPackage ../development/tools/misc/indent { }; @@ -11642,7 +11665,7 @@ with pkgs; postgis = callPackage ../development/libraries/postgis { }; - protobuf = protobuf3_4; + protobuf = protobuf3_6; protobuf3_6 = callPackage ../development/libraries/protobuf/3.6.nix { }; protobuf3_5 = callPackage ../development/libraries/protobuf/3.5.nix { }; @@ -12662,7 +12685,7 @@ with pkgs; zmqpp = callPackage ../development/libraries/zmqpp { }; zig = callPackage ../development/compilers/zig { - llvmPackages = llvmPackages_6; + llvmPackages = llvmPackages_7; }; zimlib = callPackage ../development/libraries/zimlib { }; @@ -12835,22 +12858,20 @@ with pkgs; ### DEVELOPMENT / PERL MODULES - perl522Packages = recurseIntoAttrs (callPackage ./perl-packages.nix { - perl = perl522; - overrides = (config.perlPackageOverrides or (p: {})) pkgs; - }); - perl524Packages = recurseIntoAttrs (callPackage ./perl-packages.nix { - perl = perl524; - overrides = (config.perlPackageOverrides or (p: {})) pkgs; - }); perl526Packages = recurseIntoAttrs (callPackage ./perl-packages.nix { perl = perl526; overrides = (config.perlPackageOverrides or (p: {})) pkgs; }); + # the latest Maint version perl528Packages = recurseIntoAttrs (callPackage ./perl-packages.nix { perl = perl528; overrides = (config.perlPackageOverrides or (p: {})) pkgs; }); + # the latest Devel version + perldevelPackages = recurseIntoAttrs (callPackage ./perl-packages.nix { + perl = perldevel; + overrides = (config.perlPackageOverrides or (p: {})) pkgs; + }); perlPackages = perl528Packages; inherit (perlPackages) perl buildPerlPackage; @@ -13364,11 +13385,7 @@ with pkgs; check-esxi-hardware = callPackage ../servers/monitoring/plugins/esxi.nix {}; - net_snmp = callPackage ../servers/monitoring/net-snmp { - # https://sourceforge.net/p/net-snmp/bugs/2712/ - # remove after net-snmp > 5.7.3 - perl = perl522; - }; + net_snmp = callPackage ../servers/monitoring/net-snmp { }; newrelic-sysmond = callPackage ../servers/monitoring/newrelic-sysmond { }; @@ -13388,7 +13405,7 @@ with pkgs; softether_4_25 = callPackage ../servers/softether/4.25.nix { }; softether = softether_4_25; - qboot = callPackage ../applications/virtualization/qboot { stdenv = stdenv_32bit; }; + qboot = pkgsi686Linux.callPackage ../applications/virtualization/qboot { }; OVMF = callPackage ../applications/virtualization/OVMF { seabios = null; openssl = null; }; OVMF-CSM = OVMF.override { openssl = null; }; @@ -13575,6 +13592,12 @@ with pkgs; # see also openssl, which has/had this same trick }; + sickbeard = callPackage ../servers/sickbeard { }; + + sickgear = callPackage ../servers/sickbeard/sickgear.nix { }; + + sickrage = callPackage ../servers/sickbeard/sickrage.nix { }; + sipcmd = callPackage ../applications/networking/sipcmd { }; sipwitch = callPackage ../servers/sip/sipwitch { }; @@ -14287,6 +14310,8 @@ with pkgs; }) zfsStable zfsUnstable; zfs = zfsStable; + + can-isotp = callPackage ../os-specific/linux/can-isotp { }; }); # The current default kernel / kernel modules. @@ -14652,6 +14677,8 @@ with pkgs; payload = "${linux_riscv}/vmlinux"; }; + roccat-tools = callPackage ../os-specific/linux/roccat-tools { }; + rtkit = callPackage ../os-specific/linux/rtkit { }; rt5677-firmware = callPackage ../os-specific/linux/firmware/rt5677 { }; @@ -15670,6 +15697,12 @@ with pkgs; bluejeans = callPackage ../applications/networking/browsers/mozilla-plugins/bluejeans { }; + bluejeans-gui = callPackage ../applications/networking/instant-messengers/bluejeans { + gconf = pkgs.gnome2.GConf; + inherit (pkgs.xorg) libX11 libXrender libXtst libXdamage + libXi libXext libXfixes libXcomposite; + }; + bombono = callPackage ../applications/video/bombono {}; bomi = libsForQt5.callPackage ../applications/video/bomi { @@ -15827,6 +15860,8 @@ with pkgs; inherit (gnome2) libgnomeui GConf; }; + csa = callPackage ../applications/audio/csa { }; + csound = callPackage ../applications/audio/csound { }; cinepaint = callPackage ../applications/graphics/cinepaint { @@ -16616,6 +16651,8 @@ with pkgs; flac = callPackage ../applications/audio/flac { }; + redoflacs = callPackage ../applications/audio/redoflacs { }; + flameshot = libsForQt5.callPackage ../tools/misc/flameshot { }; flashplayer = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer { @@ -16852,7 +16889,7 @@ with pkgs; googleearth = callPackage ../applications/misc/googleearth { }; - google-chrome = callPackage ../applications/networking/browsers/google-chrome { gconf = gnome2.GConf; }; + google-chrome = callPackage ../applications/networking/browsers/google-chrome { gconf = gnome2.GConf; patchelf = patchelfUnstable; }; google-chrome-beta = google-chrome.override { chromium = chromiumBeta; channel = "beta"; }; @@ -16983,6 +17020,8 @@ with pkgs; spectrwm = callPackage ../applications/window-managers/spectrwm { }; + spectral = qt5.callPackage ../applications/networking/instant-messengers/spectral { }; + super-productivity = callPackage ../applications/networking/super-productivity { }; wlc = callPackage ../development/libraries/wlc { }; @@ -17525,6 +17564,8 @@ with pkgs; gconf = pkgs.gnome2.GConf; }; + menumaker = callPackage ../applications/misc/menumaker { }; + mercurial = callPackage ../applications/version-management/mercurial { inherit (darwin.apple_sdk.frameworks) ApplicationServices; guiSupport = false; # use mercurialFull to get hgk GUI @@ -17780,6 +17821,8 @@ with pkgs; pythonPackages = python3Packages; }; + neap = callPackage ../applications/misc/neap { }; + neomutt = callPackage ../applications/networking/mailreaders/neomutt { }; natron = callPackage ../applications/video/natron { }; @@ -19017,8 +19060,6 @@ with pkgs; treesheets = callPackage ../applications/office/treesheets { wxGTK = wxGTK31; }; - trezor-bridge = callPackage ../applications/networking/browsers/mozilla-plugins/trezor { }; - tribler = callPackage ../applications/networking/p2p/tribler { }; trojita = libsForQt5.callPackage ../applications/networking/mailreaders/trojita { }; @@ -20158,7 +20199,9 @@ with pkgs; pong3d = callPackage ../games/pong3d { }; - pokerth = callPackage ../games/pokerth { }; + pokerth = callPackage ../games/pokerth { + protobuf = protobuf3_4; + }; pokerth-server = pokerth.server; @@ -20576,6 +20619,8 @@ with pkgs; pantheon-terminal = callPackage ../desktops/pantheon/apps/pantheon-terminal { }; }; + plasma-applet-volumewin7mixer = libsForQt5.callPackage ../applications/misc/plasma-applet-volumewin7mixer { }; + redshift = callPackage ../applications/misc/redshift { inherit (python3Packages) python pygobject3 pyxdg wrapPython; inherit (darwin.apple_sdk.frameworks) CoreLocation ApplicationServices Foundation Cocoa; @@ -22081,16 +22126,19 @@ with pkgs; terraform = terraform_0_11; terraform-full = terraform_0_11-full; + terraform-providers = recurseIntoAttrs ( + callPackage ../applications/networking/cluster/terraform-providers {} + ); + + terraform-provider-libvirt = callPackage ../applications/networking/cluster/terraform-provider-libvirt {}; + terraform-provider-ibm = callPackage ../applications/networking/cluster/terraform-provider-ibm {}; - terraform-inventory = callPackage ../applications/networking/cluster/terraform-inventory {}; - terraform-provider-nixos = callPackage ../applications/networking/cluster/terraform-provider-nixos {}; + terraform-inventory = callPackage ../applications/networking/cluster/terraform-inventory {}; terraform-landscape = callPackage ../applications/networking/cluster/terraform-landscape {}; - terraform-provider-libvirt = callPackage ../applications/networking/cluster/terraform-provider-libvirt {}; - terragrunt = callPackage ../applications/networking/cluster/terragrunt {}; terragrunt_0_11_1 = callPackage ../applications/networking/cluster/terragrunt/0.11.1.nix { @@ -22341,8 +22389,8 @@ with pkgs; spdlog = spdlog_1; dart = callPackage ../development/interpreters/dart { }; - dart_stable = dart.override { version = "1.24.3"; }; - dart_old = dart.override { version = "1.16.1"; }; + dart_stable = dart.override { version = "2.0.0"; }; + dart_old = dart.override { version = "1.24.3"; }; dart_dev = dart.override { version = "2.0.0-dev.26.0"; }; httrack = callPackage ../tools/backup/httrack { }; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 818f896048ba..9c4c9aa9bdab 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -77,7 +77,7 @@ in rec { version = "8.7.2"; }; coq_8_8 = callPackage ../applications/science/logic/coq { - version = "8.8.1"; + version = "8.8.2"; }; coqPackages_8_5 = mkCoqPackages coq_8_5; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index bbb028ceb4b8..6bdcaf49af91 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -54,13 +54,13 @@ in { }; ghc802 = callPackage ../development/compilers/ghc/8.0.2.nix { bootPkgs = packages.ghc7103Binary; - sphinx = pkgs.python27Packages.sphinx; + inherit (buildPackages.python27Packages) sphinx; buildLlvmPackages = buildPackages.llvmPackages_37; llvmPackages = pkgs.llvmPackages_37; }; ghc822 = callPackage ../development/compilers/ghc/8.2.2.nix { bootPkgs = packages.ghc821Binary; - sphinx = pkgs.python3Packages.sphinx; + inherit (buildPackages.python3Packages) sphinx; buildLlvmPackages = buildPackages.llvmPackages_39; llvmPackages = pkgs.llvmPackages_39; }; @@ -80,13 +80,17 @@ in { llvmPackages = pkgs.llvmPackages_5; }; ghcjs = compiler.ghcjs84; - ghcjs710 = packages.ghc7103.callPackage ../development/compilers/ghcjs { + # Use `import` because `callPackage inside`. + ghcjs710 = import ../development/compilers/ghcjs/7.10 { bootPkgs = packages.ghc7103; inherit (pkgs) cabal-install; + inherit (buildPackages) fetchgit fetchFromGitHub; }; - ghcjs80 = packages.ghc802.callPackage ../development/compilers/ghcjs/head.nix { + # `import` on purpose; see above. + ghcjs80 = import ../development/compilers/ghcjs/8.0 { bootPkgs = packages.ghc802; inherit (pkgs) cabal-install; + inherit (buildPackages) fetchgit fetchFromGitHub; }; ghcjs82 = callPackage ../development/compilers/ghcjs-ng { bootPkgs = packages.ghc822; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 779a24352bf8..9e324257e03d 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -240,6 +240,8 @@ let eliom = callPackage ../development/ocaml-modules/eliom { }; + elpi = callPackage ../development/ocaml-modules/elpi { }; + enumerate = callPackage ../development/ocaml-modules/enumerate { }; erm_xml = callPackage ../development/ocaml-modules/erm_xml { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 18ca62c02b04..bef7b75b6cc8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8434,6 +8434,20 @@ let }; }; + LinuxDesktopFiles = buildPerlPackage rec { + name = "Linux-DesktopFiles-0.25"; + src = fetchurl { + url = "mirror://cpan/authors/id/T/TR/TRIZEN/${name}.tar.gz"; + sha256 = "60377a74fba90fa465200ee1c7430dbdde69d454d85f9ee101c039803a07e5f5"; + }; + buildInputs = [ ModuleBuild ]; + meta = { + homepage = https://github.com/trizen/Linux-DesktopFiles; + description = "Fast parsing of the Linux desktop files"; + license = stdenv.lib.licenses.artistic2; + }; + }; + LinuxDistribution = buildPerlModule { name = "Linux-Distribution-0.23"; src = fetchurl { @@ -11329,6 +11343,21 @@ let }; }; + NetSCP = buildPerlPackage rec { + name = "Net-SCP-0.08.reprise"; + src = fetchurl { + url = "mirror://cpan/authors/id/I/IV/IVAN/${name}.tar.gz"; + sha256 = "88a9b2df69e769e5855a408b19f61915b82e8fe070ab5cf4d525dd3b8bbe31c1"; + }; + propagatedBuildInputs = [ pkgs.openssl Carp Exporter IO NetSSH StringShellQuote ]; + patchPhase = '' + sed -i 's|$scp = "scp";|$scp = "${pkgs.openssh}/bin/scp";|' SCP.pm + ''; + meta = { + description = "Simple wrappers around ssh and scp commands."; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; NetServer = buildPerlPackage { name = "Net-Server-2.009"; @@ -11407,6 +11436,22 @@ let doCheck = false; # The test suite fails, see https://rt.cpan.org/Public/Bug/Display.html?id=85799 }; + NetSSH = buildPerlPackage rec { + name = "Net-SSH-0.09"; + src = fetchurl { + url = "mirror://cpan/authors/id/I/IV/IVAN/${name}.tar.gz"; + sha256 = "7c71c7c3cbe953234dfe25bcc1ad7edb0e1f5a0578601f5523bc6070262a3817"; + }; + propagatedBuildInputs = [ pkgs.openssl Exporter IO ]; + patchPhase = '' + sed -i 's|$ssh = "ssh";|$ssh = "${pkgs.openssh}/bin/ssh";|' SSH.pm + ''; + meta = { + description = "Simple wrappers around ssh commands."; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + NetSSLeay = buildPerlPackage rec { name = "Net-SSLeay-1.85"; src = fetchurl { @@ -14359,12 +14404,12 @@ let }; SysVirt = buildPerlModule rec { - version = "4.5.0"; + version = "4.7.0"; name = "Sys-Virt-${version}"; src = assert version == pkgs.libvirt.version; pkgs.fetchgit { url = git://libvirt.org/libvirt-perl.git; rev = "v${version}"; - sha256 = "18ns94i29c9x0j50pz9r1vcif6baayz769sa7b51v8kcvam9j52s"; + sha256 = "14q8s6k3d9a1qh6sh618qp30ib4p9qma2z4p2ynyh223i4w3virg"; }; nativeBuildInputs = [ pkgs.pkgconfig ]; buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c8fc8c64de39..2da2892f9beb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1123,7 +1123,7 @@ in { }; blessed = callPackage ../development/python-modules/blessed {}; - + block-io = callPackage ../development/python-modules/block-io {}; # Build boost for this specific Python version @@ -3351,19 +3351,43 @@ in { python-mapnik = buildPythonPackage rec { name = "python-mapnik-${version}"; - version = "3.0.13"; + version = "3.0.16"; src = pkgs.fetchFromGitHub { owner = "mapnik"; repo = "python-mapnik"; rev = "v${version}"; - sha256 = "0biw9bfkbsgfyjihyvkj4abx9s9r3h81rk6dc1y32022rypsqhkp"; + sha256 = "1gqs4kvmjawdgl80j0ab5r8y0va9kw0rvwix3093xsv4hwd00lcc"; }; disabled = isPyPy; doCheck = false; # doesn't find needed test data files - buildInputs = with pkgs; - [ boost cairo harfbuzz icu libjpeg libpng libtiff libwebp mapnik proj zlib ]; + preBuild = let + pythonVersion = with stdenv.lib.versions; "${major python.version}${minor python.version}"; + in '' + export BOOST_PYTHON_LIB="boost_python${pythonVersion}" + export BOOST_THREAD_LIB="boost_thread" + export BOOST_SYSTEM_LIB="boost_system" + ''; + buildInputs = with pkgs; [ + (boost.override { + enablePython = true; + inherit python; + }) + (mapnik.override { + inherit python; + boost = (boost.override { enablePython = true; inherit python; }); + }) + cairo + harfbuzz + icu + libjpeg + libpng + libtiff + libwebp + proj + zlib + ]; propagatedBuildInputs = with self; [ pillow pycairo ]; meta = with stdenv.lib; { @@ -3869,35 +3893,7 @@ in { }; }; - pypillowfight = buildPythonPackage rec { - name = "pypillowfight-${version}"; - version = "0.2.1"; - - src = pkgs.fetchFromGitHub { - owner = "jflesch"; - repo = "libpillowfight"; - rev = version; - sha256 = "1rwmajsy9qhl3qhhy5mw0xmr3n8abxcq8baidpn0sxv6yjg2369z"; - }; - - # Disable tests because they're designed to only work on Debian: - # https://github.com/jflesch/libpillowfight/issues/2#issuecomment-268259174 - doCheck = false; - - # Python 2.x is not supported, see: - # https://github.com/jflesch/libpillowfight/issues/1 - disabled = !isPy3k && !isPyPy; - - # This is needed by setup.py regardless of whether tests are enabled. - buildInputs = [ self.nose ]; - propagatedBuildInputs = [ self.pillow ]; - - meta = { - description = "Library containing various image processing algorithms"; - homepage = "https://github.com/jflesch/libpillowfight"; - license = licenses.gpl3Plus; - }; - }; + pypillowfight = callPackage ../development/python-modules/pypillowfight { }; pyprind = callPackage ../development/python-modules/pyprind { }; @@ -5306,6 +5302,8 @@ in { flask_elastic = callPackage ../development/python-modules/flask-elastic { }; + flask-jwt-extended = callPackage ../development/python-modules/flask-jwt-extended { }; + flask-limiter = callPackage ../development/python-modules/flask-limiter { }; flask_login = callPackage ../development/python-modules/flask-login { }; @@ -5334,23 +5332,7 @@ in { flask-silk = callPackage ../development/python-modules/flask-silk { }; - flask_sqlalchemy = buildPythonPackage rec { - name = "Flask-SQLAlchemy-${version}"; - version = "2.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/F/Flask-SQLAlchemy/${name}.tar.gz"; - sha256 = "1i9ps5d5snih9xlqhrvmi3qfiygkmqzxh92n25kj4pf89kj4s965"; - }; - - propagatedBuildInputs = with self ; [ flask sqlalchemy ]; - - meta = { - description = "SQLAlchemy extension for Flask"; - homepage = http://flask-sqlalchemy.pocoo.org/; - license = licenses.bsd3; - }; - }; + flask_sqlalchemy = callPackage ../development/python-modules/flask-sqlalchemy { }; flask_testing = callPackage ../development/python-modules/flask-testing { }; @@ -5870,35 +5852,7 @@ in { }; }; - glances = buildPythonPackage rec { - name = "glances-${version}"; - version = "3.0.1"; - disabled = isPyPy; - - src = pkgs.fetchFromGitHub { - owner = "nicolargo"; - repo = "glances"; - rev = "v${version}"; - sha256 = "18pyp6ij3bzybqj771v48n7yn3a1spk6ncg1kgp6hfpjhpqiw87x"; - }; - - # Requires access to /sys/class/power_supply - doCheck = false; - - buildInputs = with self; [ unittest2 ]; - propagatedBuildInputs = with self; [ psutil setuptools bottle batinfo pkgs.hddtemp pysnmp ]; - - preConfigure = '' - sed -i 's/data_files\.append((conf_path/data_files.append(("etc\/glances"/' setup.py; - ''; - - meta = { - homepage = https://nicolargo.github.io/glances/; - description = "Cross-platform curses-based monitoring tool"; - license = licenses.lgpl3; - maintainers = with maintainers; [ primeos koral ]; - }; - }; + glances = callPackage ../development/python-modules/glances { }; github3_py = buildPythonPackage rec { name = "github3.py-${version}"; @@ -8241,6 +8195,24 @@ in { inherit (pkgs) which; }; + nixpkgs = buildPythonPackage rec { + disabled = ! pythonAtLeast "3.5"; + pname = "nixpkgs"; + version = "0.2.2"; + src = fetchPypi { + inherit pname version; + sha256 = "0gsrd99kkv99jsrh3hckz7ns1zwndi9vvh4465v4gnpz723dd6fj"; + }; + buildInputs = with self; [ pbr ]; + propagatedBuildInputs = with self; [ pythonix ]; + meta = { + description = "Allows to `from nixpkgs import` stuff in interactive Python sessions"; + homepage = http://github.com/t184256/nixpkgs-python-importer; + license = licenses.mit; + maintainers = with maintainers; [ t184256 ]; + }; + }; + nodeenv = callPackage ../development/python-modules/nodeenv { }; nose = buildPythonPackage rec { @@ -9725,7 +9697,7 @@ in { protobuf = callPackage ../development/python-modules/protobuf { disabled = isPyPy; doCheck = !isPy3k; - protobuf = pkgs.protobuf3_5; + protobuf = pkgs.protobuf; }; protobuf3_1 = callPackage ../development/python-modules/protobuf { @@ -9857,6 +9829,8 @@ in { python-pushover = callPackage ../development/python-modules/pushover {}; + pystemd = callPackage ../development/python-modules/pystemd { systemd = pkgs.systemd; }; + mongodict = buildPythonPackage rec { name = "mongodict-${version}"; version = "0.3.1"; @@ -17153,6 +17127,11 @@ EOF libtorrentRasterbar = (toPythonModule (pkgs.libtorrentRasterbar.override { inherit python; })).python; + + libiio = (toPythonModule (pkgs.libiio.override { + inherit python; + })).python; + }); in fix' (extends overrides packages) |