diff options
190 files changed, 5564 insertions, 1551 deletions
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 17b830e5fad0..5c2b495fa8e1 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -47,6 +47,9 @@ /nixos/doc/manual/man-nixos-option.xml @nbp /nixos/modules/installer/tools/nixos-option.sh @nbp +# NixOS modules +/nixos/modules @Infinisil + # Python-related code and docs /maintainers/scripts/update-python-libraries @FRidh /pkgs/top-level/python-packages.nix @FRidh diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 81ce4d94ad21..eefe46b15de1 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -484,7 +484,7 @@ and in this case the `python35` interpreter is automatically used. ### Interpreters Versions 2.7, 3.5, 3.6 and 3.7 of the CPython interpreter are available as -respectively `python27`, `python35`, `python36` and `python37`. The PyPy +respectively `python27`, `python35`, `python36`, and `python37`. The PyPy interpreter is available as `pypy`. The aliases `python2` and `python3` correspond to respectively `python27` and `python37`. The default interpreter, `python`, maps to `python2`. The Nix expressions for the interpreters can be diff --git a/lib/types.nix b/lib/types.nix index ca6794e274c3..d1ece2402ad7 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -169,6 +169,9 @@ rec { # s32 = sign 32 4294967296; }; + # Alias of u16 for a port number + port = ints.u16; + float = mkOptionType rec { name = "float"; description = "floating point number"; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c73cda5ea1cf..47117ba8a7be 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1754,6 +1754,11 @@ email = "t@larkery.com"; name = "Tom Hinton"; }; + hlolli = { + email = "hlolli@gmail.com"; + github = "hlolli"; + name = "Hlodver Sigurdsson"; + }; hodapp = { email = "hodapp87@gmail.com"; github = "Hodapp87"; @@ -2686,6 +2691,11 @@ github = "melsigl"; name = "Melanie B. Sigl"; }; + melkor333 = { + email = "samuel@ton-kunst.ch"; + github = "melkor333"; + name = "Samuel Ruprecht"; + }; metabar = { email = "softs@metabarcoding.org"; name = "Celine Mercier"; diff --git a/nixos/doc/manual/development/option-types.xml b/nixos/doc/manual/development/option-types.xml index e6c9eae11a72..d993e47bc914 100644 --- a/nixos/doc/manual/development/option-types.xml +++ b/nixos/doc/manual/development/option-types.xml @@ -106,7 +106,7 @@ </para> </listitem> </varlistentry> - <varlistentry> + <varlistentry xml:id='types.ints.ux'> <term> <varname>types.ints.{u8, u16, u32}</varname> </term> @@ -131,6 +131,17 @@ </para> </listitem> </varlistentry> + <varlistentry> + <term> + <varname>types.port</varname> + </term> + <listitem> + <para> + A port number. This type is an alias to + <link linkend='types.ints.ux'><varname>types.ints.u16</varname></link>. + </para> + </listitem> + </varlistentry> </variablelist> <para> diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 3d5479c31f01..2fbde1c451ce 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -431,6 +431,7 @@ ./services/monitoring/dd-agent/dd-agent.nix ./services/monitoring/fusion-inventory.nix ./services/monitoring/grafana.nix + ./services/monitoring/grafana-reporter.nix ./services/monitoring/graphite.nix ./services/monitoring/hdaps.nix ./services/monitoring/heapster.nix diff --git a/nixos/modules/services/monitoring/grafana-reporter.nix b/nixos/modules/services/monitoring/grafana-reporter.nix new file mode 100644 index 000000000000..149026d20188 --- /dev/null +++ b/nixos/modules/services/monitoring/grafana-reporter.nix @@ -0,0 +1,66 @@ +{ options, config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.grafana_reporter; + +in { + options.services.grafana_reporter = { + enable = mkEnableOption "grafana_reporter"; + + grafana = { + protocol = mkOption { + description = "Grafana protocol."; + default = "http"; + type = types.enum ["http" "https"]; + }; + addr = mkOption { + description = "Grafana address."; + default = "127.0.0.1"; + type = types.str; + }; + port = mkOption { + description = "Grafana port."; + default = 3000; + type = types.int; + }; + + }; + addr = mkOption { + description = "Listening address."; + default = "127.0.0.1"; + type = types.str; + }; + + port = mkOption { + description = "Listening port."; + default = 8686; + type = types.int; + }; + + templateDir = mkOption { + description = "Optional template directory to use custom tex templates"; + default = "${pkgs.grafana_reporter}"; + type = types.str; + }; + }; + + config = mkIf cfg.enable { + systemd.services.grafana_reporter = { + description = "Grafana Reporter Service Daemon"; + wantedBy = ["multi-user.target"]; + after = ["network.target"]; + serviceConfig = let + args = lib.concatSepString " " [ + "-proto ${cfg.grafana.protocol}://" + "-ip ${cfg.grafana.addr}:${toString cfg.grafana.port}" + "-port :${toString cfg.port}" + "-templates ${cfg.templateDir}" + ]; + in { + ExecStart = "${pkgs.grafana_reporter.bin}/bin/grafana-reporter ${args}"; + }; + }; + }; +} diff --git a/nixos/modules/services/monitoring/monit.nix b/nixos/modules/services/monitoring/monit.nix index d48e5c550abb..32e14ab21ffc 100644 --- a/nixos/modules/services/monitoring/monit.nix +++ b/nixos/modules/services/monitoring/monit.nix @@ -1,33 +1,30 @@ -# Monit system watcher -# http://mmonit.org/monit/ - {config, pkgs, lib, ...}: -let inherit (lib) mkOption mkIf; +with lib; + +let + cfg = config.services.monit; in { - options = { - services.monit = { - enable = mkOption { - default = false; - description = '' - Whether to run Monit system watcher. - ''; - }; - config = mkOption { - default = ""; - description = "monitrc content"; - }; + options.services.monit = { + + enable = mkEnableOption "Monit"; + + config = mkOption { + type = types.lines; + default = ""; + description = "monitrc content"; }; + }; - config = mkIf config.services.monit.enable { + config = mkIf cfg.enable { environment.systemPackages = [ pkgs.monit ]; environment.etc."monitrc" = { - text = config.services.monit.config; + text = cfg.config; mode = "0400"; }; diff --git a/nixos/modules/services/network-filesystems/glusterfs.nix b/nixos/modules/services/network-filesystems/glusterfs.nix index 8ac9f801dcb8..adf59100f067 100644 --- a/nixos/modules/services/network-filesystems/glusterfs.nix +++ b/nixos/modules/services/network-filesystems/glusterfs.nix @@ -198,6 +198,9 @@ in install -m 0755 -d /var/log/glusterfs ''; + # glustereventsd uses the `gluster` executable + path = [ glusterfs ]; + serviceConfig = { Type="simple"; Environment="PYTHONPATH=${glusterfs}/usr/lib/python2.7/site-packages"; diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index c16fbe8a52fa..5fab79f1b3d7 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -130,7 +130,7 @@ in }; ports = mkOption { - type = types.listOf types.int; + type = types.listOf types.port; default = [22]; description = '' Specifies on which ports the SSH daemon listens. diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index c7e97bbeba9a..d0efdf88d73c 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -171,7 +171,12 @@ in { dbhost = mkOption { type = types.nullOr types.str; default = "localhost"; - description = "Database host."; + description = '' + Database host. + + Note: for using Unix authentication with PostgreSQL, this should be + set to <literal>/tmp</literal>. + ''; }; dbport = mkOption { type = with types; nullOr (either int str); diff --git a/nixos/release.nix b/nixos/release.nix index b7f8c01bb000..c2372da23f57 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -336,6 +336,7 @@ in rec { tests.plasma5 = callTest tests/plasma5.nix {}; tests.plotinus = callTest tests/plotinus.nix {}; tests.keymap = callSubTests tests/keymap.nix {}; + tests.incron = callTest tests/incron.nix {}; tests.initrdNetwork = callTest tests/initrd-network.nix {}; tests.kafka = callSubTests tests/kafka.nix {}; tests.kernel-latest = callTest tests/kernel-latest.nix {}; diff --git a/nixos/tests/incron.nix b/nixos/tests/incron.nix new file mode 100644 index 000000000000..e39bbb5f096b --- /dev/null +++ b/nixos/tests/incron.nix @@ -0,0 +1,52 @@ +import ./make-test.nix ({ pkgs, lib, ... }: + +{ + name = "incron"; + meta.maintainers = [ lib.maintainers.aanderse ]; + + machine = + { ... }: + { services.incron.enable = true; + services.incron.extraPackages = [ pkgs.coreutils ]; + services.incron.systab = '' + /test IN_CREATE,IN_MODIFY,IN_CLOSE_WRITE,IN_MOVED_FROM,IN_MOVED_TO echo "$@/$# $%" >> /root/incron.log + ''; + + # ensure the directory to be monitored exists before incron is started + system.activationScripts.incronTest = '' + mkdir /test + ''; + }; + + testScript = '' + startAll; + + $machine->waitForUnit("multi-user.target"); + $machine->waitForUnit("incron.service"); + + $machine->succeed("test -d /test"); + # create some activity for incron to monitor + $machine->succeed("touch /test/file"); + $machine->succeed("echo foo >> /test/file"); + $machine->succeed("mv /test/file /root"); + $machine->succeed("mv /root/file /test"); + + $machine->sleep(1); + + # touch /test/file + $machine->succeed("grep '/test/file IN_CREATE' /root/incron.log"); + + # echo foo >> /test/file + $machine->succeed("grep '/test/file IN_MODIFY' /root/incron.log"); + $machine->succeed("grep '/test/file IN_CLOSE_WRITE' /root/incron.log"); + + # mv /test/file /root + $machine->succeed("grep '/test/file IN_MOVED_FROM' /root/incron.log"); + + # mv /root/file /test + $machine->succeed("grep '/test/file IN_MOVED_TO' /root/incron.log"); + + # ensure something unexpected is not present + $machine->fail("grep 'IN_OPEN' /root/incron.log"); + ''; +}) diff --git a/pkgs/applications/audio/bs1770gain/default.nix b/pkgs/applications/audio/bs1770gain/default.nix index edf7a313ff5f..44296d3c8b99 100644 --- a/pkgs/applications/audio/bs1770gain/default.nix +++ b/pkgs/applications/audio/bs1770gain/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "bs1770gain-${version}"; - version = "0.5.0"; + version = "0.5.1"; src = fetchurl { url = "mirror://sourceforge/bs1770gain/${name}.tar.gz"; - sha256 = "0vd7320k7s2zcn2vganclxbr1vav18ghld27rcwskvcc3dm8prii"; + sha256 = "0r4fbajgfmnwgl63hcm56f1j8m5f135q6j5jkzdvrrhpcj39yx06"; }; buildInputs = [ ffmpeg sox ]; diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index c8ac0a938efa..da3cff0bac24 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { name = "csound-${version}"; - version = "6.11.0"; + version = "6.12.0"; enableParallelBuilding = true; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "csound"; repo = "csound"; rev = version; - sha256 = "1nnfl8dqvc5b3f94zbvdg6bxr2wlp7as78hb31awxmvfwwihpv18"; + sha256 = "0pv4s54cayvavdp6y30n3r1l5x83x9whyyd2v24y0dh224v3hbxi"; }; cmakeFlags = [ "-DBUILD_CSOUND_AC=0" ] # fails to find Score.hpp diff --git a/pkgs/applications/audio/flacon/default.nix b/pkgs/applications/audio/flacon/default.nix index 8f3facec09b1..cec20743abdd 100644 --- a/pkgs/applications/audio/flacon/default.nix +++ b/pkgs/applications/audio/flacon/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "flacon-${version}"; - version = "4.1.0"; + version = "5.0.0"; src = fetchFromGitHub { owner = "flacon"; repo = "flacon"; rev = "v${version}"; - sha256 = "1sw2v2w3s79lbzhkf96m8lwvag824am7rwfzzsi8bz6sa6krmj0m"; + sha256 = "0pglqm2z7mp5igqmfnmvrgjhfbfrj8q5jvd0a0g2dzv3rqwfw4vc"; }; nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; diff --git a/pkgs/applications/audio/gradio/default.nix b/pkgs/applications/audio/gradio/default.nix index 0e636c532b46..3aea07235d8a 100644 --- a/pkgs/applications/audio/gradio/default.nix +++ b/pkgs/applications/audio/gradio/default.nix @@ -16,7 +16,7 @@ , gst_plugins ? with gst_all_1; [ gst-plugins-good gst-plugins-ugly ] }: let - version = "7.1"; + version = "7.2"; in stdenv.mkDerivation rec { name = "gradio-${version}"; @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { owner = "haecker-felix"; repo = "gradio"; rev = "v${version}"; - sha256 = "0x0hmcjvpgvsm64ywcc71srlwqybfhadn5nkwycq0lh7r49d89kx"; + sha256 = "0c4vlrfl0ljkiwarpwa8wcfmmihh6a5j4pi4yr0qshyl9xxvxiv3"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix index a5582f908fc0..a99683ef9942 100644 --- a/pkgs/applications/audio/mixxx/default.nix +++ b/pkgs/applications/audio/mixxx/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { name = "mixxx-${version}"; - version = "2.1.4"; + version = "2.1.5"; src = fetchFromGitHub { owner = "mixxxdj"; repo = "mixxx"; rev = "release-${version}"; - sha256 = "1q1px4033marraprvgr5yq9jlz943kcc10fdkn7py2ma8cfgnipq"; + sha256 = "0h14pwglz03sdmgzviypv1qa1xfjclrnhyqaq5nd60j47h4z39dr"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index 3649a0a68863..c89bb2e897ba 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.28.1"; + version = "3.29.2"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0yph01z8lw0r5bw3aa14w0l7z1ymxvpmb131gbaw3ib0srssgz64"; + sha256 = "1v767a2j6lzp5yppfjna0ifv8psj60pphzd7njcdkx71dvpswpi2"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/editors/emacs/25.nix b/pkgs/applications/editors/emacs/25.nix index ee21bbbd9bd9..6576cd544729 100644 --- a/pkgs/applications/editors/emacs/25.nix +++ b/pkgs/applications/editors/emacs/25.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d , pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif , libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux -, alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO +, alsaLib, cairo, acl, gpm, cf-private, AppKit, GSS, ImageIO , withX ? !stdenv.isDarwin , withGTK2 ? false, gtk2 ? null , withGTK3 ? true, gtk3 ? null, gsettings-desktop-schemas ? null @@ -61,9 +61,12 @@ stdenv.mkDerivation rec { ++ lib.optional (withX && withGTK2) gtk2 ++ lib.optionals (withX && withGTK3) [ gtk3 gsettings-desktop-schemas ] ++ lib.optional (stdenv.isDarwin && withX) cairo - ++ lib.optionals (withX && withXwidgets) [ webkitgtk24x-gtk3 glib-networking ]; - - propagatedBuildInputs = lib.optionals stdenv.isDarwin [ AppKit GSS ImageIO ]; + ++ lib.optionals (withX && withXwidgets) [ webkitgtk24x-gtk3 glib-networking ] + ++ lib.optionals stdenv.isDarwin [ + AppKit GSS ImageIO + # Needed for CFNotificationCenterAddObserver symbols. + cf-private + ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/editors/emacs/macport.nix b/pkgs/applications/editors/emacs/macport.nix index 0876a71cbf73..7070ce597388 100644 --- a/pkgs/applications/editors/emacs/macport.nix +++ b/pkgs/applications/editors/emacs/macport.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, ncurses, pkgconfig, texinfo, libxml2, gnutls, gettext, autoconf, automake -, AppKit, Carbon, Cocoa, IOKit, OSAKit, Quartz, QuartzCore, WebKit +, cf-private, AppKit, Carbon, Cocoa, IOKit, OSAKit, Quartz, QuartzCore, WebKit , ImageCaptureCore, GSS, ImageIO # These may be optional }: @@ -33,6 +33,8 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses libxml2 gnutls texinfo gettext AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit ImageCaptureCore GSS ImageIO # may be optional + # Needed for CFNotificationCenterAddObserver symbols. + cf-private ]; postUnpack = '' diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix index e50625fa0e89..23f9e486ad9a 100644 --- a/pkgs/applications/editors/kakoune/default.nix +++ b/pkgs/applications/editors/kakoune/default.nix @@ -4,12 +4,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "kakoune-unstable-${version}"; - version = "2018.09.04"; + version = "2018.10.27"; src = fetchFromGitHub { repo = "kakoune"; owner = "mawww"; rev = "v${version}"; - sha256 = "08v55hh7whm6hx6a047gszh0h5g35k3r8r52aggv7r2ybzrrw6w1"; + sha256 = "1w7jmq57h8gxxbzg0n3lgd6cci77xb9mziy6lr8330nzqc85zp9p"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ncurses asciidoc docbook_xsl libxslt ]; diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index 729b58ee89e6..201ebf7b2984 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -9,11 +9,11 @@ let inherit (python2Packages) pygtk wrapPython python; in stdenv.mkDerivation rec { name = "gimp-${version}"; - version = "2.10.6"; + version = "2.10.8"; src = fetchurl { url = "http://download.gimp.org/pub/gimp/v${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2"; - sha256 = "07qh2ljbza2mph1gh8sicn27qihhj8hx3ivvry2874cfh8ghgj2f"; + sha256 = "16sb4kslwin2jbgdb4nhks78pd0af8mvj8g5hap3hj946p7w2jfq"; }; nativeBuildInputs = [ pkgconfig intltool gettext wrapPython ]; diff --git a/pkgs/applications/graphics/krop/default.nix b/pkgs/applications/graphics/krop/default.nix index 2858086e0d64..c4c889cdba52 100644 --- a/pkgs/applications/graphics/krop/default.nix +++ b/pkgs/applications/graphics/krop/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "krop"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "arminstraub"; repo = pname; rev = "v${version}"; - sha256 = "0y8z9xr10wbzmi1dg1zpcsf3ihnxrnvlaf72821x3390s3qsnydf"; + sha256 = "0b1zqpks4vzq7sfhf7r9qrshr77f1ncj18x7d0fa3g29rxa42dcr"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/graphics/openimageio/default.nix b/pkgs/applications/graphics/openimageio/default.nix index 1980f470435b..f405ca01200d 100644 --- a/pkgs/applications/graphics/openimageio/default.nix +++ b/pkgs/applications/graphics/openimageio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "openimageio-${version}"; - version = "1.8.15"; + version = "1.8.16"; src = fetchFromGitHub { owner = "OpenImageIO"; repo = "oiio"; rev = "Release-${version}"; - sha256 = "0fbl5rzmip5q155lfsr07n65dnhww1kw97masps1i1x40gq15czx"; + sha256 = "0isx137c6anvs1xfxi0z35v1cw855xvnq2ca0pakqqpdh0yivrps"; }; outputs = [ "bin" "out" "dev" "doc" ]; diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index 594173f11c62..5237e02f15c0 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -18,6 +18,7 @@ libGL, xclip, # Darwin Frameworks + cf-private, AppKit, CoreFoundation, CoreGraphics, @@ -40,15 +41,6 @@ let libGL libXi ]; - darwinFrameworks = [ - AppKit - CoreFoundation - CoreGraphics - CoreServices - CoreText - Foundation - OpenGL - ]; in buildRustPackage rec { name = "alacritty-unstable-${version}"; version = "0.2.1"; @@ -71,7 +63,11 @@ in buildRustPackage rec { ]; buildInputs = rpathLibs - ++ lib.optionals stdenv.isDarwin darwinFrameworks; + ++ lib.optionals stdenv.isDarwin [ + AppKit CoreFoundation CoreGraphics CoreServices CoreText Foundation OpenGL + # Needed for CFURLResourceIsReachable symbols. + cf-private + ]; outputs = [ "out" "terminfo" ]; diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix index ad3f65346593..1a162aca0d76 100644 --- a/pkgs/applications/misc/cheat/default.nix +++ b/pkgs/applications/misc/cheat/default.nix @@ -4,7 +4,7 @@ with python3Packages; buildPythonApplication rec { name = "${pname}-${version}"; pname = "cheat"; - version = "2.2.3"; + version = "2.3.1"; propagatedBuildInputs = [ docopt pygments ]; @@ -12,7 +12,7 @@ buildPythonApplication rec { owner = "chrisallenlane"; repo = "cheat"; rev = version; - sha256 = "1p9a54fax3b1ilqcwdlccy08ww3igwsyzcyikqivaxj5p6mqq6wl"; + sha256 = "1dcpjvbv648r8325qjf30m8b4cyrrjbzc2kvh40zy2mbjsa755zr"; }; # no tests available doCheck = false; diff --git a/pkgs/applications/misc/chirp/default.nix b/pkgs/applications/misc/chirp/default.nix index 4f594d5d4c05..db67514cd077 100644 --- a/pkgs/applications/misc/chirp/default.nix +++ b/pkgs/applications/misc/chirp/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "chirp-daily-${version}"; - version = "20181009"; + version = "20181018"; src = fetchurl { url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${name}.tar.gz"; - sha256 = "1h7i8skdjkz7n6dz3q9pzg1k31nh1ivy2mx3864bjvpkc7m6yyd9"; + sha256 = "0jd7xi6q09b3djn1k7pj1sbqvw24kn7dcp9r6abvxily4pc1xhdr"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix index 39a87314ca7b..e05e140048b9 100644 --- a/pkgs/applications/misc/copyq/default.nix +++ b/pkgs/applications/misc/copyq/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "CopyQ-${version}"; - version = "3.6.1"; + version = "3.7.0"; src = fetchFromGitHub { owner = "hluk"; repo = "CopyQ"; rev = "v${version}"; - sha256 = "0drhafnr1d595wa8zwvmgmrrqb86navdk4iw6ly6gmh0i800wz0z"; + sha256 = "1dm02l1ry7ndn283774nzmg89wy1933f4iyf6n02p152zgx4llyf"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/gImageReader/default.nix b/pkgs/applications/misc/gImageReader/default.nix index 16693cfbf09c..ec867854dfb9 100644 --- a/pkgs/applications/misc/gImageReader/default.nix +++ b/pkgs/applications/misc/gImageReader/default.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation rec { name = "gImageReader-${version}"; - version = "3.2.99"; + version = "3.3.0"; src = fetchFromGitHub { owner= "manisandro"; repo = "gImageReader"; rev = "v${version}"; - sha256 = "19dbxq83j77lbvi10a8x0xxgw5hbsqyc852c196zzvmwk3km6pnc"; + sha256 = "0pjk4kr7bc5q4hi1xf7na2zln9fyqdazgzq62r3bg41nzy7fakcz"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/gnss-sdr/default.nix b/pkgs/applications/misc/gnss-sdr/default.nix index 0bb0926f048a..6cbdea8c6867 100644 --- a/pkgs/applications/misc/gnss-sdr/default.nix +++ b/pkgs/applications/misc/gnss-sdr/default.nix @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DGFlags_ROOT_DIR=${google-gflags}/lib" "-DGLOG_INCLUDE_DIR=${glog}/include" + "-DENABLE_UNIT_TESTING=OFF" # gnss-sdr doesn't truly depend on BLAS or LAPACK, as long as # armadillo is built using both, so skip checking for them. diff --git a/pkgs/applications/misc/hovercraft/default.nix b/pkgs/applications/misc/hovercraft/default.nix new file mode 100644 index 000000000000..ba23078bba93 --- /dev/null +++ b/pkgs/applications/misc/hovercraft/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonApplication +, isPy3k +, fetchFromGitHub +, manuel +, setuptools +, docutils +, lxml +, svg-path +, pygments +, watchdog +}: + +buildPythonApplication rec { + pname = "hovercraft"; + version = "2.6"; + disabled = ! isPy3k; + + src = fetchFromGitHub { + owner = "regebro"; + repo = "hovercraft"; + rev = version; + sha256 = "150sn6kvqi2s89di1akl5i0g81fasji2ipr12zq5s4dcnhw4r5wp"; + }; + + checkInputs = [ manuel ]; + propagatedBuildInputs = [ setuptools docutils lxml svg-path pygments watchdog ]; + + meta = with lib; { + description = "Makes impress.js presentations from reStructuredText"; + homepage = https://github.com/regebro/hovercraft; + license = licenses.mit; + maintainers = with maintainers; [ goibhniu makefu ]; + }; +} diff --git a/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix b/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix index b2980bcd8aea..b45cb24b1b51 100644 --- a/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix +++ b/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix @@ -1,12 +1,12 @@ { stdenv, buildEnv, fetchurl, mono }: let - version = "1.7.3.1"; + version = "1.8.0"; drv = stdenv.mkDerivation { name = "keepassrpc-${version}"; src = fetchurl { url = "https://github.com/kee-org/keepassrpc/releases/download/v${version}/KeePassRPC.plgx"; - sha256 = "1y9b35qg27caj3pbaqqzrqpk61hbbd8617ziwdc9vl799i786m9k"; + sha256 = "1dclfpia559cqf78qw29zz235h1df5md4kgjv3bbi8y41wwmx7cd"; }; meta = with stdenv.lib; { @@ -14,7 +14,7 @@ let homepage = https://github.com/kee-org/keepassrpc; platforms = [ "x86_64-linux" ]; license = licenses.gpl2; - maintainers = with maintainers; [ mjanczyk svsdep ]; + maintainers = with maintainers; [ mjanczyk svsdep mgregoire ]; }; pluginFilename = "KeePassRPC.plgx"; diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix index 7713b5256bfa..120d3a82b5e9 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.4"; + version = "4.8.8"; src = fetchFromGitHub { owner = "OpenCPN"; repo = "OpenCPN"; rev = "v${version}"; - sha256 = "0v4klprzddmpq7w8h2pm69sgbshirdmjrlzhz62b606gbr58fazf"; + sha256 = "1z9xfc5fgbdslzak3iqg9nx6wggxwv8qwfxfhvfblkyg6kjw30dg"; }; nativeBuildInputs = [ pkgconfig ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "A concise ChartPlotter/Navigator"; maintainers = [ stdenv.lib.maintainers.kragniz ]; - platforms = stdenv.lib.platforms.all; + platforms = [ "x86_64-linux" ]; license = stdenv.lib.licenses.gpl2; homepage = https://opencpn.org/; }; diff --git a/pkgs/applications/networking/browsers/falkon/default.nix b/pkgs/applications/networking/browsers/falkon/default.nix index 21631ef191c4..ff16ddb90f69 100644 --- a/pkgs/applications/networking/browsers/falkon/default.nix +++ b/pkgs/applications/networking/browsers/falkon/default.nix @@ -1,5 +1,9 @@ -{ stdenv, fetchFromGitHub, cmake, extra-cmake-modules, pkgconfig, qmake -, libpthreadstubs, libxcb, libXdmcp, qtsvg, qttools, qtwebengine, qtx11extras, kwallet }: +{ stdenv, lib, fetchFromGitHub, cmake, extra-cmake-modules, pkgconfig, qmake +, libpthreadstubs, libxcb, libXdmcp +, qtsvg, qttools, qtwebengine, qtx11extras +, qtwayland +, kwallet +}: stdenv.mkDerivation rec { name = "falkon-${version}"; @@ -21,9 +25,9 @@ stdenv.mkDerivation rec { buildInputs = [ libpthreadstubs libxcb libXdmcp + qtsvg qttools qtwebengine qtx11extras kwallet - qtsvg qtwebengine qtx11extras - ]; + ] ++ lib.optionals stdenv.isLinux [ qtwayland ]; nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qmake qttools ]; diff --git a/pkgs/applications/networking/cluster/terraform-providers/data.nix b/pkgs/applications/networking/cluster/terraform-providers/data.nix index 421fc652a328..c3be5eade390 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/data.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/data.nix @@ -11,8 +11,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-alicloud"; - version = "1.21.0"; - sha256 = "17853l2s5z1y2g24wdkapdp26hw0sx5w73y118h0px85fiwhkq79"; + version = "1.22.0"; + sha256 = "19qn7q280ppsg7hjlmyagbhgb7qw365mk6c4avs0apvpq6n64rn3"; }; archive = { @@ -39,15 +39,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-aws"; - version = "1.42.0"; - sha256 = "1wi1m7i6vq53p36x1prax4yaz400834024q494zg0ckk4rvngfp6"; + version = "1.43.1"; + sha256 = "0fhw07kqcykfzlfhqh3wdz43kkhz3c63xkymnpw68kqx2vxx8ncv"; }; azurerm = { owner = "terraform-providers"; repo = "terraform-provider-azurerm"; - version = "1.17.0"; - sha256 = "03sjlqkwy0qa382sjwi21g6h2fz1mpsiqcd4naj5zh76fkp8aslw"; + version = "1.18.0"; + sha256 = "03vkpk9kl9zvfrprhqqn739klr9gpps5d6zq5r3qa56k588zcg4p"; }; azurestack = { @@ -102,8 +102,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-cloudflare"; - version = "1.7.0"; - sha256 = "0sqq6miwyh6z86b3wq2bhkaj4x39g2nqq784py8nm8gvs06gcm5a"; + version = "1.8.0"; + sha256 = "1hsqxi27mwr96k8yn8f1nxwvs1jaq7nr8plxi7y4lqsv6s7mghjk"; }; cloudscale = { @@ -137,8 +137,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-datadog"; - version = "1.4.0"; - sha256 = "06ik2k0jkm4200d8njpsidwfjl12ikn5ciqkmlxfwr3b8s1w8kpa"; + version = "1.5.0"; + sha256 = "0wr44rqmg0hffgb2g4h03lk4pg9i244c13kyrc3m89b3biwdcydz"; }; digitalocean = { @@ -305,8 +305,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-linode"; - version = "1.1.0"; - sha256 = "19c269w8jjx04a8rhm4x7bg2xad3y0s74wgis446mwaw7mhla3l3"; + version = "1.2.0"; + sha256 = "1wnl48qi8lhrxnrdgnhw7cb7mqv6141g4i648wb7cni5vlqy3i5l"; }; local = { @@ -340,8 +340,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-mysql"; - version = "1.1.0"; - sha256 = "06alk5vd20wzf493dw8hb80q0sx0kw4j8g1sd0193fhni0k4rflw"; + version = "1.5.0"; + sha256 = "1fsqfqz1db1pv8agr5zgqqyhizd7647n6rznf24iwapy1q0wkvmi"; }; netlify = { @@ -354,8 +354,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-newrelic"; - version = "1.1.0"; - sha256 = "040pxbr4xp0h6s0njdwy0phlkblnk5p3xrcms2gkwyzkqpd82s8b"; + version = "1.2.0"; + sha256 = "1dh2i7qps7nr876y54jrjb414vdjhd8c7m1zwdiny93ggvl8f5j2"; }; nomad = { @@ -396,8 +396,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-oci"; - version = "3.5.0"; - sha256 = "0f4m6rahis1n62w0h0amg8sjs5bb3ifnrfzq1dys7r01k5411wcf"; + version = "3.6.0"; + sha256 = "0ilg52j6js6bvw9wng5rbcv2n9kp926x4f2q340qwyyna59r5s5l"; }; oneandone = { @@ -424,8 +424,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-opentelekomcloud"; - version = "1.2.0"; - sha256 = "05w899l18gmdywfhakjvaxqxxzd9cxga3s932ljfibr0ssipkhh9"; + version = "1.3.0"; + sha256 = "07rmav271wgjp1sby88s2ghh8w5hnkdy6rsc8pj69zy332i7n6wk"; }; opsgenie = { @@ -620,8 +620,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-vault"; - version = "1.2.0"; - sha256 = "1z92dcr5b665l69gxs1hw1rizc5znvf0ck1lksphd301l2ywk97b"; + version = "1.3.1"; + sha256 = "1rhwq45g6jggmxf953w5lckqzngdr15g5ncwwl2mjhz2xakn44lh"; }; vcd = { diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index f35269eb2712..1fe9ad5ccc83 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "terragrunt-${version}"; - version = "0.16.6"; + version = "0.17.2"; goPackagePath = "github.com/gruntwork-io/terragrunt"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "gruntwork-io"; repo = "terragrunt"; rev = "v${version}"; - sha256 = "0fzn2ymk8x0lzwfqlvnry8s6wf3q0sqn76lfardjyz6wgxl8011i"; + sha256 = "069l9ynyl96rfs9zw6w6n1yzjjin27731nj1ajr9jsyc8rhd84wv"; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 1e8080fd9c9d..b5994d03bc68 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -13,8 +13,8 @@ let in { stable = mkTelegram stableVersion; preview = mkTelegram (stableVersion // { - version = "1.4.4"; - sha256Hash = "1m1j485r3vzpglzfn8l4cqskysvkx8l3pqaw3fgp66jfajbxynf0"; + version = "1.4.7"; + sha256Hash = "00kjirikywdbigm4zdnm50s3wxfn9bw1yx13xz4k4ppz6amq9nrp"; stable = false; }); } diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix index e8f2c135fa8a..63c3f9e07252 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix @@ -97,7 +97,9 @@ mkDerivation rec { sed -i Telegram/ThirdParty/libtgvoip/libtgvoip.gyp \ -e "/-msse2/d" - gyp \ + gyp ${lib.optionalString (!stable) '' + -Dapi_id=17349 \ + -Dapi_hash=344583e45741c457fe1862106095a5eb ''}\ -Dbuild_defines=${GYP_DEFINES} \ -Gconfig=Release \ --depth=Telegram/gyp \ diff --git a/pkgs/applications/networking/syncplay/default.nix b/pkgs/applications/networking/syncplay/default.nix index 07444fbb9fe9..5861513e7bd2 100644 --- a/pkgs/applications/networking/syncplay/default.nix +++ b/pkgs/applications/networking/syncplay/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, python2Packages }: +{ stdenv, fetchurl, python3Packages }: -python2Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { name = "syncplay-${version}"; - version = "1.5.5"; + version = "1.6.0"; format = "other"; src = fetchurl { - url = https://github.com/Syncplay/syncplay/archive/v1.5.5.tar.gz; - sha256 = "0g12hm84c48fjrmwljl0ii62f55vm6fk2mv8vna7fadabmk6dwhr"; + url = https://github.com/Syncplay/syncplay/archive/v1.6.0.tar.gz; + sha256 = "19x7b694p8b3qp578qk8q4g0pybhfjd4zk8rgrggz40s1yyfnwy5"; }; - propagatedBuildInputs = with python2Packages; [ pyside twisted ]; + propagatedBuildInputs = with python3Packages; [ pyside twisted ]; makeFlags = [ "DESTDIR=" "PREFIX=$(out)" ]; diff --git a/pkgs/applications/science/math/calc/default.nix b/pkgs/applications/science/math/calc/default.nix index ff6b2d0ad2d1..efa2b55499ab 100644 --- a/pkgs/applications/science/math/calc/default.nix +++ b/pkgs/applications/science/math/calc/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { name = "calc-${version}"; - version = "2.12.6.8"; + version = "2.12.7.1"; src = fetchurl { urls = [ "https://github.com/lcn2/calc/releases/download/${version}/${name}.tar.bz2" "http://www.isthe.com/chongo/src/calc/${name}.tar.bz2" ]; - sha256 = "144am0pra3hh7635fmi7kqynba8z246dx1dzclm9qx965p3xb4hb"; + sha256 = "0k58vv8m26kq74b8p784d749mzir0pi6g48hch1f6680d3fwa7gb"; }; patchPhase = '' diff --git a/pkgs/applications/science/math/nasc/default.nix b/pkgs/applications/science/math/nasc/default.nix index bba08e3ae291..73fa2a5e678c 100644 --- a/pkgs/applications/science/math/nasc/default.nix +++ b/pkgs/applications/science/math/nasc/default.nix @@ -6,7 +6,6 @@ , granite , gnome3 , cmake -, ninja , vala_0_40 , libqalculate , gobjectIntrospection @@ -14,24 +13,28 @@ stdenv.mkDerivation rec { name = "nasc-${version}"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "parnold-x"; repo = "nasc"; rev = version; - sha256 = "1rrp3djsv7lrgsqjn7x50msv0c5ffhz90lj1v11di0kp05m6q9j9"; + sha256 = "13y5fnm7g3xgdxmdydlgly73nigh8maqbf9d6c9bpyzxkxq1csy5"; }; + postPatch = '' + # libqalculatenasc.so is not installed, and nasc fails to start + substituteInPlace libqalculatenasc/CMakeLists.txt --replace SHARED STATIC + ''; + nativeBuildInputs = [ pkgconfig wrapGAppsHook vala_0_40 # should be `elementary.vala` when elementary attribute set is merged cmake - ninja gobjectIntrospection # for setup-hook ]; - + buildInputs = [ gnome3.defaultIconTheme # should be `elementary.defaultIconTheme`when elementary attribute set is merged gnome3.gtksourceview diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index 59dbfdb509dc..7cd22f22a4e7 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "qalculate-gtk-${version}"; - version = "2.6.2"; + version = "2.8.1"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${version}"; - sha256 = "1yzw6avhka7bbi071z9d8cipcghyjq2bg9x3arv1cf395xlnrmb9"; + sha256 = "029yq9db2rm4fy83c11aynxjsd6vvi7ffamaf9zvkkamqqj1sjlf"; }; patchPhase = '' diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 05c764086021..c8495155dbca 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -136,9 +136,9 @@ rec { --prefix PATH : "$out/libexec/docker:$extraPath" # docker uses containerd now - ln -s ${docker-containerd}/bin/containerd $out/libexec/docker/docker-containerd - ln -s ${docker-containerd}/bin/containerd-shim $out/libexec/docker/docker-containerd-shim - ln -s ${docker-runc}/bin/runc $out/libexec/docker/docker-runc + ln -s ${docker-containerd}/bin/containerd $out/libexec/docker/containerd + ln -s ${docker-containerd}/bin/containerd-shim $out/libexec/docker/containerd-shim + ln -s ${docker-runc}/bin/runc $out/libexec/docker/runc ln -s ${docker-proxy}/bin/docker-proxy $out/libexec/docker/docker-proxy ln -s ${docker-tini}/bin/tini-static $out/libexec/docker/docker-init diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix index bf2ab8bbdbe7..028bb8c87ee8 100644 --- a/pkgs/applications/window-managers/dwm/dwm-status.nix +++ b/pkgs/applications/window-managers/dwm/dwm-status.nix @@ -3,19 +3,19 @@ rustPlatform.buildRustPackage rec { name = "dwm-status-${version}"; - version = "1.1.2"; + version = "1.2.0"; src = fetchFromGitHub { owner = "Gerschtli"; repo = "dwm-status"; rev = version; - sha256 = "1nyi0p9snx9hddb4hliihskj4gdp933xs0f8kydyiprckikwiyjk"; + sha256 = "0bv1jkqkf509akg3dvdy8b2q1kh8i75vw4n6a9rjvslx9s9nh6ca"; }; nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = [ dbus gdk_pixbuf libnotify xorg.libX11 ]; - cargoSha256 = "1ngdzzxnv4y6xprmkawf6s2696zgwiwgb6ykj5adb4knlx5c634d"; + cargoSha256 = "0wbbbk99hxxlrkm389iqni9aqvw2laarwk6hhwsr4ph3y278qhi8"; postInstall = lib.optionalString enableAlsaUtils '' wrapProgram $out/bin/dwm-status \ diff --git a/pkgs/applications/window-managers/i3/gaps.nix b/pkgs/applications/window-managers/i3/gaps.nix index 251b893f92ff..01a89b49e715 100644 --- a/pkgs/applications/window-managers/i3/gaps.nix +++ b/pkgs/applications/window-managers/i3/gaps.nix @@ -3,12 +3,12 @@ i3.overrideAttrs (oldAttrs : rec { name = "i3-gaps-${version}"; - version = "4.15.0.1"; + version = "4.16"; releaseDate = "2018-03-13"; src = fetchurl { url = "https://github.com/Airblader/i3/archive/${version}.tar.gz"; - sha256 = "16s6bink8yj3zix4vww64b745d5drf2vqjg8vz3pwzrark09hfal"; + sha256 = "16d215y9g27b75rifm1cgznxg73fmg5ksigi0gbj7pfd6x6bqcy9"; }; nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ autoreconfHook ]; diff --git a/pkgs/desktops/deepin/dbus-factory/default.nix b/pkgs/desktops/deepin/dbus-factory/default.nix index 610e367b09f8..3c99c40ee807 100644 --- a/pkgs/desktops/deepin/dbus-factory/default.nix +++ b/pkgs/desktops/deepin/dbus-factory/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, jq, libxml2, go-dbus-generator }: +{ stdenv, fetchFromGitHub, jq, libxml2, go-dbus-generator, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { sed -i -e 's:/share/gocode:/share/go:' Makefile ''; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Generates static DBus bindings for Golang and QML at build-time"; homepage = https://github.com/linuxdeepin/dbus-factory; diff --git a/pkgs/desktops/deepin/dde-api/default.nix b/pkgs/desktops/deepin/dde-api/default.nix index d8452e5f7a38..c1321acb853e 100644 --- a/pkgs/desktops/deepin/dde-api/default.nix +++ b/pkgs/desktops/deepin/dde-api/default.nix @@ -1,11 +1,12 @@ { stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, -go-gir-generator, glib, gtk3, poppler, librsvg, pulseaudio, alsaLib, -libcanberra, gnome3, deepin-gettext-tools, go }: + deepin-gettext-tools, go-dbus-factory, go-gir-generator, go-lib, + alsaLib, glib, gtk3, libcanberra, libgudev, librsvg, poppler, + pulseaudio, go, deepin }: buildGoPackage rec { name = "${pname}-${version}"; pname = "dde-api"; - version = "3.1.30"; + version = "3.5.0"; goPackagePath = "pkg.deepin.io/dde/api"; @@ -13,29 +14,32 @@ buildGoPackage rec { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0piw6ka2xcbd5vi7m33d1afdjbb7nycxvmai530ka6r2xjabrkir"; + sha256 = "1g3s0i5wa6qyv00yksz4r4cy2vhiknq8v0yx7aribvwm3gxf7jw3"; }; goDeps = ./deps.nix; nativeBuildInputs = [ pkgconfig - go-gir-generator deepin-gettext-tools + go-dbus-factory + go-gir-generator + go-lib ]; buildInputs = [ + alsaLib glib gtk3 - poppler + libcanberra + libgudev librsvg + poppler pulseaudio - alsaLib - libcanberra - gnome3.libgudev ]; postPatch = '' + patchShebangs . sed -i -e "s|/var|$bin/var|" Makefile ''; @@ -50,6 +54,8 @@ buildGoPackage rec { remove-references-to -t ${go} $bin/bin/* $bin/lib/deepin-api/* ''; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Go-lang bindings for dde-daemon"; homepage = https://github.com/linuxdeepin/dde-api; diff --git a/pkgs/desktops/deepin/dde-api/deps.nix b/pkgs/desktops/deepin/dde-api/deps.nix index 9df368325e3c..bd7a13043da2 100644 --- a/pkgs/desktops/deepin/dde-api/deps.nix +++ b/pkgs/desktops/deepin/dde-api/deps.nix @@ -32,35 +32,26 @@ fetch = { type = "git"; url = "https://github.com/disintegration/imaging"; - rev = "32df9565b4e0c1460f1915d53f6ff198d9a41af2"; - sha256 = "1nkmaav375fv4610g8i9bam33pv4aa4fy2n4nypprhc7vq0svwkm"; + rev = "9458da53d1e65e098d48467a4317c403327e4424"; + sha256 = "1b0ma9if8s892qfx5b1vjinxn00ah9vsyxijs8knkilrhf5vqcx4"; }; } { - goPackagePath = "github.com/kr/pretty"; + goPackagePath = "github.com/fogleman/gg"; fetch = { type = "git"; - url = "https://github.com/kr/pretty"; - rev = "73f6ac0b30a98e433b289500d779f50c1a6f0712"; - sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; + url = "https://github.com/fogleman/gg"; + rev = "0e0ff3ade7039063fe954cc1b45fad6cd4ac80db"; + sha256 = "06gvsngfwizdxin90nldix5503fqgnwqmqvxzrz0xg5hfazwfra5"; }; } { - goPackagePath = "github.com/kr/text"; + goPackagePath = "github.com/golang/freetype"; fetch = { type = "git"; - url = "https://github.com/kr/text"; - rev = "e2ffdb16a802fe2bb95e2e35ff34f0e53aeef34f"; - sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; - }; - } - { - goPackagePath = "github.com/linuxdeepin/go-dbus-factory"; - fetch = { - type = "git"; - url = "https://github.com/linuxdeepin/go-dbus-factory"; - rev = "2a30fc6fb47b70b8879855df8e29c8f581c419aa"; - sha256 = "0b0j47n3bb5fd04p01jla6k9vz2ck8l8512ga0xsn78177yb2z0w"; + url = "https://github.com/golang/freetype"; + rev = "e2365dfdc4a05e4b8299a783240d4a7d5a65d4e4"; + sha256 = "194w3djc6fv1rgcjqds085b9fq074panc5vw582bcb8dbfzsrqxc"; }; } { @@ -68,8 +59,8 @@ fetch = { type = "git"; url = "https://github.com/linuxdeepin/go-x11-client"; - rev = "8f12fd35ff10b391f0321aa41b94db6acd951ea3"; - sha256 = "1axxzzhbiwvi76d19bix3zm5wv3qmlq0wgji9mwjbmkb4bvp0v3d"; + rev = "03541136501cab4910ad8852fe749ef8e18907ca"; + sha256 = "1iiw8qclpklim81hz1sdjp2ajw0ljvjz19n9jly86nbw6m8x4gkp"; }; } { @@ -86,8 +77,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/image"; - rev = "991ec62608f3c0da01d400756917825d1e2fd528"; - sha256 = "0jipi9czjczi6hlqb5kchgml8r6h6qyb4gqrb0nnb63m25510019"; + rev = "69cc3646b96e61de0b417f4815b86c36e65783ee"; + sha256 = "0nkywb3r0qvwkmykpswnf0svxi463ycn293y5jjididzxv9qxdp9"; }; } { @@ -95,8 +86,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "146acd28ed5894421fb5aac80ca93bc1b1f46f87"; - sha256 = "0d177474z85nvxz8ch6y9wjqz288844wwx8q9za3x2njnk4jbgxj"; + rev = "c44066c5c816ec500d459a2a324a753f78531ae0"; + sha256 = "0mgww74bl15d0jvsh4f3qr1ckjzb8icb8hn0mgs5ppa0b2fgpc4f"; }; } { @@ -108,22 +99,4 @@ sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; }; } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "788fd78401277ebd861206a03c884797c6ec5541"; - sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; - }; - } - { - goPackagePath = "pkg.deepin.io/lib"; - fetch = { - type = "git"; - url = "https://github.com/linuxdeepin/go-lib.git"; - rev = "f09dcc32fc5a36b53ff7760e5a06e7f8f97b81f9"; - sha256 = "1z4iw7h6lknm9jrna2c73icg1a1mxvzrqdhgjvaiww89mql1jzb4"; - }; - } ] diff --git a/pkgs/desktops/deepin/dde-calendar/default.nix b/pkgs/desktops/deepin/dde-calendar/default.nix index ad6b0f1912a6..6d0abab2100f 100644 --- a/pkgs/desktops/deepin/dde-calendar/default.nix +++ b/pkgs/desktops/deepin/dde-calendar/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, qmake, qttools, - deepin-gettext-tools, dtkcore, dtkwidget + deepin-gettext-tools, dtkcore, dtkwidget, deepin }: stdenv.mkDerivation rec { @@ -34,6 +34,8 @@ stdenv.mkDerivation rec { -e "s,/usr,$out," ''; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Calendar for Deepin Desktop Environment"; homepage = https://github.com/linuxdeepin/dde-calendar; diff --git a/pkgs/desktops/deepin/dde-daemon/default.nix b/pkgs/desktops/deepin/dde-daemon/default.nix index fe2c5f8f55a1..3678694be9ee 100644 --- a/pkgs/desktops/deepin/dde-daemon/default.nix +++ b/pkgs/desktops/deepin/dde-daemon/default.nix @@ -2,12 +2,12 @@ dbus-factory, go-dbus-factory, go-gir-generator, go-lib, deepin-gettext-tools, dde-api, alsaLib, glib, gtk3, libinput, libnl, librsvg, linux-pam, networkmanager, pulseaudio, xorg, gnome3, - python3Packages, hicolor-icon-theme, go }: + python3Packages, hicolor-icon-theme, go, deepin }: buildGoPackage rec { name = "${pname}-${version}"; pname = "dde-daemon"; - version = "3.2.24.7"; + version = "3.6.0"; goPackagePath = "pkg.deepin.io/dde/daemon"; @@ -15,7 +15,7 @@ buildGoPackage rec { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "17dvhqrw0dqy3d0wd9ailb18y2rg7575g3ffy0d5rg9m3y65y1y6"; + sha256 = "0gn2zp34wg79lvzdfla6yb4gs3f9ll83kj765zvig1wpx51nq1aj"; }; patches = [ @@ -80,6 +80,8 @@ buildGoPackage rec { remove-references-to -t ${go} $out/lib/deepin-daemon/* ''; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Daemon for handling Deepin Desktop Environment session settings"; homepage = https://github.com/linuxdeepin/dde-daemon; diff --git a/pkgs/desktops/deepin/dde-daemon/deps.nix b/pkgs/desktops/deepin/dde-daemon/deps.nix index 5ffecc28882d..3d241baa3260 100644 --- a/pkgs/desktops/deepin/dde-daemon/deps.nix +++ b/pkgs/desktops/deepin/dde-daemon/deps.nix @@ -41,8 +41,8 @@ fetch = { type = "git"; url = "https://github.com/linuxdeepin/go-x11-client"; - rev = "8f12fd35ff10b391f0321aa41b94db6acd951ea3"; - sha256 = "1axxzzhbiwvi76d19bix3zm5wv3qmlq0wgji9mwjbmkb4bvp0v3d"; + rev = "03541136501cab4910ad8852fe749ef8e18907ca"; + sha256 = "1iiw8qclpklim81hz1sdjp2ajw0ljvjz19n9jly86nbw6m8x4gkp"; }; } { @@ -68,8 +68,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/image"; - rev = "991ec62608f3c0da01d400756917825d1e2fd528"; - sha256 = "0jipi9czjczi6hlqb5kchgml8r6h6qyb4gqrb0nnb63m25510019"; + rev = "69cc3646b96e61de0b417f4815b86c36e65783ee"; + sha256 = "0nkywb3r0qvwkmykpswnf0svxi463ycn293y5jjididzxv9qxdp9"; }; } { @@ -77,8 +77,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "04a2e542c03f1d053ab3e4d6e5abcd4b66e2be8e"; - sha256 = "040i9f6ymj4z25957h20id9kfmlrcp35y4sfd99hngw9li50ihql"; + rev = "c44066c5c816ec500d459a2a324a753f78531ae0"; + sha256 = "0mgww74bl15d0jvsh4f3qr1ckjzb8icb8hn0mgs5ppa0b2fgpc4f"; }; } { @@ -86,8 +86,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "4d1c5fb19474adfe9562c9847ba425e7da817e81"; - sha256 = "1y4rf9cmjyf8r56khr1sz0chbq1v0ynaj63i2z1mq6k6h6ww45da"; + rev = "6f44c5a2ea40ee3593d98cdcc905cc1fdaa660e2"; + sha256 = "00mwzxly5isgf0glz7k3k2dkyqkjfc4z55qxajx4lgcp3h8xn9xj"; }; } { @@ -99,4 +99,13 @@ sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; }; } + { + goPackagePath = "pkg.deepin.io/lib"; + fetch = { + type = "git"; + url = "https://github.com/linuxdeepin/go-lib.git"; + rev = "b199d0dc96e979398ea3985334ccf9c20236d1a7"; + sha256 = "0g84v1adnnyqc1mv45n3wlvnivkm1fi8ywszzgwx8irl3iddfvxv"; + }; + } ] diff --git a/pkgs/desktops/deepin/dde-polkit-agent/default.nix b/pkgs/desktops/deepin/dde-polkit-agent/default.nix deleted file mode 100644 index 71f9e9b0298e..000000000000 --- a/pkgs/desktops/deepin/dde-polkit-agent/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ stdenv, fetchFromGitHub, pkgconfig, qmake, qttools, polkit-qt, -dtkcore, dtkwidget, dde-qt-dbus-factory }: - -stdenv.mkDerivation rec { - name = "${pname}-${version}"; - pname = "dde-polkit-agent"; - version = "0.2.1"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "1n3hys5hhhd99ycpx4im6ihy53vl9c28z7ls7smn117h3ca4c8wc"; - }; - - nativeBuildInputs = [ - pkgconfig - qmake - qttools - ]; - - buildInputs = [ - dde-qt-dbus-factory - dtkcore - dtkwidget - polkit-qt - ]; - - postPatch = '' - patchShebangs . - - sed -i dde-polkit-agent.pro polkit-dde-authentication-agent-1.desktop \ - -e "s,/usr,$out," - - sed -i pluginmanager.cpp \ - -e "s,/usr/lib/polkit-1-dde/plugins,/run/current-system/sw/lib/polkit-1-dde/plugins," - ''; - - meta = with stdenv.lib; { - description = "PolicyKit agent for Deepin Desktop Environment"; - homepage = https://github.com/linuxdeepin/dde-polkit-agent; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix b/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix index 007d58b3c304..f28d8f77b3c3 100644 --- a/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix +++ b/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, pkgconfig, qmake, python }: +{ stdenv, fetchFromGitHub, pkgconfig, qmake, python, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "dde-qt-dbus-factory"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0j0f57byzlz2ixgj6qr1pda83bpwn2q8kxv4i2jv99n6g0qw4nmw"; + sha256 = "0cz55hsbhy1ab1mndv0sp6xnqrhz2y66w7pcxy8v9k87ii32czf8"; }; nativeBuildInputs = [ @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Qt DBus interface library for Deepin software"; homepage = https://github.com/linuxdeepin/dde-qt-dbus-factory; diff --git a/pkgs/desktops/deepin/dde-session-ui/default.nix b/pkgs/desktops/deepin/dde-session-ui/default.nix index cab3aff14048..303c4db57dd1 100644 --- a/pkgs/desktops/deepin/dde-session-ui/default.nix +++ b/pkgs/desktops/deepin/dde-session-ui/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchFromGitHub, pkgconfig, qmake, qtsvg, qttools, qtx11extras, xkeyboard_config, xorg, lightdm_qt, gsettings-qt, dde-qt-dbus-factory, deepin-gettext-tools, dtkcore, dtkwidget, - hicolor-icon-theme }: + hicolor-icon-theme, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "dde-session-ui"; - version = "4.5.1.10"; + version = "4.6.1"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0cr3g9jbgpp8k41i86lr4pg88gn690nzili7ah745vf1kdwvi1w0"; + sha256 = "190dgrwr5ji2bjndg2bmggpyccdz6pa3acx86yqmxfmirx669w92"; }; nativeBuildInputs = [ @@ -45,11 +45,13 @@ stdenv.mkDerivation rec { find -type f -exec sed -i -e "s,Exec=/usr,Exec=$out," {} + find -type f -exec sed -i -e "s,/usr/share/dde-session-ui,$out/share/dde-session-ui," {} + sed -i global_util/xkbparser.h -e "s,/usr/share/X11/xkb/rules/base.xml,${xkeyboard_config}/share/X11/xkb/rules/base.xml," - sed -i lightdm-deepin-greeter/Scripts/lightdm-deepin-greeter -e "s,/usr/bin/lightdm-deepin-greeter,$out/bin/lightdm-deepin-greeter," + sed -i lightdm-deepin-greeter/scripts/lightdm-deepin-greeter -e "s,/usr/bin/lightdm-deepin-greeter,$out/bin/lightdm-deepin-greeter," # fix default background url sed -i widgets/*.cpp boxframe/*.cpp -e 's,/usr/share/backgrounds/default_background.jpg,/usr/share/backgrounds/deepin/desktop.jpg,' ''; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Deepin desktop-environment - Session UI module"; homepage = https://github.com/linuxdeepin/dde-session-ui; diff --git a/pkgs/desktops/deepin/deepin-desktop-base/default.nix b/pkgs/desktops/deepin/deepin-desktop-base/default.nix index 5b96e335c67e..80a368c5be99 100644 --- a/pkgs/desktops/deepin/deepin-desktop-base/default.nix +++ b/pkgs/desktops/deepin/deepin-desktop-base/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, deepin-wallpapers }: +{ stdenv, fetchFromGitHub, deepin-wallpapers, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-desktop-base"; - version = "2018.7.23"; + version = "2018.10.29"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "1n1bjkvhgq138jcg3zkwg55r41056x91mh191mirlpvpic574ydc"; + sha256 = "0l2zb7rpag2q36lqsgvirhjgmj7w243nsi1rywkypf2xm7g2v235"; }; buildInputs = [ deepin-wallpapers ]; @@ -35,6 +35,8 @@ stdenv.mkDerivation rec { ln -s ../lib/deepin/desktop-version $out/etc/deepin-version ''; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Base assets and definitions for Deepin Desktop Environment"; homepage = https://github.com/linuxdeepin/deepin-desktop-base; diff --git a/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix b/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix index b1a9c52014b8..d2b70ec4a896 100644 --- a/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix +++ b/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix @@ -1,16 +1,17 @@ { stdenv, fetchFromGitHub, python, deepin-gtk-theme, -deepin-icon-theme, deepin-sound-theme, deepin-wallpapers, gnome3 }: + deepin-icon-theme, deepin-sound-theme, deepin-wallpapers, gnome3, + deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-desktop-schemas"; - version = "3.2.18.7"; + version = "3.4.0"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "1siv28wbfjydr3s9k9i5b9fin39yr8ys90f3wi7b8rfm3cr5yy6j"; + sha256 = "10x0rh9z925yzyp8h0vgmg4313smvran06lvr12c3931qkmkzwgq"; }; nativeBuildInputs = [ @@ -33,6 +34,8 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "GSettings deepin desktop-wide schemas"; homepage = https://github.com/linuxdeepin/deepin-desktop-schemas; diff --git a/pkgs/desktops/deepin/deepin-gettext-tools/default.nix b/pkgs/desktops/deepin/deepin-gettext-tools/default.nix index e275429b3951..779fae6a113e 100644 --- a/pkgs/desktops/deepin/deepin-gettext-tools/default.nix +++ b/pkgs/desktops/deepin/deepin-gettext-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gettext, python3Packages, perlPackages }: +{ stdenv, fetchFromGitHub, gettext, python3Packages, perlPackages, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -36,6 +36,8 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/deepin-desktop-ts-convert --set PERL5LIB $PERL5LIB ''; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Deepin Internationalization utilities"; homepage = https://github.com/linuxdeepin/deepin-gettext-tools; diff --git a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix index c46dea2875ad..8d11ca8bf42a 100644 --- a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix +++ b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix @@ -1,20 +1,23 @@ -{ stdenv, fetchFromGitHub, gtk-engine-murrine }: +{ stdenv, fetchFromGitHub, gtk-engine-murrine, deepin }: stdenv.mkDerivation rec { - name = "deepin-gtk-theme-${version}"; - version = "17.10.9"; + name = "${pname}-${version}"; + pname = "deepin-gtk-theme"; + version = "17.10.10"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "deepin-gtk-theme"; rev = version; - sha256 = "02yn76h007hlmrd7syd82f0mz1c79rlkz3gy1w17zxfy0gdvagz3"; + sha256 = "0vwly24cvjwhvda7g3l595vpf99d2z7b2zr0q5kna4df4iql7vn4"; }; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; makeFlags = [ "PREFIX=$(out)" ]; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Deepin GTK Theme"; homepage = https://github.com/linuxdeepin/deepin-gtk-theme; diff --git a/pkgs/desktops/deepin/deepin-icon-theme/default.nix b/pkgs/desktops/deepin/deepin-icon-theme/default.nix index c6d7f3493019..ef4574206019 100644 --- a/pkgs/desktops/deepin/deepin-icon-theme/default.nix +++ b/pkgs/desktops/deepin/deepin-icon-theme/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, gtk3, papirus-icon-theme }: +{ stdenv, fetchFromGitHub, gtk3, papirus-icon-theme, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-icon-theme"; - version = "15.12.59"; + version = "15.12.64"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "1qkxhqx6a7pahkjhf6m9lm16lw9v9grk0d4j449h9622zwfjkxlq"; + sha256 = "0z1yrp6yg2hb67azrbd9ac743jjh83vxdf2j0mmv2lfpd4fqw8qc"; }; nativeBuildInputs = [ gtk3 papirus-icon-theme ]; @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { sed -i -e 's|\(-rm -f .*/icon-theme.cache\)|# \1|g' Makefile ''; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Icons for the Deepin Desktop Environment"; homepage = https://github.com/linuxdeepin/deepin-icon-theme; diff --git a/pkgs/desktops/deepin/deepin-image-viewer/default.nix b/pkgs/desktops/deepin/deepin-image-viewer/default.nix index 0ba2e306110a..0b08f7cd39a0 100644 --- a/pkgs/desktops/deepin/deepin-image-viewer/default.nix +++ b/pkgs/desktops/deepin/deepin-image-viewer/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchFromGitHub, pkgconfig, qmake, qttools, qtsvg, qtx11extras, dtkcore, dtkwidget, qt5integration, freeimage, libraw, - libexif + libexif, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-image-viewer"; - version = "1.2.23"; + version = "1.3.1"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "1n1b3j65in6v7q5bxgkiam8qy56kjn9prld3sjrbc2mqzff8sm3q"; + sha256 = "0dxdvm6hzj6izfxka35za8y7vacd06nksfgzx6xsv7ywzagri4k5"; }; nativeBuildInputs = [ @@ -41,11 +41,14 @@ stdenv.mkDerivation rec { -e "s,/usr,$out," ''; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Image Viewer for Deepin Desktop Environment"; homepage = https://github.com/linuxdeepin/deepin-image-viewer; license = licenses.gpl3Plus; platforms = platforms.linux; + badPlatforms = [ "aarch64-linux" ]; # See https://github.com/NixOS/nixpkgs/pull/46463#issuecomment-420274189 maintainers = with maintainers; [ romildo ]; }; } diff --git a/pkgs/desktops/deepin/deepin-menu/default.nix b/pkgs/desktops/deepin/deepin-menu/default.nix index eeed3579f459..9ac61355c75b 100644 --- a/pkgs/desktops/deepin/deepin-menu/default.nix +++ b/pkgs/desktops/deepin/deepin-menu/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, qmake, dtkcore, dtkwidget, - qt5integration }: + qt5integration, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -30,6 +30,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Deepin menu service"; homepage = https://github.com/linuxdeepin/deepin-menu; diff --git a/pkgs/desktops/deepin/deepin-metacity/default.nix b/pkgs/desktops/deepin/deepin-metacity/default.nix index b5eb71108763..78b6303188a2 100644 --- a/pkgs/desktops/deepin/deepin-metacity/default.nix +++ b/pkgs/desktops/deepin/deepin-metacity/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, bamf, json-glib, libcanberra-gtk3, libxkbcommon, libstartup_notification, - deepin-wallpapers, deepin-desktop-schemas }: + deepin-wallpapers, deepin-desktop-schemas, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -52,6 +52,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "2D window manager for Deepin"; homepage = https://github.com/linuxdeepin/deepin-metacity; diff --git a/pkgs/desktops/deepin/deepin-movie-reborn/default.nix b/pkgs/desktops/deepin/deepin-movie-reborn/default.nix index 52a51c0db861..3d195f8f1c0c 100644 --- a/pkgs/desktops/deepin/deepin-movie-reborn/default.nix +++ b/pkgs/desktops/deepin/deepin-movie-reborn/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, qttools, qtx11extras, dtkcore, dtkwidget, ffmpeg, ffmpegthumbnailer, mpv, pulseaudio, - libdvdnav, libdvdread, xorg }: + libdvdnav, libdvdread, xorg, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-movie-reborn"; - version = "3.2.10"; + version = "3.2.14"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0lqmbvl9yyxgkiipd9r8mgmxl2sm34l3gr3hkwlc7r2l6kc32933"; + sha256 = "1i9sdg2p6qp57rqzrnjbxnqj3mg1qggzyq3yykw271vs8h85a707"; }; nativeBuildInputs = [ @@ -43,6 +43,8 @@ stdenv.mkDerivation rec { sed -i src/libdmr/libdmr.pc.in -e "s,/usr,$out," -e 's,libdir=''${prefix}/,libdir=,' ''; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Deepin movie player"; homepage = https://github.com/linuxdeepin/deepin-movie-reborn; diff --git a/pkgs/desktops/deepin/deepin-mutter/default.nix b/pkgs/desktops/deepin/deepin-mutter/default.nix index e397ab53576d..be845d3c6bac 100644 --- a/pkgs/desktops/deepin/deepin-mutter/default.nix +++ b/pkgs/desktops/deepin/deepin-mutter/default.nix @@ -1,18 +1,17 @@ { stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, xorg, libcanberra-gtk3, upower, xkeyboard_config, libxkbcommon, - libstartup_notification, libinput, cogl, clutter, systemd -}: + libstartup_notification, libinput, cogl, clutter, systemd, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-mutter"; - version = "3.20.34"; + version = "3.20.35"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0s427fmj806ljpdg6jdvpfislk5m1xvxpnnyrq3l8b7pkhjvp8wd"; + sha256 = "0mwk06kgw8qp8rg1j6px1zlya4x5rr9llax0qks59j56b3m9yim7"; }; nativeBuildInputs = [ @@ -51,6 +50,8 @@ stdenv.mkDerivation rec { NOCONFIGURE=1 ./autogen.sh ''; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Base window manager for deepin, fork of gnome mutter"; homepage = https://github.com/linuxdeepin/deepin-mutter; diff --git a/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix b/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix index 1bb112b76f6e..737c99261f9d 100644 --- a/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix +++ b/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, qmake, dtkcore, dtkwidget, - qt5integration -}: + qt5integration, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -27,6 +26,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Pop-up shortcut viewer for Deepin applications"; homepage = https://github.com/linuxdeepin/deepin-shortcut-viewer; diff --git a/pkgs/desktops/deepin/deepin-sound-theme/default.nix b/pkgs/desktops/deepin/deepin-sound-theme/default.nix index f12419a615b3..bb004372497f 100644 --- a/pkgs/desktops/deepin/deepin-sound-theme/default.nix +++ b/pkgs/desktops/deepin/deepin-sound-theme/default.nix @@ -1,7 +1,8 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, deepin }: stdenv.mkDerivation rec { - name = "deepin-sound-theme-${version}"; + name = "${pname}-${version}"; + pname = "deepin-sound-theme"; version = "15.10.3"; src = fetchFromGitHub { @@ -13,6 +14,8 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Deepin sound theme"; homepage = https://github.com/linuxdeepin/deepin-sound-theme; diff --git a/pkgs/desktops/deepin/deepin-terminal/default.nix b/pkgs/desktops/deepin/deepin-terminal/default.nix index 26146b8ab477..de5ac800747a 100644 --- a/pkgs/desktops/deepin/deepin-terminal/default.nix +++ b/pkgs/desktops/deepin/deepin-terminal/default.nix @@ -1,55 +1,61 @@ -{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, gtk3, vala, cmake, - ninja, vte, libgee, wnck, zssh, gettext, librsvg, libsecret, - json-glib, gobjectIntrospection, deepin-menu, deepin-shortcut-viewer -}: +{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, cmake, ninja, vala, + gettext, gobjectIntrospection, at-spi2-core, dbus, epoxy, expect, + gtk3, json-glib, libXdmcp, libgee, libpthreadstubs, librsvg, + libsecret, libtasn1, libxcb, libxkbcommon, p11-kit, pcre, vte, wnck, + deepin-menu, deepin-shortcut-viewer, deepin }: stdenv.mkDerivation rec { - name = "deepin-terminal-${version}"; - version = "3.0.3"; + name = "${pname}-${version}"; + pname = "deepin-terminal"; + version = "3.0.10"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "deepin-terminal"; rev = version; - sha256 = "04yvim97a4j8fq5lq2g6svs8qs79np9m4nl6x83iv02wkb9b7gqa"; + sha256 = "1jrzx0igq2csb25k4ak5hj81gpvb7zwbg4i64p4mln4vl7x27i5q"; }; - patches = [ - # Do not build vendored zssh and vte - (fetchurl { - name = "remove-vendor.patch"; - url = https://git.archlinux.org/svntogit/community.git/plain/trunk/remove-vendor.patch?h=packages/deepin-terminal&id=de701614c19c273b98b60fd6790795ff7d8a157e; - sha256 = "0g7hhvr7ay9g0cgc6qqvzhbcwvbzvrrilbn8w46ypfzj7w5hlkqv"; - }) - ]; - - postPatch = '' - substituteInPlace ssh_login.sh --replace /usr/lib/deepin-terminal/zssh "${zssh}/bin/zssh" - ''; - nativeBuildInputs = [ pkgconfig - vala cmake ninja + vala gettext gobjectIntrospection # For setup hook ]; buildInputs = [ + at-spi2-core + dbus + deepin-menu + deepin-shortcut-viewer + epoxy + expect gtk3 - vte + json-glib + libXdmcp libgee - wnck + libpthreadstubs librsvg libsecret - json-glib - deepin-menu - deepin-shortcut-viewer + libtasn1 + libxcb + libxkbcommon + p11-kit + pcre + vte + wnck ]; + postPatch = '' + patchShebangs . + ''; + enableParallelBuilding = true; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "The default terminal emulation for Deepin"; longDescription = '' diff --git a/pkgs/desktops/deepin/deepin-wallpapers/default.nix b/pkgs/desktops/deepin/deepin-wallpapers/default.nix index ed2c795fd9cb..8f04bd482184 100644 --- a/pkgs/desktops/deepin/deepin-wallpapers/default.nix +++ b/pkgs/desktops/deepin/deepin-wallpapers/default.nix @@ -1,7 +1,8 @@ -{ stdenv, fetchFromGitHub, dde-api }: +{ stdenv, fetchFromGitHub, dde-api, deepin }: stdenv.mkDerivation rec { - name = "deepin-wallpapers-${version}"; + name = "${pname}-${version}"; + pname = "deepin-wallpapers"; version = "1.7.5"; src = fetchFromGitHub { @@ -31,6 +32,8 @@ stdenv.mkDerivation rec { $out/var/cache/image-blur/$(echo -n $out/share/backgrounds/deepin/desktop.jpg | md5sum | cut -d " " -f 1).jpg ''; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Wallpapers for Deepin Desktop Environment"; homepage = https://github.com/linuxdeepin/deepin-wallpapers; diff --git a/pkgs/desktops/deepin/deepin-wm/default.nix b/pkgs/desktops/deepin/deepin-wm/default.nix index f936934dcc0c..db60e7b499b0 100644 --- a/pkgs/desktops/deepin/deepin-wm/default.nix +++ b/pkgs/desktops/deepin/deepin-wm/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, vala, gnome3, bamf, clutter-gtk, granite, libcanberra-gtk3, libwnck3, deepin-mutter, deepin-wallpapers, deepin-desktop-schemas, - hicolor-icon-theme }: + hicolor-icon-theme, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-wm"; - version = "1.9.32"; + version = "1.9.33"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "02vwbkfpxcwv01vqa70pg7dm0lhm1lwhdqhk057r147a9cjb3ssc"; + sha256 = "01l2np31g7fnh61fgq927h7a6xrmdvagqd41vr29a6cc3q9q9rzv"; }; nativeBuildInputs = [ @@ -48,6 +48,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Deepin Window Manager"; homepage = https://github.com/linuxdeepin/deepin-wm; diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index a6163cd32e20..62a67c11492b 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -2,12 +2,12 @@ let packages = self: with self; { + updateScript = callPackage ./update.nix { }; dbus-factory = callPackage ./dbus-factory { }; dde-api = callPackage ./dde-api { }; dde-calendar = callPackage ./dde-calendar { }; dde-daemon = callPackage ./dde-daemon { }; - dde-polkit-agent = callPackage ./dde-polkit-agent { }; dde-qt-dbus-factory = callPackage ./dde-qt-dbus-factory { }; dde-session-ui = callPackage ./dde-session-ui { }; deepin-desktop-base = callPackage ./deepin-desktop-base { }; @@ -28,7 +28,6 @@ let }; 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 { }; diff --git a/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix b/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix deleted file mode 100644 index 4aeba1b4c1bc..000000000000 --- a/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchFromGitHub, pkgconfig, qmake, qttools, gnome3, dde-polkit-agent }: - -stdenv.mkDerivation rec { - name = "${pname}-${version}"; - pname = "dpa-ext-gnomekeyring"; - version = "0.1.0"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "168j42nwyw7vcgwc0fha2pjpwwlgir70fq1hns4ia1dkdqa1nhzw"; - }; - - nativeBuildInputs = [ - pkgconfig - qmake - qttools - ]; - - buildInputs = [ - dde-polkit-agent - gnome3.libgnome-keyring - ]; - - postPatch = '' - patchShebangs . - - sed -i dpa-ext-gnomekeyring.pro gnomekeyringextention.cpp \ - -e "s,/usr,$out," - ''; - - meta = with stdenv.lib; { - description = "GNOME keyring extension for dde-polkit-agent"; - homepage = https://github.com/linuxdeepin/dpa-ext-gnomekeyring; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/dtkcore/default.nix b/pkgs/desktops/deepin/dtkcore/default.nix index 3fc9a1b4a03e..9904c58128f5 100644 --- a/pkgs/desktops/deepin/dtkcore/default.nix +++ b/pkgs/desktops/deepin/dtkcore/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, pkgconfig, qmake, gsettings-qt, pythonPackages }: +{ stdenv, fetchFromGitHub, pkgconfig, qmake, gsettings-qt, pythonPackages, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "dtkcore"; - version = "2.0.9.4"; + version = "2.0.9.8"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "184yg1501hvv7n1c7r0fl2y4d4nhif368rrbrd1phwzfvh6x1ji4"; + sha256 = "06jj5gpy2qbmc21nf0fnbvgw7nbjjgvzx7m2vg9byw5il8l4g22h"; }; nativeBuildInputs = [ @@ -42,6 +42,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Deepin tool kit core modules"; homepage = https://github.com/linuxdeepin/dtkcore; diff --git a/pkgs/desktops/deepin/dtkwidget/default.nix b/pkgs/desktops/deepin/dtkwidget/default.nix index 268f9518495e..16125efff8e2 100644 --- a/pkgs/desktops/deepin/dtkwidget/default.nix +++ b/pkgs/desktops/deepin/dtkwidget/default.nix @@ -1,18 +1,17 @@ { stdenv, fetchFromGitHub, pkgconfig, qmake, qttools, qtmultimedia, qtsvg, qtx11extras, librsvg, libstartup_notification, gsettings-qt, - dde-qt-dbus-factory, dtkcore -}: + dde-qt-dbus-factory, dtkcore, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "dtkwidget"; - version = "2.0.9.4"; + version = "2.0.9.9"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "06iyb3ryxrqkwxdazpv8cgabqa4djldgm3q5icsa2grqrgy8vw5m"; + sha256 = "1h4vm6a4lb6w6nkx2ns7a526mqyi9hqi7j5lqafd7ycwxlrc64nb"; }; nativeBuildInputs = [ @@ -41,6 +40,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Deepin graphical user interface library"; homepage = https://github.com/linuxdeepin/dtkwidget; diff --git a/pkgs/desktops/deepin/dtkwm/default.nix b/pkgs/desktops/deepin/dtkwm/default.nix index 46ed7bcc3bef..7154ae3da6a9 100644 --- a/pkgs/desktops/deepin/dtkwm/default.nix +++ b/pkgs/desktops/deepin/dtkwm/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, pkgconfig, qmake, qtx11extras, dtkcore }: +{ stdenv, fetchFromGitHub, pkgconfig, qmake, qtx11extras, dtkcore, + deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -29,6 +30,8 @@ stdenv.mkDerivation rec { LIB_INSTALL_DIR=$out/lib" ''; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Deepin graphical user interface library"; homepage = https://github.com/linuxdeepin/dtkwm; diff --git a/pkgs/desktops/deepin/go-dbus-factory/default.nix b/pkgs/desktops/deepin/go-dbus-factory/default.nix index b9b3aa59a0b1..01d504eda896 100644 --- a/pkgs/desktops/deepin/go-dbus-factory/default.nix +++ b/pkgs/desktops/deepin/go-dbus-factory/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { sed -i -e 's:/share/gocode:/share/go:' Makefile ''; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "GoLang DBus factory for the Deepin Desktop Environment"; homepage = https://github.com/linuxdeepin/go-dbus-factory; diff --git a/pkgs/desktops/deepin/go-dbus-generator/default.nix b/pkgs/desktops/deepin/go-dbus-generator/default.nix index fa38e650c3a9..28873d8459ec 100644 --- a/pkgs/desktops/deepin/go-dbus-generator/default.nix +++ b/pkgs/desktops/deepin/go-dbus-generator/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, go, go-lib }: +{ stdenv, fetchFromGitHub, go, go-lib, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -22,6 +22,8 @@ stdenv.mkDerivation rec { "GOCACHE=off" ]; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Convert dbus interfaces to go-lang or qml wrapper code"; homepage = https://github.com/linuxdeepin/go-dbus-generator; diff --git a/pkgs/desktops/deepin/go-gir-generator/default.nix b/pkgs/desktops/deepin/go-gir-generator/default.nix index d5ec29f1ef8b..183ae58fecd0 100644 --- a/pkgs/desktops/deepin/go-gir-generator/default.nix +++ b/pkgs/desktops/deepin/go-gir-generator/default.nix @@ -1,15 +1,16 @@ -{ stdenv, fetchFromGitHub, pkgconfig, go, gobjectIntrospection, libgudev }: +{ stdenv, fetchFromGitHub, pkgconfig, go, gobjectIntrospection, + libgudev, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "go-gir-generator"; - version = "1.0.4"; + version = "1.1.0"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0yi3lsgkxi8ghz2c7msf2df20jxkvzj8s47slvpzz4m57i82vgzl"; + sha256 = "0grp4ffy3vmlknzmymnxq1spwshff2ylqsw82pj4y2v2fcvnqfvb"; }; nativeBuildInputs = [ @@ -31,6 +32,8 @@ stdenv.mkDerivation rec { "GOCACHE=off" ]; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Generate static golang bindings for GObject"; homepage = https://github.com/linuxdeepin/go-gir-generator; diff --git a/pkgs/desktops/deepin/go-lib/default.nix b/pkgs/desktops/deepin/go-lib/default.nix index ff9394425e08..684f1dd7f32d 100644 --- a/pkgs/desktops/deepin/go-lib/default.nix +++ b/pkgs/desktops/deepin/go-lib/default.nix @@ -1,17 +1,16 @@ { stdenv, fetchFromGitHub, glib, xorg, gdk_pixbuf, pulseaudio, - mobile-broadband-provider-info -}: + mobile-broadband-provider-info, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "go-lib"; - version = "1.2.16.3"; + version = "1.3.0"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0dk6k53in3ffwwvkr0sazfk83rf4fyc6rvb6k8fi2n3qj4gp8xd2"; + sha256 = "0g84v1adnnyqc1mv45n3wlvnivkm1fi8ywszzgwx8irl3iddfvxv"; }; buildInputs = [ @@ -27,6 +26,8 @@ stdenv.mkDerivation rec { "GOSITE_DIR=$(out)/share/go" ]; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Go bindings for Deepin Desktop Environment development"; homepage = https://github.com/linuxdeepin/go-lib; diff --git a/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix b/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix index 3754de3ea980..c4ce0ca563bd 100644 --- a/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix +++ b/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix @@ -1,15 +1,16 @@ -{ stdenv, fetchFromGitHub, pkgconfig, qmake, qtx11extras, libSM, mtdev, cairo }: +{ stdenv, fetchFromGitHub, pkgconfig, qmake, qtx11extras, libSM, + mtdev, cairo, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "qt5dxcb-plugin"; - version = "1.1.11"; + version = "1.1.13"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "157p2cqs9fvd4n4fmxj6mh4cxlc35bkl4rnf832wk2gvjnxdfrfy"; + sha256 = "12lvh3agw3qdviqf32brmzba5kscnj5al5jhc08lq69a9kmip05x"; }; nativeBuildInputs = [ @@ -30,6 +31,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Qt platform theme integration plugin for DDE"; homepage = https://github.com/linuxdeepin/qt5dxcb-plugin; diff --git a/pkgs/desktops/deepin/qt5integration/default.nix b/pkgs/desktops/deepin/qt5integration/default.nix index 28e06bae42d2..809156377225 100644 --- a/pkgs/desktops/deepin/qt5integration/default.nix +++ b/pkgs/desktops/deepin/qt5integration/default.nix @@ -1,18 +1,17 @@ -{ stdenv, fetchFromGitHub, pkgconfig, qmake, mtdev, gsettings-qt -, lxqt, qtx11extras, qtmultimedia, qtsvg, fontconfig, freetype -, qt5dxcb-plugin, qtstyleplugins, dtkcore, dtkwidget -}: +{ stdenv, fetchFromGitHub, pkgconfig, qmake, mtdev, gsettings-qt , + lxqt, qtx11extras, qtmultimedia, qtsvg, fontconfig, freetype , + qt5dxcb-plugin, qtstyleplugins, dtkcore, dtkwidget, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "qt5integration"; - version = "0.3.5"; + version = "0.3.6"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0qf9ndsg8pz2n68y68a30d1hxr3ri8k4j00dxlbcf5cn5mbnny1b"; + sha256 = "1v9whlqn07c5c8xnaiicdshj9n88a667gfbn8y8bk5bfylilfzcy"; }; nativeBuildInputs = [ @@ -42,6 +41,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = deepin.updateScript { inherit name; }; + meta = with stdenv.lib; { description = "Qt platform theme integration plugins for DDE"; homepage = https://github.com/linuxdeepin/qt5integration; diff --git a/pkgs/desktops/deepin/update.nix b/pkgs/desktops/deepin/update.nix new file mode 100644 index 000000000000..761ead015c6b --- /dev/null +++ b/pkgs/desktops/deepin/update.nix @@ -0,0 +1,37 @@ +{ lib, writeScript, coreutils, curl, gnugrep, gnused, jq, common-updater-scripts, nix }: +{ name, ignored-versions ? "^2014\\.|^v[0-9]+" }: + +let + nameAndVersion = builtins.parseDrvName name; + packageVersion = nameAndVersion.version; + packageName = nameAndVersion.name; + attrPath = "deepin.${packageName}"; +in + +writeScript "update-${packageName}" '' + set -o errexit + set -x + + # search for the latest version of the package on github + PATH=${lib.makeBinPath [ common-updater-scripts coreutils curl gnugrep gnused jq ]} + tags=$(curl -s https://api.github.com/repos/linuxdeepin/${packageName}/tags) + tags=$(echo "$tags" | jq -r '.[] | .name') + echo "# ${name}" >> git-commits.txt + echo "# available tags:" >> git-commits.txt + echo "$tags" | ${gnused}/bin/sed -e 's/^/# /' >> git-commits.txt + if [ -n "${ignored-versions}" ]; then + tags=$(echo "$tags" | grep -vE "${ignored-versions}") + fi + latest_tag=$(echo "$tags" | sort --version-sort | tail -1) + + # generate commands to commit the changes + if [ "${packageVersion}" != "$latest_tag" ]; then + pfile=$(EDITOR=echo ${nix}/bin/nix edit -f. ${attrPath}) + echo " git add $pfile " >> git-commits.txt + echo " git commit -m \"${attrPath}: ${packageVersion} -> $latest_tag\"" >> git-commits.txt + fi + + # update the nix expression + update-source-version "${attrPath}" "$latest_tag" + echo "" >> git-commits.txt +'' diff --git a/pkgs/development/interpreters/clojurescript/lumo/default.nix b/pkgs/development/interpreters/clojurescript/lumo/default.nix new file mode 100644 index 000000000000..40276cf3c42b --- /dev/null +++ b/pkgs/development/interpreters/clojurescript/lumo/default.nix @@ -0,0 +1,257 @@ +{ stdenv, lib, fetchurl, clojure, + nodejs, jre, unzip, nodePackages, + python, openssl }: + +let # packageJSON=./package.json; + version = "1.9.0"; + nodeVersion = "10.9.0"; + nodeSources = fetchurl { + url="https://nodejs.org/dist/v${nodeVersion}/node-v${nodeVersion}.tar.gz"; + sha256="0wgawq3wzw07pir73bxz13dggcc1fj0538y7y69n3cc0a2kiplqy"; + }; + lumo-internal-classpath = "LUMO__INTERNAL__CLASSPATH"; + + # as found in cljs/snapshot/lumo/repl.cljs + requireDeps = '' \ + cljs.analyzer \ + cljs.compiler \ + cljs.env \ + cljs.js \ + cljs.reader \ + cljs.repl \ + cljs.source-map \ + cljs.source-map.base64 \ + cljs.source-map.base64-vlq \ + cljs.spec.alpha \ + cljs.spec.gen.alpha \ + cljs.tagged-literals \ + cljs.tools.reader \ + cljs.tools.reader.reader-types \ + cljs.tools.reader.impl.commons \ + cljs.tools.reader.impl.utils \ + clojure.core.rrb-vector \ + clojure.core.rrb-vector.interop \ + clojure.core.rrb-vector.nodes \ + clojure.core.rrb-vector.protocols \ + clojure.core.rrb-vector.rrbt \ + clojure.core.rrb-vector.transients \ + clojure.core.rrb-vector.trees \ + clojure.string \ + clojure.set \ + clojure.walk \ + cognitect.transit \ + fipp.visit \ + fipp.engine \ + fipp.deque \ + lazy-map.core \ + lumo.pprint.data \ + lumo.repl \ + lumo.repl-resources \ + lumo.js-deps \ + lumo.common ''; + + compileClojurescript = (simple: '' + (require '[cljs.build.api :as cljs]) + (cljs/build \"src/cljs/snapshot\" + {:optimizations ${if simple then ":simple" else ":none"} + :main 'lumo.core + :cache-analysis true + :source-map false + :dump-core false + :static-fns true + :optimize-constants false + :npm-deps false + :verbose true + :closure-defines {'cljs.core/*target* \"nodejs\" + 'lumo.core/*lumo-version* \"${version}\"} + :compiler-stats true + :process-shim false + :fn-invoke-direct true + :parallel-build false + :browser-repl false + :target :nodejs + :hashbang false + ;; :libs [ \"src/cljs/bundled\" \"src/js\" ] + :output-dir ${if simple + then ''\"cljstmp\"'' + else ''\"target\"''} + :output-to ${if simple + then ''\"cljstmp/main.js\"'' + else ''\"target/deleteme.js\"'' }}) + ''); + + + cacheToJsons = '' + (import [java.io ByteArrayOutputStream FileInputStream]) + (require '[cognitect.transit :as transit] + '[clojure.edn :as edn] + '[clojure.string :as str]) + + (defn write-transit-json [cache] + (let [out (ByteArrayOutputStream. 1000000) + writer (transit/writer out :json)] + (transit/write writer cache) + (.toString out))) + + (defn process-caches [] + (let [cache-aot-path \"target/cljs/core.cljs.cache.aot.edn\" + cache-aot-edn (edn/read-string (slurp cache-aot-path)) + cache-macros-path \"target/cljs/core\$macros.cljc.cache.json\" + cache-macros-stream (FileInputStream. cache-macros-path) + cache-macros-edn (transit/read (transit/reader cache-macros-stream :json)) + caches [[cache-aot-path cache-aot-edn] + [cache-macros-path cache-macros-edn]]] + (doseq [[path cache-edn] caches] + (doseq [key (keys cache-edn)] + (let [out-path (str/replace path #\"(\.json|\.edn)\$\" + (str \".\" (munge key) \".json\")) + tr-json (write-transit-json (key cache-edn))] + (spit out-path tr-json)))))) + + (process-caches) + ''; + + trimMainJsEnd = '' + (let [string (slurp \"target/main.js\")] + (spit \"target/main.js\" + (subs string 0 (.indexOf string \"cljs.nodejs={};\")))) + ''; + + + cljdeps = import ./deps.nix; + cljpaths = cljdeps.makePaths {}; + classp = cljdeps.makeClasspaths { + extraClasspaths=["src/js" "src/cljs/bundled" "src/cljs/snapshot"]; + }; + + + getJarPath = jarName: (lib.findFirst (p: p.name == jarName) null cljdeps.packages).path.jar; + +in stdenv.mkDerivation rec { + inherit version; + name = "lumo-${version}"; + + src = fetchurl { + url = "https://github.com/anmonteiro/lumo/archive/${version}.tar.gz"; + sha256 = "1mr3zjslznhv7y3mzvg1pmmvzn10d6di26izz4x8p4nfnshacwgw"; + }; + + + buildInputs = [ nodejs clojure jre unzip python openssl + nodePackages."lumo-build-deps-../interpreters/clojurescript/lumo" ]; + + buildPhase = '' + # Copy over lumo-build-deps environment + rm yarn.lock + cp -rf ${nodePackages."lumo-build-deps-../interpreters/clojurescript/lumo"}/lib/node_modules/lumo-build-deps/* ./ + + # configure clojure-cli + mkdir ./.cpcache + export CLJ_CONFIG=`pwd` + export CLJ_CACHE=`pwd`/.cpcache + + # require more namespaces for cljs-bundle + sed -i "s!ns lumo.core! \ + ns lumo.core \ + (:require ${requireDeps}) \ + (:require-macros [clojure.template :as temp] \ + [cljs.test :as test])!g" \ + ./src/cljs/snapshot/lumo/core.cljs + + # Step 1: compile clojurescript with :none and :simple + ${clojure}/bin/clojure -Scp ${classp} -e "${compileClojurescript true}" + ${clojure}/bin/clojure -Scp ${classp} -e "${compileClojurescript false}" + cp -f cljstmp/main.js target/main.js + ${clojure}/bin/clojure -Scp ${classp} -e "${trimMainJsEnd}" + + # Step 2: sift files + unzip -o ${getJarPath "org.clojure/clojurescript"} -d ./target + unzip -j ${getJarPath "org.clojure/clojure"} "clojure/template.clj" -d ./target/clojure + unzip -o ${getJarPath "org.clojure/google-closure-library"} -d ./target + unzip -o ${getJarPath "org.clojure/google-closure-library-third-party"} -d ./target + unzip -o ${getJarPath "org.clojure/tools.reader"} -d ./target + unzip -o ${getJarPath "org.clojure/test.check"} -d ./target + cp -rf ./src/cljs/bundled/lumo/* ./target/lumo/ + cp -rf ./src/cljs/snapshot/lumo/repl.clj ./target/lumo/ + # cleanup + mv ./target/main.js ./target/main + rm ./target/*\.js + mv ./target/main ./target/main.js + rm ./target/AUTHORS + rm ./target/LICENSE + rm ./target/*.edn + rm ./target/*.md + rm -rf ./target/css + rm -rf ./target/META-INF + rm -rf ./target/com + rm -rf ./target/cljs/build + rm -rf ./target/cljs/repl + rm ./target/cljs/core\.cljs\.cache.aot\.json + rm ./target/cljs/source_map\.clj + rm ./target/cljs/repl\.cljc + rm ./target/cljs/externs\.clj + rm ./target/cljs/closure\.clj + rm ./target/cljs/util\.cljc + rm ./target/cljs/js_deps\.cljc + rm ./target/cljs/analyzer/utils\.clj + rm ./target/cljs/core/macros\.clj + rm ./target/cljs/compiler/api.clj + rm ./target/goog/test_module* + rm ./target/goog/transpile\.js + rm ./target/goog/base_* + find ./target -type f -name '*.class' -delete + find ./target -type d -empty -delete + + # Step 3: generate munged cache jsons + ${clojure}/bin/clojure -Scp ${classp} -e "${cacheToJsons}" + rm ./target/cljs/core\$macros\.cljc\.cache\.json + + + # Step 4: Bunde javascript + NODE_ENV=production node scripts/bundle.js + node scripts/bundleForeign.js + + # Step 5: Backup resources + cp -R target resources_bak + + # Step 6: Package executeable 1st time + # fetch node sources and copy to palce that nexe will find + mkdir -p tmp/${nodeVersion} + cp ${nodeSources} tmp/${nodeVersion}/node-${nodeVersion}.tar.gz + tar -C ./tmp/${nodeVersion} -xf ${nodeSources} + mv ./tmp/${nodeVersion}/node-v${nodeVersion}/* ./tmp/${nodeVersion}/ + rm -rf ${lumo-internal-classpath} + mv target ${lumo-internal-classpath} + node scripts/package.js ${nodeVersion} + rm -rf ${lumo-internal-classpath} + + # Step 7: AOT Macros + sh scripts/aot-bundle-macros.sh + + # Step 8: Package executeable 2nd time + rm -rf ${lumo-internal-classpath} + mv target ${lumo-internal-classpath} + node scripts/package.js ${nodeVersion} + ''; + + dontStrip = true; + + installPhase = '' + mkdir -p $out/bin + cp build/lumo $out/bin + ''; + + meta = { + description = "Fast, cross-platform, standalone ClojureScript environment"; + longDescription = '' + Lumo is a fast, standalone ClojureScript REPL that runs on Node.js and V8. + Thanks to V8's custom startup snapshots, Lumo starts up instantaneously, + making it the fastest Clojure REPL in existence. + ''; + homepage = https://github.com/anmonteiro/lumo; + license = stdenv.lib.licenses.epl10; + maintainers = [ stdenv.lib.maintainers.hlolli ]; + platforms = stdenv.lib.platforms.linux; + }; +} + diff --git a/pkgs/development/interpreters/clojurescript/lumo/deps.edn b/pkgs/development/interpreters/clojurescript/lumo/deps.edn new file mode 100644 index 000000000000..e1563599a8cc --- /dev/null +++ b/pkgs/development/interpreters/clojurescript/lumo/deps.edn @@ -0,0 +1,12 @@ +{:deps + {org.clojure/clojure {:mvn/version "1.10.0-beta5"} + org.clojure/clojurescript {:mvn/version "1.10.439"} + org.clojure/test.check {:mvn/version "0.10.0-alpha3"} + org.clojure/tools.reader {:mvn/version "1.3.2" + :exclusions [org.clojure/clojure org.clojure/clojurescript]} + com.cognitect/transit-cljs {:mvn/version "0.8.256" + :exclusions [org.clojure/clojure org.clojure/clojurescript]} + malabarba/lazy-map {:mvn/version "1.3" + :exclusions [org.clojure/clojure org.clojure/clojurescript]} + fipp {:mvn/version "0.6.14" + :exclusions [org.clojure/clojure org.clojure/clojurescript]}}} diff --git a/pkgs/development/interpreters/clojurescript/lumo/deps.nix b/pkgs/development/interpreters/clojurescript/lumo/deps.nix new file mode 100644 index 000000000000..b73c41b8f3d7 --- /dev/null +++ b/pkgs/development/interpreters/clojurescript/lumo/deps.nix @@ -0,0 +1,392 @@ +# generated by clj2nix +let repos = [ + "https://repo.clojars.org/" + "https://repo1.maven.org/" + "http://central.maven.org/maven2/" + "http://oss.sonatype.org/content/repositories/releases/" + "http://oss.sonatype.org/content/repositories/public/" + "http://repo.typesafe.com/typesafe/releases/" + ]; + pkgs = import <nixpkgs> {}; + in rec { + makePaths = {extraClasspaths ? []}: (builtins.map (dep: if builtins.hasAttr "jar" dep.path then dep.path.jar else dep.path) packages) ++ extraClasspaths; + makeClasspaths = {extraClasspaths ? []}: builtins.concatStringsSep ":" (makePaths {inherit extraClasspaths;}); + + packages = [ + { + name = "com.cognitect/transit-java"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "transit-java"; + groupId = "com.cognitect"; + sha512 = "80365a4f244e052b6c4fdfd2fd3b91288835599cb4dd88e0e0dae19883dcda39afee83966810ed81beff342111c3a45a66f5601c443f3ad49904908c43631708"; + version = "0.8.332"; + }; + } + + { + name = "org.clojure/data.json"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "data.json"; + groupId = "org.clojure"; + sha512 = "ce526bef01bedd31b772954d921a61832ae60af06121f29080853f7932326438b33d183240a9cffbe57e00dc3744700220753948da26b8973ee21c30e84227a6"; + version = "0.2.6"; + }; + } + + { + name = "org.clojure/clojure"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "clojure"; + groupId = "org.clojure"; + sha512 = "f7a6b207b1bcbb6523d32ecfdd3c8c25d4d0b0a59c78baf06cdc69ba3c21c5e96b5dac8e9efcb331efd94e10bccbb9b54fca62a4312309db65a1f9d89d9da3f4"; + version = "1.10.0-beta5"; + }; + } + + { + name = "commons-codec/commons-codec"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "commons-codec"; + groupId = "commons-codec"; + sha512 = "8edecc0faf38e8620460909d8191837f34e2bb2ce853677c486c5e79bb79e88d043c3aed69c11f1365c4884827052ee4e1c18ca56e38d1a5bc0ce15c57daeee3"; + version = "1.10"; + }; + } + + { + name = "com.google.errorprone/error_prone_annotations"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "error_prone_annotations"; + groupId = "com.google.errorprone"; + sha512 = "bd2135cc9eb2c652658a2814ec9c565fa3e071d4cff590cbe17b853885c78c9f84c1b7b24ba736f4f30ed8cec60a6af983827fcbed61ff142f27ac808e97fc6b"; + version = "2.1.3"; + }; + } + + { + name = "org.clojure/core.specs.alpha"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "core.specs.alpha"; + groupId = "org.clojure"; + sha512 = "348c0ea0911bc0dcb08655e61b97ba040649b4b46c32a62aa84d0c29c245a8af5c16d44a4fa5455d6ab076f4bb5bbbe1ad3064a7befe583f13aeb9e32a169bf4"; + version = "0.2.44"; + }; + } + + { + name = "org.clojure/spec.alpha"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "spec.alpha"; + groupId = "org.clojure"; + sha512 = "18c97fb2b74c0bc2ff4f6dc722a3edec539f882ee85d0addf22bbf7e6fe02605d63f40c2b8a2905868ccd6f96cfc36a65f5fb70ddac31c6ec93da228a456edbd"; + version = "0.2.176"; + }; + } + + { + name = "org.codehaus.mojo/animal-sniffer-annotations"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "animal-sniffer-annotations"; + groupId = "org.codehaus.mojo"; + sha512 = "9e5e3ea9e06e0ac9463869fd0e08ed38f7042784995a7b50c9bfd7f692a53f0e1430b9e1367dc772d0d4eafe5fd2beabbcc60da5008bd792f9e7ec8436c0f136"; + version = "1.14"; + }; + } + + { + name = "com.googlecode.json-simple/json-simple"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "json-simple"; + groupId = "com.googlecode.json-simple"; + sha512 = "f8798bfbcc8ab8001baf90ce47ec2264234dc1da2d4aa97fdcdc0990472a6b5a5a32f828e776140777d598a99d8a0c0f51c6d0767ae1a829690ab9200ae35742"; + version = "1.1.1"; + }; + } + + { + name = "com.cognitect/transit-cljs"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "transit-cljs"; + groupId = "com.cognitect"; + sha512 = "318b98ddd63629f37b334bb90e625bc31ab6abcf0b1fa80d8e097551658f2d9219b5ee35869a31f2976d7d385da83bea0c07b0d097babcae241ecbd0fe8a7ecd"; + version = "0.8.256"; + }; + } + + { + name = "org.clojure/google-closure-library"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "google-closure-library"; + groupId = "org.clojure"; + sha512 = "75631182ef12f21723fe3eba1003d8cf9b8348a51512961e4e1b87bc24d8f3abb14a70c856f08cdaa5588a2d7c2b1b0c03aeaa3c4c5f2ed745a85f59ceeab83a"; + version = "0.0-20170809-b9c14c6b"; + }; + } + + { + name = "fipp"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "fipp"; + groupId = "fipp"; + sha512 = "155b5bb7045ac7c3a75c638e65464ca1fc90e5b4692328fc2da73b26792178fdbce5ab01ba0397e1986b6162b06b8904712d2c366f32ea43ea5fa2b454a526a5"; + version = "0.6.14"; + }; + } + + { + name = "org.clojure/clojurescript"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "clojurescript"; + groupId = "org.clojure"; + sha512 = "4aec5abdd48aaf95f7a729e11d225a99d02caa3a4ddff3e9e4f8db80dea83ab70a4440691cb372562c8c16e73c2850b22806a2851df3849c852fddd49b57fc58"; + version = "1.10.439"; + }; + } + + { + name = "com.google.jsinterop/jsinterop-annotations"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "jsinterop-annotations"; + groupId = "com.google.jsinterop"; + sha512 = "b6fd98a9167d031f6bff571567d4658fda62c132dc74d47ca85e02c9bb3ce8812b1012c67f4c81501ab0cbd9ccd9cda5dcf32d306e04368ace7a173cecae975d"; + version = "1.0.0"; + }; + } + + { + name = "com.fasterxml.jackson.core/jackson-core"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "jackson-core"; + groupId = "com.fasterxml.jackson.core"; + sha512 = "a1bd6c264b9ab07aad3d0f26b65757e35ff47904ab895bb7f997e3e1fd063129c177ad6f69876907b04ff8a43c6b1770a26f53a811633a29e66a5dce57194f64"; + version = "2.8.7"; + }; + } + + { + name = "malabarba/lazy-map"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "lazy-map"; + groupId = "malabarba"; + sha512 = "ce56d6f03ac344579e15f062cdd4c477c0323da716d4d4106c4edb746959699e0b294b25aacf8ecf1579a6bdd5556a60f4bcb1648d22832984c069a0431c840f"; + version = "1.3"; + }; + } + + { + name = "com.cognitect/transit-js"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "transit-js"; + groupId = "com.cognitect"; + sha512 = "6ca0978e633e41b45ff5a76df79099ba7c4900a8ca9f6acd2a903e4ab10a1ec0c83d4127009df9dac1337debaba01f7ff1d5cced1c2159c05ef94845f73f0623"; + version = "0.8.846"; + }; + } + + { + name = "org.mozilla/rhino"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "rhino"; + groupId = "org.mozilla"; + sha512 = "466e7a76303ea191802b5e7adb3dff64c1d6283a25ce87447296b693b87b166f4cdd191ef7dc130a5739bfa0e4a81b08550f607c84eec167406d9be2225562dc"; + version = "1.7R5"; + }; + } + + { + name = "org.clojure/google-closure-library-third-party"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "google-closure-library-third-party"; + groupId = "org.clojure"; + sha512 = "57fa84fbbca3eb9e612d2842e4476b74f64d13dd076ffca6c9d9e15c4ca8a2f2c56cc19307bcad0ab5b4f9cb0c3e7900ccc845bd570ebc92e2633885ab621f35"; + version = "0.0-20170809-b9c14c6b"; + }; + } + + { + name = "com.google.javascript/closure-compiler-externs"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "closure-compiler-externs"; + groupId = "com.google.javascript"; + sha512 = "1a47c8559144095c0b23a8e40acd7185625cea5a4c103eb75fbacd32d5809d087bfb60aaf57066329649c6017ec5f993756024e767a5b8f84926371ba6183a82"; + version = "v20180805"; + }; + } + + { + name = "org.javassist/javassist"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "javassist"; + groupId = "org.javassist"; + sha512 = "ad65ee383ed83bedecc2073118cb3780b68b18d5fb79a1b2b665ff8529df02446ad11e68f9faaf4f2e980065f5946761a59ada379312cbb22d002625abed6a4f"; + version = "3.18.1-GA"; + }; + } + + { + name = "com.google.guava/guava"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "guava"; + groupId = "com.google.guava"; + sha512 = "429ceeec0350ba98e2b089b8b70ded2ec570c3a684894a7545d10592c1c7be42dacd1fad8b2cb9123aa3612575ce1b56e1bb54923443fc293f8e9adeac2762ee"; + version = "25.1-jre"; + }; + } + + { + name = "org.msgpack/msgpack"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "msgpack"; + groupId = "org.msgpack"; + sha512 = "a2741bed01f9c37ba3dbe6a7ab9ce936d36d4da97c35e215250ac89ac0851fc5948d83975ea6257d5dce1d43b6b5147254ecfb4b33f9bbdc489500b3ff060449"; + version = "0.6.12"; + }; + } + + { + name = "com.google.j2objc/j2objc-annotations"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "j2objc-annotations"; + groupId = "com.google.j2objc"; + sha512 = "a4a0b58ffc2d9f9b516f571bcd0ac14e4d3eec15aacd6320a4a1a12045acce8c6081e8ce922c4e882221cedb2cc266399ab468487ae9a08124d65edc07ae30f0"; + version = "1.1"; + }; + } + + { + name = "com.cognitect/transit-clj"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "transit-clj"; + groupId = "com.cognitect"; + sha512 = "ad838d9e5688c8cebe54972ad0c9a6db428ec1cece8c8b078e8e8d4b0c7870b328239d2bc9dd8fcbedcba56ca0de9afb5a0a843ff5f630dc039118de7eb45eba"; + version = "0.8.309"; + }; + } + + { + name = "args4j/args4j"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "args4j"; + groupId = "args4j"; + sha512 = "5f0651234c8f8b130fddb39fa832c6da47d3e21bc3434307554314c47e672c28d005c64e9effe85d552190cfc27966b1f005740ffd40b4e1bec2cb257d7feedb"; + version = "2.0.26"; + }; + } + + { + name = "org.clojure/core.rrb-vector"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "core.rrb-vector"; + groupId = "org.clojure"; + sha512 = "5f737bf3ca3acf567b2b5c14b5761c8c38e94e1f6168f8cba9f46d2ae41334ae3d68d2c00663827a6214094d96b9767f6803f66ab44b0012c6f2e3c2997b1796"; + version = "0.0.13"; + }; + } + + { + name = "org.checkerframework/checker-qual"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "checker-qual"; + groupId = "org.checkerframework"; + sha512 = "3c38b0b9e0bde464268cff5fdb1894a048240b039093ee3abe5b32976a22737d26b355f8793f630a7f0b319fdb019a6fcd9ee1d5219676f0f10c0b0f496b61b7"; + version = "2.0.0"; + }; + } + + { + name = "org.clojure/tools.reader"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "tools.reader"; + groupId = "org.clojure"; + sha512 = "290a2d98b2eec08a8affc2952006f43c0459c7e5467dc454f5fb5670ea7934fa974e6be19f7e7c91dadcfed62082d0fbcc7788455b7446a2c9c5af02f7fc52b6"; + version = "1.3.2"; + }; + } + + { + name = "com.google.javascript/closure-compiler-unshaded"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "closure-compiler-unshaded"; + groupId = "com.google.javascript"; + sha512 = "4fa7029aabd9ff84255d56004707486726db9c770f43cb10dc44fb53a3254d588a0f47f937f55401d7f319267ec2362c87f5ea709bcfa06f12a66fe22cb8c53d"; + version = "v20180805"; + }; + } + + { + name = "org.clojure/test.check"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "test.check"; + groupId = "org.clojure"; + sha512 = "bf57571a9d31d50cf15b38134f4d7c34d03eb458bc62b30c7a1dbf233e300c67f1fda6673dbd1584a0497cf8875f972e6697e7f13d0c3e70e4254697b1b75cc6"; + version = "0.10.0-alpha3"; + }; + } + + { + name = "com.google.protobuf/protobuf-java"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "protobuf-java"; + groupId = "com.google.protobuf"; + sha512 = "230fc4360b8b2ee10eb73d756c58478b6c779433aa4ca91938404bbfd0ada516d3215664dbe953c96649e33bbef293958e4ad4616671f0c246883196ece92998"; + version = "3.0.2"; + }; + } + + { + name = "com.google.code.findbugs/jsr305"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "jsr305"; + groupId = "com.google.code.findbugs"; + sha512 = "bb09db62919a50fa5b55906013be6ca4fc7acb2e87455fac5eaf9ede2e41ce8bbafc0e5a385a561264ea4cd71bbbd3ef5a45e02d63277a201d06a0ae1636f804"; + version = "3.0.2"; + }; + } + + { + name = "com.google.code.gson/gson"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "gson"; + groupId = "com.google.code.gson"; + sha512 = "c3cdaf66a99e6336abc80ff23374f6b62ac95ab2ae874c9075805e91d849b18e3f620cc202b4978fc92b73d98de96089c8714b1dd096b2ae1958cfa085715f7a"; + version = "2.7"; + }; + } + + ]; + } + \ No newline at end of file diff --git a/pkgs/development/interpreters/clojurescript/lumo/package.json b/pkgs/development/interpreters/clojurescript/lumo/package.json new file mode 100644 index 000000000000..358595ef1eb8 --- /dev/null +++ b/pkgs/development/interpreters/clojurescript/lumo/package.json @@ -0,0 +1,42 @@ +{ + "name": "lumo-build-deps", + "version": "1.9.0", + "dependencies": { + "@babel/core": "^7.1.5", + "@babel/plugin-external-helpers": "7.0.0", + "@babel/plugin-proposal-class-properties": "^7.1.0", + "@babel/plugin-proposal-object-rest-spread": "^7.0.0", + "@babel/plugin-transform-runtime": "^7.1.0", + "@babel/preset-env": "^7.1.5", + "@babel/preset-stage-2": "7.0.0", + "@babel/runtime": "^7.1.5", + "async-retry": "^1.2.3", + "babel-core": "^7.0.0-bridge.0", + "babel-eslint": "10.0.1", + "babel-jest": "^23.6.0", + "babel-loader": "^8.0.4", + "babel-plugin-transform-flow-strip-types": "6.22.0", + "chalk": "^2.4.1", + "cross-env": "5.2.0", + "death": "^1.1.0", + "flow-bin": "0.85.0", + "google-closure-compiler-js": "20170910.0.1", + "jszip": "github:anmonteiro/jszip#patch-1", + "nexe": "3.0.0-beta.7", + "node-fetch": "^2.2.1", + "paredit.js": "0.3.4", + "posix-getopt": "github:anmonteiro/node-getopt#master", + "prettier": "1.15.1", + "progress": "^2.0.0", + "read-pkg": "^4.0.1", + "rollup": "0.67.0", + "rollup-plugin-babel": "4.0.3", + "rollup-plugin-babel-minify": "6.1.1", + "rollup-plugin-commonjs": "9.2.0", + "rollup-plugin-node-resolve": "3.4.0", + "rollup-plugin-replace": "2.1.0", + "webpack": "^4.25.1", + "webpack-cli": "^3.1.2", + "which-promise": "^1.0.0" + } +} diff --git a/pkgs/development/libraries/SDL_sound/default.nix b/pkgs/development/libraries/SDL_sound/default.nix index 2a009a3b7104..0e717c530357 100644 --- a/pkgs/development/libraries/SDL_sound/default.nix +++ b/pkgs/development/libraries/SDL_sound/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, libvorbis, flac, libmikmod }: +{ stdenv, lib, fetchurl, SDL, libvorbis, flac, libmikmod }: stdenv.mkDerivation rec { name = "SDL_sound-${version}"; @@ -11,9 +11,11 @@ stdenv.mkDerivation rec { buildInputs = [ SDL libvorbis flac libmikmod ]; - meta = with stdenv.lib; { + configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest"; + + meta = with lib; { description = "SDL sound library"; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.lgpl21; homepage = https://www.icculus.org/SDL_sound/; }; diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix index 2aacfd07364f..831d0cc0f713 100644 --- a/pkgs/development/libraries/appstream-glib/default.nix +++ b/pkgs/development/libraries/appstream-glib/default.nix @@ -4,7 +4,7 @@ , libuuid, json-glib, meson, gperf, ninja }: stdenv.mkDerivation rec { - name = "appstream-glib-0.7.13"; + name = "appstream-glib-0.7.14"; outputs = [ "out" "dev" "man" "installedTests" ]; outputBin = "dev"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "appstream-glib"; rev = stdenv.lib.replaceStrings ["." "-"] ["_" "_"] name; - sha256 = "0r1gb806p68axspzwvpn1ygmd6pfc17mncg3i6yazk3n10k5cl06"; + sha256 = "1908ilra1l0m2a224azmj6p4yglzdwwk41rr6rhby959sgw3iaky"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix index 5e4218852e51..19b82fcffa38 100644 --- a/pkgs/development/libraries/appstream/default.nix +++ b/pkgs/development/libraries/appstream/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "appstream-${version}"; - version = "0.12.2"; + version = "0.12.3"; src = fetchFromGitHub { owner = "ximion"; repo = "appstream"; rev = "APPSTREAM_${stdenv.lib.replaceStrings ["."] ["_"] version}"; - sha256 = "1g15c4bhyl730rgaiqia3jppraixh05c3yx098lyilidbddxp5xb"; + sha256 = "154yfn10vm5v7vwa2jz60bgpcznzm3nkjg31g92rm9b39rd2y1ja"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index 16ba6b32382a..7685a0d9eb4f 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5 }: stdenv.mkDerivation rec { - version = "9.100.5"; + version = "9.200.4"; name = "armadillo-${version}"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "1ka1vd9fcmvp12qkcm4888dkfqwnalvv00x04wy29f3nx3qwczby"; + sha256 = "0rkry405vacvlvkc7xdkzh20zf7yni9hsp65v0dby91na0wcrl8h"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index 027b86a97747..4c942cac3f69 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.58"; + name = "babl-0.1.60"; src = fetchurl { url = "https://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2"; - sha256 = "0mgdii9v89ay0nra36cz9i0q7cqv8wi8hk01jsc4bf0rc1bsxjbr"; + sha256 = "0kv0y12j4k9khrxqa7rryfb4ikcnrax6x4nwi70wnz05nv6fxld3"; }; doCheck = true; diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix index 09c1560d6f60..f1cad37d438f 100644 --- a/pkgs/development/libraries/caf/default.nix +++ b/pkgs/development/libraries/caf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "actor-framework-${version}"; - version = "0.16.0"; + version = "0.16.2"; src = fetchFromGitHub { owner = "actor-framework"; repo = "actor-framework"; rev = "${version}"; - sha256 = "01i6sclxwa7k91ngi7jw9vlss8wjpv1hz4y5934jq0lx8hdf7s02"; + sha256 = "0sdr9mrrkrj9nfwqbznz3pkqfsnsi8kanfy99x01js1spqihy1s3"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/cpp-hocon/default.nix b/pkgs/development/libraries/cpp-hocon/default.nix index f08077a9a3cf..c2f3ce9b9b4a 100644 --- a/pkgs/development/libraries/cpp-hocon/default.nix +++ b/pkgs/development/libraries/cpp-hocon/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "cpp-hocon-${version}"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { - sha256 = "084vsn080z8mp5s54jaq0qdwlx0p62nbw1i0rffkag477h8vq68i"; + sha256 = "0ar7q3rp46m01wvfa289bxnk9xma3ydc67by7i4nrpz8vamvhwc3"; rev = version; repo = "cpp-hocon"; owner = "puppetlabs"; diff --git a/pkgs/development/libraries/fltk/default.nix b/pkgs/development/libraries/fltk/default.nix index 405d80031e37..b1c798476ead 100644 --- a/pkgs/development/libraries/fltk/default.nix +++ b/pkgs/development/libraries/fltk/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, xlibsWrapper, inputproto, libXi , freeglut, libGLU_combined, libjpeg, zlib, libXft, libpng -, darwin, libtiff, freetype +, libtiff, freetype, cf-private, Cocoa, AGL, GLUT }: let @@ -35,7 +35,7 @@ in stdenv.mkDerivation { propagatedBuildInputs = [ inputproto ] ++ (if stdenv.isDarwin - then (with darwin.apple_sdk.frameworks; [Cocoa AGL GLUT freetype libtiff]) + then [ Cocoa AGL GLUT freetype libtiff cf-private /* Needed for NSDefaultRunLoopMode */ ] else [ xlibsWrapper libXi freeglut ]); enableParallelBuilding = true; diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index 42313fc4e5e9..03324d548991 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig , openssl -, odbcSupport ? false, unixODBC ? null }: +, odbcSupport ? true, unixODBC ? null }: assert odbcSupport -> unixODBC != null; diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index cba31f45d557..91c384b249a4 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, cmake, vtk }: stdenv.mkDerivation rec { - version = "2.8.7"; + version = "2.8.8"; name = "gdcm-${version}"; src = fetchurl { url = "mirror://sourceforge/gdcm/${name}.tar.bz2"; - sha256 = "1psl4r0i3hfhjjm9y8q5ml9lnlal4212bm8df21087dddi9nfl62"; + sha256 = "1iwfrk04sd22wkr1ivbg8gixl34fv9zfzwnfqvrq121nadb0s29b"; }; dontUseCmakeBuildDir = true; diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix index c8b7b3b8eca5..cb7f2621353d 100644 --- a/pkgs/development/libraries/gegl/4.0.nix +++ b/pkgs/development/libraries/gegl/4.0.nix @@ -3,7 +3,7 @@ , libwebp, gnome3, libintl }: let - version = "0.4.8"; + version = "0.4.12"; in stdenv.mkDerivation rec { name = "gegl-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2"; - sha256 = "0jdfhf8wikba4h68k505x0br3gisiwivc33aca8v3ibaqpp6i53i"; + sha256 = "0ljqxc4iyy2hrj31pxcy1xp4xm5zbx1nigqisphmg4p8mcz2jrz9"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix index 8d4d4d10038a..9cbc60dcef5a 100644 --- a/pkgs/development/libraries/glfw/3.x.nix +++ b/pkgs/development/libraries/glfw/3.x.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, cmake, libGL, libXrandr, libXinerama, libXcursor, libX11 -, darwin, fixDarwinDylibNames +, cf-private, Cocoa, Kernel, fixDarwinDylibNames }: stdenv.mkDerivation rec { @@ -21,7 +21,11 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 libXrandr libXinerama libXcursor - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Cocoa Kernel fixDarwinDylibNames ]); + ] ++ lib.optionals stdenv.isDarwin [ + Cocoa Kernel fixDarwinDylibNames + # Needed for NSDefaultRunLoopMode symbols. + cf-private + ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/development/libraries/libdwarf/default.nix index 649541e22627..edd84d5a9515 100644 --- a/pkgs/development/libraries/libdwarf/default.nix +++ b/pkgs/development/libraries/libdwarf/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libelf }: let - version = "20180809"; + version = "20181024"; src = fetchurl { url = "https://www.prevanders.net/libdwarf-${version}.tar.gz"; # Upstream displays this hash broken into three parts: diff --git a/pkgs/development/libraries/libibverbs/default.nix b/pkgs/development/libraries/libibverbs/default.nix deleted file mode 100644 index 2243f832b7a6..000000000000 --- a/pkgs/development/libraries/libibverbs/default.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ stdenv, fetchurl }: - -let - - verbs = rec { - version = "1.1.8"; - name = "libibverbs-${version}"; - url = "http://downloads.openfabrics.org/verbs/${name}.tar.gz"; - sha256 = "13w2j5lrrqxxxvhpxbqb70x7wy0h8g329inzgfrvqv8ykrknwxkw"; - }; - - drivers = { - libmlx4 = rec { - version = "1.0.6"; - name = "libmlx4-${version}"; - url = "http://downloads.openfabrics.org/mlx4/${name}.tar.gz"; - sha256 = "f680ecbb60b01ad893490c158b4ce8028a3014bb8194c2754df508d53aa848a8"; - }; - libmthca = rec { - version = "1.0.6"; - name = "libmthca-${version}"; - url = "http://downloads.openfabrics.org/mthca/${name}.tar.gz"; - sha256 = "cc8ea3091135d68233d53004e82b5b510009c821820494a3624e89e0bdfc855c"; - }; - }; - -in stdenv.mkDerivation rec { - - inherit (verbs) name version ; - - srcs = [ - ( fetchurl { inherit (verbs) url sha256 ; } ) - ( fetchurl { inherit (drivers.libmlx4) url sha256 ; } ) - ( fetchurl { inherit (drivers.libmthca) url sha256 ; } ) - ]; - - sourceRoot = name; - - # Install userspace drivers - postInstall = '' - for dir in ${drivers.libmlx4.name} ${drivers.libmthca.name} ; do - cd ../$dir - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$out/include" - export NIX_LDFLAGS="-rpath $out/lib $NIX_LDFLAGS -L$out/lib" - ./configure $configureFlags - make -j$NIX_BUILD_CORES - make install - done - - mkdir -p $out/lib/pkgconfig - cat >$out/lib/pkgconfig/ibverbs.pc <<EOF - prefix=$out - exec_prefix=\''${prefix} - libdir=\''${exec_prefix}/lib - includedir=\''${prefix}/include - - Name: IB verbs - Version: ${version} - Description: Library for direct userspace use of RDMA (InfiniBand/iWARP) - Libs: -L\''${libdir} -libverbs - Cflags: -I\''${includedir} - EOF - ''; - - # Re-add the libibverbs path into runpath of the library - # to enable plugins to be found by dlopen - postFixup = '' - RPATH=$(patchelf --print-rpath $out/lib/libibverbs.so) - patchelf --set-rpath $RPATH:$out/lib $out/lib/libibverbs.so.1.0.0 - ''; - - meta = with stdenv.lib; { - homepage = https://www.openfabrics.org/; - license = licenses.bsd2; - platforms = with platforms; linux ++ freebsd; - maintainers = with maintainers; [ wkennington bzizou ]; - }; -} - diff --git a/pkgs/development/libraries/libimagequant/default.nix b/pkgs/development/libraries/libimagequant/default.nix index d232e268f309..ccd52f81d111 100644 --- a/pkgs/development/libraries/libimagequant/default.nix +++ b/pkgs/development/libraries/libimagequant/default.nix @@ -3,7 +3,7 @@ with stdenv; let - version = "2.12.1"; + version = "2.12.2"; in mkDerivation { name = "libimagequant-${version}"; @@ -11,7 +11,7 @@ in owner = "ImageOptim"; repo = "libimagequant"; rev = "${version}"; - sha256 = "0r7zgsnhqci2rjilh9bzw43miwp669k6b7q16hdjzrq4nr0xpvbl"; + sha256 = "1k61ifcjbp2lcrwqidflj99inkyhpbrw0hl1nzq1rjp5dnw2y5lw"; }; preConfigure = '' diff --git a/pkgs/development/libraries/liblognorm/default.nix b/pkgs/development/libraries/liblognorm/default.nix index a21b65170d39..60a38915630e 100644 --- a/pkgs/development/libraries/liblognorm/default.nix +++ b/pkgs/development/libraries/liblognorm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libestr, json_c, pcre, fastJson }: stdenv.mkDerivation rec { - name = "liblognorm-2.0.5"; + name = "liblognorm-2.0.6"; src = fetchurl { url = "http://www.liblognorm.com/files/download/${name}.tar.gz"; - sha256 = "145i1lrl2n145189i7l2a62yazjg9rkyma5jic41y0r17fl1s5f8"; + sha256 = "1wpn15c617r7lfm1z9d5aggmmi339s6yn4pdz698j0r2bkl5gw6g"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index 2c25d4181196..bb823f69135a 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "libqalculate-${version}"; - version = "2.6.2"; + version = "2.8.1"; src = fetchFromGitHub { owner = "qalculate"; repo = "libqalculate"; rev = "v${version}"; - sha256 = "1wfffki5ib65z9ndph2c4a17qx62f07q12adzabs7ij9gv94y9j5"; + sha256 = "1fakvv5vvx99pp5x72djp3313jxjwfhsl34gbyrpgkj5b4nnm7mz"; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/librdmacm/default.nix b/pkgs/development/libraries/librdmacm/default.nix deleted file mode 100644 index 3b84ead7cec1..000000000000 --- a/pkgs/development/libraries/librdmacm/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, fetchurl, libibverbs }: - -stdenv.mkDerivation rec { - name = "librdmacm-${version}"; - version = "1.1.0"; - - src = fetchurl { - url = "https://www.openfabrics.org/downloads/rdmacm/${name}.tar.gz"; - sha256 = "1ic0qd5ayvkybh4pxc5qx7sqvny1fv4anhxlf1nmsn0h926q844g"; - }; - - buildInputs = [ libibverbs ]; - - postInstall = '' - mkdir -p $out/lib/pkgconfig - cat >$out/lib/pkgconfig/rdmacm.pc <<EOF - prefix=$out - exec_prefix=\''${prefix} - libdir=\''${exec_prefix}/lib - includedir=\''${prefix}/include - - Name: RDMA library - Version: ${version} - Description: Library for managing RDMA connections - Libs: -L\''${libdir} -lrdmacm - Cflags: -I\''${includedir} - EOF - ''; - - meta = with stdenv.lib; { - homepage = https://www.openfabrics.org/; - platforms = with platforms; linux ++ freebsd; - license = licenses.bsd2; - maintainers = with maintainers; [ wkennington ]; - }; -} diff --git a/pkgs/development/libraries/libui/default.nix b/pkgs/development/libraries/libui/default.nix index 150e299ac422..dcc406accbd7 100644 --- a/pkgs/development/libraries/libui/default.nix +++ b/pkgs/development/libraries/libui/default.nix @@ -1,54 +1,53 @@ -{ stdenv, fetchgit, cmake, pkgconfig, gtk3, darwin }: +{ stdenv, fetchgit, cmake, pkgconfig, gtk3, cf-private, Cocoa }: let shortName = "libui"; version = "3.1a"; backend = if stdenv.isDarwin then "darwin" else "unix"; in - stdenv.mkDerivation rec { - name = "${shortName}-${version}"; - src = fetchgit { - url = "https://github.com/andlabs/libui.git"; - rev = "6ebdc96b93273c3cedf81159e7843025caa83058"; - sha256 = "1lpbfa298c61aarlzgp7vghrmxg1274pzxh1j9isv8x758gk6mfn"; - }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake ] ++ - (if backend == "darwin" then [darwin.apple_sdk.frameworks.Cocoa] - else if backend == "unix" then [gtk3] - else null); +stdenv.mkDerivation rec { + name = "${shortName}-${version}"; + src = fetchgit { + url = "https://github.com/andlabs/libui.git"; + rev = "6ebdc96b93273c3cedf81159e7843025caa83058"; + sha256 = "1lpbfa298c61aarlzgp7vghrmxg1274pzxh1j9isv8x758gk6mfn"; + }; - preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' - sed -i 's/set(CMAKE_OSX_DEPLOYMENT_TARGET "10.8")//' ./CMakeLists.txt - ''; + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = stdenv.lib.optional stdenv.isLinux gtk3 + ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa cf-private /* For NSDefaultRunLoopMode */ ]; - installPhase = '' - mkdir -p $out/{include,lib} - mkdir -p $out/lib/pkgconfig - '' + stdenv.lib.optionalString stdenv.isLinux '' - mv ./out/${shortName}.so.0 $out/lib/ - ln -s $out/lib/${shortName}.so.0 $out/lib/${shortName}.so - '' + stdenv.lib.optionalString stdenv.isDarwin '' - mv ./out/${shortName}.A.dylib $out/lib/ - ln -s $out/lib/${shortName}.A.dylib $out/lib/${shortName}.dylib - '' + '' - cp $src/ui.h $out/include - cp $src/ui_${backend}.h $out/include + preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + sed -i 's/set(CMAKE_OSX_DEPLOYMENT_TARGET "10.8")//' ./CMakeLists.txt + ''; - cp ${./libui.pc} $out/lib/pkgconfig/${shortName}.pc - substituteInPlace $out/lib/pkgconfig/${shortName}.pc \ - --subst-var-by out $out \ - --subst-var-by version "${version}" - ''; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' - install_name_tool -id $out/lib/${shortName}.A.dylib $out/lib/${shortName}.A.dylib - ''; + installPhase = '' + mkdir -p $out/{include,lib} + mkdir -p $out/lib/pkgconfig + '' + stdenv.lib.optionalString stdenv.isLinux '' + mv ./out/${shortName}.so.0 $out/lib/ + ln -s $out/lib/${shortName}.so.0 $out/lib/${shortName}.so + '' + stdenv.lib.optionalString stdenv.isDarwin '' + mv ./out/${shortName}.A.dylib $out/lib/ + ln -s $out/lib/${shortName}.A.dylib $out/lib/${shortName}.dylib + '' + '' + cp $src/ui.h $out/include + cp $src/ui_${backend}.h $out/include - meta = with stdenv.lib; { - homepage = https://github.com/andlabs/libui; - description = "Simple and portable (but not inflexible) GUI library in C that uses the native GUI technologies of each platform it supports."; - license = licenses.mit; - platforms = platforms.unix; - }; - } + cp ${./libui.pc} $out/lib/pkgconfig/${shortName}.pc + substituteInPlace $out/lib/pkgconfig/${shortName}.pc \ + --subst-var-by out $out \ + --subst-var-by version "${version}" + ''; + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + install_name_tool -id $out/lib/${shortName}.A.dylib $out/lib/${shortName}.A.dylib + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/andlabs/libui; + description = "Simple and portable (but not inflexible) GUI library in C that uses the native GUI technologies of each platform it supports."; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index 66a840fa2a9e..4532285e53dc 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -10,7 +10,7 @@ , enableFfmpeg ? false, ffmpeg , enableGStreamer ? false, gst_all_1 , enableEigen ? true, eigen -, darwin +, cf-private, Cocoa, QTKit }: let @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ++ lib.optional enableFfmpeg ffmpeg ++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ]) ++ lib.optional enableEigen eigen - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Cocoa QTKit ]) + ++ lib.optionals stdenv.isDarwin [ Cocoa QTKit cf-private /* For NSDefaultRunLoopMode */ ] ; propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy; diff --git a/pkgs/development/node-packages/node-packages-v8.json b/pkgs/development/node-packages/node-packages-v8.json index 5e89c8e3e35b..3a259b20222d 100644 --- a/pkgs/development/node-packages/node-packages-v8.json +++ b/pkgs/development/node-packages/node-packages-v8.json @@ -68,6 +68,7 @@ , "less-plugin-clean-css" , "live-server" , "livedown" +, { "lumo-build-deps": "../interpreters/clojurescript/lumo" } , "madoko" , "mathjax" , "meat" diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix index 443c011c95d8..34060c1d8c4d 100644 --- a/pkgs/development/node-packages/node-packages-v8.nix +++ b/pkgs/development/node-packages/node-packages-v8.nix @@ -40,6 +40,15 @@ let sha512 = "OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA=="; }; }; + "@babel/core-7.1.5" = { + name = "_at_babel_slash_core"; + packageName = "@babel/core"; + version = "7.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/core/-/core-7.1.5.tgz"; + sha512 = "vOyH020C56tQvte++i+rX2yokZcRfbv/kKcw+/BCRw/cK6dvsr47aCzm8oC1XHwMSEWbqrZKzZRLzLnq6SFMsg=="; + }; + }; "@babel/generator-7.0.0-beta.38" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; @@ -49,13 +58,193 @@ let sha512 = "aOHQPhsEyaB6p2n+AK981+onHoc+Ork9rcAQVSUJR33wUkGiWRpu6/C685knRyIZVsKeSdG5Q4xMiYeFUhuLzA=="; }; }; - "@babel/generator-7.1.3" = { + "@babel/generator-7.1.5" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.1.3"; + version = "7.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.1.5.tgz"; + sha512 = "IO31r62xfMI+wBJVmgx0JR9ZOHty8HkoYpQAjRWUGG9vykBTlGHdArZ8zoFtpUu2gs17K7qTl/TtPpiSi6t+MA=="; + }; + }; + "@babel/helper-annotate-as-pure-7.0.0" = { + name = "_at_babel_slash_helper-annotate-as-pure"; + packageName = "@babel/helper-annotate-as-pure"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0.tgz"; + sha512 = "3UYcJUj9kvSLbLbUIfQTqzcy5VX7GRZ/CCDrnOaZorFFM01aXp1+GJwuFGV4NDDoAS+mOUyHcO6UD/RfqOks3Q=="; + }; + }; + "@babel/helper-builder-binary-assignment-operator-visitor-7.1.0" = { + name = "_at_babel_slash_helper-builder-binary-assignment-operator-visitor"; + packageName = "@babel/helper-builder-binary-assignment-operator-visitor"; + version = "7.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.1.0.tgz"; + sha512 = "qNSR4jrmJ8M1VMM9tibvyRAHXQs2PmaksQF7c1CGJNipfe3D8p+wgNwgso/P2A2r2mdgBWAXljNWR0QRZAMW8w=="; + }; + }; + "@babel/helper-call-delegate-7.1.0" = { + name = "_at_babel_slash_helper-call-delegate"; + packageName = "@babel/helper-call-delegate"; + version = "7.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.1.0.tgz"; + sha512 = "YEtYZrw3GUK6emQHKthltKNZwszBcHK58Ygcis+gVUrF4/FmTVr5CCqQNSfmvg2y+YDEANyYoaLz/SHsnusCwQ=="; + }; + }; + "@babel/helper-define-map-7.1.0" = { + name = "_at_babel_slash_helper-define-map"; + packageName = "@babel/helper-define-map"; + version = "7.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.1.0.tgz"; + sha512 = "yPPcW8dc3gZLN+U1mhYV91QU3n5uTbx7DUdf8NnPbjS0RMwBuHi9Xt2MUgppmNz7CJxTBWsGczTiEp1CSOTPRg=="; + }; + }; + "@babel/helper-explode-assignable-expression-7.1.0" = { + name = "_at_babel_slash_helper-explode-assignable-expression"; + packageName = "@babel/helper-explode-assignable-expression"; + version = "7.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.1.0.tgz"; + sha512 = "NRQpfHrJ1msCHtKjbzs9YcMmJZOg6mQMmGRB+hbamEdG5PNpaSm95275VD92DvJKuyl0s2sFiDmMZ+EnnvufqA=="; + }; + }; + "@babel/helper-function-name-7.1.0" = { + name = "_at_babel_slash_helper-function-name"; + packageName = "@babel/helper-function-name"; + version = "7.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz"; + sha512 = "A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw=="; + }; + }; + "@babel/helper-get-function-arity-7.0.0" = { + name = "_at_babel_slash_helper-get-function-arity"; + packageName = "@babel/helper-get-function-arity"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz"; + sha512 = "r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ=="; + }; + }; + "@babel/helper-hoist-variables-7.0.0" = { + name = "_at_babel_slash_helper-hoist-variables"; + packageName = "@babel/helper-hoist-variables"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.0.0.tgz"; + sha512 = "Ggv5sldXUeSKsuzLkddtyhyHe2YantsxWKNi7A+7LeD12ExRDWTRk29JCXpaHPAbMaIPZSil7n+lq78WY2VY7w=="; + }; + }; + "@babel/helper-member-expression-to-functions-7.0.0" = { + name = "_at_babel_slash_helper-member-expression-to-functions"; + packageName = "@babel/helper-member-expression-to-functions"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.0.0.tgz"; + sha512 = "avo+lm/QmZlv27Zsi0xEor2fKcqWG56D5ae9dzklpIaY7cQMK5N8VSpaNVPPagiqmy7LrEjK1IWdGMOqPu5csg=="; + }; + }; + "@babel/helper-module-imports-7.0.0" = { + name = "_at_babel_slash_helper-module-imports"; + packageName = "@babel/helper-module-imports"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.0.0.tgz"; + sha512 = "aP/hlLq01DWNEiDg4Jn23i+CXxW/owM4WpDLFUbpjxe4NS3BhLVZQ5i7E0ZrxuQ/vwekIeciyamgB1UIYxxM6A=="; + }; + }; + "@babel/helper-module-transforms-7.1.0" = { + name = "_at_babel_slash_helper-module-transforms"; + packageName = "@babel/helper-module-transforms"; + version = "7.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.1.0.tgz"; + sha512 = "0JZRd2yhawo79Rcm4w0LwSMILFmFXjugG3yqf+P/UsKsRS1mJCmMwwlHDlMg7Avr9LrvSpp4ZSULO9r8jpCzcw=="; + }; + }; + "@babel/helper-optimise-call-expression-7.0.0" = { + name = "_at_babel_slash_helper-optimise-call-expression"; + packageName = "@babel/helper-optimise-call-expression"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0.tgz"; + sha512 = "u8nd9NQePYNQV8iPWu/pLLYBqZBa4ZaY1YWRFMuxrid94wKI1QNt67NEZ7GAe5Kc/0LLScbim05xZFWkAdrj9g=="; + }; + }; + "@babel/helper-plugin-utils-7.0.0" = { + name = "_at_babel_slash_helper-plugin-utils"; + packageName = "@babel/helper-plugin-utils"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz"; + sha512 = "CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA=="; + }; + }; + "@babel/helper-regex-7.0.0" = { + name = "_at_babel_slash_helper-regex"; + packageName = "@babel/helper-regex"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.0.0.tgz"; + sha512 = "TR0/N0NDCcUIUEbqV6dCO+LptmmSQFQ7q70lfcEB4URsjD0E1HzicrwUH+ap6BAQ2jhCX9Q4UqZy4wilujWlkg=="; + }; + }; + "@babel/helper-remap-async-to-generator-7.1.0" = { + name = "_at_babel_slash_helper-remap-async-to-generator"; + packageName = "@babel/helper-remap-async-to-generator"; + version = "7.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.1.0.tgz"; + sha512 = "3fOK0L+Fdlg8S5al8u/hWE6vhufGSn0bN09xm2LXMy//REAF8kDCrYoOBKYmA8m5Nom+sV9LyLCwrFynA8/slg=="; + }; + }; + "@babel/helper-replace-supers-7.1.0" = { + name = "_at_babel_slash_helper-replace-supers"; + packageName = "@babel/helper-replace-supers"; + version = "7.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.1.0.tgz"; + sha512 = "BvcDWYZRWVuDeXTYZWxekQNO5D4kO55aArwZOTFXw6rlLQA8ZaDicJR1sO47h+HrnCiDFiww0fSPV0d713KBGQ=="; + }; + }; + "@babel/helper-simple-access-7.1.0" = { + name = "_at_babel_slash_helper-simple-access"; + packageName = "@babel/helper-simple-access"; + version = "7.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.1.0.tgz"; + sha512 = "Vk+78hNjRbsiu49zAPALxTb+JUQCz1aolpd8osOF16BGnLtseD21nbHgLPGUwrXEurZgiCOUmvs3ExTu4F5x6w=="; + }; + }; + "@babel/helper-split-export-declaration-7.0.0" = { + name = "_at_babel_slash_helper-split-export-declaration"; + packageName = "@babel/helper-split-export-declaration"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0.tgz"; + sha512 = "MXkOJqva62dfC0w85mEf/LucPPS/1+04nmmRMPEBUB++hiiThQ2zPtX/mEWQ3mtzCEjIJvPY8nuwxXtQeQwUag=="; + }; + }; + "@babel/helper-wrap-function-7.1.0" = { + name = "_at_babel_slash_helper-wrap-function"; + packageName = "@babel/helper-wrap-function"; + version = "7.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.1.0.tgz"; + sha512 = "R6HU3dete+rwsdAfrOzTlE9Mcpk4RjU3aX3gi9grtmugQY0u79X7eogUvfXA5sI81Mfq1cn6AgxihfN33STjJA=="; + }; + }; + "@babel/helpers-7.1.5" = { + name = "_at_babel_slash_helpers"; + packageName = "@babel/helpers"; + version = "7.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.1.3.tgz"; - sha512 = "ZoCZGcfIJFJuZBqxcY9OjC1KW2lWK64qrX1o4UYL3yshVhwKFYgzpWZ0vvtGMNJdTlvkw0W+HR1VnYN8q3QPFQ=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.1.5.tgz"; + sha512 = "2jkcdL02ywNBry1YNFAH/fViq4fXG0vdckHqeJk+75fpQ2OH+Az6076tX/M0835zA45E0Cqa6pV5Kiv9YOqjEg=="; }; }; "@babel/highlight-7.0.0" = { @@ -67,22 +256,427 @@ let sha512 = "UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw=="; }; }; - "@babel/parser-7.1.3" = { + "@babel/parser-7.1.5" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; + version = "7.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.1.5.tgz"; + sha512 = "WXKf5K5HT6X0kKiCOezJZFljsfxKV1FpU8Tf1A7ZpGvyd/Q4hlrJm2EwoH2onaUq3O4tLDp+4gk0hHPsMyxmOg=="; + }; + }; + "@babel/plugin-external-helpers-7.0.0" = { + name = "_at_babel_slash_plugin-external-helpers"; + packageName = "@babel/plugin-external-helpers"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-external-helpers/-/plugin-external-helpers-7.0.0.tgz"; + sha512 = "tZKTMdhZvTy0KCEX5EGQQm1RHr7jUa36q/yax1baEA0yZapVYmu10yW7LTqijITgSq416gPVjrcexiA6y4pJlA=="; + }; + }; + "@babel/plugin-proposal-async-generator-functions-7.1.0" = { + name = "_at_babel_slash_plugin-proposal-async-generator-functions"; + packageName = "@babel/plugin-proposal-async-generator-functions"; + version = "7.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.1.0.tgz"; + sha512 = "Fq803F3Jcxo20MXUSDdmZZXrPe6BWyGcWBPPNB/M7WaUYESKDeKMOGIxEzQOjGSmW/NWb6UaPZrtTB2ekhB/ew=="; + }; + }; + "@babel/plugin-proposal-class-properties-7.1.0" = { + name = "_at_babel_slash_plugin-proposal-class-properties"; + packageName = "@babel/plugin-proposal-class-properties"; + version = "7.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.1.0.tgz"; + sha512 = "/PCJWN+CKt5v1xcGn4vnuu13QDoV+P7NcICP44BoonAJoPSGwVkgrXihFIQGiEjjPlUDBIw1cM7wYFLARS2/hw=="; + }; + }; + "@babel/plugin-proposal-json-strings-7.0.0" = { + name = "_at_babel_slash_plugin-proposal-json-strings"; + packageName = "@babel/plugin-proposal-json-strings"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.0.0.tgz"; + sha512 = "kfVdUkIAGJIVmHmtS/40i/fg/AGnw/rsZBCaapY5yjeO5RA9m165Xbw9KMOu2nqXP5dTFjEjHdfNdoVcHv133Q=="; + }; + }; + "@babel/plugin-proposal-object-rest-spread-7.0.0" = { + name = "_at_babel_slash_plugin-proposal-object-rest-spread"; + packageName = "@babel/plugin-proposal-object-rest-spread"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.0.0.tgz"; + sha512 = "14fhfoPcNu7itSen7Py1iGN0gEm87hX/B+8nZPqkdmANyyYWYMY2pjA3r8WXbWVKMzfnSNS0xY8GVS0IjXi/iw=="; + }; + }; + "@babel/plugin-proposal-optional-catch-binding-7.0.0" = { + name = "_at_babel_slash_plugin-proposal-optional-catch-binding"; + packageName = "@babel/plugin-proposal-optional-catch-binding"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.0.0.tgz"; + sha512 = "JPqAvLG1s13B/AuoBjdBYvn38RqW6n1TzrQO839/sIpqLpbnXKacsAgpZHzLD83Sm8SDXMkkrAvEnJ25+0yIpw=="; + }; + }; + "@babel/plugin-proposal-unicode-property-regex-7.0.0" = { + name = "_at_babel_slash_plugin-proposal-unicode-property-regex"; + packageName = "@babel/plugin-proposal-unicode-property-regex"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.0.0.tgz"; + sha512 = "tM3icA6GhC3ch2SkmSxv7J/hCWKISzwycub6eGsDrFDgukD4dZ/I+x81XgW0YslS6mzNuQ1Cbzh5osjIMgepPQ=="; + }; + }; + "@babel/plugin-syntax-async-generators-7.0.0" = { + name = "_at_babel_slash_plugin-syntax-async-generators"; + packageName = "@babel/plugin-syntax-async-generators"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.0.0.tgz"; + sha512 = "im7ged00ddGKAjcZgewXmp1vxSZQQywuQXe2B1A7kajjZmDeY/ekMPmWr9zJgveSaQH0k7BcGrojQhcK06l0zA=="; + }; + }; + "@babel/plugin-syntax-class-properties-7.0.0" = { + name = "_at_babel_slash_plugin-syntax-class-properties"; + packageName = "@babel/plugin-syntax-class-properties"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.0.0.tgz"; + sha512 = "cR12g0Qzn4sgkjrbrzWy2GE7m9vMl/sFkqZ3gIpAQdrvPDnLM8180i+ANDFIXfjHo9aqp0ccJlQ0QNZcFUbf9w=="; + }; + }; + "@babel/plugin-syntax-json-strings-7.0.0" = { + name = "_at_babel_slash_plugin-syntax-json-strings"; + packageName = "@babel/plugin-syntax-json-strings"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.0.0.tgz"; + sha512 = "UlSfNydC+XLj4bw7ijpldc1uZ/HB84vw+U6BTuqMdIEmz/LDe63w/GHtpQMdXWdqQZFeAI9PjnHe/vDhwirhKA=="; + }; + }; + "@babel/plugin-syntax-object-rest-spread-7.0.0" = { + name = "_at_babel_slash_plugin-syntax-object-rest-spread"; + packageName = "@babel/plugin-syntax-object-rest-spread"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.0.0.tgz"; + sha512 = "5A0n4p6bIiVe5OvQPxBnesezsgFJdHhSs3uFSvaPdMqtsovajLZ+G2vZyvNe10EzJBWWo3AcHGKhAFUxqwp2dw=="; + }; + }; + "@babel/plugin-syntax-optional-catch-binding-7.0.0" = { + name = "_at_babel_slash_plugin-syntax-optional-catch-binding"; + packageName = "@babel/plugin-syntax-optional-catch-binding"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.0.0.tgz"; + sha512 = "Wc+HVvwjcq5qBg1w5RG9o9RVzmCaAg/Vp0erHCKpAYV8La6I94o4GQAmFYNmkzoMO6gzoOSulpKeSSz6mPEoZw=="; + }; + }; + "@babel/plugin-transform-arrow-functions-7.0.0" = { + name = "_at_babel_slash_plugin-transform-arrow-functions"; + packageName = "@babel/plugin-transform-arrow-functions"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.0.0.tgz"; + sha512 = "2EZDBl1WIO/q4DIkIp4s86sdp4ZifL51MoIviLY/gG/mLSuOIEg7J8o6mhbxOTvUJkaN50n+8u41FVsr5KLy/w=="; + }; + }; + "@babel/plugin-transform-async-to-generator-7.1.0" = { + name = "_at_babel_slash_plugin-transform-async-to-generator"; + packageName = "@babel/plugin-transform-async-to-generator"; + version = "7.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.1.0.tgz"; + sha512 = "rNmcmoQ78IrvNCIt/R9U+cixUHeYAzgusTFgIAv+wQb9HJU4szhpDD6e5GCACmj/JP5KxuCwM96bX3L9v4ZN/g=="; + }; + }; + "@babel/plugin-transform-block-scoped-functions-7.0.0" = { + name = "_at_babel_slash_plugin-transform-block-scoped-functions"; + packageName = "@babel/plugin-transform-block-scoped-functions"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.0.0.tgz"; + sha512 = "AOBiyUp7vYTqz2Jibe1UaAWL0Hl9JUXEgjFvvvcSc9MVDItv46ViXFw2F7SVt1B5k+KWjl44eeXOAk3UDEaJjQ=="; + }; + }; + "@babel/plugin-transform-block-scoping-7.1.5" = { + name = "_at_babel_slash_plugin-transform-block-scoping"; + packageName = "@babel/plugin-transform-block-scoping"; + version = "7.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.1.5.tgz"; + sha512 = "jlYcDrz+5ayWC7mxgpn1Wj8zj0mmjCT2w0mPIMSwO926eXBRxpEgoN/uQVRBfjtr8ayjcmS+xk2G1jaP8JjMJQ=="; + }; + }; + "@babel/plugin-transform-classes-7.1.0" = { + name = "_at_babel_slash_plugin-transform-classes"; + packageName = "@babel/plugin-transform-classes"; + version = "7.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.1.0.tgz"; + sha512 = "rNaqoD+4OCBZjM7VaskladgqnZ1LO6o2UxuWSDzljzW21pN1KXkB7BstAVweZdxQkHAujps5QMNOTWesBciKFg=="; + }; + }; + "@babel/plugin-transform-computed-properties-7.0.0" = { + name = "_at_babel_slash_plugin-transform-computed-properties"; + packageName = "@babel/plugin-transform-computed-properties"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.0.0.tgz"; + sha512 = "ubouZdChNAv4AAWAgU7QKbB93NU5sHwInEWfp+/OzJKA02E6Woh9RVoX4sZrbRwtybky/d7baTUqwFx+HgbvMA=="; + }; + }; + "@babel/plugin-transform-destructuring-7.1.3" = { + name = "_at_babel_slash_plugin-transform-destructuring"; + packageName = "@babel/plugin-transform-destructuring"; version = "7.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.1.3.tgz"; - sha512 = "gqmspPZOMW3MIRb9HlrnbZHXI1/KHTOroBwN1NcLL6pWxzqzEKGvRTq0W/PxS45OtQGbaFikSQpkS5zbnsQm2w=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.1.3.tgz"; + sha512 = "Mb9M4DGIOspH1ExHOUnn2UUXFOyVTiX84fXCd+6B5iWrQg/QMeeRmSwpZ9lnjYLSXtZwiw80ytVMr3zue0ucYw=="; + }; + }; + "@babel/plugin-transform-dotall-regex-7.0.0" = { + name = "_at_babel_slash_plugin-transform-dotall-regex"; + packageName = "@babel/plugin-transform-dotall-regex"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.0.0.tgz"; + sha512 = "00THs8eJxOJUFVx1w8i1MBF4XH4PsAjKjQ1eqN/uCH3YKwP21GCKfrn6YZFZswbOk9+0cw1zGQPHVc1KBlSxig=="; + }; + }; + "@babel/plugin-transform-duplicate-keys-7.0.0" = { + name = "_at_babel_slash_plugin-transform-duplicate-keys"; + packageName = "@babel/plugin-transform-duplicate-keys"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.0.0.tgz"; + sha512 = "w2vfPkMqRkdxx+C71ATLJG30PpwtTpW7DDdLqYt2acXU7YjztzeWW2Jk1T6hKqCLYCcEA5UQM/+xTAm+QCSnuQ=="; + }; + }; + "@babel/plugin-transform-exponentiation-operator-7.1.0" = { + name = "_at_babel_slash_plugin-transform-exponentiation-operator"; + packageName = "@babel/plugin-transform-exponentiation-operator"; + version = "7.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.1.0.tgz"; + sha512 = "uZt9kD1Pp/JubkukOGQml9tqAeI8NkE98oZnHZ2qHRElmeKCodbTZgOEUtujSCSLhHSBWbzNiFSDIMC4/RBTLQ=="; + }; + }; + "@babel/plugin-transform-for-of-7.0.0" = { + name = "_at_babel_slash_plugin-transform-for-of"; + packageName = "@babel/plugin-transform-for-of"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.0.0.tgz"; + sha512 = "TlxKecN20X2tt2UEr2LNE6aqA0oPeMT1Y3cgz8k4Dn1j5ObT8M3nl9aA37LLklx0PBZKETC9ZAf9n/6SujTuXA=="; + }; + }; + "@babel/plugin-transform-function-name-7.1.0" = { + name = "_at_babel_slash_plugin-transform-function-name"; + packageName = "@babel/plugin-transform-function-name"; + version = "7.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.1.0.tgz"; + sha512 = "VxOa1TMlFMtqPW2IDYZQaHsFrq/dDoIjgN098NowhexhZcz3UGlvPgZXuE1jEvNygyWyxRacqDpCZt+par1FNg=="; + }; + }; + "@babel/plugin-transform-literals-7.0.0" = { + name = "_at_babel_slash_plugin-transform-literals"; + packageName = "@babel/plugin-transform-literals"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.0.0.tgz"; + sha512 = "1NTDBWkeNXgpUcyoVFxbr9hS57EpZYXpje92zv0SUzjdu3enaRwF/l3cmyRnXLtIdyJASyiS6PtybK+CgKf7jA=="; + }; + }; + "@babel/plugin-transform-modules-amd-7.1.0" = { + name = "_at_babel_slash_plugin-transform-modules-amd"; + packageName = "@babel/plugin-transform-modules-amd"; + version = "7.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.1.0.tgz"; + sha512 = "wt8P+xQ85rrnGNr2x1iV3DW32W8zrB6ctuBkYBbf5/ZzJY99Ob4MFgsZDFgczNU76iy9PWsy4EuxOliDjdKw6A=="; + }; + }; + "@babel/plugin-transform-modules-commonjs-7.1.0" = { + name = "_at_babel_slash_plugin-transform-modules-commonjs"; + packageName = "@babel/plugin-transform-modules-commonjs"; + version = "7.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.1.0.tgz"; + sha512 = "wtNwtMjn1XGwM0AXPspQgvmE6msSJP15CX2RVfpTSTNPLhKhaOjaIfBaVfj4iUZ/VrFSodcFedwtPg/NxwQlPA=="; + }; + }; + "@babel/plugin-transform-modules-systemjs-7.1.3" = { + name = "_at_babel_slash_plugin-transform-modules-systemjs"; + packageName = "@babel/plugin-transform-modules-systemjs"; + version = "7.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.1.3.tgz"; + sha512 = "PvTxgjxQAq4pvVUZF3mD5gEtVDuId8NtWkJsZLEJZMZAW3TvgQl1pmydLLN1bM8huHFVVU43lf0uvjQj9FRkKw=="; + }; + }; + "@babel/plugin-transform-modules-umd-7.1.0" = { + name = "_at_babel_slash_plugin-transform-modules-umd"; + packageName = "@babel/plugin-transform-modules-umd"; + version = "7.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.1.0.tgz"; + sha512 = "enrRtn5TfRhMmbRwm7F8qOj0qEYByqUvTttPEGimcBH4CJHphjyK1Vg7sdU7JjeEmgSpM890IT/efS2nMHwYig=="; + }; + }; + "@babel/plugin-transform-new-target-7.0.0" = { + name = "_at_babel_slash_plugin-transform-new-target"; + packageName = "@babel/plugin-transform-new-target"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.0.0.tgz"; + sha512 = "yin069FYjah+LbqfGeTfzIBODex/e++Yfa0rH0fpfam9uTbuEeEOx5GLGr210ggOV77mVRNoeqSYqeuaqSzVSw=="; + }; + }; + "@babel/plugin-transform-object-super-7.1.0" = { + name = "_at_babel_slash_plugin-transform-object-super"; + packageName = "@babel/plugin-transform-object-super"; + version = "7.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.1.0.tgz"; + sha512 = "/O02Je1CRTSk2SSJaq0xjwQ8hG4zhZGNjE8psTsSNPXyLRCODv7/PBozqT5AmQMzp7MI3ndvMhGdqp9c96tTEw=="; + }; + }; + "@babel/plugin-transform-parameters-7.1.0" = { + name = "_at_babel_slash_plugin-transform-parameters"; + packageName = "@babel/plugin-transform-parameters"; + version = "7.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.1.0.tgz"; + sha512 = "vHV7oxkEJ8IHxTfRr3hNGzV446GAb+0hgbA7o/0Jd76s+YzccdWuTU296FOCOl/xweU4t/Ya4g41yWz80RFCRw=="; + }; + }; + "@babel/plugin-transform-regenerator-7.0.0" = { + name = "_at_babel_slash_plugin-transform-regenerator"; + packageName = "@babel/plugin-transform-regenerator"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.0.0.tgz"; + sha512 = "sj2qzsEx8KDVv1QuJc/dEfilkg3RRPvPYx/VnKLtItVQRWt1Wqf5eVCOLZm29CiGFfYYsA3VPjfizTCV0S0Dlw=="; + }; + }; + "@babel/plugin-transform-runtime-7.1.0" = { + name = "_at_babel_slash_plugin-transform-runtime"; + packageName = "@babel/plugin-transform-runtime"; + version = "7.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.1.0.tgz"; + sha512 = "WFLMgzu5DLQEah0lKTJzYb14vd6UiES7PTnXcvrPZ1VrwFeJ+mTbvr65fFAsXYMt2bIoOoC0jk76zY1S7HZjUg=="; + }; + }; + "@babel/plugin-transform-shorthand-properties-7.0.0" = { + name = "_at_babel_slash_plugin-transform-shorthand-properties"; + packageName = "@babel/plugin-transform-shorthand-properties"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.0.0.tgz"; + sha512 = "g/99LI4vm5iOf5r1Gdxq5Xmu91zvjhEG5+yZDJW268AZELAu4J1EiFLnkSG3yuUsZyOipVOVUKoGPYwfsTymhw=="; + }; + }; + "@babel/plugin-transform-spread-7.0.0" = { + name = "_at_babel_slash_plugin-transform-spread"; + packageName = "@babel/plugin-transform-spread"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.0.0.tgz"; + sha512 = "L702YFy2EvirrR4shTj0g2xQp7aNwZoWNCkNu2mcoU0uyzMl0XRwDSwzB/xp6DSUFiBmEXuyAyEN16LsgVqGGQ=="; }; }; - "@babel/runtime-corejs2-7.1.2" = { + "@babel/plugin-transform-sticky-regex-7.0.0" = { + name = "_at_babel_slash_plugin-transform-sticky-regex"; + packageName = "@babel/plugin-transform-sticky-regex"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.0.0.tgz"; + sha512 = "LFUToxiyS/WD+XEWpkx/XJBrUXKewSZpzX68s+yEOtIbdnsRjpryDw9U06gYc6klYEij/+KQVRnD3nz3AoKmjw=="; + }; + }; + "@babel/plugin-transform-template-literals-7.0.0" = { + name = "_at_babel_slash_plugin-transform-template-literals"; + packageName = "@babel/plugin-transform-template-literals"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.0.0.tgz"; + sha512 = "vA6rkTCabRZu7Nbl9DfLZE1imj4tzdWcg5vtdQGvj+OH9itNNB6hxuRMHuIY8SGnEt1T9g5foqs9LnrHzsqEFg=="; + }; + }; + "@babel/plugin-transform-typeof-symbol-7.0.0" = { + name = "_at_babel_slash_plugin-transform-typeof-symbol"; + packageName = "@babel/plugin-transform-typeof-symbol"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.0.0.tgz"; + sha512 = "1r1X5DO78WnaAIvs5uC48t41LLckxsYklJrZjNKcevyz83sF2l4RHbw29qrCPr/6ksFsdfRpT/ZgxNWHXRnffg=="; + }; + }; + "@babel/plugin-transform-unicode-regex-7.0.0" = { + name = "_at_babel_slash_plugin-transform-unicode-regex"; + packageName = "@babel/plugin-transform-unicode-regex"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.0.0.tgz"; + sha512 = "uJBrJhBOEa3D033P95nPHu3nbFwFE9ZgXsfEitzoIXIwqAZWk7uXcg06yFKXz9FSxBH5ucgU/cYdX0IV8ldHKw=="; + }; + }; + "@babel/polyfill-7.0.0" = { + name = "_at_babel_slash_polyfill"; + packageName = "@babel/polyfill"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.0.0.tgz"; + sha512 = "dnrMRkyyr74CRelJwvgnnSUDh2ge2NCTyHVwpOdvRMHtJUyxLtMAfhBN3s64pY41zdw0kgiLPh6S20eb1NcX6Q=="; + }; + }; + "@babel/preset-env-7.1.5" = { + name = "_at_babel_slash_preset-env"; + packageName = "@babel/preset-env"; + version = "7.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.1.5.tgz"; + sha512 = "pQ+2o0YyCp98XG0ODOHJd9z4GsSoV5jicSedRwCrU8uiqcJahwQiOq0asSZEb/m/lwyu6X5INvH/DSiwnQKncw=="; + }; + }; + "@babel/preset-stage-2-7.0.0" = { + name = "_at_babel_slash_preset-stage-2"; + packageName = "@babel/preset-stage-2"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/preset-stage-2/-/preset-stage-2-7.0.0.tgz"; + sha512 = "A8ia2Wus0OAP6hh28ZgPSCBJEX3Jnql3kg9di/I+Lmg1gbJXgDZBrHr/UGZXl20Vi1lXgMuUq8c8J899KFr5gA=="; + }; + }; + "@babel/register-7.0.0" = { + name = "_at_babel_slash_register"; + packageName = "@babel/register"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/register/-/register-7.0.0.tgz"; + sha512 = "f/+CRmaCe7rVEvcvPvxeA8j5aJhHC3aJie7YuqcMDhUOuyWLA7J/aNrTaHIzoWPEhpHA54mec4Mm8fv8KBlv3g=="; + }; + }; + "@babel/runtime-7.1.5" = { + name = "_at_babel_slash_runtime"; + packageName = "@babel/runtime"; + version = "7.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.1.5.tgz"; + sha512 = "xKnPpXG/pvK1B90JkwwxSGii90rQGKtzcMt2gI5G6+M0REXaq6rOHsGC2ay6/d0Uje7zzvSzjEzfR3ENhFlrfA=="; + }; + }; + "@babel/runtime-corejs2-7.1.5" = { name = "_at_babel_slash_runtime-corejs2"; packageName = "@babel/runtime-corejs2"; - version = "7.1.2"; + version = "7.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.1.2.tgz"; - sha512 = "drxaPByExlcRDKW4ZLubUO4ZkI8/8ax9k9wve1aEthdLKFzjB7XRkOQ0xoTIWGxqdDnWDElkjYq77bt7yrcYJQ=="; + url = "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.1.5.tgz"; + sha512 = "WsYRwQsFhVmxkAqwypPTZyV9GpkqMEaAr2zOItOmqSX2GBFaI+eq98CN81e13o0zaUKJOQGYyjhNVqj56nnkYg=="; }; }; "@babel/template-7.1.2" = { @@ -94,6 +688,15 @@ let sha512 = "SY1MmplssORfFiLDcOETrW7fCLl+PavlwMh92rrGcikQaRq4iWPVH0MpwPpY3etVMx6RnDjXtr6VZYr/IbP/Ag=="; }; }; + "@babel/traverse-7.1.5" = { + name = "_at_babel_slash_traverse"; + packageName = "@babel/traverse"; + version = "7.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.1.5.tgz"; + sha512 = "eU6XokWypl0MVJo+MTSPUtlfPePkrqsF26O+l1qFGlCKWwmiYAYy2Sy44Qw8m2u/LbPCsxYt90rghmqhYMGpPA=="; + }; + }; "@babel/types-7.0.0-beta.38" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; @@ -103,13 +706,22 @@ let sha512 = "SAtyEjmA7KiEoL2eAOAUM6M9arQJGWxJKK0S9x0WyPOosHS420RXoxPhn57u/8orRnK8Kxm0nHQQNTX203cP1Q=="; }; }; - "@babel/types-7.1.3" = { + "@babel/types-7.1.5" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.1.3"; + version = "7.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/types/-/types-7.1.5.tgz"; + sha512 = "sJeqa/d9eM/bax8Ivg+fXF7FpN3E/ZmTrWbkk6r+g7biVYfALMnLin4dKijsaqEhpd2xvOGfQTkQkD31YCVV4A=="; + }; + }; + "@calebboyd/semaphore-1.3.1" = { + name = "_at_calebboyd_slash_semaphore"; + packageName = "@calebboyd/semaphore"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.1.3.tgz"; - sha512 = "RpPOVfK+yatXyn8n4PB1NW6k9qjinrXrRR8ugBN8fD6hCy5RXI6PSbVqpOJBO9oSaY7Nom4ohj35feb0UR9hSA=="; + url = "https://registry.npmjs.org/@calebboyd/semaphore/-/semaphore-1.3.1.tgz"; + sha512 = "17z9me12RgAEcMhIgR7f+BiXKbzwF9p1VraI69OxrUUSWGuSMOyOTEHQNVtMKuVrkEDVD0/Av5uiGZPBMYZljw=="; }; }; "@cliqz-oss/firefox-client-0.3.1" = { @@ -130,6 +742,15 @@ let sha512 = "O/IyiB5pfztCdmxQZg0/xeq5w+YiP3gtJz8d4We2EpLPKzbDVjOrtfLKYgVfm6Ya6mbvDge1uLkSRwaoVCWKnA=="; }; }; + "@comandeer/babel-plugin-banner-4.0.0" = { + name = "_at_comandeer_slash_babel-plugin-banner"; + packageName = "@comandeer/babel-plugin-banner"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@comandeer/babel-plugin-banner/-/babel-plugin-banner-4.0.0.tgz"; + sha512 = "JhkNsBm8n4Z3rU1Sl2ivPX+Gd3dBcxLUdhLrn3Yok33uBGmoT0wNspXjOgToPxFqDAHHAWj83uj7MSLEJCLpxQ=="; + }; + }; "@commitlint/cli-7.2.1" = { name = "_at_commitlint_slash_cli"; packageName = "@commitlint/cli"; @@ -931,6 +1552,15 @@ let sha1 = "a777360b5b39a1a2e5106f8e858f2fd2d060c570"; }; }; + "@sindresorhus/is-0.12.0" = { + name = "_at_sindresorhus_slash_is"; + packageName = "@sindresorhus/is"; + version = "0.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@sindresorhus/is/-/is-0.12.0.tgz"; + sha512 = "9ve22cGrAKlSRvi8Vb2JIjzcaaQg79531yQHnF+hi/kOpsSj3Om8AyR1wcHrgl0u7U3vYQ7gmF5erZzOp4+51Q=="; + }; + }; "@sindresorhus/is-0.7.0" = { name = "_at_sindresorhus_slash_is"; packageName = "@sindresorhus/is"; @@ -940,6 +1570,15 @@ let sha512 = "ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow=="; }; }; + "@szmarczak/http-timer-1.1.1" = { + name = "_at_szmarczak_slash_http-timer"; + packageName = "@szmarczak/http-timer"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.1.tgz"; + sha512 = "WljfOGkmSJe8SUkl+4TPvN2ec0dpUGVyfTBQLoXJUiILs+wBSc4Kvp2N3aAWE4VwwDSLGdmD3/bufS5BgZpVSQ=="; + }; + }; "@types/accepts-1.3.5" = { name = "_at_types_slash_accepts"; packageName = "@types/accepts"; @@ -1012,6 +1651,15 @@ let sha512 = "ipZjBVsm2tF/n8qFGOuGBkUij9X9ZswVi9G3bx/6dz7POpVa6gVHcj1wsX/LVEn9MMF41fxK/PnZPPoTD1UFPw=="; }; }; + "@types/estree-0.0.39" = { + name = "_at_types_slash_estree"; + packageName = "@types/estree"; + version = "0.0.39"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz"; + sha512 = "EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw=="; + }; + }; "@types/events-1.2.0" = { name = "_at_types_slash_events"; packageName = "@types/events"; @@ -1057,13 +1705,13 @@ let sha512 = "A2TAGbTFdBw9azHbpVd+/FkdW2T6msN1uct1O9bH3vTerEHKZhTXJUQXy+hNq1B0RagfU8U+KBdqiZpxjhOUQA=="; }; }; - "@types/node-10.12.2" = { + "@types/node-10.12.5" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.12.2"; + version = "10.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.12.2.tgz"; - sha512 = "53ElVDSnZeFUUFIYzI8WLQ25IhWzb6vbddNp8UHlXQyU0ET2RhV5zg0NfubzU7iNMh5bBXb0htCzfvrSVNgzaQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.12.5.tgz"; + sha512 = "GzdHjq3t3eGLMv92Al90Iq+EoLL+86mPfQhuglbBFO7HiLdC/rkt+zrzJJumAiBF6nsrBWhou22rPW663AAyFw=="; }; }; "@types/node-8.10.37" = { @@ -1111,13 +1759,13 @@ let sha512 = "kdU8ydio1weSvhIIh9rptZ6MdMiR2NQGFnlnZ5qQ7OiQS1ej79zK4GaJ9qX3naSTpOA7iWqwUnZCQpd7SpD1NA=="; }; }; - "@types/ws-5.1.2" = { + "@types/ws-6.0.1" = { name = "_at_types_slash_ws"; packageName = "@types/ws"; - version = "5.1.2"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/ws/-/ws-5.1.2.tgz"; - sha512 = "NkTXUKTYdXdnPE2aUUbGOXE1XfMK527SCvU/9bj86kyFF6kZ9ZnOQ3mK5jADn98Y2vEUD/7wKDgZa7Qst2wYOg=="; + url = "https://registry.npmjs.org/@types/ws/-/ws-6.0.1.tgz"; + sha512 = "EzH8k1gyZ4xih/MaZTXwT2xOkPiIMSrhQ9b8wrlX88L0T02eYsddatQlwVFlEPyEqV0ChpdpNnE51QPH6NVT4Q=="; }; }; "@types/zen-observable-0.8.0" = { @@ -1561,6 +2209,15 @@ let sha512 = "3OOR92FTc2p5/EcOzPcXp+Cbo+3C15nV9RXHlOUBCBpHhcB+0frbSNR9ehED/o7sTcyGVtqGJpguToEdlXhD0w=="; }; }; + "ace.improved-0.2.1" = { + name = "ace.improved"; + packageName = "ace.improved"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ace.improved/-/ace.improved-0.2.1.tgz"; + sha1 = "4d74628fc431b09cdcaa1fb2b23d1ec83c5d2f32"; + }; + }; "acorn-1.2.2" = { name = "acorn"; packageName = "acorn"; @@ -1678,6 +2335,15 @@ let sha512 = "XkB50fn0MURDyww9+UYL3c1yLbOBz0ZFvrdYlGB8l+Ije1oSC75qAqrzSPjYQbdnQUzhlUGNKuesryAv0gxZOg=="; }; }; + "acorn-loose-6.0.0" = { + name = "acorn-loose"; + packageName = "acorn-loose"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn-loose/-/acorn-loose-6.0.0.tgz"; + sha512 = "gJff4bSdy882CwS6toeHixdBn9+IP8ojffjCW9hXnb2Ly7uVyAMaH2pLehtwS10wj2FIQ9Iw564MTDSsaQW9ng=="; + }; + }; "acorn-node-1.6.2" = { name = "acorn-node"; packageName = "acorn-node"; @@ -1741,13 +2407,13 @@ let sha1 = "f291be701a2efc567a63fc7aa6afcded31430be1"; }; }; - "addons-linter-1.3.1" = { + "addons-linter-1.3.8" = { name = "addons-linter"; packageName = "addons-linter"; - version = "1.3.1"; + version = "1.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/addons-linter/-/addons-linter-1.3.1.tgz"; - sha512 = "Oaj8q8hXWwGhrzlMTM7LUxj5ZUxi8k8/pg0V/NlA3usgClngl7jXW4GRlobdoOao8KEnW95y/WNNMeoTbxYe4w=="; + url = "https://registry.npmjs.org/addons-linter/-/addons-linter-1.3.8.tgz"; + sha512 = "NFon8Q++k8R6t1lunNPoVPWxVUzC8ED5Cu8VB66HdsaVarLHNhIdpDSqClplefC5Mypx/EEgZhkMZAuaxScyUg=="; }; }; "addr-to-ip-port-1.5.1" = { @@ -1903,15 +2569,6 @@ let sha1 = "73b5eeca3fab653e3d3f9422b341ad42205dc965"; }; }; - "ajv-6.5.2" = { - name = "ajv"; - packageName = "ajv"; - version = "6.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.5.2.tgz"; - sha512 = "hOs7GfvI6tUI1LfZddH82ky6mOMyTuY0mk7kE2pWpmhhUSkumzaTO5vbVwij39MdwPQWCV4Zv57Eo06NtL/GVA=="; - }; - }; "ajv-6.5.3" = { name = "ajv"; packageName = "ajv"; @@ -1984,13 +2641,13 @@ let sha1 = "0cd90a561093f35d0a99256c22b7069433fad117"; }; }; - "aligned-block-file-1.1.3" = { + "aligned-block-file-1.1.4" = { name = "aligned-block-file"; packageName = "aligned-block-file"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/aligned-block-file/-/aligned-block-file-1.1.3.tgz"; - sha512 = "ai/S+nZ9XMjC0ReZfq94OLGCICVBJyhNiKWmF1J+/GVZZaXtYV805plMi9obaWjfNl/QljB+VOsT+wQ7R858xA=="; + url = "https://registry.npmjs.org/aligned-block-file/-/aligned-block-file-1.1.4.tgz"; + sha512 = "KE27h781ueGONLqSBY2ik6LJRr9vo0L/i3GGhtQgJfCk0MO2QNSgrXZVCk2t7UeZKYTxcTfl+yBgcZWqBiAGPQ=="; }; }; "almond-0.3.3" = { @@ -2290,13 +2947,13 @@ let sha512 = "+Du0/4kUSuf5PjPx0+pvgMGV12ezbHA8/hubYuqRQoy/4AWb4faa61CgJNI6cKz2mhDd9m94VTNKTX11NntwkQ=="; }; }; - "apollo-cache-control-0.2.5" = { + "apollo-cache-control-0.3.0" = { name = "apollo-cache-control"; packageName = "apollo-cache-control"; - version = "0.2.5"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.2.5.tgz"; - sha512 = "xEDrUvo3U2mQKSzA8NzQmgeqK4ytwFnTGl2YKGKPfG0+r8fZdswKp6CDBue29KLO8KkSuqW/hntveWrAdK51FQ=="; + url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.3.0.tgz"; + sha512 = "XtkinmravL9/IEAPXzJod9fKx4iesS0TNBV/619xwurv8eopZkbAiKVZ3WB4rbjoGQpBgEs0bekWIAhYGWLyOw=="; }; }; "apollo-cache-inmemory-1.3.9" = { @@ -2326,31 +2983,31 @@ let sha512 = "jlxz/b5iinRWfh48hXdmMtrjTPn/rDok0Z3b7icvkiaD6I30w4sq9B+JDkFbLnkldzsFLV2BZtBDa/dkZhx8Ng=="; }; }; - "apollo-datasource-0.1.3" = { + "apollo-datasource-0.2.0" = { name = "apollo-datasource"; packageName = "apollo-datasource"; - version = "0.1.3"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-0.1.3.tgz"; - sha512 = "yEGEe5Cjzqqu5ml1VV3O8+C+thzdknZri9Ny0P3daTGNO+45J3vBOMcmaANeeI2+OOeWxdqUNa5aPOx/35kniw=="; + url = "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-0.2.0.tgz"; + sha512 = "WJM9Ix3uogIfAG7mjL1NZQM9+45rcikn4mPWhE1Iuyw2+Y857J3uKJqQgF5h9Fg64SlCJh9u5WL3N7N5mg1fVw=="; }; }; - "apollo-engine-reporting-0.0.6" = { + "apollo-engine-reporting-0.1.0" = { name = "apollo-engine-reporting"; packageName = "apollo-engine-reporting"; - version = "0.0.6"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-0.0.6.tgz"; - sha512 = "JmfNJ9v3QEJQ8ZhLfCKEDiww53n5kj5HarP85p8LreoYNojbvcWN8Qm6RgvSG5N/ZJrAYHeTRQbSxm1vWwGubw=="; + url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-0.1.0.tgz"; + sha512 = "OjG9MmNWRS3ZMSDc44Z6QMFQ66VDzs/E4H1yZELZ77BVrLsDx4i8Fft95byywACUpLvXhrCRtOdSZIwRPDq+cw=="; }; }; - "apollo-engine-reporting-protobuf-0.0.1" = { + "apollo-engine-reporting-protobuf-0.1.0" = { name = "apollo-engine-reporting-protobuf"; packageName = "apollo-engine-reporting-protobuf"; - version = "0.0.1"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.0.1.tgz"; - sha512 = "AySoDgog2p1Nph44FyyqaU4AfRZOXx8XZxRsVHvYY4dHlrMmDDhhjfF3Jswa7Wr8X/ivvx3xA0jimRn6rsG8Ew=="; + url = "https://registry.npmjs.org/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.1.0.tgz"; + sha512 = "GReJtAYTmpwg0drb9VgFtqObYYTCHkJhlHEYCeXY8bJV4fOgXsAZ7CIXR9nPKO0mBaoHIHaGYvXGcyCLrZ36VA=="; }; }; "apollo-link-1.2.3" = { @@ -2416,58 +3073,67 @@ let sha512 = "CtKwLE61bCJTW5jrucOMm5PubeAlCl/9i45pg4GKKlAbl0zR4i2dww8TJkYoIY6iCyj4qjKW/uqGD6v5/aVwhg=="; }; }; - "apollo-server-caching-0.1.2" = { + "apollo-server-caching-0.2.0" = { name = "apollo-server-caching"; packageName = "apollo-server-caching"; - version = "0.1.2"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-caching/-/apollo-server-caching-0.1.2.tgz"; - sha512 = "jBRnsTgXN0m8yVpumoelaUq9mXR7YpJ3EE+y/alI7zgXY+0qFDqksRApU8dEfg3q6qUnO7rFxRhdG5eyc0+1ig=="; + url = "https://registry.npmjs.org/apollo-server-caching/-/apollo-server-caching-0.2.0.tgz"; + sha512 = "/v7xWEcyyahs3hwX4baH/GekuHz3LRt9NoIYwg869G1eeqjuwY6NsowRIujZ100anJQwm9v5A9/sLtHBFvbgYg=="; }; }; - "apollo-server-core-2.1.0" = { + "apollo-server-core-2.2.0" = { name = "apollo-server-core"; packageName = "apollo-server-core"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.1.0.tgz"; - sha512 = "D1Tw0o3NzCQ2KGM8EWh9AHELHmn/SE361dtlqJxkbelxXqAkCIGIFywF30h+0ezhMbgbO7eqBBJfvRilF/oJHA=="; + url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.2.0.tgz"; + sha512 = "Pd9YpC/xSzpVOr6KM5bDHQdcI8jjKu3hb8x7eyevh/Q7eyrF+ClmfPZvY5EnG4ETIJsTS0+fU1dnoGMmyxCBKw=="; }; }; - "apollo-server-env-2.0.3" = { + "apollo-server-env-2.2.0" = { name = "apollo-server-env"; packageName = "apollo-server-env"; - version = "2.0.3"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-2.0.3.tgz"; - sha512 = "uIfKFH8n8xKO0eLb9Fa79+s2DdMuVethgznvW6SrOYq5VzgkIIobqKEuZPKa5wObw9CkCyju/+Sr7b7WWMFxUQ=="; + url = "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-2.2.0.tgz"; + sha512 = "wjJiI5nQWPBpNmpiLP389Ezpstp71szS6DHAeTgYLb/ulCw3CTuuA+0/E1bsThVWiQaDeHZE0sE3yI8q2zrYiA=="; }; }; - "apollo-server-errors-2.0.2" = { + "apollo-server-errors-2.2.0" = { name = "apollo-server-errors"; packageName = "apollo-server-errors"; - version = "2.0.2"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-errors/-/apollo-server-errors-2.0.2.tgz"; - sha512 = "zyWDqAVDCkj9espVsoUpZr9PwDznM8UW6fBfhV+i1br//s2AQb07N6ektZ9pRIEvkhykDZW+8tQbDwAO0vUROg=="; + url = "https://registry.npmjs.org/apollo-server-errors/-/apollo-server-errors-2.2.0.tgz"; + sha512 = "gV9EZG2tovFtT1cLuCTavnJu2DaKxnXPRNGSTo+SDI6IAk6cdzyW0Gje5N2+3LybI0Wq5KAbW6VLei31S4MWmg=="; }; }; - "apollo-server-express-2.1.0" = { + "apollo-server-express-2.2.0" = { name = "apollo-server-express"; packageName = "apollo-server-express"; - version = "2.1.0"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.2.0.tgz"; + sha512 = "E6WpImvCHKR9MHs64gTHhMrehk6/1NRE2+bblsHZg7ot8Iy6hVmzsCIzSmlPYh5uozpcyeRdC1pV0nwERtQKog=="; + }; + }; + "apollo-server-plugin-base-0.1.0" = { + name = "apollo-server-plugin-base"; + packageName = "apollo-server-plugin-base"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.1.0.tgz"; - sha512 = "jLFIz1VLduMA/rme4OAy3IPeoaMEZOPoQXpio8AhfjIqCijRPPfoWJ2QMqz56C/g3vas7rZtgcVOrHpjBKudjw=="; + url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.1.0.tgz"; + sha512 = "ptaVBjR+Q1swdzsh84tY5Qb0yyTMO/IOBsBJzCdxuAKs+PAVFw7ZMQoe5bT0DJjKJXHjtfMiTF77mRLLBq2dEw=="; }; }; - "apollo-tracing-0.2.5" = { + "apollo-tracing-0.3.0" = { name = "apollo-tracing"; packageName = "apollo-tracing"; - version = "0.2.5"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.2.5.tgz"; - sha512 = "DZO7pfL5LATHeJdVFoTZ/N3HwA+IMf1YnIt5K+uMQW+/MrRgYOtTszUv5tYX2cUIqHYHcbdDaBQUuIXwSpaV2Q=="; + url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.3.0.tgz"; + sha512 = "fkSpvzldDo1jBFap0d5lJYghEiH55eRVQzrC6vGvwr7rZNK5Moznwn9sBqy+4QsOaIp+wYc6pz/a+hwG4pasig=="; }; }; "apollo-upload-client-9.1.0" = { @@ -2488,6 +3154,15 @@ let sha512 = "AXvqkhni3Ir1ffm4SA1QzXn8k8I5BBl4PVKEyak734i4jFdp+xgfUyi2VCqF64TJlFTA/B73TRDUvO2D+tKtZg=="; }; }; + "app-builder-5.2.0" = { + name = "app-builder"; + packageName = "app-builder"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/app-builder/-/app-builder-5.2.0.tgz"; + sha512 = "RRj/vu8WhmMM71G9BxMLRvcwpr1QUJZ9NXURGGo1v3fPiauzkQfNi31kM7irRNqR87NV+lJ/qI62iTzcAc+V0Q=="; + }; + }; "append-0.1.1" = { name = "append"; packageName = "append"; @@ -2578,6 +3253,15 @@ let sha512 = "BLM56aPo9vLLFVa8+/+pJLnrZ7QGGTVHWsCwieAWT9o9K8UeGaQbzZbGoabWLOo2ksBCztoXdqBZBplqLDDCSg=="; }; }; + "archive-type-4.0.0" = { + name = "archive-type"; + packageName = "archive-type"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/archive-type/-/archive-type-4.0.0.tgz"; + sha1 = "f92e72233056dfc6969472749c267bdb046b1d70"; + }; + }; "archiver-2.1.1" = { name = "archiver"; packageName = "archiver"; @@ -3334,13 +4018,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.349.0" = { + "aws-sdk-2.353.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.349.0"; + version = "2.353.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.349.0.tgz"; - sha512 = "yGYCvXOKpvLfbhh1Vo+/2q+Z5bRdPlFpXX3kHBGz4haI6ZoLfFGuztap4en83zim/wpG1ZrhVJjd9u+i9l1ZEA=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.353.0.tgz"; + sha512 = "c5MwJhfcHwA2lC1Wq9csQvP9gz8dVGpZ64s5j9f/sWY6eZiDCQ6OWjxj+VJfpnCmfxyC/pdZO7JDGwems7dqIQ=="; }; }; "aws-sign-0.2.1" = { @@ -3397,31 +4081,31 @@ let sha1 = "56b558ba43b9cb5657662251dabe3cb34c16c56f"; }; }; - "azure-arm-batch-3.1.2" = { + "azure-arm-batch-3.2.0" = { name = "azure-arm-batch"; packageName = "azure-arm-batch"; - version = "3.1.2"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-batch/-/azure-arm-batch-3.1.2.tgz"; - sha512 = "4jAqSLNrQvdjq6/BmKSkvIUZj7gUpJnf/cOgxs/gbHNluOhIm19RRrD7yzeriGcx1fzIDZGQ7iPmF6kI9CW7xQ=="; + url = "https://registry.npmjs.org/azure-arm-batch/-/azure-arm-batch-3.2.0.tgz"; + sha512 = "DDfgAiRruGAiL8Yot5nufG3O8GLA0r5lf1CGYhuF8pEzQ+vYfhLpgJzme7LPh3ASPb8UBSVYHm1IK4W4StvVnw=="; }; }; - "azure-arm-cdn-4.0.2" = { + "azure-arm-cdn-4.1.0" = { name = "azure-arm-cdn"; packageName = "azure-arm-cdn"; - version = "4.0.2"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-cdn/-/azure-arm-cdn-4.0.2.tgz"; - sha512 = "qDxDfmBGpV4oDodfWo1BQmPs8ibOL55To+cu9OlhBGHbbzLIZclsHZucOElCtQHSKWuQMjhWRc+RF8eUSRqrxA=="; + url = "https://registry.npmjs.org/azure-arm-cdn/-/azure-arm-cdn-4.1.0.tgz"; + sha512 = "5xD2CkCx5ONn1vaGa4USAzv3LtCs0kmZCkdSNj98eQlQJLJQ7RPpIsNAXHGuHX4yN+EKHdaA2/hC/ynuQujNEQ=="; }; }; - "azure-arm-commerce-2.0.0" = { + "azure-arm-commerce-2.1.0" = { name = "azure-arm-commerce"; packageName = "azure-arm-commerce"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-commerce/-/azure-arm-commerce-2.0.0.tgz"; - sha512 = "scKBmo3nZXbzXtox+SoEYf8Ij+c2y1r47Ga0MVxm1kUTs1UT8KaAiAlC269KKDNYpuXXuV7+CKUs52VCiM06JQ=="; + url = "https://registry.npmjs.org/azure-arm-commerce/-/azure-arm-commerce-2.1.0.tgz"; + sha512 = "zhZ9b1Comp1Owa8/Pn7ORTL0l+uX9elz5A5yOoL/XdYXC8S6bN2QaiRLPmue9ZB55qGE1Tn7Cf+KRlpskL17hQ=="; }; }; "azure-arm-compute-3.0.0-preview" = { @@ -3519,7 +4203,7 @@ let packageName = "azure-arm-powerbiembedded"; version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-powerbiembedded/-/azure-arm-powerbiembedded-0.1.1.tgz"; + url = "http://registry.npmjs.org/azure-arm-powerbiembedded/-/azure-arm-powerbiembedded-0.1.1.tgz"; sha1 = "7103c94e06b3ddf628293f60e02fd0ba8f9c3ca9"; }; }; @@ -3528,7 +4212,7 @@ let packageName = "azure-arm-rediscache"; version = "0.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-rediscache/-/azure-arm-rediscache-0.2.3.tgz"; + url = "http://registry.npmjs.org/azure-arm-rediscache/-/azure-arm-rediscache-0.2.3.tgz"; sha1 = "b6898abe8b4c3e1b2ec5be82689ef212bc2b1a06"; }; }; @@ -3541,13 +4225,13 @@ let sha1 = "aa9a49fb9081a210f2f4cc6596ca4653b68306e6"; }; }; - "azure-arm-resource-7.0.1" = { + "azure-arm-resource-7.1.0" = { name = "azure-arm-resource"; packageName = "azure-arm-resource"; - version = "7.0.1"; + version = "7.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-resource/-/azure-arm-resource-7.0.1.tgz"; - sha512 = "vimPiR/xf6TFWNooIXZM6gRQV7Gdqs0y2wzNF+SNSMxPj3h8XEuSL/SyRZHNULY7sJseAx+0aGjWXbZxQo+kVw=="; + url = "https://registry.npmjs.org/azure-arm-resource/-/azure-arm-resource-7.1.0.tgz"; + sha512 = "EzLJJYn1Qzwjc/ukikdj9N89J4Y9MphVL2gTxt092jqAZND3ecLS4QTVPzpwxQkLZF/Jo+ZPPQozxEDWuCRAQQ=="; }; }; "azure-arm-servermanagement-1.1.0" = { @@ -3577,13 +4261,13 @@ let sha1 = "b46cfcf7f1690e4739864dcdb5c8de322e82ec50"; }; }; - "azure-arm-website-5.5.0" = { + "azure-arm-website-5.6.0" = { name = "azure-arm-website"; packageName = "azure-arm-website"; - version = "5.5.0"; + version = "5.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-website/-/azure-arm-website-5.5.0.tgz"; - sha512 = "fppYG7UtrFNtuMPlyIpWItC7D6pcU4Nhu0UAs9uew42jubQG+PTNRSCadGMuOlANCBEUVtAGMk4jfUU2UGhKTw=="; + url = "https://registry.npmjs.org/azure-arm-website/-/azure-arm-website-5.6.0.tgz"; + sha512 = "rG7SIGe5KFHmUW7V3Fia4mb7YSsnXWHYdXfCzpHXPBBxeY2gmpeyHXolrlpSFgvarsi5ucC+0B3iPiFxZZ53LA=="; }; }; "azure-asm-compute-0.18.0" = { @@ -3654,7 +4338,7 @@ let packageName = "azure-asm-subscription"; version = "0.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/azure-asm-subscription/-/azure-asm-subscription-0.10.1.tgz"; + url = "http://registry.npmjs.org/azure-asm-subscription/-/azure-asm-subscription-0.10.1.tgz"; sha1 = "917a5e87a04b69c0f5c29339fe910bb5e5e7a04c"; }; }; @@ -3730,13 +4414,13 @@ let sha512 = "6HNA8VuC5qYvQMjcQt2/zlB7oyAJ7n6KGIYGstS6KS9Orux0peqxlrGPDeQRa4jDNq6ili83KiGc7RhWcgsE4Q=="; }; }; - "azure-servicefabric-2.0.0" = { + "azure-servicefabric-2.1.0" = { name = "azure-servicefabric"; packageName = "azure-servicefabric"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-servicefabric/-/azure-servicefabric-2.0.0.tgz"; - sha512 = "SkMg4vVrQ7Vd7/h8h3qZzURQysV4KJqUIy4pjs/XRjVbCduSePlJ3EOgAl9ed739RWkT906xIAU3tu2Pf5RKFQ=="; + url = "https://registry.npmjs.org/azure-servicefabric/-/azure-servicefabric-2.1.0.tgz"; + sha512 = "A/9b+iHbOy1Ix7OFMmzhn7+TyYxgoe0nOXI/cQJTvP6neoP5J64F4P5r/LmxS1I6TDmSe+3jGlqdql9PawChNw=="; }; }; "azure-storage-2.10.2" = { @@ -3766,6 +4450,24 @@ let sha512 = "6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA=="; }; }; + "babel-core-7.0.0-bridge.0" = { + name = "babel-core"; + packageName = "babel-core"; + version = "7.0.0-bridge.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-core/-/babel-core-7.0.0-bridge.0.tgz"; + sha512 = "poPX9mZH/5CSanm50Q+1toVci6pv5KSRv/5TWCwtzQS5XEwn40BcCrgIeMFWP9CKKIniKXNxoIOnOq4VVlGXhg=="; + }; + }; + "babel-eslint-10.0.1" = { + name = "babel-eslint"; + packageName = "babel-eslint"; + version = "10.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.0.1.tgz"; + sha512 = "z7OT1iNV+TjOwHNLLyJk+HN+YVWX+CLE6fPD2SymJZOZQBs+QIexFjhm4keGTm8MW9xr4EC9Q0PbaLB24V5GoQ=="; + }; + }; "babel-generator-6.26.1" = { name = "babel-generator"; packageName = "babel-generator"; @@ -3784,6 +4486,69 @@ let sha1 = "39ff8313b75c8b65dceff1f31d383e0ff2a408a0"; }; }; + "babel-helper-evaluate-path-0.5.0" = { + name = "babel-helper-evaluate-path"; + packageName = "babel-helper-evaluate-path"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-helper-evaluate-path/-/babel-helper-evaluate-path-0.5.0.tgz"; + sha512 = "mUh0UhS607bGh5wUMAQfOpt2JX2ThXMtppHRdRU1kL7ZLRWIXxoV2UIV1r2cAeeNeU1M5SB5/RSUgUxrK8yOkA=="; + }; + }; + "babel-helper-flip-expressions-0.4.3" = { + name = "babel-helper-flip-expressions"; + packageName = "babel-helper-flip-expressions"; + version = "0.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-helper-flip-expressions/-/babel-helper-flip-expressions-0.4.3.tgz"; + sha1 = "3696736a128ac18bc25254b5f40a22ceb3c1d3fd"; + }; + }; + "babel-helper-is-nodes-equiv-0.0.1" = { + name = "babel-helper-is-nodes-equiv"; + packageName = "babel-helper-is-nodes-equiv"; + version = "0.0.1"; + src = fetchurl { + url = "http://registry.npmjs.org/babel-helper-is-nodes-equiv/-/babel-helper-is-nodes-equiv-0.0.1.tgz"; + sha1 = "34e9b300b1479ddd98ec77ea0bbe9342dfe39684"; + }; + }; + "babel-helper-is-void-0-0.4.3" = { + name = "babel-helper-is-void-0"; + packageName = "babel-helper-is-void-0"; + version = "0.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-helper-is-void-0/-/babel-helper-is-void-0-0.4.3.tgz"; + sha1 = "7d9c01b4561e7b95dbda0f6eee48f5b60e67313e"; + }; + }; + "babel-helper-mark-eval-scopes-0.4.3" = { + name = "babel-helper-mark-eval-scopes"; + packageName = "babel-helper-mark-eval-scopes"; + version = "0.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-helper-mark-eval-scopes/-/babel-helper-mark-eval-scopes-0.4.3.tgz"; + sha1 = "d244a3bef9844872603ffb46e22ce8acdf551562"; + }; + }; + "babel-helper-remove-or-void-0.4.3" = { + name = "babel-helper-remove-or-void"; + packageName = "babel-helper-remove-or-void"; + version = "0.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-helper-remove-or-void/-/babel-helper-remove-or-void-0.4.3.tgz"; + sha1 = "a4f03b40077a0ffe88e45d07010dee241ff5ae60"; + }; + }; + "babel-helper-to-multiple-sequence-expressions-0.5.0" = { + name = "babel-helper-to-multiple-sequence-expressions"; + packageName = "babel-helper-to-multiple-sequence-expressions"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-helper-to-multiple-sequence-expressions/-/babel-helper-to-multiple-sequence-expressions-0.5.0.tgz"; + sha512 = "m2CvfDW4+1qfDdsrtf4dwOslQC3yhbgyBFptncp4wvtdrDHqueW7slsYv4gArie056phvQFhT2nRcGS4bnm6mA=="; + }; + }; "babel-helpers-6.24.1" = { name = "babel-helpers"; packageName = "babel-helpers"; @@ -3793,6 +4558,24 @@ let sha1 = "3471de9caec388e5c850e597e58a26ddf37602b2"; }; }; + "babel-jest-23.6.0" = { + name = "babel-jest"; + packageName = "babel-jest"; + version = "23.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-jest/-/babel-jest-23.6.0.tgz"; + sha512 = "lqKGG6LYXYu+DQh/slrQ8nxXQkEkhugdXsU6St7GmhVS7Ilc/22ArwqXNJrf0QaOBjZB0360qZMwXqDYQHXaew=="; + }; + }; + "babel-loader-8.0.4" = { + name = "babel-loader"; + packageName = "babel-loader"; + version = "8.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-loader/-/babel-loader-8.0.4.tgz"; + sha512 = "fhBhNkUToJcW9nV46v8w87AJOwAJDz84c1CL57n3Stj73FANM/b9TbCUK4YhdOwEyZ+OxhYpdeZDNzSI29Firw=="; + }; + }; "babel-messages-6.23.0" = { name = "babel-messages"; packageName = "babel-messages"; @@ -3802,6 +4585,132 @@ let sha1 = "f3cdf4703858035b2a2951c6ec5edf6c62f2630e"; }; }; + "babel-plugin-istanbul-4.1.6" = { + name = "babel-plugin-istanbul"; + packageName = "babel-plugin-istanbul"; + version = "4.1.6"; + src = fetchurl { + url = "http://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.6.tgz"; + sha512 = "PWP9FQ1AhZhS01T/4qLSKoHGY/xvkZdVBGlKM/HuxxS3+sC66HhTNR7+MpbO/so/cz/wY94MeSWJuP1hXIPfwQ=="; + }; + }; + "babel-plugin-jest-hoist-23.2.0" = { + name = "babel-plugin-jest-hoist"; + packageName = "babel-plugin-jest-hoist"; + version = "23.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-23.2.0.tgz"; + sha1 = "e61fae05a1ca8801aadee57a6d66b8cefaf44167"; + }; + }; + "babel-plugin-minify-builtins-0.5.0" = { + name = "babel-plugin-minify-builtins"; + packageName = "babel-plugin-minify-builtins"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-minify-builtins/-/babel-plugin-minify-builtins-0.5.0.tgz"; + sha512 = "wpqbN7Ov5hsNwGdzuzvFcjgRlzbIeVv1gMIlICbPj0xkexnfoIDe7q+AZHMkQmAE/F9R5jkrB6TLfTegImlXag=="; + }; + }; + "babel-plugin-minify-constant-folding-0.5.0" = { + name = "babel-plugin-minify-constant-folding"; + packageName = "babel-plugin-minify-constant-folding"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-minify-constant-folding/-/babel-plugin-minify-constant-folding-0.5.0.tgz"; + sha512 = "Vj97CTn/lE9hR1D+jKUeHfNy+m1baNiJ1wJvoGyOBUx7F7kJqDZxr9nCHjO/Ad+irbR3HzR6jABpSSA29QsrXQ=="; + }; + }; + "babel-plugin-minify-dead-code-elimination-0.5.0" = { + name = "babel-plugin-minify-dead-code-elimination"; + packageName = "babel-plugin-minify-dead-code-elimination"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-minify-dead-code-elimination/-/babel-plugin-minify-dead-code-elimination-0.5.0.tgz"; + sha512 = "XQteBGXlgEoAKc/BhO6oafUdT4LBa7ARi55mxoyhLHNuA+RlzRmeMAfc31pb/UqU01wBzRc36YqHQzopnkd/6Q=="; + }; + }; + "babel-plugin-minify-flip-comparisons-0.4.3" = { + name = "babel-plugin-minify-flip-comparisons"; + packageName = "babel-plugin-minify-flip-comparisons"; + version = "0.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-minify-flip-comparisons/-/babel-plugin-minify-flip-comparisons-0.4.3.tgz"; + sha1 = "00ca870cb8f13b45c038b3c1ebc0f227293c965a"; + }; + }; + "babel-plugin-minify-guarded-expressions-0.4.3" = { + name = "babel-plugin-minify-guarded-expressions"; + packageName = "babel-plugin-minify-guarded-expressions"; + version = "0.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-minify-guarded-expressions/-/babel-plugin-minify-guarded-expressions-0.4.3.tgz"; + sha1 = "cc709b4453fd21b1f302877444c89f88427ce397"; + }; + }; + "babel-plugin-minify-infinity-0.4.3" = { + name = "babel-plugin-minify-infinity"; + packageName = "babel-plugin-minify-infinity"; + version = "0.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-minify-infinity/-/babel-plugin-minify-infinity-0.4.3.tgz"; + sha1 = "dfb876a1b08a06576384ef3f92e653ba607b39ca"; + }; + }; + "babel-plugin-minify-mangle-names-0.5.0" = { + name = "babel-plugin-minify-mangle-names"; + packageName = "babel-plugin-minify-mangle-names"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-minify-mangle-names/-/babel-plugin-minify-mangle-names-0.5.0.tgz"; + sha512 = "3jdNv6hCAw6fsX1p2wBGPfWuK69sfOjfd3zjUXkbq8McbohWy23tpXfy5RnToYWggvqzuMOwlId1PhyHOfgnGw=="; + }; + }; + "babel-plugin-minify-numeric-literals-0.4.3" = { + name = "babel-plugin-minify-numeric-literals"; + packageName = "babel-plugin-minify-numeric-literals"; + version = "0.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-minify-numeric-literals/-/babel-plugin-minify-numeric-literals-0.4.3.tgz"; + sha1 = "8e4fd561c79f7801286ff60e8c5fd9deee93c0bc"; + }; + }; + "babel-plugin-minify-replace-0.5.0" = { + name = "babel-plugin-minify-replace"; + packageName = "babel-plugin-minify-replace"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-minify-replace/-/babel-plugin-minify-replace-0.5.0.tgz"; + sha512 = "aXZiaqWDNUbyNNNpWs/8NyST+oU7QTpK7J9zFEFSA0eOmtUNMU3fczlTTTlnCxHmq/jYNFEmkkSG3DDBtW3Y4Q=="; + }; + }; + "babel-plugin-minify-simplify-0.5.0" = { + name = "babel-plugin-minify-simplify"; + packageName = "babel-plugin-minify-simplify"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-minify-simplify/-/babel-plugin-minify-simplify-0.5.0.tgz"; + sha512 = "TM01J/YcKZ8XIQd1Z3nF2AdWHoDsarjtZ5fWPDksYZNsoOjQ2UO2EWm824Ym6sp127m44gPlLFiO5KFxU8pA5Q=="; + }; + }; + "babel-plugin-minify-type-constructors-0.4.3" = { + name = "babel-plugin-minify-type-constructors"; + packageName = "babel-plugin-minify-type-constructors"; + version = "0.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-minify-type-constructors/-/babel-plugin-minify-type-constructors-0.4.3.tgz"; + sha1 = "1bc6f15b87f7ab1085d42b330b717657a2156500"; + }; + }; + "babel-plugin-syntax-flow-6.18.0" = { + name = "babel-plugin-syntax-flow"; + packageName = "babel-plugin-syntax-flow"; + version = "6.18.0"; + src = fetchurl { + url = "http://registry.npmjs.org/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz"; + sha1 = "4c3ab20a2af26aa20cd25995c398c4eb70310c8d"; + }; + }; "babel-plugin-syntax-jsx-6.18.0" = { name = "babel-plugin-syntax-jsx"; packageName = "babel-plugin-syntax-jsx"; @@ -3829,6 +4738,51 @@ let sha1 = "997bb1f1ab967f682d2b0876fe358d60e765c56d"; }; }; + "babel-plugin-transform-flow-strip-types-6.22.0" = { + name = "babel-plugin-transform-flow-strip-types"; + packageName = "babel-plugin-transform-flow-strip-types"; + version = "6.22.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-transform-flow-strip-types/-/babel-plugin-transform-flow-strip-types-6.22.0.tgz"; + sha1 = "84cb672935d43714fdc32bce84568d87441cf7cf"; + }; + }; + "babel-plugin-transform-inline-consecutive-adds-0.4.3" = { + name = "babel-plugin-transform-inline-consecutive-adds"; + packageName = "babel-plugin-transform-inline-consecutive-adds"; + version = "0.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-transform-inline-consecutive-adds/-/babel-plugin-transform-inline-consecutive-adds-0.4.3.tgz"; + sha1 = "323d47a3ea63a83a7ac3c811ae8e6941faf2b0d1"; + }; + }; + "babel-plugin-transform-member-expression-literals-6.9.4" = { + name = "babel-plugin-transform-member-expression-literals"; + packageName = "babel-plugin-transform-member-expression-literals"; + version = "6.9.4"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-transform-member-expression-literals/-/babel-plugin-transform-member-expression-literals-6.9.4.tgz"; + sha1 = "37039c9a0c3313a39495faac2ff3a6b5b9d038bf"; + }; + }; + "babel-plugin-transform-merge-sibling-variables-6.9.4" = { + name = "babel-plugin-transform-merge-sibling-variables"; + packageName = "babel-plugin-transform-merge-sibling-variables"; + version = "6.9.4"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-transform-merge-sibling-variables/-/babel-plugin-transform-merge-sibling-variables-6.9.4.tgz"; + sha1 = "85b422fc3377b449c9d1cde44087203532401dae"; + }; + }; + "babel-plugin-transform-minify-booleans-6.9.4" = { + name = "babel-plugin-transform-minify-booleans"; + packageName = "babel-plugin-transform-minify-booleans"; + version = "6.9.4"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-transform-minify-booleans/-/babel-plugin-transform-minify-booleans-6.9.4.tgz"; + sha1 = "acbb3e56a3555dd23928e4b582d285162dd2b198"; + }; + }; "babel-plugin-transform-object-rest-spread-6.26.0" = { name = "babel-plugin-transform-object-rest-spread"; packageName = "babel-plugin-transform-object-rest-spread"; @@ -3838,6 +4792,15 @@ let sha1 = "0f36692d50fef6b7e2d4b3ac1478137a963b7b06"; }; }; + "babel-plugin-transform-property-literals-6.9.4" = { + name = "babel-plugin-transform-property-literals"; + packageName = "babel-plugin-transform-property-literals"; + version = "6.9.4"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-transform-property-literals/-/babel-plugin-transform-property-literals-6.9.4.tgz"; + sha1 = "98c1d21e255736573f93ece54459f6ce24985d39"; + }; + }; "babel-plugin-transform-react-jsx-6.24.1" = { name = "babel-plugin-transform-react-jsx"; packageName = "babel-plugin-transform-react-jsx"; @@ -3847,6 +4810,60 @@ let sha1 = "840a028e7df460dfc3a2d29f0c0d91f6376e66a3"; }; }; + "babel-plugin-transform-regexp-constructors-0.4.3" = { + name = "babel-plugin-transform-regexp-constructors"; + packageName = "babel-plugin-transform-regexp-constructors"; + version = "0.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-transform-regexp-constructors/-/babel-plugin-transform-regexp-constructors-0.4.3.tgz"; + sha1 = "58b7775b63afcf33328fae9a5f88fbd4fb0b4965"; + }; + }; + "babel-plugin-transform-remove-console-6.9.4" = { + name = "babel-plugin-transform-remove-console"; + packageName = "babel-plugin-transform-remove-console"; + version = "6.9.4"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-transform-remove-console/-/babel-plugin-transform-remove-console-6.9.4.tgz"; + sha1 = "b980360c067384e24b357a588d807d3c83527780"; + }; + }; + "babel-plugin-transform-remove-debugger-6.9.4" = { + name = "babel-plugin-transform-remove-debugger"; + packageName = "babel-plugin-transform-remove-debugger"; + version = "6.9.4"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-transform-remove-debugger/-/babel-plugin-transform-remove-debugger-6.9.4.tgz"; + sha1 = "42b727631c97978e1eb2d199a7aec84a18339ef2"; + }; + }; + "babel-plugin-transform-remove-undefined-0.5.0" = { + name = "babel-plugin-transform-remove-undefined"; + packageName = "babel-plugin-transform-remove-undefined"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-transform-remove-undefined/-/babel-plugin-transform-remove-undefined-0.5.0.tgz"; + sha512 = "+M7fJYFaEE/M9CXa0/IRkDbiV3wRELzA1kKQFCJ4ifhrzLKn/9VCCgj9OFmYWwBd8IB48YdgPkHYtbYq+4vtHQ=="; + }; + }; + "babel-plugin-transform-simplify-comparison-operators-6.9.4" = { + name = "babel-plugin-transform-simplify-comparison-operators"; + packageName = "babel-plugin-transform-simplify-comparison-operators"; + version = "6.9.4"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-transform-simplify-comparison-operators/-/babel-plugin-transform-simplify-comparison-operators-6.9.4.tgz"; + sha1 = "f62afe096cab0e1f68a2d753fdf283888471ceb9"; + }; + }; + "babel-plugin-transform-undefined-to-void-6.9.4" = { + name = "babel-plugin-transform-undefined-to-void"; + packageName = "babel-plugin-transform-undefined-to-void"; + version = "6.9.4"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-transform-undefined-to-void/-/babel-plugin-transform-undefined-to-void-6.9.4.tgz"; + sha1 = "be241ca81404030678b748717322b89d0c8fe280"; + }; + }; "babel-polyfill-6.16.0" = { name = "babel-polyfill"; packageName = "babel-polyfill"; @@ -3865,6 +4882,24 @@ let sha1 = "379937abc67d7895970adc621f284cd966cf2153"; }; }; + "babel-preset-jest-23.2.0" = { + name = "babel-preset-jest"; + packageName = "babel-preset-jest"; + version = "23.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-23.2.0.tgz"; + sha1 = "8ec7a03a138f001a1a8fb1e8113652bf1a55da46"; + }; + }; + "babel-preset-minify-0.5.0" = { + name = "babel-preset-minify"; + packageName = "babel-preset-minify"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-preset-minify/-/babel-preset-minify-0.5.0.tgz"; + sha512 = "xj1s9Mon+RFubH569vrGCayA9Fm2GMsCgDRm1Jb8SgctOB7KFcrVc2o8K3YHUyMz+SWP8aea75BoS8YfsXXuiA=="; + }; + }; "babel-register-6.26.0" = { name = "babel-register"; packageName = "babel-register"; @@ -4302,7 +5337,7 @@ let packageName = "bin-version"; version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/bin-version/-/bin-version-2.0.0.tgz"; + url = "http://registry.npmjs.org/bin-version/-/bin-version-2.0.0.tgz"; sha1 = "2cc95d83b522bdef2e99978e76aeb5491c8114ff"; }; }; @@ -4311,7 +5346,7 @@ let packageName = "bin-version-check"; version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/bin-version-check/-/bin-version-check-3.0.0.tgz"; + url = "http://registry.npmjs.org/bin-version-check/-/bin-version-check-3.0.0.tgz"; sha1 = "e24ebfa6b63cb0387c5fc174f86e5cc812ca7cc9"; }; }; @@ -4612,13 +5647,13 @@ let sha1 = "f72d760be09b7f76d08ed8fae98b289a8d05fab3"; }; }; - "bluebird-3.5.2" = { + "bluebird-3.5.3" = { name = "bluebird"; packageName = "bluebird"; - version = "3.5.2"; + version = "3.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.2.tgz"; - sha512 = "dhHTWMI7kMx5whMQntl7Vr9C6BvV10lFXDAasnqnrMYhXVCzzk6IO9Fo2L75jXHT07WrOngL1WDXOp+yYS91Yg=="; + url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.3.tgz"; + sha512 = "/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw=="; }; }; "blueimp-md5-2.10.0" = { @@ -5053,6 +6088,15 @@ let sha512 = "Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA=="; }; }; + "browserslist-4.3.4" = { + name = "browserslist"; + packageName = "browserslist"; + version = "4.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.3.4.tgz"; + sha512 = "u5iz+ijIMUlmV8blX82VGFrB9ecnUg5qEt55CMZ/YJEhha+d8qpBfOFuutJ6F/VKRXjZoD33b6uvarpPxcl3RA=="; + }; + }; "bson-0.1.8" = { name = "bson"; packageName = "bson"; @@ -5215,6 +6259,15 @@ let sha1 = "a9fb806ce8145d5428510ce72f278bb363a638bf"; }; }; + "buffer-queue-1.0.0" = { + name = "buffer-queue"; + packageName = "buffer-queue"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-queue/-/buffer-queue-1.0.0.tgz"; + sha1 = "3d253fe2f0ab70e851d728712e8cd6f914a8c002"; + }; + }; "buffer-xor-1.0.3" = { name = "buffer-xor"; packageName = "buffer-xor"; @@ -5305,6 +6358,15 @@ let sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f"; }; }; + "builtin-modules-2.0.0" = { + name = "builtin-modules"; + packageName = "builtin-modules"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/builtin-modules/-/builtin-modules-2.0.0.tgz"; + sha512 = "3U5kUA5VPsRUA3nofm/BXX7GVHKfxz0hOBAPxXrIvHzlDRkQVqEn6yi8QJegxl4LzOHLdvb7XF5dVawa/VVYBg=="; + }; + }; "builtin-status-codes-3.0.0" = { name = "builtin-status-codes"; packageName = "builtin-status-codes"; @@ -5512,13 +6574,22 @@ let sha1 = "0d808801b6342ad33c91df9d0b44dc09b91e5c3d"; }; }; - "cached-path-relative-1.0.1" = { + "cacheable-request-5.1.0" = { + name = "cacheable-request"; + packageName = "cacheable-request"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cacheable-request/-/cacheable-request-5.1.0.tgz"; + sha512 = "UCdjX4N/QjymZGpKY7hW4VJsxsVJM+drIiCxPa9aTvFQN5sL2+kJCYyeys8f2W0dJ0sU6Et54Ovl0sAmCpHHsA=="; + }; + }; + "cached-path-relative-1.0.2" = { name = "cached-path-relative"; packageName = "cached-path-relative"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.0.1.tgz"; - sha1 = "d09c4b52800aa4c078e2dd81a869aac90d2e54e7"; + url = "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.0.2.tgz"; + sha512 = "5r2GqsoEb4qMTTN9J+WzXfjov+hjxT+j3u5K+kIVNIwAd99DLCJE9pBIMP1qVeybV6JiijL385Oz0DcYxfbOIg=="; }; }; "call-me-maybe-1.0.1" = { @@ -5656,6 +6727,15 @@ let sha1 = "d545635be1e33c542649c69173e5de6acfae34dd"; }; }; + "camelcase-5.0.0" = { + name = "camelcase"; + packageName = "camelcase"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-5.0.0.tgz"; + sha512 = "faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA=="; + }; + }; "camelcase-keys-2.1.0" = { name = "camelcase-keys"; packageName = "camelcase-keys"; @@ -5674,6 +6754,15 @@ let sha1 = "a2aa5fb1af688758259c32c141426d78923b9b77"; }; }; + "caniuse-lite-1.0.30000907" = { + name = "caniuse-lite"; + packageName = "caniuse-lite"; + version = "1.0.30000907"; + src = fetchurl { + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000907.tgz"; + sha512 = "No5sQ/OB2Nmka8MNOOM6nJx+Hxt6MQ6h7t7kgJFu9oTuwjykyKRSBP/+i/QAyFHxeHB+ddE0Da1CG5ihx9oehQ=="; + }; + }; "capture-stack-trace-1.0.1" = { name = "capture-stack-trace"; packageName = "capture-stack-trace"; @@ -5998,6 +7087,15 @@ let sha1 = "4b9f53a81b27e4d5dac31c0ffd0cfa03cc6830db"; }; }; + "cherow-1.6.8" = { + name = "cherow"; + packageName = "cherow"; + version = "1.6.8"; + src = fetchurl { + url = "https://registry.npmjs.org/cherow/-/cherow-1.6.8.tgz"; + sha512 = "if2GIw3fjE/KnFD5tddg4YJn2zveJ7PU7VcTrVHvsAdqJClB5555AsSti53XHjUyaOEiqq9x3/lZZVJ8s+VPkA=="; + }; + }; "chloride-2.2.10" = { name = "chloride"; packageName = "chloride"; @@ -6741,7 +7839,7 @@ let packageName = "colors"; version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/colors/-/colors-0.5.1.tgz"; + url = "http://registry.npmjs.org/colors/-/colors-0.5.1.tgz"; sha1 = "7d0023eaeb154e8ee9fce75dcb923d0ed1667774"; }; }; @@ -6750,7 +7848,7 @@ let packageName = "colors"; version = "0.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz"; + url = "http://registry.npmjs.org/colors/-/colors-0.6.2.tgz"; sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc"; }; }; @@ -6759,7 +7857,7 @@ let packageName = "colors"; version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz"; + url = "http://registry.npmjs.org/colors/-/colors-1.0.3.tgz"; sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b"; }; }; @@ -6768,7 +7866,7 @@ let packageName = "colors"; version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz"; + url = "http://registry.npmjs.org/colors/-/colors-1.1.2.tgz"; sha1 = "168a4701756b6a7f51a12ce0c97bfa28c084ed63"; }; }; @@ -8006,13 +9104,13 @@ let sha512 = "6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ=="; }; }; - "cosmiconfig-5.0.6" = { + "cosmiconfig-5.0.7" = { name = "cosmiconfig"; packageName = "cosmiconfig"; - version = "5.0.6"; + version = "5.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.0.6.tgz"; - sha512 = "6DWfizHriCrFWURP1/qyhsiFvYdlJzbCzmtFWh744+KyWsJo5+kPzUZZaMRSSItoYc0pxFX7gEO7ZC1/gN/7AQ=="; + url = "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.0.7.tgz"; + sha512 = "PcLqxTKiDmNT6pSpy4N6KtuPwb53W+2tzNvwOZw0WH9N6O0vLIBq0x8aj8Oj75ere4YcGi48bDFCL+3fRJdlNA=="; }; }; "couch-login-0.1.20" = { @@ -8141,6 +9239,15 @@ let sha512 = "j7zMFLrcSta53xqOvETUt8ge+PM14GtF47gEGJJeVlM6qP24/eWHSgtiWiEiKBR2sHS8xZaBQZq4D7vFXg8dcQ=="; }; }; + "cross-env-5.2.0" = { + name = "cross-env"; + packageName = "cross-env"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz"; + sha512 = "jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg=="; + }; + }; "cross-fetch-2.2.2" = { name = "cross-fetch"; packageName = "cross-fetch"; @@ -8843,6 +9950,15 @@ let sha512 = "jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q=="; }; }; + "death-1.1.0" = { + name = "death"; + packageName = "death"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/death/-/death-1.1.0.tgz"; + sha1 = "01aa9c401edd92750514470b8266390c66c67318"; + }; + }; "debounce-1.1.0" = { name = "debounce"; packageName = "debounce"; @@ -9185,15 +10301,6 @@ let sha512 = "Q89Z26KAfA3lpPGhbF6XMfYAm3jIV3avViy6KOJ2JLzFbeWHOvPQUu5aSJIWXap3gDZC2y1eF5HXEPI2wGqgvw=="; }; }; - "deepmerge-2.1.1" = { - name = "deepmerge"; - packageName = "deepmerge"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/deepmerge/-/deepmerge-2.1.1.tgz"; - sha512 = "urQxA1smbLZ2cBbXbaYObM1dJ82aJ2H57A1C/Kklfh/ZN1bgH4G/n5KWhdNfOK11W98gqZfyYj7W4frJJRwA2w=="; - }; - }; "deepmerge-2.2.1" = { name = "deepmerge"; packageName = "deepmerge"; @@ -9239,6 +10346,15 @@ let sha1 = "c656051e9817d9ff08ed881477f3fe4019f3ef7d"; }; }; + "defer-to-connect-1.0.1" = { + name = "defer-to-connect"; + packageName = "defer-to-connect"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.0.1.tgz"; + sha512 = "2e0FJesseUqQj671gvZWfUyxpnFx/5n4xleamlpCD3U6Fm5dh5qzmmLNxNhtmHF06+SYVHH8QU6FACffYTnj0Q=="; + }; + }; "deferred-leveldown-0.2.0" = { name = "deferred-leveldown"; packageName = "deferred-leveldown"; @@ -9329,13 +10445,13 @@ let sha1 = "fcf490a37ece266464d9cc431ab98c5819ced095"; }; }; - "del-2.2.2" = { + "del-3.0.0" = { name = "del"; packageName = "del"; - version = "2.2.2"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/del/-/del-2.2.2.tgz"; - sha1 = "c12c981d067846c84bcaf862cff930d907ffd1a8"; + url = "https://registry.npmjs.org/del/-/del-3.0.0.tgz"; + sha1 = "53ecf699ffcbcb39637691ab13baf160819766e5"; }; }; "delayed-stream-0.0.5" = { @@ -9707,13 +10823,13 @@ let sha1 = "57ddacb47324ae5f58d2cc0da886db4ce9eeb718"; }; }; - "dispensary-0.22.0" = { + "dispensary-0.26.0" = { name = "dispensary"; packageName = "dispensary"; - version = "0.22.0"; + version = "0.26.0"; src = fetchurl { - url = "https://registry.npmjs.org/dispensary/-/dispensary-0.22.0.tgz"; - sha512 = "iwpIOQ4T+fJ55PAPE4G7b8MubUN8dGyZa78VrD6A+XqSnqs844npoGvpwSEETnn064JaaS4gqLcgAfTGR4p2+g=="; + url = "https://registry.npmjs.org/dispensary/-/dispensary-0.26.0.tgz"; + sha512 = "Cw0N6Hf8/y4vH9/NvDPGLd2+Mve9xs+41+sULJ4ODHuhZ+9CnJ2eMl2ju2udL/UACY0Vcxw3TzyoDRBNaU/0DQ=="; }; }; "diveSync-0.3.0" = { @@ -10058,6 +11174,15 @@ let sha1 = "63537f977f99266a30eb8a2a2fbd1f20b8000f7a"; }; }; + "download-7.1.0" = { + name = "download"; + packageName = "download"; + version = "7.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/download/-/download-7.1.0.tgz"; + sha512 = "xqnBTVd/E+GxJVrX5/eUJiLYjCGPwMpdL+jGhGU57BvtcA7wwhtHVbXBeUk51kOpW3S7Jn3BQbN9Q1R1Km2qDQ=="; + }; + }; "download-git-repo-1.1.0" = { name = "download-git-repo"; packageName = "download-git-repo"; @@ -10319,6 +11444,15 @@ let sha512 = "0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ=="; }; }; + "electron-to-chromium-1.3.84" = { + name = "electron-to-chromium"; + packageName = "electron-to-chromium"; + version = "1.3.84"; + src = fetchurl { + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.84.tgz"; + sha512 = "IYhbzJYOopiTaNWMBp7RjbecUBsbnbDneOP86f3qvS0G0xfzwNSvMJpTrvi5/Y1gU7tg2NAgeg8a8rCYvW9Whw=="; + }; + }; "elegant-spinner-1.0.1" = { name = "elegant-spinner"; packageName = "elegant-spinner"; @@ -10541,7 +11675,7 @@ let packageName = "engine.io-client"; version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.3.1.tgz"; + url = "http://registry.npmjs.org/engine.io-client/-/engine.io-client-1.3.1.tgz"; sha1 = "1c5a65d5c5af6d04b44c22c3dbcd95c39ed1c989"; }; }; @@ -10559,7 +11693,7 @@ let packageName = "engine.io-client"; version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.2.1.tgz"; + url = "http://registry.npmjs.org/engine.io-client/-/engine.io-client-3.2.1.tgz"; sha512 = "y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw=="; }; }; @@ -11013,13 +12147,13 @@ let sha512 = "D5nG2rErquLUstgUaxJlWB5+gu+U/3VDY0fk/Iuq8y9CUFy/7Y6oF4N2cR1tV8knzQvciIbfqfohd359xTLIKQ=="; }; }; - "eslint-5.8.0" = { + "eslint-5.9.0" = { name = "eslint"; packageName = "eslint"; - version = "5.8.0"; + version = "5.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-5.8.0.tgz"; - sha512 = "Zok6Bru3y2JprqTNm14mgQ15YQu/SMDkWdnmHfFg770DIUlmMFd/gqqzCHekxzjHZJxXv3tmTpH0C1icaYJsRQ=="; + url = "https://registry.npmjs.org/eslint/-/eslint-5.9.0.tgz"; + sha512 = "g4KWpPdqN0nth+goDNICNXGfJF7nNnepthp46CAlJoJtC5K/cLu3NgCM3AHu1CkJ5Hzt9V0Y0PBAO6Ay/gGb+w=="; }; }; "eslint-plugin-no-unsafe-innerhtml-1.0.16" = { @@ -11031,6 +12165,15 @@ let sha1 = "7d02878c8e9bf7916b88836d5ac122b42f151932"; }; }; + "eslint-scope-3.7.1" = { + name = "eslint-scope"; + packageName = "eslint-scope"; + version = "3.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.1.tgz"; + sha1 = "3d63c3edfda02e06e01a452ad88caacc7cdcb6e8"; + }; + }; "eslint-scope-4.0.0" = { name = "eslint-scope"; packageName = "eslint-scope"; @@ -11175,6 +12318,15 @@ let sha1 = "0dee3fed31fcd469618ce7342099fc1afa0bdb13"; }; }; + "estree-walker-0.5.2" = { + name = "estree-walker"; + packageName = "estree-walker"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/estree-walker/-/estree-walker-0.5.2.tgz"; + sha512 = "XpCnW/AE10ws/kDAs37cngSkvgIR8aN3G0MS85m7dUpuK2EREo9VJ00uvw6Dg/hXEpfsE1I1TvJOJr+Z+TL+ig=="; + }; + }; "esutils-2.0.2" = { name = "esutils"; packageName = "esutils"; @@ -11724,6 +12876,15 @@ let sha1 = "07e4418737cb1f513c32c6ea48d8b8c8e0471abb"; }; }; + "ext-name-5.0.0" = { + name = "ext-name"; + packageName = "ext-name"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ext-name/-/ext-name-5.0.0.tgz"; + sha512 = "yblEwXAbGv1VQDmow7s38W77hzAgJAO50ztBLMcUyUBfxv1HC+LGwtiEN+Co6LtlqT/5uwVOxsD4TNIilWhwdQ=="; + }; + }; "extend-1.2.1" = { name = "extend"; packageName = "extend"; @@ -12201,6 +13362,15 @@ let sha1 = "257a078384d1db8087bc449d107d52a52672b9e9"; }; }; + "file-type-4.4.0" = { + name = "file-type"; + packageName = "file-type"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/file-type/-/file-type-4.4.0.tgz"; + sha1 = "1b600e5fca1fbdc6e80c0a70c71c8dba5f7906c5"; + }; + }; "file-type-5.2.0" = { name = "file-type"; packageName = "file-type"; @@ -12219,6 +13389,15 @@ let sha512 = "YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg=="; }; }; + "file-type-8.1.0" = { + name = "file-type"; + packageName = "file-type"; + version = "8.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/file-type/-/file-type-8.1.0.tgz"; + sha512 = "qyQ0pzAy78gVoJsmYeNgl8uH8yKhr1lVhW7JbzJmnlRi0I4R2eEDEJZVKG8agpDnLpacwNbDhLNG/LMdxHD2YQ=="; + }; + }; "file-uri-to-path-1.0.0" = { name = "file-uri-to-path"; packageName = "file-uri-to-path"; @@ -12422,7 +13601,7 @@ let packageName = "find-versions"; version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/find-versions/-/find-versions-2.0.0.tgz"; + url = "http://registry.npmjs.org/find-versions/-/find-versions-2.0.0.tgz"; sha1 = "2ad90d490f6828c1aa40292cf709ac3318210c3c"; }; }; @@ -12525,13 +13704,13 @@ let sha1 = "4e79ae9b2eb38bf86b3bb56bf3e0a56aa5fcabd7"; }; }; - "flat-cache-1.3.0" = { + "flat-cache-1.3.2" = { name = "flat-cache"; packageName = "flat-cache"; - version = "1.3.0"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.0.tgz"; - sha1 = "d3030b32b38154f4e3b7e9c709f490f7ef97c481"; + url = "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.2.tgz"; + sha512 = "KByBY8c98sLUAGpnmjEdWTrtrLZRtZdwds+kAL/ciFXTCb7AZgqKsAnVnYFQj1hxepwO8JKN/8AsRWwLq+RK0A=="; }; }; "flat-tree-1.6.0" = { @@ -12588,6 +13767,15 @@ let sha1 = "dae46a9d78fbe25292258cc1e780a41d95c03782"; }; }; + "flow-bin-0.85.0" = { + name = "flow-bin"; + packageName = "flow-bin"; + version = "0.85.0"; + src = fetchurl { + url = "https://registry.npmjs.org/flow-bin/-/flow-bin-0.85.0.tgz"; + sha512 = "ougBA2q6Rn9sZrjZQ9r5pTFxCotlGouySpD2yRIuq5AYwwfIT8HHhVMeSwrN5qJayjHINLJyrnsSkkPCZyfMrQ=="; + }; + }; "fluent-ffmpeg-2.1.2" = { name = "fluent-ffmpeg"; packageName = "fluent-ffmpeg"; @@ -13034,7 +14222,7 @@ let packageName = "fs-extra"; version = "0.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-0.24.0.tgz"; + url = "http://registry.npmjs.org/fs-extra/-/fs-extra-0.24.0.tgz"; sha1 = "d4e4342a96675cb7846633a6099249332b539952"; }; }; @@ -13043,7 +14231,7 @@ let packageName = "fs-extra"; version = "0.26.7"; src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-0.26.7.tgz"; + url = "http://registry.npmjs.org/fs-extra/-/fs-extra-0.26.7.tgz"; sha1 = "9ae1fdd94897798edab76d0918cf42d0c3184fa9"; }; }; @@ -13052,7 +14240,7 @@ let packageName = "fs-extra"; version = "0.30.0"; src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz"; + url = "http://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz"; sha1 = "f233ffcc08d4da7d432daa449776989db1df93f0"; }; }; @@ -13061,7 +14249,7 @@ let packageName = "fs-extra"; version = "0.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-0.6.4.tgz"; + url = "http://registry.npmjs.org/fs-extra/-/fs-extra-0.6.4.tgz"; sha1 = "f46f0c75b7841f8d200b3348cd4d691d5a099d15"; }; }; @@ -13070,7 +14258,7 @@ let packageName = "fs-extra"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz"; + url = "http://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz"; sha1 = "cd3ce5f7e7cb6145883fcae3191e9877f8587950"; }; }; @@ -13110,13 +14298,13 @@ let sha512 = "GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA=="; }; }; - "fs-extra-7.0.0" = { + "fs-extra-7.0.1" = { name = "fs-extra"; packageName = "fs-extra"; - version = "7.0.0"; + version = "7.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.0.tgz"; - sha512 = "EglNDLRpmaTWiD/qraZn6HREAEAHJcJOmxNEYwq6xeMKnVMAy3GUcFB+wXt2C6k4CNvB/mP1y/U3dzvKKj5OtQ=="; + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz"; + sha512 = "YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw=="; }; }; "fs-minipass-1.2.5" = { @@ -13547,7 +14735,7 @@ let packageName = "gettext-parser"; version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/gettext-parser/-/gettext-parser-1.1.0.tgz"; + url = "http://registry.npmjs.org/gettext-parser/-/gettext-parser-1.1.0.tgz"; sha1 = "2c5a6638d893934b9b55037d0ad82cb7004b2679"; }; }; @@ -13876,6 +15064,15 @@ let sha512 = "sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg=="; }; }; + "global-modules-path-2.3.0" = { + name = "global-modules-path"; + packageName = "global-modules-path"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/global-modules-path/-/global-modules-path-2.3.0.tgz"; + sha512 = "HchvMJNYh9dGSCy8pOQ2O8u/hoXaL+0XhnrwH0RyLiSXMMTl9W3N6KUU73+JFOg5PGjtzl6VZzUQsnrpm7Szag=="; + }; + }; "global-paths-1.0.0" = { name = "global-paths"; packageName = "global-paths"; @@ -13939,13 +15136,13 @@ let sha1 = "080f54549ec1b82a6c60e631fc82e1211dbe95f8"; }; }; - "globby-5.0.0" = { + "globby-6.1.0" = { name = "globby"; packageName = "globby"; - version = "5.0.0"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz"; - sha1 = "ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"; + url = "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz"; + sha1 = "f5a6d70e8395e21c858fb0489d64df02424d506c"; }; }; "globby-8.0.1" = { @@ -13984,6 +15181,15 @@ let sha1 = "d53b30cdf9313dffb7dc9a0d477096aa6d145c50"; }; }; + "google-closure-compiler-js-20170910.0.1" = { + name = "google-closure-compiler-js"; + packageName = "google-closure-compiler-js"; + version = "20170910.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/google-closure-compiler-js/-/google-closure-compiler-js-20170910.0.1.tgz"; + sha512 = "Vric7QFWxzHFxITZ10bmlG1H/5rhODb7hJuWyKWMD8GflpQzRmbMVqkFp3fKvN+U9tPwZItGVhkiOR+84PX3ew=="; + }; + }; "got-1.2.2" = { name = "got"; packageName = "got"; @@ -14020,6 +15226,15 @@ let sha512 = "qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw=="; }; }; + "got-9.3.2" = { + name = "got"; + packageName = "got"; + version = "9.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/got/-/got-9.3.2.tgz"; + sha512 = "OyKOUg71IKvwb8Uj0KP6EN3+qVVvXmYsFznU1fnwUnKtDbZnwSlAi7muNlu4HhBfN9dImtlgg9e7H0g5qVdaeQ=="; + }; + }; "graceful-fs-1.2.3" = { name = "graceful-fs"; packageName = "graceful-fs"; @@ -14182,13 +15397,13 @@ let sha512 = "7Qh3TzZS3hwZpJbTNfTHXBM6UbzV7DMik9Mc95Rz76yTAs7Wr83xBFsH4Ap1NWlqBgANfO3cLLI4YomDJmO5SA=="; }; }; - "graphql-extensions-0.2.1" = { + "graphql-extensions-0.3.0" = { name = "graphql-extensions"; packageName = "graphql-extensions"; - version = "0.2.1"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.2.1.tgz"; - sha512 = "/1FTPSWSffDjlRyMAV2UwQhojLmca9aQD0ieo1IYiqT5SE+uOWi4r83QF1CoER0sREIsH3s+nTmdH3cvQVG3MA=="; + url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.3.0.tgz"; + sha512 = "+ppyD7g6acX0y2vj5hm5mRlCBngdHD2dE1jW7abAG4PAWg275TrczA3WXUxB6P9Q4uw0XA886Q+aagI5EmTSaA=="; }; }; "graphql-import-0.4.5" = { @@ -14254,15 +15469,6 @@ let sha512 = "C8+EqwNCiQxUhbrWEokxN16oINAkhIDBzEpKHXeatBRaAyMczXm0J6HMaMSKOuQmk7P1PbDHIVW3FVZwXF2WJQ=="; }; }; - "graphql-subscriptions-0.5.8" = { - name = "graphql-subscriptions"; - packageName = "graphql-subscriptions"; - version = "0.5.8"; - src = fetchurl { - url = "http://registry.npmjs.org/graphql-subscriptions/-/graphql-subscriptions-0.5.8.tgz"; - sha512 = "0CaZnXKBw2pwnIbvmVckby5Ge5e2ecmjofhYCdyeACbCly2j3WXDP/pl+s+Dqd2GQFC7y99NB+53jrt55CKxYQ=="; - }; - }; "graphql-subscriptions-1.0.0" = { name = "graphql-subscriptions"; packageName = "graphql-subscriptions"; @@ -14281,13 +15487,13 @@ let sha512 = "9FD6cw976TLLf9WYIUPCaaTpniawIjHWZSwIRZSjrfufJamcXbVVYfN2TWvJYbw0Xf2JjYbl1/f2+wDnBVw3/w=="; }; }; - "graphql-tools-3.1.1" = { + "graphql-tools-4.0.3" = { name = "graphql-tools"; packageName = "graphql-tools"; - version = "3.1.1"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-tools/-/graphql-tools-3.1.1.tgz"; - sha512 = "yHvPkweUB0+Q/GWH5wIG60bpt8CTwBklCSzQdEHmRUgAdEQKxw+9B7zB3dG7wB3Ym7M7lfrS4Ej+jtDZfA2UXg=="; + url = "https://registry.npmjs.org/graphql-tools/-/graphql-tools-4.0.3.tgz"; + sha512 = "NNZM0WSnVLX1zIMUxu7SjzLZ4prCp15N5L2T2ro02OVyydZ0fuCnZYRnx/yK9xjGWbZA0Q58yEO//Bv/psJWrg=="; }; }; "graphql-type-json-0.2.1" = { @@ -14466,7 +15672,7 @@ let packageName = "har-validator"; version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz"; + url = "http://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz"; sha1 = "cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d"; }; }; @@ -14965,13 +16171,13 @@ let sha512 = "Alr4ZQgoMlnere5FZJsIyfIjORBqZll5POhDsF4q64dPuJR6rNxXdDxtHSQq8OXRurhmx+PWYEE8bXRROY8h0w=="; }; }; - "hoek-6.0.1" = { + "hoek-6.0.2" = { name = "hoek"; packageName = "hoek"; - version = "6.0.1"; + version = "6.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/hoek/-/hoek-6.0.1.tgz"; - sha512 = "3PvUwBerLNVJiIVQdpkWF9F/M0ekgb2NPJWOhsE28RXSQPsY42YSnaJ8d1kZjcAz58TZ/Fk9Tw64xJsENFlJNw=="; + url = "https://registry.npmjs.org/hoek/-/hoek-6.0.2.tgz"; + sha512 = "0RGPLkyxpsMJVj/iOCaJaIWFEch988eUicJJpRiQ+Or1CMvBXcoZPlSx9FhreDWw4hxMYy8xgTEdlsYQDTnxWA=="; }; }; "hogan.js-3.0.2" = { @@ -14992,6 +16198,15 @@ let sha1 = "e36c3f2d2cae7d746a857e38d18d5f32a7882db8"; }; }; + "home-or-tmp-3.0.0" = { + name = "home-or-tmp"; + packageName = "home-or-tmp"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-3.0.0.tgz"; + sha1 = "57a8fe24cf33cdd524860a15821ddc25c86671fb"; + }; + }; "homedir-polyfill-1.0.1" = { name = "homedir-polyfill"; packageName = "homedir-polyfill"; @@ -15118,6 +16333,15 @@ let sha512 = "5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w=="; }; }; + "http-cache-semantics-4.0.0" = { + name = "http-cache-semantics"; + packageName = "http-cache-semantics"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.0.0.tgz"; + sha512 = "NtexGRtaV5z3ZUX78W9UDTOJPBdpqms6RmwQXmOhHws7CuQK3cqIoQtnmeqi1VvVD6u6eMMRL0sKE9BCZXTDWQ=="; + }; + }; "http-errors-1.3.1" = { name = "http-errors"; packageName = "http-errors"; @@ -15325,13 +16549,13 @@ let sha512 = "PH5GBkXqFxw5+4eKaKRIkD23y6vRd/IXSl7IldyJxEXpDH9SEIXRORkBtkGni/ae2P7RVOw6Wxypd2tGXhha1w=="; }; }; - "hypercore-6.20.2" = { + "hypercore-6.21.0" = { name = "hypercore"; packageName = "hypercore"; - version = "6.20.2"; + version = "6.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/hypercore/-/hypercore-6.20.2.tgz"; - sha512 = "VALfzDCqS0cIxoRvlQmCn4QYnQcUDCazyOQq3c0lbp1AvzEjaq62BvYDH28pmWeASokBszuysgsrPFTn704DbA=="; + url = "https://registry.npmjs.org/hypercore/-/hypercore-6.21.0.tgz"; + sha512 = "LPKI+nvgbFTKbXD1y6It3PUZDIQFHSYIeSDbqIZeIVuSoeI4PYcCehKdqB9Wls31AIZL7cFwA5o64uOtBxF1cA=="; }; }; "hypercore-crypto-1.0.0" = { @@ -15586,6 +16810,15 @@ let sha512 = "LWbJPZnidF8eczu7XmcnLBsumuyRBkpwIRPCZxlojouhBo5jEBO4toj6n7hMy6IxHU/c+MqDSWkvaTpPlMQcyA=="; }; }; + "import-fresh-2.0.0" = { + name = "import-fresh"; + packageName = "import-fresh"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz"; + sha1 = "d81355c15612d386c61f9ddd3922d4304822a546"; + }; + }; "import-global-0.1.0" = { name = "import-global"; packageName = "import-global"; @@ -15622,6 +16855,15 @@ let sha512 = "vAaZHieK9qjGo58agRBg+bhHX3hoTZU/Oa3GESWLz7t1U62fk63aHuDJJEteXoDeTCcPmUT+z38gkHPZkkmpmQ=="; }; }; + "import-local-2.0.0" = { + name = "import-local"; + packageName = "import-local"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz"; + sha512 = "b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ=="; + }; + }; "imurmurhash-0.1.4" = { name = "imurmurhash"; packageName = "imurmurhash"; @@ -16486,6 +17728,15 @@ let sha512 = "JfyDDwUdtS4yHCgUpxOyKB9dnfZ0gecufxB0eytX6BmSXSE+8dbxDGt+V7CNRIRJ9sYFV/WQt2KJG6hNob2sBw=="; }; }; + "is-module-1.0.0" = { + name = "is-module"; + packageName = "is-module"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz"; + sha1 = "3258fb69f78c14d5b815d664336b4cffb6441591"; + }; + }; "is-my-ip-valid-1.0.0" = { name = "is-my-ip-valid"; packageName = "is-my-ip-valid"; @@ -17053,6 +18304,24 @@ let sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; }; }; + "istanbul-lib-coverage-1.2.1" = { + name = "istanbul-lib-coverage"; + packageName = "istanbul-lib-coverage"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.1.tgz"; + sha512 = "PzITeunAgyGbtY1ibVIUiV679EFChHjoMNRibEIobvmrCRaIgwLxNucOSimtNWUhEib/oO7QY2imD75JVgCJWQ=="; + }; + }; + "istanbul-lib-instrument-1.10.2" = { + name = "istanbul-lib-instrument"; + packageName = "istanbul-lib-instrument"; + version = "1.10.2"; + src = fetchurl { + url = "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.2.tgz"; + sha512 = "aWHxfxDqvh/ZlxR8BBaEPVSWDPUkGD63VjGQn3jcw8jCp7sHEMKcrj4xfJn/ABzdMEHiQNyvDQhqm5o8+SQg7A=="; + }; + }; "isurl-1.0.0" = { name = "isurl"; packageName = "isurl"; @@ -17224,6 +18493,15 @@ let sha512 = "xcinL3AuDJk7VSzsHgb9DvvIXayBbadtMZ4HFPx8rUszbW1MuNMlwYVC4zzCZ6e1sqZpnNS5ZFYOhXqA39T7LQ=="; }; }; + "js-levenshtein-1.1.4" = { + name = "js-levenshtein"; + packageName = "js-levenshtein"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.4.tgz"; + sha512 = "PxfGzSs0ztShKrUYPIn5r0MtyAhYcCwmndozzpz8YObbPnD1jFxzlBGbRnX2mIu6Z13xN6+PTu05TQFnZFlzow=="; + }; + }; "js-message-1.0.5" = { name = "js-message"; packageName = "js-message"; @@ -17251,6 +18529,15 @@ let sha1 = "c284e22824d5927aec962dcdf247174aefb0d190"; }; }; + "js-string-escape-1.0.1" = { + name = "js-string-escape"; + packageName = "js-string-escape"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/js-string-escape/-/js-string-escape-1.0.1.tgz"; + sha1 = "e2625badbc0d67c7533e9edc1068c587ae4137ef"; + }; + }; "js-stringify-1.0.2" = { name = "js-stringify"; packageName = "js-stringify"; @@ -17341,22 +18628,31 @@ let sha1 = "40b402770c2bda23469096bee91ab675e3b1fc6e"; }; }; + "jsesc-0.5.0" = { + name = "jsesc"; + packageName = "jsesc"; + version = "0.5.0"; + src = fetchurl { + url = "http://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz"; + sha1 = "e7dee66e35d6fc16f710fe91d5cf69f70f08911d"; + }; + }; "jsesc-1.3.0" = { name = "jsesc"; packageName = "jsesc"; version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz"; + url = "http://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz"; sha1 = "46c3fec8c1892b12b0833db9bc7622176dbab34b"; }; }; - "jsesc-2.5.1" = { + "jsesc-2.5.2" = { name = "jsesc"; packageName = "jsesc"; - version = "2.5.1"; + version = "2.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/jsesc/-/jsesc-2.5.1.tgz"; - sha1 = "e421a2a8e20d6b0819df28908f782526b96dd1fe"; + url = "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz"; + sha512 = "OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="; }; }; "jshint-2.9.6" = { @@ -17800,6 +19096,16 @@ let sha512 = "5W8NUaFRFRqTOL7ZDDrx5qWHJyBXy6velVudIzQUSoqAAYqzSh2Z7/m0Rf1QbmQJccegD0r+YZxBjzqoBiEeJQ=="; }; }; + "jszip-git://github.com/anmonteiro/jszip#patch-1" = { + name = "jszip"; + packageName = "jszip"; + version = "2.6.1"; + src = fetchgit { + url = "git://github.com/anmonteiro/jszip"; + rev = "5a92e8c9153a3557daa8d3540b00c50bd8554c49"; + sha256 = "00016993634d04b6f7eea8fae529b804d5a0b7ed2636361c7546a48b866e9c5c"; + }; + }; "junk-2.1.0" = { name = "junk"; packageName = "junk"; @@ -20249,6 +21555,15 @@ let sha512 = "mmLbumEYMi5nXReB9js3WGsB8UE6cDBWyIO62Z4DNx6GbRhDxHNjA1MlzSpJ2S2KM1wyiPRA0d19uHWYYvMHjA=="; }; }; + "magic-string-0.25.1" = { + name = "magic-string"; + packageName = "magic-string"; + version = "0.25.1"; + src = fetchurl { + url = "https://registry.npmjs.org/magic-string/-/magic-string-0.25.1.tgz"; + sha512 = "sCuTz6pYom8Rlt4ISPFn6wuFodbKMIHUMv4Qko9P17dpxb7s52KJTmRuZZqHdGmLCK9AOcDare039nRIcfdkEg=="; + }; + }; "magnet-uri-2.0.1" = { name = "magnet-uri"; packageName = "magnet-uri"; @@ -20645,15 +21960,6 @@ let sha1 = "5edd52b485ca1d900fe64895505399a0dfa45f76"; }; }; - "mem-3.0.1" = { - name = "mem"; - packageName = "mem"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mem/-/mem-3.0.1.tgz"; - sha512 = "QKs47bslvOE0NbXOqG6lMxn6Bk0Iuw0vfrIeLykmQle2LkCw1p48dZDdzE+D88b/xqRJcZGcMNeDvSVma+NuIQ=="; - }; - }; "mem-4.0.0" = { name = "mem"; packageName = "mem"; @@ -21352,7 +22658,7 @@ let packageName = "modern-syslog"; version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/modern-syslog/-/modern-syslog-1.1.2.tgz"; + url = "http://registry.npmjs.org/modern-syslog/-/modern-syslog-1.1.2.tgz"; sha1 = "f1fa58899f3f452d788f1573401212a4ef898de5"; }; }; @@ -22477,6 +23783,15 @@ let sha1 = "4aa7bfd43f03f0b81c9702b13d6a858ddb326f3e"; }; }; + "nexe-3.0.0-beta.7" = { + name = "nexe"; + packageName = "nexe"; + version = "3.0.0-beta.7"; + src = fetchurl { + url = "https://registry.npmjs.org/nexe/-/nexe-3.0.0-beta.7.tgz"; + sha512 = "Vnvd/rHCDyvc3ZxEX/sSw6lCMsBLHqkhGQS627MtetIiFBj1G7oRw9y1All8a7Tzi560o+SGIkAbnjFR60wNlQ=="; + }; + }; "next-event-1.0.0" = { name = "next-event"; packageName = "next-event"; @@ -22684,6 +23999,15 @@ let sha512 = "5AzFzdoIMb89hBGMZglEegffzgRg+ZFoUmisQ8HI4j1KDdpx13J0taNp2y9xPbur6W61gepGDDotGBVQ7mfUCg=="; }; }; + "node-modules-regexp-1.0.0" = { + name = "node-modules-regexp"; + packageName = "node-modules-regexp"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz"; + sha1 = "8d9dbe28964a4ac5712e9131642107c71e90ec40"; + }; + }; "node-notifier-5.2.1" = { name = "node-notifier"; packageName = "node-notifier"; @@ -22765,6 +24089,15 @@ let sha512 = "mkw8HOosXHMBRdyJkio77vPx4Ls5IY26P5ZyoMWmKMkimXKTnX00DdpmNlkW+dHwMDYq1H66WzFtQhNOdEAbgA=="; }; }; + "node-releases-1.0.3" = { + name = "node-releases"; + packageName = "node-releases"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/node-releases/-/node-releases-1.0.3.tgz"; + sha512 = "ZaZWMsbuDcetpHmYeKWPO6e63pSXLb50M7lJgCbcM2nC/nQC3daNifmtp5a2kp7EWwYfhuvH6zLPWkrF8IiDdw=="; + }; + }; "node-request-by-swagger-1.1.4" = { name = "node-request-by-swagger"; packageName = "node-request-by-swagger"; @@ -23071,6 +24404,15 @@ let sha512 = "D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw=="; }; }; + "normalize-url-3.3.0" = { + name = "normalize-url"; + packageName = "normalize-url"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-url/-/normalize-url-3.3.0.tgz"; + sha512 = "U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg=="; + }; + }; "now-and-later-2.0.0" = { name = "now-and-later"; packageName = "now-and-later"; @@ -23990,6 +25332,15 @@ let sha512 = "hNNlAd3gfv/iPmsNxYoAPLvxg7HuPozww7fFonMZvL84tP6Ox5igfk5j/+a9rtJJwqMgKK+JgWsAQik5o0HTLA=="; }; }; + "ora-3.0.0" = { + name = "ora"; + packageName = "ora"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ora/-/ora-3.0.0.tgz"; + sha512 = "LBS97LFe2RV6GJmXBi6OKcETKyklHNMV0xw7BtsVn2MlsgsydyZetSCbCANr+PFLmDyv4KV88nn0eCKza665Mg=="; + }; + }; "orchestrator-0.3.8" = { name = "orchestrator"; packageName = "orchestrator"; @@ -24040,7 +25391,7 @@ let packageName = "os-homedir"; version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz"; + url = "http://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz"; sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; }; }; @@ -24062,15 +25413,6 @@ let sha512 = "3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA=="; }; }; - "os-locale-3.0.0" = { - name = "os-locale"; - packageName = "os-locale"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/os-locale/-/os-locale-3.0.0.tgz"; - sha512 = "4mi6ZXIp4OtcV/Bwzl9p9Cvae7KJv/czGIm/HK0iaXCuRh7BMpy4l4o4CLjN+atsRQpCW9Rs4FdhfnK0zaR1Jg=="; - }; - }; "os-locale-3.0.1" = { name = "os-locale"; packageName = "os-locale"; @@ -24112,7 +25454,7 @@ let packageName = "os-tmpdir"; version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; + url = "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; }; }; @@ -24170,6 +25512,15 @@ let sha512 = "HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ=="; }; }; + "p-cancelable-1.0.0" = { + name = "p-cancelable"; + packageName = "p-cancelable"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.0.0.tgz"; + sha512 = "USgPoaC6tkTGlS831CxsVdmZmyb8tR1D+hStI84MyckLOzfJlYQUweomrwE3D8T7u5u5GVuW064LT501wHTYYA=="; + }; + }; "p-defer-1.0.0" = { name = "p-defer"; packageName = "p-defer"; @@ -24179,6 +25530,15 @@ let sha1 = "9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"; }; }; + "p-event-2.1.0" = { + name = "p-event"; + packageName = "p-event"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-event/-/p-event-2.1.0.tgz"; + sha512 = "sDEpDVnzLGlJj3k590uUdpfEUySP5yAYlvfTCu5hTDvSTXQVecYWKcEwdO49PrZlnJ5wkfAvtawnno/jyXeqvA=="; + }; + }; "p-finally-1.0.0" = { name = "p-finally"; packageName = "p-finally"; @@ -24458,6 +25818,15 @@ let sha1 = "df94fd8cf6531ecf75e6bef9a0858fbc72be2247"; }; }; + "paredit.js-0.3.4" = { + name = "paredit.js"; + packageName = "paredit.js"; + version = "0.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/paredit.js/-/paredit.js-0.3.4.tgz"; + sha512 = "b6t7ORo/MwT6xvRiuu1c1do3+CAUd7/0rgc1d3qNHUeP64zxy4ttLIvK7SEHzyfyDLvD9pPuV9mYKHf6MgUkmg=="; + }; + }; "parents-1.0.1" = { name = "parents"; packageName = "parents"; @@ -24904,7 +26273,7 @@ let packageName = "path-is-absolute"; version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; + url = "http://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; }; }; @@ -25224,6 +26593,24 @@ let sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"; }; }; + "pify-4.0.1" = { + name = "pify"; + packageName = "pify"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz"; + sha512 = "uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="; + }; + }; + "pinkie-1.0.0" = { + name = "pinkie"; + packageName = "pinkie"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pinkie/-/pinkie-1.0.0.tgz"; + sha1 = "5a47f28ba1015d0201bda7bf0f358e47bec8c7e4"; + }; + }; "pinkie-2.0.4" = { name = "pinkie"; packageName = "pinkie"; @@ -25233,6 +26620,15 @@ let sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870"; }; }; + "pinkie-promise-1.0.0" = { + name = "pinkie-promise"; + packageName = "pinkie-promise"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-1.0.0.tgz"; + sha1 = "d1da67f5482563bb7cf57f286ae2822ecfbf3670"; + }; + }; "pinkie-promise-2.0.1" = { name = "pinkie-promise"; packageName = "pinkie-promise"; @@ -25242,13 +26638,22 @@ let sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; }; }; - "pino-5.0.4" = { + "pino-5.5.0" = { name = "pino"; packageName = "pino"; - version = "5.0.4"; + version = "5.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/pino/-/pino-5.0.4.tgz"; - sha512 = "w7UohXesFggN77UyTnt0A7FqkEiq6TbeXgTvY7g1wFGXoGbxmF780uFm8oQKaWlFi7vnzDRkBnYHNaaHFUKEoQ=="; + url = "https://registry.npmjs.org/pino/-/pino-5.5.0.tgz"; + sha512 = "cCaBKVwutiaGwgKXyOvsRSCeBxgi2j0X1PEK1cog1/9SMDhgL8+iJwWvTKUef20HDyGfZIUq5KaH0ZOhWLHYSw=="; + }; + }; + "pino-5.8.1" = { + name = "pino"; + packageName = "pino"; + version = "5.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pino/-/pino-5.8.1.tgz"; + sha512 = "7bVFzUw3ffIfOM3t7MuQ9KsH+wX5bdGdQhGfccKgleoY7qG4FO3CmVSjywlFmmYGyMOISi1LDGC6JMEH7XkZJg=="; }; }; "pino-std-serializers-2.3.0" = { @@ -25260,6 +26665,15 @@ let sha512 = "klfGoOsP6sJH7ON796G4xoUSx2fkpFgKHO4YVVO2zmz31jR+etzc/QzGJILaOIiCD6HTCFgkPx+XN8nk+ruqPw=="; }; }; + "pirates-4.0.0" = { + name = "pirates"; + packageName = "pirates"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pirates/-/pirates-4.0.0.tgz"; + sha512 = "8t5BsXy1LUIjn3WWOlOuFDuKswhQb/tkak641lvBgmPOBUQHXveORtlMCp6OdPV1dtuTaEahKA8VNz6uLfKBtA=="; + }; + }; "pkg-dir-2.0.0" = { name = "pkg-dir"; packageName = "pkg-dir"; @@ -25269,6 +26683,15 @@ let sha1 = "f6d5d1109e19d63edf428e0bd57e12777615334b"; }; }; + "pkg-dir-3.0.0" = { + name = "pkg-dir"; + packageName = "pkg-dir"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz"; + sha512 = "/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw=="; + }; + }; "pkg-up-2.0.0" = { name = "pkg-up"; packageName = "pkg-up"; @@ -25512,6 +26935,16 @@ let sha1 = "01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"; }; }; + "posix-getopt-git://github.com/anmonteiro/node-getopt#master" = { + name = "posix-getopt"; + packageName = "posix-getopt"; + version = "1.2.0"; + src = fetchgit { + url = "git://github.com/anmonteiro/node-getopt"; + rev = "a3123885e3559c9b70903948d6e5c34852520d74"; + sha256 = "0092766ac49279342f7d17677359880b44b245ad9d32237a11a5ea45cb0d03fa"; + }; + }; "postcss-6.0.23" = { name = "postcss"; packageName = "postcss"; @@ -25521,6 +26954,15 @@ let sha512 = "soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag=="; }; }; + "postcss-7.0.5" = { + name = "postcss"; + packageName = "postcss"; + version = "7.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss/-/postcss-7.0.5.tgz"; + sha512 = "HBNpviAUFCKvEh7NZhw1e8MBPivRszIiUnhrJ+sBFVSYSqubrzwX3KG51mYgcRHX8j/cAgZJedONZcm5jTBdgQ=="; + }; + }; "prebuild-install-2.1.2" = { name = "prebuild-install"; packageName = "prebuild-install"; @@ -25584,6 +27026,15 @@ let sha1 = "815ed1f6ebc65926f865b310c0713bcb3315ce4b"; }; }; + "prettier-1.15.1" = { + name = "prettier"; + packageName = "prettier"; + version = "1.15.1"; + src = fetchurl { + url = "https://registry.npmjs.org/prettier/-/prettier-1.15.1.tgz"; + sha512 = "4rgV2hyc/5Pk0XHH4VjJWHRgVjgRbpMfLQjREAhHBtyW1UvTFkjJEsueGYNYYZd9mn97K+1qv0EBwm11zoaSgA=="; + }; + }; "prettier-bytes-1.0.4" = { name = "prettier-bytes"; packageName = "prettier-bytes"; @@ -27375,6 +28826,15 @@ let sha1 = "9cbc686978fee65d16c00e2b19c237fcf6e38389"; }; }; + "read-pkg-4.0.1" = { + name = "read-pkg"; + packageName = "read-pkg"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg/-/read-pkg-4.0.1.tgz"; + sha1 = "963625378f3e1c4d48c85872b5a6ec7d5d093237"; + }; + }; "read-pkg-up-1.0.1" = { name = "read-pkg-up"; packageName = "read-pkg-up"; @@ -27618,6 +29078,24 @@ let sha1 = "e0c93542c574521bea13df0f9488ed82ab77c5da"; }; }; + "regenerate-1.4.0" = { + name = "regenerate"; + packageName = "regenerate"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz"; + sha512 = "1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg=="; + }; + }; + "regenerate-unicode-properties-7.0.0" = { + name = "regenerate-unicode-properties"; + packageName = "regenerate-unicode-properties"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-7.0.0.tgz"; + sha512 = "s5NGghCE4itSlUS+0WUj88G6cfMVMmH8boTPNvABf8od+2dhT9WDlWu8n01raQAJZMOK8Ch6jSexaRO7swd6aw=="; + }; + }; "regenerator-runtime-0.10.5" = { name = "regenerator-runtime"; packageName = "regenerator-runtime"; @@ -27654,6 +29132,15 @@ let sha1 = "d33eb95d0d2001a4be39659707c51b0cb71ce029"; }; }; + "regenerator-transform-0.13.3" = { + name = "regenerator-transform"; + packageName = "regenerator-transform"; + version = "0.13.3"; + src = fetchurl { + url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.13.3.tgz"; + sha512 = "5ipTrZFSq5vU2YoGoww4uaRVAK4wyYC4TSICibbfEPOruUu8FFP7ErV0BjmbIOEpn3O/k9na9UEdYR/3m7N6uA=="; + }; + }; "regex-cache-0.4.4" = { name = "regex-cache"; packageName = "regex-cache"; @@ -27699,6 +29186,15 @@ let sha512 = "lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw=="; }; }; + "regexpu-core-4.2.0" = { + name = "regexpu-core"; + packageName = "regexpu-core"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.2.0.tgz"; + sha512 = "Z835VSnJJ46CNBttalHD/dB+Sj2ezmY6Xp38npwU87peK6mqOzOpV8eYktdkLTEkzzD+JsTcxd84ozd8I14+rw=="; + }; + }; "registry-auth-token-3.3.2" = { name = "registry-auth-token"; packageName = "registry-auth-token"; @@ -27717,6 +29213,24 @@ let sha1 = "3d4ef870f73dde1d77f0cf9a381432444e174942"; }; }; + "regjsgen-0.4.0" = { + name = "regjsgen"; + packageName = "regjsgen"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/regjsgen/-/regjsgen-0.4.0.tgz"; + sha512 = "X51Lte1gCYUdlwhF28+2YMO0U6WeN0GLpgpA7LK7mbdDnkQYiwvEpmpe0F/cv5L14EbxgrdayAG3JETBv0dbXA=="; + }; + }; + "regjsparser-0.3.0" = { + name = "regjsparser"; + packageName = "regjsparser"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.3.0.tgz"; + sha512 = "zza72oZBBHzt64G7DxdqrOo/30bhHkwMUoT0WqfGu98XLd7N+1tsy5MJ96Bk4MD0y74n629RhmrGW6XlnLLwCA=="; + }; + }; "reinterval-1.1.0" = { name = "reinterval"; packageName = "reinterval"; @@ -28073,7 +29587,7 @@ let packageName = "require-uncached"; version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz"; + url = "http://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz"; sha1 = "4e0d56d6c9662fd31e43011c4b95aa49955421d3"; }; }; @@ -28140,6 +29654,15 @@ let sha1 = "00a9f7387556e27038eae232caa372a6a59b665a"; }; }; + "resolve-dependencies-2.1.1" = { + name = "resolve-dependencies"; + packageName = "resolve-dependencies"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-dependencies/-/resolve-dependencies-2.1.1.tgz"; + sha512 = "Qmd1eEp9CmAZZx1e3scW2Cof0kauO3Y6jKMoZIm8RN/BWwkfhUdfLV+qpb7+ONITVmqWFUdHb6r62HSlmAMv5Q=="; + }; + }; "resolve-dir-1.0.1" = { name = "resolve-dir"; packageName = "resolve-dir"; @@ -28437,6 +29960,78 @@ let sha1 = "f33fe9cfb52bbfd520aa18323bc65db110a1b76c"; }; }; + "rollup-0.67.0" = { + name = "rollup"; + packageName = "rollup"; + version = "0.67.0"; + src = fetchurl { + url = "https://registry.npmjs.org/rollup/-/rollup-0.67.0.tgz"; + sha512 = "p34buXxArhwv9ieTdHvdhdo65Cbig68s/Z8llbZuiX5e+3zCqnBF02Ck9IH0tECrmvvrJVMws32Ry84hTnS1Tw=="; + }; + }; + "rollup-plugin-babel-4.0.3" = { + name = "rollup-plugin-babel"; + packageName = "rollup-plugin-babel"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/rollup-plugin-babel/-/rollup-plugin-babel-4.0.3.tgz"; + sha512 = "/PP0MgbPQyRywI4zRIJim6ySjTcOLo4kQbEbROqp9kOR3kHC3FeU++QpBDZhS2BcHtJTVZMVbBV46flbBN5zxQ=="; + }; + }; + "rollup-plugin-babel-minify-6.1.1" = { + name = "rollup-plugin-babel-minify"; + packageName = "rollup-plugin-babel-minify"; + version = "6.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/rollup-plugin-babel-minify/-/rollup-plugin-babel-minify-6.1.1.tgz"; + sha512 = "MX0lqOHp1vHd7WbHTK5OG679msgPxzGzYf4VBEg6kKptO05fgheCbN51i3EoFYSa+8/VtNDjPc23iDdZfhO2uw=="; + }; + }; + "rollup-plugin-commonjs-9.2.0" = { + name = "rollup-plugin-commonjs"; + packageName = "rollup-plugin-commonjs"; + version = "9.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/rollup-plugin-commonjs/-/rollup-plugin-commonjs-9.2.0.tgz"; + sha512 = "0RM5U4Vd6iHjL6rLvr3lKBwnPsaVml+qxOGaaNUWN1lSq6S33KhITOfHmvxV3z2vy9Mk4t0g4rNlVaJJsNQPWA=="; + }; + }; + "rollup-plugin-node-resolve-3.4.0" = { + name = "rollup-plugin-node-resolve"; + packageName = "rollup-plugin-node-resolve"; + version = "3.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-3.4.0.tgz"; + sha512 = "PJcd85dxfSBWih84ozRtBkB731OjXk0KnzN0oGp7WOWcarAFkVa71cV5hTJg2qpVsV2U8EUwrzHP3tvy9vS3qg=="; + }; + }; + "rollup-plugin-replace-2.1.0" = { + name = "rollup-plugin-replace"; + packageName = "rollup-plugin-replace"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/rollup-plugin-replace/-/rollup-plugin-replace-2.1.0.tgz"; + sha512 = "SxrAIgpH/B5/W4SeULgreOemxcpEgKs2gcD42zXw50bhqGWmcnlXneVInQpAqzA/cIly4bJrOpeelmB9p4YXSQ=="; + }; + }; + "rollup-plugin-uglify-3.0.0" = { + name = "rollup-plugin-uglify"; + packageName = "rollup-plugin-uglify"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/rollup-plugin-uglify/-/rollup-plugin-uglify-3.0.0.tgz"; + sha512 = "dehLu9eRRoV4l09aC+ySntRw1OAfoyKdbk8Nelblj03tHoynkSybqyEpgavemi1LBOH6S1vzI58/mpxkZIe1iQ=="; + }; + }; + "rollup-pluginutils-2.3.3" = { + name = "rollup-pluginutils"; + packageName = "rollup-pluginutils"; + version = "2.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.3.3.tgz"; + sha512 = "2XZwja7b6P5q4RZ5FhyX1+f46xi1Z3qBKigLRZ6VTZjwbN0K1IFGMlwm06Uu0Emcre2Z63l77nq/pzn+KxIEoA=="; + }; + }; "root-2.0.0" = { name = "root"; packageName = "root"; @@ -28617,6 +30212,15 @@ let sha512 = "JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw=="; }; }; + "s3-stream-upload-2.0.2" = { + name = "s3-stream-upload"; + packageName = "s3-stream-upload"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/s3-stream-upload/-/s3-stream-upload-2.0.2.tgz"; + sha1 = "60342f12d4aa06ea8f389fb761a5393aedca017f"; + }; + }; "safe-buffer-5.0.1" = { name = "safe-buffer"; packageName = "safe-buffer"; @@ -29886,13 +31490,22 @@ let sha512 = "FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg=="; }; }; - "snyk-1.108.0" = { + "snyk-1.103.2" = { name = "snyk"; packageName = "snyk"; - version = "1.108.0"; + version = "1.103.2"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.108.0.tgz"; - sha512 = "QKeERkklW4DFyd49sqbwZ4xNYXtHOPCcUjNUzDfcvXzNwyxfRKhTf43nmPw6lnIcgBesrY95hMozos4WmgYl3w=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.103.2.tgz"; + sha512 = "rmMsNW94SQdmWQEtVDW1hiGKb3r7Gx1hVb0bTuK9mCm4/lHGmyuAG7QYdcwdhMrhGjg7yQDWCEXorEnq2JLs7Q=="; + }; + }; + "snyk-1.108.2" = { + name = "snyk"; + packageName = "snyk"; + version = "1.108.2"; + src = fetchurl { + url = "https://registry.npmjs.org/snyk/-/snyk-1.108.2.tgz"; + sha512 = "VfSHSRj4ISWf4EfySTdAVqUWnDspoFUaGs4uGp7FIbjZb35+JPaQ/hqgWKcDal+ZwTtzQvxKAdPsB3WUCBoSKg=="; }; }; "snyk-config-2.2.0" = { @@ -29904,13 +31517,31 @@ let sha512 = "mq0wbP/AgjcmRq5i5jg2akVVV3iSYUPTowZwKn7DChRLDL8ySOzWAwan+ImXiyNbrWo87FNI/15O6MpOnTxOIg=="; }; }; - "snyk-docker-plugin-1.12.1" = { + "snyk-docker-plugin-1.12.0" = { name = "snyk-docker-plugin"; packageName = "snyk-docker-plugin"; - version = "1.12.1"; + version = "1.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-1.12.1.tgz"; - sha512 = "9/k+tZORb0CUoE+nFvG+ADc6vzHAkgiGR/7aZ35vxpuc9vW37LFWjmXZAfyoiGNOn1ICrPxSxarah8YsFEwE8Q=="; + url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-1.12.0.tgz"; + sha512 = "QqKq2bGdnf1L2PNGQrHoqcoaV/PIlJv1qjKIzwA93gfhToKGkgJ31oPXwfef/l9N+ui0Y44c4POBHFbFf8PlJw=="; + }; + }; + "snyk-docker-plugin-1.12.2" = { + name = "snyk-docker-plugin"; + packageName = "snyk-docker-plugin"; + version = "1.12.2"; + src = fetchurl { + url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-1.12.2.tgz"; + sha512 = "8bEn6tDSXPtNS6d1XRM6CSRMwM0bI3N0vRzcKVMZ9E52W9sIpv2E50noYjxcMpoRFxpLWAJ4WMtamcMtLPnNeQ=="; + }; + }; + "snyk-go-plugin-1.5.2" = { + name = "snyk-go-plugin"; + packageName = "snyk-go-plugin"; + version = "1.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.5.2.tgz"; + sha512 = "XWajcSh6Ld+I+WdcyU3DGDuE2ydThQd8ORkESy0nQ2LwekygLYVYN66OBy0uxpqYfd4qoqeg+J8lb4oGzCmyGA=="; }; }; "snyk-go-plugin-1.6.0" = { @@ -29931,6 +31562,24 @@ let sha512 = "9gYJluomFZ5kaww5FoBvp4zUIsr27pEJ12jQJaVf0FJ0BmyYHmbCoxvHdqjCSYS2fVtF+fmPnvw0XKQOIwA1SA=="; }; }; + "snyk-gradle-plugin-2.1.1" = { + name = "snyk-gradle-plugin"; + packageName = "snyk-gradle-plugin"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-2.1.1.tgz"; + sha512 = "aFeVC5y3XkJ5BxknHhtYo76as3xJbzSQlXACGZrQZGQ/w/UhNdM8VI1QB6Eq4uEzexleB/hcJwYxNmhI2CNCeA=="; + }; + }; + "snyk-module-1.8.2" = { + name = "snyk-module"; + packageName = "snyk-module"; + version = "1.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/snyk-module/-/snyk-module-1.8.2.tgz"; + sha512 = "XqhdbZ/CUuJ5gSaYdYfapLqx9qm2Mp6nyRMBCLXe9tJSiohOJsc9fQuUDbdOiRCqpA4BD6WLl+qlwOJmJoszBg=="; + }; + }; "snyk-module-1.9.1" = { name = "snyk-module"; packageName = "snyk-module"; @@ -29949,6 +31598,15 @@ let sha512 = "9jAhZhv+7YcqtoQYCYlgMoxK+dWBKlk+wkX27Ebg3vNddNop9q5jZitRXTjsXwfSUZHRt+Ptw1f8vei9kjzZVg=="; }; }; + "snyk-nodejs-lockfile-parser-1.5.1" = { + name = "snyk-nodejs-lockfile-parser"; + packageName = "snyk-nodejs-lockfile-parser"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.5.1.tgz"; + sha512 = "rfFcW+ZrOEH3NxufUCpMBpNLSb4BPOxLbAM6MoRqfYH5DhSdTHsecwRDf1gU6XzQok/9Koav+1qtP8+welJC2A=="; + }; + }; "snyk-nodejs-lockfile-parser-1.7.0" = { name = "snyk-nodejs-lockfile-parser"; packageName = "snyk-nodejs-lockfile-parser"; @@ -29976,6 +31634,15 @@ let sha512 = "g5QSHBsRJ2O4cNxKC4zlWwnQYiSgQ77Y6QgGmo3ihPX3VLZrc1amaZIpPsNe1jwXirnGj2rvR5Xw+jDjbzvHFw=="; }; }; + "snyk-policy-1.12.0" = { + name = "snyk-policy"; + packageName = "snyk-policy"; + version = "1.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/snyk-policy/-/snyk-policy-1.12.0.tgz"; + sha512 = "CEioNnDzccHyid7UIVl3bJ1dnG4co4ofI+KxuC1mo0IUXy64gxnBTeVoZF5gVLWbAyxGxSeW8f0+8GmWMHVb7w=="; + }; + }; "snyk-policy-1.13.1" = { name = "snyk-policy"; packageName = "snyk-policy"; @@ -29985,6 +31652,15 @@ let sha512 = "l9evS3Yk70xyvajjg+I6Ij7fr7gxpVRMZl0J1xNpWps/IVu4DSGih3aMmXi47VJozr4A/eFyj7R1lIr2GhqJCA=="; }; }; + "snyk-python-plugin-1.8.2" = { + name = "snyk-python-plugin"; + packageName = "snyk-python-plugin"; + version = "1.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.8.2.tgz"; + sha512 = "LBvjztnXarSHKyhivzM567icOOLOB98I7S9EEnjepuG+EZ0jiZzqOEMVRmzuYi+hRq3Cwh0hhjkwgJAQpKDz+g=="; + }; + }; "snyk-python-plugin-1.9.0" = { name = "snyk-python-plugin"; packageName = "snyk-python-plugin"; @@ -30003,6 +31679,15 @@ let sha512 = "7+i+LLhtBo1Pkth01xv+RYJU8a67zmJ8WFFPvSxyCjdlKIcsps4hPQFebhz+0gC5rMemlaeIV6cqwqUf9PEDpw=="; }; }; + "snyk-resolve-deps-4.0.1" = { + name = "snyk-resolve-deps"; + packageName = "snyk-resolve-deps"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/snyk-resolve-deps/-/snyk-resolve-deps-4.0.1.tgz"; + sha512 = "gieaYoOuJLXzUmDDKfQJAqfwaxa43KmSqN2d9abRfgMXnLlX9IqyoZ1wqZMbd3WN7tsHSkpWvVwc4FHdQEkUKA=="; + }; + }; "snyk-resolve-deps-4.0.2" = { name = "snyk-resolve-deps"; packageName = "snyk-resolve-deps"; @@ -30143,7 +31828,7 @@ let packageName = "socket.io-parser"; version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.1.2.tgz"; + url = "http://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.1.2.tgz"; sha1 = "876655b9edd555c5bdf7301cedf30a436c67b8b0"; }; }; @@ -30152,7 +31837,7 @@ let packageName = "socket.io-parser"; version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.0.tgz"; + url = "http://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.0.tgz"; sha1 = "2609601f59e6a7fab436a53be3d333fbbfcbd30a"; }; }; @@ -30161,7 +31846,7 @@ let packageName = "socket.io-parser"; version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.3.1.tgz"; + url = "http://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.3.1.tgz"; sha1 = "dd532025103ce429697326befd64005fcfe5b4a0"; }; }; @@ -30170,7 +31855,7 @@ let packageName = "socket.io-parser"; version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.2.0.tgz"; + url = "http://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.2.0.tgz"; sha512 = "FYiBx7rc/KORMJlgsXysflWx/RIvtqZbyGLlHZvjfmPTPeuD/I8MaW7cfFrj5tRltICJdgwflhfZ3NVVbVLFQA=="; }; }; @@ -30192,6 +31877,15 @@ let sha512 = "0GabKw7n9mI46vcNrVfs0o6XzWzjVa3h6GaSo2UPxtWAROXUWavfJWh1M4PR5tnE0dcnQXZIDFP4yrAysLze/w=="; }; }; + "socks-2.2.2" = { + name = "socks"; + packageName = "socks"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/socks/-/socks-2.2.2.tgz"; + sha512 = "g6wjBnnMOZpE0ym6e0uHSddz9p3a+WsBaaYQaBaSCJYvrC4IXykQR9MNGjLQf38e9iIIhp3b1/Zk8YZI3KGJ0Q=="; + }; + }; "socks-proxy-agent-3.0.1" = { name = "socks-proxy-agent"; packageName = "socks-proxy-agent"; @@ -30246,13 +31940,13 @@ let sha512 = "UMmCHovws/sxIBZsIRhIl8uRPou/RFDD0vVop81T1hG106NLLgqajKKuHAOtAP6hflnZ0UrVA2VFwddTd/NQyA=="; }; }; - "sodium-native-2.2.2" = { + "sodium-native-2.2.3" = { name = "sodium-native"; packageName = "sodium-native"; - version = "2.2.2"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/sodium-native/-/sodium-native-2.2.2.tgz"; - sha512 = "TdAa+PlmWki2Spx3TJyGFVkj6gLsxs5HV/i/j2COZ5INEaCmLz15NIHgUAT/GQ0KrG8Ddy6tkvuP7B5YJpmW6g=="; + url = "https://registry.npmjs.org/sodium-native/-/sodium-native-2.2.3.tgz"; + sha512 = "0rQvKwlWW86YmmAhosnJ6/2PR3mdAtfuWW147L4x3/gwfL7XiJ7mf2BPvBwU16vsYQNY1yxOQg9YT/MN6qoZOA=="; }; }; "sodium-universal-2.0.0" = { @@ -30264,13 +31958,13 @@ let sha512 = "csdVyakzHJRyCevY4aZC2Eacda8paf+4nmRGF2N7KxCLKY2Ajn72JsExaQlJQ2BiXJncp44p3T+b80cU+2TTsg=="; }; }; - "sonic-boom-0.6.1" = { + "sonic-boom-0.6.2" = { name = "sonic-boom"; packageName = "sonic-boom"; - version = "0.6.1"; + version = "0.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/sonic-boom/-/sonic-boom-0.6.1.tgz"; - sha512 = "3qx6XXDeG+hPNa+jla1H6BMBLcjLl8L8NRERLVeIf/EuPqoqmq4K8owG29Xu7OypT/7/YT/0uKW6YitsKA+nLQ=="; + url = "https://registry.npmjs.org/sonic-boom/-/sonic-boom-0.6.2.tgz"; + sha512 = "JVftM6ZJanmU/akt+bfiHUKQq0MtRe0ayXyEXjB1yiZYRH6ettF4gu7Dbei4HbzTmBVNshHpPJLZ9R9lY2FjWA=="; }; }; "sorcery-0.10.0" = { @@ -30354,6 +32048,15 @@ let sha1 = "558e7f57a5bf6baf6501baf2ae2c9076c4502006"; }; }; + "source-list-map-0.1.8" = { + name = "source-list-map"; + packageName = "source-list-map"; + version = "0.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz"; + sha1 = "c550b2ab5427f6b3f21f5afead88c4f5587b2106"; + }; + }; "source-list-map-2.0.1" = { name = "source-list-map"; packageName = "source-list-map"; @@ -30584,7 +32287,7 @@ let packageName = "spdy"; version = "1.32.5"; src = fetchurl { - url = "https://registry.npmjs.org/spdy/-/spdy-1.32.5.tgz"; + url = "http://registry.npmjs.org/spdy/-/spdy-1.32.5.tgz"; sha1 = "70eff23cde4e97d52a445f65afddcc5695eb5edb"; }; }; @@ -31947,13 +33650,13 @@ let sha1 = "a4316ccb0d40a77d30dadf91f0f4db7e475f948a"; }; }; - "swagger-test-templates-1.5.0" = { + "swagger-test-templates-1.5.1" = { name = "swagger-test-templates"; packageName = "swagger-test-templates"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/swagger-test-templates/-/swagger-test-templates-1.5.0.tgz"; - sha512 = "1IBHCamO7uJuFo11a/aaA0ZPWJkAfiuvadmLO9TwXiY2Op+SigTL9er/GabuhK4gXMNJ2MaoPQ4F90HQlNFYJQ=="; + url = "https://registry.npmjs.org/swagger-test-templates/-/swagger-test-templates-1.5.1.tgz"; + sha512 = "p5EotTsyVunfNGvIr07r33Tij5p4r1aUv7QFvYYW3iO6pEUo2OXxINufkx8jBjD4/4hvP2ZlCjgLDexT2ClnGw=="; }; }; "swagger-tools-0.9.16" = { @@ -32164,13 +33867,13 @@ let sha512 = "pQNFsg+Wb6VXsrIPUnuQwrHR4wD5ASBR0jRyiT4/AALFA2Nl+CjhkDX5fTmIwCuULRtyQR3Dae2BBnP2EFHscw=="; }; }; - "tar-4.4.7" = { + "tar-4.4.8" = { name = "tar"; packageName = "tar"; - version = "4.4.7"; + version = "4.4.8"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-4.4.7.tgz"; - sha512 = "mR3MzsCdN0IEWjZRuF/J9gaWHnTwOvzjqPTcvi1xXgfKTDQRp39gRETPQEfPByAdEOGmZfx1HrRsn8estaEvtA=="; + url = "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz"; + sha512 = "LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ=="; }; }; "tar-fs-1.16.3" = { @@ -32281,6 +33984,15 @@ let sha1 = "a87ee424be01a1d28f2f301045043a5bcd679a05"; }; }; + "test-exclude-4.2.3" = { + name = "test-exclude"; + packageName = "test-exclude"; + version = "4.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/test-exclude/-/test-exclude-4.2.3.tgz"; + sha512 = "SYbXgY64PT+4GAL2ocI3HwPa4Q4TBKm0cwAVeKOt/Aoc0gSpNRjJX8w0pA1LMKZ3LBmd8pYBqApFNQLII9kavA=="; + }; + }; "text-extensions-1.9.0" = { name = "text-extensions"; packageName = "text-extensions"; @@ -32430,7 +34142,7 @@ let packageName = "through2"; version = "0.6.5"; src = fetchurl { - url = "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz"; + url = "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz"; sha1 = "41ab9c67b29d57209071410e1d7a7a968cd3ad48"; }; }; @@ -32439,10 +34151,19 @@ let packageName = "through2"; version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz"; + url = "http://registry.npmjs.org/through2/-/through2-2.0.3.tgz"; sha1 = "0004569b37c7c74ba39c43f3ced78d1ad94140be"; }; }; + "through2-2.0.5" = { + name = "through2"; + packageName = "through2"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz"; + sha512 = "/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ=="; + }; + }; "through2-filter-2.0.0" = { name = "through2-filter"; packageName = "through2-filter"; @@ -32722,6 +34443,15 @@ let sha1 = "297588b7b0e7e0ac08e04e672f85c1f4999e17af"; }; }; + "to-readable-stream-1.0.0" = { + name = "to-readable-stream"; + packageName = "to-readable-stream"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz"; + sha512 = "Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q=="; + }; + }; "to-regex-3.0.2" = { name = "to-regex"; packageName = "to-regex"; @@ -33703,6 +35433,15 @@ let sha512 = "KVGLW1Bri30x00yv4HNM8kBxoqFXr0Sbo55735nvrlsx4PYBZol3UtoWgO492fSwmsetzPEZzy73rbU8OGXJcA=="; }; }; + "unicode-canonical-property-names-ecmascript-1.0.4" = { + name = "unicode-canonical-property-names-ecmascript"; + packageName = "unicode-canonical-property-names-ecmascript"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz"; + sha512 = "jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ=="; + }; + }; "unicode-emoji-modifier-base-1.0.0" = { name = "unicode-emoji-modifier-base"; packageName = "unicode-emoji-modifier-base"; @@ -33712,6 +35451,33 @@ let sha1 = "dbbd5b54ba30f287e2a8d5a249da6c0cef369459"; }; }; + "unicode-match-property-ecmascript-1.0.4" = { + name = "unicode-match-property-ecmascript"; + packageName = "unicode-match-property-ecmascript"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz"; + sha512 = "L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg=="; + }; + }; + "unicode-match-property-value-ecmascript-1.0.2" = { + name = "unicode-match-property-value-ecmascript"; + packageName = "unicode-match-property-value-ecmascript"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.0.2.tgz"; + sha512 = "Rx7yODZC1L/T8XKo/2kNzVAQaRE88AaMvI1EF/Xnj3GW2wzN6fop9DDWuFAKUVFH7vozkz26DzP0qyWLKLIVPQ=="; + }; + }; + "unicode-property-aliases-ecmascript-1.0.4" = { + name = "unicode-property-aliases-ecmascript"; + packageName = "unicode-property-aliases-ecmascript"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.4.tgz"; + sha512 = "2WSLa6OdYd2ng8oqiGIWnJqyFArvhn+5vgx5GTxMbUYjCYKUcuKS62YLFF0R/BDGlB1yzXjQOLtPAfHsgirEpg=="; + }; + }; "unified-2.1.4" = { name = "unified"; packageName = "unified"; @@ -34396,6 +36162,15 @@ let sha512 = "yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="; }; }; + "v8-compile-cache-2.0.2" = { + name = "v8-compile-cache"; + packageName = "v8-compile-cache"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.0.2.tgz"; + sha512 = "1wFuMUIM16MDJRCrpbpuEPTUGmM5QMUg0cr3KFwra2XgOgFcPGDQHDh3CszSCD2Zewc/dh/pamNEW8CbfDebUw=="; + }; + }; "v8-debug-1.0.1" = { name = "v8-debug"; packageName = "v8-debug"; @@ -34468,13 +36243,13 @@ let sha1 = "5fa912d81eb7d0c74afc140de7317f0ca7df437e"; }; }; - "validator-10.8.0" = { + "validator-10.9.0" = { name = "validator"; packageName = "validator"; - version = "10.8.0"; + version = "10.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/validator/-/validator-10.8.0.tgz"; - sha512 = "mXqMxfCh5NLsVgYVKl9WvnHNDPCcbNppHSPPowu0VjtSsGWVY+z8hJF44edLR1nbLNzi3jYoYsIl8KZpioIk6g=="; + url = "https://registry.npmjs.org/validator/-/validator-10.9.0.tgz"; + sha512 = "hZJcZSWz9poXBlAkjjcsNAdrZ6JbjD3kWlNjq/+vE7RLLS/+8PAj3qVVwrwsOz/WL8jPmZ1hYkRvtlUeZAm4ug=="; }; }; "validator-5.2.0" = { @@ -34936,13 +36711,13 @@ let sha1 = "13587190f34e72ba7a07ebbaa7e70ac147b1fb7d"; }; }; - "vue-cli-plugin-apollo-0.17.3" = { + "vue-cli-plugin-apollo-0.17.4" = { name = "vue-cli-plugin-apollo"; packageName = "vue-cli-plugin-apollo"; - version = "0.17.3"; + version = "0.17.4"; src = fetchurl { - url = "https://registry.npmjs.org/vue-cli-plugin-apollo/-/vue-cli-plugin-apollo-0.17.3.tgz"; - sha512 = "IMKGkmwVAF8uAy5ngbE0XYze6i9PGSAnByqvVgLgT4YsjUHMwfyUoyVJuAtfJPZG2G+fVpcwArhBhucAWXbSXw=="; + url = "https://registry.npmjs.org/vue-cli-plugin-apollo/-/vue-cli-plugin-apollo-0.17.4.tgz"; + sha512 = "3bB+Vc4kqvZYF8NW9D77HcIQpqwfLM3MvQEDjRvKEFeN+ZdJ9jtmcg+CUPm7li6xMkYWyFJcOSyI8kMYRfYFcw=="; }; }; "walk-2.3.14" = { @@ -35044,6 +36819,33 @@ let sha512 = "YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="; }; }; + "webpack-4.25.1" = { + name = "webpack"; + packageName = "webpack"; + version = "4.25.1"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack/-/webpack-4.25.1.tgz"; + sha512 = "T0GU/3NRtO4tMfNzsvpdhUr8HnzA4LTdP2zd+e5zd6CdOH5vNKHnAlO+DvzccfhPdzqRrALOFcjYxx7K5DWmvA=="; + }; + }; + "webpack-cli-3.1.2" = { + name = "webpack-cli"; + packageName = "webpack-cli"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.1.2.tgz"; + sha512 = "Cnqo7CeqeSvC6PTdts+dywNi5CRlIPbLx1AoUPK2T6vC1YAugMG3IOoO9DmEscd+Dghw7uRlnzV1KwOe5IrtgQ=="; + }; + }; + "webpack-core-0.6.9" = { + name = "webpack-core"; + packageName = "webpack-core"; + version = "0.6.9"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.9.tgz"; + sha1 = "fc571588c8558da77be9efb6debdc5a3b172bdc2"; + }; + }; "webpack-sources-1.3.0" = { name = "webpack-sources"; packageName = "webpack-sources"; @@ -35098,15 +36900,6 @@ let sha512 = "dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng=="; }; }; - "whatwg-url-6.5.0" = { - name = "whatwg-url"; - packageName = "whatwg-url"; - version = "6.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.5.0.tgz"; - sha512 = "rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ=="; - }; - }; "whatwg-url-7.0.0" = { name = "whatwg-url"; packageName = "whatwg-url"; @@ -35206,6 +36999,15 @@ let sha1 = "670b3afbc552e0b55df6b7780ca74615f23ad1cb"; }; }; + "which-promise-1.0.0" = { + name = "which-promise"; + packageName = "which-promise"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/which-promise/-/which-promise-1.0.0.tgz"; + sha1 = "20b721df05b35b706176ffa10b0909aba4603035"; + }; + }; "wide-align-1.1.3" = { name = "wide-align"; packageName = "wide-align"; @@ -36026,22 +37828,22 @@ let sha512 = "Rjp+lMYQOWtgqojx1dEWorjCofi1YN7AoFvYV7b1gx/7dAAeuI4kN5SZiEvr0ZmsZTOpDRcCqrpI10L31tFkBw=="; }; }; - "yargs-12.0.1" = { + "yargs-12.0.2" = { name = "yargs"; packageName = "yargs"; - version = "12.0.1"; + version = "12.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-12.0.1.tgz"; - sha512 = "B0vRAp1hRX4jgIOWFtjfNjd9OA9RWYZ6tqGA9/I/IrTMsxmKvtWy+ersM+jzpQqbC3YfLzeABPdeTgcJ9eu1qQ=="; + url = "https://registry.npmjs.org/yargs/-/yargs-12.0.2.tgz"; + sha512 = "e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ=="; }; }; - "yargs-12.0.2" = { + "yargs-12.0.4" = { name = "yargs"; packageName = "yargs"; - version = "12.0.2"; + version = "12.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-12.0.2.tgz"; - sha512 = "e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ=="; + url = "https://registry.npmjs.org/yargs/-/yargs-12.0.4.tgz"; + sha512 = "f5esswlPO351AnejaO2A1ZZr0zesz19RehQKwiRDqWtrraWrJy16tsUIKgDXFMVytvNOHPVmTiaTh3wO67I0fQ=="; }; }; "yargs-3.10.0" = { @@ -36107,6 +37909,15 @@ let sha512 = "VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ=="; }; }; + "yargs-parser-11.1.0" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "11.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.0.tgz"; + sha512 = "lGA5HsbjkpCfekDBHAhgE5OE8xEoqiUDylowr+BvhRCwG1xVYTsd8hx2CYC0NY4k9RIgJeybFTG2EZW4P2aN1w=="; + }; + }; "yargs-parser-4.2.1" = { name = "yargs-parser"; packageName = "yargs-parser"; @@ -36596,9 +38407,9 @@ in sources."aws-sign2-0.6.0" sources."aws4-1.8.0" sources."azure-arm-authorization-2.0.0" - sources."azure-arm-batch-3.1.2" - sources."azure-arm-cdn-4.0.2" - sources."azure-arm-commerce-2.0.0" + sources."azure-arm-batch-3.2.0" + sources."azure-arm-cdn-4.1.0" + sources."azure-arm-commerce-2.1.0" sources."azure-arm-compute-3.0.0-preview" (sources."azure-arm-datalake-analytics-1.0.2-preview" // { dependencies = [ @@ -36643,11 +38454,11 @@ in sources."request-2.74.0" ]; }) - sources."azure-arm-resource-7.0.1" + sources."azure-arm-resource-7.1.0" sources."azure-arm-servermanagement-1.1.0" sources."azure-arm-storage-5.2.0" sources."azure-arm-trafficmanager-1.1.0-preview" - sources."azure-arm-website-5.5.0" + sources."azure-arm-website-5.6.0" sources."azure-asm-compute-0.18.0" sources."azure-asm-hdinsight-0.10.2" sources."azure-asm-mgmt-0.10.1" @@ -36681,7 +38492,7 @@ in sources."underscore-1.9.1" ]; }) - sources."azure-servicefabric-2.0.0" + sources."azure-servicefabric-2.1.0" (sources."azure-storage-2.10.2" // { dependencies = [ sources."readable-stream-2.0.6" @@ -37236,7 +39047,7 @@ in 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" @@ -37338,7 +39149,7 @@ 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" @@ -37980,7 +39791,7 @@ in sources."builtin-status-codes-3.0.0" sources."builtins-1.0.3" sources."bytes-3.0.0" - sources."cached-path-relative-1.0.1" + sources."cached-path-relative-1.0.2" sources."camelcase-4.1.0" sources."capture-stack-trace-1.0.1" sources."caseless-0.12.0" @@ -38366,7 +40177,7 @@ in sources."tar-2.2.1" sources."term-size-1.2.0" sources."through-2.3.8" - sources."through2-2.0.3" + sources."through2-2.0.5" sources."timed-out-4.0.1" sources."timers-browserify-1.4.2" sources."to-arraybuffer-1.0.1" @@ -38450,7 +40261,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.0" - sources."@types/node-10.12.2" + sources."@types/node-10.12.5" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.1.0" sources."ansi-regex-2.1.1" @@ -38911,7 +40722,7 @@ in sources."has-flag-3.0.0" sources."http-methods-0.1.0" sources."http-signature-1.2.0" - (sources."hypercore-6.20.2" // { + (sources."hypercore-6.21.0" // { dependencies = [ sources."process-nextick-args-1.0.7" sources."unordered-set-2.0.1" @@ -39101,7 +40912,7 @@ in sources."siphash24-1.1.1" sources."slice-ansi-1.0.0" sources."sodium-javascript-0.5.5" - sources."sodium-native-2.2.2" + sources."sodium-native-2.2.3" sources."sodium-universal-2.0.0" sources."sorted-array-functions-1.2.0" sources."sorted-indexof-1.0.0" @@ -39445,7 +41256,7 @@ in sources."readable-stream-2.3.6" sources."split2-2.2.0" sources."string_decoder-1.1.1" - sources."through2-2.0.3" + sources."through2-2.0.5" ]; }) sources."network-address-0.0.5" @@ -39518,10 +41329,10 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "4.0.3"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-4.0.3.tgz"; - sha512 = "Rxbsh4LWdIlMUO+NxET9g1xHZ9Q93i7jtPESYcCyEOnRiSsZXi/AF6UmCdvmM38IgHrklI2e4DwuG1OwRIGQAA=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-4.1.1.tgz"; + sha512 = "xOHUFO48K7bHLhx8hVuIZlz7i8Zn8NVmsMGqx1YUGhsmSb1zwW/dCUfBqEHvH4iPtJf9pQPpc51wad0SmvR5XQ=="; }; dependencies = [ sources."JSONStream-1.3.5" @@ -39530,12 +41341,13 @@ in sources."assert-plus-1.0.0" sources."async-2.6.1" sources."asynckit-0.4.0" - sources."aws-sdk-2.349.0" + sources."aws-sdk-2.353.0" sources."aws-sign2-0.7.0" sources."aws4-1.8.0" sources."base64-js-1.3.0" sources."bcrypt-pbkdf-1.0.2" sources."buffer-4.9.1" + sources."buffer-queue-1.0.0" sources."bytes-3.0.0" sources."caseless-0.12.0" sources."co-4.6.0" @@ -39557,6 +41369,7 @@ in sources."har-validator-5.1.0" sources."http-signature-1.2.0" sources."ieee754-1.1.8" + sources."inherits-2.0.3" sources."ini-1.3.5" sources."is-typedarray-1.0.0" sources."isarray-1.0.0" @@ -39576,20 +41389,24 @@ in sources."oauth-sign-0.9.0" sources."optimist-0.6.1" sources."performance-now-2.1.0" + sources."process-nextick-args-2.0.0" sources."psl-1.1.29" sources."punycode-1.3.2" sources."qs-6.5.2" sources."querystring-0.2.0" + sources."readable-stream-2.3.6" (sources."request-2.88.0" // { dependencies = [ sources."uuid-3.3.2" ]; }) sources."requestretry-3.0.2" + sources."s3-stream-upload-2.0.2" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.2.1" sources."sshpk-1.15.2" + sources."string_decoder-1.1.1" sources."through-2.3.8" (sources."tough-cookie-2.4.3" // { dependencies = [ @@ -39599,6 +41416,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."url-0.10.3" + sources."util-deprecate-1.0.2" sources."uuid-3.1.0" sources."verror-1.10.0" sources."when-3.7.8" @@ -40237,10 +42055,10 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "5.8.0"; + version = "5.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-5.8.0.tgz"; - sha512 = "Zok6Bru3y2JprqTNm14mgQ15YQu/SMDkWdnmHfFg770DIUlmMFd/gqqzCHekxzjHZJxXv3tmTpH0C1icaYJsRQ=="; + url = "https://registry.npmjs.org/eslint/-/eslint-5.9.0.tgz"; + sha512 = "g4KWpPdqN0nth+goDNICNXGfJF7nNnepthp46CAlJoJtC5K/cLu3NgCM3AHu1CkJ5Hzt9V0Y0PBAO6Ay/gGb+w=="; }; dependencies = [ sources."@babel/code-frame-7.0.0" @@ -40254,7 +42072,6 @@ in sources."argparse-1.0.10" sources."array-union-1.0.2" sources."array-uniq-1.0.3" - sources."arrify-1.0.1" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."caller-path-0.1.0" @@ -40270,7 +42087,7 @@ in sources."cross-spawn-6.0.5" sources."debug-4.1.0" sources."deep-is-0.1.3" - sources."del-2.2.2" + sources."del-3.0.0" sources."doctrine-2.1.0" sources."escape-string-regexp-1.0.5" sources."eslint-scope-4.0.0" @@ -40288,12 +42105,16 @@ in sources."fast-levenshtein-2.0.6" sources."figures-2.0.0" sources."file-entry-cache-2.0.0" - sources."flat-cache-1.3.0" + sources."flat-cache-1.3.2" sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" sources."glob-7.1.3" sources."globals-11.8.0" - sources."globby-5.0.0" + (sources."globby-6.1.0" // { + dependencies = [ + sources."pify-2.3.0" + ]; + }) sources."graceful-fs-4.1.15" sources."has-flag-3.0.0" sources."iconv-lite-0.4.24" @@ -40328,10 +42149,11 @@ in sources."onetime-2.0.1" sources."optionator-0.8.2" sources."os-tmpdir-1.0.2" + sources."p-map-1.2.0" sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" sources."path-key-2.0.1" - sources."pify-2.3.0" + sources."pify-3.0.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."pluralize-7.0.0" @@ -40397,7 +42219,6 @@ in sources."argparse-1.0.10" sources."array-union-1.0.2" sources."array-uniq-1.0.3" - sources."arrify-1.0.1" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."caller-path-0.1.0" @@ -40413,10 +42234,10 @@ in sources."cross-spawn-6.0.5" sources."debug-4.1.0" sources."deep-is-0.1.3" - sources."del-2.2.2" + sources."del-3.0.0" sources."doctrine-2.1.0" sources."escape-string-regexp-1.0.5" - sources."eslint-5.8.0" + sources."eslint-5.9.0" sources."eslint-scope-4.0.0" sources."eslint-utils-1.3.1" sources."eslint-visitor-keys-1.0.0" @@ -40432,12 +42253,16 @@ in sources."fast-levenshtein-2.0.6" sources."figures-2.0.0" sources."file-entry-cache-2.0.0" - sources."flat-cache-1.3.0" + sources."flat-cache-1.3.2" sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" sources."glob-7.1.3" sources."globals-11.8.0" - sources."globby-5.0.0" + (sources."globby-6.1.0" // { + dependencies = [ + sources."pify-2.3.0" + ]; + }) sources."graceful-fs-4.1.15" sources."has-flag-3.0.0" sources."iconv-lite-0.4.24" @@ -40473,11 +42298,12 @@ in sources."onetime-2.0.1" sources."optionator-0.8.2" sources."os-tmpdir-1.0.2" + sources."p-map-1.2.0" sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" sources."path-key-2.0.1" sources."path-parse-1.0.6" - sources."pify-2.3.0" + sources."pify-3.0.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."pluralize-7.0.0" @@ -41331,7 +43157,7 @@ in ]; }) sources."sodium-chloride-1.1.2" - sources."sodium-native-2.2.2" + sources."sodium-native-2.2.3" sources."split-buffer-1.0.0" sources."ssb-avatar-0.2.0" sources."ssb-client-4.6.0" @@ -41445,7 +43271,7 @@ in sources."babel-runtime-6.26.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" - sources."bluebird-3.5.2" + sources."bluebird-3.5.3" (sources."body-parser-1.18.3" // { dependencies = [ sources."iconv-lite-0.4.23" @@ -41675,7 +43501,7 @@ in sources."js-base64-2.4.9" sources."js-yaml-3.12.0" sources."jsbn-0.1.1" - sources."jsesc-2.5.1" + sources."jsesc-2.5.2" sources."json-schema-0.2.3" (sources."json-schema-ref-parser-3.3.1" // { dependencies = [ @@ -41790,7 +43616,7 @@ in dependencies = [ sources."debug-3.2.6" sources."dotenv-4.0.0" - sources."fs-extra-7.0.0" + sources."fs-extra-7.0.1" sources."ms-2.1.1" ]; }) @@ -41882,7 +43708,7 @@ in sources."sync-exec-0.6.2" sources."term-size-1.2.0" sources."through-2.3.8" - sources."through2-2.0.3" + sources."through2-2.0.5" sources."timed-out-4.0.1" sources."title-case-2.1.1" sources."tmp-0.0.33" @@ -41908,7 +43734,7 @@ in sources."utils-merge-1.0.1" sources."uuid-3.3.2" sources."validate-npm-package-license-3.0.4" - sources."validator-10.8.0" + sources."validator-10.9.0" sources."vary-1.1.2" sources."verror-1.10.0" sources."wcwidth-1.0.1" @@ -42635,7 +44461,7 @@ in sources."strip-ansi-3.0.1" sources."strip-bom-1.0.0" sources."supports-color-2.0.0" - (sources."through2-2.0.3" // { + (sources."through2-2.0.5" // { dependencies = [ sources."isarray-1.0.0" sources."readable-stream-2.3.6" @@ -43377,11 +45203,11 @@ in sources."shelljs-0.3.0" sources."signal-exit-3.0.2" sources."smart-buffer-1.1.15" - sources."snyk-1.108.0" + sources."snyk-1.108.2" sources."snyk-config-2.2.0" - sources."snyk-docker-plugin-1.12.1" + sources."snyk-docker-plugin-1.12.2" sources."snyk-go-plugin-1.6.0" - sources."snyk-gradle-plugin-2.1.0" + sources."snyk-gradle-plugin-2.1.1" sources."snyk-module-1.9.1" sources."snyk-mvn-plugin-2.0.0" (sources."snyk-nodejs-lockfile-parser-1.7.0" // { @@ -43806,7 +45632,7 @@ in sources."signal-exit-3.0.2" sources."slice-ansi-2.0.0" sources."smart-buffer-4.0.1" - sources."socks-2.2.1" + sources."socks-2.2.2" sources."socks-proxy-agent-4.0.1" sources."source-map-0.6.1" sources."split2-2.2.0" @@ -43837,14 +45663,14 @@ in ]; }) sources."supports-color-5.5.0" - (sources."tar-4.4.7" // { + (sources."tar-4.4.8" // { dependencies = [ sources."yallist-3.0.2" ]; }) sources."term-size-1.2.0" sources."through-2.3.8" - sources."through2-2.0.3" + sources."through2-2.0.5" sources."thunkify-2.1.2" sources."timed-out-4.0.1" sources."tmp-0.0.33" @@ -44289,7 +46115,7 @@ in sources."thenify-all-1.6.0" sources."thriftrw-3.11.3" sources."through-2.3.8" - sources."through2-2.0.3" + sources."through2-2.0.5" sources."trim-newlines-2.0.0" sources."trim-off-newlines-1.0.1" sources."type-detect-4.0.8" @@ -44350,7 +46176,7 @@ in }; dependencies = [ sources."babylon-7.0.0-beta.19" - sources."bluebird-3.5.2" + sources."bluebird-3.5.3" sources."catharsis-0.8.9" sources."escape-string-regexp-1.0.5" sources."graceful-fs-4.1.15" @@ -44551,7 +46377,7 @@ in sha512 = "qVNq7ZZ7ZbLdzorvSlRDadS0Rh5oyItaE95v6I4wbbuSiijxn7SnnsV6dvKlcXuO2jX7lK8tn9fBulx34K/Ejg=="; }; dependencies = [ - sources."@types/node-10.12.2" + sources."@types/node-10.12.5" sources."@types/semver-5.5.0" sources."abbrev-1.1.1" sources."commander-2.19.0" @@ -45011,7 +46837,7 @@ in sources."better-assert-1.0.2" sources."binary-extensions-1.12.0" sources."blob-0.0.5" - sources."bluebird-3.5.2" + sources."bluebird-3.5.3" sources."body-parser-1.18.3" sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { @@ -45621,7 +47447,7 @@ in sources."safe-buffer-5.1.2" sources."stream-shift-1.0.0" sources."string_decoder-1.1.1" - sources."through2-2.0.3" + sources."through2-2.0.5" sources."through2-filter-2.0.0" sources."to-absolute-glob-2.0.2" sources."to-through-2.0.0" @@ -45923,7 +47749,11 @@ in sources."@lerna/collect-updates-3.3.2" sources."@lerna/command-3.3.0" sources."@lerna/conventional-commits-3.4.1" - sources."@lerna/create-3.4.1" + (sources."@lerna/create-3.4.1" // { + dependencies = [ + sources."camelcase-4.1.0" + ]; + }) sources."@lerna/create-symlink-3.3.0" sources."@lerna/describe-ref-3.3.0" sources."@lerna/diff-3.3.0" @@ -46000,7 +47830,7 @@ in }) sources."bcrypt-pbkdf-1.0.2" sources."block-stream-0.0.9" - sources."bluebird-3.5.2" + sources."bluebird-3.5.3" sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { dependencies = [ @@ -46015,8 +47845,15 @@ in sources."cacache-11.3.1" sources."cache-base-1.0.1" sources."call-me-maybe-1.0.1" - sources."camelcase-4.1.0" - sources."camelcase-keys-4.2.0" + sources."caller-callsite-2.0.0" + sources."caller-path-2.0.0" + sources."callsites-2.0.0" + sources."camelcase-5.0.0" + (sources."camelcase-keys-4.2.0" // { + dependencies = [ + sources."camelcase-4.1.0" + ]; + }) sources."caseless-0.12.0" sources."chalk-2.4.1" sources."chardet-0.7.0" @@ -46077,7 +47914,7 @@ in sources."copy-concurrently-1.0.5" sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" - sources."cosmiconfig-5.0.6" + sources."cosmiconfig-5.0.7" sources."cross-spawn-6.0.5" sources."currently-unhandled-0.4.1" sources."cyclist-0.2.2" @@ -46086,10 +47923,9 @@ in sources."dateformat-3.0.3" sources."debug-2.6.9" sources."debuglog-1.0.1" - sources."decamelize-2.0.0" + sources."decamelize-1.2.0" (sources."decamelize-keys-1.1.0" // { dependencies = [ - sources."decamelize-1.2.0" sources."map-obj-1.0.1" ]; }) @@ -46168,7 +48004,7 @@ in sources."form-data-2.3.3" sources."fragment-cache-0.2.1" sources."from2-2.3.0" - sources."fs-extra-7.0.0" + sources."fs-extra-7.0.1" sources."fs-minipass-1.2.5" sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" @@ -46185,7 +48021,6 @@ in dependencies = [ sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."decamelize-1.2.0" sources."find-up-1.1.2" sources."indent-string-2.1.0" sources."load-json-file-1.1.0" @@ -46255,6 +48090,11 @@ in sources."iferr-0.1.5" sources."ignore-3.3.10" sources."ignore-walk-3.0.1" + (sources."import-fresh-2.0.0" // { + dependencies = [ + sources."resolve-from-3.0.0" + ]; + }) sources."import-local-1.0.0" sources."imurmurhash-0.1.4" sources."indent-string-3.2.0" @@ -46553,7 +48393,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."socks-2.2.1" + sources."socks-2.2.2" sources."socks-proxy-agent-4.0.1" sources."sort-keys-2.0.0" sources."source-map-0.5.7" @@ -46601,7 +48441,7 @@ in sources."strip-indent-2.0.0" sources."strong-log-transformer-2.0.0" sources."supports-color-5.5.0" - (sources."tar-4.4.7" // { + (sources."tar-4.4.8" // { dependencies = [ sources."yallist-3.0.2" ]; @@ -46610,7 +48450,7 @@ in sources."temp-write-3.4.0" sources."text-extensions-1.9.0" sources."through-2.3.8" - sources."through2-2.0.3" + sources."through2-2.0.5" sources."tmp-0.0.33" (sources."to-object-path-0.3.0" // { dependencies = [ @@ -46681,12 +48521,11 @@ in sources."write-file-atomic-2.3.0" sources."write-json-file-2.3.0" sources."write-pkg-3.2.0" - sources."xregexp-4.0.0" sources."xtend-4.0.1" sources."y18n-4.0.0" sources."yallist-2.1.2" - sources."yargs-12.0.2" - sources."yargs-parser-10.1.0" + sources."yargs-12.0.4" + sources."yargs-parser-11.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -47700,6 +49539,1257 @@ in production = true; bypassCache = true; }; + "lumo-build-deps-../interpreters/clojurescript/lumo" = nodeEnv.buildNodePackage { + name = "lumo-build-deps"; + packageName = "lumo-build-deps"; + version = "1.9.0"; + src = ../interpreters/clojurescript/lumo; + dependencies = [ + sources."@babel/code-frame-7.0.0" + sources."@babel/core-7.1.5" + sources."@babel/generator-7.1.5" + sources."@babel/helper-annotate-as-pure-7.0.0" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.1.0" + sources."@babel/helper-call-delegate-7.1.0" + sources."@babel/helper-define-map-7.1.0" + sources."@babel/helper-explode-assignable-expression-7.1.0" + sources."@babel/helper-function-name-7.1.0" + sources."@babel/helper-get-function-arity-7.0.0" + sources."@babel/helper-hoist-variables-7.0.0" + sources."@babel/helper-member-expression-to-functions-7.0.0" + sources."@babel/helper-module-imports-7.0.0" + sources."@babel/helper-module-transforms-7.1.0" + sources."@babel/helper-optimise-call-expression-7.0.0" + sources."@babel/helper-plugin-utils-7.0.0" + sources."@babel/helper-regex-7.0.0" + sources."@babel/helper-remap-async-to-generator-7.1.0" + sources."@babel/helper-replace-supers-7.1.0" + sources."@babel/helper-simple-access-7.1.0" + sources."@babel/helper-split-export-declaration-7.0.0" + sources."@babel/helper-wrap-function-7.1.0" + sources."@babel/helpers-7.1.5" + sources."@babel/highlight-7.0.0" + sources."@babel/parser-7.1.5" + sources."@babel/plugin-external-helpers-7.0.0" + sources."@babel/plugin-proposal-async-generator-functions-7.1.0" + sources."@babel/plugin-proposal-class-properties-7.1.0" + sources."@babel/plugin-proposal-json-strings-7.0.0" + sources."@babel/plugin-proposal-object-rest-spread-7.0.0" + sources."@babel/plugin-proposal-optional-catch-binding-7.0.0" + sources."@babel/plugin-proposal-unicode-property-regex-7.0.0" + sources."@babel/plugin-syntax-async-generators-7.0.0" + sources."@babel/plugin-syntax-class-properties-7.0.0" + sources."@babel/plugin-syntax-json-strings-7.0.0" + sources."@babel/plugin-syntax-object-rest-spread-7.0.0" + sources."@babel/plugin-syntax-optional-catch-binding-7.0.0" + sources."@babel/plugin-transform-arrow-functions-7.0.0" + sources."@babel/plugin-transform-async-to-generator-7.1.0" + sources."@babel/plugin-transform-block-scoped-functions-7.0.0" + sources."@babel/plugin-transform-block-scoping-7.1.5" + sources."@babel/plugin-transform-classes-7.1.0" + sources."@babel/plugin-transform-computed-properties-7.0.0" + sources."@babel/plugin-transform-destructuring-7.1.3" + sources."@babel/plugin-transform-dotall-regex-7.0.0" + sources."@babel/plugin-transform-duplicate-keys-7.0.0" + sources."@babel/plugin-transform-exponentiation-operator-7.1.0" + sources."@babel/plugin-transform-for-of-7.0.0" + sources."@babel/plugin-transform-function-name-7.1.0" + sources."@babel/plugin-transform-literals-7.0.0" + sources."@babel/plugin-transform-modules-amd-7.1.0" + sources."@babel/plugin-transform-modules-commonjs-7.1.0" + sources."@babel/plugin-transform-modules-systemjs-7.1.3" + sources."@babel/plugin-transform-modules-umd-7.1.0" + sources."@babel/plugin-transform-new-target-7.0.0" + sources."@babel/plugin-transform-object-super-7.1.0" + sources."@babel/plugin-transform-parameters-7.1.0" + sources."@babel/plugin-transform-regenerator-7.0.0" + sources."@babel/plugin-transform-runtime-7.1.0" + sources."@babel/plugin-transform-shorthand-properties-7.0.0" + sources."@babel/plugin-transform-spread-7.0.0" + sources."@babel/plugin-transform-sticky-regex-7.0.0" + sources."@babel/plugin-transform-template-literals-7.0.0" + sources."@babel/plugin-transform-typeof-symbol-7.0.0" + sources."@babel/plugin-transform-unicode-regex-7.0.0" + sources."@babel/preset-env-7.1.5" + sources."@babel/preset-stage-2-7.0.0" + sources."@babel/runtime-7.1.5" + sources."@babel/template-7.1.2" + sources."@babel/traverse-7.1.5" + sources."@babel/types-7.1.5" + sources."@calebboyd/semaphore-1.3.1" + sources."@comandeer/babel-plugin-banner-4.0.0" + sources."@mrmlnc/readdir-enhanced-2.2.1" + sources."@nodelib/fs.stat-1.1.3" + sources."@sindresorhus/is-0.7.0" + sources."@szmarczak/http-timer-1.1.1" + sources."@types/estree-0.0.39" + sources."@types/node-10.12.5" + sources."@webassemblyjs/ast-1.7.11" + sources."@webassemblyjs/floating-point-hex-parser-1.7.11" + sources."@webassemblyjs/helper-api-error-1.7.11" + sources."@webassemblyjs/helper-buffer-1.7.11" + sources."@webassemblyjs/helper-code-frame-1.7.11" + sources."@webassemblyjs/helper-fsm-1.7.11" + sources."@webassemblyjs/helper-module-context-1.7.11" + sources."@webassemblyjs/helper-wasm-bytecode-1.7.11" + sources."@webassemblyjs/helper-wasm-section-1.7.11" + sources."@webassemblyjs/ieee754-1.7.11" + sources."@webassemblyjs/leb128-1.7.11" + sources."@webassemblyjs/utf8-1.7.11" + sources."@webassemblyjs/wasm-edit-1.7.11" + sources."@webassemblyjs/wasm-gen-1.7.11" + sources."@webassemblyjs/wasm-opt-1.7.11" + sources."@webassemblyjs/wasm-parser-1.7.11" + sources."@webassemblyjs/wast-parser-1.7.11" + sources."@webassemblyjs/wast-printer-1.7.11" + sources."@xtuc/ieee754-1.2.0" + sources."@xtuc/long-4.2.1" + sources."ace.improved-0.2.1" + sources."acorn-5.7.3" + sources."acorn-dynamic-import-3.0.0" + sources."ajv-6.5.5" + sources."ajv-keywords-3.2.0" + sources."amdefine-1.0.1" + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + (sources."anymatch-2.0.0" // { + dependencies = [ + sources."arr-diff-4.0.0" + sources."array-unique-0.3.2" + sources."braces-2.3.2" + sources."debug-2.6.9" + sources."define-property-1.0.0" + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."define-property-0.2.5" + ]; + }) + sources."extend-shallow-2.0.1" + sources."extglob-2.0.4" + sources."fill-range-4.0.0" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."isobject-3.0.1" + sources."kind-of-6.0.2" + sources."micromatch-3.1.10" + sources."ms-2.0.0" + ]; + }) + sources."app-builder-5.2.0" + sources."aproba-1.2.0" + (sources."archive-type-4.0.0" // { + dependencies = [ + sources."file-type-4.4.0" + ]; + }) + sources."arr-diff-2.0.0" + sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" + sources."array-union-1.0.2" + sources."array-uniq-1.0.3" + sources."array-unique-0.2.1" + sources."arrify-1.0.1" + sources."asn1.js-4.10.1" + (sources."assert-1.4.1" // { + dependencies = [ + sources."inherits-2.0.1" + sources."util-0.10.3" + ]; + }) + sources."assign-symbols-1.0.0" + sources."async-each-1.0.1" + sources."async-retry-1.2.3" + sources."atob-2.1.2" + (sources."babel-code-frame-6.26.0" // { + dependencies = [ + sources."chalk-1.1.3" + sources."js-tokens-3.0.2" + ]; + }) + sources."babel-core-7.0.0-bridge.0" + sources."babel-eslint-10.0.1" + (sources."babel-generator-6.26.1" // { + dependencies = [ + sources."jsesc-1.3.0" + ]; + }) + sources."babel-helper-evaluate-path-0.5.0" + sources."babel-helper-flip-expressions-0.4.3" + sources."babel-helper-is-nodes-equiv-0.0.1" + sources."babel-helper-is-void-0-0.4.3" + sources."babel-helper-mark-eval-scopes-0.4.3" + sources."babel-helper-remove-or-void-0.4.3" + sources."babel-helper-to-multiple-sequence-expressions-0.5.0" + sources."babel-jest-23.6.0" + sources."babel-loader-8.0.4" + sources."babel-messages-6.23.0" + sources."babel-plugin-istanbul-4.1.6" + sources."babel-plugin-jest-hoist-23.2.0" + sources."babel-plugin-minify-builtins-0.5.0" + sources."babel-plugin-minify-constant-folding-0.5.0" + sources."babel-plugin-minify-dead-code-elimination-0.5.0" + sources."babel-plugin-minify-flip-comparisons-0.4.3" + sources."babel-plugin-minify-guarded-expressions-0.4.3" + sources."babel-plugin-minify-infinity-0.4.3" + sources."babel-plugin-minify-mangle-names-0.5.0" + sources."babel-plugin-minify-numeric-literals-0.4.3" + sources."babel-plugin-minify-replace-0.5.0" + sources."babel-plugin-minify-simplify-0.5.0" + sources."babel-plugin-minify-type-constructors-0.4.3" + sources."babel-plugin-syntax-flow-6.18.0" + sources."babel-plugin-syntax-object-rest-spread-6.13.0" + sources."babel-plugin-transform-flow-strip-types-6.22.0" + sources."babel-plugin-transform-inline-consecutive-adds-0.4.3" + sources."babel-plugin-transform-member-expression-literals-6.9.4" + sources."babel-plugin-transform-merge-sibling-variables-6.9.4" + sources."babel-plugin-transform-minify-booleans-6.9.4" + sources."babel-plugin-transform-property-literals-6.9.4" + sources."babel-plugin-transform-regexp-constructors-0.4.3" + sources."babel-plugin-transform-remove-console-6.9.4" + sources."babel-plugin-transform-remove-debugger-6.9.4" + sources."babel-plugin-transform-remove-undefined-0.5.0" + sources."babel-plugin-transform-simplify-comparison-operators-6.9.4" + sources."babel-plugin-transform-undefined-to-void-6.9.4" + sources."babel-preset-jest-23.2.0" + sources."babel-preset-minify-0.5.0" + (sources."babel-runtime-6.26.0" // { + dependencies = [ + sources."regenerator-runtime-0.11.1" + ]; + }) + sources."babel-template-6.26.0" + (sources."babel-traverse-6.26.0" // { + dependencies = [ + sources."debug-2.6.9" + sources."globals-9.18.0" + sources."ms-2.0.0" + ]; + }) + (sources."babel-types-6.26.0" // { + dependencies = [ + sources."to-fast-properties-1.0.3" + ]; + }) + sources."babylon-6.18.0" + sources."balanced-match-1.0.0" + (sources."base-0.11.2" // { + dependencies = [ + sources."define-property-1.0.0" + sources."isobject-3.0.1" + ]; + }) + sources."base64-js-0.0.8" + sources."big.js-3.2.0" + sources."binary-extensions-1.12.0" + sources."bl-1.2.2" + sources."bluebird-3.5.3" + sources."bn.js-4.11.8" + sources."brace-expansion-1.1.11" + sources."braces-1.8.5" + sources."brorand-1.1.0" + sources."browserify-aes-1.2.0" + sources."browserify-cipher-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."browserslist-4.3.4" + sources."buffer-3.6.0" + sources."buffer-alloc-1.2.0" + sources."buffer-alloc-unsafe-1.1.0" + sources."buffer-crc32-0.2.13" + sources."buffer-fill-1.0.0" + sources."buffer-from-1.1.1" + sources."buffer-xor-1.0.3" + sources."builtin-modules-1.1.1" + sources."builtin-status-codes-3.0.0" + sources."cacache-10.0.4" + (sources."cache-base-1.0.1" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) + (sources."cacheable-request-2.1.4" // { + dependencies = [ + sources."lowercase-keys-1.0.0" + ]; + }) + sources."call-me-maybe-1.0.1" + sources."camelcase-5.0.0" + sources."caniuse-lite-1.0.30000907" + sources."caw-2.0.1" + (sources."chalk-2.4.1" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."supports-color-5.5.0" + ]; + }) + sources."cherow-1.6.8" + (sources."chokidar-2.0.4" // { + dependencies = [ + sources."array-unique-0.3.2" + sources."braces-2.3.2" + sources."extend-shallow-2.0.1" + sources."fill-range-4.0.0" + (sources."glob-parent-3.1.0" // { + dependencies = [ + sources."is-glob-3.1.0" + ]; + }) + sources."is-extglob-2.1.1" + sources."is-glob-4.0.0" + sources."is-number-3.0.0" + sources."isobject-3.0.1" + ]; + }) + sources."chownr-1.1.1" + sources."chrome-trace-event-1.0.0" + sources."cipher-base-1.0.4" + (sources."class-utils-0.3.6" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."isobject-3.0.1" + sources."kind-of-5.1.0" + ]; + }) + sources."cli-cursor-2.1.0" + sources."cli-spinners-1.3.1" + (sources."cliui-4.1.0" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."strip-ansi-4.0.0" + ]; + }) + sources."clone-2.1.2" + sources."clone-buffer-1.0.0" + sources."clone-response-1.0.2" + sources."clone-stats-1.0.0" + sources."cloneable-readable-1.1.2" + 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."commander-2.14.1" + sources."commondir-1.0.1" + sources."component-emitter-1.2.1" + sources."concat-map-0.0.1" + sources."concat-stream-1.6.2" + sources."config-chain-1.1.12" + sources."console-browserify-1.1.0" + sources."constants-browserify-1.0.0" + sources."content-disposition-0.5.2" + sources."convert-source-map-1.6.0" + sources."copy-concurrently-1.0.5" + sources."copy-descriptor-0.1.1" + sources."core-js-2.5.7" + sources."core-util-is-1.0.2" + sources."create-ecdh-4.0.3" + sources."create-hash-1.2.0" + sources."create-hmac-1.1.7" + sources."cross-env-5.2.0" + sources."cross-spawn-6.0.5" + sources."crypto-browserify-3.12.0" + sources."cyclist-0.2.2" + sources."date-now-0.1.4" + sources."death-1.1.0" + sources."debug-3.2.6" + sources."decamelize-1.2.0" + sources."decode-uri-component-0.2.0" + sources."decompress-4.2.0" + sources."decompress-response-3.3.0" + (sources."decompress-tar-4.1.1" // { + dependencies = [ + sources."file-type-5.2.0" + ]; + }) + (sources."decompress-tarbz2-4.1.1" // { + dependencies = [ + sources."file-type-6.2.0" + ]; + }) + (sources."decompress-targz-4.1.1" // { + dependencies = [ + sources."file-type-5.2.0" + ]; + }) + (sources."decompress-unzip-4.0.1" // { + dependencies = [ + sources."file-type-3.9.0" + sources."get-stream-2.3.1" + ]; + }) + (sources."defaults-1.0.3" // { + dependencies = [ + sources."clone-1.0.4" + ]; + }) + sources."defer-to-connect-1.0.1" + sources."define-properties-1.1.3" + (sources."define-property-2.0.2" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) + sources."des.js-1.0.0" + sources."detect-indent-4.0.0" + sources."diffie-hellman-5.0.3" + (sources."dir-glob-2.0.0" // { + dependencies = [ + sources."path-type-3.0.0" + sources."pify-3.0.0" + ]; + }) + sources."domain-browser-1.2.0" + (sources."download-7.1.0" // { + dependencies = [ + sources."got-8.3.2" + sources."pify-3.0.0" + ]; + }) + sources."duplexer3-0.1.4" + sources."duplexify-3.6.1" + sources."electron-to-chromium-1.3.84" + sources."elliptic-6.4.1" + sources."emojis-list-2.1.0" + sources."end-of-stream-1.4.1" + sources."enhanced-resolve-4.1.0" + sources."errno-0.1.7" + sources."error-ex-1.3.2" + sources."es-abstract-1.12.0" + sources."es-to-primitive-1.2.0" + sources."escape-string-regexp-1.0.5" + sources."eslint-scope-3.7.1" + sources."eslint-visitor-keys-1.0.0" + sources."esrecurse-4.2.1" + sources."estraverse-4.2.0" + sources."estree-walker-0.5.2" + sources."esutils-2.0.2" + sources."events-1.1.1" + sources."evp_bytestokey-1.0.3" + sources."execa-0.10.0" + sources."expand-brackets-0.1.5" + sources."expand-range-1.8.2" + sources."ext-list-2.2.2" + sources."ext-name-5.0.0" + (sources."extend-shallow-3.0.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + sources."extglob-0.3.2" + sources."fast-deep-equal-2.0.1" + (sources."fast-glob-2.2.3" // { + dependencies = [ + sources."arr-diff-4.0.0" + sources."array-unique-0.3.2" + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."debug-2.6.9" + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + ]; + }) + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + ]; + }) + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (sources."glob-parent-3.1.0" // { + dependencies = [ + sources."is-glob-3.1.0" + ]; + }) + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."is-extglob-2.1.1" + sources."is-glob-4.0.0" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."isobject-3.0.1" + sources."kind-of-6.0.2" + sources."micromatch-3.1.10" + sources."ms-2.0.0" + ]; + }) + sources."fast-json-stable-stringify-2.0.0" + sources."fd-slicer-1.1.0" + sources."file-type-8.1.0" + sources."filename-regex-2.0.1" + sources."filename-reserved-regex-2.0.0" + sources."filenamify-2.1.0" + sources."fill-range-2.2.4" + sources."find-cache-dir-1.0.0" + sources."find-up-2.1.0" + sources."flow-bin-0.85.0" + sources."flush-write-stream-1.0.3" + sources."for-in-1.0.2" + sources."for-own-0.1.5" + sources."fragment-cache-0.2.1" + sources."from2-2.3.0" + sources."fs-constants-1.0.0" + sources."fs-write-stream-atomic-1.0.10" + sources."fs.realpath-1.0.0" + sources."fsevents-1.2.4" + sources."function-bind-1.1.1" + sources."get-caller-file-1.0.3" + sources."get-proxy-2.1.0" + sources."get-stream-3.0.0" + sources."get-value-2.0.6" + sources."glob-7.1.3" + sources."glob-base-0.3.0" + sources."glob-parent-2.0.0" + sources."glob-to-regexp-0.3.0" + sources."global-modules-path-2.3.0" + sources."globals-11.8.0" + (sources."globby-8.0.1" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) + (sources."google-closure-compiler-js-20170910.0.1" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) + (sources."got-9.3.2" // { + dependencies = [ + sources."@sindresorhus/is-0.12.0" + sources."cacheable-request-5.1.0" + sources."get-stream-4.1.0" + sources."http-cache-semantics-4.0.0" + sources."normalize-url-3.3.0" + sources."p-cancelable-1.0.0" + ]; + }) + sources."graceful-fs-4.1.15" + sources."graceful-readlink-1.0.1" + sources."has-1.0.3" + sources."has-ansi-2.0.0" + sources."has-flag-3.0.0" + sources."has-symbol-support-x-1.4.2" + sources."has-symbols-1.0.0" + sources."has-to-string-tag-x-1.4.1" + (sources."has-value-1.0.0" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) + (sources."has-values-1.0.0" // { + dependencies = [ + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."kind-of-4.0.0" + ]; + }) + sources."hash-base-3.0.4" + sources."hash.js-1.1.5" + sources."hmac-drbg-1.0.1" + sources."hosted-git-info-2.7.1" + sources."http-cache-semantics-3.8.1" + sources."https-browserify-1.0.0" + sources."ieee754-1.1.12" + sources."iferr-0.1.5" + sources."ignore-3.3.10" + (sources."import-local-2.0.0" // { + dependencies = [ + sources."find-up-3.0.0" + sources."locate-path-3.0.0" + sources."p-limit-2.0.0" + sources."p-locate-3.0.0" + sources."p-try-2.0.0" + sources."pkg-dir-3.0.0" + ]; + }) + sources."imurmurhash-0.1.4" + sources."indexof-0.0.1" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."ini-1.3.5" + sources."interpret-1.1.0" + sources."into-stream-3.1.0" + sources."invariant-2.2.4" + sources."invert-kv-2.0.0" + (sources."is-accessor-descriptor-1.0.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + sources."is-arrayish-0.2.1" + sources."is-binary-path-1.0.1" + sources."is-buffer-1.1.6" + sources."is-builtin-module-1.0.0" + sources."is-callable-1.1.4" + (sources."is-data-descriptor-1.0.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + sources."is-date-object-1.0.1" + (sources."is-descriptor-1.0.2" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + sources."is-dotfile-1.0.3" + sources."is-equal-shallow-0.1.3" + sources."is-extendable-0.1.1" + sources."is-extglob-1.0.0" + sources."is-finite-1.0.2" + sources."is-fullwidth-code-point-1.0.0" + sources."is-glob-2.0.1" + sources."is-module-1.0.0" + sources."is-natural-number-4.0.1" + sources."is-number-2.1.0" + sources."is-object-1.0.1" + sources."is-plain-obj-1.1.0" + (sources."is-plain-object-2.0.4" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) + sources."is-posix-bracket-0.1.1" + sources."is-primitive-2.0.0" + sources."is-regex-1.0.4" + sources."is-retry-allowed-1.1.0" + sources."is-stream-1.1.0" + sources."is-symbol-1.0.2" + sources."is-utf8-0.2.1" + sources."is-windows-1.0.2" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isobject-2.1.0" + sources."istanbul-lib-coverage-1.2.1" + sources."istanbul-lib-instrument-1.10.2" + sources."isurl-1.0.0" + sources."js-levenshtein-1.1.4" + sources."js-tokens-4.0.0" + sources."jsesc-2.5.2" + sources."json-buffer-3.0.0" + sources."json-parse-better-errors-1.0.2" + sources."json-schema-traverse-0.4.1" + sources."json5-0.5.1" + sources."jszip-git://github.com/anmonteiro/jszip#patch-1" + sources."keyv-3.0.0" + sources."kind-of-3.2.2" + sources."lcid-2.0.0" + sources."load-json-file-1.1.0" + sources."loader-runner-2.3.1" + sources."loader-utils-1.1.0" + sources."locate-path-2.0.0" + sources."lodash-4.17.11" + sources."lodash.debounce-4.0.8" + sources."lodash.isplainobject-4.0.6" + sources."lodash.some-4.6.0" + sources."log-symbols-2.2.0" + sources."loose-envify-1.4.0" + sources."lowercase-keys-1.0.1" + sources."lru-cache-4.1.3" + sources."magic-string-0.25.1" + (sources."make-dir-1.3.0" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) + sources."map-age-cleaner-0.1.2" + sources."map-cache-0.2.2" + sources."map-visit-1.0.0" + sources."math-random-1.0.1" + sources."md5.js-1.3.5" + sources."mem-4.0.0" + sources."memory-fs-0.4.1" + sources."merge2-1.2.3" + sources."micromatch-2.3.11" + sources."miller-rabin-4.0.1" + sources."mime-db-1.37.0" + sources."mimic-fn-1.2.0" + sources."mimic-response-1.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."mississippi-2.0.0" // { + dependencies = [ + sources."pump-2.0.1" + ]; + }) + (sources."mixin-deep-1.3.1" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + sources."mkdirp-0.5.1" + sources."move-concurrently-1.0.1" + sources."ms-2.1.1" + sources."multistream-2.1.1" + sources."nan-2.11.1" + (sources."nanomatch-1.2.13" // { + dependencies = [ + sources."arr-diff-4.0.0" + sources."array-unique-0.3.2" + sources."kind-of-6.0.2" + ]; + }) + sources."neo-async-2.6.0" + (sources."nexe-3.0.0-beta.7" // { + dependencies = [ + sources."minimist-1.2.0" + sources."pify-4.0.1" + ]; + }) + sources."nice-try-1.0.5" + sources."node-fetch-2.2.1" + (sources."node-libs-browser-2.1.0" // { + dependencies = [ + sources."base64-js-1.3.0" + sources."buffer-4.9.1" + sources."punycode-1.4.1" + ]; + }) + sources."node-releases-1.0.3" + sources."normalize-package-data-2.4.0" + sources."normalize-path-2.1.1" + (sources."normalize-url-2.0.1" // { + dependencies = [ + sources."sort-keys-2.0.0" + ]; + }) + (sources."npm-conf-1.1.3" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) + sources."npm-run-path-2.0.2" + sources."number-is-nan-1.0.1" + sources."object-assign-4.1.1" + (sources."object-copy-0.1.0" // { + dependencies = [ + sources."define-property-0.2.5" + sources."is-accessor-descriptor-0.1.6" + sources."is-data-descriptor-0.1.4" + (sources."is-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + ]; + }) + sources."object-keys-1.0.12" + (sources."object-visit-1.0.1" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) + sources."object.getownpropertydescriptors-2.0.3" + sources."object.omit-2.0.1" + (sources."object.pick-1.3.0" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) + sources."once-1.4.0" + sources."onetime-2.0.1" + (sources."ora-3.0.0" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."strip-ansi-4.0.0" + ]; + }) + sources."os-browserify-0.3.0" + sources."os-locale-3.0.1" + sources."p-cancelable-0.4.1" + sources."p-defer-1.0.0" + sources."p-event-2.1.0" + sources."p-finally-1.0.0" + sources."p-is-promise-1.1.0" + sources."p-limit-1.3.0" + sources."p-locate-2.0.0" + sources."p-timeout-2.0.1" + sources."p-try-1.0.0" + sources."pako-1.0.6" + sources."parallel-transform-1.1.0" + sources."paredit.js-0.3.4" + sources."parse-asn1-5.1.1" + sources."parse-glob-3.0.4" + sources."parse-json-2.2.0" + sources."pascalcase-0.1.1" + sources."path-browserify-0.0.0" + sources."path-dirname-1.0.2" + sources."path-exists-3.0.0" + sources."path-is-absolute-1.0.1" + sources."path-key-2.0.1" + sources."path-parse-1.0.6" + sources."path-type-1.1.0" + sources."pbkdf2-3.0.17" + sources."pend-1.2.0" + sources."pify-2.3.0" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + sources."pkg-dir-2.0.0" + sources."posix-character-classes-0.1.1" + sources."posix-getopt-git://github.com/anmonteiro/node-getopt#master" + sources."prepend-http-2.0.0" + sources."preserve-0.2.0" + sources."prettier-1.15.1" + sources."private-0.1.8" + sources."process-0.11.10" + sources."process-nextick-args-2.0.0" + sources."progress-2.0.1" + sources."promise-inflight-1.0.1" + sources."proto-list-1.2.4" + sources."prr-1.0.1" + sources."pseudomap-1.0.2" + sources."public-encrypt-4.0.3" + sources."pump-3.0.0" + (sources."pumpify-1.5.1" // { + dependencies = [ + sources."pump-2.0.1" + ]; + }) + sources."punycode-2.1.1" + sources."query-string-5.1.1" + sources."querystring-0.2.0" + sources."querystring-es3-0.2.1" + (sources."randomatic-3.1.1" // { + dependencies = [ + sources."is-number-4.0.0" + sources."kind-of-6.0.2" + ]; + }) + sources."randombytes-2.0.6" + sources."randomfill-1.0.4" + (sources."read-pkg-4.0.1" // { + dependencies = [ + sources."parse-json-4.0.0" + sources."pify-3.0.0" + ]; + }) + (sources."read-pkg-up-1.0.1" // { + dependencies = [ + sources."find-up-1.1.2" + sources."path-exists-2.1.0" + sources."read-pkg-1.1.0" + ]; + }) + sources."readable-stream-2.3.6" + (sources."readdirp-2.2.1" // { + dependencies = [ + sources."arr-diff-4.0.0" + sources."array-unique-0.3.2" + sources."braces-2.3.2" + sources."debug-2.6.9" + sources."define-property-1.0.0" + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."define-property-0.2.5" + ]; + }) + sources."extend-shallow-2.0.1" + sources."extglob-2.0.4" + sources."fill-range-4.0.0" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."isobject-3.0.1" + sources."kind-of-6.0.2" + sources."micromatch-3.1.10" + sources."ms-2.0.0" + ]; + }) + sources."regenerate-1.4.0" + sources."regenerate-unicode-properties-7.0.0" + sources."regenerator-runtime-0.12.1" + sources."regenerator-transform-0.13.3" + sources."regex-cache-0.4.4" + sources."regex-not-1.0.2" + sources."regexpu-core-4.2.0" + sources."regjsgen-0.4.0" + (sources."regjsparser-0.3.0" // { + dependencies = [ + sources."jsesc-0.5.0" + ]; + }) + sources."remove-trailing-separator-1.1.0" + sources."repeat-element-1.1.3" + sources."repeat-string-1.6.1" + sources."repeating-2.0.1" + sources."replace-ext-1.0.0" + sources."require-directory-2.1.1" + sources."require-main-filename-1.0.1" + sources."resolve-1.8.1" + sources."resolve-cwd-2.0.0" + (sources."resolve-dependencies-2.1.1" // { + dependencies = [ + sources."pify-4.0.1" + ]; + }) + sources."resolve-from-3.0.0" + sources."resolve-url-0.2.1" + sources."responselike-1.0.2" + sources."restore-cursor-2.0.0" + sources."ret-0.1.15" + sources."retry-0.12.0" + sources."rimraf-2.6.2" + sources."ripemd160-2.0.2" + sources."rollup-0.67.0" + sources."rollup-plugin-babel-4.0.3" + sources."rollup-plugin-babel-minify-6.1.1" + sources."rollup-plugin-commonjs-9.2.0" + (sources."rollup-plugin-node-resolve-3.4.0" // { + dependencies = [ + sources."builtin-modules-2.0.0" + ]; + }) + sources."rollup-plugin-replace-2.1.0" + sources."rollup-plugin-uglify-3.0.0" + sources."rollup-pluginutils-2.3.3" + sources."run-queue-1.0.3" + sources."safe-buffer-5.1.2" + sources."safe-regex-1.1.0" + sources."schema-utils-0.4.7" + (sources."seek-bzip-1.0.5" // { + dependencies = [ + sources."commander-2.8.1" + ]; + }) + sources."semver-5.6.0" + sources."serialize-javascript-1.5.0" + sources."set-blocking-2.0.0" + (sources."set-value-2.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."setimmediate-1.0.5" + sources."sha.js-2.4.11" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."signal-exit-3.0.2" + sources."slash-1.0.0" + (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."isobject-3.0.1" + ]; + }) + sources."snapdragon-util-3.0.1" + sources."sort-keys-1.1.2" + sources."sort-keys-length-1.0.1" + sources."source-list-map-0.1.8" + sources."source-map-0.5.7" + sources."source-map-resolve-0.5.2" + sources."source-map-url-0.4.0" + sources."sourcemap-codec-1.4.3" + sources."spdx-correct-3.0.2" + sources."spdx-exceptions-2.2.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.2" + sources."split-string-3.1.0" + sources."ssri-5.3.0" + (sources."static-extend-0.1.2" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + sources."stream-browserify-2.0.1" + sources."stream-each-1.2.3" + sources."stream-http-2.8.3" + sources."stream-shift-1.0.0" + sources."strict-uri-encode-1.1.0" + (sources."string-width-2.1.1" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."is-fullwidth-code-point-2.0.0" + sources."strip-ansi-4.0.0" + ]; + }) + sources."string_decoder-1.1.1" + sources."strip-ansi-3.0.1" + sources."strip-bom-2.0.0" + sources."strip-dirs-2.1.0" + sources."strip-eof-1.0.0" + sources."strip-outer-1.0.1" + sources."supports-color-2.0.0" + sources."symbol-observable-1.2.0" + sources."tapable-1.1.0" + sources."tar-stream-1.6.2" + sources."test-exclude-4.2.3" + sources."through-2.3.8" + sources."through2-2.0.5" + sources."timed-out-4.0.1" + sources."timers-browserify-2.0.10" + sources."to-arraybuffer-1.0.1" + sources."to-buffer-1.1.1" + sources."to-fast-properties-2.0.0" + sources."to-object-path-0.3.0" + sources."to-readable-stream-1.0.0" + sources."to-regex-3.0.2" + (sources."to-regex-range-2.1.1" // { + dependencies = [ + sources."is-number-3.0.0" + ]; + }) + sources."trim-repeated-1.0.0" + sources."trim-right-1.0.1" + sources."tslib-1.9.3" + sources."tty-browserify-0.0.0" + sources."tunnel-agent-0.6.0" + sources."typedarray-0.0.6" + (sources."uglify-es-3.3.10" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + (sources."uglifyjs-webpack-plugin-1.3.0" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."unbzip2-stream-1.3.1" + sources."unicode-canonical-property-names-ecmascript-1.0.4" + sources."unicode-match-property-ecmascript-1.0.4" + sources."unicode-match-property-value-ecmascript-1.0.2" + sources."unicode-property-aliases-ecmascript-1.0.4" + (sources."union-value-1.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + sources."set-value-0.4.3" + ]; + }) + sources."unique-filename-1.1.1" + sources."unique-slug-2.0.1" + (sources."unset-value-1.0.0" // { + dependencies = [ + (sources."has-value-0.3.1" // { + dependencies = [ + sources."isobject-2.1.0" + ]; + }) + sources."has-values-0.1.4" + sources."isobject-3.0.1" + ]; + }) + sources."upath-1.1.0" + sources."uri-js-4.2.2" + sources."urix-0.1.0" + (sources."url-0.11.0" // { + dependencies = [ + sources."punycode-1.3.2" + ]; + }) + sources."url-parse-lax-3.0.0" + sources."url-to-options-1.0.1" + sources."use-3.1.1" + sources."util-0.10.4" + sources."util-deprecate-1.0.2" + sources."util.promisify-1.0.0" + sources."v8-compile-cache-2.0.2" + sources."validate-npm-package-license-3.0.4" + sources."vinyl-2.2.0" + sources."vm-browserify-0.0.4" + sources."watchpack-1.6.0" + sources."wcwidth-1.0.1" + (sources."webpack-4.25.1" // { + dependencies = [ + sources."arr-diff-4.0.0" + sources."array-unique-0.3.2" + sources."braces-2.3.2" + sources."debug-2.6.9" + sources."define-property-1.0.0" + sources."eslint-scope-4.0.0" + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."define-property-0.2.5" + ]; + }) + sources."extend-shallow-2.0.1" + sources."extglob-2.0.4" + sources."fill-range-4.0.0" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."isobject-3.0.1" + sources."kind-of-6.0.2" + sources."micromatch-3.1.10" + sources."ms-2.0.0" + ]; + }) + (sources."webpack-cli-3.1.2" // { + dependencies = [ + sources."supports-color-5.5.0" + ]; + }) + (sources."webpack-core-0.6.9" // { + dependencies = [ + sources."source-map-0.4.4" + ]; + }) + (sources."webpack-sources-1.3.0" // { + dependencies = [ + sources."source-list-map-2.0.1" + sources."source-map-0.6.1" + ]; + }) + sources."which-1.3.1" + sources."which-module-2.0.0" + (sources."which-promise-1.0.0" // { + dependencies = [ + sources."pinkie-1.0.0" + sources."pinkie-promise-1.0.0" + ]; + }) + sources."worker-farm-1.6.0" + (sources."wrap-ansi-2.1.0" // { + dependencies = [ + sources."string-width-1.0.2" + ]; + }) + sources."wrappy-1.0.2" + sources."xtend-4.0.1" + sources."y18n-4.0.0" + sources."yallist-2.1.2" + (sources."yargs-12.0.4" // { + dependencies = [ + sources."find-up-3.0.0" + sources."locate-path-3.0.0" + sources."p-limit-2.0.0" + sources."p-locate-3.0.0" + sources."p-try-2.0.0" + ]; + }) + sources."yargs-parser-11.1.0" + sources."yauzl-2.10.0" + ]; + buildInputs = globalBuildInputs; + meta = { + }; + production = true; + bypassCache = true; + }; madoko = nodeEnv.buildNodePackage { name = "madoko"; packageName = "madoko"; @@ -47789,14 +50879,14 @@ in sources."readable-stream-2.3.6" sources."source-map-0.6.1" sources."string_decoder-1.1.1" - sources."through2-2.0.3" + sources."through2-2.0.5" ]; }) (sources."@gulp-sourcemaps/map-sources-1.0.0" // { dependencies = [ sources."readable-stream-2.3.6" sources."string_decoder-1.1.1" - sources."through2-2.0.3" + sources."through2-2.0.5" ]; }) (sources."accord-0.29.0" // { @@ -48012,7 +51102,7 @@ in sources."graceful-fs-4.1.15" sources."readable-stream-2.3.6" sources."string_decoder-1.1.1" - sources."through2-2.0.3" + sources."through2-2.0.5" ]; }) sources."fs.realpath-1.0.0" @@ -48055,7 +51145,7 @@ in sources."plugin-error-0.1.2" sources."readable-stream-2.3.6" sources."string_decoder-1.1.1" - sources."through2-2.0.3" + sources."through2-2.0.5" ]; }) (sources."gulp-sourcemaps-2.6.4" // { @@ -48064,7 +51154,7 @@ in sources."readable-stream-2.3.6" sources."source-map-0.6.1" sources."string_decoder-1.1.1" - sources."through2-2.0.3" + sources."through2-2.0.5" ]; }) (sources."gulp-typescript-5.0.0-alpha.3" // { @@ -48080,7 +51170,7 @@ in sources."readable-stream-2.3.6" sources."source-map-0.7.3" sources."string_decoder-1.1.1" - sources."through2-2.0.3" + sources."through2-2.0.5" sources."unique-stream-2.2.1" sources."vinyl-2.2.0" sources."vinyl-fs-3.0.3" @@ -48091,7 +51181,7 @@ in sources."lodash-4.17.11" sources."readable-stream-2.3.6" sources."string_decoder-1.1.1" - sources."through2-2.0.3" + sources."through2-2.0.5" ]; }) (sources."gulp-util-3.0.8" // { @@ -48100,7 +51190,7 @@ in sources."readable-stream-2.3.6" sources."replace-ext-0.0.1" sources."string_decoder-1.1.1" - sources."through2-2.0.3" + sources."through2-2.0.5" sources."vinyl-0.5.3" ]; }) @@ -48295,7 +51385,7 @@ in dependencies = [ sources."readable-stream-2.3.6" sources."string_decoder-1.1.1" - sources."through2-2.0.3" + sources."through2-2.0.5" ]; }) sources."remove-trailing-separator-1.1.0" @@ -48383,7 +51473,7 @@ in dependencies = [ sources."readable-stream-2.3.6" sources."string_decoder-1.1.1" - sources."through2-2.0.3" + sources."through2-2.0.5" ]; }) sources."tildify-1.2.0" @@ -48401,7 +51491,7 @@ in dependencies = [ sources."readable-stream-2.3.6" sources."string_decoder-1.1.1" - sources."through2-2.0.3" + sources."through2-2.0.5" ]; }) sources."tough-cookie-2.4.3" @@ -49240,7 +52330,7 @@ in sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" - sources."tar-4.4.7" + sources."tar-4.4.8" sources."util-deprecate-1.0.2" sources."wide-align-1.1.3" sources."wrappy-1.0.2" @@ -49980,7 +53070,7 @@ in sources."stream-shift-1.0.0" sources."streamsearch-0.1.2" sources."string_decoder-1.1.1" - (sources."through2-2.0.3" // { + (sources."through2-2.0.5" // { dependencies = [ sources."readable-stream-2.3.6" ]; @@ -50368,7 +53458,7 @@ in sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" sources."argparse-1.0.10" - sources."bluebird-3.5.2" + sources."bluebird-3.5.3" (sources."boxen-1.3.0" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -50718,7 +53808,7 @@ in sources."string_decoder-1.1.1" ]; }) - sources."bluebird-3.5.2" + sources."bluebird-3.5.3" (sources."body-parser-1.18.3" // { dependencies = [ sources."content-type-1.0.4" @@ -51862,10 +54952,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "2.17.7"; + version = "2.17.8"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-2.17.7.tgz"; - sha512 = "FwZFpKSL4BNu1IGIScveHqZALpm6jSF7QR90CZXW4RfKaLpNYcIkkFC9iPBT4AdpPSv1UR/gYUWyQdTZBx2a5g=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-2.17.8.tgz"; + sha512 = "Lfqyq7foOu0HTHhimOAOmgDwN5uH1e4VwfyRnTJgalhVC317QL9y1df6jHATGf0Vy3uhW3AAt4JMuX48wDeFlg=="; }; buildInputs = globalBuildInputs; meta = { @@ -51879,10 +54969,10 @@ in prettier = nodeEnv.buildNodePackage { name = "prettier"; packageName = "prettier"; - version = "1.14.3"; + version = "1.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-1.14.3.tgz"; - sha512 = "qZDVnCrnpsRJJq5nSsiHCE3BYMED2OtsI+cmzIzF1QIfqm5ALf8tEJcO27zV1gKNKRPdhjO0dNWnrzssDQ1tFg=="; + url = "https://registry.npmjs.org/prettier/-/prettier-1.15.2.tgz"; + sha512 = "YgPLFFA0CdKL4Eg2IHtUSjzj/BWgszDHiNQAe0VAIBse34148whfdzLagRL+QiKS+YfK5ftB6X4v/MBw8yCoug=="; }; buildInputs = globalBuildInputs; meta = { @@ -51977,7 +55067,7 @@ in sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" sources."cache-base-1.0.1" - sources."cached-path-relative-1.0.1" + sources."cached-path-relative-1.0.2" sources."chokidar-2.0.4" sources."cipher-base-1.0.4" (sources."class-utils-0.3.6" // { @@ -52302,7 +55392,7 @@ in ]; }) 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."to-object-path-0.3.0" // { @@ -52934,7 +56024,7 @@ in }; dependencies = [ sources."abstract-leveldown-4.0.3" - (sources."aligned-block-file-1.1.3" // { + (sources."aligned-block-file-1.1.4" // { dependencies = [ sources."obv-0.0.0" ]; @@ -53606,7 +56696,7 @@ in ]; }) sources."sodium-chloride-1.1.2" - sources."sodium-native-2.2.2" + sources."sodium-native-2.2.3" sources."source-map-0.5.7" sources."source-map-resolve-0.5.2" sources."source-map-url-0.4.0" @@ -54708,10 +57798,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.108.0"; + version = "1.108.2"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.108.0.tgz"; - sha512 = "QKeERkklW4DFyd49sqbwZ4xNYXtHOPCcUjNUzDfcvXzNwyxfRKhTf43nmPw6lnIcgBesrY95hMozos4WmgYl3w=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.108.2.tgz"; + sha512 = "VfSHSRj4ISWf4EfySTdAVqUWnDspoFUaGs4uGp7FIbjZb35+JPaQ/hqgWKcDal+ZwTtzQvxKAdPsB3WUCBoSKg=="; }; dependencies = [ sources."@yarnpkg/lockfile-1.1.0" @@ -54911,9 +58001,9 @@ in sources."signal-exit-3.0.2" sources."smart-buffer-1.1.15" sources."snyk-config-2.2.0" - sources."snyk-docker-plugin-1.12.1" + sources."snyk-docker-plugin-1.12.2" sources."snyk-go-plugin-1.6.0" - sources."snyk-gradle-plugin-2.1.0" + sources."snyk-gradle-plugin-2.1.1" sources."snyk-module-1.9.1" sources."snyk-mvn-plugin-2.0.0" (sources."snyk-nodejs-lockfile-parser-1.7.0" // { @@ -55519,6 +58609,7 @@ in sources."mkdirp-0.3.0" ]; }) + sources."js-string-escape-1.0.1" sources."js-yaml-3.12.0" sources."json-refs-2.1.7" (sources."json-schema-deref-sync-0.3.4" // { @@ -55793,7 +58884,7 @@ in sources."supports-color-2.0.0" sources."swagger-converter-0.2.0" sources."swagger-editor-2.10.5" - sources."swagger-test-templates-1.5.0" + sources."swagger-test-templates-1.5.1" (sources."swagger-tools-0.9.16" // { dependencies = [ sources."swagger-converter-0.1.7" @@ -55858,7 +58949,7 @@ in sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."valid-url-1.0.9" - sources."validator-10.8.0" + sources."validator-10.9.0" sources."which-1.3.1" sources."widest-line-2.0.1" sources."wordwrap-0.0.3" @@ -55881,13 +58972,15 @@ in tern = nodeEnv.buildNodePackage { name = "tern"; packageName = "tern"; - version = "0.22.3"; + version = "0.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/tern/-/tern-0.22.3.tgz"; - sha512 = "A2C8GbR6uJWjHUwxtxF14oY1g8oJDEhM+n9ugRowX+jr8JHgNUeOLrYTOi/LV/JK9KHpxnYwyuhnal9YDXeeDQ=="; + url = "https://registry.npmjs.org/tern/-/tern-0.23.0.tgz"; + sha512 = "lST8jq/DougDUADb+vBaufwjqNChwABSJTkWf+5GG4xNVJoR/atEaMe/G7buaVZrpGCy+zoaq1TuycQy8xX+Bg=="; }; dependencies = [ - sources."acorn-5.7.3" + sources."acorn-6.0.4" + sources."acorn-loose-6.0.0" + sources."acorn-walk-6.1.0" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."concat-map-0.0.1" @@ -56000,7 +59093,7 @@ in }) sources."forever-agent-0.6.1" sources."form-data-2.3.3" - sources."fs-extra-7.0.0" + sources."fs-extra-7.0.1" sources."getpass-0.1.7" sources."graceful-fs-4.1.15" sources."har-schema-2.0.0" @@ -56319,7 +59412,7 @@ in sources."array-uniq-1.0.3" sources."asynckit-0.4.0" sources."balanced-match-1.0.0" - sources."bluebird-3.5.2" + sources."bluebird-3.5.3" (sources."boxen-1.3.0" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -56575,7 +59668,7 @@ in sources."bcrypt-pbkdf-1.0.2" sources."better-assert-1.0.2" sources."blob-0.0.5" - sources."bluebird-3.5.2" + sources."bluebird-3.5.3" sources."blueimp-md5-2.10.0" sources."body-parser-1.18.3" sources."brace-expansion-1.1.11" @@ -56584,7 +59677,7 @@ in sources."builtins-1.0.3" sources."bytes-3.0.0" sources."callsite-1.0.0" - sources."camelcase-4.1.0" + sources."camelcase-5.0.0" sources."caseless-0.12.0" (sources."cliui-4.1.0" // { dependencies = [ @@ -56628,7 +59721,7 @@ in sources."cycle-1.0.3" sources."dashdash-1.14.1" sources."debug-2.6.9" - sources."decamelize-2.0.0" + sources."decamelize-1.2.0" sources."deep-extend-0.6.0" sources."delayed-stream-0.0.5" sources."delegates-1.0.0" @@ -56954,10 +60047,9 @@ in sources."wrappy-1.0.2" sources."ws-3.3.3" sources."xmlhttprequest-ssl-1.5.5" - sources."xregexp-4.0.0" sources."y18n-4.0.0" sources."yallist-2.1.2" - (sources."yargs-12.0.2" // { + (sources."yargs-12.0.4" // { dependencies = [ sources."ansi-regex-3.0.0" sources."is-fullwidth-code-point-2.0.0" @@ -56965,7 +60057,7 @@ in sources."strip-ansi-4.0.0" ]; }) - sources."yargs-parser-10.1.0" + sources."yargs-parser-11.1.0" sources."yeast-0.1.2" ]; buildInputs = globalBuildInputs; @@ -57012,7 +60104,7 @@ in sources."base64-js-0.0.8" sources."bcrypt-pbkdf-1.0.2" sources."bl-1.2.2" - sources."bluebird-3.5.2" + sources."bluebird-3.5.3" sources."brace-expansion-1.1.11" sources."buffer-3.6.0" sources."buffer-alloc-1.2.0" @@ -57270,7 +60362,7 @@ in sources."@akryum/winattr-3.0.0" sources."@apollographql/apollo-upload-server-5.0.3" sources."@apollographql/graphql-playground-html-1.6.4" - sources."@babel/runtime-corejs2-7.1.2" + sources."@babel/runtime-corejs2-7.1.5" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@protobufjs/aspromise-1.1.2" @@ -57293,10 +60385,10 @@ in sources."@types/express-serve-static-core-4.16.0" sources."@types/long-4.0.0" sources."@types/mime-2.0.0" - sources."@types/node-10.12.2" + sources."@types/node-10.12.5" sources."@types/range-parser-1.2.2" sources."@types/serve-static-1.13.2" - sources."@types/ws-5.1.2" + sources."@types/ws-6.0.1" sources."@types/zen-observable-0.8.0" sources."@vue/cli-shared-utils-3.1.1" (sources."@vue/cli-ui-3.1.1" // { @@ -57316,12 +60408,12 @@ in sources."ansi-styles-3.2.1" sources."anymatch-2.0.0" sources."apollo-cache-1.1.20" - sources."apollo-cache-control-0.2.5" + sources."apollo-cache-control-0.3.0" sources."apollo-cache-inmemory-1.3.9" sources."apollo-client-2.4.5" - sources."apollo-datasource-0.1.3" - sources."apollo-engine-reporting-0.0.6" - sources."apollo-engine-reporting-protobuf-0.0.1" + sources."apollo-datasource-0.2.0" + sources."apollo-engine-reporting-0.1.0" + sources."apollo-engine-reporting-protobuf-0.1.0" sources."apollo-link-1.2.3" sources."apollo-link-context-1.0.9" sources."apollo-link-dedup-1.0.10" @@ -57329,20 +60421,13 @@ in sources."apollo-link-persisted-queries-0.2.1" sources."apollo-link-state-0.4.2" sources."apollo-link-ws-1.0.9" - sources."apollo-server-caching-0.1.2" - (sources."apollo-server-core-2.1.0" // { - dependencies = [ - sources."graphql-subscriptions-0.5.8" - ]; - }) - sources."apollo-server-env-2.0.3" - sources."apollo-server-errors-2.0.2" - (sources."apollo-server-express-2.1.0" // { - dependencies = [ - sources."graphql-subscriptions-0.5.8" - ]; - }) - sources."apollo-tracing-0.2.5" + sources."apollo-server-caching-0.2.0" + sources."apollo-server-core-2.2.0" + sources."apollo-server-env-2.2.0" + sources."apollo-server-errors-2.2.0" + sources."apollo-server-express-2.2.0" + sources."apollo-server-plugin-base-0.1.0" + sources."apollo-tracing-0.3.0" sources."apollo-upload-client-9.1.0" sources."apollo-utilities-1.0.25" sources."argparse-1.0.10" @@ -57641,10 +60726,10 @@ in sources."graceful-readlink-1.0.1" sources."graphql-14.0.2" sources."graphql-anywhere-4.1.22" - sources."graphql-extensions-0.2.1" + sources."graphql-extensions-0.3.0" sources."graphql-subscriptions-1.0.0" sources."graphql-tag-2.10.0" - sources."graphql-tools-3.1.1" + sources."graphql-tools-4.0.3" sources."graphql-type-json-0.2.1" sources."growly-1.3.0" sources."har-schema-2.0.0" @@ -57730,6 +60815,7 @@ in sources."jsbn-0.1.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.3.1" + sources."json-stable-stringify-1.0.1" sources."json-stringify-safe-5.0.1" sources."jsonfile-4.0.0" sources."jsonify-0.0.0" @@ -58019,7 +61105,11 @@ in sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" sources."strip-outer-1.0.1" - sources."subscriptions-transport-ws-0.9.15" + (sources."subscriptions-transport-ws-0.9.15" // { + dependencies = [ + sources."ws-5.2.2" + ]; + }) sources."supports-color-5.5.0" sources."symbol-observable-1.2.0" sources."tar-stream-1.6.2" @@ -58041,7 +61131,7 @@ in }) sources."terminate-2.1.0" sources."through-2.3.8" - sources."through2-2.0.3" + sources."through2-2.0.5" sources."timed-out-4.0.1" sources."tiny-emitter-2.0.2" sources."tmp-0.0.33" @@ -58060,7 +61150,7 @@ in sources."to-regex-range-2.1.1" (sources."topo-3.0.3" // { dependencies = [ - sources."hoek-6.0.1" + sources."hoek-6.0.2" ]; }) sources."touch-3.1.0" @@ -58113,14 +61203,14 @@ in sources."validate-npm-package-name-3.0.0" sources."vary-1.1.2" sources."verror-1.10.0" - sources."vue-cli-plugin-apollo-0.17.3" + sources."vue-cli-plugin-apollo-0.17.4" sources."watch-1.0.2" sources."wcwidth-1.0.1" sources."which-1.3.1" sources."widest-line-2.0.1" sources."wrappy-1.0.2" sources."write-file-atomic-2.3.0" - sources."ws-5.2.2" + sources."ws-6.1.0" sources."xdg-basedir-3.0.0" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" @@ -58263,11 +61353,11 @@ in }; dependencies = [ sources."@babel/code-frame-7.0.0" - sources."@babel/generator-7.1.3" + sources."@babel/generator-7.1.5" sources."@babel/highlight-7.0.0" - sources."@babel/parser-7.1.3" + sources."@babel/parser-7.1.5" sources."@babel/template-7.1.2" - sources."@babel/types-7.1.3" + sources."@babel/types-7.1.5" sources."@webassemblyjs/ast-1.7.11" sources."@webassemblyjs/floating-point-hex-parser-1.7.11" sources."@webassemblyjs/helper-api-error-1.7.11" @@ -58292,7 +61382,7 @@ in sources."esutils-2.0.2" sources."has-flag-3.0.0" sources."js-tokens-4.0.0" - sources."jsesc-2.5.1" + sources."jsesc-2.5.2" sources."lodash-4.17.11" sources."source-map-0.5.7" sources."supports-color-5.5.0" @@ -58557,7 +61647,7 @@ in sources."base64-js-1.3.0" sources."big.js-3.2.0" sources."binary-extensions-1.12.0" - sources."bluebird-3.5.2" + sources."bluebird-3.5.3" sources."bn.js-4.11.8" sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { @@ -58881,7 +61971,7 @@ in sources."stream-shift-1.0.0" sources."string_decoder-1.1.1" sources."tapable-1.1.0" - sources."through2-2.0.3" + sources."through2-2.0.5" sources."timers-browserify-2.0.10" sources."to-arraybuffer-1.0.1" (sources."to-object-path-0.3.0" // { @@ -59263,15 +62353,21 @@ in web-ext = nodeEnv.buildNodePackage { name = "web-ext"; packageName = "web-ext"; - version = "2.9.1"; + version = "2.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/web-ext/-/web-ext-2.9.1.tgz"; - sha512 = "sK5ebAiUNJFG+KfFjjvWks9ihecy0TdVCrrnSW/tZ15QFO6u4LCIQKCuBr7FyGMjC+IOGJFB7pS1ZbyPNJ72GQ=="; + url = "https://registry.npmjs.org/web-ext/-/web-ext-2.9.2.tgz"; + sha512 = "eJYKR7BMlpWXSeOP91LvsQkLHKcRE8wWkQYdlEkHzntASlFMbGZcIk6/R5myA/Yo5E87WWoCmqKO9rdUSVtQMA=="; }; dependencies = [ + sources."@babel/polyfill-7.0.0" + (sources."@babel/register-7.0.0" // { + dependencies = [ + sources."source-map-support-0.5.9" + ]; + }) sources."@cliqz-oss/firefox-client-0.3.1" sources."@cliqz-oss/node-firefox-connect-1.2.1" - sources."@types/node-10.12.2" + sources."@types/node-10.12.5" sources."@yarnpkg/lockfile-1.1.0" sources."JSONSelect-0.2.1" sources."abbrev-1.1.1" @@ -59284,31 +62380,27 @@ in sources."adbkit-2.11.0" sources."adbkit-logcat-1.1.0" sources."adbkit-monkey-1.0.1" - (sources."addons-linter-1.3.1" // { + (sources."addons-linter-1.3.8" // { dependencies = [ - sources."cross-spawn-5.1.0" - sources."execa-0.7.0" - sources."invert-kv-1.0.0" - sources."lcid-1.0.0" - sources."mem-1.1.0" - sources."source-map-0.6.1" + sources."find-up-3.0.0" + sources."locate-path-3.0.0" + sources."p-limit-2.0.0" + sources."p-locate-3.0.0" + sources."p-try-2.0.0" sources."source-map-support-0.5.6" - (sources."yargs-12.0.1" // { - dependencies = [ - sources."os-locale-2.1.0" - ]; - }) + sources."yargs-12.0.2" + sources."yargs-parser-10.1.0" ]; }) sources."adm-zip-0.4.11" sources."agent-base-4.2.1" - sources."ajv-6.5.2" + sources."ajv-6.5.4" sources."ajv-keywords-3.2.0" sources."ajv-merge-patch-4.1.0" sources."ansi-align-2.0.0" sources."ansi-escapes-3.1.0" sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" + sources."ansi-styles-3.2.1" sources."ansicolors-0.3.2" sources."any-promise-1.3.0" sources."anymatch-2.0.0" @@ -59350,28 +62442,17 @@ in sources."aws4-1.8.0" (sources."babel-code-frame-6.26.0" // { dependencies = [ + sources."ansi-styles-2.2.1" sources."chalk-1.1.3" + sources."supports-color-2.0.0" ]; }) - sources."babel-core-6.26.3" - sources."babel-generator-6.26.1" - sources."babel-helpers-6.24.1" - sources."babel-messages-6.23.0" (sources."babel-polyfill-6.26.0" // { dependencies = [ sources."regenerator-runtime-0.10.5" ]; }) - (sources."babel-register-6.26.0" // { - dependencies = [ - sources."source-map-support-0.4.18" - ]; - }) sources."babel-runtime-6.26.0" - sources."babel-template-6.26.0" - sources."babel-traverse-6.26.0" - sources."babel-types-6.26.0" - sources."babylon-6.18.0" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -59411,12 +62492,7 @@ in sources."camelcase-4.1.0" sources."capture-stack-trace-1.0.1" sources."caseless-0.12.0" - (sources."chalk-2.4.0" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."supports-color-5.5.0" - ]; - }) + sources."chalk-2.4.0" sources."chardet-0.4.2" sources."cheerio-1.0.0-rc.2" sources."chokidar-2.0.4" @@ -59459,6 +62535,7 @@ in sources."combined-stream-1.0.7" sources."commander-2.19.0" sources."common-tags-1.8.0" + sources."commondir-1.0.1" sources."component-emitter-1.2.1" (sources."compress-commons-1.2.2" // { dependencies = [ @@ -59472,7 +62549,6 @@ in ]; }) sources."configstore-3.1.2" - sources."convert-source-map-1.6.0" sources."copy-descriptor-0.1.1" sources."core-js-2.5.7" sources."core-util-is-1.0.2" @@ -59503,21 +62579,26 @@ in sources."deep-extend-0.6.0" sources."deep-is-0.1.3" sources."deepcopy-0.6.3" - sources."deepmerge-2.1.1" + sources."deepmerge-2.2.1" sources."defaults-1.0.3" sources."define-properties-1.1.3" sources."define-property-2.0.2" sources."degenerator-1.0.4" - sources."del-2.2.2" + sources."del-3.0.0" sources."delayed-stream-1.0.0" sources."depd-1.1.2" - sources."detect-indent-4.0.0" - (sources."dispensary-0.22.0" // { + (sources."dispensary-0.26.0" // { dependencies = [ sources."async-2.6.1" - sources."source-map-0.6.1" + sources."decamelize-1.2.0" + sources."find-up-3.0.0" + sources."locate-path-3.0.0" + sources."p-limit-2.0.0" + sources."p-locate-3.0.0" + sources."p-try-2.0.0" + sources."pino-5.8.1" sources."source-map-support-0.5.9" - sources."yargs-12.0.2" + sources."yargs-12.0.4" ]; }) sources."doctrine-2.1.0" @@ -59555,17 +62636,12 @@ in sources."es6-symbol-3.1.1" sources."es6-weak-map-2.0.2" sources."escape-string-regexp-1.0.5" - (sources."escodegen-1.11.0" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) + sources."escodegen-1.11.0" sources."escope-3.6.0" (sources."eslint-5.0.1" // { dependencies = [ sources."ansi-regex-3.0.0" sources."debug-3.2.6" - sources."globals-11.8.0" sources."ms-2.1.1" sources."strip-ansi-4.0.0" ]; @@ -59576,11 +62652,13 @@ in sources."ajv-keywords-1.5.1" sources."ansi-escapes-1.4.0" sources."ansi-regex-3.0.0" + sources."ansi-styles-2.2.1" sources."chalk-1.1.3" sources."cli-cursor-1.0.2" sources."eslint-3.19.0" sources."espree-3.5.4" sources."figures-1.7.0" + sources."globals-9.18.0" sources."inquirer-0.12.0" sources."is-fullwidth-code-point-2.0.0" sources."onetime-1.1.0" @@ -59592,6 +62670,7 @@ in sources."slice-ansi-0.0.4" sources."string-width-1.0.2" sources."strip-ansi-4.0.0" + sources."supports-color-2.0.0" (sources."table-3.8.3" // { dependencies = [ sources."string-width-2.1.1" @@ -59663,7 +62742,8 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."find-up-3.0.0" + sources."find-cache-dir-1.0.0" + sources."find-up-2.1.0" (sources."firefox-profile-1.2.0" // { dependencies = [ sources."async-2.5.0" @@ -59674,7 +62754,7 @@ in sources."readable-stream-2.3.6" ]; }) - sources."flat-cache-1.3.0" + sources."flat-cache-1.3.2" sources."flatstr-1.0.8" sources."fluent-syntax-0.7.0" sources."for-in-1.0.2" @@ -59721,15 +62801,19 @@ in sources."shelljs-0.7.7" ]; }) - sources."glob-7.1.2" + sources."glob-7.1.3" (sources."glob-parent-3.1.0" // { dependencies = [ sources."is-glob-3.1.0" ]; }) sources."global-dirs-0.1.1" - sources."globals-9.18.0" - sources."globby-5.0.0" + sources."globals-11.8.0" + (sources."globby-6.1.0" // { + dependencies = [ + sources."pify-2.3.0" + ]; + }) sources."got-6.7.1" sources."graceful-fs-4.1.15" sources."graceful-readlink-1.0.1" @@ -59759,7 +62843,7 @@ in sources."async-1.5.2" ]; }) - sources."home-or-tmp-2.0.0" + sources."home-or-tmp-3.0.0" sources."hosted-git-info-2.7.1" sources."htmlparser2-3.10.0" sources."http-errors-1.6.3" @@ -59791,7 +62875,6 @@ in ]; }) sources."interpret-1.1.0" - sources."invariant-2.2.4" sources."invert-kv-2.0.0" sources."ip-1.1.5" sources."is-absolute-0.1.7" @@ -59818,7 +62901,6 @@ in }) sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" - sources."is-finite-1.0.2" sources."is-fullwidth-code-point-1.0.0" sources."is-glob-4.0.0" sources."is-installed-globally-0.1.0" @@ -59859,7 +62941,6 @@ in ]; }) sources."jsbn-0.1.1" - sources."jsesc-1.3.0" sources."json-merge-patch-0.2.3" sources."json-parse-better-errors-1.0.2" sources."json-schema-0.2.3" @@ -59867,7 +62948,6 @@ in sources."json-stable-stringify-1.0.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."json-stringify-safe-5.0.1" - sources."json5-0.5.1" sources."jsonfile-4.0.0" sources."jsonify-0.0.0" sources."jsonpointer-4.0.1" @@ -59902,10 +62982,11 @@ in (sources."load-json-file-1.1.0" // { dependencies = [ sources."parse-json-2.2.0" + sources."pify-2.3.0" sources."strip-bom-2.0.0" ]; }) - sources."locate-path-3.0.0" + sources."locate-path-2.0.0" sources."lodash-4.17.11" sources."lodash.assign-4.2.0" sources."lodash.assignin-4.2.0" @@ -59923,18 +63004,14 @@ in sources."lodash.once-4.1.1" sources."lodash.set-4.3.2" sources."lodash.sortby-4.7.0" - sources."loose-envify-1.4.0" sources."lowercase-keys-1.0.1" sources."lru-cache-4.1.3" sources."macos-release-1.1.0" - (sources."make-dir-1.3.0" // { - dependencies = [ - sources."pify-3.0.0" - ]; - }) + sources."make-dir-1.3.0" + sources."map-age-cleaner-0.1.2" sources."map-cache-0.2.2" sources."map-visit-1.0.0" - sources."mem-3.0.1" + sources."mem-4.0.0" (sources."micromatch-3.1.10" // { dependencies = [ sources."kind-of-6.0.2" @@ -60000,6 +63077,7 @@ in sources."next-tick-1.0.0" sources."nice-try-1.0.5" sources."node-forge-0.7.6" + sources."node-modules-regexp-1.0.0" sources."node-notifier-5.2.1" (sources."nomnom-1.8.1" // { dependencies = [ @@ -60035,15 +63113,17 @@ in sources."opn-5.3.0" sources."optionator-0.8.2" sources."os-homedir-1.0.2" - sources."os-locale-3.0.0" + sources."os-locale-3.0.1" sources."os-name-2.0.1" sources."os-shim-0.1.3" sources."os-tmpdir-1.0.2" + sources."p-defer-1.0.0" sources."p-finally-1.0.0" sources."p-is-promise-1.1.0" - sources."p-limit-2.0.0" - sources."p-locate-3.0.0" - sources."p-try-2.0.0" + sources."p-limit-1.3.0" + sources."p-locate-2.0.0" + sources."p-map-1.2.0" + sources."p-try-1.0.0" (sources."pac-proxy-agent-2.0.2" // { dependencies = [ sources."debug-3.2.6" @@ -60063,28 +63143,30 @@ in sources."path-is-inside-1.0.2" sources."path-key-2.0.1" sources."path-parse-1.0.6" - sources."path-type-1.1.0" + (sources."path-type-1.1.0" // { + dependencies = [ + sources."pify-2.3.0" + ]; + }) sources."pend-1.2.0" sources."performance-now-2.1.0" - sources."pify-2.3.0" + sources."pify-3.0.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" - sources."pino-5.0.4" + sources."pino-5.5.0" sources."pino-std-serializers-2.3.0" + sources."pirates-4.0.0" + sources."pkg-dir-2.0.0" sources."pluralize-7.0.0" sources."po2json-0.4.5" sources."posix-character-classes-0.1.1" - (sources."postcss-6.0.23" // { + (sources."postcss-7.0.5" // { dependencies = [ - sources."ansi-styles-3.2.1" sources."chalk-2.4.1" - sources."source-map-0.6.1" - sources."supports-color-5.5.0" ]; }) sources."prelude-ls-1.1.2" sources."prepend-http-1.0.4" - sources."private-0.1.8" sources."probe-image-size-4.0.0" sources."process-0.11.10" sources."process-nextick-args-2.0.0" @@ -60137,13 +63219,14 @@ in sources."registry-url-3.1.0" (sources."relaxed-json-1.0.1" // { dependencies = [ + sources."ansi-styles-2.2.1" sources."chalk-1.1.3" + sources."supports-color-2.0.0" ]; }) sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - sources."repeating-2.0.1" sources."request-2.88.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" @@ -60164,7 +63247,7 @@ in sources."safer-buffer-2.1.2" sources."sax-1.2.4" sources."secure-keys-1.0.0" - sources."semver-5.5.0" + sources."semver-5.6.0" sources."semver-diff-2.1.0" sources."set-blocking-2.0.0" (sources."set-value-2.0.0" // { @@ -60197,12 +63280,12 @@ in sources."punycode-1.4.1" sources."regenerator-runtime-0.9.6" sources."request-2.87.0" + sources."source-map-0.5.7" sources."source-map-support-0.4.6" sources."tough-cookie-2.3.4" ]; }) sources."signal-exit-3.0.2" - sources."slash-1.0.0" (sources."slice-ansi-1.0.0" // { dependencies = [ sources."is-fullwidth-code-point-2.0.0" @@ -60225,6 +63308,7 @@ in }) sources."is-descriptor-0.1.6" sources."kind-of-5.1.0" + sources."source-map-0.5.7" ]; }) (sources."snapdragon-node-2.1.1" // { @@ -60233,19 +63317,16 @@ in ]; }) sources."snapdragon-util-3.0.1" - (sources."snyk-1.108.0" // { + (sources."snyk-1.103.2" // { dependencies = [ sources."ansi-regex-3.0.0" - sources."ansi-styles-3.2.1" sources."chalk-2.4.1" sources."debug-3.2.6" sources."inquirer-3.3.0" sources."ms-2.1.1" sources."rx-lite-4.0.8" - sources."source-map-0.6.1" sources."source-map-support-0.5.9" sources."strip-ansi-4.0.0" - sources."supports-color-5.5.0" ]; }) (sources."snyk-config-2.2.0" // { @@ -60254,25 +63335,24 @@ in sources."ms-2.1.1" ]; }) - (sources."snyk-docker-plugin-1.12.1" // { + (sources."snyk-docker-plugin-1.12.0" // { dependencies = [ sources."debug-3.2.6" sources."ms-2.1.1" ]; }) - sources."snyk-go-plugin-1.6.0" + sources."snyk-go-plugin-1.5.2" sources."snyk-gradle-plugin-2.1.0" - (sources."snyk-module-1.9.1" // { + (sources."snyk-module-1.8.2" // { dependencies = [ sources."debug-3.2.6" sources."ms-2.1.1" ]; }) sources."snyk-mvn-plugin-2.0.0" - (sources."snyk-nodejs-lockfile-parser-1.7.0" // { + (sources."snyk-nodejs-lockfile-parser-1.5.1" // { dependencies = [ sources."lodash-4.17.10" - sources."source-map-0.6.1" sources."source-map-support-0.5.9" ]; }) @@ -60288,25 +63368,23 @@ in sources."ms-2.1.1" ]; }) - (sources."snyk-policy-1.13.1" // { + (sources."snyk-policy-1.12.0" // { dependencies = [ sources."debug-3.2.6" sources."ms-2.1.1" - sources."semver-5.6.0" ]; }) - sources."snyk-python-plugin-1.9.0" + sources."snyk-python-plugin-1.8.2" (sources."snyk-resolve-1.0.1" // { dependencies = [ sources."debug-3.2.6" sources."ms-2.1.1" ]; }) - (sources."snyk-resolve-deps-4.0.2" // { + (sources."snyk-resolve-deps-4.0.1" // { dependencies = [ sources."debug-3.2.6" sources."ms-2.1.1" - sources."semver-5.6.0" ]; }) sources."snyk-sbt-plugin-2.0.0" @@ -60319,14 +63397,10 @@ in }) sources."socks-1.1.10" sources."socks-proxy-agent-3.0.1" - sources."sonic-boom-0.6.1" - sources."source-map-0.5.7" + sources."sonic-boom-0.6.2" + sources."source-map-0.6.1" sources."source-map-resolve-0.5.2" - (sources."source-map-support-0.5.3" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) + sources."source-map-support-0.5.3" sources."source-map-url-0.4.0" sources."spawn-sync-1.0.15" sources."spdx-correct-3.0.2" @@ -60378,7 +63452,7 @@ in sources."strip-bom-stream-3.0.0" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" - sources."supports-color-2.0.0" + sources."supports-color-5.5.0" sources."symbol-observable-1.0.1" sources."table-4.0.3" (sources."tar-stream-1.6.2" // { @@ -60403,7 +63477,6 @@ in sources."timed-out-4.0.1" sources."tmp-0.0.33" sources."to-buffer-1.1.1" - sources."to-fast-properties-1.0.3" sources."to-object-path-0.3.0" sources."to-regex-3.0.2" sources."to-regex-range-2.1.1" @@ -60416,7 +63489,6 @@ in }) sources."tr46-1.0.1" sources."traverse-0.4.6" - sources."trim-right-1.0.1" sources."tslib-1.9.3" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" @@ -60459,7 +63531,7 @@ in sources."watchpack-1.5.0" sources."wcwidth-1.0.1" sources."webidl-conversions-4.0.2" - sources."whatwg-url-6.5.0" + sources."whatwg-url-7.0.0" sources."when-3.7.7" sources."which-1.3.1" sources."which-module-2.0.0" @@ -60498,7 +63570,12 @@ in sources."yargs-parser-4.2.1" ]; }) - sources."yargs-parser-10.1.0" + (sources."yargs-parser-11.1.0" // { + dependencies = [ + sources."camelcase-5.0.0" + sources."decamelize-1.2.0" + ]; + }) sources."yauzl-2.9.2" (sources."zip-dir-1.0.2" // { dependencies = [ @@ -60541,10 +63618,10 @@ in yarn = nodeEnv.buildNodePackage { name = "yarn"; packageName = "yarn"; - version = "1.12.1"; + version = "1.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/yarn/-/yarn-1.12.1.tgz"; - sha512 = "vdVLrYWx73k4QR8ZpQQ3HJg/X8aAunjUHuPlADR/ogmZOhnqgAdETPz0e/Df+MW8Dno7F1dOxS5e3G6niobumw=="; + url = "https://registry.npmjs.org/yarn/-/yarn-1.12.3.tgz"; + sha512 = "8f5rWNDvkhAmCxmn8C0LsNWMxTYVk4VGKiq0sIB6HGZjaZTHsGIH87SUmVDUEd2Wk54bqKoUlbVWgQFCQhRkVw=="; }; buildInputs = globalBuildInputs; meta = { @@ -61183,7 +64260,7 @@ in }) sources."text-table-0.2.0" sources."through-2.3.8" - sources."through2-2.0.3" + sources."through2-2.0.5" sources."timed-out-4.0.1" sources."titleize-1.0.1" sources."tmp-0.0.33" diff --git a/pkgs/development/ocaml-modules/bos/default.nix b/pkgs/development/ocaml-modules/bos/default.nix index 3cb9b405d5a2..a1f4c6bc5649 100644 --- a/pkgs/development/ocaml-modules/bos/default.nix +++ b/pkgs/development/ocaml-modules/bos/default.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-bos-${version}"; - version = "0.1.6"; + version = "0.2.0"; src = fetchurl { url = "http://erratique.ch/software/bos/releases/bos-${version}.tbz"; - sha256 = "1z9sbziqddf770y94pd0bffsp1wdr1v3kp2p00pr27adv7h7dgls"; + sha256 = "1s10iqx8rgnxr5n93lf4blwirjf8nlm272yg5sipr7lsr35v49wc"; }; unpackCmd = "tar xjf $src"; diff --git a/pkgs/development/python-modules/brotli/default.nix b/pkgs/development/python-modules/brotli/default.nix index 5366eeb9c232..35b40a3adf1c 100644 --- a/pkgs/development/python-modules/brotli/default.nix +++ b/pkgs/development/python-modules/brotli/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "brotli"; - version = "1.0.5"; + version = "1.0.7"; # PyPI doesn't contain tests so let's use GitHub src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "0ssj7mnhpdpk7qnwr49qfd4gxhkmvbli5mhs274pz55cx1xp7xja"; + sha256 = "1811b55wdfg4kbsjcgh1kc938g118jpvif97ilgrmbls25dfpvvw"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/cftime/default.nix b/pkgs/development/python-modules/cftime/default.nix index 9190f274a24f..4c11267b041d 100644 --- a/pkgs/development/python-modules/cftime/default.nix +++ b/pkgs/development/python-modules/cftime/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "cftime"; - version = "1.0.1"; + version = "1.0.2.1"; src = fetchPypi { inherit pname version; - sha256 = "20556931f546838d09be5d589482dfae6164e0d403f0aab2163c006b680d3b92"; + sha256 = "1fxpvy3z0b3ga8ylr54ml7nxsfah2bh5azk43nb565rcka3x909c"; }; checkInputs = [ pytest coveralls pytestcov ]; diff --git a/pkgs/development/python-modules/click-repl/default.nix b/pkgs/development/python-modules/click-repl/default.nix new file mode 100644 index 000000000000..8a487ab24102 --- /dev/null +++ b/pkgs/development/python-modules/click-repl/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi, click, prompt_toolkit }: + +buildPythonPackage rec { + pname = "click-repl"; + version = "0.1.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "1mcmz95595nrp4r58spy1ac993db26hk4q97isghbmn4md99vwmr"; + }; + + propagatedBuildInputs = [ click prompt_toolkit ]; + + meta = with stdenv.lib; { + homepage = https://github.com/click-contrib/click-repl; + description = "Subcommand REPL for click apps"; + license = licenses.mit; + maintainers = with maintainers; [ twey ]; + }; +} diff --git a/pkgs/development/python-modules/docker_compose/default.nix b/pkgs/development/python-modules/docker_compose/default.nix index 01a5b4aa8e68..4af9c32fed6a 100644 --- a/pkgs/development/python-modules/docker_compose/default.nix +++ b/pkgs/development/python-modules/docker_compose/default.nix @@ -6,12 +6,12 @@ , enum34, functools32, }: buildPythonApplication rec { - version = "1.22.0"; + version = "1.23.1"; pname = "docker-compose"; src = fetchPypi { inherit pname version; - sha256 = "915cdd0ea7aff349d27a8e0585124ac38695635201770a35612837b25e234677"; + sha256 = "15jijx3md70b9xw8818xjm70nr9pc27p7v7is0yi6agf8scvvqkq"; }; # lots of networking and other fails diff --git a/pkgs/development/python-modules/filelock/default.nix b/pkgs/development/python-modules/filelock/default.nix index 80e3429b644a..a548f1ab5d2e 100644 --- a/pkgs/development/python-modules/filelock/default.nix +++ b/pkgs/development/python-modules/filelock/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "filelock"; - version = "3.0.9"; + version = "3.0.10"; src = fetchPypi { inherit pname version; - sha256 = "97694f181bdf58f213cca0a7cb556dc7bf90e2f8eb9aa3151260adac56701afb"; + sha256 = "1rjv7g85smh6hrq6n9h721kh83qjv8mfp0ksdnbqbbsd82xw246n"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/gin-config/default.nix b/pkgs/development/python-modules/gin-config/default.nix new file mode 100644 index 000000000000..3a854646021f --- /dev/null +++ b/pkgs/development/python-modules/gin-config/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +, six +, enum34 +}: + +buildPythonPackage rec { + pname = "gin-config"; + version = "0.1.1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1zqzhg8nqdqjx0sjrsrs9bpyiaqqlyihqhhy2ijrpp62x9rjllga"; + + }; + + propagatedBuildInputs = [ six enum34 ]; + + # PyPI archive does not ship with tests + doCheck= false; + + meta = with lib; { + homepage = https://github.com/google/gin-config; + description = "Gin provides a lightweight configuration framework for Python, based on dependency injection."; + license = licenses.asl20; + maintainers = with maintainers; [ jethro ]; + }; +} diff --git a/pkgs/development/python-modules/google_cloud_speech/default.nix b/pkgs/development/python-modules/google_cloud_speech/default.nix index f404c68921d4..6a8aefa92c42 100644 --- a/pkgs/development/python-modules/google_cloud_speech/default.nix +++ b/pkgs/development/python-modules/google_cloud_speech/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "google-cloud-speech"; - version = "0.35.0"; + version = "0.36.0"; src = fetchPypi { inherit pname version; - sha256 = "5db2d69315b3d95d067c9bffe17994b6ee9252702888cc300d76252b451638e1"; + sha256 = "1jjicvf5r20ibhkkay0p6av8jifvp2wkdd8bs9vmhm4rwvcnlxbf"; }; propagatedBuildInputs = [ google_api_core ]; diff --git a/pkgs/development/python-modules/hovercraft/default.nix b/pkgs/development/python-modules/hovercraft/default.nix deleted file mode 100644 index e598fd41bab1..000000000000 --- a/pkgs/development/python-modules/hovercraft/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, docutils -, lxml -, manuel -, pygments -, svg-path -, watchdog -, isPy3k -}: - -buildPythonPackage rec { - pname = "hovercraft"; - version = "2.0"; - disabled = ! isPy3k; - - src = fetchPypi { - inherit pname version; - sha256 = "0lqxr816lymgnywln8bbv9nrmkyahjjcjkm9kjyny9bflayz4f1g"; - }; - - propagatedBuildInputs = [ docutils lxml manuel pygments svg-path watchdog ]; - - # one test assumes we have docutils 0.12 - # TODO: enable tests after upgrading docutils to 0.12 - doCheck = false; - - meta = with stdenv.lib; { - description = "A tool to make impress.js presentations from reStructuredText"; - homepage = https://github.com/regebro/hovercraft; - license = licenses.mit; - maintainers = with maintainers; [ goibhniu ]; - }; - -} diff --git a/pkgs/development/python-modules/murmurhash/default.nix b/pkgs/development/python-modules/murmurhash/default.nix index a3a9096a335c..b3cea69c098d 100644 --- a/pkgs/development/python-modules/murmurhash/default.nix +++ b/pkgs/development/python-modules/murmurhash/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "murmurhash"; - version = "0.28.0"; + version = "1.0.1"; src = fetchPypi { inherit pname version; - sha256 = "16id8jppw8r54wisrlaaiprcszzb7d7lbpnskqn38s8i7vnkf4b5"; + sha256 = "02wbyjixvzd6l1mljpm1ci7x835zhk3nqxgy7kvbi4jimvairs9q"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/patsy/default.nix b/pkgs/development/python-modules/patsy/default.nix index 9efa3126ce3b..a21b4027bbb2 100644 --- a/pkgs/development/python-modules/patsy/default.nix +++ b/pkgs/development/python-modules/patsy/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "patsy"; - version = "0.5.0"; + version = "0.5.1"; src = fetchPypi { inherit pname version; - sha256 = "0fw888zd2s7f5zxm9f98ss93qhwv0sqnbdy21ipj33ccqgakhpz0"; + sha256 = "149rbrdzwns0ay88caf1zsm1r53v1q5np1mrb36na50y432cw5gi"; }; checkInputs = [ nose parameterized ]; diff --git a/pkgs/development/python-modules/prompt_toolkit/1.nix b/pkgs/development/python-modules/prompt_toolkit/1.nix new file mode 100644 index 000000000000..e9d44c83f1db --- /dev/null +++ b/pkgs/development/python-modules/prompt_toolkit/1.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, docopt +, six +, wcwidth +, pygments +}: + +buildPythonPackage rec { + pname = "prompt_toolkit"; + version = "1.0.15"; + + src = fetchPypi { + inherit pname version; + sha256 = "858588f1983ca497f1cf4ffde01d978a3ea02b01c8a26a8bbc5cd2e66d816917"; + }; + checkPhase = '' + rm prompt_toolkit/win32_types.py + py.test -k 'not test_pathcompleter_can_expanduser' + ''; + + checkInputs = [ pytest ]; + propagatedBuildInputs = [ docopt six wcwidth pygments ]; + + meta = { + description = "Python library for building powerful interactive command lines"; + longDescription = '' + prompt_toolkit could be a replacement for readline, but it can be + much more than that. It is cross-platform, everything that you build + with it should run fine on both Unix and Windows systems. Also ships + with a nice interactive Python shell (called ptpython) built on top. + ''; + homepage = https://github.com/jonathanslenders/python-prompt-toolkit; + license = lib.licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/prompt_toolkit/default.nix b/pkgs/development/python-modules/prompt_toolkit/default.nix index 69a2f47d05ff..cd0df6c52be7 100644 --- a/pkgs/development/python-modules/prompt_toolkit/default.nix +++ b/pkgs/development/python-modules/prompt_toolkit/default.nix @@ -2,27 +2,24 @@ , buildPythonPackage , fetchPypi , pytest -, docopt , six , wcwidth -, pygments }: buildPythonPackage rec { pname = "prompt_toolkit"; - version = "1.0.15"; + version = "2.0.7"; src = fetchPypi { inherit pname version; - sha256 = "858588f1983ca497f1cf4ffde01d978a3ea02b01c8a26a8bbc5cd2e66d816917"; + sha256 = "0fgacqk73w7s932vy46pan2yp8rvjmlkag20xvaydh9mhf6h85zx"; }; checkPhase = '' - rm prompt_toolkit/win32_types.py py.test -k 'not test_pathcompleter_can_expanduser' ''; checkInputs = [ pytest ]; - propagatedBuildInputs = [ docopt six wcwidth pygments ]; + propagatedBuildInputs = [ six wcwidth ]; meta = { description = "Python library for building powerful interactive command lines"; @@ -35,4 +32,4 @@ buildPythonPackage rec { homepage = https://github.com/jonathanslenders/python-prompt-toolkit; license = lib.licenses.bsd3; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/ptpython/default.nix b/pkgs/development/python-modules/ptpython/default.nix index b553d50d130b..d48e42ef2646 100644 --- a/pkgs/development/python-modules/ptpython/default.nix +++ b/pkgs/development/python-modules/ptpython/default.nix @@ -1,17 +1,15 @@ -{ stdenv, buildPythonPackage, fetchPypi, wcwidth, six, prompt_toolkit, docopt -, jedi, pygments }: +{ stdenv, buildPythonPackage, fetchPypi, prompt_toolkit, docopt , jedi, pygments }: buildPythonPackage rec { pname = "ptpython"; - version = "0.41"; - name = "${pname}-${version}"; + version = "2.0.4"; src = fetchPypi { inherit pname version; - sha256 = "1hcaaadkp5n37hxggraynifa33wx1akklzvf6y4rvgjxbjl2g2x7"; + sha256 = "1m34jbwj3j3762mg1vynpgciqw4kqdzdqjvd62mwhbjkly7ddsgb"; }; - propagatedBuildInputs = [ wcwidth six prompt_toolkit docopt jedi pygments ]; + propagatedBuildInputs = [ prompt_toolkit docopt jedi pygments ]; # no tests to run doCheck = false; diff --git a/pkgs/development/python-modules/selenium/default.nix b/pkgs/development/python-modules/selenium/default.nix index b64b53fb2fbb..ada159aaa121 100644 --- a/pkgs/development/python-modules/selenium/default.nix +++ b/pkgs/development/python-modules/selenium/default.nix @@ -23,11 +23,11 @@ in buildPythonPackage rec { pname = "selenium"; - version = "3.14.1"; + version = "3.141.0"; src = fetchPypi { inherit pname version; - sha256 = "ab192cd046164c40fabcf44b47c66c8b12495142f4a69dcc55ea6eeef096e614"; + sha256 = "039hf9knvl4s3hp21bzwsp1g5ri9gxsh504dp48lc6nr1av35byy"; }; buildInputs = [xorg.libX11]; diff --git a/pkgs/development/python-modules/texttable/default.nix b/pkgs/development/python-modules/texttable/default.nix index fed9a3fd7330..6747ae78f49c 100644 --- a/pkgs/development/python-modules/texttable/default.nix +++ b/pkgs/development/python-modules/texttable/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "texttable"; - version = "1.4.0"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "95e8cfe85f8395a7eacdfbc8f09d885b9ef3a6ac6ead0364ea721de1127aa36b"; + sha256 = "0mzv6zs8ciwnf83fwikqmmjwbzqmdja3imn4b4k209f80g0rk8qv"; }; meta = { diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index d99ab3df75ef..6da3d067c3ae 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,15 +1,16 @@ { stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "8.13"; + version = "8.14"; name = "checkstyle-${version}"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "05w60yg5ghjdg36k4xd8m0yyfia9viyz51j053030b74bq65yvai"; + sha256 = "11lpyjh0rbz8821q0gcrll5ichf8hrmlfy66ary5jjiyxc85z762"; }; - nativeBuildInputs = [ makeWrapper jre ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jre ]; unpackPhase = ":"; diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 2f0878da8c6f..0381dc85895f 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -90,12 +90,12 @@ in { #<generated> # DO NOT EDIT! Automatically generated by ./update.py radare2 = generic { - version_commit = "19720"; - gittap = "3.0.0"; - gittip = "13e3ebd2aa6653eb5b6bdd65a93dcddf3550fcfa"; - rev = "3.0.0"; - version = "3.0.0"; - sha256 = "0awbk9v7qjkarscaqzyly310f04dxgndxvxwxbjrsswqlp206b40"; + version_commit = "19915"; + gittap = "3.0.1"; + gittip = "addb7f21e73073600fd6205e385fa096084701f5"; + rev = "3.0.1"; + version = "3.0.1"; + sha256 = "0da4ns11valy305074cri3in5zcafjw3vxc53b4yg37114ly433h"; cs_tip = "e2c1cd46c06744beaceff42dd882de3a90f0a37c"; cs_sha256 = "1czzqj8zdjgh7h2ixi26ij3mm4bgm4xw2slin6fv73nic8yaw722"; }; diff --git a/pkgs/development/tools/database/pgcli/default.nix b/pkgs/development/tools/database/pgcli/default.nix index bc1c2515bfa7..73e343833383 100644 --- a/pkgs/development/tools/database/pgcli/default.nix +++ b/pkgs/development/tools/database/pgcli/default.nix @@ -1,27 +1,25 @@ { lib, pythonPackages, fetchFromGitHub }: pythonPackages.buildPythonApplication rec { - name = "pgcli-${version}"; - version = "1.11.0"; + pname = "pgcli"; + version = "2.0.0"; - src = fetchFromGitHub { - owner = "dbcli"; - repo = "pgcli"; - rev = "v${version}"; - sha256 = "01qcvl0iwabinq3sb4340js8v3sbwkbxi64sg4xy76wj8xr6kgsk"; + src = pythonPackages.fetchPypi { + inherit pname version; + sha256 = "085fna5nc72nfj1gw0m4ia6wzayinqaffmjy3ajldha1727vqwzi"; }; - buildInputs = with pythonPackages; [ pytest mock ]; - checkPhase = '' - mkdir /tmp/homeless-shelter - HOME=/tmp/homeless-shelter py.test tests -k 'not test_missing_rc_dir and not test_quoted_db_uri and not test_port_db_uri' - ''; - propagatedBuildInputs = with pythonPackages; [ - cli-helpers click configobj humanize prompt_toolkit psycopg2 + cli-helpers click configobj humanize prompt_toolkit_2 psycopg2 pygments sqlparse pgspecial setproctitle keyring ]; + checkInputs = with pythonPackages; [ pytest mock ]; + + checkPhase = '' + py.test + ''; + meta = with lib; { description = "Command-line interface for PostgreSQL"; longDescription = '' diff --git a/pkgs/development/tools/nailgun/default.nix b/pkgs/development/tools/nailgun/default.nix index 6a34c1c130d9..07005131fb5e 100644 --- a/pkgs/development/tools/nailgun/default.nix +++ b/pkgs/development/tools/nailgun/default.nix @@ -1,39 +1,37 @@ { stdenv, fetchMavenArtifact, fetchFromGitHub, jre, makeWrapper }: let - version = "0.9.1"; + version = "1.0.0"; nailgun-server = fetchMavenArtifact { - groupId = "com.martiansoftware"; + groupId = "com.facebook"; artifactId = "nailgun-server"; inherit version; - sha256 = "09ggkkd1s58jmpc74s6m10d3hyf6bmif31advk66zljbpykgl625"; + sha256 = "1mk8pv0g2xg9m0gsb96plbh6mc24xrlyrmnqac5mlbl4637l4q95"; }; in stdenv.mkDerivation rec { name = "nailgun-${version}"; src = fetchFromGitHub { - owner = "martylamb"; + owner = "facebook"; repo = "nailgun"; - rev = "1ad9ad9d2d17c895144a9ee0e7acb1d3d90fb66f"; - sha256 = "1f8ac5kg7imhix9kqdzwiav1bxh8vljv2hb1mq8yz4rqsrx2r4w3"; + rev = "nailgun-all-v${version}"; + sha256 = "1syyk4ss5vq1zf0ma00svn56lal53ffpikgqgzngzbwyksnfdlh6"; }; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; - buildInputs = [ makeWrapper ]; - - installPhase = '' - install -D ng $out/bin/ng + nativeBuildInputs = [ makeWrapper ]; + postInstall = '' makeWrapper ${jre}/bin/java $out/bin/ng-server \ - --add-flags '-cp ${nailgun-server.jar}:$CLASSPATH com.martiansoftware.nailgun.NGServer' + --add-flags '-classpath ${nailgun-server.jar}:$CLASSPATH com.facebook.nailgun.NGServer' ''; meta = with stdenv.lib; { description = "Client, protocol, and server for running Java programs from the command line without incurring the JVM startup overhead"; - homepage = http://martiansoftware.com/nailgun/; - license = licenses.apsl20; + homepage = http://www.martiansoftware.com/nailgun/; + license = licenses.asl20; platforms = platforms.linux; maintainers = with maintainers; [ volth ]; }; diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix index 7be1a9777c02..8474f99bc8b9 100644 --- a/pkgs/development/tools/rust/racer/default.nix +++ b/pkgs/development/tools/rust/racer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper, rustup, substituteAll }: +{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper, substituteAll }: rustPlatform.buildRustPackage rec { name = "racer-${version}"; @@ -13,8 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1j3fviimdxn6xa75z0l9wkgdnznp8q20jjs42mql6ql782dga5lk"; - # rustup is required for test - buildInputs = [ makeWrapper rustup ]; + buildInputs = [ makeWrapper ]; preCheck = '' export RUST_SRC_PATH="${rustPlatform.rustcSrc}" diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index b19bd67c307f..4ba5abc65e30 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -6,7 +6,7 @@ let allSpecs = { "x86_64-linux" = { system = "linux64"; - sha256 = "10phyz7ffzzx5ysbpyidssvwjdrcyszxf3lnba8qsrcajzm21nff"; + sha256 = "0x45d2fq01w5v28vipvl4g37ld7d9m8rij9dnwq2zcvyz0rfdfmk"; }; "x86_64-darwin" = { @@ -28,7 +28,7 @@ let in stdenv.mkDerivation rec { name = "chromedriver-${version}"; - version = "2.42"; + version = "2.43"; src = fetchurl { url = "https://chromedriver.storage.googleapis.com/${version}/chromedriver_${spec.system}.zip"; diff --git a/pkgs/games/bzflag/default.nix b/pkgs/games/bzflag/default.nix index c8618c13347d..c114443e1e72 100644 --- a/pkgs/games/bzflag/default.nix +++ b/pkgs/games/bzflag/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "bzflag"; - version = "2.4.16"; + version = "2.4.18"; src = fetchurl { url = "https://download.bzflag.org/${pname}/source/${version}/${name}.tar.bz2"; - sha256 = "00y2ifjgl4yz1pb2fgkg00vrfb6yk5cfxwjbx3fw2alnsaw6cqgg"; + sha256 = "1gmz31wmn3f8zq1bfilkgbf4qmi4fa0c93cs76mhg8h978pm23cx"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/games/gargoyle/darwin.patch b/pkgs/games/gargoyle/darwin.patch index 230f453acad7..6958fe495d26 100644 --- a/pkgs/games/gargoyle/darwin.patch +++ b/pkgs/games/gargoyle/darwin.patch @@ -1,33 +1,3 @@ -diff --git a/Jamshared b/Jamshared -index 13db835..fd42928 100644 ---- a/Jamshared -+++ b/Jamshared -@@ -79,7 +79,7 @@ if $(OS) = MACOSX - { - actions together SharedLink bind NEEDLIBS - { -- $(LINK) -headerpad_max_install_names $(FRAMEWORKS) $(MAINARCH) $(ALTARCH) -dynamiclib $(SHRLINKFLAGS) -install_name @executable_path/$(<:D=) -o $(<) $(>) $(NEEDLIBS) $(SHRLINKLIBS) -+ $(LINK) $(FRAMEWORKS) $(MAINARCH) $(ALTARCH) -dynamiclib $(SHRLINKFLAGS) -install_name @executable_path/$(<:D=) -o $(<) $(>) $(NEEDLIBS) $(SHRLINKLIBS) - } - } - else -diff --git a/tads/Jamfile b/tads/Jamfile -index 1f8829d..d8455eb 100644 ---- a/tads/Jamfile -+++ b/tads/Jamfile -@@ -33,8 +33,8 @@ if $(OS) = LINUX || $(OS) = SOLARIS - - if $(OS) = MACOSX - { -- SubDirCcFlags -headerpad_max_install_names $(MAINARCH) $(ALTARCH) ; -- LINKFLAGS = -headerpad_max_install_names $(MAINARCH) $(ALTARCH) ; -+ SubDirCcFlags $(MAINARCH) $(ALTARCH) ; -+ LINKFLAGS = $(MAINARCH) $(ALTARCH) ; - } - - SEARCH_SOURCE = -diff --git a/garglk/fontmac.m b/garglk/fontmac.m -index d6e1426..72304a3 100644 --- a/garglk/fontmac.m +++ b/garglk/fontmac.m @@ -167,7 +167,7 @@ static void propfont(char *file, int style) @@ -48,15 +18,6 @@ index d6e1426..72304a3 100644 [fontFamilyDescriptor matchingFontDescriptorsWithMandatoryKeys: nil]; for (NSFontDescriptor * sysfont in fontMatches) -@@ -197,7 +197,7 @@ void fontreplace(char *font, int type) - - else if ([sysfont symbolicTraits] & NSFontItalicTrait) - style = FONTI; -- -+ - /* find path for font */ - CFURLRef urlRef = CTFontDescriptorCopyAttribute((CTFontDescriptorRef)sysfont, kCTFontURLAttribute); - if (!urlRef) @@ -259,7 +259,7 @@ void fontload(void) // obtain a list of all files in the Fonts directory @@ -66,47 +27,9 @@ index d6e1426..72304a3 100644 // create a collection to hold the registered font URLs gli_registered_fonts = [NSMutableArray new]; -diff --git a/garglk/launchmac.m b/garglk/launchmac.m -index 68deca5..9f752ac 100644 --- a/garglk/launchmac.m +++ b/garglk/launchmac.m -@@ -72,14 +72,14 @@ char *winfilters[] = - height: (unsigned int) height - { - [[self openGLContext] makeCurrentContext]; -- -+ - /* allocate new texture */ - glDeleteTextures(1, &output); - glGenTextures(1, &output); - - /* bind target to texture */ -- glEnable(GL_TEXTURE_RECTANGLE_ARB); -- glBindTexture(GL_TEXTURE_RECTANGLE_ARB, output); -+ glEnable(GL_TEXTURE_RECTANGLE_ARB); -+ glBindTexture(GL_TEXTURE_RECTANGLE_ARB, output); - - /* set target parameters */ - glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_STORAGE_HINT_APPLE, GL_STORAGE_CACHED_APPLE); -@@ -460,7 +460,7 @@ static BOOL isTextbufferEvent(NSEvent * evt) - if (filter != FILTER_ALL) - { - NSArray * filterTypes = [NSArray arrayWithObject: [NSString stringWithCString: winfilters[filter] -- encoding: NSUTF8StringEncoding]]; -+ encoding: NSUTF8StringEncoding]]; - [openDlg setAllowedFileTypes: filterTypes]; - [openDlg setAllowsOtherFileTypes: NO]; - } -@@ -485,7 +485,7 @@ static BOOL isTextbufferEvent(NSEvent * evt) - if (filter != FILTER_ALL) - { - NSArray * filterTypes = [NSArray arrayWithObject: [NSString stringWithCString: winfilters[filter] -- encoding: NSUTF8StringEncoding]]; -+ encoding: NSUTF8StringEncoding]]; - [saveDlg setAllowedFileTypes: filterTypes]; - [saveDlg setAllowsOtherFileTypes: NO]; - } -@@ -518,7 +518,7 @@ static BOOL isTextbufferEvent(NSEvent * evt) +@@ -556,7 +556,7 @@ static BOOL isTextbufferEvent(NSEvent * evt) <GargoyleApp, NSApplicationDelegate, NSWindowDelegate> { BOOL openedFirstGame; @@ -115,34 +38,6 @@ index 68deca5..9f752ac 100644 NSConnection * link; } - (BOOL) launchFile: (NSString *) file; -@@ -760,20 +760,20 @@ static BOOL isTextbufferEvent(NSEvent * evt) - - (BOOL) launchFileDialog - { - int result; -- -+ - NSOpenPanel * openDlg = [NSOpenPanel openPanel]; - - [openDlg setCanChooseFiles: YES]; - [openDlg setCanChooseDirectories: NO]; - [openDlg setAllowsMultipleSelection: NO]; - [openDlg setTitle: [NSString stringWithCString: AppName encoding: NSUTF8StringEncoding]]; -- -+ - NSMutableArray *filterTypes = [NSMutableArray arrayWithCapacity:100]; -- -- NSEnumerator *docTypeEnum = [[[[NSBundle mainBundle] infoDictionary] -+ -+ NSEnumerator *docTypeEnum = [[[[NSBundle mainBundle] infoDictionary] - objectForKey:@"CFBundleDocumentTypes"] objectEnumerator]; - NSDictionary *docType; -- -+ - while (docType = [docTypeEnum nextObject]) - { - [filterTypes addObjectsFromArray:[docType objectForKey: @"CFBundleTypeExtensions"]]; -diff --git a/garglk/ttsmac.m b/garglk/ttsmac.m -index 9f6ab0e..de3d6fe 100644 --- a/garglk/ttsmac.m +++ b/garglk/ttsmac.m @@ -30,7 +30,7 @@ @@ -167,29 +62,3 @@ index 9f6ab0e..de3d6fe 100644 if ([lang isEqualToString: [attr objectForKey: NSVoiceLocaleIdentifier]]) { [synth setVoice: voice]; -diff --git a/tads/tads3/vmtz.cpp b/tads/tads3/vmtz.cpp -index 5e193a1..dce46f7 100644 ---- a/tads/tads3/vmtz.cpp -+++ b/tads/tads3/vmtz.cpp -@@ -1985,5 +1985,5 @@ void CVmTimeZone::query(vmtzquery *result, int32_t dayno, int32_t daytime, - * up until that moment - */ -- result->set(tcur > 0 ? tcur - 1 : tcur); -+ result->set(tcur != 0 ? tcur - 1 : tcur); - return; - } -diff --git a/terps/Jamfile b/terps/Jamfile -index b5f6d52..2d1ccdb 100644 ---- a/terps/Jamfile -+++ b/terps/Jamfile -@@ -185,8 +185,8 @@ if $(MAKE_GEAS) = yes - - if $(OS) = MACOSX - { -- SubDirCcFlags -headerpad_max_install_names $(MAINARCH) $(ALTARCH) ; -- LINKFLAGS = -headerpad_max_install_names $(MAINARCH) $(ALTARCH) ; -+ SubDirCcFlags $(MAINARCH) $(ALTARCH) ; -+ LINKFLAGS = $(MAINARCH) $(ALTARCH) ; - } - - SUBDIRC++FLAGS = $(SUBDIRCCFLAGS) ; diff --git a/pkgs/games/gargoyle/default.nix b/pkgs/games/gargoyle/default.nix index fc02bdffcad8..5bf0ae1c814a 100644 --- a/pkgs/games/gargoyle/default.nix +++ b/pkgs/games/gargoyle/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, jam, libtool, pkgconfig, gtk2, SDL, SDL_mixer, SDL_sound, smpeg, libvorbis }: +{ stdenv, lib, fetchFromGitHub, jam, cctools, pkgconfig +, SDL, SDL_mixer, SDL_sound, cf-private, gtk2, libvorbis, smpeg }: let @@ -19,28 +20,22 @@ let in stdenv.mkDerivation { - name = "gargoyle-2017-08-27"; + name = "gargoyle-2018-10-06"; src = fetchFromGitHub { owner = "garglk"; repo = "garglk"; - rev = "65c95166f53adaa2e5e1a5e0d8a34e9219d06de6"; - sha256 = "1agnap38qdf2n1v37ka3ky44j56yhvln4lzf13diyqhjmh9lvfq5"; + rev = "d03391563fa75942fbf8f8deeeacf3a8be9fc3b0"; + sha256 = "0icwgc25gp7krq6zf66hljydc6vps6bb4knywnrfgnfcmcalqqx9"; }; - nativeBuildInputs = [ jam pkgconfig ] ++ stdenv.lib.optional stdenv.isDarwin libtool; + nativeBuildInputs = [ jam pkgconfig ] ++ lib.optional stdenv.isDarwin cctools; - buildInputs = [ gtk2 SDL SDL_mixer ] ++ ( - if stdenv.isDarwin then [ smpeg libvorbis ] else [ SDL_sound ] - ); + buildInputs = [ SDL SDL_mixer SDL_sound gtk2 ] + ++ lib.optionals stdenv.isDarwin [ cf-private smpeg libvorbis ]; patches = [ ./darwin.patch ]; - postPatch = '' - substituteInPlace Jamrules \ - --replace -mmacosx-version-min=10.7 -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET - ''; - buildPhase = jamenv + "jam -j$NIX_BUILD_CORES"; installPhase = if stdenv.isDarwin then (builtins.readFile ./darwin.sh) else jamenv + '' @@ -57,7 +52,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = http://ccxvii.net/gargoyle/; license = licenses.gpl2Plus; description = "Interactive fiction interpreter GUI"; diff --git a/pkgs/misc/emulators/dosbox/default.nix b/pkgs/misc/emulators/dosbox/default.nix index 57e76a964376..878e98fa1665 100644 --- a/pkgs/misc/emulators/dosbox/default.nix +++ b/pkgs/misc/emulators/dosbox/default.nix @@ -1,31 +1,16 @@ -{ stdenv, lib, fetchurl, SDL, makeDesktopItem, libGLU_combined }: +{ stdenv, lib, fetchurl, makeDesktopItem, SDL, SDL_net, SDL_sound, libGLU_combined, libpng }: stdenv.mkDerivation rec { - name = "dosbox-0.74"; + name = "dosbox-0.74-2"; src = fetchurl { url = "mirror://sourceforge/dosbox/${name}.tar.gz"; - sha256 = "01cfjc5bs08m4w79nbxyv7rnvzq2yckmgrbq36njn06lw8b4kxqk"; + sha256 = "1ksp1b5szi0vy4x55rm3j1y9wq5mlslpy8llpg87rpdyjlsk0xvh"; }; - patches = - [ # Fix building with GCC 4.6. - (fetchurl { - url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/games-emulation/dosbox/files/dosbox-0.74-gcc46.patch?revision=1.1"; - sha256 = "03iv1ph7fccfw327ngnhvzwyiix7fsbdb5mmpxivzkidhlrssxq9"; - }) - (fetchurl { - url = "https://svnweb.freebsd.org/ports/head/emulators/dosbox/files/patch-src_gui_sdlmain.cpp?revision=435580&view=co&pathrev=435580"; - sha256 = "1mbj5wrn53k0zds2adys34949vzsbfgm0pmsyx14v9j0cxi7drca"; - name = "patch-src_gui_sdlmain.cpp"; - }) - ]; - - patchFlags = "-p0"; - hardeningDisable = [ "format" ]; - buildInputs = [ SDL libGLU_combined ]; + buildInputs = [ SDL SDL_net SDL_sound libGLU_combined libpng ]; configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest"; @@ -43,6 +28,8 @@ stdenv.mkDerivation rec { cp ${desktopItem}/share/applications/* $out/share/applications ''; + enableParallelBuilding = true; + meta = with lib; { homepage = http://www.dosbox.com/; description = "A DOS emulator"; diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix index 0c144b567418..cb281e68dfd7 100644 --- a/pkgs/misc/themes/adapta/default.nix +++ b/pkgs/misc/themes/adapta/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "adapta-gtk-theme-${version}"; - version = "3.95.0.1"; + version = "3.95.0.11"; src = fetchFromGitHub { owner = "adapta-project"; repo = "adapta-gtk-theme"; rev = version; - sha256 = "0hc3ar55wjg51qf8c7h0nix0lyqs16mk1d4hhxyv102zq4l5fz97"; + sha256 = "19skrhp10xx07hbd0lr3d619vj2im35d8p9rmb4v4zacci804q04"; }; preferLocalBuild = true; diff --git a/pkgs/os-specific/darwin/trash/default.nix b/pkgs/os-specific/darwin/trash/default.nix index 7f327fcf3d7a..e1606383c0dc 100644 --- a/pkgs/os-specific/darwin/trash/default.nix +++ b/pkgs/os-specific/darwin/trash/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, frameworks, perl } : +{ stdenv, fetchFromGitHub, perl, cf-private, AppKit, Cocoa, ScriptingBridge }: + stdenv.mkDerivation rec { version = "0.9.1"; name = "trash-${version}"; @@ -10,11 +11,11 @@ stdenv.mkDerivation rec { sha256 = "0ylkf7jxfy1pj7i1s48w28kzqjdfd57m2pw0jycsgcj5bkzwll41"; }; - buildInputs = with frameworks; [ - Cocoa - AppKit - ScriptingBridge + buildInputs = [ perl + Cocoa AppKit ScriptingBridge + # Neded for OBJC_CLASS_$_NSMutableArray symbols. + cf-private ]; patches = [ ./trash.diff ]; diff --git a/pkgs/os-specific/linux/autofs/default.nix b/pkgs/os-specific/linux/autofs/default.nix index 60ccad04eea4..38e2fa9bd344 100644 --- a/pkgs/os-specific/linux/autofs/default.nix +++ b/pkgs/os-specific/linux/autofs/default.nix @@ -2,14 +2,14 @@ , libxml2, kerberos, kmod, openldap, sssd, cyrus_sasl, openssl }: let - version = "5.1.4"; + version = "5.1.5"; name = "autofs-${version}"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "mirror://kernel/linux/daemons/autofs/v5/${name}.tar.xz"; - sha256 = "08hpphawzcdibwbhw0r3y7hnfczlazpp90sf3bz2imgza7p31klg"; + sha256 = "1nn0z60f49zchpv8yw67fk8hmbjszpnczs0bj2ql2vgxwbcxmbr3"; }; preConfigure = '' @@ -40,8 +40,8 @@ in stdenv.mkDerivation { meta = { description = "Kernel-based automounter"; - homepage = http://www.linux-consulting.com/Amd_AutoFS/autofs.html; - license = stdenv.lib.licenses.gpl2; + homepage = https://www.kernel.org/pub/linux/daemons/autofs/; + license = stdenv.lib.licenses.gpl2Plus; executables = [ "automount" ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index 4eec4754ca9a..ea255181e016 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -5,13 +5,13 @@ assert enablePython -> python2 != null; stdenv.mkDerivation rec { - name = "cryptsetup-2.0.4"; + name = "cryptsetup-2.0.5"; outputs = [ "out" "dev" "man" ]; src = fetchurl { url = "mirror://kernel/linux/utils/cryptsetup/v2.0/${name}.tar.xz"; - sha256 = "0d2p9g2wqcv6l3671gvw96p16jadbgyh21ddy2bhqgi96dq3qflx"; + sha256 = "079hzvjyzbzaakzvqc1fmciwlzllzqyl2949viasb994r2i2rxx0"; }; # Disable 4 test cases that fail in a sandbox diff --git a/pkgs/os-specific/linux/earlyoom/default.nix b/pkgs/os-specific/linux/earlyoom/default.nix index 0c2f1a872fd9..5154f68cde4e 100644 --- a/pkgs/os-specific/linux/earlyoom/default.nix +++ b/pkgs/os-specific/linux/earlyoom/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "earlyoom-${VERSION}"; # This environment variable is read by make to set the build version. - VERSION = "1.1"; + VERSION = "1.2"; src = fetchFromGitHub { owner = "rfjakob"; repo = "earlyoom"; rev = "v${VERSION}"; - sha256 = "1hczn59mmx287hnlhcmpxrf3jy3arllif165dq7b2ha6w3ywngww"; + sha256 = "0bpqlbsjcmcizgw75j1zyw1sp2cgwhaar9y70sibw1km011yqbzd"; }; installPhase = '' diff --git a/pkgs/os-specific/linux/eventstat/default.nix b/pkgs/os-specific/linux/eventstat/default.nix index 8d96a503c766..cf3522b5f2fa 100644 --- a/pkgs/os-specific/linux/eventstat/default.nix +++ b/pkgs/os-specific/linux/eventstat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "eventstat-${version}"; - version = "0.04.04"; + version = "0.04.05"; src = fetchzip { url = "http://kernel.ubuntu.com/~cking/tarballs/eventstat/eventstat-${version}.tar.gz"; - sha256 = "034xpdr3ip4w9k713wjc45x66k3nz6wg9wkzmchrjifxk4dldbd8"; + sha256 = "1s9d6wl7f8cyn21fwj894dhfvl6f6f2h5xv26hg1yk3zfb5rmyn7"; }; buildInputs = [ ncurses ]; installFlags = [ "DESTDIR=$(out)" ]; diff --git a/pkgs/os-specific/linux/irqbalance/default.nix b/pkgs/os-specific/linux/irqbalance/default.nix index 439b2aff6afc..c4a29d2d601d 100644 --- a/pkgs/os-specific/linux/irqbalance/default.nix +++ b/pkgs/os-specific/linux/irqbalance/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "irqbalance-${version}"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "irqbalance"; repo = "irqbalance"; rev = "v${version}"; - sha256 = "05q3cdz2a5zp5s2bdz5a80y9vq7awqw9lbvyvh6vjs9a8vg80hwm"; + sha256 = "1wdwch4nb479xhinin4yqvcjah6h09i4nh8fhnsfbn1mzl0hiv09"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index f30eac588a2f..762b46bb5526 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -1,23 +1,24 @@ -{ stdenv, fetchgit, autoreconfHook, coreutils, readline, python3Packages }: +{ stdenv, fetchgit, autoreconfHook, pkgconfig, coreutils, readline, python3Packages }: let ell = fetchgit { url = https://git.kernel.org/pub/scm/libs/ell/ell.git; - rev = "0.11"; - sha256 = "0nifa5w6fxy7cagyas2a0zhcppi83yrcsnnp70ls2rc90x4r1ip8"; + rev = "0.14"; + sha256 = "13jlmdk47pscmfs3c12awfwr3m6ka4fh6fyr9cl1bmqdpwqmmmk6"; }; in stdenv.mkDerivation rec { name = "iwd-${version}"; - version = "0.9"; + version = "0.11"; src = fetchgit { url = https://git.kernel.org/pub/scm/network/wireless/iwd.git; rev = version; - sha256 = "1l1jbwsshjbz32s4rf0zfcn3fd16si4y9qa0zaxp00bfzflnpcd4"; + sha256 = "0q79rdj3h16xdf0g2jdsvb2141z36z89vgzq0qn31pxzhgxdgf7j"; }; nativeBuildInputs = [ autoreconfHook + pkgconfig python3Packages.wrapPython ]; diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index a5170edfa261..61afe092f722 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.79"; + version = "4.14.80"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0flkkgfjzs6z7hkr15lga8jvxgwn6wi885yf5wyr0zxjrqg0f6an"; + sha256 = "1lnp7qnlbj8mrc6iwnffpq3dbms3l40qxwdbqmd4g9my3k0ppp4x"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.18.nix b/pkgs/os-specific/linux/kernel/linux-4.18.nix index add98cfb2faa..7859a32aeaf4 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.18.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.18.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.18.17"; + version = "4.18.18"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0353ns09i5y0fcygvly20z0qrp6gcqd453186ihm4r7ajgh43bz2"; + sha256 = "0g83i1ai0z0gpjw1rm8a8wdipjjxhfdvp798nrl14l5d2pw63crl"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index f4ef5c6eb1cf..7cd431ea1050 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.162"; + version = "4.4.163"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0l2agmxzmq89jbh7r00qg4msvmhny40m2jar96fibwpklwd44kki"; + sha256 = "1x1fixnz41q6pq1cms9z48mrac984r675m94fdm08m8ajqxddcv1"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 89702c44ccbc..666e69f2509c 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.135"; + version = "4.9.136"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1kjly5ynsg2jy5nj41z21s8f18wfs4nk843jlmmcazzax6xv08z0"; + sha256 = "1j1f4v3m0gggarz0r33pk907gf8dy633s9x5k3ww3khkvzi335fk"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/smem/default.nix b/pkgs/os-specific/linux/smem/default.nix index ede8d425f12d..de12b3719af3 100644 --- a/pkgs/os-specific/linux/smem/default.nix +++ b/pkgs/os-specific/linux/smem/default.nix @@ -1,31 +1,26 @@ { lib, stdenv, fetchurl, python }: stdenv.mkDerivation rec { - name = "smem-1.4"; + name = "smem-${version}"; + version = "1.5"; src = fetchurl { - url = "https://www.selenic.com/smem/download/${name}.tar.gz"; - sha256 = "1v31vy23s7szl6vdrllq9zbg58bp36jf5xy3fikjfg6gyiwgia9f"; + url = "https://selenic.com/repo/smem/archive/${version}.tar.bz2"; + sha256 = "19ibv1byxf2b68186ysrgrhy5shkc5mc69abark1h18yigp3j34m"; }; buildInputs = [ python ]; - buildPhase = - '' - gcc -O2 smemcap.c -o smemcap - ''; + makeFlags = [ "smemcap" ]; installPhase = '' - mkdir -p $out/bin - cp smem smemcap $out/bin/ - - mkdir -p $out/share/man/man8 - cp smem.8 $out/share/man/man8/ + install -Dm555 -t $out/bin/ smem smemcap + install -Dm444 -t $out/share/man/man8/ smem.8 ''; meta = { - homepage = http://www.selenic.com/smem/; + homepage = https://www.selenic.com/smem/; description = "A memory usage reporting tool that takes shared memory into account"; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.eelco ]; diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index 720898196c85..88907231d6ed 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "clickhouse-${version}"; - version = "18.12.17"; + version = "18.14.9"; src = fetchFromGitHub { owner = "yandex"; repo = "ClickHouse"; rev = "v${version}-stable"; - sha256 = "0gkad6x6jlih30wal8nilhfqr3z22dzgz6m22pza3bhaba2ikk53"; + sha256 = "1dsqwihh48fgsjy3jmfjk5271dw3052agw5wpfdm054nkkych86i"; }; nativeBuildInputs = [ cmake libtool ninja ]; diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 10236ee55e8c..49d11a51617c 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -8,14 +8,14 @@ assert enableSeccomp -> libseccomp != null; assert enablePython -> python3 != null; -let version = "9.12.2-P2"; in +let version = "9.12.3"; in stdenv.mkDerivation rec { name = "bind-${version}"; src = fetchurl { url = "https://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz"; - sha256 = "0gk9vwqlbdmn10m21f2awvmiccfbadvcwi8zsgm91awbx4k7h0l7"; + sha256 = "0f5rjs6zsq8sp6iv5r4q5y65xv05dk2sgvsj6lcir3i564k7d00f"; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index 933609ac268a..1f8429a60d1b 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -8,11 +8,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "pdns-recursor-${version}"; - version = "4.1.4"; + version = "4.1.7"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2"; - sha256 = "0l5mf45r3x1z5mg95zpbyms88zv307hsrrx4h6jm9zm3pr9l77xi"; + sha256 = "0syvxlfxy3h2x1kvqkj7qqk8k85y42qjq30pcqqmy69v3pymq14s"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/dns/powerdns/default.nix b/pkgs/servers/dns/powerdns/default.nix index 9d3db625d660..f9f94f002a36 100644 --- a/pkgs/servers/dns/powerdns/default.nix +++ b/pkgs/servers/dns/powerdns/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "powerdns-${version}"; - version = "4.1.4"; + version = "4.1.5"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-${version}.tar.bz2"; - sha256 = "1m9yhzrxh315gv855c590b2qc8bx31rrnl72pqxrnlix701qch79"; + sha256 = "12jgkdsh6hzaznq6y9y7hfdpjhnn7ar2qn7x706k9iyqcq55faf3"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/ftp/bftpd/default.nix b/pkgs/servers/ftp/bftpd/default.nix index c35177e6aa90..02bf714a42bf 100644 --- a/pkgs/servers/ftp/bftpd/default.nix +++ b/pkgs/servers/ftp/bftpd/default.nix @@ -5,11 +5,11 @@ let in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "4.9"; + version = "5.0"; src = fetchurl { url = "mirror://sourceforge/project/${pname}/${pname}/${name}/${name}.tar.gz"; - sha256 = "13pjil9cjggpi773m0516lszyqvwzlgcrmmj8yn9nc24rbxwvn6d"; + sha256 = "1qagqsbg7zblkhg3vrj47k5f1q09r4az7gna86rxf253kmg90yqp"; }; preConfigure = '' diff --git a/pkgs/servers/monitoring/grafana-reporter/default.nix b/pkgs/servers/monitoring/grafana-reporter/default.nix new file mode 100644 index 000000000000..03ed37b8b3f5 --- /dev/null +++ b/pkgs/servers/monitoring/grafana-reporter/default.nix @@ -0,0 +1,32 @@ +{ stdenv, buildGoPackage, fetchFromGitHub, tetex, makeWrapper }: + +with stdenv.lib; + +buildGoPackage rec { + name = "reporter-${version}"; + version = "2.0.1"; + rev = "v${version}"; + + goPackagePath = "github.com/IzakMarais/reporter"; + + nativeBuildInputs = [ makeWrapper ]; + + src = fetchFromGitHub { + inherit rev; + owner = "IzakMarais"; + repo = "reporter"; + sha256 = "0yi7nx8ig5xgkwizddl0gdicnmcdp4qgg1fdxyq04l2y3qs176sg"; + }; + + postInstall = '' + wrapProgram $bin/bin/grafana-reporter \ + --prefix PATH : ${makeBinPath [ tetex ]} + ''; + + meta = { + description = "PDF report generator from a Grafana dashboard"; + homepage = https://github.com/IzakMarais/reporter; + license = licenses.mit; + maintainers = with maintainers; [ disassembler ]; + }; +} diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix index b8649715eb37..a7747d1a256e 100644 --- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix +++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "check_ssl_cert-${version}"; - version = "1.73.0"; + version = "1.76.0"; src = fetchFromGitHub { owner = "matteocorti"; repo = "check_ssl_cert"; rev = "v${version}"; - sha256 = "0ymaypsv1s5pmk8fg9d67khcjy5h7vjbg6hd1fgslp92qcw90dqa"; + sha256 = "0in52vcygscpf79938yfkf2yni49hbkvfkfhwpwyqr7qz9gd8c6j"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index 861bd7fe5ed5..c692cee08bd6 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "groonga-${version}"; - version = "8.0.7"; + version = "8.0.8"; src = fetchurl { url = "https://packages.groonga.org/source/groonga/${name}.tar.gz"; - sha256 = "040q525qdlxlypgs7jzklndshdvd5shzss67lcs6xhkbs0f977cc"; + sha256 = "1fl5s0a5ncw8lj3ild2qqqxa3h4d3k98dmyki760c54kw6p6bycv"; }; buildInputs = with stdenv.lib; diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix index 6522985ab864..32dfd56796d6 100644 --- a/pkgs/shells/xonsh/default.nix +++ b/pkgs/shells/xonsh/default.nix @@ -1,20 +1,19 @@ -{ stdenv, fetchFromGitHub, python3Packages, glibcLocales, coreutils }: +{ stdenv, fetchFromGitHub, python3Packages, glibcLocales, coreutils, git }: python3Packages.buildPythonApplication rec { - name = "xonsh-${version}"; - version = "0.6.8"; + pname = "xonsh"; + version = "0.8.3"; + # fetch from github because the pypi package ships incomplete tests src = fetchFromGitHub { - owner = "scopatz"; - repo = "xonsh"; - rev = version; - sha256= "1a74xpww7k432b2z44388rl31nqvckn2q3fswci04f48698hzs5l"; + owner = "scopatz"; + repo = "xonsh"; + rev = "refs/tags/${version}"; + sha256 = "1qnghqswvqlwv9121r4maibmn2dvqmbr3fhsnngsj3q7plfp7yb2"; }; LC_ALL = "en_US.UTF-8"; postPatch = '' - rm xonsh/winutils.py - sed -ie "s|/bin/ls|${coreutils}/bin/ls|" tests/test_execer.py sed -ie 's|/usr/bin/env|${coreutils}/bin/env|' scripts/xon.sh @@ -22,15 +21,14 @@ python3Packages.buildPythonApplication rec { ''; checkPhase = '' - HOME=$TMPDIR XONSH_INTERACTIVE=0 \ + HOME=$TMPDIR \ pytest \ - -k 'not test_man_completion and not test_printfile and not test_sourcefile and not test_printname ' \ - tests + -k 'not test_man_completion and not test_indir and not test_xonsh_party and not test_foreign_bash_data and not test_script and not test_single_command_no_windows and not test_redirect_out_to_file and not test_sourcefile and not test_printname and not test_printfile' ''; - checkInputs = with python3Packages; [ pytest glibcLocales ]; + checkInputs = [ python3Packages.pytest glibcLocales git ]; - propagatedBuildInputs = with python3Packages; [ ply prompt_toolkit ]; + propagatedBuildInputs = with python3Packages; [ ply prompt_toolkit_2 pygments ]; meta = with stdenv.lib; { description = "A Python-ish, BASHwards-compatible shell"; diff --git a/pkgs/shells/zsh/spaceship-prompt/default.nix b/pkgs/shells/zsh/spaceship-prompt/default.nix new file mode 100644 index 000000000000..312b1e79f49c --- /dev/null +++ b/pkgs/shells/zsh/spaceship-prompt/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec{ + name = "spaceship-prompt-${version}"; + version = "3.7.1"; + + src = fetchFromGitHub { + owner = "denysdovhan"; + repo = "spaceship-prompt"; + sha256 = "0laihax18bs254rm2sww5wkjbmkp4m5c8aicgqpi4diz7difxk6z"; + rev = "aaa34aeab9ba0a99416788f627ec9aeffba392f0"; + }; + + installPhase = '' + install -D -m644 LICENSE.md "$out/share/licenses/spaceship-prompt/LICENSE" + install -D -m644 README.md "$out/share/doc/spaceship-prompt/README.md" + find docs -type f -exec install -D -m644 {} "$out/share/doc/spaceship-prompt/{}" \; + find lib -type f -exec install -D -m644 {} "$out/lib/spaceship-prompt/{}" \; + find scripts -type f -exec install -D -m644 {} "$out/lib/spaceship-prompt/{}" \; + find sections -type f -exec install -D -m644 {} "$out/lib/spaceship-prompt/{}" \; + install -D -m644 spaceship.zsh "$out/lib/spaceship-prompt/spaceship.zsh" + install -d "$out/share/zsh/themes/" + ln -s "$out/lib/spaceship-prompt/spaceship.zsh" "$out/share/zsh/themes/spaceship.zsh-theme" + ''; + + meta = with stdenv.lib; { + description = "Zsh prompt for Astronauts"; + homepage = https://github.com/halfo/lambda-mod-zsh-theme/; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ nyanloutre ]; + }; +} diff --git a/pkgs/tools/X11/wpgtk/default.nix b/pkgs/tools/X11/wpgtk/default.nix new file mode 100644 index 000000000000..b6ba431da9d6 --- /dev/null +++ b/pkgs/tools/X11/wpgtk/default.nix @@ -0,0 +1,49 @@ +{ stdenv, python36Packages, fetchFromGitHub, pywal, feh, libxslt, imagemagick, + gobjectIntrospection, gtk3, wrapGAppsHook, gnome3 }: + +python36Packages.buildPythonApplication rec { + pname = "wpgtk"; + version = "5.7.4"; + + src = fetchFromGitHub { + owner = "deviantfero"; + repo = "wpgtk"; + rev = "${version}"; + sha256 = "0c0kmc18lbr7nk3hh44hai9z06lfsgwxnjdv02hpjwrxg40zh726"; + }; + + pythonPath = [ + python36Packages.pygobject3 + python36Packages.pillow + pywal + imagemagick + ]; + + buildInputs = [ + wrapGAppsHook + gtk3 + gobjectIntrospection + gnome3.adwaita-icon-theme + libxslt + ]; + + # The $HOME variable must be set to build the package. A "permission denied" error will occur otherwise + preBuild = '' + export HOME=$(pwd) + ''; + + meta = with stdenv.lib; { + description = "Template based wallpaper/colorscheme generator and manager"; + longDescription = '' + In short, wpgtk is a colorscheme/wallpaper manager with a template system attached which lets you create templates from any textfile and will replace keywords on it on the fly, allowing for great styling and theming possibilities. + + wpgtk uses pywal as its colorscheme generator, but builds upon it with a UI and other features, such as the abilty to mix and edit the colorschemes generated and save them with their respective wallpapers, having light and dark themes, hackable and fast GTK+ theme made specifically for wpgtk and custom keywords and values to replace in templates. + + INFO: To work properly, this tool needs "programs.dconf.enable = true" on nixos or dconf installed. A reboot may be required after installing dconf. + ''; + homepage = https://github.com/deviantfero/wpgtk; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.melkor333 ]; + }; +} diff --git a/pkgs/tools/archivers/cabextract/default.nix b/pkgs/tools/archivers/cabextract/default.nix index 238ee3646071..edc70e6c601b 100644 --- a/pkgs/tools/archivers/cabextract/default.nix +++ b/pkgs/tools/archivers/cabextract/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "cabextract-1.7"; + name = "cabextract-1.9"; src = fetchurl { url = "https://www.cabextract.org.uk/${name}.tar.gz"; - sha256 = "1g86wmb8lkjiv2jarfz979ngbgg7d3si8x5il4g801604v406wi9"; + sha256 = "1hf4zhjxfdgq9x172r5zfdnafma9q0zf7372syn8hcn7hcypkg0v"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/filesystems/android-file-transfer/default.nix b/pkgs/tools/filesystems/android-file-transfer/default.nix index 336dc785bbfd..c3a0c46d5eca 100644 --- a/pkgs/tools/filesystems/android-file-transfer/default.nix +++ b/pkgs/tools/filesystems/android-file-transfer/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "android-file-transfer-${version}"; - version = "3.5"; + version = "3.6"; src = fetchFromGitHub { owner = "whoozle"; repo = "android-file-transfer-linux"; rev = "v${version}"; - sha256 = "036hca41ikgnw4maykjdp53l31rm01mgamy9y56i5qqh84cwmls2"; + sha256 = "0gaj1shmd62ks4cjdcmiqczlr93v8ivjcg0l6s8z73cz9pf8dxmz"; }; buildInputs = [ cmake fuse readline pkgconfig qtbase ]; buildPhase = '' diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 42f27e69f38e..252f25ad8fa8 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "btrfs-progs-${version}"; - version = "4.17.1"; + version = "4.19"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "0x6d53fbrcmzvhv461575fzsv3373427p4srz646w2wcagqk82xz"; + sha256 = "0jd3bsg3117ysr82n03w33sqw1g9z1ciixcxrwgp90yghvjzp4fm"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/filesystems/disorderfs/default.nix b/pkgs/tools/filesystems/disorderfs/default.nix index 138f727c3d30..07a9015fa28e 100644 --- a/pkgs/tools/filesystems/disorderfs/default.nix +++ b/pkgs/tools/filesystems/disorderfs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "disorderfs-${version}"; - version = "0.5.4"; + version = "0.5.5"; src = fetchurl { url = "http://http.debian.net/debian/pool/main/d/disorderfs/disorderfs_${version}.orig.tar.gz"; - sha256 = "0rp789qll5nmzw0jffx36ppcl9flr6hvdz84ah080mvghqkfdq8y"; + sha256 = "1y1i7k5mx2pxr9bpijnsjyyw8qd7ak1h48gf6a6ca3dhna9ws6i1"; }; nativeBuildInputs = [ pkgconfig asciidoc ]; diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index f4aa9a52fce3..e915cc1c132a 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -15,10 +15,10 @@ let # The command # find /nix/store/...-glusterfs-.../ -name '*.py' -executable # can help with finding new Python scripts. - version = "3.12.12"; + version = "4.0.0"; name="${baseName}-${version}"; url="https://github.com/gluster/glusterfs/archive/v${version}.tar.gz"; - sha256 = "1q6rcf9y98w3kvgwdlbhl65phkdl0mfil6y7i3gnpf3d21gfb6nw"; + sha256 = "0af3fwiixddds6gdwhkyq3l214mmjl2wpjc2qayp5rpz79lnclq3"; }; buildInputs = [ fuse bison flex_2_5_35 openssl ncurses readline @@ -70,10 +70,13 @@ rec { ''; patches = [ + # Remove when https://bugzilla.redhat.com/show_bug.cgi?id=1450546 is fixed ./glusterfs-use-PATH-instead-of-hardcodes.patch + # Remove when https://bugzilla.redhat.com/show_bug.cgi?id=1450593 is fixed ./glusterfs-python-remove-find_library.patch # Remove when https://bugzilla.redhat.com/show_bug.cgi?id=1489610 is fixed ./glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch + # Remove when https://bugzilla.redhat.com/show_bug.cgi?id=1559130 is fixed ./glusterfs-glusterfind-log-remote-node_cmd-error.patch ]; diff --git a/pkgs/tools/filesystems/glusterfs/glusterfs-python-remove-find_library.patch b/pkgs/tools/filesystems/glusterfs/glusterfs-python-remove-find_library.patch index 6dd1baad5dff..4757f2fce771 100644 --- a/pkgs/tools/filesystems/glusterfs/glusterfs-python-remove-find_library.patch +++ b/pkgs/tools/filesystems/glusterfs/glusterfs-python-remove-find_library.patch @@ -1,21 +1,23 @@ -From d321df349d10f038f0c89b9c11f8059572264f1b Mon Sep 17 00:00:00 2001 +From e6293e367f56833457291e32a4df7b21a52365a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me> Date: Sat, 13 May 2017 18:54:36 +0200 Subject: [PATCH] python: Remove all uses of find_library. Fixes #1450593 `find_library()` doesn't consider LD_LIBRARY_PATH on Python < 3.6. + +Change-Id: Iee26085cb5d14061001f19f032c2664d69a378a8 --- api/examples/getvolfile.py | 2 +- geo-replication/syncdaemon/libcxattr.py | 3 +-- - geo-replication/syncdaemon/libgfchangelog.py | 3 +-- + geo-replication/syncdaemon/libgfchangelog.py | 6 ++---- tests/features/ipctest.py | 10 ++-------- tests/utils/libcxattr.py | 5 ++--- tools/glusterfind/src/libgfchangelog.py | 3 +-- .../features/changelog/lib/examples/python/libgfchangelog.py | 3 +-- - 7 files changed, 9 insertions(+), 20 deletions(-) + 7 files changed, 10 insertions(+), 22 deletions(-) diff --git a/api/examples/getvolfile.py b/api/examples/getvolfile.py -index 0c95213..32c2268 100755 +index 0c95213f0..32c2268b3 100755 --- a/api/examples/getvolfile.py +++ b/api/examples/getvolfile.py @@ -3,7 +3,7 @@ @@ -28,7 +30,7 @@ index 0c95213..32c2268 100755 ctypes.c_void_p, ctypes.c_ulong] diff --git a/geo-replication/syncdaemon/libcxattr.py b/geo-replication/syncdaemon/libcxattr.py -index 3671e10..f576648 100644 +index 3671e102c..f576648b7 100644 --- a/geo-replication/syncdaemon/libcxattr.py +++ b/geo-replication/syncdaemon/libcxattr.py @@ -10,7 +10,6 @@ @@ -49,25 +51,28 @@ index 3671e10..f576648 100644 @classmethod def geterrno(cls): diff --git a/geo-replication/syncdaemon/libgfchangelog.py b/geo-replication/syncdaemon/libgfchangelog.py -index d87b56c..003c28c 100644 +index 334f5e9ea..093ae157a 100644 --- a/geo-replication/syncdaemon/libgfchangelog.py +++ b/geo-replication/syncdaemon/libgfchangelog.py -@@ -10,12 +10,11 @@ +@@ -9,14 +9,12 @@ + # import os - from ctypes import CDLL, RTLD_GLOBAL, create_string_buffer, get_errno, byref, c_ulong +-from ctypes import CDLL, RTLD_GLOBAL, create_string_buffer, \ +- get_errno, byref, c_ulong -from ctypes.util import find_library ++from ctypes import CDLL, RTLD_GLOBAL, create_string_buffer, get_errno, byref, c_ulong from syncdutils import ChangelogException, ChangelogHistoryNotAvailable class Changes(object): -- libgfc = CDLL(find_library("gfchangelog"), mode=RTLD_GLOBAL, use_errno=True) -+ libgfc = CDLL("libgfchangelog.so", mode=RTLD_GLOBAL, use_errno=True) +- libgfc = CDLL(find_library("gfchangelog"), mode=RTLD_GLOBAL, ++ libgfc = CDLL("libgfchangelog.so", mode=RTLD_GLOBAL, + use_errno=True) @classmethod - def geterrno(cls): diff --git a/tests/features/ipctest.py b/tests/features/ipctest.py -index 5aff319..9339248 100755 +index 5aff319b8..933924861 100755 --- a/tests/features/ipctest.py +++ b/tests/features/ipctest.py @@ -1,14 +1,8 @@ @@ -88,7 +93,7 @@ index 5aff319..9339248 100755 api.glfs_ipc.argtypes = [ ctypes.c_void_p, ctypes.c_int, ctypes.c_void_p, ctypes.c_void_p ] api.glfs_ipc.restype = ctypes.c_int diff --git a/tests/utils/libcxattr.py b/tests/utils/libcxattr.py -index 149db72..4e6e6c4 100644 +index 149db72e6..4e6e6c46d 100644 --- a/tests/utils/libcxattr.py +++ b/tests/utils/libcxattr.py @@ -11,7 +11,6 @@ @@ -112,10 +117,10 @@ index 149db72..4e6e6c4 100644 @classmethod def geterrno(cls): diff --git a/tools/glusterfind/src/libgfchangelog.py b/tools/glusterfind/src/libgfchangelog.py -index dd8153e..da822cf 100644 +index 0f6b40d6c..9ca3f326b 100644 --- a/tools/glusterfind/src/libgfchangelog.py +++ b/tools/glusterfind/src/libgfchangelog.py -@@ -12,14 +12,13 @@ +@@ -11,14 +11,13 @@ import os from ctypes import CDLL, get_errno, create_string_buffer, c_ulong, byref from ctypes import RTLD_GLOBAL @@ -132,7 +137,7 @@ index dd8153e..da822cf 100644 def raise_oserr(): diff --git a/xlators/features/changelog/lib/examples/python/libgfchangelog.py b/xlators/features/changelog/lib/examples/python/libgfchangelog.py -index 10e73c0..2cdbf11 100644 +index 10e73c02b..2cdbf1152 100644 --- a/xlators/features/changelog/lib/examples/python/libgfchangelog.py +++ b/xlators/features/changelog/lib/examples/python/libgfchangelog.py @@ -1,9 +1,8 @@ @@ -147,5 +152,5 @@ index 10e73c0..2cdbf11 100644 @classmethod def geterrno(cls): -- -2.7.4 +2.12.0 diff --git a/pkgs/tools/inputmethods/libinput-gestures/default.nix b/pkgs/tools/inputmethods/libinput-gestures/default.nix index 77eae2c55e1d..75670dfe9dfb 100644 --- a/pkgs/tools/inputmethods/libinput-gestures/default.nix +++ b/pkgs/tools/inputmethods/libinput-gestures/default.nix @@ -5,14 +5,14 @@ }: stdenv.mkDerivation rec { pname = "libinput-gestures"; - version = "2.38"; + version = "2.39"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "bulletmark"; repo = "libinput-gestures"; rev = version; - sha256 = "1nxvlifag04v56grdwxc3l92kmf51c4w2lq42a3w76yc6p4nxw1m"; + sha256 = "0bzyi55yhr9wyar9mnd09cr6pi88jkkp0f9lndm0a9jwi1xr4bdf"; }; patches = [ ./0001-hardcode-name.patch diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix index c9775ac6ae35..ac6f8c97c7b6 100644 --- a/pkgs/tools/misc/bdf2psf/default.nix +++ b/pkgs/tools/misc/bdf2psf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "bdf2psf-${version}"; - version = "1.185"; + version = "1.187"; src = fetchurl { url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; - sha256 = "0i8ppqj6yhdkvjkwfl588f2zpaybj61pq64bhlnmc8c4snwpn1z6"; + sha256 = "05r5jg7n4hbdxcy3kc7038h1r0fkipwld6kd0d49nbkmywl2k1a8"; }; buildInputs = [ dpkg ]; diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index 9c3db47213ec..1b2cdf0402ae 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -15,13 +15,13 @@ let binPath = stdenv.lib.makeBinPath [ ]; in stdenv.mkDerivation rec { name = "debootstrap-${version}"; - version = "1.0.109"; + version = "1.0.110"; src = fetchurl { # git clone git://git.debian.org/d-i/debootstrap.git # I'd like to use the source. However it's lacking the lanny script ? (still true?) url = "mirror://debian/pool/main/d/debootstrap/debootstrap_${version}.tar.gz"; - sha256 = "117xgrv6mpszyndmsvkn4ynh57b2s40qc68bpmfmxggw58j42klw"; + sha256 = "11bqy2dbqsy9fyx1i6lj0aj1pvq15y8kkwjfrp18k3nvy74y80ca"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/doitlive/default.nix b/pkgs/tools/misc/doitlive/default.nix index a8ff34af9757..d322a19c98a3 100644 --- a/pkgs/tools/misc/doitlive/default.nix +++ b/pkgs/tools/misc/doitlive/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "doitlive"; - version = "4.0.1"; + version = "4.1.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1icnjkczy52i3cp1fmsijqny571fz1h4b3wpdzz79cn90fr326pc"; + sha256 = "0zkvmnv6adz0gyqiql8anpxnh8zzpqk0p2n0pf2kxy55010qs4wz"; }; propagatedBuildInputs = with python3Packages; [ click click-completion click-didyoumean ]; diff --git a/pkgs/tools/misc/fwup/default.nix b/pkgs/tools/misc/fwup/default.nix index 97eedd9be25e..160ea2faab61 100644 --- a/pkgs/tools/misc/fwup/default.nix +++ b/pkgs/tools/misc/fwup/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "fwup-${version}"; - version = "1.2.5"; + version = "1.2.6"; src = fetchFromGitHub { owner = "fhunleth"; repo = "fwup"; rev = "v${version}"; - sha256 = "0kraip4lr3fvcxvvq1dwjw7fyzs6bcjg14xn0g52985krxxn5pdc"; + sha256 = "1rbpa0dcm9w1anz2bhcpmj2b678807s8j43zzkbkwh71aymfwr14"; }; doCheck = true; diff --git a/pkgs/tools/misc/hebcal/default.nix b/pkgs/tools/misc/hebcal/default.nix index da231c16cc90..edb5973fbb70 100644 --- a/pkgs/tools/misc/hebcal/default.nix +++ b/pkgs/tools/misc/hebcal/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - version = "4.14"; + version = "4.15"; name = "hebcal-${version}"; src = fetchFromGitHub { owner = "hebcal"; repo = "hebcal"; rev = "v${version}"; - sha256 = "1zq8f7cigh5r31p03az338sbygkx8gbday35c9acppglci3r8fvc"; + sha256 = "1s9iardqyzn42hs0x9p4rig2m87v87jvzcrbb9arcci7nds66y3i"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/misc/noti/default.nix b/pkgs/tools/misc/noti/default.nix index 23646abe7875..43165b4f54bb 100644 --- a/pkgs/tools/misc/noti/default.nix +++ b/pkgs/tools/misc/noti/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, Cocoa }: +{ stdenv, buildGoPackage, fetchFromGitHub, cf-private, Cocoa }: buildGoPackage rec { name = "noti-${version}"; @@ -11,7 +11,7 @@ buildGoPackage rec { sha256 = "1chsqfqk0pnhx5k2nr4c16cpb8m6zv69l1jvv4v4903zgfzcm823"; }; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Cocoa ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Cocoa cf-private /* For OBJC_CLASS_$_NSDate */ ]; # TODO: Remove this when we update apple_sdk NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.isDarwin [ "-fno-objc-arc" ]; diff --git a/pkgs/tools/misc/up/default.nix b/pkgs/tools/misc/up/default.nix new file mode 100644 index 000000000000..c09c5ad12f08 --- /dev/null +++ b/pkgs/tools/misc/up/default.nix @@ -0,0 +1,23 @@ +{ lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "up-${version}"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "akavel"; + repo = "up"; + rev = "v${version}"; + sha256 = "171bwbk2c7jbi51xdawzv7qy71492mfs9z5j0a5j52qmnr4vjjgs"; + }; + + goPackagePath = "github.com/akavel/up"; + goDeps = ./deps.nix; + + meta = with lib; { + description = "Ultimate Plumber is a tool for writing Linux pipes with instant live preview"; + homepage = https://github.com/akavel/up; + maintainers = with maintainers; [ ma27 ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/tools/misc/up/deps.nix b/pkgs/tools/misc/up/deps.nix new file mode 100644 index 000000000000..439dc5df9d4d --- /dev/null +++ b/pkgs/tools/misc/up/deps.nix @@ -0,0 +1,66 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +[ + { + goPackagePath = "github.com/gdamore/encoding"; + fetch = { + type = "git"; + url = "https://github.com/gdamore/encoding"; + rev = "b23993cbb6353f0e6aa98d0ee318a34728f628b9"; + sha256 = "0d7irqpx2fa9vkxgkhf04yiwazsm10fxh0yk86x5crflhph5fv8a"; + }; + } + { + goPackagePath = "github.com/gdamore/tcell"; + fetch = { + type = "git"; + url = "https://github.com/gdamore/tcell"; + rev = "017915a4d77dabd7af10ab539e618a735d4b9c0a"; + sha256 = "19ymkgcvcp9sz2jrfi7h6l720w5yw9hy3wnw975w2ih45j1ypqdh"; + }; + } + { + goPackagePath = "github.com/lucasb-eyer/go-colorful"; + fetch = { + type = "git"; + url = "https://github.com/lucasb-eyer/go-colorful"; + rev = "12d3b2882a08d1abc9488e34f3e1ae35165f2d07"; + sha256 = "1w95axfn1a6rz31xrks77ingr9mdkqyr7mh0glv664kz1wg2h0gw"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "3fb116b820352b7f0c281308a4d6250c22d94e27"; + sha256 = "084hplr4n4g5nvp70clljk428hc963460xz0ggcj3xdi4w7hhsvv"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "b20a3daf6a39840c202fd42cc23d53607162b045"; + sha256 = "0crivpncmh22696d5cy7k15ll5yqfjcigk0xy73wb6g1q6vnfxs7"; + }; + } + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "aea12ed6721610dc6ed40141676d7ab0a1dac9e9"; + sha256 = "17p5k37bnzj6wfh000y7xpvxyv2wsfa3db9sm8da2frjvn7jgbp2"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "6f44c5a2ea40ee3593d98cdcc905cc1fdaa660e2"; + sha256 = "00mwzxly5isgf0glz7k3k2dkyqkjfc4z55qxajx4lgcp3h8xn9xj"; + }; + } +] diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix index 56b7320a1b26..db1f383ac026 100644 --- a/pkgs/tools/networking/getmail/default.nix +++ b/pkgs/tools/networking/getmail/default.nix @@ -2,11 +2,11 @@ python2Packages.buildPythonApplication rec { pname = "getmail"; - version = "5.7"; + version = "5.8"; src = fetchurl { url = "http://pyropus.ca/software/getmail/old-versions/${pname}-${version}.tar.gz"; - sha256 = "1ygv78ihjyrh60657bl8pc17a5dqawdkfh32h8hrd4kwwxlsd5r4"; + sha256 = "0vl4cc733pd9d21y4pr4jc1ly657d0akxj1bdh1xfjggx33l3541"; }; doCheck = false; diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix index cc61cce463ce..637d2af9ae31 100644 --- a/pkgs/tools/security/eid-mw/default.nix +++ b/pkgs/tools/security/eid-mw/default.nix @@ -7,10 +7,10 @@ stdenv.mkDerivation rec { name = "eid-mw-${version}"; - version = "4.4.8"; + version = "4.4.9"; src = fetchFromGitHub { - sha256 = "0khpkpfnbin46aqnb9xkhh5d89lvsshgp4kqpdgk95l73lx8kdqp"; + sha256 = "019cfxgffl6z6ilz1w6b531dr8pi63ikflxmkc95glh7cxsaylax"; rev = "v${version}"; repo = "eid-mw"; owner = "Fedict"; diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index 555244bc38cd..720c382ebd67 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -1,6 +1,7 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub -, AVFoundation ? null, AudioToolbox ? null, ImageIO ? null, CoreMedia ? null -, Foundation ? null, CoreGraphics ? null, MediaToolbox ? null }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub, cf-private +, AVFoundation, AudioToolbox, ImageIO, CoreMedia +, Foundation, CoreGraphics, MediaToolbox +}: buildGoPackage rec { name = "keybase-${version}"; @@ -18,7 +19,11 @@ buildGoPackage rec { sha256 = "1sw6v3vf544vp8grw8p287cx078mr9v0v1wffcj6f9p9shlwj7ic"; }; - buildInputs = lib.optionals stdenv.isDarwin [ AVFoundation AudioToolbox ImageIO CoreMedia Foundation CoreGraphics MediaToolbox ]; + buildInputs = lib.optionals stdenv.isDarwin [ + AVFoundation AudioToolbox ImageIO CoreMedia Foundation CoreGraphics MediaToolbox + # Needed for OBJC_CLASS_$_NSData symbols. + cf-private + ]; buildFlags = [ "-tags production" ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/security/lynis/default.nix b/pkgs/tools/security/lynis/default.nix index ad345afb5fcc..46c2e6f03b0d 100644 --- a/pkgs/tools/security/lynis/default.nix +++ b/pkgs/tools/security/lynis/default.nix @@ -1,29 +1,26 @@ -{ stdenv, makeWrapper, fetchFromGitHub, gawk, perl }: +{ stdenv, makeWrapper, fetchFromGitHub, gawk }: stdenv.mkDerivation rec { pname = "lynis"; - version = "2.6.9"; + version = "2.7.0"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "CISOfy"; repo = "${pname}"; rev = "${version}"; - sha256 = "125p5vpc2ksn0nab8y4ckfgx13rlv3w95amgighiqkh15ccji5kq"; + sha256 = "0rzc0y8lk22bymf56249jzmllki2lh0rz5in4lkrc5fkmp29c2wv"; }; - nativeBuildInputs = [ makeWrapper perl ]; + nativeBuildInputs = [ makeWrapper ]; postPatch = '' grep -rl '/usr/local/lynis' ./ | xargs sed -i "s@/usr/local/lynis@$out/share/lynis@g" - # Don't use predefined binary paths. See https://github.com/CISOfy/lynis/issues/468 - perl -i -p0e 's/BIN_PATHS="[^"]*"/BIN_PATHS=\$\(echo \$PATH\ | sed "s\/:\/ \/g")/sm;' include/consts ''; installPhase = '' - mkdir -p $out/share/lynis + install -d $out/bin $out/share/lynis/plugins cp -r include db default.prf $out/share/lynis/ - mkdir -p $out/bin cp -a lynis $out/bin wrapProgram "$out/bin/lynis" --prefix PATH : ${stdenv.lib.makeBinPath [ gawk ]} ''; diff --git a/pkgs/tools/system/acpica-tools/default.nix b/pkgs/tools/system/acpica-tools/default.nix index 54303d0c177d..5bc8c7d945bd 100644 --- a/pkgs/tools/system/acpica-tools/default.nix +++ b/pkgs/tools/system/acpica-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "acpica-tools-${version}"; - version = "20180927"; + version = "20181031"; src = fetchurl { url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz"; - sha256 = "1c9d505mw1wyga65y4nmiz55gs357z97wnycx77yvjwvi08qsh6w"; + sha256 = "1zz1lfrl1rihs47a0cirdp32p53297kjm0l27b4kvibb5b7pa3h9"; }; NIX_CFLAGS_COMPILE = "-O3"; diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix index ba21fabe4350..dd2340668c49 100644 --- a/pkgs/tools/system/facter/default.nix +++ b/pkgs/tools/system/facter/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "facter-${version}"; - version = "3.12.0"; + version = "3.12.1"; src = fetchFromGitHub { - sha256 = "1bg044j3dv6kcksy3cyda650ara8s4awdf665k10gaaxa0gwn0jj"; + sha256 = "08mhsf9q9mhjfdzn8qkm12i1k5l7fnm6hqx6rqr8ni5iprl73b3d"; rev = version; repo = "facter"; owner = "puppetlabs"; diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix index c0210127d9f2..8e9fb6da5400 100644 --- a/pkgs/tools/system/fio/default.nix +++ b/pkgs/tools/system/fio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "fio-${version}"; - version = "3.11"; + version = "3.12"; src = fetchFromGitHub { owner = "axboe"; repo = "fio"; rev = "fio-${version}"; - sha256 = "0k5hja50qmz6qwm8h7z00zdgxhf1vg1g168jinqzn1521fihvlvz"; + sha256 = "18awz03mdzdbja1n9nm6jyvv7ic2dabh6c7ip5vwpam8c6mj4yjq"; }; buildInputs = [ python zlib ] diff --git a/pkgs/tools/text/aha/default.nix b/pkgs/tools/text/aha/default.nix index 89319ac492f4..f53a649cd771 100644 --- a/pkgs/tools/text/aha/default.nix +++ b/pkgs/tools/text/aha/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "aha-${version}"; - version = "0.4.10.6"; + version = "0.5"; src = fetchFromGitHub { - sha256 = "18mz3f5aqw4vbdrxf8wblqm6nca73ppq9hb2z2ppw6k0557i71kz"; + sha256 = "0byml4rmpiaalwx69jcixl3yvpvwmwiss1jzgsqwshilb2p4qnmz"; rev = version; repo = "aha"; owner = "theZiz"; diff --git a/pkgs/tools/text/ansifilter/default.nix b/pkgs/tools/text/ansifilter/default.nix index 3e9511fefdaa..54591bf24424 100644 --- a/pkgs/tools/text/ansifilter/default.nix +++ b/pkgs/tools/text/ansifilter/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ansifilter-${version}"; - version = "2.10"; + version = "2.12"; src = fetchurl { url = "http://www.andre-simon.de/zip/ansifilter-${version}.tar.bz2"; - sha256 = "0gzfxfpic47cs2kqrbvaw166ji62c5nq5cjhh3ngpm2fkm1wzli3"; + sha256 = "0ssvc51x90l1s9pxdxaw6ba01dcalrp0b5glrnh1j43i2pskc750"; }; diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/tools/text/fanficfare/default.nix index 1dec03e985b3..3315d435afbb 100644 --- a/pkgs/tools/text/fanficfare/default.nix +++ b/pkgs/tools/text/fanficfare/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, python27Packages }: python27Packages.buildPythonApplication rec { - version = "3.0.0"; + version = "3.1.1"; name = "fanficfare-${version}"; nameprefix = ""; src = fetchurl { url = "https://github.com/JimmXinu/FanFicFare/archive/v${version}.tar.gz"; - sha256 = "0m8p1nn4621fspcas4g4k8y6fnnlzn7kxjxw2fapdrk3cz1pgi69"; + sha256 = "1wklii24vbvq2vi5pqgp3z4lazcplh2i7r2w4d8lkm6pzbw0s8px"; }; propagatedBuildInputs = with python27Packages; [ beautifulsoup4 chardet html5lib html2text ]; diff --git a/pkgs/tools/text/hyx/default.nix b/pkgs/tools/text/hyx/default.nix index 1ba3534e3f8a..70745266fe55 100644 --- a/pkgs/tools/text/hyx/default.nix +++ b/pkgs/tools/text/hyx/default.nix @@ -1,13 +1,15 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "hyx-0.1.4"; + name = "hyx-0.1.5"; src = fetchurl { url = "https://yx7.cc/code/hyx/${name}.tar.xz"; - sha256 = "049r610hyrrfa62vpiqyb3rh99bpy8cnqy4nd4sih01733cmdhyx"; + sha256 = "0gd8fbdyw12jwffa5dgcql4ry22xbdhqdds1qwzk1rkcrkgnc1mg"; }; + patches = [ ./no-wall-by-default.patch ]; + installPhase = '' install -vD hyx $out/bin/hyx ''; @@ -17,6 +19,6 @@ stdenv.mkDerivation rec { homepage = https://yx7.cc/code/; license = licenses.mit; maintainers = with maintainers; [ fpletz ]; - platforms = platforms.all; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/text/hyx/no-wall-by-default.patch b/pkgs/tools/text/hyx/no-wall-by-default.patch new file mode 100644 index 000000000000..48ee20eff179 --- /dev/null +++ b/pkgs/tools/text/hyx/no-wall-by-default.patch @@ -0,0 +1,11 @@ +--- hyx-0.1.5.org/Makefile 2018-06-02 17:14:37.000000000 +0100 ++++ hyx-0.1.5/Makefile 2018-11-10 09:25:49.569961762 +0000 +@@ -1,7 +1,7 @@ + + all: CFLAGS ?= -O2 -Wl,-s \ + -Wl,-z,relro,-z,now -fpic -pie -D_FORTIFY_SOURCE=2 -fstack-protector-all +-all: CFLAGS += -std=c99 -pedantic -Wall -Wextra -DNDEBUG ++all: CFLAGS += -std=c99 -DNDEBUG + all: hyx + + debug: CFLAGS ?= -O0 -g \ diff --git a/pkgs/tools/virtualization/google-compute-engine/default.nix b/pkgs/tools/virtualization/google-compute-engine/default.nix index c0b9954206ad..5ddf15e09fad 100644 --- a/pkgs/tools/virtualization/google-compute-engine/default.nix +++ b/pkgs/tools/virtualization/google-compute-engine/default.nix @@ -11,14 +11,14 @@ buildPythonApplication rec { name = "google-compute-engine-${version}"; - version = "20180905"; + version = "20181011"; namePrefix = ""; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "compute-image-packages"; rev = version; - sha256 = "0095f000kgk2lc5p1y4080sbc0r7ly60a7i9id8hydfnkhqqz75n"; + sha256 = "1b3wyr412qh113xvs671dqnacidil61gisfvg79wbq6wrdwswkp8"; }; postPatch = '' diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 817200fdd7ce..8767d98ad0a9 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -86,7 +86,6 @@ mapAliases ({ docbook_xml_xslt = docbook_xsl; # added 2018-04-25 double_conversion = double-conversion; # 2017-11-22 dwarf_fortress = dwarf-fortress; # added 2016-01-23 - emacs25Macport_25_1 = emacs25Macport; # added 2018-04-25 emacsMelpa = emacs25PackagesNg; # for backward compatibility emacsPackagesGen = emacsPackagesFor; # added 2018-08-18 emacsPackagesNgGen = emacsPackagesNgFor; # added 2018-08-18 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4c8a689d1db7..d130ad251dd6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -521,6 +521,7 @@ with pkgs; alacritty = callPackage ../applications/misc/alacritty { inherit (xorg) libXcursor libXxf86vm libXi; + inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) AppKit CoreFoundation CoreGraphics CoreServices CoreText Foundation OpenGL; }; @@ -1550,6 +1551,7 @@ with pkgs; noteshrink = callPackage ../tools/misc/noteshrink { }; noti = callPackage ../tools/misc/noti { + inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) Cocoa; }; @@ -3597,6 +3599,7 @@ with pkgs; kexpand = callPackage ../development/tools/kexpand { }; keybase = callPackage ../tools/security/keybase { + inherit (darwin) cf-private; # Reasoning for the inherited apple_sdk.frameworks: # 1. specific compiler errors about: AVFoundation, AudioToolbox, MediaToolbox # 2. the rest are added from here: https://github.com/keybase/client/blob/68bb8c893c5214040d86ea36f2f86fbb7fac8d39/go/chat/attachments/preview_darwin.go#L7 @@ -3949,8 +3952,6 @@ with pkgs; libiberty_static = libiberty.override { staticBuild = true; }; - libibverbs = callPackage ../development/libraries/libibverbs { }; - libxc = callPackage ../development/libraries/libxc { }; libxcomp = callPackage ../development/libraries/libxcomp { }; @@ -3961,8 +3962,6 @@ with pkgs; libzmf = callPackage ../development/libraries/libzmf {}; - librdmacm = callPackage ../development/libraries/librdmacm { }; - libreswan = callPackage ../tools/networking/libreswan { }; libwebsockets = callPackage ../development/libraries/libwebsockets { }; @@ -5888,6 +5887,8 @@ with pkgs; untrunc = callPackage ../tools/video/untrunc { }; + up = callPackage ../tools/misc/up { }; + upx = callPackage ../tools/compression/upx { }; uqmi = callPackage ../tools/networking/uqmi { }; @@ -6249,6 +6250,8 @@ with pkgs; wolf-shaper = callPackage ../applications/audio/wolf-shaper { }; + wpgtk = callPackage ../tools/X11/wpgtk { }; + wring = nodePackages.wring; wrk = callPackage ../tools/networking/wrk { }; @@ -7649,6 +7652,10 @@ with pkgs; kanif = callPackage ../applications/networking/cluster/kanif { }; + lumo = callPackage ../development/interpreters/clojurescript/lumo { + nodejs = nodejs-10_x; + }; + lxappearance = callPackage ../desktops/lxde/core/lxappearance { gtk2 = gtk2-x11; }; @@ -9581,7 +9588,10 @@ with pkgs; flite = callPackage ../development/libraries/flite { }; - fltk13 = callPackage ../development/libraries/fltk { }; + fltk13 = callPackage ../development/libraries/fltk { + inherit (darwin) cf-private; + inherit (darwin.apple_sdk.frameworks) Cocoa AGL GLUT; + }; fltk = self.fltk13; flyway = callPackage ../development/tools/flyway { }; @@ -9735,7 +9745,10 @@ with pkgs; glfw = glfw3; glfw2 = callPackage ../development/libraries/glfw/2.x.nix { }; - glfw3 = callPackage ../development/libraries/glfw/3.x.nix { }; + glfw3 = callPackage ../development/libraries/glfw/3.x.nix { + inherit (darwin) cf-private; + inherit (darwin.apple_sdk.frameworks) Cocoa Kernel; + }; glibc = callPackage ../development/libraries/glibc { installLocales = config.glibc.locales or false; @@ -11174,7 +11187,10 @@ with pkgs; libuecc = callPackage ../development/libraries/libuecc { }; - libui = callPackage ../development/libraries/libui { }; + libui = callPackage ../development/libraries/libui { + inherit (darwin) cf-private; + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; libunistring = callPackage ../development/libraries/libunistring { }; @@ -11624,6 +11640,8 @@ with pkgs; opencv = callPackage ../development/libraries/opencv { ffmpeg = ffmpeg_2; + inherit (darwin) cf-private; + inherit (darwin.apple_sdk.frameworks) Cocoa QTKit; }; opencv3 = callPackage ../development/libraries/opencv/3.x.nix { @@ -12341,6 +12359,8 @@ with pkgs; spandsp = callPackage ../development/libraries/spandsp {}; + spaceship-prompt = callPackage ../shells/zsh/spaceship-prompt {}; + spatialite_tools = callPackage ../development/libraries/spatialite-tools { }; spdk = callPackage ../development/libraries/spdk { }; @@ -13335,6 +13355,8 @@ with pkgs; grafana = callPackage ../servers/monitoring/grafana { }; + grafana_reporter = callPackage ../servers/monitoring/grafana-reporter { }; + h2o = callPackage ../servers/http/h2o { }; haka = callPackage ../tools/security/haka { }; @@ -14318,11 +14340,6 @@ with pkgs; [ kernelPatches.bridge_stp_helper kernelPatches.cpu-cgroup-v2."4.9" kernelPatches.modinst_arg_list_too_long - # https://github.com/NixOS/nixpkgs/issues/42755 - # Remove these xen-netfront patches once they're included in - # upstream! Fixes https://github.com/NixOS/nixpkgs/issues/42755 - kernelPatches.xen-netfront_fix_mismatched_rtnl_unlock - kernelPatches.xen-netfront_update_features_after_registering_netdev ]; }; @@ -16385,6 +16402,7 @@ with pkgs; imagemagick = null; acl = null; gpm = null; + inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) AppKit GSS ImageIO; }; @@ -16394,8 +16412,8 @@ with pkgs; withGTK3 = false; })); - emacsMacport = emacs25Macport; - emacs25Macport = callPackage ../applications/editors/emacs/macport.nix { + emacsMacport = callPackage ../applications/editors/emacs/macport.nix { + inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit ImageCaptureCore GSS ImageIO; @@ -17251,6 +17269,8 @@ with pkgs; gtk = gtk3; }; + hovercraft = python3Packages.callPackage ../applications/misc/hovercraft { }; + howl = callPackage ../applications/editors/howl { }; ht = callPackage ../applications/editors/ht { }; @@ -20337,7 +20357,7 @@ with pkgs; garden-of-coloured-lights = callPackage ../games/garden-of-coloured-lights { allegro = allegro4; }; gargoyle = callPackage ../games/gargoyle { - libtool = darwin.cctools; + inherit (darwin) cctools cf-private; }; gav = callPackage ../games/gav { }; diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index 78ca0d20908d..b52afe98f7fa 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -66,7 +66,7 @@ in stubs = callPackages ../os-specific/darwin/stubs { }; - trash = callPackage ../os-specific/darwin/trash { inherit (darwin.apple_sdk) frameworks; }; + trash = darwin.callPackage ../os-specific/darwin/trash { }; usr-include = callPackage ../os-specific/darwin/usr-include { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2ec753531e40..82fa8f13349c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -362,6 +362,8 @@ in { gidgethub = callPackage ../development/python-modules/gidgethub { }; + gin-config = callPackage ../development/python-modules/gin-config { }; + globus-sdk = callPackage ../development/python-modules/globus-sdk { }; goocalendar = callPackage ../development/python-modules/goocalendar { }; @@ -1148,6 +1150,8 @@ in { click-plugins = callPackage ../development/python-modules/click-plugins {}; + click-repl = callPackage ../development/python-modules/click-repl { }; + click-threading = callPackage ../development/python-modules/click-threading {}; cligj = callPackage ../development/python-modules/cligj { }; @@ -1694,8 +1698,6 @@ in { hupper = callPackage ../development/python-modules/hupper {}; - hovercraft = callPackage ../development/python-modules/hovercraft { }; - hsaudiotag = callPackage ../development/python-modules/hsaudiotag { }; hsaudiotag3k = callPackage ../development/python-modules/hsaudiotag3k { }; @@ -3233,7 +3235,11 @@ in { prettytable = callPackage ../development/python-modules/prettytable { }; - prompt_toolkit = callPackage ../development/python-modules/prompt_toolkit { }; + prompt_toolkit = self.prompt_toolkit_1; + + prompt_toolkit_1 = callPackage ../development/python-modules/prompt_toolkit/1.nix { }; + + prompt_toolkit_2 = callPackage ../development/python-modules/prompt_toolkit { }; protobuf = callPackage ../development/python-modules/protobuf { disabled = isPyPy; @@ -3253,7 +3259,9 @@ in { psycopg2 = callPackage ../development/python-modules/psycopg2 {}; - ptpython = callPackage ../development/python-modules/ptpython {}; + ptpython = callPackage ../development/python-modules/ptpython { + prompt_toolkit = self.prompt_toolkit_2; + }; publicsuffix = callPackage ../development/python-modules/publicsuffix {}; |