diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index e1630c8cb03..9d49eb9e17a 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -278,32 +278,31 @@ The following example shows which arguments are given to `buildPythonPackage` in order to build [`datashape`](https://github.com/blaze/datashape). ```nix -{ # ... +{ lib, buildPythonPackage, fetchPypi, numpy, multipledispatch, dateutil, pytest }: - datashape = buildPythonPackage rec { - pname = "datashape"; - version = "0.4.7"; +buildPythonPackage rec { + pname = "datashape"; + version = "0.4.7"; - src = fetchPypi { - inherit pname version; - sha256 = "14b2ef766d4c9652ab813182e866f493475e65e558bed0822e38bf07bba1a278"; - }; + src = fetchPypi { + inherit pname version; + sha256 = "14b2ef766d4c9652ab813182e866f493475e65e558bed0822e38bf07bba1a278"; + }; - checkInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ numpy multipledispatch dateutil ]; + checkInputs = [ pytest ]; + propagatedBuildInputs = [ numpy multipledispatch dateutil ]; - meta = with lib; { - homepage = https://github.com/ContinuumIO/datashape; - description = "A data description language"; - license = licenses.bsd2; - maintainers = with maintainers; [ fridh ]; - }; + meta = with lib; { + homepage = https://github.com/ContinuumIO/datashape; + description = "A data description language"; + license = licenses.bsd2; + maintainers = with maintainers; [ fridh ]; }; } ``` We can see several runtime dependencies, `numpy`, `multipledispatch`, and -`dateutil`. Furthermore, we have one `buildInput`, i.e. `pytest`. `pytest` is a +`dateutil`. Furthermore, we have one `checkInputs`, i.e. `pytest`. `pytest` is a test runner and is only used during the `checkPhase` and is therefore not added to `propagatedBuildInputs`. @@ -313,25 +312,24 @@ Python bindings to `libxml2` and `libxslt`. These libraries are only required when building the bindings and are therefore added as `buildInputs`. ```nix -{ # ... +{ lib, pkgs, buildPythonPackage, fetchPypi }: - lxml = buildPythonPackage rec { - pname = "lxml"; - version = "3.4.4"; +buildPythonPackage rec { + pname = "lxml"; + version = "3.4.4"; - src = fetchPypi { - inherit pname version; - sha256 = "16a0fa97hym9ysdk3rmqz32xdjqmy4w34ld3rm3jf5viqjx65lxk"; - }; + src = fetchPypi { + inherit pname version; + sha256 = "16a0fa97hym9ysdk3rmqz32xdjqmy4w34ld3rm3jf5viqjx65lxk"; + }; - buildInputs = with self; [ pkgs.libxml2 pkgs.libxslt ]; + buildInputs = [ pkgs.libxml2 pkgs.libxslt ]; - meta = with lib; { - description = "Pythonic binding for the libxml2 and libxslt libraries"; - homepage = https://lxml.de; - license = licenses.bsd3; - maintainers = with maintainers; [ sjourdois ]; - }; + meta = with lib; { + description = "Pythonic binding for the libxml2 and libxslt libraries"; + homepage = https://lxml.de; + license = licenses.bsd3; + maintainers = with maintainers; [ sjourdois ]; }; } ``` @@ -347,35 +345,34 @@ find each of them in a different folder, and therefore we have to set `LDFLAGS` and `CFLAGS`. ```nix -{ # ... +{ lib, pkgs, buildPythonPackage, fetchPypi, numpy, scipy }: - pyfftw = buildPythonPackage rec { - pname = "pyFFTW"; - version = "0.9.2"; +buildPythonPackage rec { + pname = "pyFFTW"; + version = "0.9.2"; - src = fetchPypi { - inherit pname version; - sha256 = "f6bbb6afa93085409ab24885a1a3cdb8909f095a142f4d49e346f2bd1b789074"; - }; + src = fetchPypi { + inherit pname version; + sha256 = "f6bbb6afa93085409ab24885a1a3cdb8909f095a142f4d49e346f2bd1b789074"; + }; - buildInputs = [ pkgs.fftw pkgs.fftwFloat pkgs.fftwLongDouble]; + buildInputs = [ pkgs.fftw pkgs.fftwFloat pkgs.fftwLongDouble]; - propagatedBuildInputs = with self; [ numpy scipy ]; + propagatedBuildInputs = [ numpy scipy ]; - # Tests cannot import pyfftw. pyfftw works fine though. - doCheck = false; + # Tests cannot import pyfftw. pyfftw works fine though. + doCheck = false; - preConfigure = '' - export LDFLAGS="-L${pkgs.fftw.dev}/lib -L${pkgs.fftwFloat.out}/lib -L${pkgs.fftwLongDouble.out}/lib" - export CFLAGS="-I${pkgs.fftw.dev}/include -I${pkgs.fftwFloat.dev}/include -I${pkgs.fftwLongDouble.dev}/include" - ''; + preConfigure = '' + export LDFLAGS="-L${pkgs.fftw.dev}/lib -L${pkgs.fftwFloat.out}/lib -L${pkgs.fftwLongDouble.out}/lib" + export CFLAGS="-I${pkgs.fftw.dev}/include -I${pkgs.fftwFloat.dev}/include -I${pkgs.fftwLongDouble.dev}/include" + ''; - meta = with lib; { - description = "A pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms"; - homepage = http://hgomersall.github.com/pyFFTW; - license = with licenses; [ bsd2 bsd3 ]; - maintainers = with maintainers; [ fridh ]; - }; + meta = with lib; { + description = "A pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms"; + homepage = http://hgomersall.github.com/pyFFTW; + license = with licenses; [ bsd2 bsd3 ]; + maintainers = with maintainers; [ fridh ]; }; } ``` @@ -403,7 +400,7 @@ Indeed, we can just add any package we like to have in our environment to `propa ```nix with import {}; -with pkgs.python35Packages; +with python35Packages; buildPythonPackage rec { name = "mypackage"; @@ -436,7 +433,7 @@ Let's split the package definition from the environment definition. We first create a function that builds `toolz` in `~/path/to/toolz/release.nix` ```nix -{ lib, pkgs, buildPythonPackage }: +{ lib, buildPythonPackage }: buildPythonPackage rec { pname = "toolz"; @@ -456,18 +453,17 @@ buildPythonPackage rec { } ``` -It takes two arguments, `pkgs` and `buildPythonPackage`. +It takes an argument `buildPythonPackage`. We now call this function using `callPackage` in the definition of our environment ```nix with import {}; ( let - toolz = pkgs.callPackage /path/to/toolz/release.nix { - pkgs = pkgs; - buildPythonPackage = pkgs.python35Packages.buildPythonPackage; + toolz = callPackage /path/to/toolz/release.nix { + buildPythonPackage = python35Packages.buildPythonPackage; }; - in pkgs.python35.withPackages (ps: [ ps.numpy toolz ]) + in python35.withPackages (ps: [ ps.numpy toolz ]) ).env ``` @@ -565,7 +561,7 @@ buildPythonPackage rec { ''; checkInputs = [ hypothesis ]; - buildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ attrs py setuptools six pluggy ]; meta = with lib; { @@ -585,11 +581,6 @@ The `buildPythonPackage` mainly does four things: environment variable and add dependent libraries to script's `sys.path`. * In the `installCheck` phase, `${python.interpreter} setup.py test` is ran. -As in Perl, dependencies on other Python packages can be specified in the -`buildInputs` and `propagatedBuildInputs` attributes. If something is -exclusively a build-time dependency, use `buildInputs`; if it is (also) a runtime -dependency, use `propagatedBuildInputs`. - By default tests are run because `doCheck = true`. Test dependencies, like e.g. the test runner, should be added to `checkInputs`. @@ -733,7 +724,7 @@ Saving the following as `default.nix` with import {}; python.buildEnv.override { - extraLibs = [ pkgs.pythonPackages.pyramid ]; + extraLibs = [ pythonPackages.pyramid ]; ignoreCollisions = true; } ``` @@ -815,11 +806,12 @@ Given a `default.nix`: ```nix with import {}; -buildPythonPackage { name = "myproject"; +pythonPackages.buildPythonPackage { + name = "myproject"; + buildInputs = with pythonPackages; [ pyramid ]; -buildInputs = with pkgs.pythonPackages; [ pyramid ]; - -src = ./.; } + src = ./.; +} ``` Running `nix-shell` with no arguments should give you @@ -1005,10 +997,13 @@ Create this `default.nix` file, together with a `requirements.txt` and simply ex ```nix with import {}; -with pkgs.python27Packages; +with python27Packages; stdenv.mkDerivation { name = "impurePythonEnv"; + + src = null; + buildInputs = [ # these packages are required for virtualenv and pip to work: # @@ -1028,14 +1023,15 @@ stdenv.mkDerivation { libxslt libzip stdenv - zlib ]; - src = null; + zlib + ]; + shellHook = '' - # set SOURCE_DATE_EPOCH so that we can use python wheels - SOURCE_DATE_EPOCH=$(date +%s) - virtualenv --no-setuptools venv - export PATH=$PWD/venv/bin:$PATH - pip install -r requirements.txt + # set SOURCE_DATE_EPOCH so that we can use python wheels + SOURCE_DATE_EPOCH=$(date +%s) + virtualenv --no-setuptools venv + export PATH=$PWD/venv/bin:$PATH + pip install -r requirements.txt ''; } ``` diff --git a/doc/package-notes.xml b/doc/package-notes.xml index 169f70283e6..12d81ae29bf 100644 --- a/doc/package-notes.xml +++ b/doc/package-notes.xml @@ -310,6 +310,10 @@ packageOverrides = pkgs: {
Elm + + To start a development environment do nix-shell -p elmPackages.elm elmPackages.elm-format + + To update Elm compiler, see nixpkgs/pkgs/development/compilers/elm/README.md. diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 039da8cbff8..beb766e85b0 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1219,6 +1219,11 @@ github = "dgonyeo"; name = "Derek Gonyeo"; }; + dhkl = { + email = "david@davidslab.com"; + github = "dhl"; + name = "David Leung"; + }; dipinhora = { email = "dipinhora+github@gmail.com"; github = "dipinhora"; @@ -2733,6 +2738,11 @@ github = "lo1tuma"; name = "Mathias Schreck"; }; + loewenheim = { + email = "loewenheim@mailbox.org"; + github = "loewenheim"; + name = "Sebastian Zivota"; + }; lopsided98 = { email = "benwolsieffer@gmail.com"; github = "lopsided98"; @@ -3292,6 +3302,11 @@ github = "mvnetbiz"; name = "Matt Votava"; }; + mwilsoninsight = { + email = "max.wilson@insight.com"; + github = "mwilsoninsight"; + name = "Max Wilson"; + }; myrl = { email = "myrl.0xf@gmail.com"; github = "myrl"; @@ -3431,6 +3446,11 @@ github = "nocoolnametom"; name = "Tom Doggett"; }; + nomeata = { + email = "mail@joachim-breitner.de"; + github = "nomeata"; + name = "Joachim Breitner"; + }; noneucat = { email = "andy@lolc.at"; github = "noneucat"; @@ -4584,6 +4604,11 @@ github = "stumoss"; name = "Stuart Moss"; }; + suhr = { + email = "suhr@i2pmail.org"; + github = "suhr"; + name = "Сухарик"; + }; SuprDewd = { email = "suprdewd@gmail.com"; github = "SuprDewd"; diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml index 7c94f6e9473..574206982ae 100644 --- a/nixos/doc/manual/release-notes/rl-1903.xml +++ b/nixos/doc/manual/release-notes/rl-1903.xml @@ -534,6 +534,13 @@ Same applies to the new users.ldap.daemon.rootpwmodpwFile option. + + + nodejs-6_x is end-of-life. + nodejs-6_x, nodejs-slim-6_x and + nodePackages_6_x are removed. + +
diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml index 6685751d0d1..45531a3567e 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -37,7 +37,52 @@ - + + Besides the existing module which + targets Prometheus-1 a new module + has been added which targets Prometheus-2. + + + Both modules can be enabled at the same time. In fact + + this is needed for upgrading existing Prometheus-1 data to Prometheus-2 + . + + + + + +
+ Backward Incompatibilities + + + When upgrading from a previous release, please be aware of the following + incompatible changes: + + + + + + The directory where Prometheus will store its metric data is now + managed by systemd's StateDirectory mechanism. It still defaults + to /var/lib/prometheus. + + + Its location can be specified by the new + option which + defaults to prometheus. Note that this should + be a directory relative to /var/lib/. + + + The option has been + deprecated. You can still set it but it's now required to have + /var/lib/ as a prefix and you can't set + at the same time. +
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index ed6de399ca8..117e78158f1 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -744,6 +744,7 @@ ./services/web-apps/atlassian/crowd.nix ./services/web-apps/atlassian/jira.nix ./services/web-apps/codimd.nix + ./services/web-apps/documize.nix ./services/web-apps/frab.nix ./services/web-apps/icingaweb2/icingaweb2.nix ./services/web-apps/icingaweb2/module-monitoring.nix diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix index d53c6b318f1..27b5f9e4b64 100644 --- a/nixos/modules/programs/bash/bash.nix +++ b/nixos/modules/programs/bash/bash.nix @@ -226,9 +226,7 @@ in environment.shells = [ "/run/current-system/sw/bin/bash" - "/var/run/current-system/sw/bin/bash" "/run/current-system/sw/bin/sh" - "/var/run/current-system/sw/bin/sh" "${pkgs.bashInteractive}/bin/bash" "${pkgs.bashInteractive}/bin/sh" ]; diff --git a/nixos/modules/programs/fish.nix b/nixos/modules/programs/fish.nix index bcb5a3f341b..622d2f96fe4 100644 --- a/nixos/modules/programs/fish.nix +++ b/nixos/modules/programs/fish.nix @@ -232,7 +232,6 @@ in environment.shells = [ "/run/current-system/sw/bin/fish" - "/var/run/current-system/sw/bin/fish" "${pkgs.fish}/bin/fish" ]; diff --git a/nixos/modules/programs/xonsh.nix b/nixos/modules/programs/xonsh.nix index f967ca82ac8..ceab9b5db93 100644 --- a/nixos/modules/programs/xonsh.nix +++ b/nixos/modules/programs/xonsh.nix @@ -50,7 +50,6 @@ in environment.shells = [ "/run/current-system/sw/bin/xonsh" - "/var/run/current-system/sw/bin/xonsh" "${pkgs.xonsh}/bin/xonsh" ]; diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix index deb94922da8..b7117e5f90d 100644 --- a/nixos/modules/programs/zsh/zsh.nix +++ b/nixos/modules/programs/zsh/zsh.nix @@ -230,7 +230,6 @@ in environment.shells = [ "/run/current-system/sw/bin/zsh" - "/var/run/current-system/sw/bin/zsh" "${pkgs.zsh}/bin/zsh" ]; diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 325f9230840..30d11cc58fa 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -134,7 +134,7 @@ with lib; inetPort = [ "services" "postgrey" "inetPort" ]; in if value inetAddr == null - then { path = "/var/run/postgrey.sock"; } + then { path = "/run/postgrey.sock"; } else { addr = value inetAddr; port = value inetPort; } )) diff --git a/nixos/modules/services/backup/bacula.nix b/nixos/modules/services/backup/bacula.nix index 24cad612826..41bda7893a7 100644 --- a/nixos/modules/services/backup/bacula.nix +++ b/nixos/modules/services/backup/bacula.nix @@ -15,7 +15,7 @@ let Name = "${fd_cfg.name}"; FDPort = ${toString fd_cfg.port}; WorkingDirectory = "${libDir}"; - Pid Directory = "/var/run"; + Pid Directory = "/run"; ${fd_cfg.extraClientConfig} } @@ -41,7 +41,7 @@ let Name = "${sd_cfg.name}"; SDPort = ${toString sd_cfg.port}; WorkingDirectory = "${libDir}"; - Pid Directory = "/var/run"; + Pid Directory = "/run"; ${sd_cfg.extraStorageConfig} } @@ -77,7 +77,7 @@ let Password = "${dir_cfg.password}"; DirPort = ${toString dir_cfg.port}; Working Directory = "${libDir}"; - Pid Directory = "/var/run/"; + Pid Directory = "/run/"; QueryFile = "${pkgs.bacula}/etc/query.sql"; ${dir_cfg.extraDirectorConfig} } diff --git a/nixos/modules/services/databases/couchdb.nix b/nixos/modules/services/databases/couchdb.nix index ca89b119820..84d108d9c74 100644 --- a/nixos/modules/services/databases/couchdb.nix +++ b/nixos/modules/services/databases/couchdb.nix @@ -85,7 +85,7 @@ in { uriFile = mkOption { type = types.path; - default = "/var/run/couchdb/couchdb.uri"; + default = "/run/couchdb/couchdb.uri"; description = '' This file contains the full URI that can be used to access this instance of CouchDB. It is used to help discover the port CouchDB is diff --git a/nixos/modules/services/databases/mongodb.nix b/nixos/modules/services/databases/mongodb.nix index 4c46d9228e5..3fe4af2f261 100644 --- a/nixos/modules/services/databases/mongodb.nix +++ b/nixos/modules/services/databases/mongodb.nix @@ -65,7 +65,7 @@ in }; pidFile = mkOption { - default = "/var/run/mongodb.pid"; + default = "/run/mongodb.pid"; description = "Location of MongoDB pid file"; }; diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix index bb658918cb0..c101e7375af 100644 --- a/nixos/modules/services/databases/openldap.nix +++ b/nixos/modules/services/databases/openldap.nix @@ -226,8 +226,8 @@ in wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; preStart = '' - mkdir -p /var/run/slapd - chown -R "${cfg.user}:${cfg.group}" /var/run/slapd + mkdir -p /run/slapd + chown -R "${cfg.user}:${cfg.group}" /run/slapd ${optionalString (cfg.declarativeContents != null) '' rm -Rf "${cfg.dataDir}" ''} diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix index cc7b51982d1..c04cc1283b2 100644 --- a/nixos/modules/services/databases/redis.nix +++ b/nixos/modules/services/databases/redis.nix @@ -95,7 +95,7 @@ in type = with types; nullOr path; default = null; description = "The path to the socket to bind to."; - example = "/var/run/redis.sock"; + example = "/run/redis.sock"; }; logLevel = mkOption { diff --git a/nixos/modules/services/databases/rethinkdb.nix b/nixos/modules/services/databases/rethinkdb.nix index 789d9c851d6..4828e594b32 100644 --- a/nixos/modules/services/databases/rethinkdb.nix +++ b/nixos/modules/services/databases/rethinkdb.nix @@ -41,7 +41,7 @@ in }; pidpath = mkOption { - default = "/var/run/rethinkdb"; + default = "/run/rethinkdb"; description = "Location where each instance's pid file is located."; }; diff --git a/nixos/modules/services/mail/pfix-srsd.nix b/nixos/modules/services/mail/pfix-srsd.nix index ab5f4c39e8c..9599854352c 100644 --- a/nixos/modules/services/mail/pfix-srsd.nix +++ b/nixos/modules/services/mail/pfix-srsd.nix @@ -48,8 +48,8 @@ with lib; requiredBy = [ "postfix.service" ]; serviceConfig = { Type = "forking"; - PIDFile = "/var/run/pfix-srsd.pid"; - ExecStart = "${pkgs.pfixtools}/bin/pfix-srsd -p /var/run/pfix-srsd.pid -I ${config.services.pfix-srsd.domain} ${config.services.pfix-srsd.secretsFile}"; + PIDFile = "/run/pfix-srsd.pid"; + ExecStart = "${pkgs.pfixtools}/bin/pfix-srsd -p /run/pfix-srsd.pid -I ${config.services.pfix-srsd.domain} ${config.services.pfix-srsd.secretsFile}"; }; }; }; diff --git a/nixos/modules/services/mail/postgrey.nix b/nixos/modules/services/mail/postgrey.nix index 241f75eae27..8e2b9c5dbc5 100644 --- a/nixos/modules/services/mail/postgrey.nix +++ b/nixos/modules/services/mail/postgrey.nix @@ -29,7 +29,7 @@ with lib; let options = { path = mkOption { type = path; - default = "/var/run/postgrey.sock"; + default = "/run/postgrey.sock"; description = "Path of the unix socket"; }; @@ -53,7 +53,7 @@ in { socket = mkOption { type = socket; default = { - path = "/var/run/postgrey.sock"; + path = "/run/postgrey.sock"; mode = "0777"; }; example = { diff --git a/nixos/modules/services/mail/spamassassin.nix b/nixos/modules/services/mail/spamassassin.nix index 0c11ea43136..1fe77ce5a0c 100644 --- a/nixos/modules/services/mail/spamassassin.nix +++ b/nixos/modules/services/mail/spamassassin.nix @@ -174,7 +174,7 @@ in after = [ "network.target" ]; serviceConfig = { - ExecStart = "${pkgs.spamassassin}/bin/spamd ${optionalString cfg.debug "-D"} --username=spamd --groupname=spamd --siteconfigpath=${spamdEnv} --virtual-config-dir=/var/lib/spamassassin/user-%u --allow-tell --pidfile=/var/run/spamd.pid"; + ExecStart = "${pkgs.spamassassin}/bin/spamd ${optionalString cfg.debug "-D"} --username=spamd --groupname=spamd --siteconfigpath=${spamdEnv} --virtual-config-dir=/var/lib/spamassassin/user-%u --allow-tell --pidfile=/run/spamd.pid"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; }; diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix index 87999c3614f..5e465926b83 100644 --- a/nixos/modules/services/misc/matrix-synapse.nix +++ b/nixos/modules/services/misc/matrix-synapse.nix @@ -30,7 +30,7 @@ ${optionalString (cfg.bind_host != null) '' bind_host: "${cfg.bind_host}" ''} server_name: "${cfg.server_name}" -pid_file: "/var/run/matrix-synapse.pid" +pid_file: "/run/matrix-synapse.pid" web_client: ${boolToString cfg.web_client} ${optionalString (cfg.public_baseurl != null) '' public_baseurl: "${cfg.public_baseurl}" diff --git a/nixos/modules/services/misc/mbpfan.nix b/nixos/modules/services/misc/mbpfan.nix index 50f6f80ad00..e22d1ed61f9 100644 --- a/nixos/modules/services/misc/mbpfan.nix +++ b/nixos/modules/services/misc/mbpfan.nix @@ -101,7 +101,7 @@ in { Type = "simple"; ExecStart = "${cfg.package}/bin/mbpfan -f${verbose}"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; - PIDFile = "/var/run/mbpfan.pid"; + PIDFile = "/run/mbpfan.pid"; Restart = "always"; }; }; diff --git a/nixos/modules/services/misc/spice-vdagentd.nix b/nixos/modules/services/misc/spice-vdagentd.nix index f322ba4cbd5..2dd9fcf68ab 100644 --- a/nixos/modules/services/misc/spice-vdagentd.nix +++ b/nixos/modules/services/misc/spice-vdagentd.nix @@ -19,7 +19,7 @@ in description = "spice-vdagent daemon"; wantedBy = [ "graphical.target" ]; preStart = '' - mkdir -p "/var/run/spice-vdagentd/" + mkdir -p "/run/spice-vdagentd/" ''; serviceConfig = { Type = "forking"; diff --git a/nixos/modules/services/misc/svnserve.nix b/nixos/modules/services/misc/svnserve.nix index 04a6cd7bfa9..6292bc52b1e 100644 --- a/nixos/modules/services/misc/svnserve.nix +++ b/nixos/modules/services/misc/svnserve.nix @@ -38,7 +38,7 @@ in after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; preStart = "mkdir -p ${cfg.svnBaseDir}"; - script = "${pkgs.subversion.out}/bin/svnserve -r ${cfg.svnBaseDir} -d --foreground --pid-file=/var/run/svnserve.pid"; + script = "${pkgs.subversion.out}/bin/svnserve -r ${cfg.svnBaseDir} -d --foreground --pid-file=/run/svnserve.pid"; }; }; } diff --git a/nixos/modules/services/monitoring/nagios.nix b/nixos/modules/services/monitoring/nagios.nix index e5496209f82..7f65236ed3d 100644 --- a/nixos/modules/services/monitoring/nagios.nix +++ b/nixos/modules/services/monitoring/nagios.nix @@ -24,7 +24,7 @@ let status_file=${nagiosState}/status.dat object_cache_file=${nagiosState}/objects.cache temp_file=${nagiosState}/nagios.tmp - lock_file=/var/run/nagios.lock # Not used I think. + lock_file=/run/nagios.lock # Not used I think. state_retention_file=${nagiosState}/retention.dat query_socket=${nagiosState}/nagios.qh check_result_path=${nagiosState} diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix index cc703573d8c..25385be9704 100644 --- a/nixos/modules/services/monitoring/prometheus/default.nix +++ b/nixos/modules/services/monitoring/prometheus/default.nix @@ -4,9 +4,24 @@ with lib; let cfg = config.services.prometheus; + cfg2 = config.services.prometheus2; promUser = "prometheus"; promGroup = "prometheus"; + stateDir = + if cfg.stateDir != null + then cfg.stateDir + else + if cfg.dataDir != null + then + # This assumes /var/lib/ is a prefix of cfg.dataDir. + # This is checked as an assertion below. + removePrefix stateDirBase cfg.dataDir + else "prometheus"; + stateDirBase = "/var/lib/"; + workingDir = stateDirBase + stateDir; + workingDir2 = stateDirBase + cfg2.stateDir; + # Get a submodule without any embedded metadata: _filter = x: filterAttrs (k: v: k != "_module") x; @@ -17,13 +32,23 @@ let promtool ${what} $out ''; + # a wrapper that verifies that the configuration is valid for + # prometheus 2 + prom2toolCheck = what: name: file: + pkgs.runCommand + "${name}-${replaceStrings [" "] [""] what}-checked" + { buildInputs = [ cfg2.package ]; } '' + ln -s ${file} $out + promtool ${what} $out + ''; + # Pretty-print JSON to a file writePrettyJSON = name: x: pkgs.runCommand name { preferLocalBuild = true; } '' echo '${builtins.toJSON x}' | ${pkgs.jq}/bin/jq . > $out ''; - # This becomes the main config file + # This becomes the main config file for Prometheus 1 promConfig = { global = cfg.globalConfig; rule_files = map (promtoolCheck "check-rules" "rules") (cfg.ruleFiles ++ [ @@ -35,20 +60,53 @@ let generatedPrometheusYml = writePrettyJSON "prometheus.yml" promConfig; prometheusYml = let - yml = if cfg.configText != null then + yml = if cfg.configText != null then pkgs.writeText "prometheus.yml" cfg.configText else generatedPrometheusYml; in promtoolCheck "check-config" "prometheus.yml" yml; cmdlineArgs = cfg.extraFlags ++ [ - "-storage.local.path=${cfg.dataDir}/metrics" + "-storage.local.path=${workingDir}/metrics" "-config.file=${prometheusYml}" "-web.listen-address=${cfg.listenAddress}" "-alertmanager.notification-queue-capacity=${toString cfg.alertmanagerNotificationQueueCapacity}" "-alertmanager.timeout=${toString cfg.alertmanagerTimeout}s" - (optionalString (cfg.alertmanagerURL != []) "-alertmanager.url=${concatStringsSep "," cfg.alertmanagerURL}") - (optionalString (cfg.webExternalUrl != null) "-web.external-url=${cfg.webExternalUrl}") - ]; + ] ++ + optional (cfg.alertmanagerURL != []) "-alertmanager.url=${concatStringsSep "," cfg.alertmanagerURL}" ++ + optional (cfg.webExternalUrl != null) "-web.external-url=${cfg.webExternalUrl}"; + + # This becomes the main config file for Prometheus 2 + promConfig2 = { + global = cfg2.globalConfig; + rule_files = map (prom2toolCheck "check rules" "rules") (cfg2.ruleFiles ++ [ + (pkgs.writeText "prometheus.rules" (concatStringsSep "\n" cfg2.rules)) + ]); + scrape_configs = cfg2.scrapeConfigs; + alerting = optionalAttrs (cfg2.alertmanagerURL != []) { + alertmanagers = [{ + static_configs = [{ + targets = cfg2.alertmanagerURL; + }]; + }]; + }; + }; + + generatedPrometheus2Yml = writePrettyJSON "prometheus.yml" promConfig2; + + prometheus2Yml = let + yml = if cfg2.configText != null then + pkgs.writeText "prometheus.yml" cfg2.configText + else generatedPrometheus2Yml; + in prom2toolCheck "check config" "prometheus.yml" yml; + + cmdlineArgs2 = cfg2.extraFlags ++ [ + "--storage.tsdb.path=${workingDir2}/data/" + "--config.file=${prometheus2Yml}" + "--web.listen-address=${cfg2.listenAddress}" + "--alertmanager.notification-queue-capacity=${toString cfg2.alertmanagerNotificationQueueCapacity}" + "--alertmanager.timeout=${toString cfg2.alertmanagerTimeout}s" + ] ++ + optional (cfg2.webExternalUrl != null) "--web.external-url=${cfg2.webExternalUrl}"; promTypes.globalConfig = types.submodule { options = { @@ -403,10 +461,21 @@ in { }; dataDir = mkOption { - type = types.path; - default = "/var/lib/prometheus"; + type = types.nullOr types.path; + default = null; description = '' Directory to store Prometheus metrics data. + This option is deprecated, please use . + ''; + }; + + stateDir = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Directory below ${stateDirBase} to store Prometheus metrics data. + This directory will be created automatically using systemd's StateDirectory mechanism. + Defaults to prometheus. ''; }; @@ -497,30 +566,201 @@ in { ''; }; }; - }; + services.prometheus2 = { - config = mkIf cfg.enable { - users.groups.${promGroup}.gid = config.ids.gids.prometheus; - users.users.${promUser} = { - description = "Prometheus daemon user"; - uid = config.ids.uids.prometheus; - group = promGroup; - home = cfg.dataDir; - createHome = true; - }; - systemd.services.prometheus = { - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - script = '' - #!/bin/sh - exec ${cfg.package}/bin/prometheus \ - ${concatStringsSep " \\\n " cmdlineArgs} - ''; - serviceConfig = { - User = promUser; - Restart = "always"; - WorkingDirectory = cfg.dataDir; + enable = mkOption { + type = types.bool; + default = false; + description = '' + Enable the Prometheus 2 monitoring daemon. + ''; + }; + + package = mkOption { + type = types.package; + default = pkgs.prometheus_2; + defaultText = "pkgs.prometheus_2"; + description = '' + The prometheus2 package that should be used. + ''; + }; + + listenAddress = mkOption { + type = types.str; + default = "0.0.0.0:9090"; + description = '' + Address to listen on for the web interface, API, and telemetry. + ''; + }; + + stateDir = mkOption { + type = types.str; + default = "prometheus2"; + description = '' + Directory below ${stateDirBase} to store Prometheus metrics data. + This directory will be created automatically using systemd's StateDirectory mechanism. + Defaults to prometheus2. + ''; + }; + + extraFlags = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Extra commandline options when launching Prometheus 2. + ''; + }; + + configText = mkOption { + type = types.nullOr types.lines; + default = null; + description = '' + If non-null, this option defines the text that is written to + prometheus.yml. If null, the contents of prometheus.yml is generated + from the structured config options. + ''; + }; + + globalConfig = mkOption { + type = promTypes.globalConfig; + default = {}; + apply = _filter; + description = '' + Parameters that are valid in all configuration contexts. They + also serve as defaults for other configuration sections + ''; + }; + + rules = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Alerting and/or Recording rules to evaluate at runtime. + ''; + }; + + ruleFiles = mkOption { + type = types.listOf types.path; + default = []; + description = '' + Any additional rules files to include in this configuration. + ''; + }; + + scrapeConfigs = mkOption { + type = types.listOf promTypes.scrape_config; + default = []; + apply = x: map _filter x; + description = '' + A list of scrape configurations. + ''; + }; + + alertmanagerURL = mkOption { + type = types.listOf types.str; + default = []; + description = '' + List of Alertmanager URLs to send notifications to. + ''; + }; + + alertmanagerNotificationQueueCapacity = mkOption { + type = types.int; + default = 10000; + description = '' + The capacity of the queue for pending alert manager notifications. + ''; + }; + + alertmanagerTimeout = mkOption { + type = types.int; + default = 10; + description = '' + Alert manager HTTP API timeout (in seconds). + ''; + }; + + webExternalUrl = mkOption { + type = types.nullOr types.str; + default = null; + example = "https://example.com/"; + description = '' + The URL under which Prometheus is externally reachable (for example, + if Prometheus is served via a reverse proxy). + ''; }; }; - }; + }; + + config = mkMerge [ + (mkIf (cfg.enable || cfg2.enable) { + users.groups.${promGroup}.gid = config.ids.gids.prometheus; + users.users.${promUser} = { + description = "Prometheus daemon user"; + uid = config.ids.uids.prometheus; + group = promGroup; + }; + }) + (mkIf cfg.enable { + warnings = + optional (cfg.dataDir != null) '' + The option services.prometheus.dataDir is deprecated, please use + services.prometheus.stateDir. + ''; + assertions = [ + { + assertion = !(cfg.dataDir != null && cfg.stateDir != null); + message = + "The options services.prometheus.dataDir and services.prometheus.stateDir" + + " can't both be set at the same time! It's recommended to only set the latter" + + " since the former is deprecated."; + } + { + assertion = cfg.dataDir != null -> hasPrefix stateDirBase cfg.dataDir; + message = + "The option services.prometheus.dataDir should have ${stateDirBase} as a prefix!"; + } + { + assertion = cfg.stateDir != null -> !hasPrefix "/" cfg.stateDir; + message = + "The option services.prometheus.stateDir shouldn't be an absolute directory." + + " It should be a directory relative to ${stateDirBase}."; + } + { + assertion = cfg2.stateDir != null -> !hasPrefix "/" cfg2.stateDir; + message = + "The option services.prometheus2.stateDir shouldn't be an absolute directory." + + " It should be a directory relative to ${stateDirBase}."; + } + ]; + systemd.services.prometheus = { + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + serviceConfig = { + ExecStart = "${cfg.package}/bin/prometheus" + + optionalString (length cmdlineArgs != 0) (" \\\n " + + concatStringsSep " \\\n " cmdlineArgs); + User = promUser; + Restart = "always"; + WorkingDirectory = workingDir; + StateDirectory = stateDir; + }; + }; + }) + (mkIf cfg2.enable { + systemd.services.prometheus2 = { + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + serviceConfig = { + ExecStart = "${cfg2.package}/bin/prometheus" + + optionalString (length cmdlineArgs2 != 0) (" \\\n " + + concatStringsSep " \\\n " cmdlineArgs2); + User = promUser; + Restart = "always"; + WorkingDirectory = workingDir2; + StateDirectory = cfg2.stateDir; + }; + }; + }) + ]; } diff --git a/nixos/modules/services/monitoring/zabbix-agent.nix b/nixos/modules/services/monitoring/zabbix-agent.nix index 426cf9bf86e..0519e7c2ad6 100644 --- a/nixos/modules/services/monitoring/zabbix-agent.nix +++ b/nixos/modules/services/monitoring/zabbix-agent.nix @@ -9,7 +9,7 @@ let zabbix = cfg.package; - stateDir = "/var/run/zabbix"; + stateDir = "/run/zabbix"; logDir = "/var/log/zabbix"; diff --git a/nixos/modules/services/monitoring/zabbix-server.nix b/nixos/modules/services/monitoring/zabbix-server.nix index 5f9fc12832f..fdeab6af441 100644 --- a/nixos/modules/services/monitoring/zabbix-server.nix +++ b/nixos/modules/services/monitoring/zabbix-server.nix @@ -7,7 +7,7 @@ let cfg = config.services.zabbixServer; - stateDir = "/var/run/zabbix"; + stateDir = "/run/zabbix"; logDir = "/var/log/zabbix"; diff --git a/nixos/modules/services/networking/asterisk.nix b/nixos/modules/services/networking/asterisk.nix index b8ec2b25a22..03a2544b9a7 100644 --- a/nixos/modules/services/networking/asterisk.nix +++ b/nixos/modules/services/networking/asterisk.nix @@ -45,7 +45,7 @@ let astdatadir => /var/lib/asterisk astagidir => /var/lib/asterisk/agi-bin astspooldir => /var/spool/asterisk - astrundir => /var/run/asterisk + astrundir => /run/asterisk astlogdir => /var/log/asterisk astsbindir => ${cfg.package}/sbin ''; @@ -257,7 +257,7 @@ in ExecReload = ''${cfg.package}/bin/asterisk -x "core reload" ''; Type = "forking"; - PIDFile = "/var/run/asterisk/asterisk.pid"; + PIDFile = "/run/asterisk/asterisk.pid"; }; }; }; diff --git a/nixos/modules/services/networking/avahi-daemon.nix b/nixos/modules/services/networking/avahi-daemon.nix index 488d9877b5e..4c91a0c415b 100644 --- a/nixos/modules/services/networking/avahi-daemon.nix +++ b/nixos/modules/services/networking/avahi-daemon.nix @@ -214,7 +214,7 @@ in systemd.sockets.avahi-daemon = { description = "Avahi mDNS/DNS-SD Stack Activation Socket"; - listenStreams = [ "/var/run/avahi-daemon/socket" ]; + listenStreams = [ "/run/avahi-daemon/socket" ]; wantedBy = [ "sockets.target" ]; }; @@ -229,7 +229,7 @@ in path = [ pkgs.coreutils pkgs.avahi ]; - preStart = "mkdir -p /var/run/avahi-daemon"; + preStart = "mkdir -p /run/avahi-daemon"; script = '' diff --git a/nixos/modules/services/networking/bind.nix b/nixos/modules/services/networking/bind.nix index abcd1ef6ff5..98486cefd52 100644 --- a/nixos/modules/services/networking/bind.nix +++ b/nixos/modules/services/networking/bind.nix @@ -25,8 +25,8 @@ let blackhole { badnetworks; }; forward first; forwarders { ${concatMapStrings (entry: " ${entry}; ") cfg.forwarders} }; - directory "/var/run/named"; - pid-file "/var/run/named/named.pid"; + directory "/run/named"; + pid-file "/run/named/named.pid"; ${cfg.extraOptions} }; @@ -187,8 +187,8 @@ in ${pkgs.bind.out}/sbin/rndc-confgen -r /dev/urandom -c /etc/bind/rndc.key -u ${bindUser} -a -A hmac-sha256 2>/dev/null fi - ${pkgs.coreutils}/bin/mkdir -p /var/run/named - chown ${bindUser} /var/run/named + ${pkgs.coreutils}/bin/mkdir -p /run/named + chown ${bindUser} /run/named ''; serviceConfig = { diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix index 9f74e496329..3fbc08e9060 100644 --- a/nixos/modules/services/networking/hostapd.nix +++ b/nixos/modules/services/networking/hostapd.nix @@ -25,7 +25,7 @@ let logger_stdout=-1 logger_stdout_level=2 - ctrl_interface=/var/run/hostapd + ctrl_interface=/run/hostapd ctrl_interface_group=${cfg.group} ${if cfg.wpa then '' diff --git a/nixos/modules/services/networking/htpdate.nix b/nixos/modules/services/networking/htpdate.nix index f5d512c7cd5..6954e5b060c 100644 --- a/nixos/modules/services/networking/htpdate.nix +++ b/nixos/modules/services/networking/htpdate.nix @@ -62,7 +62,7 @@ in wantedBy = [ "multi-user.target" ]; serviceConfig = { Type = "forking"; - PIDFile = "/var/run/htpdate.pid"; + PIDFile = "/run/htpdate.pid"; ExecStart = concatStringsSep " " [ "${htpdate}/bin/htpdate" "-D -u nobody" diff --git a/nixos/modules/services/networking/iodine.nix b/nixos/modules/services/networking/iodine.nix index 58ad0df4ff2..344f84374bb 100644 --- a/nixos/modules/services/networking/iodine.nix +++ b/nixos/modules/services/networking/iodine.nix @@ -63,7 +63,7 @@ in passwordFile = mkOption { type = types.str; default = ""; - description = "File that containts password"; + description = "File that contains password"; }; }; })); @@ -100,7 +100,7 @@ in passwordFile = mkOption { type = types.str; default = ""; - description = "File that containts password"; + description = "File that contains password"; }; }; @@ -120,7 +120,7 @@ in description = "iodine client - ${name}"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - script = "${pkgs.iodine}/bin/iodine -f -u ${iodinedUser} ${cfg.extraConfig} ${optionalString (cfg.passwordFile != "") "-P $(cat \"${cfg.passwordFile}\")"} ${cfg.relay} ${cfg.server}"; + script = "exec ${pkgs.iodine}/bin/iodine -f -u ${iodinedUser} ${cfg.extraConfig} ${optionalString (cfg.passwordFile != "") "< \"${cfg.passwordFile}\""} ${cfg.relay} ${cfg.server}"; serviceConfig = { RestartSec = "30s"; Restart = "always"; @@ -136,7 +136,7 @@ in description = "iodine, ip over dns server daemon"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - script = "${pkgs.iodine}/bin/iodined -f -u ${iodinedUser} ${cfg.server.extraConfig} ${optionalString (cfg.server.passwordFile != "") "-P $(cat \"${cfg.server.passwordFile}\")"} ${cfg.server.ip} ${cfg.server.domain}"; + script = "exec ${pkgs.iodine}/bin/iodined -f -u ${iodinedUser} ${cfg.server.extraConfig} ${optionalString (cfg.server.passwordFile != "") "< \"${cfg.server.passwordFile}\""} ${cfg.server.ip} ${cfg.server.domain}"; }; }; diff --git a/nixos/modules/services/networking/ircd-hybrid/ircd.conf b/nixos/modules/services/networking/ircd-hybrid/ircd.conf index bb22832dbdb..17ef203840a 100644 --- a/nixos/modules/services/networking/ircd-hybrid/ircd.conf +++ b/nixos/modules/services/networking/ircd-hybrid/ircd.conf @@ -987,7 +987,7 @@ general { * egdpool_path: path to EGD pool. Not necessary for OpenSSL >= 0.9.7 * which automatically finds the path. */ -# egdpool_path = "/var/run/egd-pool"; +# egdpool_path = "/run/egd-pool"; /* diff --git a/nixos/modules/services/networking/lldpd.nix b/nixos/modules/services/networking/lldpd.nix index dec30cc92f6..d5de9c45d84 100644 --- a/nixos/modules/services/networking/lldpd.nix +++ b/nixos/modules/services/networking/lldpd.nix @@ -23,7 +23,7 @@ in users.users._lldpd = { description = "lldpd user"; group = "_lldpd"; - home = "/var/run/lldpd"; + home = "/run/lldpd"; isSystemUser = true; }; users.groups._lldpd = {}; diff --git a/nixos/modules/services/networking/miniupnpd.nix b/nixos/modules/services/networking/miniupnpd.nix index ab714a6ac75..c095d994854 100644 --- a/nixos/modules/services/networking/miniupnpd.nix +++ b/nixos/modules/services/networking/miniupnpd.nix @@ -71,7 +71,7 @@ in wantedBy = [ "multi-user.target" ]; serviceConfig = { ExecStart = "${pkgs.miniupnpd}/bin/miniupnpd -f ${configFile}"; - PIDFile = "/var/run/miniupnpd.pid"; + PIDFile = "/run/miniupnpd.pid"; Type = "forking"; }; }; diff --git a/nixos/modules/services/networking/ocserv.nix b/nixos/modules/services/networking/ocserv.nix index 61473a9fabf..dc26ffeafee 100644 --- a/nixos/modules/services/networking/ocserv.nix +++ b/nixos/modules/services/networking/ocserv.nix @@ -31,7 +31,7 @@ in udp-port = 443 run-as-user = nobody run-as-group = nogroup - socket-file = /var/run/ocserv-socket + socket-file = /run/ocserv-socket server-cert = certs/server-cert.pem server-key = certs/server-key.pem keepalive = 32400 @@ -50,7 +50,7 @@ in rekey-time = 172800 rekey-method = ssl use-occtl = true - pid-file = /var/run/ocserv.pid + pid-file = /run/ocserv.pid device = vpns predictable-ips = true default-domain = example.com @@ -90,8 +90,8 @@ in serviceConfig = { PrivateTmp = true; - PIDFile = "/var/run/ocserv.pid"; - ExecStart = "${pkgs.ocserv}/bin/ocserv --foreground --pid-file /var/run/ocesrv.pid --config /etc/ocserv/ocserv.conf"; + PIDFile = "/run/ocserv.pid"; + ExecStart = "${pkgs.ocserv}/bin/ocserv --foreground --pid-file /run/ocesrv.pid --config /etc/ocserv/ocserv.conf"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; }; }; diff --git a/nixos/modules/services/networking/racoon.nix b/nixos/modules/services/networking/racoon.nix index 86e13d1ea0d..328f4cb1497 100644 --- a/nixos/modules/services/networking/racoon.nix +++ b/nixos/modules/services/networking/racoon.nix @@ -32,12 +32,12 @@ in { else cfg.configPath }"; ExecReload = "${pkgs.ipsecTools}/bin/racoonctl reload-config"; - PIDFile = "/var/run/racoon.pid"; + PIDFile = "/run/racoon.pid"; Type = "forking"; Restart = "always"; }; preStart = '' - rm /var/run/racoon.pid || true + rm /run/racoon.pid || true mkdir -p /var/racoon ''; }; diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index b9b5d40c457..cbb305cd382 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -431,8 +431,6 @@ in services.openssh.extraConfig = mkOrder 0 '' - Protocol 2 - UsePAM yes AddressFamily ${if config.networking.enableIPv6 then "any" else "inet"} diff --git a/nixos/modules/services/networking/supplicant.nix b/nixos/modules/services/networking/supplicant.nix index 3c4321ab9e9..35c1e649e2e 100644 --- a/nixos/modules/services/networking/supplicant.nix +++ b/nixos/modules/services/networking/supplicant.nix @@ -132,7 +132,7 @@ in extraCmdArgs = mkOption { type = types.str; default = ""; - example = "-e/var/run/wpa_supplicant/entropy.bin"; + example = "-e/run/wpa_supplicant/entropy.bin"; description = "Command line arguments to add when executing wpa_supplicant."; }; @@ -164,7 +164,7 @@ in socketDir = mkOption { type = types.str; - default = "/var/run/wpa_supplicant"; + default = "/run/wpa_supplicant"; description = "Directory of sockets for controlling wpa_supplicant."; }; diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix index cdfe98aa034..0bd9edf4a41 100644 --- a/nixos/modules/services/networking/wpa_supplicant.nix +++ b/nixos/modules/services/networking/wpa_supplicant.nix @@ -6,7 +6,7 @@ let cfg = config.networking.wireless; configFile = if cfg.networks != {} then pkgs.writeText "wpa_supplicant.conf" '' ${optionalString cfg.userControlled.enable '' - ctrl_interface=DIR=/var/run/wpa_supplicant GROUP=${cfg.userControlled.group} + ctrl_interface=DIR=/run/wpa_supplicant GROUP=${cfg.userControlled.group} update_config=1''} ${cfg.extraConfig} ${concatStringsSep "\n" (mapAttrsToList (ssid: config: with config; let diff --git a/nixos/modules/services/networking/xrdp.nix b/nixos/modules/services/networking/xrdp.nix index cc18f6d0064..b7dd1c5d99d 100644 --- a/nixos/modules/services/networking/xrdp.nix +++ b/nixos/modules/services/networking/xrdp.nix @@ -17,7 +17,7 @@ let chmod +x $out/startwm.sh substituteInPlace $out/xrdp.ini \ - --replace "#rsakeys_ini=" "rsakeys_ini=/var/run/xrdp/rsakeys.ini" \ + --replace "#rsakeys_ini=" "rsakeys_ini=/run/xrdp/rsakeys.ini" \ --replace "certificate=" "certificate=${cfg.sslCert}" \ --replace "key_file=" "key_file=${cfg.sslKey}" \ --replace LogFile=xrdp.log LogFile=/dev/null \ @@ -132,9 +132,9 @@ in chown root:xrdp ${cfg.sslKey} ${cfg.sslCert} chmod 440 ${cfg.sslKey} ${cfg.sslCert} fi - if [ ! -s /var/run/xrdp/rsakeys.ini ]; then - mkdir -p /var/run/xrdp - ${cfg.package}/bin/xrdp-keygen xrdp /var/run/xrdp/rsakeys.ini + if [ ! -s /run/xrdp/rsakeys.ini ]; then + mkdir -p /run/xrdp + ${cfg.package}/bin/xrdp-keygen xrdp /run/xrdp/rsakeys.ini fi ''; serviceConfig = { diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index 854c76cc0a1..9e9bdedff12 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -74,7 +74,7 @@ let ${concatMapStrings (addr: '' Listen ${addr} '') cfg.listenAddresses} - Listen /var/run/cups/cups.sock + Listen /run/cups/cups.sock SetEnv PATH /var/lib/cups/path/lib/cups/filter:/var/lib/cups/path/bin diff --git a/nixos/modules/services/scheduling/fcron.nix b/nixos/modules/services/scheduling/fcron.nix index ae382897775..f77b3bcd592 100644 --- a/nixos/modules/services/scheduling/fcron.nix +++ b/nixos/modules/services/scheduling/fcron.nix @@ -100,8 +100,8 @@ in in pkgs.writeText "fcron.conf" '' fcrontabs = /var/spool/fcron - pidfile = /var/run/fcron.pid - fifofile = /var/run/fcron.fifo + pidfile = /run/fcron.pid + fifofile = /run/fcron.fifo fcronallow = /etc/fcron.allow fcrondeny = /etc/fcron.deny shell = /bin/sh diff --git a/nixos/modules/services/security/hologram-agent.nix b/nixos/modules/services/security/hologram-agent.nix index 39ed506f761..a5087b0a99b 100644 --- a/nixos/modules/services/security/hologram-agent.nix +++ b/nixos/modules/services/security/hologram-agent.nix @@ -45,7 +45,7 @@ in { wantedBy = [ "multi-user.target" ]; requires = [ "network-link-dummy0.service" "network-addresses-dummy0.service" ]; preStart = '' - /run/current-system/sw/bin/rm -fv /var/run/hologram.sock + /run/current-system/sw/bin/rm -fv /run/hologram.sock ''; serviceConfig = { ExecStart = "${pkgs.hologram.bin}/bin/hologram-agent -debug -conf ${cfgFile} -port ${cfg.httpPort}"; diff --git a/nixos/modules/services/web-apps/codimd.nix b/nixos/modules/services/web-apps/codimd.nix index 56e1de17e3c..ee2fc2b9d85 100644 --- a/nixos/modules/services/web-apps/codimd.nix +++ b/nixos/modules/services/web-apps/codimd.nix @@ -67,7 +67,7 @@ in path = mkOption { type = types.nullOr types.str; default = null; - example = "/var/run/codimd.sock"; + example = "/run/codimd.sock"; description = '' Specify where a UNIX domain socket should be placed. ''; diff --git a/nixos/modules/services/web-apps/documize.nix b/nixos/modules/services/web-apps/documize.nix new file mode 100644 index 00000000000..206617b0e5a --- /dev/null +++ b/nixos/modules/services/web-apps/documize.nix @@ -0,0 +1,67 @@ +{ pkgs, lib, config, ... }: + +with lib; + +let + + cfg = config.services.documize; + +in + + { + options.services.documize = { + enable = mkEnableOption "Documize Wiki"; + + offline = mkEnableOption "Documize offline mode"; + + package = mkOption { + default = pkgs.documize-community; + type = types.package; + description = '' + Which package to use for documize. + ''; + }; + + db = mkOption { + type = types.str; + example = "host=localhost port=5432 sslmode=disable user=admin password=secret dbname=documize"; + description = '' + The DB connection string to use for the database. + ''; + }; + + dbtype = mkOption { + type = types.enum [ "postgresql" "percona" "mariadb" "mysql" ]; + description = '' + Which database to use for storage. + ''; + }; + + port = mkOption { + type = types.port; + example = 3000; + description = '' + Which TCP port to serve. + ''; + }; + }; + + config = mkIf cfg.enable { + systemd.services.documize-server = { + wantedBy = [ "multi-user.target" ]; + + script = '' + ${cfg.package}/bin/documize \ + -db "${cfg.db}" \ + -dbtype ${cfg.dbtype} \ + -port ${toString cfg.port} \ + -offline ${if cfg.offline then "1" else "0"} + ''; + + serviceConfig = { + Restart = "always"; + DynamicUser = "yes"; + }; + }; + }; + } diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index eedcccac723..d0e45e1c12a 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -32,7 +32,7 @@ let cd ${pkgs.nextcloud} exec /run/wrappers/bin/sudo -u nextcloud \ NEXTCLOUD_CONFIG_DIR="${cfg.home}/config" \ - ${config.services.phpfpm.phpPackage}/bin/php \ + ${phpPackage}/bin/php \ -c ${pkgs.writeText "php.ini" phpOptionsStr}\ occ $* ''; @@ -360,7 +360,7 @@ in { environment.NEXTCLOUD_CONFIG_DIR = "${cfg.home}/config"; serviceConfig.Type = "oneshot"; serviceConfig.User = "nextcloud"; - serviceConfig.ExecStart = "${pkgs.php}/bin/php -f ${pkgs.nextcloud}/cron.php"; + serviceConfig.ExecStart = "${phpPackage}/bin/php -f ${pkgs.nextcloud}/cron.php"; }; }; diff --git a/nixos/modules/services/web-apps/restya-board.nix b/nixos/modules/services/web-apps/restya-board.nix index b064eae248e..15fd943a082 100644 --- a/nixos/modules/services/web-apps/restya-board.nix +++ b/nixos/modules/services/web-apps/restya-board.nix @@ -13,7 +13,7 @@ let runDir = "/run/restya-board"; poolName = "restya-board"; - phpfpmSocketName = "/var/run/phpfpm/${poolName}.sock"; + phpfpmSocketName = "/run/phpfpm/${poolName}.sock"; in diff --git a/nixos/modules/services/web-apps/selfoss.nix b/nixos/modules/services/web-apps/selfoss.nix index 7b0ce8a8d03..cd0f743a5fb 100644 --- a/nixos/modules/services/web-apps/selfoss.nix +++ b/nixos/modules/services/web-apps/selfoss.nix @@ -4,7 +4,7 @@ let cfg = config.services.selfoss; poolName = "selfoss_pool"; - phpfpmSocketName = "/var/run/phpfpm/${poolName}.sock"; + phpfpmSocketName = "/run/phpfpm/${poolName}.sock"; dataDir = "/var/lib/selfoss"; diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index f7a3daa5fdd..08297c7275a 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -15,7 +15,7 @@ let else cfg.database.port; poolName = "tt-rss"; - phpfpmSocketName = "/var/run/phpfpm/${poolName}.sock"; + phpfpmSocketName = "/run/phpfpm/${poolName}.sock"; tt-rss-config = pkgs.writeText "config.php" '' waitForUnit("documize-server.service"); + $machine->waitForOpenPort(3000); + + my $dbhash = $machine->succeed("curl -f localhost:3000 " + . " | grep 'property=\"dbhash' " + . " | grep -Po 'content=\"\\K[^\"]*'" + ); + + chomp($dbhash); + + $machine->succeed("curl -X POST " + . "--data 'dbname=documize' " + . "--data 'dbhash=$dbhash' " + . "--data 'title=NixOS' " + . "--data 'message=Docs' " + . "--data 'firstname=John' " + . "--data 'lastname=Doe' " + . "--data 'email=john.doe\@nixos.org' " + . "--data 'password=verysafe' " + . "-f localhost:3000/api/setup" + ); + + $machine->succeed('test "$(curl -f localhost:3000/api/public/meta | jq ".title" | xargs echo)" = "NixOS"'); + ''; +}) diff --git a/nixos/tests/elk.nix b/nixos/tests/elk.nix index e7ae023f3ff..a82e75799ae 100644 --- a/nixos/tests/elk.nix +++ b/nixos/tests/elk.nix @@ -2,6 +2,8 @@ config ? {}, pkgs ? import ../.. { inherit system config; }, enableUnfree ? false + # To run the test on the unfree ELK use the folllowing command: + # NIXPKGS_ALLOW_UNFREE=1 nix-build nixos/tests/elk.nix -A ELK-6 --arg enableUnfree true }: with import ../lib/testing.nix { inherit system pkgs; }; diff --git a/nixos/tests/nghttpx.nix b/nixos/tests/nghttpx.nix index 433562b9719..d41fa01aa9a 100644 --- a/nixos/tests/nghttpx.nix +++ b/nixos/tests/nghttpx.nix @@ -1,5 +1,5 @@ let - nginxRoot = "/var/run/nginx"; + nginxRoot = "/run/nginx"; in import ./make-test.nix ({...}: { name = "nghttpx"; diff --git a/nixos/tests/osquery.nix b/nixos/tests/osquery.nix index 281dbcff664..d95871ffafc 100644 --- a/nixos/tests/osquery.nix +++ b/nixos/tests/osquery.nix @@ -11,7 +11,7 @@ with lib; machine = { services.osquery.enable = true; services.osquery.loggerPath = "/var/log/osquery/logs"; - services.osquery.pidfile = "/var/run/osqueryd.pid"; + services.osquery.pidfile = "/run/osqueryd.pid"; }; testScript = '' @@ -23,6 +23,6 @@ with lib; "echo 'SELECT value FROM osquery_flags WHERE name = \"logger_path\";' | osqueryi | grep /var/log/osquery/logs" ); - $machine->succeed("echo 'SELECT value FROM osquery_flags WHERE name = \"pidfile\";' | osqueryi | grep /var/run/osqueryd.pid"); + $machine->succeed("echo 'SELECT value FROM osquery_flags WHERE name = \"pidfile\";' | osqueryi | grep /run/osqueryd.pid"); ''; }) diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix index f009a7c706e..e8702c1ffbf 100644 --- a/nixos/tests/printing.nix +++ b/nixos/tests/printing.nix @@ -42,7 +42,7 @@ import ./make-test.nix ({pkgs, ... }: { # check local encrypted connections work without error $client->succeed("lpstat -E -r") =~ /scheduler is running/ or die; # Test that UNIX socket is used for connections. - $client->succeed("lpstat -H") =~ "/var/run/cups/cups.sock" or die; + $client->succeed("lpstat -H") =~ "/run/cups/cups.sock" or die; # Test that HTTP server is available too. $client->succeed("curl --fail http://localhost:631/"); $client->succeed("curl --fail http://server:631/"); diff --git a/nixos/tests/prometheus-2.nix b/nixos/tests/prometheus-2.nix new file mode 100644 index 00000000000..5a4d8668cb8 --- /dev/null +++ b/nixos/tests/prometheus-2.nix @@ -0,0 +1,34 @@ +import ./make-test.nix { + name = "prometheus-2"; + + nodes = { + one = { pkgs, ... }: { + services.prometheus2 = { + enable = true; + scrapeConfigs = [{ + job_name = "prometheus"; + static_configs = [{ + targets = [ "127.0.0.1:9090" ]; + labels = { instance = "localhost"; }; + }]; + }]; + rules = [ + '' + groups: + - name: test + rules: + - record: testrule + expr: count(up{job="prometheus"}) + '' + ]; + }; + }; + }; + + testScript = '' + startAll; + $one->waitForUnit("prometheus2.service"); + $one->waitForOpenPort(9090); + $one->succeed("curl -s http://127.0.0.1:9090/metrics"); + ''; +} diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix index 522ffa2a533..b4406dab70e 100644 --- a/pkgs/applications/audio/kid3/default.nix +++ b/pkgs/applications/audio/kid3/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { name = "kid3-${version}"; - version = "3.7.0"; + version = "3.7.1"; src = fetchurl { url = "mirror://sourceforge/project/kid3/kid3/${version}/${name}.tar.gz"; - sha256 = "1bj4kq9hklgfp81rbxcjzbxmdgxjqksx7cqnw3m9dc0pnns5jx0x"; + sha256 = "0xkrsjrbr3z8cn8hjf623l28r3b755gr11i0clv8d8i3s10vhbd8"; }; buildInputs = with stdenv.lib; diff --git a/pkgs/applications/audio/ltc-tools/default.nix b/pkgs/applications/audio/ltc-tools/default.nix index 79edfdef504..81db133ff9a 100644 --- a/pkgs/applications/audio/ltc-tools/default.nix +++ b/pkgs/applications/audio/ltc-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "ltc-tools-${version}"; - version = "0.6.4"; + version = "0.7.0"; src = fetchFromGitHub { owner = "x42"; repo = "ltc-tools"; rev = "v${version}"; - sha256 = "1a7r99mwc7p5j5y453mrgph67wlznd674v4k2pfmlvc91s6lh44y"; + sha256 = "0vp25b970r1hv5ndzs4di63rgwnl31jfaj3jz5dka276kx34q4al"; }; buildInputs = [ pkgconfig libltc libsndfile jack2 ]; diff --git a/pkgs/applications/audio/pianobar/default.nix b/pkgs/applications/audio/pianobar/default.nix index 60cd2567f62..40e45a76b4b 100644 --- a/pkgs/applications/audio/pianobar/default.nix +++ b/pkgs/applications/audio/pianobar/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, pkgconfig, libao, json_c, libgcrypt, ffmpeg, curl }: stdenv.mkDerivation rec { - name = "pianobar-2018.06.22"; + name = "pianobar-2019.02.14"; src = fetchurl { url = "http://6xq.net/projects/pianobar/${name}.tar.bz2"; - sha256 = "1hnlif62vsxgh8j9mcibxwj4gybpgqc11ba729kflpvvi9qmfqwl"; + sha256 = "07z21vmlqpmvb3294r384iqbx972rwcx6chrdlkfv4hlnc9h7gf0"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix index eafde7957a2..089fffdc0e8 100644 --- a/pkgs/applications/audio/qjackctl/default.nix +++ b/pkgs/applications/audio/qjackctl/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras }: stdenv.mkDerivation rec { - version = "0.5.5"; + version = "0.5.6"; name = "qjackctl-${version}"; # some dependencies such as killall have to be installed additionally src = fetchurl { url = "mirror://sourceforge/qjackctl/${name}.tar.gz"; - sha256 = "1rzzqa39a6llr52vjkjr0a86nc776kmr5xs52qqga8ms9697psz5"; + sha256 = "0wlmbb9m7cf3wr7c2h2hji18592x2b119m7mx85wksjs6rjaq2mj"; }; buildInputs = [ diff --git a/pkgs/applications/audio/qmidinet/default.nix b/pkgs/applications/audio/qmidinet/default.nix index 37677cc211c..21bcd158f7a 100644 --- a/pkgs/applications/audio/qmidinet/default.nix +++ b/pkgs/applications/audio/qmidinet/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, qt5, alsaLib, libjack2 }: stdenv.mkDerivation rec { - version = "0.5.2"; + version = "0.5.3"; name = "qmidinet-${version}"; src = fetchurl { url = "mirror://sourceforge/qmidinet/${name}.tar.gz"; - sha256 = "0y2w3rymvc35r291sp2qaxn36wjwvxzk2iaw9y30q9fqc0vlpdns"; + sha256 = "0li6iz1anm8pzz7j12yrfyxlyslsfsksmz0kk0iapa4yx3kifn10"; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/audio/qsampler/default.nix b/pkgs/applications/audio/qsampler/default.nix index 69bf41e1e4f..aef0d013e9f 100644 --- a/pkgs/applications/audio/qsampler/default.nix +++ b/pkgs/applications/audio/qsampler/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "qsampler-${version}"; - version = "0.5.3"; + version = "0.5.4"; src = fetchurl { url = "mirror://sourceforge/qsampler/${name}.tar.gz"; - sha256 = "02xazvz8iaksglbgq3jhw4fq3f5pdcq9sss79jxs082md0mry17d"; + sha256 = "1hk0j63zzdyji5dd89spbyw79i74n28zjryyy0a4gsaq0m7j2dry"; }; nativeBuildInputs = [ autoconf automake libtool pkgconfig qttools ]; diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index 8e2b096672c..8e04b51753d 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "reaper-${version}"; - version = "5.965"; + version = "5.973"; src = fetchurl { url = "https://www.reaper.fm/files/${stdenv.lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_x86_64.tar.xz"; - sha256 = "05fn7r3v4qcb1b31g8layzvqilrwdr0s8yskr61yvbhx2dnjp9iw"; + sha256 = "02ymi2rn29zrb71krx43nrpfldhkcvwry4gz228apff2hb2lmqdx"; }; nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix index 8534d871c66..e749bb92807 100644 --- a/pkgs/applications/audio/snd/default.nix +++ b/pkgs/applications/audio/snd/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "snd-18.8"; + name = "snd-19.2"; src = fetchurl { url = "mirror://sourceforge/snd/${name}.tar.gz"; - sha256 = "16p6cmxl8y58wa19k1z6i66qsqaz7rld4850b0sprbxjjb6cqhf7"; + sha256 = "1a6ls2hyvggss12idca22hq5vsq4jw2xkwrx22dx29i9926gdr6h"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/audio/sunvox/default.nix b/pkgs/applications/audio/sunvox/default.nix index 47b0bf2e736..957ee50ca7a 100644 --- a/pkgs/applications/audio/sunvox/default.nix +++ b/pkgs/applications/audio/sunvox/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { name = "SunVox-${version}"; - version = "1.9.3b"; + version = "1.9.4c"; src = fetchurl { url = "http://www.warmplace.ru/soft/sunvox/sunvox-${version}.zip"; - sha256 = "0k74rcq7niw4p17vj3zp9lpgi932896dmzqv4ln43g0pz7l18c8b"; + sha256 = "19c1a4e28459e31e1a19986f219d4caa4eb2cb5bc9f6aa994abdbb2ebf6ac4ac"; }; buildInputs = [ unzip ]; diff --git a/pkgs/applications/audio/transcribe/default.nix b/pkgs/applications/audio/transcribe/default.nix index 9a76f2d15c7..29021e870af 100644 --- a/pkgs/applications/audio/transcribe/default.nix +++ b/pkgs/applications/audio/transcribe/default.nix @@ -68,5 +68,6 @@ stdenv.mkDerivation rec { license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ michalrus ]; + broken = true; }; } diff --git a/pkgs/applications/audio/traverso/default.nix b/pkgs/applications/audio/traverso/default.nix index 9729b136d90..0c432acf4af 100644 --- a/pkgs/applications/audio/traverso/default.nix +++ b/pkgs/applications/audio/traverso/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { name = "traverso-${version}"; - version = "0.49.5"; + version = "0.49.6"; src = fetchurl { - url = "http://traverso-daw.org/traverso-0.49.5.tar.gz"; - sha256 = "169dsqrf807ciavrd82d3iil0xy0r3i1js08xshcrn80ws9hv63m"; + url = "http://traverso-daw.org/traverso-0.49.6.tar.gz"; + sha256 = "12f7x8kw4fw1j0xkwjrp54cy4cv1ql0zwz2ba5arclk4pf6bhl7q"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/applications/editors/brackets/default.nix b/pkgs/applications/editors/brackets/default.nix index 1065564f7b4..ce9f10f39c4 100644 --- a/pkgs/applications/editors/brackets/default.nix +++ b/pkgs/applications/editors/brackets/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, gtk2, glib, gdk_pixbuf, alsaLib, nss, nspr, gconf -, cups, libgcrypt_1_5, systemd, dbus }: +, cups, libgcrypt_1_5, systemd, dbus, libXdamage, expat }: with stdenv.lib; let bracketsLibs = makeLibraryPath [ - gtk2 glib gdk_pixbuf stdenv.cc.cc.lib alsaLib nss nspr gconf cups libgcrypt_1_5 dbus systemd + gtk2 glib gdk_pixbuf stdenv.cc.cc.lib alsaLib nss nspr gconf cups libgcrypt_1_5 dbus systemd libXdamage expat ]; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix index 142b6fbd142..bae3c58b8e1 100644 --- a/pkgs/applications/editors/sigil/default.nix +++ b/pkgs/applications/editors/sigil/default.nix @@ -6,10 +6,10 @@ stdenv.mkDerivation rec { name = "sigil-${version}"; - version = "0.9.12"; + version = "0.9.13"; src = fetchFromGitHub { - sha256 = "0zlm1jjk91cbrphrilpvxhbm26bbmgy10n7hd0fb1ml8q70q34s3"; + sha256 = "05wnq7av7fgqgcqd88qjwgn55vr4ciy4f0rgi722f52vy97bw9bj"; rev = version; repo = "Sigil"; owner = "Sigil-Ebook"; diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index efbf5864faa..746bddd5416 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -13,8 +13,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "7.0.8-22"; - sha256 = "1ivljgf192xh7pq1apdic923pvcb3aq74mx8d4hi65hhc9748gv7"; + version = "7.0.8-34"; + sha256 = "0szkzwy0jzmwx4kqli21jq8pk3s53v37q0nsaqzascs3mpkbza2s"; patches = []; }; in diff --git a/pkgs/applications/graphics/drawpile/default.nix b/pkgs/applications/graphics/drawpile/default.nix index f322c6442b8..8a2657c3f5c 100644 --- a/pkgs/applications/graphics/drawpile/default.nix +++ b/pkgs/applications/graphics/drawpile/default.nix @@ -17,10 +17,10 @@ stdenv.mkDerivation rec { name = "drawpile-${version}"; - version = "2.1.4"; + version = "2.1.6"; src = fetchurl { url = "https://drawpile.net/files/src/drawpile-${version}.tar.gz"; - sha256 = "0n54p5day6gnmxqmgx4yd7q6y0mgv1nwh84yrz5r953yhd9m37rn"; + sha256 = "0vwsdvphigrq1daiazi411qflahlvgx8x8ssp581bng2lbq1vrbd"; }; nativeBuildInputs = [ extra-cmake-modules diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index 327272ae39c..18546e9f3cb 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -47,17 +47,17 @@ let libxkbcommon ]; in buildRustPackage rec { - name = "alacritty-${version}"; - version = "0.2.9"; + pname = "alacritty"; + version = "0.3.0"; src = fetchFromGitHub { owner = "jwilm"; - repo = "alacritty"; + repo = pname; rev = "v${version}"; - sha256 = "01wzkpbz6jjmpmnkqswilnn069ir3cx3jvd3j7zsvqdxqpwncz39"; + sha256 = "0d9qnymi8v4aqm2p300ccdsgavrnd64sv7v0cz5dp0sp5c0vd7jl"; }; - cargoSha256 = "0h9wczgpjh52lhrqg0r2dkrh5svmyvrvh4yj7p0nz45skgrnl8w9"; + cargoSha256 = "11gpv0h15n12f97mcwjymlzcmkldbakkkb5h931qgm3mvhhq5ay5"; nativeBuildInputs = [ cmake @@ -92,19 +92,20 @@ in buildRustPackage rec { mkdir $out/Applications cp -r target/release/osx/Alacritty.app $out/Applications/Alacritty.app '' else '' - install -D alacritty.desktop $out/share/applications/alacritty.desktop + install -D extra/linux/alacritty.desktop -t $out/share/applications/ + install -D extra/logo/alacritty-term.svg $out/share/icons/hicolor/scalable/apps/Alacritty.svg patchelf --set-rpath "${stdenv.lib.makeLibraryPath rpathLibs}" $out/bin/alacritty '') + '' - install -D alacritty-completions.zsh "$out/share/zsh/site-functions/_alacritty" - install -D alacritty-completions.bash "$out/etc/bash_completion.d/alacritty-completions.bash" - install -D alacritty-completions.fish "$out/share/fish/vendor_completions.d/alacritty.fish" + install -D extra/completions/_alacritty -t "$out/share/zsh/site-functions/" + install -D extra/completions/alacritty.bash -t "$out/etc/bash_completion.d/" + install -D extra/completions/alacritty.fish -t "$out/share/fish/vendor_completions.d/" install -dm 755 "$out/share/man/man1" - gzip -c alacritty.man > "$out/share/man/man1/alacritty.1.gz" + gzip -c extra/alacritty.man > "$out/share/man/man1/alacritty.1.gz" install -dm 755 "$terminfo/share/terminfo/a/" - tic -x -o "$terminfo/share/terminfo" alacritty.info + tic -x -o "$terminfo/share/terminfo" extra/alacritty.info mkdir -p $out/nix-support echo "$terminfo" >> $out/nix-support/propagated-user-env-packages diff --git a/pkgs/applications/misc/cli-visualizer/default.nix b/pkgs/applications/misc/cli-visualizer/default.nix index e0d284c838e..6602adb2f2a 100644 --- a/pkgs/applications/misc/cli-visualizer/default.nix +++ b/pkgs/applications/misc/cli-visualizer/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, fftw, ncurses5, libpulseaudio, makeWrapper }: stdenv.mkDerivation rec { - version = "1.7"; + version = "1.8"; name = "cli-visualizer-${version}"; src = fetchFromGitHub { owner = "dpayne"; repo = "cli-visualizer"; - rev = version; - sha256 = "06z6vj87xjmacppcxvgm47wby6mv1hnbqav8lpdk9v5s1hmmp1cr"; + rev = "v${version}"; + sha256 = "003mbbwsz43mg3d7llphpypqa9g7rs1p1cdbqi1mbc2bfrc1gcq2"; }; postPatch = '' diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index aa49f0e3d75..bf2de7271ab 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -1,8 +1,8 @@ -{ stdenv, appimage-run, fetchurl }: +{ stdenv, appimage-run, fetchurl, gsettings-desktop-schemas, gtk3, gobject-introspection, wrapGAppsHook }: let - version = "1.0.140"; - sha256 = "1114v141jayqhvkkxf7dr864j09nf5nz002c7z0pprzr00fifqzx"; + version = "1.0.142"; + sha256 = "0k7lnv3qqz17a2a2d431sic3ggi3373r5k0kwxm4017ama7d72m1"; in stdenv.mkDerivation rec { name = "joplin-${version}"; @@ -12,7 +12,8 @@ in inherit sha256; }; - buildInputs = [ appimage-run ]; + nativeBuildInputs = [ wrapGAppsHook ]; + buildInputs = [ appimage-run gtk3 gsettings-desktop-schemas gobject-introspection ]; unpackPhase = ":"; diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix index 120d3a82b5e..e4f2fd7ce8b 100644 --- a/pkgs/applications/misc/opencpn/default.nix +++ b/pkgs/applications/misc/opencpn/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "opencpn-${version}"; - version = "4.8.8"; + version = "5.0.0"; src = fetchFromGitHub { owner = "OpenCPN"; repo = "OpenCPN"; rev = "v${version}"; - sha256 = "1z9xfc5fgbdslzak3iqg9nx6wggxwv8qwfxfhvfblkyg6kjw30dg"; + sha256 = "1xv3h6svw9aay5ixpql231md3pf00qxvhg62z88daraf18hlkfja"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix index dd60147f4e6..d3f2d5a74e5 100644 --- a/pkgs/applications/misc/rtv/default.nix +++ b/pkgs/applications/misc/rtv/default.nix @@ -2,14 +2,14 @@ with python3Packages; buildPythonApplication rec { - version = "1.25.1"; + version = "1.26.0"; pname = "rtv"; src = fetchFromGitHub { owner = "michael-lazar"; repo = "rtv"; rev = "v${version}"; - sha256 = "0pfsf17g37d2v1xrsbfdbv460vs7m955h6q51z71rhb840r9812p"; + sha256 = "0smwlhc4sj92365pl7yy6a821xddmh9px43nbd0kdd2z9xrndyx1"; }; # Tests try to access network diff --git a/pkgs/applications/misc/sequeler/default.nix b/pkgs/applications/misc/sequeler/default.nix index f7f4b8985f0..4947bcf60bd 100644 --- a/pkgs/applications/misc/sequeler/default.nix +++ b/pkgs/applications/misc/sequeler/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub , meson, ninja, pkgconfig, pantheon, gettext, wrapGAppsHook, python3, desktop-file-utils -, gtk3, glib, libgee, libgda, gtksourceview, libxml2, libsecret, libfixposix, libssh2 }: +, gtk3, glib, libgee, libgda, gtksourceview, libxml2, libsecret, libssh2 }: let @@ -11,18 +11,18 @@ let in stdenv.mkDerivation rec { pname = "sequeler"; - version = "0.6.8"; + version = "0.7.0"; src = fetchFromGitHub { owner = "Alecaddd"; repo = pname; rev = "v${version}"; - sha256 = "1rx8h3bi86vk8j7c447pwm590z061js4w45nzrp66r41v0rnh5vk"; + sha256 = "1x2ikagjsgnhhhwkj09ihln17mq4wjq3wwbnf02j2p3jpp4i8w1i"; }; nativeBuildInputs = [ meson ninja pkgconfig pantheon.vala gettext wrapGAppsHook python3 desktop-file-utils ]; - buildInputs = [ gtk3 glib pantheon.granite libgee sqlGda gtksourceview libxml2 libsecret libfixposix libssh2 ]; + buildInputs = [ gtk3 glib pantheon.granite libgee sqlGda gtksourceview libxml2 libsecret libssh2 ]; postPatch = '' chmod +x build-aux/meson_post_install.py @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { ''; homepage = https://github.com/Alecaddd/sequeler; license = licenses.gpl3; - maintainers = [ maintainers.etu ]; + maintainers = [ maintainers.etu ] ++ pantheon.maintainers; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index ab1e0b5dda2..6c21f9e81e9 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation rec { name = "waybar-${version}"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "Alexays"; repo = "Waybar"; rev = version; - sha256 = "006pzx4crsqn9vk28g87306xh3jrfwk4ib9cmsxqrxy8v0kl2s4g"; + sha256 = "1h3ifiklzcbrvqzzhs7rij8w45k96cir2d4kkyd2ap93akvcnsr9"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 15de1a763d9..3fae28be2be 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -8,10 +8,10 @@ , libjpeg, zlib, dbus, dbus-glib, bzip2, xorg , freetype, fontconfig, file, nspr, nss, libnotify , yasm, libGLU_combined, sqlite, unzip, makeWrapper -, hunspell, libevent, libstartup_notification, libvpx +, hunspell, libXdamage, libevent, libstartup_notification, libvpx , icu, libpng, jemalloc, glib , autoconf213, which, gnused, cargo, rustc, llvmPackages -, rust-cbindgen, nodejs, nasm +, rust-cbindgen, nodejs, nasm, fetchpatch , debugBuild ? false ### optionals @@ -30,11 +30,13 @@ , privacySupport ? isTorBrowserLike || isIceCatLike # WARNING: NEVER set any of the options below to `true` by default. -# Set to `privacySupport` or `false`. +# Set to `!privacySupport` or `false`. -# webrtcSupport breaks the aarch64 build on version >= 60. +# webrtcSupport breaks the aarch64 build on version >= 60, fixed in 63. # https://bugzilla.mozilla.org/show_bug.cgi?id=1434589 -, webrtcSupport ? (if lib.versionAtLeast ffversion "60" && stdenv.isAarch64 then false else !privacySupport) +, webrtcSupport ? !privacySupport && (!stdenv.isAarch64 || !( + lib.versionAtLeast ffversion "60" && lib.versionOlder ffversion "63" + )) , geolocationSupport ? !privacySupport , googleAPISupport ? geolocationSupport , crashreporterSupport ? false @@ -92,6 +94,15 @@ let browserPatches = [ ./env_var_for_system_dir.patch + ] ++ lib.optionals (stdenv.isAarch64 && lib.versionAtLeast ffversion "66") [ + (fetchpatch { + url = "https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/09c7fa0dc1d87922e3b464c0fa084df1227fca79/extra/firefox/arm.patch"; + sha256 = "1vbpih23imhv5r3g21m3m541z08n9n9j1nvmqax76bmyhn7mxp32"; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/09c7fa0dc1d87922e3b464c0fa084df1227fca79/extra/firefox/build-arm-libopus.patch"; + sha256 = "1zg56v3lc346fkzcjjx21vjip2s9hb2xw4pvza1dsfdnhsnzppfp"; + }) ] ++ patches; in @@ -120,6 +131,7 @@ stdenv.mkDerivation rec { icu libpng jemalloc glib ] ++ lib.optionals (!isTorBrowserLike) [ nspr nss ] + ++ lib.optional (lib.versionOlder ffversion "53") libXdamage ++ lib.optional (lib.versionOlder ffversion "61") hunspell # >= 66 requires nasm for the AV1 lib dav1d diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 35a21ec62ca..945bbfba566 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -1,4 +1,4 @@ -{ lib, callPackage, stdenv, fetchurl, fetchFromGitHub, fetchpatch, python3 }: +{ lib, callPackage, stdenv, fetchurl, fetchFromGitHub, fetchpatch, python3, overrideCC, gccStdenv, gcc6 }: let @@ -47,7 +47,7 @@ rec { # the web, there are many old useful plugins targeting offline # activities (e.g. ebook readers, syncronous translation, etc) that # will probably never be ported to WebExtensions API. - firefox-esr-52 = common rec { + firefox-esr-52 = (common rec { pname = "firefox-esr"; ffversion = "52.9.0esr"; src = fetchurl { @@ -65,6 +65,9 @@ rec { description = "A web browser built from Firefox Extended Support Release source tree"; knownVulnerabilities = [ "Support ended in August 2018." ]; }; + }).override { + stdenv = overrideCC gccStdenv gcc6; # gcc7 fails with "undefined reference to `__divmoddi4'" + gtk3Support = false; }; firefox-esr-60 = common rec { diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix index 6d50c598de7..fdefa48adba 100644 --- a/pkgs/applications/networking/cluster/cni/plugins.nix +++ b/pkgs/applications/networking/cluster/cni/plugins.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "cni-plugins-${version}"; - version = "0.7.4"; + version = "0.7.5"; src = fetchFromGitHub { owner = "containernetworking"; repo = "plugins"; rev = "v${version}"; - sha256 = "1sywllwnr6lc812sgkqjdd3y10r82shl88dlnwgnbgzs738q2vp2"; + sha256 = "1kfi0iz2hs4rq3cdkw12j8d47ac4f5vrpzcwcrs2yzmh2j4n5sz5"; }; buildInputs = [ removeReferencesTo go ]; diff --git a/pkgs/applications/networking/dropbox/cli.nix b/pkgs/applications/networking/dropbox/cli.nix index f09f685ea73..73977b82047 100644 --- a/pkgs/applications/networking/dropbox/cli.nix +++ b/pkgs/applications/networking/dropbox/cli.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgconfig, fetchurl, python, dropbox }: +{ stdenv, pkgconfig, fetchurl, python3, dropbox }: let version = "2019.02.14"; dropboxd = "${dropbox}/bin/dropbox"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ python ]; + buildInputs = [ python3 ]; phases = "unpackPhase installPhase"; diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index 464722612c7..9df43b690fd 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -2,7 +2,7 @@ let stableVersion = "2.1.15"; - previewVersion = "2.2.0a3"; + previewVersion = "2.2.0a4"; addVersion = args: let version = if args.stable then stableVersion else previewVersion; branch = if args.stable then "stable" else "preview"; @@ -18,7 +18,7 @@ in { }; guiPreview = mkGui { stable = false; - sha256Hash = "110mghkhanz92p8vfzyh4199mnihb24smxsc44a8v534ds6hww74"; + sha256Hash = "1a64c314v7mbaiipyap2skqgf69pyp1ld58cn2g3d89w2zrhf5q7"; }; serverStable = mkServer { @@ -27,6 +27,6 @@ in { }; serverPreview = mkServer { stable = false; - sha256Hash = "104pvrba7n9gp7mx31xg520cfahcy0vsmbzx23007c50kp0nxc56"; + sha256Hash = "1jlz8a34q3s1sz9r6swh3jnlp96602axnvh1byywry5fb9ga8mfy"; }; } diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix index f79622b39cf..d7c8db81d63 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper }: let - version = "3.6.1"; + version = "3.7.1"; arch = if stdenv.is64bit then "amd64" else "x86"; libDir = if stdenv.is64bit then "lib64" else "lib"; in @@ -15,8 +15,8 @@ stdenv.mkDerivation { "http://teamspeak.gameserver.gamed.de/ts3/releases/${version}/teamspeak3-server_linux_${arch}-${version}.tar.bz2" ]; sha256 = if stdenv.is64bit - then "0wgnb7fdy393anridymm1frlgr86j0awxnzvd498ar5fch06ij87" - else "0x6p1z4qvgy464n6gnkaqrm7dns1ysyadm68sr260d39a7028q1c"; + then "1w60241zsvr8d1qlkca6a1sfxa1jz4w1z9kjd0wd2wkgzp4x91v7" + else "0s835dnaw662sb2v5ahqiwry0qjcpl7ff9krnhbw2iblsbqis3fj"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/jmeter/default.nix b/pkgs/applications/networking/jmeter/default.nix index 2019d9930ef..54cdf8fa4e1 100644 --- a/pkgs/applications/networking/jmeter/default.nix +++ b/pkgs/applications/networking/jmeter/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "jmeter-${version}"; - version = "4.0"; + version = "5.1"; src = fetchurl { url = "https://archive.apache.org/dist/jmeter/binaries/apache-${name}.tgz"; - sha256 = "1dvngvi6j8qb6nmf5a3gpi5wxck4xisj41qkrj8sjwb1f8jq6nw4"; + sha256 = "04n7srrg47iyrzhskm2w5g8pd8269kjsly5ixsgifl6aqcbvxpcz"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix index 8a16aeb5518..32455e1132f 100644 --- a/pkgs/applications/networking/mailreaders/mailnag/default.nix +++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix @@ -10,11 +10,11 @@ let inherit (pythonPackages) python; in pythonPackages.buildPythonApplication rec { name = "mailnag-${version}"; - version = "1.2.1"; + version = "1.3.0"; src = fetchurl { url = "https://github.com/pulb/mailnag/archive/v${version}.tar.gz"; - sha256 = "ec7ac027d93bc7d88fc270858f5a181453a6ff07f43cab20563d185818801fee"; + sha256 = "0cp5pad6jzd5c14pddbi9ap5bi78wjhk1x2p0gbblmvmcasw309s"; }; buildInputs = [ diff --git a/pkgs/applications/networking/mailreaders/mblaze/default.nix b/pkgs/applications/networking/mailreaders/mblaze/default.nix index 6356fcfc209..f00ec6e6566 100644 --- a/pkgs/applications/networking/mailreaders/mblaze/default.nix +++ b/pkgs/applications/networking/mailreaders/mblaze/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, libiconv }: +{ stdenv, fetchFromGitHub, fetchpatch, libiconv }: stdenv.mkDerivation rec { name = "mblaze-${version}"; - version = "0.5"; + version = "0.5.1"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; @@ -10,9 +10,16 @@ stdenv.mkDerivation rec { owner = "chneukirchen"; repo = "mblaze"; rev = "v${version}"; - sha256 = "0fyvydafpz7vmwgn7hc4drm9sb7367smrd07wfyizpas0gmxw2j8"; + sha256 = "11x548dl2jy9cmgsakqrzfdq166whhk4ja7zkiaxrapkjmkf6pbh"; }; + patches = [ + (fetchpatch { + url = "https://github.com/leahneukirchen/mblaze/commit/53151f4f890f302291eb8d3375dec4f8ecb66ed7.patch"; + sha256 = "1mcyrh053iiyzdhgm09g5h3a77np496whnc7jr4agpk1nkbcpfxc"; + }) + ]; + makeFlags = "PREFIX=$(out)"; postInstall = '' diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index dde0d480391..4e7be2be473 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -27,16 +27,16 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "mutt-${version}"; - version = "1.11.3"; + version = "1.11.4"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${name}.tar.gz"; - sha256 = "0h8rmcc62n1pagm7mjjccd5fxyhhi4vbvp8m88digkdf5z0g8hm5"; + sha256 = "0098pr4anmq2a0id8wfi2vci3cgcfwf9k4q411w22xn8lrz3aldn"; }; patches = optional smimeSupport (fetchpatch { - url = "https://salsa.debian.org/mutt-team/mutt/raw/debian/1.11.2-2/debian/patches/misc/smime.rc.patch"; - sha256 = "1rl27qqwl4nw321ll5jcvfmkmz4fkvcsh5vihjcrhzzyf6vz8wmj"; + url = "https://salsa.debian.org/mutt-team/mutt/raw/debian/1.10.1-2/debian/patches/misc/smime.rc.patch"; + sha256 = "0b4i00chvx6zj9pcb06x2jysmrcb2znn831lcy32cgfds6gr3nsi"; }); buildInputs = diff --git a/pkgs/applications/networking/netperf/default.nix b/pkgs/applications/networking/netperf/default.nix index 421a3cfbe3b..b89173820ee 100644 --- a/pkgs/applications/networking/netperf/default.nix +++ b/pkgs/applications/networking/netperf/default.nix @@ -1,16 +1,17 @@ { libsmbios, stdenv, autoreconfHook, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "netperf-20180504"; + name = "netperf-${version}"; + version = "20180613"; src = fetchFromGitHub { owner = "HewlettPackard"; repo = "netperf"; - rev = "c0a0d9f31f9940abf375a41b43a343cdbf87caab"; - sha256 = "0wfj9kkhar6jb5639f5wxpwsraxw4v9yzg71rsdidvj5fyncjjq2"; + rev = "bcb868bde7f0203bbab69609f65d4088ba7398db"; + sha256 = "1wbbgdvhadd3qs3afv6i777argdpcyxkwz4yv6aqp223n8ki6dm8"; }; - buildInputs = [ libsmbios ]; + buildInputs = stdenv.lib.optional (stdenv.hostPlatform.isx86) libsmbios; nativeBuildInputs = [ autoreconfHook ]; autoreconfPhase = '' autoreconf -i -I src/missing/m4 diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index a131355963c..0bf2cfce6e4 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -1,35 +1,22 @@ { stdenv, fetchgit, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, qttools, sqlite , inotify-tools, makeWrapper, openssl_1_1, pcre, qtwebengine, libsecret, fetchpatch +, libcloudproviders }: stdenv.mkDerivation rec { name = "nextcloud-client-${version}"; - version = "2.5.1"; + version = "2.5.2"; src = fetchgit { url = "git://github.com/nextcloud/desktop.git"; rev = "refs/tags/v${version}"; - sha256 = "0r6jj3vbmwh7ipv83c8w1b25pbfq3mzrjgcijdw2gwfxwx9pfq7d"; + sha256 = "1brpxdgyy742dqw6cyyv2257d6ihwiqhbzfk2hb8zjgbi6p9lhsr"; fetchSubmodules = true; }; - # Patches contained in next (>2.5.1) release - patches = [ - (fetchpatch { - name = "fix-qt-5.12-build"; - url = "https://github.com/nextcloud/desktop/commit/071709ab5e3366e867dd0b0ea931aa7d6f80f528.patch"; - sha256 = "14k635jwm8hz6i22lz88jj2db8v5czwa3zg0667i4hwhkqqmy61n"; - }) - (fetchpatch { - name = "fix-qtwebengine-crash"; - url = "https://patch-diff.githubusercontent.com/raw/nextcloud/desktop/pull/959.patch"; - sha256 = "00qx976az2rb1gwl1rxapm8gqj42yzqp8k2fasn3h7b30lnxdyr0"; - }) - ]; - nativeBuildInputs = [ pkgconfig cmake makeWrapper ]; - buildInputs = [ qtbase qtwebkit qtkeychain qttools qtwebengine sqlite openssl_1_1.out pcre inotify-tools ]; + buildInputs = [ qtbase qtwebkit qtkeychain qttools qtwebengine sqlite openssl_1_1.out pcre inotify-tools libcloudproviders ]; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/p2p/ncdc/default.nix b/pkgs/applications/networking/p2p/ncdc/default.nix index c56e39826a6..a3d55d7dff7 100644 --- a/pkgs/applications/networking/p2p/ncdc/default.nix +++ b/pkgs/applications/networking/p2p/ncdc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ncdc-${version}"; - version = "1.20"; + version = "1.21"; src = fetchurl { url = "https://dev.yorhel.nl/download/ncdc-${version}.tar.gz"; - sha256 = "0ccn7dqbqpqsbglqyalz32c20rjvf1pw0zr88jyvd2b2vxbqi6ca"; + sha256 = "10hrk7pcvfl9cj6d0kr4qf3l068ikqhccbg7lf25pr2kln9lz412"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index 9bfaad8a5bc..8a8ee240780 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "teamviewer-${version}"; - version = "14.1.3399"; + version = "14.2.2558"; src = fetchurl { url = "https://dl.tvcdn.de/download/linux/version_14x/teamviewer_${version}_amd64.deb"; - sha256 = "166ndijis2i3afz3l6nsnrdhs56v33w5cnjd0m7giqj0fbq43ws5"; + sha256 = "1wfdvs0jfhm1ri1mni4bf9qszzca17p07w6ih7k4k0x4j8ga18cs"; }; unpackPhase = '' diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/pkgs/applications/networking/resilio-sync/default.nix index c855277e225..8bdb7b456c3 100644 --- a/pkgs/applications/networking/resilio-sync/default.nix +++ b/pkgs/applications/networking/resilio-sync/default.nix @@ -9,12 +9,12 @@ let in stdenv.mkDerivation rec { name = "resilio-sync-${version}"; - version = "2.6.2"; + version = "2.6.3"; src = fetchurl { url = "https://download-cdn.resilio.com/${version}/linux-${arch}/resilio-sync_${arch}.tar.gz"; sha256 = { - "x86_64-linux" = "0vq8jz4v740zz3pvgqfya8mhy35fh49wpn8d08xjrs5062hl1yc2"; + "x86_64-linux" = "114k7dsxn7lzv6mjq9alsqxypvkah4lmjn5w6brbvgd6m6pdwslz"; "i686-linux" = "1gvq29bkdqvbcgnnhl3018h564rswk3r88s33lx5iph1rpxc6v5h"; }.${stdenv.hostPlatform.system}; }; diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 39144935e9c..7cdc7341953 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -3,14 +3,14 @@ let common = { stname, target, postInstall ? "" }: buildGoPackage rec { - version = "1.1.0"; + version = "1.1.1"; name = "${stname}-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "1qmrh3c4p5vxzjqd0zdmvcqffq75gl4qfg0s8qpkgvdc7qrzzi7i"; + sha256 = "1nkc4ivc8mg9c1njqlkhb9i5f4c1via1rdqfbhwgkj86s6cnxrg7"; }; goPackagePath = "github.com/syncthing/syncthing"; diff --git a/pkgs/applications/networking/syncthing/deps.nix b/pkgs/applications/networking/syncthing/deps.nix index 351b4e30d56..4a58a490cc5 100644 --- a/pkgs/applications/networking/syncthing/deps.nix +++ b/pkgs/applications/networking/syncthing/deps.nix @@ -392,8 +392,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "0fcca4842a8d"; - sha256 = "033ghifvrxmqr54nm8gmgxz7qxlqgw9z7z976kp88yf1rmxm2kjr"; + rev = "c2843e01d9a2"; + sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r"; }; } { @@ -419,8 +419,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "4d1cda033e06"; - sha256 = "1wgaldbnkmh568v8kkgvnmkskaj96fqrbzhx23yji2kh1432q6gh"; + rev = "d0b11bdaac8a"; + sha256 = "18yfsmw622l7gc5sqriv5qmck6903vvhivpzp8i3xfy3z33dybdl"; }; } { diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/applications/office/ledger/default.nix index 643d9ed894f..276134efd73 100644 --- a/pkgs/applications/office/ledger/default.nix +++ b/pkgs/applications/office/ledger/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "ledger-${version}"; - version = "3.1.2"; + version = "3.1.3"; src = fetchFromGitHub { owner = "ledger"; repo = "ledger"; - rev = version; - sha256 = "0hwnipj2m9p95hhyv6kyq54m27g14r58gnsy2my883kxhpcyb2vc"; + rev = "v${version}"; + sha256 = "0bfnrqrd6wqgsngfpqi30xh6yy86pwl25iwzrqy44q31r0zl4mm3"; }; buildInputs = [ diff --git a/pkgs/applications/office/wordgrinder/default.nix b/pkgs/applications/office/wordgrinder/default.nix index be5ac7a2f2b..7b7b03aae5d 100644 --- a/pkgs/applications/office/wordgrinder/default.nix +++ b/pkgs/applications/office/wordgrinder/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "wordgrinder-${version}"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { repo = "wordgrinder"; owner = "davidgiven"; rev = "${version}"; - sha256 = "19n4vn8zyvcvgwygm63d3jcmiwh6a2ikrrqqmkm8fvhdvwkqgr9k"; + sha256 = "1zqx3p9l22njni44ads3fyw3xh6807wmb5k1x2glg61z81cwc6sf"; }; makeFlags = [ diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 562874ccc13..7c32641e9c3 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -69,6 +69,11 @@ stdenv.mkDerivation rec { installTargets = [ "install" "install-info" "install-pdf" ]; + # The store path to "which" is baked into src/library/base/R/unix/system.unix.R, + # but Nix cannot detect it as a run-time dependency because the installed file + # is compiled and compressed, which hides the store path. + postFixup = "echo ${which} > $out/nix-support/undetected-runtime-dependencies"; + doCheck = true; preCheck = "export TZ=CET; bin/Rscript -e 'sessionInfo()'"; diff --git a/pkgs/applications/version-management/git-and-tools/git/update.sh b/pkgs/applications/version-management/git-and-tools/git/update.sh new file mode 100755 index 00000000000..05944014743 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git/update.sh @@ -0,0 +1,18 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl common-updater-scripts jq + +set -eu -o pipefail + +oldVersion="$(nix-instantiate --eval -E "with import ./. {}; git.version or (builtins.parseDrvName git.name).version" | tr -d '"')" +latestTag="$(git ls-remote --tags --sort="v:refname" git://github.com/git/git.git | grep -v '\{\}' | grep -v '\-rc' | tail -1 | sed 's|^.*/v\(.*\)|\1|')" + +if [ ! "${oldVersion}" = "${latestTag}" ]; then + update-source-version git "${latestTag}" + nixpkgs="$(git rev-parse --show-toplevel)" + default_nix="$nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix" + nix-build -A git + git add "${default_nix}" + git commit -m "git: ${oldVersion} -> ${latestTag}" +else + echo "git is already up-to-date" +fi diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index fc4c18f5eb7..7f72e24aa53 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -4,7 +4,7 @@ let # if you bump version, update pkgs.tortoisehg too or ping maintainer - version = "4.9"; + version = "4.9.1"; name = "mercurial-${version}"; inherit (python2Packages) docutils hg-git dulwich python; in python2Packages.buildPythonApplication { @@ -13,7 +13,7 @@ in python2Packages.buildPythonApplication { src = fetchurl { url = "https://mercurial-scm.org/release/${name}.tar.gz"; - sha256 = "01ig0464cvy9d87rn274g39frxr0p5q4lxf1xn5k3m24grf0qq0g"; + sha256 = "0iybbkd9add066729zg01kwz5hhc1s6lhp9rrnsmzq6ihyxj3p8v"; }; inherit python; # pass it so that the same version can be used in hg2git diff --git a/pkgs/applications/video/vdr/default.nix b/pkgs/applications/video/vdr/default.nix index 0ad0b04e7e4..21c2404f4ee 100644 --- a/pkgs/applications/video/vdr/default.nix +++ b/pkgs/applications/video/vdr/default.nix @@ -1,78 +1,55 @@ { stdenv, fetchurl, fontconfig, libjpeg, libcap, freetype, fribidi, pkgconfig -, gettext, ncurses, systemd, perl +, gettext, systemd, perl, lib , enableSystemd ? true , enableBidi ? true -}: -let - - version = "2.4.0"; +}: stdenv.mkDerivation rec { name = "vdr-${version}"; + version = "2.4.0"; - mkPlugin = name: stdenv.mkDerivation { - name = "vdr-${name}-${version}"; - inherit (vdr) src; - buildInputs = [ vdr ]; - preConfigure = "cd PLUGINS/src/${name}"; - installFlags = [ "DESTDIR=$(out)" ]; + src = fetchurl { + url = "ftp://ftp.tvdr.de/vdr/${name}.tar.bz2"; + sha256 = "1klcgy9kr7n6z8d2c77j63bl8hvhx5qnqppg73f77004hzz4kbwk"; }; - vdr = stdenv.mkDerivation { + enableParallelBuilding = true; - inherit name; + postPatch = "substituteInPlace Makefile --replace libsystemd-daemon libsystemd"; - src = fetchurl { - url = "ftp://ftp.tvdr.de/vdr/${name}.tar.bz2"; - sha256 = "1klcgy9kr7n6z8d2c77j63bl8hvhx5qnqppg73f77004hzz4kbwk"; - }; + buildInputs = [ fontconfig libjpeg libcap freetype ] + ++ lib.optional enableSystemd systemd + ++ lib.optional enableBidi fribidi; - enableParallelBuilding = true; + buildFlags = [ "vdr" "i18n" ] + ++ lib.optional enableSystemd "SDNOTIFY=1" + ++ lib.optional enableBidi "BIDI=1"; - postPatch = "substituteInPlace Makefile --replace libsystemd-daemon libsystemd"; + nativeBuildInputs = [ perl ]; - buildInputs = [ fontconfig libjpeg libcap freetype ] - ++ stdenv.lib.optional enableSystemd systemd - ++ stdenv.lib.optional enableBidi fribidi; + # plugins uses the same build environment as vdr + propagatedNativeBuildInputs = [ pkgconfig gettext ]; - buildFlags = [ "vdr" "i18n" ] - ++ stdenv.lib.optional enableSystemd "SDNOTIFY=1" - ++ stdenv.lib.optional enableBidi "BIDI=1"; + installFlags = [ + "DESTDIR=$(out)" + "PREFIX=" # needs to be empty, otherwise plugins try to install at same prefix + ]; - nativeBuildInputs = [ perl ]; + installTargets = [ "install-pc" "install-bin" "install-doc" "install-i18n" + "install-includes" ]; - # plugins uses the same build environment as vdr - propagatedNativeBuildInputs = [ pkgconfig gettext ]; + postInstall = '' + mkdir -p $out/lib/vdr # only needed if vdr is started without any plugin + mkdir -p $out/share/vdr/conf + cp *.conf $out/share/vdr/conf + ''; - installFlags = [ - "DESTDIR=$(out)" - "PREFIX=" # needs to be empty, otherwise plugins try to install at same prefix - ]; - - installTargets = [ "install-pc" "install-bin" "install-doc" "install-i18n" - "install-includes" ]; - - postInstall = '' - mkdir -p $out/lib/vdr # only needed if vdr is started without any plugin - mkdir -p $out/share/vdr/conf - cp *.conf $out/share/vdr/conf - ''; - - outputs = [ "out" "dev" "man" ]; - - meta = with stdenv.lib; { - homepage = http://www.tvdr.de/; - description = "Video Disc Recorder"; - maintainers = [ maintainers.ck3d ]; - platforms = [ "i686-linux" "x86_64-linux" ]; - license = licenses.gpl2; - }; + outputs = [ "out" "dev" "man" ]; + meta = with lib; { + homepage = http://www.tvdr.de/; + description = "Video Disc Recorder"; + maintainers = [ maintainers.ck3d ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + license = licenses.gpl2; }; -in vdr // { - plugins = { - skincurses = (mkPlugin "skincurses").overrideAttrs( - oldAttr: { buildInputs = oldAttr.buildInputs ++ [ ncurses ]; }); - } // (stdenv.lib.genAttrs [ - "epgtableid0" "hello" "osddemo" "pictures" "servicedemo" "status" "svdrpdemo" - ] mkPlugin); } diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix index 0e543390c4b..4fc3783ba51 100644 --- a/pkgs/applications/video/vdr/plugins.nix +++ b/pkgs/applications/video/vdr/plugins.nix @@ -1,7 +1,24 @@ { stdenv, fetchurl, fetchgit, vdr, ffmpeg_2, alsaLib, fetchFromGitHub , libvdpau, libxcb, xcbutilwm, graphicsmagick, libav, pcre, xorgserver, ffmpeg -, libiconv, boost, libgcrypt, perl, utillinux, groff, libva, xorg }: -{ +, libiconv, boost, libgcrypt, perl, utillinux, groff, libva, xorg, ncurses }: +let + mkPlugin = name: stdenv.mkDerivation { + name = "vdr-${vdr.version}-${name}"; + inherit (vdr) src; + buildInputs = [ vdr ]; + preConfigure = "cd PLUGINS/src/${name}"; + installFlags = [ "DESTDIR=$(out)" ]; + }; +in { + + skincurses = (mkPlugin "skincurses").overrideAttrs(oldAttr: { + buildInputs = oldAttr.buildInputs ++ [ ncurses ]; + }); + + inherit (stdenv.lib.genAttrs [ + "epgtableid0" "hello" "osddemo" "pictures" "servicedemo" "status" "svdrpdemo" + ] mkPlugin); + femon = stdenv.mkDerivation rec { name = "vdr-femon-2.4.0"; diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 91a6a4e6706..908e888503e 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -77,6 +77,11 @@ stdenv.mkDerivation rec { ./no-etc-install.patch ./fix-qemu-ga.patch ./9p-ignore-noatime.patch + (fetchpatch { + name = "CVE-2019-3812.patch"; + url = "https://git.qemu.org/?p=qemu.git;a=patch;h=b05b267840515730dbf6753495d5b7bd8b04ad1c"; + sha256 = "03a5vc5wvirbyi5r8kb2r4m2w6f1zmh9bqsr2psh4pblwar0nf55"; + }) ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch ++ optional pulseSupport ./fix-hda-recording.patch ++ optionals stdenv.hostPlatform.isMusl [ diff --git a/pkgs/applications/window-managers/i3/blocks.nix b/pkgs/applications/window-managers/i3/blocks.nix index 88bf7762dd8..bd088db8a36 100644 --- a/pkgs/applications/window-managers/i3/blocks.nix +++ b/pkgs/applications/window-managers/i3/blocks.nix @@ -1,54 +1,19 @@ -{ fetchurl, stdenv, perl, makeWrapper -, iproute, acpi, sysstat, xset, playerctl -, cmus, openvpn, lm_sensors, alsaUtils -, scripts ? [ "bandwidth" "battery" "cpu_usage" "disk" "iface" - "keyindicator" "load_average" "mediaplayer" "memory" - "openvpn" "temperature" "volume" "wifi" ] -}: +{ fetchFromGitHub, stdenv, autoreconfHook }: with stdenv.lib; -let - perlscripts = [ "battery" "cpu_usage" "keyindicator" - "mediaplayer" "openvpn" "temperature" ]; - contains_any = l1: l2: 0 < length( intersectLists l1 l2 ); - -in stdenv.mkDerivation rec { name = "i3blocks-${version}"; - version = "1.4"; + version = "unstable-2019-02-07"; - src = fetchurl { - url = "https://github.com/vivien/i3blocks/releases/download/${version}/${name}.tar.gz"; - sha256 = "c64720057e22cc7cac5e8fcd58fd37e75be3a7d5a3cb8995841a7f18d30c0536"; + src = fetchFromGitHub { + owner = "vivien"; + repo = "i3blocks"; + rev = "ec050e79ad8489a6f8deb37d4c20ab10729c25c3"; + sha256 = "1fx4230lmqa5rpzph68dwnpcjfaaqv5gfkradcr85hd1z8d1qp1b"; }; - buildFlags = "SYSCONFDIR=/etc all"; - installFlags = "PREFIX=\${out} VERSION=${version}"; - - buildInputs = optional (contains_any scripts perlscripts) perl; - nativeBuildInputs = [ makeWrapper ]; - - postFixup = '' - wrapProgram $out/libexec/i3blocks/bandwidth \ - --prefix PATH : ${makeBinPath (optional (elem "bandwidth" scripts) iproute)} - wrapProgram $out/libexec/i3blocks/battery \ - --prefix PATH : ${makeBinPath (optional (elem "battery" scripts) acpi)} - wrapProgram $out/libexec/i3blocks/cpu_usage \ - --prefix PATH : ${makeBinPath (optional (elem "cpu_usage" scripts) sysstat)} - wrapProgram $out/libexec/i3blocks/iface \ - --prefix PATH : ${makeBinPath (optional (elem "iface" scripts) iproute)} - wrapProgram $out/libexec/i3blocks/keyindicator \ - --prefix PATH : ${makeBinPath (optional (elem "keyindicator" scripts) xset)} - wrapProgram $out/libexec/i3blocks/mediaplayer \ - --prefix PATH : ${makeBinPath (optionals (elem "mediaplayer" scripts) [playerctl cmus])} - wrapProgram $out/libexec/i3blocks/openvpn \ - --prefix PATH : ${makeBinPath (optional (elem "openvpn" scripts) openvpn)} - wrapProgram $out/libexec/i3blocks/temperature \ - --prefix PATH : ${makeBinPath (optional (elem "temperature" scripts) lm_sensors)} - wrapProgram $out/libexec/i3blocks/volume \ - --prefix PATH : ${makeBinPath (optional (elem "volume" scripts) alsaUtils)} - ''; + nativeBuildInputs = [ autoreconfHook ]; meta = { description = "A flexible scheduler for your i3bar blocks"; diff --git a/pkgs/build-support/rust/carnix.nix b/pkgs/build-support/rust/carnix.nix index ef69f90c366..46bbff92a9c 100644 --- a/pkgs/build-support/rust/carnix.nix +++ b/pkgs/build-support/rust/carnix.nix @@ -1,4 +1,4 @@ -# Generated by carnix 0.9.8: carnix generate-nix +# Generated by carnix 0.9.10: carnix generate-nix { lib, buildPlatform, buildRustCrate, buildRustCrateHelpers, cratesIO, fetchgit }: with buildRustCrateHelpers; let inherit (lib.lists) fold; @@ -6,10 +6,10 @@ let inherit (lib.lists) fold; in rec { crates = cratesIO; - carnix = crates.crates.carnix."0.9.8" deps; + carnix = crates.crates.carnix."0.10.0" deps; __all = [ (carnix {}) ]; - deps.aho_corasick."0.6.8" = { - memchr = "2.1.0"; + deps.aho_corasick."0.6.10" = { + memchr = "2.2.0"; }; deps.ansi_term."0.11.0" = { winapi = "0.3.6"; @@ -18,48 +18,51 @@ rec { blake2_rfc = "0.2.18"; scoped_threadpool = "0.1.9"; }; - deps.arrayvec."0.4.7" = { - nodrop = "0.1.12"; + deps.arrayvec."0.4.10" = { + nodrop = "0.1.13"; }; deps.atty."0.2.11" = { termion = "1.5.1"; - libc = "0.2.43"; + libc = "0.2.50"; winapi = "0.3.6"; }; - deps.backtrace."0.3.9" = { - cfg_if = "0.1.6"; - rustc_demangle = "0.1.9"; - backtrace_sys = "0.1.24"; - libc = "0.2.43"; + deps.autocfg."0.1.2" = {}; + deps.backtrace."0.3.14" = { + cfg_if = "0.1.7"; + rustc_demangle = "0.1.13"; + autocfg = "0.1.2"; + backtrace_sys = "0.1.28"; + libc = "0.2.50"; winapi = "0.3.6"; }; - deps.backtrace_sys."0.1.24" = { - libc = "0.2.43"; - cc = "1.0.25"; + deps.backtrace_sys."0.1.28" = { + libc = "0.2.50"; + cc = "1.0.32"; }; deps.bitflags."1.0.4" = {}; deps.blake2_rfc."0.2.18" = { - arrayvec = "0.4.7"; + arrayvec = "0.4.10"; constant_time_eq = "0.1.3"; }; - deps.carnix."0.9.8" = { + deps.carnix."0.10.0" = { clap = "2.32.0"; - dirs = "1.0.4"; - env_logger = "0.5.13"; - error_chain = "0.12.0"; - itertools = "0.7.8"; - log = "0.4.5"; + dirs = "1.0.5"; + env_logger = "0.6.1"; + failure = "0.1.5"; + failure_derive = "0.1.5"; + itertools = "0.8.0"; + log = "0.4.6"; nom = "3.2.1"; - regex = "1.0.5"; - serde = "1.0.80"; - serde_derive = "1.0.80"; - serde_json = "1.0.32"; + regex = "1.1.2"; + serde = "1.0.89"; + serde_derive = "1.0.89"; + serde_json = "1.0.39"; tempdir = "0.3.7"; - toml = "0.4.8"; + toml = "0.5.0"; url = "1.7.2"; }; - deps.cc."1.0.25" = {}; - deps.cfg_if."0.1.6" = {}; + deps.cc."1.0.32" = {}; + deps.cfg_if."0.1.7" = {}; deps.clap."2.32.0" = { atty = "0.2.11"; bitflags = "1.0.4"; @@ -69,158 +72,168 @@ rec { vec_map = "0.8.1"; ansi_term = "0.11.0"; }; + deps.cloudabi."0.0.3" = { + bitflags = "1.0.4"; + }; deps.constant_time_eq."0.1.3" = {}; - deps.dirs."1.0.4" = { - redox_users = "0.2.0"; - libc = "0.2.43"; + deps.dirs."1.0.5" = { + redox_users = "0.3.0"; + libc = "0.2.50"; winapi = "0.3.6"; }; - deps.either."1.5.0" = {}; - deps.env_logger."0.5.13" = { + deps.either."1.5.1" = {}; + deps.env_logger."0.6.1" = { atty = "0.2.11"; - humantime = "1.1.1"; - log = "0.4.5"; - regex = "1.0.5"; + humantime = "1.2.0"; + log = "0.4.6"; + regex = "1.1.2"; termcolor = "1.0.4"; }; - deps.error_chain."0.12.0" = { - backtrace = "0.3.9"; + deps.failure."0.1.5" = { + backtrace = "0.3.14"; + failure_derive = "0.1.5"; }; - deps.failure."0.1.3" = { - backtrace = "0.3.9"; - failure_derive = "0.1.3"; + deps.failure_derive."0.1.5" = { + proc_macro2 = "0.4.27"; + quote = "0.6.11"; + syn = "0.15.29"; + synstructure = "0.10.1"; }; - deps.failure_derive."0.1.3" = { - proc_macro2 = "0.4.20"; - quote = "0.6.8"; - syn = "0.15.13"; - synstructure = "0.10.0"; - }; - deps.fuchsia_zircon."0.3.3" = { - bitflags = "1.0.4"; - fuchsia_zircon_sys = "0.3.3"; - }; - deps.fuchsia_zircon_sys."0.3.3" = {}; - deps.humantime."1.1.1" = { + deps.fuchsia_cprng."0.1.1" = {}; + deps.humantime."1.2.0" = { quick_error = "1.2.2"; }; deps.idna."0.1.5" = { matches = "0.1.8"; unicode_bidi = "0.3.4"; - unicode_normalization = "0.1.7"; + unicode_normalization = "0.1.8"; }; - deps.itertools."0.7.8" = { - either = "1.5.0"; + deps.itertools."0.8.0" = { + either = "1.5.1"; }; deps.itoa."0.4.3" = {}; - deps.lazy_static."1.1.0" = { - version_check = "0.1.5"; - }; - deps.libc."0.2.43" = {}; - deps.log."0.4.5" = { - cfg_if = "0.1.6"; + deps.lazy_static."1.3.0" = {}; + deps.libc."0.2.50" = {}; + deps.log."0.4.6" = { + cfg_if = "0.1.7"; }; deps.matches."0.1.8" = {}; deps.memchr."1.0.2" = { - libc = "0.2.43"; + libc = "0.2.50"; }; - deps.memchr."2.1.0" = { - cfg_if = "0.1.6"; - libc = "0.2.43"; - version_check = "0.1.5"; - }; - deps.nodrop."0.1.12" = {}; + deps.memchr."2.2.0" = {}; + deps.nodrop."0.1.13" = {}; deps.nom."3.2.1" = { memchr = "1.0.2"; }; deps.percent_encoding."1.0.1" = {}; - deps.proc_macro2."0.4.20" = { + deps.proc_macro2."0.4.27" = { unicode_xid = "0.1.0"; }; deps.quick_error."1.2.2" = {}; - deps.quote."0.6.8" = { - proc_macro2 = "0.4.20"; + deps.quote."0.6.11" = { + proc_macro2 = "0.4.27"; }; - deps.rand."0.4.3" = { - fuchsia_zircon = "0.3.3"; - libc = "0.2.43"; + deps.rand."0.4.6" = { + rand_core = "0.3.1"; + rdrand = "0.4.0"; + fuchsia_cprng = "0.1.1"; + libc = "0.2.50"; winapi = "0.3.6"; }; - deps.redox_syscall."0.1.40" = {}; + deps.rand_core."0.3.1" = { + rand_core = "0.4.0"; + }; + deps.rand_core."0.4.0" = {}; + deps.rand_os."0.1.3" = { + rand_core = "0.4.0"; + rdrand = "0.4.0"; + cloudabi = "0.0.3"; + fuchsia_cprng = "0.1.1"; + libc = "0.2.50"; + winapi = "0.3.6"; + }; + deps.rdrand."0.4.0" = { + rand_core = "0.3.1"; + }; + deps.redox_syscall."0.1.51" = {}; deps.redox_termios."0.1.1" = { - redox_syscall = "0.1.40"; + redox_syscall = "0.1.51"; }; - deps.redox_users."0.2.0" = { + deps.redox_users."0.3.0" = { argon2rs = "0.2.5"; - failure = "0.1.3"; - rand = "0.4.3"; - redox_syscall = "0.1.40"; + failure = "0.1.5"; + rand_os = "0.1.3"; + redox_syscall = "0.1.51"; }; - deps.regex."1.0.5" = { - aho_corasick = "0.6.8"; - memchr = "2.1.0"; - regex_syntax = "0.6.2"; + deps.regex."1.1.2" = { + aho_corasick = "0.6.10"; + memchr = "2.2.0"; + regex_syntax = "0.6.5"; thread_local = "0.3.6"; - utf8_ranges = "1.0.1"; + utf8_ranges = "1.0.2"; }; - deps.regex_syntax."0.6.2" = { - ucd_util = "0.1.1"; + deps.regex_syntax."0.6.5" = { + ucd_util = "0.1.3"; }; deps.remove_dir_all."0.5.1" = { winapi = "0.3.6"; }; - deps.rustc_demangle."0.1.9" = {}; - deps.ryu."0.2.6" = {}; + deps.rustc_demangle."0.1.13" = {}; + deps.ryu."0.2.7" = {}; deps.scoped_threadpool."0.1.9" = {}; - deps.serde."1.0.80" = {}; - deps.serde_derive."1.0.80" = { - proc_macro2 = "0.4.20"; - quote = "0.6.8"; - syn = "0.15.13"; + deps.serde."1.0.89" = {}; + deps.serde_derive."1.0.89" = { + proc_macro2 = "0.4.27"; + quote = "0.6.11"; + syn = "0.15.29"; }; - deps.serde_json."1.0.32" = { + deps.serde_json."1.0.39" = { itoa = "0.4.3"; - ryu = "0.2.6"; - serde = "1.0.80"; + ryu = "0.2.7"; + serde = "1.0.89"; }; + deps.smallvec."0.6.9" = {}; deps.strsim."0.7.0" = {}; - deps.syn."0.15.13" = { - proc_macro2 = "0.4.20"; - quote = "0.6.8"; + deps.syn."0.15.29" = { + proc_macro2 = "0.4.27"; + quote = "0.6.11"; unicode_xid = "0.1.0"; }; - deps.synstructure."0.10.0" = { - proc_macro2 = "0.4.20"; - quote = "0.6.8"; - syn = "0.15.13"; + deps.synstructure."0.10.1" = { + proc_macro2 = "0.4.27"; + quote = "0.6.11"; + syn = "0.15.29"; unicode_xid = "0.1.0"; }; deps.tempdir."0.3.7" = { - rand = "0.4.3"; + rand = "0.4.6"; remove_dir_all = "0.5.1"; }; deps.termcolor."1.0.4" = { wincolor = "1.0.1"; }; deps.termion."1.5.1" = { - libc = "0.2.43"; - redox_syscall = "0.1.40"; + libc = "0.2.50"; + redox_syscall = "0.1.51"; redox_termios = "0.1.1"; }; deps.textwrap."0.10.0" = { unicode_width = "0.1.5"; }; deps.thread_local."0.3.6" = { - lazy_static = "1.1.0"; + lazy_static = "1.3.0"; }; - deps.toml."0.4.8" = { - serde = "1.0.80"; + deps.toml."0.5.0" = { + serde = "1.0.89"; }; - deps.ucd_util."0.1.1" = {}; + deps.ucd_util."0.1.3" = {}; deps.unicode_bidi."0.3.4" = { matches = "0.1.8"; }; - deps.unicode_normalization."0.1.7" = {}; + deps.unicode_normalization."0.1.8" = { + smallvec = "0.6.9"; + }; deps.unicode_width."0.1.5" = {}; deps.unicode_xid."0.1.0" = {}; deps.url."1.7.2" = { @@ -228,20 +241,19 @@ rec { matches = "0.1.8"; percent_encoding = "1.0.1"; }; - deps.utf8_ranges."1.0.1" = {}; + deps.utf8_ranges."1.0.2" = {}; deps.vec_map."0.8.1" = {}; - deps.version_check."0.1.5" = {}; deps.winapi."0.3.6" = { winapi_i686_pc_windows_gnu = "0.4.0"; winapi_x86_64_pc_windows_gnu = "0.4.0"; }; deps.winapi_i686_pc_windows_gnu."0.4.0" = {}; - deps.winapi_util."0.1.1" = { + deps.winapi_util."0.1.2" = { winapi = "0.3.6"; }; deps.winapi_x86_64_pc_windows_gnu."0.4.0" = {}; deps.wincolor."1.0.1" = { winapi = "0.3.6"; - winapi_util = "0.1.1"; + winapi_util = "0.1.2"; }; } diff --git a/pkgs/build-support/rust/crates-io.nix b/pkgs/build-support/rust/crates-io.nix index 3521f0997bd..2475a62a3cd 100644 --- a/pkgs/build-support/rust/crates-io.nix +++ b/pkgs/build-support/rust/crates-io.nix @@ -4,6 +4,30 @@ let inherit (lib.lists) fold; inherit (lib.attrsets) recursiveUpdate; in rec { +# aho-corasick-0.6.10 + + crates.aho_corasick."0.6.10" = deps: { features?(features_.aho_corasick."0.6.10" deps {}) }: buildRustCrate { + crateName = "aho-corasick"; + version = "0.6.10"; + description = "Fast multiple substring searching with finite state machines."; + authors = [ "Andrew Gallant " ]; + sha256 = "0bhasxfpmfmz1460chwsx59vdld05axvmk1nbp3sd48xav3d108p"; + libName = "aho_corasick"; + crateBin = + [{ name = "aho-corasick-dot"; path = "src/main.rs"; }]; + dependencies = mapFeatures features ([ + (crates."memchr"."${deps."aho_corasick"."0.6.10"."memchr"}" deps) + ]); + }; + features_.aho_corasick."0.6.10" = deps: f: updateFeatures f (rec { + aho_corasick."0.6.10".default = (f.aho_corasick."0.6.10".default or true); + memchr."${deps.aho_corasick."0.6.10".memchr}".default = true; + }) [ + (features_.memchr."${deps."aho_corasick"."0.6.10"."memchr"}" deps) + ]; + + +# end # aho-corasick-0.6.8 crates.aho_corasick."0.6.8" = deps: { features?(features_.aho_corasick."0.6.8" deps {}) }: buildRustCrate { @@ -81,6 +105,38 @@ rec { ]; +# end +# arrayvec-0.4.10 + + crates.arrayvec."0.4.10" = deps: { features?(features_.arrayvec."0.4.10" deps {}) }: buildRustCrate { + crateName = "arrayvec"; + version = "0.4.10"; + description = "A vector with fixed capacity, backed by an array (it can be stored on the stack too). Implements fixed capacity ArrayVec and ArrayString."; + authors = [ "bluss" ]; + sha256 = "0qbh825i59w5wfdysqdkiwbwkrsy7lgbd4pwbyb8pxx8wc36iny8"; + dependencies = mapFeatures features ([ + (crates."nodrop"."${deps."arrayvec"."0.4.10"."nodrop"}" deps) + ]); + features = mkFeatures (features."arrayvec"."0.4.10" or {}); + }; + features_.arrayvec."0.4.10" = deps: f: updateFeatures f (rec { + arrayvec = fold recursiveUpdate {} [ + { "0.4.10"."serde" = + (f.arrayvec."0.4.10"."serde" or false) || + (f.arrayvec."0.4.10".serde-1 or false) || + (arrayvec."0.4.10"."serde-1" or false); } + { "0.4.10"."std" = + (f.arrayvec."0.4.10"."std" or false) || + (f.arrayvec."0.4.10".default or false) || + (arrayvec."0.4.10"."default" or false); } + { "0.4.10".default = (f.arrayvec."0.4.10".default or true); } + ]; + nodrop."${deps.arrayvec."0.4.10".nodrop}".default = (f.nodrop."${deps.arrayvec."0.4.10".nodrop}".default or false); + }) [ + (features_.nodrop."${deps."arrayvec"."0.4.10"."nodrop"}" deps) + ]; + + # end # arrayvec-0.4.7 @@ -149,6 +205,137 @@ rec { ]; +# end +# autocfg-0.1.2 + + crates.autocfg."0.1.2" = deps: { features?(features_.autocfg."0.1.2" deps {}) }: buildRustCrate { + crateName = "autocfg"; + version = "0.1.2"; + description = "Automatic cfg for Rust compiler features"; + authors = [ "Josh Stone " ]; + sha256 = "0dv81dwnp1al3j4ffz007yrjv4w1c7hw09gnf0xs3icxiw6qqfs3"; + }; + features_.autocfg."0.1.2" = deps: f: updateFeatures f (rec { + autocfg."0.1.2".default = (f.autocfg."0.1.2".default or true); + }) []; + + +# end +# backtrace-0.3.14 + + crates.backtrace."0.3.14" = deps: { features?(features_.backtrace."0.3.14" deps {}) }: buildRustCrate { + crateName = "backtrace"; + version = "0.3.14"; + description = "A library to acquire a stack trace (backtrace) at runtime in a Rust program.\n"; + authors = [ "Alex Crichton " "The Rust Project Developers" ]; + sha256 = "0sp0ib8r5w9sv1g2nkm9yclp16j46yjglw0yhkmh0snf355633mz"; + dependencies = mapFeatures features ([ + (crates."cfg_if"."${deps."backtrace"."0.3.14"."cfg_if"}" deps) + (crates."rustc_demangle"."${deps."backtrace"."0.3.14"."rustc_demangle"}" deps) + ]) + ++ (if (kernel == "linux" || kernel == "darwin") && !(kernel == "fuchsia") && !(kernel == "emscripten") && !(kernel == "darwin") && !(kernel == "ios") then mapFeatures features ([ + ] + ++ (if features.backtrace."0.3.14".backtrace-sys or false then [ (crates.backtrace_sys."${deps."backtrace"."0.3.14".backtrace_sys}" deps) ] else [])) else []) + ++ (if (kernel == "linux" || kernel == "darwin") || abi == "sgx" then mapFeatures features ([ + (crates."libc"."${deps."backtrace"."0.3.14"."libc"}" deps) + ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ + (crates."winapi"."${deps."backtrace"."0.3.14"."winapi"}" deps) + ]) else []); + + buildDependencies = mapFeatures features ([ + (crates."autocfg"."${deps."backtrace"."0.3.14"."autocfg"}" deps) + ]); + features = mkFeatures (features."backtrace"."0.3.14" or {}); + }; + features_.backtrace."0.3.14" = deps: f: updateFeatures f (rec { + autocfg."${deps.backtrace."0.3.14".autocfg}".default = true; + backtrace = fold recursiveUpdate {} [ + { "0.3.14"."addr2line" = + (f.backtrace."0.3.14"."addr2line" or false) || + (f.backtrace."0.3.14".gimli-symbolize or false) || + (backtrace."0.3.14"."gimli-symbolize" or false); } + { "0.3.14"."backtrace-sys" = + (f.backtrace."0.3.14"."backtrace-sys" or false) || + (f.backtrace."0.3.14".libbacktrace or false) || + (backtrace."0.3.14"."libbacktrace" or false); } + { "0.3.14"."coresymbolication" = + (f.backtrace."0.3.14"."coresymbolication" or false) || + (f.backtrace."0.3.14".default or false) || + (backtrace."0.3.14"."default" or false); } + { "0.3.14"."dbghelp" = + (f.backtrace."0.3.14"."dbghelp" or false) || + (f.backtrace."0.3.14".default or false) || + (backtrace."0.3.14"."default" or false); } + { "0.3.14"."dladdr" = + (f.backtrace."0.3.14"."dladdr" or false) || + (f.backtrace."0.3.14".default or false) || + (backtrace."0.3.14"."default" or false); } + { "0.3.14"."findshlibs" = + (f.backtrace."0.3.14"."findshlibs" or false) || + (f.backtrace."0.3.14".gimli-symbolize or false) || + (backtrace."0.3.14"."gimli-symbolize" or false); } + { "0.3.14"."gimli" = + (f.backtrace."0.3.14"."gimli" or false) || + (f.backtrace."0.3.14".gimli-symbolize or false) || + (backtrace."0.3.14"."gimli-symbolize" or false); } + { "0.3.14"."libbacktrace" = + (f.backtrace."0.3.14"."libbacktrace" or false) || + (f.backtrace."0.3.14".default or false) || + (backtrace."0.3.14"."default" or false); } + { "0.3.14"."libunwind" = + (f.backtrace."0.3.14"."libunwind" or false) || + (f.backtrace."0.3.14".default or false) || + (backtrace."0.3.14"."default" or false); } + { "0.3.14"."memmap" = + (f.backtrace."0.3.14"."memmap" or false) || + (f.backtrace."0.3.14".gimli-symbolize or false) || + (backtrace."0.3.14"."gimli-symbolize" or false); } + { "0.3.14"."object" = + (f.backtrace."0.3.14"."object" or false) || + (f.backtrace."0.3.14".gimli-symbolize or false) || + (backtrace."0.3.14"."gimli-symbolize" or false); } + { "0.3.14"."rustc-serialize" = + (f.backtrace."0.3.14"."rustc-serialize" or false) || + (f.backtrace."0.3.14".serialize-rustc or false) || + (backtrace."0.3.14"."serialize-rustc" or false); } + { "0.3.14"."serde" = + (f.backtrace."0.3.14"."serde" or false) || + (f.backtrace."0.3.14".serialize-serde or false) || + (backtrace."0.3.14"."serialize-serde" or false); } + { "0.3.14"."serde_derive" = + (f.backtrace."0.3.14"."serde_derive" or false) || + (f.backtrace."0.3.14".serialize-serde or false) || + (backtrace."0.3.14"."serialize-serde" or false); } + { "0.3.14"."std" = + (f.backtrace."0.3.14"."std" or false) || + (f.backtrace."0.3.14".default or false) || + (backtrace."0.3.14"."default" or false) || + (f.backtrace."0.3.14".libbacktrace or false) || + (backtrace."0.3.14"."libbacktrace" or false); } + { "0.3.14".default = (f.backtrace."0.3.14".default or true); } + ]; + backtrace_sys."${deps.backtrace."0.3.14".backtrace_sys}".default = true; + cfg_if."${deps.backtrace."0.3.14".cfg_if}".default = true; + libc."${deps.backtrace."0.3.14".libc}".default = (f.libc."${deps.backtrace."0.3.14".libc}".default or false); + rustc_demangle."${deps.backtrace."0.3.14".rustc_demangle}".default = true; + winapi = fold recursiveUpdate {} [ + { "${deps.backtrace."0.3.14".winapi}"."dbghelp" = true; } + { "${deps.backtrace."0.3.14".winapi}"."minwindef" = true; } + { "${deps.backtrace."0.3.14".winapi}"."processthreadsapi" = true; } + { "${deps.backtrace."0.3.14".winapi}"."winnt" = true; } + { "${deps.backtrace."0.3.14".winapi}".default = true; } + ]; + }) [ + (features_.cfg_if."${deps."backtrace"."0.3.14"."cfg_if"}" deps) + (features_.rustc_demangle."${deps."backtrace"."0.3.14"."rustc_demangle"}" deps) + (features_.autocfg."${deps."backtrace"."0.3.14"."autocfg"}" deps) + (features_.backtrace_sys."${deps."backtrace"."0.3.14"."backtrace_sys"}" deps) + (features_.libc."${deps."backtrace"."0.3.14"."libc"}" deps) + (features_.winapi."${deps."backtrace"."0.3.14"."winapi"}" deps) + ]; + + # end # backtrace-0.3.9 @@ -284,6 +471,34 @@ rec { ]; +# end +# backtrace-sys-0.1.28 + + crates.backtrace_sys."0.1.28" = deps: { features?(features_.backtrace_sys."0.1.28" deps {}) }: buildRustCrate { + crateName = "backtrace-sys"; + version = "0.1.28"; + description = "Bindings to the libbacktrace gcc library\n"; + authors = [ "Alex Crichton " ]; + sha256 = "1bbw8chs0wskxwzz7f3yy7mjqhyqj8lslq8pcjw1rbd2g23c34xl"; + build = "build.rs"; + dependencies = mapFeatures features ([ + (crates."libc"."${deps."backtrace_sys"."0.1.28"."libc"}" deps) + ]); + + buildDependencies = mapFeatures features ([ + (crates."cc"."${deps."backtrace_sys"."0.1.28"."cc"}" deps) + ]); + }; + features_.backtrace_sys."0.1.28" = deps: f: updateFeatures f (rec { + backtrace_sys."0.1.28".default = (f.backtrace_sys."0.1.28".default or true); + cc."${deps.backtrace_sys."0.1.28".cc}".default = true; + libc."${deps.backtrace_sys."0.1.28".libc}".default = (f.libc."${deps.backtrace_sys."0.1.28".libc}".default or false); + }) [ + (features_.libc."${deps."backtrace_sys"."0.1.28"."libc"}" deps) + (features_.cc."${deps."backtrace_sys"."0.1.28"."cc"}" deps) + ]; + + # end # bitflags-1.0.4 @@ -337,6 +552,72 @@ rec { ]; +# end +# carnix-0.10.0 + + crates.carnix."0.10.0" = deps: { features?(features_.carnix."0.10.0" deps {}) }: buildRustCrate { + crateName = "carnix"; + version = "0.10.0"; + description = "Generate Nix expressions from Cargo.lock files (in order to use Nix as a build system for crates)."; + authors = [ "pe@pijul.org " ]; + sha256 = "0hrp22yvrqnhaanr0ckrwihx9j3irhzd2cmb19sp49ksdi25d8ri"; + crateBin = + [{ name = "cargo-generate-nixfile"; path = "src/cargo-generate-nixfile.rs"; }] ++ + [{ name = "carnix"; path = "src/main.rs"; }]; + dependencies = mapFeatures features ([ + (crates."clap"."${deps."carnix"."0.10.0"."clap"}" deps) + (crates."dirs"."${deps."carnix"."0.10.0"."dirs"}" deps) + (crates."env_logger"."${deps."carnix"."0.10.0"."env_logger"}" deps) + (crates."failure"."${deps."carnix"."0.10.0"."failure"}" deps) + (crates."failure_derive"."${deps."carnix"."0.10.0"."failure_derive"}" deps) + (crates."itertools"."${deps."carnix"."0.10.0"."itertools"}" deps) + (crates."log"."${deps."carnix"."0.10.0"."log"}" deps) + (crates."nom"."${deps."carnix"."0.10.0"."nom"}" deps) + (crates."regex"."${deps."carnix"."0.10.0"."regex"}" deps) + (crates."serde"."${deps."carnix"."0.10.0"."serde"}" deps) + (crates."serde_derive"."${deps."carnix"."0.10.0"."serde_derive"}" deps) + (crates."serde_json"."${deps."carnix"."0.10.0"."serde_json"}" deps) + (crates."tempdir"."${deps."carnix"."0.10.0"."tempdir"}" deps) + (crates."toml"."${deps."carnix"."0.10.0"."toml"}" deps) + (crates."url"."${deps."carnix"."0.10.0"."url"}" deps) + ]); + }; + features_.carnix."0.10.0" = deps: f: updateFeatures f (rec { + carnix."0.10.0".default = (f.carnix."0.10.0".default or true); + clap."${deps.carnix."0.10.0".clap}".default = true; + dirs."${deps.carnix."0.10.0".dirs}".default = true; + env_logger."${deps.carnix."0.10.0".env_logger}".default = true; + failure."${deps.carnix."0.10.0".failure}".default = true; + failure_derive."${deps.carnix."0.10.0".failure_derive}".default = true; + itertools."${deps.carnix."0.10.0".itertools}".default = true; + log."${deps.carnix."0.10.0".log}".default = true; + nom."${deps.carnix."0.10.0".nom}".default = true; + regex."${deps.carnix."0.10.0".regex}".default = true; + serde."${deps.carnix."0.10.0".serde}".default = true; + serde_derive."${deps.carnix."0.10.0".serde_derive}".default = true; + serde_json."${deps.carnix."0.10.0".serde_json}".default = true; + tempdir."${deps.carnix."0.10.0".tempdir}".default = true; + toml."${deps.carnix."0.10.0".toml}".default = true; + url."${deps.carnix."0.10.0".url}".default = true; + }) [ + (features_.clap."${deps."carnix"."0.10.0"."clap"}" deps) + (features_.dirs."${deps."carnix"."0.10.0"."dirs"}" deps) + (features_.env_logger."${deps."carnix"."0.10.0"."env_logger"}" deps) + (features_.failure."${deps."carnix"."0.10.0"."failure"}" deps) + (features_.failure_derive."${deps."carnix"."0.10.0"."failure_derive"}" deps) + (features_.itertools."${deps."carnix"."0.10.0"."itertools"}" deps) + (features_.log."${deps."carnix"."0.10.0"."log"}" deps) + (features_.nom."${deps."carnix"."0.10.0"."nom"}" deps) + (features_.regex."${deps."carnix"."0.10.0"."regex"}" deps) + (features_.serde."${deps."carnix"."0.10.0"."serde"}" deps) + (features_.serde_derive."${deps."carnix"."0.10.0"."serde_derive"}" deps) + (features_.serde_json."${deps."carnix"."0.10.0"."serde_json"}" deps) + (features_.tempdir."${deps."carnix"."0.10.0"."tempdir"}" deps) + (features_.toml."${deps."carnix"."0.10.0"."toml"}" deps) + (features_.url."${deps."carnix"."0.10.0"."url"}" deps) + ]; + + # end # carnix-0.9.1 @@ -540,6 +821,30 @@ rec { }) []; +# end +# cc-1.0.32 + + crates.cc."1.0.32" = deps: { features?(features_.cc."1.0.32" deps {}) }: buildRustCrate { + crateName = "cc"; + version = "1.0.32"; + description = "A build-time dependency for Cargo build scripts to assist in invoking the native\nC compiler to compile native C code into a static archive to be linked into Rust\ncode.\n"; + authors = [ "Alex Crichton " ]; + sha256 = "0mq4ma94yis74dnn98w2wkaad195dr6qwlma4fs590xiv0j15ldx"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."cc"."1.0.32" or {}); + }; + features_.cc."1.0.32" = deps: f: updateFeatures f (rec { + cc = fold recursiveUpdate {} [ + { "1.0.32"."rayon" = + (f.cc."1.0.32"."rayon" or false) || + (f.cc."1.0.32".parallel or false) || + (cc."1.0.32"."parallel" or false); } + { "1.0.32".default = (f.cc."1.0.32".default or true); } + ]; + }) []; + + # end # cfg-if-0.1.6 @@ -554,6 +859,21 @@ rec { }) []; +# end +# cfg-if-0.1.7 + + crates.cfg_if."0.1.7" = deps: { features?(features_.cfg_if."0.1.7" deps {}) }: buildRustCrate { + crateName = "cfg-if"; + version = "0.1.7"; + description = "A macro to ergonomically define an item depending on a large number of #[cfg]\nparameters. Structured like an if-else chain, the first matching branch is the\nitem that gets emitted.\n"; + authors = [ "Alex Crichton " ]; + sha256 = "13gvcx1dxjq4mpmpj26hpg3yc97qffkx2zi58ykr1dwr8q2biiig"; + }; + features_.cfg_if."0.1.7" = deps: f: updateFeatures f (rec { + cfg_if."0.1.7".default = (f.cfg_if."0.1.7".default or true); + }) []; + + # end # clap-2.32.0 @@ -643,6 +963,35 @@ rec { ]; +# end +# cloudabi-0.0.3 + + crates.cloudabi."0.0.3" = deps: { features?(features_.cloudabi."0.0.3" deps {}) }: buildRustCrate { + crateName = "cloudabi"; + version = "0.0.3"; + description = "Low level interface to CloudABI. Contains all syscalls and related types."; + authors = [ "Nuxi (https://nuxi.nl/) and contributors" ]; + sha256 = "1z9lby5sr6vslfd14d6igk03s7awf91mxpsfmsp3prxbxlk0x7h5"; + libPath = "cloudabi.rs"; + dependencies = mapFeatures features ([ + ] + ++ (if features.cloudabi."0.0.3".bitflags or false then [ (crates.bitflags."${deps."cloudabi"."0.0.3".bitflags}" deps) ] else [])); + features = mkFeatures (features."cloudabi"."0.0.3" or {}); + }; + features_.cloudabi."0.0.3" = deps: f: updateFeatures f (rec { + bitflags."${deps.cloudabi."0.0.3".bitflags}".default = true; + cloudabi = fold recursiveUpdate {} [ + { "0.0.3"."bitflags" = + (f.cloudabi."0.0.3"."bitflags" or false) || + (f.cloudabi."0.0.3".default or false) || + (cloudabi."0.0.3"."default" or false); } + { "0.0.3".default = (f.cloudabi."0.0.3".default or true); } + ]; + }) [ + (features_.bitflags."${deps."cloudabi"."0.0.3"."bitflags"}" deps) + ]; + + # end # constant_time_eq-0.1.3 @@ -694,6 +1043,44 @@ rec { ]; +# end +# dirs-1.0.5 + + crates.dirs."1.0.5" = deps: { features?(features_.dirs."1.0.5" deps {}) }: buildRustCrate { + crateName = "dirs"; + version = "1.0.5"; + description = "A tiny low-level library that provides platform-specific standard locations of directories for config, cache and other data on Linux, Windows, macOS and Redox by leveraging the mechanisms defined by the XDG base/user directory specifications on Linux, the Known Folder API on Windows, and the Standard Directory guidelines on macOS."; + authors = [ "Simon Ochsenreither " ]; + sha256 = "1py68zwwrhlj5vbz9f9ansjmhc8y4gs5bpamw9ycmqz030pprwf3"; + dependencies = (if kernel == "redox" then mapFeatures features ([ + (crates."redox_users"."${deps."dirs"."1.0.5"."redox_users"}" deps) + ]) else []) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ + (crates."libc"."${deps."dirs"."1.0.5"."libc"}" deps) + ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ + (crates."winapi"."${deps."dirs"."1.0.5"."winapi"}" deps) + ]) else []); + }; + features_.dirs."1.0.5" = deps: f: updateFeatures f (rec { + dirs."1.0.5".default = (f.dirs."1.0.5".default or true); + libc."${deps.dirs."1.0.5".libc}".default = true; + redox_users."${deps.dirs."1.0.5".redox_users}".default = true; + winapi = fold recursiveUpdate {} [ + { "${deps.dirs."1.0.5".winapi}"."knownfolders" = true; } + { "${deps.dirs."1.0.5".winapi}"."objbase" = true; } + { "${deps.dirs."1.0.5".winapi}"."shlobj" = true; } + { "${deps.dirs."1.0.5".winapi}"."winbase" = true; } + { "${deps.dirs."1.0.5".winapi}"."winerror" = true; } + { "${deps.dirs."1.0.5".winapi}".default = true; } + ]; + }) [ + (features_.redox_users."${deps."dirs"."1.0.5"."redox_users"}" deps) + (features_.libc."${deps."dirs"."1.0.5"."libc"}" deps) + (features_.winapi."${deps."dirs"."1.0.5"."winapi"}" deps) + ]; + + # end # either-1.5.0 @@ -717,6 +1104,30 @@ rec { }) []; +# end +# either-1.5.1 + + crates.either."1.5.1" = deps: { features?(features_.either."1.5.1" deps {}) }: buildRustCrate { + crateName = "either"; + version = "1.5.1"; + description = "The enum `Either` with variants `Left` and `Right` is a general purpose sum type with two cases.\n"; + authors = [ "bluss" ]; + sha256 = "049dmvnyrrhf0fw955jrfazdapdl84x32grwwxllh8in39yv3783"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."either"."1.5.1" or {}); + }; + features_.either."1.5.1" = deps: f: updateFeatures f (rec { + either = fold recursiveUpdate {} [ + { "1.5.1"."use_std" = + (f.either."1.5.1"."use_std" or false) || + (f.either."1.5.1".default or false) || + (either."1.5.1"."default" or false); } + { "1.5.1".default = (f.either."1.5.1".default or true); } + ]; + }) []; + + # end # env_logger-0.5.13 @@ -759,6 +1170,61 @@ rec { ]; +# end +# env_logger-0.6.1 + + crates.env_logger."0.6.1" = deps: { features?(features_.env_logger."0.6.1" deps {}) }: buildRustCrate { + crateName = "env_logger"; + version = "0.6.1"; + description = "A logging implementation for `log` which is configured via an environment\nvariable.\n"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1d02i2yaqpnmbgw42pf0hd56ddd9jr4zq5yypbmfvc8rs13x0jql"; + dependencies = mapFeatures features ([ + (crates."log"."${deps."env_logger"."0.6.1"."log"}" deps) + ] + ++ (if features.env_logger."0.6.1".atty or false then [ (crates.atty."${deps."env_logger"."0.6.1".atty}" deps) ] else []) + ++ (if features.env_logger."0.6.1".humantime or false then [ (crates.humantime."${deps."env_logger"."0.6.1".humantime}" deps) ] else []) + ++ (if features.env_logger."0.6.1".regex or false then [ (crates.regex."${deps."env_logger"."0.6.1".regex}" deps) ] else []) + ++ (if features.env_logger."0.6.1".termcolor or false then [ (crates.termcolor."${deps."env_logger"."0.6.1".termcolor}" deps) ] else [])); + features = mkFeatures (features."env_logger"."0.6.1" or {}); + }; + features_.env_logger."0.6.1" = deps: f: updateFeatures f (rec { + atty."${deps.env_logger."0.6.1".atty}".default = true; + env_logger = fold recursiveUpdate {} [ + { "0.6.1"."atty" = + (f.env_logger."0.6.1"."atty" or false) || + (f.env_logger."0.6.1".default or false) || + (env_logger."0.6.1"."default" or false); } + { "0.6.1"."humantime" = + (f.env_logger."0.6.1"."humantime" or false) || + (f.env_logger."0.6.1".default or false) || + (env_logger."0.6.1"."default" or false); } + { "0.6.1"."regex" = + (f.env_logger."0.6.1"."regex" or false) || + (f.env_logger."0.6.1".default or false) || + (env_logger."0.6.1"."default" or false); } + { "0.6.1"."termcolor" = + (f.env_logger."0.6.1"."termcolor" or false) || + (f.env_logger."0.6.1".default or false) || + (env_logger."0.6.1"."default" or false); } + { "0.6.1".default = (f.env_logger."0.6.1".default or true); } + ]; + humantime."${deps.env_logger."0.6.1".humantime}".default = true; + log = fold recursiveUpdate {} [ + { "${deps.env_logger."0.6.1".log}"."std" = true; } + { "${deps.env_logger."0.6.1".log}".default = true; } + ]; + regex."${deps.env_logger."0.6.1".regex}".default = true; + termcolor."${deps.env_logger."0.6.1".termcolor}".default = true; + }) [ + (features_.atty."${deps."env_logger"."0.6.1"."atty"}" deps) + (features_.humantime."${deps."env_logger"."0.6.1"."humantime"}" deps) + (features_.log."${deps."env_logger"."0.6.1"."log"}" deps) + (features_.regex."${deps."env_logger"."0.6.1"."regex"}" deps) + (features_.termcolor."${deps."env_logger"."0.6.1"."termcolor"}" deps) + ]; + + # end # error-chain-0.12.0 @@ -832,6 +1298,49 @@ rec { ]; +# end +# failure-0.1.5 + + crates.failure."0.1.5" = deps: { features?(features_.failure."0.1.5" deps {}) }: buildRustCrate { + crateName = "failure"; + version = "0.1.5"; + description = "Experimental error handling abstraction."; + authors = [ "Without Boats " ]; + sha256 = "1msaj1c0fg12dzyf4fhxqlx1gfx41lj2smdjmkc9hkrgajk2g3kx"; + dependencies = mapFeatures features ([ + ] + ++ (if features.failure."0.1.5".backtrace or false then [ (crates.backtrace."${deps."failure"."0.1.5".backtrace}" deps) ] else []) + ++ (if features.failure."0.1.5".failure_derive or false then [ (crates.failure_derive."${deps."failure"."0.1.5".failure_derive}" deps) ] else [])); + features = mkFeatures (features."failure"."0.1.5" or {}); + }; + features_.failure."0.1.5" = deps: f: updateFeatures f (rec { + backtrace."${deps.failure."0.1.5".backtrace}".default = true; + failure = fold recursiveUpdate {} [ + { "0.1.5"."backtrace" = + (f.failure."0.1.5"."backtrace" or false) || + (f.failure."0.1.5".std or false) || + (failure."0.1.5"."std" or false); } + { "0.1.5"."derive" = + (f.failure."0.1.5"."derive" or false) || + (f.failure."0.1.5".default or false) || + (failure."0.1.5"."default" or false); } + { "0.1.5"."failure_derive" = + (f.failure."0.1.5"."failure_derive" or false) || + (f.failure."0.1.5".derive or false) || + (failure."0.1.5"."derive" or false); } + { "0.1.5"."std" = + (f.failure."0.1.5"."std" or false) || + (f.failure."0.1.5".default or false) || + (failure."0.1.5"."default" or false); } + { "0.1.5".default = (f.failure."0.1.5".default or true); } + ]; + failure_derive."${deps.failure."0.1.5".failure_derive}".default = true; + }) [ + (features_.backtrace."${deps."failure"."0.1.5"."backtrace"}" deps) + (features_.failure_derive."${deps."failure"."0.1.5"."failure_derive"}" deps) + ]; + + # end # failure_derive-0.1.3 @@ -864,6 +1373,55 @@ rec { ]; +# end +# failure_derive-0.1.5 + + crates.failure_derive."0.1.5" = deps: { features?(features_.failure_derive."0.1.5" deps {}) }: buildRustCrate { + crateName = "failure_derive"; + version = "0.1.5"; + description = "derives for the failure crate"; + authors = [ "Without Boats " ]; + sha256 = "1wzk484b87r4qszcvdl2bkniv5ls4r2f2dshz7hmgiv6z4ln12g0"; + procMacro = true; + build = "build.rs"; + dependencies = mapFeatures features ([ + (crates."proc_macro2"."${deps."failure_derive"."0.1.5"."proc_macro2"}" deps) + (crates."quote"."${deps."failure_derive"."0.1.5"."quote"}" deps) + (crates."syn"."${deps."failure_derive"."0.1.5"."syn"}" deps) + (crates."synstructure"."${deps."failure_derive"."0.1.5"."synstructure"}" deps) + ]); + features = mkFeatures (features."failure_derive"."0.1.5" or {}); + }; + features_.failure_derive."0.1.5" = deps: f: updateFeatures f (rec { + failure_derive."0.1.5".default = (f.failure_derive."0.1.5".default or true); + proc_macro2."${deps.failure_derive."0.1.5".proc_macro2}".default = true; + quote."${deps.failure_derive."0.1.5".quote}".default = true; + syn."${deps.failure_derive."0.1.5".syn}".default = true; + synstructure."${deps.failure_derive."0.1.5".synstructure}".default = true; + }) [ + (features_.proc_macro2."${deps."failure_derive"."0.1.5"."proc_macro2"}" deps) + (features_.quote."${deps."failure_derive"."0.1.5"."quote"}" deps) + (features_.syn."${deps."failure_derive"."0.1.5"."syn"}" deps) + (features_.synstructure."${deps."failure_derive"."0.1.5"."synstructure"}" deps) + ]; + + +# end +# fuchsia-cprng-0.1.1 + + crates.fuchsia_cprng."0.1.1" = deps: { features?(features_.fuchsia_cprng."0.1.1" deps {}) }: buildRustCrate { + crateName = "fuchsia-cprng"; + version = "0.1.1"; + description = "Rust crate for the Fuchsia cryptographically secure pseudorandom number generator"; + authors = [ "Erick Tryzelaar " ]; + edition = "2018"; + sha256 = "07apwv9dj716yjlcj29p94vkqn5zmfh7hlrqvrjx3wzshphc95h9"; + }; + features_.fuchsia_cprng."0.1.1" = deps: f: updateFeatures f (rec { + fuchsia_cprng."0.1.1".default = (f.fuchsia_cprng."0.1.1".default or true); + }) []; + + # end # fuchsia-zircon-0.3.3 @@ -922,6 +1480,28 @@ rec { ]; +# end +# humantime-1.2.0 + + crates.humantime."1.2.0" = deps: { features?(features_.humantime."1.2.0" deps {}) }: buildRustCrate { + crateName = "humantime"; + version = "1.2.0"; + description = " A parser and formatter for std::time::{Duration, SystemTime}\n"; + authors = [ "Paul Colomiets " ]; + sha256 = "0wlcxzz2mhq0brkfbjb12hc6jm17bgm8m6pdgblw4qjwmf26aw28"; + libPath = "src/lib.rs"; + dependencies = mapFeatures features ([ + (crates."quick_error"."${deps."humantime"."1.2.0"."quick_error"}" deps) + ]); + }; + features_.humantime."1.2.0" = deps: f: updateFeatures f (rec { + humantime."1.2.0".default = (f.humantime."1.2.0".default or true); + quick_error."${deps.humantime."1.2.0".quick_error}".default = true; + }) [ + (features_.quick_error."${deps."humantime"."1.2.0"."quick_error"}" deps) + ]; + + # end # idna-0.1.5 @@ -975,6 +1555,34 @@ rec { ]; +# end +# itertools-0.8.0 + + crates.itertools."0.8.0" = deps: { features?(features_.itertools."0.8.0" deps {}) }: buildRustCrate { + crateName = "itertools"; + version = "0.8.0"; + description = "Extra iterator adaptors, iterator methods, free functions, and macros."; + authors = [ "bluss" ]; + sha256 = "0xpz59yf03vyj540i7sqypn2aqfid08c4vzyg0l6rqm08da77n7n"; + dependencies = mapFeatures features ([ + (crates."either"."${deps."itertools"."0.8.0"."either"}" deps) + ]); + features = mkFeatures (features."itertools"."0.8.0" or {}); + }; + features_.itertools."0.8.0" = deps: f: updateFeatures f (rec { + either."${deps.itertools."0.8.0".either}".default = (f.either."${deps.itertools."0.8.0".either}".default or false); + itertools = fold recursiveUpdate {} [ + { "0.8.0"."use_std" = + (f.itertools."0.8.0"."use_std" or false) || + (f.itertools."0.8.0".default or false) || + (itertools."0.8.0"."default" or false); } + { "0.8.0".default = (f.itertools."0.8.0".default or true); } + ]; + }) [ + (features_.either."${deps."itertools"."0.8.0"."either"}" deps) + ]; + + # end # itoa-0.4.3 @@ -1031,6 +1639,30 @@ rec { ]; +# end +# lazy_static-1.3.0 + + crates.lazy_static."1.3.0" = deps: { features?(features_.lazy_static."1.3.0" deps {}) }: buildRustCrate { + crateName = "lazy_static"; + version = "1.3.0"; + description = "A macro for declaring lazily evaluated statics in Rust."; + authors = [ "Marvin Löbel " ]; + sha256 = "1vv47va18ydk7dx5paz88g3jy1d3lwbx6qpxkbj8gyfv770i4b1y"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."lazy_static"."1.3.0" or {}); + }; + features_.lazy_static."1.3.0" = deps: f: updateFeatures f (rec { + lazy_static = fold recursiveUpdate {} [ + { "1.3.0"."spin" = + (f.lazy_static."1.3.0"."spin" or false) || + (f.lazy_static."1.3.0".spin_no_std or false) || + (lazy_static."1.3.0"."spin_no_std" or false); } + { "1.3.0".default = (f.lazy_static."1.3.0".default or true); } + ]; + }) []; + + # end # libc-0.2.43 @@ -1052,6 +1684,39 @@ rec { }) []; +# end +# libc-0.2.50 + + crates.libc."0.2.50" = deps: { features?(features_.libc."0.2.50" deps {}) }: buildRustCrate { + crateName = "libc"; + version = "0.2.50"; + description = "Raw FFI bindings to platform libraries like libc.\n"; + authors = [ "The Rust Project Developers" ]; + sha256 = "14y4zm0xp2xbj3l1kxqf2wpl58xb7hglxdbfx5dcxjlchbvk5dzs"; + build = "build.rs"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."libc"."0.2.50" or {}); + }; + features_.libc."0.2.50" = deps: f: updateFeatures f (rec { + libc = fold recursiveUpdate {} [ + { "0.2.50"."align" = + (f.libc."0.2.50"."align" or false) || + (f.libc."0.2.50".rustc-dep-of-std or false) || + (libc."0.2.50"."rustc-dep-of-std" or false); } + { "0.2.50"."rustc-std-workspace-core" = + (f.libc."0.2.50"."rustc-std-workspace-core" or false) || + (f.libc."0.2.50".rustc-dep-of-std or false) || + (libc."0.2.50"."rustc-dep-of-std" or false); } + { "0.2.50"."use_std" = + (f.libc."0.2.50"."use_std" or false) || + (f.libc."0.2.50".default or false) || + (libc."0.2.50"."default" or false); } + { "0.2.50".default = (f.libc."0.2.50".default or true); } + ]; + }) []; + + # end # log-0.4.5 @@ -1073,6 +1738,28 @@ rec { ]; +# end +# log-0.4.6 + + crates.log."0.4.6" = deps: { features?(features_.log."0.4.6" deps {}) }: buildRustCrate { + crateName = "log"; + version = "0.4.6"; + description = "A lightweight logging facade for Rust\n"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1nd8dl9mvc9vd6fks5d4gsxaz990xi6rzlb8ymllshmwi153vngr"; + dependencies = mapFeatures features ([ + (crates."cfg_if"."${deps."log"."0.4.6"."cfg_if"}" deps) + ]); + features = mkFeatures (features."log"."0.4.6" or {}); + }; + features_.log."0.4.6" = deps: f: updateFeatures f (rec { + cfg_if."${deps.log."0.4.6".cfg_if}".default = true; + log."0.4.6".default = (f.log."0.4.6".default or true); + }) [ + (features_.cfg_if."${deps."log"."0.4.6"."cfg_if"}" deps) + ]; + + # end # matches-0.1.8 @@ -1175,6 +1862,30 @@ rec { ]; +# end +# memchr-2.2.0 + + crates.memchr."2.2.0" = deps: { features?(features_.memchr."2.2.0" deps {}) }: buildRustCrate { + crateName = "memchr"; + version = "2.2.0"; + description = "Safe interface to memchr."; + authors = [ "Andrew Gallant " "bluss" ]; + sha256 = "11vwg8iig9jyjxq3n1cq15g29ikzw5l7ar87md54k1aisjs0997p"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."memchr"."2.2.0" or {}); + }; + features_.memchr."2.2.0" = deps: f: updateFeatures f (rec { + memchr = fold recursiveUpdate {} [ + { "2.2.0"."use_std" = + (f.memchr."2.2.0"."use_std" or false) || + (f.memchr."2.2.0".default or false) || + (memchr."2.2.0"."default" or false); } + { "2.2.0".default = (f.memchr."2.2.0".default or true); } + ]; + }) []; + + # end # nodrop-0.1.12 @@ -1202,6 +1913,34 @@ rec { }) []; +# end +# nodrop-0.1.13 + + crates.nodrop."0.1.13" = deps: { features?(features_.nodrop."0.1.13" deps {}) }: buildRustCrate { + crateName = "nodrop"; + version = "0.1.13"; + description = "A wrapper type to inhibit drop (destructor). Use std::mem::ManuallyDrop instead!"; + authors = [ "bluss" ]; + sha256 = "0gkfx6wihr9z0m8nbdhma5pyvbipznjpkzny2d4zkc05b0vnhinb"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."nodrop"."0.1.13" or {}); + }; + features_.nodrop."0.1.13" = deps: f: updateFeatures f (rec { + nodrop = fold recursiveUpdate {} [ + { "0.1.13"."nodrop-union" = + (f.nodrop."0.1.13"."nodrop-union" or false) || + (f.nodrop."0.1.13".use_union or false) || + (nodrop."0.1.13"."use_union" or false); } + { "0.1.13"."std" = + (f.nodrop."0.1.13"."std" or false) || + (f.nodrop."0.1.13".default or false) || + (nodrop."0.1.13"."default" or false); } + { "0.1.13".default = (f.nodrop."0.1.13".default or true); } + ]; + }) []; + + # end # nom-3.2.1 @@ -1300,6 +2039,35 @@ rec { ]; +# end +# proc-macro2-0.4.27 + + crates.proc_macro2."0.4.27" = deps: { features?(features_.proc_macro2."0.4.27" deps {}) }: buildRustCrate { + crateName = "proc-macro2"; + version = "0.4.27"; + description = "A stable implementation of the upcoming new `proc_macro` API. Comes with an\noption, off by default, to also reimplement itself in terms of the upstream\nunstable API.\n"; + authors = [ "Alex Crichton " ]; + sha256 = "1cp4c40p3hwn2sz72ssqa62gp5n8w4gbamdqvvadzp5l7gxnq95i"; + build = "build.rs"; + dependencies = mapFeatures features ([ + (crates."unicode_xid"."${deps."proc_macro2"."0.4.27"."unicode_xid"}" deps) + ]); + features = mkFeatures (features."proc_macro2"."0.4.27" or {}); + }; + features_.proc_macro2."0.4.27" = deps: f: updateFeatures f (rec { + proc_macro2 = fold recursiveUpdate {} [ + { "0.4.27"."proc-macro" = + (f.proc_macro2."0.4.27"."proc-macro" or false) || + (f.proc_macro2."0.4.27".default or false) || + (proc_macro2."0.4.27"."default" or false); } + { "0.4.27".default = (f.proc_macro2."0.4.27".default or true); } + ]; + unicode_xid."${deps.proc_macro2."0.4.27".unicode_xid}".default = true; + }) [ + (features_.unicode_xid."${deps."proc_macro2"."0.4.27"."unicode_xid"}" deps) + ]; + + # end # quick-error-1.2.2 @@ -1314,6 +2082,40 @@ rec { }) []; +# end +# quote-0.6.11 + + crates.quote."0.6.11" = deps: { features?(features_.quote."0.6.11" deps {}) }: buildRustCrate { + crateName = "quote"; + version = "0.6.11"; + description = "Quasi-quoting macro quote!(...)"; + authors = [ "David Tolnay " ]; + sha256 = "0agska77z58cypcq4knayzwx7r7n6m756z1cz9cp2z4sv0b846ga"; + dependencies = mapFeatures features ([ + (crates."proc_macro2"."${deps."quote"."0.6.11"."proc_macro2"}" deps) + ]); + features = mkFeatures (features."quote"."0.6.11" or {}); + }; + features_.quote."0.6.11" = deps: f: updateFeatures f (rec { + proc_macro2 = fold recursiveUpdate {} [ + { "${deps.quote."0.6.11".proc_macro2}"."proc-macro" = + (f.proc_macro2."${deps.quote."0.6.11".proc_macro2}"."proc-macro" or false) || + (quote."0.6.11"."proc-macro" or false) || + (f."quote"."0.6.11"."proc-macro" or false); } + { "${deps.quote."0.6.11".proc_macro2}".default = (f.proc_macro2."${deps.quote."0.6.11".proc_macro2}".default or false); } + ]; + quote = fold recursiveUpdate {} [ + { "0.6.11"."proc-macro" = + (f.quote."0.6.11"."proc-macro" or false) || + (f.quote."0.6.11".default or false) || + (quote."0.6.11"."default" or false); } + { "0.6.11".default = (f.quote."0.6.11".default or true); } + ]; + }) [ + (features_.proc_macro2."${deps."quote"."0.6.11"."proc_macro2"}" deps) + ]; + + # end # quote-0.6.8 @@ -1398,6 +2200,222 @@ rec { ]; +# end +# rand-0.4.6 + + crates.rand."0.4.6" = deps: { features?(features_.rand."0.4.6" deps {}) }: buildRustCrate { + crateName = "rand"; + version = "0.4.6"; + description = "Random number generators and other randomness functionality.\n"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0c3rmg5q7d6qdi7cbmg5py9alm70wd3xsg0mmcawrnl35qv37zfs"; + dependencies = (if abi == "sgx" then mapFeatures features ([ + (crates."rand_core"."${deps."rand"."0.4.6"."rand_core"}" deps) + (crates."rdrand"."${deps."rand"."0.4.6"."rdrand"}" deps) + ]) else []) + ++ (if kernel == "fuchsia" then mapFeatures features ([ + (crates."fuchsia_cprng"."${deps."rand"."0.4.6"."fuchsia_cprng"}" deps) + ]) else []) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ + ] + ++ (if features.rand."0.4.6".libc or false then [ (crates.libc."${deps."rand"."0.4.6".libc}" deps) ] else [])) else []) + ++ (if kernel == "windows" then mapFeatures features ([ + (crates."winapi"."${deps."rand"."0.4.6"."winapi"}" deps) + ]) else []); + features = mkFeatures (features."rand"."0.4.6" or {}); + }; + features_.rand."0.4.6" = deps: f: updateFeatures f (rec { + fuchsia_cprng."${deps.rand."0.4.6".fuchsia_cprng}".default = true; + libc."${deps.rand."0.4.6".libc}".default = true; + rand = fold recursiveUpdate {} [ + { "0.4.6"."i128_support" = + (f.rand."0.4.6"."i128_support" or false) || + (f.rand."0.4.6".nightly or false) || + (rand."0.4.6"."nightly" or false); } + { "0.4.6"."libc" = + (f.rand."0.4.6"."libc" or false) || + (f.rand."0.4.6".std or false) || + (rand."0.4.6"."std" or false); } + { "0.4.6"."std" = + (f.rand."0.4.6"."std" or false) || + (f.rand."0.4.6".default or false) || + (rand."0.4.6"."default" or false); } + { "0.4.6".default = (f.rand."0.4.6".default or true); } + ]; + rand_core."${deps.rand."0.4.6".rand_core}".default = (f.rand_core."${deps.rand."0.4.6".rand_core}".default or false); + rdrand."${deps.rand."0.4.6".rdrand}".default = true; + winapi = fold recursiveUpdate {} [ + { "${deps.rand."0.4.6".winapi}"."minwindef" = true; } + { "${deps.rand."0.4.6".winapi}"."ntsecapi" = true; } + { "${deps.rand."0.4.6".winapi}"."profileapi" = true; } + { "${deps.rand."0.4.6".winapi}"."winnt" = true; } + { "${deps.rand."0.4.6".winapi}".default = true; } + ]; + }) [ + (features_.rand_core."${deps."rand"."0.4.6"."rand_core"}" deps) + (features_.rdrand."${deps."rand"."0.4.6"."rdrand"}" deps) + (features_.fuchsia_cprng."${deps."rand"."0.4.6"."fuchsia_cprng"}" deps) + (features_.libc."${deps."rand"."0.4.6"."libc"}" deps) + (features_.winapi."${deps."rand"."0.4.6"."winapi"}" deps) + ]; + + +# end +# rand_core-0.3.1 + + crates.rand_core."0.3.1" = deps: { features?(features_.rand_core."0.3.1" deps {}) }: buildRustCrate { + crateName = "rand_core"; + version = "0.3.1"; + description = "Core random number generator traits and tools for implementation.\n"; + authors = [ "The Rand Project Developers" "The Rust Project Developers" ]; + sha256 = "0q0ssgpj9x5a6fda83nhmfydy7a6c0wvxm0jhncsmjx8qp8gw91m"; + dependencies = mapFeatures features ([ + (crates."rand_core"."${deps."rand_core"."0.3.1"."rand_core"}" deps) + ]); + features = mkFeatures (features."rand_core"."0.3.1" or {}); + }; + features_.rand_core."0.3.1" = deps: f: updateFeatures f (rec { + rand_core = fold recursiveUpdate {} [ + { "${deps.rand_core."0.3.1".rand_core}"."alloc" = + (f.rand_core."${deps.rand_core."0.3.1".rand_core}"."alloc" or false) || + (rand_core."0.3.1"."alloc" or false) || + (f."rand_core"."0.3.1"."alloc" or false); } + { "${deps.rand_core."0.3.1".rand_core}"."serde1" = + (f.rand_core."${deps.rand_core."0.3.1".rand_core}"."serde1" or false) || + (rand_core."0.3.1"."serde1" or false) || + (f."rand_core"."0.3.1"."serde1" or false); } + { "${deps.rand_core."0.3.1".rand_core}"."std" = + (f.rand_core."${deps.rand_core."0.3.1".rand_core}"."std" or false) || + (rand_core."0.3.1"."std" or false) || + (f."rand_core"."0.3.1"."std" or false); } + { "${deps.rand_core."0.3.1".rand_core}".default = true; } + { "0.3.1"."std" = + (f.rand_core."0.3.1"."std" or false) || + (f.rand_core."0.3.1".default or false) || + (rand_core."0.3.1"."default" or false); } + { "0.3.1".default = (f.rand_core."0.3.1".default or true); } + ]; + }) [ + (features_.rand_core."${deps."rand_core"."0.3.1"."rand_core"}" deps) + ]; + + +# end +# rand_core-0.4.0 + + crates.rand_core."0.4.0" = deps: { features?(features_.rand_core."0.4.0" deps {}) }: buildRustCrate { + crateName = "rand_core"; + version = "0.4.0"; + description = "Core random number generator traits and tools for implementation.\n"; + authors = [ "The Rand Project Developers" "The Rust Project Developers" ]; + sha256 = "0wb5iwhffibj0pnpznhv1g3i7h1fnhz64s3nz74fz6vsm3q6q3br"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."rand_core"."0.4.0" or {}); + }; + features_.rand_core."0.4.0" = deps: f: updateFeatures f (rec { + rand_core = fold recursiveUpdate {} [ + { "0.4.0"."alloc" = + (f.rand_core."0.4.0"."alloc" or false) || + (f.rand_core."0.4.0".std or false) || + (rand_core."0.4.0"."std" or false); } + { "0.4.0"."serde" = + (f.rand_core."0.4.0"."serde" or false) || + (f.rand_core."0.4.0".serde1 or false) || + (rand_core."0.4.0"."serde1" or false); } + { "0.4.0"."serde_derive" = + (f.rand_core."0.4.0"."serde_derive" or false) || + (f.rand_core."0.4.0".serde1 or false) || + (rand_core."0.4.0"."serde1" or false); } + { "0.4.0".default = (f.rand_core."0.4.0".default or true); } + ]; + }) []; + + +# end +# rand_os-0.1.3 + + crates.rand_os."0.1.3" = deps: { features?(features_.rand_os."0.1.3" deps {}) }: buildRustCrate { + crateName = "rand_os"; + version = "0.1.3"; + description = "OS backed Random Number Generator"; + authors = [ "The Rand Project Developers" ]; + sha256 = "0ywwspizgs9g8vzn6m5ix9yg36n15119d6n792h7mk4r5vs0ww4j"; + dependencies = mapFeatures features ([ + (crates."rand_core"."${deps."rand_os"."0.1.3"."rand_core"}" deps) + ]) + ++ (if abi == "sgx" then mapFeatures features ([ + (crates."rdrand"."${deps."rand_os"."0.1.3"."rdrand"}" deps) + ]) else []) + ++ (if kernel == "cloudabi" then mapFeatures features ([ + (crates."cloudabi"."${deps."rand_os"."0.1.3"."cloudabi"}" deps) + ]) else []) + ++ (if kernel == "fuchsia" then mapFeatures features ([ + (crates."fuchsia_cprng"."${deps."rand_os"."0.1.3"."fuchsia_cprng"}" deps) + ]) else []) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ + (crates."libc"."${deps."rand_os"."0.1.3"."libc"}" deps) + ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ + (crates."winapi"."${deps."rand_os"."0.1.3"."winapi"}" deps) + ]) else []) + ++ (if kernel == "wasm32-unknown-unknown" then mapFeatures features ([ +]) else []); + }; + features_.rand_os."0.1.3" = deps: f: updateFeatures f (rec { + cloudabi."${deps.rand_os."0.1.3".cloudabi}".default = true; + fuchsia_cprng."${deps.rand_os."0.1.3".fuchsia_cprng}".default = true; + libc."${deps.rand_os."0.1.3".libc}".default = true; + rand_core = fold recursiveUpdate {} [ + { "${deps.rand_os."0.1.3".rand_core}"."std" = true; } + { "${deps.rand_os."0.1.3".rand_core}".default = true; } + ]; + rand_os."0.1.3".default = (f.rand_os."0.1.3".default or true); + rdrand."${deps.rand_os."0.1.3".rdrand}".default = true; + winapi = fold recursiveUpdate {} [ + { "${deps.rand_os."0.1.3".winapi}"."minwindef" = true; } + { "${deps.rand_os."0.1.3".winapi}"."ntsecapi" = true; } + { "${deps.rand_os."0.1.3".winapi}"."winnt" = true; } + { "${deps.rand_os."0.1.3".winapi}".default = true; } + ]; + }) [ + (features_.rand_core."${deps."rand_os"."0.1.3"."rand_core"}" deps) + (features_.rdrand."${deps."rand_os"."0.1.3"."rdrand"}" deps) + (features_.cloudabi."${deps."rand_os"."0.1.3"."cloudabi"}" deps) + (features_.fuchsia_cprng."${deps."rand_os"."0.1.3"."fuchsia_cprng"}" deps) + (features_.libc."${deps."rand_os"."0.1.3"."libc"}" deps) + (features_.winapi."${deps."rand_os"."0.1.3"."winapi"}" deps) + ]; + + +# end +# rdrand-0.4.0 + + crates.rdrand."0.4.0" = deps: { features?(features_.rdrand."0.4.0" deps {}) }: buildRustCrate { + crateName = "rdrand"; + version = "0.4.0"; + description = "An implementation of random number generator based on rdrand and rdseed instructions"; + authors = [ "Simonas Kazlauskas " ]; + sha256 = "15hrcasn0v876wpkwab1dwbk9kvqwrb3iv4y4dibb6yxnfvzwajk"; + dependencies = mapFeatures features ([ + (crates."rand_core"."${deps."rdrand"."0.4.0"."rand_core"}" deps) + ]); + features = mkFeatures (features."rdrand"."0.4.0" or {}); + }; + features_.rdrand."0.4.0" = deps: f: updateFeatures f (rec { + rand_core."${deps.rdrand."0.4.0".rand_core}".default = (f.rand_core."${deps.rdrand."0.4.0".rand_core}".default or false); + rdrand = fold recursiveUpdate {} [ + { "0.4.0"."std" = + (f.rdrand."0.4.0"."std" or false) || + (f.rdrand."0.4.0".default or false) || + (rdrand."0.4.0"."default" or false); } + { "0.4.0".default = (f.rdrand."0.4.0".default or true); } + ]; + }) [ + (features_.rand_core."${deps."rdrand"."0.4.0"."rand_core"}" deps) + ]; + + # end # redox_syscall-0.1.40 @@ -1413,6 +2431,22 @@ rec { }) []; +# end +# redox_syscall-0.1.51 + + crates.redox_syscall."0.1.51" = deps: { features?(features_.redox_syscall."0.1.51" deps {}) }: buildRustCrate { + crateName = "redox_syscall"; + version = "0.1.51"; + description = "A Rust library to access raw Redox system calls"; + authors = [ "Jeremy Soller " ]; + sha256 = "1a61cv7yydx64vpyvzr0z0hwzdvy4gcvcnfc6k70zpkngj5sz3ip"; + libName = "syscall"; + }; + features_.redox_syscall."0.1.51" = deps: f: updateFeatures f (rec { + redox_syscall."0.1.51".default = (f.redox_syscall."0.1.51".default or true); + }) []; + + # end # redox_termios-0.1.1 @@ -1463,6 +2497,36 @@ rec { ]; +# end +# redox_users-0.3.0 + + crates.redox_users."0.3.0" = deps: { features?(features_.redox_users."0.3.0" deps {}) }: buildRustCrate { + crateName = "redox_users"; + version = "0.3.0"; + description = "A Rust library to access Redox users and groups functionality"; + authors = [ "Jose Narvaez " "Wesley Hershberger " ]; + sha256 = "051rzqgk5hn7rf24nwgbb32zfdn8qp2kwqvdp0772ia85p737p4j"; + dependencies = mapFeatures features ([ + (crates."argon2rs"."${deps."redox_users"."0.3.0"."argon2rs"}" deps) + (crates."failure"."${deps."redox_users"."0.3.0"."failure"}" deps) + (crates."rand_os"."${deps."redox_users"."0.3.0"."rand_os"}" deps) + (crates."redox_syscall"."${deps."redox_users"."0.3.0"."redox_syscall"}" deps) + ]); + }; + features_.redox_users."0.3.0" = deps: f: updateFeatures f (rec { + argon2rs."${deps.redox_users."0.3.0".argon2rs}".default = (f.argon2rs."${deps.redox_users."0.3.0".argon2rs}".default or false); + failure."${deps.redox_users."0.3.0".failure}".default = true; + rand_os."${deps.redox_users."0.3.0".rand_os}".default = true; + redox_syscall."${deps.redox_users."0.3.0".redox_syscall}".default = true; + redox_users."0.3.0".default = (f.redox_users."0.3.0".default or true); + }) [ + (features_.argon2rs."${deps."redox_users"."0.3.0"."argon2rs"}" deps) + (features_.failure."${deps."redox_users"."0.3.0"."failure"}" deps) + (features_.rand_os."${deps."redox_users"."0.3.0"."rand_os"}" deps) + (features_.redox_syscall."${deps."redox_users"."0.3.0"."redox_syscall"}" deps) + ]; + + # end # regex-1.0.5 @@ -1506,6 +2570,50 @@ rec { ]; +# end +# regex-1.1.2 + + crates.regex."1.1.2" = deps: { features?(features_.regex."1.1.2" deps {}) }: buildRustCrate { + crateName = "regex"; + version = "1.1.2"; + description = "An implementation of regular expressions for Rust. This implementation uses\nfinite automata and guarantees linear time matching on all inputs.\n"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1c9nb031z1vw5l6lzfkfra2mah9hb2s1wgq9f1lmgcbkiiprj9xd"; + dependencies = mapFeatures features ([ + (crates."aho_corasick"."${deps."regex"."1.1.2"."aho_corasick"}" deps) + (crates."memchr"."${deps."regex"."1.1.2"."memchr"}" deps) + (crates."regex_syntax"."${deps."regex"."1.1.2"."regex_syntax"}" deps) + (crates."thread_local"."${deps."regex"."1.1.2"."thread_local"}" deps) + (crates."utf8_ranges"."${deps."regex"."1.1.2"."utf8_ranges"}" deps) + ]); + features = mkFeatures (features."regex"."1.1.2" or {}); + }; + features_.regex."1.1.2" = deps: f: updateFeatures f (rec { + aho_corasick."${deps.regex."1.1.2".aho_corasick}".default = true; + memchr."${deps.regex."1.1.2".memchr}".default = true; + regex = fold recursiveUpdate {} [ + { "1.1.2"."pattern" = + (f.regex."1.1.2"."pattern" or false) || + (f.regex."1.1.2".unstable or false) || + (regex."1.1.2"."unstable" or false); } + { "1.1.2"."use_std" = + (f.regex."1.1.2"."use_std" or false) || + (f.regex."1.1.2".default or false) || + (regex."1.1.2"."default" or false); } + { "1.1.2".default = (f.regex."1.1.2".default or true); } + ]; + regex_syntax."${deps.regex."1.1.2".regex_syntax}".default = true; + thread_local."${deps.regex."1.1.2".thread_local}".default = true; + utf8_ranges."${deps.regex."1.1.2".utf8_ranges}".default = true; + }) [ + (features_.aho_corasick."${deps."regex"."1.1.2"."aho_corasick"}" deps) + (features_.memchr."${deps."regex"."1.1.2"."memchr"}" deps) + (features_.regex_syntax."${deps."regex"."1.1.2"."regex_syntax"}" deps) + (features_.thread_local."${deps."regex"."1.1.2"."thread_local"}" deps) + (features_.utf8_ranges."${deps."regex"."1.1.2"."utf8_ranges"}" deps) + ]; + + # end # regex-syntax-0.6.2 @@ -1526,6 +2634,27 @@ rec { ]; +# end +# regex-syntax-0.6.5 + + crates.regex_syntax."0.6.5" = deps: { features?(features_.regex_syntax."0.6.5" deps {}) }: buildRustCrate { + crateName = "regex-syntax"; + version = "0.6.5"; + description = "A regular expression parser."; + authors = [ "The Rust Project Developers" ]; + sha256 = "0aaaba1fan2qfyc31wzdmgmbmyirc27zgcbz41ba5wm1lb2d8kli"; + dependencies = mapFeatures features ([ + (crates."ucd_util"."${deps."regex_syntax"."0.6.5"."ucd_util"}" deps) + ]); + }; + features_.regex_syntax."0.6.5" = deps: f: updateFeatures f (rec { + regex_syntax."0.6.5".default = (f.regex_syntax."0.6.5".default or true); + ucd_util."${deps.regex_syntax."0.6.5".ucd_util}".default = true; + }) [ + (features_.ucd_util."${deps."regex_syntax"."0.6.5"."ucd_util"}" deps) + ]; + + # end # remove_dir_all-0.5.1 @@ -1553,6 +2682,21 @@ rec { ]; +# end +# rustc-demangle-0.1.13 + + crates.rustc_demangle."0.1.13" = deps: { features?(features_.rustc_demangle."0.1.13" deps {}) }: buildRustCrate { + crateName = "rustc-demangle"; + version = "0.1.13"; + description = "Rust compiler symbol demangling.\n"; + authors = [ "Alex Crichton " ]; + sha256 = "0sr6cr02araqnlqwc5ghvnafjmkw11vzjswqaz757lvyrcl8xcy6"; + }; + features_.rustc_demangle."0.1.13" = deps: f: updateFeatures f (rec { + rustc_demangle."0.1.13".default = (f.rustc_demangle."0.1.13".default or true); + }) []; + + # end # rustc-demangle-0.1.9 @@ -1585,6 +2729,25 @@ rec { }) []; +# end +# ryu-0.2.7 + + crates.ryu."0.2.7" = deps: { features?(features_.ryu."0.2.7" deps {}) }: buildRustCrate { + crateName = "ryu"; + version = "0.2.7"; + description = "Fast floating point to string conversion"; + authors = [ "David Tolnay " ]; + sha256 = "0m8szf1m87wfqkwh1f9zp9bn2mb0m9nav028xxnd0hlig90b44bd"; + build = "build.rs"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."ryu"."0.2.7" or {}); + }; + features_.ryu."0.2.7" = deps: f: updateFeatures f (rec { + ryu."0.2.7".default = (f.ryu."0.2.7".default or true); + }) []; + + # end # scoped_threadpool-0.1.9 @@ -1664,6 +2827,39 @@ rec { }) []; +# end +# serde-1.0.89 + + crates.serde."1.0.89" = deps: { features?(features_.serde."1.0.89" deps {}) }: buildRustCrate { + crateName = "serde"; + version = "1.0.89"; + description = "A generic serialization/deserialization framework"; + authors = [ "Erick Tryzelaar " "David Tolnay " ]; + sha256 = "14pidc6skkm92vhp431wi1aam5vv5g6rmsimik38wzb0qy72c71g"; + build = "build.rs"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."serde"."1.0.89" or {}); + }; + features_.serde."1.0.89" = deps: f: updateFeatures f (rec { + serde = fold recursiveUpdate {} [ + { "1.0.89"."serde_derive" = + (f.serde."1.0.89"."serde_derive" or false) || + (f.serde."1.0.89".derive or false) || + (serde."1.0.89"."derive" or false); } + { "1.0.89"."std" = + (f.serde."1.0.89"."std" or false) || + (f.serde."1.0.89".default or false) || + (serde."1.0.89"."default" or false); } + { "1.0.89"."unstable" = + (f.serde."1.0.89"."unstable" or false) || + (f.serde."1.0.89".alloc or false) || + (serde."1.0.89"."alloc" or false); } + { "1.0.89".default = (f.serde."1.0.89".default or true); } + ]; + }) []; + + # end # serde_derive-1.0.80 @@ -1695,6 +2891,38 @@ rec { ]; +# end +# serde_derive-1.0.89 + + crates.serde_derive."1.0.89" = deps: { features?(features_.serde_derive."1.0.89" deps {}) }: buildRustCrate { + crateName = "serde_derive"; + version = "1.0.89"; + description = "Macros 1.1 implementation of #[derive(Serialize, Deserialize)]"; + authors = [ "Erick Tryzelaar " "David Tolnay " ]; + sha256 = "0wxbxq9sccrd939pfnrgfzykkwl9gag2yf7vxhg2c2p9kx36d3wm"; + procMacro = true; + dependencies = mapFeatures features ([ + (crates."proc_macro2"."${deps."serde_derive"."1.0.89"."proc_macro2"}" deps) + (crates."quote"."${deps."serde_derive"."1.0.89"."quote"}" deps) + (crates."syn"."${deps."serde_derive"."1.0.89"."syn"}" deps) + ]); + features = mkFeatures (features."serde_derive"."1.0.89" or {}); + }; + features_.serde_derive."1.0.89" = deps: f: updateFeatures f (rec { + proc_macro2."${deps.serde_derive."1.0.89".proc_macro2}".default = true; + quote."${deps.serde_derive."1.0.89".quote}".default = true; + serde_derive."1.0.89".default = (f.serde_derive."1.0.89".default or true); + syn = fold recursiveUpdate {} [ + { "${deps.serde_derive."1.0.89".syn}"."visit" = true; } + { "${deps.serde_derive."1.0.89".syn}".default = true; } + ]; + }) [ + (features_.proc_macro2."${deps."serde_derive"."1.0.89"."proc_macro2"}" deps) + (features_.quote."${deps."serde_derive"."1.0.89"."quote"}" deps) + (features_.syn."${deps."serde_derive"."1.0.89"."syn"}" deps) + ]; + + # end # serde_json-1.0.32 @@ -1728,6 +2956,65 @@ rec { ]; +# end +# serde_json-1.0.39 + + crates.serde_json."1.0.39" = deps: { features?(features_.serde_json."1.0.39" deps {}) }: buildRustCrate { + crateName = "serde_json"; + version = "1.0.39"; + description = "A JSON serialization file format"; + authors = [ "Erick Tryzelaar " "David Tolnay " ]; + sha256 = "07ydv06hn8x0yl0rc94l2wl9r2xz1fqd97n1s6j3bgdc6gw406a8"; + dependencies = mapFeatures features ([ + (crates."itoa"."${deps."serde_json"."1.0.39"."itoa"}" deps) + (crates."ryu"."${deps."serde_json"."1.0.39"."ryu"}" deps) + (crates."serde"."${deps."serde_json"."1.0.39"."serde"}" deps) + ]); + features = mkFeatures (features."serde_json"."1.0.39" or {}); + }; + features_.serde_json."1.0.39" = deps: f: updateFeatures f (rec { + itoa."${deps.serde_json."1.0.39".itoa}".default = true; + ryu."${deps.serde_json."1.0.39".ryu}".default = true; + serde."${deps.serde_json."1.0.39".serde}".default = true; + serde_json = fold recursiveUpdate {} [ + { "1.0.39"."indexmap" = + (f.serde_json."1.0.39"."indexmap" or false) || + (f.serde_json."1.0.39".preserve_order or false) || + (serde_json."1.0.39"."preserve_order" or false); } + { "1.0.39".default = (f.serde_json."1.0.39".default or true); } + ]; + }) [ + (features_.itoa."${deps."serde_json"."1.0.39"."itoa"}" deps) + (features_.ryu."${deps."serde_json"."1.0.39"."ryu"}" deps) + (features_.serde."${deps."serde_json"."1.0.39"."serde"}" deps) + ]; + + +# end +# smallvec-0.6.9 + + crates.smallvec."0.6.9" = deps: { features?(features_.smallvec."0.6.9" deps {}) }: buildRustCrate { + crateName = "smallvec"; + version = "0.6.9"; + description = "'Small vector' optimization: store up to a small number of items on the stack"; + authors = [ "Simon Sapin " ]; + sha256 = "0p96l51a2pq5y0vn48nhbm6qslbc6k8h28cxm0pmzkqmj7xynz6w"; + libPath = "lib.rs"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."smallvec"."0.6.9" or {}); + }; + features_.smallvec."0.6.9" = deps: f: updateFeatures f (rec { + smallvec = fold recursiveUpdate {} [ + { "0.6.9"."std" = + (f.smallvec."0.6.9"."std" or false) || + (f.smallvec."0.6.9".default or false) || + (smallvec."0.6.9"."default" or false); } + { "0.6.9".default = (f.smallvec."0.6.9".default or true); } + ]; + }) []; + + # end # strsim-0.7.0 @@ -1807,6 +3094,72 @@ rec { ]; +# end +# syn-0.15.29 + + crates.syn."0.15.29" = deps: { features?(features_.syn."0.15.29" deps {}) }: buildRustCrate { + crateName = "syn"; + version = "0.15.29"; + description = "Parser for Rust source code"; + authors = [ "David Tolnay " ]; + sha256 = "0wrd6awgc6f1iwfn2v9fvwyd2yddgxdjv9s106kvwg1ljbw3fajw"; + dependencies = mapFeatures features ([ + (crates."proc_macro2"."${deps."syn"."0.15.29"."proc_macro2"}" deps) + (crates."unicode_xid"."${deps."syn"."0.15.29"."unicode_xid"}" deps) + ] + ++ (if features.syn."0.15.29".quote or false then [ (crates.quote."${deps."syn"."0.15.29".quote}" deps) ] else [])); + features = mkFeatures (features."syn"."0.15.29" or {}); + }; + features_.syn."0.15.29" = deps: f: updateFeatures f (rec { + proc_macro2 = fold recursiveUpdate {} [ + { "${deps.syn."0.15.29".proc_macro2}"."proc-macro" = + (f.proc_macro2."${deps.syn."0.15.29".proc_macro2}"."proc-macro" or false) || + (syn."0.15.29"."proc-macro" or false) || + (f."syn"."0.15.29"."proc-macro" or false); } + { "${deps.syn."0.15.29".proc_macro2}".default = (f.proc_macro2."${deps.syn."0.15.29".proc_macro2}".default or false); } + ]; + quote = fold recursiveUpdate {} [ + { "${deps.syn."0.15.29".quote}"."proc-macro" = + (f.quote."${deps.syn."0.15.29".quote}"."proc-macro" or false) || + (syn."0.15.29"."proc-macro" or false) || + (f."syn"."0.15.29"."proc-macro" or false); } + { "${deps.syn."0.15.29".quote}".default = (f.quote."${deps.syn."0.15.29".quote}".default or false); } + ]; + syn = fold recursiveUpdate {} [ + { "0.15.29"."clone-impls" = + (f.syn."0.15.29"."clone-impls" or false) || + (f.syn."0.15.29".default or false) || + (syn."0.15.29"."default" or false); } + { "0.15.29"."derive" = + (f.syn."0.15.29"."derive" or false) || + (f.syn."0.15.29".default or false) || + (syn."0.15.29"."default" or false); } + { "0.15.29"."parsing" = + (f.syn."0.15.29"."parsing" or false) || + (f.syn."0.15.29".default or false) || + (syn."0.15.29"."default" or false); } + { "0.15.29"."printing" = + (f.syn."0.15.29"."printing" or false) || + (f.syn."0.15.29".default or false) || + (syn."0.15.29"."default" or false); } + { "0.15.29"."proc-macro" = + (f.syn."0.15.29"."proc-macro" or false) || + (f.syn."0.15.29".default or false) || + (syn."0.15.29"."default" or false); } + { "0.15.29"."quote" = + (f.syn."0.15.29"."quote" or false) || + (f.syn."0.15.29".printing or false) || + (syn."0.15.29"."printing" or false); } + { "0.15.29".default = (f.syn."0.15.29".default or true); } + ]; + unicode_xid."${deps.syn."0.15.29".unicode_xid}".default = true; + }) [ + (features_.proc_macro2."${deps."syn"."0.15.29"."proc_macro2"}" deps) + (features_.quote."${deps."syn"."0.15.29"."quote"}" deps) + (features_.unicode_xid."${deps."syn"."0.15.29"."unicode_xid"}" deps) + ]; + + # end # synstructure-0.10.0 @@ -1841,6 +3194,41 @@ rec { ]; +# end +# synstructure-0.10.1 + + crates.synstructure."0.10.1" = deps: { features?(features_.synstructure."0.10.1" deps {}) }: buildRustCrate { + crateName = "synstructure"; + version = "0.10.1"; + description = "Helper methods and macros for custom derives"; + authors = [ "Nika Layzell " ]; + sha256 = "0mx2vwd0d0f7hanz15nkp0ikkfjsx9rfkph7pynxyfbj45ank4g3"; + dependencies = mapFeatures features ([ + (crates."proc_macro2"."${deps."synstructure"."0.10.1"."proc_macro2"}" deps) + (crates."quote"."${deps."synstructure"."0.10.1"."quote"}" deps) + (crates."syn"."${deps."synstructure"."0.10.1"."syn"}" deps) + (crates."unicode_xid"."${deps."synstructure"."0.10.1"."unicode_xid"}" deps) + ]); + features = mkFeatures (features."synstructure"."0.10.1" or {}); + }; + features_.synstructure."0.10.1" = deps: f: updateFeatures f (rec { + proc_macro2."${deps.synstructure."0.10.1".proc_macro2}".default = true; + quote."${deps.synstructure."0.10.1".quote}".default = true; + syn = fold recursiveUpdate {} [ + { "${deps.synstructure."0.10.1".syn}"."extra-traits" = true; } + { "${deps.synstructure."0.10.1".syn}"."visit" = true; } + { "${deps.synstructure."0.10.1".syn}".default = true; } + ]; + synstructure."0.10.1".default = (f.synstructure."0.10.1".default or true); + unicode_xid."${deps.synstructure."0.10.1".unicode_xid}".default = true; + }) [ + (features_.proc_macro2."${deps."synstructure"."0.10.1"."proc_macro2"}" deps) + (features_.quote."${deps."synstructure"."0.10.1"."quote"}" deps) + (features_.syn."${deps."synstructure"."0.10.1"."syn"}" deps) + (features_.unicode_xid."${deps."synstructure"."0.10.1"."unicode_xid"}" deps) + ]; + + # end # tempdir-0.3.7 @@ -1992,6 +3380,34 @@ rec { ]; +# end +# toml-0.5.0 + + crates.toml."0.5.0" = deps: { features?(features_.toml."0.5.0" deps {}) }: buildRustCrate { + crateName = "toml"; + version = "0.5.0"; + description = "A native Rust encoder and decoder of TOML-formatted files and streams. Provides\nimplementations of the standard Serialize/Deserialize traits for TOML data to\nfacilitate deserializing and serializing Rust structures.\n"; + authors = [ "Alex Crichton " ]; + sha256 = "0l2lqzbn5g9l376k01isq1nhb14inkr4c50qbjbdzh5qysz7dyk5"; + dependencies = mapFeatures features ([ + (crates."serde"."${deps."toml"."0.5.0"."serde"}" deps) + ]); + features = mkFeatures (features."toml"."0.5.0" or {}); + }; + features_.toml."0.5.0" = deps: f: updateFeatures f (rec { + serde."${deps.toml."0.5.0".serde}".default = true; + toml = fold recursiveUpdate {} [ + { "0.5.0"."linked-hash-map" = + (f.toml."0.5.0"."linked-hash-map" or false) || + (f.toml."0.5.0".preserve_order or false) || + (toml."0.5.0"."preserve_order" or false); } + { "0.5.0".default = (f.toml."0.5.0".default or true); } + ]; + }) [ + (features_.serde."${deps."toml"."0.5.0"."serde"}" deps) + ]; + + # end # toml2nix-0.1.1 @@ -2026,6 +3442,21 @@ rec { }) []; +# end +# ucd-util-0.1.3 + + crates.ucd_util."0.1.3" = deps: { features?(features_.ucd_util."0.1.3" deps {}) }: buildRustCrate { + crateName = "ucd-util"; + version = "0.1.3"; + description = "A small utility library for working with the Unicode character database.\n"; + authors = [ "Andrew Gallant " ]; + sha256 = "1n1qi3jywq5syq90z9qd8qzbn58pcjgv1sx4sdmipm4jf9zanz15"; + }; + features_.ucd_util."0.1.3" = deps: f: updateFeatures f (rec { + ucd_util."0.1.3".default = (f.ucd_util."0.1.3".default or true); + }) []; + + # end # unicode-bidi-0.3.4 @@ -2076,6 +3507,27 @@ rec { }) []; +# end +# unicode-normalization-0.1.8 + + crates.unicode_normalization."0.1.8" = deps: { features?(features_.unicode_normalization."0.1.8" deps {}) }: buildRustCrate { + crateName = "unicode-normalization"; + version = "0.1.8"; + description = "This crate provides functions for normalization of\nUnicode strings, including Canonical and Compatible\nDecomposition and Recomposition, as described in\nUnicode Standard Annex #15.\n"; + authors = [ "kwantam " ]; + sha256 = "1pb26i2xd5zz0icabyqahikpca0iwj2jd4145pczc4bb7p641dsz"; + dependencies = mapFeatures features ([ + (crates."smallvec"."${deps."unicode_normalization"."0.1.8"."smallvec"}" deps) + ]); + }; + features_.unicode_normalization."0.1.8" = deps: f: updateFeatures f (rec { + smallvec."${deps.unicode_normalization."0.1.8".smallvec}".default = true; + unicode_normalization."0.1.8".default = (f.unicode_normalization."0.1.8".default or true); + }) [ + (features_.smallvec."${deps."unicode_normalization"."0.1.8"."smallvec"}" deps) + ]; + + # end # unicode-width-0.1.5 @@ -2157,6 +3609,21 @@ rec { }) []; +# end +# utf8-ranges-1.0.2 + + crates.utf8_ranges."1.0.2" = deps: { features?(features_.utf8_ranges."1.0.2" deps {}) }: buildRustCrate { + crateName = "utf8-ranges"; + version = "1.0.2"; + description = "Convert ranges of Unicode codepoints to UTF-8 byte ranges."; + authors = [ "Andrew Gallant " ]; + sha256 = "1my02laqsgnd8ib4dvjgd4rilprqjad6pb9jj9vi67csi5qs2281"; + }; + features_.utf8_ranges."1.0.2" = deps: f: updateFeatures f (rec { + utf8_ranges."1.0.2".default = (f.utf8_ranges."1.0.2".default or true); + }) []; + + # end # vec_map-0.8.1 @@ -2267,6 +3734,39 @@ rec { ]; +# end +# winapi-util-0.1.2 + + crates.winapi_util."0.1.2" = deps: { features?(features_.winapi_util."0.1.2" deps {}) }: buildRustCrate { + crateName = "winapi-util"; + version = "0.1.2"; + description = "A dumping ground for high level safe wrappers over winapi."; + authors = [ "Andrew Gallant " ]; + sha256 = "07jj7rg7nndd7bqhjin1xphbv8kb5clvhzpqpxkvm3wl84r3mj1h"; + dependencies = (if kernel == "windows" then mapFeatures features ([ + (crates."winapi"."${deps."winapi_util"."0.1.2"."winapi"}" deps) + ]) else []); + }; + features_.winapi_util."0.1.2" = deps: f: updateFeatures f (rec { + winapi = fold recursiveUpdate {} [ + { "${deps.winapi_util."0.1.2".winapi}"."consoleapi" = true; } + { "${deps.winapi_util."0.1.2".winapi}"."errhandlingapi" = true; } + { "${deps.winapi_util."0.1.2".winapi}"."fileapi" = true; } + { "${deps.winapi_util."0.1.2".winapi}"."minwindef" = true; } + { "${deps.winapi_util."0.1.2".winapi}"."processenv" = true; } + { "${deps.winapi_util."0.1.2".winapi}"."std" = true; } + { "${deps.winapi_util."0.1.2".winapi}"."winbase" = true; } + { "${deps.winapi_util."0.1.2".winapi}"."wincon" = true; } + { "${deps.winapi_util."0.1.2".winapi}"."winerror" = true; } + { "${deps.winapi_util."0.1.2".winapi}"."winnt" = true; } + { "${deps.winapi_util."0.1.2".winapi}".default = true; } + ]; + winapi_util."0.1.2".default = (f.winapi_util."0.1.2".default or true); + }) [ + (features_.winapi."${deps."winapi_util"."0.1.2"."winapi"}" deps) + ]; + + # end # winapi-x86_64-pc-windows-gnu-0.4.0 diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index ab83b73c545..592af3fe4f2 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -32,19 +32,23 @@ rec { * * Examples: * # Writes my-file to /nix/store/ - * writeTextFile "my-file" - * '' - * Contents of File + * writeTextFile { + * name = "my-file"; + * text = '' + * Contents of File * ''; + * } + * # See also the `writeText` helper function below. * * # Writes executable my-file to /nix/store//bin/my-file - * writeTextFile "my-file" - * '' - * Contents of File - * '' - * true - * "/bin/my-file"; - * true + * writeTextFile { + * name = "my-file"; + * text = '' + * Contents of File + * ''; + * executable = true; + * destination = "/bin/my-file"; + * } */ writeTextFile = { name # the name of the derivation diff --git a/pkgs/data/fonts/ir-standard-fonts/default.nix b/pkgs/data/fonts/ir-standard-fonts/default.nix new file mode 100644 index 00000000000..af1392e9d5e --- /dev/null +++ b/pkgs/data/fonts/ir-standard-fonts/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "ir-standard-fonts"; + version= "unstable-2017-01-21"; + + src = fetchFromGitHub { + owner = "morealaz"; + repo = pname; + rev = "d36727d6c38c23c01b3074565667a2fe231fe18f"; + sha256 = "1ks9q1r1gk2517yfr1fbgrdbgw0w97i4am6jqn5ywpgm2xd03yg1"; + }; + + installPhase = '' + mkdir -p $out/share/fonts/ir-standard-fonts + cp -v $( find . -name '*.ttf') $out/share/fonts/ir-standard-fonts + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/morealaz/ir-standard-fonts; + description = "Iran Supreme Council of Information and Communication Technology (SCICT) standard Persian fonts series"; + # License information is unavailable. + license = licenses.unfree; + platforms = platforms.all; + maintainers = [ maintainers.linarcx ]; + }; +} diff --git a/pkgs/data/fonts/shabnam-fonts/default.nix b/pkgs/data/fonts/shabnam-fonts/default.nix new file mode 100644 index 00000000000..cf4bd372229 --- /dev/null +++ b/pkgs/data/fonts/shabnam-fonts/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "shabnam-fonts"; + version = "4.0.0"; + + src = fetchFromGitHub { + owner = "rastikerdar"; + repo = "shabnam-font"; + rev = "v${version}"; + sha256 = "1y4w16if2y12028b9vyc5l5c5bvcglhxacv380ixb8fcc4hfakmb"; + }; + + installPhase = '' + mkdir -p $out/share/fonts/shabnam-fonts + cp -v $( find . -name '*.ttf') $out/share/fonts/shabnam-fonts + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/rastikerdar/shabnam-font; + description = "A Persian (Farsi) Font - فونت (قلم) فارسی شبنم"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = [ maintainers.linarcx ]; + }; +} diff --git a/pkgs/data/themes/qogir/default.nix b/pkgs/data/themes/qogir/default.nix index ffd0cb4db3f..0c48f892992 100644 --- a/pkgs/data/themes/qogir/default.nix +++ b/pkgs/data/themes/qogir/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qogir-theme"; - version = "2019-03-10"; + version = "2019-04-07"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "1sap0hywkzvnbnyqqc610bh5hw5x1k7whwgrshpsjxgsvfkxs8in"; + sha256 = "0knv35xb4rg4pddxc78hd8frnlm8n0za1yj51ydwskn9b0qqcyhs"; }; buildInputs = [ gdk_pixbuf librsvg ]; diff --git a/pkgs/desktops/deepin/dde-network-utils/default.nix b/pkgs/desktops/deepin/dde-network-utils/default.nix new file mode 100644 index 00000000000..f183d0e15f8 --- /dev/null +++ b/pkgs/desktops/deepin/dde-network-utils/default.nix @@ -0,0 +1,54 @@ +{ stdenv, fetchFromGitHub, substituteAll, qmake, pkgconfig, qttools, + dde-qt-dbus-factory, proxychains, which, deepin }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "dde-network-utils"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "1m6njld06yphppyyhygz8mv4gvq2zw0676pbls9m3fs7b3dl56sv"; + }; + + nativeBuildInputs = [ + qmake + pkgconfig + qttools + deepin.setupHook + ]; + + buildInputs = [ + dde-qt-dbus-factory + proxychains + which + ]; + + patches = [ + (substituteAll { + src = ./fix-paths.patch; + inherit which proxychains; + }) + ]; + + postPatch = '' + searchHardCodedPaths # for debugging + patchShebangs translate_generation.sh + ''; + + postFixup = '' + searchHardCodedPaths $out # for debugging + ''; + + passthru.updateScript = deepin.updateScript { inherit name; }; + + meta = with stdenv.lib; { + description = "Deepin network utils"; + homepage = https://github.com/linuxdeepin/dde-network-utils; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/desktops/deepin/dde-network-utils/fix-paths.patch b/pkgs/desktops/deepin/dde-network-utils/fix-paths.patch new file mode 100644 index 00000000000..9f7ecd423c5 --- /dev/null +++ b/pkgs/desktops/deepin/dde-network-utils/fix-paths.patch @@ -0,0 +1,23 @@ +diff -ur dde-network-utils-master.orig/dde-network-utils.pro dde-network-utils-master/dde-network-utils.pro +--- dde-network-utils-master.orig/dde-network-utils.pro 2019-04-04 03:37:46.000000000 -0300 ++++ dde-network-utils-master/dde-network-utils.pro 2019-04-07 05:56:28.283195087 -0300 +@@ -52,6 +52,7 @@ + + QMAKE_PKGCONFIG_NAME = libddenetworkutils + QMAKE_PKGCONFIG_DESCRIPTION = libddenetworkutils ++QMAKE_PKGCONFIG_PREFIX = $$PREFIX + QMAKE_PKGCONFIG_INCDIR = $$includes.path + QMAKE_PKGCONFIG_LIBDIR = $$target.path + QMAKE_PKGCONFIG_DESTDIR = pkgconfig +diff -ur dde-network-utils-master.orig/networkworker.cpp dde-network-utils-master/networkworker.cpp +--- dde-network-utils-master.orig/networkworker.cpp 2019-04-04 03:37:46.000000000 -0300 ++++ dde-network-utils-master/networkworker.cpp 2019-04-07 05:54:28.656479216 -0300 +@@ -80,7 +80,7 @@ + } + } + +- const bool isAppProxyVaild = QProcess::execute("which", QStringList() << "/usr/bin/proxychains4") == 0; ++ const bool isAppProxyVaild = QProcess::execute("@which@/bin/which", QStringList() << "@proxychains@/bin/proxychains4") == 0; + m_networkModel->onAppProxyExistChanged(isAppProxyVaild); + } + diff --git a/pkgs/desktops/deepin/deepin-turbo/default.nix b/pkgs/desktops/deepin/deepin-turbo/default.nix new file mode 100644 index 00000000000..6a343f816b9 --- /dev/null +++ b/pkgs/desktops/deepin/deepin-turbo/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, qtbase, deepin }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "deepin-turbo"; + version = "0.0.2"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "13vbj18pclv7c25pb1y5x6dd7wmcgisa40mb13qyixnzpq2ssjg5"; + }; + + nativeBuildInputs = [ + cmake + pkgconfig + deepin.setupHook + ]; + + buildInputs = [ + qtbase + ]; + + postPatch = '' + searchHardCodedPaths # for debugging + fixPath $out /usr/lib/systemd src/booster-dtkwidget/CMakeLists.txt + fixPath $out /usr/lib/deepin-turbo src/booster-dtkwidget/deepin-turbo-booster-dtkwidget.service + ''; + + postFixup = '' + searchHardCodedPaths $out # for debugging + ''; + + passthru.updateScript = deepin.updateScript { inherit name; }; + + meta = with stdenv.lib; { + description = "A daemon that helps to launch applications faster"; + homepage = https://github.com/linuxdeepin/deepin-turbo; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 9f3613fccf0..77ef5da00a0 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -11,6 +11,7 @@ let dde-calendar = callPackage ./dde-calendar { }; dde-daemon = callPackage ./dde-daemon { }; dde-polkit-agent = callPackage ./dde-polkit-agent { }; + dde-network-utils = callPackage ./dde-network-utils { }; dde-qt-dbus-factory = callPackage ./dde-qt-dbus-factory { }; dde-session-ui = callPackage ./dde-session-ui { }; deepin-desktop-base = callPackage ./deepin-desktop-base { }; @@ -28,16 +29,18 @@ let deepin-terminal = callPackage ./deepin-terminal { wnck = pkgs.libwnck3; }; + deepin-turbo = callPackage ./deepin-turbo { }; deepin-wallpapers = callPackage ./deepin-wallpapers { }; deepin-wm = callPackage ./deepin-wm { }; dpa-ext-gnomekeyring = callPackage ./dpa-ext-gnomekeyring { }; dtkcore = callPackage ./dtkcore { }; - dtkwm = callPackage ./dtkwm { }; dtkwidget = callPackage ./dtkwidget { }; + dtkwm = callPackage ./dtkwm { }; go-dbus-factory = callPackage ./go-dbus-factory { }; go-dbus-generator = callPackage ./go-dbus-generator { }; go-gir-generator = callPackage ./go-gir-generator { }; go-lib = callPackage ./go-lib { }; + qcef = callPackage ./qcef { }; qt5dxcb-plugin = callPackage ./qt5dxcb-plugin { }; qt5integration = callPackage ./qt5integration { }; diff --git a/pkgs/desktops/deepin/qcef/default.nix b/pkgs/desktops/deepin/qcef/default.nix new file mode 100644 index 00000000000..18d64c5645c --- /dev/null +++ b/pkgs/desktops/deepin/qcef/default.nix @@ -0,0 +1,104 @@ +{ stdenv, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools, + qtwebchannel, qtx11extras, dtkcore, dtkwidget, qt5integration, + libXScrnSaver, gnome2, nss, nspr, alsaLib, atk, cairo, cups, dbus, + expat, fontconfig, gdk_pixbuf, glib, gtk2, libX11, libXcomposite, + libXcursor, libXdamage, libXext, libXfixes, libXi, libXrandr, + libXrender, libXtst, libxcb, pango, pulseaudio, xorg, deepin }: + +let + rpahtLibraries = [ + stdenv.cc.cc.lib # libstdc++.so.6 + alsaLib + atk + cairo + cups + dbus + expat + fontconfig + gdk_pixbuf + glib + gnome2.GConf + gtk2 + libxcb + nspr + nss + pango + pulseaudio + xorg.libX11 + xorg.libXScrnSaver + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrandr + xorg.libXrender + xorg.libXtst + ]; + libPath = stdenv.lib.makeLibraryPath rpahtLibraries; +in + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "qcef"; + version = "1.1.4.6"; + + srcs = [ + (fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "06909sd0gf7n4hw6p4j96apjym219zabflgpwjafm7v00bgnwxxs"; + name = pname; + }) + (fetchFromGitHub { + owner = "linuxdeepin"; + repo = "cef-binary"; + rev = "059a0c9cef4e289a50dc7a2f4c91fe69db95035e"; + sha256 = "1h7cq63n94y2a6fprq4g63admh49rcci7avl5z9kdimkhqb2jb84"; + name = "cef-binary"; + }) + ]; + + sourceRoot = pname; + + nativeBuildInputs = [ + pkgconfig + cmake + qttools + deepin.setupHook + ]; + + buildInputs = [ + qtbase + qtwebchannel + qtx11extras + ] ++ rpahtLibraries; + + postUnpack = '' + rmdir ${pname}/cef + ln -s ../cef-binary ${pname}/cef + ''; + + postPatch = '' + searchHardCodedPaths + fixPath $out /usr src/core/qcef_global_settings.{h,cpp} + sed '/COMMAND rm -rf Release Resources/a COMMAND ldd qcef/libcef.so' -i src/CMakeLists.txt + sed '/COMMAND rm -rf Release Resources/a COMMAND patchelf --set-rpath ${libPath} qcef/libcef.so' -i src/CMakeLists.txt + ''; + + postFixup = '' + searchHardCodedPaths $out + ''; + + passthru.updateScript = deepin.updateScript { inherit name; }; + + meta = with stdenv.lib; { + description = "Qt5 binding of Chromium Embedded Framework"; + homepage = https://github.com/linuxdeepin/qcef; + license = licenses.lgpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/desktops/deepin/setup-hook.sh b/pkgs/desktops/deepin/setup-hook.sh index 15fe5be1538..63a43bb5840 100755 --- a/pkgs/desktops/deepin/setup-hook.sh +++ b/pkgs/desktops/deepin/setup-hook.sh @@ -11,7 +11,7 @@ searchHardCodedPaths() { grep --color=always -r -E '\<(ExecStart|Exec|startDetached|execute|exec\.(Command|LookPath))\>' $dir || true echo ----------- looking for hard coded paths - grep --color=always -r -E '/(usr|bin|sbin|etc|var|opt)\>' $dir || true + grep --color=always -a -r -E '/(usr|bin|sbin|etc|var|opt)\>' $dir || true echo ----------- done } diff --git a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch index 4b33bee0ac6..21adba7359d 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch +++ b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch @@ -1,5 +1,5 @@ diff --git a/sddm-theme/theme.conf.cmake b/sddm-theme/theme.conf.cmake -index 69d30705..52e91028 100644 +index 69d3070..52e9102 100644 --- a/sddm-theme/theme.conf.cmake +++ b/sddm-theme/theme.conf.cmake @@ -1,4 +1,4 @@ @@ -9,7 +9,7 @@ index 69d30705..52e91028 100644 -background=${CMAKE_INSTALL_PREFIX}/${WALLPAPER_INSTALL_DIR}/Next/contents/images/3200x2000.png +background=${NIXPKGS_WALLPAPER_INSTALL_DIR}/Next/contents/images/3200x2000.png diff --git a/startkde/CMakeLists.txt b/startkde/CMakeLists.txt -index 6a1a2121..f03fd349 100644 +index 6a1a212..f03fd34 100644 --- a/startkde/CMakeLists.txt +++ b/startkde/CMakeLists.txt @@ -4,11 +4,6 @@ add_subdirectory(ksyncdbusenv) @@ -25,7 +25,7 @@ index 6a1a2121..f03fd349 100644 configure_file(startplasmacompositor.cmake ${CMAKE_CURRENT_BINARY_DIR}/startplasmacompositor @ONLY) configure_file(startplasma.cmake ${CMAKE_CURRENT_BINARY_DIR}/startplasma @ONLY) diff --git a/startkde/kstartupconfig/kstartupconfig.cpp b/startkde/kstartupconfig/kstartupconfig.cpp -index 493218ea..d507aa55 100644 +index 493218e..d507aa5 100644 --- a/startkde/kstartupconfig/kstartupconfig.cpp +++ b/startkde/kstartupconfig/kstartupconfig.cpp @@ -147,5 +147,5 @@ int main() @@ -36,7 +36,7 @@ index 493218ea..d507aa55 100644 + return system( NIXPKGS_KDOSTARTUPCONFIG5 ); } diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake -index b68f0c68..a18efd96 100644 +index b68f0c6..a0ec214 100644 --- a/startkde/startkde.cmake +++ b/startkde/startkde.cmake @@ -1,22 +1,31 @@ @@ -81,7 +81,7 @@ index b68f0c68..a18efd96 100644 fi # Boot sequence: -@@ -33,62 +42,134 @@ fi +@@ -33,62 +42,143 @@ fi # # * Then ksmserver is started which takes control of the rest of the startup sequence @@ -254,7 +254,7 @@ index b68f0c68..a18efd96 100644 #Do not sync any of this section with the wayland versions as there scale factors are #sent properly over wl_output -@@ -104,26 +185,33 @@ fi +@@ -104,26 +194,33 @@ fi #otherwise apps that manually opt in for high DPI get auto scaled by the developer AND manually scaled by us export QT_AUTO_SCREEN_SCALE_FACTOR=0 @@ -301,7 +301,7 @@ index b68f0c68..a18efd96 100644 Xft.dpi: $kcmfonts_general_forcefontdpi EOF fi -@@ -132,11 +220,11 @@ dl=$DESKTOP_LOCKED +@@ -132,11 +229,11 @@ dl=$DESKTOP_LOCKED unset DESKTOP_LOCKED # Don't want it in the environment ksplash_pid= @@ -315,7 +315,7 @@ index b68f0c68..a18efd96 100644 ;; None) ;; -@@ -145,27 +233,6 @@ if test -z "$dl"; then +@@ -145,27 +242,6 @@ if test -z "$dl"; then esac fi @@ -343,7 +343,7 @@ index b68f0c68..a18efd96 100644 # Set a left cursor instead of the standard X11 "X" cursor, since I've heard # from some users that they're confused and don't know what to do. This is # especially necessary on slow machines, where starting KDE takes one or two -@@ -221,44 +288,65 @@ export XDG_DATA_DIRS +@@ -221,44 +297,65 @@ export XDG_DATA_DIRS # KDE_FULL_SESSION=true export KDE_FULL_SESSION @@ -422,7 +422,7 @@ index b68f0c68..a18efd96 100644 # finally, give the session control to the session manager # see kdebase/ksmserver for the description of the rest of the startup sequence -@@ -270,12 +358,16 @@ qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit & +@@ -270,12 +367,16 @@ qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit & # We only check for 255 which means that the ksmserver process could not be # started, any problems thereafter, e.g. ksmserver failing to initialize, # will remain undetected. @@ -442,7 +442,7 @@ index b68f0c68..a18efd96 100644 if test $? -eq 255; then # Startup error echo 'startkde: Could not start ksmserver. Check your installation.' 1>&2 -@@ -286,36 +378,36 @@ fi +@@ -286,36 +387,36 @@ fi #Anything after here is logout #It is not called after shutdown/restart @@ -493,7 +493,7 @@ index b68f0c68..a18efd96 100644 echo 'startkde: Done.' 1>&2 diff --git a/startkde/startplasma.cmake b/startkde/startplasma.cmake -index 1fe41c59..39c0b521 100644 +index 1fe41c5..11757df 100644 --- a/startkde/startplasma.cmake +++ b/startkde/startplasma.cmake @@ -1,6 +1,6 @@ @@ -592,10 +592,10 @@ index 1fe41c59..39c0b521 100644 #It is not called after shutdown/restart -wait_drkonqi=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true` -- --if test x"$wait_drkonqi"x = x"true"x ; then +wait_drkonqi=$(@NIXPKGS_KREADCONFIG5@ --file startkderc --group WaitForDrKonqi --key Enabled --default true) -+ + +-if test x"$wait_drkonqi"x = x"true"x ; then +>>>>>>> upstream/master +if [ x"$wait_drkonqi"x = x"true"x ]; then # wait for remaining drkonqi instances with timeout (in seconds) - wait_drkonqi_timeout=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900` @@ -638,7 +638,7 @@ index 1fe41c59..39c0b521 100644 echo 'startplasma: Done.' 1>&2 diff --git a/startkde/startplasmacompositor.cmake b/startkde/startplasmacompositor.cmake -index dcb473a4..48dbf465 100644 +index dcb473a..0988740 100644 --- a/startkde/startplasmacompositor.cmake +++ b/startkde/startplasmacompositor.cmake @@ -1,118 +1,174 @@ @@ -851,18 +851,18 @@ index dcb473a4..48dbf465 100644 #otherwise apps that manually opt in for high DPI get auto scaled by the developer AND scaled by the wl_output export QT_AUTO_SCREEN_SCALE_FACTOR=0 +-# XCursor mouse theme needs to be applied here to work even for kded or ksmserver +-if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then +- @EXPORT_XCURSOR_PATH@ +XCURSOR_PATH=~/.icons +IFS=":" read -r -a xdgDirs <<< "$XDG_DATA_DIRS" +for xdgDir in "${xdgDirs[@]}"; do + XCURSOR_PATH="$XCURSOR_PATH:$xdgDir/icons" +done +export XCURSOR_PATH -+ - # XCursor mouse theme needs to be applied here to work even for kded or ksmserver --if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then -- @EXPORT_XCURSOR_PATH@ -- + - # TODO: is kapplymousetheme a core app? ++# XCursor mouse theme needs to be applied here to work even for kded or ksmserver +if [ -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ]; then #kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize" - if test $? -eq 10; then @@ -889,7 +889,7 @@ index dcb473a4..48dbf465 100644 export QT_WAYLAND_FORCE_DPI=$kcmfonts_general_forcefontdpiwayland else export QT_WAYLAND_FORCE_DPI=96 -@@ -120,12 +167,12 @@ fi +@@ -120,12 +176,12 @@ fi # Get a property value from org.freedesktop.locale1 queryLocale1() { @@ -904,7 +904,7 @@ index dcb473a4..48dbf465 100644 # Do not overwrite existing values. There is no point in setting only some # of them as then they would not match anymore. if [ -z "${XKB_DEFAULT_MODEL}" -a -z "${XKB_DEFAULT_LAYOUT}" -a \ -@@ -141,41 +188,10 @@ if qdbus --system org.freedesktop.locale1 >/dev/null 2>/dev/null; then +@@ -141,41 +197,10 @@ if qdbus --system org.freedesktop.locale1 >/dev/null 2>/dev/null; then fi fi @@ -947,7 +947,7 @@ index dcb473a4..48dbf465 100644 : # ok else echo 'startplasmacompositor: Could not start D-Bus. Can you call qdbus?' 1>&2 -@@ -212,7 +228,7 @@ export KDE_FULL_SESSION +@@ -212,7 +237,7 @@ export KDE_FULL_SESSION KDE_SESSION_VERSION=5 export KDE_SESSION_VERSION @@ -956,7 +956,7 @@ index dcb473a4..48dbf465 100644 export KDE_SESSION_UID XDG_CURRENT_DESKTOP=KDE -@@ -221,20 +237,41 @@ export XDG_CURRENT_DESKTOP +@@ -221,20 +246,41 @@ export XDG_CURRENT_DESKTOP XDG_SESSION_TYPE=wayland export XDG_SESSION_TYPE @@ -1008,3 +1008,5 @@ index dcb473a4..48dbf465 100644 echo 'startplasmacompositor: Shutting down...' 1>&2 +-- +2.19.2 diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix index 80153332934..541b30ec1b3 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; description = "Mailwatch plugin for Xfce panel"; platforms = platforms.linux; - maintainers = [ maintainers.matthiasbeyer ]; + maintainers = [ ]; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix index 8a602b8b4a1..5331c29a454 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; description = "MPD plugin for Xfce panel"; platforms = platforms.linux; - maintainers = [ maintainers.matthiasbeyer ]; + maintainers = [ ]; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix index 73ab7782ebd..57cd48c6f27 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { description = "A simple XFCE panel plugin that lets the user run an alarm at a specified time or at the end of a specified countdown period"; platforms = platforms.linux; license = licenses.gpl2; - maintainers = [ maintainers.matthiasbeyer ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/compilers/polyml/5.7.nix b/pkgs/development/compilers/polyml/5.7.nix new file mode 100644 index 00000000000..b7feed84c37 --- /dev/null +++ b/pkgs/development/compilers/polyml/5.7.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, gmp, libffi }: + +stdenv.mkDerivation rec { + name = "polyml-${version}"; + version = "5.7.1"; + + prePatch = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace configure.ac --replace stdc++ c++ + ''; + + buildInputs = [ libffi gmp ]; + + nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin autoreconfHook; + + configureFlags = [ + "--enable-shared" + "--with-system-libffi" + "--with-gmp" + ]; + + src = fetchFromGitHub { + owner = "polyml"; + repo = "polyml"; + rev = "v${version}"; + sha256 = "0j0wv3ijfrjkfngy7dswm4k1dchk3jak9chl5735dl8yrl8mq755"; + }; + + meta = with stdenv.lib; { + description = "Standard ML compiler and interpreter"; + longDescription = '' + Poly/ML is a full implementation of Standard ML. + ''; + homepage = https://www.polyml.org/; + license = licenses.lgpl21; + platforms = with platforms; (linux ++ darwin); + maintainers = with maintainers; [ z77z yurrriq ]; + }; +} diff --git a/pkgs/development/compilers/polyml/default.nix b/pkgs/development/compilers/polyml/default.nix index b7feed84c37..91a3bb45352 100644 --- a/pkgs/development/compilers/polyml/default.nix +++ b/pkgs/development/compilers/polyml/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "polyml-${version}"; - version = "5.7.1"; + version = "5.8"; prePatch = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace configure.ac --replace stdc++ c++ @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { owner = "polyml"; repo = "polyml"; rev = "v${version}"; - sha256 = "0j0wv3ijfrjkfngy7dswm4k1dchk3jak9chl5735dl8yrl8mq755"; + sha256 = "1s7q77bivppxa4vd7gxjj5dbh66qnirfxnkzh1ql69rfx1c057n3"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/compilers/purescript/purescript/default.nix b/pkgs/development/compilers/purescript/purescript/default.nix index 5e84f2d874a..0bfb8de0061 100644 --- a/pkgs/development/compilers/purescript/purescript/default.nix +++ b/pkgs/development/compilers/purescript/purescript/default.nix @@ -18,19 +18,19 @@ let in stdenv.mkDerivation rec { name = "purs-simple"; - version = "v0.12.3"; + version = "v0.12.4"; src = if stdenv.isDarwin then fetchurl { - url = "https://github.com/purescript/purescript/releases/download/v0.12.3/macos.tar.gz"; - sha256 = "1f916gv4fz571l4jvr15xjnsvjyy4nljv2ii9njwlm7k6yr5m0qn"; + url = "https://github.com/purescript/purescript/releases/download/v0.12.4/macos.tar.gz"; + sha256 = "046b18plakwvqr77x1hybhfiyzrhnnq0q5ixcmypri1mkkdsmczx"; } else fetchurl { - url = "https://github.com/purescript/purescript/releases/download/v0.12.3/linux64.tar.gz"; - sha256 = "1fad862a2sv4njxbbcfzibbi585m6is3ywb94nmjl8ax254baj3i"; + url = "https://github.com/purescript/purescript/releases/download/v0.12.4/linux64.tar.gz"; + sha256 = "18yny533sjfgacxqx1ki306nhznj4q6nv52c83l82gqj8amyj7k0"; }; diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index 2f3674fdbea..8f005d475dc 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -6,9 +6,9 @@ assert z3Support -> z3 != null; assert z3Support -> stdenv.lib.versionAtLeast z3.version "4.6.0"; let - version = "0.5.4"; - rev = "9549d8fff7343908228c3e8bedc309d1b83fc204"; - sha256 = "1r6wklp3ab2s1lrm70zv6p7blv9917ph1arjsb250j7b7bpjg5pq"; + version = "0.5.7"; + rev = "6da8b019e4a155d1f70abe7a3acc0f9765480a9e"; + sha256 = "0ii868r0ra6brjnn453kxqvw76p4bwjbvdyqfcn6v1bl2h4s60ir"; jsoncppURL = https://github.com/open-source-parsers/jsoncpp/archive/1.8.4.tar.gz; jsoncpp = fetchzip { url = jsoncppURL; @@ -43,8 +43,8 @@ stdenv.mkDerivation { ]; doCheck = stdenv.hostPlatform.isLinux && stdenv.hostPlatform == stdenv.buildPlatform; - checkPhase = "LD_LIBRARY_PATH=./libsolc:./libsolidity:./libevmasm:./libdevcore:./libyul:./liblangutil:$LD_LIBRARY_PATH " + - "./test/soltest -p -- --no-ipc --no-smt --testpath ../test"; + checkPhase = "LD_LIBRARY_PATH=./libsolc:./libsolidity:./libevmasm:./libdevcore:./libyul:./liblangutil:./test/tools/yulInterpreter:$LD_LIBRARY_PATH " + + "./test/soltest -p true -- --no-ipc --no-smt --testpath ../test"; nativeBuildInputs = [ cmake ]; buildInputs = [ boost ] diff --git a/pkgs/development/compilers/zig/default.nix b/pkgs/development/compilers/zig/default.nix index fd95635616f..35ad09320de 100644 --- a/pkgs/development/compilers/zig/default.nix +++ b/pkgs/development/compilers/zig/default.nix @@ -1,23 +1,19 @@ { stdenv, fetchFromGitHub, cmake, llvmPackages, libxml2, zlib }: stdenv.mkDerivation rec { - version = "0.3.0"; - name = "zig-${version}"; + version = "0.4.0"; + pname = "zig"; src = fetchFromGitHub { owner = "ziglang"; - repo = "zig"; - rev = "${version}"; - sha256 = "089ywagxjjh7gxv8h8yg7jpmryzjf7n4m5irhdkhp2966d03kyxm"; + repo = pname; + rev = version; + sha256 = "1cq6cc5pvybz9kn3y0j5gskkjq88hkmmcsva54mfzpcc65l3pv6p"; }; nativeBuildInputs = [ cmake ]; buildInputs = [ llvmPackages.clang-unwrapped llvmPackages.llvm libxml2 zlib ]; - cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" - ]; - 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 d9da4d2074c..10a38e12d90 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1279,4 +1279,7 @@ self: super: { # Fix build with attr-2.4.48 (see #53716) xattr = appendPatch super.xattr ./patches/xattr-fix-build.patch; + # Break out of pandoc >=2.0 && <2.7 (https://github.com/pbrisbin/yesod-markdown/pull/65) + yesod-markdown = doJailbreak super.yesod-markdown; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/libraries/aws-c-common/default.nix b/pkgs/development/libraries/aws-c-common/default.nix index dd200304ab6..682a74593fd 100644 --- a/pkgs/development/libraries/aws-c-common/default.nix +++ b/pkgs/development/libraries/aws-c-common/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-c-common"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "169ha105qgcvj93hf1bhlya2nlwh8g5fvypd6whfjs9k0hqddi0c"; + sha256 = "0wfqs77plb37gp586a0pclxjlpsjvq44991am8p2g5j46zfz6pdx"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 9ba611b0f96..e53c75e6f74 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { name = "aws-sdk-cpp-${version}"; - version = "1.7.53"; + version = "1.7.56"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-sdk-cpp"; rev = version; - sha256 = "0ybccffz5nrhp4n4nyb6ykrk9fdi0vqqqhjkaxx3l0xvmqx9rbrv"; + sha256 = "0vfw5bqlwm5r0ikziz3jx6yb5v24lwig0m62979zy3ndx36kpb9b"; }; # FIXME: might be nice to put different APIs in different outputs diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index 4c942cac3f6..947065997ec 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "babl-0.1.60"; + name = "babl-0.1.62"; src = fetchurl { url = "https://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2"; - sha256 = "0kv0y12j4k9khrxqa7rryfb4ikcnrax6x4nwi70wnz05nv6fxld3"; + sha256 = "047msfzj8v4sfl61a2xhd69r9rh2pjq4lzpk3j10ijyv9qbry9yw"; }; doCheck = true; diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index 65c876320b5..c3cac531263 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "flatpak"; - version = "1.2.3"; + version = "1.2.4"; # TODO: split out lib once we figure out what to do with triggerdir outputs = [ "out" "man" "doc" "installedTests" ]; src = fetchurl { url = "https://github.com/flatpak/flatpak/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "0i0dn3w3545lvmjlzqj3j70lk8yrq64r9frp1rk6a161gwq20ixv"; + sha256 = "1qf3ys84fzv11z6f6li59rxjdjbyrv7cyi9539k73r9i9pckjr8v"; }; patches = [ diff --git a/pkgs/development/libraries/fltk/default.nix b/pkgs/development/libraries/fltk/default.nix index 270936a91b9..60773d29d3d 100644 --- a/pkgs/development/libraries/fltk/default.nix +++ b/pkgs/development/libraries/fltk/default.nix @@ -4,13 +4,13 @@ }: let - version = "1.3.4"; + version = "1.3.5"; in stdenv.mkDerivation { name = "fltk-${version}"; src = fetchurl { url = "http://fltk.org/pub/fltk/${version}/fltk-${version}-source.tar.gz"; - sha256 = "13y57pnayrkfzm8azdfvysm8b77ysac8zhhdsh8kxmb0x3203ay8"; + sha256 = "00jp24z1818k9n6nn6lx7qflqf2k13g4kxr0p8v1d37kanhb4ac7"; }; patches = stdenv.lib.optionals stdenv.isDarwin [ ./nsosv.patch ]; diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 7381c240c8c..37be3c01d93 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 = "2019.01.28.00"; + version = "2019.03.18.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "0ll7ivf59s4xpc6wkyxnl1hami3s2a0kq8njr57lxiqy938clh4g"; + sha256 = "0g7c2lq4prcw9dd5r4q62l8kqm8frczrfq8m4mgs22np60yvmb6d"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/glog/default.nix b/pkgs/development/libraries/glog/default.nix index 791588942ba..9ae181e9453 100644 --- a/pkgs/development/libraries/glog/default.nix +++ b/pkgs/development/libraries/glog/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "glog-${version}"; - version = "0.3.5"; + version = "0.4.0"; src = fetchFromGitHub { owner = "google"; repo = "glog"; rev = "v${version}"; - sha256 = "12v7j6xy0ghya6a0f6ciy4fnbdc486vml2g07j9zm8y5xc6vx3pq"; + sha256 = "1xd3maiipfbxmhc9rrblc5x52nxvkwxp14npg31y5njqvkvzax9b"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 3b4cc86aaaa..93e76c62182 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags }: stdenv.mkDerivation rec { - version = "1.18.0"; + version = "1.19.0"; name = "grpc-${version}"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - sha256 = "0pf8q1z3qhlljlj6h7isvqvsxhh4612z780xcbv1h9lj7cdpr77m"; + sha256 = "105hvpn2z3qiyc01wyzpmfbrpmy20kz1nb9j1c2s0kz1r0v92gqi"; }; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ]; diff --git a/pkgs/development/libraries/gtksourceview/3.x.nix b/pkgs/development/libraries/gtksourceview/3.x.nix index ae90293b5f8..7212ffa00e3 100644 --- a/pkgs/development/libraries/gtksourceview/3.x.nix +++ b/pkgs/development/libraries/gtksourceview/3.x.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "gtksourceview-${version}"; - version = "3.24.9"; + version = "3.24.10"; src = fetchurl { url = "mirror://gnome/sources/gtksourceview/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1hh7brcvpip96mkf9460ksy2qpx2pwynwd0634rx78z6afj7d7b9"; + sha256 = "16ym7jwiki4s1pilwr4incx0yg7ll94f1cajrnpndkxxs36hcm5b"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix index ad59674b3ed..9ab68e578fb 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.5.4"; + version = "1.6.0"; src = fetchFromGitHub { - sha256 = "08hd6j8w4mgnxj84y26vip1vgrg668jnil5jzq2dk4pfapigfz8l"; + sha256 = "1dy1iisc0h1l28ff72pq7vxa4mj5zpq2jflpdghhx8yqksxhii4k"; rev = version; repo = "leatherman"; owner = "puppetlabs"; diff --git a/pkgs/development/libraries/lib3mf/default.nix b/pkgs/development/libraries/lib3mf/default.nix new file mode 100644 index 00000000000..7292debfc3f --- /dev/null +++ b/pkgs/development/libraries/lib3mf/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, cmake, ninja, libuuid, gtest }: + +stdenv.mkDerivation rec { + pname = "lib3mf"; + version = "1.8.1"; + + src = fetchFromGitHub { + owner = "3MFConsortium"; + repo = pname; + rev = "v${version}"; + sha256 = "11wpk6n9ga2p57h1dcrp37w77mii0r7r6mlrgmykf7rvii1rzgqd"; + }; + + nativeBuildInputs = [ cmake ninja ]; + + buildInputs = [ libuuid ]; + + postPatch = '' + rmdir UnitTests/googletest + ln -s ${gtest.src} UnitTests/googletest + ''; + + meta = with stdenv.lib; { + description = "Reference implementation of the 3D Manufacturing Format file standard"; + homepage = "https://3mf.io/"; + license = licenses.bsd2; + maintainers = with maintainers; [ gebner ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix index fea4744a075..7c7ba82ccde 100644 --- a/pkgs/development/libraries/libbluray/default.nix +++ b/pkgs/development/libraries/libbluray/default.nix @@ -19,11 +19,11 @@ assert withFonts -> freetype != null; stdenv.mkDerivation rec { name = "libbluray-${version}"; - version = "1.0.2"; + version = "1.1.0"; src = fetchurl { url = "http://get.videolan.org/libbluray/${version}/${name}.tar.bz2"; - sha256 = "1zxfnw1xbghcj7b3zz5djndv6gwssxda19cz1lrlqrkg8577r7kd"; + sha256 = "10zyqgccgl8kl9d9ljml86sm9s9l2424y55vilb3lifkdb9019p6"; }; patches = optional withJava ./BDJ-JARFILE-path.patch; diff --git a/pkgs/development/libraries/liblo/default.nix b/pkgs/development/libraries/liblo/default.nix index c72b9723dc5..2ba5750b1bf 100644 --- a/pkgs/development/libraries/liblo/default.nix +++ b/pkgs/development/libraries/liblo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "liblo-0.29"; + name = "liblo-0.30"; src = fetchurl { - url = "mirror://sourceforge/liblo/liblo/0.29/${name}.tar.gz"; - sha256 = "0sn0ckc1d0845mhsaa62wf7f9v0c0ykiq796a30ja5096kib9qdc"; + url = "mirror://sourceforge/liblo/liblo/0.30/${name}.tar.gz"; + sha256 = "06wdjzxjdshr6hyl4c94yvg3jixiylap8yjs8brdfpm297gck9rh"; }; doCheck = false; # fails 1 out of 3 tests diff --git a/pkgs/development/libraries/liblouis/default.nix b/pkgs/development/libraries/liblouis/default.nix index a6005d66b4d..a3af7aab526 100644 --- a/pkgs/development/libraries/liblouis/default.nix +++ b/pkgs/development/libraries/liblouis/default.nix @@ -3,7 +3,7 @@ }: let - version = "3.5.0"; + version = "3.9.0"; in stdenv.mkDerivation rec { name = "liblouis-${version}"; @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { owner = "liblouis"; repo = "liblouis"; rev = "v${version}"; - sha256 = "0klmyh6cg9khv59j4xdsrwwjzdgylw689gvrjiy5jsvqll58fcsd"; + sha256 = "11vq9rnmrfqka3fiyrxs0q1gpvpj4m9jmrkwd1yvrq94fndgvh1m"; }; outputs = [ "out" "dev" "man" "info" "doc" ]; @@ -50,7 +50,6 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open-source braille translator and back-translator"; homepage = http://liblouis.org/; - broken = true; license = licenses.lgpl21; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libndctl/default.nix b/pkgs/development/libraries/libndctl/default.nix index ae12bd03813..408155fd5a7 100644 --- a/pkgs/development/libraries/libndctl/default.nix +++ b/pkgs/development/libraries/libndctl/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchFromGitHub, autoreconfHook , asciidoctor, pkgconfig, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt -, json_c, kmod, which, file, utillinux, systemd +, json_c, kmod, which, file, utillinux, systemd, keyutils }: stdenv.mkDerivation rec { name = "libndctl-${version}"; - version = "63"; + version = "64.1"; src = fetchFromGitHub { owner = "pmem"; repo = "ndctl"; rev = "v${version}"; - sha256 = "060nsza8xic769bxj3pvl70a9885bwrc0myw16l095i3z6w7yzwq"; + sha256 = "1la82fqbdwjkw6il498nkdfgqc4aszv481xf2p9p07jfvankx24v"; }; outputs = [ "out" "lib" "man" "dev" ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; buildInputs = - [ json_c kmod utillinux systemd + [ json_c kmod utillinux systemd keyutils ]; configureFlags = diff --git a/pkgs/development/libraries/libpqxx/default.nix b/pkgs/development/libraries/libpqxx/default.nix index fc753fe7669..567be6e5524 100644 --- a/pkgs/development/libraries/libpqxx/default.nix +++ b/pkgs/development/libraries/libpqxx/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libpqxx"; - version = "6.4.2"; + version = "6.4.3"; src = fetchFromGitHub { owner = "jtv"; repo = pname; rev = version; - sha256 = "1s9gbznhak4nvpv56v38pgyki37rlmr0rgc1249ahhv0yfbcf74j"; + sha256 = "1h2gwns9mcdsrl8v203pq3r6jcydg3r5nihsl8s17lkfysizrqw8"; }; nativeBuildInputs = [ gnused python2 ]; diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix index 2f8f37b3792..4c1e0d830d1 100644 --- a/pkgs/development/libraries/libsolv/default.nix +++ b/pkgs/development/libraries/libsolv/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }: stdenv.mkDerivation rec { - version = "0.7.3"; + version = "0.7.4"; name = "libsolv-${version}"; src = fetchFromGitHub { owner = "openSUSE"; repo = "libsolv"; rev = version; - sha256 = "13zjk78gc5fyygpsf0n3p9n22gbjd64wgng98253phd3znvzplag"; + sha256 = "0d7xwykb3mxg8bhmlswnj5f0iyl1qsjyidxswzhcbk21fcgm5d4y"; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/libwpg/default.nix b/pkgs/development/libraries/libwpg/default.nix index 99808be2b21..e80cefe16e2 100644 --- a/pkgs/development/libraries/libwpg/default.nix +++ b/pkgs/development/libraries/libwpg/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libwpd, zlib, librevenge }: stdenv.mkDerivation rec { - name = "libwpg-0.3.2"; + name = "libwpg-0.3.3"; src = fetchurl { url = "mirror://sourceforge/libwpg/${name}.tar.xz"; - sha256 = "0cwc5zkp210c661l0bvk6q21jg9ak5g8gmy578w5fgfnjymz3yjp"; + sha256 = "074x159immf139szkswv2zapnq75p7xk10dbha2p9193hgwggcwr"; }; buildInputs = [ libwpd zlib librevenge ]; diff --git a/pkgs/development/libraries/libx86emu/default.nix b/pkgs/development/libraries/libx86emu/default.nix index 591a3e451ab..93f78a7eb8f 100644 --- a/pkgs/development/libraries/libx86emu/default.nix +++ b/pkgs/development/libraries/libx86emu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libx86emu-${version}"; - version = "2.1"; + version = "2.2"; src = fetchFromGitHub { owner = "wfeldt"; repo = "libx86emu"; rev = version; - sha256 = "16k16xcw2w2c69sn04jfdy9fd7cxs463d2rwb948xchyvfla958j"; + sha256 = "10amjaamd6jfwqxrinsbkqmm6jjrwzyqjp8qy3hm71vkg6fr20gy"; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix index b5bfb4af0bd..7d070364a63 100644 --- a/pkgs/development/libraries/mbedtls/default.nix +++ b/pkgs/development/libraries/mbedtls/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { name = "mbedtls-${version}"; - version = "2.15.1"; + version = "2.16.0"; src = fetchFromGitHub { owner = "ARMmbed"; repo = "mbedtls"; rev = name; - sha256 = "0w6cm2f7d43wp8cx6r5h4icq8zcix1jnvivshypir1rbk1q83gx8"; + sha256 = "14gw3rga9qr6j8ssfjy7k4l8spz37gamqxh9qcwas7w48303897l"; }; nativeBuildInputs = [ cmake ninja perl python ]; diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix index 1f41696a4e3..85ea7a6292a 100644 --- a/pkgs/development/libraries/mlt/qt-5.nix +++ b/pkgs/development/libraries/mlt/qt-5.nix @@ -7,13 +7,13 @@ let inherit (stdenv.lib) getDev; in stdenv.mkDerivation rec { name = "mlt-${version}"; - version = "6.12.0"; + version = "6.14.0"; src = fetchFromGitHub { owner = "mltframework"; repo = "mlt"; rev = "v${version}"; - sha256 = "0pzm3mjbbdl2rkbswgyfkx552xlxh2qrwzsi2a4dicfr92rfgq6w"; + sha256 = "0lxjrd0rsadkfwg86qp0p176kqd9zdfhbmjygmrg5jklmxzd5i25"; }; buildInputs = [ diff --git a/pkgs/development/libraries/pmdk/default.nix b/pkgs/development/libraries/pmdk/default.nix new file mode 100644 index 00000000000..ceb49fc0153 --- /dev/null +++ b/pkgs/development/libraries/pmdk/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub +, autoconf, libndctl, pkgconfig +}: + +stdenv.mkDerivation rec { + name = "pmdk-${version}"; + version = "1.6"; + + src = fetchFromGitHub { + owner = "pmem"; + repo = "pmdk"; + rev = "refs/tags/${version}"; + sha256 = "11h9h5ifgaa5f6v9y77s5lmsj7k61qg52992s1361cmvl0ndgl9k"; + }; + + nativeBuildInputs = [ autoconf pkgconfig ]; + buildInputs = [ libndctl ]; + enableParallelBuilding = true; + + outputs = [ "out" "lib" "dev" "man" ]; + + patchPhase = "patchShebangs utils"; + + installPhase = '' + make install prefix=$out + + mkdir -p $lib $dev $man/share + mv $out/share/man $man/share/man + mv $out/include $dev/include + mv $out/lib $lib/lib + ''; + + meta = with stdenv.lib; { + description = "Persistent Memory Development Kit"; + homepage = https://github.com/pmem/pmdk; + license = licenses.lgpl21; + maintainers = with maintainers; [ thoughtpolice ]; + platforms = [ "x86_64-linux" ]; # aarch64 is experimental + }; +} diff --git a/pkgs/development/libraries/qwt/6_qt4.nix b/pkgs/development/libraries/qwt/6_qt4.nix index 79b182b33b2..b6e0acb603d 100644 --- a/pkgs/development/libraries/qwt/6_qt4.nix +++ b/pkgs/development/libraries/qwt/6_qt4.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, qt4, qmake4Hook, AGL }: stdenv.mkDerivation rec { - name = "qwt-6.1.3"; + name = "qwt-6.1.4"; src = fetchurl { url = "mirror://sourceforge/qwt/${name}.tar.bz2"; - sha256 = "0cwp63s03dw351xavb3pzbjlqvx7kj88wv7v4a2b18m9f97d7v7k"; + sha256 = "1navkcnmn0qz8kzsyqmk32d929zl72l0b580w1ica7z5559j2a8m"; }; buildInputs = [ diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 2ae3bd2b9c8..5d0f6794d17 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -127,7 +127,12 @@ stdenv.mkDerivation rec { CROSS = stdenv.hostPlatform != stdenv.buildPlatform; HOSTCC = "cc"; # Makefile.system only checks defined status - NO_BINARY_MODE = toString (stdenv.hostPlatform != stdenv.buildPlatform); + # This seems to be a bug in the openblas Makefile: + # on x86_64 it expects NO_BINARY_MODE= + # but on aarch64 it expects NO_BINARY_MODE=0 + NO_BINARY_MODE = if stdenv.isx86_64 + then toString (stdenv.hostPlatform != stdenv.buildPlatform) + else stdenv.hostPlatform != stdenv.buildPlatform; }); doCheck = true; diff --git a/pkgs/development/libraries/socket_wrapper/default.nix b/pkgs/development/libraries/socket_wrapper/default.nix index 4dd09776f34..2903e79f891 100644 --- a/pkgs/development/libraries/socket_wrapper/default.nix +++ b/pkgs/development/libraries/socket_wrapper/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, pkgconfig }: stdenv.mkDerivation rec { - name = "socket_wrapper-1.2.1"; + name = "socket_wrapper-1.2.3"; src = fetchurl { url = "mirror://samba/cwrap/${name}.tar.gz"; - sha256 = "1yi1ry3skkbrhvm6g72ripz99diqxnd09v0bx3dlb5sfgcl0wjax"; + sha256 = "1jprm8f7xb91b3yrapdbf51l36j6g038n379akz7ds0dicjh0fh7"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/development/libraries/spice-protocol/default.nix b/pkgs/development/libraries/spice-protocol/default.nix index 08c92ee9ea4..18ec02b4acf 100644 --- a/pkgs/development/libraries/spice-protocol/default.nix +++ b/pkgs/development/libraries/spice-protocol/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "spice-protocol-0.12.14"; + name = "spice-protocol-0.12.15"; src = fetchurl { url = "https://www.spice-space.org/download/releases/${name}.tar.bz2"; - sha256 = "170ckpgazvqv7hxy209myg67pqnd6c0gvr4ysbqgsfch6320nd90"; + sha256 = "06b461i4jv741in8617jjpfk28wk7zs9p7841njkf4sbm8xv4kcb"; }; postInstall = '' diff --git a/pkgs/development/libraries/sqlcipher/default.nix b/pkgs/development/libraries/sqlcipher/default.nix index 46c006df935..ce72c2737be 100644 --- a/pkgs/development/libraries/sqlcipher/default.nix +++ b/pkgs/development/libraries/sqlcipher/default.nix @@ -4,13 +4,13 @@ assert readline != null -> ncurses != null; stdenv.mkDerivation rec { name = "sqlcipher-${version}"; - version = "4.0.1"; + version = "4.1.0"; src = fetchFromGitHub { owner = "sqlcipher"; repo = "sqlcipher"; rev = "v${version}"; - sha256 = "08iqj80qlcsnid2s3m6gcryhvcfc0f136frv0md2gp3rz9g3l63d"; + sha256 = "0w0f4pg3jfzismpgqnbf60bjbbll2ang48216bc4m20mm2dpp5ar"; }; buildInputs = [ readline ncurses openssl tcl ]; diff --git a/pkgs/development/libraries/vo-amrwbenc/default.nix b/pkgs/development/libraries/vo-amrwbenc/default.nix index 9e4ac7e22ca..1a900c3135c 100644 --- a/pkgs/development/libraries/vo-amrwbenc/default.nix +++ b/pkgs/development/libraries/vo-amrwbenc/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { homepage = https://sourceforge.net/projects/opencore-amr/; description = "VisualOn Adaptive Multi Rate Wideband (AMR-WB) encoder"; - license = "stdenv.lib.licenses.apache"; + license = stdenv.lib.licenses.asl20; maintainers = [ stdenv.lib.maintainers.Esteth ]; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/node-packages/composition-v6.nix b/pkgs/development/node-packages/composition-v6.nix deleted file mode 100644 index ce42bfa7ba3..00000000000 --- a/pkgs/development/node-packages/composition-v6.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file has been generated by node2nix 1.6.0. Do not edit! - -{pkgs ? import { - inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}: - -let - nodeEnv = import ./node-env.nix { - inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile; - inherit nodejs; - libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; - }; -in -import ./node-packages-v6.nix { - inherit (pkgs) fetchurl fetchgit; - inherit nodeEnv; -} \ No newline at end of file diff --git a/pkgs/development/node-packages/generate.sh b/pkgs/development/node-packages/generate.sh index 816db45375d..3df201dd96e 100755 --- a/pkgs/development/node-packages/generate.sh +++ b/pkgs/development/node-packages/generate.sh @@ -4,6 +4,5 @@ set -eu -o pipefail rm -f node-env.nix -node2nix -6 -i node-packages-v6.json -o node-packages-v6.nix -c composition-v6.nix node2nix -8 -i node-packages-v8.json -o node-packages-v8.nix -c composition-v8.nix node2nix --nodejs-10 -i node-packages-v10.json -o node-packages-v10.nix -c composition-v10.nix diff --git a/pkgs/development/ocaml-modules/base64/2.0.nix b/pkgs/development/ocaml-modules/base64/2.0.nix new file mode 100644 index 00000000000..8128dc1cb6f --- /dev/null +++ b/pkgs/development/ocaml-modules/base64/2.0.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild }: + +let version = "2.0.0"; in + +stdenv.mkDerivation { + name = "ocaml-base64-${version}"; + + src = fetchzip { + url = "https://github.com/mirage/ocaml-base64/archive/v${version}.tar.gz"; + sha256 = "1nv55gwq5vaxmrcz9ja2s165b1p9fhcxszc1l76043gpa56qm4fs"; + }; + + buildInputs = [ ocaml findlib ocamlbuild ]; + + createFindlibDestdir = true; + + meta = { + homepage = https://github.com/mirage/ocaml-base64; + platforms = ocaml.meta.platforms or []; + description = "Base64 encoding and decoding in OCaml"; + license = stdenv.lib.licenses.isc; + maintainers = with stdenv.lib.maintainers; [ vbgl ]; + }; +} diff --git a/pkgs/development/ocaml-modules/base64/default.nix b/pkgs/development/ocaml-modules/base64/default.nix index 8128dc1cb6f..2633d43c104 100644 --- a/pkgs/development/ocaml-modules/base64/default.nix +++ b/pkgs/development/ocaml-modules/base64/default.nix @@ -1,24 +1,26 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild }: +{ lib, fetchzip, buildDunePackage, alcotest, bos }: -let version = "2.0.0"; in +let version = "3.2.0"; in -stdenv.mkDerivation { - name = "ocaml-base64-${version}"; +buildDunePackage { + pname = "base64"; + inherit version; src = fetchzip { url = "https://github.com/mirage/ocaml-base64/archive/v${version}.tar.gz"; - sha256 = "1nv55gwq5vaxmrcz9ja2s165b1p9fhcxszc1l76043gpa56qm4fs"; + sha256 = "1ilw3zj0w6cq7i4pvr8m2kv5l5f2y9aldmv72drlwwns013b1gwy"; }; - buildInputs = [ ocaml findlib ocamlbuild ]; + minimumOCamlVersion = "4.03"; - createFindlibDestdir = true; + buildInputs = [ alcotest bos ]; + + doCheck = true; meta = { homepage = https://github.com/mirage/ocaml-base64; - platforms = ocaml.meta.platforms or []; description = "Base64 encoding and decoding in OCaml"; - license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/ppxlib/default.nix b/pkgs/development/ocaml-modules/ppxlib/default.nix index a1e43d6d13d..468738224de 100644 --- a/pkgs/development/ocaml-modules/ppxlib/default.nix +++ b/pkgs/development/ocaml-modules/ppxlib/default.nix @@ -4,13 +4,13 @@ buildDunePackage rec { pname = "ppxlib"; - version = "0.3.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "ocaml-ppx"; repo = pname; rev = version; - sha256 = "0qpjl84x8abq9zivifb0k8ld7fa1lrhkbajmmccvfv06ja3as1v4"; + sha256 = "0d2nyp4mlx7m3vdvcdhs51x570vw30j645yfbwlhjpwdd8243fya"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/APScheduler/default.nix b/pkgs/development/python-modules/APScheduler/default.nix index f3c8c57f576..5c8ec07f4bb 100644 --- a/pkgs/development/python-modules/APScheduler/default.nix +++ b/pkgs/development/python-modules/APScheduler/default.nix @@ -20,11 +20,11 @@ buildPythonPackage rec { pname = "APScheduler"; - version = "3.5.3"; + version = "3.6.0"; src = fetchPypi { inherit pname version; - sha256 = "6599bc78901ee7e9be85cbd073d9cc155c42d2bc867c5cde4d4d1cc339ebfbeb"; + sha256 = "0q22lgp001hkk4z4xs2b2hlix84ka15i576p33fmgp69zn4bhmlg"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/IPy/default.nix b/pkgs/development/python-modules/IPy/default.nix index eacfe8dda5b..7f258780d1c 100644 --- a/pkgs/development/python-modules/IPy/default.nix +++ b/pkgs/development/python-modules/IPy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "IPy"; - version = "0.83"; + version = "1.00"; src = fetchPypi { inherit pname version; - sha256 = "61da5a532b159b387176f6eabf11946e7458b6df8fb8b91ff1d345ca7a6edab8"; + sha256 = "08d6kcacj67mvh0b6y765ipccy6gi4w2ndd4v1l3im2qm1cgcarg"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/Wand/default.nix b/pkgs/development/python-modules/Wand/default.nix index 0e25734cb7c..1db067838fb 100644 --- a/pkgs/development/python-modules/Wand/default.nix +++ b/pkgs/development/python-modules/Wand/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Wand"; - version = "0.5.1"; + version = "0.5.2"; src = fetchPypi { inherit pname version; - sha256 = "7d6b8dc9d4eaccc430b9c86e6b749013220c994970a3f39e902b397e2fa732c3"; + sha256 = "0nvdq15gmkzhwpwkln8wmkq0h4izznnr6zmrnwqza8lsa1c0jz5f"; }; postPatch = '' diff --git a/pkgs/development/python-modules/agate-dbf/default.nix b/pkgs/development/python-modules/agate-dbf/default.nix index ea3f26cd315..f070dcb258e 100644 --- a/pkgs/development/python-modules/agate-dbf/default.nix +++ b/pkgs/development/python-modules/agate-dbf/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "agate-dbf"; - version = "0.2.0"; + version = "0.2.1"; propagatedBuildInputs = [ agate dbf dbfread ]; src = fetchPypi { inherit pname version; - sha256 = "0pkk6m873xpqj77ja6ylmg8v41abpn4bvsqw6mh2hjyd0snw2rh6"; + sha256 = "0brprva3vjypb5r9lk6zy10jazp681rxsqxzhz2lr869ir4krj80"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/aniso8601/default.nix b/pkgs/development/python-modules/aniso8601/default.nix index 4f660239530..76b5d97e281 100644 --- a/pkgs/development/python-modules/aniso8601/default.nix +++ b/pkgs/development/python-modules/aniso8601/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "aniso8601"; - version = "4.1.0"; + version = "6.0.0"; meta = with stdenv.lib; { description = "Parses ISO 8601 strings."; @@ -17,6 +17,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1x49k287ky1spv3msc9fwmc7ydyw6rlcr14nslgcmpjfn3pgzh03"; + sha256 = "1bylfskk08ahyma25i8w3mcd0kywpxqx6icv5p7m1z0i8srak9mq"; }; } diff --git a/pkgs/development/python-modules/ansible-runner/default.nix b/pkgs/development/python-modules/ansible-runner/default.nix index fbe9589478c..2ea96b93772 100644 --- a/pkgs/development/python-modules/ansible-runner/default.nix +++ b/pkgs/development/python-modules/ansible-runner/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "ansible-runner"; - version = "1.2.0"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "9c2fc02bd22ac831138bfd2241e1664d7700bbb2c61f96b8b1f2d83ab4ea59a7"; + sha256 = "1zys65vq0jqyzdmchaydzsvlf0ysw2y58sapjq6wzc6yw6pdyigz"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/aws-lambda-builders/default.nix b/pkgs/development/python-modules/aws-lambda-builders/default.nix new file mode 100644 index 00000000000..16f5e19b786 --- /dev/null +++ b/pkgs/development/python-modules/aws-lambda-builders/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, six +, pytest +, mock +, parameterized +, isPy35 +}: + +buildPythonPackage rec { + pname = "aws-lambda-builders"; + version = "0.2.1"; + + # No tests available in PyPI tarball + src = fetchFromGitHub { + owner = "awslabs"; + repo = "aws-lambda-builders"; + rev = "v${version}"; + sha256 = "1pbi6572q1nqs2wd7jx9d5vgf3rqdsqlaz4v8fqvl23wfb2c4vpd"; + }; + + # Package is not compatible with Python 3.5 + disabled = isPy35; + + propagatedBuildInputs = [ + six + ]; + + checkInputs = [ + pytest + mock + parameterized + ]; + + checkPhase = '' + export PATH=$out/bin:$PATH + pytest tests/functional + ''; + + meta = with lib; { + homepage = https://github.com/awslabs/aws-lambda-builders; + description = "A tool to compile, build and package AWS Lambda functions"; + longDescription = '' + Lambda Builders is a Python library to compile, build and package + AWS Lambda functions for several runtimes & frameworks. + ''; + license = licenses.asl20; + maintainers = with maintainers; [ dhkl ]; + }; +} diff --git a/pkgs/development/python-modules/azure-storage-blob/default.nix b/pkgs/development/python-modules/azure-storage-blob/default.nix index 9a84a732685..2531c440daf 100644 --- a/pkgs/development/python-modules/azure-storage-blob/default.nix +++ b/pkgs/development/python-modules/azure-storage-blob/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "azure-storage-blob"; - version = "1.4.0"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "65ebe2e54460566c2077c6b3773a2a0623eabc7b95602010cb51b84077087fda"; + sha256 = "0b15dzy75fml994gdfmaw5qcyij15gvh968mk3hg94d1wxwai1zi"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/backports_csv/default.nix b/pkgs/development/python-modules/backports_csv/default.nix index 322f9c6d793..ce5d15c212a 100644 --- a/pkgs/development/python-modules/backports_csv/default.nix +++ b/pkgs/development/python-modules/backports_csv/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "backports.csv"; - version = "1.0.6"; + version = "1.0.7"; src = fetchPypi { inherit pname version; - sha256 = "bed884eeb967c8d6f517dfcf672914324180f1e9ceeb0376fde2c4c32fd7008d"; + sha256 = "0vdx5jlhs91iizc8j8l8811nqprwvdx39pgkdc82w2qkfgzxyxqj"; }; propagatedBuildInputs = [ future ]; diff --git a/pkgs/development/python-modules/braintree/default.nix b/pkgs/development/python-modules/braintree/default.nix index 5e24a880e75..6604901a512 100644 --- a/pkgs/development/python-modules/braintree/default.nix +++ b/pkgs/development/python-modules/braintree/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "braintree"; - version = "3.51.0"; + version = "3.52.0"; src = fetchPypi { inherit pname version; - sha256 = "1aavalwxcpql416f0n6wxq2h5jpvbx5jq4y4nz2wsppgjbsxylcc"; + sha256 = "0p8qmmc3fmjz7i5yjyxx9sxkhfq38kr0mws4dh3k5kxl6an02mp4"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/chevron/default.nix b/pkgs/development/python-modules/chevron/default.nix new file mode 100644 index 00000000000..c6338fce56b --- /dev/null +++ b/pkgs/development/python-modules/chevron/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, python +}: + +buildPythonPackage rec { + pname = "chevron"; + version = "0.13.1"; + + # No tests available in the PyPI tarball + src = fetchFromGitHub { + owner = "noahmorrison"; + repo = "chevron"; + rev = "0.13.1"; + sha256 = "0l1ik8dvi6bgyb3ym0w4ii9dh25nzy0x4yawf4zbcyvvcb6af470"; + }; + + checkPhase = '' + ${python.interpreter} test_spec.py + ''; + + meta = with lib; { + homepage = https://github.com/noahmorrison/chevron; + description = "A python implementation of the mustache templating language"; + license = licenses.mit; + maintainers = with maintainers; [ dhkl ]; + }; +} diff --git a/pkgs/development/python-modules/click-completion/default.nix b/pkgs/development/python-modules/click-completion/default.nix index 0dd5e22abf5..2921970ff28 100644 --- a/pkgs/development/python-modules/click-completion/default.nix +++ b/pkgs/development/python-modules/click-completion/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "click-completion"; - version = "0.5.0"; + version = "0.5.1"; disabled = (!isPy3k); src = fetchPypi { inherit pname version; - sha256 = "0k3chs301cnyq2jfl12lih5fa6r06nmxmbyp9dwvjm09v8f2c03n"; + sha256 = "1ysn6kzv3fgakn0y06i3cxynd8iaybarrygabk9a0pp2spn2w1vq"; }; propagatedBuildInputs = [ click jinja2 shellingham six ]; diff --git a/pkgs/development/python-modules/dbf/default.nix b/pkgs/development/python-modules/dbf/default.nix index 5a27e2b746f..2ba308596d4 100644 --- a/pkgs/development/python-modules/dbf/default.nix +++ b/pkgs/development/python-modules/dbf/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "dbf"; - version = "0.97.11"; + version = "0.98.0"; src = fetchPypi { inherit pname version; - sha256 = "8aa5a73d8b140aa3c511a3b5b204a67d391962e90c66b380dd048fcae6ddbb68"; + sha256 = "089h98gpjf9ffxzbkbd9k9wd8n3s7g0nhfpn3rf44h51hllgqxxb"; }; propagatedBuildInputs = [ aenum ] ++ stdenv.lib.optional (pythonOlder "3.4") [ enum34 ]; diff --git a/pkgs/development/python-modules/django-allauth/default.nix b/pkgs/development/python-modules/django-allauth/default.nix index 775660b8304..331aa46acd0 100644 --- a/pkgs/development/python-modules/django-allauth/default.nix +++ b/pkgs/development/python-modules/django-allauth/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "django-allauth"; - version = "0.36.0"; + version = "0.38.0"; # no tests on PyPI src = fetchFromGitHub { owner = "pennersr"; repo = pname; rev = version; - sha256 = "1c863cmd521j6cwpyd50jxz5y62fdschrhm15jfqihicyr9imjan"; + sha256 = "17ch8lvq47arkgvwz2fdc89lwvgphsnmjs6wwf5g1m50xclljwmq"; }; propagatedBuildInputs = [ requests requests_oauthlib django python3-openid ]; diff --git a/pkgs/development/python-modules/eyed3/default.nix b/pkgs/development/python-modules/eyed3/default.nix index 6f10e69c0ec..16e94bd785f 100644 --- a/pkgs/development/python-modules/eyed3/default.nix +++ b/pkgs/development/python-modules/eyed3/default.nix @@ -14,13 +14,13 @@ }: buildPythonPackage rec { - version = "0.8.9"; + version = "0.8.10"; pname = "eyeD3"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "b6bb626566f2949da409d7a871576271e2d6254dfb3d416b21713dabc4b6b00f"; + sha256 = "1jb22n1jczxgbpcnfiw12r8dcs74556g1d09mzms44f52kgs7lgc"; }; # https://github.com/nicfit/eyeD3/pull/284 diff --git a/pkgs/development/python-modules/fints/default.nix b/pkgs/development/python-modules/fints/default.nix index 5ac7ccd1adc..4d9d250815a 100644 --- a/pkgs/development/python-modules/fints/default.nix +++ b/pkgs/development/python-modules/fints/default.nix @@ -2,13 +2,13 @@ requests, mt-940, sepaxml, bleach, isPy3k }: buildPythonPackage rec { - version = "2.0.1"; + version = "2.1.1"; pname = "fints"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "27427b5e6536b592f964c464a8f0c75c5725176604e9d0f208772a45918d9b78"; + sha256 = "06p6p0xxw0n10hmf7z4k1l29fya0sja433s6lasjr1bal5asdhaq"; }; propagatedBuildInputs = [ requests mt-940 sepaxml bleach ]; diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix index ff6f0716d71..b8d203d515a 100644 --- a/pkgs/development/python-modules/fiona/default.nix +++ b/pkgs/development/python-modules/fiona/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Fiona"; - version = "1.8.4"; + version = "1.8.6"; src = fetchPypi { inherit pname version; - sha256 = "aec9ab2e3513c9503ec123b1a8573bee55fc6a66e2ac07088c3376bf6738a424"; + sha256 = "0gpvdrayam4qvpqvz0911nlyvf7ib3slsyml52qx172vhpldycgs"; }; CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11"; diff --git a/pkgs/development/python-modules/flask-marshmallow/default.nix b/pkgs/development/python-modules/flask-marshmallow/default.nix index c523d7b963c..92e4542bfef 100644 --- a/pkgs/development/python-modules/flask-marshmallow/default.nix +++ b/pkgs/development/python-modules/flask-marshmallow/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "flask-marshmallow"; - version = "0.9.0"; + version = "0.10.0"; meta = { homepage = "https://github.com/marshmallow-code/flask-marshmallow"; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "db7aff4130eb99fd05ab78fd2e2c58843ba0f208899aeb1c14aff9cd98ae8c80"; + sha256 = "1xvk289628l3pp56gidwhmd54cgdczpsxhxfw0bfcsd120k1svfv"; }; propagatedBuildInputs = [ flask marshmallow ]; diff --git a/pkgs/development/python-modules/flexmock/default.nix b/pkgs/development/python-modules/flexmock/default.nix index f1a0efc0713..59dd32053ca 100644 --- a/pkgs/development/python-modules/flexmock/default.nix +++ b/pkgs/development/python-modules/flexmock/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "flexmock"; - version = "0.10.3"; + version = "0.10.4"; src = fetchPypi { inherit pname version; - sha256 = "031c624pdqm7cc0xh4yz5k69gqxn2bbrjz13s17684q5shn0ik21"; + sha256 = "0b6qw3grhgx58kxlkj7mdma7xdvlj02zabvcf7w2qifnfjwwwcsh"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/fs/default.nix b/pkgs/development/python-modules/fs/default.nix index cdbdcf7d16e..d53556f0d07 100644 --- a/pkgs/development/python-modules/fs/default.nix +++ b/pkgs/development/python-modules/fs/default.nix @@ -19,11 +19,11 @@ buildPythonPackage rec { pname = "fs"; - version = "2.3.1"; + version = "2.4.4"; src = fetchPypi { inherit pname version; - sha256 = "6c3f79a16dfcbf8a8f437f81dd8afaa3741285d9369574c48e1d27e40b0c980e"; + sha256 = "0krf632nz24v2da7g9xivq6l2w9za3vph4vix7mm1k3byzwjnawk"; }; buildInputs = [ glibcLocales ]; diff --git a/pkgs/development/python-modules/future-fstrings/default.nix b/pkgs/development/python-modules/future-fstrings/default.nix index 9e49147315b..c9b49fee4cb 100644 --- a/pkgs/development/python-modules/future-fstrings/default.nix +++ b/pkgs/development/python-modules/future-fstrings/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "future-fstrings"; - version = "0.4.5"; + version = "1.0.0"; src = fetchPypi { inherit version; pname = "future_fstrings"; - sha256 = "891c5d5f073b3e3ff686bebde0a4c45c479065f45c8cbd6de19323d5a50738a8"; + sha256 = "1pra33in6rinrcs5wvdb1rbxmx223j93ahdwhzwgf7wyfsnjda98"; }; # No tests included in Pypi archive diff --git a/pkgs/development/python-modules/geoalchemy2/default.nix b/pkgs/development/python-modules/geoalchemy2/default.nix index fbbcaa82dd2..eebf2794d4b 100644 --- a/pkgs/development/python-modules/geoalchemy2/default.nix +++ b/pkgs/development/python-modules/geoalchemy2/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "GeoAlchemy2"; - version = "0.5.0"; + version = "0.6.1"; src = fetchPypi { inherit pname version; - sha256 = "7d66d01af82d22bc37d3ebb1e73713b87ac5e116b3bc82ea4ec0584bbaa89f89"; + sha256 = "0bzm9zgz2gfy6smlvdgxnf6y14rfhr4vj3mjfwlxdx2vcfc95hqa"; }; propagatedBuildInputs = [ sqlalchemy shapely ]; diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index 3ecc0b3294f..9d8814e6531 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -1,17 +1,22 @@ -{ stdenv, buildPythonPackage, fetchPypi, lib, darwin -, six, protobuf, enum34, futures, isPy27, isPy34, pkgconfig }: +{ stdenv, buildPythonPackage, fetchFromGitHub, lib, darwin +, six, protobuf, enum34, futures, isPy27, isPy34, pkgconfig +, cython}: with stdenv.lib; buildPythonPackage rec { pname = "grpcio"; version = "1.18.0"; - src = fetchPypi { - inherit pname version; - sha256 = "abe825aa49e6239d5edf4e222c44170d2c7f6f4b1fd5286b4756a62d8067e112"; + src = fetchFromGitHub { + owner = "grpc"; + repo = "grpc"; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "0cilbhk35gv46mk40jl5f3iqa94x14qyxbavpfq0kh0rld82nx4m"; }; - nativeBuildInputs = [ pkgconfig ] ++ optional stdenv.isDarwin darwin.cctools; + nativeBuildInputs = [ cython pkgconfig ] + ++ optional stdenv.isDarwin darwin.cctools; propagatedBuildInputs = [ six protobuf ] ++ lib.optionals (isPy27 || isPy34) [ enum34 ] diff --git a/pkgs/development/python-modules/gsd/default.nix b/pkgs/development/python-modules/gsd/default.nix index c0ad2dc3ac9..07fca0d2404 100644 --- a/pkgs/development/python-modules/gsd/default.nix +++ b/pkgs/development/python-modules/gsd/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "1.6.0"; + version = "1.6.1"; pname = "gsd"; src = fetchPypi { inherit pname version; - sha256 = "845a7fe4fd9776cda1bd66112dc2d788cb5ccf8333a205bd4a32807e57d3c875"; + sha256 = "18icw5cbsq4gnhx4vsjwhxzcx11mbnz6kmwgrylkf82m7m1v2921"; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix index e9d14e56fd4..69507798cbe 100644 --- a/pkgs/development/python-modules/h5py/default.nix +++ b/pkgs/development/python-modules/h5py/default.nix @@ -30,7 +30,7 @@ in buildPythonPackage rec { preBuild = if mpiSupport then "export CC=${mpi}/bin/mpicc" else ""; - checkInputs = optional isPy27 unittest2; + checkInputs = optional isPy27 unittest2 ++ [ openssh ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ hdf5 cython ] ++ optional mpiSupport mpi; diff --git a/pkgs/development/python-modules/influxdb/default.nix b/pkgs/development/python-modules/influxdb/default.nix index 99edea703c6..657a8178440 100644 --- a/pkgs/development/python-modules/influxdb/default.nix +++ b/pkgs/development/python-modules/influxdb/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "influxdb"; - version = "5.2.1"; + version = "5.2.2"; src = fetchPypi { inherit pname version; - sha256 = "1dp3fakzp0fqdajf6xsfmisdwj1avk4lvxjmw5k9wkhdbpi6vnbm"; + sha256 = "0hriag4d4gx4bsqisiz29478sj54b215p6xzmshlw6x9af4z5vxg"; }; # ImportError: No module named tests diff --git a/pkgs/development/python-modules/ipdb/default.nix b/pkgs/development/python-modules/ipdb/default.nix index 3203963b29d..f31b9013d94 100644 --- a/pkgs/development/python-modules/ipdb/default.nix +++ b/pkgs/development/python-modules/ipdb/default.nix @@ -7,17 +7,20 @@ buildPythonPackage rec { pname = "ipdb"; - version = "0.8.1"; + version = "0.12"; disabled = isPyPy; # setupterm: could not find terminfo database src = fetchPypi { inherit pname version; - extension = "zip"; - sha256 = "1763d1564113f5eb89df77879a8d3213273c4d7ff93dcb37a3070cdf0c34fd7c"; + sha256 = "dce2112557edfe759742ca2d0fee35c59c97b0cc7a05398b791079d78f1519ce"; }; propagatedBuildInputs = [ ipython ]; + preCheck = '' + export HOME=$(mktemp -d) + ''; + meta = with stdenv.lib; { homepage = https://github.com/gotcha/ipdb; description = "IPython-enabled pdb"; diff --git a/pkgs/development/python-modules/j2cli/default.nix b/pkgs/development/python-modules/j2cli/default.nix index 13af20ba79b..163dbba07f7 100644 --- a/pkgs/development/python-modules/j2cli/default.nix +++ b/pkgs/development/python-modules/j2cli/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "j2cli"; - version = "0.3.5.post1"; + version = "0.3.6.post1"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "c0439a79308aae320bfd01d82b56893b02fe461195d8b69b438ba9b333075642"; + sha256 = "1j8s09b75w041b2lawjz341ri997n9fnxbd2ipm9czxj6fhj8hi2"; }; buildInputs = [ nose ]; diff --git a/pkgs/development/python-modules/jaraco_itertools/default.nix b/pkgs/development/python-modules/jaraco_itertools/default.nix index cbf966785e1..59d8538bb1e 100644 --- a/pkgs/development/python-modules/jaraco_itertools/default.nix +++ b/pkgs/development/python-modules/jaraco_itertools/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "jaraco.itertools"; - version = "4.4.1"; + version = "4.4.2"; src = fetchPypi { inherit pname version; - sha256 = "d1380ed961c9a4724f0bcca85d2bffebaa2507adfde535d5ee717441c9105fae"; + sha256 = "0zxx8ffk5ycapy2d41dfgzskl5jfwjc10hsd91jsrax5alkhrh7x"; }; patches = [ ./0001-Don-t-run-flake8-checks-during-the-build.patch ]; diff --git a/pkgs/development/python-modules/jsbeautifier/default.nix b/pkgs/development/python-modules/jsbeautifier/default.nix index 9b2d3a5b832..2ca26ad65e8 100644 --- a/pkgs/development/python-modules/jsbeautifier/default.nix +++ b/pkgs/development/python-modules/jsbeautifier/default.nix @@ -1,18 +1,26 @@ -{ lib, fetchPypi, buildPythonApplication, EditorConfig, pytest, six }: +{ lib, fetchPypi, buildPythonApplication, EditorConfig, fetchpatch, pytest, six }: buildPythonApplication rec { pname = "jsbeautifier"; - version = "1.8.9"; + version = "1.9.1"; - propagatedBuildInputs = [ six ]; - - buildInputs = [ EditorConfig pytest ]; + propagatedBuildInputs = [ six EditorConfig ]; + checkInputs = [ pytest ]; src = fetchPypi { inherit pname version; - sha256 = "7d02baa9b0459bf9c5407c1b99ad5566de04a3b664b18a58ac64f52832034204"; + sha256 = "0q8ld072dkccssagjxyvc9633fb6ynflvz70924phgp3zxmim960"; }; + patches = [ + (fetchpatch { + url = "https://github.com/beautify-web/js-beautify/commit/78e35a11cbb805fc044241d6465800ee2bd57ebc.patch"; + sha256 = "1ah7nshk96yljy37i20v4fga834dix9cdbhkdc3flfm4904n4523"; + }) + ]; + + patchFlags = [ "-p2" ]; + meta = with lib; { homepage = "http://jsbeautifier.org"; description = "JavaScript unobfuscator and beautifier."; diff --git a/pkgs/development/python-modules/jupyterlab_server/default.nix b/pkgs/development/python-modules/jupyterlab_server/default.nix index 9d111c3eb6f..5fa8c52a97a 100644 --- a/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/pkgs/development/python-modules/jupyterlab_server/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "jupyterlab_server"; - version = "0.2.0"; + version = "0.3.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "72d916a73957a880cdb885def6d8664a6d1b2760ef5dca5ad665aa1e8d1bb783"; + sha256 = "13b728z5ls0g3p1gq5hvfqg7302clxna5grvgjfwbfzss0avlpjc"; }; checkInputs = [ requests pytest ]; diff --git a/pkgs/development/python-modules/kafka-python/default.nix b/pkgs/development/python-modules/kafka-python/default.nix index 0f257fb13c2..e68bd1615fa 100644 --- a/pkgs/development/python-modules/kafka-python/default.nix +++ b/pkgs/development/python-modules/kafka-python/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi, pytest, six, mock }: buildPythonPackage rec { - version = "1.4.4"; + version = "1.4.5"; pname = "kafka-python"; src = fetchPypi { inherit pname version; - sha256 = "1p9sr9vl96xz8qrgdrjiql9qkch2qx29pkq7igk28clgc6zbn510"; + sha256 = "01jlklfgvggkyq5yj0zhk46xv91jhha2cshq8kbxv9f7043c201i"; }; checkInputs = [ pytest six mock ]; diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix index cce640cce36..604f9bad3c3 100644 --- a/pkgs/development/python-modules/limnoria/default.nix +++ b/pkgs/development/python-modules/limnoria/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "limnoria"; - version = "2018.12.19"; + version = "2019.02.23"; src = fetchPypi { inherit pname version; - sha256 = "6034e324b3a455f042975006a35dd33fa9175115c7302cb53ca9a646f6594bfc"; + sha256 = "0rlv9l1w80n2jpw2yy1g6x83rvldwzkmkafdalxkar32czbi2xv4"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/mail-parser/default.nix b/pkgs/development/python-modules/mail-parser/default.nix index 42162d62aac..1f06f7f250a 100644 --- a/pkgs/development/python-modules/mail-parser/default.nix +++ b/pkgs/development/python-modules/mail-parser/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "mail-parser"; - version = "3.9.2"; + version = "3.9.3"; # no tests in PyPI tarball src = fetchFromGitHub { owner = "SpamScope"; repo = pname; rev = "v${version}"; - sha256 = "0f515a8r3qz3i2cm4lvs5aw59193jl9mk7bmaj9545n4miyar4nr"; + sha256 = "0v6hgsz6yvp6csgx4y440ksqj24rdsd06vyfqcihiy3dfvp9229y"; }; LC_ALL = "en_US.utf-8"; diff --git a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix index 8582f8a29f9..0d8382f9b6f 100644 --- a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "marshmallow-sqlalchemy"; - version = "0.16.0"; + version = "0.16.1"; meta = { homepage = "https://github.com/marshmallow-code/marshmallow-sqlalchemy"; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "c99d51bb4dfca7e1b35ae12ed96746c0df0464b7eb95bba6835a1231e6ea286c"; + sha256 = "0dv9imc41xg0k9xv0fb8ygfip7iznsnf8g33z74zz2bf1dbhricr"; }; propagatedBuildInputs = [ marshmallow sqlalchemy ]; diff --git a/pkgs/development/python-modules/mechanize/default.nix b/pkgs/development/python-modules/mechanize/default.nix index fa6ea72129f..c6e7089cdd9 100644 --- a/pkgs/development/python-modules/mechanize/default.nix +++ b/pkgs/development/python-modules/mechanize/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "mechanize"; - version = "0.4.0"; + version = "0.4.1"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "15g58z3hy1pgi5sygpif28jyqj79iz4vw2mh5nxdydl4w20micvf"; + sha256 = "1fl6zb36cqsdiay1mn3nmjv5jw4jys5av7hb1y9995qlycg0hm49"; }; propagatedBuildInputs = [ html5lib ]; diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix index d3535589911..5984f2bcb7c 100644 --- a/pkgs/development/python-modules/mpi4py/default.nix +++ b/pkgs/development/python-modules/mpi4py/default.nix @@ -2,31 +2,17 @@ buildPythonPackage rec { pname = "mpi4py"; - version = "3.0.0"; + version = "3.0.1"; src = fetchPypi { inherit pname version; - sha256 = "1mzgd26dfv4vwbci8gq77ss9f0x26i9aqzq9b9vs9ndxhlnv0mxl"; + sha256 = "0ld8rjmsjr0dklvj2g1gr3ax32sdq0xjxyh0cspknc1i36waajb5"; }; passthru = { inherit mpi; }; - patches = [ - (fetchpatch { - # Disable tests failing with 3.1.x and MPI_THREAD_MULTIPLE (upstream patch) - url = "https://bitbucket.org/mpi4py/mpi4py/commits/c2b6b7e642a182f9b00a2b8e9db363214470548a/raw"; - sha256 = "0n6bz3kj4vcqb6q7d0mlj5vl6apn7i2bvfc9mpg59vh3wy47119q"; - }) - (fetchpatch { - # Open MPI: Workaround removal of MPI_{LB|UB} (upstream patch) - url = "https://bitbucket.org/mpi4py/mpi4py/commits/39ca784226460f9e519507269ebb29635dc8bd90/raw"; - sha256 = "02kxikdlsrlq8yr5hca42536mxbrq4k4j8nqv7p1p2r0q21a919q"; - }) - - ]; - postPatch = '' substituteInPlace test/test_spawn.py --replace \ "unittest.skipMPI('openmpi(<3.0.0)')" \ diff --git a/pkgs/development/python-modules/netcdf4/default.nix b/pkgs/development/python-modules/netcdf4/default.nix index f592edf2cd9..a274da71ce4 100644 --- a/pkgs/development/python-modules/netcdf4/default.nix +++ b/pkgs/development/python-modules/netcdf4/default.nix @@ -3,13 +3,13 @@ }: buildPythonPackage rec { pname = "netCDF4"; - version = "1.4.2"; + version = "1.5.0"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "0c0sklgrmv15ygliin8qq0hp7vanmbi74m6zpi0r1ksr0hssyd5r"; + sha256 = "1nf0cjja94zsfbp8dw83b36c4cmz9v4b0h51yh8g3q2z9w8d2n62"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/nuitka/default.nix b/pkgs/development/python-modules/nuitka/default.nix index ec68cb54afe..b586a36aa88 100644 --- a/pkgs/development/python-modules/nuitka/default.nix +++ b/pkgs/development/python-modules/nuitka/default.nix @@ -13,13 +13,13 @@ let # Therefore we create a separate env for it. scons = pkgs.python27.withPackages(ps: [ pkgs.scons ]); in buildPythonPackage rec { - version = "0.6.1.1"; + version = "0.6.2"; pname = "Nuitka"; # Latest version is not yet on PyPi src = fetchurl { url = "https://github.com/kayhayen/Nuitka/archive/${version}.tar.gz"; - sha256 = "0dlhbgn90nj110kmylyrzxd301611g63ynbpm5dfsb09s9c569zm"; + sha256 = "04qmk1diplpvcdmk0clbsy0mdg04pkmgjjysz31g82v477if9m54"; }; checkInputs = [ vmprof pyqt4 ]; diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index f0ac35feefd..0aa89eb7620 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "pex"; - version = "1.6.2"; + version = "1.6.3"; src = fetchPypi { inherit pname version; - sha256 = "724588ce982222a3020ad3de50e0912915815175771b35e59fe06fdf1db35415"; + sha256 = "1xb68q4rdi0is22cwvrfk1xwg6yngdxcvmjpdlkgmbdxf3y1sy33"; }; prePatch = '' diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 4fcc20d2d0d..af9232b174c 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.10.6"; + version = "8.10.8"; src = fetchPypi { inherit pname version; - sha256 = "2fe47dbf947cc74643ef1a49411466483d1165ced2b62578a14b513dd09642a9"; + sha256 = "1ka7fnlvmvmw984k89mlkdlwbnnyap186a1yfnykx833bp364yg2"; }; meta = { diff --git a/pkgs/development/python-modules/pika/default.nix b/pkgs/development/python-modules/pika/default.nix index ec00a2e400a..40f2afcafb6 100644 --- a/pkgs/development/python-modules/pika/default.nix +++ b/pkgs/development/python-modules/pika/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "pika"; - version = "0.13.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1104b0jm7qs9b211hw6siddflvf56ag4lfsjy6yfbczds4lxhf2k"; + sha256 = "119lpjzw8wd7c6ikn35c0pvr3zzfy20rklpxdkcmp12wnf9i597v"; }; # Tests require twisted which is only availalble for python-2.x diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index 6a2d49996b3..253288088c4 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "plotly"; - version = "3.6.1"; + version = "3.7.1"; src = fetchPypi { inherit pname version; - sha256 = "3cfc53346fa5c32432f13b0c20c272f9cf48f9af9c15f8f77745fb602c12bd91"; + sha256 = "1gad00c0p56zvmk2yzy03m0f3fcq67q9kdgdfxph2aw905mkwddc"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/portpicker/default.nix b/pkgs/development/python-modules/portpicker/default.nix index e08fe05d822..30ac0015560 100644 --- a/pkgs/development/python-modules/portpicker/default.nix +++ b/pkgs/development/python-modules/portpicker/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "portpicker"; - version = "1.3.0"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "19c0f950x544ndsdkfhga58x69iiin2vqiz59pqn9mymk2vrlpkg"; + sha256 = "0rwn5ca7ns3yh6bp785zdd2l4018ccpd5i0m2d1fsd9nhxvcgkfj"; }; meta = { diff --git a/pkgs/development/python-modules/progressbar2/default.nix b/pkgs/development/python-modules/progressbar2/default.nix index 7a3d2264c28..a8afd97c434 100644 --- a/pkgs/development/python-modules/progressbar2/default.nix +++ b/pkgs/development/python-modules/progressbar2/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "progressbar2"; - version = "3.39.2"; + version = "3.39.3"; src = fetchPypi { inherit pname version; - sha256 = "6eb5135b987caca4212d2c7abc2923d4ad5ba18bb34ccbe7044b3628f52efc2c"; + sha256 = "0fgy4327xzn232br4as74r6ddg5v6ycmfwga7xybp4s1w0cm8nwf"; }; postPatch = '' diff --git a/pkgs/development/python-modules/pybcrypt/default.nix b/pkgs/development/python-modules/pybcrypt/default.nix deleted file mode 100644 index 3f9f3b69a78..00000000000 --- a/pkgs/development/python-modules/pybcrypt/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -}: - -buildPythonPackage rec { - pname = "pybcrypt"; - version = "0.4"; - - src = fetchPypi { - inherit pname version; - sha256 = "5fa13bce551468350d66c4883694850570f3da28d6866bb638ba44fe5eabda78"; - }; - - meta = with stdenv.lib; { - description = "bcrypt password hashing and key derivation"; - homepage = https://code.google.com/p/py-bcrypt2; - license = licenses.bsd0; - }; - -} diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index 624dca05e1e..e17ec16f436 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyopencl"; - version = "2018.2.3"; + version = "2018.2.5"; checkInputs = [ pytest ]; buildInputs = [ opencl-headers ocl-icd pybind11 ]; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "ebefe9505cad970dfb4c8024630ef5a546c68d22943dbb3e5677943a6d006ac6"; + sha256 = "1qgi6diw9m7yldmql9kh08792053ib6zkplh8v2mqv6waaflmrnn"; }; # py.test is not needed during runtime, so remove it from `install_requires` diff --git a/pkgs/development/python-modules/pytest-tornado/default.nix b/pkgs/development/python-modules/pytest-tornado/default.nix index ccb9ae782aa..53e1fce493d 100644 --- a/pkgs/development/python-modules/pytest-tornado/default.nix +++ b/pkgs/development/python-modules/pytest-tornado/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pytest-tornado"; - version = "0.5.0"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "214fc59d06fb81696fce3028b56dff522168ac1cfc784cfc0077b7b1e425b4cd"; + sha256 = "0ndwjsad901km7zw8xxj3igjff651hg1pjcmv5vqx458xhnmbfqw"; }; # package has no tests diff --git a/pkgs/development/python-modules/pyviz-comms/default.nix b/pkgs/development/python-modules/pyviz-comms/default.nix index 53f06cff922..5bd6722939b 100644 --- a/pkgs/development/python-modules/pyviz-comms/default.nix +++ b/pkgs/development/python-modules/pyviz-comms/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pyviz_comms"; - version = "0.7.0"; + version = "0.7.1"; src = fetchPypi { inherit pname version; - sha256 = "7ad4ff0c2166f0296ee070049ce21341f868f907003714eb6eaf1630ea8e241a"; + sha256 = "045bjs8na3q0fy8zzq4pghyz05d9aid1lcv11992f62z2jrf6m2q"; }; propagatedBuildInputs = [ param ]; diff --git a/pkgs/development/python-modules/qtpy/default.nix b/pkgs/development/python-modules/qtpy/default.nix index ecc531d82ce..d0bea83ad26 100644 --- a/pkgs/development/python-modules/qtpy/default.nix +++ b/pkgs/development/python-modules/qtpy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "QtPy"; - version = "1.6.0"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "fd5c09655e58bf3a013d2940e71f069732ed67f056d4dcb2b0609a3ecd9b320f"; + sha256 = "0gjg7farw6mkmrwqcg6ms7j74g8py2msvawddji4wy8yfvql1ifl"; }; # no concrete propagatedBuildInputs as multiple backends are supposed diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix index 6306267ba2a..f5a563545a1 100644 --- a/pkgs/development/python-modules/rasterio/default.nix +++ b/pkgs/development/python-modules/rasterio/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "rasterio"; - version = "1.0.18"; + version = "1.0.22"; # Pypi doesn't ship the tests, so we fetch directly from GitHub src = fetchFromGitHub { owner = "mapbox"; repo = "rasterio"; rev = version; - sha256 = "05miivbn2c5slc5nn7fpdn1da42qwzg4z046i71f4r70bc49vsj9"; + sha256 = "1gx48qjiahlwflmjlkndp3ricd03jmzfx7i9ffgq7a2i6gcm36zp"; }; checkInputs = [ boto3 pytest pytestcov packaging hypothesis ]; diff --git a/pkgs/development/python-modules/rjsmin/default.nix b/pkgs/development/python-modules/rjsmin/default.nix index 0ec53528df2..287ae0391df 100644 --- a/pkgs/development/python-modules/rjsmin/default.nix +++ b/pkgs/development/python-modules/rjsmin/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "rjsmin"; - version = "1.0.12"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "1wc62d0f80kw1kjv8nlxychh0iy66a6pydi4vfvhh2shffm935fx"; + sha256 = "0cmc72rlkvzz8fl89bc83czkx0pcvhzj7yn7m29r8pgnf5fcfpdi"; }; # The package does not ship tests, and the setup machinary confuses diff --git a/pkgs/development/python-modules/rope/default.nix b/pkgs/development/python-modules/rope/default.nix index b91709446b3..66340f91770 100644 --- a/pkgs/development/python-modules/rope/default.nix +++ b/pkgs/development/python-modules/rope/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "rope"; - version = "0.12.0"; + version = "0.14.0"; src = fetchPypi { inherit pname version; - sha256 = "031eb54b3eeec89f4304ede816995ed2b93a21e6fba16bd02aff10a0d6c257b7"; + sha256 = "1bwayj0hh459s3yh0sdrxksr9wfilgi3a49izfaj06kvgyladif5"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/scp/default.nix b/pkgs/development/python-modules/scp/default.nix index 623b94124d1..c57d10cf890 100644 --- a/pkgs/development/python-modules/scp/default.nix +++ b/pkgs/development/python-modules/scp/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "scp"; - version = "0.13.0"; + version = "0.13.2"; src = fetchPypi { inherit pname version; - sha256 = "09219c45hafq6pb8z6rsinsfhp3rsx5mr9cgz2099rcs4if2gk6g"; + sha256 = "1crlpw9lnn58fs1c1rmh7s7s9y5gkgpgjsqlvg9qa51kq1knx7gg"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/serverlessrepo/default.nix b/pkgs/development/python-modules/serverlessrepo/default.nix new file mode 100644 index 00000000000..d70abe1f95f --- /dev/null +++ b/pkgs/development/python-modules/serverlessrepo/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, boto3 +, six +, pyyaml +, mock +}: + +buildPythonPackage rec { + pname = "serverlessrepo"; + version = "0.1.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "533389d41a51450e50cc01405ab766550170149c08e1c85b3a1559b0fab4cb25"; + }; + + propagatedBuildInputs = [ + six + boto3 + pyyaml + ]; + + checkInputs = [ pytest mock ]; + + checkPhase = '' + pytest tests/unit + ''; + + meta = with lib; { + homepage = https://github.com/awslabs/aws-serverlessrepo-python; + description = "Helpers for working with the AWS Serverless Application Repository"; + longDescription = '' + A Python library with convenience helpers for working with the + AWS Serverless Application Repository. + ''; + license = lib.licenses.asl20; + maintainers = with maintainers; [ dhkl ]; + }; +} diff --git a/pkgs/development/python-modules/sparse/default.nix b/pkgs/development/python-modules/sparse/default.nix index d3d78620a3d..f08d8c47c82 100644 --- a/pkgs/development/python-modules/sparse/default.nix +++ b/pkgs/development/python-modules/sparse/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "sparse"; - version = "0.6.0"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "2ac6fcbf68b38b999eae98467cf4880b942c13a72036868f78d65a10aeba808d"; + sha256 = "0ija4pl8wg36ldsdv5jmqr5i75qi17vijcwwf2jdn1k15kqg35j4"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/unittest-xml-reporting/default.nix b/pkgs/development/python-modules/unittest-xml-reporting/default.nix index f5997b9091f..84803a55b33 100644 --- a/pkgs/development/python-modules/unittest-xml-reporting/default.nix +++ b/pkgs/development/python-modules/unittest-xml-reporting/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "unittest-xml-reporting"; - version = "2.2.1"; + version = "2.4.0"; propagatedBuildInputs = [six]; @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1cn870jgf4h0wb4bnafw527g1dj6rd3rgyjz4f64khd0zx9qs84z"; + sha256 = "1qnlz1k77rldgd5dfrj6nhlsjj71xzqy6s4091djpk0s2p8y1550"; }; meta = with lib; { homepage = https://github.com/xmlrunner/unittest-xml-reporting/tree/master/; diff --git a/pkgs/development/python-modules/user-agents/default.nix b/pkgs/development/python-modules/user-agents/default.nix index 07cbdc57ef9..a5dc414b260 100644 --- a/pkgs/development/python-modules/user-agents/default.nix +++ b/pkgs/development/python-modules/user-agents/default.nix @@ -2,20 +2,18 @@ buildPythonPackage rec { pname = "user-agents"; - version = "1.1.0"; + version = "2.0"; # PyPI is missing devices.json src = fetchFromGitHub { owner = "selwin"; repo = "python-user-agents"; rev = "v${version}"; - sha256 = "14kxd780zhp8718xr1z63xffaj3bvxgr4pldh9sv943m4hvi0gw5"; + sha256 = "0ix2yajqdnfj433j50dls90mkmqz8m4fiywxg097zwkkc95wm8s4"; }; propagatedBuildInputs = [ ua-parser ]; - doCheck = false; # some tests fail due to ua-parser bump to 0.8.0 - meta = with stdenv.lib; { description = "A Python library to identify devices by parsing user agent strings"; homepage = https://github.com/selwin/python-user-agents; diff --git a/pkgs/development/python-modules/vega/default.nix b/pkgs/development/python-modules/vega/default.nix index 9a589ccf1f8..25acc4f88bc 100644 --- a/pkgs/development/python-modules/vega/default.nix +++ b/pkgs/development/python-modules/vega/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "vega"; - version = "1.4.0"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "cf9701dac0111c09ea009ab06cbb81f27b1d9c23ebf58ebdf08b6994a37f13ac"; + sha256 = "097jlh1xarnqmcnym5jkfa6rg2f0i6b17v9pck2242axgyi692rm"; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index 997c4a2deeb..cf524329661 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "xarray"; - version = "0.11.3"; + version = "0.12.0"; src = fetchPypi { inherit pname version; - sha256 = "1pc4p7yxvmhn3x121wgslwclaqnjlx51wxs6ihb4cxynh2vcwgfc"; + sha256 = "1wspvvp8hh9ar7pl6w1qhmakajsjsg4cm11pmi4a422jqmid0vw5"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 7b7dab1481e..7dc0b7b88e9 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -23,7 +23,7 @@ , cmake, libssh2, openssl, mysql, darwin, git, perl, pcre, gecode_3, curl , msgpack, qt59, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem , cairo, re2, rake, gobject-introspection, gdk_pixbuf, zeromq, czmq, graphicsmagick, libcxx -, file, libvirt, glib, vips, taglib +, file, libvirt, glib, vips, taglib, libopus , libselinux ? null, libsepol ? null }@args: @@ -275,6 +275,15 @@ in ] ++ lib.optional stdenv.isDarwin "--with-iconv-dir=${libiconv}"; }; + opus-ruby = attrs: { + dontBuild = false; + postPatch = '' + substituteInPlace lib/opus-ruby.rb \ + --replace "ffi_lib 'opus'" \ + "ffi_lib '${libopus}/lib/libopus${stdenv.hostPlatform.extensions.sharedLibrary}'" + ''; + }; + ovirt-engine-sdk = attrs: { buildInputs = [ curl libxml2 ]; }; diff --git a/pkgs/development/ruby-modules/gem/default.nix b/pkgs/development/ruby-modules/gem/default.nix index c881d4eb474..7b92a586b54 100644 --- a/pkgs/development/ruby-modules/gem/default.nix +++ b/pkgs/development/ruby-modules/gem/default.nix @@ -179,7 +179,7 @@ stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // { '${version}' \ '${lib.escapeShellArgs buildFlags}' \ '${attrs.source.url}' \ - '${src}' \ + '.' \ '${attrs.source.rev}' ''} diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 604e44cf7b1..be81673f212 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "8.18"; + version = "8.19"; name = "checkstyle-${version}"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "1l9dqihl73yi3k27j2a1k87gqzs64z0mpwxj6w68ipvxf4rg63x5"; + sha256 = "107x4ij99igq54f0mdqvv8adl2rh694b8ylf3jz090raqa0d2nyk"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 9219698b2df..c80a14063a5 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -110,21 +110,21 @@ in { # # DO NOT EDIT! Automatically generated by ./update.py radare2 = generic { - version_commit = "21238"; - gittap = "3.3.0"; - gittip = "5a9127d2599c8ff61d8544be7d4c9384402e94a3"; - rev = "3.3.0"; - version = "3.3.0"; - sha256 = "11ap3icr8w0y49lq5dxch2h589qdmwf3qv9lsdyfsz4l0mjm49ri"; + version_commit = "21276"; + gittap = "3.4.1"; + gittip = "da30e593718d5149f2a3d520c7f79fe1c7ca46ef"; + rev = "3.4.1"; + version = "3.4.1"; + sha256 = "02qfj11j8f37hl46m8h4x9pv161glgdr7q3rfhwmq46px9y7f17p"; cs_ver = "4.0.1"; cs_sha256 = "0ijwxxk71nr9z91yxw20zfj4bbsbrgvixps5c7cpj163xlzlwba6"; }; r2-for-cutter = generic { - version_commit = "21238"; + version_commit = "21276"; gittap = "3.3.0"; gittip = "5a9127d2599c8ff61d8544be7d4c9384402e94a3"; rev = "5a9127d2599c8ff61d8544be7d4c9384402e94a3"; - version = "3.3.0"; + version = "2019-02-19"; sha256 = "11ap3icr8w0y49lq5dxch2h589qdmwf3qv9lsdyfsz4l0mjm49ri"; cs_ver = "4.0.1"; cs_sha256 = "0ijwxxk71nr9z91yxw20zfj4bbsbrgvixps5c7cpj163xlzlwba6"; diff --git a/pkgs/development/tools/apktool/default.nix b/pkgs/development/tools/apktool/default.nix index c811b8a99e9..d9d70f64d73 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.4"; + version = "2.4.0"; 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 = "07fwp5sczyivdz37ag9fa258gr9jbz3k3395hp5db7cwizaip2vm"; + sha256 = "1hdwgsw3ggmdzv523wq037kjxhxqp1xq8n8m1qb22vvdj7l1dwd0"; }; phases = [ "installPhase" ]; diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix index 8778084163e..a63395efda8 100644 --- a/pkgs/development/tools/aws-sam-cli/default.nix +++ b/pkgs/development/tools/aws-sam-cli/default.nix @@ -2,43 +2,79 @@ , python }: -with python.pkgs; +let + py = python.override { + packageOverrides = self: super: { + click = super.click.overridePythonAttrs (oldAttrs: rec { + version = "6.7"; + src = oldAttrs.src.override { + inherit version; + sha256 = "f15516df478d5a56180fbf80e68f206010e6d160fc39fa508b65e035fd75130b"; + }; + }); + + requests = super.requests.overridePythonAttrs (oldAttrs: rec { + version = "2.20.1"; + src = oldAttrs.src.override { + inherit version; + sha256 = "ea881206e59f41dbd0bd445437d792e43906703fff75ca8ff43ccdb11f33f263"; + }; + }); + + idna = super.idna.overridePythonAttrs (oldAttrs: rec { + version = "2.7"; + src = oldAttrs.src.override { + inherit version; + sha256 = "684a38a6f903c1d71d6d5fac066b58d7768af4de2b832e426ec79c30daa94a16"; + }; + }); + + six = super.six.overridePythonAttrs (oldAttrs: rec { + version = "1.11"; + src = oldAttrs.src.override { + inherit version; + sha256 = "70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9"; + }; + }); + }; + }; + +in + +with py.pkgs; buildPythonApplication rec { pname = "aws-sam-cli"; - version = "0.5.0"; + version = "0.14.2"; src = fetchPypi { inherit pname version; - sha256 = "2acf9517f467950adb4939746658091e60cf60ee80093ffd0d3d821cb8a1f9fc"; + sha256 = "b7f80838d57c1096a9a03ed703a91a8a5775a6ead33df8f31765ecf39b3a956f"; }; # Tests are not included in the PyPI package doCheck = false; propagatedBuildInputs = [ + aws-lambda-builders aws-sam-translator - boto3 + chevron click cookiecutter dateparser docker - enum34 flask - python-dateutil - pyyaml + idna + pathlib2 + requests + serverlessrepo six ]; - postPatch = '' - substituteInPlace ./requirements/base.txt \ - --replace 'aws-sam-translator==1.6.0' 'aws-sam-translator>=1.6.0'; - ''; - meta = with lib; { homepage = https://github.com/awslabs/aws-sam-cli; description = "CLI tool for local development and testing of Serverless applications"; license = licenses.asl20; - maintainers = with maintainers; [ andreabedini ]; + maintainers = with maintainers; [ andreabedini dhkl ]; }; } diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix index 6d64c82f90f..ad4cbeda0f8 100644 --- a/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/pkgs/development/tools/build-managers/rebar3/default.nix @@ -3,7 +3,7 @@ tree, hexRegistrySnapshot }: let - version = "3.9.0"; + version = "3.9.1"; bootstrapper = ./rebar3-nix-bootstrap; @@ -75,7 +75,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://github.com/rebar/rebar3/archive/${version}.tar.gz"; - sha256 = "14prx5bkyy9sisnp5rj2058xpylq80xygsj1hq8b7m0awvj3r9wy"; + sha256 = "1n6287av29ws3bvjxxmw8s2j8avwich4ccisnnrnypfbm1khlcxp"; }; inherit bootstrapper; diff --git a/pkgs/development/tools/database/cdb/default.nix b/pkgs/development/tools/database/cdb/default.nix index 8def71568e7..f0a4f6c34e2 100644 --- a/pkgs/development/tools/database/cdb/default.nix +++ b/pkgs/development/tools/database/cdb/default.nix @@ -52,6 +52,6 @@ in stdenv.mkDerivation { homepage = "https://cr.yp.to/cdb"; license = lib.licenses.publicDomain; maintainers = [ lib.maintainers.Profpatsch ]; - platforms = [ lib.platforms.unix ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 31867a87b77..e0d2d56e7fa 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -1,7 +1,7 @@ { stdenv, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv, libuuid, at-spi2-atk }: let - version = "4.1.3"; + version = "4.1.4"; name = "electron-${version}"; throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; @@ -19,19 +19,19 @@ let src = { i686-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-ia32.zip"; - sha256 = "0fjrzyd872frvlihjr5xssjqirrp0c0aa1s1z8kr5y6hw6d13m2y"; + sha256 = "0z1pr85mdw8c7vdsvznhixzmqmy3s6rrjaybym76c93hdvkr2ir9"; }; x86_64-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip"; - sha256 = "1qzfz8nm3p6qsx843jl4nlbnx6l0pa6fzz61bb8w2c1p88dwqddy"; + sha256 = "05lyq67paad4h4ng39h8bwkv84bmy6axbxh60fmvl6l1x55dsan6"; }; armv7l-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-armv7l.zip"; - sha256 = "0x5zw0937gm89rfh094kpabzcddw61ckijm8k0k5spir1nb2za9v"; + sha256 = "1ddc9b6h29qdqxnkc4vd6y5iah9i3f5i7v5zjb5b61rssz78wdbq"; }; aarch64-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-arm64.zip"; - sha256 = "1fz9przvm4jf97xbg3m7ipcnf2gv1zxhmby3bqps582nhc17fckd"; + sha256 = "0qha5klws8l2i0grmwjiz34srr66h93lpx1j0lsgz3pxjxhc33xs"; }; }.${stdenv.hostPlatform.system} or throwSystem; @@ -59,7 +59,7 @@ let src = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-darwin-x64.zip"; - sha256 = "0s2fiys8mglmz5qf9l1k19p7ipl0r6vd2222n0j8m83bcr1779rz"; + sha256 = "0zbgrwphd1xfkzqai8n7mi9vpzqflq4wwwnl4pdryrkyi3k4yxa6"; }; buildInputs = [ unzip ]; diff --git a/pkgs/development/tools/goa/default.nix b/pkgs/development/tools/goa/default.nix index 7469d506244..53d4bfaa483 100644 --- a/pkgs/development/tools/goa/default.nix +++ b/pkgs/development/tools/goa/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "goa-${version}"; - version = "1.4.0"; + version = "1.4.1"; goPackagePath = "github.com/goadesign/goa"; subPackages = [ "goagen" ]; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "goadesign"; repo = "goa"; rev = "v${version}"; - sha256 = "1qx3c7dyq5wqxidfrk3ywc55fk64najj63f2jmfisfq4ixgwxdw9"; + sha256 = "0qcd4ii6arlpsivfdhcwidvnd8zbxxvf574jyxyvm1aazl8sqxj7"; }; goDeps = ./deps.nix; diff --git a/pkgs/development/tools/goa/deps.nix b/pkgs/development/tools/goa/deps.nix index d9248925905..bfe862a4006 100644 --- a/pkgs/development/tools/goa/deps.nix +++ b/pkgs/development/tools/goa/deps.nix @@ -1,4 +1,4 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 [ { goPackagePath = "github.com/dimfeld/httppath"; @@ -9,6 +9,15 @@ sha256 = "1c1kic8g3r78g6h4xl8n2ac1waxsb9fqz40k20ypi08k24mv3ha9"; }; } + { + goPackagePath = "github.com/gofrs/uuid"; + fetch = { + type = "git"; + url = "https://github.com/gofrs/uuid"; + rev = "e684523faa0581e44663968f097d478c499d4276"; + sha256 = "1p2md0bmfnn7kaa866fnb8lfnmlzzb8wfhp4ym5915p8mv4whxgz"; + }; + } { goPackagePath = "github.com/manveru/faker"; fetch = { @@ -18,15 +27,6 @@ sha256 = "1cnrf4wdjhxd9fryhlp2krl9acz6dzwic89gshs49pg3aajlf4dy"; }; } - { - goPackagePath = "github.com/satori/go.uuid"; - fetch = { - type = "git"; - url = "https://github.com/satori/go.uuid"; - rev = "36e9d2ebbde5e3f13ab2e25625fd453271d6522e"; - sha256 = "0nc0ggn0a6bcwdrwinnx3z6889x65c20a2dwja0n8can3xblxs35"; - }; - } { goPackagePath = "github.com/spf13/cobra"; fetch = { @@ -59,8 +59,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/tools"; - rev = "f60d9635b16a5a57b06eaa119614ba4df421966a"; - sha256 = "1h587gvgwlpjdn8q3s8i1blfwfklqi0cpb0szj99w1mkgl0ads13"; + rev = "a754db16a40a9d94359b6600b825419c0ca6f986"; + sha256 = "0n0cwb2szcjbyncqhdia77spcjsbm05jcgpnh0i8rdr16ixwanyq"; }; } { @@ -68,9 +68,8 @@ fetch = { type = "git"; url = "https://gopkg.in/yaml.v2"; - rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183"; - sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; + rev = "51d6538a90f86fe93ac480b35f37b2be17fef232"; + sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; }; } ] - diff --git a/pkgs/development/tools/misc/doclifter/default.nix b/pkgs/development/tools/misc/doclifter/default.nix index 9b35d2960a4..9975f0f5465 100644 --- a/pkgs/development/tools/misc/doclifter/default.nix +++ b/pkgs/development/tools/misc/doclifter/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, python}: stdenv.mkDerivation { - name = "doclifter-2.18"; + name = "doclifter-2.19"; src = fetchurl { - url = http://www.catb.org/~esr/doclifter/doclifter-2.18.tar.gz; - sha256 = "0g39lbml7dclm2nb20j4ffzhq28226qiwxq1w37p7mpqijm7x3hw"; + url = http://www.catb.org/~esr/doclifter/doclifter-2.19.tar.gz; + sha256 = "1as6z7mdjrrkw2kism41q5ybvyzvwcmj9qzla2fz98v9f4jbj2s2"; }; buildInputs = [ python ]; diff --git a/pkgs/development/tools/misc/kibana/default.nix b/pkgs/development/tools/misc/kibana/default.nix index 9d5e94e7d76..b7e9dd0aaef 100644 --- a/pkgs/development/tools/misc/kibana/default.nix +++ b/pkgs/development/tools/misc/kibana/default.nix @@ -4,13 +4,14 @@ , makeWrapper , fetchzip , fetchurl -, nodejs +, nodejs-10_x , coreutils , which }: with stdenv.lib; let + nodejs = nodejs-10_x; inherit (builtins) elemAt; info = splitString "-" stdenv.hostPlatform.system; arch = elemAt info 0; @@ -18,26 +19,14 @@ let shas = if enableUnfree then { - "x86_64-linux" = "0lip4bj3jazv83gydw99dnp03cb0fd1p4z3lvpjbisgmqffbbg5v"; - "x86_64-darwin" = "0hjdnqagcwbjhpcfyr6w0zmy4sjnx4fyp79czb0vp7dig5arnwm3"; + "x86_64-linux" = "039ll00kvrp881cyybb04z90cw68j7p5cspgdxh0bky9lyi9qpwb"; + "x86_64-darwin" = "0qrakrihcjwn9dic77b0k9ja3zf6nbz534v76xid9gv20md5dds3"; } else { - "x86_64-linux" = "1jybn4q7pz61iijzl85d948szlacfcbldn2nhhsb6063xwvf30sa"; - "x86_64-darwin" = "1bl1h6hgp9l5cjq6pzj2x855wjaka8hbs0fn2c03lbzsc991dppr"; + "x86_64-linux" = "1v1fbmfkbnlx043z3yx02gaqqy63bj2ymvcby66n4qq0vlpahvwx"; + "x86_64-darwin" = "1y4q7a2b9arln94d6sj547qkv3258jlgcz9b342fh6khlbpfjb8c"; }; - # For the correct phantomjs version see: - # https://github.com/elastic/kibana/blob/master/x-pack/plugins/reporting/server/browsers/phantom/paths.js - phantomjs = rec { - name = "phantomjs-${version}-linux-x86_64"; - version = "2.1.1"; - src = fetchzip { - inherit name; - url = "https://github.com/Medium/phantomjs/releases/download/v${version}/${name}.tar.bz2"; - sha256 = "0g2dqjzr2daz6rkd6shj6rrlw55z4167vqh7bxadl8jl6jk7zbfv"; - }; - }; - in stdenv.mkDerivation rec { name = "kibana-${optionalString (!enableUnfree) "oss-"}${version}"; version = elk6Version; @@ -48,7 +37,7 @@ in stdenv.mkDerivation rec { }; patches = [ - # Kibana specifies it specifically needs nodejs 8.11.4 but nodejs in nixpkgs is at 8.12.0. + # Kibana specifies it specifically needs nodejs 10.15.2 but nodejs in nixpkgs is at 10.15.3. # The test succeeds with this newer version so lets just # disable the version check. ./disable-nodejs-version-check.patch @@ -63,13 +52,6 @@ in stdenv.mkDerivation rec { makeWrapper $out/libexec/kibana/bin/kibana $out/bin/kibana \ --prefix PATH : "${stdenv.lib.makeBinPath [ nodejs coreutils which ]}" sed -i 's@NODE=.*@NODE=${nodejs}/bin/node@' $out/libexec/kibana/bin/kibana - '' + - # phantomjs is needed in the unfree version. When phantomjs doesn't exist in - # $out/libexec/kibana/data kibana will try to download and unpack it during - # runtime which will fail because the nix store is read-only. So we make sure - # it already exist in the nix store. - optionalString enableUnfree '' - ln -s ${phantomjs.src} $out/libexec/kibana/data/${phantomjs.name} ''; meta = { diff --git a/pkgs/development/tools/misc/macdylibbundler/default.nix b/pkgs/development/tools/misc/macdylibbundler/default.nix new file mode 100644 index 00000000000..ebe62452440 --- /dev/null +++ b/pkgs/development/tools/misc/macdylibbundler/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "macdylibbundler-${version}"; + version = "20180825"; + + src = fetchFromGitHub { + owner = "auriamg"; + repo = "macdylibbundler"; + rev = "ce13cb585ead5237813b85e68fe530f085fc0a9e"; + sha256 = "149p3dcnap4hs3nhq5rfvr3m70rrb5hbr5xkj1h0gsfp0d7gvxnj"; + }; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + description = "Utility to ease bundling libraries into executables for OSX"; + longDescription = '' + dylibbundler is a small command-line programs that aims to make bundling + .dylibs as easy as possible. It automatically determines which dylibs are + needed by your program, copies these libraries inside the app bundle, and + fixes both them and the executable to be ready for distribution... all + this with a single command on the teminal! It will also work if your + program uses plug-ins that have dependencies too. + ''; + homepage = https://github.com/auriamg/macdylibbundler; + license = licenses.mit; + platforms = platforms.all; + maintainers = [ maintainers.nomeata ]; + + }; +} diff --git a/pkgs/development/tools/misc/pwndbg/default.nix b/pkgs/development/tools/misc/pwndbg/default.nix index e299a7b0eb8..8f27609abab 100644 --- a/pkgs/development/tools/misc/pwndbg/default.nix +++ b/pkgs/development/tools/misc/pwndbg/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { name = "pwndbg-${version}"; - version = "2018.07.29"; + version = "2019.01.25"; src = fetchFromGitHub { owner = "pwndbg"; repo = "pwndbg"; rev = version; - sha256 = "1illk1smknaaa0ck8mwvig15c8al5w7fdp42a748xvm8wvxqxdsc"; + sha256 = "0k7n6pcrj62ccag801yzf04a9mj9znghpkbnqwrzz0qn3rs42vgs"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/quilt/default.nix b/pkgs/development/tools/quilt/default.nix index 7986fb2b134..d5059aa6b93 100644 --- a/pkgs/development/tools/quilt/default.nix +++ b/pkgs/development/tools/quilt/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { - name = "quilt-0.65"; + name = "quilt-0.66"; src = fetchurl { url = "mirror://savannah/quilt/${name}.tar.gz"; - sha256 = "06b816m2gz9jfif7k9v2hrm7fz76zjg5pavf7hd3ifybwn4cgjzn"; + sha256 = "01vfvk4pqigahx82fhaaffg921ivd3k7rylz1yfvy4zbdyd32jri"; }; buildInputs = [ makeWrapper perl bash diffutils patch findutils diffstat ]; diff --git a/pkgs/development/tools/rhc/Gemfile b/pkgs/development/tools/rhc/Gemfile deleted file mode 100644 index a780461e254..00000000000 --- a/pkgs/development/tools/rhc/Gemfile +++ /dev/null @@ -1,4 +0,0 @@ -source 'https://rubygems.org' - -gem 'archive-tar-minitar', '>= 0.5.2.1', github: 'peterhoeg/archive-tar-minitar' -gem 'rhc' diff --git a/pkgs/development/tools/rhc/Gemfile.lock b/pkgs/development/tools/rhc/Gemfile.lock deleted file mode 100644 index 004c293b965..00000000000 --- a/pkgs/development/tools/rhc/Gemfile.lock +++ /dev/null @@ -1,40 +0,0 @@ -GIT - remote: git://github.com/peterhoeg/archive-tar-minitar.git - revision: dae32ca550a87dba32597115ae18805db4782ebe - specs: - archive-tar-minitar (0.5.2.1) - -GEM - remote: https://rubygems.org/ - specs: - commander (4.2.1) - highline (~> 1.6.11) - highline (1.6.21) - httpclient (2.6.0.1) - net-scp (1.2.1) - net-ssh (>= 2.6.5) - net-ssh (4.0.1) - net-ssh-gateway (2.0.0) - net-ssh (>= 4.0.0) - net-ssh-multi (1.2.1) - net-ssh (>= 2.6.5) - net-ssh-gateway (>= 1.2.0) - open4 (1.3.4) - rhc (1.38.7) - archive-tar-minitar - commander (>= 4.0, < 4.3.0) - highline (~> 1.6.11) - httpclient (>= 2.4.0, < 2.7.0) - net-scp (>= 1.1.2) - net-ssh-multi (>= 1.2.0) - open4 - -PLATFORMS - ruby - -DEPENDENCIES - archive-tar-minitar (>= 0.5.2.1)! - rhc - -BUNDLED WITH - 1.13.6 diff --git a/pkgs/development/tools/rhc/default.nix b/pkgs/development/tools/rhc/default.nix deleted file mode 100644 index 46665e8b47e..00000000000 --- a/pkgs/development/tools/rhc/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, bundlerEnv, ruby, stdenv, makeWrapper }: - -stdenv.mkDerivation rec { - name = "rhc-1.38.7"; - - env = bundlerEnv { - name = "rhc-1.38.7-gems"; - - inherit ruby; - - gemdir = ./.; - }; - - buildInputs = [ makeWrapper ]; - - phases = [ "installPhase" ]; - - installPhase = '' - mkdir -p $out/bin - makeWrapper ${env}/bin/rhc $out/bin/rhc - ''; - - meta = with lib; { - broken = true; # requires ruby 2.2 - homepage = https://github.com/openshift/rhc; - description = "OpenShift client tools"; - license = licenses.asl20; - maintainers = [ maintainers.szczyp ]; - }; -} diff --git a/pkgs/development/tools/rhc/gemset.nix b/pkgs/development/tools/rhc/gemset.nix deleted file mode 100644 index 933a7dc95af..00000000000 --- a/pkgs/development/tools/rhc/gemset.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ - archive-tar-minitar = { - source = { - fetchSubmodules = false; - rev = "dae32ca550a87dba32597115ae18805db4782ebe"; - sha256 = "0fvxacbcb52fm5dis451kdd7dv74z8p6nm4vnfqf7jg2aghcxdkd"; - type = "git"; - url = "git://github.com/peterhoeg/archive-tar-minitar.git"; - }; - version = "0.5.2.1"; - }; - commander = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1zwfhswnbhwv0zzj2b3s0qvpqijbbnmh7zvq6v0274rqbxyf1jwc"; - type = "gem"; - }; - version = "4.2.1"; - }; - highline = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "06bml1fjsnrhd956wqq5k3w8cyd09rv1vixdpa3zzkl6xs72jdn1"; - type = "gem"; - }; - version = "1.6.21"; - }; - httpclient = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0haz4s9xnzr73mkfpgabspj43bhfm9znmpmgdk74n6gih1xlrx1l"; - type = "gem"; - }; - version = "2.6.0.1"; - }; - net-scp = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0b0jqrcsp4bbi4n4mzyf70cp2ysyp6x07j8k8cqgxnvb4i3a134j"; - type = "gem"; - }; - version = "1.2.1"; - }; - net-ssh = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "02xj3pcpqr32nlak0vsx71gd5z65jl3q1hwi2x157vabw1kgjanq"; - type = "gem"; - }; - version = "4.0.1"; - }; - net-ssh-gateway = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1l3v761y32aw0n8lm0c0m42lr4ay8cq6q4sc5yc68b9fwlfvb70x"; - type = "gem"; - }; - version = "2.0.0"; - }; - net-ssh-multi = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "13kxz9b6kgr9mcds44zpavbndxyi6pvyzyda6bhk1kfmb5c10m71"; - type = "gem"; - }; - version = "1.2.1"; - }; - open4 = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1cgls3f9dlrpil846q0w7h66vsc33jqn84nql4gcqkk221rh7px1"; - type = "gem"; - }; - version = "1.3.4"; - }; - rhc = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1yaq42szq81ph44q7ckzml9yrhz1pkjfik77rxvfzlf90l1g2ibk"; - type = "gem"; - }; - version = "1.38.7"; - }; -} \ No newline at end of file diff --git a/pkgs/development/web/nodejs/v6.nix b/pkgs/development/web/nodejs/v6.nix deleted file mode 100644 index 154f2b8d609..00000000000 --- a/pkgs/development/web/nodejs/v6.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ stdenv, callPackage, lib, enableNpm ? true }: - -let - buildNodejs = callPackage ./nodejs.nix {}; -in - buildNodejs { - inherit enableNpm; - version = "6.17.0"; - sha256 = "0j17cpl1mbqvbaa0bk9n3nd34jdyljbvm53gx8n64bhwly7cgnn1"; - } diff --git a/pkgs/development/web/remarkjs/generate.sh b/pkgs/development/web/remarkjs/generate.sh index 040aaf97716..59542101812 100644 --- a/pkgs/development/web/remarkjs/generate.sh +++ b/pkgs/development/web/remarkjs/generate.sh @@ -1,3 +1,3 @@ #!/bin/sh -e -node2nix -6 -i pkgs.json -c nodepkgs.nix -e ../../node-packages/node-env.nix +node2nix -8 -i pkgs.json -c nodepkgs.nix -e ../../node-packages/node-env.nix diff --git a/pkgs/development/web/remarkjs/node-packages.nix b/pkgs/development/web/remarkjs/node-packages.nix index 3322c58b40d..a650747eb06 100644 --- a/pkgs/development/web/remarkjs/node-packages.nix +++ b/pkgs/development/web/remarkjs/node-packages.nix @@ -4,22 +4,49 @@ let sources = { - "@sinonjs/formatio-2.0.0" = { - name = "_at_sinonjs_slash_formatio"; - packageName = "@sinonjs/formatio"; - version = "2.0.0"; + "@sinonjs/commons-1.4.0" = { + name = "_at_sinonjs_slash_commons"; + packageName = "@sinonjs/commons"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-2.0.0.tgz"; - sha512 = "ls6CAMA6/5gG+O/IdsBcblvnd8qcO/l1TYoNeAzp3wcISOxlPXQEus0mLcdwazEkWjaBdaJ3TaxmNgCLWwvWzg=="; + url = "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.4.0.tgz"; + sha512 = "9jHK3YF/8HtJ9wCAbG+j8cD0i0+ATS9A7gXFqS36TblLPNy6rEEc+SB0imo91eCboGaBYGV/MT1/br/J+EE7Tw=="; }; }; - "JSONStream-1.3.3" = { + "@sinonjs/formatio-3.2.1" = { + name = "_at_sinonjs_slash_formatio"; + packageName = "@sinonjs/formatio"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-3.2.1.tgz"; + sha512 = "tsHvOB24rvyvV2+zKMmPkZ7dXX6LSLKZ7aOtXY6Edklp0uRcgGpOsQTTGTcWViFyx4uhWc6GV8QdnALbIbIdeQ=="; + }; + }; + "@sinonjs/samsam-3.3.1" = { + name = "_at_sinonjs_slash_samsam"; + packageName = "@sinonjs/samsam"; + version = "3.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-3.3.1.tgz"; + sha512 = "wRSfmyd81swH0hA1bxJZJ57xr22kC07a1N4zuIL47yTS04bDk6AoCkczcqHEjcRPmJ+FruGJ9WBQiJwMtIElFw=="; + }; + }; + "@sinonjs/text-encoding-0.7.1" = { + name = "_at_sinonjs_slash_text-encoding"; + packageName = "@sinonjs/text-encoding"; + version = "0.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz"; + sha512 = "+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ=="; + }; + }; + "JSONStream-1.3.5" = { name = "JSONStream"; packageName = "JSONStream"; - version = "1.3.3"; + version = "1.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.3.tgz"; - sha512 = "3Sp6WZZ/lXl+nTDoGpGWHEpTnnC6X5fnkolYZR6nwIfzbxxvA8utPWe1gCt7i0m9uVGsSz2IS8K8mJ7HmlduMg=="; + url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz"; + sha512 = "E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ=="; }; }; "abbrev-1.1.1" = { @@ -31,31 +58,40 @@ let sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; }; }; - "acorn-5.7.1" = { + "acorn-6.1.1" = { name = "acorn"; packageName = "acorn"; - version = "5.7.1"; + version = "6.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-5.7.1.tgz"; - sha512 = "d+nbxBUGKg7Arpsvbnlq61mc12ek3EY8EQldM3GPAhWJ1UVxC6TDGbIvUMNU6obBX3i1+ptCIzV4vq0gFPEGVQ=="; + url = "https://registry.npmjs.org/acorn/-/acorn-6.1.1.tgz"; + sha512 = "jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA=="; }; }; - "acorn-dynamic-import-3.0.0" = { + "acorn-dynamic-import-4.0.0" = { name = "acorn-dynamic-import"; packageName = "acorn-dynamic-import"; - version = "3.0.0"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz"; - sha512 = "zVWV8Z8lislJoOKKqdNMOB+s6+XV5WERty8MnKBeFgwA+19XJjJHs2RP5dzM57FftIs+jQnRToLiWazKr6sSWg=="; + url = "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz"; + sha512 = "d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw=="; }; }; - "acorn-node-1.5.2" = { + "acorn-node-1.6.2" = { name = "acorn-node"; packageName = "acorn-node"; - version = "1.5.2"; + version = "1.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/acorn-node/-/acorn-node-1.5.2.tgz"; - sha512 = "krFKvw/d1F17AN3XZbybIUzEY4YEPNiGo05AfP3dBlfVKrMHETKpgjpuZkSF8qDNt9UkQcqj7am8yJLseklCMg=="; + url = "https://registry.npmjs.org/acorn-node/-/acorn-node-1.6.2.tgz"; + sha512 = "rIhNEZuNI8ibQcL7ANm/mGyPukIaZsRNX9psFNQURyJW0nu6k8wjSDld20z6v2mDBWqX13pIEnk9gGZJHIlEXg=="; + }; + }; + "acorn-walk-6.1.1" = { + name = "acorn-walk"; + packageName = "acorn-walk"; + version = "6.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.1.1.tgz"; + sha512 = "OtUw6JUTgxA2QoqqmrmQ7F2NYqiBPi/L2jqHyFtllhOUvXYQXf0Z1CYUinIfyT4bTCGmrA7gX9FvHA81uzCoVw=="; }; }; "adm-zip-0.2.1" = { @@ -67,13 +103,85 @@ let sha1 = "e801cedeb5bd9a4e98d699c5c0f4239e2731dcbf"; }; }; - "ajv-5.5.2" = { + "ajv-6.10.0" = { name = "ajv"; packageName = "ajv"; - version = "5.5.2"; + version = "6.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz"; - sha1 = "73b5eeca3fab653e3d3f9422b341ad42205dc965"; + url = "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz"; + sha512 = "nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg=="; + }; + }; + "ansi-colors-3.2.3" = { + name = "ansi-colors"; + packageName = "ansi-colors"; + version = "3.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz"; + sha512 = "LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw=="; + }; + }; + "ansi-regex-2.1.1" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"; + sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; + }; + }; + "ansi-regex-3.0.0" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz"; + sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; + }; + }; + "ansi-styles-3.2.1" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz"; + sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; + }; + }; + "argparse-1.0.10" = { + name = "argparse"; + packageName = "argparse"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz"; + sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg=="; + }; + }; + "arr-diff-4.0.0" = { + name = "arr-diff"; + packageName = "arr-diff"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz"; + sha1 = "d6461074febfec71e7e15235761a329a5dc7c520"; + }; + }; + "arr-flatten-1.1.0" = { + name = "arr-flatten"; + packageName = "arr-flatten"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz"; + sha512 = "L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg=="; + }; + }; + "arr-union-3.1.0" = { + name = "arr-union"; + packageName = "arr-union"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz"; + sha1 = "e39b09aea9def866a8f206e288af63919bae39c4"; }; }; "array-filter-0.0.1" = { @@ -85,6 +193,15 @@ let sha1 = "7da8cf2e26628ed732803581fd21f67cacd2eeec"; }; }; + "array-from-2.1.1" = { + name = "array-from"; + packageName = "array-from"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/array-from/-/array-from-2.1.1.tgz"; + sha1 = "cfe9d8c26628b9dc5aecc62a9f5d8f1f352c1195"; + }; + }; "array-map-0.0.0" = { name = "array-map"; packageName = "array-map"; @@ -103,6 +220,15 @@ let sha1 = "173899d3ffd1c7d9383e4479525dbe278cab5f2b"; }; }; + "array-unique-0.3.2" = { + name = "array-unique"; + packageName = "array-unique"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz"; + sha1 = "a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"; + }; + }; "asap-2.0.6" = { name = "asap"; packageName = "asap"; @@ -121,13 +247,13 @@ let sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7"; }; }; - "asn1-0.2.3" = { + "asn1-0.2.4" = { name = "asn1"; packageName = "asn1"; - version = "0.2.3"; + version = "0.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"; - sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86"; + url = "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz"; + sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg=="; }; }; "asn1.js-4.10.1" = { @@ -166,6 +292,15 @@ let sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; }; }; + "assign-symbols-1.0.0" = { + name = "assign-symbols"; + packageName = "assign-symbols"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz"; + sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"; + }; + }; "async-0.9.2" = { name = "async"; packageName = "async"; @@ -184,6 +319,15 @@ let sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; }; }; + "atob-2.1.2" = { + name = "atob"; + packageName = "atob"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz"; + sha512 = "Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="; + }; + }; "aws-sign2-0.5.0" = { name = "aws-sign2"; packageName = "aws-sign2"; @@ -202,13 +346,13 @@ let sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; }; }; - "aws4-1.7.0" = { + "aws4-1.8.0" = { name = "aws4"; packageName = "aws4"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz"; - sha512 = "32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w=="; + url = "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz"; + sha512 = "ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="; }; }; "balanced-match-1.0.0" = { @@ -220,6 +364,15 @@ let sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; }; }; + "base-0.11.2" = { + name = "base"; + packageName = "base"; + version = "0.11.2"; + src = fetchurl { + url = "https://registry.npmjs.org/base/-/base-0.11.2.tgz"; + sha512 = "5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg=="; + }; + }; "base64-js-1.3.0" = { name = "base64-js"; packageName = "base64-js"; @@ -229,13 +382,13 @@ let sha512 = "ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw=="; }; }; - "bcrypt-pbkdf-1.0.1" = { + "bcrypt-pbkdf-1.0.2" = { name = "bcrypt-pbkdf"; packageName = "bcrypt-pbkdf"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz"; - sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d"; + url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"; + sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; }; }; "bn.js-4.11.8" = { @@ -265,6 +418,15 @@ let sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; }; }; + "braces-2.3.2" = { + name = "braces"; + packageName = "braces"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz"; + sha512 = "aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w=="; + }; + }; "brorand-1.1.0" = { name = "brorand"; packageName = "brorand"; @@ -319,13 +481,13 @@ let sha512 = "sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w=="; }; }; - "browserify-des-1.0.1" = { + "browserify-des-1.0.2" = { name = "browserify-des"; packageName = "browserify-des"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.1.tgz"; - sha512 = "zy0Cobe3hhgpiOM32Tj7KQ3Vl91m0njwsjzZQK1L+JDf11dzP9qIvjreVinsvXrgfjhStXwUWAEpB9D7Gwmayw=="; + url = "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz"; + sha512 = "BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A=="; }; }; "browserify-rsa-4.0.1" = { @@ -355,22 +517,22 @@ let sha512 = "Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA=="; }; }; - "buffer-5.1.0" = { + "buffer-5.2.1" = { name = "buffer"; packageName = "buffer"; - version = "5.1.0"; + version = "5.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/buffer/-/buffer-5.1.0.tgz"; - sha512 = "YkIRgwsZwJWTnyQrsBTWefizHh+8GYj3kbL1BTiAQ/9pwpino0G7B2gp5tx/FUBqUlvtxV85KNR3mwfAtv15Yw=="; + url = "https://registry.npmjs.org/buffer/-/buffer-5.2.1.tgz"; + sha512 = "c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg=="; }; }; - "buffer-from-1.1.0" = { + "buffer-from-1.1.1" = { name = "buffer-from"; packageName = "buffer-from"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.0.tgz"; - sha512 = "c5mRlguI/Pe2dSZmpER62rSCu0ryKmWddzRYsuXc50U2/g8jMOulc31VZMa4mYx31U5xsmSOpDCgH88Vl9cDGQ=="; + url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz"; + sha512 = "MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="; }; }; "buffer-xor-1.0.3" = { @@ -391,13 +553,31 @@ let sha1 = "85982878e21b98e1c66425e03d0174788f569ee8"; }; }; - "cached-path-relative-1.0.1" = { - name = "cached-path-relative"; - packageName = "cached-path-relative"; + "cache-base-1.0.1" = { + name = "cache-base"; + packageName = "cache-base"; version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.0.1.tgz"; - sha1 = "d09c4b52800aa4c078e2dd81a869aac90d2e54e7"; + url = "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz"; + sha512 = "AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ=="; + }; + }; + "cached-path-relative-1.0.2" = { + name = "cached-path-relative"; + packageName = "cached-path-relative"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.0.2.tgz"; + sha512 = "5r2GqsoEb4qMTTN9J+WzXfjov+hjxT+j3u5K+kIVNIwAd99DLCJE9pBIMP1qVeybV6JiijL385Oz0DcYxfbOIg=="; + }; + }; + "camelcase-5.3.1" = { + name = "camelcase"; + packageName = "camelcase"; + version = "5.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz"; + sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="; }; }; "caseless-0.12.0" = { @@ -409,6 +589,15 @@ let sha1 = "1b681c21ff84033c826543090689420d187151dc"; }; }; + "chalk-2.4.2" = { + name = "chalk"; + packageName = "chalk"; + version = "2.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"; + sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; + }; + }; "cipher-base-1.0.4" = { name = "cipher-base"; packageName = "cipher-base"; @@ -418,6 +607,15 @@ let sha512 = "Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q=="; }; }; + "class-utils-0.3.6" = { + name = "class-utils"; + packageName = "class-utils"; + version = "0.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz"; + sha512 = "qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg=="; + }; + }; "cli-1.0.1" = { name = "cli"; packageName = "cli"; @@ -427,13 +625,58 @@ let sha1 = "22817534f24bfa4950c34d532d48ecbc621b8c14"; }; }; - "co-4.6.0" = { - name = "co"; - packageName = "co"; - version = "4.6.0"; + "cliui-4.1.0" = { + name = "cliui"; + packageName = "cliui"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/co/-/co-4.6.0.tgz"; - sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"; + url = "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz"; + sha512 = "4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ=="; + }; + }; + "clone-2.1.2" = { + name = "clone"; + packageName = "clone"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz"; + sha1 = "1b7f4b9f591f1e8f83670401600345a02887435f"; + }; + }; + "code-point-at-1.1.0" = { + name = "code-point-at"; + packageName = "code-point-at"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz"; + sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; + }; + }; + "collection-visit-1.0.0" = { + name = "collection-visit"; + packageName = "collection-visit"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz"; + sha1 = "4bc0373c164bc3291b4d368c829cf1a80a59dca0"; + }; + }; + "color-convert-1.9.3" = { + name = "color-convert"; + packageName = "color-convert"; + version = "1.9.3"; + src = fetchurl { + url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz"; + sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="; + }; + }; + "color-name-1.1.3" = { + name = "color-name"; + packageName = "color-name"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"; + sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; }; }; "combine-source-map-0.8.0" = { @@ -454,22 +697,40 @@ let sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f"; }; }; - "combined-stream-1.0.6" = { + "combined-stream-1.0.7" = { name = "combined-stream"; packageName = "combined-stream"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz"; - sha1 = "723e7df6e801ac5613113a7e445a9b69cb632818"; + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz"; + sha512 = "brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w=="; }; }; - "commander-2.15.1" = { + "commander-2.19.0" = { name = "commander"; packageName = "commander"; - version = "2.15.1"; + version = "2.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz"; - sha512 = "VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag=="; + url = "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz"; + sha512 = "6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg=="; + }; + }; + "commander-2.20.0" = { + name = "commander"; + packageName = "commander"; + version = "2.20.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz"; + sha512 = "7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ=="; + }; + }; + "component-emitter-1.2.1" = { + name = "component-emitter"; + packageName = "component-emitter"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz"; + sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6"; }; }; "concat-map-0.0.1" = { @@ -490,13 +751,13 @@ let sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw=="; }; }; - "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=="; }; }; "console-browserify-1.1.0" = { @@ -526,6 +787,15 @@ let sha1 = "4829c877e9fe49b3161f3bf3673888e204699860"; }; }; + "copy-descriptor-0.1.1" = { + name = "copy-descriptor"; + packageName = "copy-descriptor"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz"; + sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d"; + }; + }; "core-util-is-1.0.2" = { name = "core-util-is"; packageName = "core-util-is"; @@ -562,6 +832,15 @@ let sha512 = "MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg=="; }; }; + "cross-spawn-6.0.5" = { + name = "cross-spawn"; + packageName = "cross-spawn"; + version = "6.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz"; + sha512 = "eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ=="; + }; + }; "cryptiles-0.2.2" = { name = "cryptiles"; packageName = "cryptiles"; @@ -589,6 +868,15 @@ let sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f"; }; }; + "dash-ast-1.0.0" = { + name = "dash-ast"; + packageName = "dash-ast"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dash-ast/-/dash-ast-1.0.0.tgz"; + sha512 = "Vy4dx7gquTeMcQR/hDkYLGUnwVil6vk4FOOct+djUnHOUWt+zJPJAaRIXaAFkPXtJjvlY7o3rfRu0/3hpnwoUA=="; + }; + }; "dashdash-1.14.1" = { name = "dashdash"; packageName = "dashdash"; @@ -607,13 +895,76 @@ let sha1 = "eaf439fd4d4848ad74e5cc7dbef200672b9e345b"; }; }; - "debug-3.1.0" = { + "debug-2.6.9" = { name = "debug"; packageName = "debug"; - version = "3.1.0"; + version = "2.6.9"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz"; - sha512 = "OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g=="; + url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"; + sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; + }; + }; + "debug-3.2.6" = { + name = "debug"; + packageName = "debug"; + version = "3.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz"; + sha512 = "mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ=="; + }; + }; + "decamelize-1.2.0" = { + name = "decamelize"; + packageName = "decamelize"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; + sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; + }; + }; + "decode-uri-component-0.2.0" = { + name = "decode-uri-component"; + packageName = "decode-uri-component"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz"; + sha1 = "eb3913333458775cb84cd1a1fae062106bb87545"; + }; + }; + "define-properties-1.1.3" = { + name = "define-properties"; + packageName = "define-properties"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz"; + sha512 = "3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ=="; + }; + }; + "define-property-0.2.5" = { + name = "define-property"; + packageName = "define-property"; + version = "0.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz"; + sha1 = "c35b1ef918ec3c990f9a5bc57be04aacec5c8116"; + }; + }; + "define-property-1.0.0" = { + name = "define-property"; + packageName = "define-property"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz"; + sha1 = "769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"; + }; + }; + "define-property-2.0.2" = { + name = "define-property"; + packageName = "define-property"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz"; + sha512 = "jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ=="; }; }; "defined-1.0.0" = { @@ -661,13 +1012,22 @@ let sha1 = "c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"; }; }; - "detective-5.1.0" = { + "detect-file-1.0.0" = { + name = "detect-file"; + packageName = "detect-file"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz"; + sha1 = "f0d66d03672a825cb1b73bdb3fe62310c8e552b7"; + }; + }; + "detective-5.2.0" = { name = "detective"; packageName = "detective"; - version = "5.1.0"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/detective/-/detective-5.1.0.tgz"; - sha512 = "TFHMqfOvxlgrfVzTEkNBSh9SvSNX/HfF4OFI2QFGCyPm02EsyILqnUeb5P6q7JZ3SFNTBL5t2sePRgrN4epUWQ=="; + url = "https://registry.npmjs.org/detective/-/detective-5.2.0.tgz"; + sha512 = "6SsIx+nUUbuK0EthKjv0zrdnajCCXVYGmbYYiYjFVpzcjwEs/JMDZ8tPRG29J/HhN56t3GJp2cGSWDRjjot8Pg=="; }; }; "diff-3.5.0" = { @@ -688,13 +1048,13 @@ let sha512 = "kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg=="; }; }; - "dom-serializer-0.1.0" = { + "dom-serializer-0.1.1" = { name = "dom-serializer"; packageName = "dom-serializer"; - version = "0.1.0"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz"; - sha1 = "073c697546ce0780ce23be4a28e293e40bc30c82"; + url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz"; + sha512 = "l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA=="; }; }; "domain-browser-1.2.0" = { @@ -706,22 +1066,13 @@ let sha512 = "jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA=="; }; }; - "domelementtype-1.1.3" = { + "domelementtype-1.3.1" = { name = "domelementtype"; packageName = "domelementtype"; - version = "1.1.3"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz"; - sha1 = "bd28773e2642881aec51544924299c5cd822185b"; - }; - }; - "domelementtype-1.3.0" = { - name = "domelementtype"; - packageName = "domelementtype"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz"; - sha1 = "b17aed82e8ab59e52dd9c19b1756e0fc187204c2"; + url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz"; + sha512 = "BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="; }; }; "domhandler-2.3.0" = { @@ -751,22 +1102,31 @@ let sha1 = "8b12dab878c0d69e3e7891051662a32fc6bddcc1"; }; }; - "ecc-jsbn-0.1.1" = { + "ecc-jsbn-0.1.2" = { name = "ecc-jsbn"; packageName = "ecc-jsbn"; - version = "0.1.1"; + version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"; - sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505"; + url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"; + sha1 = "3a83a904e54353287874c564b7549386849a98c9"; }; }; - "elliptic-6.4.0" = { + "elliptic-6.4.1" = { name = "elliptic"; packageName = "elliptic"; - version = "6.4.0"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz"; - sha1 = "cac9af8762c85836187003c8dfe193e5e2eae5df"; + url = "https://registry.npmjs.org/elliptic/-/elliptic-6.4.1.tgz"; + sha512 = "BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ=="; + }; + }; + "end-of-stream-1.4.1" = { + name = "end-of-stream"; + packageName = "end-of-stream"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz"; + sha512 = "1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q=="; }; }; "entities-1.0.0" = { @@ -778,13 +1138,13 @@ let sha1 = "b2987aa3821347fcde642b24fdfc9e4fb712bf26"; }; }; - "entities-1.1.1" = { + "entities-1.1.2" = { name = "entities"; packageName = "entities"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz"; - sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"; + url = "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz"; + sha512 = "f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="; }; }; "errno-0.1.7" = { @@ -796,6 +1156,24 @@ let sha512 = "MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg=="; }; }; + "es-abstract-1.13.0" = { + name = "es-abstract"; + packageName = "es-abstract"; + version = "1.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz"; + sha512 = "vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg=="; + }; + }; + "es-to-primitive-1.2.0" = { + name = "es-to-primitive"; + packageName = "es-to-primitive"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz"; + sha512 = "qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg=="; + }; + }; "escape-string-regexp-1.0.5" = { name = "escape-string-regexp"; packageName = "escape-string-regexp"; @@ -805,6 +1183,15 @@ let sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; }; }; + "esprima-4.0.1" = { + name = "esprima"; + packageName = "esprima"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz"; + sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; + }; + }; "events-2.1.0" = { name = "events"; packageName = "events"; @@ -823,6 +1210,15 @@ let sha512 = "/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA=="; }; }; + "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=="; + }; + }; "exit-0.1.2" = { name = "exit"; packageName = "exit"; @@ -832,13 +1228,58 @@ let sha1 = "0632638f8d877cc82107d30a0fff1a17cba1cd0c"; }; }; - "extend-3.0.1" = { + "expand-brackets-2.1.4" = { + name = "expand-brackets"; + packageName = "expand-brackets"; + version = "2.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz"; + sha1 = "b77735e315ce30f6b6eff0f83b04151a22449622"; + }; + }; + "expand-tilde-2.0.2" = { + name = "expand-tilde"; + packageName = "expand-tilde"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz"; + sha1 = "97e801aa052df02454de46b02bf621642cdc8502"; + }; + }; + "extend-3.0.2" = { name = "extend"; packageName = "extend"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz"; - sha1 = "a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"; + url = "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz"; + sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="; + }; + }; + "extend-shallow-2.0.1" = { + name = "extend-shallow"; + packageName = "extend-shallow"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz"; + sha1 = "51af7d614ad9a9f610ea1bafbb989d6b1c56890f"; + }; + }; + "extend-shallow-3.0.2" = { + name = "extend-shallow"; + packageName = "extend-shallow"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz"; + sha1 = "26a71aaf073b39fb2127172746131c2704028db8"; + }; + }; + "extglob-2.0.4" = { + name = "extglob"; + packageName = "extglob"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz"; + sha512 = "Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw=="; }; }; "extsprintf-1.3.0" = { @@ -850,13 +1291,13 @@ let sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; }; }; - "fast-deep-equal-1.1.0" = { + "fast-deep-equal-2.0.1" = { name = "fast-deep-equal"; packageName = "fast-deep-equal"; - version = "1.1.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz"; - sha1 = "c053477817c86b51daa853c81e059b733d023614"; + url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz"; + sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"; }; }; "fast-json-stable-stringify-2.0.0" = { @@ -868,6 +1309,51 @@ let sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2"; }; }; + "fill-range-4.0.0" = { + name = "fill-range"; + packageName = "fill-range"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz"; + sha1 = "d544811d428f98eb06a63dc402d2403c328c38f7"; + }; + }; + "find-up-3.0.0" = { + name = "find-up"; + packageName = "find-up"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz"; + sha512 = "1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg=="; + }; + }; + "findup-sync-2.0.0" = { + name = "findup-sync"; + packageName = "findup-sync"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz"; + sha1 = "9326b1488c22d1a6088650a86901b2d9a90a2cbc"; + }; + }; + "flat-4.1.0" = { + name = "flat"; + packageName = "flat"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/flat/-/flat-4.1.0.tgz"; + sha512 = "Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw=="; + }; + }; + "for-in-1.0.2" = { + name = "for-in"; + packageName = "for-in"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz"; + sha1 = "81068d295a8142ec0ac726c6e2200c30fb6d5e80"; + }; + }; "forever-agent-0.5.2" = { name = "forever-agent"; packageName = "forever-agent"; @@ -895,13 +1381,22 @@ let sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12"; }; }; - "form-data-2.3.2" = { + "form-data-2.3.3" = { name = "form-data"; packageName = "form-data"; - version = "2.3.2"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz"; - sha1 = "4970498be604c20c005d4f5c23aecd21d6b49099"; + url = "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz"; + sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ=="; + }; + }; + "fragment-cache-0.2.1" = { + name = "fragment-cache"; + packageName = "fragment-cache"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz"; + sha1 = "4290fad27f13e89be7f33799c6bc5a0abfff0d19"; }; }; "fs.realpath-1.0.0" = { @@ -931,6 +1426,33 @@ let sha512 = "mBBwmeGTrxEMO4pMaaf/uUEFHnYtwr8FTe8Y/mer4rcV/bye0qGm6pw1bGZFGStxC5O76c5ZAVBGnqHmOaJpdQ=="; }; }; + "get-caller-file-1.0.3" = { + name = "get-caller-file"; + packageName = "get-caller-file"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz"; + sha512 = "3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="; + }; + }; + "get-stream-4.1.0" = { + name = "get-stream"; + packageName = "get-stream"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz"; + sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w=="; + }; + }; + "get-value-2.0.6" = { + name = "get-value"; + packageName = "get-value"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz"; + sha1 = "dc15ca1c672387ca76bd37ac0a395ba2042a2c28"; + }; + }; "getpass-0.1.7" = { name = "getpass"; packageName = "getpass"; @@ -940,22 +1462,40 @@ let sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; }; }; - "glob-7.1.2" = { + "glob-7.1.3" = { name = "glob"; packageName = "glob"; - version = "7.1.2"; + version = "7.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz"; - sha512 = "MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ=="; + url = "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz"; + sha512 = "vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ=="; }; }; - "graceful-fs-4.1.11" = { + "global-modules-1.0.0" = { + name = "global-modules"; + packageName = "global-modules"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz"; + sha512 = "sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg=="; + }; + }; + "global-prefix-1.0.2" = { + name = "global-prefix"; + packageName = "global-prefix"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz"; + sha1 = "dbf743c6c14992593c655568cb66ed32c0122ebe"; + }; + }; + "graceful-fs-4.1.15" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.1.11"; + version = "4.1.15"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz"; - sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz"; + sha512 = "6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="; }; }; "growl-1.10.5" = { @@ -976,13 +1516,13 @@ let sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; }; }; - "har-validator-5.0.3" = { + "har-validator-5.1.3" = { name = "har-validator"; packageName = "har-validator"; - version = "5.0.3"; + version = "5.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz"; - sha1 = "ba402c266194f15956ef15e0fcf242993f6a7dfd"; + url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz"; + sha512 = "sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g=="; }; }; "has-1.0.3" = { @@ -1003,6 +1543,51 @@ let sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; }; }; + "has-symbols-1.0.0" = { + name = "has-symbols"; + packageName = "has-symbols"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz"; + sha1 = "ba1a8f1af2a0fc39650f5c850367704122063b44"; + }; + }; + "has-value-0.3.1" = { + name = "has-value"; + packageName = "has-value"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz"; + sha1 = "7b1f58bada62ca827ec0a2078025654845995e1f"; + }; + }; + "has-value-1.0.0" = { + name = "has-value"; + packageName = "has-value"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz"; + sha1 = "18b281da585b1c5c51def24c930ed29a0be6b177"; + }; + }; + "has-values-0.1.4" = { + name = "has-values"; + packageName = "has-values"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz"; + sha1 = "6d61de95d91dfca9b9a02089ad384bff8f62b771"; + }; + }; + "has-values-1.0.0" = { + name = "has-values"; + packageName = "has-values"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz"; + sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f"; + }; + }; "hash-base-3.0.4" = { name = "hash-base"; packageName = "hash-base"; @@ -1012,13 +1597,13 @@ let sha1 = "5fc8686847ecd73499403319a6b0a3f3f6ae4918"; }; }; - "hash.js-1.1.4" = { + "hash.js-1.1.7" = { name = "hash.js"; packageName = "hash.js"; - version = "1.1.4"; + version = "1.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/hash.js/-/hash.js-1.1.4.tgz"; - sha512 = "A6RlQvvZEtFS5fLU43IDu0QUmBy+fDO9VMdTXvufKwIkt/rFfvICAViCax5fbDO4zdNzaC3/27ZhKUok5bAJyw=="; + url = "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz"; + sha512 = "taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA=="; }; }; "hawk-1.0.0" = { @@ -1030,13 +1615,13 @@ let sha1 = "b90bb169807285411da7ffcb8dd2598502d3b52d"; }; }; - "he-1.1.1" = { + "he-1.2.0" = { name = "he"; packageName = "he"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/he/-/he-1.1.1.tgz"; - sha1 = "93410fd21b009735151f8868c2f271f3427e23fd"; + url = "https://registry.npmjs.org/he/-/he-1.2.0.tgz"; + sha512 = "F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="; }; }; "hmac-drbg-1.0.1" = { @@ -1057,6 +1642,15 @@ let sha1 = "3d322462badf07716ea7eb85baf88079cddce505"; }; }; + "homedir-polyfill-1.0.3" = { + name = "homedir-polyfill"; + packageName = "homedir-polyfill"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz"; + sha512 = "eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA=="; + }; + }; "htmlescape-1.1.1" = { name = "htmlescape"; packageName = "htmlescape"; @@ -1102,13 +1696,13 @@ let sha1 = "ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"; }; }; - "ieee754-1.1.12" = { + "ieee754-1.1.13" = { name = "ieee754"; packageName = "ieee754"; - version = "1.1.12"; + version = "1.1.13"; src = fetchurl { - url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.12.tgz"; - sha512 = "GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA=="; + url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz"; + sha512 = "4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="; }; }; "image-size-0.5.5" = { @@ -1192,13 +1786,49 @@ let sha512 = "VE6NlW+WGn2/AeOMd496AHFYmE7eLKkUY6Ty31k4og5vmA3Fjuwe9v6ifH6Xx/Hz27QvdoMoviw1/pqWRB09Sw=="; }; }; - "interpret-1.1.0" = { + "interpret-1.2.0" = { name = "interpret"; packageName = "interpret"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz"; - sha1 = "7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"; + url = "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz"; + sha512 = "mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw=="; + }; + }; + "invert-kv-2.0.0" = { + name = "invert-kv"; + packageName = "invert-kv"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz"; + sha512 = "wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA=="; + }; + }; + "ip-regex-2.1.0" = { + name = "ip-regex"; + packageName = "ip-regex"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz"; + sha1 = "fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"; + }; + }; + "is-accessor-descriptor-0.1.6" = { + name = "is-accessor-descriptor"; + packageName = "is-accessor-descriptor"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz"; + sha1 = "a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"; + }; + }; + "is-accessor-descriptor-1.0.0" = { + name = "is-accessor-descriptor"; + packageName = "is-accessor-descriptor"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz"; + sha512 = "m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ=="; }; }; "is-buffer-1.1.6" = { @@ -1210,6 +1840,168 @@ let sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="; }; }; + "is-buffer-2.0.3" = { + name = "is-buffer"; + packageName = "is-buffer"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.3.tgz"; + sha512 = "U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw=="; + }; + }; + "is-callable-1.1.4" = { + name = "is-callable"; + packageName = "is-callable"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz"; + sha512 = "r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA=="; + }; + }; + "is-data-descriptor-0.1.4" = { + name = "is-data-descriptor"; + packageName = "is-data-descriptor"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz"; + sha1 = "0b5ee648388e2c860282e793f1856fec3f301b56"; + }; + }; + "is-data-descriptor-1.0.0" = { + name = "is-data-descriptor"; + packageName = "is-data-descriptor"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz"; + sha512 = "jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ=="; + }; + }; + "is-date-object-1.0.1" = { + name = "is-date-object"; + packageName = "is-date-object"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz"; + sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"; + }; + }; + "is-descriptor-0.1.6" = { + name = "is-descriptor"; + packageName = "is-descriptor"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz"; + sha512 = "avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg=="; + }; + }; + "is-descriptor-1.0.2" = { + name = "is-descriptor"; + packageName = "is-descriptor"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz"; + sha512 = "2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg=="; + }; + }; + "is-extendable-0.1.1" = { + name = "is-extendable"; + packageName = "is-extendable"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz"; + sha1 = "62b110e289a471418e3ec36a617d472e301dfc89"; + }; + }; + "is-extendable-1.0.1" = { + name = "is-extendable"; + packageName = "is-extendable"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz"; + sha512 = "arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA=="; + }; + }; + "is-extglob-2.1.1" = { + name = "is-extglob"; + packageName = "is-extglob"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"; + sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; + }; + }; + "is-fullwidth-code-point-1.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; + sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; + }; + }; + "is-fullwidth-code-point-2.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; + sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; + }; + }; + "is-glob-3.1.0" = { + name = "is-glob"; + packageName = "is-glob"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz"; + sha1 = "7ba5ae24217804ac70707b96922567486cc3e84a"; + }; + }; + "is-number-3.0.0" = { + name = "is-number"; + packageName = "is-number"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz"; + sha1 = "24fd6201a4782cf50561c810276afc7d12d71195"; + }; + }; + "is-plain-object-2.0.4" = { + name = "is-plain-object"; + packageName = "is-plain-object"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz"; + sha512 = "h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og=="; + }; + }; + "is-regex-1.0.4" = { + name = "is-regex"; + packageName = "is-regex"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz"; + sha1 = "5517489b547091b0930e095654ced25ee97e9491"; + }; + }; + "is-stream-1.1.0" = { + name = "is-stream"; + packageName = "is-stream"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz"; + sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; + }; + }; + "is-symbol-1.0.2" = { + name = "is-symbol"; + packageName = "is-symbol"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz"; + sha512 = "HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw=="; + }; + }; "is-typedarray-1.0.0" = { name = "is-typedarray"; packageName = "is-typedarray"; @@ -1219,6 +2011,15 @@ let sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; }; }; + "is-windows-1.0.2" = { + name = "is-windows"; + packageName = "is-windows"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz"; + sha512 = "eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="; + }; + }; "isarray-0.0.1" = { name = "isarray"; packageName = "isarray"; @@ -1246,6 +2047,33 @@ let sha512 = "GMxXOiUirWg1xTKRipM0Ek07rX+ubx4nNVElTJdNLYmNO/2YrDkgJGw9CljXn+r4EWiDQg/8lsRdHyg2PJuUaA=="; }; }; + "isexe-2.0.0" = { + name = "isexe"; + packageName = "isexe"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"; + sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; + }; + }; + "isobject-2.1.0" = { + name = "isobject"; + packageName = "isobject"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz"; + sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89"; + }; + }; + "isobject-3.0.1" = { + name = "isobject"; + packageName = "isobject"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz"; + sha1 = "4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"; + }; + }; "isstream-0.1.2" = { name = "isstream"; packageName = "isstream"; @@ -1255,6 +2083,15 @@ let sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; }; }; + "js-yaml-3.12.0" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "3.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz"; + sha512 = "PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A=="; + }; + }; "jsbn-0.1.1" = { name = "jsbn"; packageName = "jsbn"; @@ -1273,13 +2110,13 @@ let sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; }; }; - "json-schema-traverse-0.3.1" = { + "json-schema-traverse-0.4.1" = { name = "json-schema-traverse"; packageName = "json-schema-traverse"; - version = "0.3.1"; + version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz"; - sha1 = "349a6d44c53a51de89b40805c5d5e59b417d3340"; + url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; + sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; }; }; "json-stable-stringify-0.0.1" = { @@ -1327,13 +2164,13 @@ let sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; }; }; - "just-extend-1.1.27" = { + "just-extend-4.0.2" = { name = "just-extend"; packageName = "just-extend"; - version = "1.1.27"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/just-extend/-/just-extend-1.1.27.tgz"; - sha512 = "mJVp13Ix6gFo3SBAy9U/kL+oeZqzlYYYLQBwXVBlVzIsZwBqGREnOro24oC/8s8aox+rJhtZ2DiQof++IrkA+g=="; + url = "https://registry.npmjs.org/just-extend/-/just-extend-4.0.2.tgz"; + sha512 = "FrLwOgm+iXrPV+5zDU6Jqu4gCRXbWEQg2O3SKONsWE4w7AXFRkryS53bpWdaL9cNol+AmR3AEYz6kn+o0fCPnw=="; }; }; "kew-0.1.7" = { @@ -1345,6 +2182,42 @@ let sha1 = "0a32a817ff1a9b3b12b8c9bacf4bc4d679af8e72"; }; }; + "kind-of-3.2.2" = { + name = "kind-of"; + packageName = "kind-of"; + version = "3.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz"; + sha1 = "31ea21a734bab9bbb0f32466d893aea51e4a3c64"; + }; + }; + "kind-of-4.0.0" = { + name = "kind-of"; + packageName = "kind-of"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz"; + sha1 = "20813df3d712928b207378691a45066fae72dd57"; + }; + }; + "kind-of-5.1.0" = { + name = "kind-of"; + packageName = "kind-of"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz"; + sha512 = "NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="; + }; + }; + "kind-of-6.0.2" = { + name = "kind-of"; + packageName = "kind-of"; + version = "6.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz"; + sha512 = "s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="; + }; + }; "labeled-stream-splicer-2.0.1" = { name = "labeled-stream-splicer"; packageName = "labeled-stream-splicer"; @@ -1354,22 +2227,31 @@ let sha512 = "MC94mHZRvJ3LfykJlTUipBqenZz1pacOZEMhhQ8dMGcDHs0SBE5GbsavUXV7YtP3icBW17W0Zy1I0lfASmo9Pg=="; }; }; - "lodash-3.7.0" = { - name = "lodash"; - packageName = "lodash"; - version = "3.7.0"; + "lcid-2.0.0" = { + name = "lcid"; + packageName = "lcid"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-3.7.0.tgz"; - sha1 = "3678bd8ab995057c07ade836ed2ef087da811d45"; + url = "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz"; + sha512 = "avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA=="; }; }; - "lodash.get-4.4.2" = { - name = "lodash.get"; - packageName = "lodash.get"; - version = "4.4.2"; + "locate-path-3.0.0" = { + name = "locate-path"; + packageName = "locate-path"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz"; - sha1 = "2d177f652fa31e939b4438d5341499dfa3825e99"; + url = "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz"; + sha512 = "7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A=="; + }; + }; + "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.memoize-3.0.4" = { @@ -1381,22 +2263,85 @@ let sha1 = "2dcbd2c287cbc0a55cc42328bd0c736150d53e3f"; }; }; - "lolex-2.7.0" = { - name = "lolex"; - packageName = "lolex"; - version = "2.7.0"; + "log-symbols-2.2.0" = { + name = "log-symbols"; + packageName = "log-symbols"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/lolex/-/lolex-2.7.0.tgz"; - sha512 = "uJkH2e0BVfU5KOJUevbTOtpDduooSarH5PopO+LfM/vZf8Z9sJzODqKev804JYM2i++ktJfUmC1le4LwFQ1VMg=="; + url = "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz"; + sha512 = "VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg=="; }; }; - "md5.js-1.3.4" = { + "lolex-2.7.5" = { + name = "lolex"; + packageName = "lolex"; + version = "2.7.5"; + src = fetchurl { + url = "https://registry.npmjs.org/lolex/-/lolex-2.7.5.tgz"; + sha512 = "l9x0+1offnKKIzYVjyXU2SiwhXDLekRzKyhnbyldPHvC7BvLPVpdNUNR2KeMAiCN2D/kLNttZgQD5WjSxuBx3Q=="; + }; + }; + "lolex-3.1.0" = { + name = "lolex"; + packageName = "lolex"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lolex/-/lolex-3.1.0.tgz"; + sha512 = "zFo5MgCJ0rZ7gQg69S4pqBsLURbFw11X68C18OcJjJQbqaXm2NoTrGl1IMM3TIz0/BnN1tIs2tzmmqvCsOMMjw=="; + }; + }; + "map-age-cleaner-0.1.3" = { + name = "map-age-cleaner"; + packageName = "map-age-cleaner"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz"; + sha512 = "bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w=="; + }; + }; + "map-cache-0.2.2" = { + name = "map-cache"; + packageName = "map-cache"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz"; + sha1 = "c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"; + }; + }; + "map-visit-1.0.0" = { + name = "map-visit"; + packageName = "map-visit"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz"; + sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"; + }; + }; + "md5.js-1.3.5" = { name = "md5.js"; packageName = "md5.js"; - version = "1.3.4"; + version = "1.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz"; - sha1 = "e9bdbde94a20a5ac18b04340fc5764d5b09d901d"; + url = "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz"; + sha512 = "xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg=="; + }; + }; + "mem-4.3.0" = { + name = "mem"; + packageName = "mem"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz"; + sha512 = "qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w=="; + }; + }; + "micromatch-3.1.10" = { + name = "micromatch"; + packageName = "micromatch"; + version = "3.1.10"; + src = fetchurl { + url = "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz"; + sha512 = "MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg=="; }; }; "miller-rabin-4.0.1" = { @@ -1426,22 +2371,31 @@ let sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; }; }; - "mime-db-1.33.0" = { + "mime-db-1.38.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.33.0"; + version = "1.38.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz"; - sha512 = "BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ=="; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz"; + sha512 = "bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg=="; }; }; - "mime-types-2.1.18" = { + "mime-types-2.1.22" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.18"; + version = "2.1.22"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz"; - sha512 = "lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.22.tgz"; + sha512 = "aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog=="; + }; + }; + "mimic-fn-2.1.0" = { + name = "mimic-fn"; + packageName = "mimic-fn"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz"; + sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="; }; }; "minimalistic-assert-1.0.1" = { @@ -1489,6 +2443,15 @@ let sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; }; }; + "mixin-deep-1.3.1" = { + name = "mixin-deep"; + packageName = "mixin-deep"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz"; + sha512 = "8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ=="; + }; + }; "mkdirp-0.3.5" = { name = "mkdirp"; packageName = "mkdirp"; @@ -1516,13 +2479,13 @@ let sha1 = "586538c8d71fa8de90c41a46acc0481c1fb83e18"; }; }; - "module-deps-6.1.0" = { + "module-deps-6.2.0" = { name = "module-deps"; packageName = "module-deps"; - version = "6.1.0"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/module-deps/-/module-deps-6.1.0.tgz"; - sha512 = "NPs5N511VD1rrVJihSso/LiBShRbJALYBKzDW91uZYy7BpjnO4bGnZL3HjZ9yKcFdZUWwaYjDz9zxbuP7vKMuQ=="; + url = "https://registry.npmjs.org/module-deps/-/module-deps-6.2.0.tgz"; + sha512 = "hKPmO06so6bL/ZvqVNVqdTVO8UAYsi3tQWlCa+z9KuWhoN4KDQtb5hcqQQv58qYiDE21wIvnttZEPiDgEbpwbA=="; }; }; "ms-2.0.0" = { @@ -1534,6 +2497,24 @@ let sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; }; }; + "ms-2.1.1" = { + name = "ms"; + packageName = "ms"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz"; + sha512 = "tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="; + }; + }; + "nanomatch-1.2.13" = { + name = "nanomatch"; + packageName = "nanomatch"; + version = "1.2.13"; + src = fetchurl { + url = "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz"; + sha512 = "fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA=="; + }; + }; "ncp-0.4.2" = { name = "ncp"; packageName = "ncp"; @@ -1543,13 +2524,31 @@ let sha1 = "abcc6cbd3ec2ed2a729ff6e7c1fa8f01784a8574"; }; }; - "nise-1.4.2" = { + "nice-try-1.0.5" = { + name = "nice-try"; + packageName = "nice-try"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz"; + sha512 = "1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="; + }; + }; + "nise-1.4.10" = { name = "nise"; packageName = "nise"; - version = "1.4.2"; + version = "1.4.10"; src = fetchurl { - url = "https://registry.npmjs.org/nise/-/nise-1.4.2.tgz"; - sha512 = "BxH/DxoQYYdhKgVAfqVy4pzXRZELHOIewzoesxpjYvpU+7YOalQhGNPf7wAx8pLrTNPrHRDlLOkAl8UI0ZpXjw=="; + url = "https://registry.npmjs.org/nise/-/nise-1.4.10.tgz"; + sha512 = "sa0RRbj53dovjc7wombHmVli9ZihXbXCQ2uH3TNm03DyvOSIQbxg+pbqDKrk2oxMK1rtLGVlKxcB9rrc6X5YjA=="; + }; + }; + "node-environment-flags-1.0.4" = { + name = "node-environment-flags"; + packageName = "node-environment-flags"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.4.tgz"; + sha512 = "M9rwCnWVLW7PX+NUWe3ejEdiLYinRpsEre9hMkU/6NS4h+EEulYaDH1gCEZ2gyXsmw+RXYDaV2JkkTNcsPDJ0Q=="; }; }; "node-uuid-1.4.8" = { @@ -1570,6 +2569,15 @@ let sha1 = "2aa09b7d1768487b3b89a9c5aa52335bff0baea7"; }; }; + "npm-run-path-2.0.2" = { + name = "npm-run-path"; + packageName = "npm-run-path"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz"; + sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f"; + }; + }; "npmconf-0.0.24" = { name = "npmconf"; packageName = "npmconf"; @@ -1579,6 +2587,15 @@ let sha1 = "b78875b088ccc3c0afa3eceb3ce3244b1b52390c"; }; }; + "number-is-nan-1.0.1" = { + name = "number-is-nan"; + packageName = "number-is-nan"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; + sha1 = "097b602b53422a522c1afb8790318336941a011d"; + }; + }; "oauth-sign-0.3.0" = { name = "oauth-sign"; packageName = "oauth-sign"; @@ -1588,13 +2605,67 @@ let sha1 = "cb540f93bb2b22a7d5941691a288d60e8ea9386e"; }; }; - "oauth-sign-0.8.2" = { + "oauth-sign-0.9.0" = { name = "oauth-sign"; packageName = "oauth-sign"; - version = "0.8.2"; + version = "0.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz"; - sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"; + url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz"; + sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="; + }; + }; + "object-copy-0.1.0" = { + name = "object-copy"; + packageName = "object-copy"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz"; + sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c"; + }; + }; + "object-keys-1.1.0" = { + name = "object-keys"; + packageName = "object-keys"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object-keys/-/object-keys-1.1.0.tgz"; + sha512 = "6OO5X1+2tYkNyNEx6TsCxEqFfRWaqx6EtMiSbGrw8Ob8v9Ne+Hl8rBAgLBZn5wjEz3s/s6U1WXFUFOcxxAwUpg=="; + }; + }; + "object-visit-1.0.1" = { + name = "object-visit"; + packageName = "object-visit"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz"; + sha1 = "f79c4493af0c5377b59fe39d395e41042dd045bb"; + }; + }; + "object.assign-4.1.0" = { + name = "object.assign"; + packageName = "object.assign"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz"; + sha512 = "exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w=="; + }; + }; + "object.getownpropertydescriptors-2.0.3" = { + name = "object.getownpropertydescriptors"; + packageName = "object.getownpropertydescriptors"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz"; + sha1 = "8758c846f5b407adab0f236e0986f14b051caa16"; + }; + }; + "object.pick-1.3.0" = { + name = "object.pick"; + packageName = "object.pick"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz"; + sha1 = "87a10ac4c1694bd2e1cbf53591a66141fb5dd747"; }; }; "once-1.1.1" = { @@ -1624,6 +2695,15 @@ let sha1 = "854373c7f5c2315914fc9bfc6bd8238fdda1ec27"; }; }; + "os-locale-3.1.0" = { + name = "os-locale"; + packageName = "os-locale"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz"; + sha512 = "Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q=="; + }; + }; "osenv-0.0.3" = { name = "osenv"; packageName = "osenv"; @@ -1633,13 +2713,67 @@ let sha1 = "cd6ad8ddb290915ad9e22765576025d411f29cb6"; }; }; - "pako-1.0.6" = { + "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"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz"; + sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; + }; + }; + "p-is-promise-2.0.0" = { + name = "p-is-promise"; + packageName = "p-is-promise"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.0.0.tgz"; + sha512 = "pzQPhYMCAgLAKPWD2jC3Se9fEfrD9npNos0y150EeqZll7akhEgGhTW/slB6lHku8AvYGiJ+YJ5hfHKePPgFWg=="; + }; + }; + "p-limit-2.2.0" = { + name = "p-limit"; + packageName = "p-limit"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz"; + sha512 = "pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ=="; + }; + }; + "p-locate-3.0.0" = { + name = "p-locate"; + packageName = "p-locate"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz"; + sha512 = "x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ=="; + }; + }; + "p-try-2.2.0" = { + name = "p-try"; + packageName = "p-try"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz"; + sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="; + }; + }; + "pako-1.0.10" = { name = "pako"; packageName = "pako"; - version = "1.0.6"; + version = "1.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz"; - sha512 = "lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg=="; + url = "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz"; + sha512 = "0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw=="; }; }; "parents-1.0.1" = { @@ -1651,13 +2785,31 @@ let sha1 = "fedd4d2bf193a77745fe71e371d73c3307d9c751"; }; }; - "parse-asn1-5.1.1" = { + "parse-asn1-5.1.4" = { name = "parse-asn1"; packageName = "parse-asn1"; - version = "5.1.1"; + version = "5.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz"; - sha512 = "KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw=="; + url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.4.tgz"; + sha512 = "Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw=="; + }; + }; + "parse-passwd-1.0.0" = { + name = "parse-passwd"; + packageName = "parse-passwd"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz"; + sha1 = "6d5b934a456993b23d37f40a382d6f1666a8e5c6"; + }; + }; + "pascalcase-0.1.1" = { + name = "pascalcase"; + packageName = "pascalcase"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz"; + sha1 = "b363e55e8006ca6fe21784d2db22bd15d7917f14"; }; }; "path-browserify-0.0.1" = { @@ -1669,6 +2821,15 @@ let sha512 = "BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ=="; }; }; + "path-exists-3.0.0" = { + name = "path-exists"; + packageName = "path-exists"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz"; + sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"; + }; + }; "path-is-absolute-1.0.1" = { name = "path-is-absolute"; packageName = "path-is-absolute"; @@ -1678,13 +2839,22 @@ let sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; }; }; - "path-parse-1.0.5" = { + "path-key-2.0.1" = { + name = "path-key"; + packageName = "path-key"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz"; + sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40"; + }; + }; + "path-parse-1.0.6" = { name = "path-parse"; packageName = "path-parse"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz"; - sha1 = "3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"; + url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz"; + sha512 = "GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="; }; }; "path-platform-0.11.15" = { @@ -1705,13 +2875,13 @@ let sha1 = "59fde0f435badacba103a84e9d3bc64e96b9937d"; }; }; - "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=="; }; }; "performance-now-2.1.0" = { @@ -1732,6 +2902,15 @@ let sha1 = "0b3a7ce630486a83be91ff4e832eee20e971115b"; }; }; + "posix-character-classes-0.1.1" = { + name = "posix-character-classes"; + packageName = "posix-character-classes"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz"; + sha1 = "01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"; + }; + }; "process-0.11.10" = { name = "process"; packageName = "process"; @@ -1786,22 +2965,31 @@ let sha1 = "d3fc114ba06995a45ec6893f484ceb1d78f5f476"; }; }; - "psl-1.1.28" = { + "psl-1.1.31" = { name = "psl"; packageName = "psl"; - version = "1.1.28"; + version = "1.1.31"; src = fetchurl { - url = "https://registry.npmjs.org/psl/-/psl-1.1.28.tgz"; - sha512 = "+AqO1Ae+N/4r7Rvchrdm432afjT9hqJRyBN3DQv9At0tPz4hIFSGKbq64fN9dVoCow4oggIIax5/iONx0r9hZw=="; + url = "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz"; + sha512 = "/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw=="; }; }; - "public-encrypt-4.0.2" = { + "public-encrypt-4.0.3" = { name = "public-encrypt"; packageName = "public-encrypt"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.2.tgz"; - sha512 = "4kJ5Esocg8X3h8YgJsKAuoesBgB7mqH3eowiDzMUPKiRDDE7E/BqqZD1hnTByIaAFiwAw246YEltSq7tdrOH0Q=="; + url = "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz"; + sha512 = "zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q=="; + }; + }; + "pump-3.0.0" = { + name = "pump"; + packageName = "pump"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz"; + sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww=="; }; }; "punycode-1.3.2" = { @@ -1822,6 +3010,15 @@ let sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; }; }; + "punycode-2.1.1" = { + name = "punycode"; + packageName = "punycode"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz"; + sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; + }; + }; "qs-0.6.6" = { name = "qs"; packageName = "qs"; @@ -1858,13 +3055,13 @@ let sha1 = "9ec61f79049875707d69414596fd907a4d711e73"; }; }; - "randombytes-2.0.6" = { + "randombytes-2.1.0" = { name = "randombytes"; packageName = "randombytes"; - version = "2.0.6"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz"; - sha512 = "CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A=="; + url = "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz"; + sha512 = "vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ=="; }; }; "randomfill-1.0.4" = { @@ -1912,6 +3109,33 @@ let sha1 = "85204b54dba82d5742e28c96756ef43af50e3384"; }; }; + "regex-not-1.0.2" = { + name = "regex-not"; + packageName = "regex-not"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz"; + sha512 = "J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A=="; + }; + }; + "repeat-element-1.1.3" = { + name = "repeat-element"; + packageName = "repeat-element"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz"; + sha512 = "ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g=="; + }; + }; + "repeat-string-1.6.1" = { + name = "repeat-string"; + packageName = "repeat-string"; + version = "1.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz"; + sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; + }; + }; "request-2.36.0" = { name = "request"; packageName = "request"; @@ -1921,13 +3145,13 @@ let sha1 = "28c6c04262c7b9ffdd21b9255374517ee6d943f5"; }; }; - "request-2.87.0" = { + "request-2.88.0" = { name = "request"; packageName = "request"; - version = "2.87.0"; + version = "2.88.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.87.0.tgz"; - sha512 = "fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw=="; + url = "https://registry.npmjs.org/request/-/request-2.88.0.tgz"; + sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg=="; }; }; "request-progress-0.3.1" = { @@ -1939,6 +3163,24 @@ let sha1 = "0721c105d8a96ac6b2ce8b2c89ae2d5ecfcf6b3a"; }; }; + "require-directory-2.1.1" = { + name = "require-directory"; + packageName = "require-directory"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"; + sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; + }; + }; + "require-main-filename-1.0.1" = { + name = "require-main-filename"; + packageName = "require-main-filename"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz"; + sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1"; + }; + }; "resolve-1.1.7" = { name = "resolve"; packageName = "resolve"; @@ -1948,13 +3190,40 @@ let sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b"; }; }; - "resolve-1.8.1" = { + "resolve-1.10.0" = { name = "resolve"; packageName = "resolve"; - version = "1.8.1"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.8.1.tgz"; - sha512 = "AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz"; + sha512 = "3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg=="; + }; + }; + "resolve-dir-1.0.1" = { + name = "resolve-dir"; + packageName = "resolve-dir"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz"; + sha1 = "79a40644c362be82f26effe739c9bb5382046f43"; + }; + }; + "resolve-url-0.2.1" = { + name = "resolve-url"; + packageName = "resolve-url"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz"; + sha1 = "2c637fe77c893afd2a663fe21aa9080068e2052a"; + }; + }; + "ret-0.1.15" = { + name = "ret"; + packageName = "ret"; + version = "0.1.15"; + src = fetchurl { + url = "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz"; + sha512 = "TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="; }; }; "rimraf-2.2.8" = { @@ -1984,6 +3253,15 @@ let sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; }; }; + "safe-regex-1.1.0" = { + name = "safe-regex"; + packageName = "safe-regex"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz"; + sha1 = "40a3669f3b077d1e943d44629e157dd48023bf2e"; + }; + }; "safer-buffer-2.1.2" = { name = "safer-buffer"; packageName = "safer-buffer"; @@ -1993,15 +3271,6 @@ let sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; - "samsam-1.3.0" = { - name = "samsam"; - packageName = "samsam"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/samsam/-/samsam-1.3.0.tgz"; - sha512 = "1HwIYD/8UlOtFS3QO3w7ey+SdSDFE4HRNLZoZRYVQefrOY3l17epswImeB1ijgJFQJodIaHcwkp3r/myBjFVbg=="; - }; - }; "semver-1.1.4" = { name = "semver"; packageName = "semver"; @@ -2011,6 +3280,42 @@ let sha1 = "2e5a4e72bab03472cc97f72753b4508912ef5540"; }; }; + "semver-5.7.0" = { + name = "semver"; + packageName = "semver"; + version = "5.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz"; + sha512 = "Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="; + }; + }; + "set-blocking-2.0.0" = { + name = "set-blocking"; + packageName = "set-blocking"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"; + sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; + }; + }; + "set-value-0.4.3" = { + name = "set-value"; + packageName = "set-value"; + version = "0.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz"; + sha1 = "7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"; + }; + }; + "set-value-2.0.0" = { + name = "set-value"; + packageName = "set-value"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz"; + sha512 = "hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg=="; + }; + }; "sha.js-2.4.11" = { name = "sha.js"; packageName = "sha.js"; @@ -2029,6 +3334,24 @@ let sha1 = "e7012310d8f417f4deb5712150e5678b87ae565f"; }; }; + "shebang-command-1.2.0" = { + name = "shebang-command"; + packageName = "shebang-command"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz"; + sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea"; + }; + }; + "shebang-regex-1.0.0" = { + name = "shebang-regex"; + packageName = "shebang-regex"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz"; + sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3"; + }; + }; "shell-quote-1.6.1" = { name = "shell-quote"; packageName = "shell-quote"; @@ -2092,6 +3415,15 @@ let sha1 = "c98cda374aa6b190df8ba87c9889c2b4db620063"; }; }; + "signal-exit-3.0.2" = { + name = "signal-exit"; + packageName = "signal-exit"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz"; + sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; + }; + }; "simple-concat-1.0.0" = { name = "simple-concat"; packageName = "simple-concat"; @@ -2101,6 +3433,33 @@ let sha1 = "7344cbb8b6e26fb27d66b2fc86f9f6d5997521c6"; }; }; + "snapdragon-0.8.2" = { + name = "snapdragon"; + packageName = "snapdragon"; + version = "0.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz"; + sha512 = "FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg=="; + }; + }; + "snapdragon-node-2.1.1" = { + name = "snapdragon-node"; + packageName = "snapdragon-node"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz"; + sha512 = "O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw=="; + }; + }; + "snapdragon-util-3.0.1" = { + name = "snapdragon-util"; + packageName = "snapdragon-util"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz"; + sha512 = "mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ=="; + }; + }; "sntp-0.2.4" = { name = "sntp"; packageName = "sntp"; @@ -2128,22 +3487,67 @@ let sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; }; }; - "sshpk-1.14.2" = { - name = "sshpk"; - packageName = "sshpk"; - version = "1.14.2"; + "source-map-resolve-0.5.2" = { + name = "source-map-resolve"; + packageName = "source-map-resolve"; + version = "0.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz"; - sha1 = "c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98"; + url = "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz"; + sha512 = "MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA=="; }; }; - "stream-browserify-2.0.1" = { + "source-map-url-0.4.0" = { + name = "source-map-url"; + packageName = "source-map-url"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz"; + sha1 = "3e935d7ddd73631b97659956d55128e87b5084a3"; + }; + }; + "split-string-3.1.0" = { + name = "split-string"; + packageName = "split-string"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz"; + sha512 = "NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw=="; + }; + }; + "sprintf-js-1.0.3" = { + name = "sprintf-js"; + packageName = "sprintf-js"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"; + sha1 = "04e6926f662895354f3dd015203633b857297e2c"; + }; + }; + "sshpk-1.16.1" = { + name = "sshpk"; + packageName = "sshpk"; + version = "1.16.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz"; + sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg=="; + }; + }; + "static-extend-0.1.2" = { + name = "static-extend"; + packageName = "static-extend"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz"; + sha1 = "60809c39cbff55337226fd5e0b520f341f1fb5c6"; + }; + }; + "stream-browserify-2.0.2" = { name = "stream-browserify"; packageName = "stream-browserify"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz"; - sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"; + url = "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz"; + sha512 = "nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg=="; }; }; "stream-combiner2-1.1.1" = { @@ -2173,6 +3577,24 @@ let sha1 = "1b63be438a133e4b671cc1935197600175910d83"; }; }; + "string-width-1.0.2" = { + name = "string-width"; + packageName = "string-width"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"; + sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; + }; + }; + "string-width-2.1.1" = { + name = "string-width"; + packageName = "string-width"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz"; + sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw=="; + }; + }; "string_decoder-0.10.31" = { name = "string_decoder"; packageName = "string_decoder"; @@ -2191,6 +3613,42 @@ let sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; }; }; + "string_decoder-1.2.0" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.2.0.tgz"; + sha512 = "6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w=="; + }; + }; + "strip-ansi-3.0.1" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; + sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; + }; + }; + "strip-ansi-4.0.0" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz"; + sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; + }; + }; + "strip-eof-1.0.0" = { + name = "strip-eof"; + packageName = "strip-eof"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz"; + sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf"; + }; + }; "strip-json-comments-1.0.4" = { name = "strip-json-comments"; packageName = "strip-json-comments"; @@ -2200,6 +3658,15 @@ let sha1 = "1e15fbcac97d3ee99bf2d73b4c656b082bbafb91"; }; }; + "strip-json-comments-2.0.1" = { + name = "strip-json-comments"; + packageName = "strip-json-comments"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; + sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; + }; + }; "subarg-1.0.0" = { name = "subarg"; packageName = "subarg"; @@ -2209,13 +3676,22 @@ let sha1 = "f62cf17581e996b48fc965699f54c06ae268b8d2"; }; }; - "supports-color-5.4.0" = { + "supports-color-5.5.0" = { name = "supports-color"; packageName = "supports-color"; - version = "5.4.0"; + version = "5.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz"; - sha512 = "zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w=="; + url = "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"; + sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; + }; + }; + "supports-color-6.0.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-6.0.0.tgz"; + sha512 = "on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg=="; }; }; "syntax-error-1.4.0" = { @@ -2227,15 +3703,6 @@ let sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; }; }; - "text-encoding-0.6.4" = { - name = "text-encoding"; - packageName = "text-encoding"; - version = "0.6.4"; - src = fetchurl { - url = "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz"; - sha1 = "e399a982257a276dae428bb92845cb71bdc26d19"; - }; - }; "throttleit-0.0.2" = { name = "throttleit"; packageName = "throttleit"; @@ -2254,13 +3721,13 @@ let sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; }; }; - "through2-2.0.3" = { + "through2-2.0.5" = { name = "through2"; packageName = "through2"; - version = "2.0.3"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz"; - sha1 = "0004569b37c7c74ba39c43f3ced78d1ad94140be"; + url = "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz"; + sha512 = "/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ=="; }; }; "timers-browserify-1.4.2" = { @@ -2281,13 +3748,31 @@ let sha1 = "7d229b1fcc637e466ca081180836a7aabff83f43"; }; }; - "tough-cookie-2.3.4" = { - name = "tough-cookie"; - packageName = "tough-cookie"; - version = "2.3.4"; + "to-object-path-0.3.0" = { + name = "to-object-path"; + packageName = "to-object-path"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz"; - sha512 = "TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA=="; + url = "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz"; + sha1 = "297588b7b0e7e0ac08e04e672f85c1f4999e17af"; + }; + }; + "to-regex-3.0.2" = { + name = "to-regex"; + packageName = "to-regex"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz"; + sha512 = "FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw=="; + }; + }; + "to-regex-range-2.1.1" = { + name = "to-regex-range"; + packageName = "to-regex-range"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz"; + sha1 = "7c80c17b9dfebe599e27367e0d4dd5590141db38"; }; }; "tough-cookie-2.4.3" = { @@ -2299,6 +3784,15 @@ let sha512 = "Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ=="; }; }; + "tough-cookie-3.0.1" = { + name = "tough-cookie"; + packageName = "tough-cookie"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz"; + sha512 = "yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg=="; + }; + }; "tty-browserify-0.0.1" = { name = "tty-browserify"; packageName = "tty-browserify"; @@ -2362,13 +3856,49 @@ let sha512 = "4IcGSufhFshvLNcMCV80UnQVlZ5pMOC8mvNPForqwA4+lzYQuetTESLDQkeLmihq8bRcnpbQa48Wb8Lh16/xow=="; }; }; - "undeclared-identifiers-1.1.2" = { + "undeclared-identifiers-1.1.3" = { name = "undeclared-identifiers"; packageName = "undeclared-identifiers"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/undeclared-identifiers/-/undeclared-identifiers-1.1.2.tgz"; - sha512 = "13EaeocO4edF/3JKime9rD7oB6QI8llAGhgn5fKOPyfkJbRb6NFv9pYV6dFEmpa4uRjKeBqLZP8GpuzqHlKDMQ=="; + url = "https://registry.npmjs.org/undeclared-identifiers/-/undeclared-identifiers-1.1.3.tgz"; + sha512 = "pJOW4nxjlmfwKApE4zvxLScM/njmwj/DiUBv7EabwE4O8kRUy+HIwxQtZLBPll/jx1LJyBcqNfB3/cpv9EZwOw=="; + }; + }; + "union-value-1.0.0" = { + name = "union-value"; + packageName = "union-value"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz"; + sha1 = "5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"; + }; + }; + "unset-value-1.0.0" = { + name = "unset-value"; + packageName = "unset-value"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz"; + sha1 = "8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"; + }; + }; + "uri-js-4.2.2" = { + name = "uri-js"; + packageName = "uri-js"; + version = "4.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz"; + sha512 = "KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ=="; + }; + }; + "urix-0.1.0" = { + name = "urix"; + packageName = "urix"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz"; + sha1 = "da937f7a62e21fec1fd18d49b35c2935067a6c72"; }; }; "url-0.11.0" = { @@ -2380,6 +3910,15 @@ let sha1 = "3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"; }; }; + "use-3.1.1" = { + name = "use"; + packageName = "use"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/use/-/use-3.1.1.tgz"; + sha512 = "cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="; + }; + }; "util-0.10.3" = { name = "util"; packageName = "util"; @@ -2407,13 +3946,13 @@ let sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; }; }; - "uuid-3.3.0" = { + "uuid-3.3.2" = { name = "uuid"; packageName = "uuid"; - version = "3.3.0"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.3.0.tgz"; - sha512 = "ijO9N2xY/YaOqQ5yz5c4sy2ZjWmA6AR6zASb/gdpeKZ8+948CxwfMW9RrKVk5may6ev8c0/Xguu32e2Llelpqw=="; + url = "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz"; + sha512 = "yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="; }; }; "verror-1.10.0" = { @@ -2443,6 +3982,42 @@ let sha1 = "460c1da0f810103d0321a9b633af9e575e64486f"; }; }; + "which-1.3.1" = { + name = "which"; + packageName = "which"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/which/-/which-1.3.1.tgz"; + sha512 = "HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ=="; + }; + }; + "which-module-2.0.0" = { + name = "which-module"; + packageName = "which-module"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz"; + sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"; + }; + }; + "wide-align-1.1.3" = { + name = "wide-align"; + packageName = "wide-align"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz"; + sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA=="; + }; + }; + "wrap-ansi-2.1.0" = { + name = "wrap-ansi"; + packageName = "wrap-ansi"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz"; + sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85"; + }; + }; "wrappy-1.0.2" = { name = "wrappy"; packageName = "wrappy"; @@ -2461,16 +4036,52 @@ let sha1 = "a5c6d532be656e23db820efb943a1f04998d63af"; }; }; + "y18n-4.0.0" = { + name = "y18n"; + packageName = "y18n"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz"; + sha512 = "r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w=="; + }; + }; + "yargs-12.0.5" = { + name = "yargs"; + packageName = "yargs"; + version = "12.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz"; + sha512 = "Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw=="; + }; + }; + "yargs-parser-11.1.1" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "11.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz"; + sha512 = "C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ=="; + }; + }; + "yargs-unparser-1.5.0" = { + name = "yargs-unparser"; + packageName = "yargs-unparser"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.5.0.tgz"; + sha512 = "HK25qidFTCVuj/D1VfNiEndpLIeJN78aqgR23nL3y4N0U/91cOAzqfHlF8n2BvoNDcZmJKin3ddNSvOxSr8flw=="; + }; + }; }; in { marked = nodeEnv.buildNodePackage { name = "marked"; packageName = "marked"; - version = "0.4.0"; + version = "0.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/marked/-/marked-0.4.0.tgz"; - sha512 = "tMsdNBgOsrUophCAFQl0XPe6Zqk/uy9gnue+jIIKhykO51hxyu6uNx7zBPy0+y/WKYVZZMspV9YeXLNdKk+iYw=="; + url = "https://registry.npmjs.org/marked/-/marked-0.6.1.tgz"; + sha512 = "+H0L3ibcWhAZE02SKMqmvYsErLo4EAVJxu5h3bHBBDvvjeWXtl92rGUSBYHL2++5Y+RSNgl8dYOAXcYe7lp1fA=="; }; buildInputs = globalBuildInputs; meta = { @@ -2479,21 +4090,22 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; 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.3" - sources."acorn-5.7.1" - sources."acorn-dynamic-import-3.0.0" - sources."acorn-node-1.5.2" + sources."JSONStream-1.3.5" + sources."acorn-6.1.1" + sources."acorn-dynamic-import-4.0.0" + sources."acorn-node-1.6.2" + sources."acorn-walk-6.1.1" sources."array-filter-0.0.1" sources."array-map-0.0.0" sources."array-reduce-0.0.0" @@ -2517,15 +4129,15 @@ in }) sources."browserify-aes-1.2.0" sources."browserify-cipher-1.0.1" - sources."browserify-des-1.0.1" + sources."browserify-des-1.0.2" sources."browserify-rsa-4.0.1" sources."browserify-sign-4.0.4" sources."browserify-zlib-0.2.0" - sources."buffer-5.1.0" - sources."buffer-from-1.1.0" + sources."buffer-5.2.1" + sources."buffer-from-1.1.1" sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" - sources."cached-path-relative-1.0.1" + sources."cached-path-relative-1.0.2" sources."cipher-base-1.0.4" sources."combine-source-map-0.8.0" sources."concat-map-0.0.1" @@ -2538,11 +4150,12 @@ in sources."create-hash-1.2.0" sources."create-hmac-1.1.7" sources."crypto-browserify-3.12.0" + sources."dash-ast-1.0.0" sources."date-now-0.1.4" sources."defined-1.0.0" sources."deps-sort-2.0.0" sources."des.js-1.0.0" - (sources."detective-5.1.0" // { + (sources."detective-5.2.0" // { dependencies = [ sources."minimist-1.2.0" ]; @@ -2550,20 +4163,20 @@ in sources."diffie-hellman-5.0.3" sources."domain-browser-1.2.0" sources."duplexer2-0.1.4" - sources."elliptic-6.4.0" + sources."elliptic-6.4.1" sources."events-2.1.0" sources."evp_bytestokey-1.0.3" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."get-assigned-identifiers-1.2.0" - sources."glob-7.1.2" + sources."glob-7.1.3" sources."has-1.0.3" sources."hash-base-3.0.4" - sources."hash.js-1.1.4" + sources."hash.js-1.1.7" sources."hmac-drbg-1.0.1" sources."htmlescape-1.1.1" sources."https-browserify-1.0.0" - sources."ieee754-1.1.12" + sources."ieee754-1.1.13" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."inline-source-map-0.6.2" @@ -2575,39 +4188,40 @@ in sources."jsonparse-1.3.1" sources."labeled-stream-splicer-2.0.1" sources."lodash.memoize-3.0.4" - sources."md5.js-1.3.4" + sources."md5.js-1.3.5" sources."miller-rabin-4.0.1" 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."module-deps-6.1.0" + sources."module-deps-6.2.0" sources."once-1.4.0" sources."os-browserify-0.3.0" - sources."pako-1.0.6" + sources."pako-1.0.10" sources."parents-1.0.1" - sources."parse-asn1-5.1.1" + sources."parse-asn1-5.1.4" sources."path-browserify-0.0.1" sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.5" + 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" + sources."public-encrypt-4.0.3" sources."punycode-1.4.1" sources."querystring-0.2.0" sources."querystring-es3-0.2.1" - sources."randombytes-2.0.6" + sources."randombytes-2.1.0" sources."randomfill-1.0.4" sources."read-only-stream-2.0.0" (sources."readable-stream-2.3.6" // { dependencies = [ sources."isarray-1.0.0" + sources."string_decoder-1.1.1" ]; }) - sources."resolve-1.8.1" + sources."resolve-1.10.0" sources."ripemd160-2.0.2" sources."safe-buffer-5.1.2" sources."sha.js-2.4.11" @@ -2615,11 +4229,11 @@ in sources."shell-quote-1.6.1" sources."simple-concat-1.0.0" sources."source-map-0.5.7" - sources."stream-browserify-2.0.1" + sources."stream-browserify-2.0.2" sources."stream-combiner2-1.1.1" sources."stream-http-2.8.3" sources."stream-splicer-2.0.0" - sources."string_decoder-1.1.1" + sources."string_decoder-1.2.0" (sources."subarg-1.0.0" // { dependencies = [ sources."minimist-1.2.0" @@ -2627,13 +4241,13 @@ in }) sources."syntax-error-1.4.0" sources."through-2.3.8" - sources."through2-2.0.3" + sources."through2-2.0.5" sources."timers-browserify-1.4.2" sources."to-arraybuffer-1.0.1" sources."tty-browserify-0.0.1" sources."typedarray-0.0.6" sources."umd-3.0.3" - sources."undeclared-identifiers-1.1.2" + sources."undeclared-identifiers-1.1.3" (sources."url-0.11.0" // { dependencies = [ sources."punycode-1.3.2" @@ -2652,18 +4266,18 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.4.2"; + version = "3.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.2.tgz"; - sha512 = "/kVQDzwiE9Vy7Y63eMkMozF4jIt0C2+xHctF9YpqNWdE/NLOuMurshkpoYGUlAbeYhACPv0HJPIHJul0Ak4/uw=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.5.3.tgz"; + sha512 = "rIQPT2UMDnk4jRX+w4WO84/pebU2jiLsjgIyrCktYgSvx28enOE3iYQMr+BD1rHiitWnDmpu0cY/LfIEpKcjcw=="; }; dependencies = [ - sources."commander-2.15.1" + sources."commander-2.19.0" sources."source-map-0.6.1" ]; buildInputs = globalBuildInputs; @@ -2673,72 +4287,78 @@ in license = "BSD-2-Clause"; }; production = true; - bypassCache = false; + bypassCache = true; }; less = nodeEnv.buildNodePackage { name = "less"; packageName = "less"; - version = "3.0.4"; + version = "3.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/less/-/less-3.0.4.tgz"; - sha512 = "q3SyEnPKbk9zh4l36PGeW2fgynKu+FpbhiUNx/yaiBUQ3V0CbACCgb9FzYWcRgI2DJlP6eI4jc8XPrCTi55YcQ=="; + url = "https://registry.npmjs.org/less/-/less-3.9.0.tgz"; + sha512 = "31CmtPEZraNUtuUREYjSqRkeETFdyEHSEPAGq4erDlUXtda7pzNmctdljdIagSb589d/qXGWiiP31R5JVf+v0w=="; }; dependencies = [ - sources."ajv-5.5.2" + sources."ajv-6.10.0" sources."asap-2.0.6" - sources."asn1-0.2.3" + sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.7.0" - sources."bcrypt-pbkdf-1.0.1" + sources."aws4-1.8.0" + sources."bcrypt-pbkdf-1.0.2" sources."caseless-0.12.0" - sources."co-4.6.0" - sources."combined-stream-1.0.6" + sources."clone-2.1.2" + sources."combined-stream-1.0.7" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" sources."delayed-stream-1.0.0" - sources."ecc-jsbn-0.1.1" + sources."ecc-jsbn-0.1.2" sources."errno-0.1.7" - sources."extend-3.0.1" + sources."extend-3.0.2" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.1.0" + sources."fast-deep-equal-2.0.1" 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.3" sources."getpass-0.1.7" - sources."graceful-fs-4.1.11" + sources."graceful-fs-4.1.15" sources."har-schema-2.0.0" - sources."har-validator-5.0.3" + sources."har-validator-5.1.3" sources."http-signature-1.2.0" sources."image-size-0.5.5" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."jsbn-0.1.1" sources."json-schema-0.2.3" - sources."json-schema-traverse-0.3.1" + sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" sources."mime-1.6.0" - sources."mime-db-1.33.0" - sources."mime-types-2.1.18" + sources."mime-db-1.38.0" + sources."mime-types-2.1.22" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."oauth-sign-0.8.2" + sources."oauth-sign-0.9.0" sources."performance-now-2.1.0" sources."promise-7.3.1" sources."prr-1.0.1" - sources."punycode-1.4.1" + sources."psl-1.1.31" + sources."punycode-2.1.1" sources."qs-6.5.2" - sources."request-2.87.0" + sources."request-2.88.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."source-map-0.6.1" - sources."sshpk-1.14.2" - sources."tough-cookie-2.3.4" + sources."sshpk-1.16.1" + (sources."tough-cookie-2.4.3" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uuid-3.3.0" + sources."uri-js-4.2.2" + sources."uuid-3.3.2" sources."verror-1.10.0" ]; buildInputs = globalBuildInputs; @@ -2748,40 +4368,355 @@ in license = "Apache-2.0"; }; production = true; - bypassCache = false; + bypassCache = true; }; mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "5.2.0"; + version = "6.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-5.2.0.tgz"; - sha512 = "2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ=="; + url = "https://registry.npmjs.org/mocha/-/mocha-6.0.2.tgz"; + sha512 = "RtTJsmmToGyeTznSOMoM6TPEk1A84FQaHIciKrRqARZx+B5ccJ5tXlmJzEKGBxZdqk9UjpRsesZTUkZmR5YnuQ=="; }; dependencies = [ + sources."ansi-colors-3.2.3" + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" + sources."argparse-1.0.10" + sources."arr-diff-4.0.0" + sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" + sources."array-unique-0.3.2" + sources."assign-symbols-1.0.0" + sources."atob-2.1.2" sources."balanced-match-1.0.0" + (sources."base-0.11.2" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) sources."brace-expansion-1.1.11" + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) sources."browser-stdout-1.3.1" - sources."commander-2.15.1" + sources."cache-base-1.0.1" + sources."camelcase-5.3.1" + (sources."chalk-2.4.2" // { + dependencies = [ + sources."supports-color-5.5.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."kind-of-5.1.0" + ]; + }) + sources."cliui-4.1.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."component-emitter-1.2.1" sources."concat-map-0.0.1" - sources."debug-3.1.0" + sources."copy-descriptor-0.1.1" + sources."cross-spawn-6.0.5" + sources."debug-3.2.6" + sources."decamelize-1.2.0" + sources."decode-uri-component-0.2.0" + sources."define-properties-1.1.3" + sources."define-property-2.0.2" + sources."detect-file-1.0.0" sources."diff-3.5.0" + sources."end-of-stream-1.4.1" + sources."es-abstract-1.13.0" + sources."es-to-primitive-1.2.0" sources."escape-string-regexp-1.0.5" + sources."esprima-4.0.1" + sources."execa-1.0.0" + (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" // { + 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."ms-2.0.0" + ]; + }) + sources."expand-tilde-2.0.2" + (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."find-up-3.0.0" + sources."findup-sync-2.0.0" + (sources."flat-4.1.0" // { + dependencies = [ + sources."is-buffer-2.0.3" + ]; + }) + sources."for-in-1.0.2" + sources."fragment-cache-0.2.1" sources."fs.realpath-1.0.0" - sources."glob-7.1.2" + sources."function-bind-1.1.1" + sources."get-caller-file-1.0.3" + sources."get-stream-4.1.0" + sources."get-value-2.0.6" + sources."glob-7.1.3" + sources."global-modules-1.0.0" + sources."global-prefix-1.0.2" sources."growl-1.10.5" + sources."has-1.0.3" sources."has-flag-3.0.0" - sources."he-1.1.1" + sources."has-symbols-1.0.0" + sources."has-value-1.0.0" + (sources."has-values-1.0.0" // { + dependencies = [ + sources."kind-of-4.0.0" + ]; + }) + sources."he-1.2.0" + sources."homedir-polyfill-1.0.3" sources."inflight-1.0.6" sources."inherits-2.0.3" + sources."ini-1.3.5" + sources."invert-kv-2.0.0" + sources."is-accessor-descriptor-1.0.0" + sources."is-buffer-1.1.6" + sources."is-callable-1.1.4" + sources."is-data-descriptor-1.0.0" + sources."is-date-object-1.0.1" + sources."is-descriptor-1.0.2" + sources."is-extendable-0.1.1" + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-2.0.0" + sources."is-glob-3.1.0" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-plain-object-2.0.4" + sources."is-regex-1.0.4" + sources."is-stream-1.1.0" + sources."is-symbol-1.0.2" + sources."is-windows-1.0.2" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isobject-3.0.1" + sources."js-yaml-3.12.0" + sources."kind-of-6.0.2" + sources."lcid-2.0.0" + sources."locate-path-3.0.0" + sources."lodash-4.17.11" + sources."log-symbols-2.2.0" + sources."map-age-cleaner-0.1.3" + sources."map-cache-0.2.2" + sources."map-visit-1.0.0" + sources."mem-4.3.0" + sources."micromatch-3.1.10" + sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" + (sources."mixin-deep-1.3.1" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) sources."mkdirp-0.5.1" - sources."ms-2.0.0" + sources."ms-2.1.1" + sources."nanomatch-1.2.13" + sources."nice-try-1.0.5" + sources."node-environment-flags-1.0.4" + sources."npm-run-path-2.0.2" + sources."number-is-nan-1.0.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."kind-of-3.2.2" + ]; + }) + sources."object-keys-1.1.0" + sources."object-visit-1.0.1" + sources."object.assign-4.1.0" + sources."object.getownpropertydescriptors-2.0.3" + sources."object.pick-1.3.0" sources."once-1.4.0" + sources."os-locale-3.1.0" + sources."p-defer-1.0.0" + sources."p-finally-1.0.0" + sources."p-is-promise-2.0.0" + sources."p-limit-2.2.0" + sources."p-locate-3.0.0" + sources."p-try-2.2.0" + sources."parse-passwd-1.0.0" + sources."pascalcase-0.1.1" + sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" - sources."supports-color-5.4.0" + sources."path-key-2.0.1" + sources."posix-character-classes-0.1.1" + sources."pump-3.0.0" + sources."regex-not-1.0.2" + sources."repeat-element-1.1.3" + sources."repeat-string-1.6.1" + sources."require-directory-2.1.1" + sources."require-main-filename-1.0.1" + sources."resolve-dir-1.0.1" + sources."resolve-url-0.2.1" + sources."ret-0.1.15" + sources."safe-regex-1.1.0" + sources."semver-5.7.0" + sources."set-blocking-2.0.0" + (sources."set-value-2.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."signal-exit-3.0.2" + (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" // { + 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."ms-2.0.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."sprintf-js-1.0.3" + (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-width-2.1.1" + sources."strip-ansi-4.0.0" + sources."strip-eof-1.0.0" + sources."strip-json-comments-2.0.1" + sources."supports-color-6.0.0" + (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."which-1.3.1" + sources."which-module-2.0.0" + sources."wide-align-1.1.3" + (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."y18n-4.0.0" + sources."yargs-12.0.5" + sources."yargs-parser-11.1.1" + sources."yargs-unparser-1.5.0" ]; buildInputs = globalBuildInputs; meta = { @@ -2790,7 +4725,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; mocha-phantomjs = nodeEnv.buildNodePackage { name = "mocha-phantomjs"; @@ -2809,8 +4744,8 @@ in sources."aws-sign2-0.5.0" sources."boom-0.4.2" sources."combined-stream-0.0.7" - sources."commander-2.15.1" - (sources."config-chain-1.1.11" // { + sources."commander-2.20.0" + (sources."config-chain-1.1.12" // { dependencies = [ sources."ini-1.3.5" ]; @@ -2825,6 +4760,7 @@ in sources."http-signature-0.10.1" sources."inherits-1.0.2" sources."ini-1.1.0" + sources."ip-regex-2.1.0" sources."json-stringify-safe-5.0.1" sources."kew-0.1.7" sources."mime-1.2.11" @@ -2840,8 +4776,8 @@ in sources."phantomjs-1.9.7-15" sources."progress-1.1.8" sources."proto-list-1.2.4" - sources."psl-1.1.28" - sources."punycode-1.4.1" + sources."psl-1.1.31" + sources."punycode-2.1.1" sources."qs-0.6.6" sources."request-2.36.0" sources."request-progress-0.3.1" @@ -2849,7 +4785,7 @@ in sources."semver-1.1.4" sources."sntp-0.2.4" sources."throttleit-0.0.2" - sources."tough-cookie-2.4.3" + sources."tough-cookie-3.0.1" sources."tunnel-agent-0.4.3" sources."which-1.0.9" ]; @@ -2859,15 +4795,15 @@ in homepage = "https://github.com/nathanboktae/mocha-phantomjs#readme"; }; production = true; - bypassCache = false; + bypassCache = true; }; should = nodeEnv.buildNodePackage { name = "should"; packageName = "should"; - version = "13.2.1"; + version = "13.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/should/-/should-13.2.1.tgz"; - sha512 = "l+/NwEMO+DcstsHEwPHRHzC9j4UOE3VQwJGcMWSsD/vqpqHbnQ+1iSHy64Ihmmjx1uiRPD9pFadTSc3MJtXAgw=="; + url = "https://registry.npmjs.org/should/-/should-13.2.3.tgz"; + sha512 = "ggLesLtu2xp+ZxI+ysJTmNjh2U0TsC+rQ/pfED9bUZZ4DKefP27D+7YJVVTvKsmjLpIi9jAa7itwDGkDDmt1GQ=="; }; dependencies = [ sources."should-equal-2.0.0" @@ -2883,47 +4819,53 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; sinon = nodeEnv.buildNodePackage { name = "sinon"; packageName = "sinon"; - version = "6.0.1"; + version = "7.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/sinon/-/sinon-6.0.1.tgz"; - sha512 = "rfszhNcfamK2+ofIPi9XqeH89pH7KGDcAtM+F9CsjHXOK3jzWG99vyhyD2V+r7s4IipmWcWUFYq4ftZ9/Eu2Wg=="; + url = "https://registry.npmjs.org/sinon/-/sinon-7.3.1.tgz"; + sha512 = "eQKMaeWovtOtYe2xThEvaHmmxf870Di+bim10c3ZPrL5bZhLGtu8cz+rOBTFz0CwBV4Q/7dYwZiqZbGVLZ+vjQ=="; }; dependencies = [ - sources."@sinonjs/formatio-2.0.0" + sources."@sinonjs/commons-1.4.0" + sources."@sinonjs/formatio-3.2.1" + sources."@sinonjs/samsam-3.3.1" + sources."@sinonjs/text-encoding-0.7.1" + sources."array-from-2.1.1" sources."diff-3.5.0" sources."has-flag-3.0.0" sources."isarray-0.0.1" - sources."just-extend-1.1.27" - sources."lodash.get-4.4.2" - sources."lolex-2.7.0" - sources."nise-1.4.2" + sources."just-extend-4.0.2" + sources."lodash-4.17.11" + sources."lolex-3.1.0" + (sources."nise-1.4.10" // { + dependencies = [ + sources."lolex-2.7.5" + ]; + }) sources."path-to-regexp-1.7.0" - sources."samsam-1.3.0" - sources."supports-color-5.4.0" - sources."text-encoding-0.6.4" + sources."supports-color-5.5.0" sources."type-detect-4.0.8" ]; buildInputs = globalBuildInputs; meta = { description = "JavaScript test spies, stubs and mocks."; - homepage = http://sinonjs.org/; + homepage = https://sinonjs.org/; license = "BSD-3-Clause"; }; production = true; - bypassCache = false; + bypassCache = true; }; jshint = nodeEnv.buildNodePackage { name = "jshint"; packageName = "jshint"; - version = "2.9.5"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/jshint/-/jshint-2.9.5.tgz"; - sha1 = "1e7252915ce681b40827ee14248c46d34e9aa62c"; + url = "https://registry.npmjs.org/jshint/-/jshint-2.10.2.tgz"; + sha512 = "e7KZgCSXMJxznE/4WULzybCMNXNAd/bf5TSrvVEq78Q/K8ZwFpmBqQeDtNiHc3l49nV4E/+YeHU/JZjSUIrLAA=="; }; dependencies = [ sources."balanced-match-1.0.0" @@ -2933,24 +4875,23 @@ in sources."console-browserify-1.1.0" sources."core-util-is-1.0.2" sources."date-now-0.1.4" - (sources."dom-serializer-0.1.0" // { + (sources."dom-serializer-0.1.1" // { dependencies = [ - sources."domelementtype-1.1.3" - sources."entities-1.1.1" + sources."entities-1.1.2" ]; }) - sources."domelementtype-1.3.0" + sources."domelementtype-1.3.1" sources."domhandler-2.3.0" sources."domutils-1.5.1" sources."entities-1.0.0" sources."exit-0.1.2" sources."fs.realpath-1.0.0" - sources."glob-7.1.2" + sources."glob-7.1.3" sources."htmlparser2-3.8.3" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."isarray-0.0.1" - sources."lodash-3.7.0" + sources."lodash-4.17.11" sources."minimatch-3.0.4" sources."once-1.4.0" sources."path-is-absolute-1.0.1" @@ -2967,31 +4908,31 @@ in license = "(MIT AND JSON)"; }; production = true; - bypassCache = false; + bypassCache = true; }; shelljs = nodeEnv.buildNodePackage { name = "shelljs"; packageName = "shelljs"; - version = "0.8.2"; + version = "0.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/shelljs/-/shelljs-0.8.2.tgz"; - sha512 = "pRXeNrCA2Wd9itwhvLp5LZQvPJ0wU6bcjaTMywHHGX5XWhVN2nzSu7WV0q+oUY7mGK3mgSkDDzP3MgjqdyIgbQ=="; + url = "https://registry.npmjs.org/shelljs/-/shelljs-0.8.3.tgz"; + sha512 = "fc0BKlAWiLpwZljmOvAOTE/gXawtCoNrP5oaY7KIaQbbyHeQVg01pSEuEGvGh3HEdBU4baCD7wQBwADmM/7f7A=="; }; dependencies = [ sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."concat-map-0.0.1" sources."fs.realpath-1.0.0" - sources."glob-7.1.2" + sources."glob-7.1.3" sources."inflight-1.0.6" sources."inherits-2.0.3" - sources."interpret-1.1.0" + sources."interpret-1.2.0" sources."minimatch-3.0.4" sources."once-1.4.0" sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.5" + sources."path-parse-1.0.6" sources."rechoir-0.6.2" - sources."resolve-1.8.1" + sources."resolve-1.10.0" sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; @@ -3001,6 +4942,6 @@ in license = "BSD-3-Clause"; }; production = true; - bypassCache = false; + bypassCache = true; }; } \ No newline at end of file diff --git a/pkgs/development/web/remarkjs/nodepkgs.nix b/pkgs/development/web/remarkjs/nodepkgs.nix index 846dabb2166..266ec146c78 100644 --- a/pkgs/development/web/remarkjs/nodepkgs.nix +++ b/pkgs/development/web/remarkjs/nodepkgs.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}: let nodeEnv = import ../../node-packages/node-env.nix { diff --git a/pkgs/games/scid-vs-pc/default.nix b/pkgs/games/scid-vs-pc/default.nix index 94e102e5752..79fef674002 100644 --- a/pkgs/games/scid-vs-pc/default.nix +++ b/pkgs/games/scid-vs-pc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "scid-vs-pc-${version}"; - version = "4.19"; + version = "4.20"; src = fetchurl { url = "mirror://sourceforge/scidvspc/scid_vs_pc-${version}.tgz"; - sha256 = "1k2cgs6bjyrmxy5x6x1chmrxfmm224p3r9r9mpc37kridk4hshqs"; + sha256 = "1mpardcxp5hsmhyla1cjqf4aalacs3v6xkf1zyjz16g1m3gh05lm"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/games/tintin/default.nix b/pkgs/games/tintin/default.nix index 286e408e255..50fb7ba19c4 100644 --- a/pkgs/games/tintin/default.nix +++ b/pkgs/games/tintin/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib, pcre }: stdenv.mkDerivation rec { - name = "tintin-2.01.4"; + name = "tintin-2.01.7"; src = fetchurl { url = "mirror://sourceforge/tintin/${name}.tar.gz"; - sha256 = "1g7bh8xs1ml0iyraps3a3dzaycci922y7fk5j0wyr4ssyjzsy8nx"; + sha256 = "033n84pyxml3n3gd4dq0497n9w331bnrr1gppwipz9ashmq8jz7v"; }; buildInputs = [ zlib pcre ]; diff --git a/pkgs/games/vitetris/default.nix b/pkgs/games/vitetris/default.nix index 3ed5700954a..d57559a4d80 100644 --- a/pkgs/games/vitetris/default.nix +++ b/pkgs/games/vitetris/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "vitetris-${version}"; - version = "0.57.2"; + version = "0.58.0"; src = fetchFromGitHub { owner = "vicgeralds"; repo = "vitetris"; rev = "v${version}"; - sha256 = "0px0h4zrpzr6xd1vz7w9gr6rh0z74y66jfzschkcvj84plld10k6"; + sha256 = "1fvw9yqg1q25x6dlfi4bl3hrrcdgl6wwq29j89aycxwdfxrxs09w"; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/games/xtris/default.nix b/pkgs/games/xtris/default.nix new file mode 100644 index 00000000000..9203389355c --- /dev/null +++ b/pkgs/games/xtris/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchzip, xorg }: +stdenv.mkDerivation rec { + name = "xtris-${version}"; + version = "1.15"; + + src = fetchzip { + url = "https://web.archive.org/web/20120315061213/http://www.iagora.com/~espel/xtris/xtris-${version}.tar.gz"; + sha256 = "1vqva99lyv7r6f9c7yikk8ahcfh9aq3clvwm4pz964wlbr9mj1v6"; + }; + + patchPhase = '' + sed -i ' + s:/usr/local/bin:'$out'/bin: + s:/usr/local/man:'$out'/share/man: + s:mkdir:mkdir -p:g + s:^CFLAGS:#CFLAGS: + ' Makefile + ''; + buildInputs = [ xorg.libX11 ]; + + meta = with stdenv.lib; { + description = "A multi-player version of the classical game of Tetris, for the X Window system"; + homepage = https://web.archive.org/web/20120315061213/http://www.iagora.com/~espel/xtris/xtris.html; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/misc/base16-builder/default.nix b/pkgs/misc/base16-builder/default.nix index 3d713848223..af57f2a90de 100644 --- a/pkgs/misc/base16-builder/default.nix +++ b/pkgs/misc/base16-builder/default.nix @@ -1,14 +1,6 @@ { stdenv, pkgs }: let - # node-packages*.nix generated via: - # - # % node2nix --input node-packages.json \ - # --output node-packages-generated.nix \ - # --composition node-packages.nix \ - # --node-env ./../../development/node-packages/node-env.nix \ - # --pkg-name nodejs-6_x - # nodePackages = import ./node-packages.nix { inherit pkgs; inherit (stdenv.hostPlatform) system; diff --git a/pkgs/misc/base16-builder/generate.sh b/pkgs/misc/base16-builder/generate.sh new file mode 100755 index 00000000000..e1e436010b4 --- /dev/null +++ b/pkgs/misc/base16-builder/generate.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p nodePackages.node2nix +exec node2nix -8 \ + --input node-packages.json \ + --output node-packages-generated.nix \ + --composition node-packages.nix \ + --node-env ./../../development/node-packages/node-env.nix \ diff --git a/pkgs/misc/base16-builder/node-packages-generated.nix b/pkgs/misc/base16-builder/node-packages-generated.nix index 52f3446e8c4..5c5de54ee54 100644 --- a/pkgs/misc/base16-builder/node-packages-generated.nix +++ b/pkgs/misc/base16-builder/node-packages-generated.nix @@ -58,15 +58,6 @@ let sha1 = "a7d898243ae622f7abb6bb604d740a76c6a5461b"; }; }; - "builtin-modules-1.1.1" = { - name = "builtin-modules"; - packageName = "builtin-modules"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz"; - sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f"; - }; - }; "bulk-replace-0.0.1" = { name = "bulk-replace"; packageName = "bulk-replace"; @@ -94,13 +85,13 @@ let sha1 = "308beeaffdf28119051efa1d932213c91b8f92e7"; }; }; - "capture-stack-trace-1.0.0" = { + "capture-stack-trace-1.0.1" = { name = "capture-stack-trace"; packageName = "capture-stack-trace"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz"; - sha1 = "4a6fa07399c26bba47f0b2496b4d0fb408c5550d"; + url = "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz"; + sha512 = "mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw=="; }; }; "chalk-1.1.3" = { @@ -229,13 +220,13 @@ let sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; }; }; - "esprima-4.0.0" = { + "esprima-4.0.1" = { name = "esprima"; packageName = "esprima"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz"; - sha512 = "oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw=="; + url = "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz"; + sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; }; }; "filled-array-1.1.0" = { @@ -283,13 +274,13 @@ let sha1 = "5f81635a61e4a6589f180569ea4e381680a51f35"; }; }; - "graceful-fs-4.1.11" = { + "graceful-fs-4.1.15" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.1.11"; + version = "4.1.15"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz"; - sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz"; + sha512 = "6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="; }; }; "has-ansi-2.0.0" = { @@ -301,22 +292,22 @@ let sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; }; }; - "hepburn-1.0.0" = { + "hepburn-1.1.1" = { name = "hepburn"; packageName = "hepburn"; - version = "1.0.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/hepburn/-/hepburn-1.0.0.tgz"; - sha1 = "49ce862942a77570cd4f5c8fe100b85d942cb61b"; + url = "https://registry.npmjs.org/hepburn/-/hepburn-1.1.1.tgz"; + sha512 = "Ok3ZmMJN3ek4WFAL4f5t8k+BmrDRlS5qGjI4um+3cHH0SrYVzJgUTYwIfGvU8s/eWqOEY+gsINwjJSoaBG3A9g=="; }; }; - "hosted-git-info-2.6.1" = { + "hosted-git-info-2.7.1" = { name = "hosted-git-info"; packageName = "hosted-git-info"; - version = "2.6.1"; + version = "2.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.6.1.tgz"; - sha512 = "Ba4+0M4YvIDUUsprMjhVTU1yN9F2/LJSAl69ZpzaLT4l4j5mwTS6jqqW9Ojvj6lKz/veqPzpJBqGbXspOb533A=="; + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz"; + sha512 = "7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w=="; }; }; "imurmurhash-0.1.4" = { @@ -364,15 +355,6 @@ let sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; }; }; - "is-builtin-module-1.0.0" = { - name = "is-builtin-module"; - 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"; - sha1 = "540572d34f7ac3119f8f76c30cbc1b1e037affbe"; - }; - }; "is-finite-1.0.2" = { name = "is-finite"; packageName = "is-finite"; @@ -454,13 +436,13 @@ let sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; }; }; - "js-yaml-3.12.0" = { + "js-yaml-3.13.0" = { name = "js-yaml"; packageName = "js-yaml"; - version = "3.12.0"; + version = "3.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz"; - sha512 = "PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A=="; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.0.tgz"; + sha512 = "pZZoSxcCYco+DIKBTimr67J6Hy+EYGZDY/HCWC+iAEA9h1ByhMXAIVUXMcMFpOCxQ/xjXmPI2MkDL5HRm5eFrQ=="; }; }; "keypress-0.1.0" = { @@ -481,13 +463,13 @@ let sha1 = "56f8d6139620847b8017f8f1f4d78e211324168b"; }; }; - "limax-1.6.0" = { + "limax-1.7.0" = { name = "limax"; packageName = "limax"; - version = "1.6.0"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/limax/-/limax-1.6.0.tgz"; - sha1 = "996163291c7e8c6e7dd5b438c0190b69622f1b33"; + url = "https://registry.npmjs.org/limax/-/limax-1.7.0.tgz"; + sha512 = "ibcGylOXT5vry2JKfKwLWx2tZudRYWm4SzG9AE/cc5zqwW+3nQy/uPLUvfAUChRdmqxVrK6SNepmO7ZY8RoKfA=="; }; }; "load-json-file-1.1.0" = { @@ -580,22 +562,22 @@ let sha1 = "5ae5541d024645d32a58fcddc9ceecea7ae3ac2f"; }; }; - "nodejieba-2.2.6" = { + "nodejieba-2.3.0" = { name = "nodejieba"; packageName = "nodejieba"; - version = "2.2.6"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/nodejieba/-/nodejieba-2.2.6.tgz"; - sha1 = "17cd416705b7b01c062e6cd9d7179b30453eb4a3"; + url = "https://registry.npmjs.org/nodejieba/-/nodejieba-2.3.0.tgz"; + sha512 = "ZzLsVuNDlrmcBQa/b8G/yegdXje2iFmktYmPksk6qLha1brKEANYqg4XPiBspF1D0y7Npho91KTmvKFcDr0UdA=="; }; }; - "normalize-package-data-2.4.0" = { + "normalize-package-data-2.5.0" = { name = "normalize-package-data"; packageName = "normalize-package-data"; - version = "2.4.0"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz"; - sha512 = "9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw=="; + url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz"; + sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA=="; }; }; "number-is-nan-1.0.1" = { @@ -679,6 +661,15 @@ let sha1 = "0feb6c64f0fc518d9a754dd5efb62c7022761f4b"; }; }; + "path-parse-1.0.6" = { + name = "path-parse"; + packageName = "path-parse"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz"; + sha512 = "GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="; + }; + }; "path-type-1.1.0" = { name = "path-type"; packageName = "path-type"; @@ -796,13 +787,13 @@ let sha1 = "cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"; }; }; - "registry-auth-token-3.3.2" = { + "registry-auth-token-3.4.0" = { name = "registry-auth-token"; packageName = "registry-auth-token"; - version = "3.3.2"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.2.tgz"; - sha512 = "JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ=="; + url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.4.0.tgz"; + sha512 = "4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A=="; }; }; "registry-url-3.1.0" = { @@ -823,6 +814,15 @@ let sha1 = "5214c53a926d3552707527fbab415dbc08d06dda"; }; }; + "resolve-1.10.0" = { + name = "resolve"; + packageName = "resolve"; + version = "1.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz"; + sha512 = "3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg=="; + }; + }; "safe-buffer-5.1.2" = { name = "safe-buffer"; packageName = "safe-buffer"; @@ -832,13 +832,13 @@ let sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; }; }; - "semver-5.5.0" = { + "semver-5.7.0" = { name = "semver"; packageName = "semver"; - version = "5.5.0"; + version = "5.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz"; - sha512 = "4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA=="; + url = "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz"; + sha512 = "Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="; }; }; "semver-diff-2.1.0" = { @@ -868,22 +868,22 @@ let sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"; }; }; - "spdx-correct-3.0.0" = { + "spdx-correct-3.1.0" = { name = "spdx-correct"; packageName = "spdx-correct"; - version = "3.0.0"; + version = "3.1.0"; 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.1.0.tgz"; + sha512 = "lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q=="; }; }; - "spdx-exceptions-2.1.0" = { + "spdx-exceptions-2.2.0" = { name = "spdx-exceptions"; packageName = "spdx-exceptions"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz"; - sha512 = "4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg=="; + url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz"; + sha512 = "2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA=="; }; }; "spdx-expression-parse-3.0.0" = { @@ -895,13 +895,13 @@ let sha512 = "Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg=="; }; }; - "spdx-license-ids-3.0.0" = { + "spdx-license-ids-3.0.3" = { name = "spdx-license-ids"; packageName = "spdx-license-ids"; - version = "3.0.0"; + version = "3.0.3"; 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.3.tgz"; + sha512 = "uBIcIl3Ih6Phe3XHK1NqboJLdGfwr1UN3k6wSD1dZpmPsIkb8AGNbZYJ1fOBk834+Gxy8rpfDxrS6XLEMZMY2g=="; }; }; "speakingurl-14.0.1" = { @@ -1048,13 +1048,13 @@ let sha1 = "67e2e863797215530dff318e5bf9dcebfd47b21a"; }; }; - "validate-npm-package-license-3.0.3" = { + "validate-npm-package-license-3.0.4" = { name = "validate-npm-package-license"; packageName = "validate-npm-package-license"; - version = "3.0.3"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz"; - sha512 = "63ZOUnL4SIXj4L0NixR3L1lcjO38crAbgrTpl28t8jjrfuiOBL5Iygm+60qPs/KsZGzPNg6Smnc/oY16QTjF0g=="; + url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"; + sha512 = "DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew=="; }; }; "widest-line-1.0.0" = { @@ -1102,11 +1102,10 @@ in sources."argparse-1.0.10" sources."array-find-index-1.0.2" sources."boxen-0.3.1" - sources."builtin-modules-1.1.1" sources."bulk-replace-0.0.1" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."capture-stack-trace-1.0.0" + sources."capture-stack-trace-1.0.1" sources."chalk-1.1.3" sources."code-point-at-1.1.0" sources."commander-1.1.1" @@ -1121,22 +1120,21 @@ in sources."ejs-2.6.1" sources."error-ex-1.3.2" sources."escape-string-regexp-1.0.5" - sources."esprima-4.0.0" + sources."esprima-4.0.1" sources."filled-array-1.1.0" sources."find-up-1.1.2" sources."fs-promise-0.3.1" sources."get-stdin-4.0.1" sources."got-5.7.1" - sources."graceful-fs-4.1.11" + sources."graceful-fs-4.1.15" sources."has-ansi-2.0.0" - sources."hepburn-1.0.0" - sources."hosted-git-info-2.6.1" + sources."hepburn-1.1.1" + sources."hosted-git-info-2.7.1" sources."imurmurhash-0.1.4" sources."indent-string-2.1.0" 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-finite-1.0.2" sources."is-fullwidth-code-point-1.0.0" sources."is-npm-1.0.0" @@ -1146,10 +1144,10 @@ in sources."is-stream-1.1.0" sources."is-utf8-0.2.1" sources."isarray-1.0.0" - sources."js-yaml-3.12.0" + sources."js-yaml-3.13.0" sources."keypress-0.1.0" sources."latest-version-2.0.0" - sources."limax-1.6.0" + sources."limax-1.7.0" sources."load-json-file-1.1.0" sources."loud-rejection-1.6.0" sources."lowercase-keys-1.0.1" @@ -1163,8 +1161,8 @@ in }) sources."nan-2.10.0" sources."node-status-codes-1.0.0" - sources."nodejieba-2.2.6" - sources."normalize-package-data-2.4.0" + sources."nodejieba-2.3.0" + sources."normalize-package-data-2.5.0" sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" sources."open-0.0.5" @@ -1174,6 +1172,7 @@ in sources."package-json-2.4.0" sources."parse-json-2.2.0" sources."path-exists-2.1.0" + sources."path-parse-1.0.6" sources."path-type-1.1.0" sources."pify-2.3.0" sources."pinkie-2.0.4" @@ -1187,18 +1186,19 @@ in sources."read-pkg-up-1.0.1" sources."readable-stream-2.3.6" sources."redent-1.0.0" - sources."registry-auth-token-3.3.2" + sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" sources."repeating-2.0.1" + sources."resolve-1.10.0" sources."safe-buffer-5.1.2" - sources."semver-5.5.0" + sources."semver-5.7.0" sources."semver-diff-2.1.0" sources."signal-exit-3.0.2" sources."slide-1.1.6" - sources."spdx-correct-3.0.0" - sources."spdx-exceptions-2.1.0" + sources."spdx-correct-3.1.0" + sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" - sources."spdx-license-ids-3.0.0" + sources."spdx-license-ids-3.0.3" sources."speakingurl-14.0.1" sources."sprintf-js-1.0.3" sources."string-width-1.0.2" @@ -1215,7 +1215,7 @@ in sources."url-parse-lax-1.0.0" sources."util-deprecate-1.0.2" sources."uuid-2.0.3" - sources."validate-npm-package-license-3.0.3" + sources."validate-npm-package-license-3.0.4" sources."widest-line-1.0.0" sources."write-file-atomic-1.3.4" sources."xdg-basedir-2.0.0" @@ -1227,6 +1227,6 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; } \ No newline at end of file diff --git a/pkgs/misc/base16-builder/node-packages.nix b/pkgs/misc/base16-builder/node-packages.nix index 8e6e01237ea..47020a413e9 100644 --- a/pkgs/misc/base16-builder/node-packages.nix +++ b/pkgs/misc/base16-builder/node-packages.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}: let nodeEnv = import ../../development/node-packages/node-env.nix { diff --git a/pkgs/misc/logging/beats/6.x.nix b/pkgs/misc/logging/beats/6.x.nix index ce8bf44bfc0..2cfae05c924 100644 --- a/pkgs/misc/logging/beats/6.x.nix +++ b/pkgs/misc/logging/beats/6.x.nix @@ -8,7 +8,7 @@ let beat = package : extraArgs : buildGoPackage (rec { owner = "elastic"; repo = "beats"; rev = "v${version}"; - sha256 = "1qnrq9bhk7csgcxycb8c7975lq0p7cxw29i6sji777zv4hn7442m"; + sha256 = "0n1sjngc82b7wysw5aaiqvllq4c8rx2jj7khw4vrypc40f8ahjs5"; }; goPackagePath = "github.com/elastic/beats"; diff --git a/pkgs/misc/screensavers/pipes/default.nix b/pkgs/misc/screensavers/pipes/default.nix index 8539db5e002..404346bba63 100644 --- a/pkgs/misc/screensavers/pipes/default.nix +++ b/pkgs/misc/screensavers/pipes/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pipes-${version}"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { url = "https://github.com/pipeseroni/pipes.sh/archive/v${version}.tar.gz"; - sha256 = "1v0xhgq30zkfjk9l5g8swpivh7rxfjbzhbjpr2c5c836wgn026fb"; + sha256 = "09m4alb3clp3rhnqga5v6070p7n1gmnwp2ssqhq87nf2ipfpcaak"; }; buildInputs = with pkgs; [ bash ]; diff --git a/pkgs/os-specific/linux/alsa-oss/default.nix b/pkgs/os-specific/linux/alsa-oss/default.nix index 2b8ef40461d..8fd93f58834 100644 --- a/pkgs/os-specific/linux/alsa-oss/default.nix +++ b/pkgs/os-specific/linux/alsa-oss/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, alsaLib, gettext, ncurses, libsamplerate}: stdenv.mkDerivation rec { - name = "alsa-oss-1.1.6"; + name = "alsa-oss-1.1.8"; src = fetchurl { url = "mirror://alsa/oss-lib/${name}.tar.bz2"; - sha256 = "1sj512wyci5qv8cisps96xngh7y9r5mv18ybqnazy18zwr1zgly3"; + sha256 = "13nn6n6wpr2sj1hyqx4r9nb9bwxnhnzw8r2f08p8v13yjbswxbb4"; }; buildInputs = [ alsaLib ncurses libsamplerate ]; diff --git a/pkgs/os-specific/linux/fuse/fuse3-install.patch b/pkgs/os-specific/linux/fuse/fuse3-install.patch index 320c328cbd9..6f938536974 100644 --- a/pkgs/os-specific/linux/fuse/fuse3-install.patch +++ b/pkgs/os-specific/linux/fuse/fuse3-install.patch @@ -32,3 +32,13 @@ -fi - - +diff --git a/util/meson.build b/util/meson.build +index aa0e734..06d4378 100644 +--- a/util/meson.build ++++ b/util/meson.build +@@ -1,4 +1,4 @@ +-fuseconf_path = join_paths(get_option('prefix'), get_option('sysconfdir'), 'fuse.conf') ++fuseconf_path = join_paths('/', get_option('sysconfdir'), 'fuse.conf') + + executable('fusermount3', ['fusermount.c', '../lib/mount_util.c'], + include_directories: include_dirs, diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index d803817a03e..f49d7de1a53 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -6,6 +6,7 @@ buildLinux (args // rec { version = "4.14.111"; # 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; # branchVersion needs to be x.y extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version))); diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 9f8ebab4e91..85a8ff54df4 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -6,6 +6,7 @@ buildLinux (args // rec { version = "4.19.34"; # 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; # branchVersion needs to be x.y extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version))); diff --git a/pkgs/os-specific/linux/kernel/linux-5.0.nix b/pkgs/os-specific/linux/kernel/linux-5.0.nix index aefac13e4e7..a418e4b4bcc 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.0.nix @@ -6,6 +6,7 @@ buildLinux (args // rec { version = "5.0.7"; # 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; # branchVersion needs to be x.y extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version))); diff --git a/pkgs/os-specific/linux/kernel/linux-mptcp.nix b/pkgs/os-specific/linux/kernel/linux-mptcp.nix index d96853eb7cf..44499f39cc1 100644 --- a/pkgs/os-specific/linux/kernel/linux-mptcp.nix +++ b/pkgs/os-specific/linux/kernel/linux-mptcp.nix @@ -1,7 +1,7 @@ { stdenv, buildPackages, fetchFromGitHub, perl, buildLinux, structuredExtraConfig ? {}, ... } @ args: let - mptcpVersion = "0.94.3"; - modDirVersion = "4.14.105"; + mptcpVersion = "0.94.4"; + modDirVersion = "4.14.110"; in buildLinux ({ version = "${modDirVersion}-mptcp_v${mptcpVersion}"; @@ -16,7 +16,7 @@ buildLinux ({ owner = "multipath-tcp"; repo = "mptcp"; rev = "v${mptcpVersion}"; - sha256 = "1pic86icrlmxajw4hkqyljha8a3k4w9kb5z74xj4yiyapmk9wprm"; + sha256 = "1ng6p1djhm3m5g44yyq7gpqqbzsnhm9rimsafp5g4dx8cm27a70f"; }; structuredExtraConfig = with import ../../../../lib/kernel.nix { inherit (stdenv) lib; version = null; }; diff --git a/pkgs/os-specific/linux/kernel/update.sh b/pkgs/os-specific/linux/kernel/update.sh index 99f5ac31217..7a86b05dafc 100755 --- a/pkgs/os-specific/linux/kernel/update.sh +++ b/pkgs/os-specific/linux/kernel/update.sh @@ -48,10 +48,7 @@ ls $NIXPKGS/pkgs/os-specific/linux/kernel | while read FILE; do sed -i "s/sha256 = \".*\"/sha256 = \"$HASH\"/g" $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE # Rewrite the expression - sed -i -e '/version = /d' -e '/modDirVersion = /d' $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE - if grep -q '^[0-9]\+.[0-9]\+$' <<< "$V"; then - sed -i "\#buildLinux (args // rec {#a \ modDirVersion = \"${V}.0\";" $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE - fi + sed -i -e '/version = /d' $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE sed -i "\#buildLinux (args // rec {#a \ version = \"$V\";" $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE # Commit the changes diff --git a/pkgs/os-specific/linux/nvme-cli/default.nix b/pkgs/os-specific/linux/nvme-cli/default.nix index 49171697ffe..48ab36a5cff 100644 --- a/pkgs/os-specific/linux/nvme-cli/default.nix +++ b/pkgs/os-specific/linux/nvme-cli/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "nvme-cli-${version}"; - version = "1.7"; + version = "1.8"; src = fetchFromGitHub { owner = "linux-nvme"; repo = "nvme-cli"; rev = "v${version}"; - sha256 = "1wwr31s337km3v528hvsq72j2ph17fir0j3rr622z74k68pzdh1x"; + sha256 = "0k4qnxm9sgr4bqhg7c3g870f3jpawm5yp0vp0p031a9qgnzmklb9"; }; makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; diff --git a/pkgs/os-specific/linux/roccat-tools/default.nix b/pkgs/os-specific/linux/roccat-tools/default.nix index c2fb55b344b..d5bbe91979f 100644 --- a/pkgs/os-specific/linux/roccat-tools/default.nix +++ b/pkgs/os-specific/linux/roccat-tools/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "roccat-tools-${version}"; - version = "5.7.0"; + version = "5.8.0"; src = fetchurl { url = "mirror://sourceforge/roccat/${name}.tar.bz2"; - sha256 = "15gxplcm62167xhk65k8v6gg3j6jr0c5a64wlz72y1vfq0ai7qm6"; + sha256 = "0fr1ibgsyx756fz43hxq0cik51rkq1ymgimw8mz2d0jy63d7h48q"; }; postPatch = '' diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix index 27b27ebffdd..96bffc63a27 100644 --- a/pkgs/os-specific/linux/sysstat/default.nix +++ b/pkgs/os-specific/linux/sysstat/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gettext, bzip2 }: stdenv.mkDerivation rec { - name = "sysstat-12.1.2"; + name = "sysstat-12.1.3"; src = fetchurl { url = "http://perso.orange.fr/sebastien.godard/${name}.tar.xz"; - sha256 = "0xiv70x4n24fcycvlq95lqgb3jwjxfzq61bnyqai57x54hhn46yp"; + sha256 = "1am1a6mwi91921rrq8ivgczdsl4gdz91zxkx7vnrzfjm4zw8njam"; }; buildInputs = [ gettext ]; diff --git a/pkgs/os-specific/linux/tomb/default.nix b/pkgs/os-specific/linux/tomb/default.nix index a43c53e02bb..d8fe785650c 100644 --- a/pkgs/os-specific/linux/tomb/default.nix +++ b/pkgs/os-specific/linux/tomb/default.nix @@ -1,4 +1,6 @@ -{ stdenv, lib, fetchFromGitHub, gettext, zsh, pinentry, cryptsetup, gnupg, makeWrapper }: +{ stdenv, lib, fetchFromGitHub, makeWrapper +, gettext, zsh, pinentry, cryptsetup, gnupg, utillinux, e2fsprogs +}: stdenv.mkDerivation rec { name = "tomb-${version}"; @@ -11,6 +13,8 @@ stdenv.mkDerivation rec { sha256 = "1wk1aanzfln88min29p5av2j8gd8vj5afbs2gvarv7lvx1vi7kh1"; }; + buildInputs = [ zsh pinentry ]; + nativeBuildInputs = [ makeWrapper ]; postPatch = '' @@ -19,19 +23,15 @@ stdenv.mkDerivation rec { --replace 'TOMBEXEC=$0' 'TOMBEXEC=tomb' ''; - buildPhase = '' - # manually patch the interpreter - sed -i -e "1s|.*|#!${zsh}/bin/zsh|g" tomb - ''; + doInstallCheck = true; + installCheckPhase = "$out/bin/tomb -h 2>/dev/null"; installPhase = '' install -Dm755 tomb $out/bin/tomb install -Dm644 doc/tomb.1 $out/share/man/man1/tomb.1 - ln -s ${gnupg}/bin/gpg $out/bin/gpg - wrapProgram $out/bin/tomb \ - --prefix PATH : $out/bin:${lib.makeBinPath [ cryptsetup gettext pinentry ]} + --prefix PATH : $out/bin:${lib.makeBinPath [ cryptsetup gettext gnupg pinentry utillinux e2fsprogs ]} ''; meta = with stdenv.lib; { diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix index f7b39c3cf7c..ca241192156 100644 --- a/pkgs/servers/atlassian/confluence.nix +++ b/pkgs/servers/atlassian/confluence.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "atlassian-confluence-${version}"; - version = "6.14.2"; + version = "6.15.2"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/confluence/downloads/${name}.tar.gz"; - sha256 = "012lh2838l2n7wkj42isxspxw3ix54467vnzvxbsq8wnf2m367ln"; + sha256 = "01b7k4i38xjjkfjcphylyxhsff6ckgi4nsz6nlw2ax8a3avrmnfd"; }; buildPhase = '' diff --git a/pkgs/servers/atlassian/crowd.nix b/pkgs/servers/atlassian/crowd.nix index 2b32357089e..27856bf2762 100644 --- a/pkgs/servers/atlassian/crowd.nix +++ b/pkgs/servers/atlassian/crowd.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "atlassian-crowd-${version}"; - version = "3.3.4"; + version = "3.4.3"; src = fetchurl { url = "https://www.atlassian.com/software/crowd/downloads/binary/${name}.tar.gz"; - sha256 = "007jyizrkmn97kfkczpsk8128qsd5lj2343vfhd70w82p01qjy21"; + sha256 = "0swp41lr7n318jxl61w5c09485ygn261zc74p7xaisrwmh9ygyzs"; }; phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ]; diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix index 3c7c0dc6156..99888c488ac 100644 --- a/pkgs/servers/atlassian/jira.nix +++ b/pkgs/servers/atlassian/jira.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "atlassian-jira-${version}"; - version = "8.0.1"; + version = "8.1.0"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz"; - sha256 = "0cf0j781k23fs3jzrd4ranzvqnhdnza8dbaqxx31dk3p7c7168bw"; + sha256 = "0mi1xknly44haf7gls3k212fx1dsl8k35rq82a1b3zj27kynwqr3"; }; phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ]; diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index fd5e79b6efb..9ef49309dbb 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -7,11 +7,11 @@ let inherit (stdenv.lib) optional optionals; in # Note: ATM only the libraries have been tested in nixpkgs. stdenv.mkDerivation rec { name = "knot-dns-${version}"; - version = "2.8.0"; + version = "2.8.1"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "494ad926705018bd754d96711dc2129f3173f326a0b57d33978090ba4eef87ef"; + sha256 = "b21bf03e5cb6804df4e0e8b3898446349e86ddae5bf110edaf240d0ad1e2a2c6"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/pkgs/servers/documize-community/default.nix b/pkgs/servers/documize-community/default.nix new file mode 100644 index 00000000000..4f1a420c910 --- /dev/null +++ b/pkgs/servers/documize-community/default.nix @@ -0,0 +1,43 @@ +{ lib, buildGoPackage, fetchFromGitHub, go-bindata, go-bindata-assetfs }: + +buildGoPackage rec { + pname = "documize-community"; + version = "2.2.1"; + + src = fetchFromGitHub { + owner = "documize"; + repo = "community"; + rev = "v${version}"; + sha256 = "09s5js0zb3mh3g5qz8f3l2cqjn01kjb35kinfv932nf2rfyrmyqz"; + }; + + goPackagePath = "github.com/documize/community"; + + buildInputs = [ go-bindata-assetfs go-bindata ]; + + buildPhase = '' + runHook preBuild + + pushd go/src/github.com/documize/community + go build -gcflags="all=-trimpath=$GOPATH" -o bin/documize ./edition/community.go + popd + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $bin/bin + cp go/src/github.com/documize/community/bin/documize $bin/bin + + runHook postInstall + ''; + + meta = with lib; { + description = "Open source Confluence alternative for internal & external docs built with Golang + EmberJS"; + license = licenses.agpl3; + maintainers = with maintainers; [ ma27 ]; + homepage = https://www.documize.com/; + }; +} diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 26dd0fa877b..fe52c615ef9 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.91.1"; + version = "0.91.2"; components = { "abode" = ps: with ps; [ ]; "abode.alarm_control_panel" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 85aa4caf083..9b3e70e683a 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -64,6 +64,20 @@ let (mkOverride "colorlog" "4.0.2" "3cf31b25cbc8f86ec01fef582ef3b840950dea414084ed19ab922c8b493f9b42") + # required by home-assistant-frontend + (self: super: { + user-agents = super.user-agents.overridePythonAttrs (oldAttrs: rec { + version = "1.1.0"; + src = fetchFromGitHub { + owner = "selwin"; + repo = "python-user-agents"; + rev = "v${version}"; + sha256 = "14kxd780zhp8718xr1z63xffaj3bvxgr4pldh9sv943m4hvi0gw5"; + }; + doCheck = false; # can be dropped for 2.0 + }); + }) + # hass-frontend does not exist in python3.pkgs (self: super: { hass-frontend = self.callPackage ./frontend.nix { }; @@ -97,7 +111,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.91.1"; + hassVersion = "0.91.2"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -112,7 +126,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "home-assistant"; rev = version; - sha256 = "1y2sv9qq7zmb85n2f5b3csnc60xi87ccpkmhz8ii9gkjw6swikyh"; + sha256 = "193lim90dgidkis7cryp9hm8744bwhahj9fqicmnhhxlkg0s8zy5"; }; propagatedBuildInputs = [ diff --git a/pkgs/servers/http/showoff/Gemfile b/pkgs/servers/http/showoff/Gemfile new file mode 100644 index 00000000000..cfd295096bc --- /dev/null +++ b/pkgs/servers/http/showoff/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'showoff' diff --git a/pkgs/servers/http/showoff/Gemfile.lock b/pkgs/servers/http/showoff/Gemfile.lock new file mode 100644 index 00000000000..ccf0415d440 --- /dev/null +++ b/pkgs/servers/http/showoff/Gemfile.lock @@ -0,0 +1,73 @@ +GEM + remote: https://rubygems.org/ + specs: + addressable (2.6.0) + public_suffix (>= 2.0.2, < 4.0) + commonmarker (0.18.2) + ruby-enum (~> 0.5) + concurrent-ruby (1.1.5) + daemons (1.3.1) + em-websocket (0.3.8) + addressable (>= 2.1.1) + eventmachine (>= 0.12.9) + eventmachine (1.2.7) + fidget (0.0.6) + ruby-dbus (< 0.15.0) + gli (2.18.0) + htmlentities (4.3.4) + i18n (1.6.0) + concurrent-ruby (~> 1.0) + iso-639 (0.2.8) + json (2.2.0) + mini_portile2 (2.4.0) + nokogiri (1.10.1) + mini_portile2 (~> 2.4.0) + parslet (1.8.2) + public_suffix (3.0.3) + rack (1.6.11) + rack-contrib (1.8.0) + rack (~> 1.4) + rack-protection (1.5.5) + rack + redcarpet (3.4.0) + ruby-dbus (0.14.1) + ruby-enum (0.7.2) + i18n + showoff (0.20.1) + commonmarker + fidget (>= 0.0.3) + gli (>= 2.0) + htmlentities + i18n + iso-639 + json + nokogiri + parslet + rack-contrib + redcarpet + sinatra (~> 1.3) + sinatra-websocket + thin (~> 1.3) + tilt (>= 2.0.3) + sinatra (1.4.8) + rack (~> 1.5) + rack-protection (~> 1.4) + tilt (>= 1.3, < 3) + sinatra-websocket (0.3.1) + em-websocket (~> 0.3.6) + eventmachine + thin (>= 1.3.1, < 2.0.0) + thin (1.7.2) + daemons (~> 1.0, >= 1.0.9) + eventmachine (~> 1.0, >= 1.0.4) + rack (>= 1, < 3) + tilt (2.0.9) + +PLATFORMS + ruby + +DEPENDENCIES + showoff + +BUNDLED WITH + 1.16.3 diff --git a/pkgs/servers/http/showoff/default.nix b/pkgs/servers/http/showoff/default.nix new file mode 100644 index 00000000000..79b92bdd7c5 --- /dev/null +++ b/pkgs/servers/http/showoff/default.nix @@ -0,0 +1,16 @@ +{ lib, bundlerApp }: + +bundlerApp { + pname = "showoff"; + gemdir = ./.; + exes = [ "showoff" ]; + + meta = with lib; { + description = "A slideshow presentation tool with a twist"; + longDescription = "It runs as a web application, with audience interactivity features. This means that your audience can follow along in their own browsers, can download supplemental materials, can participate in quizzes or polls, post questions for the presenter, etc. By default, their slideshows will synchronize with the presenter, but they can switch to self-navigation mode"; + homepage = https://puppetlabs.github.io/showoff/; + license = with licenses; mit; + platforms = platforms.unix; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/pkgs/servers/http/showoff/gemset.nix b/pkgs/servers/http/showoff/gemset.nix new file mode 100644 index 00000000000..334f09e8a0d --- /dev/null +++ b/pkgs/servers/http/showoff/gemset.nix @@ -0,0 +1,231 @@ +{ + addressable = { + dependencies = ["public_suffix"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bcm2hchn897xjhqj9zzsxf3n9xhddymj4lsclz508f4vw3av46l"; + type = "gem"; + }; + version = "2.6.0"; + }; + commonmarker = { + dependencies = ["ruby-enum"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "122dy5mzx4p86flpzyg3raf742zp5ab9bjr7zk29p3ixpncf0rdk"; + type = "gem"; + }; + version = "0.18.2"; + }; + concurrent-ruby = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an"; + type = "gem"; + }; + version = "1.1.5"; + }; + daemons = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0l5gai3vd4g7aqff0k1mp41j9zcsvm2rbwmqn115a325k9r7pf4w"; + type = "gem"; + }; + version = "1.3.1"; + }; + em-websocket = { + dependencies = ["addressable" "eventmachine"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xkb1rc6dd3y5s7qsp4wqrri3n9gwsbvnwwv6xwgp241jxdpp4iq"; + type = "gem"; + }; + version = "0.3.8"; + }; + eventmachine = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r"; + type = "gem"; + }; + version = "1.2.7"; + }; + fidget = { + dependencies = ["ruby-dbus"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04g2846wjlb8ms5041lv37aqs4jzsziwv58bxg7yzc61pdvi4ksb"; + type = "gem"; + }; + version = "0.0.6"; + }; + gli = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "133glfzsq67ykmdsgp251s9kddg9x4qki2jpbjv25h3hawlql4hs"; + type = "gem"; + }; + version = "2.18.0"; + }; + htmlentities = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj"; + type = "gem"; + }; + version = "4.3.4"; + }; + i18n = { + dependencies = ["concurrent-ruby"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hfxnlyr618s25xpafw9mypa82qppjccbh292c4l3bj36az7f6wl"; + type = "gem"; + }; + version = "1.6.0"; + }; + iso-639 = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10k1gpkkbxbasgjzh4hd32ygxzjb5312rphipm46ryxkpx556zzz"; + type = "gem"; + }; + version = "0.2.8"; + }; + json = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sx97bm9by389rbzv8r1f43h06xcz8vwi3h5jv074gvparql7lcx"; + type = "gem"; + }; + version = "2.2.0"; + }; + mini_portile2 = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; + type = "gem"; + }; + version = "2.4.0"; + }; + nokogiri = { + dependencies = ["mini_portile2"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09zll7c6j7xr6wyvh5mm5ncj6pkryp70ybcsxdbw1nyphx5dh184"; + type = "gem"; + }; + version = "1.10.1"; + }; + parslet = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12nrzfwjphjlakb9pmpj70hgjwgzvnr8i1zfzddifgyd44vspl88"; + type = "gem"; + }; + version = "1.8.2"; + }; + public_suffix = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l"; + type = "gem"; + }; + version = "3.0.3"; + }; + rack = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1g9926ln2lw12lfxm4ylq1h6nl0rafl10za3xvjzc87qvnqic87f"; + type = "gem"; + }; + version = "1.6.11"; + }; + rack-contrib = { + dependencies = ["rack"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1l7m0av4pjl5p64l8j7pkip1jwhkp80a8kc2j7b9lrwh04fgx5wx"; + type = "gem"; + }; + version = "1.8.0"; + }; + rack-protection = { + dependencies = ["rack"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0my0wlw4a5l3hs79jkx2xzv7djhajgf8d28k8ai1ddlnxxb0v7ss"; + type = "gem"; + }; + version = "1.5.5"; + }; + redcarpet = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0h9qz2hik4s9knpmbwrzb3jcp3vc5vygp9ya8lcpl7f1l9khmcd7"; + type = "gem"; + }; + version = "3.4.0"; + }; + ruby-dbus = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "16lsqdwas6ngyyvq51l7lynj5ayis17zm5hpsg5x3m3n6r5k2gv4"; + type = "gem"; + }; + version = "0.14.1"; + }; + ruby-enum = { + dependencies = ["i18n"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0h62avini866kxpjzqxlqnajma3yvj0y25l6hn9h2mv5pp6fcrhx"; + type = "gem"; + }; + version = "0.7.2"; + }; + showoff = { + dependencies = ["commonmarker" "fidget" "gli" "htmlentities" "i18n" "iso-639" "json" "nokogiri" "parslet" "rack-contrib" "redcarpet" "sinatra" "sinatra-websocket" "thin" "tilt"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "14884kh7vrp5b72dpn7q26h49y7igxqza72girkv1h28qx4kqw4r"; + type = "gem"; + }; + version = "0.20.1"; + }; + sinatra = { + dependencies = ["rack" "rack-protection" "tilt"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0byxzl7rx3ki0xd7aiv1x8mbah7hzd8f81l65nq8857kmgzj1jqq"; + type = "gem"; + }; + version = "1.4.8"; + }; + sinatra-websocket = { + dependencies = ["em-websocket" "eventmachine" "thin"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0as52mfw34z3ba6qjab009h2rdn0za0iwrc42kw948hbb8qzcm5m"; + type = "gem"; + }; + version = "0.3.1"; + }; + thin = { + dependencies = ["daemons" "eventmachine" "rack"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nagbf9pwy1vg09k6j4xqhbjjzrg5dwzvkn4ffvlj76fsn6vv61f"; + type = "gem"; + }; + version = "1.7.2"; + }; + tilt = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ca4k0clwf0rkvy7726x4nxpjxkpv67w043i39saxgldxd97zmwz"; + type = "gem"; + }; + version = "2.0.9"; + }; +} \ No newline at end of file diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index a4940850cc5..30a6aa5aeec 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jackett-${version}"; - version = "0.10.846"; + version = "0.11.170"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "1y1hqa7w04zs6lhyg8624b5iv8l0ni4v887mckaqqp312xmhniq7"; + sha256 = "1qnlbndls62mvpllg8177l7mihldz5nwig63gfk7in2r0b0477l3"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 7021b2210bd..6099c51fd3f 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }: buildGoPackage rec { - version = "6.1.1"; + version = "6.1.2"; name = "grafana-${version}"; goPackagePath = "github.com/grafana/grafana"; @@ -11,12 +11,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "1n7wr89sbpdi1zpqvmyidp9y0mjdnxgdv7bj6gc9kkp6dskqk1r8"; + sha256 = "0vnzjnlnapzn3w91jagpywk36c5zhbj8ccwpk16ivyxx715hmwql"; }; srcStatic = fetchurl { url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "0dbqqm3z2z4bxgq9y2lbjx6znjgqmsyz8qih2b4z6j3fvixfa5sw"; + sha256 = "161z0rh48f3ifvhwhhgbqd7zp9pmp3pk8gk5kfnlh9apnjyq1hw1"; }; postPatch = '' diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index 03080376ec2..548049cdac5 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -2,8 +2,8 @@ let goPackagePath = "github.com/prometheus/prometheus"; - - generic = { version, sha256, ... }@attrs: +in rec { + buildPrometheus = { version, sha256, doCheck ? true, ... }@attrs: let attrs' = builtins.removeAttrs attrs ["version" "sha256"]; in buildGoPackage ({ name = "prometheus-${version}"; @@ -17,8 +17,6 @@ let inherit sha256; }; - doCheck = true; - buildFlagsArray = let t = "${goPackagePath}/vendor/github.com/prometheus/common/version"; in '' -ldflags= -X ${t}.Version=${version} @@ -43,14 +41,14 @@ let platforms = platforms.unix; }; } // attrs'); -in rec { - prometheus_1 = generic { + + prometheus_1 = buildPrometheus { version = "1.8.2"; sha256 = "088flpg3qgnj9afl9vbaa19v2s1d21yxy38nrlv5m7cxwy2pi5pv"; }; - prometheus_2 = generic { - version = "2.6.0"; - sha256 = "1d9zwzs280pw9zspqwp7xx3ji04lfg2v9l5qhrfy3y633ghcmpxz"; + prometheus_2 = buildPrometheus { + version = "2.8.1"; + sha256 = "0x8w0qdh4lcf19nmdlhvgzpy08c2a932d3k49cjwhi5npcsf858n"; }; } diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index d0d0480e5ea..3138cc8ee1e 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "nextcloud-${version}"; - version = "15.0.5"; + version = "15.0.6"; src = fetchurl { url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2"; - sha256 = "125ra0rdgk17d8s80i54w0s58dqvjgkdpcxbczchqd3sg6dqcqa6"; + sha256 = "1k1c0wlrhdpkvwf7iq8yjxd8gqmmj7dyd913rqzrg9jbnvz5jc82"; }; installPhase = '' diff --git a/pkgs/servers/nosql/cassandra/generic.nix b/pkgs/servers/nosql/cassandra/generic.nix index 6ac087241ce..eaa85e69bec 100644 --- a/pkgs/servers/nosql/cassandra/generic.nix +++ b/pkgs/servers/nosql/cassandra/generic.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python, makeWrapper, gawk, bash, getopt, procps -, which, jre, version, sha256, ... +, which, jre, version, sha256, coreutils, ... }: let @@ -43,16 +43,30 @@ stdenv.mkDerivation rec { rmdir $out/doc fi - for cmd in bin/cassandra bin/nodetool bin/sstablekeys \ - bin/sstableloader bin/sstableupgrade \ - tools/bin/cassandra-stress tools/bin/cassandra-stressd \ - tools/bin/sstablemetadata tools/bin/sstableofflinerelevel \ - tools/bin/token-generator tools/bin/sstablelevelreset; do + + for cmd in bin/cassandra \ + bin/nodetool \ + bin/sstablekeys \ + bin/sstableloader \ + bin/sstablescrub \ + bin/sstableupgrade \ + bin/sstableutil \ + bin/sstableverify \ + tools/bin/cassandra-stress \ + tools/bin/cassandra-stressd \ + tools/bin/sstabledump \ + tools/bin/sstableexpiredblockers \ + tools/bin/sstablelevelreset \ + tools/bin/sstablemetadata \ + tools/bin/sstableofflinerelevel \ + tools/bin/sstablerepairedset \ + tools/bin/sstablesplit \ + tools/bin/token-generator; do # check if file exists because some bin tools don't exist across all # cassandra versions if [ -f $out/$cmd ]; then - wrapProgram $out/$cmd \ + makeWrapper $out/$cmd $out/bin/$(${coreutils}/bin/basename "$cmd") \ --suffix-each LD_LIBRARY_PATH : ${libPath} \ --prefix PATH : ${binPath} \ --set JAVA_HOME ${jre} diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index d6cade72a87..16f21391dee 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, lua }: stdenv.mkDerivation rec { - version = "5.0.3"; + version = "5.0.4"; name = "redis-${version}"; src = fetchurl { url = "http://download.redis.io/releases/${name}.tar.gz"; - sha256 = "00iyv4ybcgm5xxcm85lg1p99q7xijm05cpadlxa65chpz3fv9472"; + sha256 = "1pc7r4lbvhiyln7y529798nv8lxasky6sgspw49hkxi3bbzwxs9w"; }; buildInputs = [ lua ]; diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix index 9a4f96c46ba..5c69ecd39f8 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.15.2.793"; - vsnHash = "782228f99"; - sha256 = "0yxxyczcgbk79bhnbbqpsj6vg1hi2pbf88r29dmskr664a5s0sk7"; + version = "1.15.3.876"; + vsnHash = "ad6e39743"; + sha256 = "01g7wccm01kg3nhf3qrmwcn20nkpv0bqz6zqv2gq5v03ps58h6g5"; }; in stdenv.mkDerivation rec { diff --git a/pkgs/servers/search/elasticsearch/default.nix b/pkgs/servers/search/elasticsearch/default.nix index d22395e0133..df7324a73f4 100644 --- a/pkgs/servers/search/elasticsearch/default.nix +++ b/pkgs/servers/search/elasticsearch/default.nix @@ -19,20 +19,20 @@ stdenv.mkDerivation (rec { url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}.tar.gz"; sha256 = if enableUnfree - then "096i8xiy7mfwlslym9mkjb2f5vqdcqhk65583526rcybqxc2zkqp" - else "0j3q02c4rw8272w07hm64sk5ssmj4gj8s3qigsbrq5pgf8b03fvs"; + then "1qh6iz3qhw8zcvxfss5w3h89zarwvk6dp5bbbag7c30kh94gkqvv" + else "13v8qpslanfn5w81qvbg0aqh510yfbl3x59kisvdkz9ifhjbcavi"; }; patches = [ ./es-home-6.x.patch ]; postPatch = '' substituteInPlace bin/elasticsearch-env --replace \ - "ES_CLASSPATH=\"\$ES_HOME/lib/\*\"" \ + "ES_CLASSPATH=\"\$ES_HOME/lib/*\"" \ "ES_CLASSPATH=\"$out/lib/*\"" substituteInPlace bin/elasticsearch-cli --replace \ - "ES_CLASSPATH=\"\$ES_CLASSPATH:\$ES_HOME/\$additional_classpath_directory/\*\"" \ - "ES_CLASSPATH=\"\$ES_CLASSPATH:$out/\$additional_classpath_directory/\*\"" + "ES_CLASSPATH=\"\$ES_CLASSPATH:\$ES_HOME/\$additional_classpath_directory/*\"" \ + "ES_CLASSPATH=\"\$ES_CLASSPATH:$out/\$additional_classpath_directory/*\"" ''; buildInputs = [ makeWrapper jre_headless utillinux ] diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix index 4451b010446..0cb1dd5bfc1 100644 --- a/pkgs/servers/search/elasticsearch/plugins.nix +++ b/pkgs/servers/search/elasticsearch/plugins.nix @@ -27,7 +27,7 @@ in { version = "${elk6Version}"; src = fetchurl { url = "https://github.com/vhyza/elasticsearch-analysis-lemmagen/releases/download/v${version}/${name}-plugin.zip"; - sha256 = "0299ldqwjn1gn44yyjiqjrxvs6mlclhzl1dbn6xlgg1a2lkaal4v"; + sha256 = "0mf8lpf40bjpzfj9lkhrg7c3xinzvg7aby3vd6h92g9i676xs8ri"; }; meta = with stdenv.lib; { homepage = https://github.com/vhyza/elasticsearch-analysis-lemmagen; @@ -42,7 +42,7 @@ in { version = "${elk6Version}"; src = pkgs.fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/discovery-ec2/discovery-ec2-${elk6Version}.zip"; - sha256 = "1mg9knbc4r21kaiqnmkd8nzf2i23w5zxqnxyz484q0l2jf4hlkq1"; + sha256 = "05z4vmi29fzfqzid7fdh6h6pjwgd1dz1mhhjgjz9plpvpzymjiln"; }; meta = with stdenv.lib; { homepage = https://github.com/elastic/elasticsearch/tree/master/plugins/discovery-ec2; @@ -54,10 +54,10 @@ in { search_guard = esPlugin rec { name = "elastic-search-guard-${version}"; pluginName = "search-guard"; - version = "${elk6Version}-23.2"; + version = "${elk6Version}-24.3"; src = fetchurl rec { url = "mirror://maven/com/floragunn/search-guard-6/${version}/search-guard-6-${version}.zip"; - sha256 = "05310wyxzhylxr0dfgzr10pb0pak30ry8r97g49n6iqj8dw3csnb"; + sha256 = "17gif45fbi4vj9qrzv075fkr7d2sp0naa5bjjj9gvfgqyl2flj7g"; }; meta = with stdenv.lib; { homepage = https://github.com/floragunncom/search-guard; diff --git a/pkgs/servers/serviio/default.nix b/pkgs/servers/serviio/default.nix index 876cc01592e..5c4a3543143 100644 --- a/pkgs/servers/serviio/default.nix +++ b/pkgs/servers/serviio/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "serviio-${version}"; - version = "1.9"; + version = "1.10.1"; src = fetchurl { url = "http://download.serviio.org/releases/${name}-linux.tar.gz"; - sha256 = "0vi9dwpdrk087gpi0xib0hwpvdmaf9g99nfdfx2r3wmmdzw7wysl"; + sha256 = "0gxa29mzwvr0xvvi2qizyvf68ma5s3405q58f1pcgadbb68jwx6q"; }; phases = ["unpackPhase" "installPhase"]; diff --git a/pkgs/servers/sql/postgresql/ext/pg_cron.nix b/pkgs/servers/sql/postgresql/ext/pg_cron.nix index 959c2c38252..99dd8be4e9f 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_cron.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_cron.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "pg_cron-${version}"; - version = "1.1.2"; + version = "1.1.3"; buildInputs = [ postgresql ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "citusdata"; repo = "pg_cron"; rev = "refs/tags/v${version}"; - sha256 = "0n74dx1wkg9qxvjhnx03028465ap3p97v2kzqww833dws1wqk5m1"; + sha256 = "0r33b0c9gdx2lfhrp7lpkif3j8qbzxmnywkcs2rcxwf9qzrb4vnj"; }; installPhase = '' diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index d78707fc65f..57dc1bdaa7e 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -12,13 +12,13 @@ }: stdenv.mkDerivation rec { name = "postgis-${version}"; - version = "2.5.1"; + version = "2.5.2"; outputs = [ "out" "doc" ]; src = fetchurl { url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"; - sha256 = "14bsh4kflp4bxilypkpmhrpldknc9s9vgiax8yfhxbisyib704zv"; + sha256 = "0pnva72f2w4jcgnl1y7nw5rdly4ipx3hji4c9yc9s0hna1n2ijxn"; }; buildInputs = [ libxml2 postgresql geos proj perl gdal json_c pkgconfig ]; diff --git a/pkgs/servers/web-apps/codimd/CodeMirror/default.nix b/pkgs/servers/web-apps/codimd/CodeMirror/default.nix index e4899597de4..fa636601ec2 100644 --- a/pkgs/servers/web-apps/codimd/CodeMirror/default.nix +++ b/pkgs/servers/web-apps/codimd/CodeMirror/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, buildEnv, fetchFromGitHub, nodejs-6_x, phantomjs2, which }: +{ stdenv, pkgs, buildEnv, fetchFromGitHub, nodejs-8_x, phantomjs2, which }: let nodePackages = import ./node.nix { @@ -22,7 +22,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ which ]; - buildInputs = [ nodejs-6_x phantomjs-prebuilt ] ++ (stdenv.lib.attrVals [ + buildInputs = [ nodejs-8_x phantomjs-prebuilt ] ++ (stdenv.lib.attrVals [ "blint-^1" "node-static-0.6.0" "rollup-^0.41.0" diff --git a/pkgs/servers/web-apps/codimd/CodeMirror/generate.sh b/pkgs/servers/web-apps/codimd/CodeMirror/generate.sh index c42da7340c3..7a9fa8cb1cf 100755 --- a/pkgs/servers/web-apps/codimd/CodeMirror/generate.sh +++ b/pkgs/servers/web-apps/codimd/CodeMirror/generate.sh @@ -1,7 +1,7 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -p nodePackages.node2nix -node2nix -6 -i deps.json \ +node2nix -8 -i deps.json \ -e ../../../../development/node-packages/node-env.nix \ --no-copy-node-env \ -c node.nix diff --git a/pkgs/servers/web-apps/codimd/CodeMirror/node-packages.nix b/pkgs/servers/web-apps/codimd/CodeMirror/node-packages.nix index a2d475d5831..8059c901a95 100644 --- a/pkgs/servers/web-apps/codimd/CodeMirror/node-packages.nix +++ b/pkgs/servers/web-apps/codimd/CodeMirror/node-packages.nix @@ -13,13 +13,13 @@ let sha1 = "45e37fb39e8da3f25baee3ff5369e2bb5f22017a"; }; }; - "acorn-5.7.1" = { + "acorn-5.7.3" = { name = "acorn"; packageName = "acorn"; - version = "5.7.1"; + version = "5.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-5.7.1.tgz"; - sha512 = "d+nbxBUGKg7Arpsvbnlq61mc12ek3EY8EQldM3GPAhWJ1UVxC6TDGbIvUMNU6obBX3i1+ptCIzV4vq0gFPEGVQ=="; + url = "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz"; + sha512 = "T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw=="; }; }; "acorn-jsx-3.0.1" = { @@ -40,13 +40,13 @@ let sha1 = "48ead0f4a8eb16995a17a0db9ffc6acaada4ba68"; }; }; - "ajv-5.5.2" = { + "ajv-6.10.0" = { name = "ajv"; packageName = "ajv"; - version = "5.5.2"; + version = "6.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz"; - sha1 = "73b5eeca3fab653e3d3f9422b341ad42205dc965"; + url = "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz"; + sha512 = "nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg=="; }; }; "align-text-0.1.4" = { @@ -148,13 +148,13 @@ let sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; }; }; - "big.js-3.2.0" = { + "big.js-5.2.2" = { name = "big.js"; packageName = "big.js"; - version = "3.2.0"; + version = "5.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz"; - sha512 = "+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q=="; + url = "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz"; + sha512 = "vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="; }; }; "brace-expansion-1.1.11" = { @@ -238,22 +238,13 @@ let sha1 = "4b475760ff80264c762c3a1719032e91c7fea0d1"; }; }; - "co-4.6.0" = { - name = "co"; - packageName = "co"; - version = "4.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/co/-/co-4.6.0.tgz"; - sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"; - }; - }; - "combined-stream-1.0.6" = { + "combined-stream-1.0.7" = { name = "combined-stream"; packageName = "combined-stream"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz"; - sha1 = "723e7df6e801ac5613113a7e445a9b69cb632818"; + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz"; + sha512 = "brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w=="; }; }; "concat-map-0.0.1" = { @@ -337,13 +328,13 @@ let sha1 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389"; }; }; - "es6-promise-4.2.4" = { + "es6-promise-4.2.6" = { name = "es6-promise"; packageName = "es6-promise"; - version = "4.2.4"; + version = "4.2.6"; 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.6.tgz"; + sha512 = "aRVgGdnmW2OiySVPUC9e6m+plolMAJKjZnQlCwNSuK5yQ0JN61DZSO1X1Ufd1foqWRAlig0rhduTCHe7sVtK5Q=="; }; }; "escape-string-regexp-1.0.5" = { @@ -391,13 +382,13 @@ let sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; }; }; - "fast-deep-equal-1.1.0" = { + "fast-deep-equal-2.0.1" = { name = "fast-deep-equal"; packageName = "fast-deep-equal"; - version = "1.1.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz"; - sha1 = "c053477817c86b51daa853c81e059b733d023614"; + url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz"; + sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"; }; }; "fast-json-stable-stringify-2.0.0" = { @@ -427,13 +418,13 @@ let sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; }; }; - "form-data-2.3.2" = { + "form-data-2.3.3" = { name = "form-data"; packageName = "form-data"; - version = "2.3.2"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz"; - sha1 = "4970498be604c20c005d4f5c23aecd21d6b49099"; + url = "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz"; + sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ=="; }; }; "fs-extra-1.0.0" = { @@ -454,13 +445,13 @@ let sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; }; }; - "graceful-fs-4.1.11" = { + "graceful-fs-4.1.15" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.1.11"; + version = "4.1.15"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz"; - sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz"; + sha512 = "6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="; }; }; "har-schema-2.0.0" = { @@ -472,13 +463,13 @@ let sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; }; }; - "har-validator-5.1.0" = { + "har-validator-5.1.3" = { name = "har-validator"; packageName = "har-validator"; - version = "5.1.0"; + version = "5.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.0.tgz"; - sha512 = "+qnmNjI4OfH2ipQ9VQOw23bBd/ibtfbVdK2fYbY4acTDqKTW/YDp9McimZdDbG8iV9fZizUqQMD5xvriB146TA=="; + url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz"; + sha512 = "sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g=="; }; }; "has-ansi-2.0.0" = { @@ -598,13 +589,13 @@ let sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; }; }; - "json-schema-traverse-0.3.1" = { + "json-schema-traverse-0.4.1" = { name = "json-schema-traverse"; packageName = "json-schema-traverse"; - version = "0.3.1"; + version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz"; - sha1 = "349a6d44c53a51de89b40805c5d5e59b417d3340"; + url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; + sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; }; }; "json-stringify-safe-5.0.1" = { @@ -616,13 +607,13 @@ let sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; }; }; - "json5-0.5.1" = { + "json5-1.0.1" = { name = "json5"; packageName = "json5"; - version = "0.5.1"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz"; - sha1 = "1eade7acc012034ad84e2396767ead9fa5495821"; + url = "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz"; + sha512 = "aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow=="; }; }; "jsonfile-2.4.0" = { @@ -679,13 +670,13 @@ let sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"; }; }; - "loader-utils-1.1.0" = { + "loader-utils-1.2.3" = { name = "loader-utils"; packageName = "loader-utils"; - version = "1.1.0"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz"; - sha1 = "c98aef488bcceda2ffb5e2de646d6a754429f5cd"; + url = "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz"; + sha512 = "fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA=="; }; }; "longest-1.0.1" = { @@ -715,22 +706,22 @@ let sha1 = "591d84d3653a6b0b4a3b9df8de5aa8108e72e5e0"; }; }; - "mime-db-1.35.0" = { + "mime-db-1.38.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.35.0"; + version = "1.38.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.35.0.tgz"; - sha512 = "JWT/IcCTsB0Io3AhWUMjRqucrHSPsSf2xKLaRldJVULioggvkJvggZ3VXNNSRkCddE6D+BUI4HEIZIA2OjwIvg=="; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz"; + sha512 = "bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg=="; }; }; - "mime-types-2.1.19" = { + "mime-types-2.1.22" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.19"; + version = "2.1.22"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.19.tgz"; - sha512 = "P1tKYHVSZ6uFo26mtnve4HQFE3koh1UWVkp8YUC+ESBHe945xWSoXuHHiGarDqcEZ+whpCDnlNw5LON0kLo+sw=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.22.tgz"; + sha512 = "aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog=="; }; }; "minimatch-3.0.4" = { @@ -859,13 +850,13 @@ let sha1 = "e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"; }; }; - "psl-1.1.29" = { + "psl-1.1.31" = { name = "psl"; packageName = "psl"; - version = "1.1.29"; + version = "1.1.31"; src = fetchurl { - url = "https://registry.npmjs.org/psl/-/psl-1.1.29.tgz"; - sha512 = "AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ=="; + url = "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz"; + sha512 = "/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw=="; }; }; "punycode-1.4.1" = { @@ -877,6 +868,15 @@ let sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; }; }; + "punycode-2.1.1" = { + name = "punycode"; + packageName = "punycode"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz"; + sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; + }; + }; "qs-6.5.2" = { name = "qs"; packageName = "qs"; @@ -985,13 +985,13 @@ let sha512 = "try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA=="; }; }; - "sshpk-1.14.2" = { + "sshpk-1.16.1" = { name = "sshpk"; packageName = "sshpk"; - version = "1.14.2"; + version = "1.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz"; - sha1 = "c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98"; + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz"; + sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg=="; }; }; "string_decoder-1.1.1" = { @@ -1093,6 +1093,15 @@ let sha1 = "8b38b10cacdef63337b8b24e4ff86d45aea529a8"; }; }; + "uri-js-4.2.2" = { + name = "uri-js"; + packageName = "uri-js"; + version = "4.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz"; + sha512 = "KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ=="; + }; + }; "util-deprecate-1.0.2" = { name = "util-deprecate"; packageName = "util-deprecate"; @@ -1186,7 +1195,7 @@ in sha512 = "6RwH3oJYMujQNd38WWU+jUSRqWfECrmpfL8o3fn3Q3fE9nn5iAktLZJHGEHqeecownbZZwZneTLbaNbIWwU9/A=="; }; dependencies = [ - sources."acorn-5.7.1" + sources."acorn-5.7.3" sources."ansi-styles-1.0.0" sources."chalk-0.4.0" sources."has-color-0.1.7" @@ -1200,7 +1209,7 @@ in homepage = http://github.com/marijnh/blint; }; production = true; - bypassCache = false; + bypassCache = true; }; "node-static-0.6.0" = nodeEnv.buildNodePackage { name = "node-static"; @@ -1216,7 +1225,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "phantomjs-prebuilt-^2.1.12" = nodeEnv.buildNodePackage { name = "phantomjs-prebuilt"; @@ -1227,7 +1236,7 @@ in sha1 = "efd212a4a3966d3647684ea8ba788549be2aefef"; }; dependencies = [ - sources."ajv-5.5.2" + sources."ajv-6.10.0" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" @@ -1236,28 +1245,27 @@ in sources."bcrypt-pbkdf-1.0.2" sources."buffer-from-1.1.1" sources."caseless-0.12.0" - sources."co-4.6.0" - 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."dashdash-1.14.1" sources."debug-2.6.9" sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.2" - sources."es6-promise-4.2.4" + sources."es6-promise-4.2.6" sources."extend-3.0.2" sources."extract-zip-1.6.7" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.1.0" + sources."fast-deep-equal-2.0.1" 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.3" sources."fs-extra-1.0.0" sources."getpass-0.1.7" - sources."graceful-fs-4.1.11" + sources."graceful-fs-4.1.15" sources."har-schema-2.0.0" - sources."har-validator-5.1.0" + sources."har-validator-5.1.3" sources."hasha-2.2.0" sources."http-signature-1.2.0" sources."inherits-2.0.3" @@ -1268,14 +1276,14 @@ 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-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsonfile-2.4.0" sources."jsprim-1.4.1" sources."kew-0.7.0" sources."klaw-1.3.1" - sources."mime-db-1.35.0" - sources."mime-types-2.1.19" + sources."mime-db-1.38.0" + sources."mime-types-2.1.22" sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."ms-2.0.0" @@ -1286,21 +1294,26 @@ in sources."pinkie-promise-2.0.1" sources."process-nextick-args-2.0.0" sources."progress-1.1.8" - sources."psl-1.1.29" - sources."punycode-1.4.1" + sources."psl-1.1.31" + sources."punycode-2.1.1" sources."qs-6.5.2" sources."readable-stream-2.3.6" sources."request-2.88.0" sources."request-progress-2.0.1" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."sshpk-1.14.2" + sources."sshpk-1.16.1" sources."string_decoder-1.1.1" sources."throttleit-1.0.0" - sources."tough-cookie-2.4.3" + (sources."tough-cookie-2.4.3" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."typedarray-0.0.6" + sources."uri-js-4.2.2" sources."util-deprecate-1.0.2" sources."uuid-3.3.2" sources."verror-1.10.0" @@ -1314,7 +1327,7 @@ in license = "Apache-2.0"; }; production = true; - bypassCache = false; + bypassCache = true; }; "rollup-^0.41.0" = nodeEnv.buildNodePackage { name = "rollup"; @@ -1335,7 +1348,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "rollup-plugin-buble-^0.15.0" = nodeEnv.buildNodePackage { name = "rollup-plugin-buble"; @@ -1375,7 +1388,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "rollup-watch-^3.2.0" = nodeEnv.buildNodePackage { name = "rollup-watch"; @@ -1395,7 +1408,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "uglify-js-^2.8.15" = nodeEnv.buildNodePackage { name = "uglify-js"; @@ -1430,7 +1443,7 @@ in license = "BSD-2-Clause"; }; production = true; - bypassCache = false; + bypassCache = true; }; "url-loader-^0.5.7" = nodeEnv.buildNodePackage { name = "url-loader"; @@ -1441,11 +1454,12 @@ in sha512 = "B7QYFyvv+fOBqBVeefsxv6koWWtjmHaMFT6KZWti4KRw8YUD/hOU+3AECvXuzyVawIBx3z7zQRejXCDSO5kk1Q=="; }; dependencies = [ - sources."big.js-3.2.0" + sources."big.js-5.2.2" sources."emojis-list-2.1.0" - sources."json5-0.5.1" - sources."loader-utils-1.1.0" + sources."json5-1.0.1" + sources."loader-utils-1.2.3" sources."mime-1.3.6" + sources."minimist-1.2.0" ]; buildInputs = globalBuildInputs; meta = { @@ -1454,6 +1468,6 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; } \ No newline at end of file diff --git a/pkgs/servers/web-apps/codimd/CodeMirror/node.nix b/pkgs/servers/web-apps/codimd/CodeMirror/node.nix index 85aedb8a5a4..7f95c2b8801 100644 --- a/pkgs/servers/web-apps/codimd/CodeMirror/node.nix +++ b/pkgs/servers/web-apps/codimd/CodeMirror/node.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}: let nodeEnv = import ../../../../development/node-packages/node-env.nix { @@ -14,4 +14,4 @@ in import ./node-packages.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; -} \ No newline at end of file +} diff --git a/pkgs/servers/web-apps/codimd/default.nix b/pkgs/servers/web-apps/codimd/default.nix index d5e84cce984..79ad58dddd8 100644 --- a/pkgs/servers/web-apps/codimd/default.nix +++ b/pkgs/servers/web-apps/codimd/default.nix @@ -1,9 +1,26 @@ { stdenv, pkgs, buildEnv, fetchFromGitHub, makeWrapper -, fetchpatch, nodejs-6_x, phantomjs2, runtimeShell }: +, fetchpatch, nodejs-8_x, phantomjs2, runtimeShell }: let - nodePackages = import ./node.nix { - inherit pkgs; - system = stdenv.system; + nodePackages = let + # Some packages fail to install with ENOTCACHED due to a mistakenly added + # package-lock.json that bundles optional dependencies not resolved with `node2nix. + # See also https://github.com/svanderburg/node2nix/issues/134 + dontInstall = n: v: + if builtins.match ".*babel.*" n == null + then v + else v.override { dontNpmInstall = true; }; + + packages = stdenv.lib.mapAttrs (dontInstall) ( + import ./node.nix { + inherit pkgs; + system = stdenv.system; + } + ); + in packages // { + "js-url-^2.3.0" = packages."js-url-^2.3.0".overrideAttrs (_: { + # Don't download chromium (this isn't needed anyway for our case). + PUPPETEER_SKIP_CHROMIUM_DOWNLOAD = "1"; + }); }; addPhantomjs = (pkgs: @@ -14,12 +31,17 @@ let drvName = drv: (builtins.parseDrvName drv).name; linkNodeDeps = ({ pkg, deps, name ? "" }: - nodePackages.${pkg}.override (oldAttrs: { - postInstall = stdenv.lib.concatStringsSep "\n" (map (dep: '' - ln -s ${nodePackages.${dep}}/lib/node_modules/${drvName dep} \ - $out/lib/node_modules/${if name != "" then name else drvName pkg}/node_modules - '') deps - ); + let + targetModule = if name != "" then name else drvName pkg; + in nodePackages.${pkg}.override (oldAttrs: { + postInstall = '' + mkdir -p $out/lib/node_modules/${targetModule}/node_modules + ${stdenv.lib.concatStringsSep "\n" (map (dep: '' + ln -s ${nodePackages.${dep}}/lib/node_modules/${drvName dep} \ + $out/lib/node_modules/${targetModule}/node_modules/${drvName dep} + '') deps + )} + ''; }) ); @@ -43,8 +65,6 @@ let linkNodeDeps args ) [ { pkg = "select2-^3.5.2-browserify"; deps = [ "url-loader-^0.5.7" ]; } - { pkg = "js-sequence-diagrams-^1000000.0.6"; - deps = [ "lodash-^4.17.4" ]; } { pkg = "ionicons-~2.0.1"; deps = [ "url-loader-^0.5.7" "file-loader-^0.9.0" ]; } { pkg = "font-awesome-^4.7.0"; @@ -66,18 +86,34 @@ let name = "codimd-env"; paths = pkgsWithPhantomjs ++ pkgsWithExtraDeps ++ [ codemirror + + # `js-sequence-diagrams` has been removed from the registry + # and replaced by a security holding package (the tarballs weren't published by + # upstream as upstream only supports bower, + # see https://github.com/bramp/js-sequence-diagrams/issues/212). + # + # As the tarballs are still there, we build this manually for now until codimd's upstream + # has resolved the issue. + (import ./js-sequence-diagrams { + inherit pkgs; + nodejs = nodejs-8_x; + extraNodePackages = { + lodash = nodePackages."lodash-^4.17.4"; + eve = nodePackages."eve-^0.5.4"; + }; + }) ] ++ filterNodePackagesToList [ "bootstrap" "codemirror-git+https://github.com/hackmdio/CodeMirror.git" "font-awesome" "ionicons" - "js-sequence-diagrams" "js-url" "markdown-it" "markdown-pdf" -"node-uuid" + "node-uuid" "raphael-git+https://github.com/dmitrybaranovskiy/raphael" "select2-browserify" + "url-loader" ] nodePackages; }; @@ -107,7 +143,7 @@ stdenv.mkDerivation rec { inherit name version src; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ nodejs-6_x ]; + buildInputs = [ nodejs-8_x ]; NODE_PATH = "${nodeEnv}/lib/node_modules"; @@ -118,6 +154,12 @@ stdenv.mkDerivation rec { }) ]; + postPatch = '' + # due to the `dontNpmInstall` workaround, `node_modules/.bin` isn't created anymore. + substituteInPlace package.json \ + --replace "webpack --config" "${nodejs-8_x}/bin/node ./node_modules/webpack/bin/webpack.js --config" + ''; + buildPhase = '' ln -s ${nodeEnv}/lib/node_modules node_modules npm run build @@ -127,7 +169,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cat > $out/bin/codimd <=4.14" = nodeEnv.buildNodePackage { name = "express"; packageName = "express"; - version = "4.16.3"; + version = "4.16.4"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.16.3.tgz"; - sha1 = "6af8a502350db3246ecc4becf6b5a34d22f7ed53"; + url = "https://registry.npmjs.org/express/-/express-4.16.4.tgz"; + sha512 = "j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg=="; }; dependencies = [ sources."accepts-1.3.5" sources."array-flatten-1.1.1" - sources."body-parser-1.18.2" + sources."body-parser-1.18.3" sources."bytes-3.0.0" sources."content-disposition-0.5.2" sources."content-type-1.0.4" @@ -14467,31 +15190,26 @@ in sources."forwarded-0.1.2" sources."fresh-0.5.2" sources."http-errors-1.6.3" - sources."iconv-lite-0.4.19" + sources."iconv-lite-0.4.23" sources."inherits-2.0.3" sources."ipaddr.js-1.8.0" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.4.1" - sources."mime-db-1.35.0" - sources."mime-types-2.1.19" + sources."mime-db-1.38.0" + sources."mime-types-2.1.22" sources."ms-2.0.0" sources."negotiator-0.6.1" sources."on-finished-2.3.0" sources."parseurl-1.3.2" sources."path-to-regexp-0.1.7" sources."proxy-addr-2.0.4" - sources."qs-6.5.1" + sources."qs-6.5.2" sources."range-parser-1.2.0" - (sources."raw-body-2.3.2" // { - dependencies = [ - sources."depd-1.1.1" - sources."http-errors-1.6.2" - sources."setprototypeof-1.0.3" - ]; - }) - sources."safe-buffer-5.1.1" + sources."raw-body-2.3.3" + sources."safe-buffer-5.1.2" + sources."safer-buffer-2.1.2" sources."send-0.16.2" sources."serve-static-1.13.2" sources."setprototypeof-1.1.0" @@ -14508,7 +15226,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "express-session-^1.14.2" = nodeEnv.buildNodePackage { name = "express-session"; @@ -14525,7 +15243,7 @@ in sources."debug-2.6.9" sources."depd-1.1.2" sources."ms-2.0.0" - sources."on-headers-1.0.1" + sources."on-headers-1.0.2" sources."parseurl-1.3.2" sources."random-bytes-1.0.0" sources."uid-safe-2.1.5" @@ -14538,7 +15256,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "file-saver-^1.3.3" = nodeEnv.buildNodePackage { name = "file-saver"; @@ -14555,7 +15273,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "flowchart.js-^1.6.4" = nodeEnv.buildNodePackage { name = "flowchart.js"; @@ -14576,7 +15294,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "font-awesome-^4.7.0" = nodeEnv.buildNodePackage { name = "font-awesome"; @@ -14593,7 +15311,7 @@ in license = "(OFL-1.1 AND MIT)"; }; production = true; - bypassCache = false; + bypassCache = true; }; "formidable-^1.0.17" = nodeEnv.buildNodePackage { name = "formidable"; @@ -14610,7 +15328,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "gist-embed-~2.6.0" = nodeEnv.buildNodePackage { name = "gist-embed"; @@ -14627,15 +15345,15 @@ in license = "BSD-2-Clause"; }; production = true; - bypassCache = false; + bypassCache = true; }; "graceful-fs-^4.1.11" = nodeEnv.buildNodePackage { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.1.11"; + version = "4.1.15"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz"; - sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz"; + sha512 = "6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="; }; buildInputs = globalBuildInputs; meta = { @@ -14644,46 +15362,24 @@ in license = "ISC"; }; production = true; - bypassCache = false; + bypassCache = true; }; "handlebars-^4.0.6" = nodeEnv.buildNodePackage { name = "handlebars"; packageName = "handlebars"; - version = "4.0.11"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/handlebars/-/handlebars-4.0.11.tgz"; - sha1 = "630a35dfe0294bc281edae6ffc5d329fc7982dcc"; + url = "https://registry.npmjs.org/handlebars/-/handlebars-4.1.1.tgz"; + sha512 = "3Zhi6C0euYZL5sM0Zcy7lInLXKQ+YLcF/olbN010mzGQ4XVm50JeyBnMqofHh696GrciGruC7kCcApPDJvVgwA=="; }; dependencies = [ - sources."align-text-0.1.4" - sources."amdefine-1.0.1" - sources."async-1.5.2" - sources."camelcase-1.2.1" - sources."center-align-0.1.3" - (sources."cliui-2.1.0" // { - dependencies = [ - sources."wordwrap-0.0.2" - ]; - }) - sources."decamelize-1.2.0" - sources."is-buffer-1.1.6" - sources."kind-of-3.2.2" - sources."lazy-cache-1.0.4" - sources."longest-1.0.1" + sources."commander-2.19.0" sources."minimist-0.0.10" + sources."neo-async-2.6.0" sources."optimist-0.6.1" - sources."repeat-string-1.6.1" - sources."right-align-0.1.3" - sources."source-map-0.4.4" - (sources."uglify-js-2.8.29" // { - dependencies = [ - sources."source-map-0.5.7" - ]; - }) - sources."uglify-to-browserify-1.0.2" - sources."window-size-0.1.0" + sources."source-map-0.6.1" + sources."uglify-js-3.5.3" sources."wordwrap-0.0.3" - sources."yargs-3.10.0" ]; buildInputs = globalBuildInputs; meta = { @@ -14692,30 +15388,32 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "helmet-^3.3.0" = nodeEnv.buildNodePackage { name = "helmet"; packageName = "helmet"; - version = "3.13.0"; + version = "3.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/helmet/-/helmet-3.13.0.tgz"; - sha512 = "rCYnlbOBkeP6fCo4sXZNu91vIAWlbVgolwnUANtnzPANRf2kJZ2a6yjRnCqG23Tyl2/ExvJ8bDg4xUdNCIWnrw=="; + url = "https://registry.npmjs.org/helmet/-/helmet-3.16.0.tgz"; + sha512 = "rsTKRogc5OYGlvSHuq5QsmOsOzF6uDoMqpfh+Np8r23+QxDq+SUx90Rf8HyIKQVl7H6NswZEwfcykinbAeZ6UQ=="; }; dependencies = [ sources."camelize-1.0.0" sources."content-security-policy-builder-2.0.0" sources."dasherize-2.0.0" + sources."depd-2.0.0" sources."dns-prefetch-control-0.1.0" sources."dont-sniff-mimetype-1.0.0" sources."expect-ct-0.1.1" + sources."feature-policy-0.2.0" sources."frameguard-3.0.0" sources."helmet-crossdomain-0.3.0" sources."helmet-csp-2.7.1" sources."hide-powered-by-1.0.0" sources."hpkp-2.0.0" - sources."hsts-2.1.0" - sources."ienoopen-1.0.0" + sources."hsts-2.2.0" + sources."ienoopen-1.1.0" sources."nocache-2.0.0" sources."platform-1.3.5" sources."referrer-policy-1.1.0" @@ -14728,7 +15426,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "highlight.js-~9.12.0" = nodeEnv.buildNodePackage { name = "highlight.js"; @@ -14745,7 +15443,7 @@ in license = "BSD-3-Clause"; }; production = true; - bypassCache = false; + bypassCache = true; }; "i18n-^0.8.3" = nodeEnv.buildNodePackage { name = "i18n"; @@ -14759,7 +15457,11 @@ in sources."abbrev-1.1.1" (sources."ambi-2.5.0" // { dependencies = [ - sources."typechecker-4.5.0" + (sources."typechecker-4.7.0" // { + dependencies = [ + sources."editions-2.1.3" + ]; + }) ]; }) sources."async-1.5.2" @@ -14767,9 +15469,14 @@ in sources."brace-expansion-1.1.11" sources."concat-map-0.0.1" sources."csextends-1.2.0" - sources."debug-3.1.0" + sources."debug-4.1.1" sources."eachr-2.0.4" sources."editions-1.3.4" + (sources."errlop-1.1.1" // { + dependencies = [ + sources."editions-2.1.3" + ]; + }) (sources."extendr-2.1.0" // { dependencies = [ sources."typechecker-2.0.8" @@ -14781,7 +15488,7 @@ in ]; }) sources."glob-6.0.4" - sources."graceful-fs-4.1.11" + sources."graceful-fs-4.1.15" sources."ignorefs-1.2.0" sources."ignorepatterns-1.1.0" sources."inflight-1.0.6" @@ -14791,14 +15498,15 @@ in sources."messageformat-0.3.1" sources."minimatch-3.0.4" sources."minimist-1.2.0" - sources."ms-2.0.0" - sources."mustache-2.3.0" + sources."ms-2.1.1" + sources."mustache-3.0.1" sources."nopt-3.0.6" sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."safefs-3.2.2" sources."scandirectory-2.5.0" - sources."sprintf-js-1.1.1" + sources."semver-5.7.0" + sources."sprintf-js-1.1.2" sources."taskgroup-4.3.1" sources."typechecker-2.1.0" sources."watchr-2.4.13" @@ -14812,31 +15520,31 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "imgur-git+https://github.com/hackmdio/node-imgur.git" = nodeEnv.buildNodePackage { name = "imgur"; packageName = "imgur"; - version = "0.2.0"; + version = "0.3.1"; src = fetchgit { url = "https://github.com/hackmdio/node-imgur.git"; - rev = "0fba6d163428c946942cd2c3022634cbb8754e38"; - sha256 = "b7dc96b2ccefdca42dca10138d3121b405b2b7e70ffa055ce225ad63bc3f3c7a"; + rev = "4fe9cfa3893505c34c49067483d85d3ad4376cd6"; + sha256 = "60c728bf600ffe40db8c0b902fc1974b50f367a2bff2cea6bb9f1e9d29fb3dae"; }; dependencies = [ - sources."ajv-5.5.2" + sources."ajv-6.10.0" + sources."asap-2.0.6" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.7.0" + sources."aws4-1.8.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."brace-expansion-1.1.11" sources."caseless-0.12.0" - sources."co-4.6.0" - sources."combined-stream-1.0.6" - sources."commander-2.16.0" + sources."combined-stream-1.0.7" + sources."commander-2.20.0" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" @@ -14844,14 +15552,15 @@ in sources."ecc-jsbn-0.1.2" sources."extend-3.0.2" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.1.0" + sources."fast-deep-equal-2.0.1" 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.3" + sources."fs.realpath-1.0.0" sources."getpass-0.1.7" - sources."glob-4.5.3" + sources."glob-7.1.3" sources."har-schema-2.0.0" - sources."har-validator-5.0.3" + sources."har-validator-5.1.3" sources."http-signature-1.2.0" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -14859,36 +15568,46 @@ 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-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.35.0" - sources."mime-types-2.1.19" - sources."minimatch-2.0.10" - sources."oauth-sign-0.8.2" + sources."mime-db-1.38.0" + sources."mime-types-2.1.22" + sources."minimatch-3.0.4" + sources."oauth-sign-0.9.0" sources."once-1.4.0" + sources."path-is-absolute-1.0.1" sources."performance-now-2.1.0" - sources."punycode-1.4.1" - sources."q-1.5.1" + sources."pop-iterate-1.0.1" + sources."psl-1.1.31" + sources."punycode-2.1.1" + sources."q-2.0.3" sources."qs-6.5.2" - sources."request-2.87.0" + sources."request-2.88.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."sshpk-1.14.2" - sources."tough-cookie-2.3.4" + sources."sshpk-1.16.1" + (sources."tough-cookie-2.4.3" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" + sources."uri-js-4.2.2" sources."uuid-3.3.2" sources."verror-1.10.0" + sources."weak-map-1.0.5" sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; meta = { description = "Upload images to imgur.com"; homepage = https://github.com/kaimallea/node-imgur; + license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "ionicons-~2.0.1" = nodeEnv.buildNodePackage { name = "ionicons"; @@ -14905,7 +15624,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "jquery-^3.1.1" = nodeEnv.buildNodePackage { name = "jquery"; @@ -14922,7 +15641,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "jquery-mousewheel-^3.1.13" = nodeEnv.buildNodePackage { name = "jquery-mousewheel"; @@ -14938,7 +15657,7 @@ in homepage = https://github.com/jquery/jquery-mousewheel; }; production = true; - bypassCache = false; + bypassCache = true; }; "jquery-ui-^1.12.1" = nodeEnv.buildNodePackage { name = "jquery-ui"; @@ -14955,7 +15674,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "js-cookie-^2.1.3" = nodeEnv.buildNodePackage { name = "js-cookie"; @@ -14972,29 +15691,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; - }; - "js-sequence-diagrams-^1000000.0.6" = nodeEnv.buildNodePackage { - name = "js-sequence-diagrams"; - packageName = "js-sequence-diagrams"; - version = "1000000.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/js-sequence-diagrams/-/js-sequence-diagrams-1000000.0.6.tgz"; - sha1 = "e95db01420479c5ccbc12046af1da42fde649e5c"; - }; - dependencies = [ - sources."eve-git://github.com/adobe-webplatform/eve.git#eef80ed" - sources."raphael-2.1.4" - sources."underscore-1.4.4" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Fucks NPM and draws simple SVG sequence diagrams from textual representation of the diagram"; - homepage = "https://github.com/Moeditor/js-sequence-diagrams#readme"; - license = "BSD-2-Clause"; - }; - production = true; - bypassCache = false; + bypassCache = true; }; "js-url-^2.3.0" = nodeEnv.buildNodePackage { name = "js-url"; @@ -15005,75 +15702,55 @@ in sha1 = "e0c02b622e89710749399f440d49056e72f70078"; }; dependencies = [ - sources."ajv-5.5.2" + sources."agent-base-4.2.1" sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" - sources."asn1-0.2.4" - sources."assert-plus-1.0.0" - sources."async-1.0.0" - sources."asynckit-0.4.0" - sources."aws-sign2-0.7.0" - sources."aws4-1.7.0" + sources."ansi-styles-3.2.1" + sources."async-limiter-1.0.0" sources."balanced-match-1.0.0" - sources."bcrypt-pbkdf-1.0.2" sources."brace-expansion-1.1.11" sources."buffer-from-1.1.1" - sources."caseless-0.12.0" - sources."chalk-1.1.3" + sources."chalk-2.4.2" sources."cli-1.0.1" - sources."co-4.6.0" - sources."colors-1.0.3" - sources."combined-stream-1.0.6" - sources."commander-2.16.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."commander-2.19.0" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" sources."console-browserify-1.1.0" sources."core-util-is-1.0.2" - sources."cycle-1.0.3" - sources."dashdash-1.14.1" sources."date-now-0.1.4" - sources."debug-2.6.9" - sources."delayed-stream-1.0.0" - (sources."dom-serializer-0.1.0" // { + sources."debug-4.1.1" + (sources."dom-serializer-0.1.1" // { dependencies = [ - sources."domelementtype-1.1.3" - sources."entities-1.1.1" + sources."entities-1.1.2" ]; }) - sources."domelementtype-1.3.0" + sources."domelementtype-1.3.1" sources."domhandler-2.3.0" sources."domutils-1.5.1" sources."duplexer-0.1.1" - sources."ecc-jsbn-0.1.2" sources."entities-1.0.0" - sources."es6-promise-4.2.4" + sources."es6-promise-4.2.6" + sources."es6-promisify-5.0.0" sources."escape-string-regexp-1.0.5" - sources."eventemitter2-0.4.14" + sources."eventemitter2-5.0.1" sources."exit-0.1.2" - sources."extend-3.0.2" - sources."extract-zip-1.6.7" - 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."extract-zip-1.6.7" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) sources."fd-slicer-1.0.1" sources."figures-1.7.0" - sources."forever-agent-0.6.1" - sources."form-data-2.3.2" - sources."fs-extra-1.0.0" sources."fs.realpath-1.0.0" - sources."getpass-0.1.7" - sources."glob-7.1.2" - sources."graceful-fs-4.1.11" - sources."grunt-contrib-jshint-1.1.0" - sources."grunt-contrib-qunit-2.0.0" - sources."grunt-contrib-uglify-3.4.0" - sources."grunt-lib-phantomjs-1.1.0" + sources."glob-7.1.3" + sources."grunt-contrib-jshint-2.1.0" + sources."grunt-contrib-qunit-3.1.0" + sources."grunt-contrib-uglify-4.0.1" sources."gzip-size-3.0.0" - sources."har-schema-2.0.0" - sources."har-validator-5.0.3" sources."has-ansi-2.0.0" - sources."hasha-2.2.0" + sources."has-flag-3.0.0" sources."hooker-0.2.3" (sources."htmlparser2-3.8.3" // { dependencies = [ @@ -15082,80 +15759,55 @@ in sources."string_decoder-0.10.31" ]; }) - sources."http-signature-1.2.0" + (sources."https-proxy-agent-2.2.1" // { + dependencies = [ + sources."debug-3.2.6" + ]; + }) sources."inflight-1.0.6" sources."inherits-2.0.3" - sources."is-stream-1.1.0" - sources."is-typedarray-1.0.0" sources."isarray-1.0.0" - sources."isexe-2.0.0" - sources."isstream-0.1.2" - sources."jsbn-0.1.1" - sources."jshint-2.9.6" - sources."json-schema-0.2.3" - sources."json-schema-traverse-0.3.1" - sources."json-stringify-safe-5.0.1" - sources."jsonfile-2.4.0" - sources."jsprim-1.4.1" - sources."kew-0.7.0" - sources."klaw-1.3.1" - sources."lodash-4.17.10" - sources."maxmin-2.1.0" - sources."mime-db-1.35.0" - sources."mime-types-2.1.19" + sources."jshint-2.10.2" + sources."lodash-4.17.11" + (sources."maxmin-2.1.0" // { + dependencies = [ + sources."ansi-styles-2.2.1" + sources."chalk-1.1.3" + sources."supports-color-2.0.0" + ]; + }) + sources."mime-2.4.1" 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."number-is-nan-1.0.1" - sources."oauth-sign-0.8.2" sources."object-assign-4.1.1" sources."once-1.4.0" - sources."package-1.0.1" + sources."p-each-series-1.0.0" + sources."p-reduce-1.0.0" sources."path-is-absolute-1.0.1" sources."pend-1.2.0" - sources."performance-now-2.1.0" - sources."phantom-4.0.12" - sources."phantomjs-prebuilt-2.1.16" - sources."pinkie-2.0.4" - sources."pinkie-promise-2.0.1" sources."pretty-bytes-3.0.1" sources."process-nextick-args-2.0.0" - sources."progress-1.1.8" - sources."punycode-1.4.1" - sources."qs-6.5.2" + sources."progress-2.0.3" + sources."proxy-from-env-1.0.0" + sources."puppeteer-1.14.0" sources."readable-stream-2.3.6" - sources."request-2.87.0" - sources."request-progress-2.0.1" - sources."rimraf-2.6.2" + sources."rimraf-2.6.3" sources."safe-buffer-5.1.2" - sources."safer-buffer-2.1.2" - sources."semver-5.5.0" sources."shelljs-0.3.0" sources."source-map-0.6.1" - sources."split-1.0.1" - sources."sshpk-1.14.2" - sources."stack-trace-0.0.10" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-json-comments-1.0.4" - sources."supports-color-2.0.0" - sources."temporary-0.0.8" - sources."throttleit-1.0.0" - sources."through-2.3.8" - sources."tough-cookie-2.3.4" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" + sources."supports-color-5.5.0" sources."typedarray-0.0.6" - sources."uglify-js-3.4.6" - sources."unicode-5.2.0-0.7.5" + sources."uglify-js-3.5.3" sources."uri-path-1.0.0" sources."util-deprecate-1.0.2" - sources."uuid-3.3.2" - sources."verror-1.10.0" - sources."which-1.3.1" - sources."winston-2.4.3" sources."wrappy-1.0.2" + sources."ws-6.2.1" sources."yauzl-2.4.1" ]; buildInputs = globalBuildInputs; @@ -15165,15 +15817,15 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "js-yaml-^3.7.0" = nodeEnv.buildNodePackage { name = "js-yaml"; packageName = "js-yaml"; - version = "3.12.0"; + version = "3.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz"; - sha512 = "PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A=="; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz"; + sha512 = "YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw=="; }; dependencies = [ sources."argparse-1.0.10" @@ -15187,7 +15839,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "jsdom-nogyp-^0.8.3" = nodeEnv.buildNodePackage { name = "jsdom-nogyp"; @@ -15198,72 +15850,71 @@ in sha1 = "924b3f03cfe487dfcdf6375e6324252ceb80d0cc"; }; dependencies = [ - sources."ajv-5.5.2" + sources."ajv-6.10.0" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.7.0" + sources."aws4-1.8.0" sources."bcrypt-pbkdf-1.0.2" 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."cssom-0.2.5" (sources."cssstyle-0.2.37" // { dependencies = [ - sources."cssom-0.3.4" + sources."cssom-0.3.6" ]; }) sources."dashdash-1.14.1" sources."delayed-stream-1.0.0" - (sources."dom-serializer-0.1.0" // { - dependencies = [ - sources."domelementtype-1.1.3" - ]; - }) - sources."domelementtype-1.3.0" + sources."dom-serializer-0.1.1" + sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" sources."ecc-jsbn-0.1.2" - sources."entities-1.1.1" + sources."entities-1.1.2" sources."extend-3.0.2" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.1.0" + sources."fast-deep-equal-2.0.1" 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.3" sources."getpass-0.1.7" sources."har-schema-2.0.0" - sources."har-validator-5.0.3" - sources."htmlparser2-3.9.2" + sources."har-validator-5.1.3" + sources."htmlparser2-3.10.1" sources."http-signature-1.2.0" sources."inherits-2.0.3" sources."is-typedarray-1.0.0" - sources."isarray-1.0.0" sources."isstream-0.1.2" sources."jsbn-0.1.1" sources."json-schema-0.2.3" - sources."json-schema-traverse-0.3.1" + sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.35.0" - sources."mime-types-2.1.19" + sources."mime-db-1.38.0" + sources."mime-types-2.1.22" sources."nwmatcher-1.3.9" - sources."oauth-sign-0.8.2" + sources."oauth-sign-0.9.0" sources."performance-now-2.1.0" - sources."process-nextick-args-2.0.0" - sources."punycode-1.4.1" + sources."psl-1.1.31" + sources."punycode-2.1.1" sources."qs-6.5.2" - sources."readable-stream-2.3.6" - sources."request-2.87.0" + sources."readable-stream-3.3.0" + sources."request-2.88.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."sshpk-1.14.2" - sources."string_decoder-1.1.1" - sources."tough-cookie-2.3.4" + sources."sshpk-1.16.1" + sources."string_decoder-1.2.0" + (sources."tough-cookie-2.4.3" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" + sources."uri-js-4.2.2" sources."util-deprecate-1.0.2" sources."uuid-3.3.2" sources."verror-1.10.0" @@ -15278,7 +15929,7 @@ in }; }; production = true; - bypassCache = false; + bypassCache = true; }; "keymaster-^1.6.2" = nodeEnv.buildNodePackage { name = "keymaster"; @@ -15294,7 +15945,7 @@ in homepage = https://github.com/madrobby/keymaster; }; production = true; - bypassCache = false; + bypassCache = true; }; "list.js-^1.5.0" = nodeEnv.buildNodePackage { name = "list.js"; @@ -15305,7 +15956,7 @@ in sha1 = "a4cbfc8281ddefc02fdb2d30c8748bfae25fbcda"; }; dependencies = [ - sources."string-natural-compare-2.0.2" + sources."string-natural-compare-2.0.3" ]; buildInputs = globalBuildInputs; meta = { @@ -15314,15 +15965,15 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "lodash-^4.17.4" = nodeEnv.buildNodePackage { name = "lodash"; packageName = "lodash"; - version = "4.17.10"; + version = "4.17.11"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz"; - sha512 = "UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg=="; + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz"; + sha512 = "cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="; }; buildInputs = globalBuildInputs; meta = { @@ -15331,7 +15982,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "lz-string-1.4.4" = nodeEnv.buildNodePackage { name = "lz-string"; @@ -15348,7 +15999,7 @@ in license = "WTFPL"; }; production = true; - bypassCache = false; + bypassCache = true; }; "markdown-it-^8.2.2" = nodeEnv.buildNodePackage { name = "markdown-it"; @@ -15360,11 +16011,11 @@ in }; dependencies = [ sources."argparse-1.0.10" - sources."entities-1.1.1" - sources."linkify-it-2.0.3" + sources."entities-1.1.2" + sources."linkify-it-2.1.0" sources."mdurl-1.0.1" sources."sprintf-js-1.0.3" - sources."uc.micro-1.0.5" + sources."uc.micro-1.0.6" ]; buildInputs = globalBuildInputs; meta = { @@ -15373,7 +16024,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "markdown-it-abbr-^1.0.4" = nodeEnv.buildNodePackage { name = "markdown-it-abbr"; @@ -15390,7 +16041,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "markdown-it-container-^2.0.0" = nodeEnv.buildNodePackage { name = "markdown-it-container"; @@ -15407,7 +16058,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "markdown-it-deflist-^2.0.1" = nodeEnv.buildNodePackage { name = "markdown-it-deflist"; @@ -15424,7 +16075,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "markdown-it-emoji-^1.3.0" = nodeEnv.buildNodePackage { name = "markdown-it-emoji"; @@ -15441,7 +16092,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "markdown-it-footnote-^3.0.1" = nodeEnv.buildNodePackage { name = "markdown-it-footnote"; @@ -15458,7 +16109,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "markdown-it-imsize-^2.0.1" = nodeEnv.buildNodePackage { name = "markdown-it-imsize"; @@ -15475,7 +16126,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "markdown-it-ins-^2.0.0" = nodeEnv.buildNodePackage { name = "markdown-it-ins"; @@ -15492,7 +16143,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "markdown-it-mark-^2.0.0" = nodeEnv.buildNodePackage { name = "markdown-it-mark"; @@ -15509,7 +16160,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "markdown-it-mathjax-^2.0.0" = nodeEnv.buildNodePackage { name = "markdown-it-mathjax"; @@ -15526,7 +16177,7 @@ in license = "ISC"; }; production = true; - bypassCache = false; + bypassCache = true; }; "markdown-it-regexp-^0.4.0" = nodeEnv.buildNodePackage { name = "markdown-it-regexp"; @@ -15543,7 +16194,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "markdown-it-sub-^1.0.0" = nodeEnv.buildNodePackage { name = "markdown-it-sub"; @@ -15560,7 +16211,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "markdown-it-sup-^1.0.0" = nodeEnv.buildNodePackage { name = "markdown-it-sup"; @@ -15577,7 +16228,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "markdown-pdf-^8.0.0" = nodeEnv.buildNodePackage { name = "markdown-pdf"; @@ -15588,7 +16239,7 @@ in sha512 = "lpRyiNptdwArH6bG6Y8X13G5Qr/usTTDXxTp7zjhwxJ+cQO7Z6A1T265ZiN6PVDLzRNxxtcquQCIOpTC0U1NFg=="; }; dependencies = [ - sources."ajv-5.5.2" + sources."ajv-6.10.0" sources."argparse-0.1.16" sources."asn1-0.2.4" sources."assert-plus-1.0.0" @@ -15596,13 +16247,12 @@ in sources."asynckit-0.4.0" sources."autolinker-0.15.3" sources."aws-sign2-0.7.0" - sources."aws4-1.7.0" + sources."aws4-1.8.0" sources."bcrypt-pbkdf-1.0.2" sources."buffer-from-1.1.1" sources."caseless-0.12.0" - sources."co-4.6.0" - sources."combined-stream-1.0.6" - sources."commander-2.16.0" + sources."combined-stream-1.0.7" + sources."commander-2.20.0" sources."concat-stream-1.6.2" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" @@ -15610,22 +16260,22 @@ in sources."delayed-stream-1.0.0" sources."duplexer-0.1.1" sources."ecc-jsbn-0.1.2" - sources."es6-promise-4.2.4" + sources."es6-promise-4.2.6" sources."extend-3.0.2" sources."extract-zip-1.6.7" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.1.0" + sources."fast-deep-equal-2.0.1" 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.3" sources."fs-extra-1.0.0" sources."getpass-0.1.7" - sources."graceful-fs-4.1.11" + sources."graceful-fs-4.1.15" sources."har-schema-2.0.0" - sources."har-validator-5.0.3" + sources."har-validator-5.1.3" sources."hasha-2.2.0" - sources."highlight.js-9.12.0" + sources."highlight.js-9.15.6" sources."http-signature-1.2.0" sources."inherits-2.0.3" sources."is-stream-1.1.0" @@ -15635,18 +16285,18 @@ 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-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsonfile-2.4.0" sources."jsprim-1.4.1" sources."kew-0.7.0" sources."klaw-1.3.1" - sources."mime-db-1.35.0" - sources."mime-types-2.1.19" + sources."mime-db-1.38.0" + sources."mime-types-2.1.22" sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."ms-2.0.0" - sources."oauth-sign-0.8.2" + sources."oauth-sign-0.9.0" sources."os-tmpdir-1.0.2" sources."pend-1.2.0" sources."performance-now-2.1.0" @@ -15655,27 +16305,33 @@ in sources."pinkie-promise-2.0.1" sources."process-nextick-args-2.0.0" sources."progress-1.1.8" - sources."punycode-1.4.1" + sources."psl-1.1.31" + sources."punycode-2.1.1" sources."qs-6.5.2" sources."readable-stream-2.3.6" sources."remarkable-1.7.1" - sources."request-2.87.0" + sources."request-2.88.0" sources."request-progress-2.0.1" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."series-stream-1.0.1" - sources."sshpk-1.14.2" + sources."sshpk-1.16.1" sources."stream-from-to-1.4.3" sources."string_decoder-1.1.1" sources."throttleit-1.0.0" - sources."through2-2.0.3" + sources."through2-2.0.5" sources."tmp-0.0.33" - sources."tough-cookie-2.3.4" + (sources."tough-cookie-2.4.3" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."typedarray-0.0.6" sources."underscore-1.7.0" sources."underscore.string-2.4.0" + sources."uri-js-4.2.2" sources."util-deprecate-1.0.2" sources."uuid-3.3.2" sources."verror-1.10.0" @@ -15690,7 +16346,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "mathjax-~2.7.0" = nodeEnv.buildNodePackage { name = "mathjax"; @@ -15707,7 +16363,7 @@ in license = "Apache-2.0"; }; production = true; - bypassCache = false; + bypassCache = true; }; "mermaid-~7.1.0" = nodeEnv.buildNodePackage { name = "mermaid"; @@ -15721,11 +16377,11 @@ in sources."d3-3.5.17" sources."dagre-d3-renderer-0.4.26" sources."dagre-layout-0.8.8" - sources."graphlib-2.1.5" + sources."graphlib-2.1.7" sources."graphlibrary-2.2.0" - sources."he-1.1.1" - sources."lodash-4.17.10" - sources."moment-2.22.2" + sources."he-1.2.0" + sources."lodash-4.17.11" + sources."moment-2.24.0" ]; buildInputs = globalBuildInputs; meta = { @@ -15734,7 +16390,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "mattermost-^3.4.0" = nodeEnv.buildNodePackage { name = "mattermost"; @@ -15746,7 +16402,7 @@ in }; dependencies = [ sources."async-1.5.2" - sources."combined-stream-1.0.6" + sources."combined-stream-1.0.7" sources."component-emitter-1.2.1" sources."cookiejar-2.0.6" sources."core-util-is-1.0.2" @@ -15759,8 +16415,8 @@ in sources."isarray-0.0.1" sources."methods-1.1.2" sources."mime-1.3.4" - sources."mime-db-1.35.0" - sources."mime-types-2.1.19" + sources."mime-db-1.38.0" + sources."mime-types-2.1.22" sources."ms-2.0.0" sources."qs-2.3.3" sources."readable-stream-1.0.27-1" @@ -15775,7 +16431,7 @@ in license = "Apache-2.0"; }; production = true; - bypassCache = false; + bypassCache = true; }; "meta-marked-^0.4.2" = nodeEnv.buildNodePackage { name = "meta-marked"; @@ -15799,7 +16455,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "method-override-^2.3.7" = nodeEnv.buildNodePackage { name = "method-override"; @@ -15823,7 +16479,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "minimist-^1.2.0" = nodeEnv.buildNodePackage { name = "minimist"; @@ -15840,7 +16496,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "minio-^6.0.0" = nodeEnv.buildNodePackage { name = "minio"; @@ -15861,9 +16517,9 @@ in sources."inherits-2.0.3" sources."isarray-1.0.0" sources."json-stream-1.0.0" - sources."lodash-4.17.10" - sources."mime-db-1.35.0" - sources."mime-types-2.1.19" + sources."lodash-4.17.11" + sources."mime-db-1.38.0" + sources."mime-types-2.1.22" sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."process-nextick-args-2.0.0" @@ -15896,15 +16552,15 @@ in license = "Apache-2.0"; }; production = true; - bypassCache = false; + bypassCache = true; }; "moment-^2.17.1" = nodeEnv.buildNodePackage { name = "moment"; packageName = "moment"; - version = "2.22.2"; + version = "2.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.22.2.tgz"; - sha1 = "3c257f9839fc0e93ff53149632239eb90783ff66"; + url = "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz"; + sha512 = "bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="; }; buildInputs = globalBuildInputs; meta = { @@ -15913,25 +16569,25 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "morgan-^1.7.0" = nodeEnv.buildNodePackage { 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=="; }; dependencies = [ - sources."basic-auth-2.0.0" + sources."basic-auth-2.0.1" sources."debug-2.6.9" sources."depd-1.1.2" sources."ee-first-1.1.1" sources."ms-2.0.0" sources."on-finished-2.3.0" - sources."on-headers-1.0.1" - sources."safe-buffer-5.1.1" + sources."on-headers-1.0.2" + sources."safe-buffer-5.1.2" ]; buildInputs = globalBuildInputs; meta = { @@ -15940,7 +16596,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "mysql-^2.12.0" = nodeEnv.buildNodePackage { name = "mysql"; @@ -15969,7 +16625,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "node-uuid-^1.4.7" = nodeEnv.buildNodePackage { name = "node-uuid"; @@ -15985,7 +16641,7 @@ in homepage = https://github.com/broofa/node-uuid; }; production = true; - bypassCache = false; + bypassCache = true; }; "octicons-~4.4.0" = nodeEnv.buildNodePackage { name = "octicons"; @@ -16002,7 +16658,7 @@ in license = "(OFL-1.1 OR MIT)"; }; production = true; - bypassCache = false; + bypassCache = true; }; "passport-^0.4.0" = nodeEnv.buildNodePackage { name = "passport"; @@ -16023,7 +16679,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "passport-dropbox-oauth2-^1.1.0" = nodeEnv.buildNodePackage { name = "passport-dropbox-oauth2"; @@ -16034,10 +16690,11 @@ in sha1 = "77c737636e4841944dfb82dfc42c3d8ab782c10e"; }; dependencies = [ + sources."base64url-3.0.1" sources."oauth-0.9.15" sources."passport-oauth-1.0.0" sources."passport-oauth1-1.1.0" - sources."passport-oauth2-1.4.0" + sources."passport-oauth2-1.5.0" sources."passport-strategy-1.0.0" sources."pkginfo-0.2.3" sources."uid2-0.0.3" @@ -16049,7 +16706,7 @@ in homepage = "https://github.com/florianheinemann/passport-dropbox-oauth2#readme"; }; production = true; - bypassCache = false; + bypassCache = true; }; "passport-facebook-^2.1.1" = nodeEnv.buildNodePackage { name = "passport-facebook"; @@ -16060,8 +16717,9 @@ in sha1 = "c39d0b52ae4d59163245a4e21a7b9b6321303311"; }; dependencies = [ + sources."base64url-3.0.1" sources."oauth-0.9.15" - sources."passport-oauth2-1.4.0" + sources."passport-oauth2-1.5.0" sources."passport-strategy-1.0.0" sources."uid2-0.0.3" sources."utils-merge-1.0.1" @@ -16073,7 +16731,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "passport-github-^1.1.0" = nodeEnv.buildNodePackage { name = "passport-github"; @@ -16084,8 +16742,9 @@ in sha1 = "8ce1e3fcd61ad7578eb1df595839e4aea12355d4"; }; dependencies = [ + sources."base64url-3.0.1" sources."oauth-0.9.15" - sources."passport-oauth2-1.4.0" + sources."passport-oauth2-1.5.0" sources."passport-strategy-1.0.0" sources."uid2-0.0.3" sources."utils-merge-1.0.1" @@ -16097,7 +16756,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "passport-gitlab2-^4.0.0" = nodeEnv.buildNodePackage { name = "passport-gitlab2"; @@ -16108,8 +16767,9 @@ in sha512 = "C/8/L8piHwv57J6fY/MzsEJc8yCkgsyBSzMWxfTfEHRvCaTkD08vJ5b/txydKrWrRPl4MHuZfisFnKlZHmq4yw=="; }; dependencies = [ + sources."base64url-3.0.1" sources."oauth-0.9.15" - sources."passport-oauth2-1.4.0" + sources."passport-oauth2-1.5.0" sources."passport-strategy-1.0.0" sources."uid2-0.0.3" sources."utils-merge-1.0.1" @@ -16121,7 +16781,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "passport-google-oauth20-^1.0.0" = nodeEnv.buildNodePackage { name = "passport-google-oauth20"; @@ -16132,8 +16792,9 @@ in sha1 = "3b960e8a1d70d1dbe794615c827c68c40392a5d0"; }; dependencies = [ + sources."base64url-3.0.1" sources."oauth-0.9.15" - sources."passport-oauth2-1.4.0" + sources."passport-oauth2-1.5.0" sources."passport-strategy-1.0.0" sources."uid2-0.0.3" sources."utils-merge-1.0.1" @@ -16145,27 +16806,27 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "passport-ldapauth-^2.0.0" = nodeEnv.buildNodePackage { name = "passport-ldapauth"; packageName = "passport-ldapauth"; - version = "2.0.0"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/passport-ldapauth/-/passport-ldapauth-2.0.0.tgz"; - sha1 = "42dff004417185d0a4d9f776a3eed8d4731fd689"; + url = "https://registry.npmjs.org/passport-ldapauth/-/passport-ldapauth-2.1.3.tgz"; + sha512 = "23n425UTasN6XhcXG0qQ0h0YrS/zfo8kNIEhSLfPsNpglhYhhQFfB1pmDc5RrH+Kiz5fKLkki5BpvkKHCwkixg=="; }; dependencies = [ sources."@types/body-parser-1.17.0" sources."@types/connect-3.4.32" - sources."@types/events-1.2.0" - sources."@types/express-4.16.0" - sources."@types/express-serve-static-core-4.16.0" + sources."@types/events-3.0.0" + sources."@types/express-4.16.1" + sources."@types/express-serve-static-core-4.16.2" sources."@types/ldapjs-1.0.3" - sources."@types/mime-2.0.0" - sources."@types/node-7.0.68" - sources."@types/passport-0.3.5" - sources."@types/range-parser-1.2.2" + sources."@types/mime-2.0.1" + sources."@types/node-10.14.4" + sources."@types/passport-1.0.0" + sources."@types/range-parser-1.2.3" sources."@types/serve-static-1.13.2" sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -16187,21 +16848,20 @@ in sources."assert-plus-0.1.5" ]; }) - sources."ldapauth-fork-4.0.2" + sources."ldapauth-fork-4.2.0" sources."ldapjs-1.0.2" - sources."lru-cache-4.1.3" + sources."lru-cache-5.1.1" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."moment-2.22.2" + sources."moment-2.24.0" sources."mv-2.1.1" - sources."nan-2.10.0" + sources."nan-2.13.2" sources."ncp-2.0.0" sources."once-1.4.0" sources."passport-strategy-1.0.0" sources."path-is-absolute-1.0.1" sources."precond-0.2.3" - sources."pseudomap-1.0.2" sources."rimraf-2.4.5" sources."safe-json-stringify-1.2.0" (sources."vasync-1.6.4" // { @@ -16211,7 +16871,7 @@ in }) sources."verror-1.10.0" sources."wrappy-1.0.2" - sources."yallist-2.1.2" + sources."yallist-3.0.3" ]; buildInputs = globalBuildInputs; meta = { @@ -16220,7 +16880,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "passport-local-^1.0.0" = nodeEnv.buildNodePackage { name = "passport-local"; @@ -16238,17 +16898,18 @@ in description = "Local username and password authentication strategy for Passport."; }; production = true; - bypassCache = false; + bypassCache = true; }; "passport-oauth2-^1.4.0" = nodeEnv.buildNodePackage { name = "passport-oauth2"; packageName = "passport-oauth2"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/passport-oauth2/-/passport-oauth2-1.4.0.tgz"; - sha1 = "f62f81583cbe12609be7ce6f160b9395a27b86ad"; + url = "https://registry.npmjs.org/passport-oauth2/-/passport-oauth2-1.5.0.tgz"; + sha512 = "kqBt6vR/5VlCK8iCx1/KpY42kQ+NEHZwsSyt4Y6STiNjU+wWICG1i8ucc1FapXDGO15C5O5VZz7+7vRzrDPXXQ=="; }; dependencies = [ + sources."base64url-3.0.1" sources."oauth-0.9.15" sources."passport-strategy-1.0.0" sources."uid2-0.0.3" @@ -16261,7 +16922,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "passport-twitter-^1.0.4" = nodeEnv.buildNodePackage { name = "passport-twitter"; @@ -16286,7 +16947,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "passport-saml-^0.31.0" = nodeEnv.buildNodePackage { name = "passport-saml"; @@ -16297,10 +16958,10 @@ in sha1 = "e4d654cab30f018bfd39056efe7bcfa770aab463"; }; dependencies = [ - sources."async-2.6.1" + sources."async-2.6.2" sources."ejs-2.6.1" - sources."lodash-4.17.10" - sources."node-forge-0.7.5" + sources."lodash-4.17.11" + sources."node-forge-0.7.6" sources."passport-strategy-1.0.0" sources."q-1.5.1" sources."sax-1.2.4" @@ -16323,7 +16984,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "passport.socketio-^3.7.0" = nodeEnv.buildNodePackage { name = "passport.socketio"; @@ -16343,15 +17004,15 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "pdfobject-^2.0.201604172" = nodeEnv.buildNodePackage { name = "pdfobject"; packageName = "pdfobject"; - version = "2.0.201604172"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/pdfobject/-/pdfobject-2.0.201604172.tgz"; - sha1 = "112edf93b98be121a5e780b06e7f5f78ad31ab3f"; + url = "https://registry.npmjs.org/pdfobject/-/pdfobject-2.1.1.tgz"; + sha512 = "QFktTHyjs4q/WhGFfV2RdAbscPdNkyQb/JfFz18cwILvs9ocDiYVFAEh/jgkKGv6my+r4nlbLjwj7BHFKAupHQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -16360,7 +17021,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "pg-^6.1.2" = nodeEnv.buildNodePackage { name = "pg"; @@ -16381,10 +17042,10 @@ in sources."pg-pool-1.8.0" sources."pg-types-1.13.0" sources."pgpass-1.0.2" - sources."postgres-array-1.0.2" + sources."postgres-array-1.0.3" sources."postgres-bytea-1.0.0" - sources."postgres-date-1.0.3" - sources."postgres-interval-1.1.2" + sources."postgres-date-1.0.4" + sources."postgres-interval-1.2.0" sources."semver-4.3.2" sources."split-1.0.1" sources."through-2.3.8" @@ -16397,7 +17058,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "pg-hstore-^2.3.2" = nodeEnv.buildNodePackage { name = "pg-hstore"; @@ -16416,22 +17077,22 @@ in homepage = https://github.com/scarney81/pg-hstore; }; production = true; - bypassCache = false; + bypassCache = true; }; "prismjs-^1.6.0" = nodeEnv.buildNodePackage { name = "prismjs"; packageName = "prismjs"; - version = "1.15.0"; + version = "1.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/prismjs/-/prismjs-1.15.0.tgz"; - sha512 = "Lf2JrFYx8FanHrjoV5oL8YHCclLQgbJcVZR+gikGGMqz6ub5QVWDTM6YIwm3BuPxM/LOV+rKns3LssXNLIf+DA=="; + url = "https://registry.npmjs.org/prismjs/-/prismjs-1.16.0.tgz"; + sha512 = "OA4MKxjFZHSvZcisLGe14THYsug/nF6O1f0pAJc0KN0wTyAcLqmsbE+lTGKSpyh+9pEW57+k6pg2AfYR+coyHA=="; }; dependencies = [ - sources."clipboard-2.0.1" + sources."clipboard-2.0.4" sources."delegate-3.2.0" sources."good-listener-1.2.2" sources."select-1.1.2" - sources."tiny-emitter-2.0.2" + sources."tiny-emitter-2.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -16440,33 +17101,33 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "randomcolor-^0.5.3" = nodeEnv.buildNodePackage { name = "randomcolor"; packageName = "randomcolor"; - version = "0.5.3"; + version = "0.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/randomcolor/-/randomcolor-0.5.3.tgz"; - sha1 = "7f90f2f2a7f6d5a52232161eeaeeaea9ac3b5815"; + url = "https://registry.npmjs.org/randomcolor/-/randomcolor-0.5.4.tgz"; + sha512 = "nYd4nmTuuwMFzHL6W+UWR5fNERGZeVauho8mrJDUSXdNDbao4rbrUwhuLgKC/j8VCS5+34Ria8CsTDuBjrIrQA=="; }; buildInputs = globalBuildInputs; meta = { description = "A tiny script for generating attractive random colors"; - homepage = https://randomcolor.llllll.li/; + homepage = https://randomcolor.lllllllllllllllll.com/; license = "CC0"; }; production = true; - bypassCache = false; + bypassCache = true; }; "raphael-git+https://github.com/dmitrybaranovskiy/raphael" = nodeEnv.buildNodePackage { name = "raphael"; packageName = "raphael"; - version = "2.2.7"; + version = "2.2.8"; src = fetchgit { url = "https://github.com/dmitrybaranovskiy/raphael"; - rev = "527c51b7b12f846f9ab0d5ddf14767912b569c7d"; - sha256 = "a9c2dece0218d3c82ad624fd55d7f81b7696fd0415bc0f52429f2d09497b25d8"; + rev = "bf3dcd35317f76f915bcd04ed9db36a1b3775c4d"; + sha256 = "79245aeeab138e9a5137196d290536394bd376bbd0e92883c91d7cee9bea3274"; }; dependencies = [ sources."eve-raphael-0.5.0" @@ -16478,7 +17139,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "readline-sync-^1.4.7" = nodeEnv.buildNodePackage { name = "readline-sync"; @@ -16495,60 +17156,65 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "request-^2.79.0" = nodeEnv.buildNodePackage { name = "request"; packageName = "request"; - version = "2.87.0"; + version = "2.88.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.87.0.tgz"; - sha512 = "fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw=="; + url = "https://registry.npmjs.org/request/-/request-2.88.0.tgz"; + sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg=="; }; dependencies = [ - sources."ajv-5.5.2" + sources."ajv-6.10.0" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.7.0" + sources."aws4-1.8.0" sources."bcrypt-pbkdf-1.0.2" 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."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.2" sources."extend-3.0.2" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.1.0" + sources."fast-deep-equal-2.0.1" 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.3" sources."getpass-0.1.7" sources."har-schema-2.0.0" - sources."har-validator-5.0.3" + sources."har-validator-5.1.3" sources."http-signature-1.2.0" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."jsbn-0.1.1" sources."json-schema-0.2.3" - sources."json-schema-traverse-0.3.1" + sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.35.0" - sources."mime-types-2.1.19" - sources."oauth-sign-0.8.2" + sources."mime-db-1.38.0" + sources."mime-types-2.1.22" + sources."oauth-sign-0.9.0" sources."performance-now-2.1.0" - sources."punycode-1.4.1" + sources."psl-1.1.31" + sources."punycode-2.1.1" sources."qs-6.5.2" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."sshpk-1.14.2" - sources."tough-cookie-2.3.4" + sources."sshpk-1.16.1" + (sources."tough-cookie-2.4.3" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" + sources."uri-js-4.2.2" sources."uuid-3.3.2" sources."verror-1.10.0" ]; @@ -16559,7 +17225,7 @@ in license = "Apache-2.0"; }; production = true; - bypassCache = false; + bypassCache = true; }; "reveal.js-~3.6.0" = nodeEnv.buildNodePackage { name = "reveal.js"; @@ -16576,7 +17242,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "scrypt-^6.0.3" = nodeEnv.buildNodePackage { name = "scrypt"; @@ -16587,7 +17253,7 @@ in sha1 = "04e014a5682b53fa50c2d5cce167d719c06d870d"; }; dependencies = [ - sources."nan-2.10.0" + sources."nan-2.13.2" ]; buildInputs = globalBuildInputs; meta = { @@ -16596,7 +17262,7 @@ in license = "zlib"; }; production = true; - bypassCache = false; + bypassCache = true; }; "select2-^3.5.2-browserify" = nodeEnv.buildNodePackage { name = "select2"; @@ -16612,30 +17278,30 @@ in homepage = http://ivaynberg.github.io/select2; }; production = true; - bypassCache = false; + bypassCache = true; }; "sequelize-^3.28.0" = nodeEnv.buildNodePackage { name = "sequelize"; packageName = "sequelize"; - version = "3.33.0"; + version = "3.34.0"; src = fetchurl { - url = "https://registry.npmjs.org/sequelize/-/sequelize-3.33.0.tgz"; - sha1 = "b0eb12b87223aded10e50a9d78506e0dd42f9208"; + url = "https://registry.npmjs.org/sequelize/-/sequelize-3.34.0.tgz"; + sha512 = "smJMYZ+JniYZ2Ja4GPaEC0/mkvCNnRl7mM958hZQP9dpXNbSS/wPFUNrn0mnfpWRk8Ob/3zo0H1qxQbXKgcIzw=="; }; dependencies = [ sources."@types/geojson-1.0.6" - sources."bluebird-3.5.1" + sources."bluebird-3.5.4" sources."debug-2.6.9" sources."depd-1.1.2" sources."dottie-1.1.1" sources."generic-pool-2.4.2" sources."inflection-1.12.0" - sources."lodash-4.17.10" - sources."moment-2.22.2" - sources."moment-timezone-0.5.21" + sources."lodash-4.17.11" + sources."moment-2.24.0" + sources."moment-timezone-0.5.23" sources."ms-2.0.0" sources."retry-as-promised-2.3.2" - sources."semver-5.5.0" + sources."semver-5.7.0" sources."shimmer-1.1.0" sources."terraformer-1.0.9" sources."terraformer-wkt-parser-1.2.0" @@ -16651,7 +17317,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "sequelize-cli-^2.5.1" = nodeEnv.buildNodePackage { name = "sequelize-cli"; @@ -16677,7 +17343,7 @@ in sources."array-uniq-1.0.3" sources."array-unique-0.2.1" sources."assign-symbols-1.0.0" - sources."atob-2.1.1" + sources."atob-2.1.2" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -16686,10 +17352,9 @@ in ]; }) sources."beeper-1.1.1" - sources."bluebird-3.5.1" + sources."bluebird-3.5.4" sources."brace-expansion-1.1.11" sources."braces-1.8.5" - sources."builtin-modules-1.1.1" (sources."cache-base-1.0.1" // { dependencies = [ sources."isobject-3.0.1" @@ -16726,15 +17391,15 @@ in sources."code-point-at-1.1.0" sources."collection-visit-1.0.0" sources."color-support-1.1.3" - sources."commander-2.16.0" + sources."commander-2.20.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."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" (sources."cross-spawn-5.1.0" // { dependencies = [ - sources."lru-cache-4.1.3" + sources."lru-cache-4.1.5" ]; }) sources."d-1.0.0" @@ -16751,15 +17416,15 @@ in sources."deprecated-0.0.1" sources."detect-file-0.1.0" sources."duplexer2-0.0.2" - (sources."editorconfig-0.13.3" // { + (sources."editorconfig-0.15.3" // { dependencies = [ - sources."lru-cache-3.2.0" - sources."semver-5.5.0" + sources."lru-cache-4.1.5" + sources."semver-5.7.0" ]; }) sources."end-of-stream-0.1.5" sources."error-ex-1.3.2" - sources."es5-ext-0.10.45" + sources."es5-ext-0.10.49" sources."es6-iterator-2.0.3" sources."es6-symbol-3.1.1" sources."es6-weak-map-2.0.2" @@ -16776,24 +17441,25 @@ in ]; }) sources."extglob-0.3.2" - sources."fancy-log-1.3.2" + sources."fancy-log-1.3.3" sources."filename-regex-2.0.1" sources."fill-range-2.2.4" sources."find-index-0.1.1" sources."find-up-2.1.0" sources."findup-sync-1.0.0" - (sources."fined-1.1.0" // { + (sources."fined-1.1.1" // { dependencies = [ sources."expand-tilde-2.0.2" ]; }) sources."first-chunk-stream-1.0.0" - sources."flagged-respawn-1.0.0" + sources."flagged-respawn-1.0.1" sources."for-in-1.0.2" sources."for-own-0.1.5" sources."fragment-cache-0.2.1" sources."fs-exists-sync-0.1.0" sources."fs-extra-4.0.3" + sources."fs.realpath-1.0.0" sources."gaze-0.5.2" sources."get-caller-file-1.0.3" sources."get-stream-3.0.0" @@ -16821,8 +17487,8 @@ in sources."minimatch-0.2.14" ]; }) - sources."glogg-1.0.1" - sources."graceful-fs-4.1.11" + sources."glogg-1.0.2" + sources."graceful-fs-4.1.15" sources."gulp-3.9.1" sources."gulp-help-1.6.1" sources."gulp-util-3.0.8" @@ -16844,12 +17510,12 @@ in sources."kind-of-4.0.0" ]; }) - sources."homedir-polyfill-1.0.1" + sources."homedir-polyfill-1.0.3" sources."hosted-git-info-2.7.1" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.5" - sources."interpret-1.1.0" + sources."interpret-1.2.0" sources."invert-kv-1.0.0" (sources."is-absolute-1.0.0" // { dependencies = [ @@ -16863,7 +17529,6 @@ in }) sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-builtin-module-1.0.0" (sources."is-data-descriptor-1.0.0" // { dependencies = [ sources."kind-of-6.0.2" @@ -16897,7 +17562,12 @@ in sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-2.1.0" - sources."js-beautify-1.7.5" + (sources."js-beautify-1.9.1" // { + dependencies = [ + sources."glob-7.1.3" + sources."minimatch-3.0.4" + ]; + }) sources."jsonfile-4.0.0" sources."kind-of-3.2.2" sources."lcid-1.0.0" @@ -16967,7 +17637,7 @@ in ]; }) sources."locate-path-2.0.0" - sources."lodash-4.17.10" + sources."lodash-4.17.11" sources."lodash._basecopy-3.0.1" sources."lodash._basetostring-3.0.1" sources."lodash._basevalues-3.0.0" @@ -16993,9 +17663,9 @@ in }) sources."map-cache-0.2.2" sources."map-visit-1.0.0" - sources."math-random-1.0.1" + sources."math-random-1.0.4" sources."mem-1.1.0" - sources."memoizee-0.4.12" + sources."memoizee-0.4.14" sources."micromatch-2.3.11" sources."mimic-fn-1.2.0" sources."minimatch-2.0.10" @@ -17010,7 +17680,7 @@ in sources."minimist-0.0.8" ]; }) - sources."moment-2.22.2" + sources."moment-2.24.0" sources."ms-2.0.0" sources."multipipe-0.1.2" (sources."nanomatch-1.2.13" // { @@ -17021,10 +17691,10 @@ in sources."kind-of-6.0.2" ]; }) - sources."natives-1.1.4" + sources."natives-1.1.6" sources."next-tick-1.0.0" - sources."nopt-3.0.6" - sources."normalize-package-data-2.4.0" + sources."nopt-4.0.1" + sources."normalize-package-data-2.5.0" sources."normalize-path-2.1.1" sources."npm-run-path-2.0.2" sources."number-is-nan-1.0.1" @@ -17068,6 +17738,8 @@ in sources."ordered-read-streams-0.1.0" sources."os-homedir-1.0.2" sources."os-locale-2.1.0" + sources."os-tmpdir-1.0.2" + sources."osenv-0.1.5" sources."p-finally-1.0.0" sources."p-limit-1.3.0" sources."p-locate-2.0.0" @@ -17075,11 +17747,13 @@ in sources."parse-filepath-1.0.2" sources."parse-glob-3.0.4" sources."parse-json-2.2.0" + sources."parse-node-version-1.0.1" sources."parse-passwd-1.0.0" sources."pascalcase-0.1.1" sources."path-exists-3.0.0" + sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" - sources."path-parse-1.0.5" + sources."path-parse-1.0.6" sources."path-root-0.1.1" sources."path-root-regex-0.1.2" sources."path-type-2.0.0" @@ -17090,7 +17764,7 @@ in sources."process-nextick-args-2.0.0" sources."proto-list-1.2.4" sources."pseudomap-1.0.2" - (sources."randomatic-3.0.0" // { + (sources."randomatic-3.1.1" // { dependencies = [ sources."is-number-4.0.0" sources."kind-of-6.0.2" @@ -17108,12 +17782,12 @@ in sources."regex-cache-0.4.4" sources."regex-not-1.0.2" sources."remove-trailing-separator-1.1.0" - sources."repeat-element-1.1.2" + sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" sources."replace-ext-0.0.1" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.8.1" + sources."resolve-1.10.0" sources."resolve-dir-0.1.1" sources."resolve-url-0.2.1" sources."ret-0.1.15" @@ -17160,10 +17834,10 @@ in sources."source-map-resolve-0.5.2" sources."source-map-url-0.4.0" sources."sparkles-1.0.1" - sources."spdx-correct-3.0.0" - sources."spdx-exceptions-2.1.0" + sources."spdx-correct-3.1.0" + sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" - sources."spdx-license-ids-3.0.0" + sources."spdx-license-ids-3.0.4" sources."split-string-3.1.0" (sources."static-extend-0.1.2" // { dependencies = [ @@ -17195,7 +17869,7 @@ in sources."strip-bom-1.0.0" sources."strip-eof-1.0.0" sources."supports-color-2.0.0" - (sources."through2-2.0.3" // { + (sources."through2-2.0.5" // { dependencies = [ sources."readable-stream-2.3.6" sources."string_decoder-1.1.1" @@ -17203,7 +17877,7 @@ in }) sources."tildify-1.2.0" sources."time-stamp-1.1.0" - sources."timers-ext-0.1.5" + sources."timers-ext-0.1.7" sources."to-object-path-0.3.0" sources."to-regex-3.0.2" (sources."to-regex-range-2.1.1" // { @@ -17237,7 +17911,7 @@ in sources."user-home-1.1.1" sources."util-deprecate-1.0.2" sources."v8flags-2.1.1" - sources."validate-npm-package-license-3.0.3" + sources."validate-npm-package-license-3.0.4" sources."vinyl-0.5.3" (sources."vinyl-fs-0.3.14" // { dependencies = [ @@ -17270,7 +17944,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "shortid-2.2.8" = nodeEnv.buildNodePackage { name = "shortid"; @@ -17287,7 +17961,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "socket.io-~2.0.4" = nodeEnv.buildNodePackage { name = "socket.io"; @@ -17306,7 +17980,7 @@ in sources."base64-arraybuffer-0.1.5" sources."base64id-1.0.0" sources."better-assert-1.0.2" - sources."blob-0.0.4" + sources."blob-0.0.5" sources."callsite-1.0.0" sources."component-bind-1.0.0" sources."component-emitter-1.2.1" @@ -17323,13 +17997,13 @@ in sources."debug-3.1.0" ]; }) - sources."engine.io-parser-2.1.2" + sources."engine.io-parser-2.1.3" sources."has-binary2-1.0.3" sources."has-cors-1.1.0" sources."indexof-0.0.1" sources."isarray-2.0.1" - sources."mime-db-1.35.0" - sources."mime-types-2.1.19" + sources."mime-db-1.38.0" + sources."mime-types-2.1.22" sources."ms-2.0.0" sources."negotiator-0.6.1" sources."object-component-0.0.3" @@ -17357,7 +18031,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "socket.io-client-~2.0.4" = nodeEnv.buildNodePackage { name = "socket.io-client"; @@ -17374,7 +18048,7 @@ in sources."backo2-1.0.2" sources."base64-arraybuffer-0.1.5" sources."better-assert-1.0.2" - sources."blob-0.0.4" + sources."blob-0.0.5" sources."callsite-1.0.0" sources."component-bind-1.0.0" sources."component-emitter-1.2.1" @@ -17385,7 +18059,7 @@ in sources."debug-3.1.0" ]; }) - sources."engine.io-parser-2.1.2" + sources."engine.io-parser-2.1.3" sources."has-binary2-1.0.3" sources."has-cors-1.1.0" sources."indexof-0.0.1" @@ -17413,7 +18087,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "spin.js-^2.3.2" = nodeEnv.buildNodePackage { name = "spin.js"; @@ -17430,19 +18104,19 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "sqlite3-^4.0.1" = nodeEnv.buildNodePackage { name = "sqlite3"; packageName = "sqlite3"; - version = "4.0.2"; + version = "4.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/sqlite3/-/sqlite3-4.0.2.tgz"; - sha512 = "51ferIRwYOhzUEtogqOa/y9supADlAht98bF/gbIi6WkzRJX6Yioldxbzj1MV4yV+LgdKD/kkHwFTeFXOG4htA=="; + url = "https://registry.npmjs.org/sqlite3/-/sqlite3-4.0.6.tgz"; + sha512 = "EqBXxHdKiwvNMRCgml86VTL5TK1i0IKiumnfxykX0gh6H6jaKijAXvE9O1N7+omfNSawR2fOmIyJZcfe8HYWpw=="; }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-5.5.2" + sources."ajv-6.10.0" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -17450,15 +18124,14 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.7.0" + sources."aws4-1.8.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."brace-expansion-1.1.11" sources."caseless-0.12.0" - sources."chownr-1.0.1" - sources."co-4.6.0" + sources."chownr-1.1.1" 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" @@ -17471,20 +18144,20 @@ in sources."ecc-jsbn-0.1.2" sources."extend-3.0.2" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.1.0" + sources."fast-deep-equal-2.0.1" 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.3" sources."fs-minipass-1.2.5" sources."fs.realpath-1.0.0" sources."gauge-2.7.4" sources."getpass-0.1.7" - sources."glob-7.1.2" + sources."glob-7.1.3" sources."har-schema-2.0.0" - sources."har-validator-5.0.3" + sources."har-validator-5.1.3" sources."has-unicode-2.0.1" sources."http-signature-1.2.0" - sources."iconv-lite-0.4.23" + sources."iconv-lite-0.4.24" sources."ignore-walk-3.0.1" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -17495,26 +18168,26 @@ 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-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.35.0" - sources."mime-types-2.1.19" + sources."mime-db-1.38.0" + sources."mime-types-2.1.22" sources."minimatch-3.0.4" sources."minimist-0.0.8" - sources."minipass-2.3.3" - sources."minizlib-1.1.0" + sources."minipass-2.3.5" + sources."minizlib-1.2.1" sources."mkdirp-0.5.1" sources."ms-2.0.0" sources."nan-2.10.0" - sources."needle-2.2.1" - sources."node-pre-gyp-0.10.3" + sources."needle-2.2.4" + sources."node-pre-gyp-0.11.0" sources."nopt-4.0.1" - sources."npm-bundled-1.0.3" - sources."npm-packlist-1.1.11" + sources."npm-bundled-1.0.6" + sources."npm-packlist-1.4.1" sources."npmlog-4.1.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."once-1.4.0" sources."os-homedir-1.0.2" @@ -17523,7 +18196,8 @@ in sources."path-is-absolute-1.0.1" sources."performance-now-2.1.0" sources."process-nextick-args-2.0.0" - sources."punycode-1.4.1" + sources."psl-1.1.31" + sources."punycode-2.1.1" sources."qs-6.5.2" (sources."rc-1.2.8" // { dependencies = [ @@ -17531,29 +18205,34 @@ in ]; }) sources."readable-stream-2.3.6" - sources."request-2.87.0" - sources."rimraf-2.6.2" + sources."request-2.88.0" + sources."rimraf-2.6.3" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.2.4" - sources."semver-5.5.0" + sources."semver-5.7.0" sources."set-blocking-2.0.0" sources."signal-exit-3.0.2" - sources."sshpk-1.14.2" + sources."sshpk-1.16.1" sources."string-width-1.0.2" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" - sources."tar-4.4.6" - sources."tough-cookie-2.3.4" + sources."tar-4.4.8" + (sources."tough-cookie-2.4.3" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" + sources."uri-js-4.2.2" sources."util-deprecate-1.0.2" sources."uuid-3.3.2" sources."verror-1.10.0" sources."wide-align-1.1.3" sources."wrappy-1.0.2" - sources."yallist-3.0.2" + sources."yallist-3.0.3" ]; buildInputs = globalBuildInputs; meta = { @@ -17562,7 +18241,7 @@ in license = "BSD-3-Clause"; }; production = true; - bypassCache = false; + bypassCache = true; }; "store-^2.0.12" = nodeEnv.buildNodePackage { name = "store"; @@ -17579,7 +18258,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "string-^3.3.3" = nodeEnv.buildNodePackage { name = "string"; @@ -17596,7 +18275,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "tedious-^1.14.0" = nodeEnv.buildNodePackage { name = "tedious"; @@ -17610,10 +18289,10 @@ in sources."babel-runtime-6.26.0" sources."big-number-0.3.1" sources."bl-1.2.2" - sources."core-js-2.5.7" + sources."core-js-2.6.5" sources."core-util-is-1.0.2" sources."dns-lookup-all-1.0.2" - sources."iconv-lite-0.4.23" + sources."iconv-lite-0.4.24" sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-2.0.0" @@ -17621,7 +18300,7 @@ in sources."regenerator-runtime-0.11.1" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."semver-5.5.0" + sources."semver-5.7.0" sources."sprintf-0.1.5" sources."string_decoder-1.1.1" sources."util-deprecate-1.0.2" @@ -17633,7 +18312,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "to-markdown-^3.0.3" = nodeEnv.buildNodePackage { name = "to-markdown"; @@ -17647,85 +18326,86 @@ in sources."abab-1.0.4" sources."acorn-4.0.13" sources."acorn-globals-3.1.0" - sources."ajv-5.5.2" + sources."ajv-6.10.0" sources."array-equal-1.0.0" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.7.0" + sources."aws4-1.8.0" sources."bcrypt-pbkdf-1.0.2" sources."block-elements-1.2.0" sources."caseless-0.12.0" - sources."co-4.6.0" sources."collapse-whitespace-1.1.2" - sources."combined-stream-1.0.6" + sources."combined-stream-1.0.7" sources."content-type-parser-1.0.2" sources."core-util-is-1.0.2" - sources."cssom-0.3.4" + sources."cssom-0.3.6" sources."cssstyle-0.2.37" sources."dashdash-1.14.1" sources."deep-is-0.1.3" sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.2" - sources."escodegen-1.11.0" + sources."escodegen-1.11.1" sources."esprima-3.1.3" sources."estraverse-4.2.0" sources."esutils-2.0.2" sources."extend-3.0.2" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.1.0" + sources."fast-deep-equal-2.0.1" sources."fast-json-stable-stringify-2.0.0" sources."fast-levenshtein-2.0.6" sources."forever-agent-0.6.1" - sources."form-data-2.3.2" + sources."form-data-2.3.3" sources."getpass-0.1.7" sources."har-schema-2.0.0" - sources."har-validator-5.0.3" + sources."har-validator-5.1.3" sources."html-encoding-sniffer-1.0.2" sources."http-signature-1.2.0" - sources."iconv-lite-0.4.19" + sources."iconv-lite-0.4.24" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."jsbn-0.1.1" sources."jsdom-9.12.0" sources."json-schema-0.2.3" - sources."json-schema-traverse-0.3.1" + sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" sources."levn-0.3.0" - sources."mime-db-1.35.0" - sources."mime-types-2.1.19" + sources."mime-db-1.38.0" + sources."mime-types-2.1.22" sources."nwmatcher-1.4.4" - sources."oauth-sign-0.8.2" + sources."oauth-sign-0.9.0" sources."optionator-0.8.2" sources."parse5-1.5.1" sources."performance-now-2.1.0" sources."prelude-ls-1.1.2" - sources."psl-1.1.29" - sources."punycode-1.4.1" + sources."psl-1.1.31" + sources."punycode-2.1.1" sources."qs-6.5.2" - (sources."request-2.87.0" // { + (sources."request-2.88.0" // { dependencies = [ - sources."tough-cookie-2.3.4" + sources."punycode-1.4.1" + sources."tough-cookie-2.4.3" ]; }) sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.2.4" sources."source-map-0.6.1" - sources."sshpk-1.14.2" + sources."sshpk-1.16.1" sources."symbol-tree-3.2.2" - sources."tough-cookie-2.4.3" + sources."tough-cookie-2.5.0" sources."tr46-0.0.3" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" + sources."uri-js-4.2.2" sources."uuid-3.3.2" sources."verror-1.10.0" sources."void-elements-2.0.1" sources."webidl-conversions-4.0.2" - sources."whatwg-encoding-1.0.3" + sources."whatwg-encoding-1.0.5" (sources."whatwg-url-4.8.0" // { dependencies = [ sources."webidl-conversions-3.0.1" @@ -17741,7 +18421,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "toobusy-js-^0.5.1" = nodeEnv.buildNodePackage { name = "toobusy-js"; @@ -17758,7 +18438,7 @@ in license = "WTFPL"; }; production = true; - bypassCache = false; + bypassCache = true; }; "uuid-^3.1.0" = nodeEnv.buildNodePackage { name = "uuid"; @@ -17775,7 +18455,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "uws-~0.14.1" = nodeEnv.buildNodePackage { name = "uws"; @@ -17792,24 +18472,24 @@ in license = "Zlib"; }; production = true; - bypassCache = false; + bypassCache = true; }; "validator-^10.4.0" = nodeEnv.buildNodePackage { name = "validator"; packageName = "validator"; - version = "10.5.0"; + version = "10.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/validator/-/validator-10.5.0.tgz"; - sha512 = "6OOi+eV2mOxCFLq0f2cJDrdB6lrtLXEUxabhNRGjgOLT/l3SSll9J49Cl+LIloUqkWWTPraK/mucEQ3dc2jStQ=="; + url = "https://registry.npmjs.org/validator/-/validator-10.11.0.tgz"; + sha512 = "X/p3UZerAIsbBfN/IwahhYaBbY68EN/UQBWHtsbXGT5bfrH/p4NQzUCG1kF/rtKaNpnJ7jAu6NGTdSNtyNIXMw=="; }; buildInputs = globalBuildInputs; meta = { description = "String validation and sanitization"; - homepage = http://github.com/chriso/validator.js; + homepage = https://github.com/chriso/validator.js; license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "velocity-animate-^1.4.0" = nodeEnv.buildNodePackage { name = "velocity-animate"; @@ -17826,7 +18506,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "visibilityjs-^1.2.4" = nodeEnv.buildNodePackage { name = "visibilityjs"; @@ -17843,7 +18523,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "viz.js-^1.7.0" = nodeEnv.buildNodePackage { name = "viz.js"; @@ -17860,15 +18540,15 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "winston-^2.3.0" = nodeEnv.buildNodePackage { name = "winston"; packageName = "winston"; - version = "2.4.3"; + version = "2.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-2.4.3.tgz"; - sha512 = "GYKuysPz2pxYAVJD2NPsDLP5Z79SDEzPm9/j4tCjkF/n89iBNGBMJcR+dMUqxgPNgoSs6fVygPi+Vl2oxIpBuw=="; + url = "https://registry.npmjs.org/winston/-/winston-2.4.4.tgz"; + sha512 = "NBo2Pepn4hK4V01UfcWcDlmiVTs7VTB1h7bgnB0rgP146bYhMxX0ypCz3lBOfNxCO4Zuek7yeT+y/zM1OfMw4Q=="; }; dependencies = [ sources."async-1.0.0" @@ -17885,18 +18565,18 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "xss-^1.0.3" = nodeEnv.buildNodePackage { name = "xss"; packageName = "xss"; - version = "1.0.3"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/xss/-/xss-1.0.3.tgz"; - sha512 = "LTpz3jXPLUphMMmyufoZRSKnqMj41OVypZ8uYGzvjkMV9C1EdACrhQl/EM8Qfh5htSAuMIQFOejmKAZGkJfaCg=="; + url = "https://registry.npmjs.org/xss/-/xss-1.0.6.tgz"; + sha512 = "6Q9TPBeNyoTRxgZFk5Ggaepk/4vUOYdOsIUYvLehcsIZTFjaavbVnsuAkLA5lIFuug5hw8zxcB9tm01gsjph2A=="; }; dependencies = [ - sources."commander-2.16.0" + sources."commander-2.20.0" sources."cssfilter-0.0.10" ]; buildInputs = globalBuildInputs; @@ -17906,6 +18586,6 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; } \ No newline at end of file diff --git a/pkgs/servers/web-apps/codimd/node.nix b/pkgs/servers/web-apps/codimd/node.nix index 8f3be4cc8c7..abcf470ca08 100644 --- a/pkgs/servers/web-apps/codimd/node.nix +++ b/pkgs/servers/web-apps/codimd/node.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}: let nodeEnv = import ../../../development/node-packages/node-env.nix { @@ -14,4 +14,4 @@ in import ./node-packages.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; -} \ No newline at end of file +} diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index 8339460276c..54ab90e849c 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -24,12 +24,12 @@ let ctlpath = lib.makeBinPath [ bash gnused gnugrep coreutils utillinux procps ]; in stdenv.mkDerivation rec { - version = "18.12.1"; + version = "19.02"; name = "ejabberd-${version}"; src = fetchurl { url = "https://www.process-one.net/downloads/ejabberd/${version}/${name}.tgz"; - sha256 = "0mqzbjzcf0aqjzds6pxl1zy1ajn3f8c94dn47xf2i9qid0bsydgx"; + sha256 = "18ga87w4mhi2wli9q7m64wsml0g61k1jacamn7k522gv50d8fwpv"; }; nativeBuildInputs = [ fakegit ]; @@ -75,7 +75,7 @@ in stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1ihg5jbvilfxacsw885ywgyf74r9hm8gcn17mrgbv6y7fcvcgcsr"; + outputHash = "0nv8bwfjjhnd1xn0k6zpr882r982s43mcdwqpdgkwkvlv4b8zp2z"; }; configureFlags = diff --git a/pkgs/shells/zsh/grml-zsh-config/default.nix b/pkgs/shells/zsh/grml-zsh-config/default.nix index f3e387d8211..0051df7073b 100644 --- a/pkgs/shells/zsh/grml-zsh-config/default.nix +++ b/pkgs/shells/zsh/grml-zsh-config/default.nix @@ -5,13 +5,13 @@ with lib; stdenv.mkDerivation rec { name = "grml-zsh-config-${version}"; - version = "0.15.3"; + version = "0.16.0"; src = fetchFromGitHub { owner = "grml"; repo = "grml-etc-core"; rev = "v${version}"; - sha256 = "1g3hbn1ibrrafa9z26pzyn4lb8mfc5zipr1i1j3w2av872zh0y35"; + sha256 = "1b794c3hfhw51aqp8dg8smxqjv4x518rs1ib4pdglc4d785rlq1k"; }; buildInputs = [ zsh coreutils txt2tags procps ] diff --git a/pkgs/shells/zsh/zsh-prezto/default.nix b/pkgs/shells/zsh/zsh-prezto/default.nix index 8acdd8bb516..764459958bf 100644 --- a/pkgs/shells/zsh/zsh-prezto/default.nix +++ b/pkgs/shells/zsh/zsh-prezto/default.nix @@ -1,20 +1,22 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - name = "zsh-prezto-2017-12-03"; + name = "zsh-prezto-2019-03-18"; src = fetchgit { url = "https://github.com/sorin-ionescu/prezto"; - rev = "029414581e54f5b63156f81acd0d377e8eb78883"; - sha256 = "0crrj2nq0wcv5in8qimnkca2an760aqald13vq09s5kbwwc9rs1f"; + rev = "1f4601e44c989b90dc7314b151891fa60a101251"; + sha256 = "1dcd5r7pc4biiplm0lh7yca0h6hs0xpaq9dwaarmfsh9wrd68350"; fetchSubmodules = true; }; buildPhase = '' - sed -i -e "s|\''${ZDOTDIR:\-\$HOME}/.zpreztorc|/etc/zpreztorc|g" init.zsh + sed -i '/\''${ZDOTDIR:\-\$HOME}\/.zpreztorc" ]]/i\ + if [[ -s "/etc/zpreztorc" ]]; then\ + source "/etc/zpreztorc"\ + fi' init.zsh sed -i -e "s|\''${ZDOTDIR:\-\$HOME}/.zprezto/|$out/|g" init.zsh for i in runcoms/*; do sed -i -e "s|\''${ZDOTDIR:\-\$HOME}/.zprezto/|$out/|g" $i done - sed -i -e "s|\''${0:h}/cache.zsh|\''${ZDOTDIR:\-\$HOME}/.zfasd_cache|g" modules/fasd/init.zsh ''; installPhase = '' mkdir -p $out diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index aa8cc12ece8..3abd189d0f9 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -19,18 +19,18 @@ let sources = name: system: { x86_64-darwin = { url = "${baseUrl}/${name}-darwin-x86_64.tar.gz"; - sha256 = "03ymvfhk8azyvdm6j4pbqx2fsh178kw81yqwkycbhmm6mnyc8yv1"; + sha256 = "1w94c1p8vnp3kf802zpr3i0932f5b5irnfqmxj2p44gfyfmkym1j"; }; x86_64-linux = { url = "${baseUrl}/${name}-linux-x86_64.tar.gz"; - sha256 = "1pw4w3v81mp8alm6vxq10242xxwv8rfs59bjxrmy0pfkjgsr4x4v"; + sha256 = "0pps7csf8d3rxqgd0bv06ga6cgkqhlbsys0k0sy1ipl3i6h5hmpf"; }; }.${system}; in stdenv.mkDerivation rec { name = "google-cloud-sdk-${version}"; - version = "222.0.0"; + version = "241.0.0"; src = fetchurl (sources name stdenv.hostPlatform.system); diff --git a/pkgs/tools/admin/nomachine-client/default.nix b/pkgs/tools/admin/nomachine-client/default.nix index 62fa8219f5a..f73104422c1 100644 --- a/pkgs/tools/admin/nomachine-client/default.nix +++ b/pkgs/tools/admin/nomachine-client/default.nix @@ -1,10 +1,10 @@ { stdenv, lib, file, fetchurl, makeWrapper, autoPatchelfHook, jsoncpp, libpulseaudio }: let - versionMajor = "6.5"; - versionMinor = "6"; - versionBuild_x86_64 = "9"; - versionBuild_i686 = "8"; + versionMajor = "6.6"; + versionMinor = "8"; + versionBuild_x86_64 = "5"; + versionBuild_i686 = "5"; in stdenv.mkDerivation rec { pname = "nomachine-client"; @@ -14,12 +14,12 @@ in if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_x86_64}_x86_64.tar.gz"; - sha256 = "07lg5yadxpl5qfvvh067b3kxd8hm3xv95ralm2pyjl4lw6aql46p"; + sha256 = "0hsx1nd9m1l35pj4jri88jib1hgf2wh1f42s650y2br2h6bhaixs"; } else if stdenv.hostPlatform.system == "i686-linux" then fetchurl { url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_i686}_i686.tar.gz"; - sha256 = "1a23isw09vicazkrypq0kxbb8qy2i4vxiarrgz5xmasjhiy5999a"; + sha256 = "1hrp8s17pcqkb4jcnayx81qmm7c1njjp69fkpyqgcnv9vshias1b"; } else throw "NoMachine client is not supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/tools/admin/pulumi/default.nix b/pkgs/tools/admin/pulumi/default.nix index 956f688bb0a..2d4b6527323 100644 --- a/pkgs/tools/admin/pulumi/default.nix +++ b/pkgs/tools/admin/pulumi/default.nix @@ -4,17 +4,17 @@ with lib; let - version = "0.16.11"; + version = "0.17.4"; # switch the dropdown to “manual” on https://pulumi.io/quickstart/install.html # TODO: update script pulumiArchPackage = { "x86_64-linux" = { url = "https://get.pulumi.com/releases/sdk/pulumi-v${version}-linux-x64.tar.gz"; - sha256 = "176nwqp1dd8vdpl4qajaq2w458f8pgavwvwd93lgnccqw3cznv75"; + sha256 = "169hj0db3kcq8874sb3px1hk88ls08kq5w6wygay56whymhva65n"; }; "x86_64-darwin" = { url = "https://get.pulumi.com/releases/sdk/pulumi-v${version}-darwin-x64.tar.gz"; - sha256 = "1mkz9bkkvpvbpzfnvwpx4892zd05bvjz5rbfwhwzm3wzfcjjs16i"; + sha256 = "1cn4mbgzq86d69mpp341zxfl8baakz0n5p9yd5chxrjjvxb6i629"; }; }; diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix index 6cf997cd738..13bba0860c4 100644 --- a/pkgs/tools/admin/salt/default.nix +++ b/pkgs/tools/admin/salt/default.nix @@ -8,11 +8,11 @@ pythonPackages.buildPythonApplication rec { pname = "salt"; - version = "2018.3.2"; + version = "2019.2.0"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "d86eeea2e5387f4a64bbf0a11d103bfc8aac1122e19d39cc0945d33efdc797bd"; + sha256 = "1kgn3lway0zwwysyzpphv05j4xgxk92dk4rv1vybr2527wmvp5an"; }; propagatedBuildInputs = with pythonPackages; [ diff --git a/pkgs/tools/filesystems/nilfs-utils/default.nix b/pkgs/tools/filesystems/nilfs-utils/default.nix index eccd72ceb23..ea321200fb9 100644 --- a/pkgs/tools/filesystems/nilfs-utils/default.nix +++ b/pkgs/tools/filesystems/nilfs-utils/default.nix @@ -35,7 +35,13 @@ stdenv.mkDerivation rec { }) ]; - configureFlags = [ "--with-libmount" ]; + configureFlags = [ + "--with-libmount" + ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + # AC_FUNC_MALLOC is broken on cross builds. + "ac_cv_func_malloc_0_nonnull=yes" + "ac_cv_func_realloc_0_nonnull=yes" + ]; # FIXME: https://github.com/NixOS/patchelf/pull/98 is in, but stdenv # still doesn't use it diff --git a/pkgs/tools/graphics/pngout/default.nix b/pkgs/tools/graphics/pngout/default.nix index 333e5f60076..9d0e1b0ea87 100644 --- a/pkgs/tools/graphics/pngout/default.nix +++ b/pkgs/tools/graphics/pngout/default.nix @@ -6,11 +6,11 @@ let else throw "Unsupported system: ${stdenv.hostPlatform.system}"; in stdenv.mkDerivation { - name = "pngout-20130221"; + name = "pngout-20150319"; src = fetchurl { - url = http://static.jonof.id.au/dl/kenutils/pngout-20130221-linux.tar.gz; - sha256 = "1qdzmgx7si9zr7wjdj8fgf5dqmmqw4zg19ypg0pdz7521ns5xbvi"; + url = http://static.jonof.id.au/dl/kenutils/pngout-20150319-linux.tar.gz; + sha256 = "0iwv941hgs2g7ljpx48fxs24a70m2whrwarkrb77jkfcd309x2h7"; }; installPhase = '' diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index 7381238e4ac..77f15aa99b6 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { name = "vips-${version}"; - version = "8.7.0"; + version = "8.7.4"; src = fetchFromGitHub { owner = "libvips"; repo = "libvips"; rev = "v${version}"; - sha256 = "1dwcpmpqbgb9lkajnqv50mrsn97mxbxpq6b5aya7fgfkgdnrs9sw"; + sha256 = "0mcax1qg5i4iqlvgkz3s0c938d7ymx24pv3q2n3w2pjylnnd489s"; }; nativeBuildInputs = [ pkgconfig autoreconfHook gtk-doc gobject-introspection ]; diff --git a/pkgs/tools/inputmethods/fcitx/unwrapped.nix b/pkgs/tools/inputmethods/fcitx/unwrapped.nix index ab8a7bdb34d..50cc06d2059 100644 --- a/pkgs/tools/inputmethods/fcitx/unwrapped.nix +++ b/pkgs/tools/inputmethods/fcitx/unwrapped.nix @@ -4,7 +4,7 @@ , dbus, gtk2, gtk3, qt4, extra-cmake-modules , xkeyboard_config, pcre, libuuid , withPinyin ? true -, fetchFromGitHub +, fetchFromGitLab }: let @@ -37,13 +37,13 @@ let in stdenv.mkDerivation rec { name = "fcitx-${version}"; - version = "4.2.9.5"; + version = "4.2.9.6"; - src = fetchFromGitHub { + src = fetchFromGitLab { owner = "fcitx"; repo = "fcitx"; rev = version; - sha256 = "0rv69bacdvblka85dakz4ldpznrgwj59nqcccp5mkkn1rab4zh1r"; + sha256 = "0j5vaf930lb21gx4h7z6mksh1fazqw32gajjjkyir94wbmml9n3s"; }; # put data at the correct locations else cmake tries to fetch them, diff --git a/pkgs/tools/misc/clipster/default.nix b/pkgs/tools/misc/clipster/default.nix index 7b501d097bb..ed0239256cd 100644 --- a/pkgs/tools/misc/clipster/default.nix +++ b/pkgs/tools/misc/clipster/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "clipster-${version}"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "mrichar1"; repo = "clipster"; rev = "${version}"; - sha256 = "08zs7yjpjc6haddkwx7sq5vyq2ldy455qlcrx1a3vi7krmdwl1q9"; + sha256 = "0582r8840dk4k4jj1zq6kmyh7z9drcng099bj7f4wvr468nb9z1p"; }; pythonEnv = python3.withPackages(ps: with ps; [ pygobject3 ]); diff --git a/pkgs/tools/misc/entr/default.nix b/pkgs/tools/misc/entr/default.nix index 9301ce12a05..19bcd77923b 100644 --- a/pkgs/tools/misc/entr/default.nix +++ b/pkgs/tools/misc/entr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "entr-${version}"; - version = "4.1"; + version = "4.2"; src = fetchurl { url = "http://entrproject.org/code/${name}.tar.gz"; - sha256 = "0y7gvyf0iykpf3gfw09m21hy51m6qn4cpkbrm4nnn7pwrwycj0y5"; + sha256 = "0w2xkf77jikcjh15fp9g7661ss30pz3jbnh261vqpaqavwah4c17"; }; postPatch = '' diff --git a/pkgs/tools/misc/fltrdr/default.nix b/pkgs/tools/misc/fltrdr/default.nix index 3d99a0e27e3..b18e9d96706 100644 --- a/pkgs/tools/misc/fltrdr/default.nix +++ b/pkgs/tools/misc/fltrdr/default.nix @@ -1,20 +1,22 @@ { stdenv , fetchFromGitHub , cmake +, icu }: stdenv.mkDerivation rec { name = "fltrdr-${version}"; - version = "0.1.1"; + version = "0.2.1"; src = fetchFromGitHub { repo = "fltrdr"; owner = "octobanana"; rev = "${version}"; - sha256 = "1gglv7hwszk09ywjq6s169cdzr77sjklj89k5p24if24v93yffpf"; + sha256 = "0hj7pwb93l4ahykmmr0665nq50jvwdq0aiaciz82225aw1cq939w"; }; nativeBuildInputs = [ cmake ]; + buildInputs = [ icu ]; enableParallelBuilding = true; diff --git a/pkgs/tools/misc/kisslicer/default.nix b/pkgs/tools/misc/kisslicer/default.nix index 2ec795e78e9..b6b56e1df93 100644 --- a/pkgs/tools/misc/kisslicer/default.nix +++ b/pkgs/tools/misc/kisslicer/default.nix @@ -18,11 +18,11 @@ let in stdenv.mkDerivation rec { - name = "kisslicer-1.6.2"; + name = "kisslicer-1.6.3"; src = fetchzip { - url = "http://www.kisslicer.com/uploads/1/5/3/8/15381852/kisslicer_linux64_1.6.2_release.zip"; - sha256 = "0fb7hzic78skq3ykc37srnjsw0yri7m0pb3arlz076ws7jrcbr0f"; + url = "http://www.kisslicer.com/uploads/1/5/3/8/15381852/kisslicer_linux64_1.6.3_release.zip"; + sha256 = "1xmywj5jrcsqv1d5x3mphhvafs4mfm9l12npkhk7l03qxbwg9j82"; stripRoot = false; }; diff --git a/pkgs/tools/misc/linuxquota/default.nix b/pkgs/tools/misc/linuxquota/default.nix index dfcefe09200..d489a5188f1 100644 --- a/pkgs/tools/misc/linuxquota/default.nix +++ b/pkgs/tools/misc/linuxquota/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, e2fsprogs, openldap, pkgconfig }: stdenv.mkDerivation rec { - version = "4.04"; + version = "4.05"; name = "quota-${version}"; src = fetchurl { url = "mirror://sourceforge/linuxquota/quota-${version}.tar.gz"; - sha256 = "1pwfxza923j75z5lx0w89pj09745zi1swy77cm0zalbzgs4f2nvk"; + sha256 = "1fbsrxhhf1ls7i025db7p66yzjr0bqa2c63cni217v8l21fmnfzg"; }; outputs = [ "out" "dev" "doc" "man" ]; diff --git a/pkgs/tools/misc/logstash/default.nix b/pkgs/tools/misc/logstash/default.nix index 9f3c441ffcd..359c714228e 100644 --- a/pkgs/tools/misc/logstash/default.nix +++ b/pkgs/tools/misc/logstash/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz"; sha256 = if enableUnfree - then "01mkb9fr63m3ilp4cbbjccid5m8yc7iqhnli12ynfabsf7302fdz" - else "0r60183yyywabinsv9pkd8sx0wq68h740xi3172fypjfdcqs0g9c"; + then "18j2n6gnhfjmb6skhhrzs0d1zwa1aj9jv37rqvg4w3fimnm8p0sh" + else "181x8y6izrh587a6d1qipgj8wk71v4fggypkzjkns4my00nki42y"; }; dontBuild = true; diff --git a/pkgs/tools/misc/sl/default.nix b/pkgs/tools/misc/sl/default.nix index 4299073d96b..641a0c3e365 100644 --- a/pkgs/tools/misc/sl/default.nix +++ b/pkgs/tools/misc/sl/default.nix @@ -7,29 +7,30 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "eyJhb"; repo = "sl"; - rev = "${version}"; + rev = version; sha256 = "029lv6vw39c7gj8bkfyqs8q4g32174vbmghhhgfk8wrhnxq60qn7"; }; buildInputs = [ ncurses ]; - buildFlags = [ "CC=cc" ]; - installPhase = '' - mkdir -p $out/bin $out/share/man/man1 - cp sl $out/bin - cp sl.1 $outputMan + runHook preInstall + + install -Dm755 -t $out/bin sl + install -Dm644 -t $out/share/man/man1 sl.1{,.ja} + + runHook postInstall ''; meta = with stdenv.lib; { + description = "Steam Locomotive runs across your terminal when you type 'sl'"; homepage = http://www.tkl.iis.u-tokyo.ac.jp/~toyoda/index_e.html; license = rec { shortName = "Toyoda Masashi's free software license"; fullName = shortName; url = https://github.com/eyJhb/sl/blob/master/LICENSE; }; - maintainers = [ maintainers.eyjhb ]; - description = "Steam Locomotive runs across your terminal when you type 'sl'"; + maintainers = with maintainers; [ eyjhb ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/vdirsyncer/stable.nix b/pkgs/tools/misc/vdirsyncer/stable.nix new file mode 100644 index 00000000000..ac950894035 --- /dev/null +++ b/pkgs/tools/misc/vdirsyncer/stable.nix @@ -0,0 +1,52 @@ +{ lib, python3Packages, fetchpatch }: + +# Packaging documentation at: +# https://github.com/pimutils/vdirsyncer/blob/0.16.7/docs/packaging.rst +python3Packages.buildPythonApplication rec { + version = "0.16.7"; + pname = "vdirsyncer"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "6c9bcfb9bcb01246c83ba6f8551cf54c58af3323210755485fc23bb7848512ef"; + }; + + propagatedBuildInputs = with python3Packages; [ + click click-log click-threading + requests_toolbelt + requests + requests_oauthlib # required for google oauth sync + atomicwrites + ]; + + nativeBuildInputs = with python3Packages; [ setuptools_scm ]; + + checkInputs = with python3Packages; [ hypothesis pytest pytest-localserver pytest-subtesthack ]; + + patches = [ + # Fixes for hypothesis: https://github.com/pimutils/vdirsyncer/pull/779 + (fetchpatch { + url = https://github.com/pimutils/vdirsyncer/commit/22ad88a6b18b0979c5d1f1d610c1d2f8f87f4b89.patch; + sha256 = "0dbzj6jlxhdidnm3i21a758z83sdiwzhpd45pbkhycfhgmqmhjpl"; + }) + ]; + + postPatch = '' + # Invalid argument: 'perform_health_check' is not a valid setting + substituteInPlace tests/conftest.py \ + --replace "perform_health_check=False" "" + substituteInPlace tests/unit/test_repair.py \ + --replace $'@settings(perform_health_check=False) # Using the random module for UIDs\n' "" + ''; + + checkPhase = '' + make DETERMINISTIC_TESTS=true test + ''; + + meta = with lib; { + homepage = https://github.com/pimutils/vdirsyncer; + description = "Synchronize calendars and contacts"; + license = licenses.mit; + maintainers = with maintainers; [ loewenheim ]; + }; +} diff --git a/pkgs/tools/networking/airfield/deps.sh b/pkgs/tools/networking/airfield/deps.sh index 216e3c11a9a..77648e2fbfb 100755 --- a/pkgs/tools/networking/airfield/deps.sh +++ b/pkgs/tools/networking/airfield/deps.sh @@ -1,6 +1,6 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -p nodePackages.node2nix -node2nix -6 -i deps.json \ +node2nix -8 -i deps.json \ --no-copy-node-env \ -e ../../../development/node-packages/node-env.nix -c node.nix diff --git a/pkgs/tools/networking/airfield/node-packages.nix b/pkgs/tools/networking/airfield/node-packages.nix index 13edd48e37d..eb54c4248cb 100644 --- a/pkgs/tools/networking/airfield/node-packages.nix +++ b/pkgs/tools/networking/airfield/node-packages.nix @@ -4,22 +4,22 @@ let sources = { - "ajv-5.5.2" = { + "ajv-6.10.0" = { name = "ajv"; packageName = "ajv"; - version = "5.5.2"; + version = "6.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz"; - sha1 = "73b5eeca3fab653e3d3f9422b341ad42205dc965"; + url = "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz"; + sha512 = "nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg=="; }; }; - "asn1-0.2.3" = { + "asn1-0.2.4" = { name = "asn1"; packageName = "asn1"; - version = "0.2.3"; + version = "0.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"; - sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86"; + url = "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz"; + sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg=="; }; }; "assert-plus-1.0.0" = { @@ -49,22 +49,22 @@ let sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; }; }; - "aws4-1.7.0" = { + "aws4-1.8.0" = { name = "aws4"; packageName = "aws4"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz"; - sha512 = "32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w=="; + url = "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz"; + sha512 = "ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="; }; }; - "bcrypt-pbkdf-1.0.1" = { + "bcrypt-pbkdf-1.0.2" = { name = "bcrypt-pbkdf"; packageName = "bcrypt-pbkdf"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz"; - sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d"; + url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"; + sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; }; }; "buffer-crc32-0.1.1" = { @@ -94,22 +94,13 @@ let sha1 = "1b681c21ff84033c826543090689420d187151dc"; }; }; - "co-4.6.0" = { - name = "co"; - packageName = "co"; - version = "4.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/co/-/co-4.6.0.tgz"; - sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"; - }; - }; - "combined-stream-1.0.6" = { + "combined-stream-1.0.7" = { name = "combined-stream"; packageName = "combined-stream"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz"; - sha1 = "723e7df6e801ac5613113a7e445a9b69cb632818"; + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz"; + sha512 = "brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w=="; }; }; "commander-0.6.1" = { @@ -175,13 +166,13 @@ let sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; }; }; - "debug-3.1.0" = { + "debug-4.1.1" = { name = "debug"; packageName = "debug"; - version = "3.1.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz"; - sha512 = "OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g=="; + url = "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz"; + sha512 = "pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw=="; }; }; "delayed-stream-1.0.0" = { @@ -202,22 +193,22 @@ let sha1 = "103d3527fd31528f40188130c841efdd78264e5c"; }; }; - "ecc-jsbn-0.1.1" = { + "ecc-jsbn-0.1.2" = { name = "ecc-jsbn"; packageName = "ecc-jsbn"; - version = "0.1.1"; + version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"; - sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505"; + url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"; + sha1 = "3a83a904e54353287874c564b7549386849a98c9"; }; }; - "extend-3.0.1" = { + "extend-3.0.2" = { name = "extend"; packageName = "extend"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz"; - sha1 = "a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"; + url = "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz"; + sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="; }; }; "extsprintf-1.3.0" = { @@ -229,13 +220,13 @@ let sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; }; }; - "fast-deep-equal-1.1.0" = { + "fast-deep-equal-2.0.1" = { name = "fast-deep-equal"; packageName = "fast-deep-equal"; - version = "1.1.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz"; - sha1 = "c053477817c86b51daa853c81e059b733d023614"; + url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz"; + sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"; }; }; "fast-json-stable-stringify-2.0.0" = { @@ -256,13 +247,13 @@ let sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; }; }; - "form-data-2.3.2" = { + "form-data-2.3.3" = { name = "form-data"; packageName = "form-data"; - version = "2.3.2"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz"; - sha1 = "4970498be604c20c005d4f5c23aecd21d6b49099"; + url = "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz"; + sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ=="; }; }; "formidable-1.0.11" = { @@ -301,13 +292,13 @@ let sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; }; }; - "har-validator-5.0.3" = { + "har-validator-5.1.3" = { name = "har-validator"; packageName = "har-validator"; - version = "5.0.3"; + version = "5.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz"; - sha1 = "ba402c266194f15956ef15e0fcf242993f6a7dfd"; + url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz"; + sha512 = "sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g=="; }; }; "http-signature-1.2.0" = { @@ -355,13 +346,13 @@ let sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; }; }; - "json-schema-traverse-0.3.1" = { + "json-schema-traverse-0.4.1" = { name = "json-schema-traverse"; packageName = "json-schema-traverse"; - version = "0.3.1"; + version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz"; - sha1 = "349a6d44c53a51de89b40805c5d5e59b417d3340"; + url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; + sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; }; }; "json-stringify-safe-5.0.1" = { @@ -382,13 +373,13 @@ let sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; }; }; - "lodash-4.17.10" = { + "lodash-4.17.11" = { name = "lodash"; packageName = "lodash"; - version = "4.17.10"; + version = "4.17.11"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz"; - sha512 = "UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg=="; + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz"; + sha512 = "cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="; }; }; "methods-0.0.1" = { @@ -409,22 +400,22 @@ let sha1 = "b1f86c768c025fa87b48075f1709f28aeaf20365"; }; }; - "mime-db-1.33.0" = { + "mime-db-1.38.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.33.0"; + version = "1.38.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz"; - sha512 = "BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ=="; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz"; + sha512 = "bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg=="; }; }; - "mime-types-2.1.18" = { + "mime-types-2.1.22" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.18"; + version = "2.1.22"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz"; - sha512 = "lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.22.tgz"; + sha512 = "aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog=="; }; }; "mkdirp-0.3.3" = { @@ -436,22 +427,22 @@ let sha1 = "595e251c1370c3a68bab2136d0e348b8105adf13"; }; }; - "ms-2.0.0" = { + "ms-2.1.1" = { name = "ms"; packageName = "ms"; - version = "2.0.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"; - sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; + url = "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz"; + sha512 = "tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="; }; }; - "oauth-sign-0.8.2" = { + "oauth-sign-0.9.0" = { name = "oauth-sign"; packageName = "oauth-sign"; - version = "0.8.2"; + version = "0.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz"; - sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"; + url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz"; + sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="; }; }; "pause-0.0.1" = { @@ -472,6 +463,15 @@ let sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; }; }; + "psl-1.1.31" = { + name = "psl"; + packageName = "psl"; + version = "1.1.31"; + src = fetchurl { + url = "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz"; + sha512 = "/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw=="; + }; + }; "punycode-1.4.1" = { name = "punycode"; packageName = "punycode"; @@ -481,6 +481,15 @@ let sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; }; }; + "punycode-2.1.1" = { + name = "punycode"; + packageName = "punycode"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz"; + sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; + }; + }; "qs-0.5.1" = { name = "qs"; packageName = "qs"; @@ -517,13 +526,13 @@ let sha512 = "M1OkonEQwtRmZv4tEWF2VgpG0JWJ8Fv1PhlgT5+B+uNq2cA3Rt1Yt/ryoR+vQNOQcIEgdCdfH0jr3bDpihAw1A=="; }; }; - "redis-commands-1.3.5" = { + "redis-commands-1.4.0" = { name = "redis-commands"; packageName = "redis-commands"; - version = "1.3.5"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/redis-commands/-/redis-commands-1.3.5.tgz"; - sha512 = "foGF8u6MXGFF++1TZVC6icGXuMYPftKXt1FBT2vrfU9ZATNtZJ8duRC5d1lEfE8hyVe3jhelHGB91oB7I6qLsA=="; + url = "https://registry.npmjs.org/redis-commands/-/redis-commands-1.4.0.tgz"; + sha512 = "cu8EF+MtkwI4DLIT0x9P8qNTLFhQD4jLfxLR0cCNkeGzs87FN6879JOJwNQR/1zD7aSYNbU0hgsV9zGY71Itvw=="; }; }; "redis-parser-2.6.0" = { @@ -562,22 +571,22 @@ let sha1 = "cfb08ebd3cec9b7fc1a37d9ff9e875a971cf4640"; }; }; - "sshpk-1.14.2" = { + "sshpk-1.16.1" = { name = "sshpk"; packageName = "sshpk"; - version = "1.14.2"; + version = "1.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz"; - sha1 = "c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98"; + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz"; + sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg=="; }; }; - "tough-cookie-2.3.4" = { + "tough-cookie-2.4.3" = { name = "tough-cookie"; packageName = "tough-cookie"; - version = "2.3.4"; + version = "2.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz"; - sha512 = "TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA=="; + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz"; + sha512 = "Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ=="; }; }; "tunnel-agent-0.6.0" = { @@ -607,13 +616,22 @@ let sha512 = "5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg=="; }; }; - "uuid-3.3.0" = { + "uri-js-4.2.2" = { + name = "uri-js"; + packageName = "uri-js"; + version = "4.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz"; + sha512 = "KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ=="; + }; + }; + "uuid-3.3.2" = { name = "uuid"; packageName = "uuid"; - version = "3.3.0"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.3.0.tgz"; - sha512 = "ijO9N2xY/YaOqQ5yz5c4sy2ZjWmA6AR6zASb/gdpeKZ8+948CxwfMW9RrKVk5may6ev8c0/Xguu32e2Llelpqw=="; + url = "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz"; + sha512 = "yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="; }; }; "verror-1.10.0" = { @@ -644,13 +662,13 @@ in sources."cookie-0.0.5" sources."cookie-signature-0.0.1" sources."crc-0.2.0" - sources."debug-3.1.0" + sources."debug-4.1.1" sources."formidable-1.0.11" sources."fresh-0.1.0" sources."methods-0.0.1" sources."mime-1.2.6" sources."mkdirp-0.3.3" - sources."ms-2.0.0" + sources."ms-2.1.1" sources."pause-0.0.1" sources."qs-0.5.1" sources."range-parser-0.0.4" @@ -661,7 +679,7 @@ in description = "Sinatra inspired web development framework"; }; production = true; - bypassCache = false; + bypassCache = true; }; "swig-0.14.0" = nodeEnv.buildNodePackage { name = "swig"; @@ -679,7 +697,7 @@ in description = "A fast django-like templating engine for node.js and browsers."; }; production = true; - bypassCache = false; + bypassCache = true; }; "consolidate-0.10.0" = nodeEnv.buildNodePackage { name = "consolidate"; @@ -695,7 +713,7 @@ in homepage = https://github.com/visionmedia/consolidate.js; }; production = true; - bypassCache = false; + bypassCache = true; }; redis = nodeEnv.buildNodePackage { name = "redis"; @@ -707,7 +725,7 @@ in }; dependencies = [ sources."double-ended-queue-2.1.0-0" - sources."redis-commands-1.3.5" + sources."redis-commands-1.4.0" sources."redis-parser-2.6.0" ]; buildInputs = globalBuildInputs; @@ -717,22 +735,22 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; connect-redis = nodeEnv.buildNodePackage { name = "connect-redis"; packageName = "connect-redis"; - version = "3.3.3"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/connect-redis/-/connect-redis-3.3.3.tgz"; - sha512 = "rpWsW2uk1uOe/ccY/JvW+RiLrhZm7auIx8z4yR+KXemFTIhJyD58jXiJbI0E/fZCnybawpdSqOZ+6/ah6aBeyg=="; + url = "https://registry.npmjs.org/connect-redis/-/connect-redis-3.4.1.tgz"; + sha512 = "oXNcpLg/PJ6G4gbhyGwrQK9mUQTKYa2aEnOH9kWIxbNUjIFPqUmzz75RdLp5JTPSjrBVcz+9ll4sSxfvlW0ZLA=="; }; dependencies = [ - sources."debug-3.1.0" + sources."debug-4.1.1" sources."double-ended-queue-2.1.0-0" - sources."ms-2.0.0" + sources."ms-2.1.1" sources."redis-2.8.0" - sources."redis-commands-1.3.5" + sources."redis-commands-1.4.0" sources."redis-parser-2.6.0" ]; buildInputs = globalBuildInputs; @@ -742,18 +760,18 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; async = nodeEnv.buildNodePackage { name = "async"; packageName = "async"; - version = "2.6.1"; + version = "2.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.6.1.tgz"; - sha512 = "fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ=="; + url = "https://registry.npmjs.org/async/-/async-2.6.2.tgz"; + sha512 = "H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg=="; }; dependencies = [ - sources."lodash-4.17.10" + sources."lodash-4.17.11" ]; buildInputs = globalBuildInputs; meta = { @@ -762,61 +780,66 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; request = nodeEnv.buildNodePackage { name = "request"; packageName = "request"; - version = "2.87.0"; + version = "2.88.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.87.0.tgz"; - sha512 = "fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw=="; + url = "https://registry.npmjs.org/request/-/request-2.88.0.tgz"; + sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg=="; }; dependencies = [ - sources."ajv-5.5.2" - sources."asn1-0.2.3" + sources."ajv-6.10.0" + sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.7.0" - sources."bcrypt-pbkdf-1.0.1" + sources."aws4-1.8.0" + sources."bcrypt-pbkdf-1.0.2" 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."delayed-stream-1.0.0" - sources."ecc-jsbn-0.1.1" - sources."extend-3.0.1" + sources."ecc-jsbn-0.1.2" + sources."extend-3.0.2" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.1.0" + sources."fast-deep-equal-2.0.1" 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.3" sources."getpass-0.1.7" sources."har-schema-2.0.0" - sources."har-validator-5.0.3" + sources."har-validator-5.1.3" sources."http-signature-1.2.0" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."jsbn-0.1.1" sources."json-schema-0.2.3" - sources."json-schema-traverse-0.3.1" + sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.33.0" - sources."mime-types-2.1.18" - sources."oauth-sign-0.8.2" + sources."mime-db-1.38.0" + sources."mime-types-2.1.22" + sources."oauth-sign-0.9.0" sources."performance-now-2.1.0" - sources."punycode-1.4.1" + sources."psl-1.1.31" + sources."punycode-2.1.1" sources."qs-6.5.2" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."sshpk-1.14.2" - sources."tough-cookie-2.3.4" + sources."sshpk-1.16.1" + (sources."tough-cookie-2.4.3" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uuid-3.3.0" + sources."uri-js-4.2.2" + sources."uuid-3.3.2" sources."verror-1.10.0" ]; buildInputs = globalBuildInputs; @@ -826,6 +849,6 @@ in license = "Apache-2.0"; }; production = true; - bypassCache = false; + bypassCache = true; }; } \ No newline at end of file diff --git a/pkgs/tools/networking/airfield/node.nix b/pkgs/tools/networking/airfield/node.nix index 8f3be4cc8c7..29d77f0bf9a 100644 --- a/pkgs/tools/networking/airfield/node.nix +++ b/pkgs/tools/networking/airfield/node.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}: let nodeEnv = import ../../../development/node-packages/node-env.nix { diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix index e960f8c3a84..a4e8c17a545 100644 --- a/pkgs/tools/networking/connman/default.nix +++ b/pkgs/tools/networking/connman/default.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation rec { name = "connman-${version}"; - version = "1.36"; + version = "1.37"; src = fetchurl { url = "mirror://kernel/linux/network/connman/${name}.tar.xz"; - sha256 = "0x00dq5c2frz06md3g5y0jh5kbcj2hrfl5qjcqga8gs4ri0xp2f7"; + sha256 = "05kfjiqhqfmbbwc4snnyvi5hc4zxanac62f6gcwaf5mvn0z9pqkc"; }; buildInputs = [ openconnect polkit diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix index 32d55d2009a..c51f0a4fdf0 100644 --- a/pkgs/tools/networking/dropbear/default.nix +++ b/pkgs/tools/networking/dropbear/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "dropbear-2018.76"; + name = "dropbear-2019.78"; src = fetchurl { url = "https://matt.ucc.asn.au/dropbear/releases/${name}.tar.bz2"; - sha256 = "0rgavbzw7jrs5wslxm0dnwx2m409yzxd9hazd92r7kx8xikr3yzj"; + sha256 = "19242qlr40pbqfqd0gg6h8qpj38q6lgv03ja6sahj9vj2abnanaj"; }; dontDisableStatic = enableStatic; diff --git a/pkgs/tools/networking/gmrender-resurrect/default.nix b/pkgs/tools/networking/gmrender-resurrect/default.nix index 6926f1522c7..6fdcfaa70db 100644 --- a/pkgs/tools/networking/gmrender-resurrect/default.nix +++ b/pkgs/tools/networking/gmrender-resurrect/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation { homepage = https://github.com/hzeller/gmrender-resurrect; license = licenses.gpl2; platforms = platforms.linux; + broken = true; maintainers = [ maintainers.koral ]; }; } diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index f8c3d754100..75462659699 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -1,31 +1,26 @@ { stdenv, fetchFromGitHub, sqlite, pkgconfig, autoreconfHook, pmccabe -, xapian, glib, gmime, texinfo , emacs, guile +, xapian, glib, gmime3, texinfo , emacs, guile , gtk3, webkitgtk24x-gtk3, libsoup, icu , withMug ? false }: stdenv.mkDerivation rec { name = "mu-${version}"; - version = "1.0"; + version = "1.2"; src = fetchFromGitHub { owner = "djcb"; repo = "mu"; - rev = "v${version}"; - sha256 = "0y6azhcmqdx46a9gi7mn8v8p0mhfx2anjm5rj7i69kbr6j8imlbc"; + rev = version; + sha256 = "0yhjlj0z23jw3cf2wfnl98y8q6gikvmhkb8vdm87bd7jw0bdnrfz"; }; - # 0.9.18 and 1.0 have 2 failing tests but previously we had no tests - patches = [ - ./failing_tests.patch - ]; - # test-utils coredumps so don't run those postPatch = '' sed -i -e '/test-utils/d' lib/parser/Makefile.am ''; buildInputs = [ - sqlite xapian glib gmime texinfo emacs guile libsoup icu + sqlite xapian glib gmime3 texinfo emacs guile libsoup icu ] ++ stdenv.lib.optionals withMug [ gtk3 webkitgtk24x-gtk3 ]; nativeBuildInputs = [ pkgconfig autoreconfHook pmccabe ]; @@ -54,7 +49,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A collection of utilties for indexing and searching Maildirs"; license = licenses.gpl3Plus; - homepage = http://www.djcbsoftware.nl/code/mu/; + homepage = https://www.djcbsoftware.nl/code/mu/; platforms = platforms.mesaPlatforms; maintainers = with maintainers; [ antono the-kenny peterhoeg ]; }; diff --git a/pkgs/tools/networking/mu/failing_tests.patch b/pkgs/tools/networking/mu/failing_tests.patch deleted file mode 100644 index c45834ff208..00000000000 --- a/pkgs/tools/networking/mu/failing_tests.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/mu/tests/test-mu-query.c b/mu/tests/test-mu-query.c -index 73cbd3f4..46a0b131 100644 ---- a/mu/tests/test-mu-query.c -+++ b/mu/tests/test-mu-query.c -@@ -753,10 +753,10 @@ main (int argc, char *argv[]) - g_test_add_func ("/mu-query/test-mu-query-sizes", - test_mu_query_sizes); - -- g_test_add_func ("/mu-query/test-mu-query-dates-helsinki", -- test_mu_query_dates_helsinki); -- g_test_add_func ("/mu-query/test-mu-query-dates-sydney", -- test_mu_query_dates_sydney); -+ /* g_test_add_func ("/mu-query/test-mu-query-dates-helsinki", */ -+ /* test_mu_query_dates_helsinki); */ -+ /* g_test_add_func ("/mu-query/test-mu-query-dates-sydney", */ -+ /* test_mu_query_dates_sydney); */ - g_test_add_func ("/mu-query/test-mu-query-dates-la", - test_mu_query_dates_la); diff --git a/pkgs/tools/networking/pcapfix/default.nix b/pkgs/tools/networking/pcapfix/default.nix index 5e3bf176b2c..92df5d55524 100644 --- a/pkgs/tools/networking/pcapfix/default.nix +++ b/pkgs/tools/networking/pcapfix/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "pcapfix-1.1.3"; + name = "pcapfix-1.1.4"; src = fetchurl { url = "https://f00l.de/pcapfix/${name}.tar.gz"; - sha256 = "0f9g6yh1dc7x1n28xs4lcwlk6sa3mpz0rbw0ddhajqidag2k07sr"; + sha256 = "0m6308ka33wqs568b7cwa1f5q0bv61j2nwfizdyzrazw673lnh6d"; }; postPatch = ''sed -i "s|/usr|$out|" Makefile''; diff --git a/pkgs/tools/networking/ppp/default.nix b/pkgs/tools/networking/ppp/default.nix index cea8a3f133f..26dc71b7d61 100644 --- a/pkgs/tools/networking/ppp/default.nix +++ b/pkgs/tools/networking/ppp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, substituteAll, libpcap }: +{ stdenv, fetchurl, substituteAll, libpcap, openssl }: stdenv.mkDerivation rec { version = "2.4.7"; @@ -27,10 +27,14 @@ stdenv.mkDerivation rec { url = "https://anonscm.debian.org/git/collab-maint/pkg-ppp.git/plain/debian/patches/0016-pppoe-include-netinet-in.h-before-linux-in.h.patch"; sha256 = "1xnmqn02kc6g5y84xynjwnpv9cvrfn3nyv7h7r8j8xi7qf2aj4q8"; }) + (fetchurl { + url = https://www.nikhef.nl/~janjust/ppp/ppp-2.4.7-eaptls-mppe-1.102.patch; + sha256 = "04war8l5szql53l36043hvzgfwqp3v76kj8brbz7wlf7vs2mlkia"; + }) ./musl-fix-headers.patch ]; - buildInputs = [ libpcap ]; + buildInputs = [ libpcap openssl ]; postPatch = '' # strip is not found when cross compiling with seemingly no way to point diff --git a/pkgs/tools/networking/redir/default.nix b/pkgs/tools/networking/redir/default.nix index 350d31c19da..e584354952a 100644 --- a/pkgs/tools/networking/redir/default.nix +++ b/pkgs/tools/networking/redir/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "redir-${version}"; - version = "3.2"; + version = "3.3"; src = fetchFromGitHub { owner = "troglobit"; repo = "redir"; rev = "v${version}"; - sha256 = "015vxpy6n7xflkq0lgls4f4vw7ynvv2635bwykzglin3v5ssrm2k"; + sha256 = "13n401i3q0xwpfgr21y47kgihi057wbh59xlsna8b8zpm973qny1"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/networking/tcpreplay/default.nix b/pkgs/tools/networking/tcpreplay/default.nix index a977a83e23f..53af27b4deb 100644 --- a/pkgs/tools/networking/tcpreplay/default.nix +++ b/pkgs/tools/networking/tcpreplay/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "tcpreplay-${version}"; - version = "4.3.1"; + version = "4.3.2"; src = fetchurl { url = "https://github.com/appneta/tcpreplay/releases/download/v${version}/tcpreplay-${version}.tar.gz"; - sha256 = "0d2ywaxq0iaa1kfhgsfhsk1c4w4lakxafsw90dn4m6k82486dflm"; + sha256 = "0ld9v88g5xs2rykimksmhlkwbv2r97575c4aqmqdxbvc37crnisg"; }; buildInputs = [ libpcap ]; diff --git a/pkgs/tools/networking/tox-node/default.nix b/pkgs/tools/networking/tox-node/default.nix new file mode 100644 index 00000000000..28be00099b8 --- /dev/null +++ b/pkgs/tools/networking/tox-node/default.nix @@ -0,0 +1,43 @@ +{ stdenv, rustPlatform, fetchFromGitHub +, libsodium, openssl +, pkgconfig +}: + +with rustPlatform; + +buildRustPackage rec { + name = "tox-node-${version}"; + version = "0.0.7"; + + src = fetchFromGitHub { + owner = "tox-rs"; + repo = "tox-node"; + rev = "v${version}"; + sha256 = "0p1k4glqm3xasck66fywkyg42lbccad9rc6biyvi24rn76qip4jm"; + }; + + buildInputs = [ libsodium openssl ]; + nativeBuildInputs = [ pkgconfig ]; + + SODIUM_USE_PKG_CONFIG = "yes"; + + installPhase = '' + runHook preInstall + + install -D target/release/tox-node $out/bin/tox-node + + runHook postInstall + ''; + + doCheck = false; + + cargoSha256 = "18w1ycvj2q4q8lj81wn5lfljh5wa7b230ahqdz30w20pv1cazsv2"; + + meta = with stdenv.lib; { + description = "A server application to run tox node written in pure Rust"; + homepage = https://github.com/tox-rs/tox-node; + license = [ licenses.mit ]; + platforms = platforms.linux; + maintainers = with maintainers; [ suhr ]; + }; +} diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index 57ab0bab516..38a24eddc28 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "wget-${version}"; - version = "1.20.1"; + version = "1.20.3"; src = fetchurl { url = "mirror://gnu/wget/${name}.tar.lz"; - sha256 = "0a29qsqxkk8145vkyy35q5a1wc7qzwx3qj3gmfrkmi9xs96yhqqg"; + sha256 = "1frajd86ds8vz2hprq30wq8ya89z9dcxnwm8nwk12bbc47l7qq39"; }; patches = [ diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index 864c229b880..33620bb51f1 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "dpkg-${version}"; - version = "1.19.5"; + version = "1.19.6"; src = fetchurl { url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz"; - sha256 = "0i1mwqf60n25f89zfvp7fsa4v5rlqxhkhqah35g6j2k1ffcpqcpd"; + sha256 = "0s1pyj7g8ign630biqq1ycjy8cw733fk1dgas9w59mav3wns3caf"; }; configureFlags = [ diff --git a/pkgs/tools/package-management/nixui/generate.sh b/pkgs/tools/package-management/nixui/generate.sh index c7a93a71673..334edb4a027 100755 --- a/pkgs/tools/package-management/nixui/generate.sh +++ b/pkgs/tools/package-management/nixui/generate.sh @@ -1,4 +1,4 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -p nodePackages.node2nix -exec node2nix -6 -i pkg.json -c nixui.nix -e ../../../development/node-packages/node-env.nix --no-copy-node-env +exec node2nix -8 -i pkg.json -c nixui.nix -e ../../../development/node-packages/node-env.nix --no-copy-node-env diff --git a/pkgs/tools/package-management/nixui/nixui.nix b/pkgs/tools/package-management/nixui/nixui.nix index 8f3be4cc8c7..29d77f0bf9a 100644 --- a/pkgs/tools/package-management/nixui/nixui.nix +++ b/pkgs/tools/package-management/nixui/nixui.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}: let nodeEnv = import ../../../development/node-packages/node-env.nix { diff --git a/pkgs/tools/package-management/nixui/node-packages.nix b/pkgs/tools/package-management/nixui/node-packages.nix index 846e9bcfc12..b019c7ef377 100644 --- a/pkgs/tools/package-management/nixui/node-packages.nix +++ b/pkgs/tools/package-management/nixui/node-packages.nix @@ -102,6 +102,6 @@ in license = "Apache-2.0"; }; production = true; - bypassCache = false; + bypassCache = true; }; } \ No newline at end of file diff --git a/pkgs/tools/security/bitwarden-cli/generate.sh b/pkgs/tools/security/bitwarden-cli/generate.sh new file mode 100755 index 00000000000..5bcee4c0513 --- /dev/null +++ b/pkgs/tools/security/bitwarden-cli/generate.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p nodePackages.node2nix + +exec node2nix -8 \ + --input node-packages.json \ + --output node-packages-generated.nix \ + --composition node-packages.nix \ + --node-env ./../../../development/node-packages/node-env.nix diff --git a/pkgs/tools/security/bitwarden-cli/node-packages-generated.nix b/pkgs/tools/security/bitwarden-cli/node-packages-generated.nix index f709bd3d122..e258571a620 100644 --- a/pkgs/tools/security/bitwarden-cli/node-packages-generated.nix +++ b/pkgs/tools/security/bitwarden-cli/node-packages-generated.nix @@ -4,13 +4,58 @@ let sources = { - "ansi-escapes-3.1.0" = { + "abab-2.0.0" = { + name = "abab"; + packageName = "abab"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/abab/-/abab-2.0.0.tgz"; + sha512 = "sY5AXXVZv4Y1VACTtR11UJCPHHudgY5i26Qj5TypE6DKlIApbwb5uqhXcJ5UUGbvZNRh7EeIoW+LrJumBsKp7w=="; + }; + }; + "acorn-6.1.1" = { + name = "acorn"; + packageName = "acorn"; + version = "6.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-6.1.1.tgz"; + sha512 = "jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA=="; + }; + }; + "acorn-globals-4.3.0" = { + name = "acorn-globals"; + packageName = "acorn-globals"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.0.tgz"; + sha512 = "hMtHj3s5RnuhvHPowpBYvJVj3rAar82JiDQHvGs1zO0l10ocX/xEdBShNHTJaboucJUsScghp74pH3s7EnHHQw=="; + }; + }; + "acorn-walk-6.1.1" = { + name = "acorn-walk"; + packageName = "acorn-walk"; + version = "6.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.1.1.tgz"; + sha512 = "OtUw6JUTgxA2QoqqmrmQ7F2NYqiBPi/L2jqHyFtllhOUvXYQXf0Z1CYUinIfyT4bTCGmrA7gX9FvHA81uzCoVw=="; + }; + }; + "ajv-6.10.0" = { + name = "ajv"; + packageName = "ajv"; + version = "6.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz"; + sha512 = "nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg=="; + }; + }; + "ansi-escapes-3.2.0" = { name = "ansi-escapes"; packageName = "ansi-escapes"; - version = "3.1.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz"; - sha512 = "UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw=="; + url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz"; + sha512 = "cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ=="; }; }; "ansi-regex-3.0.0" = { @@ -31,6 +76,42 @@ let sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; }; }; + "array-equal-1.0.0" = { + name = "array-equal"; + packageName = "array-equal"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz"; + sha1 = "8c2a5ef2472fd9ea742b04c77a75093ba2757c93"; + }; + }; + "asn1-0.2.4" = { + name = "asn1"; + packageName = "asn1"; + version = "0.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz"; + sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg=="; + }; + }; + "assert-plus-1.0.0" = { + name = "assert-plus"; + packageName = "assert-plus"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; + sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; + }; + }; + "async-limiter-1.0.0" = { + name = "async-limiter"; + packageName = "async-limiter"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz"; + sha512 = "jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg=="; + }; + }; "asynckit-0.4.0" = { name = "asynckit"; packageName = "asynckit"; @@ -40,6 +121,33 @@ let sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; }; }; + "aws-sign2-0.7.0" = { + name = "aws-sign2"; + packageName = "aws-sign2"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz"; + sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; + }; + }; + "aws4-1.8.0" = { + name = "aws4"; + packageName = "aws4"; + version = "1.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz"; + sha512 = "ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="; + }; + }; + "bcrypt-pbkdf-1.0.2" = { + name = "bcrypt-pbkdf"; + packageName = "bcrypt-pbkdf"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"; + sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; + }; + }; "big-integer-1.6.36" = { name = "big-integer"; packageName = "big-integer"; @@ -49,6 +157,24 @@ let sha512 = "t70bfa7HYEA1D9idDbmuv7YbsbVkQ+Hp+8KFSul4aE5e/i1bjCNIRYJZlA8Q8p0r9T8cF/RVvwUgRA//FydEyg=="; }; }; + "browser-process-hrtime-0.1.3" = { + name = "browser-process-hrtime"; + packageName = "browser-process-hrtime"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz"; + sha512 = "bRFnI4NnjO6cnyLmOV/7PVoDEMJChlcfN0z4s1YMBY989/SvlfMI1lgCnkFUs53e9gQF+w7qu7XdllSTiSl8Aw=="; + }; + }; + "caseless-0.12.0" = { + name = "caseless"; + packageName = "caseless"; + version = "0.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz"; + sha1 = "1b681c21ff84033c826543090689420d187151dc"; + }; + }; "chalk-2.4.1" = { name = "chalk"; packageName = "chalk"; @@ -121,6 +247,60 @@ let sha512 = "6CYPa+JP2ftfRU2qkDK+UTVeQYosOg/2GbcjIcKPHfinyOLPVGXu/ovN86RP49Re5ndJK1N0kuiidFFuepc4ZQ=="; }; }; + "core-util-is-1.0.2" = { + name = "core-util-is"; + packageName = "core-util-is"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; + sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + }; + }; + "cssom-0.3.6" = { + name = "cssom"; + packageName = "cssom"; + version = "0.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/cssom/-/cssom-0.3.6.tgz"; + sha512 = "DtUeseGk9/GBW0hl0vVPpU22iHL6YB5BUX7ml1hB+GMpo0NX5G4voX3kdWiMSEguFtcW3Vh3djqNF4aIe6ne0A=="; + }; + }; + "cssstyle-1.2.2" = { + name = "cssstyle"; + packageName = "cssstyle"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cssstyle/-/cssstyle-1.2.2.tgz"; + sha512 = "43wY3kl1CVQSvL7wUY1qXkxVGkStjpkDmVjiIKX8R97uhajy8Bybay78uOtqvh7Q5GK75dNPfW0geWjE6qQQow=="; + }; + }; + "dashdash-1.14.1" = { + name = "dashdash"; + packageName = "dashdash"; + version = "1.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz"; + sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; + }; + }; + "data-urls-1.1.0" = { + name = "data-urls"; + packageName = "data-urls"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/data-urls/-/data-urls-1.1.0.tgz"; + sha512 = "YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ=="; + }; + }; + "deep-is-0.1.3" = { + name = "deep-is"; + packageName = "deep-is"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz"; + sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; + }; + }; "delayed-stream-1.0.0" = { name = "delayed-stream"; packageName = "delayed-stream"; @@ -130,6 +310,24 @@ let sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; }; }; + "domexception-1.0.1" = { + name = "domexception"; + packageName = "domexception"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/domexception/-/domexception-1.0.1.tgz"; + sha512 = "raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug=="; + }; + }; + "ecc-jsbn-0.1.2" = { + name = "ecc-jsbn"; + packageName = "ecc-jsbn"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"; + sha1 = "3a83a904e54353287874c564b7549386849a98c9"; + }; + }; "escape-string-regexp-1.0.5" = { name = "escape-string-regexp"; packageName = "escape-string-regexp"; @@ -139,6 +337,51 @@ let sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; }; }; + "escodegen-1.11.1" = { + name = "escodegen"; + packageName = "escodegen"; + version = "1.11.1"; + src = fetchurl { + url = "https://registry.npmjs.org/escodegen/-/escodegen-1.11.1.tgz"; + sha512 = "JwiqFD9KdGVVpeuRa68yU3zZnBEOcPs0nKW7wZzXky8Z7tffdYUHbe11bPCV5jYlK6DVdKLWLm0f5I/QlL0Kmw=="; + }; + }; + "esprima-3.1.3" = { + name = "esprima"; + packageName = "esprima"; + version = "3.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz"; + sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633"; + }; + }; + "estraverse-4.2.0" = { + name = "estraverse"; + packageName = "estraverse"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz"; + sha1 = "0dee3fed31fcd469618ce7342099fc1afa0bdb13"; + }; + }; + "esutils-2.0.2" = { + name = "esutils"; + packageName = "esutils"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz"; + sha1 = "0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"; + }; + }; + "extend-3.0.2" = { + name = "extend"; + packageName = "extend"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz"; + sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="; + }; + }; "external-editor-3.0.3" = { name = "external-editor"; packageName = "external-editor"; @@ -148,6 +391,42 @@ let sha512 = "bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA=="; }; }; + "extsprintf-1.3.0" = { + name = "extsprintf"; + packageName = "extsprintf"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz"; + sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; + }; + }; + "fast-deep-equal-2.0.1" = { + name = "fast-deep-equal"; + packageName = "fast-deep-equal"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz"; + sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"; + }; + }; + "fast-json-stable-stringify-2.0.0" = { + name = "fast-json-stable-stringify"; + packageName = "fast-json-stable-stringify"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz"; + sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2"; + }; + }; + "fast-levenshtein-2.0.6" = { + name = "fast-levenshtein"; + packageName = "fast-levenshtein"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; + sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; + }; + }; "figures-2.0.0" = { name = "figures"; packageName = "figures"; @@ -157,6 +436,15 @@ let sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"; }; }; + "forever-agent-0.6.1" = { + name = "forever-agent"; + packageName = "forever-agent"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"; + sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; + }; + }; "form-data-2.3.2" = { name = "form-data"; packageName = "form-data"; @@ -166,6 +454,15 @@ let sha1 = "4970498be604c20c005d4f5c23aecd21d6b49099"; }; }; + "getpass-0.1.7" = { + name = "getpass"; + packageName = "getpass"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz"; + sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; + }; + }; "graceful-fs-4.1.15" = { name = "graceful-fs"; packageName = "graceful-fs"; @@ -175,6 +472,24 @@ let sha512 = "6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="; }; }; + "har-schema-2.0.0" = { + name = "har-schema"; + packageName = "har-schema"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz"; + sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; + }; + }; + "har-validator-5.1.3" = { + name = "har-validator"; + packageName = "har-validator"; + version = "5.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz"; + sha512 = "sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g=="; + }; + }; "has-flag-3.0.0" = { name = "has-flag"; packageName = "has-flag"; @@ -184,6 +499,24 @@ let sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; }; }; + "html-encoding-sniffer-1.0.2" = { + name = "html-encoding-sniffer"; + packageName = "html-encoding-sniffer"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz"; + sha512 = "71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw=="; + }; + }; + "http-signature-1.2.0" = { + name = "http-signature"; + packageName = "http-signature"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz"; + sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; + }; + }; "iconv-lite-0.4.24" = { name = "iconv-lite"; packageName = "iconv-lite"; @@ -220,6 +553,87 @@ let sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"; }; }; + "is-typedarray-1.0.0" = { + name = "is-typedarray"; + packageName = "is-typedarray"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"; + sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; + }; + }; + "isstream-0.1.2" = { + name = "isstream"; + packageName = "isstream"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"; + sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; + }; + }; + "jsbn-0.1.1" = { + name = "jsbn"; + packageName = "jsbn"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"; + sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; + }; + }; + "jsdom-13.2.0" = { + name = "jsdom"; + packageName = "jsdom"; + version = "13.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsdom/-/jsdom-13.2.0.tgz"; + sha512 = "cG1NtMWO9hWpqRNRR3dSvEQa8bFI6iLlqU2x4kwX51FQjp0qus8T9aBaAO6iGp3DeBrhdwuKxckknohkmfvsFw=="; + }; + }; + "json-schema-0.2.3" = { + name = "json-schema"; + packageName = "json-schema"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz"; + sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; + }; + }; + "json-schema-traverse-0.4.1" = { + name = "json-schema-traverse"; + packageName = "json-schema-traverse"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; + sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; + }; + }; + "json-stringify-safe-5.0.1" = { + name = "json-stringify-safe"; + packageName = "json-stringify-safe"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; + sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; + }; + }; + "jsprim-1.4.1" = { + name = "jsprim"; + packageName = "jsprim"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz"; + sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; + }; + }; + "levn-0.3.0" = { + name = "levn"; + packageName = "levn"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz"; + sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee"; + }; + }; "lodash-4.17.11" = { name = "lodash"; packageName = "lodash"; @@ -229,6 +643,15 @@ let sha512 = "cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="; }; }; + "lodash.sortby-4.7.0" = { + name = "lodash.sortby"; + packageName = "lodash.sortby"; + version = "4.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz"; + sha1 = "edd14c824e2cc9c1e0b0a1b42bb5210516a42438"; + }; + }; "lowdb-1.0.0" = { name = "lowdb"; packageName = "lowdb"; @@ -247,22 +670,22 @@ let sha512 = "rlAEsgU9Bnavca2w1WJ6+6cdeHMXNyadcersyk3ZpuhgWb5HBNj8l4WwJz9PjksAhYDlpQffCVXPctOn+wCIVA=="; }; }; - "mime-db-1.37.0" = { + "mime-db-1.38.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.37.0"; + version = "1.38.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.37.0.tgz"; - sha512 = "R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg=="; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz"; + sha512 = "bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg=="; }; }; - "mime-types-2.1.21" = { + "mime-types-2.1.22" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.21"; + version = "2.1.22"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.21.tgz"; - sha512 = "3iL6DbwpyLzjR3xHSFNFeb9Nz/M8WDkX33t1GFQnFOllWk8pOrh/LSrB5OXlnlW5P9LH73X6loW/eogc+F5lJg=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.22.tgz"; + sha512 = "aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog=="; }; }; "mimic-fn-1.2.0" = { @@ -301,6 +724,24 @@ let sha512 = "sol30LUpz1jQFBjOKwbjxijiE3b6pjd74YwfD0fJOKPjF+fONKb2Yg8rYgS6+bK6VDl+/wfr4IYpC7jDzLUIfw=="; }; }; + "nwsapi-2.1.3" = { + name = "nwsapi"; + packageName = "nwsapi"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/nwsapi/-/nwsapi-2.1.3.tgz"; + sha512 = "RowAaJGEgYXEZfQ7tvvdtAQUKPyTR6T6wNu0fwlNsGQYr/h3yQc6oI8WnVZh3Y/Sylwc+dtAlvPqfFZjhTyk3A=="; + }; + }; + "oauth-sign-0.9.0" = { + name = "oauth-sign"; + packageName = "oauth-sign"; + version = "0.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz"; + sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="; + }; + }; "onetime-2.0.1" = { name = "onetime"; packageName = "onetime"; @@ -310,6 +751,15 @@ let sha1 = "067428230fd67443b2794b22bba528b6867962d4"; }; }; + "optionator-0.8.2" = { + name = "optionator"; + packageName = "optionator"; + version = "0.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz"; + sha1 = "364c5e409d3f4d6301d6c0b4c05bba50180aeb64"; + }; + }; "os-tmpdir-1.0.2" = { name = "os-tmpdir"; packageName = "os-tmpdir"; @@ -328,6 +778,24 @@ let sha512 = "ylm8pmgyz9rkS3Ng/ru5tHUF3JxWwKYP0aZZWZ8eCGdSxoqgYiDUXLNQei73mUJOjHw8QNu5ZNCsLoDpkMA6sg=="; }; }; + "parse5-5.1.0" = { + name = "parse5"; + packageName = "parse5"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse5/-/parse5-5.1.0.tgz"; + sha512 = "fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ=="; + }; + }; + "performance-now-2.1.0" = { + name = "performance-now"; + packageName = "performance-now"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz"; + sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; + }; + }; "pify-3.0.0" = { name = "pify"; packageName = "pify"; @@ -337,6 +805,33 @@ let sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"; }; }; + "pn-1.1.0" = { + name = "pn"; + packageName = "pn"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pn/-/pn-1.1.0.tgz"; + sha512 = "2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA=="; + }; + }; + "prelude-ls-1.1.2" = { + name = "prelude-ls"; + packageName = "prelude-ls"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz"; + sha1 = "21932a549f5e52ffd9a827f570e04be62a97da54"; + }; + }; + "psl-1.1.31" = { + name = "psl"; + packageName = "psl"; + version = "1.1.31"; + src = fetchurl { + url = "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz"; + sha512 = "/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw=="; + }; + }; "punycode-1.4.1" = { name = "punycode"; packageName = "punycode"; @@ -346,6 +841,51 @@ let sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; }; }; + "punycode-2.1.1" = { + name = "punycode"; + packageName = "punycode"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz"; + sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; + }; + }; + "qs-6.5.2" = { + name = "qs"; + packageName = "qs"; + version = "6.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz"; + sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="; + }; + }; + "request-2.88.0" = { + name = "request"; + packageName = "request"; + version = "2.88.0"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.88.0.tgz"; + sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg=="; + }; + }; + "request-promise-core-1.1.2" = { + name = "request-promise-core"; + packageName = "request-promise-core"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.2.tgz"; + sha512 = "UHYyq1MO8GsefGEt7EprS8UrXsm1TxEvFUX1IMTuSLU2Rh7fTIdFtl8xD7JiEYiWU2dl+NYAjCTksTehQUxPag=="; + }; + }; + "request-promise-native-1.0.7" = { + name = "request-promise-native"; + packageName = "request-promise-native"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.7.tgz"; + sha512 = "rIMnbBdgNViL37nZ1b3L/VfPOpSi0TqVDQPAvO6U14lMzOLrt5nilxCQqtDKhZeDiW0/hkCXGoQjhgJd/tCh6w=="; + }; + }; "restore-cursor-2.0.0" = { name = "restore-cursor"; packageName = "restore-cursor"; @@ -364,13 +904,22 @@ let sha1 = "0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"; }; }; - "rxjs-6.3.3" = { + "rxjs-6.4.0" = { name = "rxjs"; packageName = "rxjs"; - version = "6.3.3"; + version = "6.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz"; - sha512 = "JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw=="; + url = "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz"; + sha512 = "Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw=="; + }; + }; + "safe-buffer-5.1.2" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"; + sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; }; }; "safer-buffer-2.1.2" = { @@ -382,6 +931,15 @@ let sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; + "saxes-3.1.9" = { + name = "saxes"; + packageName = "saxes"; + version = "3.1.9"; + src = fetchurl { + url = "https://registry.npmjs.org/saxes/-/saxes-3.1.9.tgz"; + sha512 = "FZeKhJglhJHk7eWG5YM0z46VHmI3KJpMBAQm3xa9meDvd+wevB5GuBB0wc0exPInZiBBHqi00DbS8AcvCGCFMw=="; + }; + }; "signal-exit-3.0.2" = { name = "signal-exit"; packageName = "signal-exit"; @@ -391,6 +949,33 @@ let sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; }; }; + "source-map-0.6.1" = { + name = "source-map"; + packageName = "source-map"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"; + sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; + }; + }; + "sshpk-1.16.1" = { + name = "sshpk"; + packageName = "sshpk"; + version = "1.16.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz"; + sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg=="; + }; + }; + "stealthy-require-1.1.1" = { + name = "stealthy-require"; + packageName = "stealthy-require"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz"; + sha1 = "35b09875b4ff49f26a777e509b3090a3226bf24b"; + }; + }; "steno-0.4.4" = { name = "steno"; packageName = "steno"; @@ -427,6 +1012,15 @@ let sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; }; }; + "symbol-tree-3.2.2" = { + name = "symbol-tree"; + packageName = "symbol-tree"; + version = "3.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.2.tgz"; + sha1 = "ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"; + }; + }; "through-2.3.8" = { name = "through"; packageName = "through"; @@ -454,6 +1048,33 @@ let sha512 = "jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw=="; }; }; + "tough-cookie-2.4.3" = { + name = "tough-cookie"; + packageName = "tough-cookie"; + version = "2.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz"; + sha512 = "Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ=="; + }; + }; + "tough-cookie-2.5.0" = { + name = "tough-cookie"; + packageName = "tough-cookie"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz"; + sha512 = "nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g=="; + }; + }; + "tr46-1.0.1" = { + name = "tr46"; + packageName = "tr46"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz"; + sha1 = "a8b13fd6bfd2489519674ccde55ba3693b706d09"; + }; + }; "tslib-1.9.3" = { name = "tslib"; packageName = "tslib"; @@ -463,6 +1084,150 @@ let sha512 = "4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ=="; }; }; + "tunnel-agent-0.6.0" = { + name = "tunnel-agent"; + packageName = "tunnel-agent"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; + sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; + }; + }; + "tweetnacl-0.14.5" = { + name = "tweetnacl"; + packageName = "tweetnacl"; + version = "0.14.5"; + src = fetchurl { + url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"; + sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; + }; + }; + "type-check-0.3.2" = { + name = "type-check"; + packageName = "type-check"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz"; + sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72"; + }; + }; + "uri-js-4.2.2" = { + name = "uri-js"; + packageName = "uri-js"; + version = "4.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz"; + sha512 = "KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ=="; + }; + }; + "uuid-3.3.2" = { + name = "uuid"; + packageName = "uuid"; + version = "3.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz"; + sha512 = "yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="; + }; + }; + "verror-1.10.0" = { + name = "verror"; + packageName = "verror"; + version = "1.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz"; + sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; + }; + }; + "w3c-hr-time-1.0.1" = { + name = "w3c-hr-time"; + packageName = "w3c-hr-time"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz"; + sha1 = "82ac2bff63d950ea9e3189a58a65625fedf19045"; + }; + }; + "w3c-xmlserializer-1.1.2" = { + name = "w3c-xmlserializer"; + packageName = "w3c-xmlserializer"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-1.1.2.tgz"; + sha512 = "p10l/ayESzrBMYWRID6xbuCKh2Fp77+sA0doRuGn4tTIMrrZVeqfpKjXHY+oDh3K4nLdPgNwMTVP6Vp4pvqbNg=="; + }; + }; + "webidl-conversions-4.0.2" = { + name = "webidl-conversions"; + packageName = "webidl-conversions"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz"; + sha512 = "YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="; + }; + }; + "whatwg-encoding-1.0.5" = { + name = "whatwg-encoding"; + packageName = "whatwg-encoding"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz"; + sha512 = "b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw=="; + }; + }; + "whatwg-mimetype-2.3.0" = { + name = "whatwg-mimetype"; + packageName = "whatwg-mimetype"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz"; + sha512 = "M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g=="; + }; + }; + "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=="; + }; + }; + "wordwrap-1.0.0" = { + name = "wordwrap"; + packageName = "wordwrap"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz"; + sha1 = "27584810891456a4171c8d0226441ade90cbcaeb"; + }; + }; + "ws-6.2.1" = { + name = "ws"; + packageName = "ws"; + version = "6.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz"; + sha512 = "GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA=="; + }; + }; + "xml-name-validator-3.0.0" = { + name = "xml-name-validator"; + packageName = "xml-name-validator"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz"; + sha512 = "A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw=="; + }; + }; + "xmlchars-1.3.1" = { + name = "xmlchars"; + packageName = "xmlchars"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/xmlchars/-/xmlchars-1.3.1.tgz"; + sha512 = "tGkGJkN8XqCod7OT+EvGYK5Z4SfDQGD30zAa58OcnAa0RRWgzUEK72tkXhsX1FZd+rgnhRxFtmO+ihkp8LHSkw=="; + }; + }; "zxcvbn-4.4.2" = { name = "zxcvbn"; packageName = "zxcvbn"; @@ -478,17 +1243,31 @@ in "@bitwarden/cli" = nodeEnv.buildNodePackage { name = "_at_bitwarden_slash_cli"; packageName = "@bitwarden/cli"; - version = "1.7.0"; + version = "1.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@bitwarden/cli/-/cli-1.7.0.tgz"; - sha512 = "rynqUqyfC33dMQ21OlrOu4MQVEvtjyHw1kmu85+l0j9f2CQWEffeqVwoHF5GTtQOXev4PMyqRfSSYI6dRsseag=="; + url = "https://registry.npmjs.org/@bitwarden/cli/-/cli-1.7.4.tgz"; + sha512 = "WCYARJaSpcItFvxPFdRXTO9s26HbYFazL3wSlZ7HuL4tiML/7AfPD4wO3J7fgBn1ghU5NGJ7YZIL+oPmiuw6+Q=="; }; dependencies = [ - sources."ansi-escapes-3.1.0" + sources."abab-2.0.0" + sources."acorn-6.1.1" + sources."acorn-globals-4.3.0" + sources."acorn-walk-6.1.1" + sources."ajv-6.10.0" + sources."ansi-escapes-3.2.0" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" + sources."array-equal-1.0.0" + sources."asn1-0.2.4" + sources."assert-plus-1.0.0" + sources."async-limiter-1.0.0" sources."asynckit-0.4.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.8.0" + sources."bcrypt-pbkdf-1.0.2" sources."big-integer-1.6.36" + sources."browser-process-hrtime-0.1.3" + sources."caseless-0.12.0" sources."chalk-2.4.1" sources."chardet-0.7.0" sources."cli-cursor-2.1.0" @@ -497,44 +1276,122 @@ in sources."color-name-1.1.3" sources."combined-stream-1.0.6" sources."commander-2.18.0" + sources."core-util-is-1.0.2" + sources."cssom-0.3.6" + sources."cssstyle-1.2.2" + sources."dashdash-1.14.1" + sources."data-urls-1.1.0" + sources."deep-is-0.1.3" sources."delayed-stream-1.0.0" + sources."domexception-1.0.1" + sources."ecc-jsbn-0.1.2" sources."escape-string-regexp-1.0.5" + sources."escodegen-1.11.1" + sources."esprima-3.1.3" + sources."estraverse-4.2.0" + sources."esutils-2.0.2" + sources."extend-3.0.2" sources."external-editor-3.0.3" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-2.0.1" + sources."fast-json-stable-stringify-2.0.0" + sources."fast-levenshtein-2.0.6" sources."figures-2.0.0" + sources."forever-agent-0.6.1" sources."form-data-2.3.2" + sources."getpass-0.1.7" sources."graceful-fs-4.1.15" + sources."har-schema-2.0.0" + sources."har-validator-5.1.3" sources."has-flag-3.0.0" + sources."html-encoding-sniffer-1.0.2" + sources."http-signature-1.2.0" sources."iconv-lite-0.4.24" sources."inquirer-6.2.0" sources."is-fullwidth-code-point-2.0.0" sources."is-promise-2.1.0" + sources."is-typedarray-1.0.0" + sources."isstream-0.1.2" + sources."jsbn-0.1.1" + sources."jsdom-13.2.0" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.4.1" + sources."json-stringify-safe-5.0.1" + sources."jsprim-1.4.1" + sources."levn-0.3.0" sources."lodash-4.17.11" + sources."lodash.sortby-4.7.0" sources."lowdb-1.0.0" sources."lunr-2.3.3" - sources."mime-db-1.37.0" - sources."mime-types-2.1.21" + sources."mime-db-1.38.0" + sources."mime-types-2.1.22" sources."mimic-fn-1.2.0" sources."mute-stream-0.0.7" sources."node-fetch-2.2.0" sources."node-forge-0.7.6" + sources."nwsapi-2.1.3" + sources."oauth-sign-0.9.0" sources."onetime-2.0.1" + sources."optionator-0.8.2" sources."os-tmpdir-1.0.2" sources."papaparse-4.6.0" + sources."parse5-5.1.0" + sources."performance-now-2.1.0" sources."pify-3.0.0" - sources."punycode-1.4.1" + sources."pn-1.1.0" + sources."prelude-ls-1.1.2" + sources."psl-1.1.31" + sources."punycode-2.1.1" + sources."qs-6.5.2" + (sources."request-2.88.0" // { + dependencies = [ + sources."punycode-1.4.1" + sources."tough-cookie-2.4.3" + ]; + }) + sources."request-promise-core-1.1.2" + sources."request-promise-native-1.0.7" sources."restore-cursor-2.0.0" sources."run-async-2.3.0" - sources."rxjs-6.3.3" + sources."rxjs-6.4.0" + sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" + sources."saxes-3.1.9" sources."signal-exit-3.0.2" + sources."source-map-0.6.1" + sources."sshpk-1.16.1" + sources."stealthy-require-1.1.1" sources."steno-0.4.4" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" sources."supports-color-5.5.0" + sources."symbol-tree-3.2.2" sources."through-2.3.8" - sources."tldjs-2.3.1" + (sources."tldjs-2.3.1" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) sources."tmp-0.0.33" + sources."tough-cookie-2.5.0" + sources."tr46-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" + sources."uri-js-4.2.2" + sources."uuid-3.3.2" + sources."verror-1.10.0" + sources."w3c-hr-time-1.0.1" + sources."w3c-xmlserializer-1.1.2" + sources."webidl-conversions-4.0.2" + sources."whatwg-encoding-1.0.5" + sources."whatwg-mimetype-2.3.0" + sources."whatwg-url-7.0.0" + sources."wordwrap-1.0.0" + sources."ws-6.2.1" + sources."xml-name-validator-3.0.0" + sources."xmlchars-1.3.1" sources."zxcvbn-4.4.2" ]; buildInputs = globalBuildInputs; @@ -544,6 +1401,6 @@ in license = "GPL-3.0"; }; production = true; - bypassCache = false; + bypassCache = true; }; } \ No newline at end of file diff --git a/pkgs/tools/security/bitwarden-cli/node-packages.nix b/pkgs/tools/security/bitwarden-cli/node-packages.nix index 0b559600b1b..6fb6421eb2d 100644 --- a/pkgs/tools/security/bitwarden-cli/node-packages.nix +++ b/pkgs/tools/security/bitwarden-cli/node-packages.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}: let nodeEnv = import ../../../development/node-packages/node-env.nix { diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix index 9ac62dc334f..301e7cb1f92 100644 --- a/pkgs/tools/security/eid-mw/default.nix +++ b/pkgs/tools/security/eid-mw/default.nix @@ -8,10 +8,10 @@ stdenv.mkDerivation rec { name = "eid-mw-${version}"; - version = "4.4.13"; + version = "4.4.16"; src = fetchFromGitHub { - sha256 = "14bgn2k0xbd6241qdghg787pgxy7k9rvcspaf74zwwyibaqknzyx"; + sha256 = "1q82fw63xzrnrgh1wyh457hal6vfdl6swqfq7l6kviywiwlzx7kd"; rev = "v${version}"; repo = "eid-mw"; owner = "Fedict"; diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index bf5d34a8dd1..86cc6221a5c 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "vault-${version}"; - version = "1.0.3"; + version = "1.1.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "1c5v1m8b6nm28mjwpsgc73n8q475pkzpdvyx46rf3xyrh01rfrnz"; + sha256 = "11hyqqpfz839ipqv534vvljyarnr9wn98rzvyfwnx2lq76h2adqn"; }; nativeBuildInputs = [ go gox removeReferencesTo ]; diff --git a/pkgs/tools/security/vulnix/default.nix b/pkgs/tools/security/vulnix/default.nix index c1fd40f24c6..96c3e78b6a7 100644 --- a/pkgs/tools/security/vulnix/default.nix +++ b/pkgs/tools/security/vulnix/default.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { pname = "vulnix"; - version = "1.8.0"; + version = "1.8.1"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "15j8zz7qmf6c6vhim08yn1knn0qhwypmc7bxw608zg5nf50vghyb"; + sha256 = "1kpwqsnz7jisi622halzl4s5q42d76nbq6ra800gscnfx48hqw9r"; }; outputs = [ "out" "doc" "man" ]; diff --git a/pkgs/tools/text/link-grammar/default.nix b/pkgs/tools/text/link-grammar/default.nix index 294aa157680..e565b37fc9e 100644 --- a/pkgs/tools/text/link-grammar/default.nix +++ b/pkgs/tools/text/link-grammar/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "5.5.1"; + version = "5.6.0"; pname = "link-grammar"; outputs = [ "bin" "out" "dev" "man" ]; src = fetchurl { url = "http://www.abisource.com/downloads/${pname}/${version}/${name}.tar.gz"; - sha256 = "1x8kj1yr3b7b6qrvc5b8mm90ff3m4qdbdqplvzii2xlkpvik92ff"; + sha256 = "0v4hn72npjlcf5aaw3kqmvf05vf15mp2r1s2nbj5ggxpprjj6dsm"; }; nativeBuildInputs = [ pkgconfig python3 ]; diff --git a/pkgs/tools/text/shfmt/default.nix b/pkgs/tools/text/shfmt/default.nix index 2ab568ba841..12b57cb82df 100644 --- a/pkgs/tools/text/shfmt/default.nix +++ b/pkgs/tools/text/shfmt/default.nix @@ -2,16 +2,16 @@ buildGoPackage rec { name = "shfmt-${version}"; - version = "1.1.0"; - rev = "v${version}"; + version = "2.6.4"; - goPackagePath = "github.com/mvdan/sh"; + goPackagePath = "mvdan.cc/sh"; + subPackages = ["cmd/shfmt"]; src = fetchFromGitHub { owner = "mvdan"; repo = "sh"; - inherit rev; - sha256 = "0h1qy27z6j1cgkk3hkvl7w3wjqc5flgn92r3j6frn8k2wzwj7zhz"; + rev = "v${version}"; + sha256 = "1jifac0fi0sz6wzdgvk6s9xwpkdng2hj63ldbaral8n2j9km17hh"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/virtualization/amazon-ecs-cli/default.nix b/pkgs/tools/virtualization/amazon-ecs-cli/default.nix index 33937c7c53b..9988bcc3585 100644 --- a/pkgs/tools/virtualization/amazon-ecs-cli/default.nix +++ b/pkgs/tools/virtualization/amazon-ecs-cli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "amazon-ecs-cli-${version}"; - version = "1.12.1"; + version = "1.13.1"; src = fetchurl { url = "https://s3.amazonaws.com/amazon-ecs-cli/ecs-cli-linux-amd64-v${version}"; - sha256 = "100iv4cchnxl1s02higga5v3hvawi4c7sqva97x34qigr4r7fxwm"; + sha256 = "0wiq32szmy2vk7yjjrcfisl9wrydcyiw986vhk0haidxkgw0gkv0"; }; unpackPhase = ":"; diff --git a/pkgs/tools/virtualization/govc/default.nix b/pkgs/tools/virtualization/govc/default.nix index 527c47ffc34..f2fdbcc670d 100644 --- a/pkgs/tools/virtualization/govc/default.nix +++ b/pkgs/tools/virtualization/govc/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "govc-${version}"; - version = "0.16.0"; + version = "0.20.0"; goPackagePath = "github.com/vmware/govmomi"; @@ -12,7 +12,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "vmware"; repo = "govmomi"; - sha256 = "09fllx7l2hsjrv1jl7g06xngjy0xwn5n5zng6x8dspgsl6kblyqp"; + sha256 = "16pgjhlps21vk3cb5h2y0b6skq095rd8kl0618rwrz84chdnzahk"; }; meta = { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index fac60ece810..f059704d278 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -261,6 +261,7 @@ mapAliases ({ qwt6 = libsForQt5.qwt; # added 2015-12-19 rdiff_backup = rdiff-backup; # added 2014-11-23 rdmd = dtools; # added 2017-08-19 + rhc = throw "deprecated in 2019-04-09: abandoned by upstream."; rng_tools = rng-tools; # added 2018-10-24 robomongo = robo3t; #added 2017-09-28 rssglx = rss-glx; #added 2015-03-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 09fd0e1bcc3..6e4723ed3f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1594,6 +1594,8 @@ in ipvsadm = callPackage ../os-specific/linux/ipvsadm { }; + ir-standard-fonts = callPackage ../data/fonts/ir-standard-fonts { }; + lynis = callPackage ../tools/security/lynis { }; mathics = pythonPackages.mathics; @@ -2562,7 +2564,7 @@ in # The latest version used by elasticsearch, logstash, kibana and the the beats from elastic. elk5Version = "5.6.9"; - elk6Version = "6.5.1"; + elk6Version = "6.7.1"; elasticsearch5 = callPackage ../servers/search/elasticsearch/5.x.nix { }; elasticsearch6 = callPackage ../servers/search/elasticsearch { }; @@ -3991,10 +3993,7 @@ in nodejs = hiPrio nodejs-8_x; - nodejs-slim = nodejs-slim-6_x; - - nodejs-6_x = callPackage ../development/web/nodejs/v6.nix {}; - nodejs-slim-6_x = callPackage ../development/web/nodejs/v6.nix { enableNpm = false; }; + nodejs-slim = nodejs-slim-8_x; nodejs-8_x = callPackage ../development/web/nodejs/v8.nix {}; nodejs-slim-8_x = callPackage ../development/web/nodejs/v8.nix { enableNpm = false; }; @@ -4022,10 +4021,6 @@ in nodejs = pkgs.nodejs-8_x; }); - nodePackages_6_x = dontRecurseIntoAttrs (callPackage ../development/node-packages/default-v6.nix { - nodejs = pkgs.nodejs-6_x; - }); - nodePackages = nodePackages_10_x; npm2nix = nodePackages.npm2nix; @@ -5543,6 +5538,8 @@ in shadowsocks-libev = callPackage ../tools/networking/shadowsocks-libev { }; + shabnam-fonts = callPackage ../data/fonts/shabnam-fonts { }; + shadowsocks-rust = callPackage ../tools/networking/shadowsocks-rust { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -5990,6 +5987,8 @@ in torsocks = callPackage ../tools/security/tor/torsocks.nix { }; + tox-node = callPackage ../tools/networking/tox-node { }; + toxvpn = callPackage ../tools/networking/toxvpn { }; toybox = callPackage ../tools/misc/toybox { }; @@ -8189,6 +8188,7 @@ in polyml = callPackage ../development/compilers/polyml { }; polyml56 = callPackage ../development/compilers/polyml/5.6.nix { }; + polyml57 = callPackage ../development/compilers/polyml/5.7.nix { }; pure = callPackage ../development/interpreters/pure { llvm = llvm_35; @@ -8901,6 +8901,8 @@ in pmd = callPackage ../development/tools/analysis/pmd { }; + pmdk = callPackage ../development/libraries/pmdk { }; + jdepend = callPackage ../development/tools/analysis/jdepend { }; fedpkg = pythonPackages.callPackage ../development/tools/fedpkg { }; @@ -9279,8 +9281,6 @@ in withPEPatterns = true; }; - rhc = callPackage ../development/tools/rhc { }; - rman = callPackage ../development/tools/misc/rman { }; rolespec = callPackage ../development/tools/misc/rolespec { }; @@ -10763,6 +10763,8 @@ in lib3ds = callPackage ../development/libraries/lib3ds { }; + lib3mf = callPackage ../development/libraries/lib3mf { }; + libaacs = callPackage ../development/libraries/libaacs { }; libaal = callPackage ../development/libraries/libaal { }; @@ -13411,7 +13413,7 @@ in zmqpp = callPackage ../development/libraries/zmqpp { }; zig = callPackage ../development/compilers/zig { - llvmPackages = llvmPackages_7; + llvmPackages = llvmPackages_8; }; zimlib = callPackage ../development/libraries/zimlib { }; @@ -14345,6 +14347,8 @@ in shairport-sync = callPackage ../servers/shairport-sync { }; + showoff = callPackage ../servers/http/showoff {}; + serfdom = callPackage ../servers/serf { }; seyren = callPackage ../servers/monitoring/seyren { }; @@ -15805,6 +15809,8 @@ in documentation-highlighter = callPackage ../misc/documentation-highlighter { }; + documize-community = callPackage ../servers/documize-community { }; + doulos-sil = callPackage ../data/fonts/doulos-sil { }; cabin = callPackage ../data/fonts/cabin { }; @@ -18458,6 +18464,8 @@ in mac = callPackage ../development/libraries/mac { }; + macdylibbundler = callPackage ../development/tools/misc/macdylibbundler { }; + magic-wormhole = with python3Packages; toPythonApplication magic-wormhole; mail-notification = callPackage ../desktops/gnome-2/desktop/mail-notification {}; @@ -20089,6 +20097,8 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + vdirsyncerStable = callPackage ../tools/misc/vdirsyncer/stable.nix { }; + vdpauinfo = callPackage ../tools/X11/vdpauinfo { }; verbiste = callPackage ../applications/misc/verbiste { @@ -21550,6 +21560,8 @@ in xsokoban = callPackage ../games/xsokoban { }; + xtris = callPackage ../games/xtris { }; + inherit (callPackage ../games/quake2/yquake2 { }) yquake2 yquake2-ctf @@ -22151,7 +22163,7 @@ in ifstat-legacy = callPackage ../tools/networking/ifstat-legacy { }; isabelle = callPackage ../applications/science/logic/isabelle { - polyml = stdenv.lib.overrideDerivation polyml (attrs: { + polyml = stdenv.lib.overrideDerivation polyml57 (attrs: { configureFlags = [ "--enable-intinf-as-int" "--with-gmp" "--disable-shared" ]; }); @@ -23568,7 +23580,7 @@ in ghc-standalone-archive = callPackage ../os-specific/darwin/ghc-standalone-archive { inherit (darwin) cctools; }; vdr = callPackage ../applications/video/vdr { }; - vdrPlugins = vdr.plugins // (recurseIntoAttrs (callPackages ../applications/video/vdr/plugins.nix { })); + vdrPlugins = recurseIntoAttrs (callPackages ../applications/video/vdr/plugins.nix { }); wrapVdr = callPackage ../applications/video/vdr/wrapper.nix {}; chrome-gnome-shell = callPackage ../desktops/gnome-3/extensions/chrome-gnome-shell {}; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 68e7fde3a52..f79f6ea3c0c 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -53,6 +53,8 @@ let atdgen = callPackage ../development/ocaml-modules/atdgen { }; + base64_2 = callPackage ../development/ocaml-modules/base64/2.0.nix { }; + base64 = callPackage ../development/ocaml-modules/base64 { }; bap = callPackage ../development/ocaml-modules/bap { @@ -144,12 +146,15 @@ let cmdliner = callPackage ../development/ocaml-modules/cmdliner { }; cohttp_p4 = callPackage ../development/ocaml-modules/cohttp/0.19.3.nix { + base64 = base64_2; lwt = lwt2; }; cohttp = if lib.versionOlder "4.03" ocaml.version - then callPackage ../development/ocaml-modules/cohttp { } + then callPackage ../development/ocaml-modules/cohttp { + base64 = base64_2; + } else cohttp_p4; cohttp-lwt = callPackage ../development/ocaml-modules/cohttp/lwt.nix { }; @@ -337,7 +342,10 @@ let then callPackage ../development/tools/ocaml/js_of_ocaml/3.0.nix { } else js_of_ocaml_2; - js_of_ocaml_2 = callPackage ../development/tools/ocaml/js_of_ocaml { lwt = lwt2; }; + js_of_ocaml_2 = callPackage ../development/tools/ocaml/js_of_ocaml { + base64 = base64_2; + lwt = lwt2; + }; js_of_ocaml-camlp4 = callPackage ../development/tools/ocaml/js_of_ocaml/camlp4.nix {}; @@ -574,7 +582,10 @@ let ounit = callPackage ../development/ocaml-modules/ounit { }; - piqi = callPackage ../development/ocaml-modules/piqi { }; + piqi = callPackage ../development/ocaml-modules/piqi { + base64 = base64_2; + }; + piqi-ocaml = callPackage ../development/ocaml-modules/piqi-ocaml { }; ppxfind = callPackage ../development/ocaml-modules/ppxfind { }; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index e7763bc557b..fb65528c516 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -10,8 +10,8 @@ let isPhp73 = pkgs.lib.versionAtLeast php.version "7.3"; apcu = buildPecl { - name = "apcu-5.1.15"; - sha256 = "0v91fxh3z3amwicqlmz7lvnh4zfl2d7kj2zc8pvlvj2lms8ql5zc"; + name = "apcu-5.1.17"; + sha256 = "14y7alvj5q17q1b544bxidavkn6i40cjbq2nv1m0k70ai5vv84bb"; buildInputs = [ (if isPhp73 then pkgs.pcre2 else pkgs.pcre) ]; doCheck = true; checkTarget = "test"; @@ -21,8 +21,8 @@ let }; apcu_bc = buildPecl { - name = "apcu_bc-1.0.4"; - sha256 = "1raww7alwayg9nk0akly1mdrjypxlwg8safnmaczl773cwpw5cbw"; + name = "apcu_bc-1.0.5"; + sha256 = "0ma00syhk2ps9k9p02jz7rii6x3i2p986il23703zz5npd6y9n20"; buildInputs = [ apcu (if isPhp73 then pkgs.pcre2 else pkgs.pcre) ]; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1cabba8ea42..b3e75d8e40e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1072,6 +1072,8 @@ in { avro3k = callPackage ../development/python-modules/avro3k {}; + aws-lambda-builders = callPackage ../development/python-modules/aws-lambda-builders { }; + python-slugify = callPackage ../development/python-modules/python-slugify { }; awesome-slugify = callPackage ../development/python-modules/awesome-slugify {}; @@ -1177,6 +1179,8 @@ in { cheroot = callPackage ../development/python-modules/cheroot {}; + chevron = callPackage ../development/python-modules/chevron {}; + cli-helpers = callPackage ../development/python-modules/cli-helpers {}; cmarkgfm = callPackage ../development/python-modules/cmarkgfm { }; @@ -3740,8 +3744,6 @@ in { pyblock = callPackage ../development/python-modules/pyblock { }; - pybcrypt = callPackage ../development/python-modules/pybcrypt { }; - pyblosxom = callPackage ../development/python-modules/pyblosxom { }; pycapnp = callPackage ../development/python-modules/pycapnp { }; @@ -4201,6 +4203,8 @@ in { setuptools_scm = callPackage ../development/python-modules/setuptools_scm { }; + serverlessrepo = callPackage ../development/python-modules/serverlessrepo { }; + shippai = callPackage ../development/python-modules/shippai {}; simanneal = callPackage ../development/python-modules/simanneal { };