From bdf031dd4f1d5296689b01415a22b90f5b1fa228 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 28 Dec 2017 09:36:40 -0500 Subject: [PATCH 01/56] buildRustCrate: Set target_os to "macos" on darwin The rust compiler uses "macos" as "target_os" conditional on Mac OS[1] [1] https://github.com/rust-lang/rust/blob/8e7a609e635b728eba65d471c985ab462dc4cfc7/src/librustc_back/target/x86_64_apple_darwin.rs#L29 --- pkgs/build-support/rust/build-rust-crate.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/rust/build-rust-crate.nix b/pkgs/build-support/rust/build-rust-crate.nix index 8a9a07fd7a8..4d5fbf1fcbf 100644 --- a/pkgs/build-support/rust/build-rust-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate.nix @@ -98,7 +98,7 @@ let makeDeps = dependencies: export CARGO_PKG_AUTHORS="${authors}" export CARGO_CFG_TARGET_ARCH=${buildPlatform.parsed.cpu.name} - export CARGO_CFG_TARGET_OS=${buildPlatform.parsed.kernel.name} + export CARGO_CFG_TARGET_OS=${if buildPlatform.isDarwin then "macos" else buildPlatform.parsed.kernel.name} export CARGO_CFG_TARGET_FAMILY="unix" export CARGO_CFG_UNIX=1 export CARGO_CFG_TARGET_ENV="gnu" From 9147ccc1c94754d3cef98f70aff5af17b79e5f84 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 25 Jun 2018 10:13:02 -0500 Subject: [PATCH 02/56] radare2-cutter: 1.3 -> 1.4 Added new required deps, minor org touchup. --- .../tools/analysis/radare2-cutter/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/analysis/radare2-cutter/default.nix b/pkgs/development/tools/analysis/radare2-cutter/default.nix index d1ff712be2d..a516e6e2a39 100644 --- a/pkgs/development/tools/analysis/radare2-cutter/default.nix +++ b/pkgs/development/tools/analysis/radare2-cutter/default.nix @@ -1,23 +1,28 @@ -{ stdenv, fetchFromGitHub, fetchpatch, qmake, pkgconfig, qtbase, qtsvg, radare2 }: +{ stdenv, fetchFromGitHub +# nativeBuildInputs +, qmake, pkgconfig +# Qt +, qtbase, qtsvg, qtwebengine +# buildInputs +, radare2 +, python3 }: stdenv.mkDerivation rec { name = "radare2-cutter-${version}"; - version = "1.3"; + version = "1.4"; src = fetchFromGitHub { owner = "radareorg"; repo = "cutter"; rev = "v${version}"; - sha256 = "1z76yz2i9k8mxjk85k2agdj941szdbl2gi66p3dh50878zqavfrr"; + sha256 = "0wsxb6jfpsmgsigmbnh08j99779bsjz02v6aasqcwl6hwjx0mjfk"; }; postUnpack = "export sourceRoot=$sourceRoot/src"; - patchFlags = [ "-p2" ]; - nativeBuildInputs = [ qmake pkgconfig ]; - buildInputs = [ qtbase qtsvg radare2 ]; + buildInputs = [ qtbase qtsvg qtwebengine radare2 python3 ]; enableParallelBuilding = true; From 4b91c2428b6547d98f44abe395f997209ebd5a00 Mon Sep 17 00:00:00 2001 From: Okina Matara Date: Sat, 9 Jun 2018 22:49:27 -0500 Subject: [PATCH 03/56] meguca: 2018-05-26 -> 2018-06-10 --- nixos/modules/services/web-servers/meguca.nix | 5 +-- pkgs/servers/meguca/default.nix | 14 ++++---- pkgs/servers/meguca/server_deps.nix | 33 ++++++++++++------- 3 files changed, 30 insertions(+), 22 deletions(-) diff --git a/nixos/modules/services/web-servers/meguca.nix b/nixos/modules/services/web-servers/meguca.nix index 8ae86c67a29..7aaa820c15c 100644 --- a/nixos/modules/services/web-servers/meguca.nix +++ b/nixos/modules/services/web-servers/meguca.nix @@ -104,15 +104,16 @@ in preStart = '' # Ensure folder exists and links are correct or create them mkdir -p ${cfg.baseDir} + chmod 750 ${cfg.baseDir} ln -sf ${pkgs.meguca}/share/meguca/www ${cfg.baseDir} # Ensure the database is correct or create it ${pkgs.sudo}/bin/sudo -u ${postgres.superUser} ${postgres.package}/bin/createuser \ -SDR meguca || true - ${pkgs.sudo}/bin/sudo -u ${postgres.superUser} ${postgres.package}/bin/psql \ - -c "ALTER ROLE meguca WITH PASSWORD '$(cat ${cfg.passwordFile})';" || true ${pkgs.sudo}/bin/sudo -u ${postgres.superUser} ${postgres.package}/bin/createdb \ -T template0 -E UTF8 -O meguca meguca || true + ${pkgs.sudo}/bin/sudo -u meguca ${postgres.package}/bin/psql \ + -c "ALTER ROLE meguca WITH PASSWORD '$(cat ${cfg.passwordFile})';" || true ''; script = '' diff --git a/pkgs/servers/meguca/default.nix b/pkgs/servers/meguca/default.nix index bfe21543555..05666074181 100644 --- a/pkgs/servers/meguca/default.nix +++ b/pkgs/servers/meguca/default.nix @@ -3,8 +3,8 @@ buildGoPackage rec { name = "meguca-unstable-${version}"; - version = "2018-05-26"; - rev = "9f3d902fb899dbc874c1a91298d86fda7da59b1e"; + version = "2018-06-10"; + rev = "e2f97faf10fd3dd672f9b80d220079bfad1c045c"; goPackagePath = "github.com/bakape/meguca"; goDeps = ./server_deps.nix; enableParallelBuilding = true; @@ -14,20 +14,18 @@ buildGoPackage rec { src = fetchgit { inherit rev; url = "https://github.com/bakape/meguca"; - sha256 = "0qblllf23pxcwi5fhaq8xc77iawll7v7xpk2mf9ngks3h8p7gddq"; + sha256 = "1blj970kdvasgxxwca6idvzl6ha29g9fvqwxgy00j7hk37hzkkzf"; fetchSubmodules = true; }; - configurePhase = '' + buildPhase = '' export HOME=$PWD - export GOPATH=$GOPATH:$HOME/go + export GOPATH=$GOPATH:$HOME/go/src/github.com/bakape/meguca/go + cd $HOME/go/src/github.com/bakape/meguca ln -sf ${nodePackages.meguca}/lib/node_modules/meguca/node_modules sed -i "/npm install --progress false --depth 0/d" Makefile make generate_clean go generate meguca/... - ''; - - buildPhase = '' go build -p $NIX_BUILD_CORES meguca make -j $NIX_BUILD_CORES client wasm ''; diff --git a/pkgs/servers/meguca/server_deps.nix b/pkgs/servers/meguca/server_deps.nix index 493297b9757..d6785061ba3 100644 --- a/pkgs/servers/meguca/server_deps.nix +++ b/pkgs/servers/meguca/server_deps.nix @@ -1,5 +1,14 @@ # This file was generated by https://github.com/kamilchm/go2nix v1.2.1 [ + { + goPackagePath = "github.com/ErikDubbelboer/gspt"; + fetch = { + type = "git"; + url = "https://github.com/ErikDubbelboer/gspt"; + rev = "08ed213262b5bb2cf6ccb0baa71c6b201d353e63"; + sha256 = "1vdgvwjagk1n4mwvpil59idgg7ibdj6frk9mz8c2ckbmxsfpp8rq"; + }; + } { goPackagePath = "github.com/Masterminds/squirrel"; fetch = { @@ -41,8 +50,8 @@ fetch = { type = "git"; url = "https://github.com/bakape/thumbnailer"; - rev = "5b92eb4c4500fd8e004e4cc9eeb2038961e2004f"; - sha256 = "0z9myzp6rjyylh91ibd1nfpz7za1gxg4n3pnn7sw54i9zyws1l4x"; + rev = "bb51d30d3f3379cd17f4f2a43d1a7caf0d92b497"; + sha256 = "0rgyfi14v17acz56hm9j0dzk0kx8k6jfjcwjzvr7b04bahw09zc4"; }; } { @@ -113,8 +122,8 @@ fetch = { type = "git"; url = "https://github.com/gorilla/websocket"; - rev = "21ab95fa12b9bdd8fecf5fa3586aad941cc98785"; - sha256 = "1ygg6cr84461d6k3nzbja0dxhcgf5zvry2w10f6i7291ghrcwhyy"; + rev = "5ed622c449da6d44c3c8329331ff47a9e5844f71"; + sha256 = "1yhcwraijdk6lx7f6m9p6i1b3zfh2hq80l1nfpnckfn10gh72aw7"; }; } { @@ -158,8 +167,8 @@ fetch = { type = "git"; url = "https://github.com/mailru/easyjson"; - rev = "8b799c424f57fa123fc63a99d6383bc6e4c02578"; - sha256 = "15ba6drfmw98lzw5qjh3ijcxh9iz9rcp3hid169yfd08l06z05w0"; + rev = "3fdea8d05856a0c8df22ed4bc71b3219245e4485"; + sha256 = "0g3crph77yhv4ipdnwqc32z4cp87ahi4ikad5kyy6q4znnxliz74"; }; } { @@ -185,8 +194,8 @@ fetch = { type = "git"; url = "https://github.com/sevlyar/go-daemon"; - rev = "45a2ba1b7c6710a044163fa109bf08d060bc3afa"; - sha256 = "1fd8cwljgbxsm3w38pii0n02zg8s53x7j08w784csj3sfzq7rbv4"; + rev = "f9261e73885de99b1647d68bedadf2b9a99ad11f"; + sha256 = "1c4h85a3qfdkd61k8ipk1ffi3sdflq4wqp6d6h43zrca528m9ddc"; }; } { @@ -221,8 +230,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "a3beeb748656e13e54256fd2cde19e058f41f60f"; - sha256 = "0h0a1v2g3hf0dlfjfiv76vfvvy7r9sdhjyqc2snvh9dczm2k5zki"; + rev = "8ac0e0d97ce45cd83d1d7243c060cb8461dda5e9"; + sha256 = "0vg0dfpv1wgj5imlakpma763yfd67aqbiy0fcklq3cw46qmfbzf1"; }; } { @@ -230,8 +239,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "c11f84a56e43e20a78cee75a7c034031ecf57d1f"; - sha256 = "1fn1wwr94v6ca1zcbsrs5v79s95pajdjqzz9rm9lxkgcvv1rl189"; + rev = "7c1e4f34a39c8bf93b6a3379e4ffb3b118ecc614"; + sha256 = "1jcf4xhbw9zxzhx4w3z9i0bsgb8n59sfrs628a2xsd805b8zlw0r"; }; } { From 4031e08242959b79a30bf438943b872339f54dc3 Mon Sep 17 00:00:00 2001 From: Okina Matara Date: Mon, 11 Jun 2018 02:49:23 -0500 Subject: [PATCH 04/56] nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 --- .../node-packages/node-packages-v6.nix | 1192 ++++++++++++++++- .../node-packages/node-packages-v8.nix | 160 +++ 2 files changed, 1349 insertions(+), 3 deletions(-) diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index bcbeeca306a..aa31c6b141b 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -112,7 +112,39 @@ let sha512 = "lyJ8sW1PbY3uwuvpOBZ9zMYKshMnQpXmeDHh8dj9j2nJm/xrW0FgB5gLSYOArj5X0IfaXnmhFoJnhS4KbqIMug=="; }; }; +<<<<<<< HEAD "@types/node-10.5.0" = { +======= + "@types/caseless-0.12.1" = { + name = "_at_types_slash_caseless"; + packageName = "@types/caseless"; + version = "0.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.1.tgz"; + sha512 = "3ygc8335my77k11wjf0wihzqfsv4fxyfrvb730sx8ab3phx3wc8g4pg3g84h497ipvzk7i9gnwnzrkg68zm6df6wi59y7hdgrmlq68n"; + }; + }; + "@types/form-data-2.2.1" = { + name = "_at_types_slash_form-data"; + packageName = "@types/form-data"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/form-data/-/form-data-2.2.1.tgz"; + sha512 = "2fv2qaz90rp6ib2s45ix0p3a4bd6yl6k94k1kkhw7w4s2aa5mqc6chppkf6pfvsz1l6phh7y0xswyfyzjgny7qzascch8c7ws20a0r4"; + }; + }; +<<<<<<< HEAD + "@types/node-10.3.1" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "10.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-10.3.1.tgz"; + sha512 = "0xqz0wlddb3vi0mmlncn1ypd7sa2zv3fcq58jk7nr0xdsrwwzn9ncdq784lvg8d2k7lzq1p2kjyak5nghq0imbdj8hrmk6365lgvi92"; + }; + }; + "@types/node-8.10.18" = { +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 name = "_at_types_slash_node"; packageName = "@types/node"; version = "10.5.0"; @@ -126,11 +158,74 @@ let packageName = "@types/node"; version = "8.10.20"; src = fetchurl { +<<<<<<< HEAD url = "https://registry.npmjs.org/@types/node/-/node-8.10.20.tgz"; sha512 = "M7x8+5D1k/CuA6jhiwuSCmE8sbUWJF0wYsjcig9WrXvwUI5ArEoUBdOXpV4JcEMrLp02/QbDjw+kI+vQeKyQgg=="; }; }; "@webassemblyjs/ast-1.5.12" = { +======= + url = "https://registry.npmjs.org/@types/node/-/node-9.6.20.tgz"; + sha512 = "03zcm94d4k4hmyilhw27w8ixxm2bkkr2my3d344viq4dzadjmzc9vyabyfs085j6a3qdv1ns0bbw5m72511bwq885064cpnn58ig0wq"; +======= + "@types/node-10.3.2" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "10.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-10.3.2.tgz"; + sha512 = "3w50bh9i0rl27vnrn4mmwjphccfaybj74ydfymjmq46p8dfllfwm37lgxqjrx0mp6hrdia5hllbwnpsx2a4wwwck9hh9dkp798c9mzl"; + }; + }; + "@types/node-8.10.19" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "8.10.19"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-8.10.19.tgz"; + sha512 = "3wi74w4fjk1zjwa8sijb2a8n6c0ynl48k8za2rwawm7332kncqm0jsg4xx7vkz25fzh16x852can18bc1n859gnsfqy9d43ivp3kxgq"; + }; + }; + "@types/node-9.6.21" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "9.6.21"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-9.6.21.tgz"; + sha512 = "3n2g5wdwppphgaxing5vdzidpiggibfdwci4l522hm4v4p49gas7fsld0k51g8vf09k65y7d4cq6h0dr76sbrsvy58wn4pigjcbl16d"; +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 + }; + }; + "@types/request-2.47.0" = { + name = "_at_types_slash_request"; + packageName = "@types/request"; + version = "2.47.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/request/-/request-2.47.0.tgz"; + sha512 = "3jk7nawc1yb26ykdlv3mk1bmdpq2an6krskfj4x46kc9ka9r11ixrivg5zwcm451wlarry8dk36mick3d68w0c85i177ymghzkcr9gw"; + }; + }; + "@types/tough-cookie-2.3.3" = { + name = "_at_types_slash_tough-cookie"; + packageName = "@types/tough-cookie"; + version = "2.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-2.3.3.tgz"; + sha512 = "1hpxnn86rnm17kxbwp8r3ymx3qqmvq6vhswndr12cahvbarmm27mj2jj2r0pm0w9wvq9ixm55whl8q029ir29c59cmanbais720nd1h"; + }; + }; + "@types/uuid-3.4.3" = { + name = "_at_types_slash_uuid"; + packageName = "@types/uuid"; + version = "3.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/uuid/-/uuid-3.4.3.tgz"; + sha512 = "1psrs8sjpmhz8sz2zjkkd7743vzdi7q7vcj8p219q1pkfawr619rl1m5pczp69hbm1769kn8zwlbayjylhl7an5hkvkdd2bi04lpx75"; + }; + }; +<<<<<<< HEAD + "@webassemblyjs/ast-1.5.10" = { +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 name = "_at_webassemblyjs_slash_ast"; packageName = "@webassemblyjs/ast"; version = "1.5.12"; @@ -288,8 +383,175 @@ let packageName = "@webassemblyjs/wast-printer"; version = "1.5.12"; src = fetchurl { +<<<<<<< HEAD url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.5.12.tgz"; sha512 = "XF9RTeckFgDyl196uRKZWHFFfbkzsMK96QTXp+TC0R9gsV9DMiDGMSIllgy/WdrZ3y3dsQp4fTA5r4GoaOBchA=="; +======= + url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.5.10.tgz"; + sha512 = "3qwkz89g5fgn3hwbm7fb4v0zdgq2vr8nb98cg4w0r5za21xry06m8yzwka5j6h9qxz2qqxy019mfxxga03c0g8v8lw5fkf4d4kdk34z"; +======= + "@webassemblyjs/ast-1.5.12" = { + name = "_at_webassemblyjs_slash_ast"; + packageName = "@webassemblyjs/ast"; + version = "1.5.12"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.5.12.tgz"; + sha512 = "06c896q5ljznnp6rbln2lwfxccp7cx9bxpzcc73arj9xlcxkd9aj3ag9ghdx9xmysqq2xawmzplwk77ns2l0y9gfhx2b1dfmc8c2r3f"; + }; + }; + "@webassemblyjs/floating-point-hex-parser-1.5.12" = { + name = "_at_webassemblyjs_slash_floating-point-hex-parser"; + packageName = "@webassemblyjs/floating-point-hex-parser"; + version = "1.5.12"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.5.12.tgz"; + sha512 = "01128bl9i9hffn7kgznfdqvrvb9l6ff1njj486qn2cywjd0skwb816cnmc55cvksmyvfkg9ijsmxj7sjlpiv7fp2d9zl80fvj8yz53s"; + }; + }; + "@webassemblyjs/helper-api-error-1.5.12" = { + name = "_at_webassemblyjs_slash_helper-api-error"; + packageName = "@webassemblyjs/helper-api-error"; + version = "1.5.12"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.5.12.tgz"; + sha512 = "3152r3s7k5w80l4a3y8j37y3s565l0ggxbl3li5m9g0x0ykl2iccafdq0j13v5hvxmj5y6i1bvxz31da99mrjy1p6ybmg49rs1mm30s"; + }; + }; + "@webassemblyjs/helper-buffer-1.5.12" = { + name = "_at_webassemblyjs_slash_helper-buffer"; + packageName = "@webassemblyjs/helper-buffer"; + version = "1.5.12"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.5.12.tgz"; + sha512 = "1drz3nvcs4qn2wx651x491ryvj5gc8d7gqrw4lxciyp864s8l8i0fpbz3b94wfirrhq39kzp4sk96gxz0a2zjigi5i2rr2bvf7594xl"; + }; + }; + "@webassemblyjs/helper-code-frame-1.5.12" = { + name = "_at_webassemblyjs_slash_helper-code-frame"; + packageName = "@webassemblyjs/helper-code-frame"; + version = "1.5.12"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.5.12.tgz"; + sha512 = "0qczm2a2xv701d334lja7ickkc0l9zbbxv3n6nl3dgbh9dn82qhvg9ffxz7c5j1fsda28jbr6z3b2ah7qxq7qpk681w9y4k4j1cjnnh"; + }; + }; + "@webassemblyjs/helper-fsm-1.5.12" = { + name = "_at_webassemblyjs_slash_helper-fsm"; + packageName = "@webassemblyjs/helper-fsm"; + version = "1.5.12"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.5.12.tgz"; + sha512 = "0sl4gp0r7g3sw224lm1xhw8w0l24fs17xr866b8hc1lhj0pv6xcqx4s8w0mlpdvafyl0vk1gvs95d6639d51bw2r7a9wl2gjpixj4a0"; + }; + }; + "@webassemblyjs/helper-module-context-1.5.12" = { + name = "_at_webassemblyjs_slash_helper-module-context"; + packageName = "@webassemblyjs/helper-module-context"; + version = "1.5.12"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.5.12.tgz"; + sha512 = "0f0a2p3gpjpbk1gapgprlawpfp69i9c4zbf9awb29rchdlcdg6vipkiylvshfzv3nzp2qdw1rapyvpi1rqg8wn7vn397q682grd29a8"; + }; + }; + "@webassemblyjs/helper-wasm-bytecode-1.5.12" = { + name = "_at_webassemblyjs_slash_helper-wasm-bytecode"; + packageName = "@webassemblyjs/helper-wasm-bytecode"; + version = "1.5.12"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.5.12.tgz"; + sha512 = "3m81d4f4n6rv469xr35z8i795rzs8c9y1q1isz3agcjgjrkq60ch7p47mmcr1pmbd03mywzsp0ld34qqh42p4xkam6lkg1j0yazjv6h"; + }; + }; + "@webassemblyjs/helper-wasm-section-1.5.12" = { + name = "_at_webassemblyjs_slash_helper-wasm-section"; + packageName = "@webassemblyjs/helper-wasm-section"; + version = "1.5.12"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.5.12.tgz"; + sha512 = "2ilcq6wa6spyzbnsk936f3jhp66hh9qbil4xdrm5qkldkyifyxc399gnn8lldsnbgk6zik1h8cyvhzfj21kqzakhj4rh6l1a8lw5vw1"; + }; + }; + "@webassemblyjs/ieee754-1.5.12" = { + name = "_at_webassemblyjs_slash_ieee754"; + packageName = "@webassemblyjs/ieee754"; + version = "1.5.12"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.5.12.tgz"; + sha512 = "1p34jm6p7r6yn32adimw6qjhdir3bvna8chnq7q5gps7d3xjr5ii9l9hx95rvapdcpgmjwjpw963v3f17js5h8j9sszik01sjzw9qqp"; + }; + }; + "@webassemblyjs/leb128-1.5.12" = { + name = "_at_webassemblyjs_slash_leb128"; + packageName = "@webassemblyjs/leb128"; + version = "1.5.12"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.5.12.tgz"; + sha512 = "09lzncxy6972dcmpmdrmb2grvyv38zkrrp3wxcq43almxmisrsak055asf93imqjkgyrqqg68gz1nadlvqrdmasq616r2a6npyb28vh"; + }; + }; + "@webassemblyjs/utf8-1.5.12" = { + name = "_at_webassemblyjs_slash_utf8"; + packageName = "@webassemblyjs/utf8"; + version = "1.5.12"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.5.12.tgz"; + sha512 = "32wy1zi742qnzm4a80kvqk8bw2jb09s139p8w8ai2hdp7fbgk3k8larvp4vcamgknnd8ydc88hbvj5ncyav9gzj9ls1ak920dhhszqm"; + }; + }; + "@webassemblyjs/wasm-edit-1.5.12" = { + name = "_at_webassemblyjs_slash_wasm-edit"; + packageName = "@webassemblyjs/wasm-edit"; + version = "1.5.12"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.5.12.tgz"; + sha512 = "1sqjayps4w4382id6c5l02d65d9pjqz4n318fa0appjasd70f2mwq5xxpb38aby9w5h6aa40pm1gggrwc5jd6439rs9j4dq401ikymg"; + }; + }; + "@webassemblyjs/wasm-gen-1.5.12" = { + name = "_at_webassemblyjs_slash_wasm-gen"; + packageName = "@webassemblyjs/wasm-gen"; + version = "1.5.12"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.5.12.tgz"; + sha512 = "23dcw8svzg7h274dj4mlfkd2scavic7sk26lvij699wahdmvlj9587s0kw5fy6cswa78kihf5fnazpzl8bml5sji6312isqpmrbwfrd"; + }; + }; + "@webassemblyjs/wasm-opt-1.5.12" = { + name = "_at_webassemblyjs_slash_wasm-opt"; + packageName = "@webassemblyjs/wasm-opt"; + version = "1.5.12"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.5.12.tgz"; + sha512 = "1yyaib60nv73hs4imhwyjmlr5whnka08b7gvdw6lw7bp67ajakl4i1yiszm8b9jkp1f60bp3ibw4bd50cxwjm86ibpfzxn0lgj0c71c"; + }; + }; + "@webassemblyjs/wasm-parser-1.5.12" = { + name = "_at_webassemblyjs_slash_wasm-parser"; + packageName = "@webassemblyjs/wasm-parser"; + version = "1.5.12"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.5.12.tgz"; + sha512 = "1akyzn4hsq3vgzrckay26vpy5fglqsaw55sb503w0y0z43yhnyr6kjgi4d2wcpk5b43c1wkm626fq08yd4xy87k25c83dj0xpgsviy6"; + }; + }; + "@webassemblyjs/wast-parser-1.5.12" = { + name = "_at_webassemblyjs_slash_wast-parser"; + packageName = "@webassemblyjs/wast-parser"; + version = "1.5.12"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.5.12.tgz"; + sha512 = "2z2qbzgba6sp3xnxznvh7ls0bvdpq79n0h00a5m6sgz2wk52r7wjlchiwsyjgg63cklaqfdvf1kkb07irvxqjb9yhgbaqyz3g72sra1"; + }; + }; + "@webassemblyjs/wast-printer-1.5.12" = { + name = "_at_webassemblyjs_slash_wast-printer"; + packageName = "@webassemblyjs/wast-printer"; + version = "1.5.12"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.5.12.tgz"; + sha512 = "225rq38m20syf9hgmw0mcfx5pgxknjrpw69c99267320cj3byqn07yiqbjagmq4x6yw5c1kp5ylawaqk49bjyjzjzr005i4wx6m2psw"; +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 }; }; "@zeit/schemas-1.2.0" = { @@ -761,6 +1023,8 @@ let }; }; "ajv-6.5.0" = { +<<<<<<< HEAD +======= name = "ajv"; packageName = "ajv"; version = "6.5.0"; @@ -778,6 +1042,16 @@ let sha512 = "pgZos1vgOHDiC7gKNbZW8eKvCnNXARv2oqrGQT7Hzbq5Azp7aZG6DJzADnkuSq7RH6qkXp4J/m68yPX/2uBHyQ=="; }; }; + "ajv-6.5.1" = { +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 + name = "ajv"; + packageName = "ajv"; + version = "6.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-6.5.1.tgz"; + sha512 = "34lgq6szzswig3fzq4rwpm4m8gx3bja5rwhxh4w1jx92sbv781vkfndqwz43imalbv1n0apfc5azqpiasv3a2mq1gi70f70bfrnh1m6"; + }; + }; "ajv-keywords-1.5.1" = { name = "ajv-keywords"; packageName = "ajv-keywords"; @@ -1180,7 +1454,11 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/arch/-/arch-2.1.1.tgz"; +<<<<<<< HEAD sha512 = "BLM56aPo9vLLFVa8+/+pJLnrZ7QGGTVHWsCwieAWT9o9K8UeGaQbzZbGoabWLOo2ksBCztoXdqBZBplqLDDCSg=="; +======= + sha512 = "15c4c1cdachcnd0fqbxmkj2q293dsicsska3ilnrlds868yqlmkvnjg2vh8kc60b93ka686nikypf94m7zzpg2n2p5z5xp8lglkkcq4"; +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 }; }; "archiver-2.1.1" = { @@ -1867,13 +2145,32 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; +<<<<<<< HEAD "aws-sdk-2.265.1" = { +======= +<<<<<<< HEAD + "aws-sdk-2.252.1" = { +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 name = "aws-sdk"; packageName = "aws-sdk"; version = "2.265.1"; src = fetchurl { +<<<<<<< HEAD url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.265.1.tgz"; sha512 = "0xL9Lontx71wxwa+adZQGAWGmsXyrJbJmBzcCd6w+/zRAkd/mGX7T0V4mivPZK3QIiaKR8U/TZDmxAwnOryX3Q=="; +======= + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.252.1.tgz"; + sha1 = "4ce45b16dc408883e20a564bd86270c67f25bb60"; +======= + "aws-sdk-2.254.1" = { + name = "aws-sdk"; + packageName = "aws-sdk"; + version = "2.254.1"; + src = fetchurl { + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.254.1.tgz"; + sha512 = "3xii67fvbmza2v2asza89vxqkpqv2lksnf95qxpp4fh881kqrrbvxf2pvdmfv1y1ci7za60jabjsfzfvhyrj4f11k8v454qn8mnp25z"; +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 }; }; "aws-sign-0.2.0" = { @@ -2776,13 +3073,32 @@ let sha1 = "159a49b9a9714c1fb102f2e0ed1906fab6a450f4"; }; }; +<<<<<<< HEAD "big-integer-1.6.32" = { +======= +<<<<<<< HEAD + "big-integer-1.6.30" = { +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 name = "big-integer"; packageName = "big-integer"; version = "1.6.32"; src = fetchurl { +<<<<<<< HEAD url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.32.tgz"; sha512 = "ljKJdR3wk9thHfLj4DtrNiOSTxvGFaMjWrG4pW75juXC4j7+XuKJVFdg4kgFMYp85PVkO05dFMj2dk2xVsH4xw=="; +======= + url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.30.tgz"; + sha512 = "0mpq1fin33p53fjgylmnrc0g51raqmprdpkm51vkl2na7mar5a778mlnwv6wrj98fjcx30wijf0zms9l88ibprn36z39jpw9zpcaq1c"; +======= + "big-integer-1.6.31" = { + name = "big-integer"; + packageName = "big-integer"; + version = "1.6.31"; + src = fetchurl { + url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.31.tgz"; + sha512 = "047nkbj5b46cnqrz6rpjcqnzqmrcrk88wc60g74fla91ib7njxbddvm90fv3pfdcwv5pj8jrs7avvvqll6mmjzyijkk5i7hf4sdjdll"; +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 }; }; "big.js-3.2.0" = { @@ -2953,7 +3269,11 @@ let version = "2.4.2"; src = fetchurl { url = "https://registry.npmjs.org/bittorrent-protocol/-/bittorrent-protocol-2.4.2.tgz"; +<<<<<<< HEAD sha512 = "ZphU6H9B0Tf99P2noVmyKkT7Bf8FZG6T3VSurJva8ozvvCqSfLMnI7X4Khxn5qXXvw71/R9Vfq+aJvMgV9lquQ=="; +======= + sha512 = "2wnmnap43rjd6mggraizzgm1szxg9g6cwf2my5m4ckv6z4j5ayfz37jvadsrbjlvn9nwr05zw2zni1an9cs39zxykykgla1gzl59636"; +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 }; }; "bittorrent-tracker-7.7.0" = { @@ -3052,7 +3372,11 @@ let version = "1.2.8"; src = fetchurl { url = "https://registry.npmjs.org/blob-to-buffer/-/blob-to-buffer-1.2.8.tgz"; +<<<<<<< HEAD sha512 = "re0AIxakF504MgeMtIyJkVcZ8T5aUxtp/QmTMlmjyb3P44E1BEv5x3LATBGApWAJATyXHtkXRD+gWTmeyYLiQA=="; +======= + sha512 = "10f50n9kqwmk81z8hbxj7lp7h0hjq55h08lrh3jqzwln11mh7iwzgf9ldck54q9zmlinlss7vqijmwii66b930768w9s5x42qih1vdd"; +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 }; }; "block-stream-0.0.9" = { @@ -4153,6 +4477,28 @@ let sha1 = "a2aa5fb1af688758259c32c141426d78923b9b77"; }; }; +<<<<<<< HEAD +======= +<<<<<<< HEAD + "caniuse-lite-1.0.30000850" = { + name = "caniuse-lite"; + packageName = "caniuse-lite"; + version = "1.0.30000850"; + src = fetchurl { + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000850.tgz"; + sha512 = "109fg3d4qqzsnn1jmrjih7nhddicpkxsyhq60dhx3s6g2rgcfjas5n56h4xfncqq0j3vrbn3w0x35dhlq2cxh4khsfpq8kz8kqvhwl8"; +======= + "caniuse-lite-1.0.30000851" = { + name = "caniuse-lite"; + packageName = "caniuse-lite"; + version = "1.0.30000851"; + src = fetchurl { + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000851.tgz"; + sha512 = "22km2mq3dj2lhwfj1rp4ws5iqb6v5x70fpm19sz8d2j1x6awzi2diwg280w1nvpffv6z9ijgyhyj3q7wxyvgg3qpqs0ixqbaw1rqmv3"; +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 + }; + }; +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 "capture-stack-trace-1.0.0" = { name = "capture-stack-trace"; packageName = "capture-stack-trace"; @@ -4510,7 +4856,11 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.0.tgz"; +<<<<<<< HEAD sha512 = "xDbVgyfDTT2piup/h8dK/y4QZfJRSa73bw1WZ8b4XM1o7fsFubUVGYcE+1ANtOzJJELGpYoG2961z0Z6OAld9A=="; +======= + sha512 = "3s5s29qg93czdfyvc38m9f688jckv5l1m8gn14734avbf85zgnnikawz336fmhddzvswjaiy9ji0bpz9b3qfzzaialkskf34y1xadn4"; +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 }; }; "chromecast-player-0.2.3" = { @@ -6273,6 +6623,18 @@ let name = "cordova-serve"; packageName = "cordova-serve"; version = "2.0.1"; +<<<<<<< HEAD +======= + src = fetchurl { + url = "https://registry.npmjs.org/cordova-serve/-/cordova-serve-2.0.1.tgz"; + sha512 = "3v0v93cf8mhli9ai6lzjx7ch43npl08m18i1yx0kaqql23m0s0yf13vbfy4rch9h7rhyjzacjrjwbbbxizjlflcwrc0k2djjw7payfx"; + }; + }; + "core-js-1.2.7" = { + name = "core-js"; + packageName = "core-js"; + version = "1.2.7"; +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 src = fetchurl { url = "https://registry.npmjs.org/cordova-serve/-/cordova-serve-2.0.1.tgz"; sha512 = "3Xl1D5eyiQlY5ow6Kn/say0us2TqSw/zgQmyTLxbewTngQZ1CIqxmqD7EFGoCNBrB4HsdPmpiSpFCitybKQN9g=="; @@ -6419,7 +6781,11 @@ let version = "3.32.0"; src = fetchurl { url = "https://registry.npmjs.org/create-torrent/-/create-torrent-3.32.0.tgz"; +<<<<<<< HEAD sha512 = "l9chXj5LLyVFfPF6nFCWlm5/Wt+04d+mXUpG5LJAogeyRruWfjnUozfmQspAi6iW91ibp7qKBuFMPJViz5lp1Q=="; +======= + sha512 = "3ank6fgcaakqk710s5bm9wvb3vrda4b83545riplga3jzlnpd3b41x282rf8ijabnkdzqdlvxd7yvlnjr89qypigi2jabsb7rg23mwp"; +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 }; }; "cron-1.3.0" = { @@ -6653,7 +7019,11 @@ let version = "1.0.0-alpha.29"; src = fetchurl { url = "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.29.tgz"; +<<<<<<< HEAD sha512 = "sRNb1XydwkW9IOci6iB2xmy8IGCj6r/fr+JWitvJ2JxQRPzN3T4AGGVWCMlVmVwM1gtgALJRmGIlWv5ppnGGkg=="; +======= + sha512 = "298cwd6d7z5l9b2k18v40301gb0qp4rap4hhmk53003xpfdzi25176qr7dqlmp2mzgvzsm3c0hbqv66fqhfl8p742ylbhlxgkamn4xi"; +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 }; }; "css-tree-1.0.0-alpha25" = { @@ -6698,7 +7068,11 @@ let version = "3.5.1"; src = fetchurl { url = "https://registry.npmjs.org/csso/-/csso-3.5.1.tgz"; +<<<<<<< HEAD sha512 = "vrqULLffYU1Q2tLdJvaCYbONStnfkfimRxXNaGjxMldI0C7JPBC4rB1RyjhfdZ4m1frm8pM9uRPKH3d2knZ8gg=="; +======= + sha512 = "217qxljfrvizjhkp4yr7wp6zbajd7kmbwwcll8xmjw10g695v84hmrjy5l6ik8m8ykgi4fzv558vcv1hbv2dpfjv984sqfznwn99fmy"; +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 }; }; "cssom-0.3.3" = { @@ -8958,7 +9332,11 @@ let version = "1.10.0"; src = fetchurl { url = "https://registry.npmjs.org/escodegen/-/escodegen-1.10.0.tgz"; +<<<<<<< HEAD sha512 = "fjUOf8johsv23WuIKdNQU4P9t9jhQ4Qzx6pC2uW890OloK3Zs1ZAoCNpg/2larNF501jLl3UNy0kIRcF6VI22g=="; +======= + sha512 = "3d3clp90lbj291d6za5sbk39pklbcvalpyq6s93l105dcyrmnhaahzppkjxlhmaqwrq8hz1v2vzv0ska39jk23bvpvcp1p8r1zhwdby"; +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 }; }; "escodegen-1.8.1" = { @@ -12811,7 +13189,11 @@ let version = "1.1.12"; src = fetchurl { url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.12.tgz"; +<<<<<<< HEAD sha512 = "GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA=="; +======= + sha512 = "0nf551idk1p8slbvd2jvzdh9hkm5z2dpv0b3jh1wgkab3mbi33vimdwiivrymvaqk7ba3by6rg9bn5xsdiqi24cn9vr5yjq6kw8y2qs"; +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 }; }; "ieee754-1.1.8" = { @@ -14530,7 +14912,11 @@ let version = "0.4.1"; src = fetchurl { url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; +<<<<<<< HEAD sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; +======= + sha512 = "1bbgxs4777gn3q3yxi0n792cgz9pimf85pypr0w4wzpb22nr8fl9xi98pkcqd3n4fn7lnzffpq7qwpcl4dqc15py19lwqa2jwgw5dn5"; +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 }; }; "json-stable-stringify-0.0.1" = { @@ -18715,13 +19101,32 @@ let sha512 = "5+MtH9t8tX6Aw6M+SeoyGR23XplNTOln3aTQ7El9tj/606bxea4GxYyvV4ymTmuoODz3GXQlLLQVdGkFLyIdDQ=="; }; }; +<<<<<<< HEAD + "node-red-node-twitter-1.0.1" = { +======= +<<<<<<< HEAD + "node-red-node-twitter-0.1.15" = { +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 + name = "node-red-node-twitter"; + packageName = "node-red-node-twitter"; + version = "1.0.1"; + src = fetchurl { +<<<<<<< HEAD + url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-1.0.1.tgz"; + sha512 = "NAM6mlAiZk1EwHtdPNnP/E8P5EIijnqSag1vzE/Ya+ggywTiELt9HtYX26evyB/MrnVS+FIJg+M8S5HobklERg=="; +======= + url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-0.1.15.tgz"; + sha512 = "07v6lmlyb0hdg9l86gvlipvs3ahi64fgswkadz1frczpi293hydlbdsy7rb917nf7z0kpcsrnch9d92xwirf4p6yzfhkmdsanrb9ha0"; +======= "node-red-node-twitter-1.0.1" = { name = "node-red-node-twitter"; packageName = "node-red-node-twitter"; version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-1.0.1.tgz"; - sha512 = "NAM6mlAiZk1EwHtdPNnP/E8P5EIijnqSag1vzE/Ya+ggywTiELt9HtYX26evyB/MrnVS+FIJg+M8S5HobklERg=="; + sha512 = "1348jbfx28lng73hc4m5y2jfnpcq7y8mykxn5yn3ryvn4720k5j1s3bv17wqvqdda97m3i28bj0ykzwrzckqpbvq124sri2a2d3l0rl"; +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 }; }; "node-ssdp-2.9.1" = { @@ -19219,6 +19624,7 @@ let sha1 = "3831db968451b9cf6aff9bf95925f1ef8e37b33f"; }; }; +<<<<<<< HEAD "numeral-2.0.6" = { name = "numeral"; packageName = "numeral"; @@ -19228,13 +19634,29 @@ let sha1 = "4ad080936d443c2561aed9f2197efffe25f4e506"; }; }; +======= +<<<<<<< HEAD +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 "nwmatcher-1.4.4" = { name = "nwmatcher"; packageName = "nwmatcher"; version = "1.4.4"; src = fetchurl { url = "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.4.4.tgz"; +<<<<<<< HEAD sha512 = "3iuY4N5dhgMpCUrOVnuAdGrgxVqV2cJpM+XNccjR2DKOB1RUP0aA+wGXEiNziG/UKboFyGBIoKOaNlJxx8bciQ=="; +======= + sha512 = "24xrin7f593d6m3l1461j05p8lx8vw8fcii55q1zf04cgslah3qwcnqs7473kg56dlw5ncmbb2y0sklh1xmdkja14lh71jxvvh9hayy"; +======= + "numeral-2.0.6" = { + name = "numeral"; + packageName = "numeral"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/numeral/-/numeral-2.0.6.tgz"; + sha1 = "4ad080936d443c2561aed9f2197efffe25f4e506"; +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 }; }; "oauth-0.9.14" = { @@ -22254,13 +22676,32 @@ let sha512 = "9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw=="; }; }; +<<<<<<< HEAD + "raw-socket-1.6.2" = { +======= +<<<<<<< HEAD + "raw-socket-1.6.1" = { +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 + name = "raw-socket"; + packageName = "raw-socket"; + version = "1.6.2"; + src = fetchurl { +<<<<<<< HEAD + url = "https://registry.npmjs.org/raw-socket/-/raw-socket-1.6.2.tgz"; + sha512 = "JbmNAXPFNI+yJv3Kx0Lsl+ao2doZ/kdz9J4Ba9+ggC1U4e50BK0GfHHYuLFj8acnYzqXgKiLzhi2ixOPk6/kcw=="; +======= + url = "https://registry.npmjs.org/raw-socket/-/raw-socket-1.6.1.tgz"; + sha512 = "0fhy1r7pyl4v2zmjz1fmvqbdmjscib47pbc5di3cn965j7zj3y5h2bs8x0r131i4s7xj47c36na1cgpppp71kvdc1qs78y4bf7fpa45"; +======= "raw-socket-1.6.2" = { name = "raw-socket"; packageName = "raw-socket"; version = "1.6.2"; src = fetchurl { url = "https://registry.npmjs.org/raw-socket/-/raw-socket-1.6.2.tgz"; - sha512 = "JbmNAXPFNI+yJv3Kx0Lsl+ao2doZ/kdz9J4Ba9+ggC1U4e50BK0GfHHYuLFj8acnYzqXgKiLzhi2ixOPk6/kcw=="; + sha512 = "1ry9bwkiw9qpdhqrs5si04p79ijg9zicfqvin3igh3as13lxvhm8bc0l3gnn0cyyirlgzhrvbcsirlpxi1cgjpx4sr8yd65fc0qvf95"; +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 }; }; "rc-0.4.0" = { @@ -24225,13 +24666,32 @@ let sha512 = "dU3TBVIGkP5Hzw6o74hJx+VzTBTX2rqIiLfugs0HdmdVQCQp76XGg2jlBCqfRJfW/n6/mUKTi+s3rnzX7SgbBA=="; }; }; +<<<<<<< HEAD + "simple-git-1.96.0" = { +======= +<<<<<<< HEAD + "simple-git-1.95.1" = { +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 + name = "simple-git"; + packageName = "simple-git"; + version = "1.96.0"; + src = fetchurl { +<<<<<<< HEAD + url = "https://registry.npmjs.org/simple-git/-/simple-git-1.96.0.tgz"; + sha512 = "+gXuzJFpGtK9zCa7rPMMNs8AF2weWMsB0Vlyym5VkFX2VGQ3VBzKhnxPN//PWrGuPFGQ/u0F1yL6rZoPhj/KPQ=="; +======= + url = "https://registry.npmjs.org/simple-git/-/simple-git-1.95.1.tgz"; + sha512 = "3ssfxzdgj6ycrklss1hxrmwcfsncx9bccnsxrkdknw68p2g9is3j3dc2kk748jn0kky9q7ajdjqvv6k18n6qbj9llaiy5kh9k1i7mbj"; +======= "simple-git-1.96.0" = { name = "simple-git"; packageName = "simple-git"; version = "1.96.0"; src = fetchurl { url = "https://registry.npmjs.org/simple-git/-/simple-git-1.96.0.tgz"; - sha512 = "+gXuzJFpGtK9zCa7rPMMNs8AF2weWMsB0Vlyym5VkFX2VGQ3VBzKhnxPN//PWrGuPFGQ/u0F1yL6rZoPhj/KPQ=="; + sha512 = "0ywlgw61ydavyi2sw2yvzlha4yaxcasrzzkfkvwhv51qm1pciagcmchampclwjrs40wnn0ydhbh1krn1krsrfr6rjyx46k9j76fw1gs"; +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 }; }; "simple-lru-cache-0.0.2" = { @@ -25608,7 +26068,11 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/stream-to-blob/-/stream-to-blob-1.0.1.tgz"; +<<<<<<< HEAD sha512 = "aRy4neA4rf+qMtLT9fCRLPGWdrsIKtCx4kUdNTIPgPQ2hkHkdxbViVAvABMx9oRM6yCWfngHx6pwXfbYkVuPuw=="; +======= + sha512 = "2xqynwiv3v5sw5aqw3phzln43mlr17n649h0bshi7aicxz48633dx401wr3a7a5waqx0ah8pdv9dw9cj7qgblyj6amgzb9qw2fvh739"; +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 }; }; "stream-to-blob-url-2.1.1" = { @@ -25617,7 +26081,11 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/stream-to-blob-url/-/stream-to-blob-url-2.1.1.tgz"; +<<<<<<< HEAD sha512 = "DKJPEmCmIZoBfGVle9IhSfERiWaN5cuOtmfPxP2dZbLDRZxkBWZ4QbYxEJOSALk1Kf+WjBgedAMO6qkkf7Lmrg=="; +======= + sha512 = "2pfdckz4jlyl3h3fhg1i34nzwlkbf80ja9i0cdn85w6c1b4ki2w7ck5kpyw9kv7ns7cprcdcs4i3wa94797nrb5gh0rl8d6c094z8hc"; +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 }; }; "stream-to-promise-2.2.0" = { @@ -25662,7 +26130,11 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/stream-with-known-length-to-buffer/-/stream-with-known-length-to-buffer-1.0.2.tgz"; +<<<<<<< HEAD sha512 = "UxSISjxmguvfYzZdq6d4XAjc3gAocqTIOS1CjgwkDkkGT/LMTsIYiV8agIw42IHFFHf8k4lPOoroCCf4W9oqzg=="; +======= + sha512 = "372mnjvz0khis4a797qk4zwfwacb0fq726806jzi4cc4kncy97hcj8f4h68whid774a8wi803gdq22wg2ksnp9ncggyp0k67i58h52k"; +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 }; }; "streamline-0.10.17" = { @@ -26187,6 +26659,7 @@ let sha512 = "Ts0Mu/A1S1aZxEJNG88I4Oc9rcZSBFNac5e27yh4j2mqbhZSSzR1Ah79EYwSn9Zuh7lrlGD2cVGzw1RKGzyLSg=="; }; }; +<<<<<<< HEAD "supports-color-5.1.0" = { name = "supports-color"; packageName = "supports-color"; @@ -26196,6 +26669,8 @@ let sha512 = "Ry0AwkoKjDpVKK4sV4h6o3UJmNRbjYm2uXhwfj3J56lMVdvnUNqzQVRztOOMGQ++w1K/TjNDFvpJk0F/LoeBCQ=="; }; }; +======= +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 "supports-color-5.4.0" = { name = "supports-color"; packageName = "supports-color"; @@ -26950,7 +27425,11 @@ let version = "1.1.2"; src = fetchurl { url = "https://registry.npmjs.org/torrent-piece/-/torrent-piece-1.1.2.tgz"; +<<<<<<< HEAD sha512 = "ElXPyXKKG73o+uziHJ8qlYE9EuyDVxnK2zWL+pW/2bma7RsLpSwFFIJAb8Qui7/tel2hsHQW1z3zBnfQNREpWA=="; +======= + sha512 = "1c2j49ms1vhdwrxswb79c51bmxfvgwb5v26yh422h2jr98b3gnrmffrpyazm2rmvg51jmw3xh93v0cm5agirqpczblbs6wafb4wym8j"; +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 }; }; "torrent-stream-1.0.4" = { @@ -27043,6 +27522,7 @@ let sha512 = "WI3rIGdcaKULYg7KVoB0zcjikqvcYYvcuT6D89bFPz2rVR0Rl0PK6x8/X62rtdLtBKIE985NzVf/auTtGegIIg=="; }; }; +<<<<<<< HEAD "tr46-0.0.3" = { name = "tr46"; packageName = "tr46"; @@ -27052,6 +27532,8 @@ let sha1 = "8184fd347dac9cdc185992f3a6622e14b9d9ab6a"; }; }; +======= +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 "tr46-1.0.1" = { name = "tr46"; packageName = "tr46"; @@ -28237,7 +28719,11 @@ let version = "3.2.2"; src = fetchurl { url = "https://registry.npmjs.org/ut_metadata/-/ut_metadata-3.2.2.tgz"; +<<<<<<< HEAD sha512 = "PltK6kZ85DMscFl1gwyvOyja6UGROdyLI1ufWCTLsYnLfBaMyhtOEcbtgEgOwYEz8QuchR49qgHXTdJ2H05VHA=="; +======= + sha512 = "0f5akhzfv94vmq1m8yix1cw1gqk70f11r481vf62571pjlc2rycp2dircj5i7sv4f5xqfci87lxla1vmw686xarf0n37r3w8vm4lnry"; +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 }; }; "ut_pex-1.2.1" = { @@ -28951,6 +29437,7 @@ let sha1 = "79691584d98607f5070bd3b70a40e6bb22e401eb"; }; }; +<<<<<<< HEAD "webidl-conversions-2.0.1" = { name = "webidl-conversions"; packageName = "webidl-conversions"; @@ -28960,6 +29447,8 @@ let sha1 = "3bf8258f7d318c7443c36f2e169402a1a6703506"; }; }; +======= +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 "webidl-conversions-4.0.2" = { name = "webidl-conversions"; packageName = "webidl-conversions"; @@ -29027,6 +29516,7 @@ let name = "whatwg-url"; packageName = "whatwg-url"; version = "6.4.1"; +<<<<<<< HEAD src = fetchurl { url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.4.1.tgz"; sha512 = "FwygsxsXx27x6XXuExA/ox3Ktwcbf+OAvrKmLulotDAiO1Q6ixchPFaHYsis2zZBZSJTR0+dR+JVtf7MlbqZjw=="; @@ -29039,6 +29529,11 @@ let src = fetchurl { url = "https://registry.npmjs.org/whatwg-url-compat/-/whatwg-url-compat-0.6.5.tgz"; sha1 = "00898111af689bb097541cd5a45ca6c8798445bf"; +======= + src = fetchurl { + url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.4.1.tgz"; + sha512 = "27rkflmrkzbamg28yflyisk49jl2dnvmk4651sn7hhig2rsahxj4c5ld3ljx9mjps0f6zqv0yvwl7d37w817vkmx7qnxiqp3frs030p"; +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 }; }; "when-3.4.6" = { @@ -30422,7 +30917,20 @@ in sha512 = "9OBihy+L53g9ALssKTY/vTWEiz8mGEJ1asWiCdfPdQ1Uf++tewiNrN7Fq2Eb6ZYtvK0BYvPZlh3bHguKmKO3yA=="; }; dependencies = [ +<<<<<<< HEAD sources."@types/node-8.10.20" +======= + sources."@types/caseless-0.12.1" + sources."@types/form-data-2.2.1" +<<<<<<< HEAD + sources."@types/node-8.10.18" +======= + sources."@types/node-8.10.19" +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 + sources."@types/request-2.47.0" + sources."@types/tough-cookie-2.3.3" + sources."@types/uuid-3.4.3" +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 sources."JSV-4.0.2" sources."adal-node-0.1.28" sources."ajv-5.5.2" @@ -30699,6 +31207,14 @@ in }) (sources."ms-rest-azure-2.5.7" // { dependencies = [ +<<<<<<< HEAD +======= +<<<<<<< HEAD + sources."@types/node-9.6.20" +======= + sources."@types/node-9.6.21" +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 sources."async-2.6.0" ]; }) @@ -31182,6 +31698,7 @@ in sources."base64-js-1.3.0" sources."bencode-2.0.0" sources."bitfield-0.1.0" +<<<<<<< HEAD (sources."bittorrent-dht-6.4.2" // { dependencies = [ sources."bencode-0.7.0" @@ -31192,6 +31709,10 @@ in sources."bencode-0.8.0" ]; }) +======= + sources."bittorrent-dht-6.4.2" + sources."bittorrent-tracker-7.7.0" +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 sources."blob-to-buffer-1.2.8" sources."bn.js-4.11.8" sources."bncode-0.5.3" @@ -31482,7 +32003,15 @@ in sources."through-2.3.8" sources."thunky-0.1.0" sources."time-line-1.0.1" +<<<<<<< HEAD sources."torrent-discovery-5.4.0" +======= + (sources."torrent-discovery-5.4.0" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 sources."torrent-piece-1.1.2" (sources."torrent-stream-1.0.4" // { dependencies = [ @@ -31690,7 +32219,15 @@ in sources."balanced-match-1.0.0" sources."base64-js-1.3.0" sources."bcrypt-pbkdf-1.0.1" +<<<<<<< HEAD sources."big-integer-1.6.32" +======= +<<<<<<< HEAD + sources."big-integer-1.6.30" +======= + sources."big-integer-1.6.31" +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 sources."block-stream-0.0.9" sources."bn.js-4.11.8" sources."body-parser-1.18.2" @@ -31788,7 +32325,15 @@ in ]; }) sources."cordova-registry-mapper-1.1.15" +<<<<<<< HEAD sources."cordova-serve-2.0.1" +======= + (sources."cordova-serve-2.0.1" // { + dependencies = [ + sources."shelljs-0.5.3" + ]; + }) +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 sources."core-util-is-1.0.2" sources."create-ecdh-4.0.3" sources."create-hash-1.2.0" @@ -33114,7 +33659,15 @@ in sources."assert-plus-1.0.0" sources."async-2.6.1" sources."asynckit-0.4.0" +<<<<<<< HEAD sources."aws-sdk-2.265.1" +======= +<<<<<<< HEAD + sources."aws-sdk-2.252.1" +======= + sources."aws-sdk-2.254.1" +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 sources."aws-sign2-0.7.0" sources."aws4-1.7.0" sources."base64-js-1.3.0" @@ -34438,7 +34991,15 @@ in sources."microee-0.0.6" sources."minilog-3.1.0" sources."ms-2.0.0" +<<<<<<< HEAD sources."simple-git-1.96.0" +======= +<<<<<<< HEAD + sources."simple-git-1.95.1" +======= + sources."simple-git-1.96.0" +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 sources."tabtab-git+https://github.com/mixu/node-tabtab.git" ]; buildInputs = globalBuildInputs; @@ -35613,10 +36174,24 @@ in javascript-typescript-langserver = nodeEnv.buildNodePackage { name = "javascript-typescript-langserver"; packageName = "javascript-typescript-langserver"; +<<<<<<< HEAD version = "2.10.0"; src = fetchurl { url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.10.0.tgz"; sha512 = "y8IOlo8Ml/CFuvr8pFdaMpNV43W5eZhTl5UZuRxKGxX08PSi3OZsYjr5gMYsKT5ZzMNk/U+MqZXJNh6Ccm30hQ=="; +======= +<<<<<<< HEAD + version = "2.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.9.2.tgz"; + sha512 = "01pqqc94lq3c9010wbb0zafs81b5z4mzr06864kf4vs3zih30xfral4rbk9d2q2m2kbawcym8zlj5xydgig5k40kzqy1hyhallcm5dm"; +======= + version = "2.9.3"; + src = fetchurl { + url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.9.3.tgz"; + sha512 = "0f3mqalx44w1zfhy6vl299rp18mg4s35gass533sgw7hr7dcf6vzwy3dcik1ncl0xss1bbs4vi7a3mbxhrddm7pd2r36hmpgnp29hn5"; +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 }; dependencies = [ sources."ansi-color-0.2.1" @@ -35978,10 +36553,24 @@ in json-server = nodeEnv.buildNodePackage { name = "json-server"; packageName = "json-server"; +<<<<<<< HEAD version = "0.14.0"; src = fetchurl { url = "https://registry.npmjs.org/json-server/-/json-server-0.14.0.tgz"; sha512 = "8RVRAb1TO6LlCny6+8GC+sXDsESYv7gv7fSLdVANklVt866I416/7Z5fdqrtzSru92nyreddgavbEk8pjqcWoA=="; +======= +<<<<<<< HEAD + version = "0.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/json-server/-/json-server-0.13.0.tgz"; + sha512 = "0lz3n3y62gvdiqazgqbpfb9pdxwjvrjaagzs46ihsl6h6k18d7qmcw6bxiv30jkm3b6alb6p0l48jrym12sksx23am9bmibx45jwiq2"; +======= + version = "0.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/json-server/-/json-server-0.14.0.tgz"; + sha512 = "2h1d9wf557i5nxbh5fygbgjd7vywandxnm7cpwyxnzmxqw8mvrnsmcj1m87b2zlxlpvigwq8jqc7igshb0zpfkw1bjs4fskpl0m25gi"; +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 }; dependencies = [ sources."accepts-1.3.5" @@ -37900,6 +38489,345 @@ in production = true; bypassCache = false; }; +<<<<<<< HEAD +======= + lcov-result-merger = nodeEnv.buildNodePackage { + name = "lcov-result-merger"; + packageName = "lcov-result-merger"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lcov-result-merger/-/lcov-result-merger-3.0.0.tgz"; + sha512 = "2l5nw2y7yblpyp45q06dwd1yhrd5np1q1nxm27lx7kjdjrdscry6qp5rsm04v9ccsa31ccmdl9mx4vmrp95zmbbij6p4bdbfvqzv1p9"; + }; + dependencies = [ + sources."append-buffer-1.0.2" + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.11" + sources."buffer-equal-1.0.0" + sources."clone-2.1.2" + sources."clone-buffer-1.0.0" + sources."clone-stats-1.0.0" + sources."cloneable-readable-1.1.2" + sources."concat-map-0.0.1" + sources."convert-source-map-1.5.1" + sources."core-util-is-1.0.2" + sources."define-properties-1.1.2" + sources."duplexify-3.6.0" + sources."end-of-stream-1.4.1" + sources."extend-3.0.1" + sources."flush-write-stream-1.0.3" + sources."foreach-2.0.5" + sources."fs-mkdirp-stream-1.0.0" + sources."fs.realpath-1.0.0" + sources."function-bind-1.1.1" + sources."glob-7.1.2" + sources."glob-parent-3.1.0" + sources."glob-stream-6.1.0" + sources."graceful-fs-4.1.11" + sources."has-symbols-1.0.0" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."is-absolute-1.0.0" + sources."is-buffer-1.1.6" + sources."is-extglob-2.1.1" + sources."is-glob-3.1.0" + sources."is-negated-glob-1.0.0" + sources."is-relative-1.0.0" + sources."is-unc-path-1.0.0" + sources."is-utf8-0.2.1" + sources."is-valid-glob-1.0.0" + sources."is-windows-1.0.2" + sources."isarray-1.0.0" + sources."json-stable-stringify-1.0.1" + sources."jsonify-0.0.0" + sources."lazystream-1.0.0" + sources."lead-1.0.0" + sources."minimatch-3.0.4" + sources."normalize-path-2.1.1" + sources."now-and-later-2.0.0" + sources."object-keys-1.0.11" + sources."object.assign-4.1.0" + sources."once-1.4.0" + sources."ordered-read-streams-1.0.1" + sources."path-dirname-1.0.2" + sources."path-is-absolute-1.0.1" + sources."process-nextick-args-2.0.0" + sources."pump-2.0.1" + sources."pumpify-1.5.1" + sources."readable-stream-2.3.6" + sources."remove-bom-buffer-3.0.0" + sources."remove-bom-stream-1.2.0" + sources."remove-trailing-separator-1.1.0" + sources."replace-ext-1.0.0" + sources."resolve-options-1.1.0" + 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-filter-2.0.0" + sources."to-absolute-glob-2.0.2" + sources."to-through-2.0.0" + sources."unc-path-regex-0.1.2" + sources."unique-stream-2.2.1" + sources."util-deprecate-1.0.2" + sources."value-or-function-3.0.0" + sources."vinyl-2.1.0" + sources."vinyl-fs-3.0.3" + sources."vinyl-sourcemap-1.1.0" + sources."wrappy-1.0.2" + sources."xtend-4.0.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Merges multiple lcov results into one"; + homepage = https://github.com/mweibel/lcov-result-merger; + license = "MIT"; + }; + production = true; + bypassCache = false; + }; + livedown = nodeEnv.buildNodePackage { + name = "livedown"; + packageName = "livedown"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/livedown/-/livedown-2.1.1.tgz"; + sha512 = "3pnrrz3blfy50s64c4wdj9gjl8zv3p72wd0vmrk86qjdd676g9sj4cwywp356r633csg568pczll7pfb6sxpm0x9fvbk4zhwvdpb70b"; + }; + dependencies = [ + sources."accepts-1.3.5" + sources."after-0.8.2" + sources."ajv-5.5.2" + sources."anymatch-1.3.2" + sources."argparse-1.0.10" + sources."arr-diff-2.0.0" + sources."arr-flatten-1.1.0" + sources."array-flatten-1.1.1" + sources."array-unique-0.2.1" + sources."arraybuffer.slice-0.0.7" + sources."asn1-0.2.3" + sources."assert-plus-1.0.0" + sources."async-each-1.0.1" + sources."async-limiter-1.0.0" + sources."asynckit-0.4.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.7.0" + sources."backo2-1.0.2" + sources."balanced-match-1.0.0" + sources."base64-arraybuffer-0.1.5" + sources."base64id-1.0.0" + sources."bcrypt-pbkdf-1.0.1" + sources."better-assert-1.0.2" + sources."binary-extensions-1.11.0" + sources."blob-0.0.4" + sources."body-parser-1.18.3" + sources."brace-expansion-1.1.11" + (sources."braces-1.8.5" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + sources."bytes-3.0.0" + sources."callsite-1.0.0" + sources."caseless-0.12.0" + sources."chokidar-1.7.0" + sources."co-4.6.0" + sources."combined-stream-1.0.6" + sources."component-bind-1.0.0" + sources."component-emitter-1.2.1" + sources."component-inherit-0.0.3" + sources."concat-map-0.0.1" + sources."content-disposition-0.5.2" + sources."content-type-1.0.4" + sources."cookie-0.3.1" + sources."cookie-signature-1.0.6" + sources."core-util-is-1.0.2" + sources."dashdash-1.14.1" + sources."debug-2.6.9" + sources."delayed-stream-1.0.0" + sources."depd-1.1.2" + sources."destroy-1.0.4" + sources."ecc-jsbn-0.1.1" + sources."ee-first-1.1.1" + sources."emoji-regex-6.1.1" + sources."encodeurl-1.0.2" + sources."engine.io-3.2.0" + sources."engine.io-client-3.2.1" + sources."engine.io-parser-2.1.2" + sources."entities-1.1.1" + sources."escape-html-1.0.3" + sources."etag-1.8.1" + sources."expand-brackets-0.1.5" + sources."expand-range-1.8.2" + (sources."express-4.16.3" // { + dependencies = [ + (sources."body-parser-1.18.2" // { + dependencies = [ + sources."setprototypeof-1.0.3" + ]; + }) + sources."iconv-lite-0.4.19" + sources."qs-6.5.1" + (sources."raw-body-2.3.2" // { + dependencies = [ + sources."depd-1.1.1" + sources."http-errors-1.6.2" + ]; + }) + sources."safe-buffer-5.1.1" + sources."statuses-1.4.0" + ]; + }) + sources."extend-3.0.1" + sources."extglob-0.3.2" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-1.1.0" + sources."fast-json-stable-stringify-2.0.0" + sources."filename-regex-2.0.1" + sources."fill-range-2.2.4" + sources."finalhandler-1.1.1" + sources."for-in-1.0.2" + sources."for-own-0.1.5" + sources."forever-agent-0.6.1" + sources."form-data-2.3.2" + sources."forwarded-0.1.2" + sources."fresh-0.5.2" + sources."fsevents-1.2.4" + sources."getpass-0.1.7" + sources."github-slugger-1.2.0" + sources."glob-base-0.3.0" + sources."glob-parent-2.0.0" + sources."graceful-fs-4.1.11" + sources."har-schema-2.0.0" + sources."har-validator-5.0.3" + sources."has-binary2-1.0.3" + sources."has-cors-1.1.0" + sources."html-entities-1.2.1" + sources."http-errors-1.6.3" + sources."http-signature-1.2.0" + sources."iconv-lite-0.4.23" + sources."indexof-0.0.1" + sources."inherits-2.0.3" + sources."innertext-1.0.3" + sources."ipaddr.js-1.6.0" + sources."is-binary-path-1.0.1" + sources."is-buffer-1.1.6" + sources."is-dotfile-1.0.3" + sources."is-equal-shallow-0.1.3" + sources."is-extendable-0.1.1" + sources."is-extglob-1.0.0" + sources."is-glob-2.0.1" + sources."is-number-2.1.0" + sources."is-posix-bracket-0.1.1" + sources."is-primitive-2.0.0" + sources."is-typedarray-1.0.0" + sources."is-wsl-1.1.0" + sources."isarray-1.0.0" + sources."isobject-2.1.0" + sources."isstream-0.1.2" + sources."jsbn-0.1.1" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.3.1" + sources."json-stringify-safe-5.0.1" + sources."jsprim-1.4.1" + sources."kind-of-3.2.2" + sources."linkify-it-2.0.3" + sources."markdown-it-8.4.1" + sources."markdown-it-emoji-1.4.0" + sources."markdown-it-github-headings-1.1.1" + sources."markdown-it-task-checkbox-1.0.6" + sources."math-random-1.0.1" + sources."mdurl-1.0.1" + sources."media-typer-0.3.0" + sources."merge-descriptors-1.0.1" + sources."methods-1.1.2" + sources."micromatch-2.3.11" + sources."mime-1.4.1" + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + sources."minimatch-3.0.4" + sources."minimist-1.2.0" + sources."ms-2.0.0" + sources."nan-2.10.0" + sources."negotiator-0.6.1" + sources."normalize-path-2.1.1" + sources."oauth-sign-0.8.2" + sources."object-component-0.0.3" + sources."object.omit-2.0.1" + sources."on-finished-2.3.0" + sources."opn-5.3.0" + sources."parse-glob-3.0.4" + sources."parseqs-0.0.5" + sources."parseuri-0.0.5" + sources."parseurl-1.3.2" + sources."path-is-absolute-1.0.1" + sources."path-to-regexp-0.1.7" + sources."performance-now-2.1.0" + sources."preserve-0.2.0" + sources."process-nextick-args-2.0.0" + sources."proxy-addr-2.0.3" + sources."punycode-1.4.1" + sources."qs-6.5.2" + (sources."randomatic-3.0.0" // { + dependencies = [ + sources."is-number-4.0.0" + ]; + }) + sources."range-parser-1.2.0" + sources."raw-body-2.3.3" + sources."readable-stream-2.3.6" + sources."readdirp-2.1.0" + sources."regex-cache-0.4.4" + sources."remove-trailing-separator-1.1.0" + sources."repeat-element-1.1.2" + sources."repeat-string-1.6.1" + sources."request-2.87.0" + sources."safe-buffer-5.1.2" + sources."safer-buffer-2.1.2" + sources."send-0.16.2" + sources."serve-static-1.13.2" + sources."set-immediate-shim-1.0.1" + sources."setprototypeof-1.1.0" + (sources."socket.io-2.1.1" // { + dependencies = [ + sources."debug-3.1.0" + sources."isarray-2.0.1" + ]; + }) + sources."socket.io-adapter-1.1.1" + sources."socket.io-client-2.1.1" + sources."socket.io-parser-3.2.0" + sources."sprintf-js-1.0.3" + sources."sshpk-1.14.2" + sources."statuses-1.5.0" + sources."string_decoder-1.1.1" + sources."to-array-0.1.4" + sources."tough-cookie-2.3.4" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."type-is-1.6.16" + sources."uc.micro-1.0.5" + sources."ultron-1.1.1" + sources."unpipe-1.0.0" + sources."util-deprecate-1.0.2" + sources."utils-merge-1.0.1" + sources."uuid-3.2.1" + sources."vary-1.1.2" + sources."verror-1.10.0" + sources."ws-3.3.3" + sources."xmlhttprequest-ssl-1.5.5" + sources."yeast-0.1.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Live Markdown previews for your favourite editor."; + homepage = https://github.com/shime/livedown; + license = "MIT"; + }; + production = true; + bypassCache = false; + }; +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 live-server = nodeEnv.buildNodePackage { name = "live-server"; packageName = "live-server"; @@ -38363,10 +39291,17 @@ in meguca = nodeEnv.buildNodePackage { name = "meguca"; packageName = "meguca"; +<<<<<<< HEAD version = "1.0.8"; src = fetchurl { url = "https://registry.npmjs.org/meguca/-/meguca-1.0.8.tgz"; sha512 = "6hEfEe5385DL95w4YPo68Y/DzSGo7vyw9/ckHsAMk/qO+GBcbI1pGRVkx0oJQtTdJ7mGSVc+gcVj09sj9auTQg=="; +======= + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/meguca/-/meguca-1.0.5.tgz"; + sha512 = "0lilvxbsrwlmavh8g991m709w8p58h6rcq63izh7l6lsindvbq2w5lrk19ifb8ynqycfyhc7kh67yvkfw42p44i48skk316vjz9k8ry"; +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 }; dependencies = [ (sources."@gulp-sourcemaps/identity-map-1.0.2" // { @@ -38444,6 +39379,14 @@ in sources."buffer-equal-1.0.0" sources."cache-base-1.0.1" sources."camelcase-1.2.1" +<<<<<<< HEAD +======= +<<<<<<< HEAD + sources."caniuse-lite-1.0.30000850" +======= + sources."caniuse-lite-1.0.30000851" +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 sources."caseless-0.12.0" sources."center-align-0.1.3" sources."chalk-1.1.3" @@ -39368,7 +40311,11 @@ in version = "3.7.0"; src = fetchurl { url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.7.0.tgz"; +<<<<<<< HEAD sha512 = "qDQE/Ft9xXP6zphwx4sD0t+VhwV7yFaloMpfbL2QnnDZcyaiakWlLdtFGGQfTAwpFHdpbRhRxVhIHN1OKAjgbg=="; +======= + sha512 = "1pf02189vfiqj2qqm8ihvb9fwa2j32c3xj1hifv5njlasm24rrxjw4yj2ynqpyal2jmdj3v0n3rbpyj0f5wfw4qrvx77ibxbgy08d58"; +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 }; dependencies = [ sources."abbrev-1.1.1" @@ -39384,7 +40331,14 @@ in sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.1" sources."block-stream-0.0.9" +<<<<<<< HEAD sources."boom-2.10.1" +======= +<<<<<<< HEAD +======= + sources."boom-2.10.1" +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 sources."brace-expansion-1.1.11" sources."caseless-0.12.0" sources."co-4.6.0" @@ -39393,12 +40347,20 @@ in sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" +<<<<<<< HEAD sources."cryptiles-2.0.5" (sources."dashdash-1.14.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) +======= +<<<<<<< HEAD +======= + sources."cryptiles-2.0.5" +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 + sources."dashdash-1.14.1" +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."ecc-jsbn-0.1.1" @@ -39419,9 +40381,19 @@ in sources."har-schema-1.0.5" sources."har-validator-4.2.1" sources."has-unicode-2.0.1" +<<<<<<< HEAD sources."hawk-3.1.3" sources."hoek-2.16.3" sources."http-signature-1.1.1" +======= +<<<<<<< HEAD + sources."http-signature-1.2.0" +======= + sources."hawk-3.1.3" + sources."hoek-2.16.3" + sources."http-signature-1.1.1" +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 sources."inflight-1.0.6" sources."inherits-2.0.3" sources."is-fullwidth-code-point-1.0.0" @@ -39459,19 +40431,37 @@ in sources."punycode-1.4.1" sources."qs-6.4.0" sources."readable-stream-2.3.6" +<<<<<<< HEAD sources."request-2.81.0" +======= +<<<<<<< HEAD + sources."request-2.87.0" +======= + sources."request-2.81.0" +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 sources."rimraf-2.6.2" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."semver-5.3.0" sources."set-blocking-2.0.0" sources."signal-exit-3.0.2" +<<<<<<< HEAD +======= +<<<<<<< HEAD + sources."sshpk-1.14.2" +======= +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 sources."sntp-1.0.9" (sources."sshpk-1.14.2" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) +<<<<<<< HEAD +======= +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 sources."string-width-1.0.2" sources."string_decoder-1.1.1" sources."stringstream-0.0.6" @@ -39544,8 +40534,21 @@ in sources."balanced-match-1.0.0" sources."base64-js-0.0.8" sources."bcrypt-pbkdf-1.0.1" +<<<<<<< HEAD sources."biased-opener-0.2.8" sources."big-integer-1.6.32" +======= + (sources."biased-opener-0.2.8" // { + dependencies = [ + sources."yargs-1.3.3" + ]; + }) +<<<<<<< HEAD + sources."big-integer-1.6.30" +======= + sources."big-integer-1.6.31" +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 sources."block-stream-0.0.9" sources."body-parser-1.18.2" sources."boom-2.10.1" @@ -40536,6 +41539,23 @@ in sources."clone-1.0.4" ]; }) +<<<<<<< HEAD +======= + (sources."node-red-node-feedparser-0.1.12" // { + dependencies = [ + sources."addressparser-1.0.1" + ]; + }) + sources."node-red-node-rbe-0.2.3" +<<<<<<< HEAD + sources."node-red-node-twitter-0.1.15" +======= + sources."node-red-node-twitter-1.0.1" +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 + sources."nodemailer-1.11.0" + sources."nodemailer-direct-transport-1.1.0" + sources."nodemailer-smtp-transport-1.1.0" +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 sources."nodemailer-wellknown-0.1.10" sources."nopt-4.0.1" sources."npmlog-4.1.2" @@ -40768,11 +41788,19 @@ in sources."qs-0.5.1" sources."rai-0.1.12" sources."range-parser-0.0.4" +<<<<<<< HEAD (sources."raw-socket-1.6.2" // { dependencies = [ sources."nan-2.10.0" ]; }) +======= +<<<<<<< HEAD + sources."raw-socket-1.6.1" +======= + sources."raw-socket-1.6.2" +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 sources."redis-0.7.3" sources."semver-1.1.0" sources."send-0.1.0" @@ -41660,7 +42688,11 @@ in version = "0.39.0"; src = fetchurl { url = "https://registry.npmjs.org/peerflix/-/peerflix-0.39.0.tgz"; +<<<<<<< HEAD sha512 = "spB+D+GXdM9JcPeWG8bpnWTxfXr/KwyyZ0OjNlpyw62ffxlCsbNhwaSmhXDpDC3wh4HuQejdYc1DlU+zTXL+WA=="; +======= + sha512 = "1cgwwjdnd7rahydc7fyhhgfh63z0b8cx5q8b9m4q5hv7ca235zrzbf3f9d3d8s3cyr0qazzg9yz2r4xx731p5ppf14wyx4pw47px45j"; +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 }; dependencies = [ sources."addr-to-ip-port-1.4.3" @@ -41679,6 +42711,7 @@ in sources."balanced-match-1.0.0" sources."base64-js-0.0.8" sources."bencode-2.0.0" +<<<<<<< HEAD sources."big-integer-1.6.32" sources."bitfield-0.1.0" (sources."bittorrent-dht-6.4.2" // { @@ -41691,6 +42724,16 @@ in sources."bencode-0.8.0" ]; }) +======= +<<<<<<< HEAD + sources."big-integer-1.6.30" +======= + sources."big-integer-1.6.31" +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 + sources."bitfield-0.1.0" + sources."bittorrent-dht-6.4.2" + sources."bittorrent-tracker-7.7.0" +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 sources."blob-to-buffer-1.2.8" sources."bn.js-4.11.8" sources."bncode-0.5.3" @@ -41714,8 +42757,13 @@ in sources."cli-width-2.2.0" sources."clivas-0.2.0" sources."code-point-at-1.1.0" +<<<<<<< HEAD sources."color-convert-1.9.2" sources."color-name-1.1.1" +======= + sources."color-convert-1.9.1" + sources."color-name-1.1.3" +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 sources."compact2string-1.4.0" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" @@ -41855,6 +42903,7 @@ in sources."plist-1.2.0" sources."process-nextick-args-2.0.0" sources."pump-2.0.1" +<<<<<<< HEAD (sources."random-access-file-2.0.1" // { dependencies = [ sources."minimist-0.0.8" @@ -41862,6 +42911,10 @@ in ]; }) sources."random-access-storage-1.3.0" +======= + sources."random-access-file-2.0.1" + sources."random-access-storage-1.2.0" +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 sources."random-iterate-1.0.1" sources."randombytes-2.0.6" sources."range-parser-1.2.0" @@ -41915,7 +42968,19 @@ in sources."through-2.3.8" sources."thunky-1.0.2" sources."tmp-0.0.33" +<<<<<<< HEAD sources."torrent-discovery-5.4.0" +======= + (sources."torrent-discovery-5.4.0" // { + dependencies = [ + sources."bencode-0.8.0" + sources."isarray-1.0.0" + sources."minimist-1.2.0" + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" + ]; + }) +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 sources."torrent-piece-1.1.2" (sources."torrent-stream-1.0.4" // { dependencies = [ @@ -42470,10 +43535,24 @@ in prettier = nodeEnv.buildNodePackage { name = "prettier"; packageName = "prettier"; +<<<<<<< HEAD version = "1.13.7"; src = fetchurl { url = "https://registry.npmjs.org/prettier/-/prettier-1.13.7.tgz"; sha512 = "KIU72UmYPGk4MujZGYMFwinB7lOf2LsDNGSOC8ufevsrPLISrZbNJlWstRi3m0AMuszbH+EFSQ/r6w56RSPK6w=="; +======= +<<<<<<< HEAD + version = "1.13.4"; + src = fetchurl { + url = "https://registry.npmjs.org/prettier/-/prettier-1.13.4.tgz"; + sha512 = "325wxdf3kzhwx8wnfz13gnllivgbgsbwqfqmq3pv29gamzzwspajfjwz7iw83fxlzf3nyd038h4qv9y544v5b5fjvsh52n0crkh8svs"; +======= + version = "1.13.5"; + src = fetchurl { + url = "https://registry.npmjs.org/prettier/-/prettier-1.13.5.tgz"; + sha512 = "1zp1phxpbbli50hpbka36wdqkhl4sz765zxb1xzkgmkmfmh1vpbbwcm91pllv4q633wj8v4iipkm09wn7gwvqb0gy8srkybzfcp9kz0"; +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 }; buildInputs = globalBuildInputs; meta = { @@ -42490,7 +43569,11 @@ in version = "12.3.0"; src = fetchurl { url = "https://registry.npmjs.org/pulp/-/pulp-12.3.0.tgz"; +<<<<<<< HEAD sha512 = "Sm1XQg2h2JBVHWK3bxSHnmMdMoM0hEi5cbGfBBLpM6E2qU1vjJhDJsO/8bEkxC2RvNAAEOWROKMI3tTzmVxLbQ=="; +======= + sha512 = "1nlnp4rygadw253728ya400s2y92bf44jqz3gy34r1ri33g9nlkd89kx49097xif6wli11lhcr1sqwyhwa6zdv23mar1n511m15fvaa"; +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 }; dependencies = [ sources."JSONStream-1.3.3" @@ -43536,10 +44619,24 @@ in serve = nodeEnv.buildNodePackage { name = "serve"; packageName = "serve"; +<<<<<<< HEAD version = "9.1.0"; src = fetchurl { url = "https://registry.npmjs.org/serve/-/serve-9.1.0.tgz"; sha512 = "6PXXiYbBz4IN0JZUY6GsEmOfb5EA64vXkldffYf9O4xbL+oRVQN4Gdhqpi5Kjpw5tlQP9z1mKhGh4Ysk4y2TUw=="; +======= +<<<<<<< HEAD + version = "8.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/serve/-/serve-8.1.1.tgz"; + sha512 = "33362hcr3ya4yadf2vzck9w8ihh58g025y2ngrj7c461h2jbazi1ddrp4qi8d82y5781rkrihahas2y3pcskipx75n2mghs2mhs98dx"; +======= + version = "8.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/serve/-/serve-8.1.2.tgz"; + sha512 = "1n065fkglc79qiaj96c6aiz3rcmc8fw6vv58xpq4fw8k4cawyzpryhmpxa5433j2b0ska9jw66z4rpcbf8nq633y04wsg7xf01fzvm1"; +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 }; dependencies = [ sources."@zeit/schemas-1.2.0" @@ -45016,10 +46113,24 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; +<<<<<<< HEAD version = "1.4.26"; src = fetchurl { url = "https://registry.npmjs.org/ungit/-/ungit-1.4.26.tgz"; sha512 = "hA1Sr7zi6v+RhcJVC4cOySorCh21+Xdw627ewEkLlRXIWVjUnwdj8cEr0gj6apL7E+lqso3NwhZS/GliMyeL2g=="; +======= +<<<<<<< HEAD + version = "1.4.24"; + src = fetchurl { + url = "https://registry.npmjs.org/ungit/-/ungit-1.4.24.tgz"; + sha512 = "1lx5m5bkm4m64qiy8ccnbixchng112m2b9qvzd963k8f0nb298hfjrry1c2la1bavv834zdvgv2xwa93fdyaq0wrv562p9d0n1p5lxy"; +======= + version = "1.4.25"; + src = fetchurl { + url = "https://registry.npmjs.org/ungit/-/ungit-1.4.25.tgz"; + sha512 = "2f8fb42a03zpqd715d09k2g39zwb8xwq7qjh6zrw543kn3g66mq0s8civhv9b4frai8phpqdxlhyd7dbvw4ykhbyfmfq3x220svvvxf"; +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 }; dependencies = [ sources."abbrev-1.1.1" @@ -45922,12 +47033,45 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; +<<<<<<< HEAD version = "4.13.0"; +======= +<<<<<<< HEAD + version = "4.11.1"; +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 src = fetchurl { url = "https://registry.npmjs.org/webpack/-/webpack-4.13.0.tgz"; sha512 = "3KMX0uPjJ4cXjl9V/AY+goRQPs7jtKRQn3hhNOG6s8Sx3mmGCQUjQJvjVoGNABVo5svgujIcSLBN8g62EzqIMA=="; }; dependencies = [ +<<<<<<< HEAD +======= + sources."@webassemblyjs/ast-1.5.10" + sources."@webassemblyjs/floating-point-hex-parser-1.5.10" + sources."@webassemblyjs/helper-api-error-1.5.10" + sources."@webassemblyjs/helper-buffer-1.5.10" + sources."@webassemblyjs/helper-code-frame-1.5.10" + sources."@webassemblyjs/helper-fsm-1.5.10" + sources."@webassemblyjs/helper-module-context-1.5.10" + sources."@webassemblyjs/helper-wasm-bytecode-1.5.10" + sources."@webassemblyjs/helper-wasm-section-1.5.10" + sources."@webassemblyjs/ieee754-1.5.10" + sources."@webassemblyjs/leb128-1.5.10" + sources."@webassemblyjs/utf8-1.5.10" + sources."@webassemblyjs/wasm-edit-1.5.10" + sources."@webassemblyjs/wasm-gen-1.5.10" + sources."@webassemblyjs/wasm-opt-1.5.10" + sources."@webassemblyjs/wasm-parser-1.5.10" + sources."@webassemblyjs/wast-parser-1.5.10" + sources."@webassemblyjs/wast-printer-1.5.10" +======= + version = "4.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack/-/webpack-4.12.0.tgz"; + sha512 = "0krki7h1xk4hrlwkqnsb0cqd8ah1qlgmcippf0w3wxg3brqx5dzm2xw96y3fix89mphbcbg5z346nkilpdnijcndk9kmdk0z0azd60h"; + }; + dependencies = [ +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 sources."@webassemblyjs/ast-1.5.12" sources."@webassemblyjs/floating-point-hex-parser-1.5.12" sources."@webassemblyjs/helper-api-error-1.5.12" @@ -45946,7 +47090,12 @@ in sources."@webassemblyjs/wasm-parser-1.5.12" sources."@webassemblyjs/wast-parser-1.5.12" sources."@webassemblyjs/wast-printer-1.5.12" +<<<<<<< HEAD sources."acorn-5.7.1" +======= +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 + sources."acorn-5.6.2" +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 sources."acorn-dynamic-import-3.0.0" sources."ajv-6.5.1" sources."ajv-keywords-3.2.0" @@ -46139,7 +47288,15 @@ in sources."isarray-1.0.0" sources."isobject-3.0.1" sources."json-parse-better-errors-1.0.2" +<<<<<<< HEAD sources."json-schema-traverse-0.4.1" +======= +<<<<<<< HEAD + sources."json-schema-traverse-0.3.1" +======= + sources."json-schema-traverse-0.4.1" +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 sources."json5-0.5.1" sources."kind-of-6.0.2" sources."leb-0.3.0" @@ -46315,7 +47472,11 @@ in }) sources."to-regex-3.0.2" sources."to-regex-range-2.1.1" +<<<<<<< HEAD sources."tslib-1.9.3" +======= + sources."tslib-1.9.2" +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 sources."tty-browserify-0.0.0" sources."typedarray-0.0.6" (sources."uglify-es-3.3.10" // { @@ -46385,7 +47546,11 @@ in version = "1.12.3"; src = fetchurl { url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-1.12.3.tgz"; +<<<<<<< HEAD sha512 = "NnBAGkD64CRsl9edM9q0QU+ku6nCX32nM0U+YC8Gs/36c8y+5m9Tya3mWIux3oZKZ54yGiVtnok4tUpqDE5tMA=="; +======= + sha512 = "0q6skhcd95baf49krnja6ijkrklm1nyn65mirmdr59nzrmyrirzmzdk0qpn0gj56fkpspy2m6xs8ks1nkd377fpjxn29q7s80d40w1n"; +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 }; dependencies = [ sources."addr-to-ip-port-1.4.3" @@ -46406,6 +47571,7 @@ in ]; }) sources."bittorrent-peerid-1.2.0" +<<<<<<< HEAD (sources."bittorrent-protocol-2.4.2" // { dependencies = [ sources."debug-3.1.0" @@ -46417,6 +47583,10 @@ in sources."simple-get-3.0.2" ]; }) +======= + sources."bittorrent-protocol-2.4.2" + sources."bittorrent-tracker-9.9.1" +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 sources."bl-1.2.2" sources."blob-to-buffer-1.2.8" sources."block-stream2-1.1.0" @@ -46651,11 +47821,15 @@ in sources."upnp-device-client-1.0.2" sources."upnp-mediarenderer-client-1.2.4" sources."url-join-2.0.5" +<<<<<<< HEAD (sources."ut_metadata-3.2.2" // { dependencies = [ sources."debug-3.1.0" ]; }) +======= + sources."ut_metadata-3.2.2" +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 sources."ut_pex-1.2.1" sources."util-deprecate-1.0.2" (sources."videostream-2.4.2" // { @@ -46701,7 +47875,15 @@ in dependencies = [ sources."@cliqz-oss/firefox-client-0.3.1" sources."@cliqz-oss/node-firefox-connect-1.2.1" +<<<<<<< HEAD sources."@types/node-10.5.0" +======= +<<<<<<< HEAD + sources."@types/node-10.3.1" +======= + sources."@types/node-10.3.2" +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 sources."JSONSelect-0.2.1" sources."abbrev-1.1.1" sources."acorn-5.7.1" @@ -46969,11 +48151,15 @@ in sources."es6-symbol-3.1.1" sources."es6-weak-map-2.0.2" sources."escape-string-regexp-1.0.5" +<<<<<<< HEAD (sources."escodegen-1.10.0" // { dependencies = [ sources."source-map-0.6.1" ]; }) +======= + sources."escodegen-1.10.0" +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 sources."escope-3.6.0" (sources."eslint-4.19.1" // { dependencies = [ diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix index 9bea5ebfe96..813221e8ad7 100644 --- a/pkgs/development/node-packages/node-packages-v8.nix +++ b/pkgs/development/node-packages/node-packages-v8.nix @@ -49,13 +49,32 @@ let sha1 = "cbc4b9a68981bf0b501ccd06a9058acd65309bf7"; }; }; +<<<<<<< HEAD "@types/node-10.5.0" = { +======= +<<<<<<< HEAD + "@types/node-10.3.1" = { +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 name = "_at_types_slash_node"; packageName = "@types/node"; version = "10.5.0"; src = fetchurl { +<<<<<<< HEAD url = "https://registry.npmjs.org/@types/node/-/node-10.5.0.tgz"; sha512 = "baXPuqA7EVcBUpA5so2K26DTzk7NCWBc9xrPMu9PbUMwgusJRm9zJBPhiDmJVEcnTQ3aOxUZeuFHpd9qMYDNRg=="; +======= + url = "https://registry.npmjs.org/@types/node/-/node-10.3.1.tgz"; + sha512 = "0xqz0wlddb3vi0mmlncn1ypd7sa2zv3fcq58jk7nr0xdsrwwzn9ncdq784lvg8d2k7lzq1p2kjyak5nghq0imbdj8hrmk6365lgvi92"; +======= + "@types/node-10.3.2" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "10.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-10.3.2.tgz"; + sha512 = "3w50bh9i0rl27vnrn4mmwjphccfaybj74ydfymjmq46p8dfllfwm37lgxqjrx0mp6hrdia5hllbwnpsx2a4wwwck9hh9dkp798c9mzl"; +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 }; }; "@types/superagent-3.5.6" = { @@ -688,6 +707,11 @@ let sha1 = "090700c4ba28862a8520ef378395fdee5f61c229"; }; }; +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 "boom-2.10.1" = { name = "boom"; packageName = "boom"; @@ -697,6 +721,10 @@ let sha1 = "39c8918ceff5799f83f9492a848f625add0c766f"; }; }; +<<<<<<< HEAD +======= +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 "boxen-1.3.0" = { name = "boxen"; packageName = "boxen"; @@ -1489,6 +1517,11 @@ let sha1 = "88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"; }; }; +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 "cryptiles-2.0.5" = { name = "cryptiles"; packageName = "cryptiles"; @@ -1498,6 +1531,10 @@ let sha1 = "3bdfecdc608147c1c67202fa291e7dca59eaa3b8"; }; }; +<<<<<<< HEAD +======= +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 "crypto-random-string-1.0.0" = { name = "crypto-random-string"; packageName = "crypto-random-string"; @@ -3037,6 +3074,11 @@ let sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f"; }; }; +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 "hawk-3.1.3" = { name = "hawk"; packageName = "hawk"; @@ -3046,6 +3088,10 @@ let sha1 = "078444bd7c1640b0fe540d2c9b73d59678e8e1c4"; }; }; +<<<<<<< HEAD +======= +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 "he-1.1.1" = { name = "he"; packageName = "he"; @@ -3055,6 +3101,11 @@ let sha1 = "93410fd21b009735151f8868c2f271f3427e23fd"; }; }; +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 "hoek-2.16.3" = { name = "hoek"; packageName = "hoek"; @@ -3064,6 +3115,10 @@ let sha1 = "20bb7403d3cea398e91dc4710a8ff1b8274a25ed"; }; }; +<<<<<<< HEAD +======= +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 "http-errors-1.6.3" = { name = "http-errors"; packageName = "http-errors"; @@ -3187,7 +3242,11 @@ let version = "1.1.12"; src = fetchurl { url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.12.tgz"; +<<<<<<< HEAD sha512 = "GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA=="; +======= + sha512 = "0nf551idk1p8slbvd2jvzdh9hkm5z2dpv0b3jh1wgkab3mbi33vimdwiivrymvaqk7ba3by6rg9bn5xsdiqi24cn9vr5yjq6kw8y2qs"; +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 }; }; "ignore-by-default-1.0.1" = { @@ -5899,6 +5958,25 @@ let sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; }; }; +<<<<<<< HEAD + "request-2.81.0" = { + name = "request"; + packageName = "request"; + version = "2.81.0"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.81.0.tgz"; + sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0"; + }; + }; +======= +<<<<<<< HEAD +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 + "request-2.87.0" = { + name = "request"; + packageName = "request"; + version = "2.87.0"; + src = fetchurl { +======= "request-2.81.0" = { name = "request"; packageName = "request"; @@ -5913,6 +5991,7 @@ let packageName = "request"; version = "2.87.0"; src = fetchurl { +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 url = "https://registry.npmjs.org/request/-/request-2.87.0.tgz"; sha512 = "fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw=="; }; @@ -6349,6 +6428,18 @@ let sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198"; }; }; +<<<<<<< HEAD +======= + "sntp-1.0.9" = { + name = "sntp"; + packageName = "sntp"; + version = "1.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"; + sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198"; + }; + }; +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 "sodium-javascript-0.5.5" = { name = "sodium-javascript"; packageName = "sodium-javascript"; @@ -6673,6 +6764,15 @@ let sha512 = "87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA=="; }; }; + "stringstream-0.0.6" = { + name = "stringstream"; + packageName = "stringstream"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/stringstream/-/stringstream-0.0.6.tgz"; + sha512 = "22fa8nryyacyx538az1iir54hqsfb46m6jycmqvfpylmg025xdn1wng94ay1rg69m4s3lv0cf2qnxvzffvm5s74q5fb108y14289cgk"; + }; + }; "strip-ansi-3.0.1" = { name = "strip-ansi"; packageName = "strip-ansi"; @@ -7767,8 +7867,21 @@ in sources."@cycle/http-14.9.0" sources."@cycle/isolate-3.3.0" sources."@cycle/run-3.4.0" +<<<<<<< HEAD sources."@cycle/time-0.10.1" sources."@types/node-10.5.0" +======= + (sources."@cycle/time-0.10.1" // { + dependencies = [ + sources."chalk-1.1.3" + ]; + }) +<<<<<<< HEAD + sources."@types/node-10.3.1" +======= + sources."@types/node-10.3.2" +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 sources."@types/superagent-3.5.6" sources."ansi-escapes-3.1.0" sources."ansi-regex-2.1.1" @@ -8412,7 +8525,11 @@ in version = "3.7.0"; src = fetchurl { url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.7.0.tgz"; +<<<<<<< HEAD sha512 = "qDQE/Ft9xXP6zphwx4sD0t+VhwV7yFaloMpfbL2QnnDZcyaiakWlLdtFGGQfTAwpFHdpbRhRxVhIHN1OKAjgbg=="; +======= + sha512 = "1pf02189vfiqj2qqm8ihvb9fwa2j32c3xj1hifv5njlasm24rrxjw4yj2ynqpyal2jmdj3v0n3rbpyj0f5wfw4qrvx77ibxbgy08d58"; +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 }; dependencies = [ sources."abbrev-1.1.1" @@ -8428,7 +8545,14 @@ in sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.1" sources."block-stream-0.0.9" +<<<<<<< HEAD sources."boom-2.10.1" +======= +<<<<<<< HEAD +======= + sources."boom-2.10.1" +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 sources."brace-expansion-1.1.11" sources."caseless-0.12.0" sources."co-4.6.0" @@ -8437,12 +8561,20 @@ in sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" +<<<<<<< HEAD sources."cryptiles-2.0.5" (sources."dashdash-1.14.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) +======= +<<<<<<< HEAD +======= + sources."cryptiles-2.0.5" +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 + sources."dashdash-1.14.1" +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."ecc-jsbn-0.1.1" @@ -8463,9 +8595,19 @@ in sources."har-schema-1.0.5" sources."har-validator-4.2.1" sources."has-unicode-2.0.1" +<<<<<<< HEAD sources."hawk-3.1.3" sources."hoek-2.16.3" sources."http-signature-1.1.1" +======= +<<<<<<< HEAD + sources."http-signature-1.2.0" +======= + sources."hawk-3.1.3" + sources."hoek-2.16.3" + sources."http-signature-1.1.1" +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 sources."inflight-1.0.6" sources."inherits-2.0.3" sources."is-fullwidth-code-point-1.0.0" @@ -8503,19 +8645,37 @@ in sources."punycode-1.4.1" sources."qs-6.4.0" sources."readable-stream-2.3.6" +<<<<<<< HEAD sources."request-2.81.0" +======= +<<<<<<< HEAD + sources."request-2.87.0" +======= + sources."request-2.81.0" +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 sources."rimraf-2.6.2" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."semver-5.3.0" sources."set-blocking-2.0.0" sources."signal-exit-3.0.2" +<<<<<<< HEAD +======= +<<<<<<< HEAD + sources."sshpk-1.14.2" +======= +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 sources."sntp-1.0.9" (sources."sshpk-1.14.2" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) +<<<<<<< HEAD +======= +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +>>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 sources."string-width-1.0.2" sources."string_decoder-1.1.1" sources."stringstream-0.0.6" From c4bff754a792f4ce3aa710f836289f0badaa6bdb Mon Sep 17 00:00:00 2001 From: Okina Matara Date: Mon, 11 Jun 2018 02:53:17 -0500 Subject: [PATCH 05/56] easyjson: 2018-03-23 -> 2018-06-06 --- pkgs/development/tools/easyjson/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/easyjson/default.nix b/pkgs/development/tools/easyjson/default.nix index 9277ebe363f..253f5b374d3 100644 --- a/pkgs/development/tools/easyjson/default.nix +++ b/pkgs/development/tools/easyjson/default.nix @@ -3,15 +3,15 @@ buildGoPackage rec { name = "easyjson-unstable-${version}"; - version = "2018-03-23"; - rev = "8b799c424f57fa123fc63a99d6383bc6e4c02578"; + version = "2018-06-06"; + rev = "3fdea8d05856a0c8df22ed4bc71b3219245e4485"; goPackagePath = "github.com/mailru/easyjson"; src = fetchgit { inherit rev; url = "https://github.com/mailru/easyjson"; - sha256 = "15ba6drfmw98lzw5qjh3ijcxh9iz9rcp3hid169yfd08l06z05w0"; + sha256 = "0g3crph77yhv4ipdnwqc32z4cp87ahi4ikad5kyy6q4znnxliz74"; }; goDeps = ./deps.nix; From 8ca6c4d47df556c1cab2248d56236f83d4cd88cc Mon Sep 17 00:00:00 2001 From: Okina Matara Date: Mon, 11 Jun 2018 12:44:48 -0500 Subject: [PATCH 06/56] nodePackages: meguca: 1.0.5 -> 1.0.7 --- .../node-packages/node-packages-v6.nix | 68 +++++++++++++++++++ .../node-packages/node-packages-v8.nix | 16 +++++ 2 files changed, 84 insertions(+) diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index aa31c6b141b..8aaa7a4d831 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -24324,6 +24324,7 @@ let sha1 = "935d240cdfe0f5805307fdfe967d88942a2cbcf0"; }; }; +<<<<<<< HEAD "serve-handler-3.2.1" = { name = "serve-handler"; packageName = "serve-handler"; @@ -24331,6 +24332,15 @@ let src = fetchurl { url = "https://registry.npmjs.org/serve-handler/-/serve-handler-3.2.1.tgz"; sha512 = "4UYBO6zH61m5YUD54lJ1A8POOPmOOhBdNXJgy5/plzoOBcIluUJgmsayeI4af+QeUNPa5G5e609ycWTpJmKo2Q=="; +======= + "serve-handler-3.1.1" = { + name = "serve-handler"; + packageName = "serve-handler"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/serve-handler/-/serve-handler-3.1.1.tgz"; + sha512 = "32qab4isx4xhvmqqllr6i3n69zgdzjqyff5wdll8d5wj6mv6v24vx1hbqx7hk0v35jnj4s896fi8cnrbcc85mf4z8xmhpbs2p9nrhp8"; +>>>>>>> nodePackages: meguca: 1.0.5 -> 1.0.7 }; }; "serve-index-1.7.3" = { @@ -28422,7 +28432,11 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/unordered-set/-/unordered-set-2.0.1.tgz"; +<<<<<<< HEAD sha512 = "eUmNTPzdx+q/WvOHW0bgGYLWvWHNT3PTKEQLg0MAQhc0AHASHVHoP/9YytYd4RBVariqno/mEUhVZN98CmD7bg=="; +======= + sha512 = "1pgnq0agkgn8ma827k8z7map1m5a4713pbcln7z7zl5278jf00385s2011q62s4539p6kydc6yxd0hrw135p1zkbazymiyxzi68sjbr"; +>>>>>>> nodePackages: meguca: 1.0.5 -> 1.0.7 }; }; "unorm-1.4.1" = { @@ -29353,7 +29367,11 @@ let version = "3.8.2"; src = fetchurl { url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.8.2.tgz"; +<<<<<<< HEAD sha512 = "2RMkyt1O1czGPCnkjKZWSio2D8oh3XlQ4zi4W2xL8q2Dvi4hB3/DEt+wYyzo4hmE2ZFP0RB8PXyzHyed7p1hbw=="; +======= + sha512 = "1pn37gfklkizcvw7my11lagj7cq86g2x0n67c6z2b1py1r15sz87bgj9dn5pf1qwd87kp91r87kcajaask8rr197k3crmafvp5284yr"; +>>>>>>> nodePackages: meguca: 1.0.5 -> 1.0.7 }; }; "vscode-uri-1.0.3" = { @@ -33009,6 +33027,11 @@ in }) sources."pump-1.0.3" sources."random-access-memory-3.0.0" +<<<<<<< HEAD +======= + sources."unordered-set-2.0.1" + sources."varint-5.0.0" +>>>>>>> nodePackages: meguca: 1.0.5 -> 1.0.7 ]; }) sources."dat-registry-4.0.0" @@ -36249,8 +36272,18 @@ in sources."type-detect-4.0.8" sources."typescript-2.8.3" sources."vscode-jsonrpc-3.6.2" +<<<<<<< HEAD sources."vscode-languageserver-4.2.1" sources."vscode-languageserver-protocol-3.8.1" +======= + (sources."vscode-languageserver-3.5.1" // { + dependencies = [ + sources."vscode-jsonrpc-3.5.0" + sources."vscode-languageserver-types-3.5.0" + ]; + }) + sources."vscode-languageserver-protocol-3.5.1" +>>>>>>> nodePackages: meguca: 1.0.5 -> 1.0.7 sources."vscode-languageserver-types-3.8.2" sources."vscode-uri-1.0.5" sources."wrappy-1.0.2" @@ -39291,6 +39324,7 @@ in meguca = nodeEnv.buildNodePackage { name = "meguca"; packageName = "meguca"; +<<<<<<< HEAD <<<<<<< HEAD version = "1.0.8"; src = fetchurl { @@ -39302,6 +39336,12 @@ in url = "https://registry.npmjs.org/meguca/-/meguca-1.0.5.tgz"; sha512 = "0lilvxbsrwlmavh8g991m709w8p58h6rcq63izh7l6lsindvbq2w5lrk19ifb8ynqycfyhc7kh67yvkfw42p44i48skk316vjz9k8ry"; >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +======= + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/meguca/-/meguca-1.0.7.tgz"; + sha512 = "0wj7z2361ijiw98jp6x7xa5z3nn2fk2q1w8bgcw7j4fdw6fyp4hidfkqrcs5zkg7mribwfz22nyh6l08gv04b6r8srqjkrxy9b9ff6y"; +>>>>>>> nodePackages: meguca: 1.0.5 -> 1.0.7 }; dependencies = [ (sources."@gulp-sourcemaps/identity-map-1.0.2" // { @@ -44619,12 +44659,15 @@ in serve = nodeEnv.buildNodePackage { name = "serve"; packageName = "serve"; +<<<<<<< HEAD <<<<<<< HEAD version = "9.1.0"; src = fetchurl { url = "https://registry.npmjs.org/serve/-/serve-9.1.0.tgz"; sha512 = "6PXXiYbBz4IN0JZUY6GsEmOfb5EA64vXkldffYf9O4xbL+oRVQN4Gdhqpi5Kjpw5tlQP9z1mKhGh4Ysk4y2TUw=="; ======= +======= +>>>>>>> nodePackages: meguca: 1.0.5 -> 1.0.7 <<<<<<< HEAD version = "8.1.1"; src = fetchurl { @@ -44636,13 +44679,25 @@ in url = "https://registry.npmjs.org/serve/-/serve-8.1.2.tgz"; sha512 = "1n065fkglc79qiaj96c6aiz3rcmc8fw6vv58xpq4fw8k4cawyzpryhmpxa5433j2b0ska9jw66z4rpcbf8nq633y04wsg7xf01fzvm1"; >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +<<<<<<< HEAD >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +======= +======= + version = "8.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/serve/-/serve-8.1.3.tgz"; + sha512 = "0cxicqbyqwpvfdsskdggc87mj4y789fv0b469dz3ynl8897dhwwwcc1p5f219c9wha1gxpx9qw61qlgpzk66kffrngvil054fv3laif"; +>>>>>>> nodePackages: meguca: 1.0.5 -> 1.0.7 +>>>>>>> nodePackages: meguca: 1.0.5 -> 1.0.7 }; dependencies = [ sources."@zeit/schemas-1.2.0" sources."ajv-6.5.1" +<<<<<<< HEAD sources."ansi-align-2.0.0" sources."ansi-regex-3.0.0" +======= +>>>>>>> nodePackages: meguca: 1.0.5 -> 1.0.7 sources."ansi-styles-3.2.1" sources."arch-2.1.1" sources."arg-2.0.0" @@ -44678,11 +44733,16 @@ in sources."glob-slasher-1.0.1" sources."has-flag-3.0.0" sources."ini-1.3.5" +<<<<<<< HEAD sources."is-fullwidth-code-point-2.0.0" sources."is-stream-1.1.0" sources."isexe-2.0.0" sources."json-schema-traverse-0.4.1" sources."lodash-4.17.10" +======= + sources."json-schema-traverse-0.4.1" + sources."lodash-2.4.2" +>>>>>>> nodePackages: meguca: 1.0.5 -> 1.0.7 sources."lodash._objecttypes-2.4.1" sources."lodash.isobject-2.4.1" sources."lru-cache-4.1.3" @@ -44701,6 +44761,7 @@ in sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" sources."safe-buffer-5.1.2" +<<<<<<< HEAD sources."serve-handler-3.2.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" @@ -44708,6 +44769,13 @@ in sources."string-width-2.1.1" sources."strip-ansi-4.0.0" sources."strip-eof-1.0.0" +======= + (sources."serve-handler-3.1.1" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) +>>>>>>> nodePackages: meguca: 1.0.5 -> 1.0.7 sources."strip-json-comments-2.0.1" sources."supports-color-5.4.0" sources."term-size-1.2.0" diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix index 813221e8ad7..f85a62492a2 100644 --- a/pkgs/development/node-packages/node-packages-v8.nix +++ b/pkgs/development/node-packages/node-packages-v8.nix @@ -7355,7 +7355,11 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/unordered-set/-/unordered-set-2.0.1.tgz"; +<<<<<<< HEAD sha512 = "eUmNTPzdx+q/WvOHW0bgGYLWvWHNT3PTKEQLg0MAQhc0AHASHVHoP/9YytYd4RBVariqno/mEUhVZN98CmD7bg=="; +======= + sha512 = "1pgnq0agkgn8ma827k8z7map1m5a4713pbcln7z7zl5278jf00385s2011q62s4539p6kydc6yxd0hrw135p1zkbazymiyxzi68sjbr"; +>>>>>>> nodePackages: meguca: 1.0.5 -> 1.0.7 }; }; "unpipe-1.0.0" = { @@ -8116,6 +8120,11 @@ in }) sources."pump-1.0.3" sources."random-access-memory-3.0.0" +<<<<<<< HEAD +======= + sources."unordered-set-2.0.1" + sources."varint-5.0.0" +>>>>>>> nodePackages: meguca: 1.0.5 -> 1.0.7 ]; }) sources."dat-registry-4.0.0" @@ -8811,10 +8820,17 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; +<<<<<<< HEAD version = "2.7.0"; src = fetchurl { url = "https://registry.npmjs.org/pnpm/-/pnpm-2.7.0.tgz"; sha1 = "cfaf3889c04125abfa20117358d7bcec72902faf"; +======= + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pnpm/-/pnpm-2.4.0.tgz"; + sha1 = "54c27537e831f91d5afe63320a5aa2df597efe84"; +>>>>>>> nodePackages: meguca: 1.0.5 -> 1.0.7 }; buildInputs = globalBuildInputs; meta = { From 901e6755dcbe144ccdb9e31f5c4c84e019567c30 Mon Sep 17 00:00:00 2001 From: Okina Matara Date: Mon, 11 Jun 2018 12:48:06 -0500 Subject: [PATCH 07/56] meguca: 2018-06-10 -> 2018-06-11 --- pkgs/servers/meguca/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/meguca/default.nix b/pkgs/servers/meguca/default.nix index 05666074181..c6d97b17fb9 100644 --- a/pkgs/servers/meguca/default.nix +++ b/pkgs/servers/meguca/default.nix @@ -3,8 +3,8 @@ buildGoPackage rec { name = "meguca-unstable-${version}"; - version = "2018-06-10"; - rev = "e2f97faf10fd3dd672f9b80d220079bfad1c045c"; + version = "2018-06-11"; + rev = "0c10e89fade68da414a574b5b0fa2f0dba432ea8"; goPackagePath = "github.com/bakape/meguca"; goDeps = ./server_deps.nix; enableParallelBuilding = true; @@ -14,7 +14,7 @@ buildGoPackage rec { src = fetchgit { inherit rev; url = "https://github.com/bakape/meguca"; - sha256 = "1blj970kdvasgxxwca6idvzl6ha29g9fvqwxgy00j7hk37hzkkzf"; + sha256 = "1nw0hfa0ikbk8d5rsj3fbdwhzwnxjqkw8ypswd0hyw8nwsaxyyq8"; fetchSubmodules = true; }; From d4d9812b2def52e068c55c8676699cf0d6e7d317 Mon Sep 17 00:00:00 2001 From: Okina Matara Date: Thu, 21 Jun 2018 15:38:17 -0500 Subject: [PATCH 08/56] meguca: 2018-06-11 -> 2018-06-21 --- pkgs/servers/meguca/default.nix | 24 +++++++++++++++--------- pkgs/servers/meguca/server_deps.nix | 20 ++++++++++---------- 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/pkgs/servers/meguca/default.nix b/pkgs/servers/meguca/default.nix index c6d97b17fb9..206b279a7f1 100644 --- a/pkgs/servers/meguca/default.nix +++ b/pkgs/servers/meguca/default.nix @@ -1,23 +1,29 @@ -{ stdenv, buildGoPackage, fetchgit, pkgconfig, ffmpeg-full, graphicsmagick, ghostscript, quicktemplate, - go-bindata, easyjson, nodePackages, cmake, emscripten }: +{ stdenv, buildGoPackage, fetchgit, pkgconfig, ffmpeg-full, graphicsmagick +, ghostscript, quicktemplate, go-bindata, easyjson, nodePackages, cmake +, emscripten }: buildGoPackage rec { name = "meguca-unstable-${version}"; - version = "2018-06-11"; - rev = "0c10e89fade68da414a574b5b0fa2f0dba432ea8"; + version = "2018-06-21"; + rev = "a60b75afd10ca99ce05a362ffeb586a1ece3d41d"; goPackagePath = "github.com/bakape/meguca"; goDeps = ./server_deps.nix; - enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ ffmpeg-full graphicsmagick ghostscript quicktemplate go-bindata easyjson emscripten ]; src = fetchgit { inherit rev; url = "https://github.com/bakape/meguca"; - sha256 = "1nw0hfa0ikbk8d5rsj3fbdwhzwnxjqkw8ypswd0hyw8nwsaxyyq8"; + sha256 = "0dh168j4lfn7rk64difdq3mxcp82j8h799pvpkz40h4sw2l81qc9"; fetchSubmodules = true; }; + enableParallelBuilding = true; + nativeBuildInputs = [ pkgconfig cmake ]; + + buildInputs = [ + ffmpeg-full graphicsmagick ghostscript quicktemplate go-bindata easyjson + emscripten + ]; + buildPhase = '' export HOME=$PWD export GOPATH=$GOPATH:$HOME/go/src/github.com/bakape/meguca/go @@ -38,7 +44,7 @@ buildGoPackage rec { meta = with stdenv.lib; { homepage = "https://github.com/bakape/meguca"; - description = "Anonymous realtime imageboard focused on high performance, free speech and transparent moderation"; + description = "High performance anonymous realtime imageboard"; license = licenses.agpl3Plus; maintainers = with maintainers; [ chiiruno ]; platforms = platforms.all; diff --git a/pkgs/servers/meguca/server_deps.nix b/pkgs/servers/meguca/server_deps.nix index d6785061ba3..af4ea727acd 100644 --- a/pkgs/servers/meguca/server_deps.nix +++ b/pkgs/servers/meguca/server_deps.nix @@ -14,8 +14,8 @@ fetch = { type = "git"; url = "https://github.com/Masterminds/squirrel"; - rev = "40ef4f86bf59a996c348a9f56ddb4c4d3d49a6df"; - sha256 = "1zdv8hds2skqz9xrybf1pw5hfxzd27c35fsrfq11ryif1wxwbkyp"; + rev = "b127ed9be03443fe3c0877e391130e3dd3f3107a"; + sha256 = "04vgwm5g5486188656hiw1x56mrkv27s5g2s8mc1lz7z1ig5g5bg"; }; } { @@ -50,8 +50,8 @@ fetch = { type = "git"; url = "https://github.com/bakape/thumbnailer"; - rev = "bb51d30d3f3379cd17f4f2a43d1a7caf0d92b497"; - sha256 = "0rgyfi14v17acz56hm9j0dzk0kx8k6jfjcwjzvr7b04bahw09zc4"; + rev = "cd096c6823fae426b69921662bcfaf142e395d05"; + sha256 = "1xd1g36s3a0ynaxg4gf49r40ri9y154dlkd40dcpkhj6q294s02k"; }; } { @@ -230,8 +230,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "8ac0e0d97ce45cd83d1d7243c060cb8461dda5e9"; - sha256 = "0vg0dfpv1wgj5imlakpma763yfd67aqbiy0fcklq3cw46qmfbzf1"; + rev = "a49355c7e3f8fe157a85be2f77e6e269a0f89602"; + sha256 = "020q1laxjx5kcmnqy4wmdb63zhb0lyq6wpy40axhswzg2nd21s44"; }; } { @@ -239,8 +239,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "7c1e4f34a39c8bf93b6a3379e4ffb3b118ecc614"; - sha256 = "1jcf4xhbw9zxzhx4w3z9i0bsgb8n59sfrs628a2xsd805b8zlw0r"; + rev = "ad87a3a340fa7f3bed189293fbfa7a9b7e021ae1"; + sha256 = "0d38dpn3cl3h0ksxdnkwk2z3rsjwihqzd4ggwrnwmj405zgv1ar9"; }; } { @@ -248,8 +248,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "5c1cf69b5978e5a34c5f9ba09a83e56acc4b7877"; - sha256 = "03br8p1sb1ffr02l8hyrgcyib7ms0z06wy3v4r1dj2l6q4ghwzfs"; + rev = "5cec4b58c438bd98288aeb248bab2c1840713d21"; + sha256 = "19iyz2nppicvwap5lv796sbzd82glk2jn4yn5w6z6zymwnykfzds"; }; } { From 6f96f5549c116ac8dbb27d758bbf92955b7e94d3 Mon Sep 17 00:00:00 2001 From: Okina Matara Date: Thu, 21 Jun 2018 15:39:11 -0500 Subject: [PATCH 09/56] nodePackages: meguca: 1.0.7 update --- .../node-packages/node-packages-v6.nix | 1470 ++++++++++++----- .../node-packages/node-packages-v8.nix | 186 ++- 2 files changed, 1269 insertions(+), 387 deletions(-) diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index 8aaa7a4d831..5a229b0da16 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -100,13 +100,18 @@ let version = "7.0.4"; src = fetchurl { url = "https://registry.npmjs.org/@types/babel-types/-/babel-types-7.0.4.tgz"; +<<<<<<< HEAD sha512 = "WiZhq3SVJHFRgRYLXvpf65XnV6ipVHhnNaNvE8yCimejrGglkg38kEj0JcizqwSHxmPSjcTlig/6JouxLGEhGw=="; +======= + sha512 = "0dj2q9cn65jdyhgibjw93fjcg38f15bng42bx28j3y0v4i5d2na6rwahb616vx36mkphm59m1byg5gbbzx5w2qnh58p294mfjmn29js"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "@types/babylon-6.16.3" = { name = "_at_types_slash_babylon"; packageName = "@types/babylon"; version = "6.16.3"; +<<<<<<< HEAD src = fetchurl { url = "https://registry.npmjs.org/@types/babylon/-/babylon-6.16.3.tgz"; sha512 = "lyJ8sW1PbY3uwuvpOBZ9zMYKshMnQpXmeDHh8dj9j2nJm/xrW0FgB5gLSYOArj5X0IfaXnmhFoJnhS4KbqIMug=="; @@ -128,21 +133,23 @@ let name = "_at_types_slash_form-data"; packageName = "@types/form-data"; version = "2.2.1"; +======= +>>>>>>> nodePackages: meguca: 1.0.7 update src = fetchurl { - url = "https://registry.npmjs.org/@types/form-data/-/form-data-2.2.1.tgz"; - sha512 = "2fv2qaz90rp6ib2s45ix0p3a4bd6yl6k94k1kkhw7w4s2aa5mqc6chppkf6pfvsz1l6phh7y0xswyfyzjgny7qzascch8c7ws20a0r4"; + url = "https://registry.npmjs.org/@types/babylon/-/babylon-6.16.3.tgz"; + sha512 = "2x0r8kf18p8arw22shpjpnshz85fgmfh21lj2wq0xh42nvbzjdwjscgzpcg3q9ig3k9ahi72fr0mincglb3isgbqbp8svagdnqpq8lp"; + }; + }; + "@types/node-10.3.5" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "10.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-10.3.5.tgz"; + sha512 = "239crslw8yfvmbk5ibh5sh4fhf97j5kls7qgnacm818j6a067ywdiaab0ridjiqm1f1r5nbdip2i1ryjzfn96h6jyh3pp8qvmj70m7a"; }; }; <<<<<<< HEAD - "@types/node-10.3.1" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "10.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.3.1.tgz"; - sha512 = "0xqz0wlddb3vi0mmlncn1ypd7sa2zv3fcq58jk7nr0xdsrwwzn9ncdq784lvg8d2k7lzq1p2kjyak5nghq0imbdj8hrmk6365lgvi92"; - }; - }; "@types/node-8.10.18" = { >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 name = "_at_types_slash_node"; @@ -390,6 +397,17 @@ let url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.5.10.tgz"; sha512 = "3qwkz89g5fgn3hwbm7fb4v0zdgq2vr8nb98cg4w0r5za21xry06m8yzwka5j6h9qxz2qqxy019mfxxga03c0g8v8lw5fkf4d4kdk34z"; ======= +======= + "@types/node-8.10.20" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "8.10.20"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-8.10.20.tgz"; + sha512 = "2191b3qs3mj790giz1hdz9nklp2nhvh15gab5yk0la4mb20ir8g0yxdaq7qmp68c8q5s90nnnqkqq8aj85qpqd80fpg14zmj3xprg1k"; + }; + }; +>>>>>>> nodePackages: meguca: 1.0.7 update "@webassemblyjs/ast-1.5.12" = { name = "_at_webassemblyjs_slash_ast"; packageName = "@webassemblyjs/ast"; @@ -550,8 +568,11 @@ let src = fetchurl { url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.5.12.tgz"; sha512 = "225rq38m20syf9hgmw0mcfx5pgxknjrpw69c99267320cj3byqn07yiqbjagmq4x6yw5c1kp5ylawaqk49bjyjzjzr005i4wx6m2psw"; +<<<<<<< HEAD >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +======= +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "@zeit/schemas-1.2.0" = { @@ -758,7 +779,11 @@ let version = "5.7.1"; src = fetchurl { url = "https://registry.npmjs.org/acorn/-/acorn-5.7.1.tgz"; +<<<<<<< HEAD sha512 = "d+nbxBUGKg7Arpsvbnlq61mc12ek3EY8EQldM3GPAhWJ1UVxC6TDGbIvUMNU6obBX3i1+ptCIzV4vq0gFPEGVQ=="; +======= + sha512 = "1ahdw8l42nvwy1m4d19pymmg1gw31paak1m0bxj371s82vi8paqj582ixqk6p8924y4dp54czbrqngbd9wnwbwvmv00wah62p2dpsbp"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "acorn-dynamic-import-3.0.0" = { @@ -803,7 +828,11 @@ let version = "4.1.1"; src = fetchurl { url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-4.1.1.tgz"; +<<<<<<< HEAD sha512 = "JY+iV6r+cO21KtntVvFkD+iqjtdpRUpGqKWgfkCdZq1R+kbreEl8EcdcJR4SmiIgsIQT33s6QzheQ9a275Q8xw=="; +======= + sha512 = "33kr57gnvb46piq8cx7ppqkhjq208ls28g2ap6725y4jy7b8vx53bb6km07x855m134lib9sy7ams0gckqmdvfr5asysw7ym9bs53r5"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "acorn-node-1.5.2" = { @@ -812,7 +841,11 @@ let version = "1.5.2"; src = fetchurl { url = "https://registry.npmjs.org/acorn-node/-/acorn-node-1.5.2.tgz"; +<<<<<<< HEAD sha512 = "krFKvw/d1F17AN3XZbybIUzEY4YEPNiGo05AfP3dBlfVKrMHETKpgjpuZkSF8qDNt9UkQcqj7am8yJLseklCMg=="; +======= + sha512 = "0r44jbsxj9cig59xniwlh94snvwv87jhm26cvishalk4487ncmdamq6vpypqh2flf3dhg04hriw8k11kfy6bmyx01xmvm6x1yzlmccj"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "active-x-obfuscator-0.0.1" = { @@ -1023,8 +1056,6 @@ let }; }; "ajv-6.5.0" = { -<<<<<<< HEAD -======= name = "ajv"; packageName = "ajv"; version = "6.5.0"; @@ -1043,7 +1074,6 @@ let }; }; "ajv-6.5.1" = { ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 name = "ajv"; packageName = "ajv"; version = "6.5.1"; @@ -1947,6 +1977,7 @@ let sha1 = "102c9e9e9005d3e7e3829bf0c4fa24ee862ee9b9"; }; }; +<<<<<<< HEAD "astral-regex-1.0.0" = { name = "astral-regex"; packageName = "astral-regex"; @@ -1956,6 +1987,8 @@ let sha512 = "+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg=="; }; }; +======= +>>>>>>> nodePackages: meguca: 1.0.7 update "async-0.1.22" = { name = "async"; packageName = "async"; @@ -2133,7 +2166,11 @@ let version = "1.2.1"; src = fetchurl { url = "https://registry.npmjs.org/auto-bind/-/auto-bind-1.2.1.tgz"; +<<<<<<< HEAD sha512 = "/W9yj1yKmBLwpexwAujeD9YHwYmRuWFGV8HWE7smQab797VeHa4/cnE2NFeDhA+E+5e/OGBI8763EhLjfZ/MXA=="; +======= + sha512 = "1fcr7vxwc915dxyyd460f5zjzxq83w4hdbk8dkif8zsw7aynpvzp9j14sxi7mn1ax363fcii70hgmhgvvl04w7clpq1564abj7p4vzx"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "aws-sdk-1.18.0" = { @@ -2145,6 +2182,7 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; +<<<<<<< HEAD <<<<<<< HEAD "aws-sdk-2.265.1" = { ======= @@ -2171,6 +2209,15 @@ let sha512 = "3xii67fvbmza2v2asza89vxqkpqv2lksnf95qxpp4fh881kqrrbvxf2pvdmfv1y1ci7za60jabjsfzfvhyrj4f11k8v454qn8mnp25z"; >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +======= + "aws-sdk-2.263.1" = { + name = "aws-sdk"; + packageName = "aws-sdk"; + version = "2.263.1"; + src = fetchurl { + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.263.1.tgz"; + sha512 = "26brcpdb67335ifyh935bslqvq3idyvpix1c61sn0j1lk7alk16k8klwbkbfz5dpfqyyhmzl3b3jg91hp68xwd7c9ghxg88nnkk48zy"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "aws-sign-0.2.0" = { @@ -2503,7 +2550,11 @@ let version = "0.10.7"; src = fetchurl { url = "https://registry.npmjs.org/azure-asm-website/-/azure-asm-website-0.10.7.tgz"; +<<<<<<< HEAD sha512 = "h3OmXKKOLd4sbf4khrxqGTjspjqpKduKN9EWgEoIeNhMY+PVKrVEIMr3ZyKzmmy/8123MD+ip67wMqUKSTLtUA=="; +======= + sha512 = "18fscj91ajk5w5flyi3yc5pbprvyv4snci6gxya412baanmwdilrn3q115805ni6y5dnad97akfqf0rday8c97ydlndwbcfl9facww7"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "azure-batch-3.2.2" = { @@ -2512,7 +2563,11 @@ let version = "3.2.2"; src = fetchurl { url = "https://registry.npmjs.org/azure-batch/-/azure-batch-3.2.2.tgz"; +<<<<<<< HEAD sha512 = "IM5nUITXMgTFTF4avRxsz/oLcMXLSZEzpukulRRpO1emXBI4EgSIr0++hUo+AZ94MINE2C4DXgCDiQ9P0suYXw=="; +======= + sha512 = "1grijyj9w7qk0q0bq1jxn24hcq7i7q17r58bgjgmy4084iq29facmrvd4a9abp9lqrr2jfbqmq0pyngdhfbs6jy9k2h8cnphi86gki0"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "azure-common-0.9.20" = { @@ -2557,7 +2612,11 @@ let version = "0.10.6"; src = fetchurl { url = "https://registry.npmjs.org/azure-monitoring/-/azure-monitoring-0.10.6.tgz"; +<<<<<<< HEAD sha512 = "6HNA8VuC5qYvQMjcQt2/zlB7oyAJ7n6KGIYGstS6KS9Orux0peqxlrGPDeQRa4jDNq6ili83KiGc7RhWcgsE4Q=="; +======= + sha512 = "3hh82vjaqcfv71158vjz5m2mqvc723b27j0v3xijsqym9blxjp4wbr9pbab41l63257xvh942ipnl6fpzfl5p6880psdrl2bgql0wz8"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "azure-servicefabric-0.1.5" = { @@ -3073,6 +3132,7 @@ let sha1 = "159a49b9a9714c1fb102f2e0ed1906fab6a450f4"; }; }; +<<<<<<< HEAD <<<<<<< HEAD "big-integer-1.6.32" = { ======= @@ -3090,6 +3150,8 @@ let url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.30.tgz"; sha512 = "0mpq1fin33p53fjgylmnrc0g51raqmprdpkm51vkl2na7mar5a778mlnwv6wrj98fjcx30wijf0zms9l88ibprn36z39jpw9zpcaq1c"; ======= +======= +>>>>>>> nodePackages: meguca: 1.0.7 update "big-integer-1.6.31" = { name = "big-integer"; packageName = "big-integer"; @@ -3097,8 +3159,11 @@ let src = fetchurl { url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.31.tgz"; sha512 = "047nkbj5b46cnqrz6rpjcqnzqmrcrk88wc60g74fla91ib7njxbddvm90fv3pfdcwv5pj8jrs7avvvqll6mmjzyijkk5i7hf4sdjdll"; +<<<<<<< HEAD >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +======= +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "big.js-3.2.0" = { @@ -3736,7 +3801,11 @@ let version = "1.11.3"; src = fetchurl { url = "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.3.tgz"; +<<<<<<< HEAD sha512 = "exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ=="; +======= + sha512 = "1slq1pnm0b2903am1rl17iczlsl08sq4rckkr5fgkchgzfac13kiibwdk08yy2m62lgir8dmj9d61vil8q0vrm1d2mzw1qn2vaf443v"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "browser-stdout-1.3.1" = { @@ -4478,6 +4547,7 @@ let }; }; <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD "caniuse-lite-1.0.30000850" = { @@ -4489,13 +4559,15 @@ let sha512 = "109fg3d4qqzsnn1jmrjih7nhddicpkxsyhq60dhx3s6g2rgcfjas5n56h4xfncqq0j3vrbn3w0x35dhlq2cxh4khsfpq8kz8kqvhwl8"; ======= "caniuse-lite-1.0.30000851" = { +======= + "caniuse-lite-1.0.30000856" = { +>>>>>>> nodePackages: meguca: 1.0.7 update name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30000851"; + version = "1.0.30000856"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000851.tgz"; - sha512 = "22km2mq3dj2lhwfj1rp4ws5iqb6v5x70fpm19sz8d2j1x6awzi2diwg280w1nvpffv6z9ijgyhyj3q7wxyvgg3qpqs0ixqbaw1rqmv3"; ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000856.tgz"; + sha512 = "0m12939p8vav2l33cmfxzvxyi8blq88j20p52pc5n9mb2ci558k2gqgdx8gjqppvlx4100khqc85lmafbs1zvm1r6k0fca719q9hyf7"; }; }; >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 @@ -4829,7 +4901,11 @@ let version = "2.0.4"; src = fetchurl { url = "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz"; +<<<<<<< HEAD sha512 = "z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ=="; +======= + sha512 = "1fwj48gbgxg51bp9x3jdpypyv7214pqf7hbbgl2xsycy2pxslkavglqcmk355mbjw6ik2nya68aplkjwb80wvy8mh4z4fkbvz5gpnfg"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "chownr-0.0.2" = { @@ -5481,7 +5557,11 @@ let version = "1.9.2"; src = fetchurl { url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.2.tgz"; +<<<<<<< HEAD sha512 = "3NUJZdhMhcdPn8vJ9v2UQJoH0qqoGUkYTgFEPZaPjEtwmmKUfNV46zZmgB2M5M4DCEQHMaCfWHCxiBflLm04Tg=="; +======= + sha512 = "173hv9fwlbqicbhb2gs0c878h407kp4ihfq0rinxdwdaz4lcad70jwciyb3si019qc4j6d8mb90g6j0jkyzdjfbkx7wg1acv1jhkmfw"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "color-name-1.1.1" = { @@ -6571,7 +6651,11 @@ let version = "2.2.4"; src = fetchurl { url = "https://registry.npmjs.org/cordova-common/-/cordova-common-2.2.4.tgz"; +<<<<<<< HEAD sha512 = "tL6cfygm2EUU658Id4ROs/BFETvxFKX1gj8rxoXOWR1xxzPtXfgvjiqmMBsUIbBgIZomsq09Xj48qkU7xHBJ1Q=="; +======= + sha512 = "3aljw647d2slg1ybqysvci6k8hn1c112hdk19iaiqpzhpgd6g3p27arrs2wcarzhbssa57i7c8lbw5k9s27f24zxca4bn1651zrrgml"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "cordova-create-1.1.2" = { @@ -6592,6 +6676,7 @@ let sha1 = "4986d0779b36eb239822c2ab413a47ff9f097fea"; }; }; +<<<<<<< HEAD "cordova-js-4.2.4" = { name = "cordova-js"; packageName = "cordova-js"; @@ -6599,6 +6684,15 @@ let src = fetchurl { url = "https://registry.npmjs.org/cordova-js/-/cordova-js-4.2.4.tgz"; sha512 = "Qy0O3w/gwbIqIJzlyCy60nPwJlF1c74ELpsfDIGXB92/uST5nQSSUDVDP4UOfb/c6OU7yPqxhCWOGROyTYKPDw=="; +======= + "cordova-js-4.2.3" = { + name = "cordova-js"; + packageName = "cordova-js"; + version = "4.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/cordova-js/-/cordova-js-4.2.3.tgz"; + sha512 = "2f1zm6j1vbhvmpzrmb5k1mg76r9f0dgvx0cdp476w38xg6azlkxr8mvardwkcsz56wdaf84w9cmni23cih09hiwnngjb393zgjmrwgv"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "cordova-lib-8.0.0" = { @@ -6630,6 +6724,7 @@ let sha512 = "3v0v93cf8mhli9ai6lzjx7ch43npl08m18i1yx0kaqql23m0s0yf13vbfy4rch9h7rhyjzacjrjwbbbxizjlflcwrc0k2djjw7payfx"; }; }; +<<<<<<< HEAD "core-js-1.2.7" = { name = "core-js"; packageName = "core-js"; @@ -6640,6 +6735,8 @@ let sha512 = "3Xl1D5eyiQlY5ow6Kn/say0us2TqSw/zgQmyTLxbewTngQZ1CIqxmqD7EFGoCNBrB4HsdPmpiSpFCitybKQN9g=="; }; }; +======= +>>>>>>> nodePackages: meguca: 1.0.7 update "core-js-2.5.7" = { name = "core-js"; packageName = "core-js"; @@ -7279,7 +7376,11 @@ let version = "3.0.1"; src = fetchurl { url = "https://registry.npmjs.org/dat-dns/-/dat-dns-3.0.1.tgz"; +<<<<<<< HEAD sha512 = "OBolbMJNk7Uknw8po7Yv4XGNewH6VbuPQNrcf57EwtvgR8ScNUBDporU+DiCXYh2F7GwOcsCyVkSb++guR+OoA=="; +======= + sha512 = "2h8w7xrl3pny4jrr41cnfdhn4bpd22xh8wgim4alr1l0dcwqi3y1ny2qjg7zp6s827vnmgs05xqswg15yva6a8gkwjbb4sdq9n2a6iq"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "dat-doctor-1.4.0" = { @@ -7333,7 +7434,11 @@ let version = "2.2.0"; src = fetchurl { url = "https://registry.npmjs.org/dat-link-resolve/-/dat-link-resolve-2.2.0.tgz"; +<<<<<<< HEAD sha512 = "cu6Fwapm34myc5um6jdQBrtDkjx28oVkOVHbaV4YNLdxrRqUm+FlWuIqFk7zaCZDoZg5TMlCG1SF0j3AFbiOYA=="; +======= + sha512 = "1h8xf0mq0yx51al3d1cjk1rk2hl69k8yd71cap2b9jy36wl3anp3drl31g6knsi75j8bwkn7j947fq6a0vym9lvffr8kpv6mb0qbvkj"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "dat-log-1.1.1" = { @@ -8404,7 +8509,11 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/dom4/-/dom4-2.1.0.tgz"; +<<<<<<< HEAD sha512 = "18oT+LfQaOT46/HmdB+t8A3+ROaN/sY/P0C9i0PyasmeuDq+iThh09gpI8rmt2ZA5B6KuHpuW2qURAZMjNs+gg=="; +======= + sha512 = "213xnwc9h34953abdp7mf4a3vj40rmpwv526afqsdhki2dy7aw9xjbay91qpga07wzwdzldwr2gw3ghmlgp9rpixgwf8s6hnzw17jnp"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "domain-browser-1.1.7" = { @@ -8749,6 +8858,18 @@ let sha1 = "cc872c168880ae3c7189762fd5ffc00896c9518a"; }; }; +<<<<<<< HEAD +======= + "electron-to-chromium-1.3.50" = { + name = "electron-to-chromium"; + packageName = "electron-to-chromium"; + version = "1.3.50"; + src = fetchurl { + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.50.tgz"; + sha1 = "7438b76f92b41b919f3fbdd350fbd0757dacddf7"; + }; + }; +>>>>>>> nodePackages: meguca: 1.0.7 update "elegant-spinner-1.0.1" = { name = "elegant-spinner"; packageName = "elegant-spinner"; @@ -9107,7 +9228,11 @@ let version = "1.3.2"; src = fetchurl { url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz"; +<<<<<<< HEAD sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; +======= + sha512 = "3igrl2amb9mpa9d2z6qghz3ljqd7amjla8ahfs5fdgl0w52pw6gz3y32q5fk229yvfyg3x9kpfygadcm2w0lv4hv4nj25cyd8v4glgd"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "errorhandler-1.4.3" = { @@ -9399,7 +9524,11 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.0.tgz"; +<<<<<<< HEAD sha512 = "1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA=="; +======= + sha512 = "186fc0lsj71wnsj93jkz7j2qimqa2q99aphbdln914135x99s6njz59n6pdfpyfyy6jxq8awkscm1sp0yglf9sw5i2cs9dv71698vnl"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "eslint-visitor-keys-1.0.0" = { @@ -9429,6 +9558,15 @@ let sha512 = "kapdTCt1bjmspxStVKX6huolXVV5ZfyZguY1lcfhVVZstce3bqxH9mcLzNn3/mlgW6wQ732+0fuG9v7h0ZQoKg=="; }; }; + "espree-4.0.0" = { + name = "espree"; + packageName = "espree"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/espree/-/espree-4.0.0.tgz"; + sha512 = "0m2i56iw7zgd1pvs6z7vvqhmidn0sgyyzcwq2v7yr3sqvmpqysnqmjmw73radg6haczqrbramfjbsl6zajm9b8llyn3jvkm5d65vali"; + }; + }; "esprima-1.0.4" = { name = "esprima"; packageName = "esprima"; @@ -10443,7 +10581,11 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/filenamify/-/filenamify-2.1.0.tgz"; +<<<<<<< HEAD sha512 = "ICw7NTT6RsDp2rnYKVd8Fu4cr6ITzGy3+u4vUujPkabyaz+03F24NWEX7fs5fp+kBonlaqPH8fAO2NM+SXt/JA=="; +======= + sha512 = "0j7yys97v9xh3phy73s6sp5i43a97vy77xys5v16nw5vp5l7xmz59lirzl54bzfzavnrk0klapirvhngibjkn5rvblw0ips6hsknb10"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "filestream-4.1.3" = { @@ -11433,7 +11575,11 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/get-assigned-identifiers/-/get-assigned-identifiers-1.2.0.tgz"; +<<<<<<< HEAD sha512 = "mBBwmeGTrxEMO4pMaaf/uUEFHnYtwr8FTe8Y/mer4rcV/bye0qGm6pw1bGZFGStxC5O76c5ZAVBGnqHmOaJpdQ=="; +======= + sha512 = "1snk8irwshrwijh05cwxsdvjc5p2aqr8mk6qdcwxaka3llypkyibdz2mdkzw67g9l2vzhidfqg0ahdrzyknjk4a7c613bwkw6cp044q"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "get-browser-rtc-1.0.2" = { @@ -11911,7 +12057,11 @@ let version = "11.7.0"; src = fetchurl { url = "https://registry.npmjs.org/globals/-/globals-11.7.0.tgz"; +<<<<<<< HEAD sha512 = "K8BNSPySfeShBQXsahYB/AbbWruVOTyVpgoIDnl8odPpeSfP2J5QO2oLFFdl2j7GfDCtZj2bMKar2T49itTPCg=="; +======= + sha512 = "05czm4a7lzdkax662dksrmd61yccgnscmbi82va7d89xn6g4xwyklx1giwhw20alsakqfcmpdddn1pw04b6mv050nhy8zcjzi44vh1b"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "globals-9.18.0" = { @@ -12145,7 +12295,20 @@ let version = "3.5.0"; src = fetchurl { url = "https://registry.npmjs.org/gulp-less/-/gulp-less-3.5.0.tgz"; +<<<<<<< HEAD sha512 = "FQLY7unaHdTOXG0jlwxeBQcWoPPrTMQZRA7HfYwSNi9IPVx5l7GJEN72mG4ri2yigp/f/VNGUAJnFMJHBmH3iw=="; +======= + sha512 = "25zfq868z118rq2a1357zfzky1a4v4b5dp9ixny224v35vrbhylhbrn2a67viqf8hcw8k7byfh1c1q5bq69f8vdbk7d87fsx7pdh0hm"; + }; + }; + "gulp-rename-1.3.0" = { + name = "gulp-rename"; + packageName = "gulp-rename"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/gulp-rename/-/gulp-rename-1.3.0.tgz"; + sha512 = "05f4r6zj2kx8ym90hpgsm51dfnz4c1aj585cw0wbj61jflza31wj4llqkfdndzvffbdn2swvczhnr4pncw4bkh5y0cl52zxpw3rjjww"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "gulp-sourcemaps-2.6.4" = { @@ -12505,7 +12668,11 @@ let version = "1.1.4"; src = fetchurl { url = "https://registry.npmjs.org/hash.js/-/hash.js-1.1.4.tgz"; +<<<<<<< HEAD sha512 = "A6RlQvvZEtFS5fLU43IDu0QUmBy+fDO9VMdTXvufKwIkt/rFfvICAViCax5fbDO4zdNzaC3/27ZhKUok5bAJyw=="; +======= + sha512 = "35hkc754i52jqdnvgzjss3ksg6vhcvcbwg6p0jq041g4zn5zavj80ibkzxmwly7ajyk6z5y3jc18i5v0drf7m7jwm9d24nrzd16b903"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "hasha-2.2.0" = { @@ -13039,6 +13206,7 @@ let sha512 = "PH5GBkXqFxw5+4eKaKRIkD23y6vRd/IXSl7IldyJxEXpDH9SEIXRORkBtkGni/ae2P7RVOw6Wxypd2tGXhha1w=="; }; }; +<<<<<<< HEAD "hypercore-6.17.1" = { name = "hypercore"; packageName = "hypercore"; @@ -13055,6 +13223,15 @@ let src = fetchurl { url = "https://registry.npmjs.org/hypercore-crypto/-/hypercore-crypto-1.0.0.tgz"; sha512 = "xFwOnNlOt8L+SovC7dTNchKaNYJb5l8rKZZwpWQnCme1r7CU4Hlhp1RDqPES6b0OpS7DkTo9iU0GltQGkpsjMw=="; +======= + "hypercore-6.16.0" = { + name = "hypercore"; + packageName = "hypercore"; + version = "6.16.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hypercore/-/hypercore-6.16.0.tgz"; + sha512 = "15d7rbcm182fhq2z27vlg7mz3fvs8qjzw6s3vnm7pmvs46pz33qdm2rqs78nr5lw0wkhglyw7h2izj1l4sa3g8khww8syvdqk4mdbdh"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "hypercore-protocol-6.6.4" = { @@ -13072,7 +13249,11 @@ let version = "9.14.0"; src = fetchurl { url = "https://registry.npmjs.org/hyperdrive/-/hyperdrive-9.14.0.tgz"; +<<<<<<< HEAD sha512 = "LTgbsJ+9ZrdQfLaXXc01kQMttaicHhSOtUM3v/k7ORwXJziqQ2eMQ80+8Tfg67ja+w6zrdl5HYOK+mnlwQpCww=="; +======= + sha512 = "31l42n1wmlzm2l33mwxkbdk1vxxmf7bw0vz2gnd8f66fhxa70kif71r7gwvyds3nn7187lwm2sjs0wi6p6mv5xngi8bfrmxkyq1nf1d"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "hyperdrive-http-4.2.2" = { @@ -13220,7 +13401,11 @@ let version = "3.3.10"; src = fetchurl { url = "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz"; +<<<<<<< HEAD sha512 = "Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug=="; +======= + sha512 = "2x7za00gs7ipwcq29bslxcdv7j47m28jx14n9ybs5h2icr4024jn5ppmbs6953g2qb3amhs1gg5x0s48ky3mk7ybi36wchsb7kks2ry"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "ignore-by-default-1.0.1" = { @@ -13526,6 +13711,7 @@ let version = "7.2.0"; src = fetchurl { url = "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.2.0.tgz"; +<<<<<<< HEAD sha512 = "VE6NlW+WGn2/AeOMd496AHFYmE7eLKkUY6Ty31k4og5vmA3Fjuwe9v6ifH6Xx/Hz27QvdoMoviw1/pqWRB09Sw=="; }; }; @@ -13536,6 +13722,9 @@ let src = fetchurl { url = "https://registry.npmjs.org/insight/-/insight-0.10.1.tgz"; sha512 = "kLGeYQkh18f8KuC68QKdi0iwUcIaayJVB/STpX7x452/7pAUm1yfG4giJwcxbrTh0zNYtc8kBR+6maLMOzglOQ=="; +======= + sha512 = "15ks7a4jsdgwd9cpql86xignkdz7wf7jxz7r8pyyqgfr3n51nc6y3m271cxzwm4ccaajb6y9sc5hw80ga7pg37306zps6lndyaqskjl"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "insight-0.8.4" = { @@ -13778,7 +13967,11 @@ let version = "0.3.2"; src = fetchurl { url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz"; +<<<<<<< HEAD sha512 = "eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="; +======= + sha512 = "1cmy0k81vgz5z55rdyxfnx307053ksyp1lfgyj5jldkqqzmkx1z2k63fvzn7lgj8wdakmsa1mw408rm5xxfpk3avjqbnrb5yl56lm3r"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "is-ascii-1.0.0" = { @@ -16666,6 +16859,7 @@ let sha1 = "88328fd7d1ce7938b29283746f0b1bc126b24708"; }; }; +<<<<<<< HEAD "log4js-2.10.0" = { name = "log4js"; packageName = "log4js"; @@ -16673,6 +16867,15 @@ let src = fetchurl { url = "https://registry.npmjs.org/log4js/-/log4js-2.10.0.tgz"; sha512 = "NnhN9PjFF9zhxinAjlmDYvkqqrIW+yA3LLJAoTJ3fs6d1zru86OqQHfsxiUcc1kRq3z+faGR4DeyXUfiNbVxKQ=="; +======= + "log4js-2.9.0" = { + name = "log4js"; + packageName = "log4js"; + version = "2.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/log4js/-/log4js-2.9.0.tgz"; + sha512 = "35x0hh4glvbvlbmw5rkcmi2cph9i8a6y9h9n89zh47p7r35hpw8y1664l23scridgmm5v1g8qa04dc4fgcrnq52bc72ppshxving6x6"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "loggly-1.1.1" = { @@ -17005,7 +17208,11 @@ let version = "0.18.1"; src = fetchurl { url = "https://registry.npmjs.org/mailgun-js/-/mailgun-js-0.18.1.tgz"; +<<<<<<< HEAD sha512 = "lvuMP14u24HS2uBsJEnzSyPMxzU2b99tQsIx1o6QNjqxjk8b3WvR+vq5oG1mjqz/IBYo+5gF+uSoDS0RkMVHmg=="; +======= + sha512 = "2d4gich24nhva74z82riyr82qhgzb4fcrns1fgszb8npp8v9y7b2finj27dccf289nxyvrn6p3wq8sbyd4j8v70vb983nrfbqzqrywn"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "mailparser-0.6.2" = { @@ -18022,7 +18229,11 @@ let version = "0.5.21"; src = fetchurl { url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.21.tgz"; +<<<<<<< HEAD sha512 = "j96bAh4otsgj3lKydm3K7kdtA3iKf2m6MY2iSYCzCm5a1zmHo1g+aK3068dDEeocLZQIS9kU8bsdQHLqEvgW0A=="; +======= + sha512 = "381dy0jx9r407dvy4adjjq8jhnirshi8g3ypx5dd0z5i8w777bmlvhanf04k8ld66x6jzwag01nsizfr9npdcjjvqiwidi83q19pplg"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "mongodb-1.2.14" = { @@ -18214,6 +18425,7 @@ let sha1 = "400515e05b1924889cb61a1ec6054290a68e1207"; }; }; +<<<<<<< HEAD "ms-rest-2.3.6" = { name = "ms-rest"; packageName = "ms-rest"; @@ -18221,6 +18433,15 @@ let src = fetchurl { url = "https://registry.npmjs.org/ms-rest/-/ms-rest-2.3.6.tgz"; sha512 = "M+Lx9P7Wy4TeAk7jqPLwGS1QS1gvxF6Xo+OHv5j1g3Kcb44T/GTUuSjxTKarF6aKyeacZH1ZD++Nt7pcql7dDA=="; +======= + "ms-rest-2.3.5" = { + name = "ms-rest"; + packageName = "ms-rest"; + version = "2.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/ms-rest/-/ms-rest-2.3.5.tgz"; + sha512 = "13djv33d74sykqbp9qn9slm3ql6nbzmn2d6rv41m7nyc0a0v5igcjidgv17vhlb4k5fsdb8vb0pgn6m676rmyql85n16lj8p9gwbz6b"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "ms-rest-azure-1.15.7" = { @@ -18238,7 +18459,11 @@ let version = "2.5.7"; src = fetchurl { url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-2.5.7.tgz"; +<<<<<<< HEAD sha512 = "e4lgB0z29Dx4ufu/c+PmEAYY1WXq98GYUBkE+iRx7WsxsN04lrM3B1vj8y+B8rKt7clPUE0niqB9VovVL8zvag=="; +======= + sha512 = "1mfzk1gsn5mczd0i8klsl2gr7nsvcpjh4pz7qsv0wvv75iqvnq32szdf4jgl10ra2cc3xzacpaih1hhwvip7gzvp5w3rx7n9h3n12bv"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "msgpack-1.0.2" = { @@ -18571,7 +18796,11 @@ let version = "1.0.4"; src = fetchurl { url = "https://registry.npmjs.org/nanoid/-/nanoid-1.0.4.tgz"; +<<<<<<< HEAD sha512 = "zWPAK2WibMbVda1DvhYbahj7DAXLMvSI4Ik7553nPyJ2p8I5qJr4/j/6kgHJalrOx4FRbbme2Oa6utdzr6I/tA=="; +======= + sha512 = "2s3z8mgfgbvmfp6v2gbjvaih73wwnkar40r5yizzvw9ma1rqakpc8izwyfyffw9w24g8cnb0l6gn63a3cbbwhxdfpawcv52clmw0qyd"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "nanolru-1.0.0" = { @@ -18954,7 +19183,11 @@ let version = "2.4.3"; src = fetchurl { url = "https://registry.npmjs.org/node-abi/-/node-abi-2.4.3.tgz"; +<<<<<<< HEAD sha512 = "b656V5C0628gOOA2kwcpNA/bxdlqYF9FvxJ+qqVX0ctdXNVZpS8J6xEUYir3WAKc7U0BH/NRlSpNbGsy+azjeg=="; +======= + sha512 = "1xf7b7r69mnqk9ajm8z67q19pnrq0jqywm6450ixc4jz9arsmf5vjyiayjslzhjpx2myq3av72xn3rl543r6dp070h6zsxlj1bpmbkg"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "node-alias-1.0.4" = { @@ -18990,7 +19223,11 @@ let version = "4.3.3"; src = fetchurl { url = "https://registry.npmjs.org/node-elm-compiler/-/node-elm-compiler-4.3.3.tgz"; +<<<<<<< HEAD sha512 = "DUqXaoEFcx0xqZnMyYniyEzTKcdBhAC5GAcNsRS4tiG3VR8tidwth73cr5/rc4NzbjXIk+Jje8P4VJI+fWXHuw=="; +======= + sha512 = "2xwfrbx7s959y63gdiy54y86mp770vkxfgszp5xhwnxr29d3xavf8dnp0ab238732wh1121qwlx6k68wa4wkk4rm4qiswq5h5m9fjhd"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "node-forge-0.6.23" = { @@ -19101,6 +19338,7 @@ let sha512 = "5+MtH9t8tX6Aw6M+SeoyGR23XplNTOln3aTQ7El9tj/606bxea4GxYyvV4ymTmuoODz3GXQlLLQVdGkFLyIdDQ=="; }; }; +<<<<<<< HEAD <<<<<<< HEAD "node-red-node-twitter-1.0.1" = { ======= @@ -19118,6 +19356,8 @@ let url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-0.1.15.tgz"; sha512 = "07v6lmlyb0hdg9l86gvlipvs3ahi64fgswkadz1frczpi293hydlbdsy7rb917nf7z0kpcsrnch9d92xwirf4p6yzfhkmdsanrb9ha0"; ======= +======= +>>>>>>> nodePackages: meguca: 1.0.7 update "node-red-node-twitter-1.0.1" = { name = "node-red-node-twitter"; packageName = "node-red-node-twitter"; @@ -19125,8 +19365,11 @@ let src = fetchurl { url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-1.0.1.tgz"; sha512 = "1348jbfx28lng73hc4m5y2jfnpcq7y8mykxn5yn3ryvn4720k5j1s3bv17wqvqdda97m3i28bj0ykzwrzckqpbvq124sri2a2d3l0rl"; +<<<<<<< HEAD >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +======= +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "node-ssdp-2.9.1" = { @@ -19624,6 +19867,7 @@ let sha1 = "3831db968451b9cf6aff9bf95925f1ef8e37b33f"; }; }; +<<<<<<< HEAD <<<<<<< HEAD "numeral-2.0.6" = { name = "numeral"; @@ -19648,6 +19892,8 @@ let ======= sha512 = "24xrin7f593d6m3l1461j05p8lx8vw8fcii55q1zf04cgslah3qwcnqs7473kg56dlw5ncmbb2y0sklh1xmdkja14lh71jxvvh9hayy"; ======= +======= +>>>>>>> nodePackages: meguca: 1.0.7 update "numeral-2.0.6" = { name = "numeral"; packageName = "numeral"; @@ -19655,8 +19901,20 @@ let src = fetchurl { url = "https://registry.npmjs.org/numeral/-/numeral-2.0.6.tgz"; sha1 = "4ad080936d443c2561aed9f2197efffe25f4e506"; +<<<<<<< HEAD >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +======= + }; + }; + "nwmatcher-1.4.4" = { + name = "nwmatcher"; + packageName = "nwmatcher"; + version = "1.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.4.4.tgz"; + sha512 = "24xrin7f593d6m3l1461j05p8lx8vw8fcii55q1zf04cgslah3qwcnqs7473kg56dlw5ncmbb2y0sklh1xmdkja14lh71jxvvh9hayy"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "oauth-0.9.14" = { @@ -19783,7 +20041,11 @@ let version = "1.0.12"; src = fetchurl { url = "https://registry.npmjs.org/object-keys/-/object-keys-1.0.12.tgz"; +<<<<<<< HEAD sha512 = "FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag=="; +======= + sha512 = "1mcxc6cidz4wg1dhkn67hy9szl1hiaixrijhvh0n56mgs7cg0h110k7mxp7dflzank9whba14ivml7fndwpkxki3q31gh5n94ak4cqm"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "object-values-1.0.0" = { @@ -20872,7 +21134,11 @@ let version = "0.0.1"; src = fetchurl { url = "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz"; +<<<<<<< HEAD sha512 = "BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ=="; +======= + sha512 = "2avzhwqw37c6l7a0f276z7qzchzhwppinxhgg6q7by5bskwb7q7sfhwijb6fx4ingbdzb4i1pw6la5pg0izb5s4z69268278gil1ah5"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "path-dirname-1.0.2" = { @@ -21494,7 +21760,11 @@ let version = "6.0.23"; src = fetchurl { url = "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz"; +<<<<<<< HEAD sha512 = "soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag=="; +======= + sha512 = "1m7l8kr2bwwm21ki5jvrkfaxfxg5nqjn4zk9xf0b7rzyq1xz4s64cm5wh34qf0c13vva14wbmvfkwg7yndmcpnmcq9m7pc93vba90xj"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "prebuild-install-2.1.2" = { @@ -21809,7 +22079,11 @@ let version = "15.6.2"; src = fetchurl { url = "https://registry.npmjs.org/prop-types/-/prop-types-15.6.2.tgz"; +<<<<<<< HEAD sha512 = "3pboPvLiWD7dkI3qf3KbUe6hKFKa52w+AE0VCqECtf+QHAKgOL37tTaNCnuX1nAAQ4ZhyP+kYVKf8rLmJ/feDQ=="; +======= + sha512 = "06xxxr7wsrg57sjc6jgzj31hr1h0w6njxxhm39nnpxvsf5008f91zxm0ahhl5ad00z6rrwsa8la3vjikdr7zsldj3fkwn72y8zfi5ny"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "properties-1.2.1" = { @@ -21971,7 +22245,11 @@ let version = "1.1.28"; src = fetchurl { url = "https://registry.npmjs.org/psl/-/psl-1.1.28.tgz"; +<<<<<<< HEAD sha512 = "+AqO1Ae+N/4r7Rvchrdm432afjT9hqJRyBN3DQv9At0tPz4hIFSGKbq64fN9dVoCow4oggIIax5/iONx0r9hZw=="; +======= + sha512 = "1kn3gyjf7iqhzqydc4050i81sih4nkmgpry3fms563588117qzjvp82zl5hsxqkr18s51px6iz9lzg3csvqdp0vxlmzwdxy0za8w2pq"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "pstree.remy-1.1.0" = { @@ -22529,7 +22807,11 @@ let version = "1.3.0"; src = fetchurl { url = "https://registry.npmjs.org/random-access-storage/-/random-access-storage-1.3.0.tgz"; +<<<<<<< HEAD sha512 = "pdS9Mcb9TB7oICypPRALlheaSuszuAKmLVEPKJMuYor7R/zDuHh5ALuQoS+ox31XRwQUL+tDwWH2GPdyspwelA=="; +======= + sha512 = "2a1x75jfbviixk1q51ynbql0i3mfzf7m0ps345v01wpif63zi3zp2k25s9jh3si5nk05f1kxd59l5wn1c83va9c43l1wk7xqqqvvm55"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "random-bytes-1.0.0" = { @@ -22619,7 +22901,11 @@ let version = "2.6.3"; src = fetchurl { url = "https://registry.npmjs.org/raven/-/raven-2.6.3.tgz"; +<<<<<<< HEAD sha512 = "bKre7qlDW+y1+G2bUtCuntdDYc8o5v1T233t0vmJfbj8ttGOgLrGRlYB8saelVMW9KUAJNLrhFkAKOwFWFJonw=="; +======= + sha512 = "2gnhljq0pn2h02rhkmx4900lps1clwmkv3g40an8v3bm04fs6vgrf3xi7wx5vbxvd9zvri8rxhl7mwymv8556vdz2syqns3m7pdxakc"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "raw-body-0.0.3" = { @@ -22676,6 +22962,7 @@ let sha512 = "9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw=="; }; }; +<<<<<<< HEAD <<<<<<< HEAD "raw-socket-1.6.2" = { ======= @@ -22693,6 +22980,8 @@ let url = "https://registry.npmjs.org/raw-socket/-/raw-socket-1.6.1.tgz"; sha512 = "0fhy1r7pyl4v2zmjz1fmvqbdmjscib47pbc5di3cn965j7zj3y5h2bs8x0r131i4s7xj47c36na1cgpppp71kvdc1qs78y4bf7fpa45"; ======= +======= +>>>>>>> nodePackages: meguca: 1.0.7 update "raw-socket-1.6.2" = { name = "raw-socket"; packageName = "raw-socket"; @@ -22700,8 +22989,11 @@ let src = fetchurl { url = "https://registry.npmjs.org/raw-socket/-/raw-socket-1.6.2.tgz"; sha512 = "1ry9bwkiw9qpdhqrs5si04p79ijg9zicfqvin3igh3as13lxvhm8bc0l3gnn0cyyirlgzhrvbcsirlpxi1cgjpx4sr8yd65fc0qvf95"; +<<<<<<< HEAD >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +======= +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "rc-0.4.0" = { @@ -23118,6 +23410,15 @@ let sha512 = "ztaw4M1VqgMwl9HlPpOuiYgItcHlunW0He2fE6eNfT6E/CF2FtYi9ofOYe4mKntstYk0Fyh/rDRBdS3AnxjlrA=="; }; }; + "regexp.prototype.flags-1.2.0" = { + name = "regexp.prototype.flags"; + packageName = "regexp.prototype.flags"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.2.0.tgz"; + sha512 = "2nfa64zq0npah9lmizjh5rli6snqyra4vp63kl7yqidc5kn47y88gkxinki77zd3ns7bfp5q6shi249ms9kxrfijwq07ajmrphb1mnf"; + }; + }; "regexpp-1.1.0" = { name = "regexpp"; packageName = "regexpp"; @@ -23502,7 +23803,11 @@ let version = "1.8.1"; src = fetchurl { url = "https://registry.npmjs.org/resolve/-/resolve-1.8.1.tgz"; +<<<<<<< HEAD sha512 = "AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA=="; +======= + sha512 = "1h4w4h955vs1426yq9wpw2cs8iy81860h3jbzg2ksqbshz3gd6khp4xf49nvva2zffdm70513jkfmk60acgb6ghqi4yshmv02n0y9q2"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "resolve-dir-1.0.1" = { @@ -23898,7 +24203,11 @@ let version = "6.2.1"; src = fetchurl { url = "https://registry.npmjs.org/rxjs/-/rxjs-6.2.1.tgz"; +<<<<<<< HEAD sha512 = "OwMxHxmnmHTUpgO+V7dZChf3Tixf4ih95cmXjzzadULziVl/FKhHScGLj4goEw9weePVOH2Q0+GcCBUhKCZc/g=="; +======= + sha512 = "3z5q9i844ahi771sf87sf6mwdwp03qk5248z2y1953sh53zb64z6hkmv8y8z5y9wmyjiqjz5i7gf5qab6vmggh3lva7965734gk20rv"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "safe-buffer-5.0.1" = { @@ -24324,6 +24633,7 @@ let sha1 = "935d240cdfe0f5805307fdfe967d88942a2cbcf0"; }; }; +<<<<<<< HEAD <<<<<<< HEAD "serve-handler-3.2.1" = { name = "serve-handler"; @@ -24334,13 +24644,21 @@ let sha512 = "4UYBO6zH61m5YUD54lJ1A8POOPmOOhBdNXJgy5/plzoOBcIluUJgmsayeI4af+QeUNPa5G5e609ycWTpJmKo2Q=="; ======= "serve-handler-3.1.1" = { +======= + "serve-handler-3.2.1" = { +>>>>>>> nodePackages: meguca: 1.0.7 update name = "serve-handler"; packageName = "serve-handler"; - version = "3.1.1"; + version = "3.2.1"; src = fetchurl { +<<<<<<< HEAD url = "https://registry.npmjs.org/serve-handler/-/serve-handler-3.1.1.tgz"; sha512 = "32qab4isx4xhvmqqllr6i3n69zgdzjqyff5wdll8d5wj6mv6v24vx1hbqx7hk0v35jnj4s896fi8cnrbcc85mf4z8xmhpbs2p9nrhp8"; >>>>>>> nodePackages: meguca: 1.0.5 -> 1.0.7 +======= + url = "https://registry.npmjs.org/serve-handler/-/serve-handler-3.2.1.tgz"; + sha512 = "3cshqi6x5j72wjgxdg6xr6ssd81xr3z3a77icn6k9h45f95q82hwflpx6gwnq3j6mfi0flfz4wcxhq3fm9f5ya0c6wmksy7mhxh2ip1"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "serve-index-1.7.3" = { @@ -24574,7 +24892,11 @@ let version = "0.8.1"; src = fetchurl { url = "https://registry.npmjs.org/shelljs/-/shelljs-0.8.1.tgz"; +<<<<<<< HEAD sha512 = "YA/iYtZpzFe5HyWVGrb02FjPxc4EMCfpoU/Phg9fQoyMC72u9598OUBrsU8IrtwAKG0tO8IYaqbaLIw+k3IRGA=="; +======= + sha512 = "0c12wlk7s62rnm6d8cc4frddll01p5f117v2ss075y9zxxfpl5qr322bw7qdksgl7ljfc04rv2wyn6qyjv1m5953ywmgk39srif43v0"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "shellwords-0.1.1" = { @@ -24676,6 +24998,7 @@ let sha512 = "dU3TBVIGkP5Hzw6o74hJx+VzTBTX2rqIiLfugs0HdmdVQCQp76XGg2jlBCqfRJfW/n6/mUKTi+s3rnzX7SgbBA=="; }; }; +<<<<<<< HEAD <<<<<<< HEAD "simple-git-1.96.0" = { ======= @@ -24693,6 +25016,8 @@ let url = "https://registry.npmjs.org/simple-git/-/simple-git-1.95.1.tgz"; sha512 = "3ssfxzdgj6ycrklss1hxrmwcfsncx9bccnsxrkdknw68p2g9is3j3dc2kk748jn0kky9q7ajdjqvv6k18n6qbj9llaiy5kh9k1i7mbj"; ======= +======= +>>>>>>> nodePackages: meguca: 1.0.7 update "simple-git-1.96.0" = { name = "simple-git"; packageName = "simple-git"; @@ -24700,8 +25025,11 @@ let src = fetchurl { url = "https://registry.npmjs.org/simple-git/-/simple-git-1.96.0.tgz"; sha512 = "0ywlgw61ydavyi2sw2yvzlha4yaxcasrzzkfkvwhv51qm1pciagcmchampclwjrs40wnn0ydhbh1krn1krsrfr6rjyx46k9j76fw1gs"; +<<<<<<< HEAD >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +======= +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "simple-lru-cache-0.0.2" = { @@ -25028,6 +25356,7 @@ let sha512 = "FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg=="; }; }; +<<<<<<< HEAD "snyk-1.87.0" = { name = "snyk"; packageName = "snyk"; @@ -25035,6 +25364,15 @@ let src = fetchurl { url = "https://registry.npmjs.org/snyk/-/snyk-1.87.0.tgz"; sha1 = "8d35801eddaca1ffc3ecc2da1c7ae2dab9bf97d3"; +======= + "snyk-1.83.0" = { + name = "snyk"; + packageName = "snyk"; + version = "1.83.0"; + src = fetchurl { + url = "https://registry.npmjs.org/snyk/-/snyk-1.83.0.tgz"; + sha1 = "207fb2f47306719f62664d2d2e8e807b294baea0"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "snyk-config-2.1.0" = { @@ -25700,7 +26038,11 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/speedometer/-/speedometer-1.1.0.tgz"; +<<<<<<< HEAD sha512 = "z/wAiTESw2XVPssY2XRcme4niTc4S5FkkJ4gknudtVoc33Zil8TdTxHy5torRcgqMqksJV2Yz8HQcvtbsnw0mQ=="; +======= + sha512 = "2ck8z5jbgxp5l61ryc5s99cm4r2mj255gdfdwhi9zfw95v2fvgiqnmmkmxr484yj1j92jrq6y4jgvlrbisdj66b7vanbhqj664h1z6g"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "split-0.2.10" = { @@ -26318,6 +26660,15 @@ let sha512 = "WoZ+B2ypng1dp4iFLF2kmZlwwlE19gmjgKuhL1FJfDgCREWb3ye3SDVHSzLH6bxfnvYmkCxbzkmWcQZHA4P//Q=="; }; }; + "string.prototype.matchall-2.0.0" = { + name = "string.prototype.matchall"; + packageName = "string.prototype.matchall"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-2.0.0.tgz"; + sha512 = "3yzz0q38w3735j9rrdjr416ysg5zg79qwr4nirm92vjgpwv8m204f3w958jz8dbh2ihkxima71716crlifjr1c8lxfhv7m9dh3px1js"; + }; + }; "string2compact-1.2.5" = { name = "string2compact"; packageName = "string2compact"; @@ -26669,7 +27020,6 @@ let sha512 = "Ts0Mu/A1S1aZxEJNG88I4Oc9rcZSBFNac5e27yh4j2mqbhZSSzR1Ah79EYwSn9Zuh7lrlGD2cVGzw1RKGzyLSg=="; }; }; -<<<<<<< HEAD "supports-color-5.1.0" = { name = "supports-color"; packageName = "supports-color"; @@ -26679,8 +27029,6 @@ let sha512 = "Ry0AwkoKjDpVKK4sV4h6o3UJmNRbjYm2uXhwfj3J56lMVdvnUNqzQVRztOOMGQ++w1K/TjNDFvpJk0F/LoeBCQ=="; }; }; -======= ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 "supports-color-5.4.0" = { name = "supports-color"; packageName = "supports-color"; @@ -26753,6 +27101,15 @@ let sha512 = "S7rnFITmBH1EnyKcvxBh1LjYeQMmnZtCXSEbHcH6S0NoKit24ZuFO/T1vDcLdYsLQkM188PVVhQmzKIuThNkKg=="; }; }; + "table-4.0.3" = { + name = "table"; + packageName = "table"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/table/-/table-4.0.3.tgz"; + sha512 = "0m684sf5sicq9hlavaw7wrm8d10p2vm1cvvrxgl7f2rpqbn5cm6hhsbzb0is6r1bm19p7960dwxif6lc48bz712kx27s176hhafgfjb"; + }; + }; "tabtab-1.3.2" = { name = "tabtab"; packageName = "tabtab"; @@ -26859,7 +27216,11 @@ let version = "1.16.3"; src = fetchurl { url = "https://registry.npmjs.org/tar-fs/-/tar-fs-1.16.3.tgz"; +<<<<<<< HEAD sha512 = "NvCeXpYx7OsmOh8zIOP/ebG55zZmxLE0etfWRbWok+q2Qo8x/vOR/IJT1taADXPe+jsiu9axDb3X4B+iIgNlKw=="; +======= + sha512 = "0mna0r2l8gy1mxx1nqxdfr27gxdwwqdh3bdclw2zj8z7ziiix1bdslkm2slbmnpg8sb3i366vkvkcbrzzij0cqz78kfpv1ijrg9xw1n"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "tar-pack-3.4.1" = { @@ -27529,10 +27890,13 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/toxic/-/toxic-1.0.1.tgz"; +<<<<<<< HEAD sha512 = "WI3rIGdcaKULYg7KVoB0zcjikqvcYYvcuT6D89bFPz2rVR0Rl0PK6x8/X62rtdLtBKIE985NzVf/auTtGegIIg=="; +======= + sha512 = "0i0is0rxpj6mzsprm6wxxq4l82fvlmmmfnmygqzxg5475qi3masng9zqpbg70ryp7f8nqfwmf9f5j6dfj05djhfc85sas2wcwhfp3aq"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; -<<<<<<< HEAD "tr46-0.0.3" = { name = "tr46"; packageName = "tr46"; @@ -27542,8 +27906,6 @@ let sha1 = "8184fd347dac9cdc185992f3a6622e14b9d9ab6a"; }; }; -======= ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 "tr46-1.0.1" = { name = "tr46"; packageName = "tr46"; @@ -27685,7 +28047,11 @@ let version = "1.9.3"; src = fetchurl { url = "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz"; +<<<<<<< HEAD sha512 = "4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ=="; +======= + sha512 = "2yimhwxviswrwaxdgk4k5q99pjv0n6g8s1cc5ml17rzv1kqfac26sb7b49ndl9hyczgzlz28wh87g1k0r3h9cqa79d3hyi9qzrcajp2"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "tsscmp-1.0.5" = { @@ -27892,7 +28258,11 @@ let version = "2.9.2"; src = fetchurl { url = "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz"; +<<<<<<< HEAD sha512 = "Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w=="; +======= + sha512 = "39mbnbv5shzcdgdidpzgzx35gy4g2b4vxmpcqjg0irymcivm5kc0yckb0vvmgyb2lwcn6282n1nc4s1d73k8f468jgqnsjdf7m2kghs"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "typewise-1.0.3" = { @@ -28006,10 +28376,26 @@ let "uglify-js-3.4.2" = { name = "uglify-js"; packageName = "uglify-js"; +<<<<<<< HEAD version = "3.4.2"; src = fetchurl { url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.2.tgz"; sha512 = "/kVQDzwiE9Vy7Y63eMkMozF4jIt0C2+xHctF9YpqNWdE/NLOuMurshkpoYGUlAbeYhACPv0HJPIHJul0Ak4/uw=="; +======= + version = "3.3.28"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.28.tgz"; + sha512 = "25lqpkcyapxq7ql7s778zwxm8mn0h2ir7m3nimvfnbs7myrv1aj5c3xgvvv1nbzvxrhs340gxfmqhpmgd7sqlhfd4icqwisl3ymri7b"; + }; + }; + "uglify-js-3.4.1" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "3.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.1.tgz"; + sha512 = "2hafajm9v9l1if7nqn9kwngd1yrrra3m9hgbjpx4wffqh9a589cwid6bx18l9pfj7cwf90hlk2nim0akl9dvhww5ddc1zg4fsiq4dr1"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "uglify-to-browserify-1.0.2" = { @@ -28021,6 +28407,7 @@ let sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7"; }; }; +<<<<<<< HEAD "uglifyjs-webpack-plugin-1.2.7" = { name = "uglifyjs-webpack-plugin"; packageName = "uglifyjs-webpack-plugin"; @@ -28028,6 +28415,15 @@ let src = fetchurl { url = "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.7.tgz"; sha512 = "1VicfKhCYHLS8m1DCApqBhoulnASsEoJ/BvpUpP4zoNAPpKzdH+ghk0olGJMmwX2/jprK2j3hAHdUbczBSy2FA=="; +======= + "uglifyjs-webpack-plugin-1.2.6" = { + name = "uglifyjs-webpack-plugin"; + packageName = "uglifyjs-webpack-plugin"; + version = "1.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.6.tgz"; + sha512 = "2vaj7gmcrpn4k2hb1rnv4zx4lrqzwlvq3sxadjsdm1yw40pyw0rvaahx44jmq71ipv81bd7h7jjfkjpr0c8zpdcz93vcnv3m3hzscrl"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "uid-0.0.2" = { @@ -28162,7 +28558,11 @@ let version = "1.1.2"; src = fetchurl { url = "https://registry.npmjs.org/undeclared-identifiers/-/undeclared-identifiers-1.1.2.tgz"; +<<<<<<< HEAD sha512 = "13EaeocO4edF/3JKime9rD7oB6QI8llAGhgn5fKOPyfkJbRb6NFv9pYV6dFEmpa4uRjKeBqLZP8GpuzqHlKDMQ=="; +======= + sha512 = "0qq6lhyxbnac1pzcj5ily6a32wvi5ls8k8yj5cnyrpx3s2vnhjy89rzivrfa9qq3905kwh8lh3yhgmcpmkqljkjzx2ygq8fhxx1lwfp"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "undefsafe-2.0.2" = { @@ -28387,7 +28787,11 @@ let version = "0.1.2"; src = fetchurl { url = "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz"; +<<<<<<< HEAD sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="; +======= + sha512 = "29d9b6i7rf460m0c5761z6xzzjdl2q81ri19x5qcnvi9l85jp71f7lbr7bdk7sx3k3sqwcp9vfpmlh7srgfnzlmssr5j0lpj0imw4mc"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "unix-crypt-td-js-1.0.0" = { @@ -29196,7 +29600,11 @@ let version = "2.2.0"; src = fetchurl { url = "https://registry.npmjs.org/vinyl/-/vinyl-2.2.0.tgz"; +<<<<<<< HEAD sha512 = "MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg=="; +======= + sha512 = "290vvxjmx7zxxgcmjfsy92aizfm6daz92y336rqf8g18hcar5g94dw186ybbl6v9vhsxdg34a51ycagrysal0bcwj8g22r4zp4gw49h"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "vinyl-file-2.0.0" = { @@ -29268,7 +29676,11 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.0.tgz"; +<<<<<<< HEAD sha512 = "iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw=="; +======= + sha512 = "0dqh260i5pwksrgs15lcxbk4y92p77xvnbnkyq5kk2qa9p4bk7l48d0b7akymjc7inwfrllrz9kff7bli3k7n1hg8ras4s9yvp95bwa"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "voc-1.1.0" = { @@ -29322,7 +29734,11 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-4.0.1.tgz"; +<<<<<<< HEAD sha512 = "0fuBZj9pMkeJ8OMyIvSGeRaRVhUaJt+yeFxi7a3sz/AbrngQdcxOovMXPgKuieoBSBKS05gXPS88BsWpJZfBkA=="; +======= + sha512 = "28c35r5m72hcg1g7lbrilwj29403sl9mq13w5zkl97cqx8hg2p1pw6gxjnysqjwg2rdy9hs2mb925krhvs24cp3y24lfck97xk83yyi"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "vscode-languageserver-4.0.0" = { @@ -29340,7 +29756,11 @@ let version = "4.2.1"; src = fetchurl { url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-4.2.1.tgz"; +<<<<<<< HEAD sha512 = "5WAxaK1nEpe52ZaWNMqmd6rO5CIE72J/7UkGKPUTdGa0l0haWHS69tpRz+LetBlgTpP7PYacl4xhDaLZv82a+g=="; +======= + sha512 = "3x9mkdzv6i0sqccjyf8cggvjd7606dlvvicylfsysx78n2s92bv8rkl2gsjh1j9xmzn5vq44bjcxakplv5395lnv6wrf4k7mml32q75"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "vscode-languageserver-protocol-3.6.0" = { @@ -29358,7 +29778,11 @@ let version = "3.8.1"; src = fetchurl { url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.8.1.tgz"; +<<<<<<< HEAD sha512 = "KdeetvQ2JavRiuE9afNrV5+xJZocj7NGPQwH4kpSFw5cp+0wijv87qgXfSEvmwPUaknhMBoSuSrSIG/LRrzWJQ=="; +======= + sha512 = "0jxdg26rdpj1liap491lc7195md80wv5whps5x8xvy3p2ihxnkmq3hpa95f41qc7m3b73qwk8jv37spdgrnjgg1ib8sn99nyjv9xmr9"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "vscode-languageserver-types-3.8.2" = { @@ -29455,7 +29879,6 @@ let sha1 = "79691584d98607f5070bd3b70a40e6bb22e401eb"; }; }; -<<<<<<< HEAD "webidl-conversions-2.0.1" = { name = "webidl-conversions"; packageName = "webidl-conversions"; @@ -29465,8 +29888,6 @@ let sha1 = "3bf8258f7d318c7443c36f2e169402a1a6703506"; }; }; -======= ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 "webidl-conversions-4.0.2" = { name = "webidl-conversions"; packageName = "webidl-conversions"; @@ -29534,7 +29955,6 @@ let name = "whatwg-url"; packageName = "whatwg-url"; version = "6.4.1"; -<<<<<<< HEAD src = fetchurl { url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.4.1.tgz"; sha512 = "FwygsxsXx27x6XXuExA/ox3Ktwcbf+OAvrKmLulotDAiO1Q6ixchPFaHYsis2zZBZSJTR0+dR+JVtf7MlbqZjw=="; @@ -29547,11 +29967,6 @@ let src = fetchurl { url = "https://registry.npmjs.org/whatwg-url-compat/-/whatwg-url-compat-0.6.5.tgz"; sha1 = "00898111af689bb097541cd5a45ca6c8798445bf"; -======= - src = fetchurl { - url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.4.1.tgz"; - sha512 = "27rkflmrkzbamg28yflyisk49jl2dnvmk4651sn7hhig2rsahxj4c5ld3ljx9mjps0f6zqv0yvwl7d37w817vkmx7qnxiqp3frs030p"; ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 }; }; "when-3.4.6" = { @@ -29785,7 +30200,11 @@ let version = "2.4.3"; src = fetchurl { url = "https://registry.npmjs.org/winston/-/winston-2.4.3.tgz"; +<<<<<<< HEAD sha512 = "GYKuysPz2pxYAVJD2NPsDLP5Z79SDEzPm9/j4tCjkF/n89iBNGBMJcR+dMUqxgPNgoSs6fVygPi+Vl2oxIpBuw=="; +======= + sha512 = "2xl32n4m1fmdgpqh1rgbsdchj1cs0y65b2p8zn44m660d41v3ryfpwhlg8f5qyzkg7lq32jpxkzkcqcxk9xhhsj05c9rnpkqg5ax0hr"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "with-4.0.3" = { @@ -30001,7 +30420,11 @@ let version = "5.2.1"; src = fetchurl { url = "https://registry.npmjs.org/ws/-/ws-5.2.1.tgz"; +<<<<<<< HEAD sha512 = "2NkHdPKjDBj3CHdnAGNpmlliryKqF+n9MYXX7/wsVC4yqYocKreKNjydPDvT3wShAZnndlM0RytEfTALCDvz7A=="; +======= + sha512 = "3ng6fq81cq7si1b8ws56xp7k40s216zscxkr79w6s5bfahwialk4bjl5kyfzmw567yyj5xa4apn4ncsd5ih0rvp13vih353y9s0gnfq"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "wtf-8-1.0.0" = { @@ -30605,7 +31028,11 @@ let version = "2.3.0"; src = fetchurl { url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.3.0.tgz"; +<<<<<<< HEAD sha512 = "PHSAkVOqYdcR+C+Uht1SGC4eVD/9OhygYFkYaI66xF8vKIeS1RNYay+umj2ZrQeJ50tF5Q/RSO6qGDz9y3Ifug=="; +======= + sha512 = "2x1ywnbzly1iapf938hzra59gkqj1xdk4yrmbigddc17mcjhwl2ypy4pa76h62rc2h1qfpx7xa1wbhqabfqd51gz08xfqdaaf8q0x1w"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "yosay-2.0.2" = { @@ -30935,6 +31362,7 @@ in sha512 = "9OBihy+L53g9ALssKTY/vTWEiz8mGEJ1asWiCdfPdQ1Uf++tewiNrN7Fq2Eb6ZYtvK0BYvPZlh3bHguKmKO3yA=="; }; dependencies = [ +<<<<<<< HEAD <<<<<<< HEAD sources."@types/node-8.10.20" ======= @@ -30949,6 +31377,9 @@ in sources."@types/tough-cookie-2.3.3" sources."@types/uuid-3.4.3" >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +======= + sources."@types/node-8.10.20" +>>>>>>> nodePackages: meguca: 1.0.7 update sources."JSV-4.0.2" sources."adal-node-0.1.28" sources."ajv-5.5.2" @@ -31217,7 +31648,11 @@ in sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."moment-2.22.2" +<<<<<<< HEAD (sources."ms-rest-2.3.6" // { +======= + (sources."ms-rest-2.3.5" // { +>>>>>>> nodePackages: meguca: 1.0.7 update dependencies = [ sources."through-2.3.8" sources."tunnel-0.0.5" @@ -31226,6 +31661,7 @@ in (sources."ms-rest-azure-2.5.7" // { dependencies = [ <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD sources."@types/node-9.6.20" @@ -31233,6 +31669,8 @@ in sources."@types/node-9.6.21" >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +======= +>>>>>>> nodePackages: meguca: 1.0.7 update sources."async-2.6.0" ]; }) @@ -31619,7 +32057,15 @@ in sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" +<<<<<<< HEAD sources."module-deps-6.1.0" +======= + (sources."module-deps-6.1.0" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) +>>>>>>> nodePackages: meguca: 1.0.7 update sources."once-1.4.0" sources."os-browserify-0.3.0" sources."pako-1.0.6" @@ -31934,12 +32380,16 @@ in sources."qap-3.3.1" sources."qs-0.5.6" sources."query-string-1.0.1" +<<<<<<< HEAD (sources."random-access-file-2.0.1" // { dependencies = [ sources."minimist-0.0.8" sources."mkdirp-0.5.1" ]; }) +======= + sources."random-access-file-2.0.1" +>>>>>>> nodePackages: meguca: 1.0.7 update sources."random-access-storage-1.3.0" sources."random-iterate-1.0.1" sources."randombytes-2.0.6" @@ -32237,6 +32687,7 @@ in sources."balanced-match-1.0.0" sources."base64-js-1.3.0" sources."bcrypt-pbkdf-1.0.1" +<<<<<<< HEAD <<<<<<< HEAD sources."big-integer-1.6.32" ======= @@ -32246,6 +32697,9 @@ in sources."big-integer-1.6.31" >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +======= + sources."big-integer-1.6.31" +>>>>>>> nodePackages: meguca: 1.0.7 update sources."block-stream-0.0.9" sources."bn.js-4.11.8" sources."body-parser-1.18.2" @@ -32317,16 +32771,27 @@ in sources."cookie-signature-1.0.6" sources."cordova-app-hello-world-3.12.0" sources."cordova-common-2.2.4" +<<<<<<< HEAD (sources."cordova-create-1.1.2" // { +======= + sources."cordova-create-1.1.2" + (sources."cordova-fetch-1.3.0" // { +>>>>>>> nodePackages: meguca: 1.0.7 update dependencies = [ sources."q-1.0.1" sources."shelljs-0.3.0" ]; }) +<<<<<<< HEAD (sources."cordova-fetch-1.3.0" // { dependencies = [ sources."glob-7.1.2" sources."shelljs-0.7.8" +======= + (sources."cordova-js-4.2.3" // { + dependencies = [ + sources."isarray-2.0.4" +>>>>>>> nodePackages: meguca: 1.0.7 update ]; }) sources."cordova-js-4.2.4" @@ -32337,6 +32802,11 @@ in sources."nopt-4.0.1" sources."plist-2.0.1" sources."q-1.0.1" +<<<<<<< HEAD +======= + sources."qs-6.3.2" + sources."safe-buffer-5.1.1" +>>>>>>> nodePackages: meguca: 1.0.7 update sources."shelljs-0.3.0" sources."underscore-1.8.3" sources."xmlbuilder-8.2.2" @@ -32423,6 +32893,7 @@ in sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" sources."get-assigned-identifiers-1.2.0" +<<<<<<< HEAD (sources."getpass-0.1.7" // { dependencies = [ sources."assert-plus-1.0.0" @@ -32434,6 +32905,11 @@ in sources."object-assign-3.0.0" ]; }) +======= + sources."getpass-0.1.7" + sources."glob-5.0.15" + sources."got-3.3.1" +>>>>>>> nodePackages: meguca: 1.0.7 update sources."graceful-fs-4.1.11" sources."har-validator-2.0.6" sources."has-1.0.3" @@ -32626,12 +33102,16 @@ in sources."rechoir-0.6.2" sources."registry-url-3.1.0" sources."repeating-1.1.3" +<<<<<<< HEAD (sources."request-2.79.0" // { dependencies = [ sources."qs-6.3.2" sources."uuid-3.3.0" ]; }) +======= + sources."request-2.79.0" +>>>>>>> nodePackages: meguca: 1.0.7 update sources."resolve-1.8.1" sources."restore-cursor-1.0.1" (sources."rimraf-2.6.2" // { @@ -32655,6 +33135,7 @@ in sources."shell-quote-1.6.1" sources."shelljs-0.5.3" sources."simple-concat-1.0.0" +<<<<<<< HEAD (sources."simple-plist-0.2.1" // { dependencies = [ sources."base64-js-1.1.2" @@ -32662,6 +33143,9 @@ in sources."xmlbuilder-8.2.2" ]; }) +======= + sources."simple-plist-0.2.1" +>>>>>>> nodePackages: meguca: 1.0.7 update sources."slash-1.0.0" sources."slide-1.1.6" sources."sntp-1.0.9" @@ -33014,6 +33498,16 @@ in (sources."dat-json-1.0.2" // { dependencies = [ sources."dat-encoding-4.0.2" +<<<<<<< HEAD +======= + sources."debug-2.6.9" + ]; + }) + sources."dat-link-resolve-2.2.0" + (sources."dat-log-1.1.1" // { + dependencies = [ + sources."process-nextick-args-1.0.7" +>>>>>>> nodePackages: meguca: 1.0.7 update ]; }) sources."dat-link-resolve-2.2.0" @@ -33103,6 +33597,7 @@ in sources."has-flag-3.0.0" sources."http-methods-0.1.0" sources."http-signature-1.2.0" +<<<<<<< HEAD (sources."hypercore-6.17.1" // { dependencies = [ sources."process-nextick-args-1.0.7" @@ -33111,12 +33606,20 @@ in }) sources."hypercore-crypto-1.0.0" (sources."hypercore-protocol-6.6.4" // { +======= + (sources."hypercore-6.16.0" // { +>>>>>>> nodePackages: meguca: 1.0.7 update dependencies = [ sources."varint-5.0.0" ]; }) +<<<<<<< HEAD sources."hyperdrive-9.14.0" (sources."hyperdrive-http-4.2.2" // { +======= + sources."hypercore-protocol-6.6.4" + (sources."hyperdrive-9.14.0" // { +>>>>>>> nodePackages: meguca: 1.0.7 update dependencies = [ sources."pump-1.0.3" ]; @@ -33227,11 +33730,15 @@ in sources."punycode-1.4.1" sources."qs-6.5.2" sources."random-access-file-2.0.1" +<<<<<<< HEAD (sources."random-access-memory-2.4.0" // { dependencies = [ sources."process-nextick-args-1.0.7" ]; }) +======= + sources."random-access-memory-2.4.0" +>>>>>>> nodePackages: meguca: 1.0.7 update sources."random-access-storage-1.3.0" (sources."randomatic-3.0.0" // { dependencies = [ @@ -33344,7 +33851,11 @@ in version = "0.2.15"; src = fetchurl { url = "https://registry.npmjs.org/dhcp/-/dhcp-0.2.15.tgz"; +<<<<<<< HEAD sha512 = "oIuRtSWj6UEU6zNEddKyE4P+fFrbZOMIaTWF8VS76hqzAln1myOtaG5zvTwF0UiD+bCmlJVFh8kcWf/kq7pksg=="; +======= + sha512 = "2r69fmbwkzmj769hx2rb556n3wq6j6i0lybswvfd2nj76zmb41b66papdag319md44f6r6vb9ygx0qknb97ai1kxca43sd34nsr32x0"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; dependencies = [ sources."minimist-1.2.0" @@ -33670,10 +34181,17 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; +<<<<<<< HEAD version = "3.3.18"; src = fetchurl { url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.3.18.tgz"; sha512 = "bfdM9Dy7PeZQnNTEOt8JQCDv+nOQxQJgijLbP7LRg/bAYt6JcKNyGzUp+25iXhoZLd+X3RmLD55yh3hSIsKfAw=="; +======= + version = "3.3.17"; + src = fetchurl { + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.3.17.tgz"; + sha512 = "0vnasf7pkbax7388qv4x5lmrm83s4wb1q182bkxb6zs8jf1lgxh372gyim6dg9rhj7vx7rck3jn6a7dvi4rwzyfl3zmswh894zh7xkp"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; dependencies = [ sources."JSONStream-1.3.3" @@ -33682,6 +34200,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.1" sources."asynckit-0.4.0" +<<<<<<< HEAD <<<<<<< HEAD sources."aws-sdk-2.265.1" ======= @@ -33691,6 +34210,9 @@ in sources."aws-sdk-2.254.1" >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +======= + sources."aws-sdk-2.263.1" +>>>>>>> nodePackages: meguca: 1.0.7 update sources."aws-sign2-0.7.0" sources."aws4-1.7.0" sources."base64-js-1.3.0" @@ -34086,14 +34608,28 @@ in sources."has-symbol-support-x-1.4.2" sources."has-to-string-tag-x-1.4.1" sources."home-or-tmp-2.0.0" +<<<<<<< HEAD sources."hosted-git-info-2.6.1" sources."import-jsx-1.3.0" +======= + sources."hosted-git-info-2.6.0" + (sources."import-jsx-1.3.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."has-ansi-2.0.0" + ]; + }) +>>>>>>> nodePackages: meguca: 1.0.7 update sources."imurmurhash-0.1.4" sources."indent-string-3.2.0" (sources."ink-0.3.1" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.1" +<<<<<<< HEAD +======= + sources."strip-ansi-4.0.0" +>>>>>>> nodePackages: meguca: 1.0.7 update sources."supports-color-5.4.0" ]; }) @@ -34246,10 +34782,17 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; +<<<<<<< HEAD version = "5.0.1"; src = fetchurl { url = "https://registry.npmjs.org/eslint/-/eslint-5.0.1.tgz"; sha512 = "D5nG2rErquLUstgUaxJlWB5+gu+U/3VDY0fk/Iuq8y9CUFy/7Y6oF4N2cR1tV8knzQvciIbfqfohd359xTLIKQ=="; +======= + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint/-/eslint-5.0.0.tgz"; + sha512 = "0127ahzbflhc6hx78rgfx200waslqq5gxi2a9bxjybzyr9h99k9hd8nrx1qf9vsvnfbdhckjwm1sx1ady1hhj8w217v0ayyj9c1h39h"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; dependencies = [ sources."acorn-5.7.1" @@ -35014,6 +35557,7 @@ in sources."microee-0.0.6" sources."minilog-3.1.0" sources."ms-2.0.0" +<<<<<<< HEAD <<<<<<< HEAD sources."simple-git-1.96.0" ======= @@ -35023,6 +35567,9 @@ in sources."simple-git-1.96.0" >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +======= + sources."simple-git-1.96.0" +>>>>>>> nodePackages: meguca: 1.0.7 update sources."tabtab-git+https://github.com/mixu/node-tabtab.git" ]; buildInputs = globalBuildInputs; @@ -36197,6 +36744,7 @@ in javascript-typescript-langserver = nodeEnv.buildNodePackage { name = "javascript-typescript-langserver"; packageName = "javascript-typescript-langserver"; +<<<<<<< HEAD <<<<<<< HEAD version = "2.10.0"; src = fetchurl { @@ -36215,6 +36763,12 @@ in sha512 = "0f3mqalx44w1zfhy6vl299rp18mg4s35gass533sgw7hr7dcf6vzwy3dcik1ncl0xss1bbs4vi7a3mbxhrddm7pd2r36hmpgnp29hn5"; >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +======= + version = "2.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.10.0.tgz"; + sha512 = "22z8vbjh8g3djcmm664zzb4qg65jgi95k381y9sc9nfdp52ykqg858v98fbj6cmjx9rhydrfpimb4rjb9bs9z7spa2z15qciyb0xhnb"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; dependencies = [ sources."ansi-color-0.2.1" @@ -36272,6 +36826,7 @@ in sources."type-detect-4.0.8" sources."typescript-2.8.3" sources."vscode-jsonrpc-3.6.2" +<<<<<<< HEAD <<<<<<< HEAD sources."vscode-languageserver-4.2.1" sources."vscode-languageserver-protocol-3.8.1" @@ -36284,6 +36839,10 @@ in }) sources."vscode-languageserver-protocol-3.5.1" >>>>>>> nodePackages: meguca: 1.0.5 -> 1.0.7 +======= + sources."vscode-languageserver-4.2.1" + sources."vscode-languageserver-protocol-3.8.1" +>>>>>>> nodePackages: meguca: 1.0.7 update sources."vscode-languageserver-types-3.8.2" sources."vscode-uri-1.0.5" sources."wrappy-1.0.2" @@ -36586,6 +37145,7 @@ in json-server = nodeEnv.buildNodePackage { name = "json-server"; packageName = "json-server"; +<<<<<<< HEAD <<<<<<< HEAD version = "0.14.0"; src = fetchurl { @@ -36598,12 +37158,17 @@ in url = "https://registry.npmjs.org/json-server/-/json-server-0.13.0.tgz"; sha512 = "0lz3n3y62gvdiqazgqbpfb9pdxwjvrjaagzs46ihsl6h6k18d7qmcw6bxiv30jkm3b6alb6p0l48jrym12sksx23am9bmibx45jwiq2"; ======= +======= +>>>>>>> nodePackages: meguca: 1.0.7 update version = "0.14.0"; src = fetchurl { url = "https://registry.npmjs.org/json-server/-/json-server-0.14.0.tgz"; sha512 = "2h1d9wf557i5nxbh5fygbgjd7vywandxnm7cpwyxnzmxqw8mvrnsmcj1m87b2zlxlpvigwq8jqc7igshb0zpfkw1bjs4fskpl0m25gi"; +<<<<<<< HEAD >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +======= +>>>>>>> nodePackages: meguca: 1.0.7 update }; dependencies = [ sources."accepts-1.3.5" @@ -36893,7 +37458,11 @@ in version = "2.0.4"; src = fetchurl { url = "https://registry.npmjs.org/karma/-/karma-2.0.4.tgz"; +<<<<<<< HEAD sha512 = "32yhTwoi6BZgJZhR78GwhzyFABbYG/1WwQqYgY7Vh96Demvua2jM3+FyRltIMTUH/Kd5xaQvDw2L7jTvkYFeXg=="; +======= + sha512 = "1g5x0cixwsfx2qd1wps9ibrlzy0fd9i91dlcwp1vz66hszfddx87pl7sn78360aq5bgs6yq2q08ag47n30yylcq4mh1ds12197s2v6z"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; dependencies = [ sources."accepts-1.3.5" @@ -36910,7 +37479,18 @@ in }) sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" +<<<<<<< HEAD sources."anymatch-2.0.0" +======= + (sources."anymatch-2.0.0" // { + dependencies = [ + sources."is-accessor-descriptor-1.0.0" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + sources."is-extendable-1.0.1" + ]; + }) +>>>>>>> nodePackages: meguca: 1.0.7 update sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" @@ -36937,7 +37517,16 @@ in sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ +<<<<<<< HEAD sources."define-property-1.0.0" +======= + (sources."define-property-1.0.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + sources."kind-of-3.2.2" +>>>>>>> nodePackages: meguca: 1.0.7 update ]; }) sources."base64-arraybuffer-0.1.5" @@ -36960,8 +37549,14 @@ in sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { dependencies = [ +<<<<<<< HEAD sources."extend-shallow-2.0.1" sources."is-extendable-0.1.1" +======= + sources."is-accessor-descriptor-1.0.0" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" +>>>>>>> nodePackages: meguca: 1.0.7 update ]; }) sources."buffer-more-ints-0.0.2" @@ -36971,11 +37566,41 @@ in sources."callsite-1.0.0" sources."caseless-0.12.0" sources."chalk-1.1.3" +<<<<<<< HEAD sources."chokidar-2.0.4" +======= + (sources."chokidar-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + sources."has-values-0.1.4" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."is-extendable-0.1.1" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."kind-of-3.2.2" + sources."source-map-0.5.7" + ]; + }) +>>>>>>> nodePackages: meguca: 1.0.7 update sources."circular-json-0.5.4" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" +<<<<<<< HEAD (sources."is-accessor-descriptor-0.1.6" // { dependencies = [ sources."kind-of-3.2.2" @@ -36988,6 +37613,8 @@ in }) sources."is-descriptor-0.1.6" sources."kind-of-5.1.0" +======= +>>>>>>> nodePackages: meguca: 1.0.7 update ]; }) sources."co-4.6.0" @@ -37049,6 +37676,7 @@ in dependencies = [ sources."array-unique-0.2.1" sources."braces-0.1.5" +<<<<<<< HEAD ]; }) (sources."expand-brackets-2.1.4" // { @@ -37072,17 +37700,32 @@ in }) (sources."expand-range-0.1.1" // { dependencies = [ +======= +>>>>>>> nodePackages: meguca: 1.0.7 update sources."is-number-0.1.1" sources."repeat-string-0.2.2" ]; }) +<<<<<<< HEAD +======= + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."define-property-0.2.5" + ]; + }) + sources."expand-range-0.1.1" +>>>>>>> nodePackages: meguca: 1.0.7 update sources."extend-3.0.1" sources."extend-shallow-3.0.2" (sources."extglob-2.0.4" // { dependencies = [ sources."define-property-1.0.0" sources."extend-shallow-2.0.1" +<<<<<<< HEAD sources."is-extendable-0.1.1" +======= + sources."kind-of-5.1.0" +>>>>>>> nodePackages: meguca: 1.0.7 update ]; }) sources."extsprintf-1.3.0" @@ -37090,6 +37733,7 @@ in sources."fast-json-stable-stringify-2.0.0" sources."fast-levenshtein-2.0.6" sources."file-uri-to-path-1.0.0" +<<<<<<< HEAD (sources."fill-range-4.0.0" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -37106,6 +37750,11 @@ in sources."debug-3.1.0" ]; }) +======= + sources."fill-range-4.0.0" + sources."finalhandler-1.1.0" + sources."follow-redirects-1.5.0" +>>>>>>> nodePackages: meguca: 1.0.7 update sources."for-in-1.0.2" sources."forever-agent-0.6.1" sources."form-data-2.3.2" @@ -37130,6 +37779,17 @@ in sources."is-glob-3.1.0" ]; }) +<<<<<<< HEAD +======= + sources."get-value-2.0.6" + sources."getpass-0.1.7" + sources."glob-7.1.2" + (sources."glob-parent-3.1.0" // { + dependencies = [ + sources."is-glob-3.1.0" + ]; + }) +>>>>>>> nodePackages: meguca: 1.0.7 update sources."graceful-fs-4.1.11" sources."har-schema-2.0.0" sources."har-validator-5.0.3" @@ -37141,11 +37801,15 @@ in }) sources."has-cors-1.1.0" sources."has-value-1.0.0" +<<<<<<< HEAD (sources."has-values-1.0.0" // { dependencies = [ sources."kind-of-4.0.0" ]; }) +======= + sources."has-values-1.0.0" +>>>>>>> nodePackages: meguca: 1.0.7 update sources."hawk-3.1.3" sources."hipchat-notifier-1.1.0" sources."hoek-2.16.3" @@ -37180,11 +37844,16 @@ in sources."is-glob-4.0.0" sources."is-my-ip-valid-1.0.0" sources."is-my-json-valid-2.17.2" +<<<<<<< HEAD (sources."is-number-3.0.0" // { dependencies = [ sources."kind-of-3.2.2" ]; }) +======= + sources."is-number-4.0.0" + sources."is-odd-2.0.0" +>>>>>>> nodePackages: meguca: 1.0.7 update sources."is-plain-object-2.0.4" sources."is-property-1.0.2" sources."is-stream-1.1.0" @@ -37211,12 +37880,16 @@ in sources."libqp-1.1.0" sources."lodash-4.17.10" sources."lodash.debounce-4.0.8" +<<<<<<< HEAD (sources."log4js-2.10.0" // { dependencies = [ sources."debug-3.1.0" ]; }) (sources."loggly-1.1.1" // { +======= + (sources."log4js-2.9.0" // { +>>>>>>> nodePackages: meguca: 1.0.7 update dependencies = [ sources."assert-plus-0.2.0" sources."aws-sign2-0.6.0" @@ -37239,7 +37912,26 @@ in sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."media-typer-0.3.0" +<<<<<<< HEAD sources."micromatch-3.1.10" +======= + (sources."micromatch-3.1.10" // { + dependencies = [ + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."is-extendable-0.1.1" + ]; + }) +>>>>>>> nodePackages: meguca: 1.0.7 update sources."mime-1.6.0" sources."mime-db-1.33.0" sources."mime-types-2.1.18" @@ -37249,7 +37941,11 @@ in sources."mkdirp-0.5.1" sources."ms-2.0.0" sources."nan-2.10.0" +<<<<<<< HEAD sources."nanomatch-1.2.13" +======= + sources."nanomatch-1.2.9" +>>>>>>> nodePackages: meguca: 1.0.7 update sources."negotiator-0.6.1" sources."netmask-1.0.6" sources."node-uuid-1.4.8" @@ -37267,6 +37963,7 @@ in sources."normalize-path-2.1.1" sources."oauth-sign-0.8.2" sources."object-component-0.0.3" +<<<<<<< HEAD (sources."object-copy-0.1.0" // { dependencies = [ sources."define-property-0.2.5" @@ -37280,6 +37977,9 @@ in sources."kind-of-3.2.2" ]; }) +======= + sources."object-copy-0.1.0" +>>>>>>> nodePackages: meguca: 1.0.7 update sources."object-visit-1.0.1" sources."object.pick-1.3.0" sources."on-finished-2.3.0" @@ -37347,17 +38047,38 @@ in sources."safer-buffer-2.1.2" sources."semver-5.5.0" sources."set-immediate-shim-1.0.1" +<<<<<<< HEAD (sources."set-value-2.0.0" // { dependencies = [ sources."extend-shallow-2.0.1" sources."is-extendable-0.1.1" ]; }) +======= + sources."set-value-2.0.0" +>>>>>>> nodePackages: meguca: 1.0.7 update sources."setprototypeof-1.1.0" sources."slack-node-0.2.0" sources."smart-buffer-1.1.15" sources."smtp-connection-2.12.0" (sources."snapdragon-0.8.2" // { +<<<<<<< HEAD +======= + dependencies = [ + (sources."define-property-0.2.5" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."extend-shallow-2.0.1" + sources."kind-of-4.0.0" + ]; + }) + sources."snapdragon-node-2.1.1" + sources."snapdragon-util-3.0.1" + sources."sntp-1.0.9" + (sources."socket.io-2.0.4" // { +>>>>>>> nodePackages: meguca: 1.0.7 update dependencies = [ sources."define-property-0.2.5" sources."extend-shallow-2.0.1" @@ -37402,6 +38123,7 @@ in sources."source-map-0.6.1" sources."source-map-resolve-0.5.2" sources."source-map-url-0.4.0" +<<<<<<< HEAD sources."split-string-3.1.0" sources."sshpk-1.14.2" (sources."static-extend-0.1.2" // { @@ -37421,6 +38143,16 @@ in sources."kind-of-5.1.0" ]; }) +======= + (sources."split-string-3.1.0" // { + dependencies = [ + sources."extend-shallow-3.0.2" + sources."is-extendable-1.0.1" + ]; + }) + sources."sshpk-1.14.2" + sources."static-extend-0.1.2" +>>>>>>> nodePackages: meguca: 1.0.7 update sources."statuses-1.5.0" (sources."streamroller-0.7.0" // { dependencies = [ @@ -37435,11 +38167,15 @@ in sources."timespan-2.3.0" sources."tmp-0.0.33" sources."to-array-0.1.4" +<<<<<<< HEAD (sources."to-object-path-0.3.0" // { dependencies = [ sources."kind-of-3.2.2" ]; }) +======= + sources."to-object-path-0.3.0" +>>>>>>> nodePackages: meguca: 1.0.7 update sources."to-regex-3.0.2" sources."to-regex-range-2.1.1" sources."tough-cookie-2.3.4" @@ -37452,8 +38188,11 @@ in sources."underscore-1.7.0" (sources."union-value-1.0.0" // { dependencies = [ +<<<<<<< HEAD sources."extend-shallow-2.0.1" sources."is-extendable-0.1.1" +======= +>>>>>>> nodePackages: meguca: 1.0.7 update sources."set-value-0.4.3" ]; }) @@ -37465,12 +38204,23 @@ in sources."isobject-2.1.0" ]; }) +<<<<<<< HEAD sources."has-values-0.1.4" +======= +>>>>>>> nodePackages: meguca: 1.0.7 update ]; }) sources."upath-1.1.0" sources."urix-0.1.0" +<<<<<<< HEAD sources."use-3.1.0" +======= + (sources."use-3.1.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) +>>>>>>> nodePackages: meguca: 1.0.7 update (sources."useragent-2.2.1" // { dependencies = [ sources."lru-cache-2.2.4" @@ -38522,345 +39272,6 @@ in production = true; bypassCache = false; }; -<<<<<<< HEAD -======= - lcov-result-merger = nodeEnv.buildNodePackage { - name = "lcov-result-merger"; - packageName = "lcov-result-merger"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lcov-result-merger/-/lcov-result-merger-3.0.0.tgz"; - sha512 = "2l5nw2y7yblpyp45q06dwd1yhrd5np1q1nxm27lx7kjdjrdscry6qp5rsm04v9ccsa31ccmdl9mx4vmrp95zmbbij6p4bdbfvqzv1p9"; - }; - dependencies = [ - sources."append-buffer-1.0.2" - sources."balanced-match-1.0.0" - sources."brace-expansion-1.1.11" - sources."buffer-equal-1.0.0" - sources."clone-2.1.2" - sources."clone-buffer-1.0.0" - sources."clone-stats-1.0.0" - sources."cloneable-readable-1.1.2" - sources."concat-map-0.0.1" - sources."convert-source-map-1.5.1" - sources."core-util-is-1.0.2" - sources."define-properties-1.1.2" - sources."duplexify-3.6.0" - sources."end-of-stream-1.4.1" - sources."extend-3.0.1" - sources."flush-write-stream-1.0.3" - sources."foreach-2.0.5" - sources."fs-mkdirp-stream-1.0.0" - sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" - sources."glob-7.1.2" - sources."glob-parent-3.1.0" - sources."glob-stream-6.1.0" - sources."graceful-fs-4.1.11" - sources."has-symbols-1.0.0" - sources."inflight-1.0.6" - sources."inherits-2.0.3" - sources."is-absolute-1.0.0" - sources."is-buffer-1.1.6" - sources."is-extglob-2.1.1" - sources."is-glob-3.1.0" - sources."is-negated-glob-1.0.0" - sources."is-relative-1.0.0" - sources."is-unc-path-1.0.0" - sources."is-utf8-0.2.1" - sources."is-valid-glob-1.0.0" - sources."is-windows-1.0.2" - sources."isarray-1.0.0" - sources."json-stable-stringify-1.0.1" - sources."jsonify-0.0.0" - sources."lazystream-1.0.0" - sources."lead-1.0.0" - sources."minimatch-3.0.4" - sources."normalize-path-2.1.1" - sources."now-and-later-2.0.0" - sources."object-keys-1.0.11" - sources."object.assign-4.1.0" - sources."once-1.4.0" - sources."ordered-read-streams-1.0.1" - sources."path-dirname-1.0.2" - sources."path-is-absolute-1.0.1" - sources."process-nextick-args-2.0.0" - sources."pump-2.0.1" - sources."pumpify-1.5.1" - sources."readable-stream-2.3.6" - sources."remove-bom-buffer-3.0.0" - sources."remove-bom-stream-1.2.0" - sources."remove-trailing-separator-1.1.0" - sources."replace-ext-1.0.0" - sources."resolve-options-1.1.0" - 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-filter-2.0.0" - sources."to-absolute-glob-2.0.2" - sources."to-through-2.0.0" - sources."unc-path-regex-0.1.2" - sources."unique-stream-2.2.1" - sources."util-deprecate-1.0.2" - sources."value-or-function-3.0.0" - sources."vinyl-2.1.0" - sources."vinyl-fs-3.0.3" - sources."vinyl-sourcemap-1.1.0" - sources."wrappy-1.0.2" - sources."xtend-4.0.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Merges multiple lcov results into one"; - homepage = https://github.com/mweibel/lcov-result-merger; - license = "MIT"; - }; - production = true; - bypassCache = false; - }; - livedown = nodeEnv.buildNodePackage { - name = "livedown"; - packageName = "livedown"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/livedown/-/livedown-2.1.1.tgz"; - sha512 = "3pnrrz3blfy50s64c4wdj9gjl8zv3p72wd0vmrk86qjdd676g9sj4cwywp356r633csg568pczll7pfb6sxpm0x9fvbk4zhwvdpb70b"; - }; - dependencies = [ - sources."accepts-1.3.5" - sources."after-0.8.2" - sources."ajv-5.5.2" - sources."anymatch-1.3.2" - sources."argparse-1.0.10" - sources."arr-diff-2.0.0" - sources."arr-flatten-1.1.0" - sources."array-flatten-1.1.1" - sources."array-unique-0.2.1" - sources."arraybuffer.slice-0.0.7" - sources."asn1-0.2.3" - sources."assert-plus-1.0.0" - sources."async-each-1.0.1" - sources."async-limiter-1.0.0" - sources."asynckit-0.4.0" - sources."aws-sign2-0.7.0" - sources."aws4-1.7.0" - sources."backo2-1.0.2" - sources."balanced-match-1.0.0" - sources."base64-arraybuffer-0.1.5" - sources."base64id-1.0.0" - sources."bcrypt-pbkdf-1.0.1" - sources."better-assert-1.0.2" - sources."binary-extensions-1.11.0" - sources."blob-0.0.4" - sources."body-parser-1.18.3" - sources."brace-expansion-1.1.11" - (sources."braces-1.8.5" // { - dependencies = [ - sources."kind-of-6.0.2" - ]; - }) - sources."bytes-3.0.0" - sources."callsite-1.0.0" - sources."caseless-0.12.0" - sources."chokidar-1.7.0" - sources."co-4.6.0" - sources."combined-stream-1.0.6" - sources."component-bind-1.0.0" - sources."component-emitter-1.2.1" - sources."component-inherit-0.0.3" - sources."concat-map-0.0.1" - sources."content-disposition-0.5.2" - sources."content-type-1.0.4" - sources."cookie-0.3.1" - sources."cookie-signature-1.0.6" - sources."core-util-is-1.0.2" - sources."dashdash-1.14.1" - sources."debug-2.6.9" - sources."delayed-stream-1.0.0" - sources."depd-1.1.2" - sources."destroy-1.0.4" - sources."ecc-jsbn-0.1.1" - sources."ee-first-1.1.1" - sources."emoji-regex-6.1.1" - sources."encodeurl-1.0.2" - sources."engine.io-3.2.0" - sources."engine.io-client-3.2.1" - sources."engine.io-parser-2.1.2" - sources."entities-1.1.1" - sources."escape-html-1.0.3" - sources."etag-1.8.1" - sources."expand-brackets-0.1.5" - sources."expand-range-1.8.2" - (sources."express-4.16.3" // { - dependencies = [ - (sources."body-parser-1.18.2" // { - dependencies = [ - sources."setprototypeof-1.0.3" - ]; - }) - sources."iconv-lite-0.4.19" - sources."qs-6.5.1" - (sources."raw-body-2.3.2" // { - dependencies = [ - sources."depd-1.1.1" - sources."http-errors-1.6.2" - ]; - }) - sources."safe-buffer-5.1.1" - sources."statuses-1.4.0" - ]; - }) - sources."extend-3.0.1" - sources."extglob-0.3.2" - sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.1.0" - sources."fast-json-stable-stringify-2.0.0" - sources."filename-regex-2.0.1" - sources."fill-range-2.2.4" - sources."finalhandler-1.1.1" - sources."for-in-1.0.2" - sources."for-own-0.1.5" - sources."forever-agent-0.6.1" - sources."form-data-2.3.2" - sources."forwarded-0.1.2" - sources."fresh-0.5.2" - sources."fsevents-1.2.4" - sources."getpass-0.1.7" - sources."github-slugger-1.2.0" - sources."glob-base-0.3.0" - sources."glob-parent-2.0.0" - sources."graceful-fs-4.1.11" - sources."har-schema-2.0.0" - sources."har-validator-5.0.3" - sources."has-binary2-1.0.3" - sources."has-cors-1.1.0" - sources."html-entities-1.2.1" - sources."http-errors-1.6.3" - sources."http-signature-1.2.0" - sources."iconv-lite-0.4.23" - sources."indexof-0.0.1" - sources."inherits-2.0.3" - sources."innertext-1.0.3" - sources."ipaddr.js-1.6.0" - sources."is-binary-path-1.0.1" - sources."is-buffer-1.1.6" - sources."is-dotfile-1.0.3" - sources."is-equal-shallow-0.1.3" - sources."is-extendable-0.1.1" - sources."is-extglob-1.0.0" - sources."is-glob-2.0.1" - sources."is-number-2.1.0" - sources."is-posix-bracket-0.1.1" - sources."is-primitive-2.0.0" - sources."is-typedarray-1.0.0" - sources."is-wsl-1.1.0" - sources."isarray-1.0.0" - sources."isobject-2.1.0" - sources."isstream-0.1.2" - sources."jsbn-0.1.1" - sources."json-schema-0.2.3" - sources."json-schema-traverse-0.3.1" - sources."json-stringify-safe-5.0.1" - sources."jsprim-1.4.1" - sources."kind-of-3.2.2" - sources."linkify-it-2.0.3" - sources."markdown-it-8.4.1" - sources."markdown-it-emoji-1.4.0" - sources."markdown-it-github-headings-1.1.1" - sources."markdown-it-task-checkbox-1.0.6" - sources."math-random-1.0.1" - sources."mdurl-1.0.1" - sources."media-typer-0.3.0" - sources."merge-descriptors-1.0.1" - sources."methods-1.1.2" - sources."micromatch-2.3.11" - sources."mime-1.4.1" - sources."mime-db-1.33.0" - sources."mime-types-2.1.18" - sources."minimatch-3.0.4" - sources."minimist-1.2.0" - sources."ms-2.0.0" - sources."nan-2.10.0" - sources."negotiator-0.6.1" - sources."normalize-path-2.1.1" - sources."oauth-sign-0.8.2" - sources."object-component-0.0.3" - sources."object.omit-2.0.1" - sources."on-finished-2.3.0" - sources."opn-5.3.0" - sources."parse-glob-3.0.4" - sources."parseqs-0.0.5" - sources."parseuri-0.0.5" - sources."parseurl-1.3.2" - sources."path-is-absolute-1.0.1" - sources."path-to-regexp-0.1.7" - sources."performance-now-2.1.0" - sources."preserve-0.2.0" - sources."process-nextick-args-2.0.0" - sources."proxy-addr-2.0.3" - sources."punycode-1.4.1" - sources."qs-6.5.2" - (sources."randomatic-3.0.0" // { - dependencies = [ - sources."is-number-4.0.0" - ]; - }) - sources."range-parser-1.2.0" - sources."raw-body-2.3.3" - sources."readable-stream-2.3.6" - sources."readdirp-2.1.0" - sources."regex-cache-0.4.4" - sources."remove-trailing-separator-1.1.0" - sources."repeat-element-1.1.2" - sources."repeat-string-1.6.1" - sources."request-2.87.0" - sources."safe-buffer-5.1.2" - sources."safer-buffer-2.1.2" - sources."send-0.16.2" - sources."serve-static-1.13.2" - sources."set-immediate-shim-1.0.1" - sources."setprototypeof-1.1.0" - (sources."socket.io-2.1.1" // { - dependencies = [ - sources."debug-3.1.0" - sources."isarray-2.0.1" - ]; - }) - sources."socket.io-adapter-1.1.1" - sources."socket.io-client-2.1.1" - sources."socket.io-parser-3.2.0" - sources."sprintf-js-1.0.3" - sources."sshpk-1.14.2" - sources."statuses-1.5.0" - sources."string_decoder-1.1.1" - sources."to-array-0.1.4" - sources."tough-cookie-2.3.4" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" - sources."type-is-1.6.16" - sources."uc.micro-1.0.5" - sources."ultron-1.1.1" - sources."unpipe-1.0.0" - sources."util-deprecate-1.0.2" - sources."utils-merge-1.0.1" - sources."uuid-3.2.1" - sources."vary-1.1.2" - sources."verror-1.10.0" - sources."ws-3.3.3" - sources."xmlhttprequest-ssl-1.5.5" - sources."yeast-0.1.2" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Live Markdown previews for your favourite editor."; - homepage = https://github.com/shime/livedown; - license = "MIT"; - }; - production = true; - bypassCache = false; - }; ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 live-server = nodeEnv.buildNodePackage { name = "live-server"; packageName = "live-server"; @@ -39352,6 +39763,7 @@ in sources."through2-2.0.3" ]; }) +<<<<<<< HEAD (sources."@gulp-sourcemaps/map-sources-1.0.0" // { dependencies = [ sources."readable-stream-2.3.6" @@ -39367,6 +39779,10 @@ in sources."uglify-js-2.8.29" ]; }) +======= + sources."@gulp-sourcemaps/map-sources-1.0.0" + sources."accord-0.28.0" +>>>>>>> nodePackages: meguca: 1.0.7 update sources."acorn-5.7.1" sources."ajv-4.11.8" (sources."align-text-0.1.4" // { @@ -39420,6 +39836,7 @@ in sources."cache-base-1.0.1" sources."camelcase-1.2.1" <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD sources."caniuse-lite-1.0.30000850" @@ -39427,6 +39844,9 @@ in sources."caniuse-lite-1.0.30000851" >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +======= + sources."caniuse-lite-1.0.30000856" +>>>>>>> nodePackages: meguca: 1.0.7 update sources."caseless-0.12.0" sources."center-align-0.1.3" sources."chalk-1.1.3" @@ -39498,6 +39918,7 @@ in sources."detect-file-1.0.0" sources."detect-newline-2.1.0" sources."dom4-2.1.0" +<<<<<<< HEAD (sources."duplexer2-0.0.2" // { dependencies = [ sources."isarray-0.0.1" @@ -39513,6 +39934,12 @@ in ]; }) sources."ecc-jsbn-0.1.1" +======= + sources."duplexer2-0.0.2" + sources."duplexify-3.6.0" + sources."ecc-jsbn-0.1.1" + sources."electron-to-chromium-1.3.50" +>>>>>>> nodePackages: meguca: 1.0.7 update sources."end-of-stream-0.1.5" sources."errno-0.1.7" sources."es5-ext-0.10.45" @@ -39641,6 +40068,10 @@ in sources."through2-2.0.3" ]; }) +<<<<<<< HEAD +======= + sources."gulp-rename-1.3.0" +>>>>>>> nodePackages: meguca: 1.0.7 update (sources."gulp-sourcemaps-2.6.4" // { dependencies = [ sources."graceful-fs-4.1.11" @@ -39680,6 +40111,10 @@ in sources."readable-stream-2.3.6" sources."string_decoder-1.1.1" sources."through2-2.0.3" +<<<<<<< HEAD +======= + sources."uglify-js-3.4.1" +>>>>>>> nodePackages: meguca: 1.0.7 update ]; }) (sources."gulp-util-3.0.8" // { @@ -39824,6 +40259,7 @@ in sources."now-and-later-2.0.0" sources."oauth-sign-0.8.2" sources."object-assign-4.1.1" +<<<<<<< HEAD (sources."object-copy-0.1.0" // { dependencies = [ sources."define-property-0.2.5" @@ -39837,6 +40273,9 @@ in sources."kind-of-3.2.2" ]; }) +======= + sources."object-copy-0.1.0" +>>>>>>> nodePackages: meguca: 1.0.7 update sources."object-keys-1.0.12" sources."object-visit-1.0.1" sources."object.assign-4.1.0" @@ -40371,6 +40810,7 @@ in sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.1" sources."block-stream-0.0.9" +<<<<<<< HEAD <<<<<<< HEAD sources."boom-2.10.1" ======= @@ -40379,6 +40819,9 @@ in sources."boom-2.10.1" >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +======= + sources."boom-2.10.1" +>>>>>>> nodePackages: meguca: 1.0.7 update sources."brace-expansion-1.1.11" sources."caseless-0.12.0" sources."co-4.6.0" @@ -40387,6 +40830,7 @@ in sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" +<<<<<<< HEAD <<<<<<< HEAD sources."cryptiles-2.0.5" (sources."dashdash-1.14.1" // { @@ -40397,8 +40841,9 @@ in ======= <<<<<<< HEAD ======= +======= +>>>>>>> nodePackages: meguca: 1.0.7 update sources."cryptiles-2.0.5" ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 sources."dashdash-1.14.1" >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 sources."delayed-stream-1.0.0" @@ -40421,6 +40866,7 @@ in sources."har-schema-1.0.5" sources."har-validator-4.2.1" sources."has-unicode-2.0.1" +<<<<<<< HEAD <<<<<<< HEAD sources."hawk-3.1.3" sources."hoek-2.16.3" @@ -40434,6 +40880,11 @@ in sources."http-signature-1.1.1" >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +======= + sources."hawk-3.1.3" + sources."hoek-2.16.3" + sources."http-signature-1.1.1" +>>>>>>> nodePackages: meguca: 1.0.7 update sources."inflight-1.0.6" sources."inherits-2.0.3" sources."is-fullwidth-code-point-1.0.0" @@ -40471,6 +40922,7 @@ in sources."punycode-1.4.1" sources."qs-6.4.0" sources."readable-stream-2.3.6" +<<<<<<< HEAD <<<<<<< HEAD sources."request-2.81.0" ======= @@ -40480,6 +40932,9 @@ in sources."request-2.81.0" >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +======= + sources."request-2.81.0" +>>>>>>> nodePackages: meguca: 1.0.7 update sources."rimraf-2.6.2" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" @@ -40487,11 +40942,14 @@ in sources."set-blocking-2.0.0" sources."signal-exit-3.0.2" <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD sources."sshpk-1.14.2" ======= >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +======= +>>>>>>> nodePackages: meguca: 1.0.7 update sources."sntp-1.0.9" (sources."sshpk-1.14.2" // { dependencies = [ @@ -40499,9 +40957,12 @@ in ]; }) <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +======= +>>>>>>> nodePackages: meguca: 1.0.7 update sources."string-width-1.0.2" sources."string_decoder-1.1.1" sources."stringstream-0.0.6" @@ -40583,12 +41044,12 @@ in sources."yargs-1.3.3" ]; }) -<<<<<<< HEAD - sources."big-integer-1.6.30" -======= sources."big-integer-1.6.31" +<<<<<<< HEAD >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +======= +>>>>>>> nodePackages: meguca: 1.0.7 update sources."block-stream-0.0.9" sources."body-parser-1.18.2" sources."boom-2.10.1" @@ -40861,10 +41322,17 @@ in node-pre-gyp = nodeEnv.buildNodePackage { name = "node-pre-gyp"; packageName = "node-pre-gyp"; +<<<<<<< HEAD version = "0.10.2"; src = fetchurl { url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.2.tgz"; sha512 = "16lql9QTqs6KsB9fl3neWyZm02KxIKdI9FlJjrB0y7eMTP5Nyz+xalwPbOlw3iw7EejllJPmlJSnY711PLD1ug=="; +======= + version = "0.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.1.tgz"; + sha512 = "354ilrqnamjvp509zxg2liq7483lr9rwynh048dzqqxw5z0dskc9f43p3wjgfmji1lk85idppiw9rqj4jlkypvlxkm0h0vrj45x7s7f"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; dependencies = [ sources."abbrev-1.1.1" @@ -40985,9 +41453,13 @@ in sources."camelcase-4.1.0" sources."capture-stack-trace-1.0.0" sources."chalk-2.4.1" +<<<<<<< HEAD sources."chokidar-2.0.4" sources."ci-info-1.1.3" (sources."class-utils-0.3.6" // { +======= + (sources."chokidar-2.0.4" // { +>>>>>>> nodePackages: meguca: 1.0.7 update dependencies = [ sources."define-property-0.2.5" (sources."is-accessor-descriptor-0.1.6" // { @@ -41547,7 +42019,14 @@ in }) sources."minimatch-3.0.4" sources."minimist-1.2.0" +<<<<<<< HEAD (sources."mkdirp-0.5.1" // { +======= + sources."mkdirp-0.5.1" + sources."moment-2.22.2" + sources."moment-timezone-0.5.21" + (sources."mqtt-2.18.0" // { +>>>>>>> nodePackages: meguca: 1.0.7 update dependencies = [ sources."minimist-0.0.8" ]; @@ -41587,11 +42066,7 @@ in ]; }) sources."node-red-node-rbe-0.2.3" -<<<<<<< HEAD - sources."node-red-node-twitter-0.1.15" -======= sources."node-red-node-twitter-1.0.1" ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 sources."nodemailer-1.11.0" sources."nodemailer-direct-transport-1.1.0" sources."nodemailer-smtp-transport-1.1.0" @@ -41828,6 +42303,7 @@ in sources."qs-0.5.1" sources."rai-0.1.12" sources."range-parser-0.0.4" +<<<<<<< HEAD <<<<<<< HEAD (sources."raw-socket-1.6.2" // { dependencies = [ @@ -41841,6 +42317,9 @@ in sources."raw-socket-1.6.2" >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +======= + sources."raw-socket-1.6.2" +>>>>>>> nodePackages: meguca: 1.0.7 update sources."redis-0.7.3" sources."semver-1.1.0" sources."send-0.1.0" @@ -42751,6 +43230,7 @@ in sources."balanced-match-1.0.0" sources."base64-js-0.0.8" sources."bencode-2.0.0" +<<<<<<< HEAD <<<<<<< HEAD sources."big-integer-1.6.32" sources."bitfield-0.1.0" @@ -42768,8 +43248,9 @@ in <<<<<<< HEAD sources."big-integer-1.6.30" ======= +======= +>>>>>>> nodePackages: meguca: 1.0.7 update sources."big-integer-1.6.31" ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 sources."bitfield-0.1.0" sources."bittorrent-dht-6.4.2" sources."bittorrent-tracker-7.7.0" @@ -42797,6 +43278,7 @@ in sources."cli-width-2.2.0" sources."clivas-0.2.0" sources."code-point-at-1.1.0" +<<<<<<< HEAD <<<<<<< HEAD sources."color-convert-1.9.2" sources."color-name-1.1.1" @@ -42804,6 +43286,10 @@ in sources."color-convert-1.9.1" sources."color-name-1.1.3" >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +======= + sources."color-convert-1.9.2" + sources."color-name-1.1.1" +>>>>>>> nodePackages: meguca: 1.0.7 update sources."compact2string-1.4.0" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" @@ -42953,8 +43439,12 @@ in sources."random-access-storage-1.3.0" ======= sources."random-access-file-2.0.1" +<<<<<<< HEAD sources."random-access-storage-1.2.0" >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +======= + sources."random-access-storage-1.3.0" +>>>>>>> nodePackages: meguca: 1.0.7 update sources."random-iterate-1.0.1" sources."randombytes-2.0.6" sources."range-parser-1.2.0" @@ -43575,6 +44065,7 @@ in prettier = nodeEnv.buildNodePackage { name = "prettier"; packageName = "prettier"; +<<<<<<< HEAD <<<<<<< HEAD version = "1.13.7"; src = fetchurl { @@ -43587,12 +44078,17 @@ in url = "https://registry.npmjs.org/prettier/-/prettier-1.13.4.tgz"; sha512 = "325wxdf3kzhwx8wnfz13gnllivgbgsbwqfqmq3pv29gamzzwspajfjwz7iw83fxlzf3nyd038h4qv9y544v5b5fjvsh52n0crkh8svs"; ======= +======= +>>>>>>> nodePackages: meguca: 1.0.7 update version = "1.13.5"; src = fetchurl { url = "https://registry.npmjs.org/prettier/-/prettier-1.13.5.tgz"; sha512 = "1zp1phxpbbli50hpbka36wdqkhl4sz765zxb1xzkgmkmfmh1vpbbwcm91pllv4q633wj8v4iipkm09wn7gwvqb0gy8srkybzfcp9kz0"; +<<<<<<< HEAD >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +======= +>>>>>>> nodePackages: meguca: 1.0.7 update }; buildInputs = globalBuildInputs; meta = { @@ -43620,7 +44116,26 @@ in sources."acorn-5.7.1" sources."acorn-dynamic-import-3.0.0" sources."acorn-node-1.5.2" +<<<<<<< HEAD sources."anymatch-2.0.0" +======= + (sources."anymatch-2.0.0" // { + dependencies = [ + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."is-extendable-0.1.1" + ]; + }) +>>>>>>> nodePackages: meguca: 1.0.7 update sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" @@ -43691,7 +44206,18 @@ in sources."builtin-status-codes-3.0.0" sources."cache-base-1.0.1" sources."cached-path-relative-1.0.1" +<<<<<<< HEAD sources."chokidar-2.0.4" +======= + (sources."chokidar-2.0.4" // { + dependencies = [ + sources."is-accessor-descriptor-1.0.0" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + sources."is-extendable-1.0.1" + ]; + }) +>>>>>>> nodePackages: meguca: 1.0.7 update sources."cipher-base-1.0.4" (sources."class-utils-0.3.6" // { dependencies = [ @@ -43804,7 +44330,15 @@ in sources."inflight-1.0.6" sources."inherits-2.0.3" sources."inline-source-map-0.6.2" +<<<<<<< HEAD sources."insert-module-globals-7.2.0" +======= + (sources."insert-module-globals-7.2.0" // { + dependencies = [ + sources."concat-stream-1.6.2" + ]; + }) +>>>>>>> nodePackages: meguca: 1.0.7 update sources."is-accessor-descriptor-1.0.0" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" @@ -43827,11 +44361,15 @@ in sources."jsonify-0.0.0" sources."jsonparse-1.3.1" sources."kind-of-6.0.2" +<<<<<<< HEAD (sources."labeled-stream-splicer-2.0.1" // { dependencies = [ sources."isarray-2.0.4" ]; }) +======= + sources."labeled-stream-splicer-2.0.1" +>>>>>>> nodePackages: meguca: 1.0.7 update sources."lodash.debounce-4.0.8" sources."lodash.memoize-3.0.4" sources."map-cache-0.2.2" @@ -44253,7 +44791,17 @@ in sources."ms-2.0.0" sources."nan-2.5.1" sources."negotiator-0.6.1" +<<<<<<< HEAD sources."net-browserify-alt-1.1.0" +======= + (sources."net-browserify-alt-1.1.0" // { + dependencies = [ + sources."minimist-1.2.0" + sources."safe-buffer-5.0.1" + sources."tunnel-agent-0.4.3" + ]; + }) +>>>>>>> nodePackages: meguca: 1.0.7 update sources."node-abi-2.4.3" sources."node.extend-2.0.0" sources."noop-logger-0.1.1" @@ -44305,11 +44853,15 @@ in sources."readable-stream-2.3.6" sources."regenerator-runtime-0.11.1" sources."repeat-string-1.6.1" +<<<<<<< HEAD (sources."request-2.81.0" // { dependencies = [ sources."qs-6.4.0" ]; }) +======= + sources."request-2.81.0" +>>>>>>> nodePackages: meguca: 1.0.7 update sources."resolve-1.8.1" sources."right-align-0.1.3" sources."safe-buffer-5.1.1" @@ -44660,6 +45212,7 @@ in name = "serve"; packageName = "serve"; <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD version = "9.1.0"; src = fetchurl { @@ -44689,15 +45242,26 @@ in sha512 = "0cxicqbyqwpvfdsskdggc87mj4y789fv0b469dz3ynl8897dhwwwcc1p5f219c9wha1gxpx9qw61qlgpzk66kffrngvil054fv3laif"; >>>>>>> nodePackages: meguca: 1.0.5 -> 1.0.7 >>>>>>> nodePackages: meguca: 1.0.5 -> 1.0.7 +======= + version = "9.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/serve/-/serve-9.1.0.tgz"; + sha512 = "19r6bg34j5y388i59k3vxqgajv3k74f98pacsnq35w06m8ix8pmp31vzn3pspspjbbqpsq0j5pryqqjmjhn6m4ns06q5ky1hs4xgxg8"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; dependencies = [ sources."@zeit/schemas-1.2.0" sources."ajv-6.5.1" +<<<<<<< HEAD <<<<<<< HEAD sources."ansi-align-2.0.0" sources."ansi-regex-3.0.0" ======= >>>>>>> nodePackages: meguca: 1.0.5 -> 1.0.7 +======= + sources."ansi-align-2.0.0" + sources."ansi-regex-3.0.0" +>>>>>>> nodePackages: meguca: 1.0.7 update sources."ansi-styles-3.2.1" sources."arch-2.1.1" sources."arg-2.0.0" @@ -44723,16 +45287,21 @@ in sources."execa-0.7.0" sources."fast-deep-equal-2.0.1" sources."fast-json-stable-stringify-2.0.0" +<<<<<<< HEAD (sources."fast-url-parser-1.1.3" // { dependencies = [ sources."punycode-1.4.1" ]; }) +======= + sources."fast-url-parser-1.1.3" +>>>>>>> nodePackages: meguca: 1.0.7 update sources."get-stream-3.0.0" sources."glob-slash-1.0.0" sources."glob-slasher-1.0.1" sources."has-flag-3.0.0" sources."ini-1.3.5" +<<<<<<< HEAD <<<<<<< HEAD sources."is-fullwidth-code-point-2.0.0" sources."is-stream-1.1.0" @@ -44743,6 +45312,13 @@ in sources."json-schema-traverse-0.4.1" sources."lodash-2.4.2" >>>>>>> nodePackages: meguca: 1.0.5 -> 1.0.7 +======= + sources."is-fullwidth-code-point-2.0.0" + sources."is-stream-1.1.0" + sources."isexe-2.0.0" + sources."json-schema-traverse-0.4.1" + sources."lodash-4.17.10" +>>>>>>> nodePackages: meguca: 1.0.7 update sources."lodash._objecttypes-2.4.1" sources."lodash.isobject-2.4.1" sources."lru-cache-4.1.3" @@ -44761,6 +45337,7 @@ in sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" sources."safe-buffer-5.1.2" +<<<<<<< HEAD <<<<<<< HEAD sources."serve-handler-3.2.1" sources."shebang-command-1.2.0" @@ -44771,11 +45348,23 @@ in sources."strip-eof-1.0.0" ======= (sources."serve-handler-3.1.1" // { +======= + (sources."serve-handler-3.2.1" // { +>>>>>>> nodePackages: meguca: 1.0.7 update dependencies = [ sources."punycode-1.4.1" ]; }) +<<<<<<< HEAD >>>>>>> nodePackages: meguca: 1.0.5 -> 1.0.7 +======= + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."signal-exit-3.0.2" + sources."string-width-2.1.1" + sources."strip-ansi-4.0.0" + sources."strip-eof-1.0.0" +>>>>>>> nodePackages: meguca: 1.0.7 update sources."strip-json-comments-2.0.1" sources."supports-color-5.4.0" sources."term-size-1.2.0" @@ -45188,11 +45777,15 @@ in sources."path-is-absolute-1.0.1" sources."path-to-regexp-0.1.7" sources."performance-now-2.1.0" +<<<<<<< HEAD (sources."postcss-6.0.23" // { dependencies = [ sources."source-map-0.6.1" ]; }) +======= + sources."postcss-6.0.23" +>>>>>>> nodePackages: meguca: 1.0.7 update sources."process-nextick-args-2.0.0" sources."proxy-addr-1.1.5" sources."punycode-1.4.1" @@ -45929,7 +46522,11 @@ in version = "2.9.2"; src = fetchurl { url = "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz"; +<<<<<<< HEAD sha512 = "Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w=="; +======= + sha512 = "39mbnbv5shzcdgdidpzgzx35gy4g2b4vxmpcqjg0irymcivm5kc0yckb0vvmgyb2lwcn6282n1nc4s1d73k8f468jgqnsjdf7m2kghs"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; buildInputs = globalBuildInputs; meta = { @@ -46124,7 +46721,15 @@ in sources."tough-cookie-2.4.3" sources."typedarray-0.0.6" sources."typescript-2.9.2" +<<<<<<< HEAD sources."typings-core-2.3.3" +======= + (sources."typings-core-2.3.3" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) +>>>>>>> nodePackages: meguca: 1.0.7 update sources."unc-path-regex-0.1.2" sources."unique-string-1.0.0" sources."unzip-response-2.0.1" @@ -46160,10 +46765,17 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; +<<<<<<< HEAD version = "3.4.2"; src = fetchurl { url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.2.tgz"; sha512 = "/kVQDzwiE9Vy7Y63eMkMozF4jIt0C2+xHctF9YpqNWdE/NLOuMurshkpoYGUlAbeYhACPv0HJPIHJul0Ak4/uw=="; +======= + version = "3.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.1.tgz"; + sha512 = "2hafajm9v9l1if7nqn9kwngd1yrrra3m9hgbjpx4wffqh9a589cwid6bx18l9pfj7cwf90hlk2nim0akl9dvhww5ddc1zg4fsiq4dr1"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; dependencies = [ sources."commander-2.15.1" @@ -46181,6 +46793,7 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; +<<<<<<< HEAD <<<<<<< HEAD version = "1.4.26"; src = fetchurl { @@ -46199,6 +46812,12 @@ in sha512 = "2f8fb42a03zpqd715d09k2g39zwb8xwq7qjh6zrw543kn3g66mq0s8civhv9b4frai8phpqdxlhyd7dbvw4ykhbyfmfq3x220svvvxf"; >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +======= + version = "1.4.26"; + src = fetchurl { + url = "https://registry.npmjs.org/ungit/-/ungit-1.4.26.tgz"; + sha512 = "3d8n9rkc9lzqlhnqb6qvckax49zp4kaz84d4ay1y5ihg7ylb1cwh5cm1d4w1pkfxdq7gydm3l52nan91s3hnmf2hn8zzsp2pjpm43c4"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; dependencies = [ sources."abbrev-1.1.1" @@ -47101,6 +47720,7 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; +<<<<<<< HEAD <<<<<<< HEAD version = "4.13.0"; ======= @@ -47133,6 +47753,8 @@ in sources."@webassemblyjs/wast-parser-1.5.10" sources."@webassemblyjs/wast-printer-1.5.10" ======= +======= +>>>>>>> nodePackages: meguca: 1.0.7 update version = "4.12.0"; src = fetchurl { url = "https://registry.npmjs.org/webpack/-/webpack-4.12.0.tgz"; @@ -47158,12 +47780,16 @@ in sources."@webassemblyjs/wasm-parser-1.5.12" sources."@webassemblyjs/wast-parser-1.5.12" sources."@webassemblyjs/wast-printer-1.5.12" +<<<<<<< HEAD <<<<<<< HEAD sources."acorn-5.7.1" ======= >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 sources."acorn-5.6.2" >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +======= + sources."acorn-5.7.1" +>>>>>>> nodePackages: meguca: 1.0.7 update sources."acorn-dynamic-import-3.0.0" sources."ajv-6.5.1" sources."ajv-keywords-3.2.0" @@ -47323,7 +47949,13 @@ in }) sources."graceful-fs-4.1.11" sources."has-value-1.0.0" +<<<<<<< HEAD (sources."has-values-1.0.0" // { +======= + sources."has-values-1.0.0" + sources."hash-base-3.0.4" + (sources."hash.js-1.1.4" // { +>>>>>>> nodePackages: meguca: 1.0.7 update dependencies = [ sources."kind-of-4.0.0" ]; @@ -47356,6 +47988,7 @@ in sources."isarray-1.0.0" sources."isobject-3.0.1" sources."json-parse-better-errors-1.0.2" +<<<<<<< HEAD <<<<<<< HEAD sources."json-schema-traverse-0.4.1" ======= @@ -47365,6 +47998,9 @@ in sources."json-schema-traverse-0.4.1" >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +======= + sources."json-schema-traverse-0.4.1" +>>>>>>> nodePackages: meguca: 1.0.7 update sources."json5-0.5.1" sources."kind-of-6.0.2" sources."leb-0.3.0" @@ -47540,6 +48176,7 @@ in }) sources."to-regex-3.0.2" sources."to-regex-range-2.1.1" +<<<<<<< HEAD <<<<<<< HEAD sources."tslib-1.9.3" ======= @@ -47553,6 +48190,13 @@ in ]; }) (sources."uglifyjs-webpack-plugin-1.2.7" // { +======= + sources."tslib-1.9.3" + sources."tty-browserify-0.0.0" + sources."typedarray-0.0.6" + sources."uglify-es-3.3.10" + (sources."uglifyjs-webpack-plugin-1.2.6" // { +>>>>>>> nodePackages: meguca: 1.0.7 update dependencies = [ sources."source-map-0.6.1" ]; @@ -47943,6 +48587,7 @@ in dependencies = [ sources."@cliqz-oss/firefox-client-0.3.1" sources."@cliqz-oss/node-firefox-connect-1.2.1" +<<<<<<< HEAD <<<<<<< HEAD sources."@types/node-10.5.0" ======= @@ -47952,6 +48597,9 @@ in sources."@types/node-10.3.2" >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +======= + sources."@types/node-10.3.5" +>>>>>>> nodePackages: meguca: 1.0.7 update sources."JSONSelect-0.2.1" sources."abbrev-1.1.1" sources."acorn-5.7.1" @@ -47966,6 +48614,28 @@ in (sources."addons-linter-1.0.0" // { dependencies = [ sources."decamelize-1.2.0" +<<<<<<< HEAD +======= + sources."domelementtype-1.1.3" + sources."es6-promise-4.2.4" + sources."fast-deep-equal-1.1.0" + sources."figures-1.7.0" + sources."for-in-0.1.8" + sources."globals-11.7.0" + sources."inquirer-0.12.0" + sources."is-fullwidth-code-point-1.0.0" + sources."isarray-0.0.1" + sources."mute-stream-0.0.5" + sources."onetime-1.1.0" + sources."pify-3.0.0" + sources."pluralize-1.2.1" + sources."progress-1.1.8" + sources."punycode-1.4.1" + sources."restore-cursor-1.0.1" + sources."run-async-0.1.0" + sources."rx-lite-3.1.2" + sources."slice-ansi-0.0.4" +>>>>>>> nodePackages: meguca: 1.0.7 update sources."source-map-0.6.1" sources."source-map-support-0.5.6" sources."yargs-11.0.0" @@ -48088,8 +48758,25 @@ in sources."character-entities-legacy-1.1.2" sources."character-reference-invalid-1.1.2" sources."chardet-0.4.2" +<<<<<<< HEAD sources."cheerio-1.0.0-rc.2" sources."chokidar-2.0.4" +======= + (sources."cheerio-1.0.0-rc.2" // { + dependencies = [ + sources."domelementtype-1.3.0" + ]; + }) + (sources."chokidar-2.0.4" // { + dependencies = [ + sources."is-accessor-descriptor-1.0.0" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + sources."is-extendable-0.1.1" + sources."kind-of-3.2.2" + ]; + }) +>>>>>>> nodePackages: meguca: 1.0.7 update sources."circular-json-0.3.3" (sources."class-utils-0.3.6" // { dependencies = [ @@ -48857,7 +49544,11 @@ in }) sources."snapdragon-util-3.0.1" sources."sntp-2.1.0" +<<<<<<< HEAD (sources."snyk-1.87.0" // { +======= + (sources."snyk-1.83.0" // { +>>>>>>> nodePackages: meguca: 1.0.7 update dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.1" @@ -48913,11 +49604,15 @@ in }) sources."snyk-sbt-plugin-1.3.0" sources."snyk-tree-1.0.0" +<<<<<<< HEAD (sources."snyk-try-require-1.3.1" // { dependencies = [ sources."debug-3.1.0" ]; }) +======= + sources."snyk-try-require-1.3.1" +>>>>>>> nodePackages: meguca: 1.0.7 update sources."socks-1.1.10" sources."socks-proxy-agent-3.0.1" sources."source-map-0.5.7" @@ -49308,7 +50003,10 @@ in ]; }) sources."ecc-jsbn-0.1.1" +<<<<<<< HEAD sources."env-paths-1.0.0" +======= +>>>>>>> nodePackages: meguca: 1.0.7 update sources."error-ex-1.3.2" sources."escape-string-regexp-1.0.5" (sources."execa-0.6.3" // { @@ -49867,7 +50565,15 @@ in sources."supports-color-3.2.3" ]; }) +<<<<<<< HEAD sources."yeoman-doctor-3.0.1" +======= + (sources."yeoman-doctor-2.1.0" // { + dependencies = [ + sources."onetime-1.1.0" + ]; + }) +>>>>>>> nodePackages: meguca: 1.0.7 update (sources."yeoman-environment-2.3.0" // { dependencies = [ sources."chardet-0.4.2" diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix index f85a62492a2..186009f79a4 100644 --- a/pkgs/development/node-packages/node-packages-v8.nix +++ b/pkgs/development/node-packages/node-packages-v8.nix @@ -49,6 +49,7 @@ let sha1 = "cbc4b9a68981bf0b501ccd06a9058acd65309bf7"; }; }; +<<<<<<< HEAD <<<<<<< HEAD "@types/node-10.5.0" = { ======= @@ -75,6 +76,15 @@ let sha512 = "3w50bh9i0rl27vnrn4mmwjphccfaybj74ydfymjmq46p8dfllfwm37lgxqjrx0mp6hrdia5hllbwnpsx2a4wwwck9hh9dkp798c9mzl"; >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +======= + "@types/node-10.3.5" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "10.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-10.3.5.tgz"; + sha512 = "239crslw8yfvmbk5ibh5sh4fhf97j5kls7qgnacm818j6a067ywdiaab0ridjiqm1f1r5nbdip2i1ryjzfn96h6jyh3pp8qvmj70m7a"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "@types/superagent-3.5.6" = { @@ -708,10 +718,13 @@ let }; }; <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +======= +>>>>>>> nodePackages: meguca: 1.0.7 update "boom-2.10.1" = { name = "boom"; packageName = "boom"; @@ -722,9 +735,12 @@ let }; }; <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +======= +>>>>>>> nodePackages: meguca: 1.0.7 update "boxen-1.3.0" = { name = "boxen"; packageName = "boxen"; @@ -1019,7 +1035,11 @@ let version = "2.0.4"; src = fetchurl { url = "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz"; +<<<<<<< HEAD sha512 = "z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ=="; +======= + sha512 = "1fwj48gbgxg51bp9x3jdpypyv7214pqf7hbbgl2xsycy2pxslkavglqcmk355mbjw6ik2nya68aplkjwb80wvy8mh4z4fkbvz5gpnfg"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "chownr-1.0.1" = { @@ -1253,7 +1273,11 @@ let version = "1.9.2"; src = fetchurl { url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.2.tgz"; +<<<<<<< HEAD sha512 = "3NUJZdhMhcdPn8vJ9v2UQJoH0qqoGUkYTgFEPZaPjEtwmmKUfNV46zZmgB2M5M4DCEQHMaCfWHCxiBflLm04Tg=="; +======= + sha512 = "173hv9fwlbqicbhb2gs0c878h407kp4ihfq0rinxdwdaz4lcad70jwciyb3si019qc4j6d8mb90g6j0jkyzdjfbkx7wg1acv1jhkmfw"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "color-name-1.1.1" = { @@ -1518,10 +1542,13 @@ let }; }; <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +======= +>>>>>>> nodePackages: meguca: 1.0.7 update "cryptiles-2.0.5" = { name = "cryptiles"; packageName = "cryptiles"; @@ -1532,9 +1559,12 @@ let }; }; <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +======= +>>>>>>> nodePackages: meguca: 1.0.7 update "crypto-random-string-1.0.0" = { name = "crypto-random-string"; packageName = "crypto-random-string"; @@ -1613,7 +1643,11 @@ let version = "3.0.1"; src = fetchurl { url = "https://registry.npmjs.org/dat-dns/-/dat-dns-3.0.1.tgz"; +<<<<<<< HEAD sha512 = "OBolbMJNk7Uknw8po7Yv4XGNewH6VbuPQNrcf57EwtvgR8ScNUBDporU+DiCXYh2F7GwOcsCyVkSb++guR+OoA=="; +======= + sha512 = "2h8w7xrl3pny4jrr41cnfdhn4bpd22xh8wgim4alr1l0dcwqi3y1ny2qjg7zp6s827vnmgs05xqswg15yva6a8gkwjbb4sdq9n2a6iq"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "dat-doctor-1.4.0" = { @@ -1667,7 +1701,11 @@ let version = "2.2.0"; src = fetchurl { url = "https://registry.npmjs.org/dat-link-resolve/-/dat-link-resolve-2.2.0.tgz"; +<<<<<<< HEAD sha512 = "cu6Fwapm34myc5um6jdQBrtDkjx28oVkOVHbaV4YNLdxrRqUm+FlWuIqFk7zaCZDoZg5TMlCG1SF0j3AFbiOYA=="; +======= + sha512 = "1h8xf0mq0yx51al3d1cjk1rk2hl69k8yd71cap2b9jy36wl3anp3drl31g6knsi75j8bwkn7j947fq6a0vym9lvffr8kpv6mb0qbvkj"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "dat-log-1.1.1" = { @@ -2504,7 +2542,11 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/filenamify/-/filenamify-2.1.0.tgz"; +<<<<<<< HEAD sha512 = "ICw7NTT6RsDp2rnYKVd8Fu4cr6ITzGy3+u4vUujPkabyaz+03F24NWEX7fs5fp+kBonlaqPH8fAO2NM+SXt/JA=="; +======= + sha512 = "0j7yys97v9xh3phy73s6sp5i43a97vy77xys5v16nw5vp5l7xmz59lirzl54bzfzavnrk0klapirvhngibjkn5rvblw0ips6hsknb10"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "fill-range-2.2.4" = { @@ -3075,10 +3117,13 @@ let }; }; <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +======= +>>>>>>> nodePackages: meguca: 1.0.7 update "hawk-3.1.3" = { name = "hawk"; packageName = "hawk"; @@ -3089,9 +3134,12 @@ let }; }; <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +======= +>>>>>>> nodePackages: meguca: 1.0.7 update "he-1.1.1" = { name = "he"; packageName = "he"; @@ -3102,10 +3150,13 @@ let }; }; <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +======= +>>>>>>> nodePackages: meguca: 1.0.7 update "hoek-2.16.3" = { name = "hoek"; packageName = "hoek"; @@ -3116,9 +3167,12 @@ let }; }; <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +======= +>>>>>>> nodePackages: meguca: 1.0.7 update "http-errors-1.6.3" = { name = "http-errors"; packageName = "http-errors"; @@ -3155,6 +3209,7 @@ let sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; }; }; +<<<<<<< HEAD "hypercore-6.17.1" = { name = "hypercore"; packageName = "hypercore"; @@ -3171,6 +3226,15 @@ let src = fetchurl { url = "https://registry.npmjs.org/hypercore-crypto/-/hypercore-crypto-1.0.0.tgz"; sha512 = "xFwOnNlOt8L+SovC7dTNchKaNYJb5l8rKZZwpWQnCme1r7CU4Hlhp1RDqPES6b0OpS7DkTo9iU0GltQGkpsjMw=="; +======= + "hypercore-6.16.0" = { + name = "hypercore"; + packageName = "hypercore"; + version = "6.16.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hypercore/-/hypercore-6.16.0.tgz"; + sha512 = "15d7rbcm182fhq2z27vlg7mz3fvs8qjzw6s3vnm7pmvs46pz33qdm2rqs78nr5lw0wkhglyw7h2izj1l4sa3g8khww8syvdqk4mdbdh"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "hypercore-protocol-6.6.4" = { @@ -3188,7 +3252,11 @@ let version = "9.14.0"; src = fetchurl { url = "https://registry.npmjs.org/hyperdrive/-/hyperdrive-9.14.0.tgz"; +<<<<<<< HEAD sha512 = "LTgbsJ+9ZrdQfLaXXc01kQMttaicHhSOtUM3v/k7ORwXJziqQ2eMQ80+8Tfg67ja+w6zrdl5HYOK+mnlwQpCww=="; +======= + sha512 = "31l42n1wmlzm2l33mwxkbdk1vxxmf7bw0vz2gnd8f66fhxa70kif71r7gwvyds3nn7187lwm2sjs0wi6p6mv5xngi8bfrmxkyq1nf1d"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "hyperdrive-http-4.2.2" = { @@ -5757,7 +5825,11 @@ let version = "1.3.0"; src = fetchurl { url = "https://registry.npmjs.org/random-access-storage/-/random-access-storage-1.3.0.tgz"; +<<<<<<< HEAD sha512 = "pdS9Mcb9TB7oICypPRALlheaSuszuAKmLVEPKJMuYor7R/zDuHh5ALuQoS+ox31XRwQUL+tDwWH2GPdyspwelA=="; +======= + sha512 = "2a1x75jfbviixk1q51ynbql0i3mfzf7m0ps345v01wpif63zi3zp2k25s9jh3si5nk05f1kxd59l5wn1c83va9c43l1wk7xqqqvvm55"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "randomatic-3.0.0" = { @@ -5958,6 +6030,7 @@ let sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; }; }; +<<<<<<< HEAD <<<<<<< HEAD "request-2.81.0" = { name = "request"; @@ -5977,6 +6050,8 @@ let version = "2.87.0"; src = fetchurl { ======= +======= +>>>>>>> nodePackages: meguca: 1.0.7 update "request-2.81.0" = { name = "request"; packageName = "request"; @@ -5991,7 +6066,6 @@ let packageName = "request"; version = "2.87.0"; src = fetchurl { ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 url = "https://registry.npmjs.org/request/-/request-2.87.0.tgz"; sha512 = "fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw=="; }; @@ -6128,7 +6202,11 @@ let version = "6.2.1"; src = fetchurl { url = "https://registry.npmjs.org/rxjs/-/rxjs-6.2.1.tgz"; +<<<<<<< HEAD sha512 = "OwMxHxmnmHTUpgO+V7dZChf3Tixf4ih95cmXjzzadULziVl/FKhHScGLj4goEw9weePVOH2Q0+GcCBUhKCZc/g=="; +======= + sha512 = "3z5q9i844ahi771sf87sf6mwdwp03qk5248z2y1953sh53zb64z6hkmv8y8z5y9wmyjiqjz5i7gf5qab6vmggh3lva7965734gk20rv"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "safe-buffer-5.1.2" = { @@ -6428,8 +6506,6 @@ let sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198"; }; }; -<<<<<<< HEAD -======= "sntp-1.0.9" = { name = "sntp"; packageName = "sntp"; @@ -6439,7 +6515,6 @@ let sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198"; }; }; ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 "sodium-javascript-0.5.5" = { name = "sodium-javascript"; packageName = "sodium-javascript"; @@ -6554,7 +6629,11 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/speedometer/-/speedometer-1.1.0.tgz"; +<<<<<<< HEAD sha512 = "z/wAiTESw2XVPssY2XRcme4niTc4S5FkkJ4gknudtVoc33Zil8TdTxHy5torRcgqMqksJV2Yz8HQcvtbsnw0mQ=="; +======= + sha512 = "2ck8z5jbgxp5l61ryc5s99cm4r2mj255gdfdwhi9zfw95v2fvgiqnmmkmxr484yj1j92jrq6y4jgvlrbisdj66b7vanbhqj664h1z6g"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "split-0.3.3" = { @@ -7202,7 +7281,11 @@ let version = "1.9.3"; src = fetchurl { url = "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz"; +<<<<<<< HEAD sha512 = "4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ=="; +======= + sha512 = "2yimhwxviswrwaxdgk4k5q99pjv0n6g8s1cc5ml17rzv1kqfac26sb7b49ndl9hyczgzlz28wh87g1k0r3h9cqa79d3hyi9qzrcajp2"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "ttl-1.3.1" = { @@ -7557,7 +7640,11 @@ let version = "10.4.0"; src = fetchurl { url = "https://registry.npmjs.org/validator/-/validator-10.4.0.tgz"; +<<<<<<< HEAD sha512 = "Q/wBy3LB1uOyssgNlXSRmaf22NxjvDNZM2MtIQ4jaEOAB61xsh1TQxsq1CgzUMBV1lDrVMogIh8GjG1DYW0zLg=="; +======= + sha512 = "0p36vb18dnqq1hz48hclm7ba3b5bh2h6cld8ahv8d9ivckiml3q0hv84c722bb36dck7g33vkcgd9wrj5s9a3f8narf7mn1fb5h3z23"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "variable-diff-1.1.0" = { @@ -7749,6 +7836,7 @@ let sha512 = "g1DFmZ5JJ9Qzvt4dMw6m9IydqoCSP381ucU5zm46Owbk3bwmqAr8eEJirOPc7PrXRn45drzOpAyDp8jsnoyXyw=="; }; }; +<<<<<<< HEAD "xstream-11.7.0" = { name = "xstream"; packageName = "xstream"; @@ -7756,6 +7844,15 @@ let src = fetchurl { url = "https://registry.npmjs.org/xstream/-/xstream-11.7.0.tgz"; sha512 = "wO3TXiQd2/1UZNVsixDIcQgAN6TU4sGH7qIXvs1CRp1kgtkpU8YTfyKt/z/Z1psqcGnR0cJJxHaCnBxtktLx9w=="; +======= + "xstream-11.6.0" = { + name = "xstream"; + packageName = "xstream"; + version = "11.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xstream/-/xstream-11.6.0.tgz"; + sha512 = "2ywbymzqjiy7w59kp58cmlaqzzbig0h9r5mjiyc5a5i89rv83cq19ff26123za0blip6dq591hmz7vb7yc42bkwiqlc57za4k4hjl82"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; }; "xtend-4.0.1" = { @@ -7880,12 +7977,16 @@ in sources."chalk-1.1.3" ]; }) +<<<<<<< HEAD <<<<<<< HEAD sources."@types/node-10.3.1" ======= sources."@types/node-10.3.2" >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +======= + sources."@types/node-10.3.5" +>>>>>>> nodePackages: meguca: 1.0.7 update sources."@types/superagent-3.5.6" sources."ansi-escapes-3.1.0" sources."ansi-regex-2.1.1" @@ -8000,7 +8101,11 @@ in ]; }) sources."which-1.3.1" +<<<<<<< HEAD sources."xstream-11.7.0" +======= + sources."xstream-11.6.0" +>>>>>>> nodePackages: meguca: 1.0.7 update sources."yallist-2.1.2" ]; buildInputs = globalBuildInputs; @@ -8107,6 +8212,16 @@ in (sources."dat-json-1.0.2" // { dependencies = [ sources."dat-encoding-4.0.2" +<<<<<<< HEAD +======= + sources."debug-2.6.9" + ]; + }) + sources."dat-link-resolve-2.2.0" + (sources."dat-log-1.1.1" // { + dependencies = [ + sources."process-nextick-args-1.0.7" +>>>>>>> nodePackages: meguca: 1.0.7 update ]; }) sources."dat-link-resolve-2.2.0" @@ -8196,6 +8311,7 @@ in sources."has-flag-3.0.0" sources."http-methods-0.1.0" sources."http-signature-1.2.0" +<<<<<<< HEAD (sources."hypercore-6.17.1" // { dependencies = [ sources."process-nextick-args-1.0.7" @@ -8204,12 +8320,20 @@ in }) sources."hypercore-crypto-1.0.0" (sources."hypercore-protocol-6.6.4" // { +======= + (sources."hypercore-6.16.0" // { +>>>>>>> nodePackages: meguca: 1.0.7 update dependencies = [ sources."varint-5.0.0" ]; }) +<<<<<<< HEAD sources."hyperdrive-9.14.0" (sources."hyperdrive-http-4.2.2" // { +======= + sources."hypercore-protocol-6.6.4" + (sources."hyperdrive-9.14.0" // { +>>>>>>> nodePackages: meguca: 1.0.7 update dependencies = [ sources."pump-1.0.3" ]; @@ -8320,11 +8444,15 @@ in sources."punycode-1.4.1" sources."qs-6.5.2" sources."random-access-file-2.0.1" +<<<<<<< HEAD (sources."random-access-memory-2.4.0" // { dependencies = [ sources."process-nextick-args-1.0.7" ]; }) +======= + sources."random-access-memory-2.4.0" +>>>>>>> nodePackages: meguca: 1.0.7 update sources."random-access-storage-1.3.0" (sources."randomatic-3.0.0" // { dependencies = [ @@ -8554,6 +8682,7 @@ in sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.1" sources."block-stream-0.0.9" +<<<<<<< HEAD <<<<<<< HEAD sources."boom-2.10.1" ======= @@ -8562,6 +8691,9 @@ in sources."boom-2.10.1" >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +======= + sources."boom-2.10.1" +>>>>>>> nodePackages: meguca: 1.0.7 update sources."brace-expansion-1.1.11" sources."caseless-0.12.0" sources."co-4.6.0" @@ -8570,6 +8702,7 @@ in sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" +<<<<<<< HEAD <<<<<<< HEAD sources."cryptiles-2.0.5" (sources."dashdash-1.14.1" // { @@ -8580,8 +8713,9 @@ in ======= <<<<<<< HEAD ======= +======= +>>>>>>> nodePackages: meguca: 1.0.7 update sources."cryptiles-2.0.5" ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 sources."dashdash-1.14.1" >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 sources."delayed-stream-1.0.0" @@ -8604,6 +8738,7 @@ in sources."har-schema-1.0.5" sources."har-validator-4.2.1" sources."has-unicode-2.0.1" +<<<<<<< HEAD <<<<<<< HEAD sources."hawk-3.1.3" sources."hoek-2.16.3" @@ -8617,6 +8752,11 @@ in sources."http-signature-1.1.1" >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +======= + sources."hawk-3.1.3" + sources."hoek-2.16.3" + sources."http-signature-1.1.1" +>>>>>>> nodePackages: meguca: 1.0.7 update sources."inflight-1.0.6" sources."inherits-2.0.3" sources."is-fullwidth-code-point-1.0.0" @@ -8654,6 +8794,7 @@ in sources."punycode-1.4.1" sources."qs-6.4.0" sources."readable-stream-2.3.6" +<<<<<<< HEAD <<<<<<< HEAD sources."request-2.81.0" ======= @@ -8663,6 +8804,9 @@ in sources."request-2.81.0" >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +======= + sources."request-2.81.0" +>>>>>>> nodePackages: meguca: 1.0.7 update sources."rimraf-2.6.2" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" @@ -8670,11 +8814,14 @@ in sources."set-blocking-2.0.0" sources."signal-exit-3.0.2" <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD sources."sshpk-1.14.2" ======= >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +======= +>>>>>>> nodePackages: meguca: 1.0.7 update sources."sntp-1.0.9" (sources."sshpk-1.14.2" // { dependencies = [ @@ -8682,9 +8829,12 @@ in ]; }) <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 >>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 +======= +>>>>>>> nodePackages: meguca: 1.0.7 update sources."string-width-1.0.2" sources."string_decoder-1.1.1" sources."stringstream-0.0.6" @@ -8733,10 +8883,17 @@ in node-pre-gyp = nodeEnv.buildNodePackage { name = "node-pre-gyp"; packageName = "node-pre-gyp"; +<<<<<<< HEAD version = "0.10.2"; src = fetchurl { url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.2.tgz"; sha512 = "16lql9QTqs6KsB9fl3neWyZm02KxIKdI9FlJjrB0y7eMTP5Nyz+xalwPbOlw3iw7EejllJPmlJSnY711PLD1ug=="; +======= + version = "0.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.1.tgz"; + sha512 = "354ilrqnamjvp509zxg2liq7483lr9rwynh048dzqqxw5z0dskc9f43p3wjgfmji1lk85idppiw9rqj4jlkypvlxkm0h0vrj45x7s7f"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; dependencies = [ sources."abbrev-1.1.1" @@ -8820,6 +8977,7 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; +<<<<<<< HEAD <<<<<<< HEAD version = "2.7.0"; src = fetchurl { @@ -8831,6 +8989,12 @@ in url = "https://registry.npmjs.org/pnpm/-/pnpm-2.4.0.tgz"; sha1 = "54c27537e831f91d5afe63320a5aa2df597efe84"; >>>>>>> nodePackages: meguca: 1.0.5 -> 1.0.7 +======= + version = "2.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pnpm/-/pnpm-2.6.2.tgz"; + sha1 = "5507ebe92373aa133c871c9571b5af73aac7728f"; +>>>>>>> nodePackages: meguca: 1.0.7 update }; buildInputs = globalBuildInputs; meta = { @@ -9280,7 +9444,19 @@ in sources."center-align-0.1.3" sources."chalk-1.1.3" sources."charenc-0.0.2" +<<<<<<< HEAD sources."chokidar-2.0.4" +======= + (sources."chokidar-2.0.4" // { + dependencies = [ + sources."debug-2.6.9" + sources."is-accessor-descriptor-1.0.0" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + sources."is-extendable-1.0.1" + ]; + }) +>>>>>>> nodePackages: meguca: 1.0.7 update sources."ci-info-1.1.3" (sources."class-utils-0.3.6" // { dependencies = [ From f80c01b3f47d92cd6f49ee88867e281892f61420 Mon Sep 17 00:00:00 2001 From: Okina Matara Date: Sat, 23 Jun 2018 15:05:57 -0500 Subject: [PATCH 10/56] meguca: 2018-06-21 -> 2018-06-23 --- pkgs/servers/meguca/default.nix | 6 +++--- pkgs/servers/meguca/server_deps.nix | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/meguca/default.nix b/pkgs/servers/meguca/default.nix index 206b279a7f1..9373ebdb5d3 100644 --- a/pkgs/servers/meguca/default.nix +++ b/pkgs/servers/meguca/default.nix @@ -4,15 +4,15 @@ buildGoPackage rec { name = "meguca-unstable-${version}"; - version = "2018-06-21"; - rev = "a60b75afd10ca99ce05a362ffeb586a1ece3d41d"; + version = "2018-06-23"; + rev = "5a156e1c2a972c6d799a667f3a1a189355ea8655"; goPackagePath = "github.com/bakape/meguca"; goDeps = ./server_deps.nix; src = fetchgit { inherit rev; url = "https://github.com/bakape/meguca"; - sha256 = "0dh168j4lfn7rk64difdq3mxcp82j8h799pvpkz40h4sw2l81qc9"; + sha256 = "1asa5vccgl6f9c01nddpjjkw54yammbsj3wg80sbpmq9nc0djdjj"; fetchSubmodules = true; }; diff --git a/pkgs/servers/meguca/server_deps.nix b/pkgs/servers/meguca/server_deps.nix index af4ea727acd..c7b92c15231 100644 --- a/pkgs/servers/meguca/server_deps.nix +++ b/pkgs/servers/meguca/server_deps.nix @@ -50,8 +50,8 @@ fetch = { type = "git"; url = "https://github.com/bakape/thumbnailer"; - rev = "cd096c6823fae426b69921662bcfaf142e395d05"; - sha256 = "1xd1g36s3a0ynaxg4gf49r40ri9y154dlkd40dcpkhj6q294s02k"; + rev = "cca71d50e2f2a18f255652068be06977740fd2d5"; + sha256 = "07mwy19z8jk0v9dvsvkr48hhhiigclban6gr5fap8531hj9m5mqc"; }; } { @@ -239,8 +239,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "ad87a3a340fa7f3bed189293fbfa7a9b7e021ae1"; - sha256 = "0d38dpn3cl3h0ksxdnkwk2z3rsjwihqzd4ggwrnwmj405zgv1ar9"; + rev = "63fc586f45fe72d95d5240a5d5eb95e6503907d3"; + sha256 = "1272649cna3w2mw64qld6m1w4l5zm4jy00nhpcii03pxj3m2dqlr"; }; } { From cd667e43aee7a3c08717258f15a6afe0fff108a4 Mon Sep 17 00:00:00 2001 From: Okina Matara Date: Wed, 27 Jun 2018 01:31:23 -0500 Subject: [PATCH 11/56] meguca: 2018-06-23 -> 2018-06-27 --- pkgs/servers/meguca/default.nix | 16 ++++++++-------- pkgs/servers/meguca/server_deps.nix | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/servers/meguca/default.nix b/pkgs/servers/meguca/default.nix index 9373ebdb5d3..e1d76d9b1a4 100644 --- a/pkgs/servers/meguca/default.nix +++ b/pkgs/servers/meguca/default.nix @@ -1,18 +1,18 @@ -{ stdenv, buildGoPackage, fetchgit, pkgconfig, ffmpeg-full, graphicsmagick -, ghostscript, quicktemplate, go-bindata, easyjson, nodePackages, cmake -, emscripten }: +{ stdenv, buildGoPackage, fetchgit, pkgconfig, cmake, libcxx, libcxxabi +, ffmpeg-full, graphicsmagick, ghostscript, quicktemplate, go-bindata, easyjson +, nodePackages, emscripten }: buildGoPackage rec { name = "meguca-unstable-${version}"; - version = "2018-06-23"; - rev = "5a156e1c2a972c6d799a667f3a1a189355ea8655"; + version = "2018-06-27"; + rev = "4780ed4c51475e5e0382fe70ff8ab2187fbbf447"; goPackagePath = "github.com/bakape/meguca"; goDeps = ./server_deps.nix; src = fetchgit { inherit rev; url = "https://github.com/bakape/meguca"; - sha256 = "1asa5vccgl6f9c01nddpjjkw54yammbsj3wg80sbpmq9nc0djdjj"; + sha256 = "1yc22qv5rrawlc3923a8zmhz21b00pidk1ij4fxmm9a001cm3fi3"; fetchSubmodules = true; }; @@ -21,8 +21,8 @@ buildGoPackage rec { buildInputs = [ ffmpeg-full graphicsmagick ghostscript quicktemplate go-bindata easyjson - emscripten - ]; + emscripten + ] ++ stdenv.lib.optionals stdenv.isDarwin [ libcxx libcxxabi ]; buildPhase = '' export HOME=$PWD diff --git a/pkgs/servers/meguca/server_deps.nix b/pkgs/servers/meguca/server_deps.nix index c7b92c15231..137f355ce72 100644 --- a/pkgs/servers/meguca/server_deps.nix +++ b/pkgs/servers/meguca/server_deps.nix @@ -50,8 +50,8 @@ fetch = { type = "git"; url = "https://github.com/bakape/thumbnailer"; - rev = "cca71d50e2f2a18f255652068be06977740fd2d5"; - sha256 = "07mwy19z8jk0v9dvsvkr48hhhiigclban6gr5fap8531hj9m5mqc"; + rev = "fa88f595f3882773bc425b382eee71e3e2fa1291"; + sha256 = "19xfn8aj1nhh5dj93hskzrhaa07sayd8agmz1vkkh6varqrldanf"; }; } { @@ -239,8 +239,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "63fc586f45fe72d95d5240a5d5eb95e6503907d3"; - sha256 = "1272649cna3w2mw64qld6m1w4l5zm4jy00nhpcii03pxj3m2dqlr"; + rev = "7138fd3d9dc8335c567ca206f4333fb75eb05d56"; + sha256 = "09xgxk0d9b88m18sriy4f2l6qavicznxkgsbvjyv56x24r4kmiq0"; }; } { From ec92e4dbe2fd82aebc9aa4c6c4567971daa6deca Mon Sep 17 00:00:00 2001 From: Okina Matara Date: Wed, 27 Jun 2018 14:51:16 -0500 Subject: [PATCH 12/56] nodePackages: meguca: 1.0.7 -> 1.0.8 --- .../node-packages/composition-v10.nix | 4 +- .../node-packages/composition-v6.nix | 2 +- .../node-packages/composition-v8.nix | 2 +- pkgs/development/node-packages/node-env.nix | 81 +- .../node-packages/node-packages-v10.nix | 64 +- .../node-packages/node-packages-v6.nix | 8729 ++++++----------- .../node-packages/node-packages-v8.nix | 1479 +-- 7 files changed, 3379 insertions(+), 6982 deletions(-) diff --git a/pkgs/development/node-packages/composition-v10.nix b/pkgs/development/node-packages/composition-v10.nix index 9f723a6da47..2eea07b6380 100644 --- a/pkgs/development/node-packages/composition-v10.nix +++ b/pkgs/development/node-packages/composition-v10.nix @@ -1,8 +1,8 @@ -# This file has been generated by node2nix 1.6.0. Do not edit! +# This file has been generated by node2nix 1.5.3. Do not edit! {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-4_x"}: let nodeEnv = import ./node-env.nix { diff --git a/pkgs/development/node-packages/composition-v6.nix b/pkgs/development/node-packages/composition-v6.nix index ce42bfa7ba3..2252bab3a79 100644 --- a/pkgs/development/node-packages/composition-v6.nix +++ b/pkgs/development/node-packages/composition-v6.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.6.0. Do not edit! +# This file has been generated by node2nix 1.5.3. Do not edit! {pkgs ? import { inherit system; diff --git a/pkgs/development/node-packages/composition-v8.nix b/pkgs/development/node-packages/composition-v8.nix index 7ca3e6b925a..96266105942 100644 --- a/pkgs/development/node-packages/composition-v8.nix +++ b/pkgs/development/node-packages/composition-v8.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.6.0. Do not edit! +# This file has been generated by node2nix 1.5.3. Do not edit! {pkgs ? import { inherit system; diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix index 720e0cc0850..fc118a788ea 100644 --- a/pkgs/development/node-packages/node-env.nix +++ b/pkgs/development/node-packages/node-env.nix @@ -27,7 +27,7 @@ let buildInputs = [ nodejs ]; buildPhase = '' export HOME=$TMPDIR - tgzFile=$(npm pack | tail -n 1) # Hooks to the pack command will add output (https://docs.npmjs.com/misc/scripts) + tgzFile=$(npm pack) ''; installPhase = '' mkdir -p $out/tarballs @@ -309,42 +309,31 @@ let }; # Builds and composes an NPM package including all its dependencies - buildNodePackage = - { name - , packageName - , version - , dependencies ? [] - , buildInputs ? [] - , production ? true - , npmFlags ? "" - , dontNpmInstall ? false - , bypassCache ? false - , preRebuild ? "" - , dontStrip ? true - , unpackPhase ? "true" - , buildPhase ? "true" - , ... }@args: + buildNodePackage = { name, packageName, version, dependencies ? [], production ? true, npmFlags ? "", dontNpmInstall ? false, bypassCache ? false, preRebuild ? "", ... }@args: let forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ]; in - stdenv.mkDerivation ({ + stdenv.lib.makeOverridable stdenv.mkDerivation (builtins.removeAttrs args [ "dependencies" ] // { name = "node-${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ stdenv.lib.optional (stdenv.isDarwin) libtool - ++ buildInputs; + ++ args.buildInputs or []; + dontStrip = args.dontStrip or true; # Striping may fail a build for some package deployments - inherit dontStrip; # Stripping may fail a build for some package deployments - inherit dontNpmInstall preRebuild unpackPhase buildPhase; + inherit dontNpmInstall preRebuild; + + unpackPhase = args.unpackPhase or "true"; + + buildPhase = args.buildPhase or "true"; compositionScript = composePackage args; pinpointDependenciesScript = pinpointDependenciesOfPackage args; passAsFile = [ "compositionScript" "pinpointDependenciesScript" ]; - installPhase = '' + installPhase = args.installPhase or '' # Create and enter a root node_modules/ folder mkdir -p $out/lib/node_modules cd $out/lib/node_modules @@ -417,47 +406,27 @@ let # Run post install hook, if provided runHook postInstall ''; - } // extraArgs); + }); # Builds a development shell - buildNodeShell = - { name - , packageName - , version - , src - , dependencies ? [] - , buildInputs ? [] - , production ? true - , npmFlags ? "" - , dontNpmInstall ? false - , bypassCache ? false - , dontStrip ? true - , unpackPhase ? "true" - , buildPhase ? "true" - , ... }@args: - + buildNodeShell = { name, packageName, version, src, dependencies ? [], production ? true, npmFlags ? "", dontNpmInstall ? false, bypassCache ? false, ... }@args: let forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ]; - - nodeDependencies = stdenv.mkDerivation ({ + nodeDependencies = stdenv.mkDerivation { name = "node-dependencies-${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ stdenv.lib.optional (stdenv.isDarwin) libtool - ++ buildInputs; - - inherit dontStrip; # Stripping may fail a build for some package deployments - inherit dontNpmInstall unpackPhase buildPhase; + ++ args.buildInputs or []; includeScript = includeDependencies { inherit dependencies; }; pinpointDependenciesScript = pinpointDependenciesOfPackage args; passAsFile = [ "includeScript" "pinpointDependenciesScript" ]; - installPhase = '' + buildCommand = '' mkdir -p $out/${packageName} cd $out/${packageName} @@ -469,15 +438,13 @@ let ${stdenv.lib.optionalString bypassCache '' if [ -f ${src}/package-lock.json ] then - cp ${src}/package-lock.json . + cp ${src}/package-lock.json . fi ''} # Pinpoint the versions of all dependencies to the ones that are actually being used echo "pinpointing versions of dependencies..." cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - source $pinpointDependenciesScriptPath cd ${packageName} @@ -507,17 +474,15 @@ let ''} cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - mv ${packageName} lib ln -s $out/lib/node_modules/.bin $out/bin ''; - } // extraArgs); + }; in - stdenv.mkDerivation { + stdenv.lib.makeOverridable stdenv.mkDerivation { name = "node-shell-${name}-${version}"; - buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ buildInputs; + buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ args.buildInputs or []; buildCommand = '' mkdir -p $out/bin cat > $out/bin/shell <>>>>>> nodePackages: meguca: 1.0.7 update }; }; "@types/babylon-6.16.3" = { name = "_at_types_slash_babylon"; packageName = "@types/babylon"; version = "6.16.3"; -<<<<<<< HEAD - src = fetchurl { - url = "https://registry.npmjs.org/@types/babylon/-/babylon-6.16.3.tgz"; - sha512 = "lyJ8sW1PbY3uwuvpOBZ9zMYKshMnQpXmeDHh8dj9j2nJm/xrW0FgB5gLSYOArj5X0IfaXnmhFoJnhS4KbqIMug=="; - }; - }; -<<<<<<< HEAD - "@types/node-10.5.0" = { -======= - "@types/caseless-0.12.1" = { - name = "_at_types_slash_caseless"; - packageName = "@types/caseless"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.1.tgz"; - sha512 = "3ygc8335my77k11wjf0wihzqfsv4fxyfrvb730sx8ab3phx3wc8g4pg3g84h497ipvzk7i9gnwnzrkg68zm6df6wi59y7hdgrmlq68n"; - }; - }; - "@types/form-data-2.2.1" = { - name = "_at_types_slash_form-data"; - packageName = "@types/form-data"; - version = "2.2.1"; -======= ->>>>>>> nodePackages: meguca: 1.0.7 update src = fetchurl { url = "https://registry.npmjs.org/@types/babylon/-/babylon-6.16.3.tgz"; sha512 = "2x0r8kf18p8arw22shpjpnshz85fgmfh21lj2wq0xh42nvbzjdwjscgzpcg3q9ig3k9ahi72fr0mincglb3isgbqbp8svagdnqpq8lp"; }; }; - "@types/node-10.3.5" = { + "@types/node-10.5.1" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.3.5"; + version = "10.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.3.5.tgz"; - sha512 = "239crslw8yfvmbk5ibh5sh4fhf97j5kls7qgnacm818j6a067ywdiaab0ridjiqm1f1r5nbdip2i1ryjzfn96h6jyh3pp8qvmj70m7a"; + url = "https://registry.npmjs.org/@types/node/-/node-10.5.1.tgz"; + sha512 = "0wsh0lqflnmk8gzdiws2znpvrsskzbvb4ggba48k489jg9dd1i7frark6v7kj6yp4b39jz7kbzljrc1dj303f42xanyq8hbh3afalh0"; }; }; -<<<<<<< HEAD - "@types/node-8.10.18" = { ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "10.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.5.0.tgz"; - sha512 = "baXPuqA7EVcBUpA5so2K26DTzk7NCWBc9xrPMu9PbUMwgusJRm9zJBPhiDmJVEcnTQ3aOxUZeuFHpd9qMYDNRg=="; - }; - }; - "@types/node-8.10.20" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "8.10.20"; - src = fetchurl { -<<<<<<< HEAD - url = "https://registry.npmjs.org/@types/node/-/node-8.10.20.tgz"; - sha512 = "M7x8+5D1k/CuA6jhiwuSCmE8sbUWJF0wYsjcig9WrXvwUI5ArEoUBdOXpV4JcEMrLp02/QbDjw+kI+vQeKyQgg=="; - }; - }; - "@webassemblyjs/ast-1.5.12" = { -======= - url = "https://registry.npmjs.org/@types/node/-/node-9.6.20.tgz"; - sha512 = "03zcm94d4k4hmyilhw27w8ixxm2bkkr2my3d344viq4dzadjmzc9vyabyfs085j6a3qdv1ns0bbw5m72511bwq885064cpnn58ig0wq"; -======= - "@types/node-10.3.2" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "10.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.3.2.tgz"; - sha512 = "3w50bh9i0rl27vnrn4mmwjphccfaybj74ydfymjmq46p8dfllfwm37lgxqjrx0mp6hrdia5hllbwnpsx2a4wwwck9hh9dkp798c9mzl"; - }; - }; - "@types/node-8.10.19" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "8.10.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-8.10.19.tgz"; - sha512 = "3wi74w4fjk1zjwa8sijb2a8n6c0ynl48k8za2rwawm7332kncqm0jsg4xx7vkz25fzh16x852can18bc1n859gnsfqy9d43ivp3kxgq"; - }; - }; - "@types/node-9.6.21" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "9.6.21"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-9.6.21.tgz"; - sha512 = "3n2g5wdwppphgaxing5vdzidpiggibfdwci4l522hm4v4p49gas7fsld0k51g8vf09k65y7d4cq6h0dr76sbrsvy58wn4pigjcbl16d"; ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 - }; - }; - "@types/request-2.47.0" = { - name = "_at_types_slash_request"; - packageName = "@types/request"; - version = "2.47.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/request/-/request-2.47.0.tgz"; - sha512 = "3jk7nawc1yb26ykdlv3mk1bmdpq2an6krskfj4x46kc9ka9r11ixrivg5zwcm451wlarry8dk36mick3d68w0c85i177ymghzkcr9gw"; - }; - }; - "@types/tough-cookie-2.3.3" = { - name = "_at_types_slash_tough-cookie"; - packageName = "@types/tough-cookie"; - version = "2.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-2.3.3.tgz"; - sha512 = "1hpxnn86rnm17kxbwp8r3ymx3qqmvq6vhswndr12cahvbarmm27mj2jj2r0pm0w9wvq9ixm55whl8q029ir29c59cmanbais720nd1h"; - }; - }; - "@types/uuid-3.4.3" = { - name = "_at_types_slash_uuid"; - packageName = "@types/uuid"; - version = "3.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/uuid/-/uuid-3.4.3.tgz"; - sha512 = "1psrs8sjpmhz8sz2zjkkd7743vzdi7q7vcj8p219q1pkfawr619rl1m5pczp69hbm1769kn8zwlbayjylhl7an5hkvkdd2bi04lpx75"; - }; - }; -<<<<<<< HEAD - "@webassemblyjs/ast-1.5.10" = { ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 - name = "_at_webassemblyjs_slash_ast"; - packageName = "@webassemblyjs/ast"; - version = "1.5.12"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.5.12.tgz"; - sha512 = "bmTBEKuuhSU6dC95QIW250xO769cdYGx9rWn3uBLTw2pUpud0Z5kVuMw9m9fqbNzGeuOU2HpyuZa+yUt2CTEDA=="; - }; - }; - "@webassemblyjs/floating-point-hex-parser-1.5.12" = { - name = "_at_webassemblyjs_slash_floating-point-hex-parser"; - packageName = "@webassemblyjs/floating-point-hex-parser"; - version = "1.5.12"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.5.12.tgz"; - sha512 = "epTvkdwOIPpTE9edHS+V+shetYzpTbd91XOzUli1zAS0+NSgSe6ZsNggIqUNzhma1s4bN2f/m8c6B1NMdCERAg=="; - }; - }; - "@webassemblyjs/helper-api-error-1.5.12" = { - name = "_at_webassemblyjs_slash_helper-api-error"; - packageName = "@webassemblyjs/helper-api-error"; - version = "1.5.12"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.5.12.tgz"; - sha512 = "Goxag86JvLq8ucHLXFNSLYzf9wrR+CJr37DsESTAzSnGoqDTgw5eqiXSQVd/D9Biih7+DIn8UIQCxMs8emRRwg=="; - }; - }; - "@webassemblyjs/helper-buffer-1.5.12" = { - name = "_at_webassemblyjs_slash_helper-buffer"; - packageName = "@webassemblyjs/helper-buffer"; - version = "1.5.12"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.5.12.tgz"; - sha512 = "tJNUjttL5CxiiS/KLxT4/Zk0Nbl/poFhztFxktb46zoQEUWaGHR9ZJ0SnvE7DbFX5PY5JNJDMZ0Li4lm246fWw=="; - }; - }; - "@webassemblyjs/helper-code-frame-1.5.12" = { - name = "_at_webassemblyjs_slash_helper-code-frame"; - packageName = "@webassemblyjs/helper-code-frame"; - version = "1.5.12"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.5.12.tgz"; - sha512 = "0FrJgiST+MQDMvPigzs+UIk1vslLIqGadkEWdn53Lr0NsUC2JbheG9QaO3Zf6ycK2JwsHiUpGaMFcHYXStTPMA=="; - }; - }; - "@webassemblyjs/helper-fsm-1.5.12" = { - name = "_at_webassemblyjs_slash_helper-fsm"; - packageName = "@webassemblyjs/helper-fsm"; - version = "1.5.12"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.5.12.tgz"; - sha512 = "QBHZ45VPUJ7UyYKvUFoaxrSS9H5hbkC9U7tdWgFHmnTMutkXSEgDg2gZg3I/QTsiKOCIwx4qJUJwPd7J4D5CNQ=="; - }; - }; - "@webassemblyjs/helper-module-context-1.5.12" = { - name = "_at_webassemblyjs_slash_helper-module-context"; - packageName = "@webassemblyjs/helper-module-context"; - version = "1.5.12"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.5.12.tgz"; - sha512 = "SCXR8hPI4JOG3cdy9HAO8W5/VQ68YXG/Hfs7qDf1cd64zWuMNshyEour5NYnLMVkrrtc0XzfVS/MdeV94woFHA=="; - }; - }; - "@webassemblyjs/helper-wasm-bytecode-1.5.12" = { - name = "_at_webassemblyjs_slash_helper-wasm-bytecode"; - packageName = "@webassemblyjs/helper-wasm-bytecode"; - version = "1.5.12"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.5.12.tgz"; - sha512 = "0Gz5lQcyvElNVbOTKwjEmIxGwdWf+zpAW/WGzGo95B7IgMEzyyfZU+PrGHDwiSH9c0knol9G7smQnY0ljrSA6g=="; - }; - }; - "@webassemblyjs/helper-wasm-section-1.5.12" = { - name = "_at_webassemblyjs_slash_helper-wasm-section"; - packageName = "@webassemblyjs/helper-wasm-section"; - version = "1.5.12"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.5.12.tgz"; - sha512 = "ge/CKVKBGpiJhFN9PIOQ7sPtGYJhxm/mW1Y3SpG1L6XBunfRz0YnLjW3TmhcOEFozIVyODPS1HZ9f7VR3GBGow=="; - }; - }; - "@webassemblyjs/ieee754-1.5.12" = { - name = "_at_webassemblyjs_slash_ieee754"; - packageName = "@webassemblyjs/ieee754"; - version = "1.5.12"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.5.12.tgz"; - sha512 = "F+PEv9QBzPi1ThLBouUJbuxhEr+Sy/oua1ftXFKHiaYYS5Z9tKPvK/hgCxlSdq+RY4MSG15jU2JYb/K5pkoybg=="; - }; - }; - "@webassemblyjs/leb128-1.5.12" = { - name = "_at_webassemblyjs_slash_leb128"; - packageName = "@webassemblyjs/leb128"; - version = "1.5.12"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.5.12.tgz"; - sha512 = "cCOx/LVGiWyCwVrVlvGmTdnwHzIP4+zflLjGkZxWpYCpdNax9krVIJh1Pm7O86Ox/c5PrJpbvZU1cZLxndlPEw=="; - }; - }; - "@webassemblyjs/utf8-1.5.12" = { - name = "_at_webassemblyjs_slash_utf8"; - packageName = "@webassemblyjs/utf8"; - version = "1.5.12"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.5.12.tgz"; - sha512 = "FX8NYQMiTRU0TfK/tJVntsi9IEKsedSsna8qtsndWVE0x3zLndugiApxdNMIOoElBV9o4j0BUqR+iwU58QfPxQ=="; - }; - }; - "@webassemblyjs/wasm-edit-1.5.12" = { - name = "_at_webassemblyjs_slash_wasm-edit"; - packageName = "@webassemblyjs/wasm-edit"; - version = "1.5.12"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.5.12.tgz"; - sha512 = "r/oZAyC4EZl0ToOYJgvj+b0X6gVEKQMLT34pNNbtvWBehQOnaSXvVUA5FIYlH8ubWjFNAFqYaVGgQTjR1yuJdQ=="; - }; - }; - "@webassemblyjs/wasm-gen-1.5.12" = { - name = "_at_webassemblyjs_slash_wasm-gen"; - packageName = "@webassemblyjs/wasm-gen"; - version = "1.5.12"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.5.12.tgz"; - sha512 = "LTu+cr1YRxGGiVIXWhei/35lXXEwTnQU18x4V/gE+qCSJN21QcVTMjJuasTUh8WtmBZtOlqJbOQIeN7fGnHWhg=="; - }; - }; - "@webassemblyjs/wasm-opt-1.5.12" = { - name = "_at_webassemblyjs_slash_wasm-opt"; - packageName = "@webassemblyjs/wasm-opt"; - version = "1.5.12"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.5.12.tgz"; - sha512 = "LBwG5KPA9u/uigZVyTsDpS3CVxx3AePCnTItVL+OPkRCp5LqmLsOp4a3/c5CQE0Lecm0Ss9hjUTDcbYFZkXlfQ=="; - }; - }; - "@webassemblyjs/wasm-parser-1.5.12" = { - name = "_at_webassemblyjs_slash_wasm-parser"; - packageName = "@webassemblyjs/wasm-parser"; - version = "1.5.12"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.5.12.tgz"; - sha512 = "xset3+1AtoFYEfMg30nzCGBnhKmTBzbIKvMyLhqJT06TvYV+kA884AOUpUvhSmP6XPF3G+HVZPm/PbCGxH4/VQ=="; - }; - }; - "@webassemblyjs/wast-parser-1.5.12" = { - name = "_at_webassemblyjs_slash_wast-parser"; - packageName = "@webassemblyjs/wast-parser"; - version = "1.5.12"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.5.12.tgz"; - sha512 = "QWUtzhvfY7Ue9GlJ3HeOB6w5g9vNYUUnG+Y96TWPkFHJTxZlcvGfNrUoACCw6eDb9gKaHrjt77aPq41a7y8svg=="; - }; - }; - "@webassemblyjs/wast-printer-1.5.12" = { - name = "_at_webassemblyjs_slash_wast-printer"; - packageName = "@webassemblyjs/wast-printer"; - version = "1.5.12"; - src = fetchurl { -<<<<<<< HEAD - url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.5.12.tgz"; - sha512 = "XF9RTeckFgDyl196uRKZWHFFfbkzsMK96QTXp+TC0R9gsV9DMiDGMSIllgy/WdrZ3y3dsQp4fTA5r4GoaOBchA=="; -======= - url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.5.10.tgz"; - sha512 = "3qwkz89g5fgn3hwbm7fb4v0zdgq2vr8nb98cg4w0r5za21xry06m8yzwka5j6h9qxz2qqxy019mfxxga03c0g8v8lw5fkf4d4kdk34z"; -======= -======= "@types/node-8.10.20" = { name = "_at_types_slash_node"; packageName = "@types/node"; @@ -407,7 +130,6 @@ let sha512 = "2191b3qs3mj790giz1hdz9nklp2nhvh15gab5yk0la4mb20ir8g0yxdaq7qmp68c8q5s90nnnqkqq8aj85qpqd80fpg14zmj3xprg1k"; }; }; ->>>>>>> nodePackages: meguca: 1.0.7 update "@webassemblyjs/ast-1.5.12" = { name = "_at_webassemblyjs_slash_ast"; packageName = "@webassemblyjs/ast"; @@ -568,11 +290,6 @@ let src = fetchurl { url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.5.12.tgz"; sha512 = "225rq38m20syf9hgmw0mcfx5pgxknjrpw69c99267320cj3byqn07yiqbjagmq4x6yw5c1kp5ylawaqk49bjyjzjzr005i4wx6m2psw"; -<<<<<<< HEAD ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 -======= ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "@zeit/schemas-1.2.0" = { @@ -581,7 +298,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/@zeit/schemas/-/schemas-1.2.0.tgz"; - sha512 = "iceEQm4zFjgAVUPAj8Wto62xUJxOxicXULWFD2q9Z2Rwi1pVnz1QlDMfNTuNZUULmV7/0xFpOthf8JK8xpTYZA=="; + sha512 = "1jdi566pj9g0pyq79li3lzzbschnib5ilxka7rkji83v7smba5p0r37pmm0z1dma0bjgijfki8b3bd3mp2qzh23al03h5ikdr189iw9"; }; }; "CSSselect-0.4.1" = { @@ -635,7 +352,7 @@ let version = "1.3.3"; src = fetchurl { url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.3.tgz"; - sha512 = "3Sp6WZZ/lXl+nTDoGpGWHEpTnnC6X5fnkolYZR6nwIfzbxxvA8utPWe1gCt7i0m9uVGsSz2IS8K8mJ7HmlduMg=="; + sha512 = "0r6wmwsqyg9ig629f43sjxca6wvsjcbgcmq1db77nnwn0vg3ipz71y0lwg6an49jbkrfpxsf2g56jhwjs8ims1hkmz7k5bzjrcplanx"; }; }; "JSV-4.0.2" = { @@ -671,7 +388,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz"; - sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; + sha512 = "38s4f3id97wsb0rg9nm9zvxyq0nvwrmrpa5dzvrkp36mf5ibs98b4z6lvsbrwzzs0sbcank6c7gpp06vcwp9acfhp41rzlhi3ybsxwy"; }; }; "absolute-0.0.1" = { @@ -734,7 +451,7 @@ let version = "0.28.0"; src = fetchurl { url = "https://registry.npmjs.org/accord/-/accord-0.28.0.tgz"; - sha512 = "sPF34gqHegaCSryKf5wHJ8wREK1dTZnHmC9hsB7D8xjntRdd30DXDPKf0YVIcSvnXJmcYu5SCvZRz28H++kFhQ=="; + sha512 = "22hbsgv0xpwylgn199fwqlwk5fffavi922x37zj1kbl1psx2ysyf67kqcgb0q9gk33rjkaxml813k170yf7z2mw9a10cyl71bi7gwdh"; }; }; "acorn-1.2.2" = { @@ -779,11 +496,7 @@ let version = "5.7.1"; src = fetchurl { url = "https://registry.npmjs.org/acorn/-/acorn-5.7.1.tgz"; -<<<<<<< HEAD - sha512 = "d+nbxBUGKg7Arpsvbnlq61mc12ek3EY8EQldM3GPAhWJ1UVxC6TDGbIvUMNU6obBX3i1+ptCIzV4vq0gFPEGVQ=="; -======= sha512 = "1ahdw8l42nvwy1m4d19pymmg1gw31paak1m0bxj371s82vi8paqj582ixqk6p8924y4dp54czbrqngbd9wnwbwvmv00wah62p2dpsbp"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "acorn-dynamic-import-3.0.0" = { @@ -792,7 +505,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz"; - sha512 = "zVWV8Z8lislJoOKKqdNMOB+s6+XV5WERty8MnKBeFgwA+19XJjJHs2RP5dzM57FftIs+jQnRToLiWazKr6sSWg=="; + sha512 = "1d15axgran5kql29v8hk39yifs5zcg7rkffakv4nd3k49jpbzxh030nbsh9q31gnw8n3rfmwpmsq7rq9k9sk2p2l14wk2i5kzqramfd"; }; }; "acorn-globals-1.0.9" = { @@ -828,11 +541,7 @@ let version = "4.1.1"; src = fetchurl { url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-4.1.1.tgz"; -<<<<<<< HEAD - sha512 = "JY+iV6r+cO21KtntVvFkD+iqjtdpRUpGqKWgfkCdZq1R+kbreEl8EcdcJR4SmiIgsIQT33s6QzheQ9a275Q8xw=="; -======= sha512 = "33kr57gnvb46piq8cx7ppqkhjq208ls28g2ap6725y4jy7b8vx53bb6km07x855m134lib9sy7ams0gckqmdvfr5asysw7ym9bs53r5"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "acorn-node-1.5.2" = { @@ -841,11 +550,7 @@ let version = "1.5.2"; src = fetchurl { url = "https://registry.npmjs.org/acorn-node/-/acorn-node-1.5.2.tgz"; -<<<<<<< HEAD - sha512 = "krFKvw/d1F17AN3XZbybIUzEY4YEPNiGo05AfP3dBlfVKrMHETKpgjpuZkSF8qDNt9UkQcqj7am8yJLseklCMg=="; -======= sha512 = "0r44jbsxj9cig59xniwlh94snvwv87jhm26cvishalk4487ncmdamq6vpypqh2flf3dhg04hriw8k11kfy6bmyx01xmvm6x1yzlmccj"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "active-x-obfuscator-0.0.1" = { @@ -872,7 +577,7 @@ let version = "2.11.0"; src = fetchurl { url = "https://registry.npmjs.org/adbkit/-/adbkit-2.11.0.tgz"; - sha512 = "j2vUhEeZmCiqBP+p77CpPWQTcT20rOmSmRHFUTZUwUpxzeCd3fXop4NAGYztSY9/FNU4bT/qqvYQ4EZKuCXhfA=="; + sha512 = "1yf29dq993f047nmbm3yv9qsla7z3s9xn61jh43lzlgbpcxw36p2jn1ahv53i8ik69fkb5l7mqi6r1xm6qfzagz0jm2i64r8y2d8swg"; }; }; "adbkit-logcat-1.1.0" = { @@ -908,7 +613,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/addons-linter/-/addons-linter-1.0.0.tgz"; - sha512 = "6cC0Jcf0vMVgE86TV4A1lfjx78Fp0JltA1UH2icz/cALWMMfDZrD7YpB4dMrpobclsbKFPHexNOYhS4efAc5ng=="; + sha512 = "2g3j1vw3qp8b66kqkgg256aqsbdr1m65g9y2hcaxp1rl38zqdc0ph7x6ckxl1sm0dnrkl39q7pz3y4m6n05g4yf2dhcbg7lqwjv9h79"; }; }; "addr-to-ip-port-1.4.3" = { @@ -917,7 +622,7 @@ let version = "1.4.3"; src = fetchurl { url = "https://registry.npmjs.org/addr-to-ip-port/-/addr-to-ip-port-1.4.3.tgz"; - sha512 = "+KHTG8KSAFdKYmLNZp3VnKj94AZ94gDdu2ipAwxNuMmN9vpf5hdsQgk1hNXFqQOXfd+BMHokyDa1GwDAlGAtGQ=="; + sha512 = "0cjsq4lq001pd9nr0j7lc41vxyrf0x9qpaq8d8989n1grjzzbv8vjdq9l607ab8pgfh1qkx0vhgva4wsnfndkb2c955f04jq8dx78gq"; }; }; "addressparser-0.3.2" = { @@ -944,7 +649,7 @@ let version = "0.4.11"; src = fetchurl { url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.11.tgz"; - sha512 = "L8vcjDTCOIJk7wFvmlEUN7AsSb8T+2JrdP7KINBjzr24TJ5Mwj590sLu3BC7zNZowvJWa/JtPmD8eJCzdtDWjA=="; + sha512 = "26ddl3nnf87iz307rnz4ssnyb16imncpc8drvn2s9ykxhjckr6bigffcg821jpyfimn5yqkpx4jrc1p2i8rlvq1xxj84f626j6drjrg"; }; }; "adm-zip-0.4.7" = { @@ -989,7 +694,7 @@ let version = "4.2.0"; src = fetchurl { url = "https://registry.npmjs.org/agent-base/-/agent-base-4.2.0.tgz"; - sha512 = "c+R/U5X+2zz2+UCrCFv6odQzJdoqI+YecuhnAJLa1zYaMc13zPfwMwZrr91Pd1DYNo/yPRbiM4WVf9whgwFsIg=="; + sha512 = "0i6q0c347f7z5c56gi1cggjiwvdhl3p9zfsysq66gqggk3prlqildnpva900rz8f8gfc8rav8jk7m51z9dhias0z7v3rnzyjm9pzr3k"; }; }; "aggregate-error-1.0.0" = { @@ -1061,16 +766,7 @@ let version = "6.5.0"; src = fetchurl { url = "https://registry.npmjs.org/ajv/-/ajv-6.5.0.tgz"; - sha512 = "VDUX1oSajablmiyFyED9L1DFndg0P9h7p1F+NO8FkIzei6EPrR6Zu1n18rd5P8PqaSRd/FrWv3G1TVBqpM83gA=="; - }; - }; - "ajv-6.5.1" = { - name = "ajv"; - packageName = "ajv"; - version = "6.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.5.1.tgz"; - sha512 = "pgZos1vgOHDiC7gKNbZW8eKvCnNXARv2oqrGQT7Hzbq5Azp7aZG6DJzADnkuSq7RH6qkXp4J/m68yPX/2uBHyQ=="; + sha512 = "203gkx4d984vdbipzb5mz2x4ilymhrzg6vz5xarpfcixb8gl65xx34h0ppk8zjilxxxhgrlv2fwal1gzm0ci19ckbjsd3cshkb1fdal"; }; }; "ajv-6.5.1" = { @@ -1160,7 +856,7 @@ let version = "0.5.2"; src = fetchurl { url = "https://registry.npmjs.org/amqplib/-/amqplib-0.5.2.tgz"; - sha512 = "l9mCs6LbydtHqRniRwYkKdqxVa6XMz3Vw1fh+2gJaaVgTM6Jk3o8RccAKWKtlhT1US5sWrFh+KKxsVUALURSIA=="; + sha512 = "0h54i1d01av3cd2z1hv2nkc5r8za54nmmi2j0678ly7m4w9rr6619b915lgpqapqgakscwpmrav3ni94h34gqhrm53xpjfvlarq5ncp"; }; }; "anchor-markdown-header-0.5.7" = { @@ -1205,7 +901,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz"; - sha512 = "SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA=="; + sha512 = "2cb3237y1374lwc0f3xxpc79bv59r2m18cw868dpdhvwmrxyh06pj5sdzafc7xrc69v5j8v9lwf7hxylyzxq3bz8waxlj5fnvmrflj8"; }; }; "ansi-cyan-0.1.1" = { @@ -1223,7 +919,7 @@ let version = "1.2.1"; src = fetchurl { url = "https://registry.npmjs.org/ansi-diff-stream/-/ansi-diff-stream-1.2.1.tgz"; - sha512 = "PaKs34INoKpTzcjyKd2GM/CCEeTyDgWKuHSgF0z7ywjpbBFj/pzQf/30v+TR6VBBLia6Mso+W2ygU22ljqbi6A=="; + sha512 = "3lf59lflmnm783cbczclcms4qp42l79s7jbzx7xgz89rzk325nfj26bzd61g83lp250a3pjwh8q5w1khvfjkwn8rm9sm80dhbgsr8ix"; }; }; "ansi-escapes-1.4.0" = { @@ -1241,7 +937,7 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz"; - sha512 = "UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw=="; + sha512 = "1bm72rs09dwjhfif8kqjxnpb5fgmcdgkn5483f11j6791s5161f2kvxy69pkgcq0jdws6kqfmr1bx5189lnvkzgkq851qs3gzq1n02j"; }; }; "ansi-gray-0.1.1" = { @@ -1331,7 +1027,7 @@ let version = "3.2.0"; src = fetchurl { url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz"; - sha512 = "NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug=="; + sha512 = "2x19fs1qvg7ifsdvii4g8kqpa5hir1lm0k0y0fz6dhm5c8gh4z9il4wqczl078p2ikmrav23dmj86cxy8y1j22k4mv59d8qq6c8wx1n"; }; }; "ansi-styles-3.2.1" = { @@ -1340,7 +1036,7 @@ let version = "3.2.1"; src = fetchurl { url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz"; - sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; + sha512 = "2lgkskkj4c1fsnrksy0yffda0wss84p8lfiazdc7jli7iqnvrxkzbxjzpvx13lm28qw0zkawfxvz2bdiisc72ccy7hx8i8rm4iijgam"; }; }; "ansi-wrap-0.1.0" = { @@ -1376,7 +1072,7 @@ let version = "1.3.2"; src = fetchurl { url = "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz"; - sha512 = "0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA=="; + sha512 = "269dbx666z4ws49vag1dma5kdpjlx83s74c1jlngrn2672rhvbc47i5ay5h40spmrzgvbvcm33i4yrp88rrc6lg70v78k155z45lwyi"; }; }; "anymatch-2.0.0" = { @@ -1385,7 +1081,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz"; - sha512 = "5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw=="; + sha512 = "03mjsaw6xk4zhvl17fpqn59j4v2bafqs0yfw5y45hl8x97xlihwvjmcx3icnaamvipplnczymvzg4sb4ixwpzak0k3p21c00nqqxmz6"; }; }; "ap-0.1.0" = { @@ -1448,7 +1144,7 @@ let version = "2.4.4"; src = fetchurl { url = "https://registry.npmjs.org/append-tree/-/append-tree-2.4.4.tgz"; - sha512 = "rPMUMkR8JjjPDDHHDZ/YeLO0KIbUGCrXgy921F6sBkEXBR9jYYxK8LUlwpZkUVi70cMR6r8uSmHZ/5HvtrntHg=="; + sha512 = "0gfvfdnxy8zznb198pbzshiqg8vnn2icjbc49dmy158qqb33w2ifh86migd8xighgbjl66lhqlb9cvqv2ghviri1k7kh9kw8hr19wxc"; }; }; "appendable-cli-menu-2.0.0" = { @@ -1475,7 +1171,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz"; - sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="; + sha512 = "13mgnbmdhdq0qncijvpip1l39q1a8labcvj3hc3n1yl2zch106mdkn7p7bd5knvmfkkn1js9nd47nzyjk1himbm8ry8i8gd6mk7mlk3"; }; }; "arch-2.1.1" = { @@ -1484,11 +1180,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/arch/-/arch-2.1.1.tgz"; -<<<<<<< HEAD - sha512 = "BLM56aPo9vLLFVa8+/+pJLnrZ7QGGTVHWsCwieAWT9o9K8UeGaQbzZbGoabWLOo2ksBCztoXdqBZBplqLDDCSg=="; -======= sha512 = "15c4c1cdachcnd0fqbxmkj2q293dsicsska3ilnrlds868yqlmkvnjg2vh8kc60b93ka686nikypf94m7zzpg2n2p5z5xp8lglkkcq4"; ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 }; }; "archiver-2.1.1" = { @@ -1524,7 +1216,7 @@ let version = "1.1.5"; src = fetchurl { url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz"; - sha512 = "5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w=="; + sha512 = "3mizm1yfxynlhaavbimv7n9qljrbhni22v4fch6zr89x6ps0gpjcxm5yfvv05n8vc3r17hmglyswgq9w0s598xv70nnyw358q11s5p6"; }; }; "arg-2.0.0" = { @@ -1533,7 +1225,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/arg/-/arg-2.0.0.tgz"; - sha512 = "XxNTUzKnz1ctK3ZIcI2XUPlD96wbHP2nGqkPKpvk/HNRlPveYrXIVSTk9m3LcqOgDPg3B1nMvdV/K8wZd7PG4w=="; + sha512 = "3iwdcvp3762nzympp65j1rpz06a18vjrdnzdr14ap4baqnyzfa52wzwwjdjl3x93akzs70vmkvl7yahjy6p0j3n5cnmgkx7699m64sz"; }; }; "argparse-0.1.15" = { @@ -1560,7 +1252,7 @@ let version = "1.0.10"; src = fetchurl { url = "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz"; - sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg=="; + sha512 = "17fhywmdjcp8g0ys089i5xg26yajkkg9zg8hyry3fghz75b2pq5vdx997dk5p2sc15r9nsj8rmf4f27g81hi92kzj5q86sdmg5ni553"; }; }; "argparse-1.0.4" = { @@ -1605,7 +1297,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz"; - sha512 = "L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg=="; + sha512 = "2vdly17xk5kw7bfzajrjdnw4ml3wrfblx8064n0i4fxlchcscx2mvnwkq2bnnqvbqvdy4vs9ad462lz0rid7khysly9m9vzjiblly1g"; }; }; "arr-union-2.1.0" = { @@ -1776,7 +1468,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz"; - sha512 = "B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w=="; + sha512 = "3myjiz16qi117x0k52sisqyn0cqx6yxvpgr43bkil9shgs7yhs8wpdgd3wjwfzgwxsw330yqwhp880gsyx2kxj1lfyb6gs1fh7qqnh7"; }; }; "array-union-1.0.2" = { @@ -1830,7 +1522,7 @@ let version = "0.0.7"; src = fetchurl { url = "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz"; - sha512 = "wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog=="; + sha512 = "2ifpj39fza01g4z9jhgl0shmh5f79czgfh7bf40n66v5p93nrf43kiqhsgic9az2jrwmj8n60dn7kav1rzvm41a9kwi4ypf0mahhrf0"; }; }; "arrify-1.0.1" = { @@ -1893,7 +1585,7 @@ let version = "4.10.1"; src = fetchurl { url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz"; - sha512 = "p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw=="; + sha512 = "15j9ms7k6dx08m1wqrvc4958vcrshjjpicpxmz9bflsyk0x2r7w20lxlm27jpyj7cwj6158a0582vifk393hqp0ysn9mlbabqw9qzd7"; }; }; "assert-1.4.1" = { @@ -1947,7 +1639,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz"; - sha512 = "jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw=="; + sha512 = "07swiwljqy13fyil4y9lp319zcqsgdkchaic1y4dlfi3flh5l4qlwv497g40bnspsl9h857a3ig5assmvjdwv913dppgymkvcsil2wf"; }; }; "assign-symbols-1.0.0" = { @@ -1965,7 +1657,7 @@ let version = "0.11.5"; src = fetchurl { url = "https://registry.npmjs.org/ast-types/-/ast-types-0.11.5.tgz"; - sha512 = "oJjo+5e7/vEc2FBK8gUalV0pba4L3VdBIs2EKhOLHLcOd2FgQIVQN9xb0eZ9IjEWyAL7vq6fGJxOvVvdCHNyMw=="; + sha512 = "0rp4wq8vmdvsklw32gsxgpv0b41cc92gpkd2nyw6x88ah30c5vhxdqwic9jm16d490mgp8bmrnjjpcm382z4jjhv0fg3zmvjzxyi650"; }; }; "ast-types-0.9.6" = { @@ -1977,18 +1669,15 @@ let sha1 = "102c9e9e9005d3e7e3829bf0c4fa24ee862ee9b9"; }; }; -<<<<<<< HEAD "astral-regex-1.0.0" = { name = "astral-regex"; packageName = "astral-regex"; version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz"; - sha512 = "+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg=="; + sha512 = "0ga6b0jymkw4jrfvjilhfrddml29l1nrvj7r57d140p7rn31mmbni4j9z343v2zzz2zcnlsr2s17kmlgjkyvs9pxrf88an11pm9y77r"; }; }; -======= ->>>>>>> nodePackages: meguca: 1.0.7 update "async-0.1.22" = { name = "async"; packageName = "async"; @@ -2094,7 +1783,7 @@ let version = "2.5.0"; src = fetchurl { url = "https://registry.npmjs.org/async/-/async-2.5.0.tgz"; - sha512 = "e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw=="; + sha512 = "1ijrwmifg76a8wwhhfqxg23kd0rsjhzklwvj2czvqxs2k25ii6p3y6s3vhbcc5hnr87b0gfc4nb54b8bph2hn9c6z1f6nldjw04ksbv"; }; }; "async-2.6.0" = { @@ -2103,7 +1792,7 @@ let version = "2.6.0"; src = fetchurl { url = "https://registry.npmjs.org/async/-/async-2.6.0.tgz"; - sha512 = "xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw=="; + sha512 = "0zp4b5788400npi1ixjry5x3a4m21c8pnknk8v731rgnwnjbp5ijmfcf5ppmn1ap4a04md1s9dr8n9ygdvrmiai590v0k6dby1wc1y4"; }; }; "async-2.6.1" = { @@ -2112,7 +1801,7 @@ let version = "2.6.1"; src = fetchurl { url = "https://registry.npmjs.org/async/-/async-2.6.1.tgz"; - sha512 = "fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ=="; + sha512 = "2aqgkis9ac37q6jv6zspfpj3rikh2vr9fdch7wajrvqihq5sxyd1gh5zv65hy0y3r22l720qkidwh6img8dngqcjj0dwrl0dwpj5lbw"; }; }; "async-each-1.0.1" = { @@ -2130,7 +1819,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz"; - sha512 = "jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg=="; + sha512 = "1ddib7nbyayhldvsyrfdpxk7khyi6s72570gkf3qqf4b1xwzdh52w0vlj6bknl40imispychhwfjb2bm29pjxbd5yz26fi8g8bfx7wf"; }; }; "asynckit-0.4.0" = { @@ -2166,11 +1855,7 @@ let version = "1.2.1"; src = fetchurl { url = "https://registry.npmjs.org/auto-bind/-/auto-bind-1.2.1.tgz"; -<<<<<<< HEAD - sha512 = "/W9yj1yKmBLwpexwAujeD9YHwYmRuWFGV8HWE7smQab797VeHa4/cnE2NFeDhA+E+5e/OGBI8763EhLjfZ/MXA=="; -======= sha512 = "1fcr7vxwc915dxyyd460f5zjzxq83w4hdbk8dkif8zsw7aynpvzp9j14sxi7mn1ax363fcii70hgmhgvvl04w7clpq1564abj7p4vzx"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "aws-sdk-1.18.0" = { @@ -2182,42 +1867,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; -<<<<<<< HEAD -<<<<<<< HEAD - "aws-sdk-2.265.1" = { -======= -<<<<<<< HEAD - "aws-sdk-2.252.1" = { ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 + "aws-sdk-2.266.1" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.265.1"; + version = "2.266.1"; src = fetchurl { -<<<<<<< HEAD - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.265.1.tgz"; - sha512 = "0xL9Lontx71wxwa+adZQGAWGmsXyrJbJmBzcCd6w+/zRAkd/mGX7T0V4mivPZK3QIiaKR8U/TZDmxAwnOryX3Q=="; -======= - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.252.1.tgz"; - sha1 = "4ce45b16dc408883e20a564bd86270c67f25bb60"; -======= - "aws-sdk-2.254.1" = { - name = "aws-sdk"; - packageName = "aws-sdk"; - version = "2.254.1"; - src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.254.1.tgz"; - sha512 = "3xii67fvbmza2v2asza89vxqkpqv2lksnf95qxpp4fh881kqrrbvxf2pvdmfv1y1ci7za60jabjsfzfvhyrj4f11k8v454qn8mnp25z"; ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 -======= - "aws-sdk-2.263.1" = { - name = "aws-sdk"; - packageName = "aws-sdk"; - version = "2.263.1"; - src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.263.1.tgz"; - sha512 = "26brcpdb67335ifyh935bslqvq3idyvpix1c61sn0j1lk7alk16k8klwbkbfz5dpfqyyhmzl3b3jg91hp68xwd7c9ghxg88nnkk48zy"; ->>>>>>> nodePackages: meguca: 1.0.7 update + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.266.1.tgz"; + sha512 = "17pcm1hm0n73z4iw5aaalccx2izbwnm4p33lqc24paqig5kp8hlgkbx41c29s7cx48fijg1zn0xpqcb6jg9f8hx2xs3h482bar65jbg"; }; }; "aws-sign-0.2.0" = { @@ -2253,7 +1909,7 @@ let version = "1.7.0"; src = fetchurl { url = "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz"; - sha512 = "32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w=="; + sha512 = "3rkdcpm3myysvq9nj6plgvpngzsbv7qk1wvb9f4m3gcsl23pf5x0hyph02svyl2v1lgjji8kl75ii7q04lhhhgjyw1irbinmxsl6qyz"; }; }; "axios-0.15.3" = { @@ -2289,7 +1945,7 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/azure-arm-batch/-/azure-arm-batch-3.1.0.tgz"; - sha512 = "AwRxOn/4718n3N4rlUsnFTavKsQoNHJzcfH9BWpUadiov9mMVxH3vXPhM1sb0KVO21GPqh4s3w9s1RUpJvstkA=="; + sha512 = "282vyr654axav0gvwn1xalga7dlx9fh3ddk7qbkppvi2mwcv6zsin39aim0bzgif5rp4d18qhmaydhm4x5raayyvhkmzvzqgwx72103"; }; }; "azure-arm-cdn-4.0.1" = { @@ -2298,7 +1954,7 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/azure-arm-cdn/-/azure-arm-cdn-4.0.1.tgz"; - sha512 = "mVX5cG/XxULhCGenPYOrq6lKFeUnuGB8rur+dQgxpmP/AtBVKWSfdl1zm7i3WrEQHelyjiAHUohKxAkWFO2RQw=="; + sha512 = "11r3v8l2q4w8jl8a83j13kjx4fi1casnyw9nwsxfsgn8aams01gyqx66447bzpamry61f17wlalmadbmf1kv9v713hl5ifpdxqgjmcr"; }; }; "azure-arm-commerce-2.0.0" = { @@ -2307,7 +1963,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/azure-arm-commerce/-/azure-arm-commerce-2.0.0.tgz"; - sha512 = "scKBmo3nZXbzXtox+SoEYf8Ij+c2y1r47Ga0MVxm1kUTs1UT8KaAiAlC269KKDNYpuXXuV7+CKUs52VCiM06JQ=="; + sha512 = "0jkmkc889jyfb5513z5xffpwnk5hcr89apxnhh9i20adw0kanri6ifncrf33d36xkw5mjrnwy7hizv10hmgjcfsbvrpcrg7ind83hmi"; }; }; "azure-arm-compute-3.0.0-preview" = { @@ -2343,7 +1999,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/azure-arm-devtestlabs/-/azure-arm-devtestlabs-2.1.1.tgz"; - sha512 = "S5dCYTMrqL+BJc699fIQtXwLFuv5m8jTDqPdXTFpn/CSkyBcOyJwuZH2zPExQjGNZTyjIR6GWi8oeg/IpYLBWw=="; + sha512 = "1dw30m5r07pla1gba31w8d37ijqsca267qwrxlip5q24fsw429r5w4zd4qmvpd31v9wi6zrxcb0nz5m23rgbgff4n0vza1b6dhl55sb"; }; }; "azure-arm-dns-2.1.0" = { @@ -2352,7 +2008,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/azure-arm-dns/-/azure-arm-dns-2.1.0.tgz"; - sha512 = "/y0tOM9qNijPYqB381JFYiEyfF+L5B8z+F8JS1OMV1JXIb45vZKXeoe82ZNMZ5g38Vme3uAblxpvp5OtIcvW6Q=="; + sha512 = "3lxdjr1mn9sfvqsjwdy1plyb7qkg6379j9xkg47gabr5g9rpqhmfljpii9ln2azz0rizr4bbxy348b28m9g6xx0cb7jhdkarww2sbgz"; }; }; "azure-arm-hdinsight-0.2.2" = { @@ -2397,7 +2053,7 @@ let version = "5.3.0"; src = fetchurl { url = "https://registry.npmjs.org/azure-arm-network/-/azure-arm-network-5.3.0.tgz"; - sha512 = "juitxBWofPBZ+kcmLB8OjW5qPD6+/Ncdq86WjDTIUcH+cyb/GWktdDymv6adbOyz4xZ9/wbThFL7AHgq8cHBig=="; + sha512 = "25c3hgi59w01ysjhk9hdzvx2viv7v3cknkbz9iwfhnnj6gz4rrzxhair0s8r5nfmcfxgz5y7qy6lvld1qgjq9j7z9cz0z582p2avs4f"; }; }; "azure-arm-powerbiembedded-0.1.1" = { @@ -2433,7 +2089,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/azure-arm-servermanagement/-/azure-arm-servermanagement-1.1.0.tgz"; - sha512 = "GlPXPD5Up2U6Qxv40ScC/+7WRcVVYQf7EHUSomD385o/MuyJAjM6CxBS8fPKwkZR5MRSd60p6kBo5AQ+bwfpeA=="; + sha512 = "1wfj1vg7q2f8s20x8lssxsjqkj52in2rbrz2lhh1cx360l9xhr3z6pkyxha44km23xhfqamqm2xdvpz08kx3y0v8cx6b9sl7qydflqs"; }; }; "azure-arm-storage-5.0.0" = { @@ -2442,7 +2098,7 @@ let version = "5.0.0"; src = fetchurl { url = "https://registry.npmjs.org/azure-arm-storage/-/azure-arm-storage-5.0.0.tgz"; - sha512 = "sqMjRAbzj9ARP4nEof71cupuHq/ajx+p9uNI9znkwHAP7CYtWEyTzHP0jrfgajccrgcH4sjCQPWt4K4s66NxiQ=="; + sha512 = "24p38zb5jpf1bgm831ciqh70yp1qdvaw2vqxx3krj9lqn1d4vn0yw60whwzfj73ysliz3ysmwg6xskjypza3i497w8x13zk0r2278xj"; }; }; "azure-arm-trafficmanager-1.1.0-preview" = { @@ -2550,11 +2206,7 @@ let version = "0.10.7"; src = fetchurl { url = "https://registry.npmjs.org/azure-asm-website/-/azure-asm-website-0.10.7.tgz"; -<<<<<<< HEAD - sha512 = "h3OmXKKOLd4sbf4khrxqGTjspjqpKduKN9EWgEoIeNhMY+PVKrVEIMr3ZyKzmmy/8123MD+ip67wMqUKSTLtUA=="; -======= sha512 = "18fscj91ajk5w5flyi3yc5pbprvyv4snci6gxya412baanmwdilrn3q115805ni6y5dnad97akfqf0rday8c97ydlndwbcfl9facww7"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "azure-batch-3.2.2" = { @@ -2563,11 +2215,7 @@ let version = "3.2.2"; src = fetchurl { url = "https://registry.npmjs.org/azure-batch/-/azure-batch-3.2.2.tgz"; -<<<<<<< HEAD - sha512 = "IM5nUITXMgTFTF4avRxsz/oLcMXLSZEzpukulRRpO1emXBI4EgSIr0++hUo+AZ94MINE2C4DXgCDiQ9P0suYXw=="; -======= sha512 = "1grijyj9w7qk0q0bq1jxn24hcq7i7q17r58bgjgmy4084iq29facmrvd4a9abp9lqrr2jfbqmq0pyngdhfbs6jy9k2h8cnphi86gki0"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "azure-common-0.9.20" = { @@ -2576,7 +2224,7 @@ let version = "0.9.20"; src = fetchurl { url = "https://registry.npmjs.org/azure-common/-/azure-common-0.9.20.tgz"; - sha512 = "0gxFOLV12poak+raLYAU4z9JAZEafYSo9LrS+7WlToOawb2Ye2BfHYAGfLBkQrAZbo/NHpJ28/IaiUZVqiZ4fQ=="; + sha512 = "1yph9maam38j6pjydv947ndixp1kc22cjq7q1l03mgn0ywqpp0rm0sflnszplmsyjl88z8sj40ljgz32j02vnpajcd9mnkmnlw4a36j"; }; }; "azure-gallery-2.0.0-pre.18" = { @@ -2594,7 +2242,7 @@ let version = "2.2.0"; src = fetchurl { url = "https://registry.npmjs.org/azure-graph/-/azure-graph-2.2.0.tgz"; - sha512 = "ab0LlM5Q3pcKm+V6F6yx2ShzGOTYMcmJvLdL3PQsC9hF+hrYsBdkTCdNZdlPBgrSB8jp5vzhmK83qHGRs14hHw=="; + sha512 = "0gj2pmkj5qshdxgk3hzrrp9r03x42h69zcnak979ij1gc6q3bx4bn0b5ksdqjxppj4wjcfqwhc76a6rn6n1fyp5kc59gpjhrsa0pgb9"; }; }; "azure-keyvault-1.0.0" = { @@ -2612,11 +2260,7 @@ let version = "0.10.6"; src = fetchurl { url = "https://registry.npmjs.org/azure-monitoring/-/azure-monitoring-0.10.6.tgz"; -<<<<<<< HEAD - sha512 = "6HNA8VuC5qYvQMjcQt2/zlB7oyAJ7n6KGIYGstS6KS9Orux0peqxlrGPDeQRa4jDNq6ili83KiGc7RhWcgsE4Q=="; -======= sha512 = "3hh82vjaqcfv71158vjz5m2mqvc723b27j0v3xijsqym9blxjp4wbr9pbab41l63257xvh942ipnl6fpzfl5p6880psdrl2bgql0wz8"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "azure-servicefabric-0.1.5" = { @@ -2652,7 +2296,7 @@ let version = "6.26.3"; src = fetchurl { url = "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz"; - sha512 = "6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA=="; + sha512 = "0617drz6fkpdpkl4snbfz7ivd296j19182m7x4klhqac60qr77wn8bkgpz696sscxykcv1n8cdv09pz7v9xq6s1k552fyp6w0p8ag7a"; }; }; "babel-generator-6.26.1" = { @@ -2661,7 +2305,7 @@ let version = "6.26.1"; src = fetchurl { url = "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz"; - sha512 = "HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA=="; + sha512 = "2jfjq7ggb0ygyzxg3vw248iq0iw2v00janjva1bf3l322k4zjcx9hvq9qqy67gxxyl2igw1asxfgp769hd5229pc70kwri9l1iz09qz"; }; }; "babel-helper-builder-react-jsx-6.26.0" = { @@ -2814,7 +2458,7 @@ let version = "6.18.0"; src = fetchurl { url = "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz"; - sha512 = "q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ=="; + sha512 = "1qk460vyxfs08g8586jdc02wqzyy2y06596qcn1na9bz7yxra6vgh6177qf345xai0virpaz56bkpgmfcrd8yx5l2vjkn49y66h9xdb"; }; }; "babylon-7.0.0-beta.19" = { @@ -2823,7 +2467,7 @@ let version = "7.0.0-beta.19"; src = fetchurl { url = "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.19.tgz"; - sha512 = "Vg0C9s/REX6/WIXN37UKpv5ZhRi6A4pjHlpkE34+8/a6c2W1Q692n3hmc+SZG5lKRnaExLUbxtJ1SVT+KaCQ/A=="; + sha512 = "3y91819zra4jxfjqqdvbi44fr34m68vk7j76rkqkxvayhxmcmrvmxpk7rz16r2s3riql0xs322mkzm61asxzkc5b2zpw4firzv043an"; }; }; "backo2-1.0.2" = { @@ -2850,7 +2494,7 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/bail/-/bail-1.0.3.tgz"; - sha512 = "1X8CnjFVQ+a+KW36uBNMTU5s8+v5FzeqrP7hTG5aTb4aPreSbZJlhwPon9VKMuEVgV++JM+SQrALY3kr7eswdg=="; + sha512 = "1v31szd5dwn62xh8a9cy95yby0ibq9j9barzs03hxjr4vcjnwz1mgjdb9p4rqgymjm3f5zrxgrnqkjd9h9viykd56zfchsm66g04zym"; }; }; "balanced-match-1.0.0" = { @@ -2868,7 +2512,7 @@ let version = "0.11.2"; src = fetchurl { url = "https://registry.npmjs.org/base/-/base-0.11.2.tgz"; - sha512 = "5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg=="; + sha512 = "11dwi4v72034dqafp0qxsg8h6cpn92vv4vf909a9fybd69yfg6gqn4hhav6x59r1wbi8h1qlgfh9np0340mpljv1hc9v9p02giqygp5"; }; }; "base62-0.1.1" = { @@ -2931,7 +2575,7 @@ let version = "1.2.3"; src = fetchurl { url = "https://registry.npmjs.org/base64-js/-/base64-js-1.2.3.tgz"; - sha512 = "MsAhsUW1GxCdgYSO6tAfZrNapmUKk7mWx/k5mFY/A1gBtkaCaNapTg+FExCw1r9yeaZhqx/xPg43xgTFH6KL5w=="; + sha512 = "3kqp8hzql2ccdqf7vqizav1lrwp5gynn081718g9slxcs428sv02n037xb9hfgrqybbk4qacnk5mcv63z8fm3l4h6fi06xm8nqj3h1j"; }; }; "base64-js-1.3.0" = { @@ -2940,7 +2584,7 @@ let version = "1.3.0"; src = fetchurl { url = "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz"; - sha512 = "ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw=="; + sha512 = "2bvd1ja1kbighx0vm4ia3gqv15m70pldsx2igl37ayq11715w3g0vfmfq1yb8w80hlzblvszig3fr4sdhn8rr800lsaz8dg47zsziki"; }; }; "base64-url-1.2.1" = { @@ -3030,7 +2674,7 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/bcrypt/-/bcrypt-1.0.3.tgz"; - sha512 = "pRyDdo73C8Nim3jwFJ7DWe3TZCgwDfWZ6nHS5LSdU77kWbj1frruvdndP02AOavtD4y8v6Fp2dolbHgp4SDrfg=="; + sha512 = "1zfn87155w6q9fsv5ls3gxwih7yvarrh16kzpfrpppblzpmp1cy9gjkknsf9lkixacza39h51jd7varqfg19w3qkdic62zpirv86755"; }; }; "bcrypt-nodejs-0.0.3" = { @@ -3042,13 +2686,13 @@ let sha1 = "c60917f26dc235661566c681061c303c2b28842b"; }; }; - "bcrypt-pbkdf-1.0.1" = { + "bcrypt-pbkdf-1.0.2" = { name = "bcrypt-pbkdf"; packageName = "bcrypt-pbkdf"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz"; - sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d"; + url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"; + sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; }; }; "bcryptjs-2.4.3" = { @@ -3093,7 +2737,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/bencode/-/bencode-1.0.0.tgz"; - sha512 = "N+VOSP5MkoX+xgnp6Y056iCY5TmCZg9rgPNPQe0bIiXchxYFP4vs/Tf0dTdQ+qQhP7HM2gvfFq+sUVjQsGy5Zw=="; + sha512 = "1kvjv5hs1c53b5g2vghpnncn4zj397sa0vpbx1pzpn8ngq52s3xq9923gnl2kzkh1mhyrl277jrh87a766yks89qvz8b4jczr44xr9p"; }; }; "bencode-2.0.0" = { @@ -3102,7 +2746,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/bencode/-/bencode-2.0.0.tgz"; - sha512 = "wr2HwwrUpfB5c68zmAudOltC7rZ1G0+lQOcnuEcfIM3AWAVnB3rHI3nlgd/2CWTfQ3w3zagKt89zni/M+VLZ8g=="; + sha512 = "3rdjlprrhprwwygnw5aik9pgi1xyr09yvgq3rbr4g3pl1v70mcc1k903x3vh9z782jly6vmnvp44nrskl5rhcxgfdwz19fl1b1qggf2"; }; }; "better-assert-1.0.2" = { @@ -3132,38 +2776,13 @@ let sha1 = "159a49b9a9714c1fb102f2e0ed1906fab6a450f4"; }; }; -<<<<<<< HEAD -<<<<<<< HEAD "big-integer-1.6.32" = { -======= -<<<<<<< HEAD - "big-integer-1.6.30" = { ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 name = "big-integer"; packageName = "big-integer"; version = "1.6.32"; src = fetchurl { -<<<<<<< HEAD url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.32.tgz"; - sha512 = "ljKJdR3wk9thHfLj4DtrNiOSTxvGFaMjWrG4pW75juXC4j7+XuKJVFdg4kgFMYp85PVkO05dFMj2dk2xVsH4xw=="; -======= - url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.30.tgz"; - sha512 = "0mpq1fin33p53fjgylmnrc0g51raqmprdpkm51vkl2na7mar5a778mlnwv6wrj98fjcx30wijf0zms9l88ibprn36z39jpw9zpcaq1c"; -======= -======= ->>>>>>> nodePackages: meguca: 1.0.7 update - "big-integer-1.6.31" = { - name = "big-integer"; - packageName = "big-integer"; - version = "1.6.31"; - src = fetchurl { - url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.31.tgz"; - sha512 = "047nkbj5b46cnqrz6rpjcqnzqmrcrk88wc60g74fla91ib7njxbddvm90fv3pfdcwv5pj8jrs7avvvqll6mmjzyijkk5i7hf4sdjdll"; -<<<<<<< HEAD ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 -======= ->>>>>>> nodePackages: meguca: 1.0.7 update + sha512 = "33zihann56pdxn82iflwfv4ypj7r2ii0m4f4q2paj4y4ppy7vic5rcfz5pabf5ib8is65f63d7r48rndcxy1qzj3mhxp4zh3msqjcln"; }; }; "big.js-3.2.0" = { @@ -3172,7 +2791,7 @@ let version = "3.2.0"; src = fetchurl { url = "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz"; - sha512 = "+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q=="; + sha512 = "3qicqys1bg16slzbzjn3f0fir82r4d1h6lvy5y0cqqwzbs2iaxf93xgi6x47m7l87i102ifjn4qvjbf764gyncsxcqw7lw33mk7y4zs"; }; }; "bin-version-2.0.0" = { @@ -3217,7 +2836,7 @@ let version = "1.3.4"; src = fetchurl { url = "https://registry.npmjs.org/binary-search/-/binary-search-1.3.4.tgz"; - sha512 = "dPxU/vZLnH0tEVjVPgi015oSwqu6oLfCeHywuFRhBE0yM0mYocvleTl8qsdM1YFhRzTRhM1+VzS8XLDVrHPopg=="; + sha512 = "2kfhwxcsnq5rg1laxzcv16i6i3n30fm9k3slz1rg7jwp8cq94rk4k84c5abic3wg31bg85smg1156npnh43xmaq24npv72byvz59z3l"; }; }; "binaryheap-0.0.3" = { @@ -3244,7 +2863,7 @@ let version = "1.3.0"; src = fetchurl { url = "https://registry.npmjs.org/bindings/-/bindings-1.3.0.tgz"; - sha512 = "DpLh5EzMR2kzvX1KIlVC0VkC3iZtHKTgdtZ0a3pglBZdaQFjt5S9g9xd1lE+YvXyfd6mtCeRnrUfOLYiTMlNSw=="; + sha512 = "15lvjac4av3h7xmks8jgd56vryz5xb27r8xcpfwhfyr9dv305lms5llc1x6nx6nfvha873d4vg04nfi89aj4jkxplrnjiyc9kjf34hf"; }; }; "binstall-1.2.0" = { @@ -3271,7 +2890,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/bitfield/-/bitfield-2.0.0.tgz"; - sha512 = "4xM4DYejOHQ/qWBfeqBXNA4mJ12PwcOibFYnH1kYh5U9BHciCqEJBqGNVnMJXUhm8mflujNRLSv7IiVQxovgjw=="; + sha512 = "27y12y6a0jj5yrb5m8k7fp5czr6cj2x15rmd3d10q4s22i2fw23v5c731ciy9sndjic7hcgblkjc3ilayh7lpv0m4zp8f53hw6kh4z3"; }; }; "bitfield-rle-2.1.0" = { @@ -3307,7 +2926,7 @@ let version = "7.10.0"; src = fetchurl { url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-7.10.0.tgz"; - sha512 = "fvb6M58Ceiv/S94nu6zeaiMoJvUYOeIqRbgaClm+kJTzCAqJPtAR/31pXNYB5iEReOoKqQB5zY33gY0W6ZRWQQ=="; + sha512 = "10md5792s6q3xwdrmwh1a8ax9w128g607b5qsbxzw8x0gl9184g754hprchl6mq8lmf4f8qylk2h8vavsnbn9yy9gzjnyh2kwrzmxky"; }; }; "bittorrent-dht-8.4.0" = { @@ -3316,7 +2935,7 @@ let version = "8.4.0"; src = fetchurl { url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-8.4.0.tgz"; - sha512 = "FRe/+MYBePev7Yb+BXSclkVuDxb/w+gUbao6nVHYQRaKO7aXE+ARRlL3phqm6Rdhw5CRVoLMbLd49nxmCuUhUQ=="; + sha512 = "18j3r8acrygcy5pdk684mlij31n25z9lqdadxsj8q8y04wpnqxql5j1v18rsfmadlafihzz2q7nwicnkis0bzl6xnpzfy01qvwby5qm"; }; }; "bittorrent-peerid-1.2.0" = { @@ -3334,11 +2953,7 @@ let version = "2.4.2"; src = fetchurl { url = "https://registry.npmjs.org/bittorrent-protocol/-/bittorrent-protocol-2.4.2.tgz"; -<<<<<<< HEAD - sha512 = "ZphU6H9B0Tf99P2noVmyKkT7Bf8FZG6T3VSurJva8ozvvCqSfLMnI7X4Khxn5qXXvw71/R9Vfq+aJvMgV9lquQ=="; -======= sha512 = "2wnmnap43rjd6mggraizzgm1szxg9g6cwf2my5m4ckv6z4j5ayfz37jvadsrbjlvn9nwr05zw2zni1an9cs39zxykykgla1gzl59636"; ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 }; }; "bittorrent-tracker-7.7.0" = { @@ -3356,7 +2971,7 @@ let version = "9.9.1"; src = fetchurl { url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-9.9.1.tgz"; - sha512 = "PdCrhMP0ajbutZEcw5FLd/pTvcxr7m5NTXEck3t1qS+UMcC9+pie2Zd59TSFefia2ipDlstOhVAUTOlaoZLlDQ=="; + sha512 = "06yb4m1bbllq52hhm7cp5j35bd9my3rhlsgaycpv6g9iymxq0qr8bx9fmxr673i9m6nxvkbrjym7ykp9f8w674inpp3csplqf2apl1x"; }; }; "bl-0.8.2" = { @@ -3392,7 +3007,7 @@ let version = "1.2.2"; src = fetchurl { url = "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz"; - sha512 = "e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA=="; + sha512 = "0810nalazir8szyxvbg53d7416j4a7xy94sdri37mwmnax9s9hx88mzky882sr9dv0is7w9fqlp7ys6ijr1z1imc2dnfxk8fri51jvv"; }; }; "blake2b-2.1.2" = { @@ -3410,7 +3025,7 @@ let version = "1.1.7"; src = fetchurl { url = "https://registry.npmjs.org/blake2b-wasm/-/blake2b-wasm-1.1.7.tgz"; - sha512 = "oFIHvXhlz/DUgF0kq5B1CqxIDjIJwh9iDeUUGQUcvgiGz7Wdw03McEO7CfLBy7QKGdsydcMCgO9jFNBAFCtFcA=="; + sha512 = "1q4aaql83818qzgh01c6x9jvcchmd6bq7r0kfs3f364vhwxnp7qc25y3h2ij5751mi1zhh96874ib0afn8an92xh3ag1kv5g2yhflm0"; }; }; "blob-0.0.2" = { @@ -3437,11 +3052,7 @@ let version = "1.2.8"; src = fetchurl { url = "https://registry.npmjs.org/blob-to-buffer/-/blob-to-buffer-1.2.8.tgz"; -<<<<<<< HEAD - sha512 = "re0AIxakF504MgeMtIyJkVcZ8T5aUxtp/QmTMlmjyb3P44E1BEv5x3LATBGApWAJATyXHtkXRD+gWTmeyYLiQA=="; -======= sha512 = "10f50n9kqwmk81z8hbxj7lp7h0hjq55h08lrh3jqzwln11mh7iwzgf9ldck54q9zmlinlss7vqijmwii66b930768w9s5x42qih1vdd"; ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 }; }; "block-stream-0.0.9" = { @@ -3486,7 +3097,7 @@ let version = "3.5.1"; src = fetchurl { url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz"; - sha512 = "MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA=="; + sha512 = "2631bhp784qng0ifbypsmvijn6kjfvkhq2335kdz8ix5qi3wb3lbpg94xjn1av2s6i95ygr5a4y9j1721dw6zdbywwh1m48by4qpa1h"; }; }; "blueimp-md5-2.10.0" = { @@ -3495,7 +3106,7 @@ let version = "2.10.0"; src = fetchurl { url = "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.10.0.tgz"; - sha512 = "EkNUOi7tpV68TqjpiUz9D9NcT8um2+qtgntmMbi5UKssVX2m/2PLqotcric0RE63pB3HPN/fjf3cKHN2ufGSUQ=="; + sha512 = "18r5wdrfrrjip7xipgxyg673njbfkj46hkswp4bmb5n7zx6gmajrashp6w32rkvhanymnx6rd7mrlqgzm68ksd89sy5x9gd5qx58hqj"; }; }; "bn.js-4.11.8" = { @@ -3504,7 +3115,7 @@ let version = "4.11.8"; src = fetchurl { url = "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz"; - sha512 = "ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA=="; + sha512 = "20bg51v29zygy89w84qb64pkjikxfjdsgjs0ry6pvv8fkwn5kd1izrqn022d838q3rcaq8dmy033g7q8b6960j4f8ipan74y9ydimr2"; }; }; "bncode-0.2.3" = { @@ -3621,7 +3232,7 @@ let version = "5.2.0"; src = fetchurl { url = "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz"; - sha512 = "Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw=="; + sha512 = "19h20yqpvca08dns1rs4f057f10w63v0snxfml4h5khsk266x3x1im0w72bza4k2xn0kfz6jlv001dhcvxsjr09bmbqnysils9m7437"; }; }; "bops-0.1.1" = { @@ -3693,7 +3304,7 @@ let version = "1.3.0"; src = fetchurl { url = "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz"; - sha512 = "TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw=="; + sha512 = "0pmn5jcnph7yfgfhlncg1lys066cq44kavj4d9qhmyy9705w61pabpwlma09xg4xplzbxh78d3m4xwvjwk478r3xyqnmpzq79yy7lsc"; }; }; "bplist-creator-0.0.6" = { @@ -3729,7 +3340,7 @@ let version = "1.1.11"; src = fetchurl { url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"; - sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; + sha512 = "248cnpbbf0p32h53rd3g8wzpgrkaj4p078ra1g6l16f82i6bzkvmhwqan5rk88apbll9ly1476kngd7f7z27i3b3zxpbb3064f8yaw8"; }; }; "braces-0.1.5" = { @@ -3756,7 +3367,7 @@ let version = "2.3.2"; src = fetchurl { url = "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz"; - sha512 = "aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w=="; + sha512 = "3gxrfbb03jf6nh75n99snhv4a9jni48hfc0gkj5yl1cginpqx3d73dnp8snph1fdkc804iz6zg0aqibifjnscjfbpfziw2g7yg5pmv8"; }; }; "broadway-0.3.6" = { @@ -3792,7 +3403,7 @@ let version = "6.1.0"; src = fetchurl { url = "https://registry.npmjs.org/browser-pack/-/browser-pack-6.1.0.tgz"; - sha512 = "erYug8XoqzU3IfcU8fUgyHqyOXqIE4tUTTQ+7mqUjQlvnXkOO6OlT9c/ZoJVHYoAaqGxr09CN53G7XIsO4KtWA=="; + sha512 = "1cav0iv5irfvilx6x14zbxil5m012hxan16cgyp9yjs6fqfg6fny2cdjimfwgil9ma8n4w8g8wv4yn843sz257p44vkbaz8qn1jxdks"; }; }; "browser-resolve-1.11.3" = { @@ -3801,11 +3412,7 @@ let version = "1.11.3"; src = fetchurl { url = "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.3.tgz"; -<<<<<<< HEAD - sha512 = "exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ=="; -======= sha512 = "1slq1pnm0b2903am1rl17iczlsl08sq4rckkr5fgkchgzfac13kiibwdk08yy2m62lgir8dmj9d61vil8q0vrm1d2mzw1qn2vaf443v"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "browser-stdout-1.3.1" = { @@ -3814,7 +3421,7 @@ let version = "1.3.1"; src = fetchurl { url = "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz"; - sha512 = "qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw=="; + sha512 = "21jjhrf3wdmzsfqgva5s7shs1wdmcdxsjvi75p8z7i0q2i6n3654gpxjqlhbnpmzm25cpkshyi8swy13017qkp9m7xnbgw0bwiia45a"; }; }; "browserify-13.3.0" = { @@ -3841,7 +3448,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz"; - sha512 = "+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA=="; + sha512 = "22gkxh9wf4hjxkyvj427k9r76xkz9vs63s1drwcggbpv0r7qdclzdvw167s7iq8936zak241cc5ck3bqkp6hy99zlkrbcmfl5g8gc7v"; }; }; "browserify-cache-api-3.0.1" = { @@ -3859,7 +3466,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz"; - sha512 = "sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w=="; + sha512 = "3bz6v63l37ndb18236yjdkbxjcvy4x16a8j7vsqxqprvnkcnkq1hg1ffd1c9zk9a3j555ppnpisfyh0x4adlb8lmpwbfa8i837n9y5h"; }; }; "browserify-des-1.0.1" = { @@ -3868,7 +3475,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.1.tgz"; - sha512 = "zy0Cobe3hhgpiOM32Tj7KQ3Vl91m0njwsjzZQK1L+JDf11dzP9qIvjreVinsvXrgfjhStXwUWAEpB9D7Gwmayw=="; + sha512 = "35rl28vzg80fa81b0a7rdaj71zf0ymxxhlmdpisps4dlgvkazbxz47q9fnl1n9wnbq7ilk6vnbxa399zcwdjdz3i0lii1mpnyhh4bfg"; }; }; "browserify-incremental-3.1.1" = { @@ -3940,7 +3547,7 @@ let version = "0.2.0"; src = fetchurl { url = "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz"; - sha512 = "Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA=="; + sha512 = "24488d4s6d901hj9d9jdddapmcvmibbdpjq6nv3bpyjx72546fcqa0vripy0ydsrw1jk6bakfzvynh5i9cz0g59hrmn4ph75d3kdpk7"; }; }; "bson-0.1.8" = { @@ -3976,7 +3583,7 @@ let version = "5.1.0"; src = fetchurl { url = "https://registry.npmjs.org/buffer/-/buffer-5.1.0.tgz"; - sha512 = "YkIRgwsZwJWTnyQrsBTWefizHh+8GYj3kbL1BTiAQ/9pwpino0G7B2gp5tx/FUBqUlvtxV85KNR3mwfAtv15Yw=="; + sha512 = "1ipkzdnq03rnxyl50wmzigdbd96lh0mgzffcab80yxl38x7k316kzs3h0w0bxdjj7vqh6dw3wgb7y3rsqab0ar4ky9rbh0r1f1i2hk2"; }; }; "buffer-alloc-1.2.0" = { @@ -3985,7 +3592,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz"; - sha512 = "CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow=="; + sha512 = "2isng7g5ld0a4ih1d38bcdqpw8jpqajmcn6vfkrqpahmhim4cfw51c1sikz5s5hnmfychcbzcxvwydn8qi6zq6mhl15anzd1110fnq8"; }; }; "buffer-alloc-unsafe-1.1.0" = { @@ -3994,7 +3601,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz"; - sha512 = "TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg=="; + sha512 = "01b27ck9qpkjb3s14q703k5vi00m7lpl0zkyi91z4kxjww4b6q09frq68lm6m9hvhb5m4w0arwybncm5hia3j9kr9vd4h84qa43chsc"; }; }; "buffer-crc32-0.1.1" = { @@ -4075,7 +3682,7 @@ let version = "0.1.2"; src = fetchurl { url = "https://registry.npmjs.org/buffer-from/-/buffer-from-0.1.2.tgz"; - sha512 = "RiWIenusJsmI2KcvqQABB83tLxCByE3upSP8QU3rJDMVFGPWLvPQJt/O1Su9moRWeH7d+Q2HYb68f6+v+tw2vg=="; + sha512 = "2z3dp7smyppzg5yc63hvyfxgrw5d14splmxbknz4v8g6bnncca1acr4xd6l3z13lpp4vj4120pyvk87040ajbx7v24cj9mcgdx8h9a6"; }; }; "buffer-from-1.1.0" = { @@ -4084,7 +3691,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.0.tgz"; - sha512 = "c5mRlguI/Pe2dSZmpER62rSCu0ryKmWddzRYsuXc50U2/g8jMOulc31VZMa4mYx31U5xsmSOpDCgH88Vl9cDGQ=="; + sha512 = "0ch7mwp2p7iz81hlj769cki9vapg34rp3368mbxffjync131zz3cig7vkjv4n1lfyfnaapj9axq5d6sg92a8ri6fnvggz481fb936bk"; }; }; "buffer-indexof-1.1.1" = { @@ -4093,7 +3700,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz"; - sha512 = "4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g=="; + sha512 = "3bgz1zhq9ng3gypq825f00p9qi9y6z7wvkkf28nhjlyifnb3lk1dkmbya84k0ja79zv8kmmhvalwcnnz92533ip7pnjp3is1w9cxyp3"; }; }; "buffer-more-ints-0.0.2" = { @@ -4147,7 +3754,7 @@ let version = "3.0.5"; src = fetchurl { url = "https://registry.npmjs.org/bufferutil/-/bufferutil-3.0.5.tgz"; - sha512 = "0fUEthLqfCkYspEuP0vmiAe+PsXslE+AlILb2rmS9I4tAdm3SmpCI69M66zQL20GQEszdbXyVN6q+cpG/yhYlg=="; + sha512 = "2b5ha7z8v5gkanyakrbax9k9d00cv9gs2nfnk5g4d16ljmpv40jv3pljawxmnw2jj04z57cqlzbw1w8wr5kyblin8c2jz7a2av09xfi"; }; }; "bufferview-1.0.1" = { @@ -4219,7 +3826,7 @@ let version = "1.1.4"; src = fetchurl { url = "https://registry.npmjs.org/bulk-write-stream/-/bulk-write-stream-1.1.4.tgz"; - sha512 = "GtKwd/4etuk1hNeprXoESBO1RSeRYJMXKf+O0qHmWdUomLT8ysNEfX/4bZFXr3BK6eukpHiEnhY2uMtEHDM2ng=="; + sha512 = "2g3ccqw8k5vhdhnks27i954xglllw5gay8nvy3zgm2c7jpwnjc2imarwshx53pz54br6q4i4x2va4s80ixavafphhsykdhyzrvv1lhs"; }; }; "bunyan-1.5.1" = { @@ -4363,7 +3970,7 @@ let version = "10.0.4"; src = fetchurl { url = "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz"; - sha512 = "Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA=="; + sha512 = "0f1zwi8bbiia995410m24xljd0ra0vk579q7rk48p7mrq9nbilx3qa2rnp7hjdwnvx28zfad0rfdcwyq3blzkb3rk8b9yl77crp960f"; }; }; "cache-base-1.0.1" = { @@ -4372,7 +3979,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz"; - sha512 = "AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ=="; + sha512 = "36i943khi87af4gif9r6imjgybqxq9cbd69z2h8p2s2j6scfbhrv7j3n591xl982fmyq29rkwh70a6qdcf3v0piwzfh8n2jf571v9q0"; }; }; "cacheable-request-2.1.4" = { @@ -4546,31 +4153,6 @@ let sha1 = "a2aa5fb1af688758259c32c141426d78923b9b77"; }; }; -<<<<<<< HEAD -<<<<<<< HEAD -======= -<<<<<<< HEAD - "caniuse-lite-1.0.30000850" = { - name = "caniuse-lite"; - packageName = "caniuse-lite"; - version = "1.0.30000850"; - src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000850.tgz"; - sha512 = "109fg3d4qqzsnn1jmrjih7nhddicpkxsyhq60dhx3s6g2rgcfjas5n56h4xfncqq0j3vrbn3w0x35dhlq2cxh4khsfpq8kz8kqvhwl8"; -======= - "caniuse-lite-1.0.30000851" = { -======= - "caniuse-lite-1.0.30000856" = { ->>>>>>> nodePackages: meguca: 1.0.7 update - name = "caniuse-lite"; - packageName = "caniuse-lite"; - version = "1.0.30000856"; - src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000856.tgz"; - sha512 = "0m12939p8vav2l33cmfxzvxyi8blq88j20p52pc5n9mb2ci558k2gqgdx8gjqppvlx4100khqc85lmafbs1zvm1r6k0fca719q9hyf7"; - }; - }; ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 "capture-stack-trace-1.0.0" = { name = "capture-stack-trace"; packageName = "capture-stack-trace"; @@ -4631,7 +4213,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/caw/-/caw-2.0.1.tgz"; - sha512 = "Cg8/ZSBEa8ZVY9HspcGUYaK63d/bN7rqS3CYCzEGUxuYv6UlmcjzDUz2fCFFHyTvUW5Pk0I+3hkA3iXlIj6guA=="; + sha512 = "2wa0gi2wljxw00rvqz454sgdr8yy90z8lhprxjc1prwi695lnzrh6sk0qqhp63h9gmbldyvvzfvm8k1jk0sbv6icdawcss441jky3qa"; }; }; "ccount-1.0.3" = { @@ -4640,7 +4222,7 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/ccount/-/ccount-1.0.3.tgz"; - sha512 = "Jt9tIBkRc9POUof7QA/VwWd+58fKkEEfI+/t1/eOlxKM7ZhrczNzMFefge7Ai+39y1pR/pP6cI19guHy3FSLmw=="; + sha512 = "2dqnm6wybhq4zcdf3x97zjibb5zvvcbq3p837sp61rk6wvbk3nqq4lpivvxgvgg4cgl346aqzkpwry1sl7l1yw7ab7d6wqi34h6vpr6"; }; }; "center-align-0.1.3" = { @@ -4667,7 +4249,7 @@ let version = "7.1.1"; src = fetchurl { url = "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-7.1.1.tgz"; - sha512 = "azL6xMoi+uxu6z4rhWQ1jbdUhOMhis2PvscD/xjLqNMkv3BPPp2JyyuTHOrf9BOosGpNQ11v6BKv/g57RXbiaA=="; + sha512 = "1lf4xj5gc7gxbqjx1pmshsddaqah4zlvzm1r4rbrf4rsgjgf2zj9lx8rccgy0y7ps7wv2i1wf259dwd6mj8aaryxdpfryi2rb2glckb"; }; }; "chainsaw-0.1.0" = { @@ -4721,7 +4303,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz"; - sha512 = "LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ=="; + sha512 = "1fnn3znivja3xq1lacvsdwkl2s8ki9w95sylnf2pkmaia1mjz3llbdb5r2dxsflqfky3h8f1bh0piv0l5waw2bkdniqnyv0yx5wch9d"; }; }; "chalk-2.4.0" = { @@ -4730,7 +4312,7 @@ let version = "2.4.0"; src = fetchurl { url = "https://registry.npmjs.org/chalk/-/chalk-2.4.0.tgz"; - sha512 = "Wr/w0f4o9LuE7K53cD0qmbAMM+2XNLzR29vFn5hqko4sxGlUsyy363NvmyGIyk5tpe9cjTr9SJYbysEyPkRnFw=="; + sha512 = "0bnfi1y6b0wl6wn93ykm3awxyjnsknai0hrnvvkxfvjrcsld722r3ljdac9zifvvg8vqd4pxlrhrc4r58yp0xxfxj2bpx18zv8z1gss"; }; }; "chalk-2.4.1" = { @@ -4739,7 +4321,7 @@ let version = "2.4.1"; src = fetchurl { url = "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz"; - sha512 = "ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ=="; + sha512 = "1yl5ffjp5w65b9ydnw4vp13n563121hs64xbnajif51grhpqmslaqllj24zm1pfaw9ywvdx69n8ppa3riwlps25k5934zgnbf3pmcrr"; }; }; "character-entities-1.2.2" = { @@ -4748,7 +4330,7 @@ let version = "1.2.2"; src = fetchurl { url = "https://registry.npmjs.org/character-entities/-/character-entities-1.2.2.tgz"; - sha512 = "sMoHX6/nBiy3KKfC78dnEalnpn0Az0oSNvqUWYTtYrhRI5iUIYsROU48G+E+kMFQzqXaJ8kHJZ85n7y6/PHgwQ=="; + sha512 = "30y1wgwpay9yfcz4l3wj9yslp751hch7vhing2f748qn8clk0im3f32xn25k57s6q94mkq0gnk6ga8icz3yzhm752vjq1p7mxghgjmh"; }; }; "character-entities-html4-1.1.2" = { @@ -4757,7 +4339,7 @@ let version = "1.1.2"; src = fetchurl { url = "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-1.1.2.tgz"; - sha512 = "sIrXwyna2+5b0eB9W149izTPJk/KkJTg6mEzDGibwBUkyH1SbDa+nf515Ppdi3MaH35lW0JFJDWeq9Luzes1Iw=="; + sha512 = "0ikbsydxv9ap7im4i2l4nv5gqgilwwbbpxf8xgyknz3cv2jgp4285f0kdl0qcv1xbh9946a9wkcyd4b7mg5nzg0s5dyxnys571xg2mh"; }; }; "character-entities-legacy-1.1.2" = { @@ -4766,7 +4348,7 @@ let version = "1.1.2"; src = fetchurl { url = "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.2.tgz"; - sha512 = "9NB2VbXtXYWdXzqrvAHykE/f0QJxzaKIpZ5QzNZrrgQ7Iyxr2vnfS8fCBNVW9nUEZE0lo57nxKRqnzY/dKrwlA=="; + sha512 = "2ag1akl7wv9ysm4qkkrx8r59mj08xgnavah9hn79ggzknkb5hikn15fdgbcql4yln4a5kbi0b8xykwhy80vrarsbyfqapgdnmapdl7l"; }; }; "character-parser-1.2.1" = { @@ -4793,7 +4375,7 @@ let version = "1.1.2"; src = fetchurl { url = "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.2.tgz"; - sha512 = "7I/xceXfKyUJmSAn/jw8ve/9DyOP7XxufNYLI9Px7CmsKgEUaZLUTax6nZxGQtaoiZCjpu6cHPj20xC/vqRReQ=="; + sha512 = "1wm395ypw8d7xpq3jffx9m3j24simj28sf9symc9pa94s8l04maqagcy79j62yngip7rvcg4c7zvvxx7hygw9r0k44jaayzwmqz33zc"; }; }; "chardet-0.4.2" = { @@ -4811,7 +4393,7 @@ let version = "0.5.0"; src = fetchurl { url = "https://registry.npmjs.org/chardet/-/chardet-0.5.0.tgz"; - sha512 = "9ZTaoBaePSCFvNlNGrsyI8ZVACP2svUtq0DkM7t4K2ClAa96sqOIRjAzDTc8zXzFt1cZR46rRzLTiHFSJ+Qw0g=="; + sha512 = "3931r17a9qqilrj8ymqwiqrayvwaz6d7hvhscrh8s4a7cksmw0saq1bg2xk7r20mcnzbcpn4c05bii36axilkfrpj2j0gcy2shdm57m"; }; }; "charenc-0.0.2" = { @@ -4901,11 +4483,7 @@ let version = "2.0.4"; src = fetchurl { url = "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz"; -<<<<<<< HEAD - sha512 = "z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ=="; -======= sha512 = "1fwj48gbgxg51bp9x3jdpypyv7214pqf7hbbgl2xsycy2pxslkavglqcmk355mbjw6ik2nya68aplkjwb80wvy8mh4z4fkbvz5gpnfg"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "chownr-0.0.2" = { @@ -4932,11 +4510,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.0.tgz"; -<<<<<<< HEAD - sha512 = "xDbVgyfDTT2piup/h8dK/y4QZfJRSa73bw1WZ8b4XM1o7fsFubUVGYcE+1ANtOzJJELGpYoG2961z0Z6OAld9A=="; -======= sha512 = "3s5s29qg93czdfyvc38m9f688jckv5l1m8gn14734avbf85zgnnikawz336fmhddzvswjaiy9ji0bpz9b3qfzzaialkskf34y1xadn4"; ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 }; }; "chromecast-player-0.2.3" = { @@ -4963,7 +4537,7 @@ let version = "1.9.1"; src = fetchurl { url = "https://registry.npmjs.org/chromecasts/-/chromecasts-1.9.1.tgz"; - sha512 = "nsXv7ufgrpC8s5DUm6FJEa2XJ2VvE9FmbTVi6r4zGreTFTTSRSJjvqVEqLUFX/fGo/zbSre3zdoV+Pu9DGLz0A=="; + sha512 = "38g6qhcppxzh5fsrnvvfjnvzjiwdxsz0nsshi55prij4ifj6har7dqs6fzflqimdmkd24vgclkrgb8i96hrpm4hnfy91bp0wzpfzicy"; }; }; "chromium-pickle-js-0.2.0" = { @@ -4981,7 +4555,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/chunk-store-stream/-/chunk-store-stream-2.1.0.tgz"; - sha512 = "mVVfkjLW3E4wgBIMBw+5es+q0ShA/67r8dvGwy31o3CUo4kJ74bxWEK2WDHCJ5rTFWFbtQe5O2ZKFJgCnsOcWA=="; + sha512 = "1c9rhwy0ac18jk67fwhgdavc4ax76i7q8qmidj2b3qqdvq9i6ir8w53ylnw7invy7msxzs0538smkvsp47hf30jh0q4xp6n6a95ymcr"; }; }; "ci-info-1.1.3" = { @@ -4990,7 +4564,7 @@ let version = "1.1.3"; src = fetchurl { url = "https://registry.npmjs.org/ci-info/-/ci-info-1.1.3.tgz"; - sha512 = "SK/846h/Rcy8q9Z9CAwGBLfCJ6EkjJWdpelWDufQpqVDYq2Wnnv8zlSO6AMQap02jvhVruKKpEtQOufo3pFhLg=="; + sha512 = "0p634fyx3kkll2blj5f5bjmz273d7ba201yi3jlrvy7p7lnmmi479d6s3khwmp9lnfrb314l4kw5dq40q60hzfnmfycqibzm3izrbs8"; }; }; "cint-8.2.1" = { @@ -5008,7 +4582,7 @@ let version = "1.0.4"; src = fetchurl { url = "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz"; - sha512 = "Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q=="; + sha512 = "3cm9kdc1sv7pakzlhrc1pazdvg9lk4hv31lximwbcrgmwfzg6imxrndszgx9yzlizknfh2b73cr7b5mfcv50bldpyq6jr5s4zknsj1a"; }; }; "circular-append-file-1.0.1" = { @@ -5017,7 +4591,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/circular-append-file/-/circular-append-file-1.0.1.tgz"; - sha512 = "BUDFvrBTCdeVhg9E05PX4XgMegk6xWB69uGwyuATEg7PMfa9lGU1mzFSK0xWNW2O0i9CAQHN0oIdXI/kI2hPkg=="; + sha512 = "294ys13wj7mq7c2sb6h20a25z98wv9mar62nliikcsnb55xyqqwy3hj2ghcmc71yrx61i9s15x0qy71sy9x6i0ghsaxf2akn2zcah05"; }; }; "circular-json-0.3.3" = { @@ -5026,7 +4600,7 @@ let version = "0.3.3"; src = fetchurl { url = "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz"; - sha512 = "UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A=="; + sha512 = "3hadrrn41znfv3gbqjxf0ckzjmns7w7zgsqw73sdz8nclaff9b0cg1mqhz3zxw3ndnmqqvrdcfykkfpv2v1pv4jdyzcccbn3hsbg4ji"; }; }; "circular-json-0.5.4" = { @@ -5035,7 +4609,7 @@ let version = "0.5.4"; src = fetchurl { url = "https://registry.npmjs.org/circular-json/-/circular-json-0.5.4.tgz"; - sha512 = "vnJA8KS0BfOihugYEUkLRcnmq21FbuivbxgzDLXNs3zIk4KllV4Mx4UuTzBXht9F00C7QfD1YqMXg1zP6EXpig=="; + sha512 = "25fjig8rxf865x3cbsz0hdv839lbpw6awq4ybl5qw65x5d5ha9whz5krnshqcqqdypyhvj5dnmydja51d4i2678hsig61dllkq40wmy"; }; }; "clarinet-0.11.0" = { @@ -5053,7 +4627,7 @@ let version = "0.3.6"; src = fetchurl { url = "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz"; - sha512 = "qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg=="; + sha512 = "1xcqwmfmsbrm2ck76brwiqjmcza655khgh5szh6wngk357i37sgwsga1pbarwzaz9hvzkriqhq6j0z5mv0pmz61cf9wxvk3y5mlzs58"; }; }; "clean-css-3.4.28" = { @@ -5152,7 +4726,7 @@ let version = "1.3.1"; src = fetchurl { url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.3.1.tgz"; - sha512 = "1QL4544moEsDVH9T/l6Cemov/37iv1RtoKf7NJ04A60+4MREXNfx/QvavbH6QoGdsD4N4Mwy49cmaINR/o2mdg=="; + sha512 = "1vad3gya61nh9npwcrcrq0d7sq9v0a2zaqvvnhbzpqxfp24qkh3xb8372fk9yx7l1nm9gz2gvzjysksh9ggwlvzah1lp816ivkzh0nm"; }; }; "cli-table-0.3.1" = { @@ -5179,7 +4753,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/cli-truncate/-/cli-truncate-1.1.0.tgz"; - sha512 = "bAtZo0u82gCfaAGfSNxUdTI9mNyza7D8w4CVCcaOsy7sgwDzvx6ekr6cuWJqY3UGzgnQ1+4wgENup5eIhgxEYA=="; + sha512 = "1h48346i2bsfvj3h0qfxmyh1770cxb3d9ibk75yjag1xgzk021yqbmkiv30k5c0qgyb0sxkvjc3sckmakf4i7q1d2gh1nmw9fimj2vc"; }; }; "cli-width-1.1.1" = { @@ -5233,7 +4807,7 @@ let version = "1.2.3"; src = fetchurl { url = "https://registry.npmjs.org/clipboardy/-/clipboardy-1.2.3.tgz"; - sha512 = "2WNImOvCRe6r63Gk9pShfkwXsVtKCroMAevIbiae021mS850UkWPbevxsBz3tnvjZIEGvlwaqCPsw+4ulzNgJA=="; + sha512 = "0j60cwp5vpc7v13m0d5rgh6h5jf6yxnywfb1wgbdn7lalklrr5ncvfkkqk6xj7b046bl2jabfqifk3yl6agd93ixfmywif2xfc4hqyr"; }; }; "cliui-2.1.0" = { @@ -5260,7 +4834,7 @@ let version = "4.1.0"; src = fetchurl { url = "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz"; - sha512 = "4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ=="; + sha512 = "26knyxdavl3y7kq82vfa094ym3n05vy2h2j5srb9fhhy8l43l0kwlasah5i78jks77zqgc373hbf96xcxv6am042gpbw35x452vwlg0"; }; }; "clivas-0.1.4" = { @@ -5359,7 +4933,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/clone-regexp/-/clone-regexp-1.0.1.tgz"; - sha512 = "Fcij9IwRW27XedRIJnSOEupS7RVcXtObJXbcUOX93UCLqqOdRpkvzKywOOSizmEK/Is3S/RHX9dLdfo6R1Q1mw=="; + sha512 = "2dkam277bx7ajypbx3z8jrpigy0lqfflbj3ic5crhprjilxlfm8nh6xzpjm1p3n4ndx6pjw2pnm5shjirs2cj6lg7bnwnqiiksa7j0m"; }; }; "clone-response-1.0.2" = { @@ -5395,7 +4969,7 @@ let version = "1.1.2"; src = fetchurl { url = "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.2.tgz"; - sha512 = "Bq6+4t+lbM8vhTs/Bef5c5AdEMtapp/iFb6+s4/Hh9MVTt8OLKH7ZOOZSCT+Ys7hsHvqv0GuMPJ1lnQJVHvxpg=="; + sha512 = "2kg2ysl15s9cxgj62p43gzagfqf3kk2zqj4i6g3ckxs2b0fvx71blw7qy7v7gmy2pi9z9jsrc81v43kz7khagrvhlpwyv55vzibxbh6"; }; }; "closest-to-2.0.0" = { @@ -5476,7 +5050,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/coa/-/coa-2.0.1.tgz"; - sha512 = "5wfTTO8E2/ja4jFSxePXlG5nRu5bBtL/r1HCIpJW/lzT6yDtKl0u0Z4o/Vpz32IpKmBn7HerheEZQgA9N2DarQ=="; + sha512 = "2nxlq1p7l0446g1hnmpgv37c0m2jqnzfddgsa4ys4p5sapd43mx6p7yas925hjimzzx41jvxr36fvllsziwaliiwbdginq4xx6d61z7"; }; }; "code-point-at-1.1.0" = { @@ -5494,7 +5068,7 @@ let version = "1.2.1"; src = fetchurl { url = "https://registry.npmjs.org/codecs/-/codecs-1.2.1.tgz"; - sha512 = "SPnx+ZHXVJ0qTInRXmnxuyu8PDvSzvop5MXp1BOr/urFQI3yL2n5ewE755skTklF/hKVlWj8cinGxdR2gvLvTA=="; + sha512 = "16fzwl2fvacbii9fby6i5cm2bz4ajaf4jdyffq1ggwnjbzjim0cbspymc9x9sf5whlzmknj7cybqaxvy5lmxlc99hm9sm6pj7wz3ya8"; }; }; "codepage-1.4.0" = { @@ -5512,7 +5086,7 @@ let version = "1.12.7"; src = fetchurl { url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz"; - sha512 = "fLeEhqwymYat/MpTPUjSKHVYYl0ec2mOyALEMLmzr5i1isuG+6jfI2j2d5oBO3VIzgUXgBVIcOT9uH1TFxBckw=="; + sha512 = "29mq40padyvizg4f141b00p0p74hx9v06d7gxk84ggsiyw6rf5bb65gnfwk1i02r276jwqybmi5hx98s943slyazjnqd69jmj389dvw"; }; }; "coffee-script-1.6.3" = { @@ -5530,7 +5104,7 @@ let version = "1.0.4"; src = fetchurl { url = "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.4.tgz"; - sha512 = "YfQ1tAUZm561vpYD+5eyWN8+UsceQbSrqqlc/6zDY2gtAE+uZLSdkkovhnGpmCThsvKBFakq4EdY/FF93E8XIw=="; + sha512 = "0iifkywgm8zqn27w0maj5c1yarf294qm5qqcbsajafv8r5f9w02ss33qfngyp59mamv8h8yqx93xpsqnabzn0wnpssrx6qr0ns3bx31"; }; }; "collection-visit-1.0.0" = { @@ -5548,7 +5122,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/color/-/color-3.0.0.tgz"; - sha512 = "jCpd5+s0s0t7p3pHQKpnJ0TpQKKdleP71LWcA0aqiljpiuAkOSUFN/dyH8ZwF0hRmFlrIuRhufds1QyEP9EB+w=="; + sha512 = "3xh3l9zhh6dav7pp5hy88kbb6c52j0pf331ywpp6w2jaf94w25fjn4am930775mskxy75cxl90fji17cym40ivslxxlpcrlxgkmsalc"; }; }; "color-convert-1.9.2" = { @@ -5557,11 +5131,7 @@ let version = "1.9.2"; src = fetchurl { url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.2.tgz"; -<<<<<<< HEAD - sha512 = "3NUJZdhMhcdPn8vJ9v2UQJoH0qqoGUkYTgFEPZaPjEtwmmKUfNV46zZmgB2M5M4DCEQHMaCfWHCxiBflLm04Tg=="; -======= sha512 = "173hv9fwlbqicbhb2gs0c878h407kp4ihfq0rinxdwdaz4lcad70jwciyb3si019qc4j6d8mb90g6j0jkyzdjfbkx7wg1acv1jhkmfw"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "color-name-1.1.1" = { @@ -5588,7 +5158,7 @@ let version = "1.1.3"; src = fetchurl { url = "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz"; - sha512 = "qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg=="; + sha512 = "13g563h7mrddc3rlljgg75km4zycb8rhzxb5wiiricqvh4n7zgl60psnz39ijkzx5bn93s5qvacwkxbg1cglcmg5z3yyb6cjs96685a"; }; }; "colors-0.5.1" = { @@ -5633,7 +5203,7 @@ let version = "1.3.0"; src = fetchurl { url = "https://registry.npmjs.org/colors/-/colors-1.3.0.tgz"; - sha512 = "EDpX3a7wHMWFA7PUHWPHNWqOxIIRSJetuwl0AS5Oi/5FMV8kWm69RTlgm00GKjBO1xFHMtBbL49yRtMMdticBw=="; + sha512 = "03rrn3n1k9lcwlg5xdx0cj727blwc1a0r6rnq1r8nynwni4bwqlbzlb9qp02x09pfnrfj0ihb28wsimqxiivm5k0f2wa77hmvfmffhh"; }; }; "colour-0.7.1" = { @@ -5768,7 +5338,7 @@ let version = "2.11.0"; src = fetchurl { url = "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz"; - sha512 = "b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ=="; + sha512 = "2yi2hwf0bghfnv1fdgd4wvh7s0acjrgqbgww97ncm6i6s6ffs1zahnj48f6gqpqj6fsf0jigvnr0civ25k2160c38281r80wvg7jkkg"; }; }; "commander-2.13.0" = { @@ -5777,7 +5347,7 @@ let version = "2.13.0"; src = fetchurl { url = "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz"; - sha512 = "MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA=="; + sha512 = "1h27ar13gbld2jk6wk84irqmyz6ya6b4dzmxb6nq8azyi48iq8pqqyq90jwzxqb3i7j167y5fpiys6v7vvjzhm8bbd8rya1kzgr4nri"; }; }; "commander-2.14.1" = { @@ -5786,7 +5356,7 @@ let version = "2.14.1"; src = fetchurl { url = "https://registry.npmjs.org/commander/-/commander-2.14.1.tgz"; - sha512 = "+YR16o3rK53SmWHU3rEM3tPAh2rwb1yPcQX5irVn7mb0gXbwuCCrnkbV5+PBfETdfg1vui07nM6PCG1zndcjQw=="; + sha512 = "11j7mwxfdnhi3yfkhxjvfkg1mzdsi3wq7iygma6ksmj1f7hfs0z8rpfcysqmy85f67mqvzhda3w1lyy1jqxxm31k799sazbipm7b17r"; }; }; "commander-2.15.1" = { @@ -5795,7 +5365,16 @@ let version = "2.15.1"; src = fetchurl { url = "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz"; - sha512 = "VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag=="; + sha512 = "1mb8z6hhy74rfdgj3spmk52sdqa5bb2w5wp28z3md1daqcca4vbbsg66wz8hdhrv0fnnmf8yzdkmnw3c373vcccmyizzlnmbpsd6msn"; + }; + }; + "commander-2.16.0" = { + name = "commander"; + packageName = "commander"; + version = "2.16.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.16.0.tgz"; + sha512 = "1xx0ldb0xa8kh9a9108nq09a5sx55k8i82037w4pw665a489qh1v9a0wk81ph1z94rfvi97k9q8x70ncp0ywdyydayx58lsaj9flmdi"; }; }; "commander-2.6.0" = { @@ -5840,7 +5419,7 @@ let version = "1.7.2"; src = fetchurl { url = "https://registry.npmjs.org/common-tags/-/common-tags-1.7.2.tgz"; - sha512 = "joj9ZlUOjCrwdbmiLqafeUSgkUM74NqhLsZtSqDmhKudaIY197zTrb8JMl31fMnCUuxwFT23eC/oWvrZzDLRJQ=="; + sha512 = "0jx2cncv7x5ms1gg2vks5bhxi9c5jbwymfk42dzmp9vrxrmhrl9vaw4wsh4lvf65shxmq1v8f8s0i3rkyk2x8mrfpq2m30famkgv24f"; }; }; "commondir-1.0.1" = { @@ -5984,7 +5563,7 @@ let version = "1.6.2"; src = fetchurl { url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz"; - sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw=="; + sha512 = "05nnf80j9ls12y3cw2dfnc6rmand3ya5sx9cqn9dgg19ljzdnyfjjv8ig79xi73gr2y4rkfzn9wjip2zzwp5n2d49njd3ki2a1c3cfv"; }; }; "conf-1.4.0" = { @@ -5993,7 +5572,7 @@ let version = "1.4.0"; src = fetchurl { url = "https://registry.npmjs.org/conf/-/conf-1.4.0.tgz"; - sha512 = "bzlVWS2THbMetHqXKB8ypsXN4DQ/1qopGwNJi1eYbpwesJcd86FBjFciCQX/YwAhp9bM7NVnPFqZ5LpV7gP0Dg=="; + sha512 = "07g80zfanxf96as7ikxbv6csskj2033zw2hj8jpii0s3wqxjyq1x73fk1bqnj833clsmmiz6khcvid668gji5vsnhgb67ck5mcmafbg"; }; }; "config-0.4.15" = { @@ -6038,7 +5617,7 @@ let version = "3.1.2"; src = fetchurl { url = "https://registry.npmjs.org/configstore/-/configstore-3.1.2.tgz"; - sha512 = "vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw=="; + sha512 = "2difdg3f56d584kfxl1zvm4ik5m3ln949m0q9sxq6ranzx2iwqa9zxqxy2l5i2lsm8jwmaiqkf7rc73gfnfip5m2qh8awd3s4ggknxy"; }; }; "connect-1.9.2" = { @@ -6218,7 +5797,7 @@ let version = "3.1.2"; src = fetchurl { url = "https://registry.npmjs.org/constantinople/-/constantinople-3.1.2.tgz"; - sha512 = "yePcBqEFhLOqSBtwYOGGS1exHo/s1xjekXiinh4itpNQGCu4KA1euPh1fg07N2wMITZXQkBz75Ntdt1ctGZouw=="; + sha512 = "2xnhrmlbkfpcvckxxrl0hjp6qhhqv1p7c6pwxgqp1g0sa5q5cc514xn48g9x8kqj7g1imzciwgb2msbhvhn0w0v92mb7105l43drqy9"; }; }; "constants-browserify-1.0.0" = { @@ -6272,7 +5851,7 @@ let version = "1.0.4"; src = fetchurl { url = "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz"; - sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="; + sha512 = "1f4y61wc913jrnga7nny83gzf9l2488q6sl1ry9lbwgh5x5d3va0xcc0xrmjk6gdxl6d4r6rsk800xp5bazhjrx05yx1wpc8c8gg0w4"; }; }; "content-type-git+https://github.com/wikimedia/content-type#master" = { @@ -6309,7 +5888,7 @@ let version = "1.1.24"; src = fetchurl { url = "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-1.1.24.tgz"; - sha512 = "2WcSUst4Y3Z4hHvoMTWXMJr/DmgVdLiMOVY1Kak2LfFz+GIz2KDp5naqbFesYbfXPmaZ5p491dO0FWZIJoJw1Q=="; + sha512 = "3ap10i691k1bd6kslyrxrlrcqzdgdv1mibnraknwvls1n1kcbw77w9d6sljjdan766bhx0md07gz6ihjwsk3s3vhiw7cqvqrd914ryr"; }; }; "conventional-changelog-angular-1.6.6" = { @@ -6318,7 +5897,7 @@ let version = "1.6.6"; src = fetchurl { url = "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-1.6.6.tgz"; - sha512 = "suQnFSqCxRwyBxY68pYTsFkG0taIdinHLNEAX5ivtw8bCRnIgnpvcHmlR/yjUyZIrNPYAoXlY1WiEKWgSE4BNg=="; + sha512 = "0v02kj8l2ji18jmcgjqa0nqsfn4h9jklgy4g9brf1ppm0n8344in3xpmyc5y06i5k3jjxl8sv90cndh2fbg4fhn0wr1ric258ajgr5j"; }; }; "conventional-changelog-atom-0.2.8" = { @@ -6327,7 +5906,7 @@ let version = "0.2.8"; src = fetchurl { url = "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-0.2.8.tgz"; - sha512 = "8pPZqhMbrnltNBizjoDCb/Sz85KyUXNDQxuAEYAU5V/eHn0okMBVjqc8aHWYpHrytyZWvMGbayOlDv7i8kEf6g=="; + sha512 = "3m1yhgjwbz0x993dfdw3g2n4svz4ym4k1snhg57iraw1418glgdwpz52j01300v8d1p6ldjjbrv7x3gqa08xcqq6inpkbhv2fmdk4zj"; }; }; "conventional-changelog-cli-1.3.22" = { @@ -6336,7 +5915,7 @@ let version = "1.3.22"; src = fetchurl { url = "https://registry.npmjs.org/conventional-changelog-cli/-/conventional-changelog-cli-1.3.22.tgz"; - sha512 = "pnjdIJbxjkZ5VdAX/H1wndr1G10CY8MuZgnXuJhIHglOXfIrXygb7KZC836GW9uo1u8PjEIvIw/bKX0lOmOzZg=="; + sha512 = "1kb6qrs4myjknqg4cpl530gxzbainsvhrzg6hm6xhdjhprby9flw28y92cbimq9cqpc6qq2bldzbnlxf1yzq5yhamwld3pijqhdsy56"; }; }; "conventional-changelog-codemirror-0.3.8" = { @@ -6345,7 +5924,7 @@ let version = "0.3.8"; src = fetchurl { url = "https://registry.npmjs.org/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.3.8.tgz"; - sha512 = "3HFZKtBXTaUCHvz7ai6nk2+psRIkldDoNzCsom0egDtVmPsvvHZkzjynhdQyULfacRSsBTaiQ0ol6nBOL4dDiQ=="; + sha512 = "24l71rg9rqfl9aa8fi3c1dc2iqxmdsh6ba8b9rwrrj7dg1gzfc5afw03rns5b1h6zld15942aqsjvwklwp6myzw3q1aakaps0m5jwfw"; }; }; "conventional-changelog-core-2.0.11" = { @@ -6354,7 +5933,7 @@ let version = "2.0.11"; src = fetchurl { url = "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-2.0.11.tgz"; - sha512 = "HvTE6RlqeEZ/NFPtQeFLsIDOLrGP3bXYr7lFLMhCVsbduF1MXIe8OODkwMFyo1i9ku9NWBwVnVn0jDmIFXjDRg=="; + sha512 = "13c6y0mi0wqrx2rklaiqn2dxy9bsn53fb0w1r7072y8fp2cbnwdvijn8b42qidrmzcbbpcgn4pcx05h9ghl3vak6izlcy3a37lw9x0y"; }; }; "conventional-changelog-ember-0.3.12" = { @@ -6363,7 +5942,7 @@ let version = "0.3.12"; src = fetchurl { url = "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-0.3.12.tgz"; - sha512 = "mmJzA7uzbrOqeF89dMMi6z17O07ORTXlTMArnLG9ZTX4oLaKNolUlxFUFlFm9JUoVWajVpaHQWjxH1EOQ+ARoQ=="; + sha512 = "2hi3q231r8izwb8863rcmm3craji5glcr8icm0ijxa8jdlanshghdb5pnqrqay09kjkaiff9qxpnggb4b1p8gazg2mb6vmkpc1p6qls"; }; }; "conventional-changelog-eslint-1.0.9" = { @@ -6372,7 +5951,7 @@ let version = "1.0.9"; src = fetchurl { url = "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-1.0.9.tgz"; - sha512 = "h87nfVh2fdk9fJIvz26wCBsbDC/KxqCc5wSlNMZbXcARtbgNbNDIF7Y7ctokFdnxkzVdaHsbINkh548T9eBA7Q=="; + sha512 = "3nl1q7m2f7yf8fr40dpns2x6n9z3n8m4kd74fxn2z4d0v0dp2si3h2xbg339984wyfa1ina5w61n6q8n1pcybwjghyxjzbnb1yygkl7"; }; }; "conventional-changelog-express-0.3.6" = { @@ -6381,7 +5960,7 @@ let version = "0.3.6"; src = fetchurl { url = "https://registry.npmjs.org/conventional-changelog-express/-/conventional-changelog-express-0.3.6.tgz"; - sha512 = "3iWVtBJZ9RnRnZveNDzOD8QRn6g6vUif0qVTWWyi5nUIAbuN1FfPVyKdAlJJfp5Im+dE8Kiy/d2SpaX/0X678Q=="; + sha512 = "3qvnznizyjsb4nxznraiw24wydli7ky95905792az7mgm4dpc0hhxg6l9n5jlx5saglig9sm2gi3i0grqy39plvkp8ikxar2as9a9fy"; }; }; "conventional-changelog-jquery-0.1.0" = { @@ -6408,7 +5987,7 @@ let version = "0.3.8"; src = fetchurl { url = "https://registry.npmjs.org/conventional-changelog-jshint/-/conventional-changelog-jshint-0.3.8.tgz"; - sha512 = "hn9QU4ZI/5V50wKPJNPGT4gEWgiBFpV6adieILW4MaUFynuDYOvQ71EMSj3EznJyKi/KzuXpc9dGmX8njZMjig=="; + sha512 = "25274wd4xzrjinpfglybkna5wm74wnfqhyll32ixz8fnq43gg50b99ip2sj17nqd5x9a5l111d0922gqv9j93q2sdwrbzs8hr9m0zw6"; }; }; "conventional-changelog-preset-loader-1.1.8" = { @@ -6417,7 +5996,7 @@ let version = "1.1.8"; src = fetchurl { url = "https://registry.npmjs.org/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-1.1.8.tgz"; - sha512 = "MkksM4G4YdrMlT2MbTsV2F6LXu/hZR0Tc/yenRrDIKRwBl/SP7ER4ZDlglqJsCzLJi4UonBc52Bkm5hzrOVCcw=="; + sha512 = "1rl5rdcffc9nr30wxf718hl5qkcnb5hi5d85rchw48v2gyjbw371910qcd9v7pwfc9isrg1xxg8npnq2lxnv31xjp6dlqdqh4rjqj9j"; }; }; "conventional-changelog-writer-3.0.9" = { @@ -6426,7 +6005,7 @@ let version = "3.0.9"; src = fetchurl { url = "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-3.0.9.tgz"; - sha512 = "n9KbsxlJxRQsUnK6wIBRnARacvNnN4C/nxnxCkH+B/R1JS2Fa+DiP1dU4I59mEDEjgnFaN2+9wr1P1s7GYB5/Q=="; + sha512 = "3ypk00r7ddkzx8ayyzdss65167c8h4qgn7f0m2p7zif0sw55ljpbx07zr0hmw8rkyzq0dv7ydr5l14wa60c1fkja8n19ia936rrpllz"; }; }; "conventional-commits-filter-1.1.6" = { @@ -6435,7 +6014,7 @@ let version = "1.1.6"; src = fetchurl { url = "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-1.1.6.tgz"; - sha512 = "KcDgtCRKJCQhyk6VLT7zR+ZOyCnerfemE/CsR3iQpzRRFbLEs0Y6rwk3mpDvtOh04X223z+1xyJ582Stfct/0Q=="; + sha512 = "38pzjvxmmjg6y92qyskzpxngphp9s5lxy89ldq9mwx4dcy4n8am2d57j1w4gb7h2fkggbfy5744xrj7ycz2v5afr8hj892a4jsf1h19"; }; }; "conventional-commits-parser-2.1.7" = { @@ -6444,7 +6023,7 @@ let version = "2.1.7"; src = fetchurl { url = "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-2.1.7.tgz"; - sha512 = "BoMaddIEJ6B4QVMSDu9IkVImlGOSGA1I2BQyOZHeLQ6qVOJLcLKn97+fL6dGbzWEiqDzfH4OkcveULmeq2MHFQ=="; + sha512 = "0ahfqxbkswm1pnbj477wz7kl2588dbg8skjz7xzyykv4w2bw9aal3idvs8kjchlv140s64jcfa2clli93phw4jk85wa09q4s9sim0q6"; }; }; "conventional-recommended-bump-1.2.1" = { @@ -6453,7 +6032,7 @@ let version = "1.2.1"; src = fetchurl { url = "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-1.2.1.tgz"; - sha512 = "oJjG6DkRgtnr/t/VrPdzmf4XZv8c4xKVJrVT4zrSHd92KEL+EYxSbYoKq8lQ7U5yLMw7130wrcQTLRjM/T+d4w=="; + sha512 = "3irsgzxrhc2s4y4mlq7vmrvrhn74kpda34sn2ladm98q4gy88l7dpqxs8xf6lxm4sai5qqwzxk1gzlrfgvsrmfzzvmxk0hi77lcd650"; }; }; "convert-source-map-1.1.3" = { @@ -6588,7 +6167,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.1.0.tgz"; - sha512 = "Alvs19Vgq07eunykd3Xy2jF0/qSNv2u7KDbAek9H5liV1UMijbqFs5cycZvv5dVsvseT/U4H8/7/w8Koh35C4A=="; + sha512 = "3h44zl7m31c7zzyyc3lxzckqyz6rmg5xydp2clpnf2vm3928garan768x7pmh1n52xnpgwdlkz78cfsy9spg93wpbg4xav0spbyqnq2"; }; }; "cookiejar-2.0.1" = { @@ -6606,7 +6185,7 @@ let version = "2.1.2"; src = fetchurl { url = "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.2.tgz"; - sha512 = "Mw+adcfzPxcPeI+0WlvRrr/3lGVO0bD75SxX6811cxSh1Wbxx7xZBGK1eVtDf6si8rg2lhnUjsVLMFMfbRIuwA=="; + sha512 = "302w4kd3x9k0jy5iva1k5inp3r25avz8ddpkdb20icvrizicvas253kfp6ynmrcwpxv1lafcnagggxfs5dmmd4gg07ifgzkqxsrl3rk"; }; }; "cookies-0.7.1" = { @@ -6624,7 +6203,7 @@ let version = "1.0.5"; src = fetchurl { url = "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz"; - sha512 = "f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A=="; + sha512 = "3c1ggiqqnjgqlwdnimx94gm176c8rjsrih5qw2lbm642l8x7grx07v065k4j89c1p0adkm7v6sz11drb6j6sp51np2m1cazvycnhrvz"; }; }; "copy-descriptor-0.1.1" = { @@ -6651,11 +6230,7 @@ let version = "2.2.4"; src = fetchurl { url = "https://registry.npmjs.org/cordova-common/-/cordova-common-2.2.4.tgz"; -<<<<<<< HEAD - sha512 = "tL6cfygm2EUU658Id4ROs/BFETvxFKX1gj8rxoXOWR1xxzPtXfgvjiqmMBsUIbBgIZomsq09Xj48qkU7xHBJ1Q=="; -======= sha512 = "3aljw647d2slg1ybqysvci6k8hn1c112hdk19iaiqpzhpgd6g3p27arrs2wcarzhbssa57i7c8lbw5k9s27f24zxca4bn1651zrrgml"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "cordova-create-1.1.2" = { @@ -6676,23 +6251,13 @@ let sha1 = "4986d0779b36eb239822c2ab413a47ff9f097fea"; }; }; -<<<<<<< HEAD "cordova-js-4.2.4" = { name = "cordova-js"; packageName = "cordova-js"; version = "4.2.4"; src = fetchurl { url = "https://registry.npmjs.org/cordova-js/-/cordova-js-4.2.4.tgz"; - sha512 = "Qy0O3w/gwbIqIJzlyCy60nPwJlF1c74ELpsfDIGXB92/uST5nQSSUDVDP4UOfb/c6OU7yPqxhCWOGROyTYKPDw=="; -======= - "cordova-js-4.2.3" = { - name = "cordova-js"; - packageName = "cordova-js"; - version = "4.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/cordova-js/-/cordova-js-4.2.3.tgz"; - sha512 = "2f1zm6j1vbhvmpzrmb5k1mg76r9f0dgvx0cdp476w38xg6azlkxr8mvardwkcsz56wdaf84w9cmni23cih09hiwnngjb393zgjmrwgv"; ->>>>>>> nodePackages: meguca: 1.0.7 update + sha512 = "07qz0jdn89ik3i5hjqzmj1vwpldrgvx1s2kyhrma29097gr4jwvzp87jy0hq7wv5q2bwwvma4kg0wyjp8ncircw40mb5hg01zghwba3"; }; }; "cordova-lib-8.0.0" = { @@ -6717,33 +6282,18 @@ let name = "cordova-serve"; packageName = "cordova-serve"; version = "2.0.1"; -<<<<<<< HEAD -======= src = fetchurl { url = "https://registry.npmjs.org/cordova-serve/-/cordova-serve-2.0.1.tgz"; sha512 = "3v0v93cf8mhli9ai6lzjx7ch43npl08m18i1yx0kaqql23m0s0yf13vbfy4rch9h7rhyjzacjrjwbbbxizjlflcwrc0k2djjw7payfx"; }; }; -<<<<<<< HEAD - "core-js-1.2.7" = { - name = "core-js"; - packageName = "core-js"; - version = "1.2.7"; ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 - src = fetchurl { - url = "https://registry.npmjs.org/cordova-serve/-/cordova-serve-2.0.1.tgz"; - sha512 = "3Xl1D5eyiQlY5ow6Kn/say0us2TqSw/zgQmyTLxbewTngQZ1CIqxmqD7EFGoCNBrB4HsdPmpiSpFCitybKQN9g=="; - }; - }; -======= ->>>>>>> nodePackages: meguca: 1.0.7 update "core-js-2.5.7" = { name = "core-js"; packageName = "core-js"; version = "2.5.7"; src = fetchurl { url = "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz"; - sha512 = "RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw=="; + sha512 = "1rw87wykvh29zd2dfrylxhr1kk5lz0k9wb4ykmy6nka6slwbhsirccfy8c2br3b8d085rkly33rf55kh6z5rm9mpgxg7z301h4ckk26"; }; }; "core-util-is-1.0.2" = { @@ -6842,7 +6392,7 @@ let version = "4.0.3"; src = fetchurl { url = "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz"; - sha512 = "GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw=="; + sha512 = "1mhn55gf43qsdrp2klyyyxqjsd5mw9l6s51vsfj7wl44pq7ymfw68r8wkd4yd8dd6adg3k6q18sddxfjljr0gbk56lh3cqfyd00gc8r"; }; }; "create-error-class-3.0.2" = { @@ -6860,7 +6410,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz"; - sha512 = "z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg=="; + sha512 = "055xaldi3hy1bjxhvznh3470j1kq2xk827mxal79bgqik3lblax6s4inxqby27ymgcghl2hn7wnx9fnacmyq3q93hk6y327cc41nkfg"; }; }; "create-hmac-1.1.7" = { @@ -6869,7 +6419,7 @@ let version = "1.1.7"; src = fetchurl { url = "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz"; - sha512 = "MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg=="; + sha512 = "0p2jhk94k3as67lhrr1jyljkr0y65snxjzqnix0nifnfcanhilccrzkc47gwlg5wy0m8l1gv12lj78ivgmw5m1ww4f8iylr52bbv49h"; }; }; "create-torrent-3.32.0" = { @@ -6878,11 +6428,7 @@ let version = "3.32.0"; src = fetchurl { url = "https://registry.npmjs.org/create-torrent/-/create-torrent-3.32.0.tgz"; -<<<<<<< HEAD - sha512 = "l9chXj5LLyVFfPF6nFCWlm5/Wt+04d+mXUpG5LJAogeyRruWfjnUozfmQspAi6iW91ibp7qKBuFMPJViz5lp1Q=="; -======= sha512 = "3ank6fgcaakqk710s5bm9wvb3vrda4b83545riplga3jzlnpd3b41x282rf8ijabnkdzqdlvxd7yvlnjr89qypigi2jabsb7rg23mwp"; ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 }; }; "cron-1.3.0" = { @@ -6891,7 +6437,7 @@ let version = "1.3.0"; src = fetchurl { url = "https://registry.npmjs.org/cron/-/cron-1.3.0.tgz"; - sha512 = "K/SF7JlgMmNjcThWxkKvsHhey2EDB4CeOEWJ9aXWj3fbQJppsvTPIeyLdHfNq5IbbsMUUjRW1nr5dSO95f2E4w=="; + sha512 = "3iq9zg5plipbybssrb38lhlqdp1p4mbrmvp92zc477z9ck9k90dnxwgssjzb2a572g801q3c75mwy5hmx1ccmiqf5in6ck0k7n8bx1b"; }; }; "cross-spawn-4.0.0" = { @@ -6927,7 +6473,7 @@ let version = "6.0.5"; src = fetchurl { url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz"; - sha512 = "eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ=="; + sha512 = "1csj16gwq9riz0pm73dlxhbnsl1r3ldc5v0aincwj71ambi6xf3kc1kgsbwaakd8rj16k4mrli2syrjd57g6cr81zdzivdd2jn4ndbr"; }; }; "cross-spawn-async-2.2.5" = { @@ -7017,7 +6563,7 @@ let version = "3.12.0"; src = fetchurl { url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz"; - sha512 = "fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg=="; + sha512 = "1d3mrhqlay037azmjp2ml5a8yyls9ijdhilv6f0znz0ajgfm972yr9bhm78wqi09p4crc3shgflk50jc63zijsqv777ikkyi2j2qgkz"; }; }; "crypto-random-string-1.0.0" = { @@ -7053,7 +6599,7 @@ let version = "2.2.3"; src = fetchurl { url = "https://registry.npmjs.org/css/-/css-2.2.3.tgz"; - sha512 = "0W171WccAjQGGTKLhw4m2nnl0zPHUlTO/I8td4XzJgIB8Hg3ZZx71qT4G4eX8OVsSiaAKiUMy73E3nsbPlg2DQ=="; + sha512 = "06kcn1y3dxxxi5xrc62aal04r56rrghjy3ipy54srxrqr9pg3q020i6yf2pfbcgzk758ln76g9yayfs4q78g2rj343380hwczapnvfi"; }; }; "css-parse-1.0.4" = { @@ -7116,11 +6662,7 @@ let version = "1.0.0-alpha.29"; src = fetchurl { url = "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.29.tgz"; -<<<<<<< HEAD - sha512 = "sRNb1XydwkW9IOci6iB2xmy8IGCj6r/fr+JWitvJ2JxQRPzN3T4AGGVWCMlVmVwM1gtgALJRmGIlWv5ppnGGkg=="; -======= sha512 = "298cwd6d7z5l9b2k18v40301gb0qp4rap4hhmk53003xpfdzi25176qr7dqlmp2mzgvzsm3c0hbqv66fqhfl8p742ylbhlxgkamn4xi"; ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 }; }; "css-tree-1.0.0-alpha25" = { @@ -7129,7 +6671,7 @@ let version = "1.0.0-alpha25"; src = fetchurl { url = "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha25.tgz"; - sha512 = "XC6xLW/JqIGirnZuUWHXCHRaAjje2b3OIB0Vj5RIJo6mIi/AdJo30quQl5LxUl0gkXDIrTrFGbMlcZjyFplz1A=="; + sha512 = "3a7768nyac729dk372kmbf8f28j0pajy699g45bs8vrlx605wiad3i692a8y58x437bvnfy7015lx08sxhm2vknmsi83a69dwnv2bjw"; }; }; "css-url-regex-1.1.0" = { @@ -7165,11 +6707,7 @@ let version = "3.5.1"; src = fetchurl { url = "https://registry.npmjs.org/csso/-/csso-3.5.1.tgz"; -<<<<<<< HEAD - sha512 = "vrqULLffYU1Q2tLdJvaCYbONStnfkfimRxXNaGjxMldI0C7JPBC4rB1RyjhfdZ4m1frm8pM9uRPKH3d2knZ8gg=="; -======= sha512 = "217qxljfrvizjhkp4yr7wp6zbajd7kmbwwcll8xmjw10g695v84hmrjy5l6ik8m8ykgi4fzv558vcv1hbv2dpfjv984sqfznwn99fmy"; ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 }; }; "cssom-0.3.3" = { @@ -7178,7 +6716,7 @@ let version = "0.3.3"; src = fetchurl { url = "https://registry.npmjs.org/cssom/-/cssom-0.3.3.tgz"; - sha512 = "pjE/I/NSp3iyeoxXN5QaoJpgzYUMj2dJHx9OSufoTliJLDx+kuOQaMCJW8OwvrKJswhXUHnHN6eUmUSETN0msg=="; + sha512 = "2r2dpachi29k5576z3pjl2p12rqkcmyn31mp2f0d28f74ky7hn8jn2fx3kllkhz3x4ng3qchp6n16m03aa3fmwcgar7i9sjycikycd6"; }; }; "cssstyle-0.2.37" = { @@ -7286,7 +6824,7 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/cvss/-/cvss-1.0.3.tgz"; - sha512 = "1FfNhEFVfeC+fgZpEr6oCOOTXifJicZS+Lq/mmUKI4Om+2O8zYspc/uhw51He+CTM5givI1dqIw5JUqyi1BWtA=="; + sha512 = "2s5cl4bn952afccm1fqvg12k0rr7q3v8yfw78gvfclqpkdwcgxsd0r319jrmgxsz19cd2f94xg97qq8m2z14s86gszf0zam862csmyl"; }; }; "cycle-1.0.3" = { @@ -7376,11 +6914,7 @@ let version = "3.0.1"; src = fetchurl { url = "https://registry.npmjs.org/dat-dns/-/dat-dns-3.0.1.tgz"; -<<<<<<< HEAD - sha512 = "OBolbMJNk7Uknw8po7Yv4XGNewH6VbuPQNrcf57EwtvgR8ScNUBDporU+DiCXYh2F7GwOcsCyVkSb++guR+OoA=="; -======= sha512 = "2h8w7xrl3pny4jrr41cnfdhn4bpd22xh8wgim4alr1l0dcwqi3y1ny2qjg7zp6s827vnmgs05xqswg15yva6a8gkwjbb4sdq9n2a6iq"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "dat-doctor-1.4.0" = { @@ -7389,7 +6923,7 @@ let version = "1.4.0"; src = fetchurl { url = "https://registry.npmjs.org/dat-doctor/-/dat-doctor-1.4.0.tgz"; - sha512 = "1A3npklzv62UErw/rBaSkKDiiYnPNl7yNOtg1QeuJ1AtOEnyfH1iY9QiaVqPj6mFF2CIT4/pCSapueQFX7Cn/Q=="; + sha512 = "3ysgc2z0pjbka9617lqykw8c0bqbacgixd6j8nlcdi7sz7j94w2sl17mq3xaq7b6kr5wdngi64y584hj8baqgxw2aaavgvk96kff3fl"; }; }; "dat-encoding-4.0.2" = { @@ -7407,7 +6941,7 @@ let version = "5.0.1"; src = fetchurl { url = "https://registry.npmjs.org/dat-encoding/-/dat-encoding-5.0.1.tgz"; - sha512 = "PET9PlGt6ejgqU07hbPLx3tP2siDMMFumUe+xwmm4+5W+0cOlpzreCPoMVUBzxWeR4sPdxL+AS53odQTBtzEqA=="; + sha512 = "2lc9p062gaa2xrf07z14xqgid3rw5fg05ak3s13g3mrr5hf8zxmdvp3lq4wggj7k5pc2c43r3d4yyy7rfrqafsdm7hfisdda4zgsi1w"; }; }; "dat-ignore-2.1.1" = { @@ -7416,7 +6950,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/dat-ignore/-/dat-ignore-2.1.1.tgz"; - sha512 = "jRCfWtLh+wtbqJMuge+wZV/2kSL1TKMRWXFgUaT7r0O1OnChKUDG4wqLJo4SjzJjXo7f3V8CVN/u5wYltgSd1Q=="; + sha512 = "3ars15n4l3fgvnzah15zpfzirg66clg2a72d2qawg340ad1f0xbahxgzfj52q3ib48s6k7m4a8zcpv5n3pq2blkm1dhpyz1s9d9y44d"; }; }; "dat-json-1.0.2" = { @@ -7425,7 +6959,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/dat-json/-/dat-json-1.0.2.tgz"; - sha512 = "EZq+VeE/tM7FGygMVZx3hsMVm7zW3qxhuUYCNtLONaZptqXz4laB5cIWHydmeEn6sl3RZatZqpIuWRu4xDYxIg=="; + sha512 = "0i32dn4p0dmjbljm9csnrfibnrgljbqcqkiy5n2wn0mdqpklnv6k9imrv93c0j6p5hsrpnnpjdibhw6fyf5a3183g2wxd1zw5avx6hi"; }; }; "dat-link-resolve-2.2.0" = { @@ -7434,11 +6968,7 @@ let version = "2.2.0"; src = fetchurl { url = "https://registry.npmjs.org/dat-link-resolve/-/dat-link-resolve-2.2.0.tgz"; -<<<<<<< HEAD - sha512 = "cu6Fwapm34myc5um6jdQBrtDkjx28oVkOVHbaV4YNLdxrRqUm+FlWuIqFk7zaCZDoZg5TMlCG1SF0j3AFbiOYA=="; -======= sha512 = "1h8xf0mq0yx51al3d1cjk1rk2hl69k8yd71cap2b9jy36wl3anp3drl31g6knsi75j8bwkn7j947fq6a0vym9lvffr8kpv6mb0qbvkj"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "dat-log-1.1.1" = { @@ -7456,7 +6986,7 @@ let version = "3.5.9"; src = fetchurl { url = "https://registry.npmjs.org/dat-node/-/dat-node-3.5.9.tgz"; - sha512 = "JGZPtreK8YDFUG5JHBJSKIpSTAkqlRS0WlS6WnlJd6ap4GtQOdPYNvQyt/1AcL1ja4zM8GLnbOWGj37a6ExKQA=="; + sha512 = "104lk78v9z8z1p5dkkn5w6ciimn7gbh83yvfcpl6vcd6fahdghak9kp95wmmfjlbas1959a156552i8a891qjbfa32q1wcanyv4yri4"; }; }; "dat-registry-4.0.0" = { @@ -7465,7 +6995,7 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/dat-registry/-/dat-registry-4.0.0.tgz"; - sha512 = "CKV7j8kwWNBW2Oacdbf5x0ihxMfPNN8wcKHHmx5UjE4iyaOnfnTwCqTGM5rFoMleXKOGWpB7uCKQa0qpvzmCIA=="; + sha512 = "0h84fdzm556p412p1xr0nl6ldf5xjd0qnd37im41bq78zm7lg4j4klcahg9pix1f0qdyd6gqz2a2j67z6vpb776v1bd0n1hr67pp988"; }; }; "dat-secret-storage-4.0.1" = { @@ -7474,7 +7004,7 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/dat-secret-storage/-/dat-secret-storage-4.0.1.tgz"; - sha512 = "BUhemnKpXUhKNl/1DuUwfFUyjzomlNF940uHPsOa3okmYu9z6mrp/EGQsLO3lO0YQomDUqS0G0DmHTse9vTU1A=="; + sha512 = "3ad9x7n3qxivrj03fsa8ll3i511ivclnyrv1421zklnmskkxxi2d2fykb1kx1sbwdyx35167a7k4mbw63jhxxaz6r54hpd9fad5wj05"; }; }; "dat-storage-1.0.4" = { @@ -7483,7 +7013,7 @@ let version = "1.0.4"; src = fetchurl { url = "https://registry.npmjs.org/dat-storage/-/dat-storage-1.0.4.tgz"; - sha512 = "THxtCBzrt+AJzhGxXedlxLYeW+AVi5eFLi9Ke9JQ7fTA/j84m1Ci7KPuZ1q44Um/BeIYZ3LO01FWS2MlAOTFRg=="; + sha512 = "13cbr004milnmjisg774rqqw82vyjg1p1d6gvm3xji516rq7zzc1x7da397njig5s2rg2qmw1dixdn4cpkmvc8irq4y1dzb3h46sz2c"; }; }; "dat-swarm-defaults-1.0.1" = { @@ -7492,7 +7022,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/dat-swarm-defaults/-/dat-swarm-defaults-1.0.1.tgz"; - sha512 = "T2WlO7BVmN9USchefsP8entQiByIlJLGuzHLL9qEqOBkyKB8p0Y7XPWxP8dcL43+SkeoxU5NVe7O0bsi3xL8Jg=="; + sha512 = "0kgq4nz4axx3kpfam6lxid88x5gx39gbk3kzcgmbhxld9vwl3469q58hkd2zjripg3955483j450yvszk1pwpn895adz62mn0xsarag"; }; }; "data-uri-to-buffer-1.2.0" = { @@ -7501,7 +7031,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-1.2.0.tgz"; - sha512 = "vKQ9DTQPN1FLYiiEEOQ6IBGFqvjCa5rSK3cWMy/Nespm5d/x3dGFT9UBZnkLxCwua/IXBi2TYnwTEpsOvhC4UQ=="; + sha512 = "18vh45y1sdi44vwca9js1hpy9mjwb641dwnc0fm9y2x3pgivzjndjksrlpk65kp5g99lsy2z2m8a4907bj11118c95m2dqg6h6kv95w"; }; }; "date-format-1.2.0" = { @@ -7555,7 +7085,7 @@ let version = "3.0.3"; src = fetchurl { url = "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz"; - sha512 = "jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q=="; + sha512 = "3fxpn11cnyqcz25h9krfrpnra9zi1zri0l4f42a89acybqgj6dyr6p0lskcjffahiwxxmmc0zvgalnlk2wa74b764cm7pd5si78884g"; }; }; "debounce-1.1.0" = { @@ -7564,7 +7094,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/debounce/-/debounce-1.1.0.tgz"; - sha512 = "ZQVKfRVlwRfD150ndzEK8M90ABT+Y/JQKs4Y7U4MXdpuoUkkrr4DwKbVux3YjylA5bUMUj0Nc3pMxPJX6N2QQQ=="; + sha512 = "10r1pg8azrc8k3sfc6kslhcnpjl0acgv0fvpmd6q01vxbi496hnxnjx1i7fs66f598g4qzy2h079kzh18qpf9wxsz1ighb52myll1b5"; }; }; "debounced-seeker-1.0.0" = { @@ -7645,7 +7175,7 @@ let version = "2.6.9"; src = fetchurl { url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"; - sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; + sha512 = "0q0fsr8bk1m83z0am0h2xn09vyfcf18adscxms8hclznwks1aihsisd96h8npx0idq5wwnypnqrkyk25m5d9zh3dk7rjs29nybc8bkc"; }; }; "debug-3.1.0" = { @@ -7654,7 +7184,7 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz"; - sha512 = "OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g=="; + sha512 = "3g1hqsahr1ks2kpvdxrwzr57fj90nnr0hvwwrw8yyyzcv3i11sym8zwibxx67bl1mln0acddrzpkkdjjxnc6n2cm9fazmgzzsl1fzrr"; }; }; "debug-fabulous-1.1.0" = { @@ -7663,7 +7193,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/debug-fabulous/-/debug-fabulous-1.1.0.tgz"; - sha512 = "GZqvGIgKNlUnHUPQhepnUZFIMoi3dgZKQBzKDeL2g7oJF9SNAji/AAu36dusFUas0O+pae74lNeoIPHqXWDkLg=="; + sha512 = "0pf8q2xxbqj1a6pjkwfwsd9xz8aqihmmkdykdqb02zkh0ldshbhkfl3yvi0vjhw8150cxmpi0r4i4aiczm8bl233lkmadhai0caz6hr"; }; }; "decamelize-1.2.0" = { @@ -7681,7 +7211,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/decamelize/-/decamelize-2.0.0.tgz"; - sha512 = "Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg=="; + sha512 = "0zc3slyk7cc9xjfcnw3nk2d1vkq4kxrjalavqgp3zykbgnp5v12xcs47kr436k0izbzyxhkrdww94p5g1lcmzcdqncc9p0mqzk6jji2"; }; }; "decamelize-keys-1.1.0" = { @@ -7699,7 +7229,7 @@ let version = "10.0.1"; src = fetchurl { url = "https://registry.npmjs.org/decimal.js/-/decimal.js-10.0.1.tgz"; - sha512 = "vklWB5C4Cj423xnaOtsUmAv0/7GqlXIgDv2ZKDyR64OV3OSzGHNx2mk4p/1EKnB5s70k73cIOOEcG9YzF0q4Lw=="; + sha512 = "0pvhjhp6gb1n7717047gvr4pnrpjw1a8kysff39v9qp665kwkf9b0zbj4y2i6gx1qh755dan7zz82wq2kdkmnhrvwv3w2mqj03mcjdy"; }; }; "decode-uri-component-0.2.0" = { @@ -7735,7 +7265,7 @@ let version = "4.1.1"; src = fetchurl { url = "https://registry.npmjs.org/decompress-tar/-/decompress-tar-4.1.1.tgz"; - sha512 = "JdJMaCrGpB5fESVyxwpCx4Jdj2AagLmv3y58Qy4GE6HMVjWz1FeVQk1Ct4Kye7PftcdOo/7U7UKzYBJgqnGeUQ=="; + sha512 = "18rwwdac0961cs2xpagx8sfqysxzcvvna1bfhjd8aamgm5k6mbcr88k0qp46z1fvypvk00sc27mv0n7885cfwi525gix96659l4rli5"; }; }; "decompress-tarbz2-4.1.1" = { @@ -7744,7 +7274,7 @@ let version = "4.1.1"; src = fetchurl { url = "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz"; - sha512 = "s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A=="; + sha512 = "3s2l466xc70zvxrwsr1xr7x5sg9g9wh2wsvk81pxmhc0m73hwhfhhn63c53n6vkv8rlxs80gscrkpk8fc2mbh3j154cvbzm6wpk3kxk"; }; }; "decompress-targz-4.1.1" = { @@ -7753,7 +7283,7 @@ let version = "4.1.1"; src = fetchurl { url = "https://registry.npmjs.org/decompress-targz/-/decompress-targz-4.1.1.tgz"; - sha512 = "4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w=="; + sha512 = "3gig705jrzdsihjnfij52kj17mgsclfn5vbzswqqdjd0ac4f0dy0afds02m4zm5jacnppavhydyy0rgd99prk8hkmbcisgbfxk3agz3"; }; }; "decompress-unzip-4.0.1" = { @@ -7789,7 +7319,7 @@ let version = "3.0.1"; src = fetchurl { url = "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz"; - sha512 = "+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw=="; + sha512 = "1rrbk0h0a836gj1x6lalzgqfs0v34d4fswq23c8lxzmb6k7pna45zd509h1r1fr312n4qml94xqlmzzga40sfa9vnzf6rkr4d1qh1zr"; }; }; "deep-equal-0.1.2" = { @@ -7843,7 +7373,7 @@ let version = "0.6.0"; src = fetchurl { url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz"; - sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="; + sha512 = "0wc0sqg1aqx864bxf8xa4j8ncrc8rcvmiaj1sp3x1np2i8hdjybzjfd0w9gbf1yasmwycwzzg1mz6smr3q42hhv4pjx2qcgwqhg3q9c"; }; }; "deep-is-0.1.3" = { @@ -7870,7 +7400,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/deepmerge/-/deepmerge-2.1.0.tgz"; - sha512 = "Q89Z26KAfA3lpPGhbF6XMfYAm3jIV3avViy6KOJ2JLzFbeWHOvPQUu5aSJIWXap3gDZC2y1eF5HXEPI2wGqgvw=="; + sha512 = "2zs0sn06vr11mwi2xg2vns26s07gajx2s94hnpfab8g6fl7wmnwbg14fvi2ificasppcmy8g2dh1xiijxg6r8gilkjhsz40lbdmkks3"; }; }; "default-browser-id-1.0.4" = { @@ -7942,7 +7472,7 @@ let version = "2.0.2"; src = fetchurl { url = "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz"; - sha512 = "jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ=="; + sha512 = "1hrk3pzr4hyhfnrjy1msrlj2zh769x4l35q9fq0a2cy2glq3h1iwjkpmvz39y9idwy71h9hd98lydi92485bzkff1dzm70wbr8vc0lg"; }; }; "defined-0.0.0" = { @@ -8149,7 +7679,7 @@ let version = "4.7.1"; src = fetchurl { url = "https://registry.npmjs.org/detective/-/detective-4.7.1.tgz"; - sha512 = "H6PmeeUcZloWtdt4DAkFyzFL94arpHr3NOwwmVILFiy+9Qd4JTxxXrzfyGk/lmct2qVGBwTSwSXagqu2BxmWig=="; + sha512 = "259c687nsmq5ni5q79081s6lpd2srwn7xlwipxwbrqkq9bq0zsvwb0n1d99jc7c6kvpm95bhvvlncfb0l4hqy6vnlb5lrhwwmwyd8qz"; }; }; "detective-5.1.0" = { @@ -8158,7 +7688,7 @@ let version = "5.1.0"; src = fetchurl { url = "https://registry.npmjs.org/detective/-/detective-5.1.0.tgz"; - sha512 = "TFHMqfOvxlgrfVzTEkNBSh9SvSNX/HfF4OFI2QFGCyPm02EsyILqnUeb5P6q7JZ3SFNTBL5t2sePRgrN4epUWQ=="; + sha512 = "1cm9sp1rl54d3y7v9nvw12kad47g5pcmbzf96s7kpm85j1cc79yc8qb8q0xjj71w32pgz2p4fym47sa851i5lswglmmiimgyflwqlac"; }; }; "di-0.0.1" = { @@ -8212,7 +7742,7 @@ let version = "3.5.0"; src = fetchurl { url = "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz"; - sha512 = "A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA=="; + sha512 = "32bkv3cfhax4x5zhiyfn63wjhqwkzsjiql3my8p3d9hvv020p8f9hdi7mpqixrkpgs0g9k15mn736s449yad9wq1plhxyhxb2sam3h3"; }; }; "diff2html-2.3.3" = { @@ -8230,7 +7760,7 @@ let version = "5.0.3"; src = fetchurl { url = "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz"; - sha512 = "kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg=="; + sha512 = "37186rz3862gn294acnwnm59jwm62x1rz9ca0y5anvmj0a7abs4rhw974qp1j684qpd4rxb8c2kagv21hapxfddr2q72zvyv7ya19lj"; }; }; "difflib-0.2.4" = { @@ -8248,7 +7778,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz"; - sha512 = "37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag=="; + sha512 = "1m705yfirf97v4w87gfvylhhq9jlwjsgfp5x0p0cp33mc180ldmvgbs06zmr7by48d7r01n3awx4xz3m3vzba99gqww1wgka2na5fnz"; }; }; "director-1.2.7" = { @@ -8275,7 +7805,7 @@ let version = "5.5.1"; src = fetchurl { url = "https://registry.npmjs.org/discovery-channel/-/discovery-channel-5.5.1.tgz"; - sha512 = "EEmZQFE0PiOsJj7G3KVCwFGbYs4QchUvzA91iHtZ6HfkIqfBEDSTGLygJrUlY1Tr77WDV+qZVrZuNghHxSL/vw=="; + sha512 = "2zzy8n58w43cvmnascylmw3nppynm334nsjd85w329k8461lwif8xz8b5xqhx8grhpiawhhrri9nlf08ajxriiy4sn26gila509jj8h"; }; }; "discovery-swarm-4.4.2" = { @@ -8293,7 +7823,7 @@ let version = "5.1.1"; src = fetchurl { url = "https://registry.npmjs.org/discovery-swarm/-/discovery-swarm-5.1.1.tgz"; - sha512 = "r38993qP/fcuAlNLSOwGZUps1inzNA4wXkIkv/piwFDseyIWNjYyk/4DHGxyf/bWMB86gPWIUdA6AhydkWmgdA=="; + sha512 = "1sa0sciklf04fnha64gb01s3wqddxkzf9n1q0zyjcr3cdhn49xyql60cbxby922bqq0wd7k57b6qjk50vn4hjsk08pggzcggbvkszxg"; }; }; "dispensary-0.18.0" = { @@ -8302,7 +7832,7 @@ let version = "0.18.0"; src = fetchurl { url = "https://registry.npmjs.org/dispensary/-/dispensary-0.18.0.tgz"; - sha512 = "ikVxjigcj4leoPgjqYcHV1YhmLEZ5eXMq30CIPTf1BniWrH1C0X35F5iVCa4U2/JXZYcQJyHWniSRSOpM+hiNw=="; + sha512 = "0vn5s1km4ilb4kqba3rqh0wjrfwjvskp0k58qjywkvla2zmn5df46flvzs200kxmg6fbr8rn6c22mjp0y3sj8zql1g8k3qw52772ica"; }; }; "diveSync-0.3.0" = { @@ -8329,7 +7859,7 @@ let version = "0.0.4"; src = fetchurl { url = "https://registry.npmjs.org/dnd-page-scroll/-/dnd-page-scroll-0.0.4.tgz"; - sha512 = "bvjUS5Cylrm1uJJop/dFhEpnYtz2NQFOO0/z6vk0ORtx0AqKvUwPToc4reJk+TnHV9GBxbtZXj7ad5dJT/Dqkg=="; + sha512 = "29fmw2g96bpgniybrcvpic1s5bwffgrckiasf479q7lrgca1b8726rr6kwymwsg7d702dgnvii6fjl48pvsfs4jp2svk5mjj15x9y3f"; }; }; "dns-discovery-5.6.1" = { @@ -8338,7 +7868,7 @@ let version = "5.6.1"; src = fetchurl { url = "https://registry.npmjs.org/dns-discovery/-/dns-discovery-5.6.1.tgz"; - sha512 = "r27fv3lDuZXCqmb5b04tV2aDxVbwVJaSyPzwPlOYCUbk9F7JvsY+n7EBfY2Z952bGx5TZt3SLQ+ELFjfqyLVoA=="; + sha512 = "2hda8mbvxc2r10g5p9dsrjk3qdrp7gpk66ps0dikwzcdgn9bvsf8ih9k19kxw7wr299cm7hav2q6rjp5m76zyb6mb19bfa3g6zxyvmg"; }; }; "dns-discovery-6.1.0" = { @@ -8347,7 +7877,7 @@ let version = "6.1.0"; src = fetchurl { url = "https://registry.npmjs.org/dns-discovery/-/dns-discovery-6.1.0.tgz"; - sha512 = "Kl2tL2zuNR1w6SnsoRaqrOFm7gGP3/i/HzRXtyVBqaOq/5L1D2TUdViUAZ8e/NDbt+jQCJFWoaKCnmDC343usQ=="; + sha512 = "2qyx3fzq9h9x0m2l5b9226hx2vxpl7w3sgh352qfpa683zmjbzsm8x984jvfmrl3yzzipwg07p6dqdcm8ba3v19x5q1sdgfdhpssp9a"; }; }; "dns-equal-1.0.0" = { @@ -8374,7 +7904,7 @@ let version = "1.3.1"; src = fetchurl { url = "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz"; - sha512 = "0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg=="; + sha512 = "19g682cvkba33mwrism28hibd2nv9xd16k5bj807jx3ih1cc7ff9dn8chmfjnqgglzl6lq3m3jarxng9vbarccgchd0aq118d15yk6i"; }; }; "dns-packet-4.2.0" = { @@ -8383,7 +7913,7 @@ let version = "4.2.0"; src = fetchurl { url = "https://registry.npmjs.org/dns-packet/-/dns-packet-4.2.0.tgz"; - sha512 = "bn1AKpfkFbm0MIioOMHZ5qJzl2uypdBwI4nYNsqvhjsegBhcKJUlCrMPWLx6JEezRjxZmxhtIz/FkBEur2l8Cw=="; + sha512 = "05pqsdg5q8r1i9z4dnii6sr7i3b6ir4gay5h3xk18jraa2w3201wfw6mz53dn494dqd19djdfbp78p6v70kia4862sbj5g4jwm40zbf"; }; }; "dns-socket-1.6.3" = { @@ -8392,7 +7922,7 @@ let version = "1.6.3"; src = fetchurl { url = "https://registry.npmjs.org/dns-socket/-/dns-socket-1.6.3.tgz"; - sha512 = "/mUy3VGqIP69dAZjh2xxHXcpK9wk2Len1Dxz8mWAdrIgFC8tnR/aQAyU4a+UTXzOcTvEvGBdp1zFiwnpWKaXng=="; + sha512 = "2g9g9jqx44qpiawlxfn1g647dqwwz2djjpy350c83d1z79d5wa21cknh1jz4wrwsjkvgn14vhmjjxqxf5n8fqq6fjyzw85aa7fk4rgy"; }; }; "dns-socket-3.0.0" = { @@ -8401,7 +7931,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/dns-socket/-/dns-socket-3.0.0.tgz"; - sha512 = "M0WkByoJ/mTm+HtwBQLsRJPe5uGIC/lYVOp+s6ZzhbZ5iq4GxjFyxYPQhB85dgCLvVb43aJQXHDC9aUgyKGc/Q=="; + sha512 = "3yrr8f842jzbhkhbi8a5pgqasyqn03n74gq9l43qmr33ih6ms57kdl5ffkb6zpaaicgj2w8w7kdx4s4xh10aw3vz3k69zh9583s8i9k"; }; }; "dns-txt-2.0.2" = { @@ -8446,7 +7976,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz"; - sha512 = "35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw=="; + sha512 = "0iz6zh5d0kqs0ndd1ydsj4vaf2x3k3p0k5a7b75gsbhkqaqqq93dgsa2bpifvw7svck2sndd21mv7mp60q111rbghpssp0rxs9956fz"; }; }; "doctypes-1.1.0" = { @@ -8491,7 +8021,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/dom-storage/-/dom-storage-2.1.0.tgz"; - sha512 = "g6RpyWXzl0RR6OTElHKBl7nwnK87GUyZMYC7JWsB/IA73vpqK2K6LT39x4VepLxlSsWBFrPVLnsSR5Jyty0+2Q=="; + sha512 = "3ckwbdpfa94f4kv5vav65l1qm56bg54bs2wgz9x5nx64avazbg3p07w05mjbfw066clq69vmyfg1fcph5r99i74x18l95zkcp4nk943"; }; }; "dom-walk-0.1.1" = { @@ -8509,11 +8039,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/dom4/-/dom4-2.1.0.tgz"; -<<<<<<< HEAD - sha512 = "18oT+LfQaOT46/HmdB+t8A3+ROaN/sY/P0C9i0PyasmeuDq+iThh09gpI8rmt2ZA5B6KuHpuW2qURAZMjNs+gg=="; -======= sha512 = "213xnwc9h34953abdp7mf4a3vj40rmpwv526afqsdhki2dy7aw9xjbay91qpga07wzwdzldwr2gw3ghmlgp9rpixgwf8s6hnzw17jnp"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "domain-browser-1.1.7" = { @@ -8531,7 +8057,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz"; - sha512 = "jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA=="; + sha512 = "1fcxv8rzfhs99afvhji7bs5ppxwn9mw040ixdgvkm6iabz72q61arly2lr57086rjn4g2vkb3rkih1cyc7z35kzv1jjciwyrs4g4y4f"; }; }; "domelementtype-1.1.3" = { @@ -8576,7 +8102,7 @@ let version = "2.4.2"; src = fetchurl { url = "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz"; - sha512 = "JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA=="; + sha512 = "307i53zii3hv9zr3skxhp9pxa09ki0xwx9q1k7mxnq3hanjanlpr1mmavfzz68r2h6cl1bnv2836plrhk02rpa7yfzrpdq73pib88i6"; }; }; "domino-1.0.30" = { @@ -8585,7 +8111,7 @@ let version = "1.0.30"; src = fetchurl { url = "https://registry.npmjs.org/domino/-/domino-1.0.30.tgz"; - sha512 = "ikq8WiDSkICdkElud317F2Sigc6A3EDpWsxWBwIZqOl95km4p/Vc9Rj98id7qKgsjDmExj0AVM7JOd4bb647Xg=="; + sha512 = "1g3pbkg3gg3kjffah03vil47662ra58gckz5z8qymfgb9xq97k7vsd83410fmncbbll1p40rs0s4r0pgdypfvj9j2fq146j41dbqjla"; }; }; "domutils-1.4.3" = { @@ -8612,7 +8138,7 @@ let version = "1.7.0"; src = fetchurl { url = "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz"; - sha512 = "Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg=="; + sha512 = "076s2v293f9jixaddq6qmjc76y3z0kqddmjb4nclydp23y0jzpg6f7h32j6adilfdjxwwhxkclrhc1vn7rbsidvzcq32dkzq9fpc1rf"; }; }; "dot-prop-3.0.0" = { @@ -8630,7 +8156,7 @@ let version = "4.2.0"; src = fetchurl { url = "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz"; - sha512 = "tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ=="; + sha512 = "2wyv9brsq3dzp724y1q5z5j5ja83y834hgc193lnarfdycwz1ii3xg02qxx3dg05x3skwjm1di5s5a8hqi8l5v1afx2bia436pifhxm"; }; }; "double-ended-queue-2.1.0-0" = { @@ -8666,7 +8192,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/download-git-repo/-/download-git-repo-1.0.2.tgz"; - sha512 = "PwAUr0/w74AGB7bukOycXyLnDlt9Lfb3JzsliAWyZCHa/TvbuMYQvH1er2DWXHE4EuI/NjAzRXw+89Waynapgw=="; + sha512 = "21sjxnakbaz6gkw8lrk0dizw893hwawsrhaypkxph8cdf6v7gyxl8b4n82qh99v4zvzcbbxbc7ff8jzkkn91vmn0w381vzh9ypi801z"; }; }; "dreamopt-0.6.0" = { @@ -8738,7 +8264,7 @@ let version = "3.6.0"; src = fetchurl { url = "https://registry.npmjs.org/duplexify/-/duplexify-3.6.0.tgz"; - sha512 = "fO3Di4tBKJpYTFHAxTU00BcfWMY9w24r/x21a6rZRbsD/ToUgGxsMbiGRmB7uVAXeGKXD9MwiLZa5E97EVgIRQ=="; + sha512 = "12hhn0igd7y8nmni0qd63wpc9w1fl5rgdh4d1mq65n6r00l7byh7fs5v6m6pd8xzwmnxhrxqrc1y5yh6hswbh2i9ic9la21if5w7vbw"; }; }; "each-async-1.1.1" = { @@ -8792,7 +8318,7 @@ let version = "3.2.0"; src = fetchurl { url = "https://registry.npmjs.org/ecstatic/-/ecstatic-3.2.0.tgz"; - sha512 = "Goilx/2cfU9vvfQjgtNgc2VmJAD8CasQ6rZDqCd2u4Hsyd/qFET6nBf60jiHodevR3nl3IGzNKtrzPXWP88utQ=="; + sha512 = "2sjxkrzsvswqsxb6jrq3p75g53szmx1hwwd5yhpkkx4857avz4yr0dvfqkshhxnx88an2gw00j6crbkc39q48zlpmplyzcwzp3sb20s"; }; }; "editions-1.3.4" = { @@ -8801,7 +8327,7 @@ let version = "1.3.4"; src = fetchurl { url = "https://registry.npmjs.org/editions/-/editions-1.3.4.tgz"; - sha512 = "gzao+mxnYDzIysXKMQi/+M1mjy/rjestjg6OPoYTtI+3Izp23oiGZitsl9lPDPiTGXbcSIk1iJWhliSaglxnUg=="; + sha512 = "196fp42k8j9d8cmi0sqjj6wfqcr7y0c9zcrfv1bcs38ipkn78ivg3xl2f33x3hfiqnyp3gb5y7ndkgqpw433jn5rb43qq37dkxahdl3"; }; }; "editor-1.0.0" = { @@ -8819,7 +8345,7 @@ let version = "0.13.3"; src = fetchurl { url = "https://registry.npmjs.org/editorconfig/-/editorconfig-0.13.3.tgz"; - sha512 = "WkjsUNVCu+ITKDj73QDvi0trvpdDWdkDyHybDGSXPfekLCqwmpD7CP7iPbvBgosNuLcI96XTDwNa75JyFl7tEQ=="; + sha512 = "08ysphnfa9fynh31z9sbxq8nyw0v2w2q6xkvqpy13xr16mh58na9xrxjxj0r6vwr01xjna3jyz6njwbxw0dvyrq509y5fs2sm8fqj2s"; }; }; "ee-first-1.1.0" = { @@ -8858,18 +8384,6 @@ let sha1 = "cc872c168880ae3c7189762fd5ffc00896c9518a"; }; }; -<<<<<<< HEAD -======= - "electron-to-chromium-1.3.50" = { - name = "electron-to-chromium"; - packageName = "electron-to-chromium"; - version = "1.3.50"; - src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.50.tgz"; - sha1 = "7438b76f92b41b919f3fbdd350fbd0757dacddf7"; - }; - }; ->>>>>>> nodePackages: meguca: 1.0.7 update "elegant-spinner-1.0.1" = { name = "elegant-spinner"; packageName = "elegant-spinner"; @@ -8912,7 +8426,7 @@ let version = "2.0.4"; src = fetchurl { url = "https://registry.npmjs.org/email-validator/-/email-validator-2.0.4.tgz"; - sha512 = "gYCwo7kh5S3IDyZPLZf6hSS0MnZT8QmJFqYvbqlDZSbwdZlY6QZWxJ4i/6UhITOJ4XzyI647Bm2MXKCLqnJ4nQ=="; + sha512 = "2fphwmaifh5r33d0qxsw8zjgkhqjcr146jzy8lyqib0dsaqk5sz09k58flnwbx62s4hkwakfqrb8945zabjskr61z42vr91p6iv1041"; }; }; "emitter-http://github.com/component/emitter/archive/1.0.1.tar.gz" = { @@ -9012,7 +8526,7 @@ let version = "1.4.1"; src = fetchurl { url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz"; - sha512 = "1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q=="; + sha512 = "3cjrpi6n5i6gf8jaiwg31y2xkgx59szhhcj9myqwmdw16s9r6yvwznxd2lhqf96mpm6knyb3w2bcnksg5nzkrq6iada0k6nvdj2pjfl"; }; }; "ends-with-0.2.0" = { @@ -9039,7 +8553,7 @@ let version = "1.8.5"; src = fetchurl { url = "https://registry.npmjs.org/engine.io/-/engine.io-1.8.5.tgz"; - sha512 = "j1DWIcktw4hRwrv6nWx++5nFH2X64x16MAG2P0Lmi5Dvdfi3I+Jhc7JKJIdAmDJa+5aZ/imHV7dWRPy2Cqjh3A=="; + sha512 = "3ff3a0anvy48mmpay3jkzlrjvxmlclq823j8jmjfdhy48xpz1syz44bwr13zdh161x1vqzsclgwb6gvgrn9vymvq98qihrdr4hxcl4g"; }; }; "engine.io-3.1.5" = { @@ -9048,7 +8562,7 @@ let version = "3.1.5"; src = fetchurl { url = "https://registry.npmjs.org/engine.io/-/engine.io-3.1.5.tgz"; - sha512 = "D06ivJkYxyRrcEe0bTpNnBQNgP9d3xog+qZlLbui8EsMr/DouQpf5o9FzJnWYHEYE0YsFHllUv2R1dkgYZXHcA=="; + sha512 = "1qcg5b143cxb4gxa9jpj51c8q9ihwb0sscwqicgwrghmfg8y2phqjzhlaxjsrd6z8h1mpsxzy00s54w9lx6vd27f1mj9iqqk6ya4khg"; }; }; "engine.io-3.2.0" = { @@ -9057,7 +8571,7 @@ let version = "3.2.0"; src = fetchurl { url = "https://registry.npmjs.org/engine.io/-/engine.io-3.2.0.tgz"; - sha512 = "mRbgmAtQ4GAlKwuPnnAvXXwdPhEx+jkc0OBCLrXuD/CRvwNK3AxRSnqK4FSqmAMRRHryVJP8TopOvmEaA64fKw=="; + sha512 = "0mizbh339hvwkla9vy96m7jg92120wqm9af12ks998hrp2a0fzr3w0gxssjwhp0s0f3kyii24z1sz2x5xq9x3qb5cjn1q2h1fcf05lr"; }; }; "engine.io-client-1.3.1" = { @@ -9075,7 +8589,7 @@ let version = "1.8.5"; src = fetchurl { url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.5.tgz"; - sha512 = "AYTgHyeVUPitsseqjoedjhYJapNVoSPShbZ+tEUX9/73jgZ/Z3sUlJf9oYgdEBBdVhupUpUqSxH0kBCXlQnmZg=="; + sha512 = "1kfc2cmjw891x0i9cm9alm93db5s40h3n4a3zcpjha7nrvz0s7ggzpp2x2v8zmnhp9278amjdm0j5lfkn3qxan7nanzhl4m4wgy1101"; }; }; "engine.io-client-3.1.6" = { @@ -9084,7 +8598,7 @@ let version = "3.1.6"; src = fetchurl { url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.1.6.tgz"; - sha512 = "hnuHsFluXnsKOndS4Hv6SvUrgdYx1pk2NqfaDMW+GWdgfU3+/V25Cj7I8a0x92idSpa5PIhJRKxPvp9mnoLsfg=="; + sha512 = "1zfr0lycsgvwkxc8i4qhg5rjr59ss7p66nz3j1y1awmvzgy9myn0rqrpv2hrnm76qv9kmiiss0jpxaaz9xy0lkp7857npkfb6q8fyw6"; }; }; "engine.io-client-3.2.1" = { @@ -9093,7 +8607,7 @@ let version = "3.2.1"; src = fetchurl { url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.2.1.tgz"; - sha512 = "y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw=="; + sha512 = "37x70wgsxmbz24ypn1nprgrmqrbjf5ln7xjivpw5q6rw91kj2mhjq81ai8v7zs6am25h2sajk341kid215gxrmy88iwwy2n5f9ip46b"; }; }; "engine.io-parser-1.0.6" = { @@ -9120,7 +8634,7 @@ let version = "2.1.2"; src = fetchurl { url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.2.tgz"; - sha512 = "dInLFzr80RijZ1rGpx1+56/uFoH7/7InhH3kZt+Ms6hT8tNx3NGW/WNSA/f8As1WkOfkuyb3tnRyuXGxusclMw=="; + sha512 = "0rjbixsn5qvjwklnvvjdfz4wy85dk82zkvh6lk3znbd3p3isgr57a5kikgndr3xhhkv5zzvh4bfxbz7gqfsgijscyiiilgw78bwp2bl"; }; }; "enhanced-resolve-2.3.0" = { @@ -9138,7 +8652,7 @@ let version = "4.1.0"; src = fetchurl { url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz"; - sha512 = "F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng=="; + sha512 = "2g5bp8yrd5ixqfg81db9ifalcqdyjxmrc4va86ljng9vnhkk2v0gxc7w28q00wnlp0j6sjilzj7dh4mkj2z49z2jkjwzjgd4j9yzzhp"; }; }; "ensure-posix-path-1.0.2" = { @@ -9201,7 +8715,7 @@ let version = "3.4.2"; src = fetchurl { url = "https://registry.npmjs.org/envinfo/-/envinfo-3.4.2.tgz"; - sha512 = "yqKl+qfQ849zLua/aRGIs4TzNah6ypvdX6KPmK9LPP54Ea+Hqx2gFzSBmGhka8HvWcmCmffGIshG4INSh0ku6g=="; + sha512 = "3m2wjc7aa1y0in84b3gg6c2r5cyzhbbcil9i09l2yh1vaw7mw8piziw9fpri3x2bzfrpjksm0sz715ki08nkgz65rrqzwyhlzxab8na"; }; }; "errno-0.1.7" = { @@ -9210,7 +8724,7 @@ let version = "0.1.7"; src = fetchurl { url = "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz"; - sha512 = "MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg=="; + sha512 = "2bdzcjwgdkg5yrvlw6my57pn77k4j7a2pzppwqrq4va9f5bd4b5mzbhwpklhsy1jl7w9sjvnfs30h42nhz2dbdfhagnh8dk6l2d3yii"; }; }; "error-7.0.2" = { @@ -9228,11 +8742,7 @@ let version = "1.3.2"; src = fetchurl { url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz"; -<<<<<<< HEAD - sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; -======= sha512 = "3igrl2amb9mpa9d2z6qghz3ljqd7amjla8ahfs5fdgl0w52pw6gz3y32q5fk229yvfyg3x9kpfygadcm2w0lv4hv4nj25cyd8v4glgd"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "errorhandler-1.4.3" = { @@ -9259,7 +8769,7 @@ let version = "1.12.0"; src = fetchurl { url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.12.0.tgz"; - sha512 = "C8Fx/0jFmV5IPoMOFPA9P9G5NtqW+4cOPit3MIuvR2t7Ag2K15EJTpxnHAYTzL+aYQJIESYeXZmDBfOBE1HcpA=="; + sha512 = "2jdql8kh7rhb0wrblg2c4a809hrmgyc2c31qrww9q4r3mwa1l17nss7my5k0xrb7q78gywnv8vbkl9z7pq183l37r45x6f593zp3h8b"; }; }; "es-to-primitive-1.1.1" = { @@ -9277,7 +8787,7 @@ let version = "0.10.45"; src = fetchurl { url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.45.tgz"; - sha512 = "FkfM6Vxxfmztilbxxz5UKSD4ICMf5tSpRFtDNtkAhOxZ0EKtX6qwmXNyH/sFyIbX2P/nU5AMiA9jilWsUGJzCQ=="; + sha512 = "04p6qjhmiaqlqqgi0690lz7zzcdg1n80pxiywkkk6qalpxd8b85kv4403ckchsv8jlx9rhz4chgh819ahzcgwanibnnqzkibklwqiqn"; }; }; "es5-ext-0.8.2" = { @@ -9313,7 +8823,7 @@ let version = "4.1.1"; src = fetchurl { url = "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz"; - sha512 = "Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg=="; + sha512 = "1b98y4j9fy6c2wm7ys3csnyfg8cn40sy2g958i45fdh5bnx1lkl19d4508aldabga5rm1q5hzxq68yjdyb8n6qxb8925x1b2cbzwvsj"; }; }; "es6-iterator-2.0.3" = { @@ -9358,7 +8868,7 @@ let version = "4.2.4"; src = fetchurl { url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.4.tgz"; - sha512 = "/NdNZVJg+uZgtm9eS3O6lrOLYmQag2DjdEXuPaHlZ6RuVqgqaVZfgYCepEIKsLqwdQArOPtC3XzRLqGGfT8KQQ=="; + sha512 = "10hlgvxhshjxlbwvm1gnf1b01sv1fmh191a97l0h5gmcs9am1b6x937wnhkvvj5fkin10qscii8pcwnp9rlnpkgnrhfdyk0a9jlvmzw"; }; }; "es6-promisify-5.0.0" = { @@ -9457,11 +8967,7 @@ let version = "1.10.0"; src = fetchurl { url = "https://registry.npmjs.org/escodegen/-/escodegen-1.10.0.tgz"; -<<<<<<< HEAD - sha512 = "fjUOf8johsv23WuIKdNQU4P9t9jhQ4Qzx6pC2uW890OloK3Zs1ZAoCNpg/2larNF501jLl3UNy0kIRcF6VI22g=="; -======= sha512 = "3d3clp90lbj291d6za5sbk39pklbcvalpyq6s93l105dcyrmnhaahzppkjxlhmaqwrq8hz1v2vzv0ska39jk23bvpvcp1p8r1zhwdby"; ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 }; }; "escodegen-1.8.1" = { @@ -9497,7 +9003,16 @@ let version = "4.19.1"; src = fetchurl { url = "https://registry.npmjs.org/eslint/-/eslint-4.19.1.tgz"; - sha512 = "bT3/1x1EbZB7phzYu7vCr1v3ONuzDtX8WjuM9c0iYxe+cq+pwcKEoQjl7zd3RpC6YOLgnSy3cTN58M2jcoPDIQ=="; + sha512 = "0hw70vjlg6z0y9kf6vjr7g0w9hbm426fwvyzr88l62c5hd9mxrbw5v34b6zb31vbbyda3mkvcwgfnxgqaxvpn0wlrxr0va43pbzygbd"; + }; + }; + "eslint-5.0.1" = { + name = "eslint"; + packageName = "eslint"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint/-/eslint-5.0.1.tgz"; + sha512 = "0lwhcn5gmz7f8gsm7gqd26w1g6jgjapdlfp2xl32yl8xvdzbi844bzkma5zrr27cd1pbzwlxy17w7jqcl96n56qnbaf5aibn7dcd68g"; }; }; "eslint-plugin-no-unsafe-innerhtml-1.0.16" = { @@ -9524,11 +9039,7 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.0.tgz"; -<<<<<<< HEAD - sha512 = "1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA=="; -======= sha512 = "186fc0lsj71wnsj93jkz7j2qimqa2q99aphbdln914135x99s6njz59n6pdfpyfyy6jxq8awkscm1sp0yglf9sw5i2cs9dv71698vnl"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "eslint-visitor-keys-1.0.0" = { @@ -9537,7 +9048,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz"; - sha512 = "qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ=="; + sha512 = "02hr99x8cnc80p9hn5si7mngqpzvvjkxmdv8sch68z0qpqwjdlx3j1w6d9rhr6wgcnqf1mrxyji8wvfddbf7xr13z2nzihv29gvyfdb"; }; }; "espree-3.5.4" = { @@ -9546,16 +9057,7 @@ let version = "3.5.4"; src = fetchurl { url = "https://registry.npmjs.org/espree/-/espree-3.5.4.tgz"; - sha512 = "yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A=="; - }; - }; - "espree-4.0.0" = { - name = "espree"; - packageName = "espree"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-4.0.0.tgz"; - sha512 = "kapdTCt1bjmspxStVKX6huolXVV5ZfyZguY1lcfhVVZstce3bqxH9mcLzNn3/mlgW6wQ732+0fuG9v7h0ZQoKg=="; + sha512 = "3a07jjjp8g8mdayw3n9l0p0llw7cfipjifan2ccyn2vm1zyafrmv5cj11rc6qmk7ibbq1vc4xxc3sfr54qpgxmxiizj0ck63d1hh1y8"; }; }; "espree-4.0.0" = { @@ -9600,7 +9102,7 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz"; - sha512 = "oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw=="; + sha512 = "27mkhd94y9vrr8pb97br0ym5h85rawwb0biswgwdfp31x0387y12k9p9598bi4fc83fif6crfzqiqmmjs4x7gcb22ml3z1fldqm7yx1"; }; }; "esprima-fb-13001.1001.0-dev-harmony-fb" = { @@ -9618,7 +9120,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz"; - sha512 = "SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA=="; + sha512 = "0s9lxfan3qbvpprj71ldy70x9sz4xkpakhr3pymkm13bx40px4kp4xcgipscn8m21qigddin5mkr52bicbm34g46dapyn68kikv4s2a"; }; }; "esrecurse-4.2.1" = { @@ -9627,7 +9129,7 @@ let version = "4.2.1"; src = fetchurl { url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz"; - sha512 = "64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ=="; + sha512 = "06zyknk70y80n428x20wvjqy5822wgz2yaxzw387njnz3ar6ixzjcxzr2jsl8wrm0m9jpa4ysbcr9znpk6gbkqd7wby084zxw3l317b"; }; }; "estraverse-1.9.3" = { @@ -9789,7 +9291,7 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.0.tgz"; - sha512 = "ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA=="; + sha512 = "1q3lcjzcm6cva1avw6qkzynnk6rlcp0pblgxxliwry2z52rz9fy82wh630clfv12i64ygywca69hfbj3ki71hy1in94nqxzka32zwla"; }; }; "events-1.1.1" = { @@ -9807,7 +9309,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/events/-/events-2.1.0.tgz"; - sha512 = "3Zmiobend8P9DjmKAty0Era4jV8oJ0yGYe2nJJAxgymF9+N8F2m0hhZiMoWtcfepExzNKZumFU3ksdQbInGWCg=="; + sha512 = "059cw923gab3r2d2nk9nafd3h9skxvimn2k4qhnhss6j5vwwgvqaac3668299zdc634q9r8by6vidhjnkf052ir1vyw6xx7nyhs56fx"; }; }; "events.node-0.4.9" = { @@ -9834,7 +9336,7 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz"; - sha512 = "/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA=="; + sha512 = "1wd18zxd7n42asa63aa4k1bdf58warg29c7c8cdzzkd4r1wva7qwzqnn52h8g8hqwj7bxjkk3ryghajrvz4i27h5bzp30p8hjiqdzgx"; }; }; "execa-0.1.1" = { @@ -9897,7 +9399,7 @@ let version = "4.1.1"; src = fetchurl { url = "https://registry.npmjs.org/executable/-/executable-4.1.1.tgz"; - sha512 = "8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg=="; + sha512 = "0p56mwdi80mzj4q8yb6s1abff3dwpl1s887jarp0fx3x3gz92qahnn28yqn0r351wflqsw4cqa4383965pm0pbgxwhhgf7p23vkn87j"; }; }; "exit-0.1.2" = { @@ -9924,7 +9426,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz"; - sha512 = "h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw=="; + sha512 = "2kxcf7dq1q9z2wqwwfjagn77kpzg2zpjqf2kd3vj5drx576gwglbsfly2b1imabj3svgcz5xsx79kspq1xsdgm4wwg1fksfnjdgjv47"; }; }; "expand-braces-0.1.2" = { @@ -9978,7 +9480,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/expand-template/-/expand-template-1.1.1.tgz"; - sha512 = "cebqLtV8KOZfw0UI8TEFWxtczxxC1jvyUvx6H4fyp1K1FN7A4Q+uggVUlOsI1K8AGU0rwOGqP8nCapdrw8CYQg=="; + sha512 = "119ih63dfbnmhn97ymf3h1b9lch1byl13mr8m05hap0zqf0vqabalm7ya3iyypwabr3pmj23k7mq6sv0lqz2225qdgyca3wslpfmrki"; }; }; "expand-tilde-2.0.2" = { @@ -10095,7 +9597,7 @@ let version = "1.15.6"; src = fetchurl { url = "https://registry.npmjs.org/express-session/-/express-session-1.15.6.tgz"; - sha512 = "r0nrHTCYtAMrFwZ0kBzZEXa1vtPVrw0dKvGSrKP4dahwBQ1BJpF2/y1Pp4sCD/0kvxV4zZeclyvfmw0B4RMJQA=="; + sha512 = "100j4z1046rpprbjyf9gkbq2nzj9z8g0a5sfkrdzxv929j11l2p1a3mz2isr4pi58fhvbymsfzbaxhiv4f90x062wmh7d4q60fynjdg"; }; }; "express-urlrewrite-1.2.0" = { @@ -10113,7 +9615,7 @@ let version = "2.2.2"; src = fetchurl { url = "https://registry.npmjs.org/ext-list/-/ext-list-2.2.2.tgz"; - sha512 = "u+SQgsubraE6zItfVA0tBuCBhfU9ogSRnsvygI7wht9TS510oLkBRXBsqopeUG/GBOIQyKZO9wjTqIu/sf5zFA=="; + sha512 = "0a77zmipy5silq8yx7adj0hw82ccvshbs5alv3h8l0vk83lkm5m7pw6y2781wnbks8h98ixyn2q3q065l6m8pwbrhxa3bcvrf191r5v"; }; }; "ext-name-3.0.0" = { @@ -10185,7 +9687,7 @@ let version = "2.2.0"; src = fetchurl { url = "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz"; - sha512 = "bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A=="; + sha512 = "3sf897ajmkcp0j6rgd0jy6k95s9ck3j305yrr00kmckl8qdhswhbdd5g4m2fai03x8phs1vw2ahf9v7ym5ji4zfxydxyamiy61glabd"; }; }; "external-editor-3.0.0" = { @@ -10194,7 +9696,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/external-editor/-/external-editor-3.0.0.tgz"; - sha512 = "mpkfj0FEdxrIhOC04zk85X7StNtr0yXnG7zCb+8ikO8OJi2jsHh5YGoknNTyXgsbHOf1WOOcVU3kPFWT2WgCkQ=="; + sha512 = "28h4s6rjdakrr2danff6n7mwwf1n2syyba9q93ac1wpic535lk0xvwh4bpnzhmw3gkjblvbvfsd4zp57hwy7d70hk41lxs4867iz6cs"; }; }; "extglob-0.3.2" = { @@ -10212,7 +9714,7 @@ let version = "2.0.4"; src = fetchurl { url = "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz"; - sha512 = "Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw=="; + sha512 = "2klp0045k4wnaspb9khqx90ddv7rjg997mlyp5qz41sl2yqdrpw8g8wji77qq16aawl4yhvg0f993ln48lja0kfmy0wnbh4g50zlrin"; }; }; "extract-opts-3.3.1" = { @@ -10329,7 +9831,7 @@ let version = "1.1.2"; src = fetchurl { url = "https://registry.npmjs.org/fast-diff/-/fast-diff-1.1.2.tgz"; - sha512 = "KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig=="; + sha512 = "2550z1qvyfv9js9vg2aaj57ji5d9hhg4f6zl4rf483d6xswv23ac6ipj8gbapv4sjx14dpcslqmnx1z78vvx4np4ad5mdrxwfvm98i9"; }; }; "fast-glob-2.2.2" = { @@ -10338,7 +9840,7 @@ let version = "2.2.2"; src = fetchurl { url = "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.2.tgz"; - sha512 = "TR6zxCKftDQnUAPvkrCWdBgDq/gbqx8A3ApnBrR5rMvpp6+KMJI0Igw7fkWPgeVK0uhRXTXdvO3O+YP0CaUX2g=="; + sha512 = "3d1g989yj1zkkpdpkfkapaix394mrc1ix2pwfqc48s94c4amykykjxcg6s0crqavh01zaqvz2mh663ljsq95vq3a0kk9d4z4b2b67jd"; }; }; "fast-json-parse-1.0.3" = { @@ -10347,7 +9849,7 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/fast-json-parse/-/fast-json-parse-1.0.3.tgz"; - sha512 = "FRWsaZRWEJ1ESVNbDWmsAlqDk96gPQezzLghafp5J4GUKjbCz3OkAHuZs5TuPEtkbVQERysLp9xv6c24fBm8Aw=="; + sha512 = "01vq6bwp36yjvywlw5jniq4ainn8jrwxsab76bv02j77ky26qm99097g7x6j8dqrjrhfgd0vs9q6nh2milhsnsk9529s42njilsq58m"; }; }; "fast-json-patch-0.5.6" = { @@ -10401,7 +9903,7 @@ let version = "1.2.3"; src = fetchurl { url = "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-1.2.3.tgz"; - sha512 = "QJYT/i0QYoiZBQ71ivxdyTqkwKkQ0oxACXHYxH2zYHJEgzi2LsbjgvtzTbLi1SZcF190Db2YP7I7eTsU2egOlw=="; + sha512 = "2bhxs6r2hxpjfxj7ycbs3blbwbmq9nmwar4swzvhbiwcbmn721l8wk0ndyw9n3i1508rlhhm70a8fn9bpy8mx8f0ncqhqhh5pz175j0"; }; }; "fast-url-parser-1.1.3" = { @@ -10545,7 +10047,7 @@ let version = "6.2.0"; src = fetchurl { url = "https://registry.npmjs.org/file-type/-/file-type-6.2.0.tgz"; - sha512 = "YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg=="; + sha512 = "0xf8ry7jj1c5mvvp5qxidq3qcqxzdngx1q9r981ddq3wfcidwqd4h52hplv462hvm9frdl086advhfqfxbnvwm8ass3knby6l217xv0"; }; }; "file-uri-to-path-1.0.0" = { @@ -10554,7 +10056,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz"; - sha512 = "0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw=="; + sha512 = "0px1qliabg53lwfq4izc9vdll68sd08nlczi2ms5nvg7frm3y6zgy07vdvxywazab26jc723qpmh9a6h3bdp685iddzsmgvfarpx6yi"; }; }; "filename-regex-2.0.1" = { @@ -10581,11 +10083,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/filenamify/-/filenamify-2.1.0.tgz"; -<<<<<<< HEAD - sha512 = "ICw7NTT6RsDp2rnYKVd8Fu4cr6ITzGy3+u4vUujPkabyaz+03F24NWEX7fs5fp+kBonlaqPH8fAO2NM+SXt/JA=="; -======= sha512 = "0j7yys97v9xh3phy73s6sp5i43a97vy77xys5v16nw5vp5l7xmz59lirzl54bzfzavnrk0klapirvhngibjkn5rvblw0ips6hsknb10"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "filestream-4.1.3" = { @@ -10603,7 +10101,7 @@ let version = "2.2.4"; src = fetchurl { url = "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz"; - sha512 = "cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q=="; + sha512 = "3jpxxzv8ji9xqk6xwbr20nsl31jjqr5asnv0ayixyc3r393yv4r44b7lifpk1pqaw8clzs0cy7dnw9yb5axpg9ih7vfimzlp04xqykj"; }; }; "fill-range-4.0.0" = { @@ -10675,7 +10173,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz"; - sha512 = "Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg=="; + sha512 = "2v4ymv7dvpxpnrid4cn8qni5k5l024zc2qzg8ipkbxwmqjbaiygbx0hvbnr0ywfy0is4ngyhp6ljgjh4wmk6fqc3hd3wyzxil798lb3"; }; }; "find-cache-dir-1.0.0" = { @@ -10693,7 +10191,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/find-elm-dependencies/-/find-elm-dependencies-1.0.2.tgz"; - sha512 = "gnvu2zAKFEHd76zV/JkRvof7HNyM2X8yW5vflCfWbXeo9hmXMndz/SrEsTQFSXXgNqf0AdjhQSRPnG8JYR92oQ=="; + sha512 = "2hpc7v115prqkr487hxh0gllwvf0xa90lsb3i1azmrpfclp37vahxvdsqkr9pwvbcr7znccvhfgp1xy26czrmdcxzfl250a63dywyw2"; }; }; "find-index-0.1.1" = { @@ -10738,7 +10236,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz"; - sha512 = "1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg=="; + sha512 = "2bg49lifm64h5jqjc20612wrx7cazw9np9ms02ys94kif4li8cp5in4rvmb1c1ssa8yhbsqkgprykkj4lf3jbz8qrgp1mf8c93gl86p"; }; }; "find-versions-2.0.0" = { @@ -10801,7 +10299,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/firefox-profile/-/firefox-profile-1.1.0.tgz"; - sha512 = "wUIE4QeAjwoHvFbomWmXgKyYtV4/oZxDcJG4znxtGGa/0BhKkd3HzeOf3tAsMWPq1ExARZxCRRiNw1BL3FuPqA=="; + sha512 = "2l8ynyw9d8c738q8m19qia09kaflqri5k8dx7z3rp3xv4aa338byrhqdmycxf4if11rr89zbssrib40jxlrks2nph3hm3w00zhh8hn1"; }; }; "first-chunk-stream-1.0.0" = { @@ -10882,7 +10380,7 @@ let version = "1.0.8"; src = fetchurl { url = "https://registry.npmjs.org/flatstr/-/flatstr-1.0.8.tgz"; - sha512 = "YXblbv/vc1zuVVUtnKl1hPqqk7TalZCppnKE7Pr8FI/Rp48vzckS/4SJ4Y9O9RNiI82Vcw/FydmtqdQOg1Dpqw=="; + sha512 = "2myjl431vaakbfrr72hywwmrlin44zm9s7y32c4zw9ckk9giykx33qlzkxfr13jlslr15fsnj9smyl4fnlrqbamapp5qwzgzxpfaxk1"; }; }; "flatten-0.0.1" = { @@ -10918,7 +10416,7 @@ let version = "0.7.0"; src = fetchurl { url = "https://registry.npmjs.org/fluent-syntax/-/fluent-syntax-0.7.0.tgz"; - sha512 = "T0iqfhC40jrs3aDjYOKgzIQjjhsH2Fa6LnXB6naPv0ymW3DeYMUFa89y9aLKMpi1P9nl2vEimK7blx4tVnUWBg=="; + sha512 = "031cxan5lg9gnxfk0ig3np5v4zvb61jraigawngdc2waq6yf1dsck5zixvfmhbm5sx5dn073f72716cl3i61qx0vpn3mlmq21zalj2g"; }; }; "flush-write-stream-1.0.3" = { @@ -10927,7 +10425,7 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.3.tgz"; - sha512 = "calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw=="; + sha512 = "0dycj5bh8djmx4lj5llrbg3cg0ynq32qn8pzk8zl9j8pm6nv5n1qzk4m7dq81q96ygzh8jl9chqh8826rrbl8maa9643fvl5lq5kabi"; }; }; "follow-redirects-0.0.3" = { @@ -10954,7 +10452,7 @@ let version = "1.4.1"; src = fetchurl { url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.4.1.tgz"; - sha512 = "uxYePVPogtya1ktGnAAXOacnbIuRMB4dkvqeNz2qTtTQsuzSfbDolV+wMMKxAmCx0bLgAKLbBOkjItMbbkR1vg=="; + sha512 = "2z7ai3f3g9j48z90kds4070nb8v2q02n7131c2zjplb0zfjxjrd1m2fm8ykg7psj8fiwc4iidn2g9rr2w09qijbssddr0p8acyiw5mv"; }; }; "follow-redirects-1.5.0" = { @@ -10963,7 +10461,7 @@ let version = "1.5.0"; src = fetchurl { url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.0.tgz"; - sha512 = "fdrt472/9qQ6Kgjvb935ig6vJCuofpBUD14f9Vb+SLlm7xIe4Qva5gey8EKtv8lp7ahE1wilg3xL1znpVGtZIA=="; + sha512 = "0h5jsslx4wxfjvwhfjhims4m3nnkjdzmm1g1ch7wvd0pq8y2bpndfa8zrbga7sy1xa90zm85cjay3laz7fnzvq858xa9xmzppiyvnkx"; }; }; "for-each-0.3.3" = { @@ -10972,7 +10470,7 @@ let version = "0.3.3"; src = fetchurl { url = "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz"; - sha512 = "jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw=="; + sha512 = "2dikmdxwassw4w48vv82swjv4v1zx2sivsgcnxi3zi0imzw165ba8vaxgawz0wz4fgf138hvvc3xc5znr2wmz07r74dp8z6kqp1z9lf"; }; }; "for-in-0.1.8" = { @@ -11143,7 +10641,7 @@ let version = "1.2.1"; src = fetchurl { url = "https://registry.npmjs.org/formidable/-/formidable-1.2.1.tgz"; - sha512 = "Fs9VRguL0gqGHkXS5GQiMCr1VhZBxz0JnJs4JmMp/2jL18Fmbzvv7vOFRU+U8TBkHEE/CX1qDXzJplVULgsLeg=="; + sha512 = "1x0n2rfaiasdjbw1mm7s29z84f68c7iji7lb1gkxvpknvv6q7bwns7z55ijcf4vkh4kvis12rbgaaih49jf9lj53s30mllb1d35bkqn"; }; }; "forwarded-0.1.2" = { @@ -11251,7 +10749,7 @@ let version = "1.7.0"; src = fetchurl { url = "https://registry.npmjs.org/fs-chunk-store/-/fs-chunk-store-1.7.0.tgz"; - sha512 = "KhjJmZAs2eqfhCb6PdPx4RcZtheGTz86tpTC5JTvqBn/xda+Nb+0C7dCyjOSN7T76H6a56LvH0SVXQMchLXDRw=="; + sha512 = "13w7dc43h1mv5a43zps5rwsgvlgpd1pj8rwlhmp1fsbyddysv2zy6d8xyaf9hllnqx3ykw62yv1j5z1y79kvyi6hjgymn9cj2cwj61a"; }; }; "fs-constants-1.0.0" = { @@ -11260,7 +10758,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz"; - sha512 = "y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="; + sha512 = "2iv1j05gzx1sgpckd597sdd2f5x54rgcib3rpwgf31050wqxn5h27map6cn9wk4vix393s4ws2xv6kgps5zfby2iirb2zw8hk1818yb"; }; }; "fs-ext-0.6.0" = { @@ -11332,7 +10830,7 @@ let version = "4.0.3"; src = fetchurl { url = "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz"; - sha512 = "q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg=="; + sha512 = "05bphjab1lk12dz3qf87dywgpsjsx0f59kpligxqph53yicigij2gsmvkppgyhpi70h3q3id3ymz30c02v3pphakn06k8vm6xsdpamb"; }; }; "fs-extra-5.0.0" = { @@ -11341,7 +10839,7 @@ let version = "5.0.0"; src = fetchurl { url = "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz"; - sha512 = "66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ=="; + sha512 = "1ssfaw678600iy330a73gqk65ns22sz4ng7jwndj1fxahj8qddrsy2w4mr4ikx28qhdj8rf49n428qnl657bbpag9r3g3qv2vhyd8zb"; }; }; "fs-minipass-1.2.5" = { @@ -11350,7 +10848,7 @@ let version = "1.2.5"; src = fetchurl { url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz"; - sha512 = "JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ=="; + sha512 = "2hpc9wbzrndi5bswg9q9hwxmg4yd99zbvssxnz6g04clj68qhd8c83zn282v3q7f9h1xi7c4lmnn341nlgfpwby2k14738pr796a416"; }; }; "fs-mkdirp-stream-1.0.0" = { @@ -11404,7 +10902,7 @@ let version = "1.1.2"; src = fetchurl { url = "https://registry.npmjs.org/fsevents/-/fsevents-1.1.2.tgz"; - sha512 = "Sn44E5wQW4bTHXvQmvSHwqbuiXtduD6Rrjm2ZtUEGbyrig+nUH3t/QD4M4/ZXViY556TBpRgZkHLDx3JxPwxiw=="; + sha512 = "25k3z64r4fhzjs1crh981lkkvkrhn2xv67k7y00zpnpsl571y5apg0r0kanddirms8kxf2xgf4yx9n2hzs9ml3v3p9qcnqhkh9khzja"; }; }; "fsevents-1.2.4" = { @@ -11413,7 +10911,7 @@ let version = "1.2.4"; src = fetchurl { url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.4.tgz"; - sha512 = "z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg=="; + sha512 = "0vfzl6byj55zmi8xiqb9bqd5q0awlpgz4hsph9xzhzrd46did859d6fp5vydh7n4d0n1ph5q36smq6k3pjq6w5fxs0vx4xjv3yzrhfg"; }; }; "fstream-0.1.31" = { @@ -11467,7 +10965,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"; - sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; + sha512 = "38chm1mh077ksx6hy2sssfz4q29hf0ncb9k6ila7si54zqcpl5fxd1rh6wi82blqp7jcspf4aynr7jqhbsg2yc9y42xpqqp6c1jz2n8"; }; }; "functional-red-black-tree-1.0.1" = { @@ -11575,11 +11073,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/get-assigned-identifiers/-/get-assigned-identifiers-1.2.0.tgz"; -<<<<<<< HEAD - sha512 = "mBBwmeGTrxEMO4pMaaf/uUEFHnYtwr8FTe8Y/mer4rcV/bye0qGm6pw1bGZFGStxC5O76c5ZAVBGnqHmOaJpdQ=="; -======= sha512 = "1snk8irwshrwijh05cwxsdvjc5p2aqr8mk6qdcwxaka3llypkyibdz2mdkzw67g9l2vzhidfqg0ahdrzyknjk4a7c613bwkw6cp044q"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "get-browser-rtc-1.0.2" = { @@ -11633,7 +11127,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/get-proxy/-/get-proxy-2.1.0.tgz"; - sha512 = "zmZIaQTWnNQb4R4fJUEp/FC51eZsc6EkErspy3xtIYStaq8EB/hDIWipxsal+E8rz0qD7f2sL/NA9Xee4RInJw=="; + sha512 = "0kjf4p1krvzah7k5yngvvc39b7jnkzqlp3cdab8451zh1q4mxmav111dmycnadv28ja2wvcwvavjl7w550ja7qyw4dx976n0illhrnf"; }; }; "get-stdin-4.0.1" = { @@ -11660,7 +11154,7 @@ let version = "6.0.0"; src = fetchurl { url = "https://registry.npmjs.org/get-stdin/-/get-stdin-6.0.0.tgz"; - sha512 = "jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g=="; + sha512 = "3p9jcnfk7nqnw43xammn5v5z63nxrxgz675sn70q8sma9ick6wq2plbw8b9r5il5f8f9krdamp316rdxvwcm2j4jagvymrjmhfjv7lf"; }; }; "get-stream-2.3.1" = { @@ -11687,7 +11181,7 @@ let version = "2.0.2"; src = fetchurl { url = "https://registry.npmjs.org/get-uri/-/get-uri-2.0.2.tgz"; - sha512 = "ZD325dMZOgerGqF/rF6vZXyFGTAay62svjQIT+X/oU2PtxYpFxvSkbsdi+oxIrsNxlZVd4y8wUDqkaExWTI/Cw=="; + sha512 = "05kycjr66hr3sj0q6y8qxsmav30vfr267m8n7dvj791n5r92svqykd1zzjly21lpsnavjqs60cqaz35mxgaqzx13amhffhrsgjzcgb4"; }; }; "get-value-2.0.6" = { @@ -11705,7 +11199,7 @@ let version = "1.4.3"; src = fetchurl { url = "https://registry.npmjs.org/getmac/-/getmac-1.4.3.tgz"; - sha512 = "bOZafIX+19cCS5KUjHtlJPZW+4joMa5tISIk5CugjmlZE0zZtjwB59wm56JPXVy5ELivw7g4Z9TEI0EDa2CSwQ=="; + sha512 = "30r4q3b0d0j7i6lcwwbihxgp08bjp2x9yiff9nwww0krdnr9h9mjscfl0my891245nswcg8i3xmdxi4cmxqr54j9c1dgmzyhmy5mrkc"; }; }; "getpass-0.1.7" = { @@ -11741,7 +11235,7 @@ let version = "1.3.6"; src = fetchurl { url = "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-1.3.6.tgz"; - sha512 = "svsK26tQ8vEKnMshTDatSIQSMDdz8CxIIqKsvPqbtV23Etmw6VNaFAitu8zwZ0VrOne7FztwPyRLxK7/DIUTQg=="; + sha512 = "111718czypc8jr47xq3n5xvfwx6nib7y36bpb882id57sdhv49bfpdmkgxbrb524942rw3k6wq15128mlv4q8fbkh5g3wjhmgdhmyxj"; }; }; "git-remote-origin-url-2.0.0" = { @@ -11768,7 +11262,7 @@ let version = "1.3.6"; src = fetchurl { url = "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-1.3.6.tgz"; - sha512 = "2jHlJnln4D/ECk9FxGEBh3k44wgYdWjWDtMmJPaecjoRmxKo3Y1Lh8GMYuOPu04CHw86NTAODchYjC5pnpMQig=="; + sha512 = "25114wyd4p8qn681l730d9s1wgh4kmvizin5361hx5qvpd82adi2fkjkvv289nk1vb6hx8q13ikhyc705hw8iag1b23zq37g4kfacfs"; }; }; "gitconfiglocal-1.0.0" = { @@ -11804,7 +11298,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/github-slugger/-/github-slugger-1.2.0.tgz"; - sha512 = "wIaa75k1vZhyPm9yWrD08A5Xnx/V+RmzGrpjQuLemGKSb77Qukiaei58Bogrl/LZSADDfPzKJX8jhLs4CRTl7Q=="; + sha512 = "3nya50972xq88vz4p5gqz63014dkwlp5f40cz1fgad4ifnhprpr4qlqvvi44qxs3arikyfm3ygmf3phyjq5lwkg7rr9ig9mk7prm1n0"; }; }; "glob-3.1.21" = { @@ -11876,7 +11370,7 @@ let version = "7.1.2"; src = fetchurl { url = "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz"; - sha512 = "MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ=="; + sha512 = "08vjxzixc9dwc1hn5pd60yyij98krk2pr758aiga97r02ncvaqx1hidi95wk470k1v84gg4alls9bm52m77174z128bgf13b61x951h"; }; }; "glob-base-0.3.0" = { @@ -12012,7 +11506,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz"; - sha512 = "sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg=="; + sha512 = "1pgpsvm0rm1fnqmblx77xs67gh8c80nf4dsgcgalhh9phmlp8ahn5w7vzx3xkwyxw3fg33h8vhh3plsycw6fd7c2r76mm7m8w9fkb5h"; }; }; "global-paths-1.0.0" = { @@ -12057,11 +11551,7 @@ let version = "11.7.0"; src = fetchurl { url = "https://registry.npmjs.org/globals/-/globals-11.7.0.tgz"; -<<<<<<< HEAD - sha512 = "K8BNSPySfeShBQXsahYB/AbbWruVOTyVpgoIDnl8odPpeSfP2J5QO2oLFFdl2j7GfDCtZj2bMKar2T49itTPCg=="; -======= sha512 = "05czm4a7lzdkax662dksrmd61yccgnscmbi82va7d89xn6g4xwyklx1giwhw20alsakqfcmpdddn1pw04b6mv050nhy8zcjzi44vh1b"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "globals-9.18.0" = { @@ -12070,7 +11560,7 @@ let version = "9.18.0"; src = fetchurl { url = "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz"; - sha512 = "S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ=="; + sha512 = "18psd5ig23apaw07k4mma3z1hi2ndfwsqkm05hxashnf5lf7mpfs6kjiircc0x3x3q15j2x2j4zfzsqacxvfsmw40zjchn44bfccjab"; }; }; "globby-5.0.0" = { @@ -12097,7 +11587,7 @@ let version = "8.0.1"; src = fetchurl { url = "https://registry.npmjs.org/globby/-/globby-8.0.1.tgz"; - sha512 = "oMrYrJERnKBLXNLVTqhm3vPEdJ/b2ZE28xN4YARiix1NOIOBPEpOUnm844K1iu/BkphCaf2WNFwMszv8Soi1pw=="; + sha512 = "2kvb22azhxv632w6jbgssa2k29c3vwann1f7g3ra974lg41hcw4s7cbc8260y0kycv93nfvkxsc9wyycsl4xmfjbi5s170ij6ndijm0"; }; }; "globule-0.1.0" = { @@ -12115,7 +11605,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/glogg/-/glogg-1.0.1.tgz"; - sha512 = "ynYqXLoluBKf9XGR1gA59yEJisIL7YHEH4xr3ZziHB5/yl4qWfaK8Js9jGe6gBGCSCKVqiyO30WnRZADvemUNw=="; + sha512 = "0vr9sdx0f84b9s5vy72ralm494844c0p9kqqgcvy25gcn9abv57y7hwwafdsswc3z283v8bqa50j8gp740dd4biyngi5f15p9f2lxna"; }; }; "got-1.2.2" = { @@ -12151,7 +11641,7 @@ let version = "7.1.0"; src = fetchurl { url = "https://registry.npmjs.org/got/-/got-7.1.0.tgz"; - sha512 = "Y5WMo7xKKq1muPsxD+KmrR8DH5auG7fBdDVueZwETwV6VytKyU9OX/ddpq2/1hp1vIPvVb4T81dKQz3BivkNLw=="; + sha512 = "0phvycaq4yl6jjpyc9vwmgghfy7a6nnpynscpgpbx74zjaa5dbpl1ag0jf7jvimfk0vf6xfjqgh67xdlvi0ycgvp1kasajapjiqr5b3"; }; }; "got-8.3.1" = { @@ -12160,7 +11650,7 @@ let version = "8.3.1"; src = fetchurl { url = "https://registry.npmjs.org/got/-/got-8.3.1.tgz"; - sha512 = "tiLX+bnYm5A56T5N/n9Xo89vMaO1mrS9qoDqj3u/anVooqGozvY/HbXzEpDfbNeKsHCBpK40gSbz8wGYSp3i1w=="; + sha512 = "3by57aak00z7wr6h4sax941f2q8mmvcvy815wxm3lzzdkm8l6i6hxbapxxqzsl0mayv96mmlcqnzkx3axzzwk9yx4wr16yqp7wxf8mn"; }; }; "graceful-fs-1.2.3" = { @@ -12214,7 +11704,7 @@ let version = "2.1.5"; src = fetchurl { url = "https://registry.npmjs.org/graphlib/-/graphlib-2.1.5.tgz"; - sha512 = "XvtbqCcw+EM5SqQrIetIKKD+uZVNQtDPD1goIg7K73RuRZtVI5rYMdcCVSHm/AS1sCBZ7vt0p5WgXouucHQaOA=="; + sha512 = "0w1lx3hms5mx84mlxsgpvjr42qba17wwqhma0np67c9l8smkd2nwx7gr8724a2q1z7x0hjdjnwzx81893mj2ax498wl7y1h4yl5pysy"; }; }; "gray-matter-2.1.1" = { @@ -12241,7 +11731,7 @@ let version = "1.10.5"; src = fetchurl { url = "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz"; - sha512 = "qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA=="; + sha512 = "146i7if4fjml1p6xw1ybb7vm22k6i8yc7r8wcw8yia7qy385w1s6j18ip91g5mv47zvv5fw5m8kpzlaayjs183fkpg174hbw4xgh6m8"; }; }; "growly-1.3.0" = { @@ -12277,7 +11767,7 @@ let version = "3.9.4"; src = fetchurl { url = "https://registry.npmjs.org/gulp-clean-css/-/gulp-clean-css-3.9.4.tgz"; - sha512 = "jsbAj65WM08H1jCFOKpIvA1OlACk7OHS2FFTeeBZrSJ5OR1PJzAqi0I2R2LTWYN3oMd/N1JYN9cN2IS/8eYqdg=="; + sha512 = "1v2mrpipy2dh3fp6xc54dvzqyh7g0srsdi4fdj2icm309sg3lwpj8mdb7h7jlsiv39f3v5402a4w3dw92m3i19hsq3lycsnms7w1ilf"; }; }; "gulp-jsonminify-1.1.0" = { @@ -12286,7 +11776,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/gulp-jsonminify/-/gulp-jsonminify-1.1.0.tgz"; - sha512 = "nkqH5aRajfCGD8HB2yN+QSEQG0SMEpS7UyOp3HS966Og4DqUX0y8sPF5SU8uSsGLLLXbnHwyHbDkxauYO/pSpQ=="; + sha512 = "2jm5yivk2mwbr5h3lr7r76vnln8phaa5r7ljygin2y4qpwl7bha18zbpmsdra93afxr84lc8hdi08a1gqixphf11y3g13aslkjqfjly"; }; }; "gulp-less-3.5.0" = { @@ -12295,22 +11785,9 @@ let version = "3.5.0"; src = fetchurl { url = "https://registry.npmjs.org/gulp-less/-/gulp-less-3.5.0.tgz"; -<<<<<<< HEAD - sha512 = "FQLY7unaHdTOXG0jlwxeBQcWoPPrTMQZRA7HfYwSNi9IPVx5l7GJEN72mG4ri2yigp/f/VNGUAJnFMJHBmH3iw=="; -======= sha512 = "25zfq868z118rq2a1357zfzky1a4v4b5dp9ixny224v35vrbhylhbrn2a67viqf8hcw8k7byfh1c1q5bq69f8vdbk7d87fsx7pdh0hm"; }; }; - "gulp-rename-1.3.0" = { - name = "gulp-rename"; - packageName = "gulp-rename"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/gulp-rename/-/gulp-rename-1.3.0.tgz"; - sha512 = "05f4r6zj2kx8ym90hpgsm51dfnz4c1aj585cw0wbj61jflza31wj4llqkfdndzvffbdn2swvczhnr4pncw4bkh5y0cl52zxpw3rjjww"; ->>>>>>> nodePackages: meguca: 1.0.7 update - }; - }; "gulp-sourcemaps-2.6.4" = { name = "gulp-sourcemaps"; packageName = "gulp-sourcemaps"; @@ -12326,7 +11803,7 @@ let version = "4.0.2"; src = fetchurl { url = "https://registry.npmjs.org/gulp-typescript/-/gulp-typescript-4.0.2.tgz"; - sha512 = "Hhbn5Aa2l3T+tnn0KqsG6RRJmcYEsr3byTL2nBpNBeAK8pqug9Od4AwddU4JEI+hRw7mzZyjRbB8DDWR6paGVA=="; + sha512 = "1a8d5paj4shqz5h8nirrkg61r3s33qh1577a78cw2fx70xfkbr0mq059ld9rxijr7dvvch4qsclj5790smjmx3rnvz795xn0vjff5hy"; }; }; "gulp-uglify-3.0.0" = { @@ -12425,7 +11902,7 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/has/-/has-1.0.3.tgz"; - sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="; + sha512 = "37vh53c11hws66navka0w9xxm6rcr034bxpyvaldiqz1msafqf0jpi1aqxbaygs53arz9y510qg6dl6vrm285hrxniygs2l8lxnyrvz"; }; }; "has-ansi-0.1.0" = { @@ -12488,7 +11965,7 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz"; - sha512 = "G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw=="; + sha512 = "2gww5b6yd5yg2vl5wzdba3azfrfg5llbfppzw99j8jnx3yqz9zyjxr8ra8dm9cjnl9h0xq9dc3hxmx84ma3s9hg06g13gnj20mdclhv"; }; }; "has-color-0.1.7" = { @@ -12569,7 +12046,7 @@ let version = "1.4.2"; src = fetchurl { url = "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz"; - sha512 = "3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw=="; + sha512 = "0kljkjnsw7jnqm8dpf05rd7a59xjfwlbmp1qxs5kdda78zwwqfpkq5ryc2510iyam6v5vbyy0h7bpkwqadajq1ag2zaa7dymyyhwfnx"; }; }; "has-symbols-1.0.0" = { @@ -12587,7 +12064,7 @@ let version = "1.4.1"; src = fetchurl { url = "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz"; - sha512 = "vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw=="; + sha512 = "0bqvhd628h3lrsydbp1xllh7jp23c58j7d4z0x0v9ddffindkk1zfrqmzm28z47ipjp0zxlmzvmlzk98zf9mzjsc47bmp1ydizcmmmx"; }; }; "has-unicode-2.0.1" = { @@ -12668,11 +12145,7 @@ let version = "1.1.4"; src = fetchurl { url = "https://registry.npmjs.org/hash.js/-/hash.js-1.1.4.tgz"; -<<<<<<< HEAD - sha512 = "A6RlQvvZEtFS5fLU43IDu0QUmBy+fDO9VMdTXvufKwIkt/rFfvICAViCax5fbDO4zdNzaC3/27ZhKUok5bAJyw=="; -======= sha512 = "35hkc754i52jqdnvgzjss3ksg6vhcvcbwg6p0jq041g4zn5zavj80ibkzxmwly7ajyk6z5y3jc18i5v0drf7m7jwm9d24nrzd16b903"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "hasha-2.2.0" = { @@ -12735,7 +12208,7 @@ let version = "6.0.2"; src = fetchurl { url = "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz"; - sha512 = "miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ=="; + sha512 = "1nl2hjr2mnhj5jlaz8mh54z7acwz5j5idkch04qgjk78756gw5d0fjk4a2immil5ij9ijdssb9ndpryvnh2xpcbgcjv8lxybn330als"; }; }; "he-1.1.1" = { @@ -12834,7 +12307,7 @@ let version = "4.2.1"; src = fetchurl { url = "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz"; - sha512 = "QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA=="; + sha512 = "1y8kprb3qldxqj31zai5n8dvhydsl9nn5w4rskhnbzzhldn6pm6n5lcyam3sfkb61a62d5m58k8im7z6ngwbd9cw9zp4zm4y7ckrf20"; }; }; "hogan.js-3.0.2" = { @@ -12879,7 +12352,7 @@ let version = "2.6.1"; src = fetchurl { url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.6.1.tgz"; - sha512 = "Ba4+0M4YvIDUUsprMjhVTU1yN9F2/LJSAl69ZpzaLT4l4j5mwTS6jqqW9Ojvj6lKz/veqPzpJBqGbXspOb533A=="; + sha512 = "3f7ggir55xnv1hs4klzra6yzg7lmacgxzlg95maisx39hb67vi2agidvaf6dgay099b5z3ns4vp4kadalw34syaaba81g0qrv83xbh5"; }; }; "hot-shots-4.8.0" = { @@ -12969,7 +12442,7 @@ let version = "3.8.1"; src = fetchurl { url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz"; - sha512 = "5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w=="; + sha512 = "3gsj16kpvygynld5ajbvg8ii3n3bka4waamdzx30wwhz72mdr6wvffm20rfnxwzid9fq49d5g333yjq5dz1qqbnk9bwcmrj9f5bda75"; }; }; "http-errors-1.3.1" = { @@ -13005,7 +12478,7 @@ let version = "3.0.2"; src = fetchurl { url = "https://registry.npmjs.org/http-headers/-/http-headers-3.0.2.tgz"; - sha512 = "87E1I+2Wg4dxxz4rcxElo3dxO/w1ZtgL1yA0Sb6vH3qU16vRKq1NjWQv9SCY3ly2OQROcoxHZOUpmelS+k6wOw=="; + sha512 = "0xv0kpsablrjag5ci3qqwjf0hwvcp6yk0hgabv4im6ssanimgbr8yhzmyz4jd10sw5xhrimzhxp2xx34l8p6aryqxqqg0wnxlikbcgk"; }; }; "http-methods-0.1.0" = { @@ -13050,7 +12523,7 @@ let version = "1.17.0"; src = fetchurl { url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz"; - sha512 = "Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g=="; + sha512 = "3z80svhb9hi5fawc8za5qn75lybr53646gfsqm2hkqss4pr186pp7k6f5jnjgw7vrkgjy4yzvb34729q6kvrikn4xgq9gfdg7xsgajd"; }; }; "http-proxy-agent-1.0.0" = { @@ -13068,7 +12541,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz"; - sha512 = "qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg=="; + sha512 = "21cixh55jg0m41bhn1xh9pydf31jq4ip5j525hprkimg376jjxms69raxfbsryi0mzhmgw84g1nb3paqznb1l2ajy0zhnkvnl2dn0db"; }; }; "http-proxy-middleware-0.17.4" = { @@ -13176,7 +12649,7 @@ let version = "2.2.1"; src = fetchurl { url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz"; - sha512 = "HPCTS1LW51bcyMYbxUIOO4HEOlQ1/1qRaFWcyxvwaqUS9TY88aoEuHUY33kuAh1YhVVaDQhLZsnPd+XNARWZlQ=="; + sha512 = "2arj581rpjpgky9cr5hh3asan2mh7825rwxy63mp02amw9w6vsi59bay0dwp72md28mmzrmahxc909v1r1ca6y6r3f5dryna95r7w0w"; }; }; "humanize-0.0.9" = { @@ -13203,17 +12676,16 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/humanize-string/-/humanize-string-1.0.2.tgz"; - sha512 = "PH5GBkXqFxw5+4eKaKRIkD23y6vRd/IXSl7IldyJxEXpDH9SEIXRORkBtkGni/ae2P7RVOw6Wxypd2tGXhha1w=="; + sha512 = "3bml62y8rmpga8wbcxfqm6izvc9xxlblx0vc08r778qa42jgw6fjif4i7f9bj2y98bz4xyimg5vfgch92j6i2l7zcwiq5za8l34cziw"; }; }; -<<<<<<< HEAD "hypercore-6.17.1" = { name = "hypercore"; packageName = "hypercore"; version = "6.17.1"; src = fetchurl { url = "https://registry.npmjs.org/hypercore/-/hypercore-6.17.1.tgz"; - sha512 = "fwBwdx3oaUsaKIRI3e1M78GikrH4EmS/lpbOmRlTnELdYUTIHAAt4qg8YtSbB8PtwiPujT9DjSU+VMj8jAQArQ=="; + sha512 = "2nh014czk458gi5im1kz3gf4g1fvhq7kga64g58w8nh07688ihxshlwaccrkklnjszn84pqn69a5hgg9knxsj4450d4nsg83mvp003z"; }; }; "hypercore-crypto-1.0.0" = { @@ -13222,16 +12694,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/hypercore-crypto/-/hypercore-crypto-1.0.0.tgz"; - sha512 = "xFwOnNlOt8L+SovC7dTNchKaNYJb5l8rKZZwpWQnCme1r7CU4Hlhp1RDqPES6b0OpS7DkTo9iU0GltQGkpsjMw=="; -======= - "hypercore-6.16.0" = { - name = "hypercore"; - packageName = "hypercore"; - version = "6.16.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hypercore/-/hypercore-6.16.0.tgz"; - sha512 = "15d7rbcm182fhq2z27vlg7mz3fvs8qjzw6s3vnm7pmvs46pz33qdm2rqs78nr5lw0wkhglyw7h2izj1l4sa3g8khww8syvdqk4mdbdh"; ->>>>>>> nodePackages: meguca: 1.0.7 update + sha512 = "0rj76wj0va9c1jdi4ykm4f35sjhxgg92bqshhsllxhpkq4ln2pvarqa4xjaaw4n54mmzrjvh8srl4kjrpafvhlb9bzc5dsfv6f0wp64"; }; }; "hypercore-protocol-6.6.4" = { @@ -13240,7 +12703,7 @@ let version = "6.6.4"; src = fetchurl { url = "https://registry.npmjs.org/hypercore-protocol/-/hypercore-protocol-6.6.4.tgz"; - sha512 = "9TU7P+uve0e5v1ZiBx70DFhkpepW4iNSGYlZthK+Unm0EbZ+Yppc6clH7JTffPBNUMSnDrE552MfXMilpCHZMw=="; + sha512 = "0rxj8d4lp45q7v3wwwv23m7qi84vw3wvyafqiy9x5f9lqkynq8v8yajpq9bcnc935927qjnxajn8n0cyhg0fqjnpywlfyxgxczkndgm"; }; }; "hyperdrive-9.14.0" = { @@ -13249,11 +12712,7 @@ let version = "9.14.0"; src = fetchurl { url = "https://registry.npmjs.org/hyperdrive/-/hyperdrive-9.14.0.tgz"; -<<<<<<< HEAD - sha512 = "LTgbsJ+9ZrdQfLaXXc01kQMttaicHhSOtUM3v/k7ORwXJziqQ2eMQ80+8Tfg67ja+w6zrdl5HYOK+mnlwQpCww=="; -======= sha512 = "31l42n1wmlzm2l33mwxkbdk1vxxmf7bw0vz2gnd8f66fhxa70kif71r7gwvyds3nn7187lwm2sjs0wi6p6mv5xngi8bfrmxkyq1nf1d"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "hyperdrive-http-4.2.2" = { @@ -13262,7 +12721,7 @@ let version = "4.2.2"; src = fetchurl { url = "https://registry.npmjs.org/hyperdrive-http/-/hyperdrive-http-4.2.2.tgz"; - sha512 = "NgfZGxfQoYIEIuYat+dki/GAWpjmM/X+5YL5faTrX3VgXdGObVOhKEHQISk855T8C+R4aPP8QpF1YR8adUVBNw=="; + sha512 = "0vl2ibm38gn2xci8byg6s3qwh5zr5777hlj3l2152hm6vcfs5fn0xazxfj7vyc2wpzgacz6k1d81wcbckkvf6p6482858fh2wdxj1rn"; }; }; "hyperdrive-network-speed-2.1.0" = { @@ -13271,7 +12730,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/hyperdrive-network-speed/-/hyperdrive-network-speed-2.1.0.tgz"; - sha512 = "JolPS374h6oS1rmz1iebFfeDDvA2nAtiHbx9VJJGMgSDSx4Q77eeY09hDgZwY7KatSKUGWnnSyydSgVUb3+8Lw=="; + sha512 = "0pvqzvgah2lm79c9gknj6cl4asrmck3f030wqagcfgbgvqh3r5q611j8s958zdw3mi0p71ny0787xqmkckxdcxrsq9am1zqgr5lz296"; }; }; "hyperquest-2.1.3" = { @@ -13280,7 +12739,7 @@ let version = "2.1.3"; src = fetchurl { url = "https://registry.npmjs.org/hyperquest/-/hyperquest-2.1.3.tgz"; - sha512 = "fUuDOrB47PqNK/BAMOS13v41UoaqIxqSLHX6CAbOD7OfT+/GCWO1/vPLfTNutOeXrv1ikuaZ3yux+33Z9vh+rw=="; + sha512 = "2ppxy7nv5yzpc9bvycyd4k2znp9grxldqrpvjzkzssn62f6xx7rzcqgrq30iykm5j91l8xahr93bznynpj30h7h5f6zmv3qn0x86jvx"; }; }; "i-0.3.6" = { @@ -13343,7 +12802,7 @@ let version = "0.4.19"; src = fetchurl { url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz"; - sha512 = "oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ=="; + sha512 = "0jj1pdq3j9ak8cixn2kjp7ip8hf3xgnb85j4jr32yf9rry620v9072c0kk577mllfk1zl9wzs5ypwzbp7vbhf7j31d5rrqgwb0nldm1"; }; }; "iconv-lite-0.4.23" = { @@ -13352,7 +12811,7 @@ let version = "0.4.23"; src = fetchurl { url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz"; - sha512 = "neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA=="; + sha512 = "062yxlrx4glr90bxn6jdv83qf03c9appkxdjjz5bhbphsx2yrn0y1i6yn9pfr3hfv2xiwq18hxvrvzfzfa7axv0sbgihskda58r7v4x"; }; }; "iconv-lite-0.4.8" = { @@ -13370,11 +12829,7 @@ let version = "1.1.12"; src = fetchurl { url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.12.tgz"; -<<<<<<< HEAD - sha512 = "GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA=="; -======= sha512 = "0nf551idk1p8slbvd2jvzdh9hkm5z2dpv0b3jh1wgkab3mbi33vimdwiivrymvaqk7ba3by6rg9bn5xsdiqi24cn9vr5yjq6kw8y2qs"; ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 }; }; "ieee754-1.1.8" = { @@ -13401,11 +12856,7 @@ let version = "3.3.10"; src = fetchurl { url = "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz"; -<<<<<<< HEAD - sha512 = "Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug=="; -======= sha512 = "2x7za00gs7ipwcq29bslxcdv7j47m28jx14n9ybs5h2icr4024jn5ppmbs6953g2qb3amhs1gg5x0s48ky3mk7ybi36wchsb7kks2ry"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "ignore-by-default-1.0.1" = { @@ -13423,7 +12874,7 @@ let version = "3.0.1"; src = fetchurl { url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz"; - sha512 = "DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ=="; + sha512 = "2ajgs5klg786rkdxs37mbxn0p8ah2ai0nj0bjv5vbrfir4y0pvrhxxadv46s8g1hqkq5p3fjssys3n6qvz60p4jzjsgfq683lrnad8d"; }; }; "image-size-0.5.5" = { @@ -13459,7 +12910,7 @@ let version = "1.3.0"; src = fetchurl { url = "https://registry.npmjs.org/import-jsx/-/import-jsx-1.3.0.tgz"; - sha512 = "YQ1wdkSZeRhWNvlSyQGvn8d34tIChAYb/USZv08tHATBWOyfXIU7u2R/YieyCRZIVNUxB5G9Bq+aiyrep/zejQ=="; + sha512 = "26xxz57vqm8p6mg0syr21risma4h5h9n8kn4zv4pcxqap4zxicc210w5m7vz6a4zldhd102sbi7giwzmw0wjlpr6rb1hycr8iv703b1"; }; }; "import-lazy-2.1.0" = { @@ -13594,7 +13045,7 @@ let version = "1.3.5"; src = fetchurl { url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz"; - sha512 = "RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="; + sha512 = "1rjbvf1rg5ywhnba08sgagn2qf23lab330qrqmh7d891zap3xpxcyfyj1cblpf0f0rypglcfacybzyrpd4996aa1mbc820awa33k5j5"; }; }; "init-package-json-1.10.3" = { @@ -13603,7 +13054,7 @@ let version = "1.10.3"; src = fetchurl { url = "https://registry.npmjs.org/init-package-json/-/init-package-json-1.10.3.tgz"; - sha512 = "zKSiXKhQveNteyhcj1CoOP8tqp1QuxPIPBl8Bid99DGLFqA1p87M6lNgfjJHSBoWJJlidGOv5rWjyYKEB3g2Jw=="; + sha512 = "0kkcy07hj1ck8xmwspn6x32k4j1c6j88wr7wq2kxb6cx9rml0b8ncglglkhcz0r7k417fshknm2vzrqm188yp18gdny7gahm1fa596c"; }; }; "ink-0.3.1" = { @@ -13612,7 +13063,7 @@ let version = "0.3.1"; src = fetchurl { url = "https://registry.npmjs.org/ink/-/ink-0.3.1.tgz"; - sha512 = "e3JOOBLE6cDO2aWWkIYXXT7qhb9HN4mBHSiOj2Hv94VAMDiDb0J50koYtxY0tZBq9N117QENGoURmL+tunxQJw=="; + sha512 = "0km0z5smnzrh4c5386h3vbmvps6m45m6hbbf62as9wl4vw370q411gpxxhqz3i83n0qjds7py2ylgjx2y3915m5v77c1sf428w4wwkv"; }; }; "ink-text-input-1.1.1" = { @@ -13621,7 +13072,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/ink-text-input/-/ink-text-input-1.1.1.tgz"; - sha512 = "bOblvdmbXFC/UYbBj0WsKGkVhQaiZXK8A/O0e7/eh8HVr0DAbuZgQKatPzZ2ySsrpmcaMUGSVPbeuJOPO53X/g=="; + sha512 = "3zdg79viy9vippnaj942c8scyk2nay9fqv3zbd681hfcvn082pxbhc7vszppd7k0fy74rd20s2ias98mi2qzhc6a6zm0p4vv6yybrkc"; }; }; "inline-source-map-0.6.2" = { @@ -13639,7 +13090,7 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/innertext/-/innertext-1.0.3.tgz"; - sha512 = "ZC410b7IbrTrmt8bQb27xUOJgXkJu+XL6MVncb9FGyxjRIHyQqNjpSDY20zvSUttkAiYj0dait/67/sXyWvwYg=="; + sha512 = "1ig0sy92zxyzynzi9d4g3wq1286sjs9xx6dpn10lmis6hpjh5266b0v8nzp2ry5x35ybfq9g60qjhy5pfyl26yzkbmv8vn8pv8kabk4"; }; }; "inquirer-0.10.1" = { @@ -13684,7 +13135,7 @@ let version = "3.3.0"; src = fetchurl { url = "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz"; - sha512 = "h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ=="; + sha512 = "1wsmzzva3rfjb4bfks7ba2nvha9ziwgq2kag6xxibc5cc6mz19xbgj4fm3a7ghvfbfx4am0x13ibc8j2s5m3sv12nph44rq56gnvv47"; }; }; "inquirer-5.2.0" = { @@ -13693,7 +13144,7 @@ let version = "5.2.0"; src = fetchurl { url = "https://registry.npmjs.org/inquirer/-/inquirer-5.2.0.tgz"; - sha512 = "E9BmnJbAKLPGonz0HeWHtbKf+EeSP93paWO3ZYoUpq/aowXvYGjjCSuashhXPpzbArIjBbji39THkxTz9ZeEUQ=="; + sha512 = "18q95zmyca97iylvzibh193n81dp71yawcb56ib17inhq7g0nixmbx62j56bdv3d7lxsgwj8zw9zcmmhzjivx3wlb3b6a60jsf6dl0k"; }; }; "inquirer-6.0.0" = { @@ -13702,7 +13153,7 @@ let version = "6.0.0"; src = fetchurl { url = "https://registry.npmjs.org/inquirer/-/inquirer-6.0.0.tgz"; - sha512 = "tISQWRwtcAgrz+SHPhTH7d3e73k31gsOy6i1csonLc0u1dVK/wYvuOnFeiWqC5OXFIYbmrIFInef31wbT8MEJg=="; + sha512 = "0k09hsg3dfdz7vp482v56hvhqa9g4qbm8jpmig9p0phdzsaspajxk9d4z575dd8rc70pmipg7pxxpgdqwa3x1z4rwmhhw1d3icr115l"; }; }; "insert-module-globals-7.2.0" = { @@ -13711,8 +13162,7 @@ let version = "7.2.0"; src = fetchurl { url = "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.2.0.tgz"; -<<<<<<< HEAD - sha512 = "VE6NlW+WGn2/AeOMd496AHFYmE7eLKkUY6Ty31k4og5vmA3Fjuwe9v6ifH6Xx/Hz27QvdoMoviw1/pqWRB09Sw=="; + sha512 = "15ks7a4jsdgwd9cpql86xignkdz7wf7jxz7r8pyyqgfr3n51nc6y3m271cxzwm4ccaajb6y9sc5hw80ga7pg37306zps6lndyaqskjl"; }; }; "insight-0.10.1" = { @@ -13721,10 +13171,7 @@ let version = "0.10.1"; src = fetchurl { url = "https://registry.npmjs.org/insight/-/insight-0.10.1.tgz"; - sha512 = "kLGeYQkh18f8KuC68QKdi0iwUcIaayJVB/STpX7x452/7pAUm1yfG4giJwcxbrTh0zNYtc8kBR+6maLMOzglOQ=="; -======= - sha512 = "15ks7a4jsdgwd9cpql86xignkdz7wf7jxz7r8pyyqgfr3n51nc6y3m271cxzwm4ccaajb6y9sc5hw80ga7pg37306zps6lndyaqskjl"; ->>>>>>> nodePackages: meguca: 1.0.7 update + sha512 = "0wjaf1vrji9kfhz0ljczdaq6g9y3d3f643jf8l83fgmr6qlj3pbz7g3y5zab4zl0xaj4sqsq98v0j4bkl1g3fp05bycgmr115hrxcch"; }; }; "insight-0.8.4" = { @@ -13742,7 +13189,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/inspect-custom-symbol/-/inspect-custom-symbol-1.1.0.tgz"; - sha512 = "vtI2YXBRZBkU6DlfHfd0GtZENfiEiTacAXUd0ZY6HA+X7aPznpFfPmzSC+tHKXAkz9KDSdI4AYfwAMXR5t+isg=="; + sha512 = "2ra5pz6s72h1w4704wd4jc3sb7j8w198zmhplkc7rgr37pklgnrf3qw7abd27bm06f3d2c4z0sl9mhsfkvisprrx0a1jr2if1hkdlmy"; }; }; "int64-buffer-0.1.10" = { @@ -13796,7 +13243,7 @@ let version = "2.2.4"; src = fetchurl { url = "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz"; - sha512 = "phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA=="; + sha512 = "0sa0bflh46zr7zqdifqk3a48bmqlmpikrnmwvgz8nx6979piw2m92qrn1g5xnpjzxn864y2jq3gl84jkws2dad3mlwr6s3fa10my4m6"; }; }; "invert-kv-1.0.0" = { @@ -13904,7 +13351,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz"; - sha512 = "dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA=="; + sha512 = "02g5p9wfcx3f1p0zq01ycrx5biwg79qg1mdw1cv6li7kxpny5hxsp34ynam7w2g6nvah73f0kzdkh6pxxmx1ymd8m02fwvgz6lsirbl"; }; }; "is-accessor-descriptor-0.1.6" = { @@ -13922,7 +13369,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz"; - sha512 = "m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ=="; + sha512 = "1qllik6fjwfq17ic0fxwqyll8mrhmcm36xfsq45xc57mq9ah4i4nn4f8fvgb0gx4kpl3jlpkzndp0xlmmf2mh0xmggw6mhw74fng64v"; }; }; "is-alphabetical-1.0.2" = { @@ -13931,7 +13378,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.2.tgz"; - sha512 = "V0xN4BYezDHcBSKb1QHUFMlR4as/XEuCZBzMJUU4n7+Cbt33SmUnSol+pnXFvLxSHNq2CemUXNdaXV6Flg7+xg=="; + sha512 = "33gw3lnhmg5snnpbjafj2dnv8f55g5wqmssczl998knajppvmp85gwz712jbk0wcj14np1zmghm3j8lsh0xb6r20pf33k0y2vh4sk2p"; }; }; "is-alphanumerical-1.0.2" = { @@ -13940,7 +13387,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.2.tgz"; - sha512 = "pyfU/0kHdISIgslFfZN9nfY1Gk3MquQgUm1mJTjdkEPpkAKNWuBTSqFwewOpR7N351VkErCiyV71zX7mlQQqsg=="; + sha512 = "2r2l14mwrzcvxayr6ib04k4apkpgcs7m41pnw51999y0nld0a8fjhwhvlw2arkda8hf9anc9ld3bxlxgn9psif9ha488x0797zx89x7"; }; }; "is-arguments-1.0.2" = { @@ -13967,11 +13414,7 @@ let version = "0.3.2"; src = fetchurl { url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz"; -<<<<<<< HEAD - sha512 = "eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="; -======= sha512 = "1cmy0k81vgz5z55rdyxfnx307053ksyp1lfgyj5jldkqqzmkx1z2k63fvzn7lgj8wdakmsa1mw408rm5xxfpk3avjqbnrb5yl56lm3r"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "is-ascii-1.0.0" = { @@ -13998,7 +13441,7 @@ let version = "1.1.6"; src = fetchurl { url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz"; - sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="; + sha512 = "3kr8dm9qyklmm2xyiz75s8db90bfilfals4x0g276kncihrrrz0ar4y6dqpvc7pwy7h43jay1bayi1r62x97nzvcswkk4ap18pl1irm"; }; }; "is-builtin-module-1.0.0" = { @@ -14025,7 +13468,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/is-ci/-/is-ci-1.1.0.tgz"; - sha512 = "c7TnwxLePuqIlxHgr7xtxzycJPegNHFuIrBkwbf8hc58//+Op1CqFkyS+xnIMkwn9UsJIwc174BIjkyBmSpjKg=="; + sha512 = "0m66alrh568wj40xwshf8q99gsjfk1jr0czp4jc2sm519wfzzzprkl5zjvw2r5h49p72d50ywj9qg67dnyazq0ijy4flgny2b1ygd3k"; }; }; "is-data-descriptor-0.1.4" = { @@ -14043,7 +13486,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz"; - sha512 = "jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ=="; + sha512 = "0ny6kxc752fg3z6fmj8a7fw2lai2y17d9fx0028nvyv1qj0sa30rfryhv9xd7b7is1yfs0val6amsy2b22rh589il10md36a75mgd4d"; }; }; "is-date-object-1.0.1" = { @@ -14061,7 +13504,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.2.tgz"; - sha512 = "TRzl7mOCchnhchN+f3ICUCzYvL9ul7R+TYOsZ8xia++knyZAJfv/uA1FvQXsAnYIl1T3B2X5E/J7Wb1QXiIBXg=="; + sha512 = "1g028jya2ymjyzj2gwna1zpajbhhxh2xh2vsi8dp3zzn9a04sgs9vvbcb66gb439mzb95vfpyydhb2h09r7yzhkfbhijwl2cgpfa72d"; }; }; "is-descriptor-0.1.6" = { @@ -14070,7 +13513,7 @@ let version = "0.1.6"; src = fetchurl { url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz"; - sha512 = "avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg=="; + sha512 = "0gbflcxmd30gzj91y19fylsfalirl6qg71sxjximc8lc2vxkg5h9scnahvxsczymchlx742i8ai489843ys431vyw73rp418jpxiw3a"; }; }; "is-descriptor-1.0.2" = { @@ -14079,7 +13522,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz"; - sha512 = "2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg=="; + sha512 = "2v1a9mn2rzz52v8vs3i7njk9pv95fh971yc81xr0zkaw3dff4gbv1zv048xyjysfgwpajbyryk2px8hinwwh0wagblmw6chdbjsrs6r"; }; }; "is-docker-1.1.0" = { @@ -14133,7 +13576,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz"; - sha512 = "arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA=="; + sha512 = "0w73qlx9ynmv2iznw1kll86yd04z4rsz3788nzgh7amcnpsbyxbrs734im9dibqgps6pjyz61s8kp4lcsbjsdfrlc51m1pm2hrxgfba"; }; }; "is-extglob-1.0.0" = { @@ -14232,7 +13675,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.2.tgz"; - sha512 = "but/G3sapV3MNyqiDBLrOi4x8uCIw0RY3o/Vb5GT0sMFHrVV7731wFSVy41T5FO1og7G0gXLJh0MkgPRouko/A=="; + sha512 = "3y2isd2s41r430x4v5hbln61sibalz4af6wp5alq3svvvsmnlg0bhyjjf8nzmcgvrc49hw8w3r32bisxc90r8ia6z65v98sgcdpzsvf"; }; }; "is-installed-globally-0.1.0" = { @@ -14250,7 +13693,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/is-mergeable-object/-/is-mergeable-object-1.1.0.tgz"; - sha512 = "JfyDDwUdtS4yHCgUpxOyKB9dnfZ0gecufxB0eytX6BmSXSE+8dbxDGt+V7CNRIRJ9sYFV/WQt2KJG6hNob2sBw=="; + sha512 = "03srgd19nl1p2b2ny8gamq5qvv4k124inq5fzkb1kqxdw9y45fr46g8awmpnx0hgwpfg0blysfms7r8n89sf5183hr2xd8x0l7q7z15"; }; }; "is-my-ip-valid-1.0.0" = { @@ -14259,7 +13702,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz"; - sha512 = "gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ=="; + sha512 = "1lnwwykigbkg3yqmr61cyiplxfdvpchcsi1fz67jwn55gvdrl597jpsd6jds205gjkn8c3zxbqmppmf3danpj0rrla7ffnicmwpys42"; }; }; "is-my-json-valid-2.17.2" = { @@ -14268,7 +13711,7 @@ let version = "2.17.2"; src = fetchurl { url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.17.2.tgz"; - sha512 = "IBhBslgngMQN8DDSppmgDv7RNrlFotuuDsKcrCP3+HbFaVivIBU7u9oiiErw8sH4ynx3+gOGQ3q2otkgiSi6kg=="; + sha512 = "29bla4943cs5dks8f307ykpgk5gihgjy158h8nspcxia85gb1lwaxpqywisr7621spdp8j5p4vd3zhfl2csdlihy06w9017b2r42610"; }; }; "is-natural-number-4.0.1" = { @@ -14331,7 +13774,7 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz"; - sha512 = "rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ=="; + sha512 = "20ybhnkgsrcwv730ch8qvzayjwcvs83jk2w6iim7wv3h2nn4jz8hsldn0k6ggx4xgcypwirqjb5xdacsswsk06w2nk56zr509q2aadd"; }; }; "is-obj-1.0.1" = { @@ -14358,7 +13801,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/is-options/-/is-options-1.0.1.tgz"; - sha512 = "2Xj8sA0zDrAcaoWfBiNmc6VPWAgKDpim0T3J9Djq7vbm1UjwbUWzeuLu/FwC46g3cBbAn0E5R0xwVtOobM6Xxg=="; + sha512 = "339gkkcm39mcw2c8wwl37y02rq3ga7309fgrvp2garlavgh93aydxpfx8wg9j9xs6k9h3ha11c4z9bkcqihd7w5d8fb03ik1nqgqy6r"; }; }; "is-path-cwd-1.0.0" = { @@ -14376,7 +13819,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz"; - sha512 = "FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ=="; + sha512 = "1lrmbdvciajn2smq4j80qvp3gpkkzqddiyay3xgbzni3gi4vljkawyyw68i6h8m1jfdg4jy8l8c16rlfvr17pnfb314xw5q6m2pad8n"; }; }; "is-path-inside-1.0.1" = { @@ -14403,7 +13846,7 @@ let version = "2.0.4"; src = fetchurl { url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz"; - sha512 = "h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og=="; + sha512 = "0xgsjz9m3kg5pm36lcchblxk53qay59ya7wi5jgdmz0dsl5b0j2j7wcd48yyfaip1m70mj9aqf8kib02fn62k0hy0vxg2hng60yk4w7"; }; }; "is-posix-bracket-0.1.1" = { @@ -14502,7 +13945,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz"; - sha512 = "Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA=="; + sha512 = "0c1pd4414iy40xq652p1zgqgmncmm7xcns96pfazd63v439vyc1z93bvzvbw5r2qc4fp24414ydnj4gdsqlq223pfg05ar2mmwd23rb"; }; }; "is-resolvable-1.1.0" = { @@ -14511,7 +13954,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz"; - sha512 = "qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg=="; + sha512 = "0r8v3dkj5qbfh2wlj4w1msyqsw6j5myvxi88wkw36isscb97yyc2yc1pwm64djrmh1css6jp9p08cx1zb479fg4gv26prciaifdh05a"; }; }; "is-retry-allowed-1.1.0" = { @@ -14574,7 +14017,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/is-supported-regexp-flag/-/is-supported-regexp-flag-1.0.1.tgz"; - sha512 = "3vcJecUUrpgCqc/ca0aWeNu64UGgxcvO60K/Fkr1N6RSvfGCTU60UKN68JDmKokgba0rFFJs12EnzOQa14ubKQ=="; + sha512 = "0lrp2yp3bjcq9v1sxn5451bmmnj129aws8g0ym3a2s4wkc2y6ym591pym51dgs2xg7cpid087hvmnvqjr36pp6gm419ibhlqmwhkxyy"; }; }; "is-symbol-1.0.1" = { @@ -14619,7 +14062,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz"; - sha512 = "mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ=="; + sha512 = "2asak63h3kc1vackrpai7qfiv15ndr231w1yc753m1dy7fd6ywxsr0rvh88b9ppyxhmc373fqk89a0pw3dllv7m5nbbbcqzvmaskccs"; }; }; "is-url-1.2.4" = { @@ -14628,7 +14071,7 @@ let version = "1.2.4"; src = fetchurl { url = "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz"; - sha512 = "ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww=="; + sha512 = "31qfylxnpb1y8vczgi2nh57ayl7s5ppn8iskp21607l6ka7jxq409pf2mvspwnx6pj29b63ldayjgljsbhyc442gfc1i185dy5ccfr1"; }; }; "is-utf8-0.2.1" = { @@ -14664,7 +14107,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz"; - sha512 = "eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="; + sha512 = "0h9a8zw2ddl25yryp7i376iqjdvlsx4gw93sxy4067dw2yi98m3krfwd9xgi9q5w0idw9rqnyhhncr38xsppyi5izkb7ngai58bawkr"; }; }; "is-wsl-1.1.0" = { @@ -14709,7 +14152,7 @@ let version = "2.0.4"; src = fetchurl { url = "https://registry.npmjs.org/isarray/-/isarray-2.0.4.tgz"; - sha512 = "GMxXOiUirWg1xTKRipM0Ek07rX+ubx4nNVElTJdNLYmNO/2YrDkgJGw9CljXn+r4EWiDQg/8lsRdHyg2PJuUaA=="; + sha512 = "1l996rw6ql1ypf4jvy0yhl3d08zislzsxc0lgbc4hh3kb4qzlxqv29d9nblq9ai6lkiwvxfgynknk8j6j9qm49jqlsnib924lx5gk0q"; }; }; "isbinaryfile-3.0.2" = { @@ -14772,7 +14215,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz"; - sha512 = "1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w=="; + sha512 = "3vs53bpdrwiwwcql2xs20jmd8qha27k4iypdhr0b3isgdaj18vz80nhxwvvqxk6y3x5vj3slchxl0r91gjhz487xmkkp52gridg5zyl"; }; }; "iterare-0.0.8" = { @@ -14871,7 +14314,7 @@ let version = "3.3.1"; src = fetchurl { url = "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz"; - sha512 = "Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg=="; + sha512 = "0d5v4s4626l13llvp6hq5wlghysf7lmfxpp0x0ymvcrvikz2xmyrag81wxndb9fy48mx61gcdlbmdwln78s43givdwpmrk9dir5vfai"; }; }; "jquery-ui-bundle-1.12.1" = { @@ -14934,7 +14377,7 @@ let version = "3.10.0"; src = fetchurl { url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz"; - sha512 = "O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA=="; + sha512 = "0h26sq1bwxc45bm0hvlcadrbk4bizzaw729wvw690ya7mpys45bqfzdqwhjkdrnq0i44dzxckykz4bix22jfdyfg1asybg3yzczjsrv"; }; }; "js-yaml-3.11.0" = { @@ -14943,7 +14386,7 @@ let version = "3.11.0"; src = fetchurl { url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.11.0.tgz"; - sha512 = "saJstZWv7oNeOyBh3+Dx1qWzhW0+e6/8eDzo7p5rDFqxntSztloLtuKu+Ejhtq82jsilwOIZYsCz+lIjthg1Hw=="; + sha512 = "0gka65n4d9gmcy0c8cy5h55r273dbxnw54gibp2nq5mmdmksjgb2nhcdfgfxs1wg3yayyrydn2v79fny7hdyq907dg87vmgjnsnr8mi"; }; }; "js-yaml-3.12.0" = { @@ -14952,7 +14395,7 @@ let version = "3.12.0"; src = fetchurl { url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz"; - sha512 = "PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A=="; + sha512 = "3f8k2gvi3gnj9gpr3dnm5n5vpy2w68pshqk4hajlsmkb37ky30cnqza82l8sq153zx1nk67gizcm1ngmvlajw53hkwg4g96gir7d2rw"; }; }; "js2xmlparser-1.0.0" = { @@ -15042,7 +14485,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz"; - sha512 = "mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="; + sha512 = "2pv1kaf7gjr0bhr2djaf1i88li7q3v5daz4zm4hz57i4h21jgryihxb5c2h0p0q1vrq1ffyg279hp0vjrg73shvxr5lir6plxjb5fls"; }; }; "json-parse-helpfulerror-1.0.3" = { @@ -15105,11 +14548,7 @@ let version = "0.4.1"; src = fetchurl { url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; -<<<<<<< HEAD - sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; -======= sha512 = "1bbgxs4777gn3q3yxi0n792cgz9pimf85pypr0w4wzpb22nr8fl9xi98pkcqd3n4fn7lnzffpq7qwpcl4dqc15py19lwqa2jwgw5dn5"; ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 }; }; "json-stable-stringify-0.0.1" = { @@ -15199,7 +14638,7 @@ let version = "1.5.4"; src = fetchurl { url = "https://registry.npmjs.org/jsonata/-/jsonata-1.5.4.tgz"; - sha512 = "F/p92UWYUn+kD3SE898jjlz1mkBzjtok9ZTtWT6+axS4Z2Wtc8p/md6xHkyCGWPdIEJBTSw0mlvKE+s+fAVSjg=="; + sha512 = "27541bw7vmi7jjvk8s2qka188hdsqqrh961xcfyk5zwlwxdcmkvh53bpqz5kvclyljdm3kk82dgap4f4ggz713l1yj7yllq8pcpvyhp"; }; }; "jsonfile-1.0.1" = { @@ -15316,7 +14755,7 @@ let version = "8.2.1"; src = fetchurl { url = "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.2.1.tgz"; - sha512 = "l8rUBr0fqYYwPc8/ZGrue7GiW7vWdZtZqelxo4Sd5lMvuEeCK8/wS54sEo6tJhdZ6hqfutsj6COgC0d1XdbHGw=="; + sha512 = "0dwgmjxfm3hp813x0ixpflz3bm5j5r6mn714b4y9gqcyaw28yw2ylz6kn2a6wg9m5crnxfnpdds5cbvxrm68gyg7lq8da8zpl3d9jlp"; }; }; "jspm-config-0.3.4" = { @@ -15415,7 +14854,7 @@ let version = "1.1.6"; src = fetchurl { url = "https://registry.npmjs.org/jwa/-/jwa-1.1.6.tgz"; - sha512 = "tBO/cf++BUsJkYql/kBbJroKOgHWEigTKBAjjBEmrMGYd1QMBC74Hr4Wo2zCZw6ZrVhlJPvoMrkcOnlWR/DJfw=="; + sha512 = "1zwkw27arwkl75r6blgn935b2nrj3k7q9na65my3vw2w10caivrihdc4q8qq8qh509jh4nn04x0mfi6bd0gx9caj44ln1dyzxqvy4xl"; }; }; "jws-3.1.5" = { @@ -15424,7 +14863,7 @@ let version = "3.1.5"; src = fetchurl { url = "https://registry.npmjs.org/jws/-/jws-3.1.5.tgz"; - sha512 = "GsCSexFADNQUr8T5HPJvayTjvPIfoyJPtLQBwn5a4WZQchcrPMPMAWcC1AzJVRDKyD6ZPROPAxgv6rfHViO4uQ=="; + sha512 = "2wvh8snqyvylbqq0f7i6gcr7v4cl42mr46d80k7076c6g1b2xr50rp1b9zc40dlni7j58qzyayf693bdzr1ryf4mwad832025xr5h0s"; }; }; "jwt-decode-2.2.0" = { @@ -15460,7 +14899,7 @@ let version = "3.3.1"; src = fetchurl { url = "https://registry.npmjs.org/k-bucket/-/k-bucket-3.3.1.tgz"; - sha512 = "kgwWqYT79rAahn4maIVTP8dIe+m1KulufWW+f1bB9DlZrRFiGpZ4iJOg2HUp4xJYBWONP3+rOPIWF/RXABU6mw=="; + sha512 = "2dkl580azs1f5pj72mpygwdcc2mh4p355sxi84ki1w9c6k226nmjfglq5b7zgk5gmpfjammx5xliirzaf2nh9kyhqdb1xpvhjlic34j"; }; }; "k-bucket-4.0.1" = { @@ -15469,7 +14908,7 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/k-bucket/-/k-bucket-4.0.1.tgz"; - sha512 = "YvDpmY3waI999h1zZoW1rJ04fZrgZ+5PAlVmvwDHT6YO/Q1AOhdel07xsKy9eAvJjQ9xZV1wz3rXKqEfaWvlcQ=="; + sha512 = "1qyasv93yhjmmvsrxq5srbi1y6wj2vqpnnb1wafjxg1ffj01pyhx9jgqw0byrjm097ywrz0k9yki7dcnn2ncwqxyryqys7hincykw32"; }; }; "k-rpc-3.7.0" = { @@ -15487,7 +14926,7 @@ let version = "4.3.1"; src = fetchurl { url = "https://registry.npmjs.org/k-rpc/-/k-rpc-4.3.1.tgz"; - sha512 = "mgAJZeFYbpP0xzJzmS0TQTYoFI0sjy3GnKFhg8wyboL+KvWg2WLaA2Oy9PthLPx2Rxz4WeBMk4y3MSOrDJ95FA=="; + sha512 = "0a7k7qcmcik3dwcjd6f0ngq3i3pdz1cc7xz9ck30gd65nd0ylmgx0kf6b686qd1kk32v3rcila2hdj12cnrjwrjqzs96vjqw5jhj04s"; }; }; "k-rpc-5.0.0" = { @@ -15496,7 +14935,7 @@ let version = "5.0.0"; src = fetchurl { url = "https://registry.npmjs.org/k-rpc/-/k-rpc-5.0.0.tgz"; - sha512 = "vCH2rQdfMOS+MlUuTSuar1pS2EMrltURf9LmAR9xR6Jik0XPlMX3vEixgqMn17wKmFVCublJqSJ4hJIP7oKZ3Q=="; + sha512 = "3frk0pf1y988y12m54vkfa2anc0mg6p4yiq5ca8pkvwb56g8n9n58j7f4gh3rnjgw8xb5ib8gc54nmgk8mlsbjm6azf8c2z0ynzc8dw"; }; }; "k-rpc-socket-1.8.0" = { @@ -15505,7 +14944,7 @@ let version = "1.8.0"; src = fetchurl { url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.8.0.tgz"; - sha512 = "f/9TynsO8YYjZ6JjNNtSSH7CJcIHcio1buy3zqByGxb/GX8AWLdL6FZEWTrN8V3/J7W4/E0ZTQQ+Jt2rVq7ELg=="; + sha512 = "0pc9bjnmgfjcgh49lclvz5qnlkzypgirlx5ji2nx15vfn00gwczy5hvfahcxdzcdqsjlwh7q8jw4zj8abdk8qx2cwiqdw8fgg557zvz"; }; }; "kad-fs-0.0.4" = { @@ -15551,7 +14990,7 @@ let version = "0.1.5"; src = fetchurl { url = "https://registry.npmjs.org/keen.io/-/keen.io-0.1.5.tgz"; - sha512 = "THuLqGgrsqRiszyq7Mkasf4uKCtpIXjoptQJZQcvQ6WutSjf17ndJ/eHZCi7IbvulNq5NwJWBH1earF0duIzDw=="; + sha512 = "07k7qknfjqnlpkx0ib04dxrvaafxfr1pcl691zp4zfvkmyz52ssx9a35w3na2fllvl7h8b95cl2xzmi3b4yraiwndia9cibd2l8nysc"; }; }; "keep-alive-agent-0.0.1" = { @@ -15614,7 +15053,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/keyv/-/keyv-3.0.0.tgz"; - sha512 = "eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA=="; + sha512 = "32ga97c763vprf4sjbb2f7gbngfppq9n1hy4cpq2h4yb1msrhh2zjimxib7p09mzgynm6askbigxlsqsm11p644avp4sf5nmng8f2vs"; }; }; "kind-of-1.1.0" = { @@ -15659,7 +15098,7 @@ let version = "5.1.0"; src = fetchurl { url = "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz"; - sha512 = "NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="; + sha512 = "0zk87sccrjx6pgf9n74v4msnqwq5siyhrkpaklx7yk85ygy5ypcgmyfhbd5mmcyd53x8zcw0gzvp9bhbglziqbhp7a6n5zsf6p08q9l"; }; }; "kind-of-6.0.2" = { @@ -15668,7 +15107,7 @@ let version = "6.0.2"; src = fetchurl { url = "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz"; - sha512 = "s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="; + sha512 = "2l91vcracq8y3nxacsssb4yhk0ww011gi5sn55wsb6bpnhyds2i1x98512f61r8awxmj602bxky6c7hsyibjvz17f1pmlf7r4whp6dk"; }; }; "klaw-1.3.1" = { @@ -15695,7 +15134,7 @@ let version = "3.5.0-rc"; src = fetchurl { url = "https://registry.npmjs.org/knockout/-/knockout-3.5.0-rc.tgz"; - sha512 = "eROh551BD9dDQ2ItCF60IPcZZXP46WiEcFCU6pVlekeQ6mv3L+in4u8BIIUDp1h0OtL7IXLwvwEY8HkG/BPtrQ=="; + sha512 = "2nys4zw0rwz0601pzq748gvs8x78n570f2j00ggwakyhbzpdgm90ivscnaym52hf226isgqfdjikxr0nig0hbb28d1xf3s1kpks24vr"; }; }; "kuduscript-1.0.16" = { @@ -15704,7 +15143,7 @@ let version = "1.0.16"; src = fetchurl { url = "https://registry.npmjs.org/kuduscript/-/kuduscript-1.0.16.tgz"; - sha512 = "++ulra2RtdutmJhZZFohhF+kbccz2XdFTf23857x8X1M9Jfm54ZKY4kXPJKgPdMz6eTH1MBXWXh17RvGWxLNrw=="; + sha512 = "2pws4jvqqdysxbqb5bw1m67wklk7lrxl293q5w9cd58drz6jzs4qzgiy6gg7dzx9m2pgn9kqxns8pw445d68ncqk2nxpdcimnnsbszv"; }; }; "labeled-stream-splicer-2.0.1" = { @@ -15713,7 +15152,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.1.tgz"; - sha512 = "MC94mHZRvJ3LfykJlTUipBqenZz1pacOZEMhhQ8dMGcDHs0SBE5GbsavUXV7YtP3icBW17W0Zy1I0lfASmo9Pg=="; + sha512 = "0z3ssjaq1bx4j1dcysbbmsnq24zglv2gdsm3by6dr34w10jrlg06rrh3l7qa8a3ch7ag9gmkjfrw6m448sra299gz5rvg2ifsc7hbrh"; }; }; "last-one-wins-1.0.4" = { @@ -15830,7 +15269,7 @@ let version = "2.7.3"; src = fetchurl { url = "https://registry.npmjs.org/less/-/less-2.7.3.tgz"; - sha512 = "KPdIJKWcEAb02TuJtaLrhue0krtRLoRoo7x6BNJIBelO00t/CCdJQUnHW5V34OnHMWzIktSalJxRO+FvytQlCQ=="; + sha512 = "04jbm6adzhknlcwjjdd94n8dhqwgsg0fyampis9854jf23z9g9lxs8593908ymwldl88bjipf9b9rw6xfibb29vv7s0c44wllj4ixr8"; }; }; "less-middleware-2.2.1" = { @@ -15839,7 +15278,7 @@ let version = "2.2.1"; src = fetchurl { url = "https://registry.npmjs.org/less-middleware/-/less-middleware-2.2.1.tgz"; - sha512 = "1fDsyifwRGObMmqaZhkTDAmVnvgpZmdf6ZTSCbVv9vt+xhlzOz5TDNlLCbITsusEB3d0OKOEadwN9ic3PyOWCg=="; + sha512 = "059c8rz6wkzc3fwd62a6f3lfw3h9sxj2fr0jjyr1i9kwfvk3737xyzndyshklllx5gnfri9z2g9a28c2ccnd6ka6adn6i7h4z5frw6m"; }; }; "level-0.18.0" = { @@ -15866,7 +15305,7 @@ let version = "1.0.7"; src = fetchurl { url = "https://registry.npmjs.org/level-post/-/level-post-1.0.7.tgz"; - sha512 = "PWYqG4Q00asOrLhX7BejSajByB4EmG2GaKHfj3h5UmmZ2duciXLPGYWIjBzLECFWUGOZWlm5B20h/n3Gs3HKew=="; + sha512 = "1xwlwdkqryzw8bd0ywmjnlrcd85c88hrcf8r245377p52cwvgcrjsajg5w8zpx1d236v6043v4c3a29lcbyqmxqmh7apl9lhhdjlrix"; }; }; "level-sublevel-6.6.2" = { @@ -15875,7 +15314,7 @@ let version = "6.6.2"; src = fetchurl { url = "https://registry.npmjs.org/level-sublevel/-/level-sublevel-6.6.2.tgz"; - sha512 = "+hptqmFYPKFju9QG4F6scvx3ZXkhrSmmhYui+hPzRn/jiC3DJ6VNZRKsIhGMpeajVBWfRV7XiysUThrJ/7PgXQ=="; + sha512 = "1fy1czzr4d4w51bigbmwicz2maa7rm5ih8j5b0jcm6sa9y35n4f6zs6yc9zm8lbhnk2kb91g5jpgz3jmigf01nlpdis2g2qc6m6s6ps"; }; }; "leveldown-0.10.6" = { @@ -16037,7 +15476,7 @@ let version = "2.3.0"; src = fetchurl { url = "https://registry.npmjs.org/livereload-js/-/livereload-js-2.3.0.tgz"; - sha512 = "j1R0/FeGa64Y+NmqfZhyoVRzcFlOZ8sNlKzHjh4VvLULFACZhn68XrX5DFg2FhMvSMJmROuFxRSa560ECWKBMg=="; + sha512 = "0r82qh90jnyg6hlqn2yni36q942y4qn6rc0rydmbsy7x1lr00a0pddw2lg8xixcjh6wnrsfb5q76m51fac7vanrz0cawsw6azy78m4g"; }; }; "load-ip-set-1.3.1" = { @@ -16109,7 +15548,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz"; - sha512 = "7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A=="; + sha512 = "3jbllbkvv54d6k6zss6spzsknz5icscyfclf377jjpndb8mmacq0v9vjr1w07zjn14gaz4d2hfi0yaqk4nvg6hbm16qi70nrkivn0zc"; }; }; "lockfile-1.0.4" = { @@ -16118,7 +15557,7 @@ let version = "1.0.4"; src = fetchurl { url = "https://registry.npmjs.org/lockfile/-/lockfile-1.0.4.tgz"; - sha512 = "cvbTwETRfsFh4nHsL1eGWapU1XFi5Ot9E85sWAwia7Y7EgB7vfqcZhTKZ+l7hCGxSPoushMv5GKhT5PdLv03WA=="; + sha512 = "1c3gz9fvn9lz8b2whpi7cifz94b28c4gglngjhlcsfgmgbv0093pdkb4865hv6f2dyypr32f7am9ajrhrbjzv3iw9hw2zni8k0d7xkj"; }; }; "locks-0.2.2" = { @@ -16208,7 +15647,7 @@ let version = "4.17.10"; src = fetchurl { url = "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz"; - sha512 = "UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg=="; + sha512 = "1ba5b80jjzwrh9fbdk5ywv8sic0dynij21wgrfxsfjzwvwd7x1n6azdhdc0vjdxqmcpm0mhshd1k7n2ascxpz00z3p8a3k97mwg1s2i"; }; }; "lodash-4.17.5" = { @@ -16217,7 +15656,7 @@ let version = "4.17.5"; src = fetchurl { url = "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz"; - sha512 = "svL3uiZf1RwhH+cWrfZn3A4+U58wbP0tGVTLQPbjplZxZ8ROD9VLuNgsRniTlLe7OlSqR79RUehXgpBW/s0IQw=="; + sha512 = "11hikgyas884mz8a58vyixaahxbpdwljdw4cb6qp15xa3sfqikp2mm6wgv41jsl34nzsv1hkx9kw3nwczvas5p73whirmaz4sxggwmj"; }; }; "lodash-4.2.1" = { @@ -16658,7 +16097,7 @@ let version = "4.6.1"; src = fetchurl { url = "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.1.tgz"; - sha512 = "AOYza4+Hf5z1/0Hztxpm2/xiPZgi/cjMqdnKTUWTBSKchJlxXXuUSxCCl8rJlf4g6yww/j6mA8nC8Hw/EZWxKQ=="; + sha512 = "0lv358i7xyg1hn90fk3xzih5kmj1zlmr759g0hh9fa7npbik629q8h5jd2lvjnrm76ciz92k0yn5z6vcqdbgws1zzsrqzw7ixmk7rh0"; }; }; "lodash.mergewith-4.6.1" = { @@ -16667,7 +16106,7 @@ let version = "4.6.1"; src = fetchurl { url = "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz"; - sha512 = "eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ=="; + sha512 = "1swsfrcjr7yv5bkxi47mfjyrl5c8d2c8s4m01qpnffgnjnl9mbri6i9ys9gvwq0drsqszzrmq0rlglmc6c17h8a0r22n86qwfpkjv3r"; }; }; "lodash.once-4.1.1" = { @@ -16838,7 +16277,7 @@ let version = "2.2.0"; src = fetchurl { url = "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz"; - sha512 = "VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg=="; + sha512 = "093j1mha2zwbfkb6cvxr94l1dsx44607vvyxadxki3j69s40n2f6x6iqs6f9rzpvvqd8anclsqdlrm3klkwxixm4k2fl8bjr4b01qjm"; }; }; "log-update-1.0.2" = { @@ -16859,23 +16298,13 @@ let sha1 = "88328fd7d1ce7938b29283746f0b1bc126b24708"; }; }; -<<<<<<< HEAD "log4js-2.10.0" = { name = "log4js"; packageName = "log4js"; version = "2.10.0"; src = fetchurl { url = "https://registry.npmjs.org/log4js/-/log4js-2.10.0.tgz"; - sha512 = "NnhN9PjFF9zhxinAjlmDYvkqqrIW+yA3LLJAoTJ3fs6d1zru86OqQHfsxiUcc1kRq3z+faGR4DeyXUfiNbVxKQ=="; -======= - "log4js-2.9.0" = { - name = "log4js"; - packageName = "log4js"; - version = "2.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/log4js/-/log4js-2.9.0.tgz"; - sha512 = "35x0hh4glvbvlbmw5rkcmi2cph9i8a6y9h9n89zh47p7r35hpw8y1664l23scridgmm5v1g8qa04dc4fgcrnq52bc72ppshxving6x6"; ->>>>>>> nodePackages: meguca: 1.0.7 update + sha512 = "0lp3d9mw93mvcipw28s2zgygjmi2nbk3hjwdv3p82ma7wzf7bbrvkkyfwra2h5j5hvj1yqnnam2myb2hdcqxh19qvhxq5y5z3s4sy1n"; }; }; "loggly-1.1.1" = { @@ -16974,7 +16403,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/lossless-json/-/lossless-json-1.0.2.tgz"; - sha512 = "1213/0zHUiyQcPUuNOEyllQ4UWGOZLQImiYbUEdvKme/lGRWFRMt0ww9nAJp2DIEofMfD+I5Fm2FAhzHgMmhlA=="; + sha512 = "2aa3jc0qwf051bd2qwy43qzyfhh8cnqd419qg8cscni65ancjabyrradx3m06r6k84b8r4fc58khm4n6bhk8bpmf282qln79kzpfvfp"; }; }; "loud-rejection-1.6.0" = { @@ -17019,7 +16448,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz"; - sha512 = "G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA=="; + sha512 = "1a7qa1zn5zl1nf7i6w3299lc3biabfb0w2c30cl770l2dbldvi72nwvjdlinhx7j0ldip82sj710aprdjbmbg782i2pa3jpbgmy6qhv"; }; }; "lru-2.0.1" = { @@ -17091,7 +16520,7 @@ let version = "4.1.3"; src = fetchurl { url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz"; - sha512 = "fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA=="; + sha512 = "0j2ny2y61f70dbzarfa1xazv68dw7nb2r4p5sy46fw6dwr9y0yg003lb1yv7sdl77hcrpzn22mih799z657sz21al4qmf1kr2yj2lbw"; }; }; "lru-queue-0.1.0" = { @@ -17145,7 +16574,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/macos-release/-/macos-release-1.1.0.tgz"; - sha512 = "mmLbumEYMi5nXReB9js3WGsB8UE6cDBWyIO62Z4DNx6GbRhDxHNjA1MlzSpJ2S2KM1wyiPRA0d19uHWYYvMHjA=="; + sha512 = "260gwv2k1svhzfxs50g921jbhrqlbfr94mcs9ak0dip7i2331nqc7ip0fgdkfl3r1b30w1s87qh2ssq6wxzd08pbmkjwchqc6xdnqls"; }; }; "magnet-uri-2.0.1" = { @@ -17172,7 +16601,7 @@ let version = "5.1.8"; src = fetchurl { url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-5.1.8.tgz"; - sha512 = "rHCJ81C3W2MuLpb4c3JKshQtCbRZhgeKKNYy1YFBtLR3eAB0FjQ5thfCo16w/+VF9yN5tJDtDq4NHPtf9a328A=="; + sha512 = "3qgdbgmbzxiq3df1vnr1d3r4gvlbrgzn1ga7hhpnqwk85kl01w7gd5l860xacnn5250g1jrnh4js55j99r77y4n5qp66nxpa3rqjw5c"; }; }; "mailcomposer-2.1.0" = { @@ -17208,11 +16637,7 @@ let version = "0.18.1"; src = fetchurl { url = "https://registry.npmjs.org/mailgun-js/-/mailgun-js-0.18.1.tgz"; -<<<<<<< HEAD - sha512 = "lvuMP14u24HS2uBsJEnzSyPMxzU2b99tQsIx1o6QNjqxjk8b3WvR+vq5oG1mjqz/IBYo+5gF+uSoDS0RkMVHmg=="; -======= sha512 = "2d4gich24nhva74z82riyr82qhgzb4fcrns1fgszb8npp8v9y7b2finj27dccf289nxyvrn6p3wq8sbyd4j8v70vb983nrfbqzqrywn"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "mailparser-0.6.2" = { @@ -17230,7 +16655,7 @@ let version = "1.3.0"; src = fetchurl { url = "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz"; - sha512 = "2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ=="; + sha512 = "2qkk2yzlzrfwnmw8l80cn4l91rfin7fmqn81j39s32i8gzijilbmc798wy51bs3m5gqa6dgrns95gals771jbbl4s4jgdl9ni3za3fv"; }; }; "make-error-1.3.4" = { @@ -17239,7 +16664,7 @@ let version = "1.3.4"; src = fetchurl { url = "https://registry.npmjs.org/make-error/-/make-error-1.3.4.tgz"; - sha512 = "0Dab5btKVPhibSalc9QGXb559ED7G7iLjFXBaj9Wq8O3vorueR5K5jaE3hkG6ZQINyhA/JgG6Qk4qdFQjsYV6g=="; + sha512 = "3m1bilfa38sjf09x439iz2050vhi5790qcxx11nwr51wygfiazbghxbaqznmhamij5vh6zv83s7kgjx0va77996dmighm2apgjrndnh"; }; }; "make-error-cause-1.2.2" = { @@ -17257,7 +16682,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz"; - sha512 = "pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw=="; + sha512 = "2dhd467iqwi8rmdzm8m0921z2mmixbdbpp9hvk02f5z6k1k2324k5l971x6j46mlq8nbixf21znq376dj431jnfajxllm123mgaw657"; }; }; "mamacro-0.0.3" = { @@ -17266,7 +16691,7 @@ let version = "0.0.3"; src = fetchurl { url = "https://registry.npmjs.org/mamacro/-/mamacro-0.0.3.tgz"; - sha512 = "qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA=="; + sha512 = "1670fzjdl58zpljl3vblrzfz0805w0d99kdhf9rz4cgr1f2g01ibb5s5b1n7w7dqfv8lyig9zcqw2f0gsjlzxxwj4zc939fwn3k1hd8"; }; }; "map-cache-0.2.2" = { @@ -17329,7 +16754,7 @@ let version = "8.4.1"; src = fetchurl { url = "https://registry.npmjs.org/markdown-it/-/markdown-it-8.4.1.tgz"; - sha512 = "CzzqSSNkFRUf9vlWvhK1awpJreMRqdCrBvZ8DIoDWTOkESMIF741UPAhuAmbyWmdiFPA6WARNhnu2M6Nrhwa+A=="; + sha512 = "3w1l75fip7divhr6q8n1sf0af49ssf9kc4vh8gha0svw5q84c8s8csr0f50qz7n0smx1a8iwfnlj2kbnl9bwmpryqgia5b44d4ylg0b"; }; }; "markdown-it-emoji-1.4.0" = { @@ -17347,7 +16772,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/markdown-it-github-headings/-/markdown-it-github-headings-1.1.1.tgz"; - sha512 = "jEthmVitZXhYJ0Fkvh6RfBcxdIKKec/p3LidX9a+Hs5/AnUjtxi1nxDVhu1muyacXoTiA+ChVilASQyTdfWk2Q=="; + sha512 = "3cs9xbmjc64jh19ashy00z2hig9q9mvcvnqdm8hkysiidr3fl17zkhypvb5z7dqvklwyycah9s325vwj4gbwr214xc7hrddb2cn2jwc"; }; }; "markdown-it-task-checkbox-1.0.6" = { @@ -17356,7 +16781,7 @@ let version = "1.0.6"; src = fetchurl { url = "https://registry.npmjs.org/markdown-it-task-checkbox/-/markdown-it-task-checkbox-1.0.6.tgz"; - sha512 = "7pxkHuvqTOu3iwVGmDPeYjQg+AIS9VQxzyLP9JCg9lBjgPAJXGEkChK6A2iFuj3tS0GV3HG2u5AMNhcQqwxpJw=="; + sha512 = "0knj35b20bkc34hpfv73p4m855ysgdshml07fhj18j62p09y2066l7nl28g9kr2rwqm9x8j0bw20d32vqrrhih5ifvynk7axcg6977f"; }; }; "markdown-table-0.4.0" = { @@ -17383,7 +16808,7 @@ let version = "0.3.19"; src = fetchurl { url = "https://registry.npmjs.org/marked/-/marked-0.3.19.tgz"; - sha512 = "ea2eGWOqNxPcXv8dyERdSr/6FmzvWwzjMxpfGB/sbMccXoct+xY+YukPD+QTUZwyvK7BZwcr4m21WBOW41pAkg=="; + sha512 = "2940np3jq9midbdw8mhfry1msy3572i2gj0y3z9c8z1dyrdhxg1rivcxhgihpqs6gihqnzgdhbgmgsabm2ch7gzbvf16dxacccrxbbr"; }; }; "matcher-collection-1.0.5" = { @@ -17392,7 +16817,7 @@ let version = "1.0.5"; src = fetchurl { url = "https://registry.npmjs.org/matcher-collection/-/matcher-collection-1.0.5.tgz"; - sha512 = "nUCmzKipcJEwYsBVAFh5P+d7JBuhJaW1xs85Hara9xuMLqtCVUrW6DSC0JVIkluxEH2W45nPBM/wjHtBXa/tYA=="; + sha512 = "1hfvbsx85xqrw6g0k7rkqwngl8b2nwj92ax10ilx3b4lma2mcp8q6zpvam1sffgqsssa9d13cj7prrzg5c00mf0c8q92w59m36ach4x"; }; }; "math-random-1.0.1" = { @@ -17428,7 +16853,7 @@ let version = "1.1.4"; src = fetchurl { url = "https://registry.npmjs.org/mdn-data/-/mdn-data-1.1.4.tgz"; - sha512 = "FSYbp3lyKjyj3E7fMl6rYvUdX0FBXaluGqlFoYESWQlyUTq8R+wp0rkFxoYFqZlHCvsUXGjyJmLQSnXToYhOSA=="; + sha512 = "144x251sdslml324vr6hp0lzc54g6d90n3cc1drs8lyqixw798p42ar2a0s2id939pajpa185givxb2mdg35psfvjikqakjg6kin9hm"; }; }; "mdns-js-0.5.0" = { @@ -17446,7 +16871,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/mdns-js/-/mdns-js-1.0.1.tgz"; - sha512 = "dwEtMzmoZCQcGlr004J4m2+W6dCMpCoGQ5kYIEY+7rMPdMM7ztT+1qD9ExmottvLGgbqAVsjllhwU8PyusecPg=="; + sha512 = "0z9rixsyb1m6w2qjqimn0ga0qdcpnxnm0ci7zd0svzd9kivqds0zczf7r32064r8c32m94cs3lrcvwvg21d7x2s38f28r5874rjs0bp"; }; }; "mdns-js-packet-0.2.0" = { @@ -17482,7 +16907,7 @@ let version = "2.2.1"; src = fetchurl { url = "https://registry.npmjs.org/mediasource/-/mediasource-2.2.1.tgz"; - sha512 = "WRtioPZW7FbuD4OvgrGZU3t5c0sp1F4rGJhrYp4pMIK1u8Hi5HS5aiVvQf24T2/NBg650xdWOXgx8yqTUM71lw=="; + sha512 = "2bzbkjhjcmg6cbq75b1glxr1q3csvsgp3yl2vr5dawp9r72q6xvb0ih56g64swq30mmxm199drpjyskk6qq5bw31zp5dv2nysh646sr"; }; }; "mediawiki-title-0.6.5" = { @@ -17491,7 +16916,7 @@ let version = "0.6.5"; src = fetchurl { url = "https://registry.npmjs.org/mediawiki-title/-/mediawiki-title-0.6.5.tgz"; - sha512 = "fPcI4r2yH02UUgMo308CVzIuXUaRUrBzMvjXX8J4XfcHgX9Y73iB0/VLp+S3TnxnTgIGrQ3BFb7kWGR7kkyS8g=="; + sha512 = "3r94k4jgdj5ir5y2p0hvb860976fz2fnzjafjzmsf0pivsqgy0hgxsxg315zmzq69rv0lli8rfjwcjp097xya03aaa4s7xjppi0ixvw"; }; }; "mem-1.1.0" = { @@ -17527,7 +16952,7 @@ let version = "0.4.12"; src = fetchurl { url = "https://registry.npmjs.org/memoizee/-/memoizee-0.4.12.tgz"; - sha512 = "sprBu6nwxBWBvBOh5v2jcsGqiGLlL2xr2dLub3vR8dnE8YB17omwtm/0NSHl8jjNbcsJd5GMWJAnTSVe/O0Wfg=="; + sha512 = "1z1dvgwbqjls9whb2692xq9rdnwsf7jwlhkbx3gnsq8kvkmh3qw9ngis5xnzvnjv5mnqbz5ca4amhbjlgyyd88kpj0ibi7hm6xw36mj"; }; }; "memory-chunk-store-1.3.0" = { @@ -17536,7 +16961,7 @@ let version = "1.3.0"; src = fetchurl { url = "https://registry.npmjs.org/memory-chunk-store/-/memory-chunk-store-1.3.0.tgz"; - sha512 = "6LsOpHKKhxYrLhHmOJdBCUtSO7op5rUs1pag0fhjHo0QiXRyna0bwYf4EmQuL7InUeF2J7dUMPr6VMogRyf9NA=="; + sha512 = "0sgs9s743559yps61abf9vnw58jgcig5rj15y47q4dsv7bjfj4i138ycgwd384nsqnbbri9p8xm4jq986bkirhi5qmid1wafaj0xfz8"; }; }; "memory-fs-0.3.0" = { @@ -17563,7 +16988,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/memory-pager/-/memory-pager-1.1.0.tgz"; - sha512 = "Mf9OHV/Y7h6YWDxTzX/b4ZZ4oh9NSXblQL8dtPCOomOtZciEHxePR78+uHFLLlsk01A6jVHhHsQZZ/WcIPpnzg=="; + sha512 = "376gyi0kksnf6f43vhm339sa39j8nrf9dqvhgmz8y7if7w4r1jssqx2ivqb87dz83jpcjad3yi7i5p1vdzwslrwb2c1xvnqbwflxzri"; }; }; "memorystore-1.6.0" = { @@ -17590,7 +17015,7 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/meow/-/meow-4.0.1.tgz"; - sha512 = "xcSBHD5Z86zaOc+781KrupuHAzeGXSLtiAOmBsiLDiPSaYSB6hdew2ng9EBAnZ62jagG9MHAOdxpDi/lWBFJ/A=="; + sha512 = "3y4j4aqwlphwsfw770c3x06m26vd7lx810g9q39qdg1gsl1hilx48qfig40d9h3i3nj4pc66w1qg6xsmd9g7fyg77darwsr7qf83i65"; }; }; "merge-1.2.0" = { @@ -17635,7 +17060,7 @@ let version = "1.2.2"; src = fetchurl { url = "https://registry.npmjs.org/merge2/-/merge2-1.2.2.tgz"; - sha512 = "bgM8twH86rWni21thii6WCMQMRMmwqqdW3sGWi9IipnVAszdLXRjwDwAnyrVXo6DuP3AjRMMttZKUB48QWIFGg=="; + sha512 = "0d0aqj17hg50jnnnq6173f0znw873jyslm9y01wq1ip8bfxrh1db6ca90pml1kvbffsmhi62cqi08sqp8l8cvbdifkvbspw06vkq0vf"; }; }; "merkle-tree-stream-3.0.3" = { @@ -17734,7 +17159,7 @@ let version = "3.1.10"; src = fetchurl { url = "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz"; - sha512 = "MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg=="; + sha512 = "1r9rsac8gdslsplya0cnzyk6q0bh7m0wnxccdisacr5327k5k0v6f48dzp0022z8qqpzpvxw7sv1gzhvrqn6v5sz7qcvx37by1a8s1i"; }; }; "miller-rabin-4.0.1" = { @@ -17743,7 +17168,7 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz"; - sha512 = "115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA=="; + sha512 = "12277knznlw4myxmgg6vgkrwmrhj9dyniscrlph3s08ndi2q25v3wrv6rwanvz29v5k5x756xa5yif4xllrghpn3jqaamnr3cp5ypnp"; }; }; "mime-1.2.11" = { @@ -17788,7 +17213,7 @@ let version = "1.4.1"; src = fetchurl { url = "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz"; - sha512 = "KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ=="; + sha512 = "2sz22r1xrnyvq6jg0h6b6cab3s3xdsfqa0n6vl9xv9gq3ppcxrcpg2hqfc41xjwnfwfkr6240l5gys7nds61ch6xcb3gr3fwsl7x398"; }; }; "mime-1.6.0" = { @@ -17797,7 +17222,7 @@ let version = "1.6.0"; src = fetchurl { url = "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz"; - sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; + sha512 = "1x901mk5cdib4xp27v4ivwwr7mhy64r4rk953bzivi5p9lf2bhw88ra2rhkd254xkdx2d3q30zkq239vc4yx4pfsj4hpys8rbr6fif7"; }; }; "mime-2.3.1" = { @@ -17806,7 +17231,7 @@ let version = "2.3.1"; src = fetchurl { url = "https://registry.npmjs.org/mime/-/mime-2.3.1.tgz"; - sha512 = "OEUllcVoydBHGN1z84yfQDimn58pZNNNXgZlHXSboxMlFvgI6MXSWpWKpFRra7H1HxpVhHTkrghfRW49k6yjeg=="; + sha512 = "1xa7b4k7mp4apq8mvj7912m38gzbcbbddaa92lmbb9cbs08z0b2a4x3kds1sr86br6x6r19kygscf20ky6g6wyx313x1jb8qnajai9q"; }; }; "mime-db-1.12.0" = { @@ -17824,7 +17249,7 @@ let version = "1.33.0"; src = fetchurl { url = "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz"; - sha512 = "BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ=="; + sha512 = "36xnw59ik9fqym00cmwb5nyzg0l03k70cp413f7639j93wgmzk1mh0xjc7i6zz3r6k9xnwh0g5cm5a1f3y8c6plgy4qld7fm887ywh4"; }; }; "mime-db-1.34.0" = { @@ -17851,7 +17276,7 @@ let version = "2.1.18"; src = fetchurl { url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz"; - sha512 = "lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ=="; + sha512 = "22krj1kw7n9z10zdyx7smcaim4bzwqsqzhspwha06q58gcrxfp93hw2cd0vk5crhq5p2dwzqlpacg32lrmp5sjzb798zdzy35mdmkwm"; }; }; "mimelib-0.3.1" = { @@ -17869,7 +17294,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz"; - sha512 = "jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="; + sha512 = "1clrrqw75rmpkw0x53axy8va2hq2gzynz9zb58m0xv1nh3lg81cv4dfdy7pk9vrlb9ydwmj6klpicwkv2bjx3m8aj4fi2ph3jxkizwd"; }; }; "mimic-response-1.0.0" = { @@ -17905,7 +17330,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz"; - sha512 = "UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="; + sha512 = "3y39pa1xxg7j49vya7xca4p1mg89d0df56hj4yjhpyhmza3g5qvpgp11xs11wkd48zzy7ym970jfbn0ppimmczpijns249j7q05rljj"; }; }; "minimalistic-crypto-utils-1.0.1" = { @@ -17959,7 +17384,7 @@ let version = "3.0.4"; src = fetchurl { url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; - sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; + sha512 = "1879a3j85h92ypvb7lpv1dqpcxl49rqnbgs5la18zmj1yqhwl60c2m74254wbr5pp3znckqpkg9dvjyrz6hfz8b9vag5a3j910db4f8"; }; }; "minimist-0.0.10" = { @@ -18013,7 +17438,7 @@ let version = "3.0.2"; src = fetchurl { url = "https://registry.npmjs.org/minimist-options/-/minimist-options-3.0.2.tgz"; - sha512 = "FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ=="; + sha512 = "1slngp5z9rczjirv9lpdwiv1ap4xmp28jxl4r0i5hpds1khlm89qp70ziz8k5h2vwjph6srjqi3gb2yrwwsnnwli6p8yxvlyx7nn80p"; }; }; "minipass-2.3.3" = { @@ -18022,7 +17447,7 @@ let version = "2.3.3"; src = fetchurl { url = "https://registry.npmjs.org/minipass/-/minipass-2.3.3.tgz"; - sha512 = "/jAn9/tEX4gnpyRATxgHEOV6xbcyxgT7iUnxo9Y3+OB0zX00TgKIv/2FZCf5brBbICcwbLqVv2ImjvWWrQMSYw=="; + sha512 = "1ii40xdjvsqw9k2pyavlv1h4wh5pc3fz4kn91gxpy404kilgp6p9q7q6zba7wa9i7xh9iijnz2pmr8h0wc4yh14lwkqhps4zgvjfc7y"; }; }; "minizlib-1.1.0" = { @@ -18031,7 +17456,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/minizlib/-/minizlib-1.1.0.tgz"; - sha512 = "4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA=="; + sha512 = "2agpbdf9h90nhafdam3jwrw8gcz3jw1i40cx6bhwaw8qaf2s863gi2b77l73dc3hmf5dx491hv5km1rqzabgsbpkjxrvdcwy6pr8gp1"; }; }; "mirror-folder-3.0.0" = { @@ -18040,7 +17465,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/mirror-folder/-/mirror-folder-3.0.0.tgz"; - sha512 = "fh6wDXcSpFoKY7ZPHnEv1+xjLOS7tlkEpTvl4Y6ZsT0HNjIaYg6ktq9ng8MPthFruunS8D/3GnPeaWhoQD3X9g=="; + sha512 = "3vdfga0d1l6kpkk3bvkzw6jx6x6n4dn1z1q6rxgnsj0wqhs68v0fgdik67f3r9vll25kdmvwhn67v6p5xqiwkxncc55m90jfw6v07ky"; }; }; "mississippi-2.0.0" = { @@ -18049,7 +17474,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/mississippi/-/mississippi-2.0.0.tgz"; - sha512 = "zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw=="; + sha512 = "2gnigixsj38hrqchkf6k8wqywihq6l14pg0qb23x3qpjn56vybljv3nz1z7cbzhl952h1xfw28vsqm09pjhpv9zs9sm43rdxazkqync"; }; }; "mixin-deep-1.3.1" = { @@ -18058,7 +17483,7 @@ let version = "1.3.1"; src = fetchurl { url = "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz"; - sha512 = "8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ=="; + sha512 = "0swcxf279pl5jc4b3d4fm9whbi6sbv2xbcfm1fkxiz793qa2hl5wd1b8dw019dgyidx5nwpa141k0cvvwan0rfypn2am0c4fwn2v4pi"; }; }; "mixin-object-2.0.1" = { @@ -18148,7 +17573,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/modify-values/-/modify-values-1.0.1.tgz"; - sha512 = "xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw=="; + sha512 = "15hcc3355684n37j7979fs72xj57d71cpl1vbqf3n0nkj3mdairyl91q80xhrhrzlpbxc1yccvqqbh31zv7p4wmilcbl5vswg2rnpf5"; }; }; "module-deps-4.1.1" = { @@ -18166,7 +17591,7 @@ let version = "6.1.0"; src = fetchurl { url = "https://registry.npmjs.org/module-deps/-/module-deps-6.1.0.tgz"; - sha512 = "NPs5N511VD1rrVJihSso/LiBShRbJALYBKzDW91uZYy7BpjnO4bGnZL3HjZ9yKcFdZUWwaYjDz9zxbuP7vKMuQ=="; + sha512 = "2wqrwpfiyxwawrz1wisdh8njmshb9y8glv1xxwjkp38cfz7k03bp335dvfmphxc0kc0492v2i583f7w50mqaqjjmmmksm3mklvkkyrl"; }; }; "mold-source-map-0.4.0" = { @@ -18202,7 +17627,7 @@ let version = "2.20.1"; src = fetchurl { url = "https://registry.npmjs.org/moment/-/moment-2.20.1.tgz"; - sha512 = "Yh9y73JRljxW5QxN08Fner68eFLxM5ynNOAw2LbIB1YAGeQzZT8QFSUvkAz609Zf+IHhhaUxqZK8dG3W/+HEvg=="; + sha512 = "2zc9qgzsrnp9g4jm4qsb1g1h7w5zmnkz8690br52l83yr9kwhch0mh7r2vdhc706jkrqczia9wbrgkscz0x6k8cwmb3r5jifbpp47v2"; }; }; "moment-2.22.2" = { @@ -18229,11 +17654,7 @@ let version = "0.5.21"; src = fetchurl { url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.21.tgz"; -<<<<<<< HEAD - sha512 = "j96bAh4otsgj3lKydm3K7kdtA3iKf2m6MY2iSYCzCm5a1zmHo1g+aK3068dDEeocLZQIS9kU8bsdQHLqEvgW0A=="; -======= sha512 = "381dy0jx9r407dvy4adjjq8jhnirshi8g3ypx5dd0z5i8w777bmlvhanf04k8ld66x6jzwag01nsizfr9npdcjjvqiwidi83q19pplg"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "mongodb-1.2.14" = { @@ -18296,7 +17717,7 @@ let version = "1.1.4"; src = fetchurl { url = "https://registry.npmjs.org/mp4-box-encoding/-/mp4-box-encoding-1.1.4.tgz"; - sha512 = "p6AN8M4IBaMQLcnzynXhKXW+RTz3Cc6CE12lkyffnlvwy11IjgCmmQeeOSqVaNwXdePhYviXUbwD/1GUlHQKog=="; + sha512 = "2i0lx4lji8zy0xwa6bzhqp1wdsigp38jlm3k7h7k6k013j8bp5z0nwyvwkr79ax2f1cw2gp7i2vwx99w5swmwy95l8a6188rvq0v857"; }; }; "mp4-stream-2.0.3" = { @@ -18305,7 +17726,7 @@ let version = "2.0.3"; src = fetchurl { url = "https://registry.npmjs.org/mp4-stream/-/mp4-stream-2.0.3.tgz"; - sha512 = "5NzgI0+bGakoZEwnIYINXqB3mnewkt3Y7jcvkXsTubnCNUSdM8cpP0Vemxf6FLg0qUN8fydTgNMVAc3QU8B92g=="; + sha512 = "3d7vh2ks36h25fkh19jfzvw8flk9f0lz8brnpj57wlwfcwx8hsw5fdr2dxr2brpxvcdv4mhfyd7g82y1n1229scchlaj6cv9wiy1p74"; }; }; "mpath-0.1.1" = { @@ -18332,7 +17753,7 @@ let version = "2.18.0"; src = fetchurl { url = "https://registry.npmjs.org/mqtt/-/mqtt-2.18.0.tgz"; - sha512 = "d4hXWziT6tLMjaQs5TVh8uHWS072GBfmBIABezbWZ8W0nNzgMUm6iEmXDLvxkj5YVgl8qDdM0pWQ2NwRwhU7nA=="; + sha512 = "2f3n5f227fdi44ms963ga3w15b5hgljy6xhr5s9i2x4jcg0vjfb9ib7sqv7n0c00kk1f67n9r5xdqgjc4syab54ip6d5slk71dmg23p"; }; }; "mqtt-packet-5.6.0" = { @@ -18341,7 +17762,7 @@ let version = "5.6.0"; src = fetchurl { url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-5.6.0.tgz"; - sha512 = "QECe2ivqcR1LRsPobRsjenEKAC3i1a5gmm+jNKJLrsiq9PaSQ18LlKFuxvhGxWkvGEPadWv6rKd31O4ICqS1Xw=="; + sha512 = "1gvb90a13pd8xx7mkx6nxfs8cc2ysf58vwccvm1jh5myhwjyvsamj5f9fi398vgk9haxmg25l00lwbs4cdnvs638r5iswga5gd9wh20"; }; }; "mri-1.1.1" = { @@ -18413,7 +17834,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz"; - sha512 = "tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="; + sha512 = "352z145jr1zx0w6kmlz2jxcaw6j2pwwg9va3x4gk731zw1agka2b213avw12zx6hgn071ibm0f3p80n5cdv896npay4s6jwbrv7w2mn"; }; }; "ms-rest-1.15.7" = { @@ -18425,23 +17846,13 @@ let sha1 = "400515e05b1924889cb61a1ec6054290a68e1207"; }; }; -<<<<<<< HEAD "ms-rest-2.3.6" = { name = "ms-rest"; packageName = "ms-rest"; version = "2.3.6"; src = fetchurl { url = "https://registry.npmjs.org/ms-rest/-/ms-rest-2.3.6.tgz"; - sha512 = "M+Lx9P7Wy4TeAk7jqPLwGS1QS1gvxF6Xo+OHv5j1g3Kcb44T/GTUuSjxTKarF6aKyeacZH1ZD++Nt7pcql7dDA=="; -======= - "ms-rest-2.3.5" = { - name = "ms-rest"; - packageName = "ms-rest"; - version = "2.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/ms-rest/-/ms-rest-2.3.5.tgz"; - sha512 = "13djv33d74sykqbp9qn9slm3ql6nbzmn2d6rv41m7nyc0a0v5igcjidgv17vhlb4k5fsdb8vb0pgn6m676rmyql85n16lj8p9gwbz6b"; ->>>>>>> nodePackages: meguca: 1.0.7 update + sha512 = "06dspmabjxbg3gg1xcpsr4wwv4qm9hpmfk4rw98p7a69z0kirprqwl3yncbz1z3lfbmxi1gb15m0b8ry3raiqsf0bg89jynzvsg3qik"; }; }; "ms-rest-azure-1.15.7" = { @@ -18459,11 +17870,7 @@ let version = "2.5.7"; src = fetchurl { url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-2.5.7.tgz"; -<<<<<<< HEAD - sha512 = "e4lgB0z29Dx4ufu/c+PmEAYY1WXq98GYUBkE+iRx7WsxsN04lrM3B1vj8y+B8rKt7clPUE0niqB9VovVL8zvag=="; -======= sha512 = "1mfzk1gsn5mczd0i8klsl2gr7nsvcpjh4pz7qsv0wvv75iqvnq32szdf4jgl10ra2cc3xzacpaih1hhwvip7gzvp5w3rx7n9h3n12bv"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "msgpack-1.0.2" = { @@ -18481,7 +17888,7 @@ let version = "3.6.0"; src = fetchurl { url = "https://registry.npmjs.org/msgpack5/-/msgpack5-3.6.0.tgz"; - sha512 = "6HuCZHA57WtNUzrKIvjJ8OMxigzveJ6D5i13y6TsgGu3X3zxABpuBvChpppOoGdB9SyWZcmqUs1fwUV/PpSQ7Q=="; + sha512 = "3nr151ygx2w2pydaamcjrcn5ksl2rx09sdad8gh0rp1l07igigvfsw0xjjcnxrdws1rwy7g1j533qzhr7w25jisad6npv9rf1j84yz8"; }; }; "multer-1.3.0" = { @@ -18517,7 +17924,7 @@ let version = "6.2.3"; src = fetchurl { url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz"; - sha512 = "ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g=="; + sha512 = "3m42kr8y2s1krl4gzb5xsa9v3h01xalvrgdkj99gyfaq7761asmj5m6kzm70mxb22125gia12g7rmarnzmh09403j8j2cyvx7jqjblf"; }; }; "multicast-dns-7.0.0" = { @@ -18526,7 +17933,7 @@ let version = "7.0.0"; src = fetchurl { url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.0.0.tgz"; - sha512 = "BqB5TtIXHo+8gN33N1CA1clsvPsAJlnc6D49SzfQA0xq75cxj15g2y9NaRdf4x2u4v1P66PBC+Wg6YgPO5Bc/g=="; + sha512 = "3z5r41v1y4fk8751g0s7ssgzpiaw7g3bwbnjk9gvdh5x3rijzpnlk03s0vlng9yx3f5j9h0zfy6rjfmh183gxyxh2y8y7hps977k806"; }; }; "multicast-dns-service-types-1.1.0" = { @@ -18544,7 +17951,7 @@ let version = "1.2.2"; src = fetchurl { url = "https://registry.npmjs.org/multicb/-/multicb-1.2.2.tgz"; - sha512 = "PZM4dhYFmCF6uZGWpEmoPMUqJBywS9IcAgybT2GmSpYI1BvGvoWSdbio+ik+q/YD2vodhvslESWIS3NnkKYdqQ=="; + sha512 = "2liv9lhcxrlp21524jzp1hxzbd07xmb7qlzma5qfn98bgn63ga0i5jalrhlz6qc08fd4jxh3hj2mi9wm14s95lip5x236052rv3i4rx"; }; }; "multimatch-2.1.0" = { @@ -18598,7 +18005,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/multistream/-/multistream-2.1.1.tgz"; - sha512 = "xasv76hl6nr1dEy3lPvy7Ej7K/Lx3O/FCvwge8PeVJpciPPoNCbaANcNiBug3IpdvTveZUcAV0DJzdnUDMesNQ=="; + sha512 = "0ssriqcskcwvja0aw04frfy7fymv2nwl0dqh3fp03d2cd78yf45r6jlvv1pn87w1b2yzp7iy8mznj7cybxr9dscfkspmsk5m3pjzay5"; }; }; "muri-0.3.1" = { @@ -18688,7 +18095,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/mutexify/-/mutexify-1.2.0.tgz"; - sha512 = "oprzxd2zhfrJqEuB98qc1dRMMonClBQ57UPDjnbcrah4orEMTq1jq3+AcdFe5ePzdbJXI7zmdhfftIdMnhYFoQ=="; + sha512 = "2hha5ly9j3v9pqpfvkbq8spn9sz7qz5bv8p303zmdisskhcn6i7ia5dviv8xhs3xlwi9562i4r4rm6mkk5gg0abm34zm1dkvp2z76m2"; }; }; "mv-2.1.1" = { @@ -18715,7 +18122,7 @@ let version = "2.7.0"; src = fetchurl { url = "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz"; - sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="; + sha512 = "3cpmwzmngnmxhklvicnsbl5dchvsy0yikzgf705cq1cplyps3waa03xbjp306bjf167wnplibwki0csnavz98dihq2877g7xqs4dkfg"; }; }; "nan-0.3.2" = { @@ -18751,7 +18158,7 @@ let version = "2.10.0"; src = fetchurl { url = "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz"; - sha512 = "bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA=="; + sha512 = "349rr7x0djrlkav4gbhkg355852ingn965r0kkch8rr4cwp7qki9676zpq8cq988yszzd2hld6szsbbnd1v6rghzf11abn1nyzlj1vc"; }; }; "nan-2.5.1" = { @@ -18796,11 +18203,7 @@ let version = "1.0.4"; src = fetchurl { url = "https://registry.npmjs.org/nanoid/-/nanoid-1.0.4.tgz"; -<<<<<<< HEAD - sha512 = "zWPAK2WibMbVda1DvhYbahj7DAXLMvSI4Ik7553nPyJ2p8I5qJr4/j/6kgHJalrOx4FRbbme2Oa6utdzr6I/tA=="; -======= sha512 = "2s3z8mgfgbvmfp6v2gbjvaih73wwnkar40r5yizzvw9ma1rqakpc8izwyfyffw9w24g8cnb0l6gn63a3cbbwhxdfpawcv52clmw0qyd"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "nanolru-1.0.0" = { @@ -18809,7 +18212,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/nanolru/-/nanolru-1.0.0.tgz"; - sha512 = "GyQkE8M32pULhQk7Sko5raoIbPalAk90ICG+An4fq6fCsFHsP6fB2K46WGXVdoJpy4SGMnZ/EKbo123fZJomWg=="; + sha512 = "1d2d6k4vxnxgs5621zpccl6hk5nk0knsmjmhfmfv30sfgzca6qc59xb3xz05gi141s4y0m5yrn0iamd7554lfq9hl5rbnipqc9j890v"; }; }; "nanomatch-1.2.13" = { @@ -18818,7 +18221,7 @@ let version = "1.2.13"; src = fetchurl { url = "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz"; - sha512 = "fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA=="; + sha512 = "04al0wvh9hw1p9bblk847c5nbi3lcjz2pg5yzpqdzgllk57firrqinn4yk169iddaagdf9s5l987xh43z87w3hm9h0pqv0i7pcix6ky"; }; }; "nanotiming-1.0.1" = { @@ -18894,7 +18297,7 @@ let version = "1.1.4"; src = fetchurl { url = "https://registry.npmjs.org/natives/-/natives-1.1.4.tgz"; - sha512 = "Q29yeg9aFKwhLVdkTAejM/HvYG0Y1Am1+HUkFQGn5k2j8GS+v60TVmZh6nujpEAj/qql+wGUrlryO8bF+b1jEg=="; + sha512 = "0967ggrqp33pwjsmsa03yx5mbz26h54ldxylqb6aq9svgxyckqa6kg6lw0ia93mz2shkm0qdmhfzw9klc3lqr2p5lhsq52s1xx74vs3"; }; }; "natural-compare-1.4.0" = { @@ -18921,7 +18324,7 @@ let version = "0.10.0"; src = fetchurl { url = "https://registry.npmjs.org/nconf/-/nconf-0.10.0.tgz"; - sha512 = "fKiXMQrpP7CYWJQzKkPPx9hPgmq+YLDyxcG9N8RpiE9FoCkCbzD0NyW0YhE3xn3Aupe7nnDeIx4PFzYehpHT9Q=="; + sha512 = "3sx74c63qv1f3qy4gg717mvjyxc0zf66w8n5d156zs30vq256h4akw8d723ggf1qprb0q5yda14zn67rx1jlcwlb2cb0gz918qrga3w"; }; }; "nconf-0.6.9" = { @@ -18984,7 +18387,7 @@ let version = "1.1.2"; src = fetchurl { url = "https://registry.npmjs.org/neat-log/-/neat-log-1.1.2.tgz"; - sha512 = "LUk9cZY/FakJlQ7OcZaHakNV0AzBwfx9iqU4hwYx7NhVYBjZBeykmcHJD5y+cfVWpyaHdjIYnb+gKTVkS+DlSg=="; + sha512 = "15fbq2bchsjk85zklc34xl74skmdxbipsf0zjf1k6jfq1fr31h5bn7c6438ff55i9yzrhf11k85ahvahyb73khfjl4sj59zjrqksj9d"; }; }; "needle-0.10.0" = { @@ -19011,7 +18414,7 @@ let version = "2.2.1"; src = fetchurl { url = "https://registry.npmjs.org/needle/-/needle-2.2.1.tgz"; - sha512 = "t/ZswCM9JTWjAdXS9VpvqhI2Ct2sL2MdY4fUXqGJaGBk13ge99ObqRksRTbBE56K+wxUXwwfZYOuZHifFW9q+Q=="; + sha512 = "3wnlvqmkxw69bl3clghqpsl1kxqm7hkq4v4ab0rm6dx7xqyg3bn8q38i6hmxm47ccfn6bxcvl53c4madxdgblnm06ika99x4g06rxmp"; }; }; "negotiator-0.3.0" = { @@ -19057,7 +18460,7 @@ let version = "2.5.1"; src = fetchurl { url = "https://registry.npmjs.org/neo-async/-/neo-async-2.5.1.tgz"; - sha512 = "3KL3fvuRkZ7s4IFOMfztb7zJp3QaVWnBeGoJlgB38XnCRPj/0tLzzLG5IB8NYOHbJ8g8UGrgZv44GLDk6CxTxA=="; + sha512 = "3256b78wjq1hf7ycvh6ll1wr0kxpqb01lgj1fdirkrx5lpzz12c4ygifw09c2bag30njm8sfjkwkg3gxpy32kl1w3n9x4cizdzgg8nw"; }; }; "nested-error-stacks-1.0.2" = { @@ -19156,7 +18559,7 @@ let version = "1.0.4"; src = fetchurl { url = "https://registry.npmjs.org/nice-try/-/nice-try-1.0.4.tgz"; - sha512 = "2NpiFHqC87y/zFke0fC0spBXL3bBsoh/p5H1EFhshxjCR5+0g2d6BiXbUFz9v1sAcxsk2htp2eQnNIci2dIYcA=="; + sha512 = "1q1ilnr4a3k89z4v5lipni43drh0nxzzmf51nr50rx6g0xlkx3w4647dic11xcilxzqicn1fqpmg45jnkqd27jrrjzvrww2g8a65nnq"; }; }; "nijs-0.0.25" = { @@ -19174,7 +18577,7 @@ let version = "2.3.2"; src = fetchurl { url = "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz"; - sha512 = "rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ=="; + sha512 = "34msnfifpdmxl414b8rch1p1six59jd9251b7wkb37n78fa84xfa5f5f5cxxp477wb846nfrsg6b1py3rahz4xdpk17lzzy9kvdjr5f"; }; }; "node-abi-2.4.3" = { @@ -19183,11 +18586,7 @@ let version = "2.4.3"; src = fetchurl { url = "https://registry.npmjs.org/node-abi/-/node-abi-2.4.3.tgz"; -<<<<<<< HEAD - sha512 = "b656V5C0628gOOA2kwcpNA/bxdlqYF9FvxJ+qqVX0ctdXNVZpS8J6xEUYir3WAKc7U0BH/NRlSpNbGsy+azjeg=="; -======= sha512 = "1xf7b7r69mnqk9ajm8z67q19pnrq0jqywm6450ixc4jz9arsmf5vjyiayjslzhjpx2myq3av72xn3rl543r6dp070h6zsxlj1bpmbkg"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "node-alias-1.0.4" = { @@ -19205,7 +18604,7 @@ let version = "0.2.44"; src = fetchurl { url = "https://registry.npmjs.org/node-appc/-/node-appc-0.2.44.tgz"; - sha512 = "8D+uqpr4OMXLmWblJBuFaph/wvLKDqgQFOCAmk4JlkE9PoJ6DW9VI2nVb+UZCRIge+Kfe3/upRD9haOjHBOiAg=="; + sha512 = "01a44qwlfiqbz8hlpp7yywzw9xj04h937jnzmb94dany3bsh8z3shcn1579m0702h8ah3nayb17z63ahldj9rb6k75waf7qkamawgzh"; }; }; "node-cache-4.2.0" = { @@ -19214,7 +18613,7 @@ let version = "4.2.0"; src = fetchurl { url = "https://registry.npmjs.org/node-cache/-/node-cache-4.2.0.tgz"; - sha512 = "obRu6/f7S024ysheAjoYFEEBqqDWv4LOMNJEuO8vMeEw2AT4z+NCzO4hlc2lhI4vATzbCQv6kke9FVdx0RbCOw=="; + sha512 = "0xw45nif5bibga7jbx0n2fv7h0jz3l4lp6ra8gfri1f7kzq0kc31q9i5zpvhi6j63785gynl2m02h8l30x04pn8raw4sjzvyzmnxd51"; }; }; "node-elm-compiler-4.3.3" = { @@ -19223,11 +18622,7 @@ let version = "4.3.3"; src = fetchurl { url = "https://registry.npmjs.org/node-elm-compiler/-/node-elm-compiler-4.3.3.tgz"; -<<<<<<< HEAD - sha512 = "DUqXaoEFcx0xqZnMyYniyEzTKcdBhAC5GAcNsRS4tiG3VR8tidwth73cr5/rc4NzbjXIk+Jje8P4VJI+fWXHuw=="; -======= sha512 = "2xwfrbx7s959y63gdiy54y86mp770vkxfgszp5xhwnxr29d3xavf8dnp0ab238732wh1121qwlx6k68wa4wkk4rm4qiswq5h5m9fjhd"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "node-forge-0.6.23" = { @@ -19245,7 +18640,7 @@ let version = "0.7.5"; src = fetchurl { url = "https://registry.npmjs.org/node-forge/-/node-forge-0.7.5.tgz"; - sha512 = "MmbQJ2MTESTjt3Gi/3yG1wGpIMhUfcIypUCGtTizFR9IiccFwxSpfp0vtIZlkFclEqERemxfnSdZEMR9VqqEFQ=="; + sha512 = "0aq9ajngp210n97kmgnqyhil492amwhcn3b8bwxgsli9hq5qy4lh7qmncwbb1j0llrc4zalr0haj0fphrygz8kinzij848kcckx0rij"; }; }; "node-gyp-build-3.4.0" = { @@ -19254,7 +18649,7 @@ let version = "3.4.0"; src = fetchurl { url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.4.0.tgz"; - sha512 = "YoviGBJYGrPdLOKDIQB0sKxuKy/EEsxzooNkOZak4vSTKT/qH0Pa6dj3t1MJjEQGsefih61IyHDmO1WW7xOFfw=="; + sha512 = "1zqa4zgjrakprkhr14av1z2wyqhci4c159vgxyqx7d467za7wlr7x72ljb3jr43l9rwq4n45wmnxb5hfh0230z25kfv66jq28cf52v2"; }; }; "node-int64-0.4.0" = { @@ -19272,7 +18667,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.1.0.tgz"; - sha512 = "5AzFzdoIMb89hBGMZglEegffzgRg+ZFoUmisQ8HI4j1KDdpx13J0taNp2y9xPbur6W61gepGDDotGBVQ7mfUCg=="; + sha512 = "05d8rzfa0aihb9s1i3fm0dmdvlspfrxf4pxnsd3nms75mviv86llgg2r30l7b38a9l93yb00k7dy1vs8h4nd30ihhyvyc88vb6wa374"; }; }; "node-notifier-5.2.1" = { @@ -19281,7 +18676,7 @@ let version = "5.2.1"; src = fetchurl { url = "https://registry.npmjs.org/node-notifier/-/node-notifier-5.2.1.tgz"; - sha512 = "MIBs+AAd6dJ2SklbbE8RUDRlIVhU8MaNLh1A9SUZDUHPiZkWLFde6UNwG41yQHZEToHgJMXqyVZ9UcS/ReOVTg=="; + sha512 = "179bqs5pz252zanr7mca970h5748xj0fa6inw23x5g5fb0nk64wyh8d34jzah0x5s6wdw2lb0hnad2h257nqns999vd5s8x03w6r01h"; }; }; "node-phantom-simple-2.2.4" = { @@ -19308,7 +18703,7 @@ let version = "0.6.39"; src = fetchurl { url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz"; - sha512 = "OsJV74qxnvz/AMGgcfZoDaeDXKD3oY3QVIbBmwszTFkRisTSXbMQyn4UWzUMOtA5SVhrBZOTp0wcoSBgfMfMmQ=="; + sha512 = "2cwrivwc0ha272cly9r61bbb14kkl1s1hsmn53yr88b6pfjqj512nac6c5rphc6ak88v8gpl1f879qdd3v7386103zzr7miibpmbhis"; }; }; "node-red-node-email-0.1.29" = { @@ -19317,7 +18712,7 @@ let version = "0.1.29"; src = fetchurl { url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.29.tgz"; - sha512 = "+tqda0bNT8A0PM9G47XqFiUP9gEe1zvB/9f+JJhbLWTEk9TeRB4UeyycubmCbR1/TzJnk2v9yCDogFhDJQWbOw=="; + sha512 = "0xrn1958dc81s10r3ynp4v7697py7bdhawvk71cgca1wi6ysj9w8r1dbfc29znpzz0kpmqy07v0y98nxasy6ing7hsc0kyd8rmrvnps"; }; }; "node-red-node-feedparser-0.1.12" = { @@ -19326,7 +18721,7 @@ let version = "0.1.12"; src = fetchurl { url = "https://registry.npmjs.org/node-red-node-feedparser/-/node-red-node-feedparser-0.1.12.tgz"; - sha512 = "kwo7k7pXhl9wANXqgQTRo1WqxyrpJFelvZ2u9EnKfDA2yKrsZq0ZeYB8BDc/uVIycqh8XEJeX44EnAHkidddvQ=="; + sha512 = "2ymvmw9wh0rq14fbxg44p3wm1r34lmr7wvh8z40g4cssrpcmb43cc3wr94z9blxpnjmf9795b3slmd3s4283snm01q5z1jppa9kn2lk"; }; }; "node-red-node-rbe-0.2.3" = { @@ -19335,29 +18730,9 @@ let version = "0.2.3"; src = fetchurl { url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.2.3.tgz"; - sha512 = "5+MtH9t8tX6Aw6M+SeoyGR23XplNTOln3aTQ7El9tj/606bxea4GxYyvV4ymTmuoODz3GXQlLLQVdGkFLyIdDQ=="; + sha512 = "06is8ig0mlp85dl5hjp86gp7hwahssfls65gbwcql3awygilv9zlgxngm4yrl54vmkyjk2dk5gbf78r6bm4jgm3qf07xdbwvcgjvqz7"; }; }; -<<<<<<< HEAD -<<<<<<< HEAD - "node-red-node-twitter-1.0.1" = { -======= -<<<<<<< HEAD - "node-red-node-twitter-0.1.15" = { ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 - name = "node-red-node-twitter"; - packageName = "node-red-node-twitter"; - version = "1.0.1"; - src = fetchurl { -<<<<<<< HEAD - url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-1.0.1.tgz"; - sha512 = "NAM6mlAiZk1EwHtdPNnP/E8P5EIijnqSag1vzE/Ya+ggywTiELt9HtYX26evyB/MrnVS+FIJg+M8S5HobklERg=="; -======= - url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-0.1.15.tgz"; - sha512 = "07v6lmlyb0hdg9l86gvlipvs3ahi64fgswkadz1frczpi293hydlbdsy7rb917nf7z0kpcsrnch9d92xwirf4p6yzfhkmdsanrb9ha0"; -======= -======= ->>>>>>> nodePackages: meguca: 1.0.7 update "node-red-node-twitter-1.0.1" = { name = "node-red-node-twitter"; packageName = "node-red-node-twitter"; @@ -19365,11 +18740,6 @@ let src = fetchurl { url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-1.0.1.tgz"; sha512 = "1348jbfx28lng73hc4m5y2jfnpcq7y8mykxn5yn3ryvn4720k5j1s3bv17wqvqdda97m3i28bj0ykzwrzckqpbvq124sri2a2d3l0rl"; -<<<<<<< HEAD ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 -======= ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "node-ssdp-2.9.1" = { @@ -19387,7 +18757,7 @@ let version = "0.7.10"; src = fetchurl { url = "https://registry.npmjs.org/node-static/-/node-static-0.7.10.tgz"; - sha512 = "bd7zO5hvCWzdglgwz9t82T4mYTEUzEG5pXnSqEzitvmEacusbhl8/VwuCbMaYR9g2PNK5191yBtAEQLJEmQh1A=="; + sha512 = "3a22r0jr4112h0vr1smzrsaygc607v13arhjbjwzmy1jvmcrdlq9ydnw96ailkrlnwl3k0l65hjcgnrgkdwyc2qhbfnq2bgk0xz7pkd"; }; }; "node-swt-0.1.1" = { @@ -19558,7 +18928,7 @@ let version = "6.0.0"; src = fetchurl { url = "https://registry.npmjs.org/nodesecurity-npm-utils/-/nodesecurity-npm-utils-6.0.0.tgz"; - sha512 = "NLRle1woNaT2orR6fue2jNqkhxDTktgJj3sZxvR/8kp21pvOY7Gwlx5wvo0H8ZVPqdgd2nE2ADB9wDu5Cl8zNg=="; + sha512 = "0v36pqap4xw0z9h00v73nhxv2llz5gi0y6vww0yjyqb2qyfkgb7cjpjgzscc6bviw4xi4nk223s9nlcnvkpwymllbva8d98bixnbd1l"; }; }; "nomnom-1.8.1" = { @@ -19639,7 +19009,7 @@ let version = "2.4.0"; src = fetchurl { url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz"; - sha512 = "9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw=="; + sha512 = "01wzws79ps84ylshjb7rfpjykgiqxnpr89s52p2yyzfx8nfvyh5flvf1almiiavsi75xgi8g3s5davc1mmgz7gn8yvlqz6gnhax8f7n"; }; }; "normalize-path-2.1.1" = { @@ -19657,7 +19027,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/normalize-url/-/normalize-url-2.0.1.tgz"; - sha512 = "D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw=="; + sha512 = "0rykwifg14xfgm9m6md48rkqqxa2cya4xdsv7jjciacis2nz6dzaccpzyldlpvy14rvihpxbdiysfn49a8x8x5jw84klmxzh9di98qg"; }; }; "now-and-later-2.0.0" = { @@ -19684,7 +19054,7 @@ let version = "6.1.0"; src = fetchurl { url = "https://registry.npmjs.org/npm/-/npm-6.1.0.tgz"; - sha512 = "e38cCtJ0lEjLXXpc4twEfj8Xw5hDLolc2Py87ueWnUhJfZ8GA/5RVIeD+XbSr1+aVRGsRsdtLdzUNO63PvQJ1w=="; + sha512 = "3bhkx1ynzp39m6w5mnwfimc25arlpxgs9vgk0w7ai8zw0q6kxyljj4xjvkyxg7wv1f8jbj3k31ifgvy0kff4p3sbp5li53ls851qzvv"; }; }; "npm-bundled-1.0.3" = { @@ -19693,7 +19063,7 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.3.tgz"; - sha512 = "ByQ3oJ/5ETLyglU2+8dBObvhfWXX8dtPZDMePCahptliFX2iIuhyEszyFk401PZUNQH20vvdW5MLjJxkwU80Ow=="; + sha512 = "0xk8ky1cjf8q2wkbgfzplpn04sm9xnl6i71dwnc29rfh8m2glan5nd6l4k3q7ikci7xpwfpcmyy3frr873zndjmhbr344grkyh3f907"; }; }; "npm-conf-1.1.3" = { @@ -19702,7 +19072,7 @@ let version = "1.1.3"; src = fetchurl { url = "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz"; - sha512 = "Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw=="; + sha512 = "1rx44jzcf3byibrwmgyr0598hng4snjfj9bx29xm7bi5y1bqkbvb2krh8z0ccpzv3aps71qwrq55a56l1qkzlan118xyfn9j5nkh9v2"; }; }; "npm-keyword-5.0.0" = { @@ -19720,7 +19090,7 @@ let version = "6.1.0"; src = fetchurl { url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.0.tgz"; - sha512 = "zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA=="; + sha512 = "14dqycy588sf0k73livvvpmp1dqmbhacc97pq3ksxk1wrm9j82r7hhlrxigj0nb58gz4cbvbh3isj1x3sjiqxs60dhv439xd4zy31nd"; }; }; "npm-packlist-1.1.10" = { @@ -19729,7 +19099,7 @@ let version = "1.1.10"; src = fetchurl { url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.10.tgz"; - sha512 = "AQC0Dyhzn4EiYEfIUjCdMl0JJ61I2ER9ukf/sLxJUcZHfo+VyEfz2rMJgLZSS1v30OxPQe1cN0LZA1xbcaVfWA=="; + sha512 = "1c5z9bibdf07na26xffshagxk8gfnsbaav802dkvbrlgj4mixz4giji96yb1zs7p9yl9n28mlkhjp9jklq55j27c0i837vk507v8001"; }; }; "npm-registry-client-0.2.27" = { @@ -19747,7 +19117,7 @@ let version = "8.5.1"; src = fetchurl { url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.5.1.tgz"; - sha512 = "7rjGF2eA7hKDidGyEWmHTiKfXkbrcQAsGL/Rh4Rt3x3YNRNHhwaTzVJfW3aNvvlhg4G62VCluif0sLCb/i51Hg=="; + sha512 = "0g7abpykfqb1x17pajm1ndsh61n3ydyimv5npsjrn9hd1s72csxh7fzdn28gldz30n00wgb8rg9y8jfhxli3cnii61i5vl0cwbwdf7f"; }; }; "npm-run-path-1.0.0" = { @@ -19792,7 +19162,7 @@ let version = "2.1.3"; src = fetchurl { url = "https://registry.npmjs.org/npmconf/-/npmconf-2.1.3.tgz"; - sha512 = "iTK+HI68GceCoGOHAQiJ/ik1iDfI7S+cgyG8A+PP18IU3X83kRhQIRhAUNj4Bp2JMx6Zrt5kCiozYa9uGWTjhA=="; + sha512 = "22f6r0rdspn2cra19jdxblr3qrqk786z3c50h0q4581i49pgzfi9hnprzih7g11hff2zvf86y43aagyi44031v3l21cf6dwiqfbwcl9"; }; }; "npmi-2.0.1" = { @@ -19819,7 +19189,7 @@ let version = "4.1.2"; src = fetchurl { url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz"; - sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg=="; + sha512 = "2967mavp7zw0aawf5fadqf4pmn7vy5gya1yx2s9wwppvivhd9q4mpdnszfqvd7p6yks649bwbpj8iviw86g0hpp4f93d5ca7dmjmrfs"; }; }; "nprogress-0.2.0" = { @@ -19867,8 +19237,6 @@ let sha1 = "3831db968451b9cf6aff9bf95925f1ef8e37b33f"; }; }; -<<<<<<< HEAD -<<<<<<< HEAD "numeral-2.0.6" = { name = "numeral"; packageName = "numeral"; @@ -19878,35 +19246,6 @@ let sha1 = "4ad080936d443c2561aed9f2197efffe25f4e506"; }; }; -======= -<<<<<<< HEAD ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 - "nwmatcher-1.4.4" = { - name = "nwmatcher"; - packageName = "nwmatcher"; - version = "1.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.4.4.tgz"; -<<<<<<< HEAD - sha512 = "3iuY4N5dhgMpCUrOVnuAdGrgxVqV2cJpM+XNccjR2DKOB1RUP0aA+wGXEiNziG/UKboFyGBIoKOaNlJxx8bciQ=="; -======= - sha512 = "24xrin7f593d6m3l1461j05p8lx8vw8fcii55q1zf04cgslah3qwcnqs7473kg56dlw5ncmbb2y0sklh1xmdkja14lh71jxvvh9hayy"; -======= -======= ->>>>>>> nodePackages: meguca: 1.0.7 update - "numeral-2.0.6" = { - name = "numeral"; - packageName = "numeral"; - version = "2.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/numeral/-/numeral-2.0.6.tgz"; - sha1 = "4ad080936d443c2561aed9f2197efffe25f4e506"; -<<<<<<< HEAD ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 -======= - }; - }; "nwmatcher-1.4.4" = { name = "nwmatcher"; packageName = "nwmatcher"; @@ -19914,7 +19253,6 @@ let src = fetchurl { url = "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.4.4.tgz"; sha512 = "24xrin7f593d6m3l1461j05p8lx8vw8fcii55q1zf04cgslah3qwcnqs7473kg56dlw5ncmbb2y0sklh1xmdkja14lh71jxvvh9hayy"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "oauth-0.9.14" = { @@ -20032,7 +19370,7 @@ let version = "1.3.0"; src = fetchurl { url = "https://registry.npmjs.org/object-hash/-/object-hash-1.3.0.tgz"; - sha512 = "05KzQ70lSeGSrZJQXE5wNDiTkBJDlUT/myi6RX9dVIvz7a7Qh4oH93BQdiPMn27nldYvVQCKMUaM83AfizZlsQ=="; + sha512 = "2qnadlb3xqg732666500m9gssayfvlzrhipcl3hyw3qm1yhmvnz72slbmzlbfi8kgzl95a32a896f1lf175ql4jmn9f2j95pm1v74nk"; }; }; "object-keys-1.0.12" = { @@ -20041,11 +19379,7 @@ let version = "1.0.12"; src = fetchurl { url = "https://registry.npmjs.org/object-keys/-/object-keys-1.0.12.tgz"; -<<<<<<< HEAD - sha512 = "FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag=="; -======= sha512 = "1mcxc6cidz4wg1dhkn67hy9szl1hiaixrijhvh0n56mgs7cg0h110k7mxp7dflzank9whba14ivml7fndwpkxki3q31gh5n94ak4cqm"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "object-values-1.0.0" = { @@ -20072,7 +19406,7 @@ let version = "4.1.0"; src = fetchurl { url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz"; - sha512 = "exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w=="; + sha512 = "3krdp08gvbxvipalq64qy7bm86znxxdb7ap6bjki235qs17i9fsn6hqd22ga31sqyqa6iyy5xjfnnqc7lsck1kaybwsh154mrxcj4bv"; }; }; "object.defaults-1.1.0" = { @@ -20306,7 +19640,7 @@ let version = "5.3.0"; src = fetchurl { url = "https://registry.npmjs.org/opn/-/opn-5.3.0.tgz"; - sha512 = "bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g=="; + sha512 = "3d5s5y22sx4wfswzs8fmhr7sarmjigs8qhmmyrkiplfda6kkfk3kv67fs8npdklf8zbc9hmx76zsxqfv4bn5qlpzbfq96nfyailg0kd"; }; }; "optimist-0.2.8" = { @@ -20387,7 +19721,7 @@ let version = "1.4.0"; src = fetchurl { url = "https://registry.npmjs.org/ora/-/ora-1.4.0.tgz"; - sha512 = "iMK1DOQxzzh2MBlVsU42G80mnrvUhqsMh74phHtDlrcTZPK0pH6o7l7DRshK+0YsxDyEuaOkziVdvM3T0QTzpw=="; + sha512 = "2kz616isg6vqp95rsja7fc47k22qipv9b44dhsyxsl7x95ly9j17dwn8dxq8adyhw6ap1nlpfg2dk8v6r7b2m8r61v3ikriwh6bbhl8"; }; }; "orchestrator-0.3.8" = { @@ -20459,7 +19793,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz"; - sha512 = "3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA=="; + sha512 = "0lafrp0i2ajapsnma0x74q7zscn97a56i5hh58a0nyig2igfx9fqn4ain9kvjrr06as5gzdrv2wdf52qc5m861fd0f4cv69ghdjbjyy"; }; }; "os-name-1.0.3" = { @@ -20513,7 +19847,7 @@ let version = "0.1.5"; src = fetchurl { url = "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz"; - sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g=="; + sha512 = "3ddw0y41pxv08ls5xhmq1bi81hppjbr45k78cjfx99vznh5znrj5g1b1wab9caj1mqlsvmfms0zm9cfb47ygm0d8wv5fccx8049q9fh"; }; }; "osx-release-1.1.0" = { @@ -20531,7 +19865,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/p-any/-/p-any-1.1.0.tgz"; - sha512 = "Ef0tVa4CZ5pTAmKn+Cg3w8ABBXh+hHO1aV8281dKOoUHfX+3tjG2EaFcC+aZyagg9b4EYGsHEjz21DnEE8Og2g=="; + sha512 = "3da1hqkqhwx9xiw283nnq04pvsj1a69k7k0np5126v33dmpgxyhg19s99bz6djzd6sp713yg02h3h636wlgi9v2099rlrq2mrajvz8i"; }; }; "p-cancelable-0.3.0" = { @@ -20540,7 +19874,7 @@ let version = "0.3.0"; src = fetchurl { url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.3.0.tgz"; - sha512 = "RVbZPLso8+jFeq1MfNvgXtCRED2raz/dKpacfTNxsx6pLEpEomM7gah6VeHSYV3+vo0OAi4MkArtQcWWXuQoyw=="; + sha512 = "35jir2yjv2l3v8aj062w0hfinzgwpb1sbhmaym8h4xn78j498naj7mkf4rpv74n5bfkysxb7l893l2yw3dpqk5dgb2yiwr8pcydjmj5"; }; }; "p-cancelable-0.4.1" = { @@ -20549,7 +19883,7 @@ let version = "0.4.1"; src = fetchurl { url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.1.tgz"; - sha512 = "HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ=="; + sha512 = "02ipk9sgz2q0msm9h53lxbjvqprh9k6zj8q21dvczv6p6a5d4q5yqcmwj6xm0icmdc94n42plfmwlymnqn4f15pgci5j1zgq81vbmhw"; }; }; "p-finally-1.0.0" = { @@ -20576,7 +19910,7 @@ let version = "1.3.0"; src = fetchurl { url = "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz"; - sha512 = "vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q=="; + sha512 = "3sh18calqxbww99pxc84hldflmj0i915g8npihlmazw8wjqabihi9475v0ll3fhx44sxn35j014j1k5d2xr73q3mpwkmx09n2q1gxxy"; }; }; "p-limit-2.0.0" = { @@ -20585,7 +19919,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/p-limit/-/p-limit-2.0.0.tgz"; - sha512 = "fl5s52lI5ahKCernzzIyAP0QAZbGIovtVHGwpcu1Jr/EpzLVDI2myISHwGqK7m8uQFugVWSrbxH7XnhGtvEc+A=="; + sha512 = "3w1rwdn8rw5xyqidymn8md0bd02wvzfi9mc11w4r2k8s36m6akw9gr6np5sbc3iaknqn8n6jq0i1z8068rczrza155aira8d7knqpky"; }; }; "p-locate-2.0.0" = { @@ -20603,7 +19937,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz"; - sha512 = "x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ=="; + sha512 = "14sa2r3zdhvy3sq757d4l21nxrlb7picyigb8zm956bbjadcv22chrfa95wzzrf28z0cyj62b6yihhdc9508q82gs2q3yz8yk1pdvf7"; }; }; "p-some-2.0.1" = { @@ -20630,7 +19964,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/p-timeout/-/p-timeout-2.0.1.tgz"; - sha512 = "88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA=="; + sha512 = "0h1wg3bw3pyf3vlnxxfnrs3h33lwbx5n1lz4cz8ivh7bi8vjd6makxf6p1xz1d70ww3gj2ghryhbg6w1myxacgirk51ym23qzksdizk"; }; }; "p-try-1.0.0" = { @@ -20648,7 +19982,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/p-try/-/p-try-2.0.0.tgz"; - sha512 = "hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ=="; + sha512 = "10wq29qb47wqbg97i161pgz891dcvhzckhp4sb6vshm5ndfaqddm7cxz0gmpxyk1rqhqq749ac449z0rx6lc7c9gk3sh8faf2i79jl4"; }; }; "pac-proxy-agent-2.0.2" = { @@ -20657,7 +19991,7 @@ let version = "2.0.2"; src = fetchurl { url = "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-2.0.2.tgz"; - sha512 = "cDNAN1Ehjbf5EHkNY5qnRhGPUCp6SnpyVof5fRzN800QV1Y2OkzbH9rmjZkbBRa8igof903yOnjIl6z0SlAhxA=="; + sha512 = "3222l2ayjn9gj3q7br4vxqz1a5bq5h53fcqvrns3zdlqfinarbi0kgkrlf7vyc7arr7ljks5988y4a6lyd663br23wvg391a4vl0cvh"; }; }; "pac-resolver-3.0.0" = { @@ -20666,7 +20000,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/pac-resolver/-/pac-resolver-3.0.0.tgz"; - sha512 = "tcc38bsjuE3XZ5+4vP96OfhOugrX+JcnpUbhfuc4LuXBLQhoTthOstZeoQJBDnQUDYzYmdImKsbz0xSl1/9qeA=="; + sha512 = "1w6mzypllad7wy658kd56fqih6i8x0f841a2pnnn97dhkk810nw3r9f73kpxqa6llkrgy6p1ax4xy1rgbzvrf4zczblvf13pgqkgixm"; }; }; "package-json-1.2.0" = { @@ -20693,7 +20027,7 @@ let version = "5.0.0"; src = fetchurl { url = "https://registry.npmjs.org/package-json/-/package-json-5.0.0.tgz"; - sha512 = "EeHQFFTlEmLrkIQoxbE9w0FuAWHoc1XpthDqnZ/i9keOt701cteyXwAxQFLpVqVjj3feh2TodkihjLaRUtIgLg=="; + sha512 = "0p21ljjj6v8r8a8fvl691yyfy7n79anx5940c80byrdfwimpnvqwiznwagrvshhnvlmawz8c40nwhf37nqwaa44j3mn44p5ahad1q8i"; }; }; "package-json-versionify-1.0.4" = { @@ -20738,7 +20072,7 @@ let version = "1.0.6"; src = fetchurl { url = "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz"; - sha512 = "lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg=="; + sha512 = "1r9hy37qsbhv5ipsydkbir2yl7qg3lbpgj4qzrnb903w8mhj9ibaww0zykbp0ak1nxxp6mpbws3xsrf7fgq39zchci90c7chgqvh1wm"; }; }; "parallel-transform-1.1.0" = { @@ -20774,7 +20108,7 @@ let version = "5.1.1"; src = fetchurl { url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz"; - sha512 = "KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw=="; + sha512 = "1vq07bq1c0b5v82mknyg2y4lrdy1qmqkzw432f406rx9v2hni3040z270kpsvi2vf4ikq6x0k9g8p16n7aafrwsrpwvx0wpa9z7pz18"; }; }; "parse-entities-1.1.2" = { @@ -20783,7 +20117,7 @@ let version = "1.1.2"; src = fetchurl { url = "https://registry.npmjs.org/parse-entities/-/parse-entities-1.1.2.tgz"; - sha512 = "5N9lmQ7tmxfXf+hO3X6KRG6w7uYO/HL9fHalSySTdyn63C3WNvTM/1R8tn1u1larNcEbo3Slcy2bsVDQqvEpUg=="; + sha512 = "192kwdas18b36rdffjp98qvq4ssnmnndryvcz2lzz6g8dnn5pfglabpjcj4p9bngkyp5z0fwvpb0vj4i9zdskp8gzbig6zd1scnbpz4"; }; }; "parse-filepath-1.0.2" = { @@ -20828,7 +20162,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/parse-help/-/parse-help-1.0.0.tgz"; - sha512 = "dlOrbBba6Rrw/nrJ+V7/vkGZdiimWJQzMHZZrYsUq03JE8AV3fAv6kOYX7dP/w2h67lIdmRf8ES8mU44xAgE/Q=="; + sha512 = "3yh82647179kg24y1gn8xj8p7ms23gz9yvmz623x8pz1p8mq09wjkdb2j5ssnbn60rr8n5651v9jhdyzxggkjbszvq1msfs2rnanlvn"; }; }; "parse-json-2.2.0" = { @@ -20882,7 +20216,7 @@ let version = "5.9.1"; src = fetchurl { url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-5.9.1.tgz"; - sha512 = "yy7UTSmliOT/7Yl+P4hwwW2W7PbCTAMcD0lasaVG+k4/2laj42YWzLm468bLFGDoFPIb29g3BuwBcA3gLopKww=="; + sha512 = "31lm2ifw06p00gc0qvxinqvy8afhq0lrg3fpf5rrhb6dqx3avd3ykps8sjv2nj91wf06k62yvn9cvf1f243yzl9xpzy9255556x8bnb"; }; }; "parse-torrent-6.0.1" = { @@ -20891,7 +20225,7 @@ let version = "6.0.1"; src = fetchurl { url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-6.0.1.tgz"; - sha512 = "triz3PBolkV8kvyV2GEvVn3wne5HayJc+C1Px3L0o1UaNBO2qlv2u6seXDrbRicmL/qL2msZap+SuzMuzNb/Kg=="; + sha512 = "0mgzmnc5qrvp4lzd8cnpnlbz8pjc9s6vcx5q7mbpgv5pamn2cs1lmd3yircfkrdz1f24ss7xsfz0zan5xhxi5gwj9y4b5k8y3fb7f5n"; }; }; "parse-torrent-file-2.1.4" = { @@ -20918,7 +20252,7 @@ let version = "3.0.3"; src = fetchurl { url = "https://registry.npmjs.org/parse5/-/parse5-3.0.3.tgz"; - sha512 = "rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA=="; + sha512 = "005xscj5zlz7pkxa5ngys7i7pdb2f4pirj1zw7hr1145zhxxgg04nhykjh1csy2ncr5lyjw8phq8m2ylqhfhi2z4hgvjb2b1rkbs0xf"; }; }; "parsejson-0.0.1" = { @@ -21134,11 +20468,7 @@ let version = "0.0.1"; src = fetchurl { url = "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz"; -<<<<<<< HEAD - sha512 = "BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ=="; -======= sha512 = "2avzhwqw37c6l7a0f276z7qzchzhwppinxhgg6q7by5bskwb7q7sfhwijb6fx4ingbdzb4i1pw6la5pg0izb5s4z69268278gil1ah5"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "path-dirname-1.0.2" = { @@ -21210,7 +20540,7 @@ let version = "1.0.4"; src = fetchurl { url = "https://registry.npmjs.org/path-loader/-/path-loader-1.0.4.tgz"; - sha512 = "k/IPo9OWyofATP5gwIehHHQoFShS37zsSIsejKe6fjI+tqK+FnRpiSg4ZfWUpxb0g2PfCreWPqBD4ayjqjqkdQ=="; + sha512 = "1ss8fmalfnf2hx07sbbf2nzcf1z85m7jksnaf18i5lp85mylav3wckypakqq7lb93nbrpsj50ajhx0wl63w0q7y9k08gjlnsfihzwlk"; }; }; "path-parse-1.0.5" = { @@ -21291,7 +20621,7 @@ let version = "2.2.1"; src = fetchurl { url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-2.2.1.tgz"; - sha512 = "gu9bD6Ta5bwGrrU8muHzVOBFFREpp2iRkVfhBJahwJ6p6Xw20SjT0MxLnwkjOibQmGSYhiUnf2FLe7k+jcFmGQ=="; + sha512 = "0cndhcd7swpnjv1gwkjb1lqcjcd09is4c4ryjycs39jil9ngklsk7n0l6b09qapj68ni9r924albq2lyghrlg5mmq3brrfslh7mpvw2"; }; }; "path-type-1.1.0" = { @@ -21318,7 +20648,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz"; - sha512 = "T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg=="; + sha512 = "2z1csf4c3fmlwl0ahk533z5zqkjdf36ccfx11kakl9xran9f5asxm4cxjq4lx1kwqdp8gki786cgpldvgrkvfc7pcvh07j5ssqm8rjg"; }; }; "pathval-1.1.0" = { @@ -21363,7 +20693,7 @@ let version = "3.0.16"; src = fetchurl { url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.16.tgz"; - sha512 = "y4CXP3thSxqf7c0qmOF+9UeOTrifiVTIM+u7NWlq+PRsHbr7r7dpCmvzrZxa96JJUNi0Y5w9VqG5ZNeCVMoDcA=="; + sha512 = "1q07jjlhbbn9fd1aqyrqqxlv184k8ppbafavwvb19lvgbzvp8fnrx7qd9lkbfzb6g4592czp178wizmgvhrhandxngiljv1gczrg06b"; }; }; "peer-wire-protocol-0.7.1" = { @@ -21372,7 +20702,7 @@ let version = "0.7.1"; src = fetchurl { url = "https://registry.npmjs.org/peer-wire-protocol/-/peer-wire-protocol-0.7.1.tgz"; - sha512 = "V9oTa/ZcfNNz9fAST28Gg0fXbPeFPk3SBImsYO8GDDG5D0E195vxXmjZ+SPrzr4BJyMQmdDmwUfTf9MZ62z4mw=="; + sha512 = "2dzhv7b379pzls7q7kd168h4ckh3gnfxcizknb8bvqrpxrm847vjc8c0vpn1b490k94sgl5yxndfiw30rply4phymrx6z2wyrmi7njp"; }; }; "peer-wire-swarm-0.12.2" = { @@ -21381,7 +20711,7 @@ let version = "0.12.2"; src = fetchurl { url = "https://registry.npmjs.org/peer-wire-swarm/-/peer-wire-swarm-0.12.2.tgz"; - sha512 = "sIWZ1nTL9l6mI9J18kW1AeByBwagvNzGJlMmQA9pM+otKQtTIwnigK8SR0nEFrNZYqZelI6RQ6g4udvtQ2TI1g=="; + sha512 = "3bchr23xpdvjf588f8qx52ylri5kcqnqi4lf4mgh3i0j8sk1cljvsikd47l09jk4v3drg500q3p5q01nm2z4xfj4fk5xxnbfkb9k1dh"; }; }; "peerflix-0.34.0" = { @@ -21508,7 +20838,7 @@ let version = "4.16.1"; src = fetchurl { url = "https://registry.npmjs.org/pino/-/pino-4.16.1.tgz"; - sha512 = "ST/IC5RMyqrOZL+Hq6LDwz5h4fGKABXzx2/5Ze7rz5TjuPvE8uI72dzj409xkq9JjyWsKoOOApgXn8kEjJ73yg=="; + sha512 = "35gg7lc0k4ry5wq0a786amc4n7lkbwjf57y7qywv4xy5wn4zfwf756gxgp6bybgqzria04ay7hn2gn3qfiap1xzck7amjjcjh5whgs9"; }; }; "pino-std-serializers-2.1.0" = { @@ -21517,7 +20847,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-2.1.0.tgz"; - sha512 = "NqWvrQD/GpY78ybiNBzi/dg8ylERhDo6nB33j5sfCKpUmWLc3lYzeoBjyRoCMvEpDpL9lmH6ufRd0jw6rcd1pQ=="; + sha512 = "2jpbixd78yd4pglp7x635pxj872kw9j08dcjqw0g8rmdpnwcacm9ah83ydqzxqxkhx3m10ia753rn7xw8f39qi6ycxrc6pz02nsz99n"; }; }; "pkg-dir-2.0.0" = { @@ -21580,7 +20910,7 @@ let version = "3.0.2"; src = fetchurl { url = "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.0.2.tgz"; - sha512 = "bslfSeW+ksUbB/sYZeEdKFyTG4YWU9YKRvqfSRvZKE675khAuBUPqV5RUwJZaGuWmVQLweK45Q+lPHFVnSlSug=="; + sha512 = "2x54acxamqkr98gwnwf5h8bajcrcsv8b4156laym47ibf2093kbnki8v4dlk7zs8q5dclqnhqdr6p183phna67v0wdwb4mywm4mzjbf"; }; }; "plist-1.2.0" = { @@ -21607,7 +20937,7 @@ let version = "3.0.1"; src = fetchurl { url = "https://registry.npmjs.org/plist/-/plist-3.0.1.tgz"; - sha512 = "GpgvHHocGRyQm74b6FWEZZVRroHKE1I0/BTjAmySaohK+cUn+hZpbqXkc3KWgW3gQYkqcQej35FohcT0FRlkRQ=="; + sha512 = "12n868myk28as4ivyihfw9ai50y0vc1jrr77r55drlidyi7qpwlm23aj9n05qqlzhs544yah6p535b5hiayh6xykf81q68wg8f2z60s"; }; }; "plist-with-patches-0.5.1" = { @@ -21634,7 +20964,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz"; - sha512 = "L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA=="; + sha512 = "32d7a6iycndvgqcm7crxl59cfqlsz01iz6q7f4a4jgzwmp68myw0sl8315c0lyx2wvj4xmblhvd8jva3vhqndn1chg6rg1vv78wyp1g"; }; }; "pluralize-1.2.1" = { @@ -21652,7 +20982,7 @@ let version = "7.0.0"; src = fetchurl { url = "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz"; - sha512 = "ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow=="; + sha512 = "2ihaln20qjx82jx73wgzirbyp8mfmhxr75am1h0w8n5hy2gsbgvw9dricv7h57ycxzax84bma96wjscmdszs5mr2lsyxpfjvhwl2601"; }; }; "po2json-0.4.5" = { @@ -21697,7 +21027,7 @@ let version = "9.2.0"; src = fetchurl { url = "https://registry.npmjs.org/popsicle/-/popsicle-9.2.0.tgz"; - sha512 = "petRj39w05GvH1WKuGFmzxR9+k+R9E7zX5XWTFee7P/qf88hMuLT7aAO/RsmldpQMtJsWQISkTQlfMRECKlxhw=="; + sha512 = "23p3a888k27q99lj4904nbcs8r51nlm4qdzs3m0xp9y4ci1rxzymzzckrblrmlmbzrlxx4i9zx7s56gcrhvi2jm3ypr3lvhgy7m3sx5"; }; }; "popsicle-proxy-agent-3.0.0" = { @@ -21751,7 +21081,7 @@ let version = "6.0.19"; src = fetchurl { url = "https://registry.npmjs.org/postcss/-/postcss-6.0.19.tgz"; - sha512 = "f13HRz0HtVwVaEuW6J6cOUCBLFtymhgyLPV7t4QEk2UD3twRI9IluDcQNdzQdBpiixkXj2OmzejhhTbSbDxNTg=="; + sha512 = "174sg3cs8v8bqg8rnk673qp365n46kls3f3a41pp0jx48qivkg06rck0j2bfyzm5hr1i6kjbcn82h1rkjgfi5jbd0amrd877m3wfpbz"; }; }; "postcss-6.0.23" = { @@ -21760,11 +21090,7 @@ let version = "6.0.23"; src = fetchurl { url = "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz"; -<<<<<<< HEAD - sha512 = "soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag=="; -======= sha512 = "1m7l8kr2bwwm21ki5jvrkfaxfxg5nqjn4zk9xf0b7rzyq1xz4s64cm5wh34qf0c13vva14wbmvfkwg7yndmcpnmcq9m7pc93vba90xj"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "prebuild-install-2.1.2" = { @@ -21782,7 +21108,7 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-4.0.0.tgz"; - sha512 = "7tayxeYboJX0RbVzdnKyGl2vhQRWr6qfClEXDhOkXjuaOKCw2q8aiuFhONRYVsG/czia7KhpykIlI2S2VaPunA=="; + sha512 = "2ffx8smnrj269a2r9lsiv4s71rvzhanb3a3hqg1i8daznmhl0w9lfsylh9hw5si1agsmbsn0j2syp8sn9r7cwxm8ps9b80vwv2v5mpf"; }; }; "precond-0.2.3" = { @@ -21872,7 +21198,7 @@ let version = "2.1.5"; src = fetchurl { url = "https://registry.npmjs.org/prfun/-/prfun-2.1.5.tgz"; - sha512 = "UCDQscAfQ1HArwvSUobJWbc3sTGLqGpYkRqXUpBZgf+zOWpOjz2dxnpRsOu+qxIj1K0n5UT1wgbCCgetsIwiug=="; + sha512 = "2x2535hml3hmhh6qbsl9r97mpa264mbpvmv0lbsqsfkv3sfd8wv7zw1b68555qsj5c6ma4b66qkgdsrr6355lhbmz052hqzq2qx082h"; }; }; "printf-0.2.5" = { @@ -21890,7 +21216,7 @@ let version = "0.1.8"; src = fetchurl { url = "https://registry.npmjs.org/private/-/private-0.1.8.tgz"; - sha512 = "VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg=="; + sha512 = "2dgznnpxsgy9bgp4kfby1is72blvca4lhmqb3nlja8yiig1v52c12p5yw0aag8jqazhkqvihpxmqf9gsjlg5dr1jb56jxzgnqrazy2n"; }; }; "probe-image-size-4.0.0" = { @@ -21899,7 +21225,7 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/probe-image-size/-/probe-image-size-4.0.0.tgz"; - sha512 = "nm7RvWUxps+2+jZKNLkd04mNapXNariS6G5WIEVzvAqjx7EUuKcY1Dp3e6oUK7GLwzJ+3gbSbPLFAASHFQrPcQ=="; + sha512 = "1qwy2hmhw201igjdk90dpky6b1qpc9b2jm7nxrsshcagf0ln73s62mwfd2j0mkfx29bhsndjmm8v2fk3nwk8jinzavcz9iicnyx2vly"; }; }; "process-0.11.10" = { @@ -21935,7 +21261,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz"; - sha512 = "MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="; + sha512 = "0rw8xpqqkhs91722slvzf8icxfaimqp4w8zb3840jxr7r8n8035byl6dhdi5bm0yr6x7sdws0gf3m025fg6hqgaklwlbl4d7bah5l9j"; }; }; "progress-1.1.8" = { @@ -21962,7 +21288,7 @@ let version = "1.2.2"; src = fetchurl { url = "https://registry.npmjs.org/progress-string/-/progress-string-1.2.2.tgz"; - sha512 = "JymvIR4IJ0qTyma7ExefBeJGp2IGaXYGWv8Z//Jq+AhrCd0uKlMPK9IWJ0LL6zbXbAN8fhLe1TL1hl1ZKOljDw=="; + sha512 = "07n7s98b5fqdx9jspg14zkw0dndfdpbrd12f5nj5c7m6aifvl4nn27qdbrgy6gzb837cs86cakldqh5kwbi7fv6ra9ll9q83qhsya97"; }; }; "promiscuous-0.6.0" = { @@ -21998,7 +21324,7 @@ let version = "7.3.1"; src = fetchurl { url = "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz"; - sha512 = "nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg=="; + sha512 = "17cn4nns2nxh9r0pdiqsqx3fpvaa82c1mhcr8r84k2a9hkpb0mj4bxzfbg3l9iy74yn9hj6mh2gsddsi3v939a1zp7ycbzqkxfm12cy"; }; }; "promise-finally-3.0.0" = { @@ -22079,11 +21405,7 @@ let version = "15.6.2"; src = fetchurl { url = "https://registry.npmjs.org/prop-types/-/prop-types-15.6.2.tgz"; -<<<<<<< HEAD - sha512 = "3pboPvLiWD7dkI3qf3KbUe6hKFKa52w+AE0VCqECtf+QHAKgOL37tTaNCnuX1nAAQ4ZhyP+kYVKf8rLmJ/feDQ=="; -======= sha512 = "06xxxr7wsrg57sjc6jgzj31hr1h0w6njxxhm39nnpxvsf5008f91zxm0ahhl5ad00z6rrwsa8la3vjikdr7zsldj3fkwn72y8zfi5ny"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "properties-1.2.1" = { @@ -22137,7 +21459,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/protocol-buffers-encodings/-/protocol-buffers-encodings-1.1.0.tgz"; - sha512 = "SmjEuAf3hc3h3rWZ6V1YaaQw2MNJWK848gLJgzx/sefOJdNLujKinJVXIS0q2cBQpQn2Q32TinawZyDZPzm4kQ=="; + sha512 = "28vhf9zv4h6gc3nia9pshzn16jm1h6r58nj2mwmkji35fjbscjwxrxigwy87j82y8wayn29qgc31939b1fyk6dmvvhwv1gp0ywc8s2a"; }; }; "proxy-addr-1.0.10" = { @@ -22164,7 +21486,7 @@ let version = "2.0.3"; src = fetchurl { url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.3.tgz"; - sha512 = "jQTChiCJteusULxjBp8+jftSQE5Obdl3k4cnmLA6WXtK6XFuWRnvVL7aCiBqaLPM8c4ph0S4tKna8XvmIwEnXQ=="; + sha512 = "1fjf093wrxz3nm9njw491r9rvqwrcv8d8h0mnmyakpijnbff7lllysr7aq9h9w7jdvxjvaf9r055ywd7sghcqxwa2nfpdc9423c414d"; }; }; "proxy-agent-3.0.0" = { @@ -22173,7 +21495,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/proxy-agent/-/proxy-agent-3.0.0.tgz"; - sha512 = "g6n6vnk8fRf705ShN+FEXFG/SDJaW++lSs0d9KaJh4uBWW/wi7en4Cpo5VYQW3SZzAE121lhB/KLQrbURoubZw=="; + sha512 = "1krp2s6sjv452zj0xhmknrm0769jx2v21bfas1aw2kvg2zhdxcq32w7i6kg87fd9ajyynss694bylaw8khkg8clsgxifz9wg6zgmac3"; }; }; "proxy-from-env-1.0.0" = { @@ -22245,11 +21567,7 @@ let version = "1.1.28"; src = fetchurl { url = "https://registry.npmjs.org/psl/-/psl-1.1.28.tgz"; -<<<<<<< HEAD - sha512 = "+AqO1Ae+N/4r7Rvchrdm432afjT9hqJRyBN3DQv9At0tPz4hIFSGKbq64fN9dVoCow4oggIIax5/iONx0r9hZw=="; -======= sha512 = "1kn3gyjf7iqhzqydc4050i81sih4nkmgpry3fms563588117qzjvp82zl5hsxqkr18s51px6iz9lzg3csvqdp0vxlmzwdxy0za8w2pq"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "pstree.remy-1.1.0" = { @@ -22258,7 +21576,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.0.tgz"; - sha512 = "q5I5vLRMVtdWa8n/3UEzZX7Lfghzrg9eG2IKk2ENLSofKRCXVqMvMUHxCKgXNaqH/8ebhBxrqftHWnyTFweJ5Q=="; + sha512 = "3jqj1qpjdy5lizvm5mir14vqzzqgaim2yl0iwa164ps6mlp20liyaid1mhr62k23dg0zbkk11zcnzk56d0xvzy9ddbdfmjcnjy3k4mb"; }; }; "public-encrypt-4.0.2" = { @@ -22267,7 +21585,7 @@ let version = "4.0.2"; src = fetchurl { url = "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.2.tgz"; - sha512 = "4kJ5Esocg8X3h8YgJsKAuoesBgB7mqH3eowiDzMUPKiRDDE7E/BqqZD1hnTByIaAFiwAw246YEltSq7tdrOH0Q=="; + sha512 = "38qgcvnxnp4lva9c0x6xhq05hb811n8q5s8dxchm5mg04rv64693a1w2hrhy8lcgbvs36kv003ar1xsh312c866hzvwb0qwr897jhp2"; }; }; "pug-2.0.3" = { @@ -22402,7 +21720,7 @@ let version = "2.0.4"; src = fetchurl { url = "https://registry.npmjs.org/pull-level/-/pull-level-2.0.4.tgz"; - sha512 = "fW6pljDeUThpq5KXwKbRG3X7Ogk3vc75d5OQU/TvXXui65ykm+Bn+fiktg+MOx2jJ85cd+sheufPL+rw9QSVZg=="; + sha512 = "1k9a17my3m2zkz7g8hynxswrqks679vih7vd97qz5ky16x4kkms4ysxxzs5744kfzwwxg9p14xgnx8vs6kc15wjmdlkhlfy62bajvkx"; }; }; "pull-live-1.0.1" = { @@ -22429,7 +21747,7 @@ let version = "3.6.8"; src = fetchurl { url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.6.8.tgz"; - sha512 = "wQUIptQBcM0rFsUhZoEpOT3vUn73DtTGVq3NQ86c4T7iMOSprDzeKWYq2ksXnbwiuExTKvt+8G9fzNLFQuiO+A=="; + sha512 = "3w8xs22qp9cqpvgy1zgnajk9jw25g4x2x5xlak657g3rb59whqf4gp1kk747kddav3d83ppgr9fyg9r560nc8f52qmwsw01sjk0h1f1"; }; }; "pull-window-2.1.4" = { @@ -22456,7 +21774,7 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/pump/-/pump-1.0.3.tgz"; - sha512 = "8k0JupWme55+9tCVE+FS5ULT3K6AbgqrGa58lTT49RpyfwwcGedHqaC5LlQNdEAumn/wFsu6aPwkuPMioy8kqw=="; + sha512 = "2mj8bx34brvh97wd2xcn5phgyd2wh3l1ma2xfd0m53yf68w1izp46pmz0s9az5f36mhlvl0mvfd6hp5abhi75fhyrz9wyx6jnx0jkgj"; }; }; "pump-2.0.1" = { @@ -22465,7 +21783,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz"; - sha512 = "ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA=="; + sha512 = "288hcmlwdnqda84ylx9cv413ic0r59k0dp71hy7a200jsb7h1y63277jwdp1jdp13c1b3pl6g2gzr5gjv9p72f5sp7w3p0d34swrqxf"; }; }; "pump-3.0.0" = { @@ -22474,7 +21792,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz"; - sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww=="; + sha512 = "31n24fqakqmhzk2ch644gziskmysmrgiwclsdsr0rwk9spgikqpwickbnayap0rynfjlq72s7iny2p35n3qszypr97ws5njkpx741ig"; }; }; "pumpify-1.5.1" = { @@ -22483,7 +21801,7 @@ let version = "1.5.1"; src = fetchurl { url = "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz"; - sha512 = "oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ=="; + sha512 = "1sxm2mh7jmxhjqdrpdqrhc61ipk2cjyyyvsn9hmxlxnlpsasyzjdicl98pm63zv30012qhrxl57vdpdnnq2m2hl4w4ybgn7gqimjad0"; }; }; "punycode-1.3.2" = { @@ -22510,7 +21828,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz"; - sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; + sha512 = "381vqgh5xkqzrr6cxbzfykgnnk83m7qgpx3wjwj1hddn3sg2aibjxyr30rajpgv4js0cqknrbzwbfk5ryhiiyigzfjrk3zysy6i26sx"; }; }; "q-1.0.1" = { @@ -22564,7 +21882,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/qjobs/-/qjobs-1.2.0.tgz"; - sha512 = "8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg=="; + sha512 = "0g8mmxjq1gn92mf9gzpf2469xwrisbg2vdlxg3bnq18gqlviy2s7l7wi99wmbz5kvbb9yn0wxbi9r83f4jchhzivn0299vigc88k0zi"; }; }; "qs-0.4.2" = { @@ -22681,7 +21999,7 @@ let version = "6.5.0"; src = fetchurl { url = "https://registry.npmjs.org/qs/-/qs-6.5.0.tgz"; - sha512 = "fjVFjW9yhqMhVGwRExCXLhJKrLlkYSaxNWdyc9rmHlrVZbk35YHH312dFd7191uQeXkI3mKLZTIbSvIeFwFemg=="; + sha512 = "2d5w08p3vr4l6rjcn5n5ph8g5wr0nzpypg1b7axvz3q3r9pp5jxanhywvd76wk76nqjcqb4p6n4l4ifjw8164bcahhs71kjdy6ladby"; }; }; "qs-6.5.1" = { @@ -22690,7 +22008,7 @@ let version = "6.5.1"; src = fetchurl { url = "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz"; - sha512 = "eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A=="; + sha512 = "3waqapyj1k4g135sgj636rmswiaixq19is1rw0rpv4qp6k7dl0a9nwy06m7yl5lbdk9p6xpwwngnggbzlzaz6rh11c86j2nvnnf273r"; }; }; "qs-6.5.2" = { @@ -22699,7 +22017,7 @@ let version = "6.5.2"; src = fetchurl { url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz"; - sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="; + sha512 = "0c46ws0x9g3mmkgfmvd78bzvnmv2b8ryg4ah6jvyyqgjv9v994z7xdyvsc4vg9sf98gg7phvy3q1ahgaj5fy3dwzf2rki6bixgl15ip"; }; }; "qtdatastream-0.7.1" = { @@ -22726,7 +22044,7 @@ let version = "5.1.1"; src = fetchurl { url = "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz"; - sha512 = "gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw=="; + sha512 = "0kkwn38nmjd6n6byiz52gngvyiw46fbibx9c9p1vzn9g7l11f2jpbs39d4aqajk7kk2a6k69wx5bjgavbg1lh275ih6k84jdnr8wdc2"; }; }; "querystring-0.2.0" = { @@ -22780,7 +22098,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/random-access-file/-/random-access-file-2.0.1.tgz"; - sha512 = "nb4fClpzoUY+v1SHrro+9yykN90eMA1rc+xM39tnZ5R3BgFY+J/NxPZ0KuUpishEsvnwou9Fvm2wa3cjeuG7vg=="; + sha512 = "2zbpqbs4dvnpc3dpr2yz8phz6r49j4a57jjlx7nqk6rzy2q0437g537czdxyk7cfdmhsc0yvlvs8b7p7sxax1slpwz4d8bkb851zglx"; }; }; "random-access-memory-2.4.0" = { @@ -22798,7 +22116,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/random-access-memory/-/random-access-memory-3.0.0.tgz"; - sha512 = "O/d5C/kTOs/aDix1CD+N7z4SgNVGPx+xpFKXGfrC0TFpqYVrsJEUmQCl3ITTg7FVMoCmLBo5rdkA5FcFg00NTA=="; + sha512 = "160skc30mby806rmlwilb56h0r5bcc3sf2dr980k4a93c3bhnlnjcfiqbx1k5sjljqiygs6sn014gpgilzhhx9c1vdcyfhkz45pkxrv"; }; }; "random-access-storage-1.3.0" = { @@ -22807,11 +22125,7 @@ let version = "1.3.0"; src = fetchurl { url = "https://registry.npmjs.org/random-access-storage/-/random-access-storage-1.3.0.tgz"; -<<<<<<< HEAD - sha512 = "pdS9Mcb9TB7oICypPRALlheaSuszuAKmLVEPKJMuYor7R/zDuHh5ALuQoS+ox31XRwQUL+tDwWH2GPdyspwelA=="; -======= sha512 = "2a1x75jfbviixk1q51ynbql0i3mfzf7m0ps345v01wpif63zi3zp2k25s9jh3si5nk05f1kxd59l5wn1c83va9c43l1wk7xqqqvvm55"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "random-bytes-1.0.0" = { @@ -22838,7 +22152,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/randomatic/-/randomatic-3.0.0.tgz"; - sha512 = "VdxFOIEY3mNO5PtSRkkle/hPJDHvQhK21oa73K4yAc9qmp6N429gAyF1gZMOTMeS0/AYzaV/2Trcef+NaIonSA=="; + sha512 = "142g2k8ipzpkp1sv5zsbk8qy39r5isc1s9q2x910dh6zqwdksd6mkq16apdrfw6ssv14hpg64j4zy3v4m4lclpvwi767phqh4w4bp2m"; }; }; "randombytes-2.0.6" = { @@ -22847,7 +22161,7 @@ let version = "2.0.6"; src = fetchurl { url = "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz"; - sha512 = "CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A=="; + sha512 = "3a0zyz736klfzzpd9vwag3gznq7lrj57igm474dq279gsnyqdgfm1brhrs78ky30gsdwz9rwnjjms00fpdpp2p3x8p9mq2zbhw3k108"; }; }; "randomfill-1.0.4" = { @@ -22856,7 +22170,7 @@ let version = "1.0.4"; src = fetchurl { url = "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz"; - sha512 = "87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw=="; + sha512 = "0pm7c7mw7a3qwjr21f8cvxaa2sq5l4svqs51lppn833x0yvz3yx8x4vbd4rswjynykvlgvn4hrpq327pvbzp428f4b1fciy3xnmrfgk"; }; }; "range-parser-0.0.4" = { @@ -22901,11 +22215,7 @@ let version = "2.6.3"; src = fetchurl { url = "https://registry.npmjs.org/raven/-/raven-2.6.3.tgz"; -<<<<<<< HEAD - sha512 = "bKre7qlDW+y1+G2bUtCuntdDYc8o5v1T233t0vmJfbj8ttGOgLrGRlYB8saelVMW9KUAJNLrhFkAKOwFWFJonw=="; -======= sha512 = "2gnhljq0pn2h02rhkmx4900lps1clwmkv3g40an8v3bm04fs6vgrf3xi7wx5vbxvd9zvri8rxhl7mwymv8556vdz2syqns3m7pdxakc"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "raw-body-0.0.3" = { @@ -22959,29 +22269,9 @@ let version = "2.3.3"; src = fetchurl { url = "https://registry.npmjs.org/raw-body/-/raw-body-2.3.3.tgz"; - sha512 = "9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw=="; + sha512 = "27ygzjzpajjmz2bl1f7y1bla7wdw65w912r4i29x9p1r0pa5jivip658vwlkqq77n1nc619w1p52818mvihxhks4dlbc1pmbc925szm"; }; }; -<<<<<<< HEAD -<<<<<<< HEAD - "raw-socket-1.6.2" = { -======= -<<<<<<< HEAD - "raw-socket-1.6.1" = { ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 - name = "raw-socket"; - packageName = "raw-socket"; - version = "1.6.2"; - src = fetchurl { -<<<<<<< HEAD - url = "https://registry.npmjs.org/raw-socket/-/raw-socket-1.6.2.tgz"; - sha512 = "JbmNAXPFNI+yJv3Kx0Lsl+ao2doZ/kdz9J4Ba9+ggC1U4e50BK0GfHHYuLFj8acnYzqXgKiLzhi2ixOPk6/kcw=="; -======= - url = "https://registry.npmjs.org/raw-socket/-/raw-socket-1.6.1.tgz"; - sha512 = "0fhy1r7pyl4v2zmjz1fmvqbdmjscib47pbc5di3cn965j7zj3y5h2bs8x0r131i4s7xj47c36na1cgpppp71kvdc1qs78y4bf7fpa45"; -======= -======= ->>>>>>> nodePackages: meguca: 1.0.7 update "raw-socket-1.6.2" = { name = "raw-socket"; packageName = "raw-socket"; @@ -22989,11 +22279,6 @@ let src = fetchurl { url = "https://registry.npmjs.org/raw-socket/-/raw-socket-1.6.2.tgz"; sha512 = "1ry9bwkiw9qpdhqrs5si04p79ijg9zicfqvin3igh3as13lxvhm8bc0l3gnn0cyyirlgzhrvbcsirlpxi1cgjpx4sr8yd65fc0qvf95"; -<<<<<<< HEAD ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 -======= ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "rc-0.4.0" = { @@ -23011,7 +22296,7 @@ let version = "1.2.8"; src = fetchurl { url = "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz"; - sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw=="; + sha512 = "0xhy1n9n3y6cp28f8f0f2mi0xzc7ay1g5nhbp64fyvcwv9q30zq2zvyc5q2d0al8aa0hx101yq2y6d2ln4r5jxnqifh1pd3la1ccxnb"; }; }; "rc-config-loader-2.0.1" = { @@ -23020,7 +22305,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/rc-config-loader/-/rc-config-loader-2.0.1.tgz"; - sha512 = "OHr24Jb7nN6oaQOTRXxcQ2yJSK3SHA1dp2CZEfvRxsl/MbhFr4CYnkwn8DY37pKu7Eu18X4mYuWFxO6vpbFxtQ=="; + sha512 = "2sp3cd5mzpc91g5c8k7xwdm9gnax4pf6wvg09scksc81bs5p0qpzjf6s7xi36b0lxfhs76jmm48jv23biy4b4q3d6ldx77vjvhgcyiq"; }; }; "re-emitter-1.1.3" = { @@ -23083,7 +22368,7 @@ let version = "2.0.13"; src = fetchurl { url = "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.13.tgz"; - sha512 = "/1dZ7TRZvGrYqE0UAfN6qQb5GYBsNcqS1C0tNK601CFOJmtHI7NIGXwetEPU/OtoFHZL3hDxm4rolFFVE9Bnmg=="; + sha512 = "2d6gl0kam8r9s4akgqi1pjbfqa6iszwsi1v87kw354b68s7dck4w8flnjp38b9dsj9cldbch0czj1m9gbrh252dm3c6mg2r6knmjmzz"; }; }; "read-pkg-1.1.0" = { @@ -23146,7 +22431,7 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-4.0.0.tgz"; - sha512 = "6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA=="; + sha512 = "28400v5dwid6mc9x40s2mwfbkn22vj0dzx0ix8n2bffjx4p2ivb9b60bh743c74kdp0v391rdmladhgvrjgzihns456n977gr451sz9"; }; }; "read-torrent-1.3.0" = { @@ -23200,7 +22485,7 @@ let version = "2.3.6"; src = fetchurl { url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz"; - sha512 = "tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw=="; + sha512 = "0mj9b6190amln9rg89x5pq2n195s3v0gzicpdamv1kbabg69aw5m71l34jsjn7bqil7405l6l35x9ijnb3h4jz5vx2i00l8sl1ll2xm"; }; }; "readdirp-2.1.0" = { @@ -23254,7 +22539,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/record-cache/-/record-cache-1.1.0.tgz"; - sha512 = "u8rbtLEJV7HRacl/ZYwSBFD8NFyB3PfTTfGLP37IW3hftQCwu6z4Q2RLyxo1YJUNRTEzJfpLpGwVuEYdaIkG9Q=="; + sha512 = "3shd2b83m3bh5bcli5zl99k652hv5b06ldcnjv48gwarfxh02smyy2vr1z3z2zi9p9zgp41bhsgql042a66azy9d78v2mq9n6sdpjmv"; }; }; "recursive-readdir-2.2.2" = { @@ -23263,7 +22548,7 @@ let version = "2.2.2"; src = fetchurl { url = "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz"; - sha512 = "nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg=="; + sha512 = "0bb5d70l5lg02x515r2klvjhhz6xcxdb4ykbx16wq45l822bbsdd8sbki7vb28j17xr7181fmwlzhx3bizvr5xdq6cxpv53sidrq44x"; }; }; "recursive-watch-1.1.4" = { @@ -23272,7 +22557,7 @@ let version = "1.1.4"; src = fetchurl { url = "https://registry.npmjs.org/recursive-watch/-/recursive-watch-1.1.4.tgz"; - sha512 = "fWejAmdLi7B/jipBUjTLnqId+PK+573fbGNbdaNA/AiAnQAx6OYOLCGWRs0W5+PyM1rLzZSWK2f40QpHSR49PQ=="; + sha512 = "0yks7j98w5d3y375fb99kfbb8rz5qz72v6ld5i15h7fds1i02fq027w82ipanv3dkgvvrxyybw1v8lyrcs54h9airzv12sbcw1a6rvx"; }; }; "redent-1.0.0" = { @@ -23326,7 +22611,7 @@ let version = "2.8.0"; src = fetchurl { url = "https://registry.npmjs.org/redis/-/redis-2.8.0.tgz"; - sha512 = "M1OkonEQwtRmZv4tEWF2VgpG0JWJ8Fv1PhlgT5+B+uNq2cA3Rt1Yt/ryoR+vQNOQcIEgdCdfH0jr3bDpihAw1A=="; + sha512 = "3a3044ax6qdvss83xgjfx10h5q91ls0mwgs3wpsnxcdsiipq3cnmqzsh6glyq0r7vsmpw49jp84c2jnfrhi2bgycrkd9hhhf6ia8lrk"; }; }; "redis-commands-1.3.5" = { @@ -23335,7 +22620,7 @@ let version = "1.3.5"; src = fetchurl { url = "https://registry.npmjs.org/redis-commands/-/redis-commands-1.3.5.tgz"; - sha512 = "foGF8u6MXGFF++1TZVC6icGXuMYPftKXt1FBT2vrfU9ZATNtZJ8duRC5d1lEfE8hyVe3jhelHGB91oB7I6qLsA=="; + sha512 = "2q8pai3gf0dczb03jjig3mpaz4j2kvw8icpgf8hp4fryr3d6c0mjkvxxdmlyhainybx4zhgqsw9ghc9p986alzdzd2n2p4cxvr8b0by"; }; }; "redis-parser-2.6.0" = { @@ -23371,7 +22656,7 @@ let version = "0.11.1"; src = fetchurl { url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz"; - sha512 = "MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="; + sha512 = "03d4l8l8cyywh93wf5vw84lq56jh1b1d7jll4ny4z060j9hvx7w5q3q0b8q227jm93749k1c9h86r2pz0bm2xq5vp14g3r2kbvqc2rj"; }; }; "regenerator-runtime-0.9.6" = { @@ -23389,7 +22674,7 @@ let version = "0.4.4"; src = fetchurl { url = "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz"; - sha512 = "nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ=="; + sha512 = "1crfmf19zkv0imnbbkj7bwrcyin3zxa88cs86b6apkxj8qrsmkxnydhsy2ia75q4ld10rhi2s2c36h7g77a997mh9c2z453s311jllx"; }; }; "regex-not-1.0.2" = { @@ -23398,16 +22683,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz"; - sha512 = "J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A=="; - }; - }; - "regexp.prototype.flags-1.2.0" = { - name = "regexp.prototype.flags"; - packageName = "regexp.prototype.flags"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.2.0.tgz"; - sha512 = "ztaw4M1VqgMwl9HlPpOuiYgItcHlunW0He2fE6eNfT6E/CF2FtYi9ofOYe4mKntstYk0Fyh/rDRBdS3AnxjlrA=="; + sha512 = "3cggngaj8m70zdn8kghha4mhvavm7jfy5xm2iqi94w4gi5m5irs3nlrgg975w2231y49jnnw7zhsg648pbkl9zb6vwhii83926q7917"; }; }; "regexp.prototype.flags-1.2.0" = { @@ -23425,7 +22701,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/regexpp/-/regexpp-1.1.0.tgz"; - sha512 = "LOPw8FpgdQF9etWMaAfG/WRthIdXJGYp4mJ2Jgn/2lpkbod9jPn0t9UqN7AxBOKNfzRbYyVfgc7Vk4t/MpnXgw=="; + sha512 = "21xg69jgy5r7mffh5gjaqsv6izqvqh466q3fanmnzsgk33xhxp68nnszw4jcxk2w8lnc92phy26sr7xqq3ni36mg9yh2xb0bbqg1qrc"; }; }; "registry-auth-token-3.3.2" = { @@ -23434,7 +22710,7 @@ let version = "3.3.2"; src = fetchurl { url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.2.tgz"; - sha512 = "JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ=="; + sha512 = "2fv3fbyf4wv81famfkd3j8nld0fc4sfjfxfc91wwpqwgp00nl3727c9z4sdm4gicb4nxzmhkrphsnphpamgmknsh2ak15qpmmrzvg94"; }; }; "registry-url-3.1.0" = { @@ -23515,7 +22791,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz"; - sha512 = "8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ=="; + sha512 = "1frr714kg9xk84fp4r74zg044g4lhf996lw9gzd19mlij47jkbnb44xmmas7wqv5604r77n68qx77wrnrc7mkfbm5ygv4ls2rdapzgj"; }; }; "remove-bom-stream-1.2.0" = { @@ -23542,7 +22818,7 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/render-media/-/render-media-3.1.0.tgz"; - sha512 = "rTNcgMHJ/MrQbt96bTTwlfBY1A87EqNx0buJ2pPHTuLGwk0Aw99e1BrHgr6SpB4D7Cb7AMdiL/Gzx+UYrHliVw=="; + sha512 = "1bn4ydc33jwgczi5xicf07v4vn067m4jaz85iqssigdzhq09p1cdqjfqy9xm2dvs5qs64iv1za5iw4my0s6synzdv8cmz69q605qcxd"; }; }; "render-readme-1.3.1" = { @@ -23677,7 +22953,7 @@ let version = "2.83.0"; src = fetchurl { url = "https://registry.npmjs.org/request/-/request-2.83.0.tgz"; - sha512 = "lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw=="; + sha512 = "0by1djkn836sqd9pk2c777wcjvp34qbk1plx7s4lmykljrblpjc64dvn6ni2vyxsbyk33wnl6avym8vgw0ggr4226xakck8mw7y07cm"; }; }; "request-2.85.0" = { @@ -23686,7 +22962,7 @@ let version = "2.85.0"; src = fetchurl { url = "https://registry.npmjs.org/request/-/request-2.85.0.tgz"; - sha512 = "8H7Ehijd4js+s6wuVPLjwORxD4zeuyjYugprdOXlPSqaApmL/QOy+EB/beICHVCHkGMKNh5rvihb5ov+IDw4mg=="; + sha512 = "2d3hg10zs5ycnr8prmiwdhacf88fl0x0bi6szs0z2r07zcbk419laixwpjp8sqapbc2ifyyih7p3r60wgr58bmcncz3pqnx523c8zph"; }; }; "request-2.87.0" = { @@ -23695,7 +22971,7 @@ let version = "2.87.0"; src = fetchurl { url = "https://registry.npmjs.org/request/-/request-2.87.0.tgz"; - sha512 = "fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw=="; + sha512 = "0vnsbflzj7gxa33r47bzsiaf7jc00b9iqkqdz8l7n9x5dgdgbq1qpcqqslds1arazipz8pjr4m5rf4ikg4d59d49gn9dky0ds921jkx"; }; }; "request-2.9.203" = { @@ -23722,7 +22998,7 @@ let version = "1.13.0"; src = fetchurl { url = "https://registry.npmjs.org/requestretry/-/requestretry-1.13.0.tgz"; - sha512 = "Lmh9qMvnQXADGAQxsXHP4rbgO6pffCfuR8XUBdP9aitJcLQJxhp7YZK4xAVYXnPJ5E52mwrfiKQtKonPL8xsmg=="; + sha512 = "2d6rk1gry4jlbd4i3ghm6vn9vjcjwsyb02w9f4jc5ximih9niq4javazp9hbm658zp2fz2zm8xy1dp2rxqv2c84301p0hg7rfl7ss1f"; }; }; "require-directory-2.1.1" = { @@ -23749,7 +23025,7 @@ let version = "2.0.2"; src = fetchurl { url = "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz"; - sha512 = "Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="; + sha512 = "09yzgr8s5p0rb2ic71zylyy7dcxk9xskcmkgh7bddq4h383nn34g47wry2yvw7flxzjzsbak6d1n9cabfgh5gnb2kifrccixrcjgzax"; }; }; "require-main-filename-1.0.1" = { @@ -23803,11 +23079,7 @@ let version = "1.8.1"; src = fetchurl { url = "https://registry.npmjs.org/resolve/-/resolve-1.8.1.tgz"; -<<<<<<< HEAD - sha512 = "AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA=="; -======= sha512 = "1h4w4h955vs1426yq9wpw2cs8iy81860h3jbzg2ksqbshz3gd6khp4xf49nvva2zffdm70513jkfmk60acgb6ghqi4yshmv02n0y9q2"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "resolve-dir-1.0.1" = { @@ -23924,7 +23196,7 @@ let version = "0.1.15"; src = fetchurl { url = "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz"; - sha512 = "TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="; + sha512 = "2d7igpgyzdlpx2ni0sql8gsnqk9qivfsw6bn1aklm19kbhgxjzmlazz8szfsbdpjka4gk6i3zf0jqa0llaf7dni636fnbwfmyjmhfad"; }; }; "retry-0.10.1" = { @@ -24014,7 +23286,7 @@ let version = "2.6.2"; src = fetchurl { url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz"; - sha512 = "lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w=="; + sha512 = "3kmrqh8xli7rzfm8wc6j9lp0c6vml172iv3z088an9xlwl1xvkvh3fn92za66ms4c9yww80qa5kan31k1z1ypqvkchmh1mznb09xdwn"; }; }; "ripemd160-2.0.2" = { @@ -24023,7 +23295,7 @@ let version = "2.0.2"; src = fetchurl { url = "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz"; - sha512 = "ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA=="; + sha512 = "0hbd4cqbkycj691cj7gm40x3x5w46xk56xkg6n11wskc3k4xbdz1xxxyy6r27rcwipkzp19y1fmpfmb4lgf10l8asn6prdn11m24bla"; }; }; "rndm-1.2.0" = { @@ -24077,7 +23349,7 @@ let version = "3.6.2"; src = fetchurl { url = "https://registry.npmjs.org/rsvp/-/rsvp-3.6.2.tgz"; - sha512 = "OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw=="; + sha512 = "2bjwzsigk7685syp50amryj0sx08l155azg1z4ldx95gadlwfm07y0iyv0vfwgfchbripn2a5r04qhv546djh0biw8prgpx6r0qdx9r"; }; }; "run-async-0.1.0" = { @@ -24104,7 +23376,7 @@ let version = "1.1.9"; src = fetchurl { url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz"; - sha512 = "DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q=="; + sha512 = "3sl2kbxcwy92faw7zm0z4vql32622mag0bh6dv4bjk7cvc8a9sarvdclr9508hknhl0b7v8kzqvg3klvvff7psmvkfg9hy32i4sfjhc"; }; }; "run-parallel-limit-1.0.5" = { @@ -24113,7 +23385,7 @@ let version = "1.0.5"; src = fetchurl { url = "https://registry.npmjs.org/run-parallel-limit/-/run-parallel-limit-1.0.5.tgz"; - sha512 = "NsY+oDngvrvMxKB3G8ijBzIema6aYbQMD2bHOamvN52BysbIGTnEY2xsNyfrcr9GhY995/t/0nQN3R3oZvaDlg=="; + sha512 = "2b87xk6x0fxs3bls9zzprvxiy2ldgvjxckkfv3ccg23j6f8qv58379pmylkkiv61w6b8qcsmsciwch7lg41nxx0qk6bpgp076h3xiin"; }; }; "run-queue-1.0.3" = { @@ -24131,7 +23403,7 @@ let version = "1.1.8"; src = fetchurl { url = "https://registry.npmjs.org/run-series/-/run-series-1.1.8.tgz"; - sha512 = "+GztYEPRpIsQoCSraWHDBs9WVy4eVME16zhOtDB4H9J4xN0XRhknnmLOl+4gRgZtu8dpp9N/utSPjKH/xmDzXg=="; + sha512 = "1gg6q66zyhqr3ylp9zx79v9qyxns1j643p9gkk2kqkijihpvp27ilhzg0qb8kiqxcsw2m0y5rbmdkq6qdhnkar4l088p96i8dhfsv7q"; }; }; "rusha-0.8.13" = { @@ -24194,7 +23466,7 @@ let version = "5.5.11"; src = fetchurl { url = "https://registry.npmjs.org/rxjs/-/rxjs-5.5.11.tgz"; - sha512 = "3bjO7UwWfA2CV7lmwYMBzj4fQ6Cq+ftHc2MvUe+WMS7wcdJ1LosDWmdjPQanYp2dBRj572p7PeU81JUxHKOcBA=="; + sha512 = "029r8qw66ax8g757mxnmvzr302rv7b2lw33sqv7b81qnbkms9qz0biijvpm2bv3fd3zpydal11iygnf061w2rmray10sz0n9knwxf6x"; }; }; "rxjs-6.2.1" = { @@ -24203,11 +23475,7 @@ let version = "6.2.1"; src = fetchurl { url = "https://registry.npmjs.org/rxjs/-/rxjs-6.2.1.tgz"; -<<<<<<< HEAD - sha512 = "OwMxHxmnmHTUpgO+V7dZChf3Tixf4ih95cmXjzzadULziVl/FKhHScGLj4goEw9weePVOH2Q0+GcCBUhKCZc/g=="; -======= sha512 = "3z5q9i844ahi771sf87sf6mwdwp03qk5248z2y1953sh53zb64z6hkmv8y8z5y9wmyjiqjz5i7gf5qab6vmggh3lva7965734gk20rv"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "safe-buffer-5.0.1" = { @@ -24225,7 +23493,7 @@ let version = "5.1.1"; src = fetchurl { url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz"; - sha512 = "kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="; + sha512 = "1p28rllll1w65yzq5azi4izx962399xdsdlfbaynn7vmp981hiss05jhiy9hm7sbbfk3b4dhlcv0zy07fc59mnc07hdv6wcgqkcvawh"; }; }; "safe-buffer-5.1.2" = { @@ -24234,7 +23502,7 @@ let version = "5.1.2"; src = fetchurl { url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"; - sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; + sha512 = "3xbm0dkya4bc3zwfwpdzbl8ngq0aai5ihlp2v3s39y7162c7wyvv9izj3g8hv6dy6vm2lq48lmfzygk0kxwbjb6xic7k4a329j99p8r"; }; }; "safe-json-parse-1.0.1" = { @@ -24252,7 +23520,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.2.0.tgz"; - sha512 = "gH8eh2nZudPQO6TytOvbxnuhYBOvDBBLW52tz5q6X58lJcd/tkmqFR+5Z9adS8aJtURSXWThWy/xJtJwixErvg=="; + sha512 = "2z2n4cbf392dw9gbghn8paj8jsqkijbkpb6gf8z2nm4kdkzqwjjb7szpadczbcxbd5i035g2dha2yy6vgmv9wm47g8d7ffrd63iwzw0"; }; }; "safe-regex-1.1.0" = { @@ -24270,7 +23538,7 @@ let version = "2.1.2"; src = fetchurl { url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"; - sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; + sha512 = "2v99f22kh56y72d3s8wrgdvf5n10ry40dh3fwnsxr4d5rfvxdfxfmc3qyqkscnj4f8799jy9bpg6cm21x2d811dr9ib83wjrlmkg6k1"; }; }; "sander-0.5.1" = { @@ -24288,7 +23556,7 @@ let version = "1.18.2"; src = fetchurl { url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.18.2.tgz"; - sha512 = "52ThA+Z7h6BnvpSVbURwChl10XZrps5q7ytjTwWcIe9bmJwnVP6cpEVK2NvDOUhGupoqAvNbUz3cpnJDp4+/pg=="; + sha512 = "2kbz3x78dradp1xaddz60iakax4cj1rqgdxhjj5ljfgwm17kjc5pvr1kh2lyqrbxxmcx9kbfv8pa68af126v5clprks11vvwq1y2r77"; }; }; "sax-0.3.5" = { @@ -24342,7 +23610,7 @@ let version = "1.2.4"; src = fetchurl { url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz"; - sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="; + sha512 = "1dn291mjsda42w8kldlbmngk6dhjxfbvvd5lckyqmwbjaj6069iq3wx0nvcfglwnpddz2qa93lzf4hv77iz43bd2qixa079sjzl799n"; }; }; "schema-utils-0.4.5" = { @@ -24351,7 +23619,7 @@ let version = "0.4.5"; src = fetchurl { url = "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.5.tgz"; - sha512 = "yYrjb9TX2k/J1Y5UNy3KYdZq10xhYcF8nMpAW6o3hy6Q8WSIEf9lJHG/ePnOBfziPM3fvQwfOwa13U/Fh8qTfA=="; + sha512 = "1y97jl7qm7xvd867cghrgfzrlyf5z05rvwpigvi4ijzy4c8ckqr0bl76ym5nh6akiyc2qb19kbnmmk1r8nkfm4fsp4lznnpsipy72n9"; }; }; "scoped-regex-1.0.0" = { @@ -24459,7 +23727,7 @@ let version = "5.5.0"; src = fetchurl { url = "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz"; - sha512 = "4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA=="; + sha512 = "0h32zh035y8m6dzcqhcymbhwgmc8839fa1hhj0jfh9ivp9kmqfj1sbwnsnkzcn9qm3sqn38sa8ys2g4c638lpnmzjr0a0qndmv7f8p1"; }; }; "semver-compare-1.0.0" = { @@ -24504,7 +23772,7 @@ let version = "1.1.2"; src = fetchurl { url = "https://registry.npmjs.org/semver-utils/-/semver-utils-1.1.2.tgz"; - sha512 = "+RvtdCZJdLJXN6ozVqbypYII/m4snihgWvmFHW8iWusxqGVdEP31QdUVVaC6GeJ9EYE0JCMdWiNlLF3edjifEw=="; + sha512 = "09ryf3nvrfjqr93b8fj691lh48pvqhrpah5a5fm87szs42xcnl33sss49piv1grb9h2i7icdvz0i0m5yak5ccxa6xbv4x294rsfs6zr"; }; }; "send-0.0.3" = { @@ -24576,7 +23844,7 @@ let version = "0.16.2"; src = fetchurl { url = "https://registry.npmjs.org/send/-/send-0.16.2.tgz"; - sha512 = "E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw=="; + sha512 = "1kh8iy2h9x6mqbb0kssb4d966irri0z8g2151jwx47q32dbmds01j9fs2c8hln68dqqh0ims8p450z3xfw6vs8v2k253c1cyla1ibhk"; }; }; "sentiment-2.1.0" = { @@ -24612,7 +23880,7 @@ let version = "1.5.0"; src = fetchurl { url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.5.0.tgz"; - sha512 = "Ga8c8NjAAp46Br4+0oZ2WxJCwIzwP60Gq1YPgU+39PiTVxyed/iKE/zyZI6+UlVYH5Q4PaQdHhcegIFPZTUfoQ=="; + sha512 = "2hiydb59y0q07hp3qfs8g9qjhgmhmajps769wpw2f5ghxwy3ibr7y7lnx7q23snmc3asgzhik0444jvfs3d4gmy0qx9w0n0v3q1rbqr"; }; }; "serve-favicon-2.3.2" = { @@ -24633,32 +23901,13 @@ let sha1 = "935d240cdfe0f5805307fdfe967d88942a2cbcf0"; }; }; -<<<<<<< HEAD -<<<<<<< HEAD "serve-handler-3.2.1" = { name = "serve-handler"; packageName = "serve-handler"; version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/serve-handler/-/serve-handler-3.2.1.tgz"; - sha512 = "4UYBO6zH61m5YUD54lJ1A8POOPmOOhBdNXJgy5/plzoOBcIluUJgmsayeI4af+QeUNPa5G5e609ycWTpJmKo2Q=="; -======= - "serve-handler-3.1.1" = { -======= - "serve-handler-3.2.1" = { ->>>>>>> nodePackages: meguca: 1.0.7 update - name = "serve-handler"; - packageName = "serve-handler"; - version = "3.2.1"; - src = fetchurl { -<<<<<<< HEAD - url = "https://registry.npmjs.org/serve-handler/-/serve-handler-3.1.1.tgz"; - sha512 = "32qab4isx4xhvmqqllr6i3n69zgdzjqyff5wdll8d5wj6mv6v24vx1hbqx7hk0v35jnj4s896fi8cnrbcc85mf4z8xmhpbs2p9nrhp8"; ->>>>>>> nodePackages: meguca: 1.0.5 -> 1.0.7 -======= url = "https://registry.npmjs.org/serve-handler/-/serve-handler-3.2.1.tgz"; sha512 = "3cshqi6x5j72wjgxdg6xr6ssd81xr3z3a77icn6k9h45f95q82hwflpx6gwnq3j6mfi0flfz4wcxhq3fm9f5ya0c6wmksy7mhxh2ip1"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "serve-index-1.7.3" = { @@ -24703,7 +23952,7 @@ let version = "1.13.2"; src = fetchurl { url = "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz"; - sha512 = "p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw=="; + sha512 = "2gkkd7jlmrn2a8d736x3fcij9jj16aglbq6pcivb897g01k1dlrpvb565d3hq9zwafyr60zlcqr5flgd2yqs36s8wxpylxqnck5vyx7"; }; }; "serve-static-1.8.1" = { @@ -24766,7 +24015,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz"; - sha512 = "hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg=="; + sha512 = "1xdxg14zh452ih8f7826ki7xpq8wk8a831pm5zngqf8cbc4qv6mr9npks863bfqylfrhm161whf9199rmqn4i12wzmz2ks69z3343c7"; }; }; "setimmediate-1.0.5" = { @@ -24793,7 +24042,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz"; - sha512 = "BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="; + sha512 = "2jlhhawfqdiga1m6if01ks1q3yx56k5vj6wf372589vkswvdflw7224viivxali56b0jjsckpmjy10rj6fcakhw2dbq2psr197kzw86"; }; }; "sha.js-2.4.11" = { @@ -24802,7 +24051,7 @@ let version = "2.4.11"; src = fetchurl { url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz"; - sha512 = "QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ=="; + sha512 = "2lihh3p2mrwymrly93ni37b1dvzwbm1jc47iqp66ax4bj41js4mr94wghv3c2agq98bb44nxxddn2n67ab978zk00xx2znw3vj2kha0"; }; }; "shallow-clone-0.1.2" = { @@ -24892,11 +24141,7 @@ let version = "0.8.1"; src = fetchurl { url = "https://registry.npmjs.org/shelljs/-/shelljs-0.8.1.tgz"; -<<<<<<< HEAD - sha512 = "YA/iYtZpzFe5HyWVGrb02FjPxc4EMCfpoU/Phg9fQoyMC72u9598OUBrsU8IrtwAKG0tO8IYaqbaLIw+k3IRGA=="; -======= sha512 = "0c12wlk7s62rnm6d8cc4frddll01p5f117v2ss075y9zxxfpl5qr322bw7qdksgl7ljfc04rv2wyn6qyjv1m5953ywmgk39srif43v0"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "shellwords-0.1.1" = { @@ -24905,7 +24150,7 @@ let version = "0.1.1"; src = fetchurl { url = "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz"; - sha512 = "vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww=="; + sha512 = "31h1mksdbashjfpvj7xh8nqw7siqm5v1yj77pmcsbkzqi4hrpjqmzv2sifjlljjyx87sfqnmcn0yqh1hfgn669c43i2dargyi8i4p5w"; }; }; "shush-1.0.0" = { @@ -24932,7 +24177,7 @@ let version = "0.3.1"; src = fetchurl { url = "https://registry.npmjs.org/sign-addon/-/sign-addon-0.3.1.tgz"; - sha512 = "feaoG7+8IXr9SymOEd8VTZCSlVZArWcBDZ33IIdfXlU5NWWzXdCxCjPDqAkLQplFa7RRZr1S4lSmgMPn80Ze1A=="; + sha512 = "3a5wipkwz1q19jlw99bsrjinimlb6a21c4sihrk1aqx0pdkclskjmayby3j1xwx1l0ngba0asar542d2pgi33i99gypl8dwpwdsirkx"; }; }; "signal-exit-3.0.2" = { @@ -24986,7 +24231,7 @@ let version = "2.8.1"; src = fetchurl { url = "https://registry.npmjs.org/simple-get/-/simple-get-2.8.1.tgz"; - sha512 = "lSSHRSw3mQNUGPAYRqo7xy9dhKmxFXIjLjp4KHpf99GEH2VH7C3AM+Qfx6du6jhfUi6Vm7XnbEVEf7Wb6N8jRw=="; + sha512 = "13j7pz8kfspyi25dkkvb6wm5r95yf7adskwf7z46g02vv27clgq9lgpbxx2hy1s5qip45dim625sby77fm4c67h31a0769p5i2qf94m"; }; }; "simple-get-3.0.2" = { @@ -24995,29 +24240,9 @@ let version = "3.0.2"; src = fetchurl { url = "https://registry.npmjs.org/simple-get/-/simple-get-3.0.2.tgz"; - sha512 = "dU3TBVIGkP5Hzw6o74hJx+VzTBTX2rqIiLfugs0HdmdVQCQp76XGg2jlBCqfRJfW/n6/mUKTi+s3rnzX7SgbBA=="; + sha512 = "021na7dsxyawdzbif9l56dzgvzdd5s4kwm09rb8hg3abvr94i05arvn0z6q5vmpi24bmnnp2i677rf7964fza0frx3zx406a82x6kbm"; }; }; -<<<<<<< HEAD -<<<<<<< HEAD - "simple-git-1.96.0" = { -======= -<<<<<<< HEAD - "simple-git-1.95.1" = { ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 - name = "simple-git"; - packageName = "simple-git"; - version = "1.96.0"; - src = fetchurl { -<<<<<<< HEAD - url = "https://registry.npmjs.org/simple-git/-/simple-git-1.96.0.tgz"; - sha512 = "+gXuzJFpGtK9zCa7rPMMNs8AF2weWMsB0Vlyym5VkFX2VGQ3VBzKhnxPN//PWrGuPFGQ/u0F1yL6rZoPhj/KPQ=="; -======= - url = "https://registry.npmjs.org/simple-git/-/simple-git-1.95.1.tgz"; - sha512 = "3ssfxzdgj6ycrklss1hxrmwcfsncx9bccnsxrkdknw68p2g9is3j3dc2kk748jn0kky9q7ajdjqvv6k18n6qbj9llaiy5kh9k1i7mbj"; -======= -======= ->>>>>>> nodePackages: meguca: 1.0.7 update "simple-git-1.96.0" = { name = "simple-git"; packageName = "simple-git"; @@ -25025,11 +24250,6 @@ let src = fetchurl { url = "https://registry.npmjs.org/simple-git/-/simple-git-1.96.0.tgz"; sha512 = "0ywlgw61ydavyi2sw2yvzlha4yaxcasrzzkfkvwhv51qm1pciagcmchampclwjrs40wnn0ydhbh1krn1krsrfr6rjyx46k9j76fw1gs"; -<<<<<<< HEAD ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 -======= ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "simple-lru-cache-0.0.2" = { @@ -25056,7 +24276,7 @@ let version = "9.1.2"; src = fetchurl { url = "https://registry.npmjs.org/simple-peer/-/simple-peer-9.1.2.tgz"; - sha512 = "MUWWno5o5cvISKOH4pYQ18PQJLpDaNWoKUbrPPKuspCLCkkh+zhtuQyTE8h2U2Ags+/OUN5wnUe92+9B8/Sm2Q=="; + sha512 = "3csdx7k87pxpga7kmqdwl6fxyrj0q2kfv4174qcp5nkiyr19458p45jmvr3rss656ldas23p8jd1hyp22bf51x3934cprb8isg9ci9i"; }; }; "simple-plist-0.2.1" = { @@ -25074,7 +24294,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/simple-sha1/-/simple-sha1-2.1.1.tgz"; - sha512 = "pFMPd+I/lQkpf4wFUeS/sED5IqdIG1lUlrQviBMV4u4mz8BRAcB5fvUx5Ckfg3kBigEglAjHg7E9k/yy2KlCqA=="; + sha512 = "2l45afqnby96gdihg3hi51006502yc33wly8cgmgrww00aiq37jdvp22l9qhbxljra5j6s8lwigjh5hpzj521ccgwlhk59zw9vhylx4"; }; }; "simple-swizzle-0.2.2" = { @@ -25101,7 +24321,7 @@ let version = "7.0.2"; src = fetchurl { url = "https://registry.npmjs.org/simple-websocket/-/simple-websocket-7.0.2.tgz"; - sha512 = "cAjSaqHMtO2qc1HHSrW44aTrb2Xa7wZzHajvH6An4IhCFjTuPUXfmSByd9Z0B5Bc6bmiwQ2bFHMUMA8vGC5Bug=="; + sha512 = "2x42bhq5w7k053k2jdhvhd2p7lmr407fkb7fwi0k7glaggf6hb452704yh1zvx83mrhdvyscmpyp971p2slmisiffmfvd6cl5md423h"; }; }; "simplediff-0.1.1" = { @@ -25155,7 +24375,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/siphash24/-/siphash24-1.1.1.tgz"; - sha512 = "dKKwjIoTOa587TARYLlBRXq2lkbu5Iz35XrEVWpelhBP1m8r2BGOy1QlaZe84GTFHG/BTucEUd2btnNc8QzIVA=="; + sha512 = "1ach37ibirvd6yxa42ffkn1dwfcar70pjbnj9alrf713n1bdzb4y44nbrm5bi3swpvqrr7f8sbbcyj586wn049hxmyawf8kia6b18kl"; }; }; "skin-tone-1.0.0" = { @@ -25227,7 +24447,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz"; - sha512 = "POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg=="; + sha512 = "1xd3zsk02nck4y601rn98n8cicrphaw5bdix278mk1yizmjv9s0wpa6akcqggd7d99c55s3byf4ylqdxkshyfsfnfx7lvwbmq2b3siw"; }; }; "sliced-0.0.3" = { @@ -25299,7 +24519,7 @@ let version = "0.8.2"; src = fetchurl { url = "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz"; - sha512 = "FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg=="; + sha512 = "2b0sap2q0c6qbfkw6znql845b143frn5gkkz4gpirjhgwa2j3wy3jsvrfg51s5c1w1m4nkgis97x9yvmzsc533kap9j3h3zcffqxp0n"; }; }; "snapdragon-node-2.1.1" = { @@ -25308,7 +24528,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz"; - sha512 = "O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw=="; + sha512 = "2gk18pdld8ij1bpa2mdwl8f7i4rl5d4ys3qw31hipj56wslnsfhp1vxp3q36kj1m4f34wzzlvj0282qx5xlflqf978xyqlc2viyaviv"; }; }; "snapdragon-util-3.0.1" = { @@ -25317,7 +24537,7 @@ let version = "3.0.1"; src = fetchurl { url = "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz"; - sha512 = "mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ=="; + sha512 = "1jsaqma4ycl2iq0761i1w7758z1kq7gbsij4xfb7p5cnw0qa62pszv6pr3j856n3pbxww7wwxs5wvcg2cb6vy020kw3bchashqs9clr"; }; }; "snapsvg-0.5.1" = { @@ -25353,26 +24573,16 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz"; - sha512 = "FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg=="; + sha512 = "0k2smmr24w5hb1cpql6vcgh58vzp4pmh9anf0bgz3arlsgq1mapnlq9fjqr6xs10aq1cmxaw987fwknqi62frax0fvs9bj3q3kmpg8l"; }; }; -<<<<<<< HEAD - "snyk-1.87.0" = { + "snyk-1.88.0" = { name = "snyk"; packageName = "snyk"; - version = "1.87.0"; + version = "1.88.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.87.0.tgz"; - sha1 = "8d35801eddaca1ffc3ecc2da1c7ae2dab9bf97d3"; -======= - "snyk-1.83.0" = { - name = "snyk"; - packageName = "snyk"; - version = "1.83.0"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.83.0.tgz"; - sha1 = "207fb2f47306719f62664d2d2e8e807b294baea0"; ->>>>>>> nodePackages: meguca: 1.0.7 update + url = "https://registry.npmjs.org/snyk/-/snyk-1.88.0.tgz"; + sha1 = "10d171427de94f6474d64fdc524d6f87c0ab069e"; }; }; "snyk-config-2.1.0" = { @@ -25381,16 +24591,16 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/snyk-config/-/snyk-config-2.1.0.tgz"; - sha512 = "D1Xz1pZa9lwA9AHogmAigyJGo/iuEGH+rcPB77mFsneVfnuiK9c6IjnsHbEBUf1cePtZvWdGBjs6e75Cvc2AMg=="; + sha512 = "0r81kdx8az7nfiv0r36ggarzdw5rzai06qivv1r48xdfax2gdz9axxjhnwyzhf3mpz6245fz2ilc8l349h85s01yh05rxjsjvbg6m8g"; }; }; - "snyk-docker-plugin-1.10.2" = { + "snyk-docker-plugin-1.10.3" = { name = "snyk-docker-plugin"; packageName = "snyk-docker-plugin"; - version = "1.10.2"; + version = "1.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-1.10.2.tgz"; - sha512 = "/pHIhyYhEOUYogn8aXPSt/VMHIxobmNcuU04Jze+NWW/B93emc7i8zxvTgjl4JIsx22sVfnLBSbjDMntk4+X4A=="; + url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-1.10.3.tgz"; + sha512 = "0xx8hdq1axraknywdy4vdbvj7m41p7g102ivfa2pli9sl7hxaw4dzp5dccsl813nwy9w3bmafapghmans1w4ha85j82irgl5v6km34w"; }; }; "snyk-go-plugin-1.5.1" = { @@ -25399,7 +24609,7 @@ let version = "1.5.1"; src = fetchurl { url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.5.1.tgz"; - sha512 = "8OPJOT05Z/UL5fFSXV6b/A6KjlS1Ahr2gpup1bhXtAGXlUUPyWidqkCIER9fexDXqYWgAoDAdn9YHIvmL/5bfw=="; + sha512 = "1zmpzigws5iqn3zfv0800m0hnlxf43vbwgi3220mafnij8g8narf0dlaywdbacvhbv1l0mmaj78l3pwkdg5slpiwl5zarrr7lwwkqzh"; }; }; "snyk-gradle-plugin-1.3.0" = { @@ -25408,7 +24618,7 @@ let version = "1.3.0"; src = fetchurl { url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-1.3.0.tgz"; - sha512 = "rKZcPwbDM9zk3pFcO0w77MIKOZTkk5ZBVBkBlTlUiFg+eNOKqPTmw2hBGF5NB4ASQmMnx3uB1C8+hrQ405CthA=="; + sha512 = "22av46k72s8cgigsj0ppir7cd1150079mg1hhb8qgkg9a4asdw3wn48ahwra08rai0rd4z4jhwhmhpc7d63np4ivvjdqcy30qzmr9mc"; }; }; "snyk-module-1.8.2" = { @@ -25417,7 +24627,7 @@ let version = "1.8.2"; src = fetchurl { url = "https://registry.npmjs.org/snyk-module/-/snyk-module-1.8.2.tgz"; - sha512 = "XqhdbZ/CUuJ5gSaYdYfapLqx9qm2Mp6nyRMBCLXe9tJSiohOJsc9fQuUDbdOiRCqpA4BD6WLl+qlwOJmJoszBg=="; + sha512 = "03372r6cvic19gajy5sa3q11sjal4499svhv50bglywf9jfi2555lpnvsshh08kr6krwcmnm7vb3fm4va3pb616h5wy4ln2kxnmva2y"; }; }; "snyk-mvn-plugin-1.2.0" = { @@ -25426,7 +24636,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-1.2.0.tgz"; - sha512 = "ieTWhn1MB88gEQ6nUtGCeUKQ6Xoxm+u+QmD9u3zfP1QS5ep9fWt3YYDUQjgUiDTJJy7QyVQdZ/fsz3RECnOA7w=="; + sha512 = "3pq0wqa8isczv7pcwfm9jfh5qkwjd482hw45m40c5vnnzbxxbji4m1zvxybpzb08azfp6rigblr0hkrhb8m59qf24hcy1scgn3ddr49"; }; }; "snyk-nuget-plugin-1.6.2" = { @@ -25435,7 +24645,7 @@ let version = "1.6.2"; src = fetchurl { url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.6.2.tgz"; - sha512 = "8l8hS85esXyweTFgUFdwnGT94Ts42KcG5fdBX2wYosQkpUMePd+GTT9+64k/GvdH5hqcNt2OvtzW+Uf8JF+pbA=="; + sha512 = "1najpr4zi3zkmnwps7dsdlw3bk4gxqs7y4ynziz9n3dyg8y8fjj9i5231n5yhgpwl3agn1q7ghzsr4wf1bm0q1ig6q7rcayrr5j2pzj"; }; }; "snyk-php-plugin-1.5.1" = { @@ -25444,7 +24654,7 @@ let version = "1.5.1"; src = fetchurl { url = "https://registry.npmjs.org/snyk-php-plugin/-/snyk-php-plugin-1.5.1.tgz"; - sha512 = "g5QSHBsRJ2O4cNxKC4zlWwnQYiSgQ77Y6QgGmo3ihPX3VLZrc1amaZIpPsNe1jwXirnGj2rvR5Xw+jDjbzvHFw=="; + sha512 = "0bwffvgwcqgmw4m8zpnm3y6p651fg6nbv1kwacjd6k5cwvbnraggxc4wa6rl1h8x7cbwhx04iid02avwn60njnwf2w669qi3cf15543"; }; }; "snyk-policy-1.12.0" = { @@ -25453,7 +24663,7 @@ let version = "1.12.0"; src = fetchurl { url = "https://registry.npmjs.org/snyk-policy/-/snyk-policy-1.12.0.tgz"; - sha512 = "CEioNnDzccHyid7UIVl3bJ1dnG4co4ofI+KxuC1mo0IUXy64gxnBTeVoZF5gVLWbAyxGxSeW8f0+8GmWMHVb7w=="; + sha512 = "3pmnx9hjrlz0gpxy6b2gia65h1rpdalc1g68s759p0ik0xq5rgi8hm3cqnvicg24cgqm8qwdsf5v7bcfxcj3m6yi7rc2wgkf0vahj08"; }; }; "snyk-python-plugin-1.6.1" = { @@ -25462,7 +24672,7 @@ let version = "1.6.1"; src = fetchurl { url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.6.1.tgz"; - sha512 = "6zr5jAB3p/bwMZQxZpdj+aPmioTgHB4DI6JMLInhZupss0x8Ome5YqzVzBbOvUKNrc3KaLtjGrJWcAuxDL6M/g=="; + sha512 = "3z8rghcn45p0mmj39ivns6arnnqshmxrqbcrmdccawnffkw9jrnrsk6w64jqk524c1iw770hj5fd8zrcfbncccl67qgd9vp026gjfpb"; }; }; "snyk-resolve-1.0.1" = { @@ -25471,7 +24681,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/snyk-resolve/-/snyk-resolve-1.0.1.tgz"; - sha512 = "7+i+LLhtBo1Pkth01xv+RYJU8a67zmJ8WFFPvSxyCjdlKIcsps4hPQFebhz+0gC5rMemlaeIV6cqwqUf9PEDpw=="; + sha512 = "2kh7wgl3yjw4am7ay4ag5d6qynbj06jzqf6wph17lhwx9ichwl6adqaf8nbsksib1y65kmvmvqm90j5zqdxfx6qj97qs1kdp0nbxs7g"; }; }; "snyk-resolve-deps-3.1.0" = { @@ -25480,7 +24690,7 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/snyk-resolve-deps/-/snyk-resolve-deps-3.1.0.tgz"; - sha512 = "YVAelR+dTpqLgfk6lf6WgOlw+MGmGI0r3/Dny8tUbJJ9uVTHTRAOdZCbUyTFqJG7oEmEZxUwmfjqgAuniYwx8Q=="; + sha512 = "3qk3349lw5q1spqk4q1arw496hbp4d8qlj576whfl710kf7ajwpv4kcak5wprzhvwmqs656q7w71sc0jvz9afprh65rlklx3yaiwl31"; }; }; "snyk-sbt-plugin-1.3.0" = { @@ -25489,7 +24699,7 @@ let version = "1.3.0"; src = fetchurl { url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-1.3.0.tgz"; - sha512 = "SRxPB16392dvN3Qv2RfUcHe0XETLWx2kNIOuoNXvc2Gl6DuPW+X+meDJY7xC/yQhU7bSPPKoM2B7awYaj9i2Bg=="; + sha512 = "03bdn4g3836nyv06flg4g6jnr9j297z8ay67jg0k7zfanwg7glaaqbkxzas1bl36jj1snyb8ifb8xvhshbxjbvl6xpngxxpbq3ly729"; }; }; "snyk-tree-1.0.0" = { @@ -25552,7 +24762,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/socket.io/-/socket.io-2.1.1.tgz"; - sha512 = "rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA=="; + sha512 = "343q0n5zxyjzzcmyq7dr3naqbrpl3x469y1ff8zxxr104np1l5l9w1d0vl7nncbaxhxymwplbzfy9sbipjrbp5d001nvv9ysymnmr5c"; }; }; "socket.io-adapter-0.2.0" = { @@ -25624,7 +24834,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.1.1.tgz"; - sha512 = "jxnFyhAuFxYfjqIgduQlhzqTcOEQSn+OHKVfAxWaNWa7ecP7xSNk2Dx/3UEsDcY7NcFafxvNvKPmmO7HTwTxGQ=="; + sha512 = "0cz212gqzp9irm3pk6inzssq4skpihd5i0xszrwv1j27igvqdwvnrimk8ah6px53j77yjhhw5q96fl74pj7c852iqgic5rf235ca6cg"; }; }; "socket.io-parser-2.1.2" = { @@ -25660,7 +24870,7 @@ let version = "3.1.3"; src = fetchurl { url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.1.3.tgz"; - sha512 = "g0a2HPqLguqAczs3dMECuA1RgoGFPyvDqcbaDEdCWY9g59kdUAz3YRmaJBNKXflrHNwB7Q12Gkf/0CZXfdHR7g=="; + sha512 = "3pd3lbxawkd1zs739v0vv81vhf6pyax989j96hrc7vhql0xv7kn13sr893hrnn6m71jngw5h61523dq0b0p8drvff0fm0lbz8fbcil3"; }; }; "socket.io-parser-3.2.0" = { @@ -25669,7 +24879,7 @@ let version = "3.2.0"; src = fetchurl { url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.2.0.tgz"; - sha512 = "FYiBx7rc/KORMJlgsXysflWx/RIvtqZbyGLlHZvjfmPTPeuD/I8MaW7cfFrj5tRltICJdgwflhfZ3NVVbVLFQA=="; + sha512 = "10calkdapaxrn8pjqghqxl9h2s6bm76wdd7rp3fd468zz43xcyx6qvywfdivrb2r1dsddig2byv2mbymiyb2q4r628s7z6wpb3q320m"; }; }; "socks-1.1.10" = { @@ -25696,7 +24906,7 @@ let version = "3.0.1"; src = fetchurl { url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-3.0.1.tgz"; - sha512 = "ZwEDymm204mTzvdqyUqOdovVr2YRd2NYskrYrF2LXyZ9qDiMAoFESGK8CRphiO7rtbo2Y757k2Nia3x2hGtalA=="; + sha512 = "2a5lsw4fry6nqk3jdxvwqrnpasypvl8c4d0kg32912820lc72l7s9jzidfsrn2an9c66xqicspxb2vnir5cjspprs9qklxnd75060b7"; }; }; "sodium-javascript-0.5.5" = { @@ -25705,7 +24915,7 @@ let version = "0.5.5"; src = fetchurl { url = "https://registry.npmjs.org/sodium-javascript/-/sodium-javascript-0.5.5.tgz"; - sha512 = "UMmCHovws/sxIBZsIRhIl8uRPou/RFDD0vVop81T1hG106NLLgqajKKuHAOtAP6hflnZ0UrVA2VFwddTd/NQyA=="; + sha512 = "3451wvpagbw2ib50galmlfrb5za3zh0ml1irbm2ijd0lbjblg9va4fnag6sfs7msb1m0i5zicz93jwp90c22v0n40qzpczhicg85jah"; }; }; "sodium-native-2.1.6" = { @@ -25714,7 +24924,7 @@ let version = "2.1.6"; src = fetchurl { url = "https://registry.npmjs.org/sodium-native/-/sodium-native-2.1.6.tgz"; - sha512 = "vfovcNlU8C93SbeNoGSAdW5zVOTlrh1sTy+TzdC2FhDTE/IUK6j4ML5gdr/qziLz4XRT4EQWJvbFzql6CAAH/A=="; + sha512 = "3y0f008galwxign4qb49q2kfkhz68nfxazpcq5y63wahaqly89x640nnv8cv4rg9xn1vbp5wia76vkmh1ja13dp95vjzw2lv5q2zymx"; }; }; "sodium-universal-2.0.0" = { @@ -25723,7 +24933,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/sodium-universal/-/sodium-universal-2.0.0.tgz"; - sha512 = "csdVyakzHJRyCevY4aZC2Eacda8paf+4nmRGF2N7KxCLKY2Ajn72JsExaQlJQ2BiXJncp44p3T+b80cU+2TTsg=="; + sha512 = "2rd6r7v2i3z76rzvllqx9ywk5f64q23944njcf14vv7x3l0illqn41bgdiifik4kswgys99mxsrqinq8akf3n7b15r9871km74mbivj"; }; }; "sorcery-0.10.0" = { @@ -25768,7 +24978,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/sort-on/-/sort-on-3.0.0.tgz"; - sha512 = "e2RHeY1iM6dT9od3RoqeJSyz3O7naNFsGy34+EFEcwghjAncuOXC2/Xwq87S4FbypqLVp6PcizYEsGEGsGIDXA=="; + sha512 = "1f06qmh0rhv011nigfa79ymlakg4mp0sb7apw7mvg1fbf6w1662223k8i0ziy1d3dnd2s77xvfb6b15ks54cxw7yr9sfcv2imwlfr3v"; }; }; "sorted-array-functions-1.2.0" = { @@ -25777,7 +24987,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/sorted-array-functions/-/sorted-array-functions-1.2.0.tgz"; - sha512 = "sWpjPhIZJtqO77GN+LD8dDsDKcWZ9GCOJNqKzi1tvtjGIzwfoyuRH8S0psunmc6Z5P+qfDqztSbwYR5X/e1UTg=="; + sha512 = "1759vgxawg63w16nnrklz5azzj9kklrlz5sdd643y8jp8qz7hiwdn5ydlnwx2ns4j761x4rqllh6fvlzjqgi3dixy7dl9hr28z66smi"; }; }; "sorted-indexof-1.0.0" = { @@ -25804,7 +25014,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz"; - sha512 = "I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A=="; + sha512 = "3q09f2w67qqhl3lwiisj4422mj9nfldg4cxmidfrjcwn3k7spm9g46x4n1j6kv39bi9khmcpyvfa3fwski488ibivyg9bwijjw2cr93"; }; }; "source-map-0.1.31" = { @@ -25867,7 +25077,7 @@ let version = "0.6.1"; src = fetchurl { url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"; - sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; + sha512 = "3p7hw8p69ikj5mwapmqkacsjnbvdfk5ylyamjg9x5izkl717xvzj0vk3fnmx1n4pf54h5rs7r8ig5kk4jv4ycqqj0hv75cnx6k1lf2j"; }; }; "source-map-resolve-0.5.2" = { @@ -25876,7 +25086,7 @@ let version = "0.5.2"; src = fetchurl { url = "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz"; - sha512 = "MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA=="; + sha512 = "14dmrwi7wa13wr1mrygjmb49mzsycpj8h5r41y7qvdf98lz9qzaww7vis6cvgqgfx0ly1sx4vsmw45xzlzs6indjcs5pkrjvjyaqfij"; }; }; "source-map-support-0.3.2" = { @@ -25894,7 +25104,7 @@ let version = "0.4.18"; src = fetchurl { url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz"; - sha512 = "try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA=="; + sha512 = "1n37icn5xpsxs2x8szv6ifajjf066fskm04xn6agr79sid57n0yws4n0cis7m9q5hr0hxzr8dv2fnmmpgb4mvz8kiyv2g5ikbyb9g5n"; }; }; "source-map-support-0.4.6" = { @@ -25912,7 +25122,7 @@ let version = "0.5.3"; src = fetchurl { url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.3.tgz"; - sha512 = "eKkTgWYeBOQqFGXRfKabMFdnWepo51vWqEdoeikaEPFiJC7MCU5j2h4+6Q8npkZTeLGbSyecZvRxiSoWl3rh+w=="; + sha512 = "3xy2ylp2qm8jwglcsf2fjwvn5w56im64w7yjghyv9ilw2fc5qj65w8h38lpls27m3b5prv8x9cnfmrhkfk7rlb52hmf810ycs0i7abq"; }; }; "source-map-support-0.5.6" = { @@ -25921,7 +25131,7 @@ let version = "0.5.6"; src = fetchurl { url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.6.tgz"; - sha512 = "N4KXEz7jcKqPf2b2vZF11lQIz9W5ZMuUcIOGj243lduidkf2fjkVKJS9vNxVWn3u/uxX38AcE8U9nnH9FPcq+g=="; + sha512 = "3x2mxqlzmqrwgf52cfc1pspxkzfwzasapfbrgcl50akjzpn8xva5nwm6xp8z1l3f2acnr5rsp7hhm6nfn8vvxk6gy7slw737q9rg0ip"; }; }; "source-map-url-0.4.0" = { @@ -25939,7 +25149,7 @@ let version = "1.4.1"; src = fetchurl { url = "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.1.tgz"; - sha512 = "hX1eNBNuilj8yfFnECh0DzLgwKpBLMIvmhgEhixXNui8lMLBInTI8Kyxt++RwJnMNu7cAUo635L2+N1TxMJCzA=="; + sha512 = "3645hn4agfzixljvwx4l0fwxqvcr6f0j7pvgcdcy34788n1qaabrs1nawn8c10qk8pw4b21mb0f0chgfhl10rzir7y5i2kf2cs5wzc5"; }; }; "sparkles-1.0.1" = { @@ -25948,7 +25158,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz"; - sha512 = "dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw=="; + sha512 = "1vr1iicrmldp4avsqz22x493dh0hzvck1scwd29kphm4gbp1qs9wpk0l5lwmma1cyfmp3l967jjclnx5kr0zsagzwniashl6q6b88vm"; }; }; "sparse-bitfield-3.0.3" = { @@ -25984,7 +25194,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.0.tgz"; - sha512 = "N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g=="; + sha512 = "3xgkqk4hsm4nzvy68icv1rlv4s0qgb7mwpi9s4z2mp1a5fwny6kc6m4nqa7zzx2k7mrjlh7psci9lb7892bl3q4r4y2f4sw7vvnhprp"; }; }; "spdx-exceptions-2.1.0" = { @@ -25993,7 +25203,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz"; - sha512 = "4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg=="; + sha512 = "057m2ab3y8j38xb89w7d191hfaa693vbf7wnwkf302zicsgi2v5ayvcc4f03vyj4yyycqasqp3ryp2d3q0vcaq54r4ls2g5dar4vbg0"; }; }; "spdx-expression-parse-3.0.0" = { @@ -26002,7 +25212,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz"; - sha512 = "Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg=="; + sha512 = "351djgqvsgqmfg6h764c2k09dmixczw5073jirm8km6i1yym4xjrzc7g5ckwkidi3gls7s910m4ahl8sh37dsb478j8j3sigbfq63k2"; }; }; "spdx-license-ids-3.0.0" = { @@ -26011,7 +25221,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz"; - sha512 = "2+EPwgbnmOIl8HjGBXXMd9NAu02vLjOO1nWw4kmeRDFyHn+M/ETfHxQUK0oXg8ctgVnl9t3rosNVsZ1jG61nDA=="; + sha512 = "066gb8vcffv2mf3lbmxvxp5b60jviw32x52n50l3zgl9z4cgwg74ca4kr4y5c3mss736bmg9nxl1lvprishbikqy0jy56770v10zqfv"; }; }; "spdy-1.32.5" = { @@ -26038,11 +25248,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/speedometer/-/speedometer-1.1.0.tgz"; -<<<<<<< HEAD - sha512 = "z/wAiTESw2XVPssY2XRcme4niTc4S5FkkJ4gknudtVoc33Zil8TdTxHy5torRcgqMqksJV2Yz8HQcvtbsnw0mQ=="; -======= sha512 = "2ck8z5jbgxp5l61ryc5s99cm4r2mj255gdfdwhi9zfw95v2fvgiqnmmkmxr484yj1j92jrq6y4jgvlrbisdj66b7vanbhqj664h1z6g"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "split-0.2.10" = { @@ -26069,7 +25275,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/split/-/split-1.0.1.tgz"; - sha512 = "mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg=="; + sha512 = "2916kdi862ik0dlvr2wf2kvzmw8i8wk5spbr9wpdcksrkhrl3m0082jj1q4mqzvv50mlah5s4vcy6k18nacbj09kxbzp2pbysh8wg4r"; }; }; "split-string-3.1.0" = { @@ -26078,7 +25284,7 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz"; - sha512 = "NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw=="; + sha512 = "25ih1dx2qb3lawqjxj85znd4l3x8nnigrcdlpfw8064gh2mwxic9bgg5ylgxm9gjl3v8dmyc47rycp8xvqz78jqalg0g9yqj225acrp"; }; }; "split2-0.2.1" = { @@ -26096,7 +25302,7 @@ let version = "2.2.0"; src = fetchurl { url = "https://registry.npmjs.org/split2/-/split2-2.2.0.tgz"; - sha512 = "RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw=="; + sha512 = "1plzy1n554n2gwfpavi4azb4y45dm2mwj7dq8ma99yg1z55xcdxmkibsfhsh1h19qgsrcamm0ha5qi2c3has6skvx4bix5p67czc1j4"; }; }; "sprintf-0.1.5" = { @@ -26195,7 +25401,7 @@ let version = "5.3.0"; src = fetchurl { url = "https://registry.npmjs.org/ssri/-/ssri-5.3.0.tgz"; - sha512 = "XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ=="; + sha512 = "00qc3iqsi21cc2az3nz36q88psab4ickpzranndk6vmrb6yhn5xsq3kgp21x3lp0406bdaalpb59xy7zzqnl40ans69v3z2l8z8h52x"; }; }; "stable-0.1.8" = { @@ -26204,7 +25410,7 @@ let version = "0.1.8"; src = fetchurl { url = "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz"; - sha512 = "ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w=="; + sha512 = "3mw0cg71gcp6hfg3x0snaxcva4yqnifs11vbs3ba4agmcz8njmz70ndk5d8z97441jdvjhvb8aq8r44ngd8z4iw5hpgfmff372nlbwf"; }; }; "stack-trace-0.0.10" = { @@ -26249,7 +25455,7 @@ let version = "3.1.1"; src = fetchurl { url = "https://registry.npmjs.org/status-logger/-/status-logger-3.1.1.tgz"; - sha512 = "dNYazf7T9aD9XMvvP/ZZTL8nzhS1piUfFq7HVDOHFdO2LBnPMqdkS5kaoXjK7gvH/0mT6ZcafuDTSSd7DIVYAA=="; + sha512 = "005i18cgcklklz0gqd9gsck97zwf2zfr9wa26lr9djafcng34nbdlqmhwrm9ixf2qgjb9mm2k72ggscb7v3zvybbkys1xfkzv6immkl"; }; }; "statuses-1.2.1" = { @@ -26276,7 +25482,7 @@ let version = "1.4.0"; src = fetchurl { url = "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz"; - sha512 = "zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew=="; + sha512 = "1xxwqpj713rq1idbmp7mj7cj9dl52lazgpd5x8a9g88jawbkn9xpwbgljl7cvnd0jqkll2zpdj5xy63dlis9l2k8vmx1n1gvyv8456f"; }; }; "statuses-1.5.0" = { @@ -26348,7 +25554,7 @@ let version = "0.1.1"; src = fetchurl { url = "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.1.tgz"; - sha512 = "tNa3hzgkjEP7XbCkbRXe1jpg+ievoa0O4SCFlMOYEscGSS4JJsckGL8swUyAa/ApGU3Ae4t6Honor4HhL+tRyg=="; + sha512 = "3553srgw60szs493rx8nyy09lcjkw3bh16c2b5z30jcf9h95r4hdiqjk31r9190w47av8dg4zx60fnnvqanv95hbpxl7314723vgmml"; }; }; "stream-counter-0.2.0" = { @@ -26366,7 +25572,7 @@ let version = "1.2.2"; src = fetchurl { url = "https://registry.npmjs.org/stream-each/-/stream-each-1.2.2.tgz"; - sha512 = "mc1dbFhGBxvTM3bIWmAAINbqiuAk9TATcfIQC8P+/+HJefgaiTlMn2dHvkX8qlI12KeYKSQ1Ua9RrIqrn1VPoA=="; + sha512 = "2h4ymczmf5aqldga4sj8acqlzc3almazi2vwiv7kx63k28sz1wwkqgzzv1hn47jf49k1x94w25fmmi001h5mj3n6g9in1s6b1n5vkcr"; }; }; "stream-http-2.8.3" = { @@ -26375,7 +25581,7 @@ let version = "2.8.3"; src = fetchurl { url = "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz"; - sha512 = "+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw=="; + sha512 = "19y2xbs1xzzpjwfdczl21d0d76ahd7013cr3mhfa6a8nbwwv9jpncng8idf0g8hnmnq2mcl3xh912rjlasl06wsz44qw3j7hdya8d7r"; }; }; "stream-parser-0.3.1" = { @@ -26420,11 +25626,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/stream-to-blob/-/stream-to-blob-1.0.1.tgz"; -<<<<<<< HEAD - sha512 = "aRy4neA4rf+qMtLT9fCRLPGWdrsIKtCx4kUdNTIPgPQ2hkHkdxbViVAvABMx9oRM6yCWfngHx6pwXfbYkVuPuw=="; -======= sha512 = "2xqynwiv3v5sw5aqw3phzln43mlr17n649h0bshi7aicxz48633dx401wr3a7a5waqx0ah8pdv9dw9cj7qgblyj6amgzb9qw2fvh739"; ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 }; }; "stream-to-blob-url-2.1.1" = { @@ -26433,11 +25635,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/stream-to-blob-url/-/stream-to-blob-url-2.1.1.tgz"; -<<<<<<< HEAD - sha512 = "DKJPEmCmIZoBfGVle9IhSfERiWaN5cuOtmfPxP2dZbLDRZxkBWZ4QbYxEJOSALk1Kf+WjBgedAMO6qkkf7Lmrg=="; -======= sha512 = "2pfdckz4jlyl3h3fhg1i34nzwlkbf80ja9i0cdn85w6c1b4ki2w7ck5kpyw9kv7ns7cprcdcs4i3wa94797nrb5gh0rl8d6c094z8hc"; ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 }; }; "stream-to-promise-2.2.0" = { @@ -26482,11 +25680,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/stream-with-known-length-to-buffer/-/stream-with-known-length-to-buffer-1.0.2.tgz"; -<<<<<<< HEAD - sha512 = "UxSISjxmguvfYzZdq6d4XAjc3gAocqTIOS1CjgwkDkkGT/LMTsIYiV8agIw42IHFFHf8k4lPOoroCCf4W9oqzg=="; -======= sha512 = "372mnjvz0khis4a797qk4zwfwacb0fq726806jzi4cc4kncy97hcj8f4h68whid774a8wi803gdq22wg2ksnp9ncggyp0k67i58h52k"; ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 }; }; "streamline-0.10.17" = { @@ -26522,7 +25716,7 @@ let version = "0.7.0"; src = fetchurl { url = "https://registry.npmjs.org/streamroller/-/streamroller-0.7.0.tgz"; - sha512 = "WREzfy0r0zUqp3lGO096wRuUp7ho1X6uo/7DJfTlEi0Iv/4gT7YHqXDjKC2ioVGBZtE8QzsQD9nx1nIuoZ57jQ=="; + sha512 = "26pp7m15rrddwfr1w83nhrws5k82ld1l8njiqvhm43vckr0zszhhb8jwps2bhzylfp7xmb8p2kr86y1g97knikrlwm3blrb5mzk64ar"; }; }; "streamsearch-0.1.2" = { @@ -26639,7 +25833,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz"; - sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw=="; + sha512 = "29s1fqgr4mnhfxwczgdghfmmc1f792m9hysvcjxw2h5lfj8ndf2b6gm02m96qk5m75g4aisijvng4pk618anwbr8i9ay2jyszkqgslw"; }; }; "string.prototype.codepointat-0.2.1" = { @@ -26648,16 +25842,7 @@ let version = "0.2.1"; src = fetchurl { url = "https://registry.npmjs.org/string.prototype.codepointat/-/string.prototype.codepointat-0.2.1.tgz"; - sha512 = "2cBVCj6I4IOvEnjgO/hWqXjqBGsY+zwPmHl12Srk9IXSZ56Jwwmy+66XO5Iut/oQVR7t5ihYdLB0GMa4alEUcg=="; - }; - }; - "string.prototype.matchall-2.0.0" = { - name = "string.prototype.matchall"; - packageName = "string.prototype.matchall"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-2.0.0.tgz"; - sha512 = "WoZ+B2ypng1dp4iFLF2kmZlwwlE19gmjgKuhL1FJfDgCREWb3ye3SDVHSzLH6bxfnvYmkCxbzkmWcQZHA4P//Q=="; + sha512 = "1r18lbap331hx5hfic2irpd3rai1ymp5s93p5xfzfr0khw9krkx51glwhmdjxbrk07kryqqdc2fly59avw3pq3q2apq7q487q55bh6r"; }; }; "string.prototype.matchall-2.0.0" = { @@ -26675,7 +25860,7 @@ let version = "1.2.5"; src = fetchurl { url = "https://registry.npmjs.org/string2compact/-/string2compact-1.2.5.tgz"; - sha512 = "WujFln3AWQhpd/0UXjR8Ctcy/lCCb1jmED8h1Loa6938stww6LSSuP7FWqTMFlb4dxn/6l54jrAqlJhIAUlBWw=="; + sha512 = "1dl2j8192c98amhirw5xspz35vzhmhnrjj5migyp29b9s1hvjrgrpgb3axd889z23k5hvw2a3z35mqaghs5w57xfxlhhnf0gnbcbs2s"; }; }; "string_decoder-0.10.31" = { @@ -26693,7 +25878,7 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz"; - sha512 = "4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ=="; + sha512 = "22vw5mmwlyblqc2zyqwl39wyhyahhpiyknim8iz5fk6xi002x777gkswiq8fh297djs5ii4pgrys57wq33hr5zf3xfd0d7kjxkzl0g0"; }; }; "string_decoder-1.1.1" = { @@ -26702,7 +25887,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"; - sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; + sha512 = "315yd4vzwrwk3vwj1klf46y1cj2jbvf88066y2rnwhksb98phj46jkxixbwsp3h607w7czy7cby522s7sx8mvspdpdm3s72y2ga3x4z"; }; }; "stringify-entities-1.3.2" = { @@ -26711,7 +25896,7 @@ let version = "1.3.2"; src = fetchurl { url = "https://registry.npmjs.org/stringify-entities/-/stringify-entities-1.3.2.tgz"; - sha512 = "nrBAQClJAPN2p+uGCVJRPIPakKeKWZ9GtBCmormE7pWOSlHat7+x5A8gx85M7HM5Dt0BP3pP5RhVW77WdbJJ3A=="; + sha512 = "3f4kckmssz5nm8qwm7plgq1vl73jwzc9k7cf80gwjqvzdysa558x5gfhjws59hhni39yncaly8dm0rwa590k1pblxvg602955041c4y"; }; }; "stringstream-0.0.6" = { @@ -26720,7 +25905,7 @@ let version = "0.0.6"; src = fetchurl { url = "https://registry.npmjs.org/stringstream/-/stringstream-0.0.6.tgz"; - sha512 = "87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA=="; + sha512 = "22fa8nryyacyx538az1iir54hqsfb46m6jycmqvfpylmg025xdn1wng94ay1rg69m4s3lv0cf2qnxvzffvm5s74q5fb108y14289cgk"; }; }; "strip-ansi-0.1.1" = { @@ -26837,7 +26022,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/strip-dirs/-/strip-dirs-2.1.0.tgz"; - sha512 = "JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g=="; + sha512 = "3gd7bh1h7xjvl8y6lj1mmsv4qpgbxd620fbp2cjlnc3b9gn7wnzbs1170gs7i6y5arm0dd09y8d74vr357gvwmx9f0616wbw8wv3q14"; }; }; "strip-eof-1.0.0" = { @@ -26900,7 +26085,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz"; - sha512 = "k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg=="; + sha512 = "31a8vlzg4gwak3cx7n0lask77xyqpf5mz4ckphc10ykmb9r2lais7v4w8a8xij9lv2115xjnl7avkwp2l7cw3kbc3lpjsghl72757lk"; }; }; "strong-data-uri-1.0.6" = { @@ -26909,7 +26094,7 @@ let version = "1.0.6"; src = fetchurl { url = "https://registry.npmjs.org/strong-data-uri/-/strong-data-uri-1.0.6.tgz"; - sha512 = "zhzBZev0uhT2IrFUerenXhfaE0vFUYwAZsnG0gIKGpfM/Gi6jOUQ3cmcvyTsXeDLIPiTubHESeO7EbD6FoPmzw=="; + sha512 = "37yd0qnzaq13fz3972b3fckz0hcpq2xxhjbz769vl8fb35sd3ycr5qs181d5in9cq08qlf59c9xl5sylyvplm5i4bv19fplxdjw276f"; }; }; "strong-log-transformer-1.0.6" = { @@ -26972,7 +26157,7 @@ let version = "3.8.3"; src = fetchurl { url = "https://registry.npmjs.org/superagent/-/superagent-3.8.3.tgz"; - sha512 = "GLQtLMCoEIK4eDv6OGtkOoSMt3D+oq0y3dsxMuYuDvaNUvuT8eFBuLmfR0iYYzHC1e8hpzC6ZsxbuP6DIalMFA=="; + sha512 = "0a4ra91hgzbhnyccsx319r1xzaw4cb3k144g7xrp10y3wckzd98vxhf5vk34cfvvlrav8pyf2vqr11scimkiyivg2w84458q0n2vd0q"; }; }; "supports-color-0.2.0" = { @@ -27017,7 +26202,7 @@ let version = "4.2.0"; src = fetchurl { url = "https://registry.npmjs.org/supports-color/-/supports-color-4.2.0.tgz"; - sha512 = "Ts0Mu/A1S1aZxEJNG88I4Oc9rcZSBFNac5e27yh4j2mqbhZSSzR1Ah79EYwSn9Zuh7lrlGD2cVGzw1RKGzyLSg=="; + sha512 = "158ng0v99ac7csif7v6153bp63nxmlz2a613z8y09sk8jsj2rpalscgg0lfzdlpfdd5612jqsnkvrz0137inka2qjcmcjrmy2xhrkaf"; }; }; "supports-color-5.1.0" = { @@ -27026,7 +26211,7 @@ let version = "5.1.0"; src = fetchurl { url = "https://registry.npmjs.org/supports-color/-/supports-color-5.1.0.tgz"; - sha512 = "Ry0AwkoKjDpVKK4sV4h6o3UJmNRbjYm2uXhwfj3J56lMVdvnUNqzQVRztOOMGQ++w1K/TjNDFvpJk0F/LoeBCQ=="; + sha512 = "04q31rfgx0r6jgs2r1k6kmzab1vw3qrikiv8wsl86rxll77vdalrag7r4ypww3qp6v8k3avsjc0jxd3ga45fb5f51akm30a9b100ba7"; }; }; "supports-color-5.4.0" = { @@ -27035,7 +26220,7 @@ let version = "5.4.0"; src = fetchurl { url = "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz"; - sha512 = "zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w=="; + sha512 = "3ks7qkl6s064qcdc5qnpzcwzcrnlzccz9m3faw54fnmsm2k8fzb9saqr5nhx7w9lnd4nbp0zg047zz8mwsd4fxfnalpb7kra619fdnf"; }; }; "symbol-observable-1.0.1" = { @@ -27071,7 +26256,7 @@ let version = "1.4.0"; src = fetchurl { url = "https://registry.npmjs.org/syntax-error/-/syntax-error-1.4.0.tgz"; - sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; + sha512 = "3psid3r9b0gmnkf2ggydlw1nrcnyqa78smdihifdvff5vmlq92v8qyd6zfi94wczhllcyxl78zbc47cvz3h6xpa9v372xp6msxybwv0"; }; }; "table-3.8.3" = { @@ -27089,16 +26274,7 @@ let version = "4.0.2"; src = fetchurl { url = "https://registry.npmjs.org/table/-/table-4.0.2.tgz"; - sha512 = "UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA=="; - }; - }; - "table-4.0.3" = { - name = "table"; - packageName = "table"; - version = "4.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/table/-/table-4.0.3.tgz"; - sha512 = "S7rnFITmBH1EnyKcvxBh1LjYeQMmnZtCXSEbHcH6S0NoKit24ZuFO/T1vDcLdYsLQkM188PVVhQmzKIuThNkKg=="; + sha512 = "2q47avrxblc0an2g5ij8sd7ss2bqhdxy2949dk774gyg9vmsivg7fwyn885v2va72sxiv5k59ifvi3hg4ra6z95lr8in6sjyw008jai"; }; }; "table-4.0.3" = { @@ -27162,7 +26338,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/tapable/-/tapable-1.0.0.tgz"; - sha512 = "dQRhbNQkRnaqauC7WqSJ21EEksgT0fYZX2lqXzGkpo8JNig9zGZTYoMGvyI2nWmXlE2VSVXVDu7wLVGu/mQEsg=="; + sha512 = "2r08r7ymr8jvw7f1vamajcm9na9fscx6qiby1l3c99ndk1x50v0k3x6lhqmysk9bwczdl8kr2908lfvi6j5mfz0dam7cii4sin6213m"; }; }; "tape-2.3.3" = { @@ -27198,7 +26374,7 @@ let version = "3.1.15"; src = fetchurl { url = "https://registry.npmjs.org/tar/-/tar-3.1.15.tgz"; - sha512 = "pQNFsg+Wb6VXsrIPUnuQwrHR4wD5ASBR0jRyiT4/AALFA2Nl+CjhkDX5fTmIwCuULRtyQR3Dae2BBnP2EFHscw=="; + sha512 = "1ryql8hyrrhd0gdd71ishbj3cnr8ay0i0wpvy9mj3hjiy35cc1wa0h07wz8jwils98j00gr03ix3cf2j1xm43xjn9bsavwn1yr4a0x5"; }; }; "tar-4.4.4" = { @@ -27207,7 +26383,7 @@ let version = "4.4.4"; src = fetchurl { url = "https://registry.npmjs.org/tar/-/tar-4.4.4.tgz"; - sha512 = "mq9ixIYfNF9SK0IS/h2HKMu8Q2iaCuhDDsZhdEag/FHv8fOaYld4vN7ouMgcSSt5WKZzPs8atclTcJm36OTh4w=="; + sha512 = "3iy3r78nycp0ly9nldcygkklrc7jas93k4bis6ypiw5fqlsygqyylgwl1378qf61r1yh2lsd11vrjr8hwfzw4j25d95yd0zhv265bws"; }; }; "tar-fs-1.16.3" = { @@ -27216,11 +26392,7 @@ let version = "1.16.3"; src = fetchurl { url = "https://registry.npmjs.org/tar-fs/-/tar-fs-1.16.3.tgz"; -<<<<<<< HEAD - sha512 = "NvCeXpYx7OsmOh8zIOP/ebG55zZmxLE0etfWRbWok+q2Qo8x/vOR/IJT1taADXPe+jsiu9axDb3X4B+iIgNlKw=="; -======= sha512 = "0mna0r2l8gy1mxx1nqxdfr27gxdwwqdh3bdclw2zj8z7ziiix1bdslkm2slbmnpg8sb3i366vkvkcbrzzij0cqz78kfpv1ijrg9xw1n"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "tar-pack-3.4.1" = { @@ -27229,7 +26401,7 @@ let version = "3.4.1"; src = fetchurl { url = "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.1.tgz"; - sha512 = "PPRybI9+jM5tjtCbN2cxmmRU7YmqT3Zv/UDy48tAh2XRkLa9bAORtSWLkVc13+GJF+cdTh1yEnHEk3cpTaL5Kg=="; + sha512 = "0mgk8jd55vr7i3i29r1skhxwwbqkqfz6mbr32r5nn8h6v5xns8d2rc7835y7wj0zmppckxai7nm8r4s65kkg6yhirnwx33yixn75x1w"; }; }; "tar-stream-1.6.1" = { @@ -27238,7 +26410,7 @@ let version = "1.6.1"; src = fetchurl { url = "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.1.tgz"; - sha512 = "IFLM5wp3QrJODQFPm6/to3LJZrONdBY/otxcvDIQzu217zKye6yVR3hhi9lAjrC2Z+m/j5oDxMPb1qcd8cIvpA=="; + sha512 = "2j2zhpi3nkxdny3qh1rm3xzx5kvdc4f83cqnqbq8yasqyxj6bpvbvff20rbqp6wl8zicx4dndkcjwm3xnprnkq11m7b4hkp1bkwqli0"; }; }; "temp-0.6.0" = { @@ -27310,7 +26482,7 @@ let version = "1.7.0"; src = fetchurl { url = "https://registry.npmjs.org/text-extensions/-/text-extensions-1.7.0.tgz"; - sha512 = "AKXZeDq230UaSzaO5s3qQUZOaC7iKbzq0jOFL614R7d9R593HLqAOL0cYoqLdkNrjBSOdmoQI06yigq1TSBXAg=="; + sha512 = "015f82dnl58mcjf4c86lxlf2j66nhvnif56475x720bl73pkx3pvds7g2njz19ksbmbqag25rl4wij1xb6yd3in9cd4bpxn79wdk980"; }; }; "text-table-0.2.0" = { @@ -27382,7 +26554,7 @@ let version = "3.11.2"; src = fetchurl { url = "https://registry.npmjs.org/thriftrw/-/thriftrw-3.11.2.tgz"; - sha512 = "3iCowlHgCEXjabCkurHTaECb2+U0V+NzqBmwfKHn8fzJJwXd/oDo7Wh6Vs0kaESN7YNJMRPC8ObL3AfQ1gxKmQ=="; + sha512 = "2cll36ns03xrjz6y3116ca9hgnqsi384k6mcyk8xpl81znx0lkwkz7iwyhprc0rm1ry6mrlwpdrnh38sfqvm95hd7ila270a71ah86y"; }; }; "throat-3.2.0" = { @@ -27391,7 +26563,7 @@ let version = "3.2.0"; src = fetchurl { url = "https://registry.npmjs.org/throat/-/throat-3.2.0.tgz"; - sha512 = "/EY8VpvlqJ+sFtLPeOgc8Pl7kQVOWv0woD87KTXVHPIAE842FGT+rokxIhe8xIUP1cfgrkt0as0vDLjDiMtr8w=="; + sha512 = "3rnpjw8qfw0qbydd9s4pbp0qzahz1f4phbj4cc9mvz6851nrq9h1whwslsjjfrzl0qgsnjf0n8ppygh3kl7ikyj2sn9za75kdb3qipw"; }; }; "throttle-1.0.3" = { @@ -27562,7 +26734,7 @@ let version = "2.0.10"; src = fetchurl { url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz"; - sha512 = "YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg=="; + sha512 = "37aksk3ydmwy2n7ffsnbvyrwb5kmz5bhvi5fhyg593qs61x7vi9drblwnri5z4x9mzaz91xxqdgg15f0qmf8cd85wdfax2pbm4vbw32"; }; }; "timers-ext-0.1.5" = { @@ -27571,7 +26743,7 @@ let version = "0.1.5"; src = fetchurl { url = "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.5.tgz"; - sha512 = "tsEStd7kmACHENhsUPaxb8Jf8/+GZZxyNFQbZD07HQOyooOa6At1rQqjffgvg7n+dxscQa9cjjMdWhJtsP2sxg=="; + sha512 = "33arzdhdl95l79kirfayh8w3dvzxfc35zw7v8qammshps4shfib40qx7cyn86sl6ir9qrc6zzrmzhkgn7v50v6q223h1674vssi5hdn"; }; }; "timespan-2.3.0" = { @@ -27589,7 +26761,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/tiny-lr/-/tiny-lr-1.1.1.tgz"; - sha512 = "44yhA3tsaRoMOjQQ+5v5mVdqef+kH6Qze9jTpqtVufgYjYt08zyZAwNwwVBj3i1rJMnR52IxOW0LK0vBzgAkuA=="; + sha512 = "2w2806fq55jn2vd74qn5ryir4j6nbfycd8c2w030fckrwvlif6iiy5ranmsdlyqgcrs87x4zxwnlmwrz6dzn41l7861lsbcgc1s3373"; }; }; "tinycolor-0.0.1" = { @@ -27607,7 +26779,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/titleize/-/titleize-1.0.1.tgz"; - sha512 = "rUwGDruKq1gX+FFHbTl5qjI7teVO7eOe+C8IcQ7QT+1BK3eEUXJqbZcBOeaRP4FwSC/C1A5jDoIVta0nIQ9yew=="; + sha512 = "1xp43r14ynva5c21rihxm625x47109zj7k3j0cpdmm74lc4fwml3vags077221gz2gf7vafwnskncmag4wnsisiz0bmiawapc70ck5d"; }; }; "tmp-0.0.28" = { @@ -27643,7 +26815,7 @@ let version = "0.0.33"; src = fetchurl { url = "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz"; - sha512 = "jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw=="; + sha512 = "0drg2bck1cj8677rgs1l98v7vqaxawcqh6ja87qilwnd719l5y0lzv5ssn3pcwa37fdbg4188y6x15a90vkllyvfpd9v7fai2b8j44d"; }; }; "to-absolute-glob-2.0.2" = { @@ -27688,7 +26860,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz"; - sha512 = "lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg=="; + sha512 = "1b8wsfz1rp8fsb2kz7isrsx292vl5w4cmx9qvivxqsj61avx9ph1azxa6zr3mc85cz8qddbkxm6ski8zvacmpadc22wp6pv5gk427wp"; }; }; "to-fast-properties-1.0.3" = { @@ -27715,7 +26887,7 @@ let version = "3.0.2"; src = fetchurl { url = "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz"; - sha512 = "FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw=="; + sha512 = "03lcq1y1ks55lss37m3cx52f8f4wj85rqsxfxrhi3y8rqa0iiny6df8ardg2f742z870v7xw749lcsxh8yplsmbvaig4rrds1w6asqm"; }; }; "to-regex-range-2.1.1" = { @@ -27751,7 +26923,7 @@ let version = "1.4.1"; src = fetchurl { url = "https://registry.npmjs.org/toiletdb/-/toiletdb-1.4.1.tgz"; - sha512 = "FOinMMjECHmDt6PZkSmcbM8ir41kGwYCbVW7NczWkWNNeuX9/mQHz31oNSJKZrkvgfas692ZoZ+G1jdM43qVGA=="; + sha512 = "0c9ayp39hvxd1lzl6cxvsxcys0jzfb698i3as3xrw3n9zpxwmx4sqwisv63bfsmdl10c6v4inpj5kvckhlr3nd3ny1pj264r0qags0l"; }; }; "token-stream-0.0.1" = { @@ -27769,7 +26941,7 @@ let version = "2.3.3"; src = fetchurl { url = "https://registry.npmjs.org/toml/-/toml-2.3.3.tgz"; - sha512 = "O7L5hhSQHxuufWUdcTRPfuTh3phKfAZ/dqfxZFoxPCj2RYmpaSGLEIs016FCXItQwNr08yefUB5TSjzRYnajTA=="; + sha512 = "16a6xk2s4y4llqya2gjgwzlvb0512sw8ahxfd4b225j2sd9i52zca1w65d69wd7frzhcz2ak3gf3r3y9ws727b5gnp1n7wh2j3gkciv"; }; }; "torrent-discovery-5.4.0" = { @@ -27787,7 +26959,7 @@ let version = "8.4.1"; src = fetchurl { url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-8.4.1.tgz"; - sha512 = "PHy/H+S2pxBMK8ZdiZxp16mIPfs50rdzYjOWJLJg974BCE/VbdxHirQv117kVl9STKKXKZWo5NADGAYfmIXH0w=="; + sha512 = "39wg1cq3w31h0yhwjl9aacpl9654psnwigdfbxli93xqvfm9w403gppc2r295ikc9rvglirzcyqiafpd6f8jpf65d6119xnwhgvyz1w"; }; }; "torrent-piece-1.1.2" = { @@ -27796,11 +26968,7 @@ let version = "1.1.2"; src = fetchurl { url = "https://registry.npmjs.org/torrent-piece/-/torrent-piece-1.1.2.tgz"; -<<<<<<< HEAD - sha512 = "ElXPyXKKG73o+uziHJ8qlYE9EuyDVxnK2zWL+pW/2bma7RsLpSwFFIJAb8Qui7/tel2hsHQW1z3zBnfQNREpWA=="; -======= sha512 = "1c2j49ms1vhdwrxswb79c51bmxfvgwb5v26yh422h2jr98b3gnrmffrpyazm2rmvg51jmw3xh93v0cm5agirqpczblbs6wafb4wym8j"; ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 }; }; "torrent-stream-1.0.4" = { @@ -27809,7 +26977,7 @@ let version = "1.0.4"; src = fetchurl { url = "https://registry.npmjs.org/torrent-stream/-/torrent-stream-1.0.4.tgz"; - sha512 = "IIAoMzagHFzjRQrFjwAZrE3yQYAPsmkbx0gYMCu/x5vf/Cj5yBjZqW1/98vOcaGGGelH/LhkmrJ56VYhiAKi5g=="; + sha512 = "3ka40l845bfjydjk9jbiz27x4cqd8birv5zfzvdm7ciij7r53ydz6y7pwmk0628qwdnkchgh10z4kdc3408zi8a8pimq7506qrji010"; }; }; "tosource-1.0.0" = { @@ -27845,7 +27013,7 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz"; - sha512 = "WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA=="; + sha512 = "2a3sk3562y1ihbl06r5g1pzs37mwhhnz8f8vvcc0k8bhykczzgv9dyw71kkz4mbf81iq7wbf2nq7hpy6z6zhanj8s9d6bjk5r9pq72q"; }; }; "tough-cookie-2.2.2" = { @@ -27863,7 +27031,7 @@ let version = "2.3.4"; src = fetchurl { url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz"; - sha512 = "TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA=="; + sha512 = "0ncm6j3cjq1f26mzjf04k9bkw1b08w53s4qa3a11c1bdj4pgnqv1422c1xs5jyy6y1psppjx52fhagq5zkjkgrcpdkxcdiry96r77jd"; }; }; "tough-cookie-2.4.3" = { @@ -27872,7 +27040,7 @@ let version = "2.4.3"; src = fetchurl { url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz"; - sha512 = "Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ=="; + sha512 = "2akhyixx49dkqadghzwj53xwfa1aikf0iv04ib9zj0kbilkzxxh16j5c6vfkcwm3cy29y46q3d8lzinsy6ql2cvb1wcw31gzs9jp6s3"; }; }; "township-client-1.3.2" = { @@ -27881,7 +27049,7 @@ let version = "1.3.2"; src = fetchurl { url = "https://registry.npmjs.org/township-client/-/township-client-1.3.2.tgz"; - sha512 = "6Di70O1dWm45SJ5xrGzlE805z3gYn4ZUmNKomIrI4OojzRA4zyQzJ/4lAxQbJlq0ihG/mUE2xbP4q85Q68ig2g=="; + sha512 = "3da1j7ba37apy5kqlv436dz265b8ni63ca069gy4wrj9krq236j7sp0r259ia6jk1a8d7qqg37kkk8kwmnaqwcy90wnwnjxxp8bnf78"; }; }; "toxic-1.0.1" = { @@ -27890,11 +27058,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/toxic/-/toxic-1.0.1.tgz"; -<<<<<<< HEAD - sha512 = "WI3rIGdcaKULYg7KVoB0zcjikqvcYYvcuT6D89bFPz2rVR0Rl0PK6x8/X62rtdLtBKIE985NzVf/auTtGegIIg=="; -======= sha512 = "0i0is0rxpj6mzsprm6wxxq4l82fvlmmmfnmygqzxg5475qi3masng9zqpbg70ryp7f8nqfwmf9f5j6dfj05djhfc85sas2wcwhfp3aq"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "tr46-0.0.3" = { @@ -27957,7 +27121,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.0.tgz"; - sha512 = "DlX6dR0lOIRDFxI0mjL9IYg6OTncLm/Zt+JiBhE5OlFcAR8yc9S7FFXU9so0oda47frdM/JFsk7UjNt9vscKcg=="; + sha512 = "1r0mixygpdqrm2fn92z4cyxzbnvimm16k5gdm2m2jxx8wrj3w0mql9s748hcqp2nzcnybnw74wkm211zlr9ld0j2x1q8f153mszlm8f"; }; }; "trim-0.0.1" = { @@ -28020,7 +27184,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.1.tgz"; - sha512 = "bWLv9BbWbbd7mlqqs2oQYnLD/U/ZqeJeJwbO0FG2zA1aTq+HTvxfHNKFa/HGCVyJpDiioUYaBhfiT6rgk+l4mg=="; + sha512 = "2d7isckw2m4zqhp0qd4d8d272j8jp09qvqnp1fj3igzqkl7mx75l3fcnr8x1kh64xgf5afr9zyw6wk221mb7ajsk9xvfvfn2vsfyqkd"; }; }; "trough-1.0.2" = { @@ -28029,7 +27193,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/trough/-/trough-1.0.2.tgz"; - sha512 = "FHkoUZvG6Egrv9XZAyYGKEyb1JMsFphgPjoczkZC2y6W93U1jswcVURB8MUvtsahEPEVACyxD47JAL63vF4JsQ=="; + sha512 = "2qhjpmwnyz01jcf1yqjq00my48a3imn5z2z0ha4alfcr3imfpvrcbnv893cw71s7rh9h5icjga9nk180qk07nfmpwmlis66kd8jhy8l"; }; }; "truncate-2.0.1" = { @@ -28047,11 +27211,7 @@ let version = "1.9.3"; src = fetchurl { url = "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz"; -<<<<<<< HEAD - sha512 = "4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ=="; -======= sha512 = "2yimhwxviswrwaxdgk4k5q99pjv0n6g8s1cc5ml17rzv1kqfac26sb7b49ndl9hyczgzlz28wh87g1k0r3h9cqa79d3hyi9qzrcajp2"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "tsscmp-1.0.5" = { @@ -28069,7 +27229,7 @@ let version = "1.3.1"; src = fetchurl { url = "https://registry.npmjs.org/ttl/-/ttl-1.3.1.tgz"; - sha512 = "+bGy9iDAqg3WSfc2ZrprToSPJhZjqy7vUv9wupQzsiv+BVPVx1T2a6G4T0290SpQj+56Toaw9BiLO5j5Bd7QzA=="; + sha512 = "36d1ph5z6c3p2qqyjq8ckksxs7m0anipm6lzf51dgv59iymac2zwaxj6fablw7zabpjxav32qk8z12fdfx6cdpp97b0van043vb5cgr"; }; }; "tty-browserify-0.0.0" = { @@ -28087,7 +27247,7 @@ let version = "0.0.1"; src = fetchurl { url = "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz"; - sha512 = "C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw=="; + sha512 = "33h4i99m8bj5vqm3hmvfhi19whavny64ic0mr4yl8s14riw077ballp49zbv3kzy8615pad3gfcy7fxa86za1q41biqpmdwn8xxlx0b"; }; }; "tunnel-0.0.2" = { @@ -28114,7 +27274,7 @@ let version = "0.0.5"; src = fetchurl { url = "https://registry.npmjs.org/tunnel/-/tunnel-0.0.5.tgz"; - sha512 = "gj5sdqherx4VZKMcBA4vewER7zdK25Td+z1npBqpbDys4eJrLx+SlYjJvq1bDXs2irkuJM5pf8ktaEQVipkrbA=="; + sha512 = "1n2p6ca2m26hbf9gxlww91fp653cyqdbfnvxjc8jn91ybvbwbhsqg3cm4da8rrxzgfr9nsa6zpi20bv5w708753chaixbsym1v6qgl2"; }; }; "tunnel-agent-0.2.0" = { @@ -28159,7 +27319,7 @@ let version = "1.12.0"; src = fetchurl { url = "https://registry.npmjs.org/twig/-/twig-1.12.0.tgz"; - sha512 = "zm5OQXb8bQDGQUPytFgjqMKHhqcz/s6pU6Nwsy+rKPhsoOOVwYeHnziiDGFzeTDiFd28M8EVkEO8we6ikcrGjQ=="; + sha512 = "26wdjlilbpc3g23j0aw2cxwvlay4c3rfdhhr8iqky3qghcmwfh6ry18mcpv6w53aflwxzikly38ghm84dcb9wj387300vgwfr0lwvnf"; }; }; "twitter-ng-0.6.2" = { @@ -28186,7 +27346,7 @@ let version = "4.0.8"; src = fetchurl { url = "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz"; - sha512 = "0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g=="; + sha512 = "3z3kf4kgd3czn50a158v1k2l61lpbznrbk8xvh2pdsfsrcsda3271427fzmp1r7awnvvzrhzclfm03cpv671rdlqyz56xpmh6cgzyni"; }; }; "type-is-1.5.7" = { @@ -28204,7 +27364,7 @@ let version = "1.6.16"; src = fetchurl { url = "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz"; - sha512 = "HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q=="; + sha512 = "3sqj799a59bbpyx9h2nhwjgi776w2jc2pp620b1rgk22fc3czfbxmav4m8kq0ilaqfxx6v1hww5pzgf13bnz6n84fx62qvazszia68x"; }; }; "typechecker-4.5.0" = { @@ -28213,7 +27373,7 @@ let version = "4.5.0"; src = fetchurl { url = "https://registry.npmjs.org/typechecker/-/typechecker-4.5.0.tgz"; - sha512 = "bqPE/ck3bVIaXP7gMKTKSHrypT32lpYTpiqzPYeYzdSQnmaGvaGhy7TnN/M/+5R+2rs/kKcp9ZLPRp/Q9Yj+4w=="; + sha512 = "3izx27ms2gldkwjyllsg41zpgd7x57v7zrkgrxlrfhs3gc6csg91m6dk23kvcralq9rd5pn7njz4yj8raj31q7ybhd54v9pr7yw98vf"; }; }; "typedarray-0.0.6" = { @@ -28231,7 +27391,7 @@ let version = "3.1.5"; src = fetchurl { url = "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz"; - sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q=="; + sha512 = "3cvrfgjsyvnh9fdyixjzx9mwkfcjfyhgsjizzxzmrsvb1pwch0y58crjh7p6b0ml9nl7jr55nx5dyslq3jn15qz555fl3a4qdfbrnyd"; }; }; "typescript-2.7.2" = { @@ -28240,7 +27400,7 @@ let version = "2.7.2"; src = fetchurl { url = "https://registry.npmjs.org/typescript/-/typescript-2.7.2.tgz"; - sha512 = "p5TCYZDAO0m4G344hD+wx/LATebLWZNkkh2asWUFqSsD2OrDNhbAHuSjobrmsUmdzjJjEeZVU9g1h3O6vpstnw=="; + sha512 = "2gjv6xyp9rqfdfqadayc4b36b79sjdiwsxa38z43v01cdn3xbc06ax90mjv36hxj9j96nfbwr6w1wn7n0zq8f3y3fw4jfy0j1hw5557"; }; }; "typescript-2.8.3" = { @@ -28249,7 +27409,7 @@ let version = "2.8.3"; src = fetchurl { url = "https://registry.npmjs.org/typescript/-/typescript-2.8.3.tgz"; - sha512 = "K7g15Bb6Ra4lKf7Iq2l/I5/En+hLIHmxWZGq3D4DIRNFxMNV6j2SHSvDOqs2tGd4UvD/fJvrwopzQXjLrT7Itw=="; + sha512 = "2vwhgmdrdw42wwaqbmrnz7zy197hrxl6smkmhrb3n93vsjmqg24a4r10czdralib6qpj82bx2gw97r3gxlspj7y54jswigs2vj3bf1b"; }; }; "typescript-2.9.2" = { @@ -28258,11 +27418,7 @@ let version = "2.9.2"; src = fetchurl { url = "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz"; -<<<<<<< HEAD - sha512 = "Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w=="; -======= sha512 = "39mbnbv5shzcdgdidpzgzx35gy4g2b4vxmpcqjg0irymcivm5kc0yckb0vvmgyb2lwcn6282n1nc4s1d73k8f468jgqnsjdf7m2kghs"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "typewise-1.0.3" = { @@ -28307,7 +27463,7 @@ let version = "1.0.5"; src = fetchurl { url = "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.5.tgz"; - sha512 = "JoLI4g5zv5qNyT09f4YAvEZIIV1oOjqnewYg5D38dkQljIzpPT296dbIGvKro3digYI1bkb7W6EP1y4uDlmzLg=="; + sha512 = "0pb6n8f5qpdf3x1bgxlcvimha0n4xx3mgr1mj6nx6yksgg9ij62ai3nzhyy8806gfkklfk8blhlhimw0237yg9xr66rmgvk1vici0i6"; }; }; "uglify-es-3.3.10" = { @@ -28316,7 +27472,7 @@ let version = "3.3.10"; src = fetchurl { url = "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.10.tgz"; - sha512 = "rPzPisCzW68Okj1zNrfa2dR9uEm43SevDmpR6FChoZABFk9dANGnzzBMgHYUXI3609//63fnVkyQ1SQmAMyjww=="; + sha512 = "31s7k004qjdb42cavkpgszzvz9zm3aw2iv80k1hrykx202x9wb03451l58fhlba1spjgpdq96w7vm6rvavkcwrxj87aynxkq25czz5c"; }; }; "uglify-js-1.2.5" = { @@ -28370,32 +27526,16 @@ let version = "3.3.25"; src = fetchurl { url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.25.tgz"; - sha512 = "hobogryjDV36VrLK3Y69ou4REyrTApzUblVFmdQOYRe8cYaSmFJXMb4dR9McdvYDSbeNdzUgYr2YVukJaErJcA=="; + sha512 = "1qcjjk817lmd65xc8h3axwdnx4h7xkn3k9lf7dy65bm564jhrqvq5v11va9jiamdva9q0nk589i3vm2pn7dvjmjavx5s3d3pj1fi1l6"; }; }; "uglify-js-3.4.2" = { name = "uglify-js"; packageName = "uglify-js"; -<<<<<<< HEAD version = "3.4.2"; src = fetchurl { url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.2.tgz"; - sha512 = "/kVQDzwiE9Vy7Y63eMkMozF4jIt0C2+xHctF9YpqNWdE/NLOuMurshkpoYGUlAbeYhACPv0HJPIHJul0Ak4/uw=="; -======= - version = "3.3.28"; - src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.28.tgz"; - sha512 = "25lqpkcyapxq7ql7s778zwxm8mn0h2ir7m3nimvfnbs7myrv1aj5c3xgvvv1nbzvxrhs340gxfmqhpmgd7sqlhfd4icqwisl3ymri7b"; - }; - }; - "uglify-js-3.4.1" = { - name = "uglify-js"; - packageName = "uglify-js"; - version = "3.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.1.tgz"; - sha512 = "2hafajm9v9l1if7nqn9kwngd1yrrra3m9hgbjpx4wffqh9a589cwid6bx18l9pfj7cwf90hlk2nim0akl9dvhww5ddc1zg4fsiq4dr1"; ->>>>>>> nodePackages: meguca: 1.0.7 update + sha512 = "2xkykh2fkljc1zj4h3zsgh221idw1lljj0s2a8rnamwpf6fsby48rrmda5gaifb3nqny2vlif67hcd31k4pidwfxmrda4r27h7m0igy"; }; }; "uglify-to-browserify-1.0.2" = { @@ -28407,23 +27547,13 @@ let sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7"; }; }; -<<<<<<< HEAD "uglifyjs-webpack-plugin-1.2.7" = { name = "uglifyjs-webpack-plugin"; packageName = "uglifyjs-webpack-plugin"; version = "1.2.7"; src = fetchurl { url = "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.7.tgz"; - sha512 = "1VicfKhCYHLS8m1DCApqBhoulnASsEoJ/BvpUpP4zoNAPpKzdH+ghk0olGJMmwX2/jprK2j3hAHdUbczBSy2FA=="; -======= - "uglifyjs-webpack-plugin-1.2.6" = { - name = "uglifyjs-webpack-plugin"; - packageName = "uglifyjs-webpack-plugin"; - version = "1.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.6.tgz"; - sha512 = "2vaj7gmcrpn4k2hb1rnv4zx4lrqzwlvq3sxadjsdm1yw40pyw0rvaahx44jmq71ipv81bd7h7jjfkjpr0c8zpdcz93vcnv3m3hzscrl"; ->>>>>>> nodePackages: meguca: 1.0.7 update + sha512 = "0abcb056fvm3p81hkvnhavb7bzgc1cv9ii98a2dhsh7yx5kj8z410yfz29m5s8vzh4lmc0jf2b2w6h6d850hhvdyb974q22m1y9qn6m"; }; }; "uid-0.0.2" = { @@ -28477,7 +27607,7 @@ let version = "2.1.5"; src = fetchurl { url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.5.tgz"; - sha512 = "KPHm4VL5dDXKz01UuEd88Df+KzynaohSL9fBh096KWAxSKZQDI2uBrVqtvRM4rwrIrRRKsdLNML/lnaaVSRioA=="; + sha512 = "2h6492mk9v9dzy26i5wfajinhi2pg729ksbcsmm0sp8s32hlr432q19g97qghfp5x98hsm77hmzwdzhgi3vhm2drz53ax7rabhydw98"; }; }; "uid2-0.0.3" = { @@ -28504,7 +27634,7 @@ let version = "2.0.2"; src = fetchurl { url = "https://registry.npmjs.org/uint64be/-/uint64be-2.0.2.tgz"; - sha512 = "9QqdvpGQTXgxthP+lY4e/gIBy+RuqcBaC6JVwT5I3bDLgT/btL6twZMR0pI3/Fgah9G/pdwzIprE5gL6v9UvyQ=="; + sha512 = "34jzmdzz81fdi4s48rxr9dzs63iln7w6y9d44ckq6nvxd6v7y0wpc6x90zc2md21ddc1abfwk5h20py3s79bzhknqqphkchj6z9s2pm"; }; }; "ultron-1.0.2" = { @@ -28522,7 +27652,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz"; - sha512 = "UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og=="; + sha512 = "0x78hsv3jykmjl6qdqlqiz7v5nf06li8b5yvzpj6grnzwbcjch8ngyg55lm8g8mg4znvk7qbryvrr2dxacz3cvyb1nsm64qsw21g0ah"; }; }; "umd-3.0.3" = { @@ -28531,7 +27661,7 @@ let version = "3.0.3"; src = fetchurl { url = "https://registry.npmjs.org/umd/-/umd-3.0.3.tgz"; - sha512 = "4IcGSufhFshvLNcMCV80UnQVlZ5pMOC8mvNPForqwA4+lzYQuetTESLDQkeLmihq8bRcnpbQa48Wb8Lh16/xow=="; + sha512 = "2iz3bypw716y5lgdg89d7jwnkqnla4sid3l5hr2259ypf8h6sbkw3n0xa51ckzkkayf0c39ksaiax2j6ighj36p5ipwh5p1wx50d1z0"; }; }; "unbzip2-stream-1.2.5" = { @@ -28540,7 +27670,7 @@ let version = "1.2.5"; src = fetchurl { url = "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.2.5.tgz"; - sha512 = "izD3jxT8xkzwtXRUZjtmRwKnZoeECrfZ8ra/ketwOcusbZEp4mjULMnJOCfTDZBgGQAAY1AJ/IgxcwkavcX9Og=="; + sha512 = "0xgvidx384p6cc8zh4m0qq000cn140dsckkijf95ka6iqi9j5nsrjrrf3mr3gxnybcvf2l4hxkaf0j7cqxncm3lnpq4ripw2j7zfc4b"; }; }; "unc-path-regex-0.1.2" = { @@ -28558,11 +27688,7 @@ let version = "1.1.2"; src = fetchurl { url = "https://registry.npmjs.org/undeclared-identifiers/-/undeclared-identifiers-1.1.2.tgz"; -<<<<<<< HEAD - sha512 = "13EaeocO4edF/3JKime9rD7oB6QI8llAGhgn5fKOPyfkJbRb6NFv9pYV6dFEmpa4uRjKeBqLZP8GpuzqHlKDMQ=="; -======= sha512 = "0qq6lhyxbnac1pzcj5ily6a32wvi5ls8k8yj5cnyrpx3s2vnhjy89rzivrfa9qq3905kwh8lh3yhgmcpmkqljkjzx2ygq8fhxx1lwfp"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "undefsafe-2.0.2" = { @@ -28634,7 +27760,7 @@ let version = "1.9.1"; src = fetchurl { url = "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz"; - sha512 = "5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg=="; + sha512 = "1v1j738fqadps32lirl0nxzfhif6db9kslri77cwxq3c12adksibr6ips2zxqywh672d32sxrhfcvx2gwpc4a08hcydfxx4f2v1xzp7"; }; }; "underscore-contrib-0.3.0" = { @@ -28670,7 +27796,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/unherit/-/unherit-1.1.1.tgz"; - sha512 = "+XZuV691Cn4zHsK0vkKYwBEwB74T3IZIcxrgn2E4rKwTfFyI1zCh7X7grwh9Re08fdPlarIdyWgI8aVB3F5A5g=="; + sha512 = "3k40pnw86jz2238r4fv4sp5sdykrva5gl4azq3yxnhk1mw8biy17b5c71hrzq0sfd48dp0kpq3k04f0k11bxd623qrpw2kmmxbnwxpr"; }; }; "unicode-emoji-modifier-base-1.0.0" = { @@ -28760,7 +27886,7 @@ let version = "2.1.2"; src = fetchurl { url = "https://registry.npmjs.org/unist-util-is/-/unist-util-is-2.1.2.tgz"; - sha512 = "YkXBK/H9raAmG7KXck+UUpnKiNmUdB+aBGrknfQ4EreE1banuzrKABx3jP6Z5Z3fMSPMQQmeXBlKpCbMwBkxVw=="; + sha512 = "1bk26f0rhka8jhrbjg0jhfc4cqxz7g5k7z8qxqw0353mfx7nvaq9dqj73s9vr3a0jd1yx4lv64cm6ajji7p55xj3cka1bgxy4mw2ib2"; }; }; "unist-util-remove-position-1.1.2" = { @@ -28769,7 +27895,7 @@ let version = "1.1.2"; src = fetchurl { url = "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-1.1.2.tgz"; - sha512 = "XxoNOBvq1WXRKXxgnSYbtCF76TJrRoe5++pD4cCBsssSiWSnPEktyFrFLE8LTk3JW5mt9hB0Sk5zn4x/JeWY7Q=="; + sha512 = "3nrir95gy69ywsf99s11xmdk5dwjkaf1d7jriasr0nljg57cj4i5jxjh70f2hzazfwqfikb6blpn8dl3ck9sq3w578nbmga3cw0s6jz"; }; }; "unist-util-visit-1.3.1" = { @@ -28778,7 +27904,7 @@ let version = "1.3.1"; src = fetchurl { url = "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.3.1.tgz"; - sha512 = "0fdB9EQJU0tho5tK0VzOJzAQpPv2LyLZ030b10GxuzAWEfvd54mpY7BMjQ1L69k2YNvL+SvxRzH0yUIehOO8aA=="; + sha512 = "1lbrqw43r1ckx1i8zqjpyfbvdh3dngb9c6qsk5hcflqkryxzc8icc5vn50xf6vxsgcj4bznzfj10c17rrfd2jlvldhlnlq98ks43xyi"; }; }; "universalify-0.1.2" = { @@ -28787,11 +27913,7 @@ let version = "0.1.2"; src = fetchurl { url = "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz"; -<<<<<<< HEAD - sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="; -======= sha512 = "29d9b6i7rf460m0c5761z6xzzjdl2q81ri19x5qcnvi9l85jp71f7lbr7bdk7sx3k3sqwcp9vfpmlh7srgfnzlmssr5j0lpj0imw4mc"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "unix-crypt-td-js-1.0.0" = { @@ -28836,11 +27958,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/unordered-set/-/unordered-set-2.0.1.tgz"; -<<<<<<< HEAD - sha512 = "eUmNTPzdx+q/WvOHW0bgGYLWvWHNT3PTKEQLg0MAQhc0AHASHVHoP/9YytYd4RBVariqno/mEUhVZN98CmD7bg=="; -======= sha512 = "1pgnq0agkgn8ma827k8z7map1m5a4713pbcln7z7zl5278jf00385s2011q62s4539p6kydc6yxd0hrw135p1zkbazymiyxzi68sjbr"; ->>>>>>> nodePackages: meguca: 1.0.5 -> 1.0.7 }; }; "unorm-1.4.1" = { @@ -28894,7 +28012,7 @@ let version = "3.0.3"; src = fetchurl { url = "https://registry.npmjs.org/untildify/-/untildify-3.0.3.tgz"; - sha512 = "iSk/J8efr8uPT/Z4eSUywnqyrQU7DSdMfdqK4iWEaUVVmcP5JcnpRqmVMwcwcnmI1ATFNgC5V90u09tBynNFKA=="; + sha512 = "0l4awya87dx6bnxaywh0dn50ka8hybj603k75d98vlwj9grqfcmaib9hhjy52nsgm62f39v0nnv4yn268jpjy7n9y7wpbwzqwkkyac9"; }; }; "unyield-0.0.1" = { @@ -28930,7 +28048,7 @@ let version = "1.0.5"; src = fetchurl { url = "https://registry.npmjs.org/upath/-/upath-1.0.5.tgz"; - sha512 = "qbKn90aDQ0YEwvXoLqj0oiuUYroLX2lVHZ+b+xwjozFasAOC4GneDq5+OaIG5Zj+jFmbz/uO+f7a9qxjktJQww=="; + sha512 = "31m1lljcfngdnpyz67gpkwvb66gx6750si3jzmf1vg6kq420fq5lcd34cfgp6wz3manjpqbp9i98ax2yjl2xs7mq824chw38vvsgcm9"; }; }; "upath-1.1.0" = { @@ -28939,7 +28057,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz"; - sha512 = "bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw=="; + sha512 = "2pyjsmaajf6k6ql5qj270l0p3xkjvn25wky2qd1vndvl54ljbv8p8sbr44zsfh33mmrnj93ys4499c3h956wbgn4g82z8b1h3z4ffkg"; }; }; "update-check-1.5.2" = { @@ -28948,7 +28066,7 @@ let version = "1.5.2"; src = fetchurl { url = "https://registry.npmjs.org/update-check/-/update-check-1.5.2.tgz"; - sha512 = "1TrmYLuLj/5ZovwUS7fFd1jMH3NnFDN1y1A8dboedIDt7zs/zJMo6TwwlhYKkSeEwzleeiSBV5/3c9ufAQWDaQ=="; + sha512 = "1lq6181kzdp7xwzay0j8yjy771q89wi18b9cc1wx4l97k1z7gpyv03l3sx7ag2hrdsk6537fcgwqn3pqnvln57wl9czx3wbpdhfcfnm"; }; }; "update-notifier-0.5.0" = { @@ -28975,7 +28093,7 @@ let version = "2.5.0"; src = fetchurl { url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.5.0.tgz"; - sha512 = "gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw=="; + sha512 = "07vkna9y5i0ak6rwcbinrrgpabrcmav91ys805c42jskyc6kfla3wd12klsr858vzv5civi7arh5xz8bv7jdj81zgzyh6j70a31s0w3"; }; }; "update-section-0.3.3" = { @@ -29029,7 +28147,7 @@ let version = "4.2.2"; src = fetchurl { url = "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz"; - sha512 = "KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ=="; + sha512 = "2fz60s71ghl56ddfiiaws81xpiidlbjk69jyjmahz190d2advy9zdbcwh5if4rgg5hxdbfxhkwiipjrnjy8w834bxsmzambd2p4b3r9"; }; }; "urix-0.1.0" = { @@ -29101,7 +28219,7 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/use/-/use-3.1.0.tgz"; - sha512 = "6UJEQM/L+mzC3ZJNM56Q4DFGLX/evKGRg15UJHGB9X5j5Z3AFbgZvjUh2yq/UJUY4U5dh7Fal++XbNg1uzpRAw=="; + sha512 = "01m2fmv6pc6r5zgjxdb31sx9vhii5ahpwmdn89mpqcvh5f0kpjn6zpmh5qj8m2yhf8s3g6ygwnlccg0j2g36kcjvp16rynbrx048hp9"; }; }; "user-home-1.1.1" = { @@ -29137,11 +28255,7 @@ let version = "3.2.2"; src = fetchurl { url = "https://registry.npmjs.org/ut_metadata/-/ut_metadata-3.2.2.tgz"; -<<<<<<< HEAD - sha512 = "PltK6kZ85DMscFl1gwyvOyja6UGROdyLI1ufWCTLsYnLfBaMyhtOEcbtgEgOwYEz8QuchR49qgHXTdJ2H05VHA=="; -======= sha512 = "0f5akhzfv94vmq1m8yix1cw1gqk70f11r481vf62571pjlc2rycp2dircj5i7sv4f5xqfci87lxla1vmw686xarf0n37r3w8vm4lnry"; ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 }; }; "ut_pex-1.2.1" = { @@ -29150,7 +28264,7 @@ let version = "1.2.1"; src = fetchurl { url = "https://registry.npmjs.org/ut_pex/-/ut_pex-1.2.1.tgz"; - sha512 = "ZrxMCbffYtxQDqvREN9kBXK2CB9tPnd5PylHoqQX9ai+3HV9/S39FnA5JnhLOC82dxIQQg0nTN2wmhtAdGNtOA=="; + sha512 = "0w6sqvl80drmc6x9hkhshhh29vkcbrq9dw2cfbh2vyjvzbxfpfbxa7m2yja4ir97xwpfgkd3w4bcwh5ckgi1ldb1r8dqqnznw4lrg36"; }; }; "utf7-1.0.2" = { @@ -29195,7 +28309,7 @@ let version = "0.10.4"; src = fetchurl { url = "https://registry.npmjs.org/util/-/util-0.10.4.tgz"; - sha512 = "0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A=="; + sha512 = "3sbbgsya51i86ih8bn3nfwi3f9556xlnwh32z4k54dwcpi0jibhfa5dpbfmpzyla63yh2zlxs9chl6wkhc8bqjmjxjyxc9p6j2vvyfh"; }; }; "util-0.4.9" = { @@ -29222,7 +28336,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz"; - sha512 = "i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA=="; + sha512 = "28cvjkydplc2vpnqff8vylscx8851srnkl54y6i54pl6lhpr6548plvyj833jk2mfaf8h31gbn60s00azd28rzc5q5gm1hgcc1smvlb"; }; }; "utile-0.2.1" = { @@ -29276,7 +28390,7 @@ let version = "1.7.1"; src = fetchurl { url = "https://registry.npmjs.org/utp-native/-/utp-native-1.7.1.tgz"; - sha512 = "FSs76hQZsSsdI4YeePxb5SQoWmHxDRznImGiAN905O1svyHvcoQ3hYptu3Y9hPxRHeB3lHzJR5KRZy0Byj7qqg=="; + sha512 = "2mflgna04nng4cj8z4pr53pw0fm3z447mvbnvcahlvq8wpg46znrvg4fkgh18k14bkiq3gic5d2h975bgy7h7l64cfjpc8r2km3naqm"; }; }; "uue-3.1.2" = { @@ -29285,7 +28399,7 @@ let version = "3.1.2"; src = fetchurl { url = "https://registry.npmjs.org/uue/-/uue-3.1.2.tgz"; - sha512 = "axKLXVqwtdI/czrjG0X8hyV1KLgeWx8F4KvSbvVCnS+RUvsQMGRjx0kfuZDXXqj0LYvVJmx3B9kWlKtEdRrJLg=="; + sha512 = "0pcj6km8jmr85nr0xvnq9nmicnz9a2ysy8bj7s9qxin8c0hzd992bwx8bsnxlmbw02iynqyp0l7a9c7zi2ipqrsfczx5ddhb9fqn4kb"; }; }; "uuid-2.0.3" = { @@ -29321,16 +28435,16 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz"; - sha512 = "DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g=="; + sha512 = "3x5mi85l1559nkb35pfksjjgiyfyqrcvmcf0nly1xjl1kb0d37jnxd6sk0b8d331waadnqbf60nfssb563x9pvnjcw87lrh976sv18c"; }; }; - "uuid-3.3.0" = { + "uuid-3.3.2" = { name = "uuid"; packageName = "uuid"; - version = "3.3.0"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.3.0.tgz"; - sha512 = "ijO9N2xY/YaOqQ5yz5c4sy2ZjWmA6AR6zASb/gdpeKZ8+948CxwfMW9RrKVk5may6ev8c0/Xguu32e2Llelpqw=="; + url = "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz"; + sha512 = "1jd16sd57jqhaxygqxb1lixq31n83h1j4raknzjsw0m1pxnnhwv8aqlb1gsypdglisij9fnhxlxkgxhfm7292h353kkkp5hsrw6cwn9"; }; }; "uws-9.14.0" = { @@ -29339,7 +28453,7 @@ let version = "9.14.0"; src = fetchurl { url = "https://registry.npmjs.org/uws/-/uws-9.14.0.tgz"; - sha512 = "HNMztPP5A1sKuVFmdZ6BPVpBQd5bUjNC8EFMFiICK+oho/OQsAJy5hnIx4btMHiOk8j04f/DbIlqnEZ9d72dqg=="; + sha512 = "2m9vgbpgm39qsl9dk1zzqglr29qwy1hxn3cgj0rwrr05c4hyfij3sib08i1ck21y1136ljvvr0l2nixh6g7arjip455n0zryfs37lqw"; }; }; "v8-debug-1.0.1" = { @@ -29384,7 +28498,7 @@ let version = "3.0.3"; src = fetchurl { url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz"; - sha512 = "63ZOUnL4SIXj4L0NixR3L1lcjO38crAbgrTpl28t8jjrfuiOBL5Iygm+60qPs/KsZGzPNg6Smnc/oY16QTjF0g=="; + sha512 = "39caf21ga6s2gvpka90wdngdijarwmkix5fpgh9r94bw14fx1zfnf7j5mprgsdlh8dv0wpwxn65qn9gfwa8n3dxw3iqaj7qf994wxpb"; }; }; "validate-npm-package-name-3.0.0" = { @@ -29411,7 +28525,7 @@ let version = "9.4.1"; src = fetchurl { url = "https://registry.npmjs.org/validator/-/validator-9.4.1.tgz"; - sha512 = "YV5KjzvRmSyJ1ee/Dm5UED0G+1L4GZnLN3w6/T+zZm8scVua4sOhYKWTUrKa0H/tMiJyO9QLHMPN+9mB/aMunA=="; + sha512 = "2f2x8zxh7czpkf33h5x8fvj48rfszyhkar554x5c2hw7qlsbdqjqvv6nczzsfkw6z5rj6gqabxhcg8haip0xgz7sn4jr6fi7f7llpk1"; }; }; "value-or-function-3.0.0" = { @@ -29546,7 +28660,7 @@ let version = "2.0.3"; src = fetchurl { url = "https://registry.npmjs.org/vfile-location/-/vfile-location-2.0.3.tgz"; - sha512 = "zM5/l4lfw1CBoPx3Jimxoc5RNDAHHpk6AM6LM0pTIkm5SUSsx8ZekZ0PVdf0WEZ7kjlhSt7ZlqbRL6Cd6dBs6A=="; + sha512 = "3l6rl79knh2zld6jvcxwjk17697nijqykbma3wxj5gcdixc8i4vjj92ad5372yf00x9j7h760s53km1n4ljcxzwl20m1hszi6bpzknc"; }; }; "vhost-3.0.2" = { @@ -29558,13 +28672,13 @@ let sha1 = "2fb1decd4c466aa88b0f9341af33dc1aff2478d5"; }; }; - "videostream-2.4.2" = { + "videostream-2.4.3" = { name = "videostream"; packageName = "videostream"; - version = "2.4.2"; + version = "2.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/videostream/-/videostream-2.4.2.tgz"; - sha1 = "9560254d00fabdc40955c1a3c282057d8db1d115"; + url = "https://registry.npmjs.org/videostream/-/videostream-2.4.3.tgz"; + sha512 = "3szpyg4m3zcbjxmsq0xizi48xcb6bml7ysyvjhyqxhqsnqwn99qc19qhpq5w73j17pc3i69ly6ac9mm19k24iz8ycq7k0w1airh62gh"; }; }; "vinyl-0.4.6" = { @@ -29600,11 +28714,7 @@ let version = "2.2.0"; src = fetchurl { url = "https://registry.npmjs.org/vinyl/-/vinyl-2.2.0.tgz"; -<<<<<<< HEAD - sha512 = "MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg=="; -======= sha512 = "290vvxjmx7zxxgcmjfsy92aizfm6daz92y336rqf8g18hcar5g94dw186ybbl6v9vhsxdg34a51ycagrysal0bcwj8g22r4zp4gw49h"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "vinyl-file-2.0.0" = { @@ -29631,7 +28741,7 @@ let version = "3.0.3"; src = fetchurl { url = "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-3.0.3.tgz"; - sha512 = "vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng=="; + sha512 = "2g60av6jpj5jf9rx5v3gzvvvki2ni25jdinhkppzxng91k55z1cxykqsxbsjrm4kyp1lnnm3s1b452qfg1v28zxk1qj4drj97hbg2xw"; }; }; "vinyl-sourcemap-1.1.0" = { @@ -29676,11 +28786,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.0.tgz"; -<<<<<<< HEAD - sha512 = "iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw=="; -======= sha512 = "0dqh260i5pwksrgs15lcxbk4y92p77xvnbnkyq5kk2qa9p4bk7l48d0b7akymjc7inwfrllrz9kff7bli3k7n1hg8ras4s9yvp95bwa"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "voc-1.1.0" = { @@ -29689,7 +28795,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/voc/-/voc-1.1.0.tgz"; - sha512 = "fthgd8OJLqq8vPcLjElTk6Rcl2e3v5ekcXauImaqEnQqd5yUWKg1+ZOBgS2KTWuVKcuvZMQq4TDptiT1uYddUA=="; + sha512 = "185v1xryljbds9hw4mc8r5grclrassdi8nq30ckz4sshn4lkivjlx0jm9k25bknf6j9ggxpcybmr94kad4qq2zppjyalbl9qdvn1n3y"; }; }; "void-elements-2.0.1" = { @@ -29716,7 +28822,7 @@ let version = "3.6.0"; src = fetchurl { url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.6.0.tgz"; - sha512 = "PqHHjuTlz3ks0vyZv3IkdduJReA/lqe6OP5zRl5nXn2ptMLW++fBotNyayyZEQLIF6nNrx/Rn6WhMSHElf02Yw=="; + sha512 = "1ikdzcmqhhk38d5kz8izbydm4bwh0hik4n6nwnklb0ygyynqasajzaycxg4cwzy72xag5izw12qknvm4irbz6gws8n7kkz5wj7cg89y"; }; }; "vscode-jsonrpc-3.6.2" = { @@ -29725,7 +28831,7 @@ let version = "3.6.2"; src = fetchurl { url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.6.2.tgz"; - sha512 = "T24Jb5V48e4VgYliUXMnZ379ItbrXgOimweKaJshD84z+8q7ZOZjJan0MeDe+Ugb+uqERDVV8SBmemaGMSMugA=="; + sha512 = "202w8rihrk7lri0y5akai44xbx1nj7rvvh33x594miycr5vrbxk7khg46dni2h7kfi06ppbsqigszk74xrm2ql9h4ayxwbqjmphjvjg"; }; }; "vscode-languageclient-4.0.1" = { @@ -29734,11 +28840,7 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-4.0.1.tgz"; -<<<<<<< HEAD - sha512 = "0fuBZj9pMkeJ8OMyIvSGeRaRVhUaJt+yeFxi7a3sz/AbrngQdcxOovMXPgKuieoBSBKS05gXPS88BsWpJZfBkA=="; -======= sha512 = "28c35r5m72hcg1g7lbrilwj29403sl9mq13w5zkl97cqx8hg2p1pw6gxjnysqjwg2rdy9hs2mb925krhvs24cp3y24lfck97xk83yyi"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "vscode-languageserver-4.0.0" = { @@ -29747,7 +28849,7 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-4.0.0.tgz"; - sha512 = "bxj9nRadNkXYfVG/fjA5a+KA5WaJCeP1F2Tnj3rYFS0pKALZQCPNqk3KO/LdiGFidjyICMG7xoHvYO9J9xosXg=="; + sha512 = "1g2q6pp97pn1vw1qsxw22487iv64qc8vpr3pjjdmb6j6h6r08l2jb8mv1x8zrv42zsy62c9cvjq1qkb74q7xgsigpc4adlx2sfzs63g"; }; }; "vscode-languageserver-4.2.1" = { @@ -29756,11 +28858,7 @@ let version = "4.2.1"; src = fetchurl { url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-4.2.1.tgz"; -<<<<<<< HEAD - sha512 = "5WAxaK1nEpe52ZaWNMqmd6rO5CIE72J/7UkGKPUTdGa0l0haWHS69tpRz+LetBlgTpP7PYacl4xhDaLZv82a+g=="; -======= sha512 = "3x9mkdzv6i0sqccjyf8cggvjd7606dlvvicylfsysx78n2s92bv8rkl2gsjh1j9xmzn5vq44bjcxakplv5395lnv6wrf4k7mml32q75"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "vscode-languageserver-protocol-3.6.0" = { @@ -29769,7 +28867,7 @@ let version = "3.6.0"; src = fetchurl { url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.6.0.tgz"; - sha512 = "PN5hVQQQxrtHSZR8UCstqaoI9f2H9JctFTtdIpONWjzQNurWrc48qSXXU/vTfnbSrNou8qrJgkZ4QEZsyozOMA=="; + sha512 = "0qcx36adi340y26hb4smwifvand4xkysgxm7mr5m4ycxbfnx8vd0g2sin9j4p9v2lnrgx47zpshiam95lmm0z4l953vpihh0ian3piw"; }; }; "vscode-languageserver-protocol-3.8.1" = { @@ -29778,11 +28876,7 @@ let version = "3.8.1"; src = fetchurl { url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.8.1.tgz"; -<<<<<<< HEAD - sha512 = "KdeetvQ2JavRiuE9afNrV5+xJZocj7NGPQwH4kpSFw5cp+0wijv87qgXfSEvmwPUaknhMBoSuSrSIG/LRrzWJQ=="; -======= sha512 = "0jxdg26rdpj1liap491lc7195md80wv5whps5x8xvy3p2ihxnkmq3hpa95f41qc7m3b73qwk8jv37spdgrnjgg1ib8sn99nyjv9xmr9"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "vscode-languageserver-types-3.8.2" = { @@ -29791,11 +28885,7 @@ let version = "3.8.2"; src = fetchurl { url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.8.2.tgz"; -<<<<<<< HEAD - sha512 = "2RMkyt1O1czGPCnkjKZWSio2D8oh3XlQ4zi4W2xL8q2Dvi4hB3/DEt+wYyzo4hmE2ZFP0RB8PXyzHyed7p1hbw=="; -======= sha512 = "1pn37gfklkizcvw7my11lagj7cq86g2x0n67c6z2b1py1r15sz87bgj9dn5pf1qwd87kp91r87kcajaask8rr197k3crmafvp5284yr"; ->>>>>>> nodePackages: meguca: 1.0.5 -> 1.0.7 }; }; "vscode-uri-1.0.3" = { @@ -29822,7 +28912,7 @@ let version = "2.3.13"; src = fetchurl { url = "https://registry.npmjs.org/walk/-/walk-2.3.13.tgz"; - sha512 = "78SMe7To9U7kqVhSoGho3GfspA089ZDBIj2f8jElg2hi6lUCoagtDJ8sSMFNlpAh5Ib8Jt1gQ6Y7gh9mzHtFng=="; + sha512 = "2g4ayyccqgq4fx68dhds9pwhvj2344n9p0lhb4z1hnsi882apm64s434lqz57rx4b0r1x9w1njfqrywd1la0ljqm7j4xxg8nixqri7g"; }; }; "walk-sync-0.3.2" = { @@ -29831,7 +28921,7 @@ let version = "0.3.2"; src = fetchurl { url = "https://registry.npmjs.org/walk-sync/-/walk-sync-0.3.2.tgz"; - sha512 = "FMB5VqpLqOCcqrzA9okZFc0wq0Qbmdm396qJxvQZhDpyu0W95G9JCmp74tx7iyYnyOcBtUuKJsgIKAqjozvmmQ=="; + sha512 = "2cycfx3lc52h2684s54pd81wz42f9lbggff4yva194nzr5x8nxp4fl437scd2dayyvxk68v8jmk1k8m364zdh5wmaff1a2bm9b7kh0l"; }; }; "ware-1.3.0" = { @@ -29849,7 +28939,7 @@ let version = "1.5.0"; src = fetchurl { url = "https://registry.npmjs.org/watchpack/-/watchpack-1.5.0.tgz"; - sha512 = "RSlipNQB1u48cq0wH/BNfCu1tD/cJ8ydFIkNYhp9o+3d+8unClkIovpW5qpFPgmL9OE48wfAnlZydXByWP82AA=="; + sha512 = "003dzsqf9q7awjnkv00gwrqw7s8n29y8nmfcmpsl845j2m7rgxxvvd3gld643c92jfwq9yw7ysbaavw9pq1yc5df8yfxmh1sjj64aa5"; }; }; "watchpack-1.6.0" = { @@ -29858,7 +28948,7 @@ let version = "1.6.0"; src = fetchurl { url = "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz"; - sha512 = "i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA=="; + sha512 = "34gp4bbaidicl7azgivrrxb9kvdz501gg0xyf88lya75j9wmrbd1rs5rlk2h5g07q5rb453fkjkck54j2qzsdam1qk36bijf5xlg9wb"; }; }; "wcwidth-1.0.1" = { @@ -29894,7 +28984,7 @@ let version = "4.0.2"; src = fetchurl { url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz"; - sha512 = "YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="; + sha512 = "15gwgjh9anvzcissfhxy3gki7jxn1dy9vq5rma1sgwkbbra8wbxnvimwalgmy8anm33x56mfp492akzhs0gidwmbnadx0ck3fdq23v1"; }; }; "webpack-sources-1.1.0" = { @@ -29903,7 +28993,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.1.0.tgz"; - sha512 = "aqYp18kPphgoO5c/+NaUvEeACtZjMESmDChuD3NBciVpah3XpMEU9VAAtIaB1BsfJWWTSdv8Vv1m3T0aRk2dUw=="; + sha512 = "19rska638yxsrpxavydnjckcljiy6ylh63b802hylac396p3mm6j9bj85rhyvi81jk48c33sq580ixwjkbghgwp7cl1i9hgr7bjk9ka"; }; }; "websocket-driver-0.7.0" = { @@ -29921,7 +29011,7 @@ let version = "0.1.3"; src = fetchurl { url = "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz"; - sha512 = "nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg=="; + sha512 = "0d1n4yv45ibxf72hj7qka3j7v53dwn58savfiyvsppqhhrgg3g648ykk5v7fpb53hz85kj87m4f45r7d5iazx4yqgs381z6qnfd98cy"; }; }; "websocket-stream-5.1.2" = { @@ -29930,7 +29020,7 @@ let version = "5.1.2"; src = fetchurl { url = "https://registry.npmjs.org/websocket-stream/-/websocket-stream-5.1.2.tgz"; - sha512 = "lchLOk435iDWs0jNuL+hiU14i3ERSrMA0IKSiJh7z6X/i4XNsutBZrtqu2CPOZuA4G/zabiqVAos0vW+S7GEVw=="; + sha512 = "1bq9cabpvsx4b0aajmbhsgkdzh816rrixhbnsmvcr0ypcndhn5zz9fggfc8i4l2s00b6jhif65phkc9l6zvika8ngb21rip9qx4pj4m"; }; }; "webtorrent-0.100.0" = { @@ -29939,7 +29029,7 @@ let version = "0.100.0"; src = fetchurl { url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.100.0.tgz"; - sha512 = "b3NhfSC1luFj5lU0Q19V9e69tBnQ2KjDHEEOHz1YRDKTTemVveqjEDUHoL1ZDkRw0WpidbQtr2XZnHmG83vOCg=="; + sha512 = "05cwyzkhrwrrnb5mwnv8xb2db8p0i0fb6ys01rm22iymgcmx56r6cj4b0yiy3j13k1sin6h36sbvvpmamgl6d2mwriy35mm41yn2wvg"; }; }; "whatwg-fetch-2.0.4" = { @@ -29948,7 +29038,7 @@ let version = "2.0.4"; src = fetchurl { url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz"; - sha512 = "dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng=="; + sha512 = "2g4p2ymmww4wm7cf86xwpb0dndwlxk1gg3brsrj892a4z593h25hyhqv0rmv4hzz4zxv3smmaflsnhilakfpr6y8f2gf3sfd8ckbi3m"; }; }; "whatwg-url-6.4.1" = { @@ -29957,7 +29047,7 @@ let version = "6.4.1"; src = fetchurl { url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.4.1.tgz"; - sha512 = "FwygsxsXx27x6XXuExA/ox3Ktwcbf+OAvrKmLulotDAiO1Q6ixchPFaHYsis2zZBZSJTR0+dR+JVtf7MlbqZjw=="; + sha512 = "27rkflmrkzbamg28yflyisk49jl2dnvmk4651sn7hhig2rsahxj4c5ld3ljx9mjps0f6zqv0yvwl7d37w817vkmx7qnxiqp3frs030p"; }; }; "whatwg-url-compat-0.6.5" = { @@ -30020,7 +29110,7 @@ let version = "1.3.1"; src = fetchurl { url = "https://registry.npmjs.org/which/-/which-1.3.1.tgz"; - sha512 = "HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ=="; + sha512 = "0hr4hxkk8yb9fz993bs69pf8z2z2qb6sdpxfxb84sd16lja9fsx444pk1ang1ivmjjv5srnsm6fihdj593w7rwxdh834cdmd9hms4hz"; }; }; "which-module-1.0.0" = { @@ -30056,7 +29146,7 @@ let version = "1.1.3"; src = fetchurl { url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz"; - sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA=="; + sha512 = "2224a32flpf40nhq6rj4idzkcdz0vx65bfxp90hd06db18l6fiqgxz1xnaygm3pbfb1a6v73hl8ryq4996b09zwwins0bqprx0hwsa0"; }; }; "widest-line-2.0.0" = { @@ -30200,11 +29290,7 @@ let version = "2.4.3"; src = fetchurl { url = "https://registry.npmjs.org/winston/-/winston-2.4.3.tgz"; -<<<<<<< HEAD - sha512 = "GYKuysPz2pxYAVJD2NPsDLP5Z79SDEzPm9/j4tCjkF/n89iBNGBMJcR+dMUqxgPNgoSs6fVygPi+Vl2oxIpBuw=="; -======= sha512 = "2xl32n4m1fmdgpqh1rgbsdchj1cs0y65b2p8zn44m660d41v3ryfpwhlg8f5qyzkg7lq32jpxkzkcqcxk9xhhsj05c9rnpkqg5ax0hr"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "with-4.0.3" = { @@ -30267,7 +29353,7 @@ let version = "1.6.0"; src = fetchurl { url = "https://registry.npmjs.org/worker-farm/-/worker-farm-1.6.0.tgz"; - sha512 = "6w+3tHbM87WnSWnENBUvA2pxJPLhQUg5LKwUQHq3r+XPhIM+Gh2R5ycbwPCyuGbNg+lPgdcnQUhuC02kJCvffQ=="; + sha512 = "1yxyar4li6hnvj884kxg0agx61wsrmqnbqc06r7wy8is6iyhf2czrdgnxx4055c5hwlhhg1y8j72sh35wak9i3996kvbwycfssbf3zb"; }; }; "wrap-ansi-2.1.0" = { @@ -30312,7 +29398,7 @@ let version = "12.5.1"; src = fetchurl { url = "https://registry.npmjs.org/wreck/-/wreck-12.5.1.tgz"; - sha512 = "l5DUGrc+yDyIflpty1x9XuMj1ehVjC/dTbF3/BasOO77xk0EdEa4M/DuOY8W88MQDAD0fEDqyjc8bkIMHd2E9A=="; + sha512 = "3s89p8x1i16wg1prbm40z7l00611hzk2s7kkvph6fw4cx049p3gpviqmhbgqxxi9pfjz32mx3aj7qsygmfcnvasgs43rj1ynwdd944p"; }; }; "write-0.2.1" = { @@ -30339,7 +29425,7 @@ let version = "2.3.0"; src = fetchurl { url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz"; - sha512 = "xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA=="; + sha512 = "2sgqxmcqzjd7nq9gjh6jz7vfb0gs0ag4jvqzdq93afq3bw3jrm88mhxql9sryyb04f3ipw5jkgjfiigsmdwlz9fgsnnm3cxhcmxxqy6"; }; }; "write-json-file-2.3.0" = { @@ -30357,7 +29443,7 @@ let version = "3.2.0"; src = fetchurl { url = "https://registry.npmjs.org/write-pkg/-/write-pkg-3.2.0.tgz"; - sha512 = "tX2ifZ0YqEFOF1wjRW2Pk93NLsj02+n1UP5RvO6rCs0K6R2g1padvf006cY74PQJKMGS2r42NK7FD0dG6Y6paw=="; + sha512 = "1msk3p98r3hzidf6hvbxnljq4l0kx707g3fjd7xpnfrdmm03plhmk8amgpbqlgya3syknzlr0pcvpckixnla8sw2x743a0qkmys4zdm"; }; }; "ws-0.4.31" = { @@ -30384,7 +29470,7 @@ let version = "1.1.5"; src = fetchurl { url = "https://registry.npmjs.org/ws/-/ws-1.1.5.tgz"; - sha512 = "o3KqipXNUdS7wpQzBHSe180lBGO60SoK0yVo3CYJgb2MkobuWuBX6dhkYP5ORCLd55y+SaflMOV5fqAB53ux4w=="; + sha512 = "3iv2yz706h7wyg563jsfjdykkkxs8j49vz60r6qx5by0npfhs98rgc114kdqs15sc52mldscc22bkfpkrs08cwlqaxx8lfdjn5alwm3"; }; }; "ws-2.3.1" = { @@ -30402,7 +29488,7 @@ let version = "3.3.3"; src = fetchurl { url = "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz"; - sha512 = "nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA=="; + sha512 = "2887c18dlvnvc62pqgwhihzxnnj9mzbnjqa0gqg3n94k5b6fx6nm1wggisy2bg3mi7dl81vk11i49wl319yfvh255w2nrbhydmqnxcy"; }; }; "ws-4.1.0" = { @@ -30411,7 +29497,7 @@ let version = "4.1.0"; src = fetchurl { url = "https://registry.npmjs.org/ws/-/ws-4.1.0.tgz"; - sha512 = "ZGh/8kF9rrRNffkLFV4AzhvooEclrOH0xaugmqGsIfFgOE/pIz4fMc4Ef+5HSQqTEug2S9JZIWDR47duDSLfaA=="; + sha512 = "1ldy8hddsvy7lb045cx4jrnx09962j98zp7y16f64gkw8z99ww61w91mjhrm85bqpsf3b158yhfh6yf01g1a2zrgm6v9bkx87r7ys34"; }; }; "ws-5.2.1" = { @@ -30420,11 +29506,7 @@ let version = "5.2.1"; src = fetchurl { url = "https://registry.npmjs.org/ws/-/ws-5.2.1.tgz"; -<<<<<<< HEAD - sha512 = "2NkHdPKjDBj3CHdnAGNpmlliryKqF+n9MYXX7/wsVC4yqYocKreKNjydPDvT3wShAZnndlM0RytEfTALCDvz7A=="; -======= sha512 = "3ng6fq81cq7si1b8ws56xp7k40s216zscxkr79w6s5bfahwialk4bjl5kyfzmw567yyj5xa4apn4ncsd5ih0rvp13vih353y9s0gnfq"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "wtf-8-1.0.0" = { @@ -30487,7 +29569,7 @@ let version = "2.5.0"; src = fetchurl { url = "https://registry.npmjs.org/xhr/-/xhr-2.5.0.tgz"; - sha512 = "4nlO/14t3BNUZRXIXfXe+3N6w3s1KoxcJUUURctd64BLRe67E4gRwp4PjywtDY72fXpZ1y6Ch0VZQRY/gMPzzQ=="; + sha512 = "36z7hw07wb42na5hy12xmsrg9yzd3hd5ln8y3wyq88qh4xvxr2lp07bbp5la5254mf8qaimgg1plwzvvvsmvj0mcma17p1dbvzlwyg2"; }; }; "xml-1.0.0" = { @@ -30559,7 +29641,7 @@ let version = "0.4.19"; src = fetchurl { url = "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz"; - sha512 = "esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q=="; + sha512 = "3skianymbfq4rg2v5c1vwsz2kmxfik60qa892wh6a3rydd1wrv3l4vgyr8v4wd8krdf42jbmq7blp0ksbmwm332q5yr922fj8jngiks"; }; }; "xml2tss-0.0.5" = { @@ -30713,7 +29795,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/xpath.js/-/xpath.js-1.1.0.tgz"; - sha512 = "jg+qkfS4K8E7965sqaUl8mRngXiKb3WZGfONgE18pr03FUQiuSV6G+Ej4tS55B+rIQSFEIw3phdVAQ4pPqNWfQ=="; + sha512 = "1ymd8ry54702m8plqvqq4450hhsn7z4p7af48z13dx2bf928hakggd6gi6q13gk36cpavwag20nfr7j4njsjv5fywxw2axqyj8sl3wf"; }; }; "xregexp-2.0.0" = { @@ -30731,7 +29813,7 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/xregexp/-/xregexp-4.0.0.tgz"; - sha512 = "PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg=="; + sha512 = "0b2p3pxs6fa0knpdw3qhcpqh47ci9w9r4lfhav4nsg7p7l73izpig0b3knkrsl72nq5ll4pk79is30vwm1c044lnbqyxfi8qkx8qz1w"; }; }; "xsalsa20-1.0.2" = { @@ -30740,7 +29822,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/xsalsa20/-/xsalsa20-1.0.2.tgz"; - sha512 = "g1DFmZ5JJ9Qzvt4dMw6m9IydqoCSP381ucU5zm46Owbk3bwmqAr8eEJirOPc7PrXRn45drzOpAyDp8jsnoyXyw=="; + sha512 = "35rg34yxk4ag0qclk7bqxirgr3dgypcvkisqqj2g3y0ma16pkfy81iv79pcwff5p4spygwjh2m9v37llq7367fypqrx89s9kscwal43"; }; }; "xspfr-0.3.1" = { @@ -30785,7 +29867,7 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz"; - sha512 = "r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w=="; + sha512 = "3zj75gvpcgiphxpci4ji1znykk9n4cs0aw3dd6inwdvkmxyqn2483vya70lssjwq8alspnpw88vgii21fdrcn2vmfyppzgf4mkvzm5g"; }; }; "yallist-2.1.2" = { @@ -30830,7 +29912,7 @@ let version = "10.0.3"; src = fetchurl { url = "https://registry.npmjs.org/yargs/-/yargs-10.0.3.tgz"; - sha512 = "DqBpQ8NAUX4GyPP/ijDGHsJya4tYqLQrjPr95HNsr1YwL3+daCfvBwg7+gIC6IdJhR2kATh3hb61vjzMWEtjdw=="; + sha512 = "1vn6jsqrhybxddyhmvkh0d43n2lk1z8081glfq80zpjfs4xgwpk0mmgdiry9zgsihmv9a2qidmp5hhyqqq8mzzkr037wla0qd1nk80f"; }; }; "yargs-10.1.2" = { @@ -30839,7 +29921,7 @@ let version = "10.1.2"; src = fetchurl { url = "https://registry.npmjs.org/yargs/-/yargs-10.1.2.tgz"; - sha512 = "ivSoxqBGYOqQVruxD35+EyCFDYNEFL/Uo6FcOnz+9xZdZzK0Zzw4r4KhbrME1Oo2gOggwJod2MnsdamSG7H9ig=="; + sha512 = "25gvc8vjalpbv69v0frmh10x203dsnl0jrnx8c2mww3qrxl69kms5ppzry3lp51lgaby524hc6qa80kgrz0zcdvas8flq26l33aix4a"; }; }; "yargs-11.0.0" = { @@ -30848,16 +29930,16 @@ let version = "11.0.0"; src = fetchurl { url = "https://registry.npmjs.org/yargs/-/yargs-11.0.0.tgz"; - sha512 = "Rjp+lMYQOWtgqojx1dEWorjCofi1YN7AoFvYV7b1gx/7dAAeuI4kN5SZiEvr0ZmsZTOpDRcCqrpI10L31tFkBw=="; + sha512 = "03n9lfnyx1dfj5sm811f3d96djsr6fixd5qi6cl6wj8xf0y01sgn7w3ynv5gn2vl30dwq5mz2hw5f522v8xbwc8m9h6nf8hqsa7wfj6"; }; }; - "yargs-12.0.0" = { + "yargs-12.0.1" = { name = "yargs"; packageName = "yargs"; - version = "12.0.0"; + version = "12.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-12.0.0.tgz"; - sha512 = "wxkoyGB8193wsR6UhjzVQ76VgXx5wLJvGsBd70tuLabLFIDx/Pq9+GFGY3aoWZ8zDMK6KrmdjlUf/h/SMv+eOA=="; + url = "https://registry.npmjs.org/yargs/-/yargs-12.0.1.tgz"; + sha512 = "2lvbszm143lwppp0j03fbqzfq5rn2m5ygl37v7az6rdbgla36rwrd127zrgg051nrx8cnai1ww7sdrnvzc1d5l3h0ipwib1kl1d2jq7"; }; }; "yargs-3.10.0" = { @@ -30914,13 +29996,13 @@ let sha1 = "52acc23feecac34042078ee78c0c007f5085db4c"; }; }; - "yargs-parser-10.0.0" = { + "yargs-parser-10.1.0" = { name = "yargs-parser"; packageName = "yargs-parser"; - version = "10.0.0"; + version = "10.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.0.0.tgz"; - sha512 = "+DHejWujTVYeMHLff8U96rLc4uE4Emncoftvn5AjhB1Jw1pWxLzgBUT/WYbPrHmy6YPEBTZQx5myHhVcuuu64g=="; + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz"; + sha512 = "1nj7f7y3kyrc1ijsgnaf4mdkxhxy38lnckavl6inh9wwzhx12xfmgq0n45x4fbj0y6rd1zhjv57l49qm07kqfd9a9cl1809bi3k48jl"; }; }; "yargs-parser-4.2.1" = { @@ -30956,7 +30038,7 @@ let version = "8.1.0"; src = fetchurl { url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-8.1.0.tgz"; - sha512 = "yP+6QqN8BmrgW2ggLtTbdrOyBNSI7zBa4IykmiV5R1wl1JWNxQvWhMfMdmzIYtKU7oP3OOInY/tl2ov3BDjnJQ=="; + sha512 = "0jyff04yy5xlrgvccky4f7phgp99lk2r1n7dk67hkb0picdjpa2ap27g4jrm94cw1d31vw8sh2b5cvnvga2w838bgh6l1kwld1bmzy8"; }; }; "yargs-parser-9.0.2" = { @@ -31019,7 +30101,7 @@ let version = "3.0.1"; src = fetchurl { url = "https://registry.npmjs.org/yeoman-doctor/-/yeoman-doctor-3.0.1.tgz"; - sha512 = "ccV0Yf7nL9dTCIY+H+7gp/qtRegf8C6CGcUIr95FEc+UBR1Y17CxPvrvH72FQ4zmDv0VM/egiMavamtVIkhEgw=="; + sha512 = "21l8j12ammnmby6i2hgfcqmzl7fd323hnyizvzs7sqv1msq3l2r9kqi8pgay2653612xw0zx12svym7w3p1ygl6119xfbz7zrhp9ibi"; }; }; "yeoman-environment-2.3.0" = { @@ -31028,11 +30110,7 @@ let version = "2.3.0"; src = fetchurl { url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.3.0.tgz"; -<<<<<<< HEAD - sha512 = "PHSAkVOqYdcR+C+Uht1SGC4eVD/9OhygYFkYaI66xF8vKIeS1RNYay+umj2ZrQeJ50tF5Q/RSO6qGDz9y3Ifug=="; -======= sha512 = "2x1ywnbzly1iapf938hzra59gkqj1xdk4yrmbigddc17mcjhwl2ypy4pa76h62rc2h1qfpx7xa1wbhqabfqd51gz08xfqdaaf8q0x1w"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "yosay-2.0.2" = { @@ -31041,7 +30119,7 @@ let version = "2.0.2"; src = fetchurl { url = "https://registry.npmjs.org/yosay/-/yosay-2.0.2.tgz"; - sha512 = "avX6nz2esp7IMXGag4gu6OyQBsMh/SEn+ZybGu3yKPlOTE6z9qJrzG/0X5vCq/e0rPFy0CUYCze0G5hL310ibA=="; + sha512 = "1n24pfz9fc1pd1p1cc2bl3jy6nb9xxbqadmzx3grims5xmk9r64xy98ybnim6wwz4kj3z91qc391v785s4876ki6749xcly7ngzmxba"; }; }; "zen-observable-0.5.2" = { @@ -31050,7 +30128,7 @@ let version = "0.5.2"; src = fetchurl { url = "https://registry.npmjs.org/zen-observable/-/zen-observable-0.5.2.tgz"; - sha512 = "Dhp/R0pqSHj3vPs5O1gVd9kZx5Iew2lqVcfJQOBHx3llM/dLea8vl9wSa9FK8wLdSBQJ6mmgKi9+Rk2DRH3i9Q=="; + sha512 = "3sy4za4hd6lczig5ah6ksh92i4ds0pk9b8nn4nwjwpsyyabywrnayf78zh41jf7amm6khqyjb3iknbp2mc3nfgvpkvphj3a993py6hf"; }; }; "zeparser-0.0.5" = { @@ -31116,7 +30194,7 @@ in version = "1.13.0"; src = fetchurl { url = "https://registry.npmjs.org/alloy/-/alloy-1.13.0.tgz"; - sha512 = "sMapc9fb5Jf2hOQYa0Rqs/IvEo979iK4oqfNYq55E6sPN6CiBhFwyAS655khFIAhajylFhsCa0jirGGMMYagwA=="; + sha512 = "30a11iiiihsrqj8dc11n5m57im2300l46cygfh4r1q121m2l0vhzaqkg6p65kd7law25xkviw92zwmkd926n674hkv9gr6vsxrskimh"; }; dependencies = [ sources."JSV-4.0.2" @@ -31148,7 +30226,7 @@ in sources."chalk-1.1.3" sources."chmodr-1.0.2" sources."colors-1.3.0" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."concat-map-0.0.1" sources."convert-source-map-1.5.1" sources."core-js-2.5.7" @@ -31165,11 +30243,7 @@ in ]; }) sources."global-paths-1.0.0" - (sources."global-prefix-0.1.5" // { - dependencies = [ - sources."is-windows-0.2.0" - ]; - }) + sources."global-prefix-0.1.5" sources."globals-9.18.0" sources."graceful-fs-4.1.11" sources."has-ansi-2.0.0" @@ -31186,7 +30260,13 @@ in sources."jsesc-1.3.0" sources."json5-0.5.1" sources."jsonfile-4.0.0" - sources."jsonlint-1.6.2" + (sources."jsonlint-1.6.2" // { + dependencies = [ + sources."ansi-styles-1.0.0" + sources."chalk-0.4.0" + sources."strip-ansi-0.1.1" + ]; + }) sources."lodash-4.17.10" sources."loose-envify-1.3.1" sources."matcher-collection-1.0.5" @@ -31196,13 +30276,7 @@ in sources."moment-2.20.1" sources."ms-2.0.0" sources."node.extend-2.0.0" - (sources."nomnom-1.8.1" // { - dependencies = [ - sources."ansi-styles-1.0.0" - sources."chalk-0.4.0" - sources."strip-ansi-0.1.1" - ]; - }) + sources."nomnom-1.8.1" sources."number-is-nan-1.0.1" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" @@ -31217,11 +30291,7 @@ in sources."sax-0.5.8" sources."slash-1.0.0" sources."source-map-0.6.1" - (sources."source-map-support-0.4.18" // { - dependencies = [ - sources."source-map-0.5.7" - ]; - }) + sources."source-map-support-0.4.18" sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" sources."to-fast-properties-1.0.3" @@ -31249,7 +30319,7 @@ in version = "0.14.3"; src = fetchurl { url = "https://registry.npmjs.org/asar/-/asar-0.14.3.tgz"; - sha512 = "+hNnVVDmYbv05We/a9knj/98w171+A94A9DNHj+3kXUr3ENTQoSEcfbJRvBBRHyOh4vukBYWujmHvvaMmQoQbg=="; + sha512 = "1p102lrikvbx1rrp8b1d47fif3qwz2487q4djgnf6288hjk8gf2nxcinwzixkfh0dw0zy7mbv1przwg4zcnpgv7wpsbnqg6a1anf4zs"; }; dependencies = [ sources."abbrev-1.1.1" @@ -31260,7 +30330,7 @@ in sources."aws-sign2-0.7.0" sources."aws4-1.7.0" sources."balanced-match-1.0.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."binary-0.3.0" sources."brace-expansion-1.1.11" sources."buffers-0.1.1" @@ -31269,7 +30339,7 @@ in sources."chromium-pickle-js-0.2.0" sources."co-4.6.0" sources."combined-stream-1.0.6" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" sources."cuint-0.2.2" @@ -31309,7 +30379,11 @@ in sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."mkpath-0.1.0" - sources."mksnapshot-0.3.1" + (sources."mksnapshot-0.3.1" // { + dependencies = [ + sources."glob-7.1.2" + ]; + }) sources."nopt-3.0.6" sources."oauth-sign-0.8.2" sources."once-1.4.0" @@ -31321,11 +30395,7 @@ in sources."qs-6.5.2" sources."readable-stream-1.1.14" sources."request-2.87.0" - (sources."rimraf-2.6.2" // { - dependencies = [ - sources."glob-7.1.2" - ]; - }) + sources."rimraf-2.6.2" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sshpk-1.14.2" @@ -31340,7 +30410,7 @@ in sources."traverse-0.3.9" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."verror-1.10.0" sources."wrappy-1.0.2" ]; @@ -31359,27 +30429,10 @@ in version = "0.10.19"; src = fetchurl { url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.19.tgz"; - sha512 = "9OBihy+L53g9ALssKTY/vTWEiz8mGEJ1asWiCdfPdQ1Uf++tewiNrN7Fq2Eb6ZYtvK0BYvPZlh3bHguKmKO3yA=="; + sha512 = "34bg8wqi85ixnqxjvcz6qh1mny2v5p93dhspifymj6hhyxdxxzm83bmrzbhk8n5d9sl46167y5q8ddx7wv2jb5v00ypirwb5y3n5q7l"; }; dependencies = [ -<<<<<<< HEAD -<<<<<<< HEAD sources."@types/node-8.10.20" -======= - sources."@types/caseless-0.12.1" - sources."@types/form-data-2.2.1" -<<<<<<< HEAD - sources."@types/node-8.10.18" -======= - sources."@types/node-8.10.19" ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 - sources."@types/request-2.47.0" - sources."@types/tough-cookie-2.3.3" - sources."@types/uuid-3.4.3" ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 -======= - sources."@types/node-8.10.20" ->>>>>>> nodePackages: meguca: 1.0.7 update sources."JSV-4.0.2" sources."adal-node-0.1.28" sources."ajv-5.5.2" @@ -31401,9 +30454,15 @@ in sources."azure-arm-compute-3.0.0-preview" (sources."azure-arm-datalake-analytics-1.0.2-preview" // { dependencies = [ - sources."async-0.2.7" + sources."async-2.6.1" + sources."commander-2.16.0" sources."ms-rest-1.15.7" - sources."ms-rest-azure-1.15.7" + (sources."ms-rest-azure-1.15.7" // { + dependencies = [ + sources."async-0.2.7" + ]; + }) + sources."readable-stream-2.0.6" sources."request-2.74.0" ]; }) @@ -31515,12 +30574,8 @@ in ]; }) sources."balanced-match-1.0.0" - sources."bcrypt-pbkdf-1.0.1" - (sources."bl-1.1.2" // { - dependencies = [ - sources."readable-stream-2.0.6" - ]; - }) + sources."bcrypt-pbkdf-1.0.2" + sources."bl-1.1.2" sources."boom-2.10.1" sources."brace-expansion-1.1.11" sources."browserify-mime-1.2.9" @@ -31535,22 +30590,12 @@ in sources."combined-stream-1.0.6" sources."commander-1.0.4" sources."concat-map-0.0.1" - (sources."concat-stream-1.6.2" // { - dependencies = [ - sources."process-nextick-args-2.0.0" - sources."readable-stream-2.3.6" - sources."string_decoder-1.1.1" - ]; - }) + sources."concat-stream-1.6.2" sources."core-util-is-1.0.2" sources."cryptiles-2.0.5" sources."ctype-0.5.2" sources."cycle-1.0.3" - (sources."dashdash-1.14.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."dashdash-1.14.1" sources."date-utils-1.2.21" sources."dateformat-1.0.2-1.2.3" sources."deep-equal-1.0.1" @@ -31571,29 +30616,17 @@ in sources."fast-json-stable-stringify-2.0.0" sources."fibers-1.0.15" sources."forever-agent-0.6.1" - (sources."form-data-1.0.1" // { - dependencies = [ - sources."async-2.6.1" - ]; - }) + sources."form-data-1.0.1" sources."from-0.1.7" sources."fs.realpath-1.0.0" sources."galaxy-0.1.12" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" - (sources."getpass-0.1.7" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."getpass-0.1.7" sources."github-0.1.6" sources."glob-7.1.2" sources."har-schema-2.0.0" - (sources."har-validator-2.0.6" // { - dependencies = [ - sources."commander-2.15.1" - ]; - }) + sources."har-validator-2.0.6" sources."has-ansi-2.0.0" sources."has-color-0.1.7" sources."hash-base-3.0.4" @@ -31619,7 +30652,14 @@ in sources."json-schema-0.2.3" sources."json-schema-traverse-0.3.1" sources."json-stringify-safe-5.0.1" - sources."jsonlint-1.6.2" + (sources."jsonlint-1.6.2" // { + dependencies = [ + sources."ansi-styles-1.0.0" + sources."chalk-0.4.0" + sources."strip-ansi-0.1.1" + sources."underscore-1.6.0" + ]; + }) sources."jsonminify-0.4.1" sources."jsonparse-1.2.0" sources."jsonpointer-4.0.1" @@ -31648,11 +30688,7 @@ in sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."moment-2.22.2" -<<<<<<< HEAD (sources."ms-rest-2.3.6" // { -======= - (sources."ms-rest-2.3.5" // { ->>>>>>> nodePackages: meguca: 1.0.7 update dependencies = [ sources."through-2.3.8" sources."tunnel-0.0.5" @@ -31660,17 +30696,6 @@ in }) (sources."ms-rest-azure-2.5.7" // { dependencies = [ -<<<<<<< HEAD -<<<<<<< HEAD -======= -<<<<<<< HEAD - sources."@types/node-9.6.20" -======= - sources."@types/node-9.6.21" ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 -======= ->>>>>>> nodePackages: meguca: 1.0.7 update sources."async-2.6.0" ]; }) @@ -31678,14 +30703,7 @@ in sources."ncp-0.4.2" sources."node-forge-0.6.23" sources."node-uuid-1.4.8" - (sources."nomnom-1.8.1" // { - dependencies = [ - sources."ansi-styles-1.0.0" - sources."chalk-0.4.0" - sources."strip-ansi-0.1.1" - sources."underscore-1.6.0" - ]; - }) + sources."nomnom-1.8.1" sources."oauth-sign-0.8.2" sources."omelette-0.3.2" sources."once-1.4.0" @@ -31757,7 +30775,13 @@ in sources."stringstream-0.0.6" sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" - sources."sync-request-3.0.0" + (sources."sync-request-3.0.0" // { + dependencies = [ + sources."process-nextick-args-2.0.0" + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" + ]; + }) sources."then-request-2.2.0" sources."through-2.3.4" sources."tough-cookie-2.3.4" @@ -31768,18 +30792,10 @@ in sources."underscore-1.4.4" sources."user-home-2.0.0" sources."util-deprecate-1.0.2" - (sources."utile-0.2.1" // { - dependencies = [ - sources."async-0.2.10" - ]; - }) - sources."uuid-3.3.0" + sources."utile-0.2.1" + sources."uuid-3.3.2" sources."validator-5.2.0" - (sources."verror-1.10.0" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."verror-1.10.0" sources."wcwidth-1.0.1" (sources."winston-2.1.1" // { dependencies = [ @@ -31850,10 +30866,15 @@ in sources."ends-with-0.2.0" sources."error-ex-1.3.2" sources."ext-list-2.2.2" - sources."ext-name-3.0.0" + (sources."ext-name-3.0.0" // { + dependencies = [ + sources."graceful-fs-4.1.11" + ]; + }) sources."find-up-1.1.2" (sources."fs-extra-0.26.7" // { dependencies = [ + sources."glob-7.1.2" sources."graceful-fs-4.1.11" ]; }) @@ -31871,21 +30892,9 @@ in sources."is-finite-1.0.2" sources."is-plain-obj-1.1.0" sources."is-utf8-0.2.1" - (sources."jsonfile-2.4.0" // { - dependencies = [ - sources."graceful-fs-4.1.11" - ]; - }) - (sources."klaw-1.3.1" // { - dependencies = [ - sources."graceful-fs-4.1.11" - ]; - }) - (sources."load-json-file-1.1.0" // { - dependencies = [ - sources."graceful-fs-4.1.11" - ]; - }) + sources."jsonfile-2.4.0" + sources."klaw-1.3.1" + sources."load-json-file-1.1.0" sources."lodash-4.2.1" sources."loud-rejection-1.6.0" sources."map-obj-1.0.1" @@ -31893,11 +30902,7 @@ in sources."mime-db-1.34.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mkdirp-0.5.1" sources."ms-2.0.0" sources."natives-1.1.4" sources."normalize-package-data-2.4.0" @@ -31908,25 +30913,21 @@ in sources."parse-json-2.2.0" sources."path-exists-2.1.0" sources."path-is-absolute-1.0.1" - (sources."path-type-1.1.0" // { - dependencies = [ - sources."graceful-fs-4.1.11" - ]; - }) + sources."path-type-1.1.0" sources."pify-2.3.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" - sources."promised-temp-0.1.0" + (sources."promised-temp-0.1.0" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) sources."q-1.5.1" sources."read-pkg-1.1.0" sources."read-pkg-up-1.0.1" sources."redent-1.0.0" sources."repeating-2.0.1" - (sources."rimraf-2.6.2" // { - dependencies = [ - sources."glob-7.1.2" - ]; - }) + sources."rimraf-2.6.2" sources."semver-5.5.0" sources."signal-exit-3.0.2" sources."sort-keys-1.1.2" @@ -31962,7 +30963,7 @@ in version = "16.2.2"; src = fetchurl { url = "https://registry.npmjs.org/browserify/-/browserify-16.2.2.tgz"; - sha512 = "fMES05wq1Oukts6ksGUU2TMVHHp06LyQt0SIwbXIHm7waSrQmNBZePsU0iM/4f94zbvb/wHma+D1YrdzWYnF/A=="; + sha512 = "3ycb2arffvn5xg0dgk03zyvpg6pizz17wix457vg1cx166h59lz0vhyr2sw3224ny8brs3lg8f1acyr2ijv196fnsjfpm1akk9i5hbw"; }; dependencies = [ sources."JSONStream-1.3.3" @@ -32017,11 +31018,7 @@ in sources."defined-1.0.0" sources."deps-sort-2.0.0" sources."des.js-1.0.0" - (sources."detective-5.1.0" // { - dependencies = [ - sources."minimist-1.2.0" - ]; - }) + sources."detective-5.1.0" sources."diffie-hellman-5.0.3" sources."domain-browser-1.2.0" sources."duplexer2-0.1.4" @@ -32057,15 +31054,11 @@ in sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" -<<<<<<< HEAD - sources."module-deps-6.1.0" -======= (sources."module-deps-6.1.0" // { dependencies = [ sources."minimist-1.2.0" ]; }) ->>>>>>> nodePackages: meguca: 1.0.7 update sources."once-1.4.0" sources."os-browserify-0.3.0" sources."pako-1.0.6" @@ -32143,7 +31136,7 @@ in version = "0.6.0"; src = fetchurl { url = "https://registry.npmjs.org/castnow/-/castnow-0.6.0.tgz"; - sha512 = "VybZ8QYuJyJHt88TIi12nxsIO/89vmcM1Trna0bTq5O2uzz5SDBE2piU+x87B85V4woosyw9T45f39CZzYjxAw=="; + sha512 = "01z326dk78dypwf9wyjrcr81bimbkh77cgzp54qv9230j7r7jxvd4xbsd36prrssl66ggixzwxhh6wzfqnj44ygnx3j49rf0vqxj9jp"; }; dependencies = [ sources."addr-to-ip-port-1.4.3" @@ -32162,21 +31155,8 @@ in sources."base64-js-1.3.0" sources."bencode-2.0.0" sources."bitfield-0.1.0" -<<<<<<< HEAD - (sources."bittorrent-dht-6.4.2" // { - dependencies = [ - sources."bencode-0.7.0" - ]; - }) - (sources."bittorrent-tracker-7.7.0" // { - dependencies = [ - sources."bencode-0.8.0" - ]; - }) -======= sources."bittorrent-dht-6.4.2" sources."bittorrent-tracker-7.7.0" ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 sources."blob-to-buffer-1.2.8" sources."bn.js-4.11.8" sources."bncode-0.5.3" @@ -32204,16 +31184,10 @@ in sources."codepage-1.4.0" sources."colour-0.7.1" sources."combined-stream-0.0.7" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."compact2string-1.4.0" sources."concat-map-0.0.1" - (sources."concat-stream-1.6.2" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.6" - sources."string_decoder-1.1.1" - ]; - }) + sources."concat-stream-1.6.2" sources."cookie-jar-0.2.0" sources."core-util-is-1.0.2" sources."cryptiles-0.1.3" @@ -32226,7 +31200,11 @@ in sources."deep-extend-0.2.11" sources."delayed-stream-0.0.5" sources."diveSync-0.3.0" - sources."dns-js-0.2.1" + (sources."dns-js-0.2.1" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) (sources."end-of-stream-1.0.0" // { dependencies = [ sources."once-1.3.3" @@ -32236,24 +31214,14 @@ in sources."escape-string-regexp-1.0.5" sources."exit-on-epipe-1.0.1" sources."fifo-0.1.4" - (sources."figures-1.7.0" // { - dependencies = [ - sources."object-assign-4.1.1" - ]; - }) + sources."figures-1.7.0" sources."find-up-1.1.2" sources."flatten-0.0.1" sources."forever-agent-0.2.0" - (sources."form-data-0.0.10" // { - dependencies = [ - sources."mime-1.2.11" - ]; - }) + sources."form-data-0.0.10" (sources."fs-chunk-store-1.7.0" // { dependencies = [ - sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."thunky-1.0.2" ]; }) sources."fs.realpath-1.0.0" @@ -32273,7 +31241,11 @@ in sources."inherits-2.0.3" sources."ini-1.1.0" sources."inquirer-0.8.5" - sources."internal-ip-1.2.0" + (sources."internal-ip-1.2.0" // { + dependencies = [ + sources."object-assign-4.1.1" + ]; + }) sources."ip-1.1.5" sources."ip-set-1.0.1" sources."ipaddr.js-1.7.0" @@ -32286,6 +31258,7 @@ in sources."k-bucket-0.6.0" (sources."k-rpc-3.7.0" // { dependencies = [ + sources."bencode-2.0.0" sources."k-bucket-2.0.1" ]; }) @@ -32298,16 +31271,8 @@ in sources."lru-2.0.1" sources."magnet-uri-5.1.8" sources."map-obj-1.0.1" - (sources."mdns-js-1.0.1" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) - (sources."meow-3.7.0" // { - dependencies = [ - sources."object-assign-4.1.1" - ]; - }) + sources."mdns-js-1.0.1" + sources."meow-3.7.0" sources."mime-1.6.0" sources."mimic-response-1.0.0" sources."minimatch-3.0.4" @@ -32326,35 +31291,41 @@ in sources."object-assign-1.0.0" sources."once-1.4.0" sources."open-0.0.5" - (sources."optimist-0.6.1" // { - dependencies = [ - sources."minimist-0.0.10" - ]; - }) + sources."optimist-0.6.1" sources."options-0.0.6" sources."optjs-3.2.2" sources."pad-0.0.5" sources."parse-json-2.2.0" - (sources."parse-torrent-5.9.1" // { - dependencies = [ - sources."get-stdin-6.0.0" - ]; - }) - (sources."parse-torrent-file-2.1.4" // { - dependencies = [ - sources."bencode-0.7.0" - ]; - }) + sources."parse-torrent-5.9.1" + sources."parse-torrent-file-2.1.4" sources."path-exists-2.1.0" sources."path-is-absolute-1.0.1" sources."path-type-1.1.0" - (sources."peer-wire-protocol-0.7.1" // { + sources."peer-wire-protocol-0.7.1" + (sources."peer-wire-swarm-0.12.2" // { dependencies = [ sources."bncode-0.2.3" ]; }) - sources."peer-wire-swarm-0.12.2" - sources."peerflix-0.34.0" + (sources."peerflix-0.34.0" // { + dependencies = [ + sources."bencode-0.7.0" + sources."debug-3.1.0" + sources."end-of-stream-0.1.5" + sources."get-stdin-6.0.0" + sources."isarray-1.0.0" + sources."magnet-uri-4.2.3" + sources."minimist-0.0.10" + sources."object-assign-4.1.1" + sources."once-1.2.0" + sources."readable-stream-2.3.6" + sources."safe-buffer-5.0.1" + sources."string_decoder-1.1.1" + sources."thirty-two-0.0.2" + sources."thunky-1.0.2" + sources."ultron-1.0.2" + ]; + }) sources."pify-2.3.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" @@ -32372,39 +31343,23 @@ in sources."process-nextick-args-2.0.0" sources."promiscuous-0.6.0" sources."protobufjs-3.8.2" - (sources."pump-0.3.5" // { - dependencies = [ - sources."once-1.2.0" - ]; - }) + sources."pump-0.3.5" sources."qap-3.3.1" sources."qs-0.5.6" sources."query-string-1.0.1" -<<<<<<< HEAD - (sources."random-access-file-2.0.1" // { - dependencies = [ - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" - ]; - }) -======= sources."random-access-file-2.0.1" ->>>>>>> nodePackages: meguca: 1.0.7 update sources."random-access-storage-1.3.0" sources."random-iterate-1.0.1" sources."randombytes-2.0.6" sources."range-parser-1.2.0" - (sources."rc-0.4.0" // { - dependencies = [ - sources."minimist-0.0.10" - ]; - }) + sources."rc-0.4.0" sources."re-emitter-1.1.3" sources."read-pkg-1.1.0" sources."read-pkg-up-1.0.1" (sources."read-torrent-1.3.0" // { dependencies = [ sources."magnet-uri-2.0.1" + sources."mime-1.2.11" (sources."parse-torrent-4.1.0" // { dependencies = [ sources."magnet-uri-4.2.3" @@ -32417,11 +31372,7 @@ in sources."readline2-0.1.1" sources."redent-1.0.0" sources."repeating-2.0.1" - (sources."request-2.16.6" // { - dependencies = [ - sources."mime-1.2.11" - ]; - }) + sources."request-2.16.6" sources."rimraf-2.6.2" sources."router-0.6.2" sources."run-parallel-1.1.9" @@ -32434,20 +31385,10 @@ in sources."signal-exit-3.0.2" sources."simple-concat-1.0.0" sources."simple-get-2.8.1" - (sources."simple-peer-6.4.4" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.6" - sources."string_decoder-1.1.1" - ]; - }) + sources."simple-peer-6.4.4" sources."simple-sha1-2.1.1" (sources."simple-websocket-4.3.1" // { dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.6" - sources."safe-buffer-5.0.1" - sources."string_decoder-1.1.1" sources."ws-2.3.1" ]; }) @@ -32458,7 +31399,13 @@ in sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.0" sources."speedometer-0.1.4" - sources."srt2vtt-1.3.1" + (sources."srt2vtt-1.3.1" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" + ]; + }) sources."stream-transcoder-0.0.5" sources."string2compact-1.2.5" sources."string_decoder-0.10.31" @@ -32471,23 +31418,19 @@ in sources."through-2.3.8" sources."thunky-0.1.0" sources."time-line-1.0.1" -<<<<<<< HEAD - sources."torrent-discovery-5.4.0" -======= (sources."torrent-discovery-5.4.0" // { dependencies = [ sources."minimist-1.2.0" ]; }) ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 sources."torrent-piece-1.1.2" (sources."torrent-stream-1.0.4" // { dependencies = [ - sources."end-of-stream-0.1.5" - sources."magnet-uri-4.2.3" + sources."bencode-0.8.0" + sources."debug-2.6.9" + sources."minimist-0.0.8" sources."once-1.3.3" sources."parse-torrent-4.1.0" - sources."thirty-two-0.0.2" ]; }) sources."trim-newlines-1.0.0" @@ -32506,11 +31449,7 @@ in sources."wordwrap-0.0.3" sources."wrap-fn-0.1.5" sources."wrappy-1.0.2" - (sources."ws-1.1.5" // { - dependencies = [ - sources."ultron-1.0.2" - ]; - }) + sources."ws-1.1.5" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" sources."xmldom-0.1.27" @@ -32552,7 +31491,7 @@ in version = "1.12.7"; src = fetchurl { url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz"; - sha512 = "fLeEhqwymYat/MpTPUjSKHVYYl0ec2mOyALEMLmzr5i1isuG+6jfI2j2d5oBO3VIzgUXgBVIcOT9uH1TFxBckw=="; + sha512 = "29mq40padyvizg4f141b00p0p74hx9v06d7gxk84ggsiyw6rf5bb65gnfwk1i02r276jwqybmi5hx98s943slyazjnqd69jmj389dvw"; }; buildInputs = globalBuildInputs; meta = { @@ -32569,7 +31508,7 @@ in version = "0.0.22"; src = fetchurl { url = "https://registry.npmjs.org/coinmon/-/coinmon-0.0.22.tgz"; - sha512 = "IiL5bbisnZ4U3IVNn3l5Z8d1RnQ9yvzWuhAJU5VtSGoeYfdCn7jUlliwH02vaFOSggDkMoKdh8eh6OlgqmMu6g=="; + sha512 = "3m2wqxac3lyi8f7hyfq4cp402194lv8mx6izc2qjvabi7s2yxhiwsj8dnam628hpbbgrjixfi37biv7g5wrykc5vha9x7dcp1nzj8i2"; }; dependencies = [ sources."ansi-regex-2.1.1" @@ -32583,7 +31522,7 @@ in sources."color-convert-1.9.2" sources."color-name-1.1.1" sources."colors-1.3.0" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."debug-3.1.0" sources."escape-string-regexp-1.0.5" sources."follow-redirects-1.5.0" @@ -32619,7 +31558,7 @@ in version = "3.1.1"; src = fetchurl { url = "https://registry.npmjs.org/configurable-http-proxy/-/configurable-http-proxy-3.1.1.tgz"; - sha512 = "e+fxBy5cCayuNpxt3tcigBIuFsU/+oN48eK3aQtCBV12glavbBMxJa3ut2AEDHhXa/g3pC8r2BorKthrofHGRw=="; + sha512 = "13wdwd1dgc2laqsv0mjz91pz1mmfy0c0ihbgvmd4lqi6v5gas17cp85885nkdz2y5w87yizqlb2w4l04bbxwvcw6spaq2aw5q3z3rvv"; }; dependencies = [ sources."async-1.0.0" @@ -32686,23 +31625,15 @@ in sources."aws4-1.7.0" sources."balanced-match-1.0.0" sources."base64-js-1.3.0" - sources."bcrypt-pbkdf-1.0.1" -<<<<<<< HEAD -<<<<<<< HEAD + sources."bcrypt-pbkdf-1.0.2" sources."big-integer-1.6.32" -======= -<<<<<<< HEAD - sources."big-integer-1.6.30" -======= - sources."big-integer-1.6.31" ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 -======= - sources."big-integer-1.6.31" ->>>>>>> nodePackages: meguca: 1.0.7 update sources."block-stream-0.0.9" sources."bn.js-4.11.8" - sources."body-parser-1.18.2" + (sources."body-parser-1.18.2" // { + dependencies = [ + sources."setprototypeof-1.0.3" + ]; + }) sources."boom-2.10.1" sources."bplist-creator-0.0.7" sources."bplist-parser-0.1.1" @@ -32716,7 +31647,7 @@ in }) (sources."browserify-14.4.0" // { dependencies = [ - sources."glob-7.1.2" + sources."isarray-1.0.0" ]; }) sources."browserify-aes-1.2.0" @@ -32742,21 +31673,12 @@ in sources."code-point-at-1.1.0" sources."combine-source-map-0.8.0" sources."combined-stream-1.0.6" - sources."commander-2.15.1" - (sources."compressible-2.0.14" // { - dependencies = [ - sources."mime-db-1.34.0" - ]; - }) - (sources."compression-1.7.2" // { - dependencies = [ - sources."safe-buffer-5.1.1" - ]; - }) + sources."commander-2.16.0" + sources."compressible-2.0.14" + sources."compression-1.7.2" sources."concat-map-0.0.1" (sources."concat-stream-1.5.2" // { dependencies = [ - sources."isarray-1.0.0" sources."readable-stream-2.0.6" sources."string_decoder-0.10.31" ]; @@ -32771,68 +31693,50 @@ in sources."cookie-signature-1.0.6" sources."cordova-app-hello-world-3.12.0" sources."cordova-common-2.2.4" -<<<<<<< HEAD - (sources."cordova-create-1.1.2" // { -======= sources."cordova-create-1.1.2" (sources."cordova-fetch-1.3.0" // { ->>>>>>> nodePackages: meguca: 1.0.7 update dependencies = [ - sources."q-1.0.1" - sources."shelljs-0.3.0" + sources."q-1.5.1" + sources."shelljs-0.7.8" ]; }) -<<<<<<< HEAD - (sources."cordova-fetch-1.3.0" // { - dependencies = [ - sources."glob-7.1.2" - sources."shelljs-0.7.8" -======= - (sources."cordova-js-4.2.3" // { + (sources."cordova-js-4.2.4" // { dependencies = [ sources."isarray-2.0.4" ->>>>>>> nodePackages: meguca: 1.0.7 update ]; }) - sources."cordova-js-4.2.4" (sources."cordova-lib-8.0.0" // { dependencies = [ sources."base64-js-1.1.2" sources."glob-7.1.1" + sources."isarray-1.0.0" + sources."mime-db-1.34.0" + sources."minimist-1.2.0" sources."nopt-4.0.1" sources."plist-2.0.1" + sources."process-nextick-args-2.0.0" sources."q-1.0.1" -<<<<<<< HEAD -======= sources."qs-6.3.2" sources."safe-buffer-5.1.1" ->>>>>>> nodePackages: meguca: 1.0.7 update sources."shelljs-0.3.0" sources."underscore-1.8.3" + sources."uuid-3.3.2" sources."xmlbuilder-8.2.2" ]; }) sources."cordova-registry-mapper-1.1.15" -<<<<<<< HEAD - sources."cordova-serve-2.0.1" -======= (sources."cordova-serve-2.0.1" // { dependencies = [ sources."shelljs-0.5.3" ]; }) ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 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."cryptiles-2.0.5" sources."crypto-browserify-3.12.0" - (sources."dashdash-1.14.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."dashdash-1.14.1" sources."date-now-0.1.4" sources."debug-2.6.9" sources."deep-extend-0.6.0" @@ -32872,11 +31776,7 @@ in sources."events-1.1.1" sources."evp_bytestokey-1.0.3" sources."exit-hook-1.1.1" - (sources."express-4.16.3" // { - dependencies = [ - sources."safe-buffer-5.1.1" - ]; - }) + sources."express-4.16.3" sources."extend-3.0.1" sources."extsprintf-1.3.0" sources."falafel-2.1.0" @@ -32893,23 +31793,9 @@ in sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" sources."get-assigned-identifiers-1.2.0" -<<<<<<< HEAD - (sources."getpass-0.1.7" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - sources."glob-5.0.15" - (sources."got-3.3.1" // { - dependencies = [ - sources."object-assign-3.0.0" - ]; - }) -======= sources."getpass-0.1.7" sources."glob-5.0.15" sources."got-3.3.1" ->>>>>>> nodePackages: meguca: 1.0.7 update sources."graceful-fs-4.1.11" sources."har-validator-2.0.6" sources."has-1.0.3" @@ -32932,11 +31818,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.5" - (sources."init-package-json-1.10.3" // { - dependencies = [ - sources."glob-7.1.2" - ]; - }) + sources."init-package-json-1.10.3" sources."inline-source-map-0.6.2" sources."inquirer-0.10.1" (sources."insert-module-globals-7.2.0" // { @@ -32951,7 +31833,9 @@ in sources."uuid-2.0.3" ]; }) - sources."uuid-3.3.0" + sources."minimist-1.2.0" + sources."mute-stream-0.0.5" + sources."uuid-3.3.2" ]; }) sources."interpret-1.1.0" @@ -32985,11 +31869,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."labeled-stream-splicer-2.0.1" // { - dependencies = [ - sources."isarray-2.0.4" - ]; - }) + sources."labeled-stream-splicer-2.0.1" sources."latest-version-1.0.1" sources."lodash-3.10.1" sources."lodash._getnative-3.9.1" @@ -33032,11 +31912,7 @@ in sources."os-name-1.0.3" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" - (sources."osx-release-1.1.0" // { - dependencies = [ - sources."minimist-1.2.0" - ]; - }) + sources."osx-release-1.1.0" sources."package-json-1.2.0" sources."pako-0.2.9" sources."parents-1.0.1" @@ -33071,54 +31947,26 @@ in dependencies = [ sources."depd-1.1.1" sources."http-errors-1.6.2" - sources."setprototypeof-1.0.3" - ]; - }) - (sources."rc-1.2.8" // { - dependencies = [ - sources."minimist-1.2.0" ]; }) + sources."rc-1.2.8" sources."read-1.0.7" sources."read-all-stream-3.1.0" sources."read-only-stream-2.0.0" - (sources."read-package-json-2.0.13" // { - dependencies = [ - sources."glob-7.1.2" - ]; - }) + sources."read-package-json-2.0.13" (sources."readable-stream-2.3.6" // { dependencies = [ - sources."isarray-1.0.0" - sources."process-nextick-args-2.0.0" sources."string_decoder-1.1.1" ]; }) - (sources."readline2-1.0.1" // { - dependencies = [ - sources."mute-stream-0.0.5" - ]; - }) + sources."readline2-1.0.1" sources."rechoir-0.6.2" sources."registry-url-3.1.0" sources."repeating-1.1.3" -<<<<<<< HEAD - (sources."request-2.79.0" // { - dependencies = [ - sources."qs-6.3.2" - sources."uuid-3.3.0" - ]; - }) -======= sources."request-2.79.0" ->>>>>>> nodePackages: meguca: 1.0.7 update sources."resolve-1.8.1" sources."restore-cursor-1.0.1" - (sources."rimraf-2.6.2" // { - dependencies = [ - sources."glob-7.1.2" - ]; - }) + sources."rimraf-2.6.2" sources."ripemd160-2.0.2" sources."run-async-0.1.0" sources."rx-lite-3.1.2" @@ -33135,17 +31983,7 @@ in sources."shell-quote-1.6.1" sources."shelljs-0.5.3" sources."simple-concat-1.0.0" -<<<<<<< HEAD - (sources."simple-plist-0.2.1" // { - dependencies = [ - sources."base64-js-1.1.2" - sources."plist-2.0.1" - sources."xmlbuilder-8.2.2" - ]; - }) -======= sources."simple-plist-0.2.1" ->>>>>>> nodePackages: meguca: 1.0.7 update sources."slash-1.0.0" sources."slide-1.1.6" sources."sntp-1.0.9" @@ -33172,11 +32010,7 @@ in sources."stringstream-0.0.6" sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" - (sources."subarg-1.0.0" // { - dependencies = [ - sources."minimist-1.2.0" - ]; - }) + sources."subarg-1.0.0" sources."supports-color-2.0.0" sources."syntax-error-1.4.0" sources."tar-2.2.1" @@ -33199,6 +32033,8 @@ in (sources."update-notifier-0.5.0" // { dependencies = [ sources."configstore-1.4.0" + sources."minimist-1.2.0" + sources."object-assign-3.0.0" ]; }) (sources."url-0.11.0" // { @@ -33214,11 +32050,7 @@ in sources."validate-npm-package-license-3.0.3" sources."validate-npm-package-name-3.0.0" sources."vary-1.1.2" - (sources."verror-1.10.0" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."verror-1.10.0" sources."vm-browserify-0.0.4" sources."win-release-1.1.1" sources."wrappy-1.0.2" @@ -33248,7 +32080,7 @@ in version = "1.5.2"; src = fetchurl { url = "https://registry.npmjs.org/create-react-app/-/create-react-app-1.5.2.tgz"; - sha512 = "vnYIzsfTaqai2l07P9qtxhsZgHbzirC2omxKmf16wqvpXao9CNCDmpk+BCZRElih7HTn/mpO3soe8DTZV4DsgQ=="; + sha512 = "20yr02pv4sg07navr76mzp7fkna2n0ja4k08glrka1x021xm9fykay2gbyrjjkclavb12pkfs01j6y6mpd3yfsxvaiacsnkqz70hxmy"; }; dependencies = [ sources."ansi-regex-2.1.1" @@ -33259,7 +32091,7 @@ in sources."buffer-from-0.1.2" sources."builtins-1.0.3" sources."chalk-1.1.3" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" sources."cross-spawn-4.0.2" @@ -33274,7 +32106,11 @@ in sources."glob-7.1.2" sources."graceful-fs-4.1.11" sources."has-ansi-2.0.0" - sources."hyperquest-2.1.3" + (sources."hyperquest-2.1.3" // { + dependencies = [ + sources."readable-stream-1.0.34" + ]; + }) sources."inflight-1.0.6" sources."inherits-2.0.3" sources."isarray-0.0.1" @@ -33285,11 +32121,7 @@ in sources."macos-release-1.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mkdirp-0.5.1" sources."ms-2.0.0" sources."once-1.4.0" sources."os-name-2.0.1" @@ -33308,15 +32140,12 @@ in (sources."tar-pack-3.4.1" // { dependencies = [ sources."isarray-1.0.0" + sources."minimist-0.0.8" sources."readable-stream-2.3.6" sources."string_decoder-1.1.1" ]; }) - (sources."through2-0.6.5" // { - dependencies = [ - sources."readable-stream-1.0.34" - ]; - }) + sources."through2-0.6.5" sources."tmp-0.0.31" sources."uid-number-0.0.6" sources."util-deprecate-1.0.2" @@ -33409,26 +32238,17 @@ in version = "13.10.0"; src = fetchurl { url = "https://registry.npmjs.org/dat/-/dat-13.10.0.tgz"; - sha512 = "H8H6erdvvLjwI6bYu4mgEz5KCaHNmwwzKvBvv+bhX93VEf1J3v0L/6T9IQPCico/veFxNcUSqaDAV9FuZguhCw=="; + sha512 = "05s22v6dv8mgh50m49cadbiw6ykzjl9q81j3zd4zw5zvpj9zl8xbpazw7kbyvzh58rhr6ydl44llghkl24vpn564gqbig3gnxxgmh8z"; }; dependencies = [ sources."abstract-random-access-1.1.2" sources."ajv-5.5.2" - (sources."ansi-diff-stream-1.2.1" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) + sources."ansi-diff-stream-1.2.1" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" sources."anymatch-1.3.2" sources."ap-0.1.0" - (sources."append-tree-2.4.4" // { - dependencies = [ - sources."process-nextick-args-1.0.7" - sources."varint-5.0.0" - ]; - }) + sources."append-tree-2.4.4" sources."arr-diff-2.0.0" sources."arr-flatten-1.1.0" sources."array-lru-1.1.1" @@ -33441,19 +32261,23 @@ in sources."aws-sign2-0.7.0" sources."aws4-1.7.0" sources."balanced-match-1.0.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."bencode-1.0.0" - (sources."bitfield-rle-2.1.0" // { + sources."bitfield-rle-2.1.0" + (sources."bittorrent-dht-7.10.0" // { dependencies = [ - sources."varint-4.0.1" + sources."debug-3.1.0" ]; }) - sources."bittorrent-dht-7.10.0" sources."blake2b-2.1.2" sources."blake2b-wasm-1.1.7" sources."body-0.1.0" sources."brace-expansion-1.1.11" - sources."braces-1.8.5" + (sources."braces-1.8.5" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-equals-1.0.4" @@ -33490,6 +32314,10 @@ in (sources."dat-doctor-1.4.0" // { dependencies = [ sources."debug-2.6.9" + sources."dns-packet-1.3.1" + sources."dns-socket-1.6.3" + sources."lru-2.0.1" + sources."multicast-dns-6.2.3" sources."pump-1.0.3" ]; }) @@ -33498,8 +32326,6 @@ in (sources."dat-json-1.0.2" // { dependencies = [ sources."dat-encoding-4.0.2" -<<<<<<< HEAD -======= sources."debug-2.6.9" ]; }) @@ -33507,11 +32333,8 @@ in (sources."dat-log-1.1.1" // { dependencies = [ sources."process-nextick-args-1.0.7" ->>>>>>> nodePackages: meguca: 1.0.7 update ]; }) - sources."dat-link-resolve-2.2.0" - sources."dat-log-1.1.1" (sources."dat-node-3.5.9" // { dependencies = [ (sources."discovery-swarm-5.1.1" // { @@ -33519,13 +32342,12 @@ in sources."debug-2.6.9" ]; }) + sources."minimist-0.0.8" + sources."process-nextick-args-1.0.7" sources."pump-1.0.3" sources."random-access-memory-3.0.0" -<<<<<<< HEAD -======= sources."unordered-set-2.0.1" sources."varint-5.0.0" ->>>>>>> nodePackages: meguca: 1.0.5 -> 1.0.7 ]; }) sources."dat-registry-4.0.0" @@ -33538,28 +32360,20 @@ in sources."directory-index-html-2.1.0" (sources."discovery-channel-5.5.1" // { dependencies = [ - sources."debug-2.6.9" - sources."dns-discovery-6.1.0" - sources."lru-2.0.1" sources."pump-3.0.0" - sources."thunky-0.1.0" ]; }) (sources."discovery-swarm-4.4.2" // { dependencies = [ - sources."debug-2.6.9" - sources."pump-1.0.3" - ]; - }) - (sources."dns-discovery-5.6.1" // { - dependencies = [ - sources."debug-2.6.9" - sources."dns-packet-1.3.1" - sources."dns-socket-1.6.3" - sources."lru-2.0.1" - sources."multicast-dns-6.2.3" + (sources."dns-discovery-6.1.0" // { + dependencies = [ + sources."thunky-1.0.2" + ]; + }) + sources."thunky-0.1.0" ]; }) + sources."dns-discovery-5.6.1" sources."dns-packet-4.2.0" sources."dns-socket-3.0.0" sources."dns-txt-2.0.2" @@ -33597,33 +32411,19 @@ in sources."has-flag-3.0.0" sources."http-methods-0.1.0" sources."http-signature-1.2.0" -<<<<<<< HEAD (sources."hypercore-6.17.1" // { - dependencies = [ - sources."process-nextick-args-1.0.7" - sources."unordered-set-2.0.1" - ]; - }) - sources."hypercore-crypto-1.0.0" - (sources."hypercore-protocol-6.6.4" // { -======= - (sources."hypercore-6.16.0" // { ->>>>>>> nodePackages: meguca: 1.0.7 update dependencies = [ sources."varint-5.0.0" ]; }) -<<<<<<< HEAD - sources."hyperdrive-9.14.0" - (sources."hyperdrive-http-4.2.2" // { -======= + sources."hypercore-crypto-1.0.0" sources."hypercore-protocol-6.6.4" (sources."hyperdrive-9.14.0" // { ->>>>>>> nodePackages: meguca: 1.0.7 update dependencies = [ - sources."pump-1.0.3" + sources."varint-4.0.1" ]; }) + sources."hyperdrive-http-4.2.2" sources."hyperdrive-network-speed-2.1.0" sources."i-0.3.6" sources."inflight-1.0.6" @@ -33658,14 +32458,11 @@ in sources."k-bucket-3.3.1" (sources."k-rpc-4.3.1" // { dependencies = [ + sources."bencode-2.0.0" sources."k-bucket-4.0.1" ]; }) - (sources."k-rpc-socket-1.8.0" // { - dependencies = [ - sources."bencode-2.0.0" - ]; - }) + sources."k-rpc-socket-1.8.0" sources."kind-of-3.2.2" sources."last-one-wins-1.0.4" sources."length-prefixed-message-3.0.3" @@ -33683,11 +32480,7 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.0" sources."mirror-folder-3.0.0" - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mkdirp-0.5.1" sources."ms-2.0.0" sources."multi-random-access-2.1.1" sources."multicast-dns-7.0.0" @@ -33700,7 +32493,11 @@ in sources."nanobus-3.3.0" sources."nanotiming-1.0.1" sources."ncp-1.0.1" - sources."neat-log-1.1.2" + (sources."neat-log-1.1.2" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) sources."nets-3.2.0" sources."network-address-1.1.2" sources."node-gyp-build-3.4.0" @@ -33720,30 +32517,21 @@ in sources."process-0.5.2" sources."process-nextick-args-2.0.0" sources."progress-string-1.2.2" - sources."prompt-1.0.0" - (sources."protocol-buffers-encodings-1.1.0" // { + (sources."prompt-1.0.0" // { dependencies = [ - sources."varint-5.0.0" + sources."async-1.0.0" ]; }) + sources."protocol-buffers-encodings-1.1.0" sources."pump-2.0.1" sources."punycode-1.4.1" sources."qs-6.5.2" sources."random-access-file-2.0.1" -<<<<<<< HEAD - (sources."random-access-memory-2.4.0" // { - dependencies = [ - sources."process-nextick-args-1.0.7" - ]; - }) -======= sources."random-access-memory-2.4.0" ->>>>>>> nodePackages: meguca: 1.0.7 update sources."random-access-storage-1.3.0" (sources."randomatic-3.0.0" // { dependencies = [ sources."is-number-4.0.0" - sources."kind-of-6.0.2" ]; }) sources."randombytes-2.0.6" @@ -33761,11 +32549,7 @@ in sources."rusha-0.8.13" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - (sources."signed-varint-2.0.1" // { - dependencies = [ - sources."varint-5.0.0" - ]; - }) + sources."signed-varint-2.0.1" sources."simple-sha1-2.1.1" sources."siphash24-1.1.1" sources."slice-ansi-1.0.0" @@ -33781,11 +32565,7 @@ in sources."status-logger-3.1.1" sources."stream-collector-1.0.1" sources."stream-each-1.2.2" - (sources."stream-parser-0.3.1" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) + sources."stream-parser-0.3.1" sources."stream-shift-1.0.0" sources."string-width-2.1.1" sources."string_decoder-1.1.1" @@ -33796,15 +32576,15 @@ in ]; }) sources."supports-color-5.4.0" - sources."throttle-1.0.3" - sources."through2-2.0.3" - sources."thunky-1.0.2" - sources."to-buffer-1.1.1" - (sources."toiletdb-1.4.1" // { + (sources."throttle-1.0.3" // { dependencies = [ sources."debug-2.6.9" ]; }) + sources."through2-2.0.3" + sources."thunky-1.0.2" + sources."to-buffer-1.1.1" + sources."toiletdb-1.4.1" sources."tough-cookie-2.3.4" sources."township-client-1.3.2" sources."trim-0.0.1" @@ -33820,12 +32600,11 @@ in sources."util-deprecate-1.0.2" sources."utile-0.3.0" sources."utp-native-1.7.1" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."varint-3.0.1" sources."verror-1.10.0" (sources."winston-2.1.1" // { dependencies = [ - sources."async-1.0.0" sources."colors-1.0.3" sources."pkginfo-0.3.1" ]; @@ -33851,11 +32630,7 @@ in version = "0.2.15"; src = fetchurl { url = "https://registry.npmjs.org/dhcp/-/dhcp-0.2.15.tgz"; -<<<<<<< HEAD - sha512 = "oIuRtSWj6UEU6zNEddKyE4P+fFrbZOMIaTWF8VS76hqzAln1myOtaG5zvTwF0UiD+bCmlJVFh8kcWf/kq7pksg=="; -======= sha512 = "2r69fmbwkzmj769hx2rb556n3wq6j6i0lybswvfd2nj76zmb41b66papdag319md44f6r6vb9ygx0qknb97ai1kxca43sd34nsr32x0"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; dependencies = [ sources."minimist-1.2.0" @@ -33908,7 +32683,12 @@ in sources."etag-1.5.1" sources."event-stream-3.2.2" sources."eventemitter3-0.1.6" - sources."express-4.11.2" + (sources."express-4.11.2" // { + dependencies = [ + sources."mime-db-1.12.0" + sources."mime-types-2.0.14" + ]; + }) sources."extend-1.2.1" sources."extsprintf-1.4.0" sources."eyes-0.1.8" @@ -33984,12 +32764,7 @@ in ]; }) sources."through-2.3.8" - (sources."type-is-1.5.7" // { - dependencies = [ - sources."mime-db-1.12.0" - sources."mime-types-2.0.14" - ]; - }) + sources."type-is-1.5.7" sources."utils-merge-1.0.0" sources."vary-1.0.1" sources."verror-1.10.0" @@ -34021,18 +32796,10 @@ in }; dependencies = [ sources."JSONStream-0.8.4" - (sources."abstract-leveldown-0.12.4" // { - dependencies = [ - sources."xtend-3.0.0" - ]; - }) + sources."abstract-leveldown-0.12.4" sources."basic-auth-1.1.0" sources."bindings-1.2.1" - (sources."bl-0.8.2" // { - dependencies = [ - sources."readable-stream-1.0.34" - ]; - }) + sources."bl-0.8.2" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-fill-1.0.0" @@ -34043,13 +32810,7 @@ in sources."cors-2.8.4" sources."deferred-leveldown-0.2.0" sources."docker-parse-image-3.0.1" - (sources."duplexify-3.6.0" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.6" - sources."string_decoder-1.1.1" - ]; - }) + sources."duplexify-3.6.0" sources."end-of-stream-1.4.1" (sources."errno-0.1.7" // { dependencies = [ @@ -34057,7 +32818,13 @@ in ]; }) sources."from2-1.3.0" - sources."fs-blob-store-5.2.1" + (sources."fs-blob-store-5.2.1" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" + ]; + }) sources."fs-constants-1.0.0" sources."inherits-2.0.3" sources."isarray-0.0.1" @@ -34073,6 +32840,7 @@ in sources."xtend-3.0.0" ]; }) + sources."looper-3.0.0" sources."readable-stream-1.0.34" ]; }) @@ -34139,11 +32907,7 @@ in sources."split2-0.2.1" sources."stream-collector-1.0.1" sources."stream-shift-1.0.0" - (sources."stream-to-pull-stream-1.7.2" // { - dependencies = [ - sources."looper-3.0.0" - ]; - }) + sources."stream-to-pull-stream-1.7.2" sources."string_decoder-0.10.31" (sources."tar-stream-1.6.1" // { dependencies = [ @@ -34181,17 +32945,10 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; -<<<<<<< HEAD version = "3.3.18"; src = fetchurl { url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.3.18.tgz"; - sha512 = "bfdM9Dy7PeZQnNTEOt8JQCDv+nOQxQJgijLbP7LRg/bAYt6JcKNyGzUp+25iXhoZLd+X3RmLD55yh3hSIsKfAw=="; -======= - version = "3.3.17"; - src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.3.17.tgz"; - sha512 = "0vnasf7pkbax7388qv4x5lmrm83s4wb1q182bkxb6zs8jf1lgxh372gyim6dg9rhj7vx7rck3jn6a7dvi4rwzyfl3zmswh894zh7xkp"; ->>>>>>> nodePackages: meguca: 1.0.7 update + sha512 = "01rzhi2a9w8fwly1y5ikpcpvwnij6jyc9pgna9m3dra6w49vric1xl3s6r3znrji9h05ichfgxfy82017gkmi6lki8fcgdv7ks4rxvd"; }; dependencies = [ sources."JSONStream-1.3.3" @@ -34200,23 +32957,11 @@ in sources."assert-plus-1.0.0" sources."async-2.6.1" sources."asynckit-0.4.0" -<<<<<<< HEAD -<<<<<<< HEAD - sources."aws-sdk-2.265.1" -======= -<<<<<<< HEAD - sources."aws-sdk-2.252.1" -======= - sources."aws-sdk-2.254.1" ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 -======= - sources."aws-sdk-2.263.1" ->>>>>>> nodePackages: meguca: 1.0.7 update + sources."aws-sdk-2.266.1" sources."aws-sign2-0.7.0" sources."aws4-1.7.0" sources."base64-js-1.3.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."buffer-4.9.1" sources."caseless-0.12.0" sources."co-4.6.0" @@ -34260,17 +33005,17 @@ in sources."punycode-1.3.2" sources."qs-6.5.2" sources."querystring-0.2.0" - sources."request-2.87.0" + (sources."request-2.87.0" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.2.1" sources."sshpk-1.14.2" sources."through-2.3.8" - (sources."tough-cookie-2.3.4" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."url-0.10.3" @@ -34312,7 +33057,7 @@ in version = "0.18.12"; src = fetchurl { url = "https://registry.npmjs.org/elm-test/-/elm-test-0.18.12.tgz"; - sha512 = "5n1uNviCRxXIx5ciaFuzJd3fshcyicbYvTwyGh/L5t05bfBeq/3FZ5a3mLTz+zRZhp18dul2Oz8WoZmcn8PHcg=="; + sha512 = "1rcghwzkjcs25iz7dvfjxkwkn35jd7vyfs9idwncz2zvasyy1nkkpg6rcgilciwppccd29j2yrdzp95nddnh8lpqz41aiw2z0v6wzg6"; }; dependencies = [ sources."ansi-regex-2.1.1" @@ -34328,13 +33073,23 @@ in sources."aws-sign2-0.6.0" sources."aws4-1.7.0" sources."balanced-match-1.0.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."binary-extensions-1.11.0" - sources."binstall-1.2.0" + (sources."binstall-1.2.0" // { + dependencies = [ + sources."chalk-1.1.3" + sources."minimist-0.0.8" + sources."supports-color-2.0.0" + ]; + }) sources."block-stream-0.0.9" sources."boom-2.10.1" sources."brace-expansion-1.1.11" - sources."braces-1.8.5" + (sources."braces-1.8.5" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) sources."caseless-0.11.0" (sources."chalk-2.1.0" // { dependencies = [ @@ -34345,16 +33100,12 @@ in sources."color-convert-1.9.2" sources."color-name-1.1.1" sources."combined-stream-1.0.6" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" sources."cross-spawn-4.0.0" sources."cryptiles-2.0.5" - (sources."dashdash-1.14.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."dashdash-1.14.1" sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.1" sources."escape-string-regexp-1.0.5" @@ -34365,12 +33116,7 @@ in sources."extsprintf-1.3.0" sources."filename-regex-2.0.1" sources."fill-range-2.2.4" - (sources."find-elm-dependencies-1.0.2" // { - dependencies = [ - sources."firstline-1.2.0" - sources."lodash-4.14.2" - ]; - }) + sources."find-elm-dependencies-1.0.2" sources."find-parent-dir-0.3.0" sources."firstline-1.2.1" sources."for-in-1.0.2" @@ -34383,21 +33129,12 @@ in sources."fstream-1.0.11" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" - (sources."getpass-0.1.7" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."getpass-0.1.7" sources."glob-7.1.2" sources."glob-base-0.3.0" sources."glob-parent-2.0.0" sources."graceful-fs-4.1.11" - (sources."har-validator-2.0.6" // { - dependencies = [ - sources."chalk-1.1.3" - sources."supports-color-2.0.0" - ]; - }) + sources."har-validator-2.0.6" sources."has-ansi-2.0.0" sources."has-flag-2.0.0" sources."hawk-3.1.3" @@ -34443,16 +33180,14 @@ in sources."mime-types-2.1.18" sources."minimatch-3.0.4" sources."minimist-1.2.0" - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mkdirp-0.5.1" sources."murmur-hash-js-1.0.0" sources."nan-2.10.0" (sources."node-elm-compiler-4.3.3" // { dependencies = [ + sources."firstline-1.2.0" sources."lodash-4.14.2" + sources."rimraf-2.2.8" ]; }) sources."normalize-path-2.1.1" @@ -34472,7 +33207,6 @@ in (sources."randomatic-3.0.0" // { dependencies = [ sources."is-number-4.0.0" - sources."kind-of-6.0.2" ]; }) sources."readable-stream-2.3.6" @@ -34498,22 +33232,14 @@ in sources."strip-ansi-3.0.1" sources."supports-color-4.2.0" sources."tar-2.2.1" - (sources."temp-0.8.3" // { - dependencies = [ - sources."rimraf-2.2.8" - ]; - }) + sources."temp-0.8.3" sources."through-2.3.8" sources."tough-cookie-2.3.4" sources."tunnel-agent-0.4.3" sources."tweetnacl-0.14.5" sources."util-deprecate-1.0.2" - sources."uuid-3.3.0" - (sources."verror-1.10.0" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."uuid-3.3.2" + sources."verror-1.10.0" sources."which-1.3.1" sources."wrappy-1.0.2" sources."xmlbuilder-8.2.2" @@ -34535,7 +33261,7 @@ in version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/emoj/-/emoj-2.0.0.tgz"; - sha512 = "f+jc5ZC+EAqRK84plziuC4sfKspUcnnxwZzxLFSFsH0MZn9VbU0iQh5qTONewYXsoRaacNioMOLxYV637MLBDQ=="; + sha512 = "06w3hpcnxg63wg262ldhw4s2shyr1f1bvilqshy88i4svamgxk0qzdhhma2rwcwq7qpjwjlr8m1z2qbmqw9faff5f8hl45yj3jxrs3z"; }; dependencies = [ sources."ansi-escapes-3.1.0" @@ -34570,12 +33296,7 @@ in sources."callsites-2.0.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - (sources."chalk-1.1.3" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."has-ansi-2.0.0" - ]; - }) + sources."chalk-1.1.3" sources."cli-cursor-2.1.0" sources."clipboardy-1.2.3" sources."color-convert-1.9.2" @@ -34608,28 +33329,20 @@ in sources."has-symbol-support-x-1.4.2" sources."has-to-string-tag-x-1.4.1" sources."home-or-tmp-2.0.0" -<<<<<<< HEAD sources."hosted-git-info-2.6.1" - sources."import-jsx-1.3.0" -======= - sources."hosted-git-info-2.6.0" (sources."import-jsx-1.3.0" // { dependencies = [ sources."ansi-regex-2.1.1" sources."has-ansi-2.0.0" ]; }) ->>>>>>> nodePackages: meguca: 1.0.7 update sources."imurmurhash-0.1.4" sources."indent-string-3.2.0" (sources."ink-0.3.1" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.1" -<<<<<<< HEAD -======= sources."strip-ansi-4.0.0" ->>>>>>> nodePackages: meguca: 1.0.7 update sources."supports-color-5.4.0" ]; }) @@ -34650,11 +33363,7 @@ in sources."js-tokens-3.0.2" sources."jsesc-1.3.0" sources."json5-0.5.1" - (sources."load-json-file-1.1.0" // { - dependencies = [ - sources."pify-2.3.0" - ]; - }) + sources."load-json-file-1.1.0" sources."locate-path-2.0.0" sources."lodash-4.17.10" sources."lodash.debounce-4.0.8" @@ -34670,7 +33379,11 @@ in sources."mem-1.1.0" (sources."meow-3.7.0" // { dependencies = [ + sources."find-up-1.1.2" + sources."indent-string-2.1.0" sources."minimist-1.2.0" + sources."path-exists-2.1.0" + sources."pify-2.3.0" ]; }) sources."mimic-fn-1.2.0" @@ -34696,11 +33409,7 @@ in sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" - (sources."path-type-1.1.0" // { - dependencies = [ - sources."pify-2.3.0" - ]; - }) + sources."path-type-1.1.0" sources."pify-3.0.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" @@ -34710,17 +33419,8 @@ in sources."prop-types-15.6.2" sources."pseudomap-1.0.2" sources."read-pkg-1.1.0" - (sources."read-pkg-up-1.0.1" // { - dependencies = [ - sources."find-up-1.1.2" - sources."path-exists-2.1.0" - ]; - }) - (sources."redent-1.0.0" // { - dependencies = [ - sources."indent-string-2.1.0" - ]; - }) + sources."read-pkg-up-1.0.1" + sources."redent-1.0.0" sources."regenerator-runtime-0.11.1" sources."repeating-2.0.1" sources."require-from-string-1.2.1" @@ -34739,16 +33439,8 @@ in sources."spdx-exceptions-2.1.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.0" - (sources."string-width-2.1.1" // { - dependencies = [ - sources."strip-ansi-4.0.0" - ]; - }) - (sources."strip-ansi-3.0.1" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) + sources."string-width-2.1.1" + sources."strip-ansi-3.0.1" sources."strip-bom-2.0.0" sources."strip-eof-1.0.0" sources."strip-indent-1.0.1" @@ -34762,11 +33454,7 @@ in sources."url-to-options-1.0.1" sources."validate-npm-package-license-3.0.3" sources."which-1.3.1" - (sources."wrap-ansi-3.0.1" // { - dependencies = [ - sources."strip-ansi-4.0.0" - ]; - }) + sources."wrap-ansi-3.0.1" sources."write-file-atomic-2.3.0" sources."yallist-2.1.2" ]; @@ -34782,17 +33470,10 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; -<<<<<<< HEAD version = "5.0.1"; src = fetchurl { url = "https://registry.npmjs.org/eslint/-/eslint-5.0.1.tgz"; - sha512 = "D5nG2rErquLUstgUaxJlWB5+gu+U/3VDY0fk/Iuq8y9CUFy/7Y6oF4N2cR1tV8knzQvciIbfqfohd359xTLIKQ=="; -======= - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-5.0.0.tgz"; - sha512 = "0127ahzbflhc6hx78rgfx200waslqq5gxi2a9bxjybzyr9h99k9hd8nrx1qf9vsvnfbdhckjwm1sx1ady1hhj8w217v0ayyj9c1h39h"; ->>>>>>> nodePackages: meguca: 1.0.7 update + sha512 = "0lwhcn5gmz7f8gsm7gqd26w1g6jgjapdlfp2xl32yl8xvdzbi844bzkma5zrr27cd1pbzwlxy17w7jqcl96n56qnbaf5aibn7dcd68g"; }; dependencies = [ sources."acorn-5.7.1" @@ -34960,20 +33641,16 @@ in eslint_d = nodeEnv.buildNodePackage { name = "eslint_d"; packageName = "eslint_d"; - version = "5.3.1"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint_d/-/eslint_d-5.3.1.tgz"; - sha512 = "nD7fk0BxVUHDP+15SuRwDE9JtAJ3BGfqCtiCvCRsZtNRLJ8W+HaOaot06Zk9N4lgUoZTTDFDwlloy4iQt2fMOg=="; + url = "https://registry.npmjs.org/eslint_d/-/eslint_d-6.0.0.tgz"; + sha512 = "1wlpzphzx0gmi4ghlzyb1n1br539y5pizbjs4nc2gjqaz16kw3f0krngvxfqrwf7dqnrdlkhxwbby9kzqq2yra1hhv307xln45zl69m"; }; dependencies = [ sources."acorn-5.7.1" - (sources."acorn-jsx-3.0.1" // { - dependencies = [ - sources."acorn-3.3.0" - ]; - }) - sources."ajv-5.5.2" - sources."ajv-keywords-2.1.1" + sources."acorn-jsx-4.1.1" + sources."ajv-6.5.1" + sources."ajv-keywords-3.2.0" sources."ansi-escapes-3.1.0" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" @@ -34981,10 +33658,14 @@ in sources."array-union-1.0.2" sources."array-uniq-1.0.3" sources."arrify-1.0.1" - sources."babel-code-frame-6.26.0" + (sources."babel-code-frame-6.26.0" // { + dependencies = [ + sources."chalk-1.1.3" + sources."strip-ansi-3.0.1" + ]; + }) sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" - sources."buffer-from-1.1.0" sources."caller-path-0.1.0" sources."callsites-0.2.0" (sources."chalk-1.1.3" // { @@ -34996,79 +33677,81 @@ in sources."circular-json-0.3.3" sources."cli-cursor-2.1.0" sources."cli-width-2.2.0" - sources."co-4.6.0" sources."color-convert-1.9.2" sources."color-name-1.1.1" sources."concat-map-0.0.1" - sources."concat-stream-1.6.2" - sources."core-util-is-1.0.2" - sources."cross-spawn-5.1.0" + sources."cross-spawn-6.0.5" sources."debug-3.1.0" sources."deep-is-0.1.3" + sources."define-properties-1.1.2" sources."del-2.2.2" sources."doctrine-2.1.0" + sources."es-abstract-1.12.0" + sources."es-to-primitive-1.1.1" sources."escape-string-regexp-1.0.5" - (sources."eslint-4.19.1" // { + (sources."eslint-5.0.1" // { dependencies = [ sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" - sources."chalk-2.4.1" + (sources."chalk-2.4.1" // { + dependencies = [ + sources."supports-color-5.4.0" + ]; + }) sources."strip-ansi-4.0.0" - sources."supports-color-5.4.0" + sources."supports-color-2.0.0" ]; }) - sources."eslint-scope-3.7.1" + sources."eslint-scope-4.0.0" sources."eslint-visitor-keys-1.0.0" - sources."espree-3.5.4" + sources."espree-4.0.0" sources."esprima-4.0.0" sources."esquery-1.0.1" sources."esrecurse-4.2.1" sources."estraverse-4.2.0" sources."esutils-2.0.2" sources."external-editor-2.2.0" - sources."fast-deep-equal-1.1.0" + sources."fast-deep-equal-2.0.1" sources."fast-json-stable-stringify-2.0.0" sources."fast-levenshtein-2.0.6" sources."figures-2.0.0" sources."file-entry-cache-2.0.0" sources."flat-cache-1.3.0" + sources."foreach-2.0.5" sources."fs.realpath-1.0.0" + sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" sources."glob-7.1.2" sources."globals-11.7.0" sources."globby-5.0.0" sources."graceful-fs-4.1.11" + sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" + sources."has-symbols-1.0.0" sources."iconv-lite-0.4.23" sources."ignore-3.3.10" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.3" - (sources."inquirer-3.3.0" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."ansi-styles-3.2.1" - sources."chalk-2.4.1" - sources."strip-ansi-4.0.0" - sources."supports-color-5.4.0" - ]; - }) + sources."inquirer-5.2.0" + sources."is-callable-1.1.3" + sources."is-date-object-1.0.1" sources."is-fullwidth-code-point-2.0.0" sources."is-path-cwd-1.0.0" sources."is-path-in-cwd-1.0.1" sources."is-path-inside-1.0.1" sources."is-promise-2.1.0" + sources."is-regex-1.0.4" sources."is-resolvable-1.1.0" - sources."isarray-1.0.0" + sources."is-symbol-1.0.1" sources."isexe-2.0.0" sources."js-tokens-3.0.2" sources."js-yaml-3.12.0" - sources."json-schema-traverse-0.3.1" + sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."levn-0.3.0" sources."lodash-4.17.10" - sources."lru-cache-4.1.3" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" @@ -35077,23 +33760,25 @@ in sources."mute-stream-0.0.7" sources."nanolru-1.0.0" sources."natural-compare-1.4.0" + sources."nice-try-1.0.4" sources."object-assign-4.1.1" + sources."object-keys-1.0.12" sources."once-1.4.0" sources."onetime-2.0.1" sources."optionator-0.8.2" sources."os-tmpdir-1.0.2" sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" + sources."path-key-2.0.1" sources."path-parse-1.0.5" sources."pify-2.3.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."pluralize-7.0.0" sources."prelude-ls-1.1.2" - sources."process-nextick-args-2.0.0" sources."progress-2.0.0" - sources."pseudomap-1.0.2" - sources."readable-stream-2.3.6" + sources."punycode-2.1.1" + sources."regexp.prototype.flags-1.2.0" sources."regexpp-1.1.0" sources."require-uncached-1.0.3" sources."resolve-1.8.1" @@ -35101,9 +33786,7 @@ in sources."restore-cursor-2.0.0" sources."rimraf-2.6.2" sources."run-async-2.3.0" - sources."rx-lite-4.0.8" - sources."rx-lite-aggregates-4.0.8" - sources."safe-buffer-5.1.2" + sources."rxjs-5.5.11" sources."safer-buffer-2.1.2" sources."semver-5.5.0" sources."shebang-command-1.2.0" @@ -35111,13 +33794,8 @@ in sources."signal-exit-3.0.2" sources."slice-ansi-1.0.0" sources."sprintf-js-1.0.3" - (sources."string-width-2.1.1" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."strip-ansi-4.0.0" - ]; - }) - sources."string_decoder-1.1.1" + sources."string-width-2.1.1" + sources."string.prototype.matchall-2.0.0" sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" (sources."supports-color-3.2.3" // { @@ -35125,24 +33803,17 @@ in sources."has-flag-1.0.0" ]; }) - (sources."table-4.0.2" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.1" - sources."supports-color-5.4.0" - ]; - }) + sources."symbol-observable-1.0.1" + sources."table-4.0.3" sources."text-table-0.2.0" sources."through-2.3.8" sources."tmp-0.0.33" sources."type-check-0.3.2" - sources."typedarray-0.0.6" - sources."util-deprecate-1.0.2" + sources."uri-js-4.2.2" sources."which-1.3.1" sources."wordwrap-1.0.0" sources."wrappy-1.0.2" sources."write-0.2.1" - sources."yallist-2.1.2" ]; buildInputs = globalBuildInputs; meta = { @@ -35188,7 +33859,7 @@ in sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.7.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."buffer-from-1.1.0" sources."builtin-modules-1.1.1" sources."camelcase-2.1.1" @@ -35253,13 +33924,7 @@ in sources."kew-0.7.0" sources."klaw-1.3.1" sources."load-json-file-1.1.0" - (sources."log-symbols-2.2.0" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.1" - sources."supports-color-5.4.0" - ]; - }) + sources."log-symbols-2.2.0" sources."log-update-1.0.2" sources."loud-rejection-1.6.0" sources."map-obj-1.0.1" @@ -35268,11 +33933,7 @@ in sources."mime-types-2.1.18" sources."mimic-fn-1.2.0" sources."minimist-1.2.0" - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mkdirp-0.5.1" sources."mkpath-1.0.0" sources."ms-2.0.0" sources."node-phantom-simple-2.2.4" @@ -35297,7 +33958,11 @@ in sources."path-type-1.1.0" sources."pend-1.2.0" sources."performance-now-2.1.0" - sources."phantomjs-prebuilt-2.1.16" + (sources."phantomjs-prebuilt-2.1.16" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) sources."pify-2.3.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" @@ -35336,7 +34001,7 @@ in sources."tweetnacl-0.14.5" sources."typedarray-0.0.6" sources."util-deprecate-1.0.2" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."validate-npm-package-license-3.0.3" sources."verror-1.10.0" sources."which-1.3.1" @@ -35396,13 +34061,12 @@ in sources."balanced-match-1.0.0" sources."binary-extensions-1.11.0" sources."brace-expansion-1.1.11" - sources."braces-1.8.5" - (sources."broadway-0.3.6" // { + (sources."braces-1.8.5" // { dependencies = [ - sources."cliff-0.1.9" - sources."winston-0.8.0" + sources."kind-of-6.0.2" ]; }) + sources."broadway-0.3.6" sources."caller-0.0.1" sources."chokidar-1.7.0" (sources."cliff-0.1.10" // { @@ -35418,11 +34082,7 @@ in sources."deep-equal-0.1.2" sources."defined-0.0.0" sources."director-1.2.7" - (sources."event-stream-0.5.3" // { - dependencies = [ - sources."optimist-0.2.8" - ]; - }) + sources."event-stream-0.5.3" sources."eventemitter2-0.4.14" sources."expand-brackets-0.1.5" sources."expand-range-1.8.2" @@ -35432,12 +34092,18 @@ in sources."fill-range-2.2.4" (sources."flatiron-0.4.3" // { dependencies = [ + sources."cliff-0.1.9" sources."optimist-0.6.0" + sources."winston-0.8.0" ]; }) sources."for-in-1.0.2" sources."for-own-0.1.5" - sources."forever-monitor-1.7.1" + (sources."forever-monitor-1.7.1" // { + dependencies = [ + sources."optimist-0.2.8" + ]; + }) sources."fs.realpath-1.0.0" sources."fsevents-1.2.4" sources."glob-7.1.2" @@ -35468,11 +34134,7 @@ in sources."micromatch-2.3.11" sources."minimatch-3.0.4" sources."minimist-0.0.10" - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mkdirp-0.5.1" sources."mute-stream-0.0.7" sources."nan-2.10.0" (sources."nconf-0.6.9" // { @@ -35504,7 +34166,6 @@ in (sources."randomatic-3.0.0" // { dependencies = [ sources."is-number-4.0.0" - sources."kind-of-6.0.2" ]; }) sources."read-1.0.7" @@ -35527,7 +34188,11 @@ in sources."through-2.3.8" sources."timespan-2.3.0" sources."util-deprecate-1.0.2" - sources."utile-0.2.1" + (sources."utile-0.2.1" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) sources."winston-0.8.3" sources."wordwrap-0.0.3" sources."wrappy-1.0.2" @@ -35547,7 +34212,7 @@ in version = "0.5.5"; src = fetchurl { url = "https://registry.npmjs.org/git-run/-/git-run-0.5.5.tgz"; - sha512 = "76zCOpXUl/85CMk9aJwWbBy2vGYv+Yn17PcUMhksTtMJLAUujje3eP8v7FufC2pN9SbQx88Gtr4ARXGeVWwAJA=="; + sha512 = "0j00v2mkrqla05ynq3cziyh4vslsshbkxdyqbzzg2vkg3if0ln0klsf5hck457pxksqky9gcsybc73c2sf6hgf910wzz5yljlxc5b7g"; }; dependencies = [ sources."async-2.6.1" @@ -35557,19 +34222,7 @@ in sources."microee-0.0.6" sources."minilog-3.1.0" sources."ms-2.0.0" -<<<<<<< HEAD -<<<<<<< HEAD sources."simple-git-1.96.0" -======= -<<<<<<< HEAD - sources."simple-git-1.95.1" -======= - sources."simple-git-1.96.0" ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 -======= - sources."simple-git-1.96.0" ->>>>>>> nodePackages: meguca: 1.0.7 update sources."tabtab-git+https://github.com/mixu/node-tabtab.git" ]; buildInputs = globalBuildInputs; @@ -35587,7 +34240,7 @@ in version = "2.1.9"; src = fetchurl { url = "https://registry.npmjs.org/git-standup/-/git-standup-2.1.9.tgz"; - sha512 = "+XT110zb/S1XzG+amg5gKGWcD6dW58mnstS4GkuiO63aA8qGvpgNB9Cq89qxhFSIQ2smeB/00QGsVLn4CL1V+A=="; + sha512 = "3w5bg88z2wm9b01s7s1yy16dd1qhm44n7dg7anh0w6rigl6r81xmb9vl95imf6lnakwkrsnlw7rqr98c079m6kgribjvzfv9kbzax7r"; }; buildInputs = globalBuildInputs; meta = { @@ -35643,7 +34296,11 @@ in }; dependencies = [ sources."acorn-2.7.0" - sources."acorn-globals-1.0.9" + (sources."acorn-globals-1.0.9" // { + dependencies = [ + sources."acorn-2.7.0" + ]; + }) sources."align-text-0.1.4" sources."amdefine-1.0.1" sources."asap-1.0.0" @@ -35655,11 +34312,7 @@ in sources."commander-2.8.1" ]; }) - (sources."cliui-2.1.0" // { - dependencies = [ - sources."wordwrap-0.0.2" - ]; - }) + sources."cliui-2.1.0" sources."coffee-script-1.12.7" sources."commander-2.6.0" sources."constantinople-3.0.2" @@ -35670,7 +34323,15 @@ in sources."graceful-readlink-1.0.1" sources."is-buffer-1.1.6" sources."is-promise-2.1.0" - sources."jade-1.11.0" + (sources."jade-1.11.0" // { + dependencies = [ + sources."acorn-1.2.2" + sources."is-promise-1.0.1" + sources."promise-2.0.0" + sources."source-map-0.1.43" + sources."wordwrap-0.0.2" + ]; + }) sources."jstransformer-0.0.2" sources."kind-of-3.2.2" sources."lazy-cache-1.0.4" @@ -35693,9 +34354,6 @@ in sources."source-map-0.4.4" (sources."transformers-2.1.0" // { dependencies = [ - sources."is-promise-1.0.1" - sources."promise-2.0.0" - sources."source-map-0.1.43" sources."uglify-js-2.2.5" ]; }) @@ -35708,11 +34366,7 @@ in sources."void-elements-2.0.1" sources."weak-map-1.0.5" sources."window-size-0.1.0" - (sources."with-4.0.3" // { - dependencies = [ - sources."acorn-1.2.2" - ]; - }) + sources."with-4.0.3" sources."wordwrap-0.0.3" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" @@ -35753,14 +34407,21 @@ in sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ - sources."define-property-1.0.0" + (sources."define-property-1.0.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + sources."kind-of-3.2.2" ]; }) sources."beeper-1.1.1" sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { dependencies = [ + sources."define-property-1.0.0" sources."extend-shallow-2.0.1" + sources."kind-of-3.2.2" ]; }) sources."cache-base-1.0.1" @@ -35768,18 +34429,6 @@ in (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" ]; }) sources."clone-1.0.4" @@ -35803,42 +34452,29 @@ in (sources."expand-brackets-2.1.4" // { dependencies = [ sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" ]; }) sources."expand-tilde-2.0.2" sources."extend-3.0.1" - (sources."extend-shallow-3.0.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) + sources."extend-shallow-3.0.2" (sources."extglob-2.0.4" // { dependencies = [ sources."define-property-1.0.0" sources."extend-shallow-2.0.1" + sources."kind-of-5.1.0" ]; }) sources."fancy-log-1.3.2" - (sources."fill-range-4.0.0" // { + sources."fill-range-4.0.0" + sources."find-index-0.1.1" + (sources."findup-sync-2.0.0" // { dependencies = [ - sources."extend-shallow-2.0.1" + sources."is-accessor-descriptor-1.0.0" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + sources."is-extendable-0.1.1" ]; }) - sources."find-index-0.1.1" - sources."findup-sync-2.0.0" sources."fined-1.1.0" sources."first-chunk-stream-1.0.0" sources."flagged-respawn-1.0.0" @@ -35848,36 +34484,30 @@ in sources."gaze-0.5.2" sources."get-value-2.0.6" sources."glob-4.5.3" - (sources."glob-stream-3.1.18" // { + sources."glob-stream-3.1.18" + (sources."glob-watcher-0.0.6" // { dependencies = [ - sources."readable-stream-1.0.34" - sources."through2-0.6.5" + sources."graceful-fs-1.2.3" ]; }) - sources."glob-watcher-0.0.6" sources."glob2base-0.0.12" sources."global-modules-1.0.0" sources."global-prefix-1.0.2" - (sources."globule-0.1.0" // { - dependencies = [ - sources."glob-3.1.21" - sources."graceful-fs-1.2.3" - sources."inherits-1.0.2" - sources."minimatch-0.2.14" - ]; - }) + sources."globule-0.1.0" sources."glogg-1.0.1" sources."graceful-fs-3.0.11" - sources."gulp-util-3.0.8" + (sources."gulp-util-3.0.8" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" + ]; + }) sources."gulplog-1.0.0" sources."has-ansi-2.0.0" sources."has-gulplog-0.1.0" sources."has-value-1.0.0" - (sources."has-values-1.0.0" // { - dependencies = [ - sources."kind-of-4.0.0" - ]; - }) + sources."has-values-1.0.0" sources."homedir-polyfill-1.0.1" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -35891,11 +34521,7 @@ in sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" sources."is-glob-3.1.0" - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) + sources."is-number-3.0.0" sources."is-plain-object-2.0.4" sources."is-relative-1.0.0" sources."is-unc-path-1.0.0" @@ -35905,7 +34531,24 @@ in sources."isexe-2.0.0" sources."isobject-3.0.1" sources."kind-of-6.0.2" - sources."liftoff-2.5.0" + (sources."liftoff-2.5.0" // { + dependencies = [ + sources."has-values-0.1.4" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."is-extendable-1.0.1" + sources."isarray-1.0.0" + ]; + }) sources."lodash-1.0.2" sources."lodash._basecopy-3.0.1" sources."lodash._basetostring-3.0.1" @@ -35927,37 +34570,32 @@ in sources."make-iterator-1.0.1" sources."map-cache-0.2.2" sources."map-visit-1.0.0" - sources."micromatch-3.1.10" - sources."minimatch-2.0.10" - sources."minimist-1.2.0" - (sources."mixin-deep-1.3.1" // { + (sources."micromatch-3.1.10" // { dependencies = [ + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" sources."is-extendable-1.0.1" ]; }) - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."minimatch-2.0.10" + sources."minimist-1.2.0" + sources."mixin-deep-1.3.1" + sources."mkdirp-0.5.1" sources."ms-2.0.0" sources."multipipe-0.1.2" sources."nanomatch-1.2.13" sources."natives-1.1.4" sources."object-assign-3.0.0" - (sources."object-copy-0.1.0" // { - dependencies = [ - sources."define-property-0.2.5" - sources."is-accessor-descriptor-0.1.6" - sources."is-data-descriptor-0.1.4" - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) - sources."kind-of-3.2.2" - ]; - }) + sources."object-copy-0.1.0" sources."object-visit-1.0.1" sources."object.defaults-1.1.0" sources."object.map-1.0.1" @@ -35989,33 +34627,23 @@ in sources."safe-regex-1.1.0" sources."semver-4.3.6" sources."sequencify-0.0.7" - (sources."set-value-2.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) + sources."set-value-2.0.0" sources."sigmund-1.0.1" (sources."snapdragon-0.8.2" // { dependencies = [ - sources."define-property-0.2.5" + (sources."define-property-0.2.5" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) 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."is-extendable-0.1.1" + sources."kind-of-4.0.0" ]; }) (sources."snapdragon-node-2.1.1" // { dependencies = [ - sources."define-property-1.0.0" + sources."kind-of-6.0.2" ]; }) (sources."snapdragon-util-3.0.1" // { @@ -36027,49 +34655,26 @@ in sources."source-map-resolve-0.5.2" sources."source-map-url-0.4.0" sources."sparkles-1.0.1" - sources."split-string-3.1.0" - (sources."static-extend-0.1.2" // { + (sources."split-string-3.1.0" // { 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."extend-shallow-3.0.2" ]; }) + sources."static-extend-0.1.2" sources."stream-consume-0.1.1" sources."string_decoder-0.10.31" sources."strip-ansi-3.0.1" sources."strip-bom-1.0.0" sources."supports-color-2.0.0" - (sources."through2-2.0.3" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.6" - sources."string_decoder-1.1.1" - ]; - }) + sources."through2-2.0.3" sources."tildify-1.2.0" sources."time-stamp-1.1.0" - (sources."to-object-path-0.3.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) + sources."to-object-path-0.3.0" sources."to-regex-3.0.2" sources."to-regex-range-2.1.1" sources."unc-path-regex-0.1.2" (sources."union-value-1.0.0" // { dependencies = [ - sources."extend-shallow-2.0.1" sources."set-value-0.4.3" ]; }) @@ -36081,12 +34686,14 @@ in sources."isobject-2.1.0" ]; }) - sources."has-values-0.1.4" - sources."isarray-1.0.0" ]; }) sources."urix-0.1.0" - sources."use-3.1.0" + (sources."use-3.1.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) sources."user-home-1.1.1" sources."util-deprecate-1.0.2" sources."v8flags-2.1.1" @@ -36094,8 +34701,16 @@ in (sources."vinyl-fs-0.3.14" // { dependencies = [ sources."clone-0.2.0" + sources."glob-3.1.21" + sources."inherits-1.0.2" + sources."minimatch-0.2.14" + sources."minimist-0.0.8" sources."readable-stream-1.0.34" - sources."through2-0.6.5" + (sources."through2-0.6.5" // { + dependencies = [ + sources."inherits-2.0.3" + ]; + }) sources."vinyl-0.4.6" ]; }) @@ -36150,7 +34765,6 @@ in sources."brace-expansion-1.1.11" (sources."cli-0.6.6" // { dependencies = [ - sources."glob-3.2.11" sources."minimatch-0.3.0" ]; }) @@ -36164,12 +34778,15 @@ in (sources."dom-serializer-0.1.0" // { dependencies = [ sources."domelementtype-1.1.3" - sources."entities-1.1.1" ]; }) sources."domelementtype-1.3.0" sources."domhandler-2.3.0" - sources."domutils-1.5.1" + (sources."domutils-1.5.1" // { + dependencies = [ + sources."entities-1.1.1" + ]; + }) sources."entities-1.0.0" sources."exit-0.1.2" sources."glob-5.0.15" @@ -36184,6 +34801,7 @@ in sources."isarray-0.0.1" (sources."jshint-2.8.0" // { dependencies = [ + sources."glob-3.2.11" sources."minimatch-2.0.10" ]; }) @@ -36217,7 +34835,7 @@ in version = "3.5.17"; src = fetchurl { url = "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.17.tgz"; - sha512 = "O+StuKL0UWfwX5Zv4rFxd60DPcT5DVjGq1AlnP6VQ8wzudft/W4hx5Wl98aSYNwFBHY6XWJreRw/BehX4l+diQ=="; + sha512 = "24rspz2azl0agqwg5mn4p9sfq20bp30jb3gg9cmqwhnxzgdsywk7k23jpz9q9ahmg35h3grqhyh7bbpf6qy4vwnbzq6flgllawavr1v"; }; dependencies = [ sources."camel-case-3.0.0" @@ -36251,11 +34869,31 @@ in version = "3.20.0"; src = fetchurl { url = "https://registry.npmjs.org/ionic/-/ionic-3.20.0.tgz"; - sha512 = "yeLPusYOSyF+VmO+Hf2a5kf2Kx4ST1f3MILM8g+9ckF/MdaoD9UzXif2/sumGem6I6RTrqo9horBmC7QJYcClA=="; + sha512 = "2a051r5s0p9ihcahqysmbjklhivms8rlv5zxxi7bqrxa3x8sqqpyhbjpl7z5k4263vmfkqj3qmzciz6kbyivgk3arz22jqfqsxczqn9"; }; dependencies = [ sources."@ionic/cli-framework-0.1.3" - sources."@ionic/cli-utils-1.19.2" + (sources."@ionic/cli-utils-1.19.2" // { + dependencies = [ + sources."bytes-1.0.0" + sources."debug-2.6.9" + sources."iconv-lite-0.4.19" + sources."is-extglob-2.1.1" + sources."is-glob-3.1.0" + sources."mime-1.4.1" + sources."qs-6.5.1" + (sources."raw-body-2.3.2" // { + dependencies = [ + sources."depd-1.1.1" + sources."http-errors-1.6.2" + ]; + }) + sources."safe-buffer-5.1.1" + sources."statuses-1.4.0" + sources."string_decoder-0.10.31" + sources."yallist-3.0.2" + ]; + }) sources."@ionic/discover-0.4.0" sources."accepts-1.3.5" sources."ansi-escapes-3.1.0" @@ -36276,20 +34914,14 @@ in sources."basic-auth-1.1.0" sources."binary-extensions-1.11.0" sources."bl-1.2.2" - (sources."body-5.1.0" // { - dependencies = [ - sources."bytes-1.0.0" - sources."raw-body-1.1.7" - sources."string_decoder-0.10.31" - ]; - }) - (sources."body-parser-1.18.3" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) + sources."body-5.1.0" + sources."body-parser-1.18.3" sources."brace-expansion-1.1.11" - sources."braces-1.8.5" + (sources."braces-1.8.5" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" @@ -36337,19 +34969,11 @@ in sources."expand-range-1.8.2" (sources."express-4.16.3" // { dependencies = [ - sources."body-parser-1.18.2" - sources."debug-2.6.9" - (sources."http-errors-1.6.2" // { + (sources."body-parser-1.18.2" // { dependencies = [ - sources."depd-1.1.1" sources."setprototypeof-1.0.3" ]; }) - sources."iconv-lite-0.4.19" - sources."qs-6.5.1" - sources."raw-body-2.3.2" - sources."safe-buffer-5.1.1" - sources."statuses-1.4.0" ]; }) sources."extend-3.0.1" @@ -36359,12 +34983,7 @@ in sources."figures-2.0.0" sources."filename-regex-2.0.1" sources."fill-range-2.2.4" - (sources."finalhandler-1.1.1" // { - dependencies = [ - sources."debug-2.6.9" - sources."statuses-1.4.0" - ]; - }) + sources."finalhandler-1.1.1" sources."follow-redirects-1.5.0" sources."for-in-1.0.2" sources."for-own-0.1.5" @@ -36386,8 +35005,7 @@ in sources."http-proxy-1.17.0" (sources."http-proxy-middleware-0.17.4" // { dependencies = [ - sources."is-extglob-2.1.1" - sources."is-glob-3.1.0" + sources."debug-3.1.0" ]; }) sources."iconv-lite-0.4.23" @@ -36413,11 +35031,7 @@ in sources."isobject-2.1.0" sources."kind-of-3.2.2" sources."lazystream-1.0.0" - (sources."leek-0.0.24" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) + sources."leek-0.0.24" sources."livereload-js-2.3.0" sources."lodash-4.17.10" sources."lodash._baseassign-3.2.0" @@ -36444,17 +35058,9 @@ in sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" - (sources."minipass-2.3.3" // { - dependencies = [ - sources."yallist-3.0.2" - ]; - }) + sources."minipass-2.3.3" sources."minizlib-1.1.0" - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mkdirp-0.5.1" sources."ms-2.0.0" sources."mute-stream-0.0.7" sources."nan-2.10.0" @@ -36482,7 +35088,6 @@ in (sources."randomatic-3.0.0" // { dependencies = [ sources."is-number-4.0.0" - sources."kind-of-6.0.2" ]; }) sources."range-parser-1.2.0" @@ -36505,13 +35110,7 @@ in sources."safer-buffer-2.1.2" sources."sax-1.1.4" sources."semver-5.5.0" - (sources."send-0.16.2" // { - dependencies = [ - sources."debug-2.6.9" - sources."mime-1.4.1" - sources."statuses-1.4.0" - ]; - }) + sources."send-0.16.2" sources."serve-static-1.13.2" sources."set-immediate-shim-1.0.1" sources."setprototypeof-1.1.0" @@ -36529,12 +35128,18 @@ in sources."supports-color-5.4.0" (sources."tar-4.4.4" // { dependencies = [ - sources."yallist-3.0.2" + sources."minimist-0.0.8" + sources."safe-buffer-5.1.2" ]; }) sources."tar-stream-1.6.1" sources."through-2.3.8" - sources."tiny-lr-1.1.1" + (sources."tiny-lr-1.1.1" // { + dependencies = [ + sources."debug-3.1.0" + sources."raw-body-1.1.7" + ]; + }) sources."tmp-0.0.33" sources."to-buffer-1.1.1" sources."tslib-1.9.3" @@ -36544,7 +35149,7 @@ in sources."untildify-3.0.3" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."vary-1.1.2" sources."websocket-driver-0.7.0" sources."websocket-extensions-0.1.3" @@ -36601,11 +35206,7 @@ in sources."brace-expansion-1.1.11" sources."camelcase-1.2.1" sources."center-align-0.1.3" - (sources."cliui-2.1.0" // { - dependencies = [ - sources."wordwrap-0.0.2" - ]; - }) + sources."cliui-2.1.0" sources."concat-map-0.0.1" sources."decamelize-1.2.0" sources."deep-is-0.1.3" @@ -36618,6 +35219,7 @@ in (sources."handlebars-4.0.11" // { dependencies = [ sources."source-map-0.4.4" + sources."wordwrap-0.0.3" ]; }) sources."has-flag-1.0.0" @@ -36643,11 +35245,7 @@ in }) sources."nopt-3.0.6" sources."once-1.4.0" - (sources."optimist-0.6.1" // { - dependencies = [ - sources."wordwrap-0.0.3" - ]; - }) + sources."optimist-0.6.1" sources."optionator-0.8.2" sources."path-is-absolute-1.0.1" sources."prelude-ls-1.1.2" @@ -36661,6 +35259,7 @@ in (sources."uglify-js-2.8.29" // { dependencies = [ sources."source-map-0.5.7" + sources."wordwrap-0.0.2" ]; }) sources."uglify-to-browserify-1.0.2" @@ -36685,7 +35284,7 @@ in version = "0.4.1"; src = fetchurl { url = "https://registry.npmjs.org/imapnotify/-/imapnotify-0.4.1.tgz"; - sha512 = "GjAGPnMmGEpnyDOmyjE5TGEcUIzz/rTDgw+pV8EOcLOhYBIw5Ol7JLi1vJT/WwlRKFbGRiEvIvjyCibLzaNiHQ=="; + sha512 = "0fn58ydrck0mwpq48pj2in6aql522avzyabrddq4ixykr1h29ha3cvh1v0mga8ghg1v9zpkii81qqac74qwm9ikr1kll616fcz0cc0s"; }; dependencies = [ sources."async-0.2.10" @@ -36744,31 +35343,10 @@ in javascript-typescript-langserver = nodeEnv.buildNodePackage { name = "javascript-typescript-langserver"; packageName = "javascript-typescript-langserver"; -<<<<<<< HEAD -<<<<<<< HEAD - version = "2.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.10.0.tgz"; - sha512 = "y8IOlo8Ml/CFuvr8pFdaMpNV43W5eZhTl5UZuRxKGxX08PSi3OZsYjr5gMYsKT5ZzMNk/U+MqZXJNh6Ccm30hQ=="; -======= -<<<<<<< HEAD - version = "2.9.2"; - src = fetchurl { - url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.9.2.tgz"; - sha512 = "01pqqc94lq3c9010wbb0zafs81b5z4mzr06864kf4vs3zih30xfral4rbk9d2q2m2kbawcym8zlj5xydgig5k40kzqy1hyhallcm5dm"; -======= - version = "2.9.3"; - src = fetchurl { - url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.9.3.tgz"; - sha512 = "0f3mqalx44w1zfhy6vl299rp18mg4s35gass533sgw7hr7dcf6vzwy3dcik1ncl0xss1bbs4vi7a3mbxhrddm7pd2r36hmpgnp29hn5"; ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 -======= version = "2.10.0"; src = fetchurl { url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.10.0.tgz"; sha512 = "22z8vbjh8g3djcmm664zzb4qg65jgi95k381y9sc9nfdp52ykqg858v98fbj6cmjx9rhydrfpimb4rjb9bs9z7spa2z15qciyb0xhnb"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; dependencies = [ sources."ansi-color-0.2.1" @@ -36784,7 +35362,7 @@ in sources."check-error-1.0.2" sources."color-convert-1.9.2" sources."color-name-1.1.1" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."concat-map-0.0.1" sources."deep-eql-3.0.1" sources."deep-equal-1.0.1" @@ -36826,23 +35404,8 @@ in sources."type-detect-4.0.8" sources."typescript-2.8.3" sources."vscode-jsonrpc-3.6.2" -<<<<<<< HEAD -<<<<<<< HEAD sources."vscode-languageserver-4.2.1" sources."vscode-languageserver-protocol-3.8.1" -======= - (sources."vscode-languageserver-3.5.1" // { - dependencies = [ - sources."vscode-jsonrpc-3.5.0" - sources."vscode-languageserver-types-3.5.0" - ]; - }) - sources."vscode-languageserver-protocol-3.5.1" ->>>>>>> nodePackages: meguca: 1.0.5 -> 1.0.7 -======= - sources."vscode-languageserver-4.2.1" - sources."vscode-languageserver-protocol-3.8.1" ->>>>>>> nodePackages: meguca: 1.0.7 update sources."vscode-languageserver-types-3.8.2" sources."vscode-uri-1.0.5" sources."wrappy-1.0.2" @@ -36864,7 +35427,7 @@ in version = "0.3.2"; src = fetchurl { url = "https://registry.npmjs.org/jayschema/-/jayschema-0.3.2.tgz"; - sha512 = "UHLk2ya7ItaLjmMVJWGE9b5t7jD3DZfmURdmz+rOVSiSYnrCtgcxvNXuQavcK7bhUBlXFmrXwRAPXkCMDxxANg=="; + sha512 = "0v4070gii05w3qhq7bnl5jp358f3dibvjml3vnmphqhgdn2g9i94a2mrvmcyrhpa7k9f3gp63p6vgpmhihja5b3is5xc8mv4vdy8wjh"; }; dependencies = [ sources."when-3.4.6" @@ -36884,12 +35447,16 @@ in version = "3.5.5"; src = fetchurl { url = "https://registry.npmjs.org/jsdoc/-/jsdoc-3.5.5.tgz"; - sha512 = "6PxB65TAU4WO0Wzyr/4/YhlGovXl0EVYfpKbpSroSj0qBxT4/xod/l40Opkm38dRHRdQgdeY836M0uVnJQG7kg=="; + sha512 = "29bn095czjx533yyfcdg0ah2wfm3iyz4sckld2yzqfimzzq2h3jlgaax0mab6wjgrc4bl75yni4c6b27zzazwkcs678aly0jkml3z78"; }; dependencies = [ sources."babylon-7.0.0-beta.19" sources."bluebird-3.5.1" - sources."catharsis-0.8.9" + (sources."catharsis-0.8.9" // { + dependencies = [ + sources."underscore-1.6.0" + ]; + }) sources."escape-string-regexp-1.0.5" sources."graceful-fs-4.1.11" sources."js2xmlparser-3.0.0" @@ -36905,11 +35472,7 @@ in sources."strip-json-comments-2.0.1" sources."taffydb-2.6.2" sources."underscore-1.8.3" - (sources."underscore-contrib-0.3.0" // { - dependencies = [ - sources."underscore-1.6.0" - ]; - }) + sources."underscore-contrib-0.3.0" sources."xmlcreate-1.0.2" ]; buildInputs = globalBuildInputs; @@ -36940,12 +35503,15 @@ in (sources."dom-serializer-0.1.0" // { dependencies = [ sources."domelementtype-1.1.3" - sources."entities-1.1.1" ]; }) sources."domelementtype-1.3.0" sources."domhandler-2.3.0" - sources."domutils-1.5.1" + (sources."domutils-1.5.1" // { + dependencies = [ + sources."entities-1.1.1" + ]; + }) sources."entities-1.0.0" sources."exit-0.1.2" sources."fs.realpath-1.0.0" @@ -36995,12 +35561,12 @@ in version = "1.7.5"; src = fetchurl { url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.7.5.tgz"; - sha512 = "9OhfAqGOrD7hoQBLJMTA+BKuKmoEtTJXzZ7WDF/9gvjtey1koVLuZqIY6c51aPDjbNdNtIXAkiWKVhziawE9Og=="; + sha512 = "0x3s0bbw8f5d2i5jb08bd2dsxnf7w38fp7fj652cvp558b45mxyvy42zmghrmlyrmbk5d84d8maw4pqq3228jq0l7hkxb4fl415zs7l"; }; dependencies = [ sources."abbrev-1.1.1" sources."bluebird-3.5.1" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."config-chain-1.1.11" sources."editorconfig-0.13.3" sources."ini-1.3.5" @@ -37028,7 +35594,7 @@ in version = "1.6.3"; src = fetchurl { url = "https://registry.npmjs.org/jsonlint/-/jsonlint-1.6.3.tgz"; - sha512 = "jMVTMzP+7gU/IyC6hvKyWpUU8tmTkK5b3BPNuMI9U8Sit+YAWLlZwB6Y6YrdCxfg2kNz05p3XY3Bmm4m26Nv3A=="; + sha512 = "3f6z8yv4rp9mhcdbmvrmlvk8gdf05qbvn5fk60yq1cvjn00wsvs5i2k7p1bik8kvidsx44kv7r195asnbr8dfi04czhbvpy6crm7icc"; }; dependencies = [ sources."JSV-4.0.2" @@ -37069,7 +35635,7 @@ in version = "0.5.2"; src = fetchurl { url = "https://registry.npmjs.org/json-diff/-/json-diff-0.5.2.tgz"; - sha512 = "N7oapTQdD4rLMUtA7d1HATCPY/BpHuSNL1mhvIuoS0u5NideDvyR+gB/ntXB7ejFz/LM0XzPLNUJQcC68n5sBw=="; + sha512 = "03nqzpjpb0422fm5k7prlfcyb7wbs7dq7arwzq0za8zq3jy4wvbjjsbm25vr8ar5y6y87k9y1iqyc018zfysh2b675ql3qx6jjimfip"; }; dependencies = [ sources."cli-color-0.1.7" @@ -37093,7 +35659,7 @@ in version = "3.0.4"; src = fetchurl { url = "https://registry.npmjs.org/json-refs/-/json-refs-3.0.4.tgz"; - sha512 = "UFnB5j1C7XrUWQIlFGrjerFVuc04TZAyoEavfb0VofdjguWWN97aCtWsv1uX6pXylJiLw+agsyTPCnNjL6W4ag=="; + sha512 = "1mbi99gcdrhmkr4nfhfdhwbk2ag55gajxdvzb6m1bddwdwnwn167xx12nypvbs6l0r90k9qrnwmbcbswdm18982b7a7mva27pkc2nah"; }; dependencies = [ sources."argparse-1.0.10" @@ -37145,30 +35711,10 @@ in json-server = nodeEnv.buildNodePackage { name = "json-server"; packageName = "json-server"; -<<<<<<< HEAD -<<<<<<< HEAD - version = "0.14.0"; - src = fetchurl { - url = "https://registry.npmjs.org/json-server/-/json-server-0.14.0.tgz"; - sha512 = "8RVRAb1TO6LlCny6+8GC+sXDsESYv7gv7fSLdVANklVt866I416/7Z5fdqrtzSru92nyreddgavbEk8pjqcWoA=="; -======= -<<<<<<< HEAD - version = "0.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/json-server/-/json-server-0.13.0.tgz"; - sha512 = "0lz3n3y62gvdiqazgqbpfb9pdxwjvrjaagzs46ihsl6h6k18d7qmcw6bxiv30jkm3b6alb6p0l48jrym12sksx23am9bmibx45jwiq2"; -======= -======= ->>>>>>> nodePackages: meguca: 1.0.7 update version = "0.14.0"; src = fetchurl { url = "https://registry.npmjs.org/json-server/-/json-server-0.14.0.tgz"; sha512 = "2h1d9wf557i5nxbh5fygbgjd7vywandxnm7cpwyxnzmxqw8mvrnsmcj1m87b2zlxlpvigwq8jqc7igshb0zpfkw1bjs4fskpl0m25gi"; -<<<<<<< HEAD ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 -======= ->>>>>>> nodePackages: meguca: 1.0.7 update }; dependencies = [ sources."accepts-1.3.5" @@ -37183,7 +35729,7 @@ in sources."aws-sign2-0.7.0" sources."aws4-1.7.0" sources."basic-auth-2.0.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."body-parser-1.18.3" sources."boxen-1.3.0" sources."bytes-3.0.0" @@ -37199,12 +35745,12 @@ in sources."color-convert-1.9.2" sources."color-name-1.1.1" sources."combined-stream-1.0.6" - (sources."compressible-2.0.14" // { + sources."compressible-2.0.14" + (sources."compression-1.7.2" // { dependencies = [ sources."mime-db-1.34.0" ]; }) - sources."compression-1.7.2" sources."configstore-3.1.2" sources."connect-pause-0.1.1" sources."content-disposition-0.5.2" @@ -37235,16 +35781,19 @@ in sources."execa-0.7.0" (sources."express-4.16.3" // { dependencies = [ - sources."body-parser-1.18.2" - (sources."http-errors-1.6.2" // { + (sources."body-parser-1.18.2" // { dependencies = [ - sources."depd-1.1.1" sources."setprototypeof-1.0.3" ]; }) sources."iconv-lite-0.4.19" sources."qs-6.5.1" - sources."raw-body-2.3.2" + (sources."raw-body-2.3.2" // { + dependencies = [ + sources."depd-1.1.1" + sources."http-errors-1.6.2" + ]; + }) sources."statuses-1.4.0" ]; }) @@ -37257,11 +35806,7 @@ in sources."extsprintf-1.3.0" sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" - (sources."finalhandler-1.1.1" // { - dependencies = [ - sources."statuses-1.4.0" - ]; - }) + sources."finalhandler-1.1.1" sources."find-up-2.1.0" sources."forever-agent-0.6.1" sources."form-data-2.3.2" @@ -37368,11 +35913,7 @@ in sources."semver-5.5.0" sources."semver-compare-1.0.0" sources."semver-diff-2.1.0" - (sources."send-0.16.2" // { - dependencies = [ - sources."statuses-1.4.0" - ]; - }) + sources."send-0.16.2" sources."serve-static-1.13.2" sources."server-destroy-1.0.1" sources."set-blocking-2.0.0" @@ -37400,7 +35941,7 @@ in sources."update-notifier-2.5.0" sources."url-parse-lax-1.0.0" sources."utils-merge-1.0.1" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."vary-1.1.2" sources."verror-1.10.0" sources."which-1.3.1" @@ -37408,8 +35949,6 @@ in sources."widest-line-2.0.0" (sources."wrap-ansi-2.1.0" // { dependencies = [ - sources."ansi-regex-2.1.1" - sources."is-fullwidth-code-point-1.0.0" sources."string-width-1.0.2" sources."strip-ansi-3.0.1" ]; @@ -37418,7 +35957,12 @@ in sources."xdg-basedir-3.0.0" sources."y18n-3.2.1" sources."yallist-2.1.2" - sources."yargs-10.1.2" + (sources."yargs-10.1.2" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."is-fullwidth-code-point-1.0.0" + ]; + }) sources."yargs-parser-8.1.0" ]; buildInputs = globalBuildInputs; @@ -37436,7 +35980,7 @@ in version = "3.12.0"; src = fetchurl { url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz"; - sha512 = "PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A=="; + sha512 = "3f8k2gvi3gnj9gpr3dnm5n5vpy2w68pshqk4hajlsmkb37ky30cnqza82l8sq153zx1nk67gizcm1ngmvlajw53hkwg4g96gir7d2rw"; }; dependencies = [ sources."argparse-1.0.10" @@ -37458,11 +36002,7 @@ in version = "2.0.4"; src = fetchurl { url = "https://registry.npmjs.org/karma/-/karma-2.0.4.tgz"; -<<<<<<< HEAD - sha512 = "32yhTwoi6BZgJZhR78GwhzyFABbYG/1WwQqYgY7Vh96Demvua2jM3+FyRltIMTUH/Kd5xaQvDw2L7jTvkYFeXg=="; -======= sha512 = "1g5x0cixwsfx2qd1wps9ibrlzy0fd9i91dlcwp1vz66hszfddx87pl7sn78360aq5bgs6yq2q08ag47n30yylcq4mh1ds12197s2v6z"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; dependencies = [ sources."accepts-1.3.5" @@ -37472,16 +36012,11 @@ in sources."ajv-5.5.2" (sources."amqplib-0.5.2" // { dependencies = [ - sources."isarray-0.0.1" sources."readable-stream-1.1.14" - sources."string_decoder-0.10.31" ]; }) sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" -<<<<<<< HEAD - sources."anymatch-2.0.0" -======= (sources."anymatch-2.0.0" // { dependencies = [ sources."is-accessor-descriptor-1.0.0" @@ -37490,7 +36025,6 @@ in sources."is-extendable-1.0.1" ]; }) ->>>>>>> nodePackages: meguca: 1.0.7 update sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" @@ -37510,38 +36044,28 @@ in sources."aws4-1.7.0" (sources."axios-0.15.3" // { dependencies = [ - sources."follow-redirects-1.0.0" + sources."debug-2.6.9" ]; }) sources."backo2-1.0.2" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ -<<<<<<< HEAD - sources."define-property-1.0.0" -======= (sources."define-property-1.0.0" // { dependencies = [ sources."kind-of-6.0.2" ]; }) sources."kind-of-3.2.2" ->>>>>>> nodePackages: meguca: 1.0.7 update ]; }) sources."base64-arraybuffer-0.1.5" sources."base64id-1.0.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."better-assert-1.0.2" sources."binary-extensions-1.11.0" sources."bitsyntax-0.0.4" - (sources."bl-1.1.2" // { - dependencies = [ - sources."process-nextick-args-1.0.7" - sources."readable-stream-2.0.6" - sources."string_decoder-0.10.31" - ]; - }) + sources."bl-1.1.2" sources."blob-0.0.4" sources."bluebird-3.5.1" sources."body-parser-1.18.3" @@ -37549,14 +36073,9 @@ in sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { dependencies = [ -<<<<<<< HEAD - sources."extend-shallow-2.0.1" - sources."is-extendable-0.1.1" -======= sources."is-accessor-descriptor-1.0.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" ->>>>>>> nodePackages: meguca: 1.0.7 update ]; }) sources."buffer-more-ints-0.0.2" @@ -37566,9 +36085,6 @@ in sources."callsite-1.0.0" sources."caseless-0.12.0" sources."chalk-1.1.3" -<<<<<<< HEAD - sources."chokidar-2.0.4" -======= (sources."chokidar-2.0.4" // { dependencies = [ sources."define-property-1.0.0" @@ -37586,35 +36102,14 @@ in }) sources."is-descriptor-0.1.6" sources."is-extendable-0.1.1" - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) sources."kind-of-3.2.2" sources."source-map-0.5.7" ]; }) ->>>>>>> nodePackages: meguca: 1.0.7 update sources."circular-json-0.5.4" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" -<<<<<<< HEAD - (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" -======= ->>>>>>> nodePackages: meguca: 1.0.7 update ]; }) sources."co-4.6.0" @@ -37622,12 +36117,16 @@ in sources."colors-1.3.0" sources."combine-lists-1.0.1" sources."combined-stream-1.0.6" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."component-bind-1.0.0" sources."component-emitter-1.2.1" sources."component-inherit-0.0.3" sources."concat-map-0.0.1" - sources."connect-3.6.6" + (sources."connect-3.6.6" // { + dependencies = [ + sources."statuses-1.3.1" + ]; + }) sources."content-type-1.0.4" sources."cookie-0.3.1" sources."copy-descriptor-0.1.1" @@ -37676,56 +36175,23 @@ in dependencies = [ sources."array-unique-0.2.1" sources."braces-0.1.5" -<<<<<<< HEAD - ]; - }) - (sources."expand-brackets-2.1.4" // { - dependencies = [ - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."is-extendable-0.1.1" - sources."kind-of-5.1.0" - ]; - }) - (sources."expand-range-0.1.1" // { - dependencies = [ -======= ->>>>>>> nodePackages: meguca: 1.0.7 update sources."is-number-0.1.1" sources."repeat-string-0.2.2" ]; }) -<<<<<<< HEAD -======= (sources."expand-brackets-2.1.4" // { dependencies = [ sources."define-property-0.2.5" ]; }) sources."expand-range-0.1.1" ->>>>>>> nodePackages: meguca: 1.0.7 update sources."extend-3.0.1" sources."extend-shallow-3.0.2" (sources."extglob-2.0.4" // { dependencies = [ sources."define-property-1.0.0" sources."extend-shallow-2.0.1" -<<<<<<< HEAD - sources."is-extendable-0.1.1" -======= sources."kind-of-5.1.0" ->>>>>>> nodePackages: meguca: 1.0.7 update ]; }) sources."extsprintf-1.3.0" @@ -37733,28 +36199,9 @@ in sources."fast-json-stable-stringify-2.0.0" sources."fast-levenshtein-2.0.6" sources."file-uri-to-path-1.0.0" -<<<<<<< HEAD - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - sources."is-extendable-0.1.1" - ]; - }) - (sources."finalhandler-1.1.0" // { - dependencies = [ - sources."statuses-1.3.1" - ]; - }) - (sources."follow-redirects-1.5.0" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) -======= sources."fill-range-4.0.0" sources."finalhandler-1.1.0" sources."follow-redirects-1.5.0" ->>>>>>> nodePackages: meguca: 1.0.7 update sources."for-in-1.0.2" sources."forever-agent-0.6.1" sources."form-data-2.3.2" @@ -37763,14 +36210,16 @@ in sources."fsevents-1.2.4" (sources."ftp-0.3.10" // { dependencies = [ - sources."isarray-0.0.1" sources."readable-stream-1.1.14" - sources."string_decoder-0.10.31" ]; }) sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" - sources."get-uri-2.0.2" + (sources."get-uri-2.0.2" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) sources."get-value-2.0.6" sources."getpass-0.1.7" sources."glob-7.1.2" @@ -37779,55 +36228,28 @@ in sources."is-glob-3.1.0" ]; }) -<<<<<<< HEAD -======= - sources."get-value-2.0.6" - sources."getpass-0.1.7" - sources."glob-7.1.2" - (sources."glob-parent-3.1.0" // { - dependencies = [ - sources."is-glob-3.1.0" - ]; - }) ->>>>>>> nodePackages: meguca: 1.0.7 update sources."graceful-fs-4.1.11" sources."har-schema-2.0.0" sources."har-validator-5.0.3" sources."has-ansi-2.0.0" - (sources."has-binary2-1.0.3" // { - dependencies = [ - sources."isarray-2.0.1" - ]; - }) + sources."has-binary2-1.0.3" sources."has-cors-1.1.0" sources."has-value-1.0.0" -<<<<<<< HEAD - (sources."has-values-1.0.0" // { - dependencies = [ - sources."kind-of-4.0.0" - ]; - }) -======= sources."has-values-1.0.0" ->>>>>>> nodePackages: meguca: 1.0.7 update sources."hawk-3.1.3" sources."hipchat-notifier-1.1.0" sources."hoek-2.16.3" sources."http-errors-1.6.3" - sources."http-proxy-1.17.0" - (sources."http-proxy-agent-2.1.0" // { + (sources."http-proxy-1.17.0" // { dependencies = [ sources."debug-3.1.0" ]; }) + sources."http-proxy-agent-2.1.0" sources."http-signature-1.2.0" sources."httpntlm-1.6.1" sources."httpreq-0.4.24" - (sources."https-proxy-agent-2.2.1" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) + sources."https-proxy-agent-2.2.1" sources."iconv-lite-0.4.23" sources."indexof-0.0.1" sources."inflection-1.12.0" @@ -37844,16 +36266,11 @@ in sources."is-glob-4.0.0" sources."is-my-ip-valid-1.0.0" sources."is-my-json-valid-2.17.2" -<<<<<<< HEAD (sources."is-number-3.0.0" // { dependencies = [ sources."kind-of-3.2.2" ]; }) -======= - sources."is-number-4.0.0" - sources."is-odd-2.0.0" ->>>>>>> nodePackages: meguca: 1.0.7 update sources."is-plain-object-2.0.4" sources."is-property-1.0.2" sources."is-stream-1.1.0" @@ -37872,49 +36289,42 @@ in sources."kind-of-6.0.2" sources."levn-0.3.0" sources."libbase64-0.1.0" - (sources."libmime-3.0.0" // { - dependencies = [ - sources."iconv-lite-0.4.15" - ]; - }) + sources."libmime-3.0.0" sources."libqp-1.1.0" sources."lodash-4.17.10" sources."lodash.debounce-4.0.8" -<<<<<<< HEAD (sources."log4js-2.10.0" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) - (sources."loggly-1.1.1" // { -======= - (sources."log4js-2.9.0" // { ->>>>>>> nodePackages: meguca: 1.0.7 update dependencies = [ sources."assert-plus-0.2.0" sources."aws-sign2-0.6.0" sources."caseless-0.11.0" + sources."debug-3.1.0" + sources."follow-redirects-1.0.0" sources."form-data-2.0.0" sources."har-validator-2.0.6" sources."http-signature-1.1.1" + sources."iconv-lite-0.4.15" + sources."isarray-0.0.1" + sources."process-nextick-args-1.0.7" sources."qs-6.2.3" + sources."readable-stream-2.0.6" sources."request-2.75.0" + sources."socks-1.1.9" + sources."string_decoder-0.10.31" sources."tunnel-agent-0.4.3" ]; }) + sources."loggly-1.1.1" sources."lru-cache-4.1.3" sources."mailcomposer-4.0.1" (sources."mailgun-js-0.18.1" // { dependencies = [ - sources."debug-3.1.0" + sources."form-data-2.3.2" ]; }) sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."media-typer-0.3.0" -<<<<<<< HEAD - sources."micromatch-3.1.10" -======= (sources."micromatch-3.1.10" // { dependencies = [ (sources."is-accessor-descriptor-0.1.6" // { @@ -37931,7 +36341,6 @@ in sources."is-extendable-0.1.1" ]; }) ->>>>>>> nodePackages: meguca: 1.0.7 update sources."mime-1.6.0" sources."mime-db-1.33.0" sources."mime-types-2.1.18" @@ -37941,19 +36350,11 @@ in sources."mkdirp-0.5.1" sources."ms-2.0.0" sources."nan-2.10.0" -<<<<<<< HEAD sources."nanomatch-1.2.13" -======= - sources."nanomatch-1.2.9" ->>>>>>> nodePackages: meguca: 1.0.7 update sources."negotiator-0.6.1" sources."netmask-1.0.6" sources."node-uuid-1.4.8" - (sources."nodemailer-2.7.2" // { - dependencies = [ - sources."socks-1.1.9" - ]; - }) + sources."nodemailer-2.7.2" sources."nodemailer-direct-transport-3.3.2" sources."nodemailer-fetch-1.6.0" sources."nodemailer-shared-1.1.0" @@ -37963,23 +36364,7 @@ in sources."normalize-path-2.1.1" sources."oauth-sign-0.8.2" sources."object-component-0.0.3" -<<<<<<< HEAD - (sources."object-copy-0.1.0" // { - dependencies = [ - sources."define-property-0.2.5" - sources."is-accessor-descriptor-0.1.6" - sources."is-data-descriptor-0.1.4" - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) - sources."kind-of-3.2.2" - ]; - }) -======= sources."object-copy-0.1.0" ->>>>>>> nodePackages: meguca: 1.0.7 update sources."object-visit-1.0.1" sources."object.pick-1.3.0" sources."on-finished-2.3.0" @@ -37991,11 +36376,7 @@ in }) sources."optionator-0.8.2" sources."os-tmpdir-1.0.2" - (sources."pac-proxy-agent-2.0.2" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) + sources."pac-proxy-agent-2.0.2" sources."pac-resolver-3.0.0" sources."parseqs-0.0.5" sources."parseuri-0.0.5" @@ -38015,11 +36396,7 @@ in sources."prelude-ls-1.1.2" sources."process-nextick-args-2.0.0" sources."promisify-call-2.0.4" - (sources."proxy-agent-3.0.0" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) + sources."proxy-agent-3.0.0" sources."proxy-from-env-1.0.0" sources."pseudomap-1.0.2" sources."punycode-1.4.1" @@ -38047,23 +36424,12 @@ in sources."safer-buffer-2.1.2" sources."semver-5.5.0" sources."set-immediate-shim-1.0.1" -<<<<<<< HEAD - (sources."set-value-2.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - sources."is-extendable-0.1.1" - ]; - }) -======= sources."set-value-2.0.0" ->>>>>>> nodePackages: meguca: 1.0.7 update sources."setprototypeof-1.1.0" sources."slack-node-0.2.0" sources."smart-buffer-1.1.15" sources."smtp-connection-2.12.0" (sources."snapdragon-0.8.2" // { -<<<<<<< HEAD -======= dependencies = [ (sources."define-property-0.2.5" // { dependencies = [ @@ -38078,44 +36444,15 @@ in sources."snapdragon-util-3.0.1" sources."sntp-1.0.9" (sources."socket.io-2.0.4" // { ->>>>>>> nodePackages: meguca: 1.0.7 update dependencies = [ - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."is-extendable-0.1.1" - sources."kind-of-5.1.0" - sources."source-map-0.5.7" + sources."isarray-2.0.1" ]; }) - (sources."snapdragon-node-2.1.1" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) - (sources."snapdragon-util-3.0.1" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."sntp-1.0.9" - sources."socket.io-2.0.4" sources."socket.io-adapter-1.1.1" sources."socket.io-client-2.0.4" (sources."socket.io-parser-3.1.3" // { dependencies = [ sources."debug-3.1.0" - sources."isarray-2.0.1" ]; }) sources."socks-1.1.10" @@ -38123,27 +36460,6 @@ in sources."source-map-0.6.1" sources."source-map-resolve-0.5.2" sources."source-map-url-0.4.0" -<<<<<<< HEAD - sources."split-string-3.1.0" - sources."sshpk-1.14.2" - (sources."static-extend-0.1.2" // { - dependencies = [ - sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) -======= (sources."split-string-3.1.0" // { dependencies = [ sources."extend-shallow-3.0.2" @@ -38152,13 +36468,8 @@ in }) sources."sshpk-1.14.2" sources."static-extend-0.1.2" ->>>>>>> nodePackages: meguca: 1.0.7 update sources."statuses-1.5.0" - (sources."streamroller-0.7.0" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) + sources."streamroller-0.7.0" sources."string_decoder-1.1.1" sources."stringstream-0.0.6" sources."strip-ansi-3.0.1" @@ -38167,15 +36478,7 @@ in sources."timespan-2.3.0" sources."tmp-0.0.33" sources."to-array-0.1.4" -<<<<<<< HEAD - (sources."to-object-path-0.3.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) -======= sources."to-object-path-0.3.0" ->>>>>>> nodePackages: meguca: 1.0.7 update sources."to-regex-3.0.2" sources."to-regex-range-2.1.1" sources."tough-cookie-2.3.4" @@ -38188,11 +36491,6 @@ in sources."underscore-1.7.0" (sources."union-value-1.0.0" // { dependencies = [ -<<<<<<< HEAD - sources."extend-shallow-2.0.1" - sources."is-extendable-0.1.1" -======= ->>>>>>> nodePackages: meguca: 1.0.7 update sources."set-value-0.4.3" ]; }) @@ -38204,23 +36502,15 @@ in sources."isobject-2.1.0" ]; }) -<<<<<<< HEAD - sources."has-values-0.1.4" -======= ->>>>>>> nodePackages: meguca: 1.0.7 update ]; }) sources."upath-1.1.0" sources."urix-0.1.0" -<<<<<<< HEAD - sources."use-3.1.0" -======= (sources."use-3.1.0" // { dependencies = [ sources."kind-of-6.0.2" ]; }) ->>>>>>> nodePackages: meguca: 1.0.7 update (sources."useragent-2.2.1" // { dependencies = [ sources."lru-cache-2.2.4" @@ -38228,7 +36518,7 @@ in }) sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."uws-9.14.0" sources."verror-1.10.0" sources."void-elements-2.0.1" @@ -38270,13 +36560,18 @@ in sources."body-parser-1.13.3" sources."bytes-2.1.0" sources."commander-2.6.0" - (sources."compressible-2.0.14" // { + sources."compressible-2.0.14" + sources."compression-1.5.2" + (sources."connect-2.30.2" // { dependencies = [ - sources."mime-db-1.34.0" + sources."accepts-1.2.13" + sources."escape-html-1.0.3" + sources."ms-0.7.2" + sources."negotiator-0.5.3" + sources."send-0.13.2" + sources."vary-1.1.2" ]; }) - sources."compression-1.5.2" - sources."connect-2.30.2" sources."connect-restreamer-1.0.3" sources."connect-timeout-1.6.2" sources."content-disposition-0.5.0" @@ -38288,26 +36583,34 @@ in sources."crc-3.3.0" sources."csrf-3.0.6" sources."csurf-1.8.3" - sources."debug-2.2.0" + (sources."debug-2.2.0" // { + dependencies = [ + sources."ms-0.7.1" + ]; + }) sources."depd-1.0.1" sources."destroy-1.0.4" sources."ee-first-1.1.1" - (sources."errorhandler-1.4.3" // { - dependencies = [ - sources."accepts-1.3.5" - sources."escape-html-1.0.3" - sources."negotiator-0.6.1" - ]; - }) + sources."errorhandler-1.4.3" sources."escape-html-1.0.2" sources."etag-1.7.0" - sources."express-3.21.2" - (sources."express-session-1.11.3" // { + (sources."express-3.21.2" // { dependencies = [ + sources."accepts-1.3.5" + sources."destroy-1.0.3" + sources."mime-db-1.34.0" + sources."ms-2.0.0" + sources."negotiator-0.6.1" + sources."statuses-1.2.1" sources."uid-safe-2.0.0" ]; }) - sources."finalhandler-0.4.0" + sources."express-session-1.11.3" + (sources."finalhandler-0.4.0" // { + dependencies = [ + sources."escape-html-1.0.2" + ]; + }) sources."forwarded-0.1.2" sources."fresh-0.3.0" sources."http-errors-1.3.1" @@ -38320,8 +36623,6 @@ in (sources."method-override-2.3.10" // { dependencies = [ sources."debug-2.6.9" - sources."ms-2.0.0" - sources."vary-1.1.2" ]; }) sources."methods-1.1.2" @@ -38370,26 +36671,15 @@ in sources."sax-1.2.4" (sources."send-0.13.0" // { dependencies = [ - sources."destroy-1.0.3" - sources."statuses-1.2.1" - ]; - }) - (sources."serve-favicon-2.3.2" // { - dependencies = [ - sources."ms-0.7.2" - ]; - }) - (sources."serve-index-1.7.3" // { - dependencies = [ - sources."escape-html-1.0.3" + sources."ms-0.7.1" ]; }) + sources."serve-favicon-2.3.2" + sources."serve-index-1.7.3" (sources."serve-static-1.10.3" // { dependencies = [ sources."depd-1.1.2" - sources."escape-html-1.0.3" - sources."send-0.13.2" - sources."statuses-1.2.1" + sources."ms-0.7.1" ]; }) sources."statuses-1.5.0" @@ -38420,7 +36710,7 @@ in version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/lcov-result-merger/-/lcov-result-merger-3.0.0.tgz"; - sha512 = "6Yb98XarLXKNjGvVX9LNdZNeE22VsTCUZixtAqrO5WLjM9Mtyybn6fSI2m3A4drSMvSh8WYALuT6S5c/XnBbqA=="; + sha512 = "2l5nw2y7yblpyp45q06dwd1yhrd5np1q1nxm27lx7kjdjrdscry6qp5rsm04v9ccsa31ccmdl9mx4vmrp95zmbbij6p4bdbfvqzv1p9"; }; dependencies = [ sources."append-buffer-1.0.2" @@ -38515,7 +36805,7 @@ in version = "2.5.2"; src = fetchurl { url = "https://registry.npmjs.org/leetcode-cli/-/leetcode-cli-2.5.2.tgz"; - sha512 = "KneaqL2/SAfJQpxR1yheLrnB10f8vwJJbVBA4vxtRl6aENbO+JKsJSgE1cZvO/4isD+MPI7C5HPjJbL5+MOmnw=="; + sha512 = "2gsdhzqz6r2bqvkwk18wg4c7yq25zivdz3da1184nn95y6fsq89lpj6dpyf4h2hdm4h5gzw8zbw3f9fbqldflcw8b4hfj5zpnl9lxra"; }; dependencies = [ sources."abab-1.0.4" @@ -38531,19 +36821,18 @@ in sources."aws-sign2-0.7.0" sources."aws4-1.7.0" sources."balanced-match-1.0.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."boolbase-1.0.0" sources."boom-4.3.1" sources."brace-expansion-1.1.11" sources."camelcase-2.1.1" sources."caseless-0.12.0" - (sources."chalk-2.4.1" // { + sources."chalk-2.4.1" + (sources."cheerio-0.20.0" // { dependencies = [ - sources."ansi-styles-3.2.1" - sources."supports-color-5.4.0" + sources."domelementtype-1.1.3" ]; }) - sources."cheerio-0.20.0" sources."cli-cursor-2.1.0" sources."cli-spinners-1.3.1" sources."cliui-3.2.0" @@ -38571,11 +36860,7 @@ in sources."deep-equal-0.2.2" sources."deep-is-0.1.3" sources."delayed-stream-1.0.0" - (sources."dom-serializer-0.1.0" // { - dependencies = [ - sources."domelementtype-1.1.3" - ]; - }) + sources."dom-serializer-0.1.0" sources."domelementtype-1.3.0" sources."domhandler-2.3.0" sources."domutils-1.5.1" @@ -38659,7 +36944,12 @@ in sources."once-1.4.0" sources."onetime-2.0.1" sources."optionator-0.8.2" - sources."ora-1.4.0" + (sources."ora-1.4.0" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."supports-color-5.4.0" + ]; + }) sources."os-locale-1.4.0" sources."p-finally-1.0.0" sources."p-limit-1.3.0" @@ -38672,7 +36962,11 @@ in sources."performance-now-2.1.0" sources."pkginfo-0.4.1" sources."prelude-ls-1.1.2" - sources."prompt-1.0.0" + (sources."prompt-1.0.0" // { + dependencies = [ + sources."async-0.9.2" + ]; + }) sources."pseudomap-1.0.2" sources."psl-1.1.28" sources."punycode-1.4.1" @@ -38719,12 +37013,8 @@ in sources."tweetnacl-0.14.5" sources."type-check-0.3.2" sources."underscore-1.8.3" - (sources."utile-0.3.0" // { - dependencies = [ - sources."async-0.9.2" - ]; - }) - sources."uuid-3.3.0" + sources."utile-0.3.0" + sources."uuid-3.3.2" sources."verror-1.10.0" sources."webidl-conversions-2.0.1" sources."whatwg-url-compat-0.6.5" @@ -38747,17 +37037,14 @@ in (sources."yargs-10.0.3" // { dependencies = [ sources."ansi-regex-3.0.0" + sources."camelcase-4.1.0" sources."is-fullwidth-code-point-2.0.0" sources."os-locale-2.1.0" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" ]; }) - (sources."yargs-parser-8.1.0" // { - dependencies = [ - sources."camelcase-4.1.0" - ]; - }) + sources."yargs-parser-8.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -38774,7 +37061,7 @@ in version = "2.11.0"; src = fetchurl { url = "https://registry.npmjs.org/lerna/-/lerna-2.11.0.tgz"; - sha512 = "kgM6zwe2P2tR30MYvgiLLW+9buFCm6E7o8HnRlhTgm70WVBvXVhydqv+q/MF2HrVZkCawfVtCfetyQmtd4oHhQ=="; + sha512 = "22hg2kpml4wkbgp15nzbhcs81kdaynq0prspzmbfrr5hpbga1cz8vl2adc4dry1lcxs36s2w5pbsvrdic4bw623vx8nngxn0z7kl0wj"; }; dependencies = [ sources."JSONStream-1.3.3" @@ -38798,11 +37085,7 @@ in sources."builtin-modules-1.1.1" sources."byline-5.0.0" sources."camelcase-1.2.1" - (sources."camelcase-keys-2.1.0" // { - dependencies = [ - sources."camelcase-2.1.1" - ]; - }) + sources."camelcase-keys-2.1.0" sources."capture-stack-trace-1.0.0" sources."center-align-0.1.3" sources."chalk-2.4.1" @@ -38810,11 +37093,7 @@ in sources."ci-info-1.1.3" sources."cli-cursor-2.1.0" sources."cli-width-2.2.0" - (sources."cliui-2.1.0" // { - dependencies = [ - sources."wordwrap-0.0.2" - ]; - }) + sources."cliui-2.1.0" sources."clone-1.0.4" sources."cmd-shim-2.0.2" sources."code-point-at-1.1.0" @@ -38826,15 +37105,42 @@ in sources."concat-map-0.0.1" sources."concat-stream-1.6.2" sources."console-control-strings-1.1.0" - sources."conventional-changelog-1.1.24" + (sources."conventional-changelog-1.1.24" // { + dependencies = [ + sources."camelcase-4.1.0" + sources."map-obj-1.0.1" + sources."meow-3.7.0" + ]; + }) sources."conventional-changelog-angular-1.6.6" sources."conventional-changelog-atom-0.2.8" - sources."conventional-changelog-cli-1.3.22" + (sources."conventional-changelog-cli-1.3.22" // { + dependencies = [ + sources."camelcase-2.1.1" + sources."camelcase-keys-4.2.0" + sources."find-up-1.1.2" + sources."indent-string-3.2.0" + sources."load-json-file-1.1.0" + sources."map-obj-2.0.0" + sources."minimist-1.2.0" + sources."parse-json-4.0.0" + sources."path-exists-2.1.0" + sources."path-type-1.1.0" + sources."pify-2.3.0" + sources."read-pkg-1.1.0" + sources."read-pkg-up-3.0.0" + sources."redent-2.0.0" + sources."strip-bom-3.0.0" + sources."strip-indent-2.0.0" + sources."trim-newlines-2.0.0" + sources."wordwrap-0.0.2" + sources."yargs-3.10.0" + ]; + }) sources."conventional-changelog-codemirror-0.3.8" (sources."conventional-changelog-core-2.0.11" // { dependencies = [ - sources."load-json-file-1.1.0" - sources."read-pkg-1.1.0" + sources."meow-4.0.1" ]; }) sources."conventional-changelog-ember-0.3.12" @@ -38877,29 +37183,28 @@ in sources."find-up-2.1.0" sources."fs-extra-4.0.3" sources."fs.realpath-1.0.0" - (sources."gauge-2.7.4" // { - dependencies = [ - sources."is-fullwidth-code-point-1.0.0" - sources."string-width-1.0.2" - ]; - }) + sources."gauge-2.7.4" sources."get-caller-file-1.0.2" - (sources."get-pkg-repo-1.4.0" // { - dependencies = [ - sources."meow-3.7.0" - sources."minimist-1.2.0" - ]; - }) + sources."get-pkg-repo-1.4.0" sources."get-port-3.2.0" sources."get-stdin-4.0.1" sources."get-stream-3.0.0" - sources."git-raw-commits-1.3.6" + (sources."git-raw-commits-1.3.6" // { + dependencies = [ + sources."read-pkg-3.0.0" + sources."read-pkg-up-3.0.0" + ]; + }) sources."git-remote-origin-url-2.0.0" sources."git-semver-tags-1.3.6" sources."gitconfiglocal-1.0.0" sources."glob-7.1.2" sources."glob-parent-3.1.0" - sources."globby-6.1.0" + (sources."globby-6.1.0" // { + dependencies = [ + sources."pify-2.3.0" + ]; + }) sources."got-6.7.1" sources."graceful-fs-4.1.11" sources."handlebars-4.0.11" @@ -38948,7 +37253,6 @@ in (sources."load-json-file-4.0.0" // { dependencies = [ sources."parse-json-4.0.0" - sources."pify-3.0.0" sources."strip-bom-3.0.0" ]; }) @@ -38961,24 +37265,17 @@ in sources."loud-rejection-1.6.0" sources."lowercase-keys-1.0.1" sources."lru-cache-4.1.3" - (sources."make-dir-1.3.0" // { - dependencies = [ - sources."pify-3.0.0" - ]; - }) + sources."make-dir-1.3.0" sources."map-obj-1.0.1" sources."mem-1.1.0" (sources."meow-4.0.1" // { dependencies = [ - sources."camelcase-4.1.0" - sources."camelcase-keys-4.2.0" - sources."indent-string-3.2.0" - sources."map-obj-2.0.0" - sources."minimist-1.2.0" - sources."read-pkg-up-3.0.0" - sources."redent-2.0.0" - sources."strip-indent-2.0.0" - sources."trim-newlines-2.0.0" + sources."find-up-2.1.0" + sources."load-json-file-4.0.0" + sources."path-exists-3.0.0" + sources."path-type-3.0.0" + sources."pify-3.0.0" + sources."read-pkg-3.0.0" ]; }) sources."mimic-fn-1.2.0" @@ -38991,31 +37288,36 @@ in sources."mute-stream-0.0.7" sources."normalize-package-data-2.4.0" sources."npm-run-path-2.0.2" - sources."npmlog-4.1.2" + (sources."npmlog-4.1.2" // { + dependencies = [ + sources."is-fullwidth-code-point-1.0.0" + sources."string-width-1.0.2" + ]; + }) sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" sources."once-1.4.0" sources."onetime-2.0.1" sources."optimist-0.6.1" - (sources."os-locale-2.1.0" // { - dependencies = [ - sources."execa-0.7.0" - ]; - }) + sources."os-locale-2.1.0" sources."os-tmpdir-1.0.2" sources."p-finally-1.0.0" sources."p-limit-1.3.0" sources."p-locate-2.0.0" sources."p-try-1.0.0" - sources."package-json-4.0.1" + (sources."package-json-4.0.1" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) sources."parse-github-repo-url-1.4.1" sources."parse-json-2.2.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-type-1.1.0" - sources."pify-2.3.0" + sources."path-type-3.0.0" + sources."pify-3.0.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."prepend-http-1.0.4" @@ -39023,26 +37325,10 @@ in sources."pseudomap-1.0.2" sources."q-1.5.1" sources."quick-lru-1.1.0" - (sources."rc-1.2.8" // { - dependencies = [ - sources."minimist-1.2.0" - ]; - }) + sources."rc-1.2.8" sources."read-cmd-shim-1.0.1" - (sources."read-pkg-3.0.0" // { - dependencies = [ - sources."path-type-3.0.0" - sources."pify-3.0.0" - ]; - }) - (sources."read-pkg-up-1.0.1" // { - dependencies = [ - sources."find-up-1.1.2" - sources."load-json-file-1.1.0" - sources."path-exists-2.1.0" - sources."read-pkg-1.1.0" - ]; - }) + sources."read-pkg-3.0.0" + sources."read-pkg-up-1.0.1" sources."readable-stream-2.3.6" sources."redent-1.0.0" sources."registry-auth-token-3.3.2" @@ -39073,12 +37359,7 @@ in sources."spdx-license-ids-3.0.0" sources."split-1.0.1" sources."split2-2.2.0" - (sources."string-width-2.1.1" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."strip-ansi-4.0.0" - ]; - }) + sources."string-width-2.1.1" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-bom-2.0.0" @@ -39094,8 +37375,7 @@ in sources."temp-dir-1.0.0" (sources."temp-write-3.4.0" // { dependencies = [ - sources."pify-3.0.0" - sources."uuid-3.3.0" + sources."uuid-3.3.2" ]; }) sources."tempfile-1.1.1" @@ -39110,7 +37390,6 @@ in (sources."uglify-js-2.8.29" // { dependencies = [ sources."source-map-0.5.7" - sources."yargs-3.10.0" ]; }) sources."uglify-to-browserify-1.0.2" @@ -39126,19 +37405,10 @@ in sources."wide-align-1.1.3" sources."window-size-0.1.0" sources."wordwrap-0.0.3" - (sources."wrap-ansi-2.1.0" // { - dependencies = [ - sources."is-fullwidth-code-point-1.0.0" - sources."string-width-1.0.2" - ]; - }) + sources."wrap-ansi-2.1.0" sources."wrappy-1.0.2" sources."write-file-atomic-2.3.0" - (sources."write-json-file-2.3.0" // { - dependencies = [ - sources."pify-3.0.0" - ]; - }) + sources."write-json-file-2.3.0" sources."write-pkg-3.2.0" sources."xtend-4.0.1" sources."y18n-3.2.1" @@ -39151,19 +37421,17 @@ in sources."string-width-1.0.2" ]; }) + sources."execa-0.7.0" sources."is-fullwidth-code-point-1.0.0" sources."load-json-file-2.0.0" sources."path-type-2.0.0" + sources."pify-2.3.0" sources."read-pkg-2.0.0" sources."read-pkg-up-2.0.0" sources."strip-bom-3.0.0" ]; }) - (sources."yargs-parser-7.0.0" // { - dependencies = [ - sources."camelcase-4.1.0" - ]; - }) + sources."yargs-parser-7.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -39180,7 +37448,7 @@ in version = "3.0.4"; src = fetchurl { url = "https://registry.npmjs.org/less/-/less-3.0.4.tgz"; - sha512 = "q3SyEnPKbk9zh4l36PGeW2fgynKu+FpbhiUNx/yaiBUQ3V0CbACCgb9FzYWcRgI2DJlP6eI4jc8XPrCTi55YcQ=="; + sha512 = "1qmi7lbjfq3w5ygilwf5sagk463c0j6kj2wsidzh6100v02bpfi05c8kbycf395hrdmmy5ffb5f0rsvkvqyhxw9hxrlyvnafc9b4x5b"; }; dependencies = [ sources."ajv-5.5.2" @@ -39190,7 +37458,7 @@ in sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.7.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."caseless-0.12.0" sources."co-4.6.0" sources."combined-stream-1.0.6" @@ -39237,7 +37505,7 @@ in sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."verror-1.10.0" ]; buildInputs = globalBuildInputs; @@ -39290,16 +37558,16 @@ in sources."array-unique-0.2.1" sources."async-each-1.0.1" sources."balanced-match-1.0.0" - (sources."basic-auth-2.0.0" // { - dependencies = [ - sources."safe-buffer-5.1.1" - ]; - }) + sources."basic-auth-2.0.0" sources."batch-0.6.1" sources."bcryptjs-2.4.3" sources."binary-extensions-1.11.0" sources."brace-expansion-1.1.11" - sources."braces-1.8.5" + (sources."braces-1.8.5" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) sources."chokidar-1.7.0" sources."colors-1.3.0" sources."concat-map-0.0.1" @@ -39331,11 +37599,7 @@ in sources."glob-parent-2.0.0" sources."graceful-fs-4.1.11" sources."http-auth-3.1.3" - (sources."http-errors-1.6.3" // { - dependencies = [ - sources."statuses-1.5.0" - ]; - }) + sources."http-errors-1.6.3" sources."http-parser-js-0.4.13" sources."inherits-2.0.3" sources."is-binary-path-1.0.1" @@ -39363,6 +37627,7 @@ in dependencies = [ sources."debug-2.6.9" sources."ms-2.0.0" + sources."safe-buffer-5.1.1" ]; }) sources."ms-0.7.1" @@ -39384,7 +37649,6 @@ in (sources."randomatic-3.0.0" // { dependencies = [ sources."is-number-4.0.0" - sources."kind-of-6.0.2" ]; }) sources."range-parser-1.2.0" @@ -39419,7 +37683,7 @@ in sources."unpipe-1.0.0" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.0" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."vary-1.1.2" sources."websocket-driver-0.7.0" sources."websocket-extensions-0.1.3" @@ -39439,7 +37703,7 @@ in version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/livedown/-/livedown-2.1.1.tgz"; - sha512 = "C5x12+bwk7m2Sx3U27VZ7h5KP7vIlKfZGCabMi73nBGp0zPHtCaxQTPXDRoX5479EZUvycYJI0aD4h1d4+ds7w=="; + sha512 = "3pnrrz3blfy50s64c4wdj9gjl8zv3p72wd0vmrk86qjdd676g9sj4cwywp356r633csg568pczll7pfb6sxpm0x9fvbk4zhwvdpb70b"; }; dependencies = [ sources."accepts-1.3.5" @@ -39463,13 +37727,17 @@ in sources."balanced-match-1.0.0" sources."base64-arraybuffer-0.1.5" sources."base64id-1.0.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."better-assert-1.0.2" sources."binary-extensions-1.11.0" sources."blob-0.0.4" sources."body-parser-1.18.3" sources."brace-expansion-1.1.11" - sources."braces-1.8.5" + (sources."braces-1.8.5" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) sources."bytes-3.0.0" sources."callsite-1.0.0" sources."caseless-0.12.0" @@ -39494,16 +37762,8 @@ in sources."ee-first-1.1.1" sources."emoji-regex-6.1.1" sources."encodeurl-1.0.2" - (sources."engine.io-3.2.0" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) - (sources."engine.io-client-3.2.1" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) + sources."engine.io-3.2.0" + sources."engine.io-client-3.2.1" sources."engine.io-parser-2.1.2" sources."entities-1.1.1" sources."escape-html-1.0.3" @@ -39512,16 +37772,19 @@ in sources."expand-range-1.8.2" (sources."express-4.16.3" // { dependencies = [ - sources."body-parser-1.18.2" - (sources."http-errors-1.6.2" // { + (sources."body-parser-1.18.2" // { dependencies = [ - sources."depd-1.1.1" sources."setprototypeof-1.0.3" ]; }) sources."iconv-lite-0.4.19" sources."qs-6.5.1" - sources."raw-body-2.3.2" + (sources."raw-body-2.3.2" // { + dependencies = [ + sources."depd-1.1.1" + sources."http-errors-1.6.2" + ]; + }) sources."safe-buffer-5.1.1" sources."statuses-1.4.0" ]; @@ -39533,11 +37796,7 @@ in sources."fast-json-stable-stringify-2.0.0" sources."filename-regex-2.0.1" sources."fill-range-2.2.4" - (sources."finalhandler-1.1.1" // { - dependencies = [ - sources."statuses-1.4.0" - ]; - }) + sources."finalhandler-1.1.1" sources."for-in-1.0.2" sources."for-own-0.1.5" sources."forever-agent-0.6.1" @@ -39552,11 +37811,7 @@ in sources."graceful-fs-4.1.11" sources."har-schema-2.0.0" sources."har-validator-5.0.3" - (sources."has-binary2-1.0.3" // { - dependencies = [ - sources."isarray-2.0.1" - ]; - }) + sources."has-binary2-1.0.3" sources."has-cors-1.1.0" sources."html-entities-1.2.1" sources."http-errors-1.6.3" @@ -39627,7 +37882,6 @@ in (sources."randomatic-3.0.0" // { dependencies = [ sources."is-number-4.0.0" - sources."kind-of-6.0.2" ]; }) sources."range-parser-1.2.0" @@ -39641,31 +37895,19 @@ in sources."request-2.87.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - (sources."send-0.16.2" // { - dependencies = [ - sources."statuses-1.4.0" - ]; - }) + sources."send-0.16.2" sources."serve-static-1.13.2" sources."set-immediate-shim-1.0.1" sources."setprototypeof-1.1.0" (sources."socket.io-2.1.1" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) - sources."socket.io-adapter-1.1.1" - (sources."socket.io-client-2.1.1" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) - (sources."socket.io-parser-3.2.0" // { dependencies = [ sources."debug-3.1.0" sources."isarray-2.0.1" ]; }) + sources."socket.io-adapter-1.1.1" + sources."socket.io-client-2.1.1" + sources."socket.io-parser-3.2.0" sources."sprintf-js-1.0.3" sources."sshpk-1.14.2" sources."statuses-1.5.0" @@ -39680,7 +37922,7 @@ in sources."unpipe-1.0.0" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."vary-1.1.2" sources."verror-1.10.0" sources."ws-3.3.3" @@ -39735,61 +37977,18 @@ in meguca = nodeEnv.buildNodePackage { name = "meguca"; packageName = "meguca"; -<<<<<<< HEAD -<<<<<<< HEAD version = "1.0.8"; src = fetchurl { url = "https://registry.npmjs.org/meguca/-/meguca-1.0.8.tgz"; - sha512 = "6hEfEe5385DL95w4YPo68Y/DzSGo7vyw9/ckHsAMk/qO+GBcbI1pGRVkx0oJQtTdJ7mGSVc+gcVj09sj9auTQg=="; -======= - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/meguca/-/meguca-1.0.5.tgz"; - sha512 = "0lilvxbsrwlmavh8g991m709w8p58h6rcq63izh7l6lsindvbq2w5lrk19ifb8ynqycfyhc7kh67yvkfw42p44i48skk316vjz9k8ry"; ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 -======= - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/meguca/-/meguca-1.0.7.tgz"; - sha512 = "0wj7z2361ijiw98jp6x7xa5z3nn2fk2q1w8bgcw7j4fdw6fyp4hidfkqrcs5zkg7mribwfz22nyh6l08gv04b6r8srqjkrxy9b9ff6y"; ->>>>>>> nodePackages: meguca: 1.0.5 -> 1.0.7 + sha512 = "1197azm4gdx6qy5h4z5fjc6p4kxvm22155cfr0m35lqsv2wc3w8xylk1k01w97pyyqgrvm8476w73zi7bx60f4wyz5r1wvpxq8iy4ga"; }; dependencies = [ - (sources."@gulp-sourcemaps/identity-map-1.0.2" // { - dependencies = [ - sources."readable-stream-2.3.6" - sources."source-map-0.6.1" - sources."string_decoder-1.1.1" - sources."through2-2.0.3" - ]; - }) -<<<<<<< HEAD - (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."accord-0.28.0" // { - dependencies = [ - sources."glob-7.1.2" - sources."minimatch-3.0.4" - sources."semver-5.5.0" - sources."uglify-js-2.8.29" - ]; - }) -======= + sources."@gulp-sourcemaps/identity-map-1.0.2" sources."@gulp-sourcemaps/map-sources-1.0.0" sources."accord-0.28.0" ->>>>>>> nodePackages: meguca: 1.0.7 update sources."acorn-5.7.1" sources."ajv-4.11.8" - (sources."align-text-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) + sources."align-text-0.1.4" sources."almond-0.3.3" sources."amdefine-1.0.1" sources."ansi-colors-1.1.0" @@ -39820,51 +38019,34 @@ in sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ - sources."define-property-1.0.0" + (sources."define-property-1.0.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + sources."kind-of-3.2.2" ]; }) - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."beeper-1.1.1" sources."boom-2.10.1" sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { dependencies = [ + sources."define-property-1.0.0" sources."extend-shallow-2.0.1" + sources."kind-of-3.2.2" ]; }) sources."buffer-equal-1.0.0" sources."cache-base-1.0.1" sources."camelcase-1.2.1" -<<<<<<< HEAD -<<<<<<< HEAD -======= -<<<<<<< HEAD - sources."caniuse-lite-1.0.30000850" -======= - sources."caniuse-lite-1.0.30000851" ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 -======= - sources."caniuse-lite-1.0.30000856" ->>>>>>> nodePackages: meguca: 1.0.7 update sources."caseless-0.12.0" sources."center-align-0.1.3" sources."chalk-1.1.3" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" ]; }) sources."clean-css-4.1.11" @@ -39872,12 +38054,7 @@ in sources."clone-1.0.4" sources."clone-buffer-1.0.0" sources."clone-stats-0.0.1" - (sources."cloneable-readable-1.1.2" // { - dependencies = [ - sources."readable-stream-2.3.6" - sources."string_decoder-1.1.1" - ]; - }) + sources."cloneable-readable-1.1.2" sources."co-4.6.0" sources."collection-visit-1.0.0" sources."color-support-1.1.3" @@ -39896,18 +38073,10 @@ in ]; }) sources."d-1.0.0" - (sources."dashdash-1.14.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."dashdash-1.14.1" sources."dateformat-2.2.0" sources."debug-2.6.9" - (sources."debug-fabulous-1.1.0" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) + sources."debug-fabulous-1.1.0" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" sources."defaults-1.0.3" @@ -39918,28 +38087,9 @@ in sources."detect-file-1.0.0" sources."detect-newline-2.1.0" sources."dom4-2.1.0" -<<<<<<< HEAD - (sources."duplexer2-0.0.2" // { - dependencies = [ - sources."isarray-0.0.1" - sources."readable-stream-1.1.14" - ]; - }) - (sources."duplexify-3.6.0" // { - dependencies = [ - sources."end-of-stream-1.4.1" - sources."once-1.4.0" - sources."readable-stream-2.3.6" - sources."string_decoder-1.1.1" - ]; - }) - sources."ecc-jsbn-0.1.1" -======= sources."duplexer2-0.0.2" sources."duplexify-3.6.0" sources."ecc-jsbn-0.1.1" - sources."electron-to-chromium-1.3.50" ->>>>>>> nodePackages: meguca: 1.0.7 update sources."end-of-stream-0.1.5" sources."errno-0.1.7" sources."es5-ext-0.10.45" @@ -39951,7 +38101,24 @@ in (sources."expand-brackets-2.1.4" // { dependencies = [ sources."define-property-0.2.5" + ]; + }) + sources."expand-tilde-2.0.2" + sources."extend-3.0.1" + sources."extend-shallow-3.0.2" + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" sources."extend-shallow-2.0.1" + sources."kind-of-5.1.0" + ]; + }) + sources."extsprintf-1.3.0" + sources."fancy-log-1.3.2" + sources."fill-range-4.0.0" + sources."find-index-0.1.1" + (sources."findup-sync-2.0.0" // { + dependencies = [ (sources."is-accessor-descriptor-0.1.6" // { dependencies = [ sources."kind-of-3.2.2" @@ -39963,81 +38130,61 @@ in ]; }) sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) - sources."expand-tilde-2.0.2" - sources."extend-3.0.1" - (sources."extend-shallow-3.0.2" // { - dependencies = [ sources."is-extendable-1.0.1" ]; }) - (sources."extglob-2.0.4" // { - dependencies = [ - sources."define-property-1.0.0" - sources."extend-shallow-2.0.1" - ]; - }) - sources."extsprintf-1.3.0" - sources."fancy-log-1.3.2" - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."find-index-0.1.1" - sources."findup-sync-2.0.0" sources."fined-1.1.0" sources."first-chunk-stream-1.0.0" sources."flagged-respawn-1.0.0" - (sources."flush-write-stream-1.0.3" // { - dependencies = [ - sources."readable-stream-2.3.6" - sources."string_decoder-1.1.1" - ]; - }) + sources."flush-write-stream-1.0.3" sources."for-in-1.0.2" sources."for-own-1.0.0" sources."foreach-2.0.5" sources."forever-agent-0.6.1" sources."form-data-2.1.4" sources."fragment-cache-0.2.1" - (sources."fs-mkdirp-stream-1.0.0" // { - dependencies = [ - sources."graceful-fs-4.1.11" - sources."readable-stream-2.3.6" - sources."string_decoder-1.1.1" - sources."through2-2.0.3" - ]; - }) + sources."fs-mkdirp-stream-1.0.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."gaze-0.5.2" sources."get-value-2.0.6" - (sources."getpass-0.1.7" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."getpass-0.1.7" sources."glob-4.5.3" sources."glob-parent-3.1.0" sources."glob-stream-3.1.18" - sources."glob-watcher-0.0.6" + (sources."glob-watcher-0.0.6" // { + dependencies = [ + sources."graceful-fs-1.2.3" + ]; + }) sources."glob2base-0.0.12" sources."global-modules-1.0.0" sources."global-prefix-1.0.2" - (sources."globule-0.1.0" // { + sources."globule-0.1.0" + sources."glogg-1.0.1" + sources."graceful-fs-3.0.11" + (sources."gulp-3.9.1" // { dependencies = [ + sources."clone-0.2.0" sources."glob-3.1.21" - sources."graceful-fs-1.2.3" + sources."has-values-0.1.4" sources."inherits-1.0.2" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."is-extendable-1.0.1" + sources."isarray-0.0.1" sources."minimatch-0.2.14" ]; }) - sources."glogg-1.0.1" - sources."graceful-fs-3.0.11" - sources."gulp-3.9.1" (sources."gulp-clean-css-3.9.4" // { dependencies = [ sources."readable-stream-2.3.6" @@ -40061,19 +38208,25 @@ in sources."arr-union-2.1.0" sources."array-slice-0.2.3" sources."extend-shallow-1.1.4" - sources."kind-of-1.1.0" - sources."plugin-error-0.1.2" + sources."glob-7.1.2" + sources."graceful-fs-4.1.11" + sources."kind-of-3.2.2" + sources."minimatch-3.0.4" + (sources."plugin-error-0.1.2" // { + dependencies = [ + sources."kind-of-1.1.0" + ]; + }) sources."readable-stream-2.3.6" + sources."semver-5.5.0" sources."string_decoder-1.1.1" sources."through2-2.0.3" + sources."uglify-js-2.8.29" ]; }) -<<<<<<< HEAD -======= - sources."gulp-rename-1.3.0" ->>>>>>> nodePackages: meguca: 1.0.7 update (sources."gulp-sourcemaps-2.6.4" // { dependencies = [ + sources."debug-3.1.0" sources."graceful-fs-4.1.11" sources."readable-stream-2.3.6" sources."source-map-0.6.1" @@ -40088,12 +38241,14 @@ in sources."array-slice-0.2.3" sources."clone-2.1.2" sources."clone-stats-1.0.0" + sources."end-of-stream-1.4.1" sources."extend-shallow-1.1.4" sources."glob-7.1.2" sources."glob-stream-6.1.0" sources."graceful-fs-4.1.11" sources."kind-of-1.1.0" sources."minimatch-3.0.4" + sources."once-1.4.0" sources."ordered-read-streams-1.0.1" sources."plugin-error-0.1.2" sources."readable-stream-2.3.6" @@ -40111,19 +38266,21 @@ in sources."readable-stream-2.3.6" sources."string_decoder-1.1.1" sources."through2-2.0.3" -<<<<<<< HEAD -======= - sources."uglify-js-3.4.1" ->>>>>>> nodePackages: meguca: 1.0.7 update ]; }) (sources."gulp-util-3.0.8" // { dependencies = [ + sources."isarray-0.0.1" sources."object-assign-3.0.0" - sources."readable-stream-2.3.6" + sources."readable-stream-1.1.14" sources."replace-ext-0.0.1" sources."string_decoder-1.1.1" - sources."through2-2.0.3" + (sources."through2-2.0.3" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.6" + ]; + }) sources."vinyl-0.5.3" ]; }) @@ -40134,11 +38291,7 @@ in sources."has-gulplog-0.1.0" sources."has-symbols-1.0.0" sources."has-value-1.0.0" - (sources."has-values-1.0.0" // { - dependencies = [ - sources."kind-of-4.0.0" - ]; - }) + sources."has-values-1.0.0" sources."hawk-3.1.3" sources."hoek-2.16.3" sources."homedir-polyfill-1.0.1" @@ -40158,11 +38311,7 @@ in sources."is-extglob-2.1.1" sources."is-glob-3.1.0" sources."is-negated-glob-1.0.0" - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) + sources."is-number-3.0.0" sources."is-plain-object-2.0.4" sources."is-promise-2.1.0" sources."is-relative-1.0.0" @@ -40188,19 +38337,17 @@ in }) sources."kind-of-6.0.2" sources."lazy-cache-1.0.4" - (sources."lazystream-1.0.0" // { - dependencies = [ - sources."readable-stream-2.3.6" - sources."string_decoder-1.1.1" - ]; - }) + sources."lazystream-1.0.0" sources."lead-1.0.0" - (sources."less-2.7.3" // { + sources."less-2.7.3" + (sources."liftoff-2.5.0" // { dependencies = [ - sources."graceful-fs-4.1.11" + sources."is-accessor-descriptor-1.0.0" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + sources."is-extendable-0.1.1" ]; }) - sources."liftoff-2.5.0" sources."lodash-1.0.2" sources."lodash._basecopy-3.0.1" sources."lodash._basetostring-3.0.1" @@ -40234,22 +38381,18 @@ in sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."memoizee-0.4.12" - sources."micromatch-3.1.10" + (sources."micromatch-3.1.10" // { + dependencies = [ + sources."is-extendable-0.1.1" + ]; + }) sources."mime-1.6.0" sources."mime-db-1.33.0" sources."mime-types-2.1.18" sources."minimatch-2.0.10" sources."minimist-1.2.0" - (sources."mixin-deep-1.3.1" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mixin-deep-1.3.1" + sources."mkdirp-0.5.1" sources."ms-2.0.0" sources."multipipe-0.1.2" sources."nanomatch-1.2.13" @@ -40259,23 +38402,7 @@ in sources."now-and-later-2.0.0" sources."oauth-sign-0.8.2" sources."object-assign-4.1.1" -<<<<<<< HEAD - (sources."object-copy-0.1.0" // { - dependencies = [ - sources."define-property-0.2.5" - sources."is-accessor-descriptor-0.1.6" - sources."is-data-descriptor-0.1.4" - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) - sources."kind-of-3.2.2" - ]; - }) -======= sources."object-copy-0.1.0" ->>>>>>> nodePackages: meguca: 1.0.7 update sources."object-keys-1.0.12" sources."object-visit-1.0.1" sources."object.assign-4.1.0" @@ -40301,33 +38428,15 @@ in sources."process-nextick-args-2.0.0" sources."promise-7.3.1" sources."prr-1.0.1" - (sources."pump-2.0.1" // { - dependencies = [ - (sources."end-of-stream-1.4.1" // { - dependencies = [ - sources."once-1.4.0" - ]; - }) - ]; - }) + sources."pump-2.0.1" sources."pumpify-1.5.1" sources."punycode-1.4.1" sources."qs-6.4.0" - (sources."readable-stream-1.0.34" // { - dependencies = [ - sources."isarray-0.0.1" - ]; - }) + sources."readable-stream-1.0.34" sources."rechoir-0.6.2" sources."regex-not-1.0.2" sources."remove-bom-buffer-3.0.0" - (sources."remove-bom-stream-1.2.0" // { - dependencies = [ - sources."readable-stream-2.3.6" - sources."string_decoder-1.1.1" - sources."through2-2.0.3" - ]; - }) + sources."remove-bom-stream-1.2.0" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.2" sources."repeat-string-1.6.1" @@ -40344,33 +38453,22 @@ in sources."safer-buffer-2.1.2" sources."semver-4.3.6" sources."sequencify-0.0.7" - (sources."set-value-2.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) + sources."set-value-2.0.0" sources."sigmund-1.0.1" (sources."snapdragon-0.8.2" // { dependencies = [ - sources."define-property-0.2.5" + (sources."define-property-0.2.5" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) 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."kind-of-4.0.0" ]; }) (sources."snapdragon-node-2.1.1" // { dependencies = [ - sources."define-property-1.0.0" + sources."kind-of-6.0.2" ]; }) (sources."snapdragon-util-3.0.1" // { @@ -40383,29 +38481,17 @@ in sources."source-map-resolve-0.5.2" sources."source-map-url-0.4.0" sources."sparkles-1.0.1" - sources."split-string-3.1.0" + (sources."split-string-3.1.0" // { + dependencies = [ + sources."extend-shallow-3.0.2" + ]; + }) (sources."sshpk-1.14.2" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) - (sources."static-extend-0.1.2" // { - dependencies = [ - sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) + sources."static-extend-0.1.2" sources."stream-consume-0.1.1" sources."stream-shift-1.0.0" sources."string_decoder-0.10.31" @@ -40415,31 +38501,15 @@ in sources."strip-bom-string-1.0.0" sources."supports-color-2.0.0" sources."through2-0.6.5" - (sources."through2-filter-2.0.0" // { - dependencies = [ - sources."readable-stream-2.3.6" - sources."string_decoder-1.1.1" - sources."through2-2.0.3" - ]; - }) + sources."through2-filter-2.0.0" sources."tildify-1.2.0" sources."time-stamp-1.1.0" sources."timers-ext-0.1.5" sources."to-absolute-glob-2.0.2" - (sources."to-object-path-0.3.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) + sources."to-object-path-0.3.0" sources."to-regex-3.0.2" sources."to-regex-range-2.1.1" - (sources."to-through-2.0.0" // { - dependencies = [ - sources."readable-stream-2.3.6" - sources."string_decoder-1.1.1" - sources."through2-2.0.3" - ]; - }) + sources."to-through-2.0.0" sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" @@ -40453,7 +38523,6 @@ in sources."unc-path-regex-0.1.2" (sources."union-value-1.0.0" // { dependencies = [ - sources."extend-shallow-2.0.1" sources."set-value-0.4.3" ]; }) @@ -40465,35 +38534,28 @@ in sources."isobject-2.1.0" ]; }) - sources."has-values-0.1.4" ]; }) sources."urix-0.1.0" - sources."use-3.1.0" + (sources."use-3.1.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) sources."user-home-1.1.1" sources."util-deprecate-1.0.2" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."v8flags-2.1.1" sources."value-or-function-3.0.0" - (sources."verror-1.10.0" // { + sources."verror-1.10.0" + sources."vinyl-0.4.6" + (sources."vinyl-fs-0.3.14" // { dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - (sources."vinyl-0.4.6" // { - dependencies = [ - sources."clone-0.2.0" - ]; - }) - sources."vinyl-fs-0.3.14" - (sources."vinyl-sourcemap-1.1.0" // { - dependencies = [ - sources."clone-2.1.2" - sources."clone-stats-1.0.0" - sources."graceful-fs-4.1.11" - sources."vinyl-2.2.0" + sources."inherits-2.0.3" + sources."minimist-0.0.8" ]; }) + sources."vinyl-sourcemap-1.1.0" sources."vinyl-sourcemaps-apply-0.2.1" sources."whatwg-fetch-2.0.4" sources."when-3.7.8" @@ -40519,7 +38581,7 @@ in version = "5.2.0"; src = fetchurl { url = "https://registry.npmjs.org/mocha/-/mocha-5.2.0.tgz"; - sha512 = "2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ=="; + sha512 = "1qqnhamd691pyvx27ql2l5228qx1migp0yys010zdi748pp516hf10sr26w7gx71323a9p0gv69i358xv2w918gpba9xp2w70l211fq"; }; dependencies = [ sources."balanced-match-1.0.0" @@ -40567,7 +38629,7 @@ in sources."argparse-1.0.10" sources."asynckit-0.4.0" sources."combined-stream-1.0.6" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."component-emitter-1.2.1" sources."cookiejar-2.1.2" sources."core-util-is-1.0.2" @@ -40637,7 +38699,7 @@ in version = "1.6.0"; src = fetchurl { url = "https://registry.npmjs.org/node2nix/-/node2nix-1.6.0.tgz"; - sha512 = "MJY6SsQH3pN59R9N3nMz/L8BsbQ0DlvSF38mgg1fwfwgnaJ+y600s3Nd0vZ+cnETUH+4OPETc4QohflccjPUYw=="; + sha512 = "1ix8cvjbkwqaa44fc9z2f5qgx816wbjgvvd4pbkncsavjvylafj1z61bw6q49kz2z95n3ilnjqh3gzw6drxwk8zymwr7ph7qi53m5ih"; }; dependencies = [ sources."abbrev-1.1.1" @@ -40651,7 +38713,7 @@ in sources."aws-sign2-0.7.0" sources."aws4-1.7.0" sources."base64-js-1.2.3" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."buffer-from-1.1.0" sources."builtin-modules-1.1.1" sources."builtins-1.0.3" @@ -40675,11 +38737,7 @@ in sources."foreachasync-3.0.0" sources."forever-agent-0.6.1" sources."form-data-2.3.2" - (sources."fs-extra-0.6.4" // { - dependencies = [ - sources."mkdirp-0.3.5" - ]; - }) + sources."fs-extra-0.6.4" (sources."fs.extra-1.3.2" // { dependencies = [ sources."mkdirp-0.3.5" @@ -40766,7 +38824,7 @@ in sources."typedarray-0.0.6" sources."uid-number-0.0.5" sources."util-deprecate-1.0.2" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."validate-npm-package-license-3.0.3" sources."validate-npm-package-name-3.0.0" sources."verror-1.10.0" @@ -40790,11 +38848,7 @@ in version = "3.7.0"; src = fetchurl { url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.7.0.tgz"; -<<<<<<< HEAD - sha512 = "qDQE/Ft9xXP6zphwx4sD0t+VhwV7yFaloMpfbL2QnnDZcyaiakWlLdtFGGQfTAwpFHdpbRhRxVhIHN1OKAjgbg=="; -======= sha512 = "1pf02189vfiqj2qqm8ihvb9fwa2j32c3xj1hifv5njlasm24rrxjw4yj2ynqpyal2jmdj3v0n3rbpyj0f5wfw4qrvx77ibxbgy08d58"; ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 }; dependencies = [ sources."abbrev-1.1.1" @@ -40808,20 +38862,9 @@ in sources."aws-sign2-0.6.0" sources."aws4-1.7.0" sources."balanced-match-1.0.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."block-stream-0.0.9" -<<<<<<< HEAD -<<<<<<< HEAD sources."boom-2.10.1" -======= -<<<<<<< HEAD -======= - sources."boom-2.10.1" ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 -======= - sources."boom-2.10.1" ->>>>>>> nodePackages: meguca: 1.0.7 update sources."brace-expansion-1.1.11" sources."caseless-0.12.0" sources."co-4.6.0" @@ -40830,22 +38873,8 @@ in sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" -<<<<<<< HEAD -<<<<<<< HEAD - sources."cryptiles-2.0.5" - (sources."dashdash-1.14.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) -======= -<<<<<<< HEAD -======= -======= ->>>>>>> nodePackages: meguca: 1.0.7 update sources."cryptiles-2.0.5" sources."dashdash-1.14.1" ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."ecc-jsbn-0.1.1" @@ -40856,35 +38885,15 @@ in sources."fs.realpath-1.0.0" sources."fstream-1.0.11" sources."gauge-2.7.4" - (sources."getpass-0.1.7" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."getpass-0.1.7" sources."glob-7.1.2" sources."graceful-fs-4.1.11" sources."har-schema-1.0.5" sources."har-validator-4.2.1" sources."has-unicode-2.0.1" -<<<<<<< HEAD -<<<<<<< HEAD sources."hawk-3.1.3" sources."hoek-2.16.3" sources."http-signature-1.1.1" -======= -<<<<<<< HEAD - sources."http-signature-1.2.0" -======= - sources."hawk-3.1.3" - sources."hoek-2.16.3" - sources."http-signature-1.1.1" ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 -======= - sources."hawk-3.1.3" - sources."hoek-2.16.3" - sources."http-signature-1.1.1" ->>>>>>> nodePackages: meguca: 1.0.7 update sources."inflight-1.0.6" sources."inherits-2.0.3" sources."is-fullwidth-code-point-1.0.0" @@ -40922,47 +38931,19 @@ in sources."punycode-1.4.1" sources."qs-6.4.0" sources."readable-stream-2.3.6" -<<<<<<< HEAD -<<<<<<< HEAD sources."request-2.81.0" -======= -<<<<<<< HEAD - sources."request-2.87.0" -======= - sources."request-2.81.0" ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 -======= - sources."request-2.81.0" ->>>>>>> nodePackages: meguca: 1.0.7 update sources."rimraf-2.6.2" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."semver-5.3.0" sources."set-blocking-2.0.0" sources."signal-exit-3.0.2" -<<<<<<< HEAD -<<<<<<< HEAD -======= -<<<<<<< HEAD - sources."sshpk-1.14.2" -======= ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 -======= ->>>>>>> nodePackages: meguca: 1.0.7 update sources."sntp-1.0.9" (sources."sshpk-1.14.2" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 -======= ->>>>>>> nodePackages: meguca: 1.0.7 update sources."string-width-1.0.2" sources."string_decoder-1.1.1" sources."stringstream-0.0.6" @@ -40972,12 +38953,8 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."util-deprecate-1.0.2" - sources."uuid-3.3.0" - (sources."verror-1.10.0" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."uuid-3.3.2" + sources."verror-1.10.0" sources."which-1.3.1" sources."wide-align-1.1.3" sources."wrappy-1.0.2" @@ -40997,7 +38974,7 @@ in version = "3.4.0"; src = fetchurl { url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.4.0.tgz"; - sha512 = "YoviGBJYGrPdLOKDIQB0sKxuKy/EEsxzooNkOZak4vSTKT/qH0Pa6dj3t1MJjEQGsefih61IyHDmO1WW7xOFfw=="; + sha512 = "1zqa4zgjrakprkhr14av1z2wyqhci4c159vgxyqx7d467za7wlr7x72ljb3jr43l9rwq4n45wmnxb5hfh0230z25kfv66jq28cf52v2"; }; buildInputs = globalBuildInputs; meta = { @@ -41034,28 +39011,27 @@ in sources."aws4-1.7.0" sources."balanced-match-1.0.0" sources."base64-js-0.0.8" - sources."bcrypt-pbkdf-1.0.1" -<<<<<<< HEAD - sources."biased-opener-0.2.8" - sources."big-integer-1.6.32" -======= + sources."bcrypt-pbkdf-1.0.2" (sources."biased-opener-0.2.8" // { dependencies = [ sources."yargs-1.3.3" ]; }) - sources."big-integer-1.6.31" -<<<<<<< HEAD ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 -======= ->>>>>>> nodePackages: meguca: 1.0.7 update + sources."big-integer-1.6.32" sources."block-stream-0.0.9" - sources."body-parser-1.18.2" + (sources."body-parser-1.18.2" // { + dependencies = [ + sources."setprototypeof-1.0.3" + ]; + }) sources."boom-2.10.1" sources."bplist-parser-0.1.1" sources."brace-expansion-1.1.11" - sources."browser-launcher2-0.4.6" + (sources."browser-launcher2-0.4.6" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) sources."builtin-modules-1.1.1" sources."bytes-3.0.0" sources."camelcase-2.1.1" @@ -41074,11 +39050,7 @@ in sources."core-util-is-1.0.2" sources."cryptiles-2.0.5" sources."currently-unhandled-0.4.1" - (sources."dashdash-1.14.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."dashdash-1.14.1" sources."debug-2.6.9" sources."decamelize-1.2.0" sources."deep-extend-0.6.0" @@ -41108,11 +39080,7 @@ in sources."fstream-ignore-1.0.5" sources."gauge-2.7.4" sources."get-stdin-4.0.1" - (sources."getpass-0.1.7" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."getpass-0.1.7" sources."glob-5.0.15" sources."graceful-fs-4.1.11" sources."har-schema-1.0.5" @@ -41164,21 +39132,11 @@ in sources."mime-types-2.1.18" sources."minimatch-3.0.4" sources."minimist-1.2.0" - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mkdirp-0.5.1" sources."ms-2.0.0" sources."nan-2.10.0" sources."negotiator-0.6.1" - (sources."node-pre-gyp-0.6.39" // { - dependencies = [ - sources."glob-7.1.2" - sources."rimraf-2.6.2" - sources."semver-5.5.0" - ]; - }) + sources."node-pre-gyp-0.6.39" sources."nopt-4.0.1" sources."normalize-package-data-2.4.0" sources."npmlog-4.1.2" @@ -41202,7 +39160,11 @@ in sources."pify-2.3.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" - sources."plist-1.2.0" + (sources."plist-1.2.0" // { + dependencies = [ + sources."lodash-3.10.1" + ]; + }) sources."process-nextick-args-2.0.0" sources."proxy-addr-2.0.3" sources."punycode-1.4.1" @@ -41212,7 +39174,6 @@ in dependencies = [ sources."depd-1.1.1" sources."http-errors-1.6.2" - sources."setprototypeof-1.0.3" ]; }) sources."rc-1.2.8" @@ -41221,11 +39182,7 @@ in sources."readable-stream-2.3.6" sources."redent-1.0.0" sources."repeating-2.0.1" - (sources."request-2.81.0" // { - dependencies = [ - sources."qs-6.4.0" - ]; - }) + sources."request-2.81.0" sources."rimraf-2.2.8" sources."safe-buffer-5.1.1" sources."safer-buffer-2.1.2" @@ -41260,12 +39217,7 @@ in sources."strip-json-comments-2.0.1" sources."strong-data-uri-1.0.6" sources."tar-2.2.1" - (sources."tar-pack-3.4.1" // { - dependencies = [ - sources."glob-7.1.2" - sources."rimraf-2.6.2" - ]; - }) + sources."tar-pack-3.4.1" sources."tough-cookie-2.3.4" sources."trim-newlines-1.0.0" sources."truncate-2.0.1" @@ -41279,33 +39231,28 @@ in sources."untildify-2.1.0" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" - sources."uuid-3.3.0" - sources."v8-debug-1.0.1" + sources."uuid-3.3.2" + (sources."v8-debug-1.0.1" // { + dependencies = [ + sources."glob-7.1.2" + sources."qs-6.4.0" + sources."rimraf-2.6.2" + sources."semver-5.5.0" + ]; + }) sources."v8-profiler-5.7.0" sources."validate-npm-package-license-3.0.3" sources."vary-1.1.2" - (sources."verror-1.10.0" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."verror-1.10.0" sources."which-1.3.1" sources."wide-align-1.1.3" - (sources."win-detect-browsers-1.0.2" // { - dependencies = [ - sources."yargs-1.3.3" - ]; - }) + sources."win-detect-browsers-1.0.2" sources."window-size-0.1.4" sources."wrap-ansi-2.1.0" sources."wrappy-1.0.2" sources."ws-1.1.5" sources."x-default-browser-0.3.1" - (sources."xmlbuilder-4.0.0" // { - dependencies = [ - sources."lodash-3.10.1" - ]; - }) + sources."xmlbuilder-4.0.0" sources."xmldom-0.1.27" sources."xtend-4.0.1" sources."y18n-3.2.1" @@ -41322,17 +39269,10 @@ in node-pre-gyp = nodeEnv.buildNodePackage { name = "node-pre-gyp"; packageName = "node-pre-gyp"; -<<<<<<< HEAD version = "0.10.2"; src = fetchurl { url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.2.tgz"; - sha512 = "16lql9QTqs6KsB9fl3neWyZm02KxIKdI9FlJjrB0y7eMTP5Nyz+xalwPbOlw3iw7EejllJPmlJSnY711PLD1ug=="; -======= - version = "0.10.1"; - src = fetchurl { - url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.1.tgz"; - sha512 = "354ilrqnamjvp509zxg2liq7483lr9rwynh048dzqqxw5z0dskc9f43p3wjgfmji1lk85idppiw9rqj4jlkypvlxkm0h0vrj45x7s7f"; ->>>>>>> nodePackages: meguca: 1.0.7 update + sha512 = "2xgbc1wfnyn79wljkk97575x08knb6yf3lnq3swdaqkzjsdzr68rdybfjq8wjaryi4af85icb9nc9jvvrwrfpqzn25cxahksjbnmafp"; }; dependencies = [ sources."abbrev-1.1.1" @@ -41419,14 +39359,21 @@ in version = "1.17.5"; src = fetchurl { url = "https://registry.npmjs.org/nodemon/-/nodemon-1.17.5.tgz"; - sha512 = "FG2mWJU1Y58a9ktgMJ/RZpsiPz3b7ge77t/okZHEa4NbrlXGKZ8s1A6Q+C7+JPXohAfcPALRwvxcAn8S874pmw=="; + sha512 = "2djkgpk29zh4p7wqb8h4g6w0y2fix94zqpgi40fshn9yaf6anp5p0vbqj8r3s6zxsxhgvnv7lzj56v6s6gk0q2byqd9yqrmjmcacv8l"; }; dependencies = [ sources."abbrev-1.1.1" sources."ansi-align-2.0.0" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" - sources."anymatch-2.0.0" + (sources."anymatch-2.0.0" // { + dependencies = [ + sources."is-accessor-descriptor-1.0.0" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + sources."is-extendable-1.0.1" + ]; + }) sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" @@ -41437,7 +39384,12 @@ in sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ - sources."define-property-1.0.0" + (sources."define-property-1.0.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + sources."kind-of-3.2.2" ]; }) sources."binary-extensions-1.11.0" @@ -41445,23 +39397,21 @@ in sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { dependencies = [ - sources."extend-shallow-2.0.1" - sources."is-extendable-0.1.1" + sources."is-accessor-descriptor-1.0.0" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" ]; }) sources."cache-base-1.0.1" sources."camelcase-4.1.0" sources."capture-stack-trace-1.0.0" sources."chalk-2.4.1" -<<<<<<< HEAD - sources."chokidar-2.0.4" - sources."ci-info-1.1.3" - (sources."class-utils-0.3.6" // { -======= (sources."chokidar-2.0.4" // { ->>>>>>> nodePackages: meguca: 1.0.7 update dependencies = [ - sources."define-property-0.2.5" + sources."debug-2.6.9" + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + sources."has-values-0.1.4" (sources."is-accessor-descriptor-0.1.6" // { dependencies = [ sources."kind-of-3.2.2" @@ -41473,7 +39423,14 @@ in ]; }) sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" + sources."is-extendable-0.1.1" + sources."kind-of-3.2.2" + ]; + }) + sources."ci-info-1.1.3" + (sources."class-utils-0.3.6" // { + dependencies = [ + sources."define-property-0.2.5" ]; }) sources."cli-boxes-1.0.0" @@ -41500,22 +39457,7 @@ in sources."execa-0.7.0" (sources."expand-brackets-2.1.4" // { dependencies = [ - sources."debug-2.6.9" sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."is-extendable-0.1.1" - sources."kind-of-5.1.0" ]; }) sources."extend-shallow-3.0.2" @@ -41523,15 +39465,10 @@ in dependencies = [ sources."define-property-1.0.0" sources."extend-shallow-2.0.1" - sources."is-extendable-0.1.1" - ]; - }) - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - sources."is-extendable-0.1.1" + sources."kind-of-5.1.0" ]; }) + sources."fill-range-4.0.0" sources."for-in-1.0.2" sources."fragment-cache-0.2.1" sources."from-0.1.7" @@ -41548,11 +39485,7 @@ in sources."graceful-fs-4.1.11" sources."has-flag-3.0.0" sources."has-value-1.0.0" - (sources."has-values-1.0.0" // { - dependencies = [ - sources."kind-of-4.0.0" - ]; - }) + sources."has-values-1.0.0" sources."ignore-by-default-1.0.1" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" @@ -41594,7 +39527,22 @@ in sources."map-cache-0.2.2" sources."map-stream-0.1.0" sources."map-visit-1.0.0" - sources."micromatch-3.1.10" + (sources."micromatch-3.1.10" // { + dependencies = [ + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."is-extendable-0.1.1" + ]; + }) sources."minimatch-3.0.4" sources."minimist-1.2.0" sources."mixin-deep-1.3.1" @@ -41604,19 +39552,7 @@ in sources."nopt-1.0.10" sources."normalize-path-2.1.1" sources."npm-run-path-2.0.2" - (sources."object-copy-0.1.0" // { - dependencies = [ - sources."define-property-0.2.5" - sources."is-accessor-descriptor-0.1.6" - sources."is-data-descriptor-0.1.4" - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) - sources."kind-of-3.2.2" - ]; - }) + sources."object-copy-0.1.0" sources."object-visit-1.0.1" sources."object.pick-1.3.0" sources."p-finally-1.0.0" @@ -41650,67 +39586,34 @@ in sources."semver-5.5.0" sources."semver-diff-2.1.0" sources."set-immediate-shim-1.0.1" - (sources."set-value-2.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - sources."is-extendable-0.1.1" - ]; - }) + sources."set-value-2.0.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" (sources."snapdragon-0.8.2" // { dependencies = [ - sources."debug-2.6.9" - sources."define-property-0.2.5" + (sources."define-property-0.2.5" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) 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."is-extendable-0.1.1" - sources."kind-of-5.1.0" - ]; - }) - (sources."snapdragon-node-2.1.1" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) - (sources."snapdragon-util-3.0.1" // { - dependencies = [ - sources."kind-of-3.2.2" + sources."kind-of-4.0.0" ]; }) + sources."snapdragon-node-2.1.1" + sources."snapdragon-util-3.0.1" sources."source-map-0.5.7" sources."source-map-resolve-0.5.2" sources."source-map-url-0.4.0" sources."split-0.3.3" - sources."split-string-3.1.0" - (sources."static-extend-0.1.2" // { + (sources."split-string-3.1.0" // { 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."extend-shallow-3.0.2" + sources."is-extendable-1.0.1" ]; }) + sources."static-extend-0.1.2" sources."stream-combiner-0.0.4" sources."string-width-2.1.1" sources."string_decoder-1.1.1" @@ -41721,11 +39624,7 @@ in sources."term-size-1.2.0" sources."through-2.3.8" sources."timed-out-4.0.1" - (sources."to-object-path-0.3.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) + sources."to-object-path-0.3.0" sources."to-regex-3.0.2" sources."to-regex-range-2.1.1" sources."touch-3.1.0" @@ -41736,8 +39635,6 @@ in }) (sources."union-value-1.0.0" // { dependencies = [ - sources."extend-shallow-2.0.1" - sources."is-extendable-0.1.1" sources."set-value-0.4.3" ]; }) @@ -41749,7 +39646,6 @@ in sources."isobject-2.1.0" ]; }) - sources."has-values-0.1.4" ]; }) sources."unzip-response-2.0.1" @@ -41757,7 +39653,11 @@ in sources."update-notifier-2.5.0" sources."urix-0.1.0" sources."url-parse-lax-1.0.0" - sources."use-3.1.0" + (sources."use-3.1.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) sources."util-deprecate-1.0.2" sources."which-1.3.1" sources."widest-line-2.0.0" @@ -41780,7 +39680,7 @@ in version = "0.18.7"; src = fetchurl { url = "https://registry.npmjs.org/node-red/-/node-red-0.18.7.tgz"; - sha512 = "c88H51qK2chQNITdN3tDzk4TgPWHzBxEGE2jQwHihjeneGnJEihDnoncsGB7CA2s9aU1tlh2lbifdObFhQr8gA=="; + sha512 = "20gq2l5qpk797xqjmv5idimlpssq388gdhb1p49kr1jh4n9d5wafdw6w80l78sd3121rk47yn016knf8dxkgpc46i8cincabbkhgkvk"; }; dependencies = [ sources."abbrev-1.1.1" @@ -41804,7 +39704,7 @@ in sources."balanced-match-1.0.0" sources."basic-auth-2.0.0" sources."bcrypt-1.0.3" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."bcryptjs-2.4.3" sources."bl-1.2.2" sources."block-stream-0.0.9" @@ -41812,22 +39712,16 @@ in sources."boolbase-1.0.0" sources."brace-expansion-1.1.11" sources."buffer-from-1.1.0" - (sources."buildmail-2.0.0" // { - dependencies = [ - sources."needle-0.10.0" - ]; - }) - (sources."busboy-0.2.14" // { - dependencies = [ - sources."isarray-0.0.1" - sources."readable-stream-1.1.14" - sources."string_decoder-0.10.31" - ]; - }) + sources."buildmail-2.0.0" + sources."busboy-0.2.14" sources."bytes-3.0.0" sources."callback-stream-1.1.0" sources."caseless-0.12.0" - sources."cheerio-0.22.0" + (sources."cheerio-0.22.0" // { + dependencies = [ + sources."domelementtype-1.1.3" + ]; + }) sources."clone-2.1.1" sources."co-4.6.0" sources."code-point-at-1.1.0" @@ -41856,18 +39750,8 @@ in sources."delegates-1.0.0" sources."depd-1.1.2" sources."destroy-1.0.4" - (sources."dicer-0.2.5" // { - dependencies = [ - sources."isarray-0.0.1" - sources."readable-stream-1.1.14" - sources."string_decoder-0.10.31" - ]; - }) - (sources."dom-serializer-0.1.0" // { - dependencies = [ - sources."domelementtype-1.1.3" - ]; - }) + sources."dicer-0.2.5" + sources."dom-serializer-0.1.0" sources."domelementtype-1.3.0" sources."domhandler-2.4.2" sources."domutils-1.5.1" @@ -41884,16 +39768,19 @@ in sources."etag-1.8.1" (sources."express-4.16.3" // { dependencies = [ - sources."body-parser-1.18.2" - (sources."http-errors-1.6.2" // { + (sources."body-parser-1.18.2" // { dependencies = [ - sources."depd-1.1.1" sources."setprototypeof-1.0.3" ]; }) sources."iconv-lite-0.4.19" sources."qs-6.5.1" - sources."raw-body-2.3.2" + (sources."raw-body-2.3.2" // { + dependencies = [ + sources."depd-1.1.1" + sources."http-errors-1.6.2" + ]; + }) sources."statuses-1.4.0" ]; }) @@ -41902,16 +39789,8 @@ in sources."extsprintf-1.3.0" sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" - (sources."feedparser-2.2.9" // { - dependencies = [ - sources."addressparser-1.0.1" - ]; - }) - (sources."finalhandler-1.1.1" // { - dependencies = [ - sources."statuses-1.4.0" - ]; - }) + sources."feedparser-2.2.9" + sources."finalhandler-1.1.1" (sources."follow-redirects-1.4.1" // { dependencies = [ sources."debug-3.1.0" @@ -41936,20 +39815,22 @@ in sources."har-validator-5.0.3" sources."has-unicode-2.0.1" sources."hash-sum-1.0.2" - sources."help-me-1.1.0" - sources."htmlparser2-3.9.2" + (sources."help-me-1.1.0" // { + dependencies = [ + sources."pump-2.0.1" + ]; + }) + (sources."htmlparser2-3.9.2" // { + dependencies = [ + sources."domelementtype-1.3.0" + ]; + }) sources."http-errors-1.6.3" sources."http-signature-1.2.0" sources."i18next-1.10.6" sources."i18next-client-1.10.3" sources."iconv-lite-0.4.23" - (sources."imap-0.8.19" // { - dependencies = [ - sources."isarray-0.0.1" - sources."readable-stream-1.1.14" - sources."string_decoder-0.10.31" - ]; - }) + sources."imap-0.8.19" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.5" @@ -41999,7 +39880,11 @@ in sources."lodash.some-4.6.0" sources."lodash.uniq-4.5.0" sources."lru-cache-4.1.3" - sources."mailcomposer-2.1.0" + (sources."mailcomposer-2.1.0" // { + dependencies = [ + sources."needle-0.10.0" + ]; + }) sources."mailparser-0.6.2" sources."media-typer-0.3.0" (sources."memorystore-1.6.0" // { @@ -42012,34 +39897,27 @@ in sources."mime-1.4.1" sources."mime-db-1.33.0" sources."mime-types-2.1.18" - (sources."mimelib-0.3.1" // { - dependencies = [ - sources."addressparser-1.0.1" - ]; - }) + sources."mimelib-0.3.1" sources."minimatch-3.0.4" sources."minimist-1.2.0" -<<<<<<< HEAD - (sources."mkdirp-0.5.1" // { -======= sources."mkdirp-0.5.1" sources."moment-2.22.2" sources."moment-timezone-0.5.21" (sources."mqtt-2.18.0" // { ->>>>>>> nodePackages: meguca: 1.0.7 update dependencies = [ - sources."minimist-0.0.8" + sources."ws-3.3.3" ]; }) - sources."moment-2.22.2" - sources."moment-timezone-0.5.21" - sources."mqtt-2.18.0" sources."mqtt-packet-5.6.0" sources."mri-1.1.1" sources."ms-2.0.0" (sources."multer-1.3.0" // { dependencies = [ + sources."isarray-0.0.1" + sources."minimist-0.0.8" sources."object-assign-3.0.0" + sources."readable-stream-1.1.14" + sources."string_decoder-0.10.31" ]; }) sources."mustache-2.3.0" @@ -42047,19 +39925,17 @@ in sources."needle-0.11.0" sources."negotiator-0.6.1" sources."node-pre-gyp-0.6.36" - sources."node-red-node-email-0.1.29" - sources."node-red-node-feedparser-0.1.12" - sources."node-red-node-rbe-0.2.3" - sources."node-red-node-twitter-1.0.1" - sources."nodemailer-1.11.0" - sources."nodemailer-direct-transport-1.1.0" - (sources."nodemailer-smtp-transport-1.1.0" // { + (sources."node-red-node-email-0.1.29" // { dependencies = [ + sources."addressparser-1.0.1" sources."clone-1.0.4" + sources."isarray-0.0.1" + sources."minimist-0.0.10" + sources."readable-stream-1.1.14" + sources."semver-5.3.0" + sources."string_decoder-0.10.31" ]; }) -<<<<<<< HEAD -======= (sources."node-red-node-feedparser-0.1.12" // { dependencies = [ sources."addressparser-1.0.1" @@ -42070,7 +39946,6 @@ in sources."nodemailer-1.11.0" sources."nodemailer-direct-transport-1.1.0" sources."nodemailer-smtp-transport-1.1.0" ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 sources."nodemailer-wellknown-0.1.10" sources."nopt-4.0.1" sources."npmlog-4.1.2" @@ -42083,11 +39958,7 @@ in sources."on-finished-2.3.0" sources."on-headers-1.0.1" sources."once-1.4.0" - (sources."optimist-0.6.1" // { - dependencies = [ - sources."minimist-0.0.10" - ]; - }) + sources."optimist-0.6.1" sources."options-0.0.6" sources."ordered-read-streams-1.0.1" sources."os-homedir-1.0.2" @@ -42108,11 +39979,7 @@ in sources."proxy-addr-2.0.3" sources."pseudomap-1.0.2" sources."pump-3.0.0" - (sources."pumpify-1.5.1" // { - dependencies = [ - sources."pump-2.0.1" - ]; - }) + sources."pumpify-1.5.1" sources."punycode-1.4.1" sources."qs-6.5.2" sources."random-bytes-1.0.0" @@ -42129,11 +39996,7 @@ in sources."safer-buffer-2.1.2" sources."sax-1.2.4" sources."semver-5.5.0" - (sources."send-0.16.2" // { - dependencies = [ - sources."statuses-1.4.0" - ]; - }) + sources."send-0.16.2" sources."sentiment-2.1.0" sources."serve-static-1.13.2" sources."set-blocking-2.0.0" @@ -42171,22 +40034,14 @@ in sources."unique-stream-2.2.1" sources."universalify-0.1.2" sources."unpipe-1.0.0" - (sources."utf7-1.0.2" // { - dependencies = [ - sources."semver-5.3.0" - ]; - }) + sources."utf7-1.0.2" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uue-3.1.2" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."vary-1.1.2" sources."verror-1.10.0" - (sources."websocket-stream-5.1.2" // { - dependencies = [ - sources."ws-3.3.3" - ]; - }) + sources."websocket-stream-5.1.2" sources."when-3.7.8" sources."wide-align-1.1.3" sources."wordwrap-0.0.3" @@ -42247,15 +40102,15 @@ in sources."connect-flash-0.1.0" sources."cookie-0.0.5" sources."cookie-signature-1.0.1" - (sources."debug-3.1.0" // { + sources."debug-3.1.0" + sources."diff-1.0.8" + sources."ejs-0.8.3" + sources."esprima-1.0.4" + (sources."express-3.2.0" // { dependencies = [ sources."ms-2.0.0" ]; }) - sources."diff-1.0.8" - sources."ejs-0.8.3" - sources."esprima-1.0.4" - sources."express-3.2.0" sources."express-partials-0.0.6" sources."eyes-0.1.8" sources."formidable-1.0.11" @@ -42289,7 +40144,11 @@ in sources."ms-0.1.0" sources."muri-0.3.1" sources."nan-1.0.0" - sources."net-ping-1.1.7" + (sources."net-ping-1.1.7" // { + dependencies = [ + sources."nan-2.10.0" + ]; + }) sources."nodemailer-0.3.35" sources."nodemailer-fetch-1.6.0" sources."nodemailer-shared-1.1.0" @@ -42303,29 +40162,17 @@ in sources."qs-0.5.1" sources."rai-0.1.12" sources."range-parser-0.0.4" -<<<<<<< HEAD -<<<<<<< HEAD - (sources."raw-socket-1.6.2" // { - dependencies = [ - sources."nan-2.10.0" - ]; - }) -======= -<<<<<<< HEAD - sources."raw-socket-1.6.1" -======= sources."raw-socket-1.6.2" ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 -======= - sources."raw-socket-1.6.2" ->>>>>>> nodePackages: meguca: 1.0.7 update sources."redis-0.7.3" sources."semver-1.1.0" sources."send-0.1.0" sources."simplesmtp-0.3.35" sources."sliced-0.0.3" - sources."socket.io-0.9.14" + (sources."socket.io-0.9.14" // { + dependencies = [ + sources."commander-2.1.0" + ]; + }) sources."socket.io-client-0.9.11" sources."tinycolor-0.0.1" sources."uglify-js-1.2.5" @@ -42334,11 +40181,7 @@ in sources."vows-0.8.2" sources."wordwrap-0.0.3" sources."wrappy-1.0.2" - (sources."ws-0.4.32" // { - dependencies = [ - sources."commander-2.1.0" - ]; - }) + sources."ws-0.4.32" sources."xmlhttprequest-1.4.2" sources."xoauth2-0.1.8" sources."zeparser-0.0.5" @@ -42357,7 +40200,7 @@ in version = "6.1.0"; src = fetchurl { url = "https://registry.npmjs.org/npm/-/npm-6.1.0.tgz"; - sha512 = "e38cCtJ0lEjLXXpc4twEfj8Xw5hDLolc2Py87ueWnUhJfZ8GA/5RVIeD+XbSr1+aVRGsRsdtLdzUNO63PvQJ1w=="; + sha512 = "3bhkx1ynzp39m6w5mnwfimc25arlpxgs9vgk0w7ai8zw0q6kxyljj4xjvkyxg7wv1f8jbj3k31ifgvy0kff4p3sbp5li53ls851qzvv"; }; buildInputs = globalBuildInputs; meta = { @@ -42390,8 +40233,12 @@ in sources."aws-sign2-0.7.0" sources."aws4-1.7.0" sources."balanced-match-1.0.0" - sources."bcrypt-pbkdf-1.0.1" - sources."block-stream-0.0.9" + sources."bcrypt-pbkdf-1.0.2" + (sources."block-stream-0.0.9" // { + dependencies = [ + sources."inherits-2.0.3" + ]; + }) sources."brace-expansion-1.1.11" sources."caseless-0.12.0" sources."chownr-0.0.2" @@ -42420,17 +40267,16 @@ in sources."foreachasync-3.0.0" sources."forever-agent-0.6.1" sources."form-data-2.3.2" - (sources."fs-extra-0.6.4" // { + sources."fs-extra-0.6.4" + (sources."fs.extra-1.3.2" // { dependencies = [ sources."rimraf-2.2.8" ]; }) - sources."fs.extra-1.3.2" sources."fs.realpath-1.0.0" (sources."fstream-0.1.31" // { dependencies = [ - sources."graceful-fs-3.0.11" - sources."mkdirp-0.5.1" + sources."inherits-2.0.3" ]; }) sources."gauge-2.7.4" @@ -42502,7 +40348,9 @@ in sources."strip-ansi-3.0.1" (sources."tar-0.1.17" // { dependencies = [ + sources."graceful-fs-3.0.11" sources."inherits-1.0.2" + sources."mkdirp-0.5.1" ]; }) (sources."temp-0.6.0" // { @@ -42517,7 +40365,7 @@ in sources."underscore-1.4.4" sources."underscore.string-2.3.3" sources."util-deprecate-1.0.2" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."verror-1.10.0" sources."walk-2.3.13" sources."wide-align-1.1.3" @@ -42537,7 +40385,7 @@ in version = "2.14.2"; src = fetchurl { url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.14.2.tgz"; - sha512 = "kyrLnGIImPb4WK/S/4AgsxKZ21ztC9KP+6aNTZN31cGJm4+GyH+aNq7ASvvJQO3iOdg/c60qLdZVtLTOn4l0gQ=="; + sha512 = "20p92czrssb8mfn5lmaswrzv0wy5va0r7xlmh5f6sd7zj46iydqkhfmfy9lv3d6zf7x42zdbkdrj4mk420gzlmgb3wgd608cafcnalk"; }; dependencies = [ sources."ansi-align-2.0.0" @@ -42545,13 +40393,7 @@ in sources."ansi-styles-2.2.1" sources."argparse-1.0.10" sources."bluebird-3.5.1" - (sources."boxen-1.3.0" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.1" - sources."supports-color-5.4.0" - ]; - }) + sources."boxen-1.3.0" sources."camelcase-4.1.0" sources."capture-stack-trace-1.0.0" sources."chalk-1.1.3" @@ -42562,7 +40404,7 @@ in sources."color-convert-1.9.2" sources."color-name-1.1.1" sources."colors-1.0.3" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."configstore-3.1.2" sources."create-error-class-3.0.2" sources."cross-spawn-5.1.0" @@ -42641,12 +40483,7 @@ in sources."signal-exit-3.0.2" sources."spawn-please-0.3.0" sources."sprintf-js-1.0.3" - (sources."string-width-2.1.1" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."strip-ansi-4.0.0" - ]; - }) + sources."string-width-2.1.1" sources."strip-ansi-3.0.1" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" @@ -42657,8 +40494,10 @@ in sources."unzip-response-2.0.1" (sources."update-notifier-2.5.0" // { dependencies = [ + sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" sources."chalk-2.4.1" + sources."strip-ansi-4.0.0" sources."supports-color-5.4.0" ]; }) @@ -42684,7 +40523,7 @@ in version = "3.2.1"; src = fetchurl { url = "https://registry.npmjs.org/nsp/-/nsp-3.2.1.tgz"; - sha512 = "dLmGi7IGixJEHKetErIH460MYiYIzAoxuVsloZFu9e1p9U8K0yULx7YQ1+VzrjZbB+wqq67ES1SfOvKVb/qMDQ=="; + sha512 = "06qrykgjpr3m7sl9g2axaraxh3mndmffgjxf45nqw5jblqa9zsnkvgmds8s29avp4qhmk084ri0rbg30yr15bd73i2152q6na5qdfbl"; }; dependencies = [ sources."agent-base-4.2.0" @@ -42699,7 +40538,11 @@ in sources."cli-cursor-2.1.0" sources."cli-table2-0.2.0" sources."cli-width-2.2.0" - sources."cliui-3.2.0" + (sources."cliui-3.2.0" // { + dependencies = [ + sources."string-width-1.0.2" + ]; + }) sources."code-point-at-1.1.0" sources."color-convert-1.9.2" sources."color-name-1.1.1" @@ -42823,7 +40666,7 @@ in version = "1.0.35"; src = fetchurl { url = "https://registry.npmjs.org/ocaml-language-server/-/ocaml-language-server-1.0.35.tgz"; - sha512 = "9RS7+KyrmFFL2BZLjIBjLToqbDTKDTAoCGrQDm8eYgKie/ep6UnodGuvZgRaM9HOQ8RDzBh4rE3CfGdNsggD4g=="; + sha512 = "3i0625j9mkprhjdmiw1ik23qi1wxl9kb826dbvbfkl4ksd9yxxs40k23rphxl3a10l303fa6in2lfidcf08qjqnv15m365bmkwbn57m"; }; dependencies = [ sources."async-2.6.0" @@ -42884,14 +40727,8 @@ in sources."aws4-1.7.0" sources."babybird-0.0.1" sources."balanced-match-1.0.0" - sources."bcrypt-pbkdf-1.0.1" - (sources."bl-1.2.2" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.6" - sources."string_decoder-1.1.1" - ]; - }) + sources."bcrypt-pbkdf-1.0.2" + sources."bl-1.2.2" sources."bluebird-3.5.1" (sources."body-parser-1.18.3" // { dependencies = [ @@ -42908,21 +40745,17 @@ in sources."caseless-0.12.0" sources."center-align-0.1.3" sources."clarinet-0.11.0" - (sources."cliui-2.1.0" // { - dependencies = [ - sources."wordwrap-0.0.2" - ]; - }) + sources."cliui-2.1.0" sources."co-4.6.0" sources."code-point-at-1.1.0" sources."colors-1.3.0" sources."combined-stream-1.0.6" - (sources."compressible-2.0.14" // { + sources."compressible-2.0.14" + (sources."compression-1.7.2" // { dependencies = [ sources."mime-db-1.34.0" ]; }) - sources."compression-1.7.2" sources."concat-map-0.0.1" sources."connect-busboy-0.0.2" sources."content-disposition-0.5.2" @@ -42954,21 +40787,30 @@ in sources."etag-1.8.1" (sources."express-4.16.3" // { dependencies = [ - sources."body-parser-1.18.2" - sources."content-type-1.0.4" - (sources."http-errors-1.6.2" // { + (sources."body-parser-1.18.2" // { dependencies = [ - sources."depd-1.1.1" sources."setprototypeof-1.0.3" ]; }) + sources."content-type-1.0.4" sources."iconv-lite-0.4.19" sources."qs-6.5.1" - sources."raw-body-2.3.2" + (sources."raw-body-2.3.2" // { + dependencies = [ + sources."depd-1.1.1" + sources."http-errors-1.6.2" + ]; + }) sources."statuses-1.4.0" ]; }) - sources."express-handlebars-3.0.0" + (sources."express-handlebars-3.0.0" // { + dependencies = [ + sources."async-1.5.2" + sources."wordwrap-0.0.2" + sources."yargs-3.10.0" + ]; + }) sources."extend-3.0.1" sources."extsprintf-1.3.0" sources."fast-deep-equal-1.1.0" @@ -42991,11 +40833,7 @@ in sources."getpass-0.1.7" sources."glob-6.0.4" sources."graceful-fs-4.1.11" - (sources."handlebars-4.0.11" // { - dependencies = [ - sources."async-1.5.2" - ]; - }) + sources."handlebars-4.0.11" sources."har-schema-2.0.0" sources."har-validator-5.0.3" sources."has-symbols-1.0.0" @@ -43024,36 +40862,14 @@ in sources."json-schema-traverse-0.3.1" sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" - (sources."kad-git+https://github.com/gwicke/kad.git#master" // { - dependencies = [ - sources."ms-0.7.3" - ]; - }) - (sources."kad-fs-0.0.4" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.6" - sources."string_decoder-1.1.1" - ]; - }) + sources."kad-git+https://github.com/gwicke/kad.git#master" + sources."kad-fs-0.0.4" sources."kad-localstorage-0.0.7" - (sources."kad-memstore-0.0.1" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.6" - sources."string_decoder-1.1.1" - ]; - }) + sources."kad-memstore-0.0.1" sources."kind-of-3.2.2" sources."lazy-cache-1.0.4" sources."lcid-1.0.0" - (sources."limitation-0.2.0" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.6" - sources."string_decoder-1.1.1" - ]; - }) + sources."limitation-0.2.0" sources."load-json-file-1.1.0" sources."lodash-3.10.1" sources."lodash._baseclone-4.5.7" @@ -43069,20 +40885,10 @@ in sources."mime-types-2.1.18" sources."minimatch-3.0.4" sources."minimist-0.0.10" - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mkdirp-0.5.1" sources."moment-2.22.2" sources."ms-2.0.0" - (sources."msgpack5-3.6.0" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.6" - sources."string_decoder-1.1.1" - ]; - }) + sources."msgpack5-3.6.0" sources."mv-2.1.1" sources."nan-2.10.0" sources."ncp-2.0.0" @@ -43129,18 +40935,22 @@ in sources."safe-json-stringify-1.2.0" sources."safer-buffer-2.1.2" sources."semver-5.5.0" - (sources."send-0.16.2" // { - dependencies = [ - sources."statuses-1.4.0" - ]; - }) + sources."send-0.16.2" (sources."serve-favicon-2.5.0" // { dependencies = [ sources."ms-2.1.1" ]; }) sources."serve-static-1.13.2" - sources."service-runner-2.3.0" + (sources."service-runner-2.3.0" // { + dependencies = [ + sources."isarray-1.0.0" + sources."minimist-0.0.8" + sources."ms-0.7.3" + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" + ]; + }) sources."set-blocking-2.0.0" sources."setprototypeof-1.1.0" sources."simplediff-0.1.1" @@ -43164,14 +40974,13 @@ in (sources."uglify-js-2.8.29" // { dependencies = [ sources."source-map-0.5.7" - sources."yargs-3.10.0" ]; }) sources."uglify-to-browserify-1.0.2" sources."unpipe-1.0.0" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."validate-npm-package-license-3.0.3" sources."vary-1.1.2" sources."verror-1.10.0" @@ -43187,11 +40996,7 @@ in sources."cliui-3.2.0" ]; }) - (sources."yargs-parser-5.0.0" // { - dependencies = [ - sources."camelcase-3.0.0" - ]; - }) + sources."yargs-parser-5.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -43207,11 +41012,7 @@ in version = "0.39.0"; src = fetchurl { url = "https://registry.npmjs.org/peerflix/-/peerflix-0.39.0.tgz"; -<<<<<<< HEAD - sha512 = "spB+D+GXdM9JcPeWG8bpnWTxfXr/KwyyZ0OjNlpyw62ffxlCsbNhwaSmhXDpDC3wh4HuQejdYc1DlU+zTXL+WA=="; -======= sha512 = "1cgwwjdnd7rahydc7fyhhgfh63z0b8cx5q8b9m4q5hv7ca235zrzbf3f9d3d8s3cyr0qazzg9yz2r4xx731p5ppf14wyx4pw47px45j"; ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 }; dependencies = [ sources."addr-to-ip-port-1.4.3" @@ -43230,31 +41031,10 @@ in sources."balanced-match-1.0.0" sources."base64-js-0.0.8" sources."bencode-2.0.0" -<<<<<<< HEAD -<<<<<<< HEAD sources."big-integer-1.6.32" sources."bitfield-0.1.0" - (sources."bittorrent-dht-6.4.2" // { - dependencies = [ - sources."bencode-0.7.0" - ]; - }) - (sources."bittorrent-tracker-7.7.0" // { - dependencies = [ - sources."bencode-0.8.0" - ]; - }) -======= -<<<<<<< HEAD - sources."big-integer-1.6.30" -======= -======= ->>>>>>> nodePackages: meguca: 1.0.7 update - sources."big-integer-1.6.31" - sources."bitfield-0.1.0" sources."bittorrent-dht-6.4.2" sources."bittorrent-tracker-7.7.0" ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 sources."blob-to-buffer-1.2.8" sources."bn.js-4.11.8" sources."bncode-0.5.3" @@ -43278,18 +41058,8 @@ in sources."cli-width-2.2.0" sources."clivas-0.2.0" sources."code-point-at-1.1.0" -<<<<<<< HEAD -<<<<<<< HEAD sources."color-convert-1.9.2" sources."color-name-1.1.1" -======= - sources."color-convert-1.9.1" - sources."color-name-1.1.3" ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 -======= - sources."color-convert-1.9.2" - sources."color-name-1.1.1" ->>>>>>> nodePackages: meguca: 1.0.7 update sources."compact2string-1.4.0" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" @@ -43316,7 +41086,6 @@ in sources."flatten-0.0.1" (sources."fs-chunk-store-1.7.0" // { dependencies = [ - sources."minimist-0.0.8" sources."mkdirp-0.5.1" ]; }) @@ -43362,6 +41131,7 @@ in sources."k-bucket-0.6.0" (sources."k-rpc-3.7.0" // { dependencies = [ + sources."bencode-2.0.0" sources."k-bucket-2.0.1" ]; }) @@ -43406,45 +41176,24 @@ in sources."get-stdin-6.0.0" ]; }) - (sources."parse-torrent-file-2.1.4" // { - dependencies = [ - sources."bencode-0.7.0" - ]; - }) + sources."parse-torrent-file-2.1.4" sources."path-exists-2.1.0" sources."path-is-absolute-1.0.1" sources."path-type-1.1.0" - (sources."peer-wire-protocol-0.7.1" // { + sources."peer-wire-protocol-0.7.1" + (sources."peer-wire-swarm-0.12.2" // { dependencies = [ sources."bncode-0.2.3" - sources."isarray-0.0.1" - sources."readable-stream-1.1.14" - sources."string_decoder-0.10.31" ]; }) - sources."peer-wire-swarm-0.12.2" sources."pify-2.3.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."plist-1.2.0" sources."process-nextick-args-2.0.0" sources."pump-2.0.1" -<<<<<<< HEAD - (sources."random-access-file-2.0.1" // { - dependencies = [ - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" - ]; - }) - sources."random-access-storage-1.3.0" -======= sources."random-access-file-2.0.1" -<<<<<<< HEAD - sources."random-access-storage-1.2.0" ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 -======= sources."random-access-storage-1.3.0" ->>>>>>> nodePackages: meguca: 1.0.7 update sources."random-iterate-1.0.1" sources."randombytes-2.0.6" sources."range-parser-1.2.0" @@ -43474,7 +41223,6 @@ in sources."simple-sha1-2.1.1" (sources."simple-websocket-4.3.1" // { dependencies = [ - sources."safe-buffer-5.0.1" sources."ws-2.3.1" ]; }) @@ -43498,9 +41246,6 @@ in sources."through-2.3.8" sources."thunky-1.0.2" sources."tmp-0.0.33" -<<<<<<< HEAD - sources."torrent-discovery-5.4.0" -======= (sources."torrent-discovery-5.4.0" // { dependencies = [ sources."bencode-0.8.0" @@ -43510,15 +41255,21 @@ in sources."string_decoder-1.1.1" ]; }) ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 sources."torrent-piece-1.1.2" (sources."torrent-stream-1.0.4" // { dependencies = [ + sources."bencode-0.7.0" sources."end-of-stream-0.1.5" + sources."isarray-0.0.1" sources."magnet-uri-4.2.3" + sources."minimist-0.0.8" sources."once-1.3.3" sources."parse-torrent-4.1.0" + sources."readable-stream-1.1.14" + sources."safe-buffer-5.0.1" + sources."string_decoder-0.10.31" sources."thirty-two-0.0.2" + sources."ultron-1.0.2" ]; }) sources."trim-newlines-1.0.0" @@ -43531,11 +41282,7 @@ in sources."winreg-1.2.4" sources."wordwrap-0.0.3" sources."wrappy-1.0.2" - (sources."ws-1.1.5" // { - dependencies = [ - sources."ultron-1.0.2" - ]; - }) + sources."ws-1.1.5" sources."xmlbuilder-4.0.0" sources."xmldom-0.1.27" sources."xtend-4.0.1" @@ -43576,20 +41323,11 @@ in sources."better-assert-1.0.2" sources."bitfield-0.1.0" sources."bittorrent-dht-6.4.2" - (sources."bittorrent-tracker-7.7.0" // { - dependencies = [ - sources."bencode-0.8.0" - sources."minimist-1.2.0" - ]; - }) + sources."bittorrent-tracker-7.7.0" sources."blob-0.0.4" sources."bn.js-4.11.8" sources."bncode-0.5.3" - (sources."body-parser-1.13.3" // { - dependencies = [ - sources."qs-4.0.0" - ]; - }) + sources."body-parser-1.13.3" sources."boom-0.3.8" sources."brace-expansion-1.1.11" sources."buffer-alloc-1.2.0" @@ -43606,17 +41344,17 @@ in sources."component-bind-1.0.0" sources."component-emitter-1.2.1" sources."component-inherit-0.0.3" - (sources."compressible-2.0.14" // { - dependencies = [ - sources."mime-db-1.34.0" - ]; - }) + sources."compressible-2.0.14" sources."compression-1.5.2" sources."concat-map-0.0.1" (sources."connect-2.30.2" // { dependencies = [ - sources."multiparty-3.3.2" - sources."qs-4.0.0" + sources."accepts-1.2.13" + sources."escape-html-1.0.3" + sources."ms-0.7.2" + sources."negotiator-0.5.3" + sources."send-0.13.2" + sources."vary-1.1.2" ]; }) sources."connect-multiparty-2.1.1" @@ -43633,62 +41371,56 @@ in sources."csrf-3.0.6" sources."csurf-1.8.3" sources."cyclist-0.1.1" - sources."debug-2.2.0" + (sources."debug-2.2.0" // { + dependencies = [ + sources."ms-0.7.1" + ]; + }) sources."decompress-response-3.3.0" sources."delayed-stream-0.0.5" sources."depd-1.0.1" sources."destroy-1.0.4" sources."ee-first-1.1.1" sources."end-of-stream-1.4.1" - (sources."engine.io-1.8.5" // { - dependencies = [ - sources."accepts-1.3.3" - sources."cookie-0.3.1" - sources."debug-2.3.3" - sources."ms-0.7.2" - sources."negotiator-0.6.1" - ]; - }) - (sources."engine.io-client-1.8.5" // { - dependencies = [ - sources."debug-2.3.3" - sources."ms-0.7.2" - ]; - }) + sources."engine.io-1.8.5" + sources."engine.io-client-1.8.5" sources."engine.io-parser-1.3.2" - (sources."errorhandler-1.4.3" // { - dependencies = [ - sources."accepts-1.3.5" - sources."escape-html-1.0.3" - sources."negotiator-0.6.1" - ]; - }) + sources."errorhandler-1.4.3" sources."escape-html-1.0.2" sources."etag-1.7.0" (sources."express-3.21.2" // { dependencies = [ + sources."accepts-1.3.5" + sources."destroy-1.0.3" + sources."mime-db-1.34.0" + sources."ms-2.0.0" + sources."multiparty-3.3.2" + sources."negotiator-0.6.1" + sources."qs-4.0.0" sources."range-parser-1.0.3" - ]; - }) - (sources."express-session-1.11.3" // { - dependencies = [ + sources."statuses-1.2.1" sources."uid-safe-2.0.0" ]; }) + sources."express-session-1.11.3" sources."fd-slicer-1.0.1" sources."fifo-0.1.4" - sources."finalhandler-0.4.0" + (sources."finalhandler-0.4.0" // { + dependencies = [ + sources."escape-html-1.0.2" + ]; + }) sources."flatten-0.0.1" sources."fluent-ffmpeg-2.1.2" sources."forever-agent-0.2.0" - (sources."form-data-0.0.10" // { - dependencies = [ - sources."mime-1.2.11" - ]; - }) + sources."form-data-0.0.10" sources."forwarded-0.1.2" sources."fresh-0.3.0" - sources."fs-chunk-store-1.7.0" + (sources."fs-chunk-store-1.7.0" // { + dependencies = [ + sources."mkdirp-0.5.1" + ]; + }) sources."fs.realpath-1.0.0" sources."get-browser-rtc-1.0.2" sources."glob-7.1.2" @@ -43713,14 +41445,11 @@ in sources."k-bucket-0.6.0" (sources."k-rpc-3.7.0" // { dependencies = [ + sources."bencode-2.0.0" sources."k-bucket-2.0.1" ]; }) - (sources."k-rpc-socket-1.8.0" // { - dependencies = [ - sources."bencode-2.0.0" - ]; - }) + sources."k-rpc-socket-1.8.0" sources."lodash-2.4.2" sources."lru-2.0.1" sources."magnet-uri-2.0.1" @@ -43729,8 +41458,6 @@ in (sources."method-override-2.3.10" // { dependencies = [ sources."debug-2.6.9" - sources."ms-2.0.0" - sources."vary-1.1.2" ]; }) sources."methods-1.1.2" @@ -43765,12 +41492,12 @@ in sources."parseurl-1.3.2" sources."path-is-absolute-1.0.1" sources."pause-0.1.0" - (sources."peer-wire-protocol-0.7.1" // { + sources."peer-wire-protocol-0.7.1" + (sources."peer-wire-swarm-0.12.2" // { dependencies = [ sources."bncode-0.2.3" ]; }) - sources."peer-wire-swarm-0.12.2" sources."pend-1.2.0" sources."process-nextick-args-2.0.0" sources."proxy-addr-1.0.10" @@ -43789,14 +41516,14 @@ in ]; }) sources."re-emitter-1.1.3" - sources."read-torrent-1.3.0" - sources."readable-stream-1.1.14" - (sources."request-2.16.6" // { + (sources."read-torrent-1.3.0" // { dependencies = [ sources."mime-1.2.11" sources."qs-0.5.6" ]; }) + sources."readable-stream-1.1.14" + sources."request-2.16.6" (sources."response-time-2.3.2" // { dependencies = [ sources."depd-1.1.2" @@ -43810,72 +41537,43 @@ in sources."safe-buffer-5.1.2" (sources."send-0.13.0" // { dependencies = [ - sources."destroy-1.0.3" - sources."range-parser-1.0.3" - sources."statuses-1.2.1" - ]; - }) - (sources."serve-favicon-2.3.2" // { - dependencies = [ - sources."ms-0.7.2" - ]; - }) - (sources."serve-index-1.7.3" // { - dependencies = [ - sources."escape-html-1.0.3" + sources."ms-0.7.1" ]; }) + sources."serve-favicon-2.3.2" + sources."serve-index-1.7.3" (sources."serve-static-1.10.3" // { dependencies = [ sources."depd-1.1.2" - sources."escape-html-1.0.3" - sources."range-parser-1.0.3" - sources."send-0.13.2" - sources."statuses-1.2.1" + sources."ms-0.7.1" ]; }) sources."simple-concat-1.0.0" sources."simple-get-2.8.1" - (sources."simple-peer-6.4.4" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.6" - sources."string_decoder-1.1.1" - ]; - }) + sources."simple-peer-6.4.4" sources."simple-sha1-2.1.1" (sources."simple-websocket-4.3.1" // { dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.6" - sources."safe-buffer-5.0.1" - sources."string_decoder-1.1.1" - sources."ultron-1.1.1" sources."ws-2.3.1" ]; }) sources."sntp-0.1.4" (sources."socket.io-1.7.4" // { dependencies = [ + sources."accepts-1.3.3" + sources."component-emitter-1.1.2" + sources."cookie-0.3.1" sources."debug-2.3.3" sources."ms-0.7.2" + sources."negotiator-0.6.1" ]; }) - (sources."socket.io-adapter-0.5.0" // { - dependencies = [ - sources."debug-2.3.3" - sources."ms-0.7.2" - ]; - }) - (sources."socket.io-client-1.7.4" // { - dependencies = [ - sources."debug-2.3.3" - sources."ms-0.7.2" - ]; - }) + sources."socket.io-adapter-0.5.0" + sources."socket.io-client-1.7.4" (sources."socket.io-parser-2.3.1" // { dependencies = [ - sources."component-emitter-1.1.2" + sources."debug-2.2.0" + sources."ms-0.7.1" ]; }) sources."speedometer-0.1.4" @@ -43890,9 +41588,16 @@ in sources."torrent-piece-1.1.2" (sources."torrent-stream-1.0.4" // { dependencies = [ + sources."bencode-0.8.0" sources."end-of-stream-0.1.5" + sources."isarray-1.0.0" + sources."minimist-1.2.0" sources."mkdirp-0.3.5" sources."once-1.3.3" + sources."readable-stream-2.3.6" + sources."safe-buffer-5.0.1" + sources."string_decoder-1.1.1" + sources."ultron-1.1.1" ]; }) sources."tsscmp-1.0.5" @@ -43940,23 +41645,19 @@ in sources."async-2.6.1" sources."aws-sign2-0.6.0" sources."balanced-match-1.0.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."bl-1.0.3" sources."boom-2.10.1" sources."brace-expansion-1.1.11" sources."caseless-0.11.0" sources."chalk-1.1.3" sources."combined-stream-1.0.6" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."concat-map-0.0.1" sources."concat-stream-1.5.0" sources."core-util-is-1.0.2" sources."cryptiles-2.0.5" - (sources."dashdash-1.14.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."dashdash-1.14.1" sources."debug-0.7.4" sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.1" @@ -43971,11 +41672,7 @@ in sources."fs.realpath-1.0.0" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" - (sources."getpass-0.1.7" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."getpass-0.1.7" sources."glob-7.1.2" sources."graceful-fs-4.1.11" sources."har-validator-2.0.6" @@ -44043,11 +41740,7 @@ in sources."tweetnacl-0.14.5" sources."typedarray-0.0.6" sources."util-deprecate-1.0.2" - (sources."verror-1.10.0" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."verror-1.10.0" sources."which-1.2.14" sources."wrappy-1.0.2" sources."xtend-4.0.1" @@ -44065,30 +41758,10 @@ in prettier = nodeEnv.buildNodePackage { name = "prettier"; packageName = "prettier"; -<<<<<<< HEAD -<<<<<<< HEAD version = "1.13.7"; src = fetchurl { url = "https://registry.npmjs.org/prettier/-/prettier-1.13.7.tgz"; - sha512 = "KIU72UmYPGk4MujZGYMFwinB7lOf2LsDNGSOC8ufevsrPLISrZbNJlWstRi3m0AMuszbH+EFSQ/r6w56RSPK6w=="; -======= -<<<<<<< HEAD - version = "1.13.4"; - src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-1.13.4.tgz"; - sha512 = "325wxdf3kzhwx8wnfz13gnllivgbgsbwqfqmq3pv29gamzzwspajfjwz7iw83fxlzf3nyd038h4qv9y544v5b5fjvsh52n0crkh8svs"; -======= -======= ->>>>>>> nodePackages: meguca: 1.0.7 update - version = "1.13.5"; - src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-1.13.5.tgz"; - sha512 = "1zp1phxpbbli50hpbka36wdqkhl4sz765zxb1xzkgmkmfmh1vpbbwcm91pllv4q633wj8v4iipkm09wn7gwvqb0gy8srkybzfcp9kz0"; -<<<<<<< HEAD ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 -======= ->>>>>>> nodePackages: meguca: 1.0.7 update + sha512 = "3mwl8s5g87fpsqg942y27yvrjx0qh4vnwcbbb2m4v6rdb8jn8y2pyvskz5hp3k46h1vpn4zagpc2af20n1ikng868w6jg4q97ckp198"; }; buildInputs = globalBuildInputs; meta = { @@ -44105,20 +41778,13 @@ in version = "12.3.0"; src = fetchurl { url = "https://registry.npmjs.org/pulp/-/pulp-12.3.0.tgz"; -<<<<<<< HEAD - sha512 = "Sm1XQg2h2JBVHWK3bxSHnmMdMoM0hEi5cbGfBBLpM6E2qU1vjJhDJsO/8bEkxC2RvNAAEOWROKMI3tTzmVxLbQ=="; -======= sha512 = "1nlnp4rygadw253728ya400s2y92bf44jqz3gy34r1ri33g9nlkd89kx49097xif6wli11lhcr1sqwyhwa6zdv23mar1n511m15fvaa"; ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 }; dependencies = [ sources."JSONStream-1.3.3" sources."acorn-5.7.1" sources."acorn-dynamic-import-3.0.0" sources."acorn-node-1.5.2" -<<<<<<< HEAD - sources."anymatch-2.0.0" -======= (sources."anymatch-2.0.0" // { dependencies = [ (sources."is-accessor-descriptor-0.1.6" // { @@ -44135,7 +41801,6 @@ in sources."is-extendable-0.1.1" ]; }) ->>>>>>> nodePackages: meguca: 1.0.7 update sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" @@ -44157,7 +41822,12 @@ in sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ - sources."define-property-1.0.0" + (sources."define-property-1.0.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + sources."kind-of-3.2.2" ]; }) sources."base64-js-1.3.0" @@ -44166,7 +41836,6 @@ in sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { dependencies = [ - sources."extend-shallow-2.0.1" sources."is-extendable-0.1.1" ]; }) @@ -44184,6 +41853,8 @@ in sources."readable-stream-2.0.6" ]; }) + sources."isarray-2.0.4" + sources."process-nextick-args-2.0.0" ]; }) sources."browserify-aes-1.2.0" @@ -44206,9 +41877,6 @@ in sources."builtin-status-codes-3.0.0" sources."cache-base-1.0.1" sources."cached-path-relative-1.0.1" -<<<<<<< HEAD - sources."chokidar-2.0.4" -======= (sources."chokidar-2.0.4" // { dependencies = [ sources."is-accessor-descriptor-1.0.0" @@ -44217,23 +41885,10 @@ in sources."is-extendable-1.0.1" ]; }) ->>>>>>> nodePackages: meguca: 1.0.7 update 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."kind-of-5.1.0" ]; }) sources."collection-visit-1.0.0" @@ -44269,20 +41924,6 @@ in (sources."expand-brackets-2.1.4" // { dependencies = [ sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."is-extendable-0.1.1" - sources."kind-of-5.1.0" ]; }) sources."extend-shallow-3.0.2" @@ -44290,15 +41931,10 @@ in dependencies = [ sources."define-property-1.0.0" sources."extend-shallow-2.0.1" - sources."is-extendable-0.1.1" - ]; - }) - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - sources."is-extendable-0.1.1" + sources."kind-of-5.1.0" ]; }) + sources."fill-range-4.0.0" sources."for-in-1.0.2" sources."fragment-cache-0.2.1" sources."fs.realpath-1.0.0" @@ -44315,11 +41951,7 @@ in sources."graceful-fs-4.1.11" sources."has-1.0.3" sources."has-value-1.0.0" - (sources."has-values-1.0.0" // { - dependencies = [ - sources."kind-of-4.0.0" - ]; - }) + sources."has-values-1.0.0" sources."hash-base-3.0.4" sources."hash.js-1.1.4" sources."hmac-drbg-1.0.1" @@ -44330,15 +41962,11 @@ in sources."inflight-1.0.6" sources."inherits-2.0.3" sources."inline-source-map-0.6.2" -<<<<<<< HEAD - sources."insert-module-globals-7.2.0" -======= (sources."insert-module-globals-7.2.0" // { dependencies = [ sources."concat-stream-1.6.2" ]; }) ->>>>>>> nodePackages: meguca: 1.0.7 update sources."is-accessor-descriptor-1.0.0" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" @@ -44361,15 +41989,7 @@ in sources."jsonify-0.0.0" sources."jsonparse-1.3.1" sources."kind-of-6.0.2" -<<<<<<< HEAD - (sources."labeled-stream-splicer-2.0.1" // { - dependencies = [ - sources."isarray-2.0.4" - ]; - }) -======= sources."labeled-stream-splicer-2.0.1" ->>>>>>> nodePackages: meguca: 1.0.7 update sources."lodash.debounce-4.0.8" sources."lodash.memoize-3.0.4" sources."map-cache-0.2.2" @@ -44383,20 +42003,8 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.0" sources."mixin-deep-1.3.1" - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) - (sources."module-deps-4.1.1" // { - dependencies = [ - (sources."concat-stream-1.5.2" // { - dependencies = [ - sources."readable-stream-2.0.6" - ]; - }) - ]; - }) + sources."mkdirp-0.5.1" + sources."module-deps-4.1.1" (sources."mold-source-map-0.4.0" // { dependencies = [ sources."through-2.2.7" @@ -44407,30 +42015,18 @@ in sources."nan-2.10.0" sources."nanomatch-1.2.13" sources."neo-async-2.5.1" - sources."node-static-0.7.10" - sources."normalize-path-2.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."kind-of-3.2.2" - ]; - }) - sources."object-visit-1.0.1" - sources."object.pick-1.3.0" - sources."once-1.4.0" - (sources."optimist-0.6.1" // { + (sources."node-static-0.7.10" // { dependencies = [ sources."minimist-0.0.10" sources."wordwrap-0.0.3" ]; }) + sources."normalize-path-2.1.1" + sources."object-copy-0.1.0" + sources."object-visit-1.0.1" + sources."object.pick-1.3.0" + sources."once-1.4.0" + sources."optimist-0.6.1" sources."os-browserify-0.1.2" sources."os-tmpdir-1.0.2" sources."pako-0.2.9" @@ -44456,7 +42052,7 @@ in sources."read-only-stream-2.0.0" (sources."readable-stream-2.3.6" // { dependencies = [ - sources."process-nextick-args-2.0.0" + sources."isarray-1.0.0" sources."string_decoder-1.1.1" ]; }) @@ -44472,70 +42068,42 @@ in sources."ripemd160-2.0.2" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" - sources."sander-0.5.1" - sources."set-immediate-shim-1.0.1" - (sources."set-value-2.0.0" // { + (sources."sander-0.5.1" // { dependencies = [ - sources."extend-shallow-2.0.1" - sources."is-extendable-0.1.1" + sources."minimist-0.0.8" ]; }) + sources."set-immediate-shim-1.0.1" + sources."set-value-2.0.0" sources."sha.js-2.4.11" sources."shasum-1.0.2" sources."shell-quote-1.6.1" sources."simple-concat-1.0.0" (sources."snapdragon-0.8.2" // { dependencies = [ - sources."define-property-0.2.5" + (sources."define-property-0.2.5" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) 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."is-extendable-0.1.1" - sources."kind-of-5.1.0" - ]; - }) - (sources."snapdragon-node-2.1.1" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) - (sources."snapdragon-util-3.0.1" // { - dependencies = [ - sources."kind-of-3.2.2" + sources."kind-of-4.0.0" ]; }) + sources."snapdragon-node-2.1.1" + sources."snapdragon-util-3.0.1" sources."sorcery-0.10.0" sources."source-map-0.5.7" sources."source-map-resolve-0.5.2" sources."source-map-url-0.4.0" sources."sourcemap-codec-1.4.1" - sources."split-string-3.1.0" - (sources."static-extend-0.1.2" // { + (sources."split-string-3.1.0" // { 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."extend-shallow-3.0.2" + sources."is-extendable-1.0.1" ]; }) + sources."static-extend-0.1.2" sources."stream-browserify-2.0.1" sources."stream-combiner2-1.1.1" sources."stream-http-2.8.3" @@ -44553,11 +42121,7 @@ in sources."through2-2.0.3" sources."timers-browserify-1.4.2" sources."to-arraybuffer-1.0.1" - (sources."to-object-path-0.3.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) + sources."to-object-path-0.3.0" sources."to-regex-3.0.2" sources."to-regex-range-2.1.1" sources."tree-kill-1.2.0" @@ -44567,8 +42131,6 @@ in sources."undeclared-identifiers-1.1.2" (sources."union-value-1.0.0" // { dependencies = [ - sources."extend-shallow-2.0.1" - sources."is-extendable-0.1.1" sources."set-value-0.4.3" ]; }) @@ -44579,7 +42141,6 @@ in sources."isobject-2.1.0" ]; }) - sources."has-values-0.1.4" ]; }) sources."upath-1.1.0" @@ -44589,11 +42150,34 @@ in sources."punycode-1.3.2" ]; }) - sources."use-3.1.0" + (sources."use-3.1.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) sources."util-0.10.4" sources."util-deprecate-1.0.2" sources."vm-browserify-0.0.4" - sources."watchpack-1.6.0" + (sources."watchpack-1.6.0" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + sources."has-values-0.1.4" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."is-extendable-0.1.1" + sources."kind-of-3.2.2" + ]; + }) sources."which-1.3.1" sources."wordwrap-1.0.0" sources."wrappy-1.0.2" @@ -44642,7 +42226,7 @@ in sources."babel-types-6.26.0" sources."babylon-6.18.0" sources."basic-auth-2.0.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."bindings-1.2.1" sources."bl-1.2.2" sources."body-parser-1.18.3" @@ -44662,7 +42246,7 @@ in sources."co-4.6.0" sources."code-point-at-1.1.0" sources."combined-stream-1.0.6" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."console-control-strings-1.1.0" sources."constantinople-3.1.2" sources."content-disposition-0.5.2" @@ -44673,11 +42257,7 @@ in sources."core-js-2.5.7" sources."core-util-is-1.0.2" sources."cryptiles-2.0.5" - (sources."dashdash-1.14.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."dashdash-1.14.1" sources."debug-2.6.9" sources."decamelize-1.2.0" sources."deep-extend-0.6.0" @@ -44698,26 +42278,25 @@ in sources."expand-template-1.1.1" (sources."express-4.16.3" // { dependencies = [ - sources."body-parser-1.18.2" - (sources."http-errors-1.6.2" // { + (sources."body-parser-1.18.2" // { dependencies = [ - sources."depd-1.1.1" sources."setprototypeof-1.0.3" ]; }) sources."iconv-lite-0.4.19" sources."qs-6.5.1" - sources."raw-body-2.3.2" + (sources."raw-body-2.3.2" // { + dependencies = [ + sources."depd-1.1.1" + sources."http-errors-1.6.2" + ]; + }) sources."statuses-1.4.0" ]; }) sources."extend-3.0.1" sources."extsprintf-1.3.0" - (sources."finalhandler-1.1.1" // { - dependencies = [ - sources."statuses-1.4.0" - ]; - }) + sources."finalhandler-1.1.1" sources."forever-agent-0.6.1" sources."form-data-2.1.4" sources."forwarded-0.1.2" @@ -44725,11 +42304,7 @@ in sources."fs-constants-1.0.0" sources."function-bind-1.1.1" sources."gauge-2.7.4" - (sources."getpass-0.1.7" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."getpass-0.1.7" sources."github-from-package-0.0.0" sources."graceful-fs-4.1.11" sources."har-schema-1.0.5" @@ -44749,11 +42324,7 @@ in sources."ipaddr.js-1.6.0" sources."is-3.2.1" sources."is-buffer-1.1.6" - (sources."is-expression-3.0.0" // { - dependencies = [ - sources."acorn-4.0.13" - ]; - }) + sources."is-expression-3.0.0" sources."is-fullwidth-code-point-1.0.0" sources."is-promise-2.1.0" sources."is-regex-1.0.4" @@ -44774,7 +42345,11 @@ in sources."jstransformer-1.0.0" sources."kind-of-3.2.2" sources."lazy-cache-1.0.4" - sources."less-2.7.3" + (sources."less-2.7.3" // { + dependencies = [ + sources."qs-6.4.0" + ]; + }) sources."less-middleware-2.2.1" sources."libquassel-2.1.9" sources."lodash-4.17.10" @@ -44791,9 +42366,6 @@ in sources."ms-2.0.0" sources."nan-2.5.1" sources."negotiator-0.6.1" -<<<<<<< HEAD - sources."net-browserify-alt-1.1.0" -======= (sources."net-browserify-alt-1.1.0" // { dependencies = [ sources."minimist-1.2.0" @@ -44801,7 +42373,6 @@ in sources."tunnel-agent-0.4.3" ]; }) ->>>>>>> nodePackages: meguca: 1.0.7 update sources."node-abi-2.4.3" sources."node.extend-2.0.0" sources."noop-logger-0.1.1" @@ -44817,17 +42388,16 @@ in sources."path-parse-1.0.5" sources."path-to-regexp-0.1.7" sources."performance-now-0.2.0" - (sources."prebuild-install-2.1.2" // { - dependencies = [ - sources."minimist-1.2.0" - sources."tunnel-agent-0.4.3" - ]; - }) + sources."prebuild-install-2.1.2" sources."process-nextick-args-2.0.0" sources."promise-7.3.1" sources."proxy-addr-2.0.3" sources."prr-1.0.1" - sources."pug-2.0.3" + (sources."pug-2.0.3" // { + dependencies = [ + sources."acorn-4.0.13" + ]; + }) sources."pug-attrs-2.0.3" sources."pug-code-gen-2.0.1" sources."pug-error-1.3.2" @@ -44845,33 +42415,17 @@ in sources."qtdatastream-0.7.1" sources."range-parser-1.2.0" sources."raw-body-2.3.3" - (sources."rc-1.2.8" // { - dependencies = [ - sources."minimist-1.2.0" - ]; - }) + sources."rc-1.2.8" sources."readable-stream-2.3.6" sources."regenerator-runtime-0.11.1" sources."repeat-string-1.6.1" -<<<<<<< HEAD - (sources."request-2.81.0" // { - dependencies = [ - sources."qs-6.4.0" - ]; - }) -======= sources."request-2.81.0" ->>>>>>> nodePackages: meguca: 1.0.7 update sources."resolve-1.8.1" sources."right-align-0.1.3" sources."safe-buffer-5.1.1" sources."safer-buffer-2.1.2" sources."semver-5.5.0" - (sources."send-0.16.2" // { - dependencies = [ - sources."statuses-1.4.0" - ]; - }) + sources."send-0.16.2" (sources."serve-favicon-2.3.2" // { dependencies = [ sources."etag-1.7.0" @@ -44913,24 +42467,16 @@ in sources."unzip-response-1.0.2" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."vary-1.1.2" - (sources."verror-1.10.0" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."verror-1.10.0" sources."void-elements-2.0.1" sources."wide-align-1.1.3" sources."window-size-0.1.0" sources."with-5.1.1" sources."wordwrap-0.0.2" sources."wrappy-1.0.2" - (sources."ws-2.3.1" // { - dependencies = [ - sources."safe-buffer-5.0.1" - ]; - }) + sources."ws-2.3.1" sources."xtend-4.0.1" sources."yargs-3.10.0" ]; @@ -44958,7 +42504,7 @@ in sources."balanced-match-1.0.0" sources."base62-0.1.1" sources."brace-expansion-1.1.11" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."commoner-0.10.8" sources."concat-map-0.0.1" sources."defined-1.0.0" @@ -45026,17 +42572,17 @@ in sources."isstream-0.1.2" sources."minimatch-3.0.4" sources."minimist-1.2.0" - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mkdirp-0.5.1" sources."mute-stream-0.0.7" sources."ncp-0.4.2" sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."pkginfo-0.4.1" - sources."prompt-0.2.14" + (sources."prompt-0.2.14" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) sources."read-1.0.7" sources."revalidator-0.1.8" sources."rimraf-2.6.2" @@ -45077,7 +42623,7 @@ in sources."aws-sdk-1.18.0" sources."aws-sign2-0.7.0" sources."aws4-1.7.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."buffer-crc32-0.2.1" sources."bytes-0.2.1" sources."caseless-0.12.0" @@ -45180,7 +42726,7 @@ in sources."tweetnacl-0.14.5" sources."uid2-0.0.3" sources."util-0.4.9" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."verror-1.10.0" sources."xml2js-0.2.4" sources."xmlbuilder-0.4.2" @@ -45197,7 +42743,7 @@ in version = "5.5.0"; src = fetchurl { url = "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz"; - sha512 = "4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA=="; + sha512 = "0h32zh035y8m6dzcqhcymbhwgmc8839fa1hhj0jfh9ivp9kmqfj1sbwnsnkzcn9qm3sqn38sa8ys2g4c638lpnmzjr0a0qndmv7f8p1"; }; buildInputs = globalBuildInputs; meta = { @@ -45211,57 +42757,16 @@ in serve = nodeEnv.buildNodePackage { name = "serve"; packageName = "serve"; -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - version = "9.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/serve/-/serve-9.1.0.tgz"; - sha512 = "6PXXiYbBz4IN0JZUY6GsEmOfb5EA64vXkldffYf9O4xbL+oRVQN4Gdhqpi5Kjpw5tlQP9z1mKhGh4Ysk4y2TUw=="; -======= -======= ->>>>>>> nodePackages: meguca: 1.0.5 -> 1.0.7 -<<<<<<< HEAD - version = "8.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/serve/-/serve-8.1.1.tgz"; - sha512 = "33362hcr3ya4yadf2vzck9w8ihh58g025y2ngrj7c461h2jbazi1ddrp4qi8d82y5781rkrihahas2y3pcskipx75n2mghs2mhs98dx"; -======= - version = "8.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/serve/-/serve-8.1.2.tgz"; - sha512 = "1n065fkglc79qiaj96c6aiz3rcmc8fw6vv58xpq4fw8k4cawyzpryhmpxa5433j2b0ska9jw66z4rpcbf8nq633y04wsg7xf01fzvm1"; ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 -<<<<<<< HEAD ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 -======= -======= - version = "8.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/serve/-/serve-8.1.3.tgz"; - sha512 = "0cxicqbyqwpvfdsskdggc87mj4y789fv0b469dz3ynl8897dhwwwcc1p5f219c9wha1gxpx9qw61qlgpzk66kffrngvil054fv3laif"; ->>>>>>> nodePackages: meguca: 1.0.5 -> 1.0.7 ->>>>>>> nodePackages: meguca: 1.0.5 -> 1.0.7 -======= version = "9.1.0"; src = fetchurl { url = "https://registry.npmjs.org/serve/-/serve-9.1.0.tgz"; sha512 = "19r6bg34j5y388i59k3vxqgajv3k74f98pacsnq35w06m8ix8pmp31vzn3pspspjbbqpsq0j5pryqqjmjhn6m4ns06q5ky1hs4xgxg8"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; dependencies = [ sources."@zeit/schemas-1.2.0" sources."ajv-6.5.1" -<<<<<<< HEAD -<<<<<<< HEAD sources."ansi-align-2.0.0" sources."ansi-regex-3.0.0" -======= ->>>>>>> nodePackages: meguca: 1.0.5 -> 1.0.7 -======= - sources."ansi-align-2.0.0" - sources."ansi-regex-3.0.0" ->>>>>>> nodePackages: meguca: 1.0.7 update sources."ansi-styles-3.2.1" sources."arch-2.1.1" sources."arg-2.0.0" @@ -45287,38 +42792,17 @@ in sources."execa-0.7.0" sources."fast-deep-equal-2.0.1" sources."fast-json-stable-stringify-2.0.0" -<<<<<<< HEAD - (sources."fast-url-parser-1.1.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) -======= sources."fast-url-parser-1.1.3" ->>>>>>> nodePackages: meguca: 1.0.7 update sources."get-stream-3.0.0" sources."glob-slash-1.0.0" sources."glob-slasher-1.0.1" sources."has-flag-3.0.0" sources."ini-1.3.5" -<<<<<<< HEAD -<<<<<<< HEAD sources."is-fullwidth-code-point-2.0.0" sources."is-stream-1.1.0" sources."isexe-2.0.0" sources."json-schema-traverse-0.4.1" sources."lodash-4.17.10" -======= - sources."json-schema-traverse-0.4.1" - sources."lodash-2.4.2" ->>>>>>> nodePackages: meguca: 1.0.5 -> 1.0.7 -======= - sources."is-fullwidth-code-point-2.0.0" - sources."is-stream-1.1.0" - sources."isexe-2.0.0" - sources."json-schema-traverse-0.4.1" - sources."lodash-4.17.10" ->>>>>>> nodePackages: meguca: 1.0.7 update sources."lodash._objecttypes-2.4.1" sources."lodash.isobject-2.4.1" sources."lru-cache-4.1.3" @@ -45337,34 +42821,17 @@ in sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" sources."safe-buffer-5.1.2" -<<<<<<< HEAD -<<<<<<< HEAD - sources."serve-handler-3.2.1" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.2" - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" - sources."strip-eof-1.0.0" -======= - (sources."serve-handler-3.1.1" // { -======= (sources."serve-handler-3.2.1" // { ->>>>>>> nodePackages: meguca: 1.0.7 update dependencies = [ sources."punycode-1.4.1" ]; }) -<<<<<<< HEAD ->>>>>>> nodePackages: meguca: 1.0.5 -> 1.0.7 -======= sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" sources."strip-eof-1.0.0" ->>>>>>> nodePackages: meguca: 1.0.7 update sources."strip-json-comments-2.0.1" sources."supports-color-5.4.0" sources."term-size-1.2.0" @@ -45408,17 +42875,26 @@ in sources."base64-arraybuffer-0.1.2" sources."base64id-0.1.0" sources."bcrypt-nodejs-0.0.3" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."better-assert-1.0.2" sources."blob-0.0.2" - sources."body-parser-1.18.2" + (sources."body-parser-1.18.2" // { + dependencies = [ + sources."setprototypeof-1.0.3" + ]; + }) sources."bytes-3.0.0" sources."callsite-1.0.0" sources."caseless-0.12.0" - sources."cheerio-0.17.0" + (sources."cheerio-0.17.0" // { + dependencies = [ + sources."domelementtype-1.1.3" + sources."domutils-1.5.1" + ]; + }) sources."co-4.6.0" sources."combined-stream-1.0.6" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."component-bind-1.0.0" sources."component-emitter-1.1.2" sources."component-inherit-0.0.3" @@ -45432,11 +42908,7 @@ in sources."delayed-stream-1.0.0" sources."depd-1.1.2" sources."destroy-1.0.4" - (sources."dom-serializer-0.0.1" // { - dependencies = [ - sources."domelementtype-1.1.3" - ]; - }) + sources."dom-serializer-0.0.1" sources."domelementtype-1.3.0" sources."domhandler-2.2.1" sources."domutils-1.4.3" @@ -45450,11 +42922,7 @@ in sources."debug-0.6.0" ]; }) - (sources."engine.io-client-1.3.1" // { - dependencies = [ - sources."debug-0.7.4" - ]; - }) + sources."engine.io-client-1.3.1" sources."engine.io-parser-1.0.6" sources."entities-1.1.1" sources."escape-html-1.0.3" @@ -45479,7 +42947,6 @@ in sources."has-cors-1.0.3" (sources."htmlparser2-3.7.3" // { dependencies = [ - sources."domutils-1.5.1" sources."entities-1.0.0" ]; }) @@ -45534,7 +43001,6 @@ in dependencies = [ sources."depd-1.1.1" sources."http-errors-1.6.2" - sources."setprototypeof-1.0.3" ]; }) sources."read-1.0.7" @@ -45553,26 +43019,18 @@ in }) (sources."socket.io-1.0.6" // { dependencies = [ + sources."commander-0.6.1" sources."debug-0.7.4" + sources."emitter-http://github.com/component/emitter/archive/1.0.1.tar.gz" ]; }) (sources."socket.io-adapter-0.2.0" // { dependencies = [ - sources."debug-0.7.4" - sources."emitter-http://github.com/component/emitter/archive/1.0.1.tar.gz" sources."socket.io-parser-2.1.2" ]; }) - (sources."socket.io-client-1.0.6" // { - dependencies = [ - sources."debug-0.7.4" - ]; - }) - (sources."socket.io-parser-2.2.0" // { - dependencies = [ - sources."debug-0.7.4" - ]; - }) + sources."socket.io-client-1.0.6" + sources."socket.io-parser-2.2.0" sources."split-0.3.3" sources."sshpk-1.14.2" sources."statuses-1.4.0" @@ -45588,14 +43046,10 @@ in sources."unpipe-1.0.0" sources."utf8-2.0.0" sources."utils-merge-1.0.1" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."vary-1.1.2" sources."verror-1.10.0" - (sources."ws-0.4.31" // { - dependencies = [ - sources."commander-0.6.1" - ]; - }) + sources."ws-0.4.31" sources."xmlhttprequest-https://github.com/LearnBoost/node-XMLHttpRequest/archive/0f36d0b5ebc03d85f860d42a64ae9791e1daa433.tar.gz" ]; buildInputs = globalBuildInputs; @@ -45631,7 +43085,7 @@ in sources."aws-sign2-0.7.0" sources."aws4-1.7.0" sources."balanced-match-1.0.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" (sources."body-parser-1.18.3" // { dependencies = [ sources."bytes-3.0.0" @@ -45641,7 +43095,11 @@ in ]; }) sources."brace-expansion-1.1.11" - sources."bunyan-1.8.12" + (sources."bunyan-1.8.12" // { + dependencies = [ + sources."minimatch-3.0.4" + ]; + }) sources."bytes-1.0.0" sources."caseless-0.12.0" sources."chalk-2.4.1" @@ -45649,15 +43107,12 @@ in sources."color-convert-1.9.2" sources."color-name-1.1.1" sources."combined-stream-1.0.6" - sources."commander-2.15.1" - (sources."compressible-2.0.14" // { - dependencies = [ - sources."mime-db-1.34.0" - ]; - }) + sources."commander-2.16.0" + sources."compressible-2.0.14" (sources."compression-1.7.2" // { dependencies = [ sources."bytes-3.0.0" + sources."mime-db-1.34.0" ]; }) sources."concat-map-0.0.1" @@ -45704,21 +43159,17 @@ in sources."fresh-0.5.2" sources."fs-ext-0.6.0" sources."getpass-0.1.7" - (sources."glob-6.0.4" // { + sources."glob-6.0.4" + (sources."handlebars-2.0.0" // { dependencies = [ - sources."minimatch-3.0.4" + sources."async-0.2.10" ]; }) - sources."handlebars-2.0.0" sources."har-schema-2.0.0" sources."har-validator-5.0.3" sources."has-flag-3.0.0" sources."highlight.js-8.9.1" - (sources."htmlparser2-3.9.2" // { - dependencies = [ - sources."readable-stream-2.3.6" - ]; - }) + sources."htmlparser2-3.9.2" (sources."http-errors-1.6.3" // { dependencies = [ sources."setprototypeof-1.1.0" @@ -45777,15 +43228,7 @@ in sources."path-is-absolute-1.0.1" sources."path-to-regexp-0.1.7" sources."performance-now-2.1.0" -<<<<<<< HEAD - (sources."postcss-6.0.23" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) -======= sources."postcss-6.0.23" ->>>>>>> nodePackages: meguca: 1.0.7 update sources."process-nextick-args-2.0.0" sources."proxy-addr-1.1.5" sources."punycode-1.4.1" @@ -45798,7 +43241,12 @@ in sources."string_decoder-0.10.31" ]; }) - sources."render-readme-1.3.1" + (sources."render-readme-1.3.1" // { + dependencies = [ + sources."readable-stream-2.3.6" + sources."source-map-0.6.1" + ]; + }) (sources."request-2.87.0" // { dependencies = [ sources."qs-6.5.2" @@ -45834,15 +43282,11 @@ in sources."tweetnacl-0.14.5" sources."type-is-1.6.16" sources."uc.micro-1.0.5" - (sources."uglify-js-2.3.6" // { - dependencies = [ - sources."async-0.2.10" - ]; - }) + sources."uglify-js-2.3.6" sources."unpipe-1.0.0" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.0" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."vary-1.1.2" sources."verror-1.10.0" sources."wordwrap-0.0.3" @@ -45940,12 +43384,7 @@ in sources."jodid25519-1.0.2" sources."jsbn-0.1.1" sources."json-schema-0.2.3" - (sources."jsprim-1.4.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - sources."extsprintf-1.3.0" - ]; - }) + sources."jsprim-1.4.1" sources."keep-alive-agent-0.0.1" sources."lru-cache-2.2.0" sources."mime-1.6.0" @@ -45980,24 +43419,26 @@ in sources."semver-4.3.6" (sources."smartdc-auth-2.3.1" // { dependencies = [ + sources."asn1-0.2.3" sources."assert-plus-0.1.2" sources."clone-0.1.5" sources."dashdash-1.10.1" - sources."extsprintf-1.0.0" + sources."extsprintf-1.3.0" (sources."http-signature-1.2.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."json-schema-0.2.2" + (sources."jsprim-0.3.0" // { + dependencies = [ + sources."verror-1.3.3" + ]; + }) sources."once-1.3.0" (sources."vasync-1.4.3" // { dependencies = [ - (sources."jsprim-0.3.0" // { - dependencies = [ - sources."verror-1.3.3" - ]; - }) + sources."extsprintf-1.0.0" ]; }) sources."verror-1.1.0" @@ -46006,16 +43447,14 @@ in sources."spdy-1.32.5" (sources."sshpk-1.7.1" // { dependencies = [ - sources."asn1-0.2.3" sources."assert-plus-0.2.0" - (sources."dashdash-1.14.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) ]; }) - sources."sshpk-agent-1.2.1" + (sources."sshpk-agent-1.2.1" // { + dependencies = [ + sources."assert-plus-0.1.5" + ]; + }) sources."stream-transform-0.1.2" sources."string_decoder-1.1.1" sources."tunnel-agent-0.4.3" @@ -46048,7 +43487,7 @@ in version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/socket.io/-/socket.io-2.1.1.tgz"; - sha512 = "rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA=="; + sha512 = "343q0n5zxyjzzcmyq7dr3naqbrpl3x469y1ff8zxxr104np1l5l9w1d0vl7nncbaxhxymwplbzfy9sbipjrbp5d001nvv9ysymnmr5c"; }; dependencies = [ sources."accepts-1.3.5" @@ -46226,7 +43665,7 @@ in version = "1.0.5"; src = fetchurl { url = "https://registry.npmjs.org/svgo/-/svgo-1.0.5.tgz"; - sha512 = "nYrifviB77aNKDNKKyuay3M9aYiK6Hv5gJVDdjj2ZXTQmI8WZc8+UPLR5IpVlktJfSu3co/4XcWgrgI6seGBPg=="; + sha512 = "0z83qdi781ax865bpw8ywmp5dyljjwnan5f9lgja0zcyr8niycd0x35yqw7chwmh3wpps4ai1lkswybk8mjnjik526vdvw1z1zf52lx"; }; dependencies = [ sources."argparse-1.0.10" @@ -46354,29 +43793,21 @@ in sources."asynckit-0.4.0" sources."aws-sign2-0.6.0" sources."aws4-1.7.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."boom-2.10.1" sources."camelcase-1.2.1" sources."caseless-0.12.0" sources."center-align-0.1.3" sources."chalk-1.1.3" - (sources."cliui-2.1.0" // { - dependencies = [ - sources."wordwrap-0.0.2" - ]; - }) + sources."cliui-2.1.0" sources."co-4.6.0" sources."colors-1.1.2" sources."combined-stream-1.0.6" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."core-util-is-1.0.2" sources."cryptiles-2.0.5" sources."cycle-1.0.3" - (sources."dashdash-1.14.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."dashdash-1.14.1" sources."decamelize-1.2.0" sources."delayed-stream-1.0.0" sources."diff-3.2.0" @@ -46395,11 +43826,7 @@ in sources."fs-extra-2.1.2" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" - (sources."getpass-0.1.7" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."getpass-0.1.7" sources."graceful-fs-4.1.11" sources."har-schema-1.0.5" sources."har-validator-4.2.1" @@ -46441,6 +43868,8 @@ in sources."async-2.3.0" sources."fs-extra-2.0.0" sources."request-2.81.0" + sources."source-map-0.5.7" + sources."wordwrap-0.0.2" ]; }) sources."oauth-sign-0.8.2" @@ -46483,18 +43912,10 @@ in sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - (sources."uglify-js-2.8.21" // { - dependencies = [ - sources."source-map-0.5.7" - ]; - }) + sources."uglify-js-2.8.21" sources."uglify-to-browserify-1.0.2" sources."uuid-3.0.1" - (sources."verror-1.10.0" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."verror-1.10.0" sources."window-size-0.1.0" (sources."winston-1.1.2" // { dependencies = [ @@ -46522,11 +43943,7 @@ in version = "2.9.2"; src = fetchurl { url = "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz"; -<<<<<<< HEAD - sha512 = "Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w=="; -======= sha512 = "39mbnbv5shzcdgdidpzgzx35gy4g2b4vxmpcqjg0irymcivm5kc0yckb0vvmgyb2lwcn6282n1nc4s1d73k8f468jgqnsjdf7m2kghs"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; buildInputs = globalBuildInputs; meta = { @@ -46558,13 +43975,7 @@ in sources."asynckit-0.4.0" sources."balanced-match-1.0.0" sources."bluebird-3.5.1" - (sources."boxen-1.3.0" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.1" - sources."supports-color-5.4.0" - ]; - }) + sources."boxen-1.3.0" sources."brace-expansion-1.1.11" sources."buffer-from-1.1.0" sources."camelcase-4.1.0" @@ -46573,7 +43984,12 @@ in sources."ci-info-1.1.3" sources."cli-boxes-1.0.0" sources."cli-cursor-1.0.2" - sources."cli-truncate-1.1.0" + (sources."cli-truncate-1.1.0" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."strip-ansi-4.0.0" + ]; + }) sources."clone-1.0.4" sources."color-convert-1.9.2" sources."color-name-1.1.1" @@ -46653,11 +44069,7 @@ in sources."mime-types-2.1.18" sources."minimatch-3.0.4" sources."minimist-1.2.0" - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mkdirp-0.5.1" sources."ms-2.0.0" sources."nopt-1.0.10" sources."npm-run-path-2.0.2" @@ -46665,11 +44077,7 @@ in sources."once-1.4.0" sources."onetime-1.1.0" sources."p-finally-1.0.0" - (sources."package-json-4.0.1" // { - dependencies = [ - sources."semver-5.5.0" - ]; - }) + sources."package-json-4.0.1" sources."parse-json-2.2.0" sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" @@ -46686,7 +44094,11 @@ in sources."pseudomap-1.0.2" sources."psl-1.1.28" sources."punycode-1.4.1" - sources."rc-1.2.8" + (sources."rc-1.2.8" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) sources."readable-stream-2.3.6" sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" @@ -46701,12 +44113,7 @@ in sources."slice-ansi-1.0.0" sources."sort-keys-1.1.2" sources."string-template-1.0.0" - (sources."string-width-2.1.1" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."strip-ansi-4.0.0" - ]; - }) + sources."string-width-2.1.1" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-bom-3.0.0" @@ -46721,15 +44128,11 @@ in sources."tough-cookie-2.4.3" sources."typedarray-0.0.6" sources."typescript-2.9.2" -<<<<<<< HEAD - sources."typings-core-2.3.3" -======= (sources."typings-core-2.3.3" // { dependencies = [ sources."minimist-0.0.8" ]; }) ->>>>>>> nodePackages: meguca: 1.0.7 update sources."unc-path-regex-0.1.2" sources."unique-string-1.0.0" sources."unzip-response-2.0.1" @@ -46737,6 +44140,7 @@ in dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.1" + sources."semver-5.5.0" sources."supports-color-5.4.0" ]; }) @@ -46765,17 +44169,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; -<<<<<<< HEAD version = "3.4.2"; src = fetchurl { url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.2.tgz"; - sha512 = "/kVQDzwiE9Vy7Y63eMkMozF4jIt0C2+xHctF9YpqNWdE/NLOuMurshkpoYGUlAbeYhACPv0HJPIHJul0Ak4/uw=="; -======= - version = "3.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.1.tgz"; - sha512 = "2hafajm9v9l1if7nqn9kwngd1yrrra3m9hgbjpx4wffqh9a589cwid6bx18l9pfj7cwf90hlk2nim0akl9dvhww5ddc1zg4fsiq4dr1"; ->>>>>>> nodePackages: meguca: 1.0.7 update + sha512 = "2xkykh2fkljc1zj4h3zsgh221idw1lljj0s2a8rnamwpf6fsby48rrmda5gaifb3nqny2vlif67hcd31k4pidwfxmrda4r27h7m0igy"; }; dependencies = [ sources."commander-2.15.1" @@ -46793,31 +44190,10 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; -<<<<<<< HEAD -<<<<<<< HEAD - version = "1.4.26"; + version = "1.4.27"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.4.26.tgz"; - sha512 = "hA1Sr7zi6v+RhcJVC4cOySorCh21+Xdw627ewEkLlRXIWVjUnwdj8cEr0gj6apL7E+lqso3NwhZS/GliMyeL2g=="; -======= -<<<<<<< HEAD - version = "1.4.24"; - src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.4.24.tgz"; - sha512 = "1lx5m5bkm4m64qiy8ccnbixchng112m2b9qvzd963k8f0nb298hfjrry1c2la1bavv834zdvgv2xwa93fdyaq0wrv562p9d0n1p5lxy"; -======= - version = "1.4.25"; - src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.4.25.tgz"; - sha512 = "2f8fb42a03zpqd715d09k2g39zwb8xwq7qjh6zrw543kn3g66mq0s8civhv9b4frai8phpqdxlhyd7dbvw4ykhbyfmfq3x220svvvxf"; ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 -======= - version = "1.4.26"; - src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.4.26.tgz"; - sha512 = "3d8n9rkc9lzqlhnqb6qvckax49zp4kaz84d4ay1y5ihg7ylb1cwh5cm1d4w1pkfxdq7gydm3l52nan91s3hnmf2hn8zzsp2pjpm43c4"; ->>>>>>> nodePackages: meguca: 1.0.7 update + url = "https://registry.npmjs.org/ungit/-/ungit-1.4.27.tgz"; + sha512 = "2dg9q7pdd7jzq4bimlhb2pp4x2nmlwhcln1fapkx4w6qi8fxvrcish6jhhqwv5zn9vsq1l1s7yprhcj60y5v23ckijqqm0p6p39ln74"; }; dependencies = [ sources."abbrev-1.1.1" @@ -46826,13 +44202,7 @@ in sources."ajv-5.5.2" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" - (sources."are-we-there-yet-1.1.5" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.6" - sources."string_decoder-1.1.1" - ]; - }) + sources."are-we-there-yet-1.1.5" sources."array-flatten-1.1.1" sources."arraybuffer.slice-0.0.7" sources."asn1-0.2.3" @@ -46846,7 +44216,7 @@ in sources."balanced-match-1.0.0" sources."base64-arraybuffer-0.1.5" sources."base64id-1.0.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."better-assert-1.0.2" sources."blob-0.0.4" sources."bluebird-3.5.1" @@ -46863,10 +44233,7 @@ in sources."charenc-0.0.2" (sources."cliui-4.1.0" // { dependencies = [ - sources."ansi-regex-3.0.0" - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" + sources."ansi-regex-2.1.1" ]; }) sources."clone-2.1.2" @@ -46882,13 +44249,7 @@ in sources."component-emitter-1.1.2" sources."component-inherit-0.0.3" sources."concat-map-0.0.1" - (sources."concat-stream-1.6.2" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.6" - sources."string_decoder-1.1.1" - ]; - }) + sources."concat-stream-1.6.2" sources."console-control-strings-1.1.0" sources."content-disposition-0.5.2" sources."content-type-1.0.4" @@ -46904,31 +44265,26 @@ in sources."cycle-1.0.3" sources."dashdash-1.14.1" sources."debug-2.6.9" - sources."decamelize-1.2.0" + sources."decamelize-2.0.0" sources."deep-extend-0.6.0" sources."delayed-stream-0.0.5" sources."delegates-1.0.0" sources."depd-1.1.2" sources."destroy-1.0.4" sources."diff-3.5.0" - sources."diff2html-2.3.3" + (sources."diff2html-2.3.3" // { + dependencies = [ + sources."mkdirp-0.3.0" + ]; + }) sources."dnd-page-scroll-0.0.4" sources."eachr-3.2.0" sources."ecc-jsbn-0.1.1" sources."editions-1.3.4" sources."ee-first-1.1.1" sources."encodeurl-1.0.2" - (sources."engine.io-3.2.0" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) - (sources."engine.io-client-3.2.1" // { - dependencies = [ - sources."component-emitter-1.2.1" - sources."debug-3.1.0" - ]; - }) + sources."engine.io-3.2.0" + sources."engine.io-client-3.2.1" sources."engine.io-parser-2.1.2" sources."escape-html-1.0.3" sources."etag-1.8.1" @@ -46936,16 +44292,19 @@ in sources."execa-0.7.0" (sources."express-4.16.3" // { dependencies = [ - sources."body-parser-1.18.2" - (sources."http-errors-1.6.2" // { + (sources."body-parser-1.18.2" // { dependencies = [ - sources."depd-1.1.1" sources."setprototypeof-1.0.3" ]; }) sources."iconv-lite-0.4.19" sources."qs-6.5.1" - sources."raw-body-2.3.2" + (sources."raw-body-2.3.2" // { + dependencies = [ + sources."depd-1.1.1" + sources."http-errors-1.6.2" + ]; + }) sources."statuses-1.4.0" ]; }) @@ -46956,18 +44315,10 @@ in sources."eyes-0.1.8" sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" - (sources."finalhandler-1.1.1" // { - dependencies = [ - sources."statuses-1.4.0" - ]; - }) - sources."find-up-2.1.0" + sources."finalhandler-1.1.1" + sources."find-up-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-0.1.3" // { - dependencies = [ - sources."mime-1.2.11" - ]; - }) + sources."form-data-0.1.3" sources."formidable-1.0.14" sources."forwarded-0.1.2" sources."fresh-0.5.2" @@ -46981,19 +44332,11 @@ in sources."graceful-fs-4.1.11" sources."har-schema-2.0.0" sources."har-validator-5.0.3" - (sources."has-binary2-1.0.3" // { - dependencies = [ - sources."isarray-2.0.1" - ]; - }) + sources."has-binary2-1.0.3" sources."has-cors-1.1.0" sources."has-unicode-2.0.1" sources."hasher-1.2.0" - (sources."hogan.js-3.0.2" // { - dependencies = [ - sources."mkdirp-0.3.0" - ]; - }) + sources."hogan.js-3.0.2" sources."hosted-git-info-2.6.1" sources."http-errors-1.6.3" sources."http-signature-1.2.0" @@ -47011,6 +44354,7 @@ in sources."is-fullwidth-code-point-1.0.0" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" + sources."is-wsl-1.1.0" sources."isarray-0.0.1" sources."isexe-2.0.0" sources."isstream-0.1.2" @@ -47032,7 +44376,7 @@ in }) sources."knockout-3.5.0-rc" sources."lcid-1.0.0" - sources."locate-path-2.0.0" + sources."locate-path-3.0.0" sources."locks-0.2.2" sources."lodash-4.17.10" sources."lru-cache-4.1.3" @@ -47061,7 +44405,17 @@ in sources."normalize-package-data-2.4.0" sources."npm-6.1.0" sources."npm-package-arg-6.1.0" - sources."npm-registry-client-8.5.1" + (sources."npm-registry-client-8.5.1" // { + dependencies = [ + sources."combined-stream-1.0.6" + sources."delayed-stream-1.0.0" + sources."extend-3.0.1" + sources."form-data-2.3.2" + sources."isarray-1.0.0" + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" + ]; + }) sources."npm-run-path-2.0.2" sources."npmlog-4.1.2" sources."nprogress-0.2.0" @@ -47073,15 +44427,15 @@ in sources."on-finished-2.3.0" sources."on-headers-1.0.1" sources."once-1.4.0" - sources."open-0.0.5" + sources."opn-5.3.0" sources."os-homedir-1.0.2" sources."os-locale-2.1.0" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" sources."p-finally-1.0.0" - sources."p-limit-1.3.0" - sources."p-locate-2.0.0" - sources."p-try-1.0.0" + sources."p-limit-2.0.0" + sources."p-locate-3.0.0" + sources."p-try-2.0.0" sources."parseqs-0.0.5" sources."parseuri-0.0.5" sources."parseurl-1.3.2" @@ -47114,14 +44468,7 @@ in }) sources."readable-stream-1.0.27-1" sources."reduce-component-1.0.1" - (sources."request-2.87.0" // { - dependencies = [ - sources."combined-stream-1.0.6" - sources."delayed-stream-1.0.0" - sources."extend-3.0.1" - sources."form-data-2.3.2" - ]; - }) + sources."request-2.87.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" sources."retry-0.10.1" @@ -47129,11 +44476,7 @@ in sources."safe-buffer-5.1.1" sources."safer-buffer-2.1.2" sources."semver-5.5.0" - (sources."send-0.16.2" // { - dependencies = [ - sources."statuses-1.4.0" - ]; - }) + sources."send-0.16.2" sources."serve-static-1.13.2" sources."set-blocking-2.0.0" sources."setprototypeof-1.1.0" @@ -47145,24 +44488,15 @@ in sources."slide-1.1.6" sources."snapsvg-0.5.1" (sources."socket.io-2.1.1" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) - sources."socket.io-adapter-1.1.1" - (sources."socket.io-client-2.1.1" // { - dependencies = [ - sources."component-emitter-1.2.1" - sources."debug-3.1.0" - ]; - }) - (sources."socket.io-parser-3.2.0" // { dependencies = [ sources."component-emitter-1.2.1" sources."debug-3.1.0" sources."isarray-2.0.1" ]; }) + sources."socket.io-adapter-1.1.1" + sources."socket.io-client-2.1.1" + sources."socket.io-parser-3.2.0" sources."spdx-correct-3.0.0" sources."spdx-exceptions-2.1.0" sources."spdx-expression-parse-3.0.0" @@ -47210,7 +44544,7 @@ in sources."unpipe-1.0.0" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."validate-npm-package-license-3.0.3" sources."validate-npm-package-name-3.0.0" sources."vary-1.1.2" @@ -47224,13 +44558,19 @@ in sources."async-1.0.0" ]; }) - sources."wrap-ansi-2.1.0" + (sources."wrap-ansi-2.1.0" // { + dependencies = [ + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + ]; + }) 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.0" // { + (sources."yargs-12.0.1" // { dependencies = [ sources."ansi-regex-3.0.0" sources."is-fullwidth-code-point-2.0.0" @@ -47238,7 +44578,7 @@ in sources."strip-ansi-4.0.0" ]; }) - sources."yargs-parser-10.0.0" + sources."yargs-parser-10.1.0" sources."yeast-0.1.2" ]; buildInputs = globalBuildInputs; @@ -47256,15 +44596,11 @@ in version = "2.9.6"; src = fetchurl { url = "https://registry.npmjs.org/vue-cli/-/vue-cli-2.9.6.tgz"; - sha512 = "swQ0bfyJSWfFr42IXr8A774yA1n+YudhzsaHBKhWSkczSqjvgZvSvM8NEnx6QKnfOHBXbdNR5vhahjNUMlftQQ=="; + sha512 = "10ysmrjahrqcnpqwr8x6vapf0wdzaa0g9y143fgpk99p0ggm1536isaasl091y6rrhyfqpyb41k5gpg02zmx24dmz2nfjc9zink815k"; }; dependencies = [ sources."absolute-0.0.1" - (sources."ajv-5.5.2" // { - dependencies = [ - sources."co-4.6.0" - ]; - }) + sources."ajv-5.5.2" sources."align-text-0.1.4" sources."amdefine-1.0.1" sources."ansi-escapes-3.1.0" @@ -47285,7 +44621,7 @@ in sources."aws4-1.7.0" sources."balanced-match-1.0.0" sources."base64-js-0.0.8" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."bl-1.2.2" sources."bluebird-3.5.1" sources."brace-expansion-1.1.11" @@ -47298,18 +44634,18 @@ in sources."camelcase-1.2.1" sources."capture-stack-trace-1.0.0" sources."caseless-0.12.0" - sources."caw-2.0.1" + (sources."caw-2.0.1" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) sources."center-align-0.1.3" sources."chalk-2.4.1" sources."chardet-0.5.0" sources."cli-cursor-2.1.0" sources."cli-spinners-1.3.1" sources."cli-width-2.2.0" - (sources."cliui-2.1.0" // { - dependencies = [ - sources."wordwrap-0.0.2" - ]; - }) + sources."cliui-2.1.0" sources."clone-1.0.4" sources."co-3.1.0" sources."co-from-stream-0.0.0" @@ -47319,7 +44655,7 @@ in sources."color-convert-1.9.2" sources."color-name-1.1.1" sources."combined-stream-1.0.6" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."concat-map-0.0.1" sources."config-chain-1.1.11" sources."consolidate-0.14.5" @@ -47327,23 +44663,28 @@ in sources."create-error-class-3.0.2" sources."dashdash-1.14.1" sources."decamelize-1.2.0" - sources."decompress-4.2.0" - sources."decompress-tar-4.1.1" - (sources."decompress-tarbz2-4.1.1" // { - dependencies = [ - sources."file-type-6.2.0" - ]; - }) - sources."decompress-targz-4.1.1" - (sources."decompress-unzip-4.0.1" // { + (sources."decompress-4.2.0" // { dependencies = [ sources."file-type-3.9.0" sources."get-stream-2.3.1" ]; }) + sources."decompress-tar-4.1.1" + sources."decompress-tarbz2-4.1.1" + sources."decompress-targz-4.1.1" + sources."decompress-unzip-4.0.1" sources."delayed-stream-1.0.0" - sources."download-5.0.3" - sources."download-git-repo-1.0.2" + (sources."download-5.0.3" // { + dependencies = [ + sources."file-type-5.2.0" + ]; + }) + (sources."download-git-repo-1.0.2" // { + dependencies = [ + sources."commander-2.8.1" + sources."file-type-6.2.0" + ]; + }) sources."duplexer3-0.1.4" sources."ecc-jsbn-0.1.1" sources."enable-1.3.2" @@ -47378,15 +44719,12 @@ in (sources."handlebars-4.0.11" // { dependencies = [ sources."async-1.5.2" + sources."wordwrap-0.0.2" ]; }) sources."har-schema-2.0.0" sources."har-validator-5.0.3" - (sources."has-ansi-2.0.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) + sources."has-ansi-2.0.0" sources."has-flag-3.0.0" sources."has-generators-1.0.1" sources."has-symbol-support-x-1.4.2" @@ -47449,11 +44787,7 @@ in sources."mkdirp-0.5.1" sources."multimatch-2.1.0" sources."mute-stream-0.0.7" - (sources."npm-conf-1.1.3" // { - dependencies = [ - sources."pify-3.0.0" - ]; - }) + sources."npm-conf-1.1.3" sources."oauth-sign-0.8.2" sources."object-assign-4.1.1" sources."once-1.4.0" @@ -47477,7 +44811,11 @@ in sources."readable-stream-2.3.6" sources."recursive-readdir-2.2.2" sources."repeat-string-1.6.1" - sources."request-2.87.0" + (sources."request-2.87.0" // { + dependencies = [ + sources."co-4.6.0" + ]; + }) sources."restore-cursor-2.0.0" sources."right-align-0.1.3" sources."rimraf-2.6.2" @@ -47485,11 +44823,7 @@ in sources."rxjs-6.2.1" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - (sources."seek-bzip-1.0.5" // { - dependencies = [ - sources."commander-2.8.1" - ]; - }) + sources."seek-bzip-1.0.5" sources."semver-5.5.0" sources."signal-exit-3.0.2" sources."source-map-0.4.4" @@ -47530,7 +44864,7 @@ in sources."url-to-options-1.0.1" sources."user-home-2.0.0" sources."util-deprecate-1.0.2" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."validate-npm-package-name-3.0.0" sources."verror-1.10.0" sources."ware-1.3.0" @@ -47571,14 +44905,14 @@ in sources."async-2.6.1" sources."aws-sign2-0.6.0" sources."balanced-match-1.0.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."bl-1.0.3" sources."boom-2.10.1" sources."brace-expansion-1.1.11" sources."caseless-0.11.0" sources."chalk-1.1.3" sources."combined-stream-1.0.6" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."concat-map-0.0.1" sources."concat-stream-1.5.0" (sources."config-chain-1.1.11" // { @@ -47588,21 +44922,13 @@ in }) sources."core-util-is-1.0.2" sources."cryptiles-2.0.5" - (sources."dashdash-1.14.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."dashdash-1.14.1" sources."debug-0.7.4" sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.1" sources."escape-string-regexp-1.0.5" sources."extend-3.0.1" - (sources."extract-zip-1.5.0" // { - dependencies = [ - sources."mkdirp-0.5.0" - ]; - }) + sources."extract-zip-1.5.0" sources."extsprintf-1.3.0" sources."fd-slicer-1.0.1" sources."follow-redirects-0.0.3" @@ -47612,11 +44938,7 @@ in sources."fs.realpath-1.0.0" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" - (sources."getpass-0.1.7" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."getpass-0.1.7" sources."glob-7.1.2" sources."graceful-fs-4.1.11" sources."har-validator-2.0.6" @@ -47666,6 +44988,7 @@ in (sources."phantomjs-1.9.20" // { dependencies = [ sources."kew-0.7.0" + sources."mkdirp-0.5.0" ]; }) sources."pinkie-2.0.4" @@ -47698,11 +45021,7 @@ in sources."typedarray-0.0.6" sources."underscore-1.9.1" sources."util-deprecate-1.0.2" - (sources."verror-1.10.0" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."verror-1.10.0" sources."which-1.2.14" sources."wrappy-1.0.2" sources."xtend-4.0.1" @@ -47720,48 +45039,12 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; -<<<<<<< HEAD -<<<<<<< HEAD - version = "4.13.0"; -======= -<<<<<<< HEAD - version = "4.11.1"; ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 + version = "4.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.13.0.tgz"; - sha512 = "3KMX0uPjJ4cXjl9V/AY+goRQPs7jtKRQn3hhNOG6s8Sx3mmGCQUjQJvjVoGNABVo5svgujIcSLBN8g62EzqIMA=="; + url = "https://registry.npmjs.org/webpack/-/webpack-4.14.0.tgz"; + sha512 = "10ywicmcqkgkc86i4596ngznnnkc94xja4kqjh0vfb1yn4cvj35qhfs1xr78dcrka2yq6k7ycnxkb0idlrr8wmacqjv898v199ly1ha"; }; dependencies = [ -<<<<<<< HEAD -======= - sources."@webassemblyjs/ast-1.5.10" - sources."@webassemblyjs/floating-point-hex-parser-1.5.10" - sources."@webassemblyjs/helper-api-error-1.5.10" - sources."@webassemblyjs/helper-buffer-1.5.10" - sources."@webassemblyjs/helper-code-frame-1.5.10" - sources."@webassemblyjs/helper-fsm-1.5.10" - sources."@webassemblyjs/helper-module-context-1.5.10" - sources."@webassemblyjs/helper-wasm-bytecode-1.5.10" - sources."@webassemblyjs/helper-wasm-section-1.5.10" - sources."@webassemblyjs/ieee754-1.5.10" - sources."@webassemblyjs/leb128-1.5.10" - sources."@webassemblyjs/utf8-1.5.10" - sources."@webassemblyjs/wasm-edit-1.5.10" - sources."@webassemblyjs/wasm-gen-1.5.10" - sources."@webassemblyjs/wasm-opt-1.5.10" - sources."@webassemblyjs/wasm-parser-1.5.10" - sources."@webassemblyjs/wast-parser-1.5.10" - sources."@webassemblyjs/wast-printer-1.5.10" -======= -======= ->>>>>>> nodePackages: meguca: 1.0.7 update - version = "4.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.12.0.tgz"; - sha512 = "0krki7h1xk4hrlwkqnsb0cqd8ah1qlgmcippf0w3wxg3brqx5dzm2xw96y3fix89mphbcbg5z346nkilpdnijcndk9kmdk0z0azd60h"; - }; - dependencies = [ ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 sources."@webassemblyjs/ast-1.5.12" sources."@webassemblyjs/floating-point-hex-parser-1.5.12" sources."@webassemblyjs/helper-api-error-1.5.12" @@ -47780,16 +45063,7 @@ in sources."@webassemblyjs/wasm-parser-1.5.12" sources."@webassemblyjs/wast-parser-1.5.12" sources."@webassemblyjs/wast-printer-1.5.12" -<<<<<<< HEAD -<<<<<<< HEAD sources."acorn-5.7.1" -======= ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 - sources."acorn-5.6.2" ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 -======= - sources."acorn-5.7.1" ->>>>>>> nodePackages: meguca: 1.0.7 update sources."acorn-dynamic-import-3.0.0" sources."ajv-6.5.1" sources."ajv-keywords-3.2.0" @@ -47802,7 +45076,6 @@ in sources."asn1.js-4.10.1" (sources."assert-1.4.1" // { dependencies = [ - sources."inherits-2.0.1" sources."util-0.10.3" ]; }) @@ -47812,7 +45085,13 @@ in sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ - sources."define-property-1.0.0" + (sources."define-property-1.0.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + sources."is-extendable-1.0.1" + sources."kind-of-3.2.2" ]; }) sources."base64-js-1.3.0" @@ -47823,7 +45102,9 @@ in sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { dependencies = [ + sources."define-property-1.0.0" sources."extend-shallow-2.0.1" + sources."kind-of-3.2.2" ]; }) sources."brorand-1.1.0" @@ -47846,18 +45127,6 @@ in (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" ]; }) sources."collection-visit-1.0.0" @@ -47896,41 +45165,21 @@ in sources."evp_bytestokey-1.0.3" (sources."expand-brackets-2.1.4" // { dependencies = [ - sources."debug-2.6.9" sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) - (sources."extend-shallow-3.0.2" // { - dependencies = [ - sources."is-extendable-1.0.1" ]; }) + sources."extend-shallow-3.0.2" (sources."extglob-2.0.4" // { dependencies = [ sources."define-property-1.0.0" sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" + sources."kind-of-5.1.0" ]; }) sources."fast-deep-equal-2.0.1" sources."fast-json-stable-stringify-2.0.0" - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) + sources."fill-range-4.0.0" sources."find-cache-dir-1.0.0" sources."find-up-2.1.0" sources."flush-write-stream-1.0.3" @@ -47949,19 +45198,13 @@ in }) sources."graceful-fs-4.1.11" sources."has-value-1.0.0" -<<<<<<< HEAD - (sources."has-values-1.0.0" // { -======= sources."has-values-1.0.0" sources."hash-base-3.0.4" (sources."hash.js-1.1.4" // { ->>>>>>> nodePackages: meguca: 1.0.7 update dependencies = [ - sources."kind-of-4.0.0" + sources."inherits-2.0.3" ]; }) - sources."hash-base-3.0.4" - sources."hash.js-1.1.4" sources."hmac-drbg-1.0.1" sources."https-browserify-1.0.0" sources."ieee754-1.1.12" @@ -47978,29 +45221,13 @@ in sources."is-extendable-0.1.1" 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."is-number-3.0.0" sources."is-plain-object-2.0.4" sources."is-windows-1.0.2" sources."isarray-1.0.0" sources."isobject-3.0.1" sources."json-parse-better-errors-1.0.2" -<<<<<<< HEAD -<<<<<<< HEAD sources."json-schema-traverse-0.4.1" -======= -<<<<<<< HEAD - sources."json-schema-traverse-0.3.1" -======= - sources."json-schema-traverse-0.4.1" ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 -======= - sources."json-schema-traverse-0.4.1" ->>>>>>> nodePackages: meguca: 1.0.7 update sources."json5-0.5.1" sources."kind-of-6.0.2" sources."leb-0.3.0" @@ -48016,18 +45243,31 @@ in sources."map-visit-1.0.0" sources."md5.js-1.3.4" sources."memory-fs-0.4.1" - sources."micromatch-3.1.10" + (sources."micromatch-3.1.10" // { + dependencies = [ + sources."debug-2.6.9" + sources."has-values-0.1.4" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."is-extendable-1.0.1" + ]; + }) sources."miller-rabin-4.0.1" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mississippi-2.0.0" - (sources."mixin-deep-1.3.1" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) + sources."mixin-deep-1.3.1" sources."mkdirp-0.5.1" sources."move-concurrently-1.0.1" sources."ms-2.0.0" @@ -48036,23 +45276,12 @@ in sources."neo-async-2.5.1" (sources."node-libs-browser-2.1.0" // { dependencies = [ + sources."inherits-2.0.1" sources."punycode-1.4.1" ]; }) sources."normalize-path-2.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."kind-of-3.2.2" - ]; - }) + sources."object-copy-0.1.0" sources."object-visit-1.0.1" sources."object.pick-1.3.0" sources."once-1.4.0" @@ -48101,35 +45330,38 @@ in sources."schema-utils-0.4.5" sources."serialize-javascript-1.5.0" sources."set-immediate-shim-1.0.1" - (sources."set-value-2.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) + sources."set-value-2.0.0" sources."setimmediate-1.0.5" sources."sha.js-2.4.11" (sources."snapdragon-0.8.2" // { dependencies = [ - sources."debug-2.6.9" - sources."define-property-0.2.5" + (sources."define-property-0.2.5" // { + dependencies = [ + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) 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."is-accessor-descriptor-1.0.0" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + sources."is-extendable-0.1.1" + sources."kind-of-4.0.0" ]; }) (sources."snapdragon-node-2.1.1" // { dependencies = [ - sources."define-property-1.0.0" + sources."kind-of-6.0.2" ]; }) (sources."snapdragon-util-3.0.1" // { @@ -48141,25 +45373,13 @@ in sources."source-map-0.5.7" sources."source-map-resolve-0.5.2" sources."source-map-url-0.4.0" - sources."split-string-3.1.0" - sources."ssri-5.3.0" - (sources."static-extend-0.1.2" // { + (sources."split-string-3.1.0" // { 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."extend-shallow-3.0.2" ]; }) + sources."ssri-5.3.0" + sources."static-extend-0.1.2" sources."stream-browserify-2.0.1" sources."stream-each-1.2.2" sources."stream-http-2.8.3" @@ -48169,41 +45389,20 @@ in sources."through2-2.0.3" sources."timers-browserify-2.0.10" sources."to-arraybuffer-1.0.1" - (sources."to-object-path-0.3.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) + sources."to-object-path-0.3.0" sources."to-regex-3.0.2" sources."to-regex-range-2.1.1" -<<<<<<< HEAD -<<<<<<< HEAD - sources."tslib-1.9.3" -======= - sources."tslib-1.9.2" ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 - sources."tty-browserify-0.0.0" - sources."typedarray-0.0.6" - (sources."uglify-es-3.3.10" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) - (sources."uglifyjs-webpack-plugin-1.2.7" // { -======= sources."tslib-1.9.3" sources."tty-browserify-0.0.0" sources."typedarray-0.0.6" sources."uglify-es-3.3.10" - (sources."uglifyjs-webpack-plugin-1.2.6" // { ->>>>>>> nodePackages: meguca: 1.0.7 update + (sources."uglifyjs-webpack-plugin-1.2.7" // { dependencies = [ sources."source-map-0.6.1" ]; }) (sources."union-value-1.0.0" // { dependencies = [ - sources."extend-shallow-2.0.1" sources."set-value-0.4.3" ]; }) @@ -48216,7 +45415,6 @@ in sources."isobject-2.1.0" ]; }) - sources."has-values-0.1.4" ]; }) sources."upath-1.1.0" @@ -48227,8 +45425,16 @@ in sources."punycode-1.3.2" ]; }) - sources."use-3.1.0" - sources."util-0.10.4" + (sources."use-3.1.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + (sources."util-0.10.4" // { + dependencies = [ + sources."inherits-2.0.3" + ]; + }) sources."util-deprecate-1.0.2" sources."vm-browserify-0.0.4" sources."watchpack-1.6.0" @@ -48258,15 +45464,16 @@ in version = "1.12.3"; src = fetchurl { url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-1.12.3.tgz"; -<<<<<<< HEAD - sha512 = "NnBAGkD64CRsl9edM9q0QU+ku6nCX32nM0U+YC8Gs/36c8y+5m9Tya3mWIux3oZKZ54yGiVtnok4tUpqDE5tMA=="; -======= sha512 = "0q6skhcd95baf49krnja6ijkrklm1nyn65mirmdr59nzrmyrirzmzdk0qpn0gj56fkpspy2m6xs8ks1nkd377fpjxn29q7s80d40w1n"; ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 }; dependencies = [ sources."addr-to-ip-port-1.4.3" - sources."airplay-js-0.3.0" + (sources."airplay-js-0.3.0" // { + dependencies = [ + sources."semver-5.1.1" + sources."xmlbuilder-0.4.3" + ]; + }) sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -48277,28 +45484,10 @@ in sources."binary-search-1.3.4" sources."bindings-1.3.0" sources."bitfield-2.0.0" - (sources."bittorrent-dht-8.4.0" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) + sources."bittorrent-dht-8.4.0" sources."bittorrent-peerid-1.2.0" -<<<<<<< HEAD - (sources."bittorrent-protocol-2.4.2" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) - (sources."bittorrent-tracker-9.9.1" // { - dependencies = [ - sources."debug-3.1.0" - sources."simple-get-3.0.2" - ]; - }) -======= sources."bittorrent-protocol-2.4.2" sources."bittorrent-tracker-9.9.1" ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 sources."bl-1.2.2" sources."blob-to-buffer-1.2.8" sources."block-stream2-1.1.0" @@ -48311,7 +45500,11 @@ in sources."buffer-fill-1.0.0" sources."buffer-from-1.1.0" sources."buffer-indexof-1.1.1" - sources."bufferutil-3.0.5" + (sources."bufferutil-3.0.5" // { + dependencies = [ + sources."simple-get-2.8.1" + ]; + }) sources."bufferview-1.0.1" sources."bytebuffer-3.5.5" sources."castv2-0.1.9" @@ -48357,11 +45550,7 @@ in sources."expand-template-1.1.1" sources."filestream-4.1.3" sources."flatten-1.0.2" - (sources."fs-chunk-store-1.7.0" // { - dependencies = [ - sources."thunky-1.0.2" - ]; - }) + sources."fs-chunk-store-1.7.0" sources."fs-constants-1.0.0" sources."fs.realpath-1.0.0" sources."gauge-2.7.4" @@ -48388,15 +45577,15 @@ in sources."k-rpc-5.0.0" sources."k-rpc-socket-1.8.0" sources."last-one-wins-1.0.4" - sources."load-ip-set-1.3.1" + (sources."load-ip-set-1.3.1" // { + dependencies = [ + sources."simple-get-2.8.1" + ]; + }) sources."long-2.4.0" sources."lru-3.1.0" sources."magnet-uri-5.1.8" - (sources."mdns-js-0.5.0" // { - dependencies = [ - sources."semver-5.1.1" - ]; - }) + sources."mdns-js-0.5.0" sources."mdns-js-packet-0.2.0" sources."mediasource-2.2.1" sources."memory-chunk-store-1.3.0" @@ -48404,11 +45593,7 @@ in sources."mimic-response-1.0.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mkdirp-0.5.1" sources."moment-2.22.2" sources."mp4-box-encoding-1.1.4" sources."mp4-stream-2.0.3" @@ -48444,16 +45629,8 @@ in sources."path-is-absolute-1.0.1" sources."piece-length-1.0.0" sources."pify-2.3.0" - (sources."plist-with-patches-0.5.1" // { - dependencies = [ - sources."xmlbuilder-0.4.3" - ]; - }) - (sources."prebuild-install-4.0.0" // { - dependencies = [ - sources."pump-2.0.1" - ]; - }) + sources."plist-with-patches-0.5.1" + sources."prebuild-install-4.0.0" sources."prettier-bytes-1.0.4" sources."process-nextick-args-2.0.0" sources."protobufjs-3.8.2" @@ -48470,7 +45647,7 @@ in sources."record-cache-1.1.0" (sources."render-media-3.1.0" // { dependencies = [ - sources."debug-3.1.0" + sources."pump-1.0.3" ]; }) sources."rimraf-2.6.2" @@ -48485,15 +45662,10 @@ in sources."signal-exit-3.0.2" sources."simple-concat-1.0.0" sources."simple-get-2.8.1" - (sources."simple-peer-9.1.2" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) + sources."simple-peer-9.1.2" sources."simple-sha1-2.1.1" (sources."simple-websocket-7.0.2" // { dependencies = [ - sources."debug-3.1.0" sources."ws-4.1.0" ]; }) @@ -48520,7 +45692,8 @@ in sources."to-buffer-1.1.1" (sources."torrent-discovery-8.4.1" // { dependencies = [ - sources."debug-3.1.0" + sources."minimist-1.2.0" + sources."pump-2.0.1" ]; }) sources."torrent-piece-1.1.2" @@ -48533,27 +45706,17 @@ in sources."upnp-device-client-1.0.2" sources."upnp-mediarenderer-client-1.2.4" sources."url-join-2.0.5" -<<<<<<< HEAD - (sources."ut_metadata-3.2.2" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) -======= sources."ut_metadata-3.2.2" ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 sources."ut_pex-1.2.1" sources."util-deprecate-1.0.2" - (sources."videostream-2.4.2" // { - dependencies = [ - sources."pump-1.0.3" - ]; - }) + sources."videostream-2.4.3" sources."vlc-command-1.1.1" (sources."webtorrent-0.100.0" // { dependencies = [ sources."debug-3.1.0" + sources."minimist-0.0.8" sources."simple-get-3.0.2" + sources."thunky-1.0.2" ]; }) sources."which-pm-runs-1.0.0" @@ -48582,24 +45745,12 @@ in version = "2.7.0"; src = fetchurl { url = "https://registry.npmjs.org/web-ext/-/web-ext-2.7.0.tgz"; - sha512 = "hXj/MV/x6G0oxplOirV4/j7BJ5MZJ2yZHml0gulBr7mH2BMNyTJHdRi+qzVBNPFdBMLV0/PS05YGZ7xr2YmwVA=="; + sha512 = "1ab12frdfy6f1lnsg9g7lymq825vw9l84sspghqfm3k5j8d2gc8gfdg87lq4x393scnq9qrjckw2gpyg2sqlklrqql6vs7ibwqzyy45"; }; dependencies = [ sources."@cliqz-oss/firefox-client-0.3.1" sources."@cliqz-oss/node-firefox-connect-1.2.1" -<<<<<<< HEAD -<<<<<<< HEAD - sources."@types/node-10.5.0" -======= -<<<<<<< HEAD - sources."@types/node-10.3.1" -======= - sources."@types/node-10.3.2" ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 -======= - sources."@types/node-10.3.5" ->>>>>>> nodePackages: meguca: 1.0.7 update + sources."@types/node-10.5.1" sources."JSONSelect-0.2.1" sources."abbrev-1.1.1" sources."acorn-5.7.1" @@ -48613,9 +45764,16 @@ in sources."adbkit-monkey-1.0.1" (sources."addons-linter-1.0.0" // { dependencies = [ + sources."ajv-keywords-1.5.1" + sources."ansi-escapes-1.4.0" + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" + sources."async-2.6.1" + sources."camelcase-2.1.1" + sources."cli-cursor-1.0.2" + sources."cliui-4.1.0" + sources."debug-3.1.0" sources."decamelize-1.2.0" -<<<<<<< HEAD -======= sources."domelementtype-1.1.3" sources."es6-promise-4.2.4" sources."fast-deep-equal-1.1.0" @@ -48631,14 +45789,27 @@ in sources."pluralize-1.2.1" sources."progress-1.1.8" sources."punycode-1.4.1" + sources."request-2.87.0" sources."restore-cursor-1.0.1" sources."run-async-0.1.0" sources."rx-lite-3.1.2" sources."slice-ansi-0.0.4" ->>>>>>> nodePackages: meguca: 1.0.7 update sources."source-map-0.6.1" sources."source-map-support-0.5.6" - sources."yargs-11.0.0" + sources."string-width-1.0.2" + sources."string_decoder-0.10.31" + sources."strip-ansi-4.0.0" + sources."supports-color-5.4.0" + sources."table-3.8.3" + sources."traverse-0.6.6" + sources."underscore-1.6.0" + (sources."yargs-11.0.0" // { + dependencies = [ + sources."camelcase-4.1.0" + sources."is-fullwidth-code-point-2.0.0" + sources."string-width-2.1.1" + ]; + }) ]; }) sources."adm-zip-0.4.11" @@ -48653,12 +45824,23 @@ in sources."ansi-styles-2.2.1" sources."ansicolors-0.3.2" sources."any-promise-1.3.0" - sources."anymatch-2.0.0" - (sources."archiver-2.1.1" // { + (sources."anymatch-2.0.0" // { dependencies = [ - sources."async-2.6.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."is-extendable-1.0.1" ]; }) + sources."archiver-2.1.1" sources."archiver-utils-1.3.0" sources."archy-1.0.0" sources."argparse-1.0.10" @@ -48684,11 +45866,7 @@ in sources."atob-2.1.1" sources."aws-sign2-0.7.0" sources."aws4-1.7.0" - (sources."babel-code-frame-6.26.0" // { - dependencies = [ - sources."chalk-1.1.3" - ]; - }) + sources."babel-code-frame-6.26.0" sources."babel-core-6.26.3" sources."babel-generator-6.26.1" sources."babel-helpers-6.24.1" @@ -48700,6 +45878,7 @@ in }) (sources."babel-register-6.26.0" // { dependencies = [ + sources."chalk-1.1.3" sources."source-map-support-0.4.18" ]; }) @@ -48712,11 +45891,16 @@ in sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ - sources."define-property-1.0.0" + (sources."define-property-1.0.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + sources."kind-of-3.2.2" ]; }) sources."base64-js-0.0.2" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."binary-extensions-1.11.0" sources."bl-1.2.2" sources."bluebird-2.9.34" @@ -48726,11 +45910,7 @@ in sources."boundary-1.0.1" sources."boxen-1.3.0" sources."brace-expansion-1.1.11" - (sources."braces-2.3.2" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) + sources."braces-2.3.2" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" @@ -48738,7 +45918,12 @@ in sources."buffer-fill-1.0.0" sources."buffer-from-1.1.0" sources."builtin-modules-1.1.1" - sources."bunyan-1.8.12" + (sources."bunyan-1.8.12" // { + dependencies = [ + sources."glob-6.0.4" + sources."rimraf-2.4.5" + ]; + }) sources."bytes-3.0.0" sources."cache-base-1.0.1" sources."caller-path-0.1.0" @@ -48747,21 +45932,12 @@ in sources."capture-stack-trace-1.0.0" sources."caseless-0.12.0" sources."ccount-1.0.3" - (sources."chalk-2.4.0" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."supports-color-5.4.0" - ]; - }) + sources."chalk-2.4.0" sources."character-entities-1.2.2" sources."character-entities-html4-1.1.2" sources."character-entities-legacy-1.1.2" sources."character-reference-invalid-1.1.2" sources."chardet-0.4.2" -<<<<<<< HEAD - sources."cheerio-1.0.0-rc.2" - sources."chokidar-2.0.4" -======= (sources."cheerio-1.0.0-rc.2" // { dependencies = [ sources."domelementtype-1.3.0" @@ -48776,34 +45952,16 @@ in sources."kind-of-3.2.2" ]; }) ->>>>>>> nodePackages: meguca: 1.0.7 update sources."circular-json-0.3.3" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" ]; }) sources."cli-boxes-1.0.0" sources."cli-cursor-2.1.0" sources."cli-width-2.2.0" - (sources."cliui-4.1.0" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."strip-ansi-4.0.0" - ]; - }) + sources."cliui-3.2.0" sources."clone-1.0.4" sources."clone-deep-0.3.0" sources."co-4.6.0" @@ -48815,7 +45973,7 @@ in sources."colors-0.5.1" sources."columnify-1.5.4" sources."combined-stream-1.0.6" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."common-tags-1.7.2" sources."component-emitter-1.2.1" sources."compress-commons-1.2.2" @@ -48864,20 +46022,12 @@ in sources."detect-indent-4.0.0" (sources."dispensary-0.18.0" // { dependencies = [ - sources."async-2.6.1" - sources."decamelize-1.2.0" - sources."source-map-0.6.1" - sources."source-map-support-0.5.6" - sources."yargs-11.0.0" + sources."ajv-5.5.2" ]; }) sources."doctoc-1.3.1" sources."doctrine-2.1.0" - (sources."dom-serializer-0.1.0" // { - dependencies = [ - sources."domelementtype-1.1.3" - ]; - }) + sources."dom-serializer-0.1.0" sources."domelementtype-1.3.0" sources."domhandler-2.4.2" sources."domutils-1.5.1" @@ -48906,53 +46056,33 @@ in sources."es6-symbol-3.1.1" sources."es6-weak-map-2.0.2" sources."escape-string-regexp-1.0.5" -<<<<<<< HEAD - (sources."escodegen-1.10.0" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) -======= sources."escodegen-1.10.0" ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 sources."escope-3.6.0" (sources."eslint-4.19.1" // { dependencies = [ sources."ajv-5.5.2" - sources."ansi-regex-3.0.0" - sources."debug-3.1.0" - sources."fast-deep-equal-1.1.0" - sources."globals-11.7.0" - sources."strip-ansi-4.0.0" + sources."esprima-4.0.0" ]; }) (sources."eslint-plugin-no-unsafe-innerhtml-1.0.16" // { dependencies = [ sources."ajv-4.11.8" - sources."ajv-keywords-1.5.1" - sources."ansi-escapes-1.4.0" - sources."ansi-regex-3.0.0" + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" sources."chalk-1.1.3" - sources."cli-cursor-1.0.2" - sources."eslint-3.19.0" - sources."figures-1.7.0" - sources."inquirer-0.12.0" - sources."is-fullwidth-code-point-2.0.0" - sources."onetime-1.1.0" - sources."pluralize-1.2.1" - sources."progress-1.1.8" - sources."restore-cursor-1.0.1" - sources."run-async-0.1.0" - sources."rx-lite-3.1.2" - sources."shelljs-0.7.8" - sources."slice-ansi-0.0.4" - sources."string-width-1.0.2" - sources."strip-ansi-4.0.0" - (sources."table-3.8.3" // { + sources."debug-2.6.9" + (sources."eslint-3.19.0" // { dependencies = [ - sources."string-width-2.1.1" + sources."ansi-regex-3.0.0" + sources."strip-ansi-4.0.0" ]; }) + sources."globals-9.18.0" + sources."is-fullwidth-code-point-2.0.0" + sources."shelljs-0.7.8" + sources."string-width-2.1.1" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" ]; }) sources."eslint-scope-3.7.1" @@ -48970,32 +46100,16 @@ in (sources."expand-brackets-2.1.4" // { dependencies = [ sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" ]; }) sources."extend-3.0.1" - (sources."extend-shallow-3.0.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) + sources."extend-shallow-3.0.2" sources."external-editor-2.2.0" (sources."extglob-2.0.4" // { dependencies = [ sources."define-property-1.0.0" sources."extend-shallow-2.0.1" + sources."kind-of-5.1.0" ]; }) sources."extsprintf-1.3.0" @@ -49009,11 +46123,7 @@ in sources."figures-2.0.0" sources."file-entry-cache-2.0.0" sources."file-uri-to-path-1.0.0" - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) + sources."fill-range-4.0.0" sources."find-up-2.1.0" (sources."firefox-profile-1.1.0" // { dependencies = [ @@ -49036,9 +46146,7 @@ in sources."fsevents-1.2.4" (sources."ftp-0.3.10" // { dependencies = [ - sources."isarray-0.0.1" sources."readable-stream-1.1.14" - sources."string_decoder-0.10.31" ]; }) sources."function-bind-1.1.1" @@ -49054,7 +46162,11 @@ in sources."generate-object-property-1.2.0" sources."get-caller-file-1.0.2" sources."get-stream-3.0.0" - sources."get-uri-2.0.2" + (sources."get-uri-2.0.2" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) sources."get-value-2.0.6" sources."getpass-0.1.7" sources."gettext-parser-1.1.0" @@ -49078,44 +46190,23 @@ in sources."graphlib-2.1.5" sources."growly-1.3.0" sources."har-schema-2.0.0" - (sources."har-validator-5.0.3" // { - dependencies = [ - sources."ajv-5.5.2" - sources."fast-deep-equal-1.1.0" - ]; - }) + sources."har-validator-5.0.3" sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-color-0.1.7" sources."has-flag-3.0.0" sources."has-value-1.0.0" - (sources."has-values-1.0.0" // { - dependencies = [ - sources."kind-of-4.0.0" - ]; - }) - (sources."hasbin-1.2.3" // { - dependencies = [ - sources."async-1.5.2" - ]; - }) + sources."has-values-1.0.0" + sources."hasbin-1.2.3" sources."hawk-6.0.2" sources."hoek-4.2.1" sources."home-or-tmp-2.0.0" sources."hosted-git-info-2.6.1" sources."htmlparser2-3.9.2" sources."http-errors-1.6.3" - (sources."http-proxy-agent-2.1.0" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) + sources."http-proxy-agent-2.1.0" sources."http-signature-1.2.0" - (sources."https-proxy-agent-2.2.1" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) + sources."https-proxy-agent-2.2.1" sources."iconv-lite-0.4.23" sources."ignore-3.3.10" sources."import-lazy-2.1.0" @@ -49123,43 +46214,26 @@ in sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.5" - (sources."inquirer-3.3.0" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."strip-ansi-4.0.0" - ]; - }) + sources."inquirer-3.3.0" sources."interpret-1.1.0" sources."invariant-2.2.4" sources."invert-kv-1.0.0" sources."ip-1.1.5" sources."is-absolute-0.1.7" - (sources."is-accessor-descriptor-1.0.0" // { - dependencies = [ - sources."kind-of-6.0.2" - ]; - }) + sources."is-accessor-descriptor-1.0.0" sources."is-alphabetical-1.0.2" sources."is-alphanumerical-1.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-data-descriptor-1.0.0" // { - dependencies = [ - sources."kind-of-6.0.2" - ]; - }) + sources."is-data-descriptor-1.0.0" sources."is-decimal-1.0.2" - (sources."is-descriptor-1.0.2" // { - dependencies = [ - sources."kind-of-6.0.2" - ]; - }) + sources."is-descriptor-1.0.2" 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-fullwidth-code-point-2.0.0" sources."is-glob-4.0.0" sources."is-hexadecimal-1.0.2" sources."is-installed-globally-0.1.0" @@ -49167,7 +46241,11 @@ in sources."is-my-ip-valid-1.0.0" sources."is-my-json-valid-2.17.2" sources."is-npm-1.0.0" - sources."is-number-3.0.0" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) sources."is-obj-1.0.1" sources."is-path-cwd-1.0.0" sources."is-path-in-cwd-1.0.1" @@ -49192,11 +46270,7 @@ in sources."jetpack-id-1.0.0" sources."js-select-0.6.0" sources."js-tokens-3.0.2" - (sources."js-yaml-3.12.0" // { - dependencies = [ - sources."esprima-4.0.0" - ]; - }) + sources."js-yaml-3.12.0" sources."jsbn-0.1.1" sources."jsesc-1.3.0" sources."json-merge-patch-0.2.3" @@ -49210,11 +46284,7 @@ in sources."jsonfile-4.0.0" sources."jsonify-0.0.0" sources."jsonpointer-4.0.1" - (sources."jsonwebtoken-8.2.1" // { - dependencies = [ - sources."ms-2.1.1" - ]; - }) + sources."jsonwebtoken-8.2.1" sources."jsprim-1.4.1" sources."jszip-2.6.1" sources."jwa-1.1.6" @@ -49225,12 +46295,7 @@ in sources."lazystream-1.0.0" sources."lcid-1.0.0" sources."levn-0.3.0" - (sources."load-json-file-1.1.0" // { - dependencies = [ - sources."parse-json-2.2.0" - sources."strip-bom-2.0.0" - ]; - }) + sources."load-json-file-1.1.0" sources."locate-path-2.0.0" sources."lodash-4.17.10" sources."lodash.assign-4.2.0" @@ -49253,23 +46318,15 @@ in 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-cache-0.2.2" sources."map-visit-1.0.0" sources."markdown-table-0.4.0" - (sources."markdown-to-ast-3.4.0" // { - dependencies = [ - sources."traverse-0.6.6" - ]; - }) + sources."markdown-to-ast-3.4.0" sources."mem-1.1.0" (sources."micromatch-3.1.10" // { dependencies = [ - sources."kind-of-6.0.2" + sources."is-extendable-0.1.1" ]; }) sources."mime-db-1.33.0" @@ -49277,16 +46334,8 @@ in sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" - (sources."mixin-deep-1.3.1" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) - (sources."mixin-object-2.0.1" // { - dependencies = [ - sources."for-in-0.1.8" - ]; - }) + sources."mixin-deep-1.3.1" + sources."mixin-object-2.0.1" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -49295,47 +46344,25 @@ in sources."moment-2.22.2" sources."ms-2.0.0" sources."mute-stream-0.0.7" - (sources."mv-2.1.1" // { - dependencies = [ - sources."glob-6.0.4" - sources."rimraf-2.4.5" - ]; - }) + sources."mv-2.1.1" sources."mz-2.7.0" sources."nan-2.10.0" - (sources."nanomatch-1.2.13" // { - dependencies = [ - sources."kind-of-6.0.2" - ]; - }) + sources."nanomatch-1.2.13" sources."natural-compare-1.4.0" sources."natural-compare-lite-1.4.0" - (sources."nconf-0.10.0" // { + sources."nconf-0.10.0" + sources."ncp-2.0.0" + (sources."needle-2.2.1" // { dependencies = [ - sources."async-1.5.2" - sources."camelcase-2.1.1" - sources."cliui-3.2.0" - sources."decamelize-1.2.0" - sources."os-locale-1.4.0" - sources."string-width-1.0.2" - sources."yargs-3.32.0" + sources."debug-2.6.9" ]; }) - sources."ncp-2.0.0" - sources."needle-2.2.1" sources."neo-async-2.5.1" sources."netmask-1.0.6" sources."next-tick-1.0.0" sources."node-forge-0.7.5" sources."node-notifier-5.2.1" - (sources."nomnom-1.8.1" // { - dependencies = [ - sources."ansi-styles-1.0.0" - sources."chalk-0.4.0" - sources."strip-ansi-0.1.1" - sources."underscore-1.6.0" - ]; - }) + sources."nomnom-1.8.1" sources."normalize-package-data-2.4.0" sources."normalize-path-2.1.1" sources."npm-run-path-2.0.2" @@ -49343,18 +46370,7 @@ in sources."number-is-nan-1.0.1" sources."oauth-sign-0.8.2" 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-copy-0.1.0" sources."object-visit-1.0.1" sources."object.pick-1.3.0" sources."once-1.4.0" @@ -49370,11 +46386,7 @@ in sources."p-limit-1.3.0" sources."p-locate-2.0.0" sources."p-try-1.0.0" - (sources."pac-proxy-agent-2.0.2" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) + sources."pac-proxy-agent-2.0.2" sources."pac-resolver-3.0.0" sources."package-json-4.0.1" sources."pako-1.0.6" @@ -49399,27 +46411,28 @@ in sources."pino-std-serializers-2.1.0" sources."pkginfo-0.4.1" sources."pluralize-7.0.0" - sources."po2json-0.4.5" - sources."posix-character-classes-0.1.1" - (sources."postcss-6.0.19" // { + (sources."po2json-0.4.5" // { dependencies = [ - sources."source-map-0.6.1" - sources."supports-color-5.4.0" + sources."ansi-styles-1.0.0" + sources."chalk-0.4.0" + sources."strip-ansi-0.1.1" ]; }) + sources."posix-character-classes-0.1.1" + sources."postcss-6.0.19" sources."prelude-ls-1.1.2" sources."prepend-http-1.0.4" sources."private-0.1.8" - sources."probe-image-size-4.0.0" + (sources."probe-image-size-4.0.0" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) sources."process-0.11.10" sources."process-nextick-args-2.0.0" sources."progress-2.0.0" sources."promise-7.3.1" - (sources."proxy-agent-3.0.0" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) + sources."proxy-agent-3.0.0" sources."proxy-from-env-1.0.0" sources."pseudomap-1.0.2" sources."pump-3.0.0" @@ -49429,19 +46442,10 @@ in sources."raw-body-2.3.3" sources."rc-1.2.8" sources."read-pkg-1.1.0" - (sources."read-pkg-up-1.0.1" // { - dependencies = [ - sources."find-up-1.1.2" - sources."path-exists-2.1.0" - ]; - }) + sources."read-pkg-up-1.0.1" sources."readable-stream-2.3.6" sources."readdirp-2.1.0" - (sources."readline2-1.0.1" // { - dependencies = [ - sources."mute-stream-0.0.5" - ]; - }) + sources."readline2-1.0.1" sources."rechoir-0.6.2" sources."recursive-readdir-2.2.2" sources."regenerator-runtime-0.11.1" @@ -49451,7 +46455,11 @@ in sources."registry-url-3.1.0" (sources."relaxed-json-1.0.1" // { dependencies = [ + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" sources."chalk-1.1.3" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" ]; }) sources."remark-5.1.0" @@ -49484,11 +46492,7 @@ in sources."semver-diff-2.1.0" sources."set-blocking-2.0.0" sources."set-immediate-shim-1.0.1" - (sources."set-value-2.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) + sources."set-value-2.0.0" sources."setprototypeof-1.1.0" sources."sha.js-2.4.11" (sources."shallow-clone-0.1.2" // { @@ -49505,6 +46509,7 @@ in dependencies = [ sources."babel-polyfill-6.16.0" sources."es6-error-4.0.0" + sources."ms-2.1.1" sources."mz-2.5.0" sources."regenerator-runtime-0.9.6" sources."request-2.87.0" @@ -49513,106 +46518,67 @@ in }) 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" - ]; - }) + sources."slice-ansi-1.0.0" sources."smart-buffer-1.1.15" (sources."snapdragon-0.8.2" // { dependencies = [ - sources."define-property-0.2.5" + (sources."define-property-0.2.5" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) - (sources."snapdragon-node-2.1.1" // { - dependencies = [ - sources."define-property-1.0.0" + sources."kind-of-4.0.0" ]; }) + sources."snapdragon-node-2.1.1" sources."snapdragon-util-3.0.1" sources."sntp-2.1.0" -<<<<<<< HEAD - (sources."snyk-1.87.0" // { -======= - (sources."snyk-1.83.0" // { ->>>>>>> nodePackages: meguca: 1.0.7 update + (sources."snyk-1.88.0" // { dependencies = [ - sources."ansi-styles-3.2.1" + sources."ansi-escapes-3.1.0" + sources."ansi-regex-2.1.1" + sources."async-1.5.2" sources."chalk-2.4.1" - sources."debug-3.1.0" - sources."supports-color-5.4.0" + sources."cli-cursor-2.1.0" + sources."figures-2.0.0" + sources."inquirer-3.3.0" + sources."is-fullwidth-code-point-2.0.0" + sources."mute-stream-0.0.7" + sources."onetime-2.0.1" + sources."os-locale-1.4.0" + sources."restore-cursor-2.0.0" + sources."run-async-2.3.0" + sources."rx-lite-4.0.8" + sources."string-width-2.1.1" + sources."strip-ansi-3.0.1" + sources."yargs-3.32.0" ]; }) (sources."snyk-config-2.1.0" // { dependencies = [ - sources."debug-3.1.0" - ]; - }) - (sources."snyk-docker-plugin-1.10.2" // { - dependencies = [ - sources."debug-3.1.0" - sources."request-2.87.0" + sources."is-fullwidth-code-point-1.0.0" + sources."string-width-1.0.2" ]; }) + sources."snyk-docker-plugin-1.10.3" sources."snyk-go-plugin-1.5.1" sources."snyk-gradle-plugin-1.3.0" - (sources."snyk-module-1.8.2" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) + sources."snyk-module-1.8.2" sources."snyk-mvn-plugin-1.2.0" - (sources."snyk-nuget-plugin-1.6.2" // { - dependencies = [ - sources."debug-3.1.0" - sources."es6-promise-4.2.4" - ]; - }) - (sources."snyk-php-plugin-1.5.1" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) - (sources."snyk-policy-1.12.0" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) + sources."snyk-nuget-plugin-1.6.2" + sources."snyk-php-plugin-1.5.1" + sources."snyk-policy-1.12.0" sources."snyk-python-plugin-1.6.1" - (sources."snyk-resolve-1.0.1" // { + sources."snyk-resolve-1.0.1" + sources."snyk-resolve-deps-3.1.0" + (sources."snyk-sbt-plugin-1.3.0" // { dependencies = [ - sources."debug-3.1.0" + sources."debug-2.6.9" ]; }) - (sources."snyk-resolve-deps-3.1.0" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) - sources."snyk-sbt-plugin-1.3.0" sources."snyk-tree-1.0.0" -<<<<<<< HEAD - (sources."snyk-try-require-1.3.1" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) -======= sources."snyk-try-require-1.3.1" ->>>>>>> nodePackages: meguca: 1.0.7 update sources."socks-1.1.10" sources."socks-proxy-agent-3.0.1" sources."source-map-0.5.7" @@ -49629,27 +46595,16 @@ in sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.0" sources."split-0.3.3" - sources."split-string-3.1.0" + (sources."split-string-3.1.0" // { + dependencies = [ + sources."extend-shallow-3.0.2" + sources."is-extendable-1.0.1" + ]; + }) sources."split2-2.2.0" sources."sprintf-js-1.0.3" sources."sshpk-1.14.2" - (sources."static-extend-0.1.2" // { - dependencies = [ - sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) + sources."static-extend-0.1.2" sources."statuses-1.5.0" sources."stream-parser-0.3.1" sources."stream-to-array-2.3.0" @@ -49659,13 +46614,7 @@ in sources."once-1.3.3" ]; }) - (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-width-2.1.1" sources."string_decoder-1.1.1" sources."stringify-entities-1.3.2" sources."stringstream-0.0.6" @@ -49677,12 +46626,7 @@ in sources."strip-json-comments-2.0.1" sources."structured-source-3.0.2" sources."supports-color-2.0.0" - (sources."table-4.0.2" // { - dependencies = [ - sources."ajv-5.5.2" - sources."fast-deep-equal-1.1.0" - ]; - }) + sources."table-4.0.2" sources."tar-stream-1.6.1" sources."temp-dir-1.0.0" sources."tempfile-2.0.0" @@ -49704,11 +46648,7 @@ in sources."to-utf8-0.0.1" sources."toml-2.3.3" sources."tosource-1.0.0" - (sources."tough-cookie-2.3.4" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-2.3.4" sources."tr46-1.0.1" sources."traverse-0.4.6" sources."trim-0.0.1" @@ -49719,13 +46659,16 @@ in sources."tweetnacl-0.14.5" sources."type-check-0.3.2" sources."typedarray-0.0.6" - sources."undefsafe-2.0.2" + (sources."undefsafe-2.0.2" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) sources."underscore-1.8.3" sources."unherit-1.1.1" sources."unified-4.2.1" (sources."union-value-1.0.0" // { dependencies = [ - sources."extend-shallow-2.0.1" sources."set-value-0.4.3" ]; }) @@ -49742,7 +46685,6 @@ in sources."isobject-2.1.0" ]; }) - sources."has-values-0.1.4" ]; }) sources."unzip-response-2.0.1" @@ -49760,15 +46702,38 @@ in sources."user-home-2.0.0" sources."util-0.10.4" sources."util-deprecate-1.0.2" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."validate-npm-package-license-3.0.3" sources."verror-1.10.0" sources."vfile-1.4.0" sources."vfile-location-2.0.3" - sources."watchpack-1.5.0" + (sources."watchpack-1.5.0" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + sources."has-values-0.1.4" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."is-extendable-1.0.1" + sources."kind-of-6.0.2" + ]; + }) sources."wcwidth-1.0.1" sources."webidl-conversions-4.0.2" - sources."whatwg-url-6.4.1" + (sources."whatwg-url-6.4.1" // { + dependencies = [ + sources."punycode-2.1.1" + ]; + }) sources."when-3.7.7" sources."which-1.3.1" sources."which-module-2.0.0" @@ -49777,11 +46742,7 @@ in sources."window-size-0.1.4" sources."winreg-0.0.12" sources."wordwrap-1.0.0" - (sources."wrap-ansi-2.1.0" // { - dependencies = [ - sources."string-width-1.0.2" - ]; - }) + sources."wrap-ansi-2.1.0" sources."wrappy-1.0.2" sources."write-0.2.1" sources."write-file-atomic-2.3.0" @@ -49796,10 +46757,14 @@ in (sources."yargs-6.6.0" // { dependencies = [ sources."camelcase-3.0.0" - sources."cliui-3.2.0" sources."decamelize-1.2.0" + sources."find-up-1.1.2" + sources."is-fullwidth-code-point-1.0.0" sources."os-locale-1.4.0" + sources."parse-json-2.2.0" + sources."path-exists-2.1.0" sources."string-width-1.0.2" + sources."strip-bom-2.0.0" sources."which-module-1.0.0" sources."yargs-parser-4.2.1" ]; @@ -49863,7 +46828,7 @@ in version = "2.0.3"; src = fetchurl { url = "https://registry.npmjs.org/yo/-/yo-2.0.3.tgz"; - sha512 = "v1z5HW9oZF82ntIx9janKzn/6KS+YXe+dYwCtA/TVCWafr+bTVE914uDkmcJTMbqS1enzoZ3Dy7mveRYQUZ3dg=="; + sha512 = "1v7fij1b3jbvrif1xvqdkm7ax5ymijc15kr50wbswym2kcvpxz9l9alsc7v80lcfnz7fqdylklgyf9blwvgccfjkqv5yr38dwfzjp5z"; }; dependencies = [ sources."@mrmlnc/readdir-enhanced-2.2.1" @@ -49897,25 +46862,24 @@ in sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ - sources."define-property-1.0.0" - ]; - }) - sources."bcrypt-pbkdf-1.0.1" - (sources."bin-version-2.0.0" // { - dependencies = [ - sources."execa-0.1.1" + (sources."define-property-1.0.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + sources."kind-of-3.2.2" ]; }) + sources."bcrypt-pbkdf-1.0.2" + sources."bin-version-2.0.0" sources."bin-version-check-3.0.0" - (sources."boxen-1.3.0" // { - dependencies = [ - sources."camelcase-4.1.0" - ]; - }) + sources."boxen-1.3.0" sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { dependencies = [ + sources."define-property-1.0.0" sources."extend-shallow-2.0.1" + sources."kind-of-3.2.2" ]; }) sources."buffer-from-1.1.0" @@ -49937,18 +46901,6 @@ in (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" ]; }) sources."clean-stack-1.3.0" @@ -49989,37 +46941,37 @@ in sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."diff-3.5.0" - (sources."dir-glob-2.0.0" // { - dependencies = [ - sources."path-type-3.0.0" - ]; - }) + sources."dir-glob-2.0.0" sources."dot-prop-4.2.0" sources."downgrade-root-1.2.2" sources."duplexer3-0.1.4" - (sources."each-async-1.1.1" // { - dependencies = [ - sources."onetime-1.1.0" - ]; - }) + sources."each-async-1.1.1" sources."ecc-jsbn-0.1.1" -<<<<<<< HEAD sources."env-paths-1.0.0" -======= ->>>>>>> nodePackages: meguca: 1.0.7 update sources."error-ex-1.3.2" sources."escape-string-regexp-1.0.5" - (sources."execa-0.6.3" // { - dependencies = [ - sources."cross-spawn-5.1.0" - ]; - }) + sources."execa-0.6.3" sources."execall-1.0.0" sources."exit-hook-1.1.1" (sources."expand-brackets-2.1.4" // { dependencies = [ sources."define-property-0.2.5" + ]; + }) + sources."extend-3.0.1" + sources."extend-shallow-3.0.2" + sources."external-editor-3.0.0" + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" sources."extend-shallow-2.0.1" + sources."kind-of-5.1.0" + ]; + }) + sources."extsprintf-1.3.0" + sources."fast-deep-equal-1.1.0" + (sources."fast-glob-2.2.2" // { + dependencies = [ (sources."is-accessor-descriptor-0.1.6" // { dependencies = [ sources."kind-of-3.2.2" @@ -50031,32 +46983,12 @@ in ]; }) sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) - sources."extend-3.0.1" - (sources."extend-shallow-3.0.2" // { - dependencies = [ sources."is-extendable-1.0.1" ]; }) - sources."external-editor-3.0.0" - (sources."extglob-2.0.4" // { - dependencies = [ - sources."define-property-1.0.0" - sources."extend-shallow-2.0.1" - ]; - }) - sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.1.0" - sources."fast-glob-2.2.2" sources."fast-json-stable-stringify-2.0.0" sources."figures-2.0.0" - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) + sources."fill-range-4.0.0" sources."filter-obj-1.1.0" sources."find-up-2.1.0" sources."find-versions-2.0.0" @@ -50068,7 +47000,14 @@ in sources."fragment-cache-0.2.1" sources."from2-2.3.0" sources."fs.realpath-1.0.0" - sources."fullname-3.3.0" + (sources."fullname-3.3.0" // { + dependencies = [ + sources."cross-spawn-5.1.0" + sources."npm-run-path-1.0.0" + sources."path-key-1.0.0" + sources."pify-2.3.0" + ]; + }) sources."gauge-1.2.7" sources."get-stdin-4.0.1" sources."get-stream-3.0.0" @@ -50083,27 +47022,27 @@ in sources."glob-to-regexp-0.3.0" sources."global-dirs-0.1.1" sources."global-tunnel-ng-2.1.1" - sources."globby-8.0.1" + (sources."globby-8.0.1" // { + dependencies = [ + sources."debug-2.6.9" + sources."is-accessor-descriptor-1.0.0" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + sources."is-extendable-0.1.1" + ]; + }) sources."got-8.3.1" sources."graceful-fs-4.1.11" sources."grouped-queue-0.3.3" sources."har-schema-2.0.0" sources."har-validator-5.0.3" - (sources."has-ansi-2.0.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) + sources."has-ansi-2.0.0" sources."has-flag-3.0.0" sources."has-symbol-support-x-1.4.2" sources."has-to-string-tag-x-1.4.1" sources."has-unicode-2.0.1" sources."has-value-1.0.0" - (sources."has-values-1.0.0" // { - dependencies = [ - sources."kind-of-4.0.0" - ]; - }) + sources."has-values-1.0.0" sources."hosted-git-info-2.6.1" sources."http-cache-semantics-3.8.1" sources."http-signature-1.2.0" @@ -50141,11 +47080,7 @@ in sources."is-glob-4.0.0" sources."is-installed-globally-0.1.0" sources."is-npm-1.0.0" - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) + sources."is-number-3.0.0" sources."is-obj-1.0.1" sources."is-object-1.0.1" sources."is-path-inside-1.0.1" @@ -50177,19 +47112,8 @@ in sources."jsprim-1.4.1" sources."keyv-3.0.0" sources."kind-of-6.0.2" - (sources."latest-version-3.1.0" // { - dependencies = [ - sources."got-6.7.1" - sources."package-json-4.0.1" - sources."prepend-http-1.0.4" - sources."url-parse-lax-1.0.0" - ]; - }) - (sources."load-json-file-1.1.0" // { - dependencies = [ - sources."pify-2.3.0" - ]; - }) + sources."latest-version-3.1.0" + sources."load-json-file-1.1.0" sources."locate-path-2.0.0" sources."locutus-2.0.9" sources."lodash-4.17.10" @@ -50211,23 +47135,25 @@ in (sources."meow-3.7.0" // { dependencies = [ sources."find-up-1.1.2" + sources."indent-string-2.1.0" sources."path-exists-2.1.0" + sources."pify-2.3.0" sources."read-pkg-up-1.0.1" ]; }) sources."merge2-1.2.2" - sources."micromatch-3.1.10" + (sources."micromatch-3.1.10" // { + dependencies = [ + sources."is-extendable-0.1.1" + ]; + }) sources."mime-db-1.33.0" sources."mime-types-2.1.18" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" - (sources."mixin-deep-1.3.1" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) + sources."mixin-deep-1.3.1" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -50253,19 +47179,7 @@ in sources."number-is-nan-1.0.1" sources."oauth-sign-0.8.2" 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."kind-of-3.2.2" - ]; - }) + sources."object-copy-0.1.0" sources."object-values-1.0.0" sources."object-visit-1.0.1" sources."object.pick-1.3.0" @@ -50293,9 +47207,6 @@ in (sources."passwd-user-2.1.0" // { dependencies = [ sources."execa-0.4.0" - sources."npm-run-path-1.0.0" - sources."path-key-1.0.0" - sources."pify-2.3.0" ]; }) sources."path-dirname-1.0.2" @@ -50303,11 +47214,7 @@ in sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" sources."path-key-2.0.1" - (sources."path-type-1.1.0" // { - dependencies = [ - sources."pify-2.3.0" - ]; - }) + sources."path-type-1.1.0" sources."performance-now-2.1.0" sources."pify-3.0.0" sources."pinkie-2.0.4" @@ -50338,11 +47245,7 @@ in ]; }) sources."readable-stream-2.3.6" - (sources."redent-1.0.0" // { - dependencies = [ - sources."indent-string-2.1.0" - ]; - }) + sources."redent-1.0.0" sources."regex-not-1.0.2" sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" @@ -50359,7 +47262,15 @@ in sources."responselike-1.0.2" sources."restore-cursor-2.0.0" sources."ret-0.1.15" - sources."root-check-1.0.0" + (sources."root-check-1.0.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."chalk-1.1.3" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + ]; + }) sources."run-async-2.3.0" sources."rx-4.1.0" sources."rxjs-6.2.1" @@ -50372,36 +47283,25 @@ in sources."semver-regex-1.0.0" sources."semver-truncate-1.1.2" sources."set-immediate-shim-1.0.1" - (sources."set-value-2.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) + sources."set-value-2.0.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" sources."slash-1.0.0" (sources."snapdragon-0.8.2" // { dependencies = [ - sources."define-property-0.2.5" + (sources."define-property-0.2.5" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) 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."kind-of-4.0.0" ]; }) (sources."snapdragon-node-2.1.1" // { dependencies = [ - sources."define-property-1.0.0" + sources."kind-of-6.0.2" ]; }) (sources."snapdragon-util-3.0.1" // { @@ -50419,25 +47319,13 @@ in sources."spdx-exceptions-2.1.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.0" - sources."split-string-3.1.0" - sources."sshpk-1.14.2" - (sources."static-extend-0.1.2" // { + (sources."split-string-3.1.0" // { 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."extend-shallow-3.0.2" ]; }) + sources."sshpk-1.14.2" + sources."static-extend-0.1.2" sources."strict-uri-encode-1.1.0" sources."string-length-2.0.0" sources."string-width-2.1.1" @@ -50448,15 +47336,7 @@ in sources."strip-eof-1.0.0" sources."strip-indent-1.0.1" sources."strip-json-comments-2.0.1" - (sources."sudo-block-1.2.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" - sources."chalk-1.1.3" - sources."strip-ansi-3.0.1" - sources."supports-color-2.0.0" - ]; - }) + sources."sudo-block-1.2.0" sources."supports-color-5.4.0" sources."symbol-observable-1.0.1" (sources."tabtab-1.3.2" // { @@ -50480,23 +47360,14 @@ in ]; }) sources."taketalk-1.0.0" - (sources."term-size-1.2.0" // { - dependencies = [ - sources."cross-spawn-5.1.0" - sources."execa-0.7.0" - ]; - }) + sources."term-size-1.2.0" sources."text-table-0.2.0" sources."through-2.3.8" sources."through2-2.0.3" sources."timed-out-4.0.1" sources."titleize-1.0.1" sources."tmp-0.0.33" - (sources."to-object-path-0.3.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) + sources."to-object-path-0.3.0" sources."to-regex-3.0.2" sources."to-regex-range-2.1.1" sources."tough-cookie-2.4.3" @@ -50509,7 +47380,6 @@ in sources."typedarray-0.0.6" (sources."union-value-1.0.0" // { dependencies = [ - sources."extend-shallow-2.0.1" sources."set-value-0.4.3" ]; }) @@ -50521,37 +47391,43 @@ in sources."isobject-2.1.0" ]; }) - sources."has-values-0.1.4" ]; }) sources."untildify-3.0.3" sources."unzip-response-2.0.1" - sources."update-notifier-2.5.0" + (sources."update-notifier-2.5.0" // { + dependencies = [ + sources."camelcase-4.1.0" + sources."cross-spawn-5.1.0" + sources."execa-0.7.0" + sources."got-6.7.1" + sources."package-json-4.0.1" + sources."prepend-http-1.0.4" + sources."url-parse-lax-1.0.0" + ]; + }) sources."urix-0.1.0" sources."url-parse-lax-3.0.0" sources."url-to-options-1.0.1" - sources."use-3.1.0" + (sources."use-3.1.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) sources."user-home-2.0.0" sources."util-deprecate-1.0.2" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."validate-npm-package-license-3.0.3" sources."verror-1.10.0" sources."vinyl-1.2.0" - (sources."vinyl-file-2.0.0" // { - dependencies = [ - sources."pify-2.3.0" - ]; - }) + sources."vinyl-file-2.0.0" sources."walk-2.3.13" sources."which-1.3.1" sources."widest-line-2.0.0" sources."win-release-1.1.1" (sources."wrap-ansi-2.1.0" // { dependencies = [ - sources."ansi-regex-2.1.1" - sources."is-fullwidth-code-point-1.0.0" sources."string-width-1.0.2" - sources."strip-ansi-3.0.1" ]; }) sources."wrappy-1.0.2" @@ -50565,21 +47441,33 @@ in sources."supports-color-3.2.3" ]; }) -<<<<<<< HEAD - sources."yeoman-doctor-3.0.1" -======= - (sources."yeoman-doctor-2.1.0" // { + (sources."yeoman-doctor-3.0.1" // { dependencies = [ + sources."execa-0.1.1" sources."onetime-1.1.0" ]; }) ->>>>>>> nodePackages: meguca: 1.0.7 update (sources."yeoman-environment-2.3.0" // { dependencies = [ sources."chardet-0.4.2" sources."debug-3.1.0" sources."external-editor-2.2.0" + sources."has-values-0.1.4" sources."inquirer-5.2.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" + sources."is-extendable-1.0.1" + sources."path-type-3.0.0" + sources."pify-2.3.0" sources."rxjs-5.5.11" ]; }) @@ -50591,6 +47479,7 @@ in sources."ansi-styles-2.2.1" ]; }) + sources."is-fullwidth-code-point-1.0.0" sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" ]; diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix index 186009f79a4..4737db380c0 100644 --- a/pkgs/development/node-packages/node-packages-v8.nix +++ b/pkgs/development/node-packages/node-packages-v8.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.6.0. Do not edit! +# This file has been generated by node2nix 1.5.3. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: @@ -19,7 +19,7 @@ let version = "14.9.0"; src = fetchurl { url = "https://registry.npmjs.org/@cycle/http/-/http-14.9.0.tgz"; - sha512 = "wOLMflfsszUXej5wSNxo06VgFqeWZ/GQFz/OzcrHv4r3oXvBsFh9KyyvIV6kOLpaZ+8bkOwBWbpGbJZWK00NFQ=="; + sha512 = "0ahsk9basb6qimsb40yr40vxxkmmfiqlig23brc5dymic61gfhzg2mzqz5cvkiz2y8g2rwnlwb619fkd3f4hw1yg8bkbczcaxzcrqn0"; }; }; "@cycle/isolate-3.3.0" = { @@ -28,7 +28,7 @@ let version = "3.3.0"; src = fetchurl { url = "https://registry.npmjs.org/@cycle/isolate/-/isolate-3.3.0.tgz"; - sha512 = "WFbEhrS1+Wx7VrJtGnjE/TQ1GtSoxQi6mBcFgqh8CwFu9FRxbNk1QL5rrwel250m+zEcwRmxo+kUwtJSlj4DCA=="; + sha512 = "0406glnab9c4579lfqikh8w67xjd7fvll3sysxy80sxjv3iaks6w08bgjl8418pk2x0iid8shd3ad7xqiw1lvdjarxnrydmnj3c8mjq"; }; }; "@cycle/run-3.4.0" = { @@ -37,7 +37,7 @@ let version = "3.4.0"; src = fetchurl { url = "https://registry.npmjs.org/@cycle/run/-/run-3.4.0.tgz"; - sha512 = "YUZyPu0nC4YDC31mLH5PGxbMoPEH5dNEV+nmgt34GgGgJ0ykDd4PrY7/ph5MAEpQE6rOfov0VN44qQRs6beQow=="; + sha512 = "2ir1dz9dh2ajf6yaks8nznfm89m0jh09hgadzwfml7xw3d49hks008sz3fq5rp9ax2d7r87y6hcq5hv9xz2qrkx1c1qc2r7xlz74ik1"; }; }; "@cycle/time-0.10.1" = { @@ -49,42 +49,13 @@ let sha1 = "cbc4b9a68981bf0b501ccd06a9058acd65309bf7"; }; }; -<<<<<<< HEAD -<<<<<<< HEAD - "@types/node-10.5.0" = { -======= -<<<<<<< HEAD - "@types/node-10.3.1" = { ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 + "@types/node-10.5.1" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.5.0"; + version = "10.5.1"; src = fetchurl { -<<<<<<< HEAD - url = "https://registry.npmjs.org/@types/node/-/node-10.5.0.tgz"; - sha512 = "baXPuqA7EVcBUpA5so2K26DTzk7NCWBc9xrPMu9PbUMwgusJRm9zJBPhiDmJVEcnTQ3aOxUZeuFHpd9qMYDNRg=="; -======= - url = "https://registry.npmjs.org/@types/node/-/node-10.3.1.tgz"; - sha512 = "0xqz0wlddb3vi0mmlncn1ypd7sa2zv3fcq58jk7nr0xdsrwwzn9ncdq784lvg8d2k7lzq1p2kjyak5nghq0imbdj8hrmk6365lgvi92"; -======= - "@types/node-10.3.2" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "10.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.3.2.tgz"; - sha512 = "3w50bh9i0rl27vnrn4mmwjphccfaybj74ydfymjmq46p8dfllfwm37lgxqjrx0mp6hrdia5hllbwnpsx2a4wwwck9hh9dkp798c9mzl"; ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 -======= - "@types/node-10.3.5" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "10.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.3.5.tgz"; - sha512 = "239crslw8yfvmbk5ibh5sh4fhf97j5kls7qgnacm818j6a067ywdiaab0ridjiqm1f1r5nbdip2i1ryjzfn96h6jyh3pp8qvmj70m7a"; ->>>>>>> nodePackages: meguca: 1.0.7 update + url = "https://registry.npmjs.org/@types/node/-/node-10.5.1.tgz"; + sha512 = "0wsh0lqflnmk8gzdiws2znpvrsskzbvb4ggba48k489jg9dd1i7frark6v7kj6yp4b39jz7kbzljrc1dj303f42xanyq8hbh3afalh0"; }; }; "@types/superagent-3.5.6" = { @@ -93,7 +64,7 @@ let version = "3.5.6"; src = fetchurl { url = "https://registry.npmjs.org/@types/superagent/-/superagent-3.5.6.tgz"; - sha512 = "yGiVkRbB1qtIkRCpEJIxlHazBoILmu33xbbu4IiwxTJjwDi/EudiPYAD7QwWe035jkE40yQgTVXZsAePFtleww=="; + sha512 = "31mxn8niw3v1nam9lh29lrq867gjkbv2q6fs0w07miff4mz73066cn5n24f1vmnqpvyv6hbh83b6xll66911a8hj54apmn12s8ras68"; }; }; "URIjs-1.16.1" = { @@ -111,7 +82,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz"; - sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; + sha512 = "38s4f3id97wsb0rg9nm9zvxyq0nvwrmrpa5dzvrkp36mf5ibs98b4z6lvsbrwzzs0sbcank6c7gpp06vcwp9acfhp41rzlhi3ybsxwy"; }; }; "absolute-0.0.1" = { @@ -183,7 +154,7 @@ let version = "1.2.1"; src = fetchurl { url = "https://registry.npmjs.org/ansi-diff-stream/-/ansi-diff-stream-1.2.1.tgz"; - sha512 = "PaKs34INoKpTzcjyKd2GM/CCEeTyDgWKuHSgF0z7ywjpbBFj/pzQf/30v+TR6VBBLia6Mso+W2ygU22ljqbi6A=="; + sha512 = "3lf59lflmnm783cbczclcms4qp42l79s7jbzx7xgz89rzk325nfj26bzd61g83lp250a3pjwh8q5w1khvfjkwn8rm9sm80dhbgsr8ix"; }; }; "ansi-escapes-1.4.0" = { @@ -201,7 +172,7 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz"; - sha512 = "UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw=="; + sha512 = "1bm72rs09dwjhfif8kqjxnpb5fgmcdgkn5483f11j6791s5161f2kvxy69pkgcq0jdws6kqfmr1bx5189lnvkzgkq851qs3gzq1n02j"; }; }; "ansi-red-0.1.1" = { @@ -246,7 +217,7 @@ let version = "3.2.1"; src = fetchurl { url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz"; - sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; + sha512 = "2lgkskkj4c1fsnrksy0yffda0wss84p8lfiazdc7jli7iqnvrxkzbxjzpvx13lm28qw0zkawfxvz2bdiisc72ccy7hx8i8rm4iijgam"; }; }; "ansi-wrap-0.1.0" = { @@ -264,7 +235,7 @@ let version = "1.3.2"; src = fetchurl { url = "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz"; - sha512 = "0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA=="; + sha512 = "269dbx666z4ws49vag1dma5kdpjlx83s74c1jlngrn2672rhvbc47i5ay5h40spmrzgvbvcm33i4yrp88rrc6lg70v78k155z45lwyi"; }; }; "anymatch-2.0.0" = { @@ -273,7 +244,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz"; - sha512 = "5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw=="; + sha512 = "03mjsaw6xk4zhvl17fpqn59j4v2bafqs0yfw5y45hl8x97xlihwvjmcx3icnaamvipplnczymvzg4sb4ixwpzak0k3p21c00nqqxmz6"; }; }; "ap-0.1.0" = { @@ -300,7 +271,7 @@ let version = "2.4.4"; src = fetchurl { url = "https://registry.npmjs.org/append-tree/-/append-tree-2.4.4.tgz"; - sha512 = "rPMUMkR8JjjPDDHHDZ/YeLO0KIbUGCrXgy921F6sBkEXBR9jYYxK8LUlwpZkUVi70cMR6r8uSmHZ/5HvtrntHg=="; + sha512 = "0gfvfdnxy8zznb198pbzshiqg8vnn2icjbc49dmy158qqb33w2ifh86migd8xighgbjl66lhqlb9cvqv2ghviri1k7kh9kw8hr19wxc"; }; }; "aproba-1.2.0" = { @@ -309,7 +280,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz"; - sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="; + sha512 = "13mgnbmdhdq0qncijvpip1l39q1a8labcvj3hc3n1yl2zch106mdkn7p7bd5knvmfkkn1js9nd47nzyjk1himbm8ry8i8gd6mk7mlk3"; }; }; "are-we-there-yet-1.1.5" = { @@ -318,7 +289,7 @@ let version = "1.1.5"; src = fetchurl { url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz"; - sha512 = "5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w=="; + sha512 = "3mizm1yfxynlhaavbimv7n9qljrbhni22v4fch6zr89x6ps0gpjcxm5yfvv05n8vc3r17hmglyswgq9w0s598xv70nnyw358q11s5p6"; }; }; "argparse-1.0.10" = { @@ -327,7 +298,7 @@ let version = "1.0.10"; src = fetchurl { url = "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz"; - sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg=="; + sha512 = "17fhywmdjcp8g0ys089i5xg26yajkkg9zg8hyry3fghz75b2pq5vdx997dk5p2sc15r9nsj8rmf4f27g81hi92kzj5q86sdmg5ni553"; }; }; "arr-diff-2.0.0" = { @@ -354,7 +325,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz"; - sha512 = "L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg=="; + sha512 = "2vdly17xk5kw7bfzajrjdnw4ml3wrfblx8064n0i4fxlchcscx2mvnwkq2bnnqvbqvdy4vs9ad462lz0rid7khysly9m9vzjiblly1g"; }; }; "arr-union-3.1.0" = { @@ -507,7 +478,7 @@ let version = "2.6.1"; src = fetchurl { url = "https://registry.npmjs.org/async/-/async-2.6.1.tgz"; - sha512 = "fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ=="; + sha512 = "2aqgkis9ac37q6jv6zspfpj3rikh2vr9fdch7wajrvqihq5sxyd1gh5zv65hy0y3r22l720qkidwh6img8dngqcjj0dwrl0dwpj5lbw"; }; }; "async-each-1.0.1" = { @@ -570,7 +541,7 @@ let version = "1.7.0"; src = fetchurl { url = "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz"; - sha512 = "32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w=="; + sha512 = "3rkdcpm3myysvq9nj6plgvpngzsbv7qk1wvb9f4m3gcsl23pf5x0hyph02svyl2v1lgjji8kl75ii7q04lhhhgjyw1irbinmxsl6qyz"; }; }; "balanced-match-1.0.0" = { @@ -588,7 +559,7 @@ let version = "0.11.2"; src = fetchurl { url = "https://registry.npmjs.org/base/-/base-0.11.2.tgz"; - sha512 = "5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg=="; + sha512 = "11dwi4v72034dqafp0qxsg8h6cpn92vv4vf909a9fybd69yfg6gqn4hhav6x59r1wbi8h1qlgfh9np0340mpljv1hc9v9p02giqygp5"; }; }; "base64-js-0.0.8" = { @@ -600,13 +571,13 @@ let sha1 = "1101e9544f4a76b1bc3b26d452ca96d7a35e7978"; }; }; - "bcrypt-pbkdf-1.0.1" = { + "bcrypt-pbkdf-1.0.2" = { name = "bcrypt-pbkdf"; packageName = "bcrypt-pbkdf"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz"; - sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d"; + url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"; + sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; }; }; "bencode-1.0.0" = { @@ -615,7 +586,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/bencode/-/bencode-1.0.0.tgz"; - sha512 = "N+VOSP5MkoX+xgnp6Y056iCY5TmCZg9rgPNPQe0bIiXchxYFP4vs/Tf0dTdQ+qQhP7HM2gvfFq+sUVjQsGy5Zw=="; + sha512 = "1kvjv5hs1c53b5g2vghpnncn4zj397sa0vpbx1pzpn8ngq52s3xq9923gnl2kzkh1mhyrl277jrh87a766yks89qvz8b4jczr44xr9p"; }; }; "bencode-2.0.0" = { @@ -624,7 +595,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/bencode/-/bencode-2.0.0.tgz"; - sha512 = "wr2HwwrUpfB5c68zmAudOltC7rZ1G0+lQOcnuEcfIM3AWAVnB3rHI3nlgd/2CWTfQ3w3zagKt89zni/M+VLZ8g=="; + sha512 = "3rdjlprrhprwwygnw5aik9pgi1xyr09yvgq3rbr4g3pl1v70mcc1k903x3vh9z782jly6vmnvp44nrskl5rhcxgfdwz19fl1b1qggf2"; }; }; "binary-extensions-1.11.0" = { @@ -651,7 +622,7 @@ let version = "7.10.0"; src = fetchurl { url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-7.10.0.tgz"; - sha512 = "fvb6M58Ceiv/S94nu6zeaiMoJvUYOeIqRbgaClm+kJTzCAqJPtAR/31pXNYB5iEReOoKqQB5zY33gY0W6ZRWQQ=="; + sha512 = "10md5792s6q3xwdrmwh1a8ax9w128g607b5qsbxzw8x0gl9184g754hprchl6mq8lmf4f8qylk2h8vavsnbn9yy9gzjnyh2kwrzmxky"; }; }; "bl-1.2.2" = { @@ -660,7 +631,7 @@ let version = "1.2.2"; src = fetchurl { url = "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz"; - sha512 = "e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA=="; + sha512 = "0810nalazir8szyxvbg53d7416j4a7xy94sdri37mwmnax9s9hx88mzky882sr9dv0is7w9fqlp7ys6ijr1z1imc2dnfxk8fri51jvv"; }; }; "blake2b-2.1.2" = { @@ -678,7 +649,7 @@ let version = "1.1.7"; src = fetchurl { url = "https://registry.npmjs.org/blake2b-wasm/-/blake2b-wasm-1.1.7.tgz"; - sha512 = "oFIHvXhlz/DUgF0kq5B1CqxIDjIJwh9iDeUUGQUcvgiGz7Wdw03McEO7CfLBy7QKGdsydcMCgO9jFNBAFCtFcA=="; + sha512 = "1q4aaql83818qzgh01c6x9jvcchmd6bq7r0kfs3f364vhwxnp7qc25y3h2ij5751mi1zhh96874ib0afn8an92xh3ag1kv5g2yhflm0"; }; }; "block-stream-0.0.9" = { @@ -696,7 +667,7 @@ let version = "3.5.1"; src = fetchurl { url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz"; - sha512 = "MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA=="; + sha512 = "2631bhp784qng0ifbypsmvijn6kjfvkhq2335kdz8ix5qi3wb3lbpg94xjn1av2s6i95ygr5a4y9j1721dw6zdbywwh1m48by4qpa1h"; }; }; "body-0.1.0" = { @@ -717,14 +688,6 @@ let sha1 = "090700c4ba28862a8520ef378395fdee5f61c229"; }; }; -<<<<<<< HEAD -<<<<<<< HEAD -======= -<<<<<<< HEAD -======= ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 -======= ->>>>>>> nodePackages: meguca: 1.0.7 update "boom-2.10.1" = { name = "boom"; packageName = "boom"; @@ -734,20 +697,13 @@ let sha1 = "39c8918ceff5799f83f9492a848f625add0c766f"; }; }; -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 -======= ->>>>>>> nodePackages: meguca: 1.0.7 update "boxen-1.3.0" = { name = "boxen"; packageName = "boxen"; version = "1.3.0"; src = fetchurl { url = "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz"; - sha512 = "TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw=="; + sha512 = "0pmn5jcnph7yfgfhlncg1lys066cq44kavj4d9qhmyy9705w61pabpwlma09xg4xplzbxh78d3m4xwvjwk478r3xyqnmpzq79yy7lsc"; }; }; "brace-expansion-1.1.11" = { @@ -756,7 +712,7 @@ let version = "1.1.11"; src = fetchurl { url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"; - sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; + sha512 = "248cnpbbf0p32h53rd3g8wzpgrkaj4p078ra1g6l16f82i6bzkvmhwqan5rk88apbll9ly1476kngd7f7z27i3b3zxpbb3064f8yaw8"; }; }; "braces-1.8.5" = { @@ -774,7 +730,7 @@ let version = "2.3.2"; src = fetchurl { url = "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz"; - sha512 = "aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w=="; + sha512 = "3gxrfbb03jf6nh75n99snhv4a9jni48hfc0gkj5yl1cginpqx3d73dnp8snph1fdkc804iz6zg0aqibifjnscjfbpfziw2g7yg5pmv8"; }; }; "browser-stdout-1.3.1" = { @@ -783,7 +739,7 @@ let version = "1.3.1"; src = fetchurl { url = "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz"; - sha512 = "qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw=="; + sha512 = "21jjhrf3wdmzsfqgva5s7shs1wdmcdxsjvi75p8z7i0q2i6n3654gpxjqlhbnpmzm25cpkshyi8swy13017qkp9m7xnbgw0bwiia45a"; }; }; "buffer-3.6.0" = { @@ -801,7 +757,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz"; - sha512 = "CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow=="; + sha512 = "2isng7g5ld0a4ih1d38bcdqpw8jpqajmcn6vfkrqpahmhim4cfw51c1sikz5s5hnmfychcbzcxvwydn8qi6zq6mhl15anzd1110fnq8"; }; }; "buffer-alloc-unsafe-1.1.0" = { @@ -810,7 +766,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz"; - sha512 = "TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg=="; + sha512 = "01b27ck9qpkjb3s14q703k5vi00m7lpl0zkyi91z4kxjww4b6q09frq68lm6m9hvhb5m4w0arwybncm5hia3j9kr9vd4h84qa43chsc"; }; }; "buffer-crc32-0.2.13" = { @@ -846,7 +802,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.0.tgz"; - sha512 = "c5mRlguI/Pe2dSZmpER62rSCu0ryKmWddzRYsuXc50U2/g8jMOulc31VZMa4mYx31U5xsmSOpDCgH88Vl9cDGQ=="; + sha512 = "0ch7mwp2p7iz81hlj769cki9vapg34rp3368mbxffjync131zz3cig7vkjv4n1lfyfnaapj9axq5d6sg92a8ri6fnvggz481fb936bk"; }; }; "buffer-indexof-1.1.1" = { @@ -855,7 +811,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz"; - sha512 = "4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g=="; + sha512 = "3bgz1zhq9ng3gypq825f00p9qi9y6z7wvkkf28nhjlyifnb3lk1dkmbya84k0ja79zv8kmmhvalwcnnz92533ip7pnjp3is1w9cxyp3"; }; }; "builtins-1.0.3" = { @@ -873,7 +829,7 @@ let version = "1.1.4"; src = fetchurl { url = "https://registry.npmjs.org/bulk-write-stream/-/bulk-write-stream-1.1.4.tgz"; - sha512 = "GtKwd/4etuk1hNeprXoESBO1RSeRYJMXKf+O0qHmWdUomLT8ysNEfX/4bZFXr3BK6eukpHiEnhY2uMtEHDM2ng=="; + sha512 = "2g3ccqw8k5vhdhnks27i954xglllw5gay8nvy3zgm2c7jpwnjc2imarwshx53pz54br6q4i4x2va4s80ixavafphhsykdhyzrvv1lhs"; }; }; "busboy-0.2.14" = { @@ -918,7 +874,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz"; - sha512 = "AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ=="; + sha512 = "36i943khi87af4gif9r6imjgybqxq9cbd69z2h8p2s2j6scfbhrv7j3n591xl982fmyq29rkwh70a6qdcf3v0piwzfh8n2jf571v9q0"; }; }; "call-me-maybe-1.0.1" = { @@ -972,7 +928,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/caw/-/caw-2.0.1.tgz"; - sha512 = "Cg8/ZSBEa8ZVY9HspcGUYaK63d/bN7rqS3CYCzEGUxuYv6UlmcjzDUz2fCFFHyTvUW5Pk0I+3hkA3iXlIj6guA=="; + sha512 = "2wa0gi2wljxw00rvqz454sgdr8yy90z8lhprxjc1prwi695lnzrh6sk0qqhp63h9gmbldyvvzfvm8k1jk0sbv6icdawcss441jky3qa"; }; }; "center-align-0.1.3" = { @@ -999,7 +955,7 @@ let version = "2.4.1"; src = fetchurl { url = "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz"; - sha512 = "ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ=="; + sha512 = "1yl5ffjp5w65b9ydnw4vp13n563121hs64xbnajif51grhpqmslaqllj24zm1pfaw9ywvdx69n8ppa3riwlps25k5934zgnbf3pmcrr"; }; }; "chardet-0.4.2" = { @@ -1017,7 +973,7 @@ let version = "0.5.0"; src = fetchurl { url = "https://registry.npmjs.org/chardet/-/chardet-0.5.0.tgz"; - sha512 = "9ZTaoBaePSCFvNlNGrsyI8ZVACP2svUtq0DkM7t4K2ClAa96sqOIRjAzDTc8zXzFt1cZR46rRzLTiHFSJ+Qw0g=="; + sha512 = "3931r17a9qqilrj8ymqwiqrayvwaz6d7hvhscrh8s4a7cksmw0saq1bg2xk7r20mcnzbcpn4c05bii36axilkfrpj2j0gcy2shdm57m"; }; }; "charenc-0.0.2" = { @@ -1035,11 +991,7 @@ let version = "2.0.4"; src = fetchurl { url = "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz"; -<<<<<<< HEAD - sha512 = "z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ=="; -======= sha512 = "1fwj48gbgxg51bp9x3jdpypyv7214pqf7hbbgl2xsycy2pxslkavglqcmk355mbjw6ik2nya68aplkjwb80wvy8mh4z4fkbvz5gpnfg"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "chownr-1.0.1" = { @@ -1057,7 +1009,7 @@ let version = "1.1.3"; src = fetchurl { url = "https://registry.npmjs.org/ci-info/-/ci-info-1.1.3.tgz"; - sha512 = "SK/846h/Rcy8q9Z9CAwGBLfCJ6EkjJWdpelWDufQpqVDYq2Wnnv8zlSO6AMQap02jvhVruKKpEtQOufo3pFhLg=="; + sha512 = "0p634fyx3kkll2blj5f5bjmz273d7ba201yi3jlrvy7p7lnmmi479d6s3khwmp9lnfrb314l4kw5dq40q60hzfnmfycqibzm3izrbs8"; }; }; "circular-append-file-1.0.1" = { @@ -1066,7 +1018,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/circular-append-file/-/circular-append-file-1.0.1.tgz"; - sha512 = "BUDFvrBTCdeVhg9E05PX4XgMegk6xWB69uGwyuATEg7PMfa9lGU1mzFSK0xWNW2O0i9CAQHN0oIdXI/kI2hPkg=="; + sha512 = "294ys13wj7mq7c2sb6h20a25z98wv9mar62nliikcsnb55xyqqwy3hj2ghcmc71yrx61i9s15x0qy71sy9x6i0ghsaxf2akn2zcah05"; }; }; "class-utils-0.3.6" = { @@ -1075,7 +1027,7 @@ let version = "0.3.6"; src = fetchurl { url = "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz"; - sha512 = "qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg=="; + sha512 = "1xcqwmfmsbrm2ck76brwiqjmcza655khgh5szh6wngk357i37sgwsga1pbarwzaz9hvzkriqhq6j0z5mv0pmz61cf9wxvk3y5mlzs58"; }; }; "cli-boxes-1.0.0" = { @@ -1111,7 +1063,7 @@ let version = "1.3.1"; src = fetchurl { url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.3.1.tgz"; - sha512 = "1QL4544moEsDVH9T/l6Cemov/37iv1RtoKf7NJ04A60+4MREXNfx/QvavbH6QoGdsD4N4Mwy49cmaINR/o2mdg=="; + sha512 = "1vad3gya61nh9npwcrcrq0d7sq9v0a2zaqvvnhbzpqxfp24qkh3xb8372fk9yx7l1nm9gz2gvzjysksh9ggwlvzah1lp816ivkzh0nm"; }; }; "cli-table-0.3.1" = { @@ -1129,7 +1081,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/cli-truncate/-/cli-truncate-1.1.0.tgz"; - sha512 = "bAtZo0u82gCfaAGfSNxUdTI9mNyza7D8w4CVCcaOsy7sgwDzvx6ekr6cuWJqY3UGzgnQ1+4wgENup5eIhgxEYA=="; + sha512 = "1h48346i2bsfvj3h0qfxmyh1770cxb3d9ibk75yjag1xgzk021yqbmkiv30k5c0qgyb0sxkvjc3sckmakf4i7q1d2gh1nmw9fimj2vc"; }; }; "cli-width-1.1.1" = { @@ -1246,7 +1198,7 @@ let version = "1.2.1"; src = fetchurl { url = "https://registry.npmjs.org/codecs/-/codecs-1.2.1.tgz"; - sha512 = "SPnx+ZHXVJ0qTInRXmnxuyu8PDvSzvop5MXp1BOr/urFQI3yL2n5ewE755skTklF/hKVlWj8cinGxdR2gvLvTA=="; + sha512 = "16fzwl2fvacbii9fby6i5cm2bz4ajaf4jdyffq1ggwnjbzjim0cbspymc9x9sf5whlzmknj7cybqaxvy5lmxlc99hm9sm6pj7wz3ya8"; }; }; "coffee-script-1.12.7" = { @@ -1255,7 +1207,7 @@ let version = "1.12.7"; src = fetchurl { url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz"; - sha512 = "fLeEhqwymYat/MpTPUjSKHVYYl0ec2mOyALEMLmzr5i1isuG+6jfI2j2d5oBO3VIzgUXgBVIcOT9uH1TFxBckw=="; + sha512 = "29mq40padyvizg4f141b00p0p74hx9v06d7gxk84ggsiyw6rf5bb65gnfwk1i02r276jwqybmi5hx98s943slyazjnqd69jmj389dvw"; }; }; "collection-visit-1.0.0" = { @@ -1273,11 +1225,7 @@ let version = "1.9.2"; src = fetchurl { url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.2.tgz"; -<<<<<<< HEAD - sha512 = "3NUJZdhMhcdPn8vJ9v2UQJoH0qqoGUkYTgFEPZaPjEtwmmKUfNV46zZmgB2M5M4DCEQHMaCfWHCxiBflLm04Tg=="; -======= sha512 = "173hv9fwlbqicbhb2gs0c878h407kp4ihfq0rinxdwdaz4lcad70jwciyb3si019qc4j6d8mb90g6j0jkyzdjfbkx7wg1acv1jhkmfw"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "color-name-1.1.1" = { @@ -1304,7 +1252,7 @@ let version = "1.3.0"; src = fetchurl { url = "https://registry.npmjs.org/colors/-/colors-1.3.0.tgz"; - sha512 = "EDpX3a7wHMWFA7PUHWPHNWqOxIIRSJetuwl0AS5Oi/5FMV8kWm69RTlgm00GKjBO1xFHMtBbL49yRtMMdticBw=="; + sha512 = "03rrn3n1k9lcwlg5xdx0cj727blwc1a0r6rnq1r8nynwni4bwqlbzlb9qp02x09pfnrfj0ihb28wsimqxiivm5k0f2wa77hmvfmffhh"; }; }; "combine-errors-3.0.3" = { @@ -1340,7 +1288,16 @@ let version = "2.15.1"; src = fetchurl { url = "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz"; - sha512 = "VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag=="; + sha512 = "1mb8z6hhy74rfdgj3spmk52sdqa5bb2w5wp28z3md1daqcca4vbbsg66wz8hdhrv0fnnmf8yzdkmnw3c373vcccmyizzlnmbpsd6msn"; + }; + }; + "commander-2.16.0" = { + name = "commander"; + packageName = "commander"; + version = "2.16.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.16.0.tgz"; + sha512 = "1xx0ldb0xa8kh9a9108nq09a5sx55k8i82037w4pw665a489qh1v9a0wk81ph1z94rfvi97k9q8x70ncp0ywdyydayx58lsaj9flmdi"; }; }; "commander-2.3.0" = { @@ -1394,7 +1351,7 @@ let version = "1.6.2"; src = fetchurl { url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz"; - sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw=="; + sha512 = "05nnf80j9ls12y3cw2dfnc6rmand3ya5sx9cqn9dgg19ljzdnyfjjv8ig79xi73gr2y4rkfzn9wjip2zzwp5n2d49njd3ki2a1c3cfv"; }; }; "config-chain-1.1.11" = { @@ -1412,7 +1369,7 @@ let version = "3.1.2"; src = fetchurl { url = "https://registry.npmjs.org/configstore/-/configstore-3.1.2.tgz"; - sha512 = "vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw=="; + sha512 = "2difdg3f56d584kfxl1zvm4ik5m3ln949m0q9sxq6ranzx2iwqa9zxqxy2l5i2lsm8jwmaiqkf7rc73gfnfip5m2qh8awd3s4ggknxy"; }; }; "connect-3.6.6" = { @@ -1457,7 +1414,7 @@ let version = "1.0.4"; src = fetchurl { url = "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz"; - sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="; + sha512 = "1f4y61wc913jrnga7nny83gzf9l2488q6sl1ry9lbwgh5x5d3va0xcc0xrmjk6gdxl6d4r6rsk800xp5bazhjrx05yx1wpc8c8gg0w4"; }; }; "content-types-0.1.0" = { @@ -1484,7 +1441,7 @@ let version = "2.1.2"; src = fetchurl { url = "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.2.tgz"; - sha512 = "Mw+adcfzPxcPeI+0WlvRrr/3lGVO0bD75SxX6811cxSh1Wbxx7xZBGK1eVtDf6si8rg2lhnUjsVLMFMfbRIuwA=="; + sha512 = "302w4kd3x9k0jy5iva1k5inp3r25avz8ddpkdb20icvrizicvas253kfp6ynmrcwpxv1lafcnagggxfs5dmmd4gg07ifgzkqxsrl3rk"; }; }; "copy-descriptor-0.1.1" = { @@ -1541,14 +1498,6 @@ let sha1 = "88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"; }; }; -<<<<<<< HEAD -<<<<<<< HEAD -======= -<<<<<<< HEAD -======= ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 -======= ->>>>>>> nodePackages: meguca: 1.0.7 update "cryptiles-2.0.5" = { name = "cryptiles"; packageName = "cryptiles"; @@ -1558,13 +1507,6 @@ let sha1 = "3bdfecdc608147c1c67202fa291e7dca59eaa3b8"; }; }; -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 -======= ->>>>>>> nodePackages: meguca: 1.0.7 update "crypto-random-string-1.0.0" = { name = "crypto-random-string"; packageName = "crypto-random-string"; @@ -1643,11 +1585,7 @@ let version = "3.0.1"; src = fetchurl { url = "https://registry.npmjs.org/dat-dns/-/dat-dns-3.0.1.tgz"; -<<<<<<< HEAD - sha512 = "OBolbMJNk7Uknw8po7Yv4XGNewH6VbuPQNrcf57EwtvgR8ScNUBDporU+DiCXYh2F7GwOcsCyVkSb++guR+OoA=="; -======= sha512 = "2h8w7xrl3pny4jrr41cnfdhn4bpd22xh8wgim4alr1l0dcwqi3y1ny2qjg7zp6s827vnmgs05xqswg15yva6a8gkwjbb4sdq9n2a6iq"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "dat-doctor-1.4.0" = { @@ -1656,7 +1594,7 @@ let version = "1.4.0"; src = fetchurl { url = "https://registry.npmjs.org/dat-doctor/-/dat-doctor-1.4.0.tgz"; - sha512 = "1A3npklzv62UErw/rBaSkKDiiYnPNl7yNOtg1QeuJ1AtOEnyfH1iY9QiaVqPj6mFF2CIT4/pCSapueQFX7Cn/Q=="; + sha512 = "3ysgc2z0pjbka9617lqykw8c0bqbacgixd6j8nlcdi7sz7j94w2sl17mq3xaq7b6kr5wdngi64y584hj8baqgxw2aaavgvk96kff3fl"; }; }; "dat-encoding-4.0.2" = { @@ -1674,7 +1612,7 @@ let version = "5.0.1"; src = fetchurl { url = "https://registry.npmjs.org/dat-encoding/-/dat-encoding-5.0.1.tgz"; - sha512 = "PET9PlGt6ejgqU07hbPLx3tP2siDMMFumUe+xwmm4+5W+0cOlpzreCPoMVUBzxWeR4sPdxL+AS53odQTBtzEqA=="; + sha512 = "2lc9p062gaa2xrf07z14xqgid3rw5fg05ak3s13g3mrr5hf8zxmdvp3lq4wggj7k5pc2c43r3d4yyy7rfrqafsdm7hfisdda4zgsi1w"; }; }; "dat-ignore-2.1.1" = { @@ -1683,7 +1621,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/dat-ignore/-/dat-ignore-2.1.1.tgz"; - sha512 = "jRCfWtLh+wtbqJMuge+wZV/2kSL1TKMRWXFgUaT7r0O1OnChKUDG4wqLJo4SjzJjXo7f3V8CVN/u5wYltgSd1Q=="; + sha512 = "3ars15n4l3fgvnzah15zpfzirg66clg2a72d2qawg340ad1f0xbahxgzfj52q3ib48s6k7m4a8zcpv5n3pq2blkm1dhpyz1s9d9y44d"; }; }; "dat-json-1.0.2" = { @@ -1692,7 +1630,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/dat-json/-/dat-json-1.0.2.tgz"; - sha512 = "EZq+VeE/tM7FGygMVZx3hsMVm7zW3qxhuUYCNtLONaZptqXz4laB5cIWHydmeEn6sl3RZatZqpIuWRu4xDYxIg=="; + sha512 = "0i32dn4p0dmjbljm9csnrfibnrgljbqcqkiy5n2wn0mdqpklnv6k9imrv93c0j6p5hsrpnnpjdibhw6fyf5a3183g2wxd1zw5avx6hi"; }; }; "dat-link-resolve-2.2.0" = { @@ -1701,11 +1639,7 @@ let version = "2.2.0"; src = fetchurl { url = "https://registry.npmjs.org/dat-link-resolve/-/dat-link-resolve-2.2.0.tgz"; -<<<<<<< HEAD - sha512 = "cu6Fwapm34myc5um6jdQBrtDkjx28oVkOVHbaV4YNLdxrRqUm+FlWuIqFk7zaCZDoZg5TMlCG1SF0j3AFbiOYA=="; -======= sha512 = "1h8xf0mq0yx51al3d1cjk1rk2hl69k8yd71cap2b9jy36wl3anp3drl31g6knsi75j8bwkn7j947fq6a0vym9lvffr8kpv6mb0qbvkj"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "dat-log-1.1.1" = { @@ -1723,7 +1657,7 @@ let version = "3.5.9"; src = fetchurl { url = "https://registry.npmjs.org/dat-node/-/dat-node-3.5.9.tgz"; - sha512 = "JGZPtreK8YDFUG5JHBJSKIpSTAkqlRS0WlS6WnlJd6ap4GtQOdPYNvQyt/1AcL1ja4zM8GLnbOWGj37a6ExKQA=="; + sha512 = "104lk78v9z8z1p5dkkn5w6ciimn7gbh83yvfcpl6vcd6fahdghak9kp95wmmfjlbas1959a156552i8a891qjbfa32q1wcanyv4yri4"; }; }; "dat-registry-4.0.0" = { @@ -1732,7 +1666,7 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/dat-registry/-/dat-registry-4.0.0.tgz"; - sha512 = "CKV7j8kwWNBW2Oacdbf5x0ihxMfPNN8wcKHHmx5UjE4iyaOnfnTwCqTGM5rFoMleXKOGWpB7uCKQa0qpvzmCIA=="; + sha512 = "0h84fdzm556p412p1xr0nl6ldf5xjd0qnd37im41bq78zm7lg4j4klcahg9pix1f0qdyd6gqz2a2j67z6vpb776v1bd0n1hr67pp988"; }; }; "dat-secret-storage-4.0.1" = { @@ -1741,7 +1675,7 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/dat-secret-storage/-/dat-secret-storage-4.0.1.tgz"; - sha512 = "BUhemnKpXUhKNl/1DuUwfFUyjzomlNF940uHPsOa3okmYu9z6mrp/EGQsLO3lO0YQomDUqS0G0DmHTse9vTU1A=="; + sha512 = "3ad9x7n3qxivrj03fsa8ll3i511ivclnyrv1421zklnmskkxxi2d2fykb1kx1sbwdyx35167a7k4mbw63jhxxaz6r54hpd9fad5wj05"; }; }; "dat-storage-1.0.4" = { @@ -1750,7 +1684,7 @@ let version = "1.0.4"; src = fetchurl { url = "https://registry.npmjs.org/dat-storage/-/dat-storage-1.0.4.tgz"; - sha512 = "THxtCBzrt+AJzhGxXedlxLYeW+AVi5eFLi9Ke9JQ7fTA/j84m1Ci7KPuZ1q44Um/BeIYZ3LO01FWS2MlAOTFRg=="; + sha512 = "13cbr004milnmjisg774rqqw82vyjg1p1d6gvm3xji516rq7zzc1x7da397njig5s2rg2qmw1dixdn4cpkmvc8irq4y1dzb3h46sz2c"; }; }; "dat-swarm-defaults-1.0.1" = { @@ -1759,7 +1693,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/dat-swarm-defaults/-/dat-swarm-defaults-1.0.1.tgz"; - sha512 = "T2WlO7BVmN9USchefsP8entQiByIlJLGuzHLL9qEqOBkyKB8p0Y7XPWxP8dcL43+SkeoxU5NVe7O0bsi3xL8Jg=="; + sha512 = "0kgq4nz4axx3kpfam6lxid88x5gx39gbk3kzcgmbhxld9vwl3469q58hkd2zjripg3955483j450yvszk1pwpn895adz62mn0xsarag"; }; }; "debug-2.2.0" = { @@ -1777,7 +1711,7 @@ let version = "2.6.9"; src = fetchurl { url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"; - sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; + sha512 = "0q0fsr8bk1m83z0am0h2xn09vyfcf18adscxms8hclznwks1aihsisd96h8npx0idq5wwnypnqrkyk25m5d9zh3dk7rjs29nybc8bkc"; }; }; "debug-3.1.0" = { @@ -1786,7 +1720,7 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz"; - sha512 = "OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g=="; + sha512 = "3g1hqsahr1ks2kpvdxrwzr57fj90nnr0hvwwrw8yyyzcv3i11sym8zwibxx67bl1mln0acddrzpkkdjjxnc6n2cm9fazmgzzsl1fzrr"; }; }; "decamelize-1.2.0" = { @@ -1822,7 +1756,7 @@ let version = "4.1.1"; src = fetchurl { url = "https://registry.npmjs.org/decompress-tar/-/decompress-tar-4.1.1.tgz"; - sha512 = "JdJMaCrGpB5fESVyxwpCx4Jdj2AagLmv3y58Qy4GE6HMVjWz1FeVQk1Ct4Kye7PftcdOo/7U7UKzYBJgqnGeUQ=="; + sha512 = "18rwwdac0961cs2xpagx8sfqysxzcvvna1bfhjd8aamgm5k6mbcr88k0qp46z1fvypvk00sc27mv0n7885cfwi525gix96659l4rli5"; }; }; "decompress-tarbz2-4.1.1" = { @@ -1831,7 +1765,7 @@ let version = "4.1.1"; src = fetchurl { url = "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz"; - sha512 = "s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A=="; + sha512 = "3s2l466xc70zvxrwsr1xr7x5sg9g9wh2wsvk81pxmhc0m73hwhfhhn63c53n6vkv8rlxs80gscrkpk8fc2mbh3j154cvbzm6wpk3kxk"; }; }; "decompress-targz-4.1.1" = { @@ -1840,7 +1774,7 @@ let version = "4.1.1"; src = fetchurl { url = "https://registry.npmjs.org/decompress-targz/-/decompress-targz-4.1.1.tgz"; - sha512 = "4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w=="; + sha512 = "3gig705jrzdsihjnfij52kj17mgsclfn5vbzswqqdjd0ac4f0dy0afds02m4zm5jacnppavhydyy0rgd99prk8hkmbcisgbfxk3agz3"; }; }; "decompress-unzip-4.0.1" = { @@ -1867,7 +1801,7 @@ let version = "0.6.0"; src = fetchurl { url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz"; - sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="; + sha512 = "0wc0sqg1aqx864bxf8xa4j8ncrc8rcvmiaj1sp3x1np2i8hdjybzjfd0w9gbf1yasmwycwzzg1mz6smr3q42hhv4pjx2qcgwqhg3q9c"; }; }; "define-property-0.2.5" = { @@ -1894,7 +1828,7 @@ let version = "2.0.2"; src = fetchurl { url = "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz"; - sha512 = "jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ=="; + sha512 = "1hrk3pzr4hyhfnrjy1msrlj2zh769x4l35q9fq0a2cy2glq3h1iwjkpmvz39y9idwy71h9hd98lydi92485bzkff1dzm70wbr8vc0lg"; }; }; "delayed-stream-1.0.0" = { @@ -1975,7 +1909,7 @@ let version = "3.5.0"; src = fetchurl { url = "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz"; - sha512 = "A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA=="; + sha512 = "32bkv3cfhax4x5zhiyfn63wjhqwkzsjiql3my8p3d9hvv020p8f9hdi7mpqixrkpgs0g9k15mn736s449yad9wq1plhxyhxb2sam3h3"; }; }; "directory-index-html-2.1.0" = { @@ -1993,7 +1927,7 @@ let version = "5.5.1"; src = fetchurl { url = "https://registry.npmjs.org/discovery-channel/-/discovery-channel-5.5.1.tgz"; - sha512 = "EEmZQFE0PiOsJj7G3KVCwFGbYs4QchUvzA91iHtZ6HfkIqfBEDSTGLygJrUlY1Tr77WDV+qZVrZuNghHxSL/vw=="; + sha512 = "2zzy8n58w43cvmnascylmw3nppynm334nsjd85w329k8461lwif8xz8b5xqhx8grhpiawhhrri9nlf08ajxriiy4sn26gila509jj8h"; }; }; "discovery-swarm-4.4.2" = { @@ -2011,7 +1945,7 @@ let version = "5.1.1"; src = fetchurl { url = "https://registry.npmjs.org/discovery-swarm/-/discovery-swarm-5.1.1.tgz"; - sha512 = "r38993qP/fcuAlNLSOwGZUps1inzNA4wXkIkv/piwFDseyIWNjYyk/4DHGxyf/bWMB86gPWIUdA6AhydkWmgdA=="; + sha512 = "1sa0sciklf04fnha64gb01s3wqddxkzf9n1q0zyjcr3cdhn49xyql60cbxby922bqq0wd7k57b6qjk50vn4hjsk08pggzcggbvkszxg"; }; }; "dns-discovery-5.6.1" = { @@ -2020,7 +1954,7 @@ let version = "5.6.1"; src = fetchurl { url = "https://registry.npmjs.org/dns-discovery/-/dns-discovery-5.6.1.tgz"; - sha512 = "r27fv3lDuZXCqmb5b04tV2aDxVbwVJaSyPzwPlOYCUbk9F7JvsY+n7EBfY2Z952bGx5TZt3SLQ+ELFjfqyLVoA=="; + sha512 = "2hda8mbvxc2r10g5p9dsrjk3qdrp7gpk66ps0dikwzcdgn9bvsf8ih9k19kxw7wr299cm7hav2q6rjp5m76zyb6mb19bfa3g6zxyvmg"; }; }; "dns-discovery-6.1.0" = { @@ -2029,7 +1963,7 @@ let version = "6.1.0"; src = fetchurl { url = "https://registry.npmjs.org/dns-discovery/-/dns-discovery-6.1.0.tgz"; - sha512 = "Kl2tL2zuNR1w6SnsoRaqrOFm7gGP3/i/HzRXtyVBqaOq/5L1D2TUdViUAZ8e/NDbt+jQCJFWoaKCnmDC343usQ=="; + sha512 = "2qyx3fzq9h9x0m2l5b9226hx2vxpl7w3sgh352qfpa683zmjbzsm8x984jvfmrl3yzzipwg07p6dqdcm8ba3v19x5q1sdgfdhpssp9a"; }; }; "dns-packet-1.3.1" = { @@ -2038,7 +1972,7 @@ let version = "1.3.1"; src = fetchurl { url = "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz"; - sha512 = "0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg=="; + sha512 = "19g682cvkba33mwrism28hibd2nv9xd16k5bj807jx3ih1cc7ff9dn8chmfjnqgglzl6lq3m3jarxng9vbarccgchd0aq118d15yk6i"; }; }; "dns-packet-4.2.0" = { @@ -2047,7 +1981,7 @@ let version = "4.2.0"; src = fetchurl { url = "https://registry.npmjs.org/dns-packet/-/dns-packet-4.2.0.tgz"; - sha512 = "bn1AKpfkFbm0MIioOMHZ5qJzl2uypdBwI4nYNsqvhjsegBhcKJUlCrMPWLx6JEezRjxZmxhtIz/FkBEur2l8Cw=="; + sha512 = "05pqsdg5q8r1i9z4dnii6sr7i3b6ir4gay5h3xk18jraa2w3201wfw6mz53dn494dqd19djdfbp78p6v70kia4862sbj5g4jwm40zbf"; }; }; "dns-socket-1.6.3" = { @@ -2056,7 +1990,7 @@ let version = "1.6.3"; src = fetchurl { url = "https://registry.npmjs.org/dns-socket/-/dns-socket-1.6.3.tgz"; - sha512 = "/mUy3VGqIP69dAZjh2xxHXcpK9wk2Len1Dxz8mWAdrIgFC8tnR/aQAyU4a+UTXzOcTvEvGBdp1zFiwnpWKaXng=="; + sha512 = "2g9g9jqx44qpiawlxfn1g647dqwwz2djjpy350c83d1z79d5wa21cknh1jz4wrwsjkvgn14vhmjjxqxf5n8fqq6fjyzw85aa7fk4rgy"; }; }; "dns-socket-3.0.0" = { @@ -2065,7 +1999,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/dns-socket/-/dns-socket-3.0.0.tgz"; - sha512 = "M0WkByoJ/mTm+HtwBQLsRJPe5uGIC/lYVOp+s6ZzhbZ5iq4GxjFyxYPQhB85dgCLvVb43aJQXHDC9aUgyKGc/Q=="; + sha512 = "3yrr8f842jzbhkhbi8a5pgqasyqn03n74gq9l43qmr33ih6ms57kdl5ffkb6zpaaicgj2w8w7kdx4s4xh10aw3vz3k69zh9583s8i9k"; }; }; "dns-txt-2.0.2" = { @@ -2092,7 +2026,7 @@ let version = "4.2.0"; src = fetchurl { url = "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz"; - sha512 = "tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ=="; + sha512 = "2wyv9brsq3dzp724y1q5z5j5ja83y834hgc193lnarfdycwz1ii3xg02qxx3dg05x3skwjm1di5s5a8hqi8l5v1afx2bia436pifhxm"; }; }; "download-5.0.3" = { @@ -2110,7 +2044,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/download-git-repo/-/download-git-repo-1.0.2.tgz"; - sha512 = "PwAUr0/w74AGB7bukOycXyLnDlt9Lfb3JzsliAWyZCHa/TvbuMYQvH1er2DWXHE4EuI/NjAzRXw+89Waynapgw=="; + sha512 = "21sjxnakbaz6gkw8lrk0dizw893hwawsrhaypkxph8cdf6v7gyxl8b4n82qh99v4zvzcbbxbc7ff8jzkkn91vmn0w381vzh9ypi801z"; }; }; "duplexer-0.1.1" = { @@ -2137,7 +2071,7 @@ let version = "3.6.0"; src = fetchurl { url = "https://registry.npmjs.org/duplexify/-/duplexify-3.6.0.tgz"; - sha512 = "fO3Di4tBKJpYTFHAxTU00BcfWMY9w24r/x21a6rZRbsD/ToUgGxsMbiGRmB7uVAXeGKXD9MwiLZa5E97EVgIRQ=="; + sha512 = "12hhn0igd7y8nmni0qd63wpc9w1fl5rgdh4d1mq65n6r00l7byh7fs5v6m6pd8xzwmnxhrxqrc1y5yh6hswbh2i9ic9la21if5w7vbw"; }; }; "ecc-jsbn-0.1.1" = { @@ -2191,7 +2125,7 @@ let version = "1.4.1"; src = fetchurl { url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz"; - sha512 = "1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q=="; + sha512 = "3cjrpi6n5i6gf8jaiwg31y2xkgx59szhhcj9myqwmdw16s9r6yvwznxd2lhqf96mpm6knyb3w2bcnksg5nzkrq6iada0k6nvdj2pjfl"; }; }; "es5-ext-0.10.45" = { @@ -2200,7 +2134,7 @@ let version = "0.10.45"; src = fetchurl { url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.45.tgz"; - sha512 = "FkfM6Vxxfmztilbxxz5UKSD4ICMf5tSpRFtDNtkAhOxZ0EKtX6qwmXNyH/sFyIbX2P/nU5AMiA9jilWsUGJzCQ=="; + sha512 = "04p6qjhmiaqlqqgi0690lz7zzcdg1n80pxiywkkk6qalpxd8b85kv4403ckchsv8jlx9rhz4chgh819ahzcgwanibnnqzkibklwqiqn"; }; }; "es6-iterator-2.0.3" = { @@ -2272,7 +2206,7 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz"; - sha512 = "oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw=="; + sha512 = "27mkhd94y9vrr8pb97br0ym5h85rawwb0biswgwdfp31x0387y12k9p9598bi4fc83fif6crfzqiqmmjs4x7gcb22ml3z1fldqm7yx1"; }; }; "etag-1.8.1" = { @@ -2389,7 +2323,7 @@ let version = "2.2.0"; src = fetchurl { url = "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz"; - sha512 = "bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A=="; + sha512 = "3sf897ajmkcp0j6rgd0jy6k95s9ck3j305yrr00kmckl8qdhswhbdd5g4m2fai03x8phs1vw2ahf9v7ym5ji4zfxydxyamiy61glabd"; }; }; "external-editor-3.0.0" = { @@ -2398,7 +2332,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/external-editor/-/external-editor-3.0.0.tgz"; - sha512 = "mpkfj0FEdxrIhOC04zk85X7StNtr0yXnG7zCb+8ikO8OJi2jsHh5YGoknNTyXgsbHOf1WOOcVU3kPFWT2WgCkQ=="; + sha512 = "28h4s6rjdakrr2danff6n7mwwf1n2syyba9q93ac1wpic535lk0xvwh4bpnzhmw3gkjblvbvfsd4zp57hwy7d70hk41lxs4867iz6cs"; }; }; "extglob-0.3.2" = { @@ -2416,7 +2350,7 @@ let version = "2.0.4"; src = fetchurl { url = "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz"; - sha512 = "Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw=="; + sha512 = "2klp0045k4wnaspb9khqx90ddv7rjg997mlyp5qz41sl2yqdrpw8g8wji77qq16aawl4yhvg0f993ln48lja0kfmy0wnbh4g50zlrin"; }; }; "extsprintf-1.3.0" = { @@ -2515,7 +2449,7 @@ let version = "6.2.0"; src = fetchurl { url = "https://registry.npmjs.org/file-type/-/file-type-6.2.0.tgz"; - sha512 = "YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg=="; + sha512 = "0xf8ry7jj1c5mvvp5qxidq3qcqxzdngx1q9r981ddq3wfcidwqd4h52hplv462hvm9frdl086advhfqfxbnvwm8ass3knby6l217xv0"; }; }; "filename-regex-2.0.1" = { @@ -2542,11 +2476,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/filenamify/-/filenamify-2.1.0.tgz"; -<<<<<<< HEAD - sha512 = "ICw7NTT6RsDp2rnYKVd8Fu4cr6ITzGy3+u4vUujPkabyaz+03F24NWEX7fs5fp+kBonlaqPH8fAO2NM+SXt/JA=="; -======= sha512 = "0j7yys97v9xh3phy73s6sp5i43a97vy77xys5v16nw5vp5l7xmz59lirzl54bzfzavnrk0klapirvhngibjkn5rvblw0ips6hsknb10"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "fill-range-2.2.4" = { @@ -2555,7 +2485,7 @@ let version = "2.2.4"; src = fetchurl { url = "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz"; - sha512 = "cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q=="; + sha512 = "3jpxxzv8ji9xqk6xwbr20nsl31jjqr5asnv0ayixyc3r393yv4r44b7lifpk1pqaw8clzs0cy7dnw9yb5axpg9ih7vfimzlp04xqykj"; }; }; "fill-range-4.0.0" = { @@ -2600,7 +2530,7 @@ let version = "0.3.3"; src = fetchurl { url = "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz"; - sha512 = "jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw=="; + sha512 = "2dikmdxwassw4w48vv82swjv4v1zx2sivsgcnxi3zi0imzw165ba8vaxgawz0wz4fgf138hvvc3xc5znr2wmz07r74dp8z6kqp1z9lf"; }; }; "for-in-1.0.2" = { @@ -2672,7 +2602,7 @@ let version = "1.2.1"; src = fetchurl { url = "https://registry.npmjs.org/formidable/-/formidable-1.2.1.tgz"; - sha512 = "Fs9VRguL0gqGHkXS5GQiMCr1VhZBxz0JnJs4JmMp/2jL18Fmbzvv7vOFRU+U8TBkHEE/CX1qDXzJplVULgsLeg=="; + sha512 = "1x0n2rfaiasdjbw1mm7s29z84f68c7iji7lb1gkxvpknvv6q7bwns7z55ijcf4vkh4kvis12rbgaaih49jf9lj53s30mllb1d35bkqn"; }; }; "fragment-cache-0.2.1" = { @@ -2717,7 +2647,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz"; - sha512 = "y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="; + sha512 = "2iv1j05gzx1sgpckd597sdd2f5x54rgcib3rpwgf31050wqxn5h27map6cn9wk4vix393s4ws2xv6kgps5zfby2iirb2zw8hk1818yb"; }; }; "fs-extra-0.24.0" = { @@ -2744,7 +2674,7 @@ let version = "1.2.5"; src = fetchurl { url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz"; - sha512 = "JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ=="; + sha512 = "2hpc9wbzrndi5bswg9q9hwxmg4yd99zbvssxnz6g04clj68qhd8c83zn282v3q7f9h1xi7c4lmnn341nlgfpwby2k14738pr796a416"; }; }; "fs.realpath-1.0.0" = { @@ -2762,7 +2692,7 @@ let version = "1.2.4"; src = fetchurl { url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.4.tgz"; - sha512 = "z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg=="; + sha512 = "0vfzl6byj55zmi8xiqb9bqd5q0awlpgz4hsph9xzhzrd46did859d6fp5vydh7n4d0n1ph5q36smq6k3pjq6w5fxs0vx4xjv3yzrhfg"; }; }; "fstream-1.0.11" = { @@ -2789,7 +2719,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/get-proxy/-/get-proxy-2.1.0.tgz"; - sha512 = "zmZIaQTWnNQb4R4fJUEp/FC51eZsc6EkErspy3xtIYStaq8EB/hDIWipxsal+E8rz0qD7f2sL/NA9Xee4RInJw=="; + sha512 = "0kjf4p1krvzah7k5yngvvc39b7jnkzqlp3cdab8451zh1q4mxmav111dmycnadv28ja2wvcwvavjl7w550ja7qyw4dx976n0illhrnf"; }; }; "get-stream-2.3.1" = { @@ -2861,7 +2791,7 @@ let version = "7.1.2"; src = fetchurl { url = "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz"; - sha512 = "MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ=="; + sha512 = "08vjxzixc9dwc1hn5pd60yyij98krk2pr758aiga97r02ncvaqx1hidi95wk470k1v84gg4alls9bm52m77174z128bgf13b61x951h"; }; }; "glob-base-0.3.0" = { @@ -2942,7 +2872,7 @@ let version = "2.1.5"; src = fetchurl { url = "https://registry.npmjs.org/graphlib/-/graphlib-2.1.5.tgz"; - sha512 = "XvtbqCcw+EM5SqQrIetIKKD+uZVNQtDPD1goIg7K73RuRZtVI5rYMdcCVSHm/AS1sCBZ7vt0p5WgXouucHQaOA=="; + sha512 = "0w1lx3hms5mx84mlxsgpvjr42qba17wwqhma0np67c9l8smkd2nwx7gr8724a2q1z7x0hjdjnwzx81893mj2ax498wl7y1h4yl5pysy"; }; }; "gray-matter-2.1.1" = { @@ -2960,7 +2890,7 @@ let version = "1.10.5"; src = fetchurl { url = "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz"; - sha512 = "qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA=="; + sha512 = "146i7if4fjml1p6xw1ybb7vm22k6i8yc7r8wcw8yia7qy385w1s6j18ip91g5mv47zvv5fw5m8kpzlaayjs183fkpg174hbw4xgh6m8"; }; }; "growl-1.9.2" = { @@ -3059,7 +2989,7 @@ let version = "1.4.2"; src = fetchurl { url = "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz"; - sha512 = "3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw=="; + sha512 = "0kljkjnsw7jnqm8dpf05rd7a59xjfwlbmp1qxs5kdda78zwwqfpkq5ryc2510iyam6v5vbyy0h7bpkwqadajq1ag2zaa7dymyyhwfnx"; }; }; "has-to-string-tag-x-1.4.1" = { @@ -3068,7 +2998,7 @@ let version = "1.4.1"; src = fetchurl { url = "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz"; - sha512 = "vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw=="; + sha512 = "0bqvhd628h3lrsydbp1xllh7jp23c58j7d4z0x0v9ddffindkk1zfrqmzm28z47ipjp0zxlmzvmlzk98zf9mzjsc47bmp1ydizcmmmx"; }; }; "has-unicode-2.0.1" = { @@ -3116,14 +3046,6 @@ let sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f"; }; }; -<<<<<<< HEAD -<<<<<<< HEAD -======= -<<<<<<< HEAD -======= ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 -======= ->>>>>>> nodePackages: meguca: 1.0.7 update "hawk-3.1.3" = { name = "hawk"; packageName = "hawk"; @@ -3133,13 +3055,6 @@ let sha1 = "078444bd7c1640b0fe540d2c9b73d59678e8e1c4"; }; }; -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 -======= ->>>>>>> nodePackages: meguca: 1.0.7 update "he-1.1.1" = { name = "he"; packageName = "he"; @@ -3149,14 +3064,6 @@ let sha1 = "93410fd21b009735151f8868c2f271f3427e23fd"; }; }; -<<<<<<< HEAD -<<<<<<< HEAD -======= -<<<<<<< HEAD -======= ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 -======= ->>>>>>> nodePackages: meguca: 1.0.7 update "hoek-2.16.3" = { name = "hoek"; packageName = "hoek"; @@ -3166,13 +3073,6 @@ let sha1 = "20bb7403d3cea398e91dc4710a8ff1b8274a25ed"; }; }; -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 -======= ->>>>>>> nodePackages: meguca: 1.0.7 update "http-errors-1.6.3" = { name = "http-errors"; packageName = "http-errors"; @@ -3209,14 +3109,13 @@ let sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; }; }; -<<<<<<< HEAD "hypercore-6.17.1" = { name = "hypercore"; packageName = "hypercore"; version = "6.17.1"; src = fetchurl { url = "https://registry.npmjs.org/hypercore/-/hypercore-6.17.1.tgz"; - sha512 = "fwBwdx3oaUsaKIRI3e1M78GikrH4EmS/lpbOmRlTnELdYUTIHAAt4qg8YtSbB8PtwiPujT9DjSU+VMj8jAQArQ=="; + sha512 = "2nh014czk458gi5im1kz3gf4g1fvhq7kga64g58w8nh07688ihxshlwaccrkklnjszn84pqn69a5hgg9knxsj4450d4nsg83mvp003z"; }; }; "hypercore-crypto-1.0.0" = { @@ -3225,16 +3124,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/hypercore-crypto/-/hypercore-crypto-1.0.0.tgz"; - sha512 = "xFwOnNlOt8L+SovC7dTNchKaNYJb5l8rKZZwpWQnCme1r7CU4Hlhp1RDqPES6b0OpS7DkTo9iU0GltQGkpsjMw=="; -======= - "hypercore-6.16.0" = { - name = "hypercore"; - packageName = "hypercore"; - version = "6.16.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hypercore/-/hypercore-6.16.0.tgz"; - sha512 = "15d7rbcm182fhq2z27vlg7mz3fvs8qjzw6s3vnm7pmvs46pz33qdm2rqs78nr5lw0wkhglyw7h2izj1l4sa3g8khww8syvdqk4mdbdh"; ->>>>>>> nodePackages: meguca: 1.0.7 update + sha512 = "0rj76wj0va9c1jdi4ykm4f35sjhxgg92bqshhsllxhpkq4ln2pvarqa4xjaaw4n54mmzrjvh8srl4kjrpafvhlb9bzc5dsfv6f0wp64"; }; }; "hypercore-protocol-6.6.4" = { @@ -3243,7 +3133,7 @@ let version = "6.6.4"; src = fetchurl { url = "https://registry.npmjs.org/hypercore-protocol/-/hypercore-protocol-6.6.4.tgz"; - sha512 = "9TU7P+uve0e5v1ZiBx70DFhkpepW4iNSGYlZthK+Unm0EbZ+Yppc6clH7JTffPBNUMSnDrE552MfXMilpCHZMw=="; + sha512 = "0rxj8d4lp45q7v3wwwv23m7qi84vw3wvyafqiy9x5f9lqkynq8v8yajpq9bcnc935927qjnxajn8n0cyhg0fqjnpywlfyxgxczkndgm"; }; }; "hyperdrive-9.14.0" = { @@ -3252,11 +3142,7 @@ let version = "9.14.0"; src = fetchurl { url = "https://registry.npmjs.org/hyperdrive/-/hyperdrive-9.14.0.tgz"; -<<<<<<< HEAD - sha512 = "LTgbsJ+9ZrdQfLaXXc01kQMttaicHhSOtUM3v/k7ORwXJziqQ2eMQ80+8Tfg67ja+w6zrdl5HYOK+mnlwQpCww=="; -======= sha512 = "31l42n1wmlzm2l33mwxkbdk1vxxmf7bw0vz2gnd8f66fhxa70kif71r7gwvyds3nn7187lwm2sjs0wi6p6mv5xngi8bfrmxkyq1nf1d"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "hyperdrive-http-4.2.2" = { @@ -3265,7 +3151,7 @@ let version = "4.2.2"; src = fetchurl { url = "https://registry.npmjs.org/hyperdrive-http/-/hyperdrive-http-4.2.2.tgz"; - sha512 = "NgfZGxfQoYIEIuYat+dki/GAWpjmM/X+5YL5faTrX3VgXdGObVOhKEHQISk855T8C+R4aPP8QpF1YR8adUVBNw=="; + sha512 = "0vl2ibm38gn2xci8byg6s3qwh5zr5777hlj3l2152hm6vcfs5fn0xazxfj7vyc2wpzgacz6k1d81wcbckkvf6p6482858fh2wdxj1rn"; }; }; "hyperdrive-network-speed-2.1.0" = { @@ -3274,7 +3160,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/hyperdrive-network-speed/-/hyperdrive-network-speed-2.1.0.tgz"; - sha512 = "JolPS374h6oS1rmz1iebFfeDDvA2nAtiHbx9VJJGMgSDSx4Q77eeY09hDgZwY7KatSKUGWnnSyydSgVUb3+8Lw=="; + sha512 = "0pvqzvgah2lm79c9gknj6cl4asrmck3f030wqagcfgbgvqh3r5q611j8s958zdw3mi0p71ny0787xqmkckxdcxrsq9am1zqgr5lz296"; }; }; "i-0.3.6" = { @@ -3292,7 +3178,7 @@ let version = "0.4.23"; src = fetchurl { url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz"; - sha512 = "neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA=="; + sha512 = "062yxlrx4glr90bxn6jdv83qf03c9appkxdjjz5bhbphsx2yrn0y1i6yn9pfr3hfv2xiwq18hxvrvzfzfa7axv0sbgihskda58r7v4x"; }; }; "iconv-lite-0.4.8" = { @@ -3310,11 +3196,7 @@ let version = "1.1.12"; src = fetchurl { url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.12.tgz"; -<<<<<<< HEAD - sha512 = "GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA=="; -======= sha512 = "0nf551idk1p8slbvd2jvzdh9hkm5z2dpv0b3jh1wgkab3mbi33vimdwiivrymvaqk7ba3by6rg9bn5xsdiqi24cn9vr5yjq6kw8y2qs"; ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 }; }; "ignore-by-default-1.0.1" = { @@ -3332,7 +3214,7 @@ let version = "3.0.1"; src = fetchurl { url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz"; - sha512 = "DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ=="; + sha512 = "2ajgs5klg786rkdxs37mbxn0p8ah2ai0nj0bjv5vbrfir4y0pvrhxxadv46s8g1hqkq5p3fjssys3n6qvz60p4jzjsgfq683lrnad8d"; }; }; "import-lazy-2.1.0" = { @@ -3377,7 +3259,7 @@ let version = "1.3.5"; src = fetchurl { url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz"; - sha512 = "RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="; + sha512 = "1rjbvf1rg5ywhnba08sgagn2qf23lab330qrqmh7d891zap3xpxcyfyj1cblpf0f0rypglcfacybzyrpd4996aa1mbc820awa33k5j5"; }; }; "inquirer-0.10.1" = { @@ -3395,7 +3277,7 @@ let version = "3.3.0"; src = fetchurl { url = "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz"; - sha512 = "h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ=="; + sha512 = "1wsmzzva3rfjb4bfks7ba2nvha9ziwgq2kag6xxibc5cc6mz19xbgj4fm3a7ghvfbfx4am0x13ibc8j2s5m3sv12nph44rq56gnvv47"; }; }; "inquirer-6.0.0" = { @@ -3404,7 +3286,7 @@ let version = "6.0.0"; src = fetchurl { url = "https://registry.npmjs.org/inquirer/-/inquirer-6.0.0.tgz"; - sha512 = "tISQWRwtcAgrz+SHPhTH7d3e73k31gsOy6i1csonLc0u1dVK/wYvuOnFeiWqC5OXFIYbmrIFInef31wbT8MEJg=="; + sha512 = "0k09hsg3dfdz7vp482v56hvhqa9g4qbm8jpmig9p0phdzsaspajxk9d4z575dd8rc70pmipg7pxxpgdqwa3x1z4rwmhhw1d3icr115l"; }; }; "inspect-custom-symbol-1.1.0" = { @@ -3413,7 +3295,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/inspect-custom-symbol/-/inspect-custom-symbol-1.1.0.tgz"; - sha512 = "vtI2YXBRZBkU6DlfHfd0GtZENfiEiTacAXUd0ZY6HA+X7aPznpFfPmzSC+tHKXAkz9KDSdI4AYfwAMXR5t+isg=="; + sha512 = "2ra5pz6s72h1w4704wd4jc3sb7j8w198zmhplkc7rgr37pklgnrf3qw7abd27bm06f3d2c4z0sl9mhsfkvisprrx0a1jr2if1hkdlmy"; }; }; "ip-1.1.5" = { @@ -3449,7 +3331,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz"; - sha512 = "m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ=="; + sha512 = "1qllik6fjwfq17ic0fxwqyll8mrhmcm36xfsq45xc57mq9ah4i4nn4f8fvgb0gx4kpl3jlpkzndp0xlmmf2mh0xmggw6mhw74fng64v"; }; }; "is-binary-path-1.0.1" = { @@ -3467,7 +3349,7 @@ let version = "1.1.6"; src = fetchurl { url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz"; - sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="; + sha512 = "3kr8dm9qyklmm2xyiz75s8db90bfilfals4x0g276kncihrrrz0ar4y6dqpvc7pwy7h43jay1bayi1r62x97nzvcswkk4ap18pl1irm"; }; }; "is-callable-1.1.3" = { @@ -3485,7 +3367,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/is-ci/-/is-ci-1.1.0.tgz"; - sha512 = "c7TnwxLePuqIlxHgr7xtxzycJPegNHFuIrBkwbf8hc58//+Op1CqFkyS+xnIMkwn9UsJIwc174BIjkyBmSpjKg=="; + sha512 = "0m66alrh568wj40xwshf8q99gsjfk1jr0czp4jc2sm519wfzzzprkl5zjvw2r5h49p72d50ywj9qg67dnyazq0ijy4flgny2b1ygd3k"; }; }; "is-data-descriptor-0.1.4" = { @@ -3503,7 +3385,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz"; - sha512 = "jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ=="; + sha512 = "0ny6kxc752fg3z6fmj8a7fw2lai2y17d9fx0028nvyv1qj0sa30rfryhv9xd7b7is1yfs0val6amsy2b22rh589il10md36a75mgd4d"; }; }; "is-descriptor-0.1.6" = { @@ -3512,7 +3394,7 @@ let version = "0.1.6"; src = fetchurl { url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz"; - sha512 = "avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg=="; + sha512 = "0gbflcxmd30gzj91y19fylsfalirl6qg71sxjximc8lc2vxkg5h9scnahvxsczymchlx742i8ai489843ys431vyw73rp418jpxiw3a"; }; }; "is-descriptor-1.0.2" = { @@ -3521,7 +3403,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz"; - sha512 = "2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg=="; + sha512 = "2v1a9mn2rzz52v8vs3i7njk9pv95fh971yc81xr0zkaw3dff4gbv1zv048xyjysfgwpajbyryk2px8hinwwh0wagblmw6chdbjsrs6r"; }; }; "is-dotfile-1.0.3" = { @@ -3557,7 +3439,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz"; - sha512 = "arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA=="; + sha512 = "0w73qlx9ynmv2iznw1kll86yd04z4rsz3788nzgh7amcnpsbyxbrs734im9dibqgps6pjyz61s8kp4lcsbjsdfrlc51m1pm2hrxgfba"; }; }; "is-extglob-1.0.0" = { @@ -3692,7 +3574,7 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz"; - sha512 = "rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ=="; + sha512 = "20ybhnkgsrcwv730ch8qvzayjwcvs83jk2w6iim7wv3h2nn4jz8hsldn0k6ggx4xgcypwirqjb5xdacsswsk06w2nk56zr509q2aadd"; }; }; "is-obj-1.0.1" = { @@ -3719,7 +3601,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/is-options/-/is-options-1.0.1.tgz"; - sha512 = "2Xj8sA0zDrAcaoWfBiNmc6VPWAgKDpim0T3J9Djq7vbm1UjwbUWzeuLu/FwC46g3cBbAn0E5R0xwVtOobM6Xxg=="; + sha512 = "339gkkcm39mcw2c8wwl37y02rq3ga7309fgrvp2garlavgh93aydxpfx8wg9j9xs6k9h3ha11c4z9bkcqihd7w5d8fb03ik1nqgqy6r"; }; }; "is-path-inside-1.0.1" = { @@ -3737,7 +3619,7 @@ let version = "2.0.4"; src = fetchurl { url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz"; - sha512 = "h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og=="; + sha512 = "0xgsjz9m3kg5pm36lcchblxk53qay59ya7wi5jgdmz0dsl5b0j2j7wcd48yyfaip1m70mj9aqf8kib02fn62k0hy0vxg2hng60yk4w7"; }; }; "is-posix-bracket-0.1.1" = { @@ -3836,7 +3718,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz"; - sha512 = "eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="; + sha512 = "0h9a8zw2ddl25yryp7i376iqjdvlsx4gw93sxy4067dw2yi98m3krfwd9xgi9q5w0idw9rqnyhhncr38xsppyi5izkb7ngai58bawkr"; }; }; "isarray-0.0.1" = { @@ -3899,7 +3781,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz"; - sha512 = "1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w=="; + sha512 = "3vs53bpdrwiwwcql2xs20jmd8qha27k4iypdhr0b3isgdaj18vz80nhxwvvqxk6y3x5vj3slchxl0r91gjhz487xmkkp52gridg5zyl"; }; }; "iterators-0.1.0" = { @@ -3926,7 +3808,7 @@ let version = "3.12.0"; src = fetchurl { url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz"; - sha512 = "PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A=="; + sha512 = "3f8k2gvi3gnj9gpr3dnm5n5vpy2w68pshqk4hajlsmkb37ky30cnqza82l8sq153zx1nk67gizcm1ngmvlajw53hkwg4g96gir7d2rw"; }; }; "jsbn-0.1.1" = { @@ -3962,7 +3844,7 @@ let version = "0.3.4"; src = fetchurl { url = "https://registry.npmjs.org/json-schema-deref-sync/-/json-schema-deref-sync-0.3.4.tgz"; - sha512 = "4Ssj+1UGDJAzPIdTL1QW/rvHwWeuwC28gjbA0EjStLxVsalc+UPciKXxs3rhtr4gaGdIBojW/VmvC8B8bCQwcA=="; + sha512 = "1q3093cgk00pbsrzpb8h1j8cxl21gmnw5xb7wd5i3f47yawm6qmbg5ls94d1h1nhay2vh5fcz0wgfzy2ra2ylw77hrr0306apxj6az1"; }; }; "json-schema-traverse-0.3.1" = { @@ -4025,7 +3907,7 @@ let version = "3.3.1"; src = fetchurl { url = "https://registry.npmjs.org/k-bucket/-/k-bucket-3.3.1.tgz"; - sha512 = "kgwWqYT79rAahn4maIVTP8dIe+m1KulufWW+f1bB9DlZrRFiGpZ4iJOg2HUp4xJYBWONP3+rOPIWF/RXABU6mw=="; + sha512 = "2dkl580azs1f5pj72mpygwdcc2mh4p355sxi84ki1w9c6k226nmjfglq5b7zgk5gmpfjammx5xliirzaf2nh9kyhqdb1xpvhjlic34j"; }; }; "k-bucket-4.0.1" = { @@ -4034,7 +3916,7 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/k-bucket/-/k-bucket-4.0.1.tgz"; - sha512 = "YvDpmY3waI999h1zZoW1rJ04fZrgZ+5PAlVmvwDHT6YO/Q1AOhdel07xsKy9eAvJjQ9xZV1wz3rXKqEfaWvlcQ=="; + sha512 = "1qyasv93yhjmmvsrxq5srbi1y6wj2vqpnnb1wafjxg1ffj01pyhx9jgqw0byrjm097ywrz0k9yki7dcnn2ncwqxyryqys7hincykw32"; }; }; "k-rpc-4.3.1" = { @@ -4043,7 +3925,7 @@ let version = "4.3.1"; src = fetchurl { url = "https://registry.npmjs.org/k-rpc/-/k-rpc-4.3.1.tgz"; - sha512 = "mgAJZeFYbpP0xzJzmS0TQTYoFI0sjy3GnKFhg8wyboL+KvWg2WLaA2Oy9PthLPx2Rxz4WeBMk4y3MSOrDJ95FA=="; + sha512 = "0a7k7qcmcik3dwcjd6f0ngq3i3pdz1cc7xz9ck30gd65nd0ylmgx0kf6b686qd1kk32v3rcila2hdj12cnrjwrjqzs96vjqw5jhj04s"; }; }; "k-rpc-socket-1.8.0" = { @@ -4052,7 +3934,7 @@ let version = "1.8.0"; src = fetchurl { url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.8.0.tgz"; - sha512 = "f/9TynsO8YYjZ6JjNNtSSH7CJcIHcio1buy3zqByGxb/GX8AWLdL6FZEWTrN8V3/J7W4/E0ZTQQ+Jt2rVq7ELg=="; + sha512 = "0pc9bjnmgfjcgh49lclvz5qnlkzypgirlx5ji2nx15vfn00gwczy5hvfahcxdzcdqsjlwh7q8jw4zj8abdk8qx2cwiqdw8fgg557zvz"; }; }; "kind-of-3.2.2" = { @@ -4079,7 +3961,7 @@ let version = "5.1.0"; src = fetchurl { url = "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz"; - sha512 = "NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="; + sha512 = "0zk87sccrjx6pgf9n74v4msnqwq5siyhrkpaklx7yk85ygy5ypcgmyfhbd5mmcyd53x8zcw0gzvp9bhbglziqbhp7a6n5zsf6p08q9l"; }; }; "kind-of-6.0.2" = { @@ -4088,7 +3970,7 @@ let version = "6.0.2"; src = fetchurl { url = "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz"; - sha512 = "s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="; + sha512 = "2l91vcracq8y3nxacsssb4yhk0ww011gi5sn55wsb6bpnhyds2i1x98512f61r8awxmj602bxky6c7hsyibjvz17f1pmlf7r4whp6dk"; }; }; "klaw-1.3.1" = { @@ -4151,7 +4033,7 @@ let version = "4.17.10"; src = fetchurl { url = "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz"; - sha512 = "UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg=="; + sha512 = "1ba5b80jjzwrh9fbdk5ywv8sic0dynij21wgrfxsfjzwvwd7x1n6azdhdc0vjdxqmcpm0mhshd1k7n2ascxpz00z3p8a3k97mwg1s2i"; }; }; "lodash-compat-3.10.2" = { @@ -4520,7 +4402,7 @@ let version = "2.2.0"; src = fetchurl { url = "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz"; - sha512 = "VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg=="; + sha512 = "093j1mha2zwbfkb6cvxr94l1dsx44607vvyxadxki3j69s40n2f6x6iqs6f9rzpvvqd8anclsqdlrm3klkwxixm4k2fl8bjr4b01qjm"; }; }; "longest-1.0.1" = { @@ -4538,7 +4420,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz"; - sha512 = "G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA=="; + sha512 = "1a7qa1zn5zl1nf7i6w3299lc3biabfb0w2c30cl770l2dbldvi72nwvjdlinhx7j0ldip82sj710aprdjbmbg782i2pa3jpbgmy6qhv"; }; }; "lru-2.0.1" = { @@ -4574,7 +4456,7 @@ let version = "4.1.3"; src = fetchurl { url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz"; - sha512 = "fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA=="; + sha512 = "0j2ny2y61f70dbzarfa1xazv68dw7nb2r4p5sy46fw6dwr9y0yg003lb1yv7sdl77hcrpzn22mih799z657sz21al4qmf1kr2yj2lbw"; }; }; "make-dir-1.3.0" = { @@ -4583,7 +4465,7 @@ let version = "1.3.0"; src = fetchurl { url = "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz"; - sha512 = "2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ=="; + sha512 = "2qkk2yzlzrfwnmw8l80cn4l91rfin7fmqn81j39s32i8gzijilbmc798wy51bs3m5gqa6dgrns95gals771jbbl4s4jgdl9ni3za3fv"; }; }; "map-cache-0.2.2" = { @@ -4655,7 +4537,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/memory-pager/-/memory-pager-1.1.0.tgz"; - sha512 = "Mf9OHV/Y7h6YWDxTzX/b4ZZ4oh9NSXblQL8dtPCOomOtZciEHxePR78+uHFLLlsk01A6jVHhHsQZZ/WcIPpnzg=="; + sha512 = "376gyi0kksnf6f43vhm339sa39j8nrf9dqvhgmz8y7if7w4r1jssqx2ivqb87dz83jpcjad3yi7i5p1vdzwslrwb2c1xvnqbwflxzri"; }; }; "merkle-tree-stream-3.0.3" = { @@ -4700,7 +4582,7 @@ let version = "3.1.10"; src = fetchurl { url = "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz"; - sha512 = "MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg=="; + sha512 = "1r9rsac8gdslsplya0cnzyk6q0bh7m0wnxccdisacr5327k5k0v6f48dzp0022z8qqpzpvxw7sv1gzhvrqn6v5sz7qcvx37by1a8s1i"; }; }; "mime-1.3.4" = { @@ -4718,7 +4600,7 @@ let version = "1.4.1"; src = fetchurl { url = "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz"; - sha512 = "KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ=="; + sha512 = "2sz22r1xrnyvq6jg0h6b6cab3s3xdsfqa0n6vl9xv9gq3ppcxrcpg2hqfc41xjwnfwfkr6240l5gys7nds61ch6xcb3gr3fwsl7x398"; }; }; "mime-1.6.0" = { @@ -4727,7 +4609,7 @@ let version = "1.6.0"; src = fetchurl { url = "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz"; - sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; + sha512 = "1x901mk5cdib4xp27v4ivwwr7mhy64r4rk953bzivi5p9lf2bhw88ra2rhkd254xkdx2d3q30zkq239vc4yx4pfsj4hpys8rbr6fif7"; }; }; "mime-db-1.33.0" = { @@ -4736,7 +4618,7 @@ let version = "1.33.0"; src = fetchurl { url = "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz"; - sha512 = "BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ=="; + sha512 = "36xnw59ik9fqym00cmwb5nyzg0l03k70cp413f7639j93wgmzk1mh0xjc7i6zz3r6k9xnwh0g5cm5a1f3y8c6plgy4qld7fm887ywh4"; }; }; "mime-types-2.1.18" = { @@ -4745,7 +4627,7 @@ let version = "2.1.18"; src = fetchurl { url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz"; - sha512 = "lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ=="; + sha512 = "22krj1kw7n9z10zdyx7smcaim4bzwqsqzhspwha06q58gcrxfp93hw2cd0vk5crhq5p2dwzqlpacg32lrmp5sjzb798zdzy35mdmkwm"; }; }; "mimic-fn-1.2.0" = { @@ -4754,7 +4636,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz"; - sha512 = "jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="; + sha512 = "1clrrqw75rmpkw0x53axy8va2hq2gzynz9zb58m0xv1nh3lg81cv4dfdy7pk9vrlb9ydwmj6klpicwkv2bjx3m8aj4fi2ph3jxkizwd"; }; }; "min-document-2.19.0" = { @@ -4781,7 +4663,7 @@ let version = "3.0.4"; src = fetchurl { url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; - sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; + sha512 = "1879a3j85h92ypvb7lpv1dqpcxl49rqnbgs5la18zmj1yqhwl60c2m74254wbr5pp3znckqpkg9dvjyrz6hfz8b9vag5a3j910db4f8"; }; }; "minimist-0.0.8" = { @@ -4808,7 +4690,7 @@ let version = "2.3.3"; src = fetchurl { url = "https://registry.npmjs.org/minipass/-/minipass-2.3.3.tgz"; - sha512 = "/jAn9/tEX4gnpyRATxgHEOV6xbcyxgT7iUnxo9Y3+OB0zX00TgKIv/2FZCf5brBbICcwbLqVv2ImjvWWrQMSYw=="; + sha512 = "1ii40xdjvsqw9k2pyavlv1h4wh5pc3fz4kn91gxpy404kilgp6p9q7q6zba7wa9i7xh9iijnz2pmr8h0wc4yh14lwkqhps4zgvjfc7y"; }; }; "minizlib-1.1.0" = { @@ -4817,7 +4699,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/minizlib/-/minizlib-1.1.0.tgz"; - sha512 = "4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA=="; + sha512 = "2agpbdf9h90nhafdam3jwrw8gcz3jw1i40cx6bhwaw8qaf2s863gi2b77l73dc3hmf5dx491hv5km1rqzabgsbpkjxrvdcwy6pr8gp1"; }; }; "mirror-folder-3.0.0" = { @@ -4826,7 +4708,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/mirror-folder/-/mirror-folder-3.0.0.tgz"; - sha512 = "fh6wDXcSpFoKY7ZPHnEv1+xjLOS7tlkEpTvl4Y6ZsT0HNjIaYg6ktq9ng8MPthFruunS8D/3GnPeaWhoQD3X9g=="; + sha512 = "3vdfga0d1l6kpkk3bvkzw6jx6x6n4dn1z1q6rxgnsj0wqhs68v0fgdik67f3r9vll25kdmvwhn67v6p5xqiwkxncc55m90jfw6v07ky"; }; }; "mixin-deep-1.3.1" = { @@ -4835,7 +4717,7 @@ let version = "1.3.1"; src = fetchurl { url = "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz"; - sha512 = "8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ=="; + sha512 = "0swcxf279pl5jc4b3d4fm9whbi6sbv2xbcfm1fkxiz793qa2hl5wd1b8dw019dgyidx5nwpa141k0cvvwan0rfypn2am0c4fwn2v4pi"; }; }; "mkdirp-0.3.0" = { @@ -4898,7 +4780,7 @@ let version = "1.3.1"; src = fetchurl { url = "https://registry.npmjs.org/multer/-/multer-1.3.1.tgz"; - sha512 = "JHdEoxkA/5NgZRo91RNn4UT+HdcJV9XUo01DTkKC7vo1erNIngtuaw9Y0WI8RdTlyi+wMIbunflhghzVLuGJyw=="; + sha512 = "35qkq9fslf84qgrkpp8cc5h5z5fbm257iid2n0gddp0p7j8ndx3bypfh914whsdlgadamq9swfzwi71cw9xag8scmh97zq036il8xr4"; }; }; "multi-random-access-2.1.1" = { @@ -4916,7 +4798,7 @@ let version = "6.2.3"; src = fetchurl { url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz"; - sha512 = "ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g=="; + sha512 = "3m42kr8y2s1krl4gzb5xsa9v3h01xalvrgdkj99gyfaq7761asmj5m6kzm70mxb22125gia12g7rmarnzmh09403j8j2cyvx7jqjblf"; }; }; "multicast-dns-7.0.0" = { @@ -4925,7 +4807,7 @@ let version = "7.0.0"; src = fetchurl { url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.0.0.tgz"; - sha512 = "BqB5TtIXHo+8gN33N1CA1clsvPsAJlnc6D49SzfQA0xq75cxj15g2y9NaRdf4x2u4v1P66PBC+Wg6YgPO5Bc/g=="; + sha512 = "3z5r41v1y4fk8751g0s7ssgzpiaw7g3bwbnjk9gvdh5x3rijzpnlk03s0vlng9yx3f5j9h0zfy6rjfmh183gxyxh2y8y7hps977k806"; }; }; "multicb-1.2.2" = { @@ -4934,7 +4816,7 @@ let version = "1.2.2"; src = fetchurl { url = "https://registry.npmjs.org/multicb/-/multicb-1.2.2.tgz"; - sha512 = "PZM4dhYFmCF6uZGWpEmoPMUqJBywS9IcAgybT2GmSpYI1BvGvoWSdbio+ik+q/YD2vodhvslESWIS3NnkKYdqQ=="; + sha512 = "2liv9lhcxrlp21524jzp1hxzbd07xmb7qlzma5qfn98bgn63ga0i5jalrhlz6qc08fd4jxh3hj2mi9wm14s95lip5x236052rv3i4rx"; }; }; "multimatch-2.1.0" = { @@ -4952,7 +4834,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/multistream/-/multistream-2.1.1.tgz"; - sha512 = "xasv76hl6nr1dEy3lPvy7Ej7K/Lx3O/FCvwge8PeVJpciPPoNCbaANcNiBug3IpdvTveZUcAV0DJzdnUDMesNQ=="; + sha512 = "0ssriqcskcwvja0aw04frfy7fymv2nwl0dqh3fp03d2cd78yf45r6jlvv1pn87w1b2yzp7iy8mznj7cybxr9dscfkspmsk5m3pjzay5"; }; }; "mute-stream-0.0.5" = { @@ -4979,7 +4861,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/mutexify/-/mutexify-1.2.0.tgz"; - sha512 = "oprzxd2zhfrJqEuB98qc1dRMMonClBQ57UPDjnbcrah4orEMTq1jq3+AcdFe5ePzdbJXI7zmdhfftIdMnhYFoQ=="; + sha512 = "2hha5ly9j3v9pqpfvkbq8spn9sz7qz5bv8p303zmdisskhcn6i7ia5dviv8xhs3xlwi9562i4r4rm6mkk5gg0abm34zm1dkvp2z76m2"; }; }; "nan-2.10.0" = { @@ -4988,7 +4870,7 @@ let version = "2.10.0"; src = fetchurl { url = "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz"; - sha512 = "bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA=="; + sha512 = "349rr7x0djrlkav4gbhkg355852ingn965r0kkch8rr4cwp7qki9676zpq8cq988yszzd2hld6szsbbnd1v6rghzf11abn1nyzlj1vc"; }; }; "nanoassert-1.1.0" = { @@ -5015,7 +4897,7 @@ let version = "1.2.13"; src = fetchurl { url = "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz"; - sha512 = "fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA=="; + sha512 = "04al0wvh9hw1p9bblk847c5nbi3lcjz2pg5yzpqdzgllk57firrqinn4yk169iddaagdf9s5l987xh43z87w3hm9h0pqv0i7pcix6ky"; }; }; "nanotiming-1.0.1" = { @@ -5051,7 +4933,7 @@ let version = "1.1.2"; src = fetchurl { url = "https://registry.npmjs.org/neat-log/-/neat-log-1.1.2.tgz"; - sha512 = "LUk9cZY/FakJlQ7OcZaHakNV0AzBwfx9iqU4hwYx7NhVYBjZBeykmcHJD5y+cfVWpyaHdjIYnb+gKTVkS+DlSg=="; + sha512 = "15fbq2bchsjk85zklc34xl74skmdxbipsf0zjf1k6jfq1fr31h5bn7c6438ff55i9yzrhf11k85ahvahyb73khfjl4sj59zjrqksj9d"; }; }; "needle-2.2.1" = { @@ -5060,7 +4942,7 @@ let version = "2.2.1"; src = fetchurl { url = "https://registry.npmjs.org/needle/-/needle-2.2.1.tgz"; - sha512 = "t/ZswCM9JTWjAdXS9VpvqhI2Ct2sL2MdY4fUXqGJaGBk13ge99ObqRksRTbBE56K+wxUXwwfZYOuZHifFW9q+Q=="; + sha512 = "3wnlvqmkxw69bl3clghqpsl1kxqm7hkq4v4ab0rm6dx7xqyg3bn8q38i6hmxm47ccfn6bxcvl53c4madxdgblnm06ika99x4g06rxmp"; }; }; "nets-3.2.0" = { @@ -5096,7 +4978,7 @@ let version = "3.4.0"; src = fetchurl { url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.4.0.tgz"; - sha512 = "YoviGBJYGrPdLOKDIQB0sKxuKy/EEsxzooNkOZak4vSTKT/qH0Pa6dj3t1MJjEQGsefih61IyHDmO1WW7xOFfw=="; + sha512 = "1zqa4zgjrakprkhr14av1z2wyqhci4c159vgxyqx7d467za7wlr7x72ljb3jr43l9rwq4n45wmnxb5hfh0230z25kfv66jq28cf52v2"; }; }; "nodemon-1.17.5" = { @@ -5105,7 +4987,7 @@ let version = "1.17.5"; src = fetchurl { url = "https://registry.npmjs.org/nodemon/-/nodemon-1.17.5.tgz"; - sha512 = "FG2mWJU1Y58a9ktgMJ/RZpsiPz3b7ge77t/okZHEa4NbrlXGKZ8s1A6Q+C7+JPXohAfcPALRwvxcAn8S874pmw=="; + sha512 = "2djkgpk29zh4p7wqb8h4g6w0y2fix94zqpgi40fshn9yaf6anp5p0vbqj8r3s6zxsxhgvnv7lzj56v6s6gk0q2byqd9yqrmjmcacv8l"; }; }; "nopt-1.0.10" = { @@ -5150,7 +5032,7 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.3.tgz"; - sha512 = "ByQ3oJ/5ETLyglU2+8dBObvhfWXX8dtPZDMePCahptliFX2iIuhyEszyFk401PZUNQH20vvdW5MLjJxkwU80Ow=="; + sha512 = "0xk8ky1cjf8q2wkbgfzplpn04sm9xnl6i71dwnc29rfh8m2glan5nd6l4k3q7ikci7xpwfpcmyy3frr873zndjmhbr344grkyh3f907"; }; }; "npm-conf-1.1.3" = { @@ -5159,7 +5041,7 @@ let version = "1.1.3"; src = fetchurl { url = "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz"; - sha512 = "Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw=="; + sha512 = "1rx44jzcf3byibrwmgyr0598hng4snjfj9bx29xm7bi5y1bqkbvb2krh8z0ccpzv3aps71qwrq55a56l1qkzlan118xyfn9j5nkh9v2"; }; }; "npm-packlist-1.1.10" = { @@ -5168,7 +5050,7 @@ let version = "1.1.10"; src = fetchurl { url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.10.tgz"; - sha512 = "AQC0Dyhzn4EiYEfIUjCdMl0JJ61I2ER9ukf/sLxJUcZHfo+VyEfz2rMJgLZSS1v30OxPQe1cN0LZA1xbcaVfWA=="; + sha512 = "1c5z9bibdf07na26xffshagxk8gfnsbaav802dkvbrlgj4mixz4giji96yb1zs7p9yl9n28mlkhjp9jklq55j27c0i837vk507v8001"; }; }; "npm-run-path-2.0.2" = { @@ -5186,7 +5068,7 @@ let version = "4.1.2"; src = fetchurl { url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz"; - sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg=="; + sha512 = "2967mavp7zw0aawf5fadqf4pmn7vy5gya1yx2s9wwppvivhd9q4mpdnszfqvd7p6yks649bwbpj8iviw86g0hpp4f93d5ca7dmjmrfs"; }; }; "number-is-nan-1.0.1" = { @@ -5330,7 +5212,7 @@ let version = "1.4.0"; src = fetchurl { url = "https://registry.npmjs.org/ora/-/ora-1.4.0.tgz"; - sha512 = "iMK1DOQxzzh2MBlVsU42G80mnrvUhqsMh74phHtDlrcTZPK0pH6o7l7DRshK+0YsxDyEuaOkziVdvM3T0QTzpw=="; + sha512 = "2kz616isg6vqp95rsja7fc47k22qipv9b44dhsyxsl7x95ly9j17dwn8dxq8adyhw6ap1nlpfg2dk8v6r7b2m8r61v3ikriwh6bbhl8"; }; }; "os-homedir-1.0.2" = { @@ -5357,7 +5239,7 @@ let version = "0.1.5"; src = fetchurl { url = "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz"; - sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g=="; + sha512 = "3ddw0y41pxv08ls5xhmq1bi81hppjbr45k78cjfx99vznh5znrj5g1b1wab9caj1mqlsvmfms0zm9cfb47ygm0d8wv5fccx8049q9fh"; }; }; "p-finally-1.0.0" = { @@ -5456,7 +5338,7 @@ let version = "1.0.4"; src = fetchurl { url = "https://registry.npmjs.org/path-loader/-/path-loader-1.0.4.tgz"; - sha512 = "k/IPo9OWyofATP5gwIehHHQoFShS37zsSIsejKe6fjI+tqK+FnRpiSg4ZfWUpxb0g2PfCreWPqBD4ayjqjqkdQ=="; + sha512 = "1ss8fmalfnf2hx07sbbf2nzcf1z85m7jksnaf18i5lp85mylav3wckypakqq7lb93nbrpsj50ajhx0wl63w0q7y9k08gjlnsfihzwlk"; }; }; "path-to-regexp-1.7.0" = { @@ -5627,7 +5509,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz"; - sha512 = "MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="; + sha512 = "0rw8xpqqkhs91722slvzf8icxfaimqp4w8zb3840jxr7r8n8035byl6dhdi5bm0yr6x7sdws0gf3m025fg6hqgaklwlbl4d7bah5l9j"; }; }; "progress-string-1.2.2" = { @@ -5636,7 +5518,7 @@ let version = "1.2.2"; src = fetchurl { url = "https://registry.npmjs.org/progress-string/-/progress-string-1.2.2.tgz"; - sha512 = "JymvIR4IJ0qTyma7ExefBeJGp2IGaXYGWv8Z//Jq+AhrCd0uKlMPK9IWJ0LL6zbXbAN8fhLe1TL1hl1ZKOljDw=="; + sha512 = "07n7s98b5fqdx9jspg14zkw0dndfdpbrd12f5nj5c7m6aifvl4nn27qdbrgy6gzb837cs86cakldqh5kwbi7fv6ra9ll9q83qhsya97"; }; }; "prompt-1.0.0" = { @@ -5663,7 +5545,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/protocol-buffers-encodings/-/protocol-buffers-encodings-1.1.0.tgz"; - sha512 = "SmjEuAf3hc3h3rWZ6V1YaaQw2MNJWK848gLJgzx/sefOJdNLujKinJVXIS0q2cBQpQn2Q32TinawZyDZPzm4kQ=="; + sha512 = "28vhf9zv4h6gc3nia9pshzn16jm1h6r58nj2mwmkji35fjbscjwxrxigwy87j82y8wayn29qgc31939b1fyk6dmvvhwv1gp0ywc8s2a"; }; }; "ps-tree-1.1.0" = { @@ -5690,7 +5572,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.0.tgz"; - sha512 = "q5I5vLRMVtdWa8n/3UEzZX7Lfghzrg9eG2IKk2ENLSofKRCXVqMvMUHxCKgXNaqH/8ebhBxrqftHWnyTFweJ5Q=="; + sha512 = "3jqj1qpjdy5lizvm5mir14vqzzqgaim2yl0iwa164ps6mlp20liyaid1mhr62k23dg0zbkk11zcnzk56d0xvzy9ddbdfmjcnjy3k4mb"; }; }; "pump-1.0.3" = { @@ -5699,7 +5581,7 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/pump/-/pump-1.0.3.tgz"; - sha512 = "8k0JupWme55+9tCVE+FS5ULT3K6AbgqrGa58lTT49RpyfwwcGedHqaC5LlQNdEAumn/wFsu6aPwkuPMioy8kqw=="; + sha512 = "2mj8bx34brvh97wd2xcn5phgyd2wh3l1ma2xfd0m53yf68w1izp46pmz0s9az5f36mhlvl0mvfd6hp5abhi75fhyrz9wyx6jnx0jkgj"; }; }; "pump-2.0.1" = { @@ -5708,7 +5590,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz"; - sha512 = "ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA=="; + sha512 = "288hcmlwdnqda84ylx9cv413ic0r59k0dp71hy7a200jsb7h1y63277jwdp1jdp13c1b3pl6g2gzr5gjv9p72f5sp7w3p0d34swrqxf"; }; }; "pump-3.0.0" = { @@ -5717,7 +5599,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz"; - sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww=="; + sha512 = "31n24fqakqmhzk2ch644gziskmysmrgiwclsdsr0rwk9spgikqpwickbnayap0rynfjlq72s7iny2p35n3qszypr97ws5njkpx741ig"; }; }; "punycode-1.4.1" = { @@ -5735,7 +5617,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz"; - sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; + sha512 = "381vqgh5xkqzrr6cxbzfykgnnk83m7qgpx3wjwj1hddn3sg2aibjxyr30rajpgv4js0cqknrbzwbfk5ryhiiyigzfjrk3zysy6i26sx"; }; }; "qs-2.3.3" = { @@ -5780,7 +5662,7 @@ let version = "6.5.2"; src = fetchurl { url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz"; - sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="; + sha512 = "0c46ws0x9g3mmkgfmvd78bzvnmv2b8ryg4ah6jvyyqgjv9v994z7xdyvsc4vg9sf98gg7phvy3q1ahgaj5fy3dwzf2rki6bixgl15ip"; }; }; "raf-3.3.2" = { @@ -5798,7 +5680,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/random-access-file/-/random-access-file-2.0.1.tgz"; - sha512 = "nb4fClpzoUY+v1SHrro+9yykN90eMA1rc+xM39tnZ5R3BgFY+J/NxPZ0KuUpishEsvnwou9Fvm2wa3cjeuG7vg=="; + sha512 = "2zbpqbs4dvnpc3dpr2yz8phz6r49j4a57jjlx7nqk6rzy2q0437g537czdxyk7cfdmhsc0yvlvs8b7p7sxax1slpwz4d8bkb851zglx"; }; }; "random-access-memory-2.4.0" = { @@ -5816,7 +5698,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/random-access-memory/-/random-access-memory-3.0.0.tgz"; - sha512 = "O/d5C/kTOs/aDix1CD+N7z4SgNVGPx+xpFKXGfrC0TFpqYVrsJEUmQCl3ITTg7FVMoCmLBo5rdkA5FcFg00NTA=="; + sha512 = "160skc30mby806rmlwilb56h0r5bcc3sf2dr980k4a93c3bhnlnjcfiqbx1k5sjljqiygs6sn014gpgilzhhx9c1vdcyfhkz45pkxrv"; }; }; "random-access-storage-1.3.0" = { @@ -5825,11 +5707,7 @@ let version = "1.3.0"; src = fetchurl { url = "https://registry.npmjs.org/random-access-storage/-/random-access-storage-1.3.0.tgz"; -<<<<<<< HEAD - sha512 = "pdS9Mcb9TB7oICypPRALlheaSuszuAKmLVEPKJMuYor7R/zDuHh5ALuQoS+ox31XRwQUL+tDwWH2GPdyspwelA=="; -======= sha512 = "2a1x75jfbviixk1q51ynbql0i3mfzf7m0ps345v01wpif63zi3zp2k25s9jh3si5nk05f1kxd59l5wn1c83va9c43l1wk7xqqqvvm55"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "randomatic-3.0.0" = { @@ -5838,7 +5716,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/randomatic/-/randomatic-3.0.0.tgz"; - sha512 = "VdxFOIEY3mNO5PtSRkkle/hPJDHvQhK21oa73K4yAc9qmp6N429gAyF1gZMOTMeS0/AYzaV/2Trcef+NaIonSA=="; + sha512 = "142g2k8ipzpkp1sv5zsbk8qy39r5isc1s9q2x910dh6zqwdksd6mkq16apdrfw6ssv14hpg64j4zy3v4m4lclpvwi767phqh4w4bp2m"; }; }; "randombytes-2.0.6" = { @@ -5847,7 +5725,7 @@ let version = "2.0.6"; src = fetchurl { url = "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz"; - sha512 = "CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A=="; + sha512 = "3a0zyz736klfzzpd9vwag3gznq7lrj57igm474dq279gsnyqdgfm1brhrs78ky30gsdwz9rwnjjms00fpdpp2p3x8p9mq2zbhw3k108"; }; }; "range-parser-1.2.0" = { @@ -5874,7 +5752,7 @@ let version = "1.2.8"; src = fetchurl { url = "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz"; - sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw=="; + sha512 = "0xhy1n9n3y6cp28f8f0f2mi0xzc7ay1g5nhbp64fyvcwv9q30zq2zvyc5q2d0al8aa0hx101yq2y6d2ln4r5jxnqifh1pd3la1ccxnb"; }; }; "read-1.0.7" = { @@ -5919,7 +5797,7 @@ let version = "2.3.6"; src = fetchurl { url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz"; - sha512 = "tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw=="; + sha512 = "0mj9b6190amln9rg89x5pq2n195s3v0gzicpdamv1kbabg69aw5m71l34jsjn7bqil7405l6l35x9ijnb3h4jz5vx2i00l8sl1ll2xm"; }; }; "readdirp-2.1.0" = { @@ -5946,7 +5824,7 @@ let version = "2.2.2"; src = fetchurl { url = "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz"; - sha512 = "nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg=="; + sha512 = "0bb5d70l5lg02x515r2klvjhhz6xcxdb4ykbx16wq45l822bbsdd8sbki7vb28j17xr7181fmwlzhx3bizvr5xdq6cxpv53sidrq44x"; }; }; "recursive-watch-1.1.4" = { @@ -5955,7 +5833,7 @@ let version = "1.1.4"; src = fetchurl { url = "https://registry.npmjs.org/recursive-watch/-/recursive-watch-1.1.4.tgz"; - sha512 = "fWejAmdLi7B/jipBUjTLnqId+PK+573fbGNbdaNA/AiAnQAx6OYOLCGWRs0W5+PyM1rLzZSWK2f40QpHSR49PQ=="; + sha512 = "0yks7j98w5d3y375fb99kfbb8rz5qz72v6ld5i15h7fds1i02fq027w82ipanv3dkgvvrxyybw1v8lyrcs54h9airzv12sbcw1a6rvx"; }; }; "reduce-component-1.0.1" = { @@ -5973,7 +5851,7 @@ let version = "0.4.4"; src = fetchurl { url = "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz"; - sha512 = "nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ=="; + sha512 = "1crfmf19zkv0imnbbkj7bwrcyin3zxa88cs86b6apkxj8qrsmkxnydhsy2ia75q4ld10rhi2s2c36h7g77a997mh9c2z453s311jllx"; }; }; "regex-not-1.0.2" = { @@ -5982,7 +5860,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz"; - sha512 = "J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A=="; + sha512 = "3cggngaj8m70zdn8kghha4mhvavm7jfy5xm2iqi94w4gi5m5irs3nlrgg975w2231y49jnnw7zhsg648pbkl9zb6vwhii83926q7917"; }; }; "registry-auth-token-3.3.2" = { @@ -5991,7 +5869,7 @@ let version = "3.3.2"; src = fetchurl { url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.2.tgz"; - sha512 = "JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ=="; + sha512 = "2fv3fbyf4wv81famfkd3j8nld0fc4sfjfxfc91wwpqwgp00nl3727c9z4sdm4gicb4nxzmhkrphsnphpamgmknsh2ak15qpmmrzvg94"; }; }; "registry-url-3.1.0" = { @@ -6030,28 +5908,6 @@ let sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; }; }; -<<<<<<< HEAD -<<<<<<< HEAD - "request-2.81.0" = { - name = "request"; - packageName = "request"; - version = "2.81.0"; - src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.81.0.tgz"; - sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0"; - }; - }; -======= -<<<<<<< HEAD ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 - "request-2.87.0" = { - name = "request"; - packageName = "request"; - version = "2.87.0"; - src = fetchurl { -======= -======= ->>>>>>> nodePackages: meguca: 1.0.7 update "request-2.81.0" = { name = "request"; packageName = "request"; @@ -6067,7 +5923,7 @@ let version = "2.87.0"; src = fetchurl { url = "https://registry.npmjs.org/request/-/request-2.87.0.tgz"; - sha512 = "fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw=="; + sha512 = "0vnsbflzj7gxa33r47bzsiaf7jc00b9iqkqdz8l7n9x5dgdgbq1qpcqqslds1arazipz8pjr4m5rf4ikg4d59d49gn9dky0ds921jkx"; }; }; "resolve-1.1.7" = { @@ -6112,7 +5968,7 @@ let version = "0.1.15"; src = fetchurl { url = "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz"; - sha512 = "TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="; + sha512 = "2d7igpgyzdlpx2ni0sql8gsnqk9qivfsw6bn1aklm19kbhgxjzmlazz8szfsbdpjka4gk6i3zf0jqa0llaf7dni636fnbwfmyjmhfad"; }; }; "revalidator-0.1.8" = { @@ -6139,7 +5995,7 @@ let version = "2.6.2"; src = fetchurl { url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz"; - sha512 = "lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w=="; + sha512 = "3kmrqh8xli7rzfm8wc6j9lp0c6vml172iv3z088an9xlwl1xvkvh3fn92za66ms4c9yww80qa5kan31k1z1ypqvkchmh1mznb09xdwn"; }; }; "run-async-0.1.0" = { @@ -6202,11 +6058,7 @@ let version = "6.2.1"; src = fetchurl { url = "https://registry.npmjs.org/rxjs/-/rxjs-6.2.1.tgz"; -<<<<<<< HEAD - sha512 = "OwMxHxmnmHTUpgO+V7dZChf3Tixf4ih95cmXjzzadULziVl/FKhHScGLj4goEw9weePVOH2Q0+GcCBUhKCZc/g=="; -======= sha512 = "3z5q9i844ahi771sf87sf6mwdwp03qk5248z2y1953sh53zb64z6hkmv8y8z5y9wmyjiqjz5i7gf5qab6vmggh3lva7965734gk20rv"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "safe-buffer-5.1.2" = { @@ -6215,7 +6067,7 @@ let version = "5.1.2"; src = fetchurl { url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"; - sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; + sha512 = "3xbm0dkya4bc3zwfwpdzbl8ngq0aai5ihlp2v3s39y7162c7wyvv9izj3g8hv6dy6vm2lq48lmfzygk0kxwbjb6xic7k4a329j99p8r"; }; }; "safe-regex-1.1.0" = { @@ -6233,7 +6085,7 @@ let version = "2.1.2"; src = fetchurl { url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"; - sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; + sha512 = "2v99f22kh56y72d3s8wrgdvf5n10ry40dh3fwnsxr4d5rfvxdfxfmc3qyqkscnj4f8799jy9bpg6cm21x2d811dr9ib83wjrlmkg6k1"; }; }; "sanitize-filename-1.6.1" = { @@ -6251,7 +6103,7 @@ let version = "1.2.4"; src = fetchurl { url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz"; - sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="; + sha512 = "1dn291mjsda42w8kldlbmngk6dhjxfbvvd5lckyqmwbjaj6069iq3wx0nvcfglwnpddz2qa93lzf4hv77iz43bd2qixa079sjzl799n"; }; }; "seek-bzip-1.0.5" = { @@ -6278,7 +6130,7 @@ let version = "5.5.0"; src = fetchurl { url = "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz"; - sha512 = "4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA=="; + sha512 = "0h32zh035y8m6dzcqhcymbhwgmc8839fa1hhj0jfh9ivp9kmqfj1sbwnsnkzcn9qm3sqn38sa8ys2g4c638lpnmzjr0a0qndmv7f8p1"; }; }; "semver-diff-2.1.0" = { @@ -6296,7 +6148,7 @@ let version = "0.16.2"; src = fetchurl { url = "https://registry.npmjs.org/send/-/send-0.16.2.tgz"; - sha512 = "E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw=="; + sha512 = "1kh8iy2h9x6mqbb0kssb4d966irri0z8g2151jwx47q32dbmds01j9fs2c8hln68dqqh0ims8p450z3xfw6vs8v2k253c1cyla1ibhk"; }; }; "serve-static-1.13.2" = { @@ -6305,7 +6157,7 @@ let version = "1.13.2"; src = fetchurl { url = "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz"; - sha512 = "p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw=="; + sha512 = "2gkkd7jlmrn2a8d736x3fcij9jj16aglbq6pcivb897g01k1dlrpvb565d3hq9zwafyr60zlcqr5flgd2yqs36s8wxpylxqnck5vyx7"; }; }; "set-blocking-2.0.0" = { @@ -6341,7 +6193,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz"; - sha512 = "hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg=="; + sha512 = "1xdxg14zh452ih8f7826ki7xpq8wk8a831pm5zngqf8cbc4qv6mr9npks863bfqylfrhm161whf9199rmqn4i12wzmz2ks69z3343c7"; }; }; "setimmediate-1.0.5" = { @@ -6359,7 +6211,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz"; - sha512 = "BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="; + sha512 = "2jlhhawfqdiga1m6if01ks1q3yx56k5vj6wf372589vkswvdflw7224viivxali56b0jjsckpmjy10rj6fcakhw2dbq2psr197kzw86"; }; }; "shebang-command-1.2.0" = { @@ -6413,7 +6265,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/simple-sha1/-/simple-sha1-2.1.1.tgz"; - sha512 = "pFMPd+I/lQkpf4wFUeS/sED5IqdIG1lUlrQviBMV4u4mz8BRAcB5fvUx5Ckfg3kBigEglAjHg7E9k/yy2KlCqA=="; + sha512 = "2l45afqnby96gdihg3hi51006502yc33wly8cgmgrww00aiq37jdvp22l9qhbxljra5j6s8lwigjh5hpzj521ccgwlhk59zw9vhylx4"; }; }; "siphash24-1.1.1" = { @@ -6422,7 +6274,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/siphash24/-/siphash24-1.1.1.tgz"; - sha512 = "dKKwjIoTOa587TARYLlBRXq2lkbu5Iz35XrEVWpelhBP1m8r2BGOy1QlaZe84GTFHG/BTucEUd2btnNc8QzIVA=="; + sha512 = "1ach37ibirvd6yxa42ffkn1dwfcar70pjbnj9alrf713n1bdzb4y44nbrm5bi3swpvqrr7f8sbbcyj586wn049hxmyawf8kia6b18kl"; }; }; "slash-1.0.0" = { @@ -6449,7 +6301,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz"; - sha512 = "POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg=="; + sha512 = "1xd3zsk02nck4y601rn98n8cicrphaw5bdix278mk1yizmjv9s0wpa6akcqggd7d99c55s3byf4ylqdxkshyfsfnfx7lvwbmq2b3siw"; }; }; "snabbdom-0.7.0" = { @@ -6458,7 +6310,7 @@ let version = "0.7.0"; src = fetchurl { url = "https://registry.npmjs.org/snabbdom/-/snabbdom-0.7.0.tgz"; - sha512 = "LCg6lH9p2OD5n52SI4LlpYmDW2bscxsyN7rhnGJB/R3LQy/FdJfqNBM5aVST+zOfM4OdKFl8pxVUhjGsPtQA1w=="; + sha512 = "3bh1m1ymhqqcm0mlxy5ja4xhcrryczvjda6jf8k6km9fx655x1wn7gx85i9rqds6wr1nwzccrdq72d5wn1274lxkzwy1n39gya3la1c"; }; }; "snabbdom-selector-1.2.1" = { @@ -6467,7 +6319,7 @@ let version = "1.2.1"; src = fetchurl { url = "https://registry.npmjs.org/snabbdom-selector/-/snabbdom-selector-1.2.1.tgz"; - sha512 = "g0w2Ft4RJl+F/1/tQvA4BUsH09s+RNd0RRa+So24Inv5yzce5xUnPzxlEWNUBG5TwQjfKDZSFWrf2rXz+e1Q2g=="; + sha512 = "3d51vgryfsxmpva2m93ca6z130m6vh4aiii2r9w7wkibrqy6z5zjyr2p26lmghn8msdfi1yvg9hfjq573q45vazzy2my9hivqb3ck43"; }; }; "snapdragon-0.8.2" = { @@ -6476,7 +6328,7 @@ let version = "0.8.2"; src = fetchurl { url = "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz"; - sha512 = "FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg=="; + sha512 = "2b0sap2q0c6qbfkw6znql845b143frn5gkkz4gpirjhgwa2j3wy3jsvrfg51s5c1w1m4nkgis97x9yvmzsc533kap9j3h3zcffqxp0n"; }; }; "snapdragon-node-2.1.1" = { @@ -6485,7 +6337,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz"; - sha512 = "O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw=="; + sha512 = "2gk18pdld8ij1bpa2mdwl8f7i4rl5d4ys3qw31hipj56wslnsfhp1vxp3q36kj1m4f34wzzlvj0282qx5xlflqf978xyqlc2viyaviv"; }; }; "snapdragon-util-3.0.1" = { @@ -6494,16 +6346,7 @@ let version = "3.0.1"; src = fetchurl { url = "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz"; - sha512 = "mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ=="; - }; - }; - "sntp-1.0.9" = { - name = "sntp"; - packageName = "sntp"; - version = "1.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"; - sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198"; + sha512 = "1jsaqma4ycl2iq0761i1w7758z1kq7gbsij4xfb7p5cnw0qa62pszv6pr3j856n3pbxww7wwxs5wvcg2cb6vy020kw3bchashqs9clr"; }; }; "sntp-1.0.9" = { @@ -6521,7 +6364,7 @@ let version = "0.5.5"; src = fetchurl { url = "https://registry.npmjs.org/sodium-javascript/-/sodium-javascript-0.5.5.tgz"; - sha512 = "UMmCHovws/sxIBZsIRhIl8uRPou/RFDD0vVop81T1hG106NLLgqajKKuHAOtAP6hflnZ0UrVA2VFwddTd/NQyA=="; + sha512 = "3451wvpagbw2ib50galmlfrb5za3zh0ml1irbm2ijd0lbjblg9va4fnag6sfs7msb1m0i5zicz93jwp90c22v0n40qzpczhicg85jah"; }; }; "sodium-native-2.1.6" = { @@ -6530,7 +6373,7 @@ let version = "2.1.6"; src = fetchurl { url = "https://registry.npmjs.org/sodium-native/-/sodium-native-2.1.6.tgz"; - sha512 = "vfovcNlU8C93SbeNoGSAdW5zVOTlrh1sTy+TzdC2FhDTE/IUK6j4ML5gdr/qziLz4XRT4EQWJvbFzql6CAAH/A=="; + sha512 = "3y0f008galwxign4qb49q2kfkhz68nfxazpcq5y63wahaqly89x640nnv8cv4rg9xn1vbp5wia76vkmh1ja13dp95vjzw2lv5q2zymx"; }; }; "sodium-universal-2.0.0" = { @@ -6539,7 +6382,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/sodium-universal/-/sodium-universal-2.0.0.tgz"; - sha512 = "csdVyakzHJRyCevY4aZC2Eacda8paf+4nmRGF2N7KxCLKY2Ajn72JsExaQlJQ2BiXJncp44p3T+b80cU+2TTsg=="; + sha512 = "2rd6r7v2i3z76rzvllqx9ywk5f64q23944njcf14vv7x3l0illqn41bgdiifik4kswgys99mxsrqinq8akf3n7b15r9871km74mbivj"; }; }; "sorted-array-functions-1.2.0" = { @@ -6548,7 +6391,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/sorted-array-functions/-/sorted-array-functions-1.2.0.tgz"; - sha512 = "sWpjPhIZJtqO77GN+LD8dDsDKcWZ9GCOJNqKzi1tvtjGIzwfoyuRH8S0psunmc6Z5P+qfDqztSbwYR5X/e1UTg=="; + sha512 = "1759vgxawg63w16nnrklz5azzj9kklrlz5sdd643y8jp8qz7hiwdn5ydlnwx2ns4j761x4rqllh6fvlzjqgi3dixy7dl9hr28z66smi"; }; }; "sorted-immutable-list-1.1.0" = { @@ -6593,7 +6436,7 @@ let version = "0.5.2"; src = fetchurl { url = "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz"; - sha512 = "MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA=="; + sha512 = "14dmrwi7wa13wr1mrygjmb49mzsycpj8h5r41y7qvdf98lz9qzaww7vis6cvgqgfx0ly1sx4vsmw45xzlzs6indjcs5pkrjvjyaqfij"; }; }; "source-map-url-0.4.0" = { @@ -6629,11 +6472,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/speedometer/-/speedometer-1.1.0.tgz"; -<<<<<<< HEAD - sha512 = "z/wAiTESw2XVPssY2XRcme4niTc4S5FkkJ4gknudtVoc33Zil8TdTxHy5torRcgqMqksJV2Yz8HQcvtbsnw0mQ=="; -======= sha512 = "2ck8z5jbgxp5l61ryc5s99cm4r2mj255gdfdwhi9zfw95v2fvgiqnmmkmxr484yj1j92jrq6y4jgvlrbisdj66b7vanbhqj664h1z6g"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "split-0.3.3" = { @@ -6651,7 +6490,7 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz"; - sha512 = "NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw=="; + sha512 = "25ih1dx2qb3lawqjxj85znd4l3x8nnigrcdlpfw8064gh2mwxic9bgg5ylgxm9gjl3v8dmyc47rycp8xvqz78jqalg0g9yqj225acrp"; }; }; "sprintf-js-1.0.3" = { @@ -6705,7 +6544,7 @@ let version = "3.1.1"; src = fetchurl { url = "https://registry.npmjs.org/status-logger/-/status-logger-3.1.1.tgz"; - sha512 = "dNYazf7T9aD9XMvvP/ZZTL8nzhS1piUfFq7HVDOHFdO2LBnPMqdkS5kaoXjK7gvH/0mT6ZcafuDTSSd7DIVYAA=="; + sha512 = "005i18cgcklklz0gqd9gsck97zwf2zfr9wa26lr9djafcng34nbdlqmhwrm9ixf2qgjb9mm2k72ggscb7v3zvybbkys1xfkzv6immkl"; }; }; "statuses-1.3.1" = { @@ -6723,16 +6562,7 @@ let version = "1.4.0"; src = fetchurl { url = "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz"; - sha512 = "zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew=="; - }; - }; - "statuses-1.5.0" = { - name = "statuses"; - packageName = "statuses"; - version = "1.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz"; - sha1 = "161c7dac177659fd9811f43771fa99381478628c"; + sha512 = "1xxwqpj713rq1idbmp7mj7cj9dl52lazgpd5x8a9g88jawbkn9xpwbgljl7cvnd0jqkll2zpdj5xy63dlis9l2k8vmx1n1gvyv8456f"; }; }; "stream-collector-1.0.1" = { @@ -6759,7 +6589,7 @@ let version = "1.2.2"; src = fetchurl { url = "https://registry.npmjs.org/stream-each/-/stream-each-1.2.2.tgz"; - sha512 = "mc1dbFhGBxvTM3bIWmAAINbqiuAk9TATcfIQC8P+/+HJefgaiTlMn2dHvkX8qlI12KeYKSQ1Ua9RrIqrn1VPoA=="; + sha512 = "2h4ymczmf5aqldga4sj8acqlzc3almazi2vwiv7kx63k28sz1wwkqgzzv1hn47jf49k1x94w25fmmi001h5mj3n6g9in1s6b1n5vkcr"; }; }; "stream-parser-0.3.1" = { @@ -6813,7 +6643,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz"; - sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw=="; + sha512 = "29s1fqgr4mnhfxwczgdghfmmc1f792m9hysvcjxw2h5lfj8ndf2b6gm02m96qk5m75g4aisijvng4pk618anwbr8i9ay2jyszkqgslw"; }; }; "string_decoder-0.10.31" = { @@ -6831,16 +6661,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"; - sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; - }; - }; - "stringstream-0.0.6" = { - name = "stringstream"; - packageName = "stringstream"; - version = "0.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/stringstream/-/stringstream-0.0.6.tgz"; - sha512 = "87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA=="; + sha512 = "315yd4vzwrwk3vwj1klf46y1cj2jbvf88066y2rnwhksb98phj46jkxixbwsp3h607w7czy7cby522s7sx8mvspdpdm3s72y2ga3x4z"; }; }; "stringstream-0.0.6" = { @@ -6876,7 +6697,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/strip-dirs/-/strip-dirs-2.1.0.tgz"; - sha512 = "JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g=="; + sha512 = "3gd7bh1h7xjvl8y6lj1mmsv4qpgbxd620fbp2cjlnc3b9gn7wnzbs1170gs7i6y5arm0dd09y8d74vr357gvwmx9f0616wbw8wv3q14"; }; }; "strip-eof-1.0.0" = { @@ -6903,7 +6724,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz"; - sha512 = "k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg=="; + sha512 = "31a8vlzg4gwak3cx7n0lask77xyqpf5mz4ckphc10ykmb9r2lais7v4w8a8xij9lv2115xjnl7avkwp2l7cw3kbc3lpjsghl72757lk"; }; }; "subcommand-2.1.0" = { @@ -6930,7 +6751,7 @@ let version = "3.8.2"; src = fetchurl { url = "https://registry.npmjs.org/superagent/-/superagent-3.8.2.tgz"; - sha512 = "gVH4QfYHcY3P0f/BZzavLreHW3T1v7hG9B+hpMQotGQqurOvhv87GcMCd6LWySmBuf+BDR44TQd0aISjVHLeNQ=="; + sha512 = "0sxwwjllf26hx079lw1w3c1zywq2af9ssi7f0n334xzz1mgnfx2lr5l532a988zyi3bigzmfidqgdrfmwv6ghgzs77qsw87yr0zhlc1"; }; }; "superagent-3.8.3" = { @@ -6939,7 +6760,7 @@ let version = "3.8.3"; src = fetchurl { url = "https://registry.npmjs.org/superagent/-/superagent-3.8.3.tgz"; - sha512 = "GLQtLMCoEIK4eDv6OGtkOoSMt3D+oq0y3dsxMuYuDvaNUvuT8eFBuLmfR0iYYzHC1e8hpzC6ZsxbuP6DIalMFA=="; + sha512 = "0a4ra91hgzbhnyccsx319r1xzaw4cb3k144g7xrp10y3wckzd98vxhf5vk34cfvvlrav8pyf2vqr11scimkiyivg2w84458q0n2vd0q"; }; }; "supports-color-1.2.0" = { @@ -6966,7 +6787,7 @@ let version = "5.4.0"; src = fetchurl { url = "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz"; - sha512 = "zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w=="; + sha512 = "3ks7qkl6s064qcdc5qnpzcwzcrnlzccz9m3faw54fnmsm2k8fzb9saqr5nhx7w9lnd4nbp0zg047zz8mwsd4fxfnalpb7kra619fdnf"; }; }; "swagger-converter-0.1.7" = { @@ -7002,7 +6823,7 @@ let version = "1.5.0"; src = fetchurl { url = "https://registry.npmjs.org/swagger-test-templates/-/swagger-test-templates-1.5.0.tgz"; - sha512 = "1IBHCamO7uJuFo11a/aaA0ZPWJkAfiuvadmLO9TwXiY2Op+SigTL9er/GabuhK4gXMNJ2MaoPQ4F90HQlNFYJQ=="; + sha512 = "0jmilcls10zf18f7nlcdn29qdf21bl4xsk1kzzayp5h92ljkwx3c9jyy3a3p2yrd6pjnzh0k5c4yih3kbv6nxcd2rpf5vlfm44lg06l"; }; }; "swagger-tools-0.9.16" = { @@ -7020,7 +6841,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz"; - sha512 = "e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ=="; + sha512 = "1fxqjwdn747lxzkxrwhbw8arc9czdig47izx5hnzk22z8k7rnw00q8vcpy8v7a3xyamavwgg4mvjkpn2ihjiyjxjnhx2ihiryf39pbv"; }; }; "tar-2.2.1" = { @@ -7038,7 +6859,7 @@ let version = "4.4.4"; src = fetchurl { url = "https://registry.npmjs.org/tar/-/tar-4.4.4.tgz"; - sha512 = "mq9ixIYfNF9SK0IS/h2HKMu8Q2iaCuhDDsZhdEag/FHv8fOaYld4vN7ouMgcSSt5WKZzPs8atclTcJm36OTh4w=="; + sha512 = "3iy3r78nycp0ly9nldcygkklrc7jas93k4bis6ypiw5fqlsygqyylgwl1378qf61r1yh2lsd11vrjr8hwfzw4j25d95yd0zhv265bws"; }; }; "tar-stream-1.6.1" = { @@ -7047,7 +6868,7 @@ let version = "1.6.1"; src = fetchurl { url = "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.1.tgz"; - sha512 = "IFLM5wp3QrJODQFPm6/to3LJZrONdBY/otxcvDIQzu217zKye6yVR3hhi9lAjrC2Z+m/j5oDxMPb1qcd8cIvpA=="; + sha512 = "2j2zhpi3nkxdny3qh1rm3xzx5kvdc4f83cqnqbq8yasqyxj6bpvbvff20rbqp6wl8zicx4dndkcjwm3xnprnkq11m7b4hkp1bkwqli0"; }; }; "term-size-1.2.0" = { @@ -7146,7 +6967,7 @@ let version = "0.0.33"; src = fetchurl { url = "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz"; - sha512 = "jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw=="; + sha512 = "0drg2bck1cj8677rgs1l98v7vqaxawcqh6ja87qilwnd719l5y0lzv5ssn3pcwa37fdbg4188y6x15a90vkllyvfpd9v7fai2b8j44d"; }; }; "to-buffer-1.1.1" = { @@ -7155,7 +6976,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz"; - sha512 = "lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg=="; + sha512 = "1b8wsfz1rp8fsb2kz7isrsx292vl5w4cmx9qvivxqsj61avx9ph1azxa6zr3mc85cz8qddbkxm6ski8zvacmpadc22wp6pv5gk427wp"; }; }; "to-iso-string-0.0.2" = { @@ -7182,7 +7003,7 @@ let version = "3.0.2"; src = fetchurl { url = "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz"; - sha512 = "FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw=="; + sha512 = "03lcq1y1ks55lss37m3cx52f8f4wj85rqsxfxrhi3y8rqa0iiny6df8ardg2f742z870v7xw749lcsxh8yplsmbvaig4rrds1w6asqm"; }; }; "to-regex-range-2.1.1" = { @@ -7200,7 +7021,7 @@ let version = "1.4.1"; src = fetchurl { url = "https://registry.npmjs.org/toiletdb/-/toiletdb-1.4.1.tgz"; - sha512 = "FOinMMjECHmDt6PZkSmcbM8ir41kGwYCbVW7NczWkWNNeuX9/mQHz31oNSJKZrkvgfas692ZoZ+G1jdM43qVGA=="; + sha512 = "0c9ayp39hvxd1lzl6cxvsxcys0jzfb698i3as3xrw3n9zpxwmx4sqwisv63bfsmdl10c6v4inpj5kvckhlr3nd3ny1pj264r0qags0l"; }; }; "toml-2.3.3" = { @@ -7209,7 +7030,7 @@ let version = "2.3.3"; src = fetchurl { url = "https://registry.npmjs.org/toml/-/toml-2.3.3.tgz"; - sha512 = "O7L5hhSQHxuufWUdcTRPfuTh3phKfAZ/dqfxZFoxPCj2RYmpaSGLEIs016FCXItQwNr08yefUB5TSjzRYnajTA=="; + sha512 = "16a6xk2s4y4llqya2gjgwzlvb0512sw8ahxfd4b225j2sd9i52zca1w65d69wd7frzhcz2ak3gf3r3y9ws727b5gnp1n7wh2j3gkciv"; }; }; "touch-3.1.0" = { @@ -7218,7 +7039,7 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz"; - sha512 = "WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA=="; + sha512 = "2a3sk3562y1ihbl06r5g1pzs37mwhhnz8f8vvcc0k8bhykczzgv9dyw71kkz4mbf81iq7wbf2nq7hpy6z6zhanj8s9d6bjk5r9pq72q"; }; }; "tough-cookie-2.3.4" = { @@ -7227,7 +7048,7 @@ let version = "2.3.4"; src = fetchurl { url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz"; - sha512 = "TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA=="; + sha512 = "0ncm6j3cjq1f26mzjf04k9bkw1b08w53s4qa3a11c1bdj4pgnqv1422c1xs5jyy6y1psppjx52fhagq5zkjkgrcpdkxcdiry96r77jd"; }; }; "township-client-1.3.2" = { @@ -7236,7 +7057,7 @@ let version = "1.3.2"; src = fetchurl { url = "https://registry.npmjs.org/township-client/-/township-client-1.3.2.tgz"; - sha512 = "6Di70O1dWm45SJ5xrGzlE805z3gYn4ZUmNKomIrI4OojzRA4zyQzJ/4lAxQbJlq0ihG/mUE2xbP4q85Q68ig2g=="; + sha512 = "3da1j7ba37apy5kqlv436dz265b8ni63ca069gy4wrj9krq236j7sp0r259ia6jk1a8d7qqg37kkk8kwmnaqwcy90wnwnjxxp8bnf78"; }; }; "traverse-0.6.6" = { @@ -7281,11 +7102,7 @@ let version = "1.9.3"; src = fetchurl { url = "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz"; -<<<<<<< HEAD - sha512 = "4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ=="; -======= sha512 = "2yimhwxviswrwaxdgk4k5q99pjv0n6g8s1cc5ml17rzv1kqfac26sb7b49ndl9hyczgzlz28wh87g1k0r3h9cqa79d3hyi9qzrcajp2"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "ttl-1.3.1" = { @@ -7294,7 +7111,7 @@ let version = "1.3.1"; src = fetchurl { url = "https://registry.npmjs.org/ttl/-/ttl-1.3.1.tgz"; - sha512 = "+bGy9iDAqg3WSfc2ZrprToSPJhZjqy7vUv9wupQzsiv+BVPVx1T2a6G4T0290SpQj+56Toaw9BiLO5j5Bd7QzA=="; + sha512 = "36d1ph5z6c3p2qqyjq8ckksxs7m0anipm6lzf51dgv59iymac2zwaxj6fablw7zabpjxav32qk8z12fdfx6cdpp97b0van043vb5cgr"; }; }; "tunnel-agent-0.6.0" = { @@ -7321,7 +7138,7 @@ let version = "1.6.16"; src = fetchurl { url = "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz"; - sha512 = "HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q=="; + sha512 = "3sqj799a59bbpyx9h2nhwjgi776w2jc2pp620b1rgk22fc3czfbxmav4m8kq0ilaqfxx6v1hww5pzgf13bnz6n84fx62qvazszia68x"; }; }; "typedarray-0.0.6" = { @@ -7366,7 +7183,7 @@ let version = "2.0.2"; src = fetchurl { url = "https://registry.npmjs.org/uint64be/-/uint64be-2.0.2.tgz"; - sha512 = "9QqdvpGQTXgxthP+lY4e/gIBy+RuqcBaC6JVwT5I3bDLgT/btL6twZMR0pI3/Fgah9G/pdwzIprE5gL6v9UvyQ=="; + sha512 = "34jzmdzz81fdi4s48rxr9dzs63iln7w6y9d44ckq6nvxd6v7y0wpc6x90zc2md21ddc1abfwk5h20py3s79bzhknqqphkchj6z9s2pm"; }; }; "unbzip2-stream-1.2.5" = { @@ -7375,7 +7192,7 @@ let version = "1.2.5"; src = fetchurl { url = "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.2.5.tgz"; - sha512 = "izD3jxT8xkzwtXRUZjtmRwKnZoeECrfZ8ra/ketwOcusbZEp4mjULMnJOCfTDZBgGQAAY1AJ/IgxcwkavcX9Og=="; + sha512 = "0xgvidx384p6cc8zh4m0qq000cn140dsckkijf95ka6iqi9j5nsrjrrf3mr3gxnybcvf2l4hxkaf0j7cqxncm3lnpq4ripw2j7zfc4b"; }; }; "undefsafe-2.0.2" = { @@ -7438,11 +7255,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/unordered-set/-/unordered-set-2.0.1.tgz"; -<<<<<<< HEAD - sha512 = "eUmNTPzdx+q/WvOHW0bgGYLWvWHNT3PTKEQLg0MAQhc0AHASHVHoP/9YytYd4RBVariqno/mEUhVZN98CmD7bg=="; -======= sha512 = "1pgnq0agkgn8ma827k8z7map1m5a4713pbcln7z7zl5278jf00385s2011q62s4539p6kydc6yxd0hrw135p1zkbazymiyxzi68sjbr"; ->>>>>>> nodePackages: meguca: 1.0.5 -> 1.0.7 }; }; "unpipe-1.0.0" = { @@ -7469,7 +7282,7 @@ let version = "3.0.3"; src = fetchurl { url = "https://registry.npmjs.org/untildify/-/untildify-3.0.3.tgz"; - sha512 = "iSk/J8efr8uPT/Z4eSUywnqyrQU7DSdMfdqK4iWEaUVVmcP5JcnpRqmVMwcwcnmI1ATFNgC5V90u09tBynNFKA=="; + sha512 = "0l4awya87dx6bnxaywh0dn50ka8hybj603k75d98vlwj9grqfcmaib9hhjy52nsgm62f39v0nnv4yn268jpjy7n9y7wpbwzqwkkyac9"; }; }; "unyield-0.0.1" = { @@ -7496,7 +7309,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz"; - sha512 = "bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw=="; + sha512 = "2pyjsmaajf6k6ql5qj270l0p3xkjvn25wky2qd1vndvl54ljbv8p8sbr44zsfh33mmrnj93ys4499c3h956wbgn4g82z8b1h3z4ffkg"; }; }; "update-notifier-2.5.0" = { @@ -7505,7 +7318,7 @@ let version = "2.5.0"; src = fetchurl { url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.5.0.tgz"; - sha512 = "gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw=="; + sha512 = "07vkna9y5i0ak6rwcbinrrgpabrcmav91ys805c42jskyc6kfla3wd12klsr858vzv5civi7arh5xz8bv7jdj81zgzyh6j70a31s0w3"; }; }; "uri-js-3.0.2" = { @@ -7550,7 +7363,7 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/use/-/use-3.1.0.tgz"; - sha512 = "6UJEQM/L+mzC3ZJNM56Q4DFGLX/evKGRg15UJHGB9X5j5Z3AFbgZvjUh2yq/UJUY4U5dh7Fal++XbNg1uzpRAw=="; + sha512 = "01m2fmv6pc6r5zgjxdb31sx9vhii5ahpwmdn89mpqcvh5f0kpjn6zpmh5qj8m2yhf8s3g6ygwnlccg0j2g36kcjvp16rynbrx048hp9"; }; }; "user-home-2.0.0" = { @@ -7604,16 +7417,16 @@ let version = "1.7.1"; src = fetchurl { url = "https://registry.npmjs.org/utp-native/-/utp-native-1.7.1.tgz"; - sha512 = "FSs76hQZsSsdI4YeePxb5SQoWmHxDRznImGiAN905O1svyHvcoQ3hYptu3Y9hPxRHeB3lHzJR5KRZy0Byj7qqg=="; + sha512 = "2mflgna04nng4cj8z4pr53pw0fm3z447mvbnvcahlvq8wpg46znrvg4fkgh18k14bkiq3gic5d2h975bgy7h7l64cfjpc8r2km3naqm"; }; }; - "uuid-3.3.0" = { + "uuid-3.3.2" = { name = "uuid"; packageName = "uuid"; - version = "3.3.0"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.3.0.tgz"; - sha512 = "ijO9N2xY/YaOqQ5yz5c4sy2ZjWmA6AR6zASb/gdpeKZ8+948CxwfMW9RrKVk5may6ev8c0/Xguu32e2Llelpqw=="; + url = "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz"; + sha512 = "1jd16sd57jqhaxygqxb1lixq31n83h1j4raknzjsw0m1pxnnhwv8aqlb1gsypdglisij9fnhxlxkgxhfm7292h353kkkp5hsrw6cwn9"; }; }; "valid-url-1.0.9" = { @@ -7640,11 +7453,7 @@ let version = "10.4.0"; src = fetchurl { url = "https://registry.npmjs.org/validator/-/validator-10.4.0.tgz"; -<<<<<<< HEAD - sha512 = "Q/wBy3LB1uOyssgNlXSRmaf22NxjvDNZM2MtIQ4jaEOAB61xsh1TQxsq1CgzUMBV1lDrVMogIh8GjG1DYW0zLg=="; -======= sha512 = "0p36vb18dnqq1hz48hclm7ba3b5bh2h6cld8ahv8d9ivckiml3q0hv84c722bb36dck7g33vkcgd9wrj5s9a3f8narf7mn1fb5h3z23"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; }; "variable-diff-1.1.0" = { @@ -7707,7 +7516,7 @@ let version = "1.3.1"; src = fetchurl { url = "https://registry.npmjs.org/which/-/which-1.3.1.tgz"; - sha512 = "HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ=="; + sha512 = "0hr4hxkk8yb9fz993bs69pf8z2z2qb6sdpxfxb84sd16lja9fsx444pk1ang1ivmjjv5srnsm6fihdj593w7rwxdh834cdmd9hms4hz"; }; }; "wide-align-1.1.3" = { @@ -7716,7 +7525,7 @@ let version = "1.1.3"; src = fetchurl { url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz"; - sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA=="; + sha512 = "2224a32flpf40nhq6rj4idzkcdz0vx65bfxp90hd06db18l6fiqgxz1xnaygm3pbfb1a6v73hl8ryq4996b09zwwins0bqprx0hwsa0"; }; }; "widest-line-2.0.0" = { @@ -7806,7 +7615,7 @@ let version = "2.3.0"; src = fetchurl { url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz"; - sha512 = "xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA=="; + sha512 = "2sgqxmcqzjd7nq9gjh6jz7vfb0gs0ag4jvqzdq93afq3bw3jrm88mhxql9sryyb04f3ipw5jkgjfiigsmdwlz9fgsnnm3cxhcmxxqy6"; }; }; "xdg-basedir-3.0.0" = { @@ -7824,7 +7633,7 @@ let version = "2.5.0"; src = fetchurl { url = "https://registry.npmjs.org/xhr/-/xhr-2.5.0.tgz"; - sha512 = "4nlO/14t3BNUZRXIXfXe+3N6w3s1KoxcJUUURctd64BLRe67E4gRwp4PjywtDY72fXpZ1y6Ch0VZQRY/gMPzzQ=="; + sha512 = "36z7hw07wb42na5hy12xmsrg9yzd3hd5ln8y3wyq88qh4xvxr2lp07bbp5la5254mf8qaimgg1plwzvvvsmvj0mcma17p1dbvzlwyg2"; }; }; "xsalsa20-1.0.2" = { @@ -7833,26 +7642,16 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/xsalsa20/-/xsalsa20-1.0.2.tgz"; - sha512 = "g1DFmZ5JJ9Qzvt4dMw6m9IydqoCSP381ucU5zm46Owbk3bwmqAr8eEJirOPc7PrXRn45drzOpAyDp8jsnoyXyw=="; + sha512 = "35rg34yxk4ag0qclk7bqxirgr3dgypcvkisqqj2g3y0ma16pkfy81iv79pcwff5p4spygwjh2m9v37llq7367fypqrx89s9kscwal43"; }; }; -<<<<<<< HEAD "xstream-11.7.0" = { name = "xstream"; packageName = "xstream"; version = "11.7.0"; src = fetchurl { url = "https://registry.npmjs.org/xstream/-/xstream-11.7.0.tgz"; - sha512 = "wO3TXiQd2/1UZNVsixDIcQgAN6TU4sGH7qIXvs1CRp1kgtkpU8YTfyKt/z/Z1psqcGnR0cJJxHaCnBxtktLx9w=="; -======= - "xstream-11.6.0" = { - name = "xstream"; - packageName = "xstream"; - version = "11.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/xstream/-/xstream-11.6.0.tgz"; - sha512 = "2ywbymzqjiy7w59kp58cmlaqzzbig0h9r5mjiyc5a5i89rv83cq19ff26123za0blip6dq591hmz7vb7yc42bkwiqlc57za4k4hjl82"; ->>>>>>> nodePackages: meguca: 1.0.7 update + sha512 = "3vz3lljdlf9r0knqi4w5lfid5q2m6ynv4zzzb92gw9wclr9v61697a68b6vw5x2xs3w3qnllhvh023ir088nv6mciagvnqx4igd7vf0"; }; }; "xtend-4.0.1" = { @@ -7915,7 +7714,7 @@ let version = "3.22.0"; src = fetchurl { url = "https://registry.npmjs.org/z-schema/-/z-schema-3.22.0.tgz"; - sha512 = "Oq82unxX2PTcJ031gFGcksDHE5PNBs5CbcQ1tbre0Sl4Mu5habZTVmEAkuZS4cK//VgIdNg9UG9PMgMlN6KmiA=="; + sha512 = "24ad8ip4l1k4kvga0yxhx08b3yvzhp1abk94031ar9vcsb1xqr7hafivsxbadf4dm1cw1ndjc9wgh4jki8q1xad4zfg9n2pgjx3dbrs"; }; }; }; @@ -7944,7 +7743,7 @@ in version = "1.12.7"; src = fetchurl { url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz"; - sha512 = "fLeEhqwymYat/MpTPUjSKHVYYl0ec2mOyALEMLmzr5i1isuG+6jfI2j2d5oBO3VIzgUXgBVIcOT9uH1TFxBckw=="; + sha512 = "29mq40padyvizg4f141b00p0p74hx9v06d7gxk84ggsiyw6rf5bb65gnfwk1i02r276jwqybmi5hx98s943slyazjnqd69jmj389dvw"; }; buildInputs = globalBuildInputs; meta = { @@ -7961,32 +7760,19 @@ in version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/create-cycle-app/-/create-cycle-app-4.0.0.tgz"; - sha512 = "ofgR7gXf+7lgnXQvj0KeveHAyrtoK8zveCDD3sTHPFQY1FKJGkJ7M404ak+G8w6VbTuHwzaBrYbEh8M/SBuykQ=="; + sha512 = "28v46s87z1qgi46mn0kdhw77dnra3pkhr7nlf4d6dxl46l9aba1hm1wqz2dxhr0g3pwqav8pg5c1qdxkr18ybvlkmhbkyyz0pp13y51"; }; dependencies = [ sources."@cycle/dom-18.3.0" sources."@cycle/http-14.9.0" sources."@cycle/isolate-3.3.0" sources."@cycle/run-3.4.0" -<<<<<<< HEAD - sources."@cycle/time-0.10.1" - sources."@types/node-10.5.0" -======= (sources."@cycle/time-0.10.1" // { dependencies = [ sources."chalk-1.1.3" ]; }) -<<<<<<< HEAD -<<<<<<< HEAD - sources."@types/node-10.3.1" -======= - sources."@types/node-10.3.2" ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 -======= - sources."@types/node-10.3.5" ->>>>>>> nodePackages: meguca: 1.0.7 update + sources."@types/node-10.5.1" sources."@types/superagent-3.5.6" sources."ansi-escapes-3.1.0" sources."ansi-regex-2.1.1" @@ -8081,12 +7867,7 @@ in sources."snabbdom-0.7.0" sources."snabbdom-selector-1.2.1" sources."sorted-immutable-list-1.1.0" - (sources."string-width-2.1.1" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."strip-ansi-4.0.0" - ]; - }) + sources."string-width-2.1.1" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."superagent-3.8.2" @@ -8095,17 +7876,9 @@ in sources."through-2.3.8" sources."tmp-0.0.33" sources."util-deprecate-1.0.2" - (sources."variable-diff-1.1.0" // { - dependencies = [ - sources."chalk-1.1.3" - ]; - }) + sources."variable-diff-1.1.0" sources."which-1.3.1" -<<<<<<< HEAD sources."xstream-11.7.0" -======= - sources."xstream-11.6.0" ->>>>>>> nodePackages: meguca: 1.0.7 update sources."yallist-2.1.2" ]; buildInputs = globalBuildInputs; @@ -8123,26 +7896,17 @@ in version = "13.10.0"; src = fetchurl { url = "https://registry.npmjs.org/dat/-/dat-13.10.0.tgz"; - sha512 = "H8H6erdvvLjwI6bYu4mgEz5KCaHNmwwzKvBvv+bhX93VEf1J3v0L/6T9IQPCico/veFxNcUSqaDAV9FuZguhCw=="; + sha512 = "05s22v6dv8mgh50m49cadbiw6ykzjl9q81j3zd4zw5zvpj9zl8xbpazw7kbyvzh58rhr6ydl44llghkl24vpn564gqbig3gnxxgmh8z"; }; dependencies = [ sources."abstract-random-access-1.1.2" sources."ajv-5.5.2" - (sources."ansi-diff-stream-1.2.1" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) + sources."ansi-diff-stream-1.2.1" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" sources."anymatch-1.3.2" sources."ap-0.1.0" - (sources."append-tree-2.4.4" // { - dependencies = [ - sources."process-nextick-args-1.0.7" - sources."varint-5.0.0" - ]; - }) + sources."append-tree-2.4.4" sources."arr-diff-2.0.0" sources."arr-flatten-1.1.0" sources."array-lru-1.1.1" @@ -8155,19 +7919,23 @@ in sources."aws-sign2-0.7.0" sources."aws4-1.7.0" sources."balanced-match-1.0.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."bencode-1.0.0" - (sources."bitfield-rle-2.1.0" // { + sources."bitfield-rle-2.1.0" + (sources."bittorrent-dht-7.10.0" // { dependencies = [ - sources."varint-4.0.1" + sources."debug-3.1.0" ]; }) - sources."bittorrent-dht-7.10.0" sources."blake2b-2.1.2" sources."blake2b-wasm-1.1.7" sources."body-0.1.0" sources."brace-expansion-1.1.11" - sources."braces-1.8.5" + (sources."braces-1.8.5" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-equals-1.0.4" @@ -8204,6 +7972,10 @@ in (sources."dat-doctor-1.4.0" // { dependencies = [ sources."debug-2.6.9" + sources."dns-packet-1.3.1" + sources."dns-socket-1.6.3" + sources."lru-2.0.1" + sources."multicast-dns-6.2.3" sources."pump-1.0.3" ]; }) @@ -8212,8 +7984,6 @@ in (sources."dat-json-1.0.2" // { dependencies = [ sources."dat-encoding-4.0.2" -<<<<<<< HEAD -======= sources."debug-2.6.9" ]; }) @@ -8221,11 +7991,8 @@ in (sources."dat-log-1.1.1" // { dependencies = [ sources."process-nextick-args-1.0.7" ->>>>>>> nodePackages: meguca: 1.0.7 update ]; }) - sources."dat-link-resolve-2.2.0" - sources."dat-log-1.1.1" (sources."dat-node-3.5.9" // { dependencies = [ (sources."discovery-swarm-5.1.1" // { @@ -8233,13 +8000,12 @@ in sources."debug-2.6.9" ]; }) + sources."minimist-0.0.8" + sources."process-nextick-args-1.0.7" sources."pump-1.0.3" sources."random-access-memory-3.0.0" -<<<<<<< HEAD -======= sources."unordered-set-2.0.1" sources."varint-5.0.0" ->>>>>>> nodePackages: meguca: 1.0.5 -> 1.0.7 ]; }) sources."dat-registry-4.0.0" @@ -8252,28 +8018,20 @@ in sources."directory-index-html-2.1.0" (sources."discovery-channel-5.5.1" // { dependencies = [ - sources."debug-2.6.9" - sources."dns-discovery-6.1.0" - sources."lru-2.0.1" sources."pump-3.0.0" - sources."thunky-0.1.0" ]; }) (sources."discovery-swarm-4.4.2" // { dependencies = [ - sources."debug-2.6.9" - sources."pump-1.0.3" - ]; - }) - (sources."dns-discovery-5.6.1" // { - dependencies = [ - sources."debug-2.6.9" - sources."dns-packet-1.3.1" - sources."dns-socket-1.6.3" - sources."lru-2.0.1" - sources."multicast-dns-6.2.3" + (sources."dns-discovery-6.1.0" // { + dependencies = [ + sources."thunky-1.0.2" + ]; + }) + sources."thunky-0.1.0" ]; }) + sources."dns-discovery-5.6.1" sources."dns-packet-4.2.0" sources."dns-socket-3.0.0" sources."dns-txt-2.0.2" @@ -8311,33 +8069,19 @@ in sources."has-flag-3.0.0" sources."http-methods-0.1.0" sources."http-signature-1.2.0" -<<<<<<< HEAD (sources."hypercore-6.17.1" // { - dependencies = [ - sources."process-nextick-args-1.0.7" - sources."unordered-set-2.0.1" - ]; - }) - sources."hypercore-crypto-1.0.0" - (sources."hypercore-protocol-6.6.4" // { -======= - (sources."hypercore-6.16.0" // { ->>>>>>> nodePackages: meguca: 1.0.7 update dependencies = [ sources."varint-5.0.0" ]; }) -<<<<<<< HEAD - sources."hyperdrive-9.14.0" - (sources."hyperdrive-http-4.2.2" // { -======= + sources."hypercore-crypto-1.0.0" sources."hypercore-protocol-6.6.4" (sources."hyperdrive-9.14.0" // { ->>>>>>> nodePackages: meguca: 1.0.7 update dependencies = [ - sources."pump-1.0.3" + sources."varint-4.0.1" ]; }) + sources."hyperdrive-http-4.2.2" sources."hyperdrive-network-speed-2.1.0" sources."i-0.3.6" sources."inflight-1.0.6" @@ -8372,14 +8116,11 @@ in sources."k-bucket-3.3.1" (sources."k-rpc-4.3.1" // { dependencies = [ + sources."bencode-2.0.0" sources."k-bucket-4.0.1" ]; }) - (sources."k-rpc-socket-1.8.0" // { - dependencies = [ - sources."bencode-2.0.0" - ]; - }) + sources."k-rpc-socket-1.8.0" sources."kind-of-3.2.2" sources."last-one-wins-1.0.4" sources."length-prefixed-message-3.0.3" @@ -8397,11 +8138,7 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.0" sources."mirror-folder-3.0.0" - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mkdirp-0.5.1" sources."ms-2.0.0" sources."multi-random-access-2.1.1" sources."multicast-dns-7.0.0" @@ -8414,7 +8151,11 @@ in sources."nanobus-3.3.0" sources."nanotiming-1.0.1" sources."ncp-1.0.1" - sources."neat-log-1.1.2" + (sources."neat-log-1.1.2" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) sources."nets-3.2.0" sources."network-address-1.1.2" sources."node-gyp-build-3.4.0" @@ -8434,30 +8175,21 @@ in sources."process-0.5.2" sources."process-nextick-args-2.0.0" sources."progress-string-1.2.2" - sources."prompt-1.0.0" - (sources."protocol-buffers-encodings-1.1.0" // { + (sources."prompt-1.0.0" // { dependencies = [ - sources."varint-5.0.0" + sources."async-1.0.0" ]; }) + sources."protocol-buffers-encodings-1.1.0" sources."pump-2.0.1" sources."punycode-1.4.1" sources."qs-6.5.2" sources."random-access-file-2.0.1" -<<<<<<< HEAD - (sources."random-access-memory-2.4.0" // { - dependencies = [ - sources."process-nextick-args-1.0.7" - ]; - }) -======= sources."random-access-memory-2.4.0" ->>>>>>> nodePackages: meguca: 1.0.7 update sources."random-access-storage-1.3.0" (sources."randomatic-3.0.0" // { dependencies = [ sources."is-number-4.0.0" - sources."kind-of-6.0.2" ]; }) sources."randombytes-2.0.6" @@ -8475,11 +8207,7 @@ in sources."rusha-0.8.13" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - (sources."signed-varint-2.0.1" // { - dependencies = [ - sources."varint-5.0.0" - ]; - }) + sources."signed-varint-2.0.1" sources."simple-sha1-2.1.1" sources."siphash24-1.1.1" sources."slice-ansi-1.0.0" @@ -8495,11 +8223,7 @@ in sources."status-logger-3.1.1" sources."stream-collector-1.0.1" sources."stream-each-1.2.2" - (sources."stream-parser-0.3.1" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) + sources."stream-parser-0.3.1" sources."stream-shift-1.0.0" sources."string-width-2.1.1" sources."string_decoder-1.1.1" @@ -8510,15 +8234,15 @@ in ]; }) sources."supports-color-5.4.0" - sources."throttle-1.0.3" - sources."through2-2.0.3" - sources."thunky-1.0.2" - sources."to-buffer-1.1.1" - (sources."toiletdb-1.4.1" // { + (sources."throttle-1.0.3" // { dependencies = [ sources."debug-2.6.9" ]; }) + sources."through2-2.0.3" + sources."thunky-1.0.2" + sources."to-buffer-1.1.1" + sources."toiletdb-1.4.1" sources."tough-cookie-2.3.4" sources."township-client-1.3.2" sources."trim-0.0.1" @@ -8534,12 +8258,11 @@ in sources."util-deprecate-1.0.2" sources."utile-0.3.0" sources."utp-native-1.7.1" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."varint-3.0.1" sources."verror-1.10.0" (sources."winston-2.1.1" // { dependencies = [ - sources."async-1.0.0" sources."colors-1.0.3" sources."pkginfo-0.3.1" ]; @@ -8599,7 +8322,7 @@ in version = "5.2.0"; src = fetchurl { url = "https://registry.npmjs.org/mocha/-/mocha-5.2.0.tgz"; - sha512 = "2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ=="; + sha512 = "1qqnhamd691pyvx27ql2l5228qx1migp0yys010zdi748pp516hf10sr26w7gx71323a9p0gv69i358xv2w918gpba9xp2w70l211fq"; }; dependencies = [ sources."balanced-match-1.0.0" @@ -8662,11 +8385,7 @@ in version = "3.7.0"; src = fetchurl { url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.7.0.tgz"; -<<<<<<< HEAD - sha512 = "qDQE/Ft9xXP6zphwx4sD0t+VhwV7yFaloMpfbL2QnnDZcyaiakWlLdtFGGQfTAwpFHdpbRhRxVhIHN1OKAjgbg=="; -======= sha512 = "1pf02189vfiqj2qqm8ihvb9fwa2j32c3xj1hifv5njlasm24rrxjw4yj2ynqpyal2jmdj3v0n3rbpyj0f5wfw4qrvx77ibxbgy08d58"; ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 }; dependencies = [ sources."abbrev-1.1.1" @@ -8680,20 +8399,9 @@ in sources."aws-sign2-0.6.0" sources."aws4-1.7.0" sources."balanced-match-1.0.0" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."block-stream-0.0.9" -<<<<<<< HEAD -<<<<<<< HEAD sources."boom-2.10.1" -======= -<<<<<<< HEAD -======= - sources."boom-2.10.1" ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 -======= - sources."boom-2.10.1" ->>>>>>> nodePackages: meguca: 1.0.7 update sources."brace-expansion-1.1.11" sources."caseless-0.12.0" sources."co-4.6.0" @@ -8702,22 +8410,8 @@ in sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" -<<<<<<< HEAD -<<<<<<< HEAD - sources."cryptiles-2.0.5" - (sources."dashdash-1.14.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) -======= -<<<<<<< HEAD -======= -======= ->>>>>>> nodePackages: meguca: 1.0.7 update sources."cryptiles-2.0.5" sources."dashdash-1.14.1" ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."ecc-jsbn-0.1.1" @@ -8728,35 +8422,15 @@ in sources."fs.realpath-1.0.0" sources."fstream-1.0.11" sources."gauge-2.7.4" - (sources."getpass-0.1.7" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."getpass-0.1.7" sources."glob-7.1.2" sources."graceful-fs-4.1.11" sources."har-schema-1.0.5" sources."har-validator-4.2.1" sources."has-unicode-2.0.1" -<<<<<<< HEAD -<<<<<<< HEAD sources."hawk-3.1.3" sources."hoek-2.16.3" sources."http-signature-1.1.1" -======= -<<<<<<< HEAD - sources."http-signature-1.2.0" -======= - sources."hawk-3.1.3" - sources."hoek-2.16.3" - sources."http-signature-1.1.1" ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 -======= - sources."hawk-3.1.3" - sources."hoek-2.16.3" - sources."http-signature-1.1.1" ->>>>>>> nodePackages: meguca: 1.0.7 update sources."inflight-1.0.6" sources."inherits-2.0.3" sources."is-fullwidth-code-point-1.0.0" @@ -8794,47 +8468,19 @@ in sources."punycode-1.4.1" sources."qs-6.4.0" sources."readable-stream-2.3.6" -<<<<<<< HEAD -<<<<<<< HEAD sources."request-2.81.0" -======= -<<<<<<< HEAD - sources."request-2.87.0" -======= - sources."request-2.81.0" ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 -======= - sources."request-2.81.0" ->>>>>>> nodePackages: meguca: 1.0.7 update sources."rimraf-2.6.2" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."semver-5.3.0" sources."set-blocking-2.0.0" sources."signal-exit-3.0.2" -<<<<<<< HEAD -<<<<<<< HEAD -======= -<<<<<<< HEAD - sources."sshpk-1.14.2" -======= ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 -======= ->>>>>>> nodePackages: meguca: 1.0.7 update sources."sntp-1.0.9" (sources."sshpk-1.14.2" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 ->>>>>>> nodePackages: meguca: 1.0.4 (2018-05-17) -> 1.0.5 -======= ->>>>>>> nodePackages: meguca: 1.0.7 update sources."string-width-1.0.2" sources."string_decoder-1.1.1" sources."stringstream-0.0.6" @@ -8844,12 +8490,8 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."util-deprecate-1.0.2" - sources."uuid-3.3.0" - (sources."verror-1.10.0" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."uuid-3.3.2" + sources."verror-1.10.0" sources."which-1.3.1" sources."wide-align-1.1.3" sources."wrappy-1.0.2" @@ -8869,7 +8511,7 @@ in version = "3.4.0"; src = fetchurl { url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.4.0.tgz"; - sha512 = "YoviGBJYGrPdLOKDIQB0sKxuKy/EEsxzooNkOZak4vSTKT/qH0Pa6dj3t1MJjEQGsefih61IyHDmO1WW7xOFfw=="; + sha512 = "1zqa4zgjrakprkhr14av1z2wyqhci4c159vgxyqx7d467za7wlr7x72ljb3jr43l9rwq4n45wmnxb5hfh0230z25kfv66jq28cf52v2"; }; buildInputs = globalBuildInputs; meta = { @@ -8883,17 +8525,10 @@ in node-pre-gyp = nodeEnv.buildNodePackage { name = "node-pre-gyp"; packageName = "node-pre-gyp"; -<<<<<<< HEAD version = "0.10.2"; src = fetchurl { url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.2.tgz"; - sha512 = "16lql9QTqs6KsB9fl3neWyZm02KxIKdI9FlJjrB0y7eMTP5Nyz+xalwPbOlw3iw7EejllJPmlJSnY711PLD1ug=="; -======= - version = "0.10.1"; - src = fetchurl { - url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.1.tgz"; - sha512 = "354ilrqnamjvp509zxg2liq7483lr9rwynh048dzqqxw5z0dskc9f43p3wjgfmji1lk85idppiw9rqj4jlkypvlxkm0h0vrj45x7s7f"; ->>>>>>> nodePackages: meguca: 1.0.7 update + sha512 = "2xgbc1wfnyn79wljkk97575x08knb6yf3lnq3swdaqkzjsdzr68rdybfjq8wjaryi4af85icb9nc9jvvrwrfpqzn25cxahksjbnmafp"; }; dependencies = [ sources."abbrev-1.1.1" @@ -8977,24 +8612,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; -<<<<<<< HEAD -<<<<<<< HEAD version = "2.7.0"; src = fetchurl { url = "https://registry.npmjs.org/pnpm/-/pnpm-2.7.0.tgz"; sha1 = "cfaf3889c04125abfa20117358d7bcec72902faf"; -======= - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-2.4.0.tgz"; - sha1 = "54c27537e831f91d5afe63320a5aa2df597efe84"; ->>>>>>> nodePackages: meguca: 1.0.5 -> 1.0.7 -======= - version = "2.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-2.6.2.tgz"; - sha1 = "5507ebe92373aa133c871c9571b5af73aac7728f"; ->>>>>>> nodePackages: meguca: 1.0.7 update }; buildInputs = globalBuildInputs; meta = { @@ -9011,7 +8632,7 @@ in version = "5.5.0"; src = fetchurl { url = "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz"; - sha512 = "4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA=="; + sha512 = "0h32zh035y8m6dzcqhcymbhwgmc8839fa1hhj0jfh9ivp9kmqfj1sbwnsnkzcn9qm3sqn38sa8ys2g4c638lpnmzjr0a0qndmv7f8p1"; }; buildInputs = globalBuildInputs; meta = { @@ -9068,15 +8689,11 @@ in version = "2.9.6"; src = fetchurl { url = "https://registry.npmjs.org/vue-cli/-/vue-cli-2.9.6.tgz"; - sha512 = "swQ0bfyJSWfFr42IXr8A774yA1n+YudhzsaHBKhWSkczSqjvgZvSvM8NEnx6QKnfOHBXbdNR5vhahjNUMlftQQ=="; + sha512 = "10ysmrjahrqcnpqwr8x6vapf0wdzaa0g9y143fgpk99p0ggm1536isaasl091y6rrhyfqpyb41k5gpg02zmx24dmz2nfjc9zink815k"; }; dependencies = [ sources."absolute-0.0.1" - (sources."ajv-5.5.2" // { - dependencies = [ - sources."co-4.6.0" - ]; - }) + sources."ajv-5.5.2" sources."align-text-0.1.4" sources."amdefine-1.0.1" sources."ansi-escapes-3.1.0" @@ -9097,7 +8714,7 @@ in sources."aws4-1.7.0" sources."balanced-match-1.0.0" sources."base64-js-0.0.8" - sources."bcrypt-pbkdf-1.0.1" + sources."bcrypt-pbkdf-1.0.2" sources."bl-1.2.2" sources."bluebird-3.5.1" sources."brace-expansion-1.1.11" @@ -9110,18 +8727,18 @@ in sources."camelcase-1.2.1" sources."capture-stack-trace-1.0.0" sources."caseless-0.12.0" - sources."caw-2.0.1" + (sources."caw-2.0.1" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) sources."center-align-0.1.3" sources."chalk-2.4.1" sources."chardet-0.5.0" sources."cli-cursor-2.1.0" sources."cli-spinners-1.3.1" sources."cli-width-2.2.0" - (sources."cliui-2.1.0" // { - dependencies = [ - sources."wordwrap-0.0.2" - ]; - }) + sources."cliui-2.1.0" sources."clone-1.0.4" sources."co-3.1.0" sources."co-from-stream-0.0.0" @@ -9131,7 +8748,7 @@ in sources."color-convert-1.9.2" sources."color-name-1.1.1" sources."combined-stream-1.0.6" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."concat-map-0.0.1" sources."config-chain-1.1.11" sources."consolidate-0.14.5" @@ -9139,23 +8756,28 @@ in sources."create-error-class-3.0.2" sources."dashdash-1.14.1" sources."decamelize-1.2.0" - sources."decompress-4.2.0" - sources."decompress-tar-4.1.1" - (sources."decompress-tarbz2-4.1.1" // { - dependencies = [ - sources."file-type-6.2.0" - ]; - }) - sources."decompress-targz-4.1.1" - (sources."decompress-unzip-4.0.1" // { + (sources."decompress-4.2.0" // { dependencies = [ sources."file-type-3.9.0" sources."get-stream-2.3.1" ]; }) + sources."decompress-tar-4.1.1" + sources."decompress-tarbz2-4.1.1" + sources."decompress-targz-4.1.1" + sources."decompress-unzip-4.0.1" sources."delayed-stream-1.0.0" - sources."download-5.0.3" - sources."download-git-repo-1.0.2" + (sources."download-5.0.3" // { + dependencies = [ + sources."file-type-5.2.0" + ]; + }) + (sources."download-git-repo-1.0.2" // { + dependencies = [ + sources."commander-2.8.1" + sources."file-type-6.2.0" + ]; + }) sources."duplexer3-0.1.4" sources."ecc-jsbn-0.1.1" sources."enable-1.3.2" @@ -9190,15 +8812,12 @@ in (sources."handlebars-4.0.11" // { dependencies = [ sources."async-1.5.2" + sources."wordwrap-0.0.2" ]; }) sources."har-schema-2.0.0" sources."har-validator-5.0.3" - (sources."has-ansi-2.0.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) + sources."has-ansi-2.0.0" sources."has-flag-3.0.0" sources."has-generators-1.0.1" sources."has-symbol-support-x-1.4.2" @@ -9261,11 +8880,7 @@ in sources."mkdirp-0.5.1" sources."multimatch-2.1.0" sources."mute-stream-0.0.7" - (sources."npm-conf-1.1.3" // { - dependencies = [ - sources."pify-3.0.0" - ]; - }) + sources."npm-conf-1.1.3" sources."oauth-sign-0.8.2" sources."object-assign-4.1.1" sources."once-1.4.0" @@ -9289,7 +8904,11 @@ in sources."readable-stream-2.3.6" sources."recursive-readdir-2.2.2" sources."repeat-string-1.6.1" - sources."request-2.87.0" + (sources."request-2.87.0" // { + dependencies = [ + sources."co-4.6.0" + ]; + }) sources."restore-cursor-2.0.0" sources."right-align-0.1.3" sources."rimraf-2.6.2" @@ -9297,11 +8916,7 @@ in sources."rxjs-6.2.1" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - (sources."seek-bzip-1.0.5" // { - dependencies = [ - sources."commander-2.8.1" - ]; - }) + sources."seek-bzip-1.0.5" sources."semver-5.5.0" sources."signal-exit-3.0.2" sources."source-map-0.4.4" @@ -9342,7 +8957,7 @@ in sources."url-to-options-1.0.1" sources."user-home-2.0.0" sources."util-deprecate-1.0.2" - sources."uuid-3.3.0" + sources."uuid-3.3.2" sources."validate-npm-package-name-3.0.0" sources."verror-1.10.0" sources."ware-1.3.0" @@ -9376,17 +8991,28 @@ in dependencies = [ sources."URIjs-1.16.1" sources."abbrev-1.1.1" - (sources."align-text-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) + sources."align-text-0.1.4" sources."amdefine-1.0.1" sources."ansi-align-2.0.0" sources."ansi-escapes-1.4.0" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" - sources."anymatch-2.0.0" + (sources."anymatch-2.0.0" // { + dependencies = [ + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."is-extendable-0.1.1" + ]; + }) sources."append-field-0.1.0" sources."argparse-1.0.10" sources."arr-diff-4.0.0" @@ -9401,42 +9027,30 @@ in sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ - sources."define-property-1.0.0" + (sources."define-property-1.0.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + sources."kind-of-3.2.2" ]; }) sources."binary-extensions-1.11.0" (sources."body-parser-1.12.4" // { dependencies = [ sources."debug-2.2.0" - sources."depd-1.0.1" - sources."ee-first-1.1.0" - sources."ms-0.7.1" - sources."on-finished-2.2.1" sources."qs-2.4.2" ]; }) - (sources."boxen-1.3.0" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.1" - sources."supports-color-5.4.0" - ]; - }) + sources."boxen-1.3.0" sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { dependencies = [ - sources."extend-shallow-2.0.1" sources."is-extendable-0.1.1" ]; }) sources."buffer-from-1.1.0" - (sources."busboy-0.2.14" // { - dependencies = [ - sources."isarray-0.0.1" - sources."readable-stream-1.1.14" - sources."string_decoder-0.10.31" - ]; - }) + sources."busboy-0.2.14" sources."bytes-1.0.0" sources."cache-base-1.0.1" sources."camelcase-4.1.0" @@ -9444,9 +9058,6 @@ in sources."center-align-0.1.3" sources."chalk-1.1.3" sources."charenc-0.0.2" -<<<<<<< HEAD - sources."chokidar-2.0.4" -======= (sources."chokidar-2.0.4" // { dependencies = [ sources."debug-2.6.9" @@ -9456,40 +9067,23 @@ in sources."is-extendable-1.0.1" ]; }) ->>>>>>> nodePackages: meguca: 1.0.7 update sources."ci-info-1.1.3" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" ]; }) sources."cli-boxes-1.0.0" sources."cli-cursor-1.0.2" sources."cli-width-1.1.1" - (sources."cliui-2.1.0" // { - dependencies = [ - sources."wordwrap-0.0.2" - ]; - }) + sources."cliui-2.1.0" sources."clone-2.0.0" sources."code-point-at-1.1.0" sources."collection-visit-1.0.0" sources."color-convert-1.9.2" sources."color-name-1.1.1" sources."combined-stream-1.0.6" - sources."commander-2.15.1" + sources."commander-2.16.0" sources."component-emitter-1.2.1" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" @@ -9500,11 +9094,7 @@ in sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" - (sources."cross-spawn-5.1.0" // { - dependencies = [ - sources."lru-cache-4.1.3" - ]; - }) + sources."cross-spawn-5.1.0" sources."crypt-0.0.2" sources."crypto-random-string-1.0.0" sources."dag-map-1.0.2" @@ -9516,13 +9106,7 @@ in sources."delayed-stream-1.0.0" sources."depd-1.1.2" sources."destroy-1.0.4" - (sources."dicer-0.2.5" // { - dependencies = [ - sources."isarray-0.0.1" - sources."readable-stream-1.1.14" - sources."string_decoder-0.10.31" - ]; - }) + sources."dicer-0.2.5" sources."diff-1.4.0" sources."dot-prop-4.2.0" sources."duplexer-0.1.1" @@ -9539,20 +9123,6 @@ in (sources."expand-brackets-2.1.4" // { dependencies = [ sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."is-extendable-0.1.1" - sources."kind-of-5.1.0" ]; }) sources."extend-3.0.1" @@ -9561,16 +9131,11 @@ in dependencies = [ sources."define-property-1.0.0" sources."extend-shallow-2.0.1" - sources."is-extendable-0.1.1" + sources."kind-of-5.1.0" ]; }) sources."figures-1.7.0" - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - sources."is-extendable-0.1.1" - ]; - }) + sources."fill-range-4.0.0" sources."finalhandler-1.1.0" sources."for-in-1.0.2" sources."form-data-2.3.2" @@ -9592,30 +9157,14 @@ in sources."global-dirs-0.1.1" sources."got-6.7.1" sources."graceful-fs-4.1.11" - (sources."graphlib-2.1.5" // { - dependencies = [ - sources."lodash-4.17.10" - ]; - }) + sources."graphlib-2.1.5" sources."growl-1.9.2" - (sources."handlebars-4.0.11" // { - dependencies = [ - sources."source-map-0.4.4" - ]; - }) + sources."handlebars-4.0.11" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" sources."has-value-1.0.0" - (sources."has-values-1.0.0" // { - dependencies = [ - sources."kind-of-4.0.0" - ]; - }) - (sources."http-errors-1.6.3" // { - dependencies = [ - sources."statuses-1.5.0" - ]; - }) + sources."has-values-1.0.0" + sources."http-errors-1.6.3" sources."iconv-lite-0.4.8" sources."ignore-by-default-1.0.1" sources."import-lazy-2.1.0" @@ -9635,12 +9184,7 @@ in sources."is-fullwidth-code-point-1.0.0" sources."is-glob-4.0.0" sources."is-installed-globally-0.1.0" - (sources."is-invalid-path-0.1.0" // { - dependencies = [ - sources."is-extglob-1.0.0" - sources."is-glob-2.0.1" - ]; - }) + sources."is-invalid-path-0.1.0" sources."is-npm-1.0.0" (sources."is-number-3.0.0" // { dependencies = [ @@ -9665,7 +9209,14 @@ in ]; }) sources."js-yaml-3.12.0" - sources."json-refs-2.1.7" + (sources."json-refs-2.1.7" // { + dependencies = [ + sources."debug-3.1.0" + sources."ms-2.0.0" + sources."qs-6.5.2" + sources."superagent-3.8.3" + ]; + }) (sources."json-schema-deref-sync-0.3.4" // { dependencies = [ sources."lodash-4.17.10" @@ -9741,7 +9292,11 @@ in sources."ms-2.0.0" (sources."multer-1.3.1" // { dependencies = [ - sources."object-assign-3.0.0" + sources."ee-first-1.1.1" + sources."isarray-1.0.0" + sources."on-finished-2.3.0" + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" ]; }) sources."mute-stream-0.0.5" @@ -9750,7 +9305,30 @@ in sources."native-promise-only-0.8.1" (sources."nodemon-1.17.5" // { dependencies = [ + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" + sources."chalk-2.4.1" sources."debug-3.1.0" + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + sources."has-values-0.1.4" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."is-extendable-0.1.1" + sources."is-fullwidth-code-point-2.0.0" + sources."kind-of-3.2.2" + sources."lru-cache-4.1.3" + sources."minimist-1.2.0" + sources."strip-ansi-4.0.0" sources."supports-color-5.4.0" ]; }) @@ -9759,19 +9337,7 @@ in 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."kind-of-3.2.2" - ]; - }) + sources."object-copy-0.1.0" sources."object-visit-1.0.1" sources."object.pick-1.3.0" sources."on-finished-2.3.0" @@ -9786,18 +9352,8 @@ in sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" sources."path-key-2.0.1" - (sources."path-loader-1.0.4" // { - dependencies = [ - sources."debug-3.1.0" - sources."qs-6.5.2" - sources."superagent-3.8.3" - ]; - }) - (sources."path-to-regexp-1.7.0" // { - dependencies = [ - sources."isarray-0.0.1" - ]; - }) + sources."path-loader-1.0.4" + sources."path-to-regexp-1.7.0" sources."pause-stream-0.0.11" sources."pify-3.0.0" sources."posix-character-classes-0.1.1" @@ -9814,11 +9370,7 @@ in sources."bytes-2.1.0" ]; }) - (sources."rc-1.2.8" // { - dependencies = [ - sources."minimist-1.2.0" - ]; - }) + sources."rc-1.2.8" sources."readable-stream-2.3.6" sources."readdirp-2.1.0" sources."readline2-1.0.1" @@ -9841,19 +9393,14 @@ in sources."sanitize-filename-1.6.1" sources."semver-5.5.0" sources."semver-diff-2.1.0" - (sources."send-0.16.2" // { + sources."send-0.16.2" + (sources."serve-static-1.13.2" // { dependencies = [ sources."statuses-1.4.0" ]; }) - sources."serve-static-1.13.2" sources."set-immediate-shim-1.0.1" - (sources."set-value-2.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - sources."is-extendable-0.1.1" - ]; - }) + sources."set-value-2.0.0" sources."setprototypeof-1.1.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" @@ -9862,91 +9409,74 @@ in sources."slash-1.0.0" (sources."snapdragon-0.8.2" // { dependencies = [ - sources."define-property-0.2.5" + (sources."define-property-0.2.5" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) 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."is-extendable-0.1.1" - sources."kind-of-5.1.0" - ]; - }) - (sources."snapdragon-node-2.1.1" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) - (sources."snapdragon-util-3.0.1" // { - dependencies = [ - sources."kind-of-3.2.2" + sources."kind-of-4.0.0" ]; }) + sources."snapdragon-node-2.1.1" + sources."snapdragon-util-3.0.1" sources."source-map-0.5.7" sources."source-map-resolve-0.5.2" sources."source-map-url-0.4.0" sources."spark-md5-1.0.1" sources."split-0.3.3" - sources."split-string-3.1.0" - sources."sprintf-js-1.0.3" - (sources."static-extend-0.1.2" // { + (sources."split-string-3.1.0" // { 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."extend-shallow-3.0.2" + sources."is-extendable-1.0.1" ]; }) + sources."sprintf-js-1.0.3" + sources."static-extend-0.1.2" sources."statuses-1.3.1" sources."stream-combiner-0.0.4" sources."streamsearch-0.1.2" sources."string-3.3.3" - (sources."string-width-2.1.1" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."is-fullwidth-code-point-2.0.0" - sources."strip-ansi-4.0.0" - ]; - }) + sources."string-width-2.1.1" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" (sources."superagent-1.8.5" // { dependencies = [ - sources."cookiejar-2.0.6" - sources."extend-3.0.0" - sources."form-data-1.0.0-rc3" - sources."formidable-1.0.17" - sources."isarray-0.0.1" - sources."mime-1.3.4" sources."qs-2.3.3" sources."readable-stream-1.0.27-1" - sources."string_decoder-0.10.31" ]; }) 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.0" // { + dependencies = [ + sources."camelcase-1.2.1" + sources."is-extglob-1.0.0" + sources."is-glob-2.0.1" + sources."kind-of-3.2.2" + sources."source-map-0.4.4" + sources."wordwrap-0.0.2" + ]; + }) (sources."swagger-tools-0.9.16" // { dependencies = [ + sources."cookiejar-2.0.6" + sources."depd-1.0.1" + sources."ee-first-1.1.0" + sources."extend-3.0.0" + sources."form-data-1.0.0-rc3" + sources."formidable-1.0.17" + sources."isarray-0.0.1" + sources."lodash-4.17.10" + sources."mime-1.3.4" + sources."ms-0.7.1" + sources."object-assign-3.0.0" + sources."on-finished-2.2.1" + sources."readable-stream-1.1.14" + sources."string_decoder-0.10.31" sources."swagger-converter-0.1.7" ]; }) @@ -9954,11 +9484,7 @@ in sources."through-2.3.8" sources."timed-out-4.0.1" sources."to-iso-string-0.0.2" - (sources."to-object-path-0.3.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) + sources."to-object-path-0.3.0" sources."to-regex-3.0.2" sources."to-regex-range-2.1.1" sources."touch-3.1.0" @@ -9966,13 +9492,19 @@ in sources."truncate-utf8-bytes-1.0.2" sources."type-is-1.6.16" sources."typedarray-0.0.6" - sources."uglify-js-2.8.29" + (sources."uglify-js-2.8.29" // { + dependencies = [ + sources."source-map-0.5.7" + ]; + }) sources."uglify-to-browserify-1.0.2" - sources."undefsafe-2.0.2" + (sources."undefsafe-2.0.2" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) (sources."union-value-1.0.0" // { dependencies = [ - sources."extend-shallow-2.0.1" - sources."is-extendable-0.1.1" sources."set-value-0.4.3" ]; }) @@ -9985,22 +9517,19 @@ in sources."isobject-2.1.0" ]; }) - sources."has-values-0.1.4" ]; }) sources."unzip-response-2.0.1" sources."upath-1.1.0" - (sources."update-notifier-2.5.0" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.1" - sources."supports-color-5.4.0" - ]; - }) + sources."update-notifier-2.5.0" sources."uri-js-3.0.2" sources."urix-0.1.0" sources."url-parse-lax-1.0.0" - sources."use-3.1.0" + (sources."use-3.1.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) sources."utf8-byte-length-1.0.4" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" @@ -10015,11 +9544,7 @@ in sources."xdg-basedir-3.0.0" sources."xtend-4.0.1" sources."yallist-2.1.2" - (sources."yargs-3.10.0" // { - dependencies = [ - sources."camelcase-1.2.1" - ]; - }) + sources."yargs-3.10.0" sources."z-schema-3.22.0" ]; buildInputs = globalBuildInputs; @@ -10037,7 +9562,7 @@ in version = "6.1.0"; src = fetchurl { url = "https://registry.npmjs.org/npm/-/npm-6.1.0.tgz"; - sha512 = "e38cCtJ0lEjLXXpc4twEfj8Xw5hDLolc2Py87ueWnUhJfZ8GA/5RVIeD+XbSr1+aVRGsRsdtLdzUNO63PvQJ1w=="; + sha512 = "3bhkx1ynzp39m6w5mnwfimc25arlpxgs9vgk0w7ai8zw0q6kxyljj4xjvkyxg7wv1f8jbj3k31ifgvy0kff4p3sbp5li53ls851qzvv"; }; buildInputs = globalBuildInputs; meta = { @@ -10071,7 +9596,7 @@ in version = "2.7.4"; src = fetchurl { url = "https://registry.npmjs.org/mathjax/-/mathjax-2.7.4.tgz"; - sha512 = "B6SLtoETmV08kqTepRyz8eqMRGFzllPy2QASKFdFl0g0YB6SNgQVnWae11RaF3/y8ZKLTJNJ7hLbMIqmBEkLzw=="; + sha512 = "37hnj84ls531nqjxr4r6k4bjbqz4zqpb9adg7k6klah8dlj3rh38j4p8mbjh4h0v7r575kkc528rspincfabpm4j8y5v68kh6v8p907"; }; buildInputs = globalBuildInputs; meta = { From 82a501d92f4c36bcef43ff1eb3780363c90cfcea Mon Sep 17 00:00:00 2001 From: Okina Matara Date: Fri, 29 Jun 2018 16:37:25 -0500 Subject: [PATCH 13/56] meguca: 2018-06-27 -> 2018-06-29 --- pkgs/servers/meguca/default.nix | 6 +++--- pkgs/servers/meguca/server_deps.nix | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/meguca/default.nix b/pkgs/servers/meguca/default.nix index e1d76d9b1a4..6b170c8fec0 100644 --- a/pkgs/servers/meguca/default.nix +++ b/pkgs/servers/meguca/default.nix @@ -4,15 +4,15 @@ buildGoPackage rec { name = "meguca-unstable-${version}"; - version = "2018-06-27"; - rev = "4780ed4c51475e5e0382fe70ff8ab2187fbbf447"; + version = "2018-06-29"; + rev = "504f872ebee46b8f6c165523a9fcbcd6ddbf8dc2"; goPackagePath = "github.com/bakape/meguca"; goDeps = ./server_deps.nix; src = fetchgit { inherit rev; url = "https://github.com/bakape/meguca"; - sha256 = "1yc22qv5rrawlc3923a8zmhz21b00pidk1ij4fxmm9a001cm3fi3"; + sha256 = "1xjhz4lh4alk30vk03l5qs0c9x6a2023d5gvq59ss8slp9zp8ssa"; fetchSubmodules = true; }; diff --git a/pkgs/servers/meguca/server_deps.nix b/pkgs/servers/meguca/server_deps.nix index 137f355ce72..7bdf498bdc3 100644 --- a/pkgs/servers/meguca/server_deps.nix +++ b/pkgs/servers/meguca/server_deps.nix @@ -104,8 +104,8 @@ fetch = { type = "git"; url = "https://github.com/go-playground/log"; - rev = "91a5908e654f9fc444a71ea3c51c72cb5c6c2442"; - sha256 = "0p67j453pi7ffv3axl5g97qadx8lj22vsi5xrzqrr3v6mj8b0lbm"; + rev = "736ecb55f80c7121af3754a7ea62e96733451fe1"; + sha256 = "1gr2658m8nwswiybnz5i54d4gzwx4nk79gnh7j5fj1rcmbxdkkjh"; }; } { @@ -248,8 +248,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "5cec4b58c438bd98288aeb248bab2c1840713d21"; - sha256 = "19iyz2nppicvwap5lv796sbzd82glk2jn4yn5w6z6zymwnykfzds"; + rev = "c0fe8dde8a10c9b32154bd9bdf080b8b3d635127"; + sha256 = "0zi15k236nmqrlpfy3hgnxnh3f0n1aag0h6gs41xlxdkr9lpmnsz"; }; } { From bd228c05b1483d5a587454220628625c7225ce99 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 30 Jun 2018 01:50:32 +0200 Subject: [PATCH 14/56] nixos/modules/installer: users.extraUsers -> users.users --- nixos/modules/installer/cd-dvd/installation-cd-base.nix | 2 +- nixos/modules/installer/cd-dvd/sd-image-aarch64.nix | 2 +- .../modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix | 2 +- nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix | 2 +- nixos/modules/installer/netboot/netboot-base.nix | 2 +- nixos/modules/installer/virtualbox-demo.nix | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix index 1ed56386e6e..298b8d88bb5 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-base.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-base.nix @@ -30,7 +30,7 @@ with lib; boot.loader.grub.memtest86.enable = true; # Allow the user to log in as root without a password. - users.extraUsers.root.initialHashedPassword = ""; + users.users.root.initialHashedPassword = ""; system.nixos.stateVersion = mkDefault "18.03"; } diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix index ddf91a5656c..4eb28434e19 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix @@ -34,7 +34,7 @@ in boot.kernelParams = ["cma=32M" "console=ttyS0,115200n8" "console=ttyAMA0,115200n8" "console=tty0"]; # FIXME: this probably should be in installation-device.nix - users.extraUsers.root.initialHashedPassword = ""; + users.users.root.initialHashedPassword = ""; sdImage = { populateBootCommands = let diff --git a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix index 891923234dd..0d595503f19 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix @@ -35,7 +35,7 @@ in boot.kernelParams = ["console=ttyS0,115200n8" "console=ttymxc0,115200n8" "console=ttyAMA0,115200n8" "console=ttyO0,115200n8" "console=ttySAC2,115200n8" "console=tty0"]; # FIXME: this probably should be in installation-device.nix - users.extraUsers.root.initialHashedPassword = ""; + users.users.root.initialHashedPassword = ""; sdImage = { populateBootCommands = let diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix index fe6cc416163..aa52844288c 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix @@ -28,7 +28,7 @@ in boot.kernelPackages = pkgs.linuxPackages_rpi; # FIXME: this probably should be in installation-device.nix - users.extraUsers.root.initialHashedPassword = ""; + users.users.root.initialHashedPassword = ""; sdImage = { populateBootCommands = let diff --git a/nixos/modules/installer/netboot/netboot-base.nix b/nixos/modules/installer/netboot/netboot-base.nix index b12eaccf870..5e8f7f93d92 100644 --- a/nixos/modules/installer/netboot/netboot-base.nix +++ b/nixos/modules/installer/netboot/netboot-base.nix @@ -16,5 +16,5 @@ with lib; ]; # Allow the user to log in as root without a password. - users.extraUsers.root.initialHashedPassword = ""; + users.users.root.initialHashedPassword = ""; } diff --git a/nixos/modules/installer/virtualbox-demo.nix b/nixos/modules/installer/virtualbox-demo.nix index c40e3035420..f58c3658780 100644 --- a/nixos/modules/installer/virtualbox-demo.nix +++ b/nixos/modules/installer/virtualbox-demo.nix @@ -14,7 +14,7 @@ with lib; boot.loader.grub.fsIdentifier = "provided"; # Allow mounting of shared folders. - users.extraUsers.demo.extraGroups = [ "vboxsf" ]; + users.users.demo.extraGroups = [ "vboxsf" ]; # Add some more video drivers to give X11 a shot at working in # VMware and QEMU. From 0868aa76f6eaed2123fc6115cbb8a5f110dc8e2f Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 30 Jun 2018 01:52:41 +0200 Subject: [PATCH 15/56] nixos-generate-config.pl: users.extraUsers-> users.users --- nixos/modules/installer/tools/nixos-generate-config.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index a198c2d49b5..16556691240 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -619,7 +619,7 @@ $bootLoaderConfig # services.xserver.desktopManager.plasma5.enable = true; # Define a user account. Don't forget to set a password with ‘passwd’. - # users.extraUsers.guest = { + # users.users.guest = { # isNormalUser = true; # uid = 1000; # }; From 89d5d191b48c502c84a4ed459ef3c9adc77a012a Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 30 Jun 2018 01:55:42 +0200 Subject: [PATCH 16/56] nixos/tests: users.(extraUsers|extraGroup->users|group) --- nixos/tests/atd.nix | 2 +- nixos/tests/common/user-account.nix | 4 ++-- nixos/tests/gitolite.nix | 4 ++-- nixos/tests/installer.nix | 2 +- nixos/tests/jenkins.nix | 4 ++-- nixos/tests/lightdm.nix | 2 +- nixos/tests/openssh.nix | 4 ++-- nixos/tests/pam-oath-login.nix | 2 +- nixos/tests/plasma5.nix | 2 +- nixos/tests/sddm.nix | 2 +- nixos/tests/slim.nix | 2 +- nixos/tests/sudo.nix | 2 +- nixos/tests/virtualbox.nix | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-) diff --git a/nixos/tests/atd.nix b/nixos/tests/atd.nix index 5260c8ddfb8..ef848c2a374 100644 --- a/nixos/tests/atd.nix +++ b/nixos/tests/atd.nix @@ -9,7 +9,7 @@ import ./make-test.nix ({ pkgs, lib, ... }: machine = { config, pkgs, ... }: { services.atd.enable = true; - users.extraUsers.alice = { isNormalUser = true; }; + users.users.alice = { isNormalUser = true; }; }; # "at" has a resolution of 1 minute diff --git a/nixos/tests/common/user-account.nix b/nixos/tests/common/user-account.nix index 93aeb60e456..dc50e14750b 100644 --- a/nixos/tests/common/user-account.nix +++ b/nixos/tests/common/user-account.nix @@ -1,12 +1,12 @@ { lib, ... }: -{ users.extraUsers.alice = +{ users.users.alice = { isNormalUser = true; description = "Alice Foobar"; password = "foobar"; }; - users.extraUsers.bob = + users.users.bob = { isNormalUser = true; description = "Bob Foobar"; password = "foobar"; diff --git a/nixos/tests/gitolite.nix b/nixos/tests/gitolite.nix index 4b4e081acc5..d4028efad1d 100644 --- a/nixos/tests/gitolite.nix +++ b/nixos/tests/gitolite.nix @@ -78,8 +78,8 @@ in # there's nobody around that can input password PreferredAuthentications publickey ''; - users.extraUsers.alice = { isNormalUser = true; }; - users.extraUsers.bob = { isNormalUser = true; }; + users.users.alice = { isNormalUser = true; }; + users.users.bob = { isNormalUser = true; }; }; }; diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 92f400937b9..8ce9bc21ff7 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -43,7 +43,7 @@ let boot.loader.systemd-boot.enable = true; ''} - users.extraUsers.alice = { + users.users.alice = { isNormalUser = true; home = "/home/alice"; description = "Alice Foobar"; diff --git a/nixos/tests/jenkins.nix b/nixos/tests/jenkins.nix index ed55b2ff587..25629efbfa4 100644 --- a/nixos/tests/jenkins.nix +++ b/nixos/tests/jenkins.nix @@ -18,7 +18,7 @@ import ./make-test.nix ({ pkgs, ...} : { # should have no effect services.jenkinsSlave.enable = true; - users.extraUsers.jenkins.extraGroups = [ "users" ]; + users.users.jenkins.extraGroups = [ "users" ]; systemd.services.jenkins.serviceConfig.TimeoutStartSec = "6min"; }; @@ -27,7 +27,7 @@ import ./make-test.nix ({ pkgs, ...} : { { config, pkgs, ... }: { services.jenkinsSlave.enable = true; - users.extraUsers.jenkins.extraGroups = [ "users" ]; + users.users.jenkins.extraGroups = [ "users" ]; }; }; diff --git a/nixos/tests/lightdm.nix b/nixos/tests/lightdm.nix index 97ec79406b8..d2b561fa67b 100644 --- a/nixos/tests/lightdm.nix +++ b/nixos/tests/lightdm.nix @@ -16,7 +16,7 @@ import ./make-test.nix ({ pkgs, ...} : { enableOCR = true; testScript = { nodes, ... }: let - user = nodes.machine.config.users.extraUsers.alice; + user = nodes.machine.config.users.users.alice; in '' startAll; $machine->waitForText(qr/${user.description}/); diff --git a/nixos/tests/openssh.nix b/nixos/tests/openssh.nix index b2d254e9d9d..230b4520684 100644 --- a/nixos/tests/openssh.nix +++ b/nixos/tests/openssh.nix @@ -17,7 +17,7 @@ in { services.openssh.enable = true; security.pam.services.sshd.limits = [ { domain = "*"; item = "memlock"; type = "-"; value = 1024; } ]; - users.extraUsers.root.openssh.authorizedKeys.keys = [ + users.users.root.openssh.authorizedKeys.keys = [ snakeOilPublicKey ]; }; @@ -29,7 +29,7 @@ in { services.openssh = { enable = true; startWhenNeeded = true; }; security.pam.services.sshd.limits = [ { domain = "*"; item = "memlock"; type = "-"; value = 1024; } ]; - users.extraUsers.root.openssh.authorizedKeys.keys = [ + users.users.root.openssh.authorizedKeys.keys = [ snakeOilPublicKey ]; }; diff --git a/nixos/tests/pam-oath-login.nix b/nixos/tests/pam-oath-login.nix index 4364d6e354a..eb5966d9213 100644 --- a/nixos/tests/pam-oath-login.nix +++ b/nixos/tests/pam-oath-login.nix @@ -30,7 +30,7 @@ in enable = true; }; - users.extraUsers.alice = { + users.users.alice = { isNormalUser = true; name = "alice"; uid = 1000; diff --git a/nixos/tests/plasma5.nix b/nixos/tests/plasma5.nix index 14ab2e30cab..e479d3f1cb8 100644 --- a/nixos/tests/plasma5.nix +++ b/nixos/tests/plasma5.nix @@ -41,7 +41,7 @@ import ./make-test.nix ({ pkgs, ...} : enableOCR = true; testScript = { nodes, ... }: let - user = nodes.machine.config.users.extraUsers.alice; + user = nodes.machine.config.users.users.alice; xdo = "${pkgs.xdotool}/bin/xdotool"; in '' startAll; diff --git a/nixos/tests/sddm.nix b/nixos/tests/sddm.nix index 1ce2b815784..ac91a89f669 100644 --- a/nixos/tests/sddm.nix +++ b/nixos/tests/sddm.nix @@ -21,7 +21,7 @@ let enableOCR = true; testScript = { nodes, ... }: let - user = nodes.machine.config.users.extraUsers.alice; + user = nodes.machine.config.users.users.alice; in '' startAll; $machine->waitForText(qr/select your user/i); diff --git a/nixos/tests/slim.nix b/nixos/tests/slim.nix index 7b939d83638..5c76c58cf3f 100644 --- a/nixos/tests/slim.nix +++ b/nixos/tests/slim.nix @@ -48,7 +48,7 @@ import ./make-test.nix ({ pkgs, ...} : { enableOCR = true; testScript = { nodes, ... }: let - user = nodes.machine.config.users.extraUsers.alice; + user = nodes.machine.config.users.users.alice; in '' startAll; $machine->waitForText(qr/Username:/); diff --git a/nixos/tests/sudo.nix b/nixos/tests/sudo.nix index 35addb0ee80..5d6c8691230 100644 --- a/nixos/tests/sudo.nix +++ b/nixos/tests/sudo.nix @@ -14,7 +14,7 @@ in { config, lib, pkgs, ... }: with lib; { - users.extraGroups = { foobar = {}; barfoo = {}; baz = { gid = 1337; }; }; + users.groups = { foobar = {}; barfoo = {}; baz = { gid = 1337; }; }; users.users = { test0 = { isNormalUser = true; extraGroups = [ "wheel" ]; }; test1 = { isNormalUser = true; password = password; }; diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index 249571fcede..008dab8459c 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -334,7 +334,7 @@ let virtualisation.memorySize = 2048; virtualisation.virtualbox.host.enable = true; services.xserver.displayManager.auto.user = "alice"; - users.extraUsers.alice.extraGroups = let + users.users.alice.extraGroups = let inherit (config.virtualisation.virtualbox.host) enableHardening; in lib.mkIf enableHardening (lib.singleton "vboxusers"); }; From fff5923686c21dd147bde62d08e9f1042deadb4f Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 30 Jun 2018 01:58:35 +0200 Subject: [PATCH 17/56] nixos/modules: users.(extraUsers|extraGroup->users|group) --- nixos/modules/config/ldap.nix | 4 ++-- nixos/modules/config/pulseaudio.nix | 4 ++-- nixos/modules/hardware/nitrokey.nix | 2 +- nixos/modules/misc/locate.nix | 2 +- nixos/modules/profiles/demo.nix | 2 +- nixos/modules/programs/adb.nix | 4 ++-- nixos/modules/programs/gphoto2.nix | 4 ++-- nixos/modules/programs/sway.nix | 2 +- nixos/modules/programs/wireshark.nix | 2 +- nixos/modules/security/pam_mount.nix | 2 +- nixos/modules/security/polkit.nix | 2 +- nixos/modules/security/rtkit.nix | 2 +- nixos/modules/services/admin/oxidized.nix | 4 ++-- nixos/modules/services/amqp/activemq/default.nix | 4 ++-- nixos/modules/services/amqp/rabbitmq.nix | 4 ++-- nixos/modules/services/audio/liquidsoap.nix | 4 ++-- nixos/modules/services/audio/mopidy.nix | 4 ++-- nixos/modules/services/audio/mpd.nix | 4 ++-- nixos/modules/services/audio/squeezelite.nix | 2 +- nixos/modules/services/backup/bacula.nix | 4 ++-- nixos/modules/services/backup/duplicati.nix | 4 ++-- nixos/modules/services/backup/mysql-backup.nix | 2 +- .../services/backup/restic-rest-server.nix | 4 ++-- .../services/cluster/kubernetes/default.nix | 4 ++-- .../continuous-integration/buildbot/master.nix | 4 ++-- .../continuous-integration/buildbot/worker.nix | 4 ++-- .../continuous-integration/buildkite-agent.nix | 2 +- .../continuous-integration/gitlab-runner.nix | 4 ++-- .../gocd-agent/default.nix | 4 ++-- .../gocd-server/default.nix | 8 ++++---- .../continuous-integration/hydra/default.nix | 8 ++++---- .../continuous-integration/jenkins/default.nix | 4 ++-- .../continuous-integration/jenkins/slave.nix | 4 ++-- .../services/databases/4store-endpoint.nix | 2 +- nixos/modules/services/databases/4store.nix | 2 +- nixos/modules/services/databases/cassandra.nix | 2 +- nixos/modules/services/databases/clickhouse.nix | 4 ++-- nixos/modules/services/databases/couchdb.nix | 4 ++-- nixos/modules/services/databases/firebird.nix | 4 ++-- .../modules/services/databases/foundationdb.nix | 4 ++-- nixos/modules/services/databases/hbase.nix | 4 ++-- nixos/modules/services/databases/influxdb.nix | 4 ++-- nixos/modules/services/databases/memcached.nix | 2 +- nixos/modules/services/databases/mongodb.nix | 2 +- nixos/modules/services/databases/mysql.nix | 4 ++-- nixos/modules/services/databases/neo4j.nix | 2 +- nixos/modules/services/databases/openldap.nix | 4 ++-- nixos/modules/services/databases/opentsdb.nix | 4 ++-- nixos/modules/services/databases/postgresql.nix | 4 ++-- nixos/modules/services/databases/redis.nix | 2 +- nixos/modules/services/databases/rethinkdb.nix | 4 ++-- nixos/modules/services/databases/riak-cs.nix | 2 +- nixos/modules/services/databases/riak.nix | 4 ++-- nixos/modules/services/databases/stanchion.nix | 4 ++-- nixos/modules/services/databases/virtuoso.nix | 2 +- nixos/modules/services/editors/infinoted.nix | 4 ++-- .../modules/services/games/minecraft-server.nix | 2 +- nixos/modules/services/games/minetest-server.nix | 2 +- nixos/modules/services/games/terraria.nix | 4 ++-- nixos/modules/services/hardware/sane.nix | 4 ++-- nixos/modules/services/hardware/tcsd.nix | 4 ++-- nixos/modules/services/hardware/usbmuxd.nix | 4 ++-- nixos/modules/services/logging/graylog.nix | 2 +- nixos/modules/services/logging/journalwatch.nix | 2 +- nixos/modules/services/logging/logcheck.nix | 2 +- nixos/modules/services/mail/dovecot.nix | 4 ++-- nixos/modules/services/mail/dspam.nix | 4 ++-- nixos/modules/services/mail/exim.nix | 4 ++-- nixos/modules/services/mail/mailhog.nix | 2 +- nixos/modules/services/mail/mlmmj.nix | 4 ++-- nixos/modules/services/mail/nullmailer.nix | 4 ++-- nixos/modules/services/mail/opendkim.nix | 4 ++-- nixos/modules/services/mail/opensmtpd.nix | 4 ++-- nixos/modules/services/mail/postfix.nix | 4 ++-- nixos/modules/services/mail/postgrey.nix | 4 ++-- nixos/modules/services/mail/postsrsd.nix | 4 ++-- nixos/modules/services/mail/rmilter.nix | 8 ++++---- nixos/modules/services/mail/rspamd.nix | 4 ++-- nixos/modules/services/mail/spamassassin.nix | 4 ++-- nixos/modules/services/misc/airsonic.nix | 2 +- nixos/modules/services/misc/apache-kafka.nix | 2 +- nixos/modules/services/misc/bepasty.nix | 4 ++-- nixos/modules/services/misc/calibre-server.nix | 4 ++-- nixos/modules/services/misc/cfdyndns.nix | 4 ++-- nixos/modules/services/misc/cgminer.nix | 2 +- nixos/modules/services/misc/couchpotato.nix | 4 ++-- nixos/modules/services/misc/dictd.nix | 4 ++-- nixos/modules/services/misc/disnix.nix | 2 +- nixos/modules/services/misc/docker-registry.nix | 2 +- nixos/modules/services/misc/emby.nix | 4 ++-- nixos/modules/services/misc/errbot.nix | 4 ++-- nixos/modules/services/misc/etcd.nix | 2 +- nixos/modules/services/misc/exhibitor.nix | 2 +- nixos/modules/services/misc/felix.nix | 4 ++-- nixos/modules/services/misc/folding-at-home.nix | 2 +- nixos/modules/services/misc/gammu-smsd.nix | 2 +- nixos/modules/services/misc/geoip-updater.nix | 2 +- nixos/modules/services/misc/gitea.nix | 2 +- nixos/modules/services/misc/gitit.nix | 10 +++++----- nixos/modules/services/misc/gitlab.nix | 4 ++-- nixos/modules/services/misc/gitolite.nix | 4 ++-- nixos/modules/services/misc/gogs.nix | 4 ++-- nixos/modules/services/misc/gollum.nix | 4 ++-- nixos/modules/services/misc/gpsd.nix | 4 ++-- nixos/modules/services/misc/home-assistant.nix | 4 ++-- nixos/modules/services/misc/ihaskell.nix | 10 +++++----- nixos/modules/services/misc/jackett.nix | 4 ++-- nixos/modules/services/misc/mathics.nix | 10 +++++----- nixos/modules/services/misc/matrix-synapse.nix | 4 ++-- nixos/modules/services/misc/mediatomb.nix | 4 ++-- nixos/modules/services/misc/nix-daemon.nix | 10 +++++----- nixos/modules/services/misc/nix-ssh-serve.nix | 4 ++-- nixos/modules/services/misc/nzbget.nix | 4 ++-- nixos/modules/services/misc/octoprint.nix | 4 ++-- nixos/modules/services/misc/osrm.nix | 2 +- nixos/modules/services/misc/plex.nix | 4 ++-- nixos/modules/services/misc/plexpy.nix | 2 +- nixos/modules/services/misc/pykms.nix | 4 ++-- nixos/modules/services/misc/radarr.nix | 4 ++-- nixos/modules/services/misc/redmine.nix | 4 ++-- nixos/modules/services/misc/ripple-data-api.nix | 2 +- nixos/modules/services/misc/rippled.nix | 2 +- nixos/modules/services/misc/serviio.nix | 4 ++-- nixos/modules/services/misc/siproxd.nix | 2 +- nixos/modules/services/misc/sonarr.nix | 4 ++-- nixos/modules/services/misc/subsonic.nix | 6 +++--- nixos/modules/services/misc/uhub.nix | 4 ++-- nixos/modules/services/misc/zookeeper.nix | 2 +- nixos/modules/services/monitoring/bosun.nix | 4 ++-- nixos/modules/services/monitoring/collectd.nix | 2 +- .../services/monitoring/dd-agent/dd-agent.nix | 4 ++-- .../services/monitoring/fusion-inventory.nix | 2 +- nixos/modules/services/monitoring/grafana.nix | 2 +- nixos/modules/services/monitoring/graphite.nix | 4 ++-- nixos/modules/services/monitoring/heapster.nix | 2 +- nixos/modules/services/monitoring/munin.nix | 4 ++-- nixos/modules/services/monitoring/nagios.nix | 2 +- nixos/modules/services/monitoring/netdata.nix | 4 ++-- .../services/monitoring/prometheus/default.nix | 4 ++-- .../modules/services/monitoring/riemann-dash.nix | 4 ++-- .../services/monitoring/riemann-tools.nix | 4 ++-- nixos/modules/services/monitoring/riemann.nix | 4 ++-- nixos/modules/services/monitoring/scollector.nix | 4 ++-- nixos/modules/services/monitoring/statsd.nix | 2 +- nixos/modules/services/monitoring/telegraf.nix | 2 +- nixos/modules/services/monitoring/ups.nix | 4 ++-- nixos/modules/services/monitoring/vnstat.nix | 2 +- .../modules/services/monitoring/zabbix-agent.nix | 2 +- .../services/monitoring/zabbix-server.nix | 2 +- .../services/network-filesystems/ceph.nix | 4 ++-- .../services/network-filesystems/davfs2.nix | 4 ++-- .../services/network-filesystems/ipfs.nix | 4 ++-- .../services/network-filesystems/tahoe.nix | 4 ++-- .../services/network-filesystems/xtreemfs.nix | 4 ++-- .../services/network-filesystems/yandex-disk.nix | 2 +- nixos/modules/services/networking/amuled.nix | 4 ++-- nixos/modules/services/networking/aria2.nix | 4 ++-- nixos/modules/services/networking/asterisk.nix | 4 ++-- .../modules/services/networking/avahi-daemon.nix | 4 ++-- nixos/modules/services/networking/bind.nix | 2 +- nixos/modules/services/networking/bird.nix | 4 ++-- nixos/modules/services/networking/bitlbee.nix | 4 ++-- nixos/modules/services/networking/btsync.nix | 4 ++-- nixos/modules/services/networking/charybdis.nix | 4 ++-- nixos/modules/services/networking/chrony.nix | 4 ++-- nixos/modules/services/networking/cntlm.nix | 2 +- nixos/modules/services/networking/consul.nix | 2 +- nixos/modules/services/networking/coturn.nix | 4 ++-- nixos/modules/services/networking/dhcpd.nix | 2 +- nixos/modules/services/networking/dnscache.nix | 2 +- nixos/modules/services/networking/dnschain.nix | 2 +- nixos/modules/services/networking/dnsmasq.nix | 2 +- nixos/modules/services/networking/ejabberd.nix | 4 ++-- nixos/modules/services/networking/freenet.nix | 4 ++-- nixos/modules/services/networking/freeradius.nix | 2 +- nixos/modules/services/networking/gale.nix | 4 ++-- nixos/modules/services/networking/gateone.nix | 4 ++-- nixos/modules/services/networking/git-daemon.nix | 4 ++-- nixos/modules/services/networking/gnunet.nix | 4 ++-- nixos/modules/services/networking/hans.nix | 2 +- nixos/modules/services/networking/haproxy.nix | 4 ++-- nixos/modules/services/networking/i2p.nix | 4 ++-- nixos/modules/services/networking/i2pd.nix | 4 ++-- nixos/modules/services/networking/iodine.nix | 4 ++-- .../services/networking/ircd-hybrid/default.nix | 4 ++-- nixos/modules/services/networking/kippo.nix | 4 ++-- nixos/modules/services/networking/kresd.nix | 4 ++-- nixos/modules/services/networking/lambdabot.nix | 4 ++-- nixos/modules/services/networking/lldpd.nix | 4 ++-- nixos/modules/services/networking/mailpile.nix | 4 ++-- .../modules/services/networking/matterbridge.nix | 4 ++-- nixos/modules/services/networking/minidlna.nix | 4 ++-- .../services/networking/mjpg-streamer.nix | 2 +- nixos/modules/services/networking/monero.nix | 4 ++-- nixos/modules/services/networking/morty.nix | 2 +- nixos/modules/services/networking/mosquitto.nix | 4 ++-- nixos/modules/services/networking/murmur.nix | 2 +- nixos/modules/services/networking/namecoind.nix | 4 ++-- .../services/networking/networkmanager.nix | 4 ++-- nixos/modules/services/networking/ngircd.nix | 2 +- nixos/modules/services/networking/nix-serve.nix | 2 +- nixos/modules/services/networking/nntp-proxy.nix | 2 +- nixos/modules/services/networking/nsd.nix | 4 ++-- nixos/modules/services/networking/ntpd.nix | 2 +- nixos/modules/services/networking/nylon.nix | 4 ++-- nixos/modules/services/networking/oidentd.nix | 4 ++-- nixos/modules/services/networking/openntpd.nix | 2 +- nixos/modules/services/networking/owamp.nix | 4 ++-- .../services/networking/pdns-recursor.nix | 2 +- nixos/modules/services/networking/pdnsd.nix | 4 ++-- nixos/modules/services/networking/polipo.nix | 4 ++-- nixos/modules/services/networking/prayer.nix | 4 ++-- nixos/modules/services/networking/prosody.nix | 4 ++-- nixos/modules/services/networking/quassel.nix | 4 ++-- nixos/modules/services/networking/radicale.nix | 4 ++-- nixos/modules/services/networking/radvd.nix | 2 +- nixos/modules/services/networking/rdnssd.nix | 2 +- nixos/modules/services/networking/resilio.nix | 4 ++-- nixos/modules/services/networking/rpcbind.nix | 2 +- nixos/modules/services/networking/sabnzbd.nix | 4 ++-- nixos/modules/services/networking/searx.nix | 4 ++-- nixos/modules/services/networking/seeks.nix | 4 ++-- .../services/networking/shairport-sync.nix | 2 +- nixos/modules/services/networking/shout.nix | 2 +- nixos/modules/services/networking/smokeping.nix | 2 +- nixos/modules/services/networking/sniproxy.nix | 4 ++-- nixos/modules/services/networking/spiped.nix | 4 ++-- nixos/modules/services/networking/ssh/sshd.nix | 4 ++-- nixos/modules/services/networking/supybot.nix | 4 ++-- nixos/modules/services/networking/syncthing.nix | 4 ++-- nixos/modules/services/networking/tcpcrypt.nix | 2 +- nixos/modules/services/networking/tinc.nix | 2 +- nixos/modules/services/networking/tinydns.nix | 2 +- .../services/networking/tox-bootstrapd.nix | 2 +- nixos/modules/services/networking/toxvpn.nix | 2 +- nixos/modules/services/networking/tvheadend.nix | 4 ++-- nixos/modules/services/networking/unifi.nix | 2 +- nixos/modules/services/networking/vsftpd.nix | 4 ++-- nixos/modules/services/networking/znc.nix | 4 ++-- nixos/modules/services/printing/cupsd.nix | 2 +- nixos/modules/services/scheduling/atd.nix | 4 ++-- nixos/modules/services/scheduling/chronos.nix | 2 +- nixos/modules/services/scheduling/fcron.nix | 2 +- nixos/modules/services/scheduling/marathon.nix | 2 +- nixos/modules/services/search/hound.nix | 4 ++-- nixos/modules/services/search/kibana.nix | 2 +- nixos/modules/services/security/clamav.nix | 4 ++-- nixos/modules/services/security/fprot.nix | 4 ++-- nixos/modules/services/security/oauth2_proxy.nix | 2 +- nixos/modules/services/security/tor.nix | 4 ++-- nixos/modules/services/security/vault.nix | 4 ++-- nixos/modules/services/system/dbus.nix | 4 ++-- nixos/modules/services/system/nscd.nix | 2 +- nixos/modules/services/system/uptimed.nix | 2 +- nixos/modules/services/torrent/deluge.nix | 4 ++-- nixos/modules/services/torrent/peerflix.nix | 2 +- nixos/modules/services/torrent/transmission.nix | 4 ++-- .../services/web-apps/atlassian/confluence.nix | 4 ++-- .../services/web-apps/atlassian/crowd.nix | 4 ++-- .../modules/services/web-apps/atlassian/jira.nix | 4 ++-- nixos/modules/services/web-apps/frab.nix | 4 ++-- nixos/modules/services/web-apps/matomo.nix | 4 ++-- nixos/modules/services/web-apps/mattermost.nix | 4 ++-- nixos/modules/services/web-apps/nexus.nix | 4 ++-- nixos/modules/services/web-apps/restya-board.nix | 4 ++-- nixos/modules/services/web-apps/tt-rss.nix | 4 ++-- nixos/modules/services/web-apps/virtlyst.nix | 2 +- .../web-servers/apache-httpd/default.nix | 4 ++-- nixos/modules/services/web-servers/caddy.nix | 4 ++-- .../services/web-servers/hitch/default.nix | 4 ++-- .../services/web-servers/lighttpd/default.nix | 4 ++-- .../services/web-servers/lighttpd/inginious.nix | 2 +- nixos/modules/services/web-servers/meguca.nix | 4 ++-- nixos/modules/services/web-servers/mighttpd2.nix | 4 ++-- nixos/modules/services/web-servers/minio.nix | 4 ++-- .../services/web-servers/nginx/default.nix | 4 ++-- nixos/modules/services/web-servers/tomcat.nix | 4 ++-- nixos/modules/services/web-servers/traefik.nix | 4 ++-- nixos/modules/services/web-servers/uwsgi.nix | 4 ++-- .../services/web-servers/varnish/default.nix | 4 ++-- nixos/modules/services/web-servers/zope2.nix | 2 +- .../services/x11/display-managers/gdm.nix | 4 ++-- .../services/x11/display-managers/lightdm.nix | 6 +++--- .../services/x11/display-managers/sddm.nix | 4 ++-- nixos/modules/system/boot/initrd-ssh.nix | 2 +- nixos/modules/system/boot/systemd.nix | 16 ++++++++-------- nixos/modules/system/boot/timesyncd.nix | 4 ++-- nixos/modules/testing/test-instrumentation.nix | 2 +- nixos/modules/virtualisation/docker.nix | 2 +- nixos/modules/virtualisation/libvirtd.nix | 2 +- nixos/modules/virtualisation/lxc-container.nix | 2 +- nixos/modules/virtualisation/lxd.nix | 4 ++-- nixos/modules/virtualisation/rkt.nix | 2 +- .../modules/virtualisation/virtualbox-guest.nix | 2 +- nixos/modules/virtualisation/virtualbox-host.nix | 2 +- 295 files changed, 512 insertions(+), 512 deletions(-) diff --git a/nixos/modules/config/ldap.nix b/nixos/modules/config/ldap.nix index 710dfdd01af..0693e896f71 100644 --- a/nixos/modules/config/ldap.nix +++ b/nixos/modules/config/ldap.nix @@ -215,11 +215,11 @@ in ); users = mkIf cfg.daemon.enable { - extraGroups.nslcd = { + groups.nslcd = { gid = config.ids.gids.nslcd; }; - extraUsers.nslcd = { + users.nslcd = { uid = config.ids.uids.nslcd; description = "nslcd user."; group = "nslcd"; diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index 90cea47b70a..3fd882789af 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -264,7 +264,7 @@ in { }) (mkIf systemWide { - users.extraUsers.pulse = { + users.users.pulse = { # For some reason, PulseAudio wants UID == GID. uid = assert uid == gid; uid; group = "pulse"; @@ -274,7 +274,7 @@ in { createHome = true; }; - users.extraGroups.pulse.gid = gid; + users.groups.pulse.gid = gid; systemd.services.pulseaudio = { description = "PulseAudio System-Wide Server"; diff --git a/nixos/modules/hardware/nitrokey.nix b/nixos/modules/hardware/nitrokey.nix index bd440de6972..60fc95a7582 100644 --- a/nixos/modules/hardware/nitrokey.nix +++ b/nixos/modules/hardware/nitrokey.nix @@ -36,6 +36,6 @@ in { inherit (cfg) group; } )) ]; - users.extraGroups."${cfg.group}" = {}; + users.groups."${cfg.group}" = {}; }; } diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix index ce5765cf197..dd6a2f67b30 100644 --- a/nixos/modules/misc/locate.nix +++ b/nixos/modules/misc/locate.nix @@ -101,7 +101,7 @@ in { }; config = mkIf cfg.enable { - users.extraGroups = mkIf isMLocate { mlocate = {}; }; + users.groups = mkIf isMLocate { mlocate = {}; }; security.wrappers = mkIf isMLocate { locate = { diff --git a/nixos/modules/profiles/demo.nix b/nixos/modules/profiles/demo.nix index c3ee6e98371..7477795a94e 100644 --- a/nixos/modules/profiles/demo.nix +++ b/nixos/modules/profiles/demo.nix @@ -3,7 +3,7 @@ { imports = [ ./graphical.nix ]; - users.extraUsers.demo = + users.users.demo = { isNormalUser = true; description = "Demo user account"; extraGroups = [ "wheel" ]; diff --git a/nixos/modules/programs/adb.nix b/nixos/modules/programs/adb.nix index f648d70bd9f..942572cef9d 100644 --- a/nixos/modules/programs/adb.nix +++ b/nixos/modules/programs/adb.nix @@ -14,7 +14,7 @@ with lib; description = '' Whether to configure system to use Android Debug Bridge (adb). To grant access to a user, it must be part of adbusers group: - users.extraUsers.alice.extraGroups = ["adbusers"]; + users.users.alice.extraGroups = ["adbusers"]; ''; relatedPackages = [ ["androidenv" "platformTools"] ]; }; @@ -25,6 +25,6 @@ with lib; config = mkIf config.programs.adb.enable { services.udev.packages = [ pkgs.android-udev-rules ]; environment.systemPackages = [ pkgs.androidenv.platformTools ]; - users.extraGroups.adbusers = {}; + users.groups.adbusers = {}; }; } diff --git a/nixos/modules/programs/gphoto2.nix b/nixos/modules/programs/gphoto2.nix index ca7c6fb28f5..93923ff3133 100644 --- a/nixos/modules/programs/gphoto2.nix +++ b/nixos/modules/programs/gphoto2.nix @@ -15,7 +15,7 @@ with lib; Whether to configure system to use gphoto2. To grant digital camera access to a user, the user must be part of the camera group: - users.extraUsers.alice.extraGroups = ["camera"]; + users.users.alice.extraGroups = ["camera"]; ''; }; }; @@ -25,6 +25,6 @@ with lib; config = mkIf config.programs.gphoto2.enable { services.udev.packages = [ pkgs.libgphoto2 ]; environment.systemPackages = [ pkgs.gphoto2 ]; - users.extraGroups.camera = {}; + users.groups.camera = {}; }; } diff --git a/nixos/modules/programs/sway.nix b/nixos/modules/programs/sway.nix index d9503d6004f..0eaaf6b85b9 100644 --- a/nixos/modules/programs/sway.nix +++ b/nixos/modules/programs/sway.nix @@ -73,7 +73,7 @@ in { permissions = "u+rx,g+rx"; }; - users.extraGroups.sway = {}; + users.groups.sway = {}; security.pam.services.swaylock = {}; hardware.opengl.enable = mkDefault true; diff --git a/nixos/modules/programs/wireshark.nix b/nixos/modules/programs/wireshark.nix index 710d223b6f5..819f15b98a0 100644 --- a/nixos/modules/programs/wireshark.nix +++ b/nixos/modules/programs/wireshark.nix @@ -29,7 +29,7 @@ in { config = mkIf cfg.enable { environment.systemPackages = [ wireshark ]; - users.extraGroups.wireshark = {}; + users.groups.wireshark = {}; security.wrappers.dumpcap = { source = "${wireshark}/bin/dumpcap"; diff --git a/nixos/modules/security/pam_mount.nix b/nixos/modules/security/pam_mount.nix index a5299728348..8b131c54a2a 100644 --- a/nixos/modules/security/pam_mount.nix +++ b/nixos/modules/security/pam_mount.nix @@ -40,7 +40,7 @@ in target = "security/pam_mount.conf.xml"; source = let - extraUserVolumes = filterAttrs (n: u: u.cryptHomeLuks != null) config.users.extraUsers; + extraUserVolumes = filterAttrs (n: u: u.cryptHomeLuks != null) config.users.users; userVolumeEntry = user: "\n"; in pkgs.writeText "pam_mount.conf.xml" '' diff --git a/nixos/modules/security/polkit.nix b/nixos/modules/security/polkit.nix index 7e59408a5b0..04685f2c9ea 100644 --- a/nixos/modules/security/polkit.nix +++ b/nixos/modules/security/polkit.nix @@ -94,7 +94,7 @@ in rm -rf /var/lib/{polkit-1,PolicyKit} ''; - users.extraUsers.polkituser = { + users.users.polkituser = { description = "PolKit daemon"; uid = config.ids.uids.polkituser; }; diff --git a/nixos/modules/security/rtkit.nix b/nixos/modules/security/rtkit.nix index afe93f24273..f6dda21c600 100644 --- a/nixos/modules/security/rtkit.nix +++ b/nixos/modules/security/rtkit.nix @@ -34,7 +34,7 @@ with lib; services.dbus.packages = [ pkgs.rtkit ]; - users.extraUsers = singleton + users.users = singleton { name = "rtkit"; uid = config.ids.uids.rtkit; description = "RealtimeKit daemon"; diff --git a/nixos/modules/services/admin/oxidized.nix b/nixos/modules/services/admin/oxidized.nix index 891ca6323c3..70f7dd9e364 100644 --- a/nixos/modules/services/admin/oxidized.nix +++ b/nixos/modules/services/admin/oxidized.nix @@ -83,8 +83,8 @@ in }; config = mkIf cfg.enable { - users.extraGroups.${cfg.group} = { }; - users.extraUsers.${cfg.user} = { + users.groups.${cfg.group} = { }; + users.users.${cfg.user} = { description = "Oxidized service user"; group = cfg.group; home = cfg.dataDir; diff --git a/nixos/modules/services/amqp/activemq/default.nix b/nixos/modules/services/amqp/activemq/default.nix index 261f9761766..27bfd91cd2d 100644 --- a/nixos/modules/services/amqp/activemq/default.nix +++ b/nixos/modules/services/amqp/activemq/default.nix @@ -93,13 +93,13 @@ in { }; config = mkIf cfg.enable { - users.extraUsers.activemq = { + users.users.activemq = { description = "ActiveMQ server user"; group = "activemq"; uid = config.ids.uids.activemq; }; - users.extraGroups.activemq.gid = config.ids.gids.activemq; + users.groups.activemq.gid = config.ids.gids.activemq; systemd.services.activemq_init = { wantedBy = [ "activemq.service" ]; diff --git a/nixos/modules/services/amqp/rabbitmq.nix b/nixos/modules/services/amqp/rabbitmq.nix index f536d56d7c6..bb6fc0a104d 100644 --- a/nixos/modules/services/amqp/rabbitmq.nix +++ b/nixos/modules/services/amqp/rabbitmq.nix @@ -83,7 +83,7 @@ in { environment.systemPackages = [ pkgs.rabbitmq_server ]; - users.extraUsers.rabbitmq = { + users.users.rabbitmq = { description = "RabbitMQ server user"; home = "${cfg.dataDir}"; createHome = true; @@ -91,7 +91,7 @@ in { uid = config.ids.uids.rabbitmq; }; - users.extraGroups.rabbitmq.gid = config.ids.gids.rabbitmq; + users.groups.rabbitmq.gid = config.ids.gids.rabbitmq; systemd.services.rabbitmq = { description = "RabbitMQ Server"; diff --git a/nixos/modules/services/audio/liquidsoap.nix b/nixos/modules/services/audio/liquidsoap.nix index 1c19ed36bdc..66f84ef2076 100644 --- a/nixos/modules/services/audio/liquidsoap.nix +++ b/nixos/modules/services/audio/liquidsoap.nix @@ -57,7 +57,7 @@ in config = mkIf (builtins.length streams != 0) { - users.extraUsers.liquidsoap = { + users.users.liquidsoap = { uid = config.ids.uids.liquidsoap; group = "liquidsoap"; extraGroups = [ "audio" ]; @@ -66,7 +66,7 @@ in createHome = true; }; - users.extraGroups.liquidsoap.gid = config.ids.gids.liquidsoap; + users.groups.liquidsoap.gid = config.ids.gids.liquidsoap; systemd.services = builtins.listToAttrs ( map streamService streams ); }; diff --git a/nixos/modules/services/audio/mopidy.nix b/nixos/modules/services/audio/mopidy.nix index 52613d450b5..e2f4ec39f94 100644 --- a/nixos/modules/services/audio/mopidy.nix +++ b/nixos/modules/services/audio/mopidy.nix @@ -93,7 +93,7 @@ in { }; }; - users.extraUsers.mopidy = { + users.users.mopidy = { inherit uid; group = "mopidy"; extraGroups = [ "audio" ]; @@ -101,7 +101,7 @@ in { home = "${cfg.dataDir}"; }; - users.extraGroups.mopidy.gid = gid; + users.groups.mopidy.gid = gid; }; diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix index 94020ed05d6..3add6556d0d 100644 --- a/nixos/modules/services/audio/mpd.nix +++ b/nixos/modules/services/audio/mpd.nix @@ -184,7 +184,7 @@ in { }; }; - users.extraUsers = optionalAttrs (cfg.user == name) (singleton { + users.users = optionalAttrs (cfg.user == name) (singleton { inherit uid; inherit name; group = cfg.group; @@ -193,7 +193,7 @@ in { home = "${cfg.dataDir}"; }); - users.extraGroups = optionalAttrs (cfg.group == name) (singleton { + users.groups = optionalAttrs (cfg.group == name) (singleton { inherit name; gid = gid; }); diff --git a/nixos/modules/services/audio/squeezelite.nix b/nixos/modules/services/audio/squeezelite.nix index f1a60be992d..57ae3855993 100644 --- a/nixos/modules/services/audio/squeezelite.nix +++ b/nixos/modules/services/audio/squeezelite.nix @@ -54,7 +54,7 @@ in { }; }; - users.extraUsers.squeezelite= { + users.users.squeezelite= { inherit uid; group = "nogroup"; extraGroups = [ "audio" ]; diff --git a/nixos/modules/services/backup/bacula.nix b/nixos/modules/services/backup/bacula.nix index 340b0cf0723..e2806a69539 100644 --- a/nixos/modules/services/backup/bacula.nix +++ b/nixos/modules/services/backup/bacula.nix @@ -397,7 +397,7 @@ in { environment.systemPackages = [ pkgs.bacula ]; - users.extraUsers.bacula = { + users.users.bacula = { group = "bacula"; uid = config.ids.uids.bacula; home = "${libDir}"; @@ -406,6 +406,6 @@ in { shell = "${pkgs.bash}/bin/bash"; }; - users.extraGroups.bacula.gid = config.ids.gids.bacula; + users.groups.bacula.gid = config.ids.gids.bacula; }; } diff --git a/nixos/modules/services/backup/duplicati.nix b/nixos/modules/services/backup/duplicati.nix index 379fde1fe03..80287f30b81 100644 --- a/nixos/modules/services/backup/duplicati.nix +++ b/nixos/modules/services/backup/duplicati.nix @@ -44,13 +44,13 @@ in }; }; - users.extraUsers.duplicati = { + users.users.duplicati = { uid = config.ids.uids.duplicati; home = "/var/lib/duplicati"; createHome = true; group = "duplicati"; }; - users.extraGroups.duplicati.gid = config.ids.gids.duplicati; + users.groups.duplicati.gid = config.ids.gids.duplicati; }; } diff --git a/nixos/modules/services/backup/mysql-backup.nix b/nixos/modules/services/backup/mysql-backup.nix index 3f533fa457d..f0c273ffebf 100644 --- a/nixos/modules/services/backup/mysql-backup.nix +++ b/nixos/modules/services/backup/mysql-backup.nix @@ -84,7 +84,7 @@ in }; config = mkIf cfg.enable { - users.extraUsers = optionalAttrs (cfg.user == defaultUser) (singleton + users.users = optionalAttrs (cfg.user == defaultUser) (singleton { name = defaultUser; isSystemUser = true; createHome = false; diff --git a/nixos/modules/services/backup/restic-rest-server.nix b/nixos/modules/services/backup/restic-rest-server.nix index d4b47a09941..d1b775f150d 100644 --- a/nixos/modules/services/backup/restic-rest-server.nix +++ b/nixos/modules/services/backup/restic-rest-server.nix @@ -95,13 +95,13 @@ in }; }; - users.extraUsers.restic = { + users.users.restic = { group = "restic"; home = cfg.dataDir; createHome = true; uid = config.ids.uids.restic; }; - users.extraGroups.restic.gid = config.ids.uids.restic; + users.groups.restic.gid = config.ids.uids.restic; }; } diff --git a/nixos/modules/services/cluster/kubernetes/default.nix b/nixos/modules/services/cluster/kubernetes/default.nix index 5e87ae88f5a..2707c176efd 100644 --- a/nixos/modules/services/cluster/kubernetes/default.nix +++ b/nixos/modules/services/cluster/kubernetes/default.nix @@ -1145,7 +1145,7 @@ in { ]; environment.systemPackages = [ cfg.package ]; - users.extraUsers = singleton { + users.users = singleton { name = "kubernetes"; uid = config.ids.uids.kubernetes; description = "Kubernetes user"; @@ -1154,7 +1154,7 @@ in { home = cfg.dataDir; createHome = true; }; - users.extraGroups.kubernetes.gid = config.ids.gids.kubernetes; + users.groups.kubernetes.gid = config.ids.gids.kubernetes; # dns addon is enabled by default services.kubernetes.addons.dns.enable = mkDefault true; diff --git a/nixos/modules/services/continuous-integration/buildbot/master.nix b/nixos/modules/services/continuous-integration/buildbot/master.nix index 846efc8b5b9..8d767de37f0 100644 --- a/nixos/modules/services/continuous-integration/buildbot/master.nix +++ b/nixos/modules/services/continuous-integration/buildbot/master.nix @@ -191,11 +191,11 @@ in { }; config = mkIf cfg.enable { - users.extraGroups = optional (cfg.group == "buildbot") { + users.groups = optional (cfg.group == "buildbot") { name = "buildbot"; }; - users.extraUsers = optional (cfg.user == "buildbot") { + users.users = optional (cfg.user == "buildbot") { name = "buildbot"; description = "Buildbot User."; isNormalUser = true; diff --git a/nixos/modules/services/continuous-integration/buildbot/worker.nix b/nixos/modules/services/continuous-integration/buildbot/worker.nix index a97f571e89d..67c541570b9 100644 --- a/nixos/modules/services/continuous-integration/buildbot/worker.nix +++ b/nixos/modules/services/continuous-integration/buildbot/worker.nix @@ -84,11 +84,11 @@ in { }; config = mkIf cfg.enable { - users.extraGroups = optional (cfg.group == "bbworker") { + users.groups = optional (cfg.group == "bbworker") { name = "bbworker"; }; - users.extraUsers = optional (cfg.user == "bbworker") { + users.users = optional (cfg.user == "bbworker") { name = "bbworker"; description = "Buildbot Worker User."; isNormalUser = true; diff --git a/nixos/modules/services/continuous-integration/buildkite-agent.nix b/nixos/modules/services/continuous-integration/buildkite-agent.nix index d647b7b9fa4..9daf391c73c 100644 --- a/nixos/modules/services/continuous-integration/buildkite-agent.nix +++ b/nixos/modules/services/continuous-integration/buildkite-agent.nix @@ -185,7 +185,7 @@ in }; config = mkIf config.services.buildkite-agent.enable { - users.extraUsers.buildkite-agent = + users.users.buildkite-agent = { name = "buildkite-agent"; home = cfg.dataDir; createHome = true; diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix index 6d5cea4f77a..a0aff1b8b5b 100644 --- a/nixos/modules/services/continuous-integration/gitlab-runner.nix +++ b/nixos/modules/services/continuous-integration/gitlab-runner.nix @@ -134,7 +134,7 @@ in # Make the gitlab-runner command availabe so users can query the runner environment.systemPackages = [ cfg.package ]; - users.extraUsers.gitlab-runner = { + users.users.gitlab-runner = { group = "gitlab-runner"; extraGroups = optional hasDocker "docker"; uid = config.ids.uids.gitlab-runner; @@ -142,6 +142,6 @@ in createHome = true; }; - users.extraGroups.gitlab-runner.gid = config.ids.gids.gitlab-runner; + users.groups.gitlab-runner.gid = config.ids.gids.gitlab-runner; }; } diff --git a/nixos/modules/services/continuous-integration/gocd-agent/default.nix b/nixos/modules/services/continuous-integration/gocd-agent/default.nix index 05adb18fbe9..8126f27c2b0 100644 --- a/nixos/modules/services/continuous-integration/gocd-agent/default.nix +++ b/nixos/modules/services/continuous-integration/gocd-agent/default.nix @@ -135,12 +135,12 @@ in { }; config = mkIf cfg.enable { - users.extraGroups = optional (cfg.group == "gocd-agent") { + users.groups = optional (cfg.group == "gocd-agent") { name = "gocd-agent"; gid = config.ids.gids.gocd-agent; }; - users.extraUsers = optional (cfg.user == "gocd-agent") { + users.users = optional (cfg.user == "gocd-agent") { name = "gocd-agent"; description = "gocd-agent user"; createHome = true; diff --git a/nixos/modules/services/continuous-integration/gocd-server/default.nix b/nixos/modules/services/continuous-integration/gocd-server/default.nix index 07e00f17f1e..8f177da129e 100644 --- a/nixos/modules/services/continuous-integration/gocd-server/default.nix +++ b/nixos/modules/services/continuous-integration/gocd-server/default.nix @@ -113,8 +113,8 @@ in { extraOptions = mkOption { default = [ ]; - example = [ - "-X debug" + example = [ + "-X debug" "-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005" "-verbose:gc" "-Xloggc:go-server-gc.log" @@ -143,12 +143,12 @@ in { }; config = mkIf cfg.enable { - users.extraGroups = optional (cfg.group == "gocd-server") { + users.groups = optional (cfg.group == "gocd-server") { name = "gocd-server"; gid = config.ids.gids.gocd-server; }; - users.extraUsers = optional (cfg.user == "gocd-server") { + users.users = optional (cfg.user == "gocd-server") { name = "gocd-server"; description = "gocd-server user"; createHome = true; diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix index 2fa7c59a965..c7fe4eeeab9 100644 --- a/nixos/modules/services/continuous-integration/hydra/default.nix +++ b/nixos/modules/services/continuous-integration/hydra/default.nix @@ -194,11 +194,11 @@ in config = mkIf cfg.enable { - users.extraGroups.hydra = { + users.groups.hydra = { gid = config.ids.gids.hydra; }; - users.extraUsers.hydra = + users.users.hydra = { description = "Hydra"; group = "hydra"; createHome = true; @@ -207,7 +207,7 @@ in uid = config.ids.uids.hydra; }; - users.extraUsers.hydra-queue-runner = + users.users.hydra-queue-runner = { description = "Hydra queue runner"; group = "hydra"; useDefaultShell = true; @@ -215,7 +215,7 @@ in uid = config.ids.uids.hydra-queue-runner; }; - users.extraUsers.hydra-www = + users.users.hydra-www = { description = "Hydra web server"; group = "hydra"; useDefaultShell = true; diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix index c2f4e9c0c5a..1eca45fbd57 100644 --- a/nixos/modules/services/continuous-integration/jenkins/default.nix +++ b/nixos/modules/services/continuous-integration/jenkins/default.nix @@ -150,12 +150,12 @@ in { pkgs.dejavu_fonts ]; - users.extraGroups = optional (cfg.group == "jenkins") { + users.groups = optional (cfg.group == "jenkins") { name = "jenkins"; gid = config.ids.gids.jenkins; }; - users.extraUsers = optional (cfg.user == "jenkins") { + users.users = optional (cfg.user == "jenkins") { name = "jenkins"; description = "jenkins user"; createHome = true; diff --git a/nixos/modules/services/continuous-integration/jenkins/slave.nix b/nixos/modules/services/continuous-integration/jenkins/slave.nix index a0216caf2b5..d8f55fb826f 100644 --- a/nixos/modules/services/continuous-integration/jenkins/slave.nix +++ b/nixos/modules/services/continuous-integration/jenkins/slave.nix @@ -50,12 +50,12 @@ in { }; config = mkIf (cfg.enable && !masterCfg.enable) { - users.extraGroups = optional (cfg.group == "jenkins") { + users.groups = optional (cfg.group == "jenkins") { name = "jenkins"; gid = config.ids.gids.jenkins; }; - users.extraUsers = optional (cfg.user == "jenkins") { + users.users = optional (cfg.user == "jenkins") { name = "jenkins"; description = "jenkins user"; createHome = true; diff --git a/nixos/modules/services/databases/4store-endpoint.nix b/nixos/modules/services/databases/4store-endpoint.nix index d528355671f..59ed0e5f0af 100644 --- a/nixos/modules/services/databases/4store-endpoint.nix +++ b/nixos/modules/services/databases/4store-endpoint.nix @@ -52,7 +52,7 @@ with lib; message = "Must specify 4Store database name"; }; - users.extraUsers = singleton + users.users = singleton { name = endpointUser; uid = config.ids.uids.fourstorehttp; description = "4Store SPARQL endpoint user"; diff --git a/nixos/modules/services/databases/4store.nix b/nixos/modules/services/databases/4store.nix index abb62e1f263..be4351c1c38 100644 --- a/nixos/modules/services/databases/4store.nix +++ b/nixos/modules/services/databases/4store.nix @@ -43,7 +43,7 @@ with lib; message = "Must specify 4Store database name."; }; - users.extraUsers = singleton + users.users = singleton { name = fourStoreUser; uid = config.ids.uids.fourstore; description = "4Store database user"; diff --git a/nixos/modules/services/databases/cassandra.nix b/nixos/modules/services/databases/cassandra.nix index 1e5cd8f5413..09b3fbd8a62 100644 --- a/nixos/modules/services/databases/cassandra.nix +++ b/nixos/modules/services/databases/cassandra.nix @@ -420,7 +420,7 @@ in { 9160 ]; - users.extraUsers.cassandra = + users.users.cassandra = if config.ids.uids ? "cassandra" then { uid = config.ids.uids.cassandra; } // cassandraUser else cassandraUser ; diff --git a/nixos/modules/services/databases/clickhouse.nix b/nixos/modules/services/databases/clickhouse.nix index 631d7f8cba7..1b8771cec39 100644 --- a/nixos/modules/services/databases/clickhouse.nix +++ b/nixos/modules/services/databases/clickhouse.nix @@ -27,14 +27,14 @@ with lib; config = mkIf cfg.enable { - users.extraUsers.clickhouse = { + users.users.clickhouse = { name = "clickhouse"; uid = config.ids.uids.clickhouse; group = "clickhouse"; description = "ClickHouse server user"; }; - users.extraGroups.clickhouse.gid = config.ids.gids.clickhouse; + users.groups.clickhouse.gid = config.ids.gids.clickhouse; systemd.services.clickhouse = { description = "ClickHouse server"; diff --git a/nixos/modules/services/databases/couchdb.nix b/nixos/modules/services/databases/couchdb.nix index 52247bfb983..ca89b119820 100644 --- a/nixos/modules/services/databases/couchdb.nix +++ b/nixos/modules/services/databases/couchdb.nix @@ -198,13 +198,13 @@ in { }; }; - users.extraUsers.couchdb = { + users.users.couchdb = { description = "CouchDB Server user"; group = "couchdb"; uid = config.ids.uids.couchdb; }; - users.extraGroups.couchdb.gid = config.ids.gids.couchdb; + users.groups.couchdb.gid = config.ids.gids.couchdb; }; } diff --git a/nixos/modules/services/databases/firebird.nix b/nixos/modules/services/databases/firebird.nix index b9f66612d4e..cc81b440450 100644 --- a/nixos/modules/services/databases/firebird.nix +++ b/nixos/modules/services/databases/firebird.nix @@ -154,13 +154,13 @@ in # there are some additional settings which should be reviewed ''; - users.extraUsers.firebird = { + users.users.firebird = { description = "Firebird server user"; group = "firebird"; uid = config.ids.uids.firebird; }; - users.extraGroups.firebird.gid = config.ids.gids.firebird; + users.groups.firebird.gid = config.ids.gids.firebird; }; } diff --git a/nixos/modules/services/databases/foundationdb.nix b/nixos/modules/services/databases/foundationdb.nix index 693d2fde991..91337cf791d 100644 --- a/nixos/modules/services/databases/foundationdb.nix +++ b/nixos/modules/services/databases/foundationdb.nix @@ -325,14 +325,14 @@ in environment.systemPackages = [ pkg ]; - users.extraUsers = optionalAttrs (cfg.user == "foundationdb") (singleton + users.users = optionalAttrs (cfg.user == "foundationdb") (singleton { name = "foundationdb"; description = "FoundationDB User"; uid = config.ids.uids.foundationdb; group = cfg.group; }); - users.extraGroups = optionalAttrs (cfg.group == "foundationdb") (singleton + users.groups = optionalAttrs (cfg.group == "foundationdb") (singleton { name = "foundationdb"; gid = config.ids.gids.foundationdb; }); diff --git a/nixos/modules/services/databases/hbase.nix b/nixos/modules/services/databases/hbase.nix index 629d02209a9..4772e897efe 100644 --- a/nixos/modules/services/databases/hbase.nix +++ b/nixos/modules/services/databases/hbase.nix @@ -122,13 +122,13 @@ in { }; }; - users.extraUsers.hbase = { + users.users.hbase = { description = "HBase Server user"; group = "hbase"; uid = config.ids.uids.hbase; }; - users.extraGroups.hbase.gid = config.ids.gids.hbase; + users.groups.hbase.gid = config.ids.gids.hbase; }; } diff --git a/nixos/modules/services/databases/influxdb.nix b/nixos/modules/services/databases/influxdb.nix index 15b711f57b1..d7a028b25d8 100644 --- a/nixos/modules/services/databases/influxdb.nix +++ b/nixos/modules/services/databases/influxdb.nix @@ -182,13 +182,13 @@ in ''; }; - users.extraUsers = optional (cfg.user == "influxdb") { + users.users = optional (cfg.user == "influxdb") { name = "influxdb"; uid = config.ids.uids.influxdb; description = "Influxdb daemon user"; }; - users.extraGroups = optional (cfg.group == "influxdb") { + users.groups = optional (cfg.group == "influxdb") { name = "influxdb"; gid = config.ids.gids.influxdb; }; diff --git a/nixos/modules/services/databases/memcached.nix b/nixos/modules/services/databases/memcached.nix index 46bc6fc5c13..7af452e4dce 100644 --- a/nixos/modules/services/databases/memcached.nix +++ b/nixos/modules/services/databases/memcached.nix @@ -64,7 +64,7 @@ in config = mkIf config.services.memcached.enable { - users.extraUsers = optional (cfg.user == "memcached") { + users.users = optional (cfg.user == "memcached") { name = "memcached"; description = "Memcached server user"; }; diff --git a/nixos/modules/services/databases/mongodb.nix b/nixos/modules/services/databases/mongodb.nix index 78dbf0d784c..4c46d9228e5 100644 --- a/nixos/modules/services/databases/mongodb.nix +++ b/nixos/modules/services/databases/mongodb.nix @@ -93,7 +93,7 @@ in config = mkIf config.services.mongodb.enable { - users.extraUsers.mongodb = mkIf (cfg.user == "mongodb") + users.users.mongodb = mkIf (cfg.user == "mongodb") { name = "mongodb"; uid = config.ids.uids.mongodb; description = "MongoDB server user"; diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index 15b9c788e87..3eb7879e2d9 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -221,13 +221,13 @@ in mkDefault (if versionAtLeast config.system.nixos.stateVersion "17.09" then "/var/lib/mysql" else "/var/mysql"); - users.extraUsers.mysql = { + users.users.mysql = { description = "MySQL server user"; group = "mysql"; uid = config.ids.uids.mysql; }; - users.extraGroups.mysql.gid = config.ids.gids.mysql; + users.groups.mysql.gid = config.ids.gids.mysql; environment.systemPackages = [mysql]; diff --git a/nixos/modules/services/databases/neo4j.nix b/nixos/modules/services/databases/neo4j.nix index 424e08a6ee3..5015618c424 100644 --- a/nixos/modules/services/databases/neo4j.nix +++ b/nixos/modules/services/databases/neo4j.nix @@ -139,7 +139,7 @@ in { environment.systemPackages = [ cfg.package ]; - users.extraUsers = singleton { + users.users = singleton { name = "neo4j"; uid = config.ids.uids.neo4j; description = "Neo4j daemon user"; diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix index a67c61eb994..9f2bf5ef8a9 100644 --- a/nixos/modules/services/databases/openldap.nix +++ b/nixos/modules/services/databases/openldap.nix @@ -145,13 +145,13 @@ in "${configOpts}"; }; - users.extraUsers.openldap = + users.users.openldap = { name = cfg.user; group = cfg.group; uid = config.ids.uids.openldap; }; - users.extraGroups.openldap = + users.groups.openldap = { name = cfg.group; gid = config.ids.gids.openldap; }; diff --git a/nixos/modules/services/databases/opentsdb.nix b/nixos/modules/services/databases/opentsdb.nix index 489cdcffe65..b26fa9093ef 100644 --- a/nixos/modules/services/databases/opentsdb.nix +++ b/nixos/modules/services/databases/opentsdb.nix @@ -97,13 +97,13 @@ in { }; }; - users.extraUsers.opentsdb = { + users.users.opentsdb = { description = "OpenTSDB Server user"; group = "opentsdb"; uid = config.ids.uids.opentsdb; }; - users.extraGroups.opentsdb.gid = config.ids.gids.opentsdb; + users.groups.opentsdb.gid = config.ids.gids.opentsdb; }; } diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index 42d61fa1b36..e33bee9db6e 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -183,14 +183,14 @@ in host all all ::1/128 md5 ''; - users.extraUsers.postgres = + users.users.postgres = { name = "postgres"; uid = config.ids.uids.postgres; group = "postgres"; description = "PostgreSQL server user"; }; - users.extraGroups.postgres.gid = config.ids.gids.postgres; + users.groups.postgres.gid = config.ids.gids.postgres; environment.systemPackages = [ postgresql ]; diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix index e4e38a4364a..cc7b51982d1 100644 --- a/nixos/modules/services/databases/redis.nix +++ b/nixos/modules/services/databases/redis.nix @@ -217,7 +217,7 @@ in allowedTCPPorts = [ cfg.port ]; }; - users.extraUsers.redis = + users.users.redis = { name = cfg.user; description = "Redis database user"; }; diff --git a/nixos/modules/services/databases/rethinkdb.nix b/nixos/modules/services/databases/rethinkdb.nix index cd8c386b08d..789d9c851d6 100644 --- a/nixos/modules/services/databases/rethinkdb.nix +++ b/nixos/modules/services/databases/rethinkdb.nix @@ -96,12 +96,12 @@ in ''; }; - users.extraUsers.rethinkdb = mkIf (cfg.user == "rethinkdb") + users.users.rethinkdb = mkIf (cfg.user == "rethinkdb") { name = "rethinkdb"; description = "RethinkDB server user"; }; - users.extraGroups = optionalAttrs (cfg.group == "rethinkdb") (singleton + users.groups = optionalAttrs (cfg.group == "rethinkdb") (singleton { name = "rethinkdb"; }); diff --git a/nixos/modules/services/databases/riak-cs.nix b/nixos/modules/services/databases/riak-cs.nix index 198efc29222..2cb204f729a 100644 --- a/nixos/modules/services/databases/riak-cs.nix +++ b/nixos/modules/services/databases/riak-cs.nix @@ -145,7 +145,7 @@ in ${cfg.extraAdvancedConfig} ''; - users.extraUsers.riak-cs = { + users.users.riak-cs = { name = "riak-cs"; uid = config.ids.uids.riak-cs; group = "riak"; diff --git a/nixos/modules/services/databases/riak.nix b/nixos/modules/services/databases/riak.nix index e0ebf164aef..ac086cf5599 100644 --- a/nixos/modules/services/databases/riak.nix +++ b/nixos/modules/services/databases/riak.nix @@ -102,14 +102,14 @@ in ${cfg.extraAdvancedConfig} ''; - users.extraUsers.riak = { + users.users.riak = { name = "riak"; uid = config.ids.uids.riak; group = "riak"; description = "Riak server user"; }; - users.extraGroups.riak.gid = config.ids.gids.riak; + users.groups.riak.gid = config.ids.gids.riak; systemd.services.riak = { description = "Riak Server"; diff --git a/nixos/modules/services/databases/stanchion.nix b/nixos/modules/services/databases/stanchion.nix index a4597cac3cd..9fe49f51edd 100644 --- a/nixos/modules/services/databases/stanchion.nix +++ b/nixos/modules/services/databases/stanchion.nix @@ -143,14 +143,14 @@ in ${cfg.extraConfig} ''; - users.extraUsers.stanchion = { + users.users.stanchion = { name = "stanchion"; uid = config.ids.uids.stanchion; group = "stanchion"; description = "Stanchion server user"; }; - users.extraGroups.stanchion.gid = config.ids.gids.stanchion; + users.groups.stanchion.gid = config.ids.gids.stanchion; systemd.services.stanchion = { description = "Stanchion Server"; diff --git a/nixos/modules/services/databases/virtuoso.nix b/nixos/modules/services/databases/virtuoso.nix index 3231fede08f..6ffc44a5274 100644 --- a/nixos/modules/services/databases/virtuoso.nix +++ b/nixos/modules/services/databases/virtuoso.nix @@ -54,7 +54,7 @@ with lib; config = mkIf cfg.enable { - users.extraUsers = singleton + users.users = singleton { name = virtuosoUser; uid = config.ids.uids.virtuoso; description = "virtuoso user"; diff --git a/nixos/modules/services/editors/infinoted.nix b/nixos/modules/services/editors/infinoted.nix index 9074a4345ea..bba21caca85 100644 --- a/nixos/modules/services/editors/infinoted.nix +++ b/nixos/modules/services/editors/infinoted.nix @@ -111,12 +111,12 @@ in { }; config = mkIf (cfg.enable) { - users.extraUsers = optional (cfg.user == "infinoted") + users.users = optional (cfg.user == "infinoted") { name = "infinoted"; description = "Infinoted user"; group = cfg.group; }; - users.extraGroups = optional (cfg.group == "infinoted") + users.groups = optional (cfg.group == "infinoted") { name = "infinoted"; }; diff --git a/nixos/modules/services/games/minecraft-server.nix b/nixos/modules/services/games/minecraft-server.nix index d2c8af6de0c..f50d2897843 100644 --- a/nixos/modules/services/games/minecraft-server.nix +++ b/nixos/modules/services/games/minecraft-server.nix @@ -45,7 +45,7 @@ in }; config = mkIf cfg.enable { - users.extraUsers.minecraft = { + users.users.minecraft = { description = "Minecraft Server Service user"; home = cfg.dataDir; createHome = true; diff --git a/nixos/modules/services/games/minetest-server.nix b/nixos/modules/services/games/minetest-server.nix index 58b73ac4f6b..2de42f20f6c 100644 --- a/nixos/modules/services/games/minetest-server.nix +++ b/nixos/modules/services/games/minetest-server.nix @@ -79,7 +79,7 @@ in }; config = mkIf cfg.enable { - users.extraUsers.minetest = { + users.users.minetest = { description = "Minetest Server Service user"; home = "/var/lib/minetest"; createHome = true; diff --git a/nixos/modules/services/games/terraria.nix b/nixos/modules/services/games/terraria.nix index 21aff780b67..ddf17599296 100644 --- a/nixos/modules/services/games/terraria.nix +++ b/nixos/modules/services/games/terraria.nix @@ -105,14 +105,14 @@ in }; config = mkIf cfg.enable { - users.extraUsers.terraria = { + users.users.terraria = { description = "Terraria server service user"; home = "/var/lib/terraria"; createHome = true; uid = config.ids.uids.terraria; }; - users.extraGroups.terraria = { + users.groups.terraria = { gid = config.ids.gids.terraria; members = [ "terraria" ]; }; diff --git a/nixos/modules/services/hardware/sane.nix b/nixos/modules/services/hardware/sane.nix index d651ccaa577..fe05c5a5c06 100644 --- a/nixos/modules/services/hardware/sane.nix +++ b/nixos/modules/services/hardware/sane.nix @@ -124,7 +124,7 @@ in environment.sessionVariables = env; services.udev.packages = backends; - users.extraGroups."scanner".gid = config.ids.gids.scanner; + users.groups."scanner".gid = config.ids.gids.scanner; }) (mkIf config.services.saned.enable { @@ -152,7 +152,7 @@ in }; }; - users.extraUsers."scanner" = { + users.users."scanner" = { uid = config.ids.uids.scanner; group = "scanner"; }; diff --git a/nixos/modules/services/hardware/tcsd.nix b/nixos/modules/services/hardware/tcsd.nix index d957b5063d3..d4b0a9495d7 100644 --- a/nixos/modules/services/hardware/tcsd.nix +++ b/nixos/modules/services/hardware/tcsd.nix @@ -137,13 +137,13 @@ in serviceConfig.ExecStart = "${pkgs.trousers}/sbin/tcsd -f -c ${tcsdConf}"; }; - users.extraUsers = optionalAttrs (cfg.user == "tss") (singleton + users.users = optionalAttrs (cfg.user == "tss") (singleton { name = "tss"; group = "tss"; uid = config.ids.uids.tss; }); - users.extraGroups = optionalAttrs (cfg.group == "tss") (singleton + users.groups = optionalAttrs (cfg.group == "tss") (singleton { name = "tss"; gid = config.ids.gids.tss; }); diff --git a/nixos/modules/services/hardware/usbmuxd.nix b/nixos/modules/services/hardware/usbmuxd.nix index 7ebd49fa01c..6a3f7cfd210 100644 --- a/nixos/modules/services/hardware/usbmuxd.nix +++ b/nixos/modules/services/hardware/usbmuxd.nix @@ -43,13 +43,13 @@ in config = mkIf cfg.enable { - users.extraUsers = optional (cfg.user == defaultUserGroup) { + users.users = optional (cfg.user == defaultUserGroup) { name = cfg.user; description = "usbmuxd user"; group = cfg.group; }; - users.extraGroups = optional (cfg.group == defaultUserGroup) { + users.groups = optional (cfg.group == defaultUserGroup) { name = cfg.group; }; diff --git a/nixos/modules/services/logging/graylog.nix b/nixos/modules/services/logging/graylog.nix index 95f31829882..74a7b3c9b47 100644 --- a/nixos/modules/services/logging/graylog.nix +++ b/nixos/modules/services/logging/graylog.nix @@ -127,7 +127,7 @@ in config = mkIf cfg.enable { - users.extraUsers = mkIf (cfg.user == "graylog") { + users.users = mkIf (cfg.user == "graylog") { graylog = { uid = config.ids.uids.graylog; description = "Graylog server daemon user"; diff --git a/nixos/modules/services/logging/journalwatch.nix b/nixos/modules/services/logging/journalwatch.nix index d49795fe2b7..adabc645914 100644 --- a/nixos/modules/services/logging/journalwatch.nix +++ b/nixos/modules/services/logging/journalwatch.nix @@ -197,7 +197,7 @@ in { config = mkIf cfg.enable { - users.extraUsers.${user} = { + users.users.${user} = { isSystemUser = true; createHome = true; home = dataDir; diff --git a/nixos/modules/services/logging/logcheck.nix b/nixos/modules/services/logging/logcheck.nix index a4cab0c94cd..1477d273d5e 100644 --- a/nixos/modules/services/logging/logcheck.nix +++ b/nixos/modules/services/logging/logcheck.nix @@ -213,7 +213,7 @@ in mapAttrsToList writeIgnoreRule cfg.ignore ++ mapAttrsToList writeIgnoreCronRule cfg.ignoreCron; - users.extraUsers = optionalAttrs (cfg.user == "logcheck") (singleton + users.users = optionalAttrs (cfg.user == "logcheck") (singleton { name = "logcheck"; uid = config.ids.uids.logcheck; shell = "/bin/sh"; diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix index 50477fdd25b..a3eb1653df5 100644 --- a/nixos/modules/services/mail/dovecot.nix +++ b/nixos/modules/services/mail/dovecot.nix @@ -309,7 +309,7 @@ in ++ optional cfg.enablePop3 "pop3" ++ optional cfg.enableLmtp "lmtp"; - users.extraUsers = [ + users.users = [ { name = "dovenull"; uid = config.ids.uids.dovenull2; description = "Dovecot user for untrusted logins"; @@ -328,7 +328,7 @@ in group = cfg.mailGroup; }); - users.extraGroups = optional (cfg.group == "dovecot2") + users.groups = optional (cfg.group == "dovecot2") { name = "dovecot2"; gid = config.ids.gids.dovecot2; } diff --git a/nixos/modules/services/mail/dspam.nix b/nixos/modules/services/mail/dspam.nix index 89076ff0546..167b5aeccc8 100644 --- a/nixos/modules/services/mail/dspam.nix +++ b/nixos/modules/services/mail/dspam.nix @@ -86,13 +86,13 @@ in { config = mkIf cfg.enable (mkMerge [ { - users.extraUsers = optionalAttrs (cfg.user == "dspam") (singleton + users.users = optionalAttrs (cfg.user == "dspam") (singleton { name = "dspam"; group = cfg.group; uid = config.ids.uids.dspam; }); - users.extraGroups = optionalAttrs (cfg.group == "dspam") (singleton + users.groups = optionalAttrs (cfg.group == "dspam") (singleton { name = "dspam"; gid = config.ids.gids.dspam; }); diff --git a/nixos/modules/services/mail/exim.nix b/nixos/modules/services/mail/exim.nix index f9ee3f90966..06c4b2811b3 100644 --- a/nixos/modules/services/mail/exim.nix +++ b/nixos/modules/services/mail/exim.nix @@ -77,14 +77,14 @@ in systemPackages = [ exim ]; }; - users.extraUsers = singleton { + users.users = singleton { name = cfg.user; description = "Exim mail transfer agent user"; uid = config.ids.uids.exim; group = cfg.group; }; - users.extraGroups = singleton { + users.groups = singleton { name = cfg.group; gid = config.ids.gids.exim; }; diff --git a/nixos/modules/services/mail/mailhog.nix b/nixos/modules/services/mail/mailhog.nix index 206fb50d31a..b78f4c8e0e6 100644 --- a/nixos/modules/services/mail/mailhog.nix +++ b/nixos/modules/services/mail/mailhog.nix @@ -24,7 +24,7 @@ in { config = mkIf cfg.enable { - users.extraUsers.mailhog = { + users.users.mailhog = { name = cfg.user; description = "MailHog service user"; }; diff --git a/nixos/modules/services/mail/mlmmj.nix b/nixos/modules/services/mail/mlmmj.nix index b6439b44fb5..11565bc02f8 100644 --- a/nixos/modules/services/mail/mlmmj.nix +++ b/nixos/modules/services/mail/mlmmj.nix @@ -94,7 +94,7 @@ in config = mkIf cfg.enable { - users.extraUsers = singleton { + users.users = singleton { name = cfg.user; description = "mlmmj user"; home = stateDir; @@ -104,7 +104,7 @@ in useDefaultShell = true; }; - users.extraGroups = singleton { + users.groups = singleton { name = cfg.group; gid = config.ids.gids.mlmmj; }; diff --git a/nixos/modules/services/mail/nullmailer.nix b/nixos/modules/services/mail/nullmailer.nix index 59cb512c115..418c02af4b7 100644 --- a/nixos/modules/services/mail/nullmailer.nix +++ b/nixos/modules/services/mail/nullmailer.nix @@ -201,13 +201,13 @@ with lib; }; users = { - extraUsers = singleton { + users = singleton { name = cfg.user; description = "Nullmailer relay-only mta user"; group = cfg.group; }; - extraGroups = singleton { + groups = singleton { name = cfg.group; }; }; diff --git a/nixos/modules/services/mail/opendkim.nix b/nixos/modules/services/mail/opendkim.nix index 59a8373843a..7855efb46c7 100644 --- a/nixos/modules/services/mail/opendkim.nix +++ b/nixos/modules/services/mail/opendkim.nix @@ -88,13 +88,13 @@ in { config = mkIf cfg.enable { - users.extraUsers = optionalAttrs (cfg.user == "opendkim") (singleton + users.users = optionalAttrs (cfg.user == "opendkim") (singleton { name = "opendkim"; group = cfg.group; uid = config.ids.uids.opendkim; }); - users.extraGroups = optionalAttrs (cfg.group == "opendkim") (singleton + users.groups = optionalAttrs (cfg.group == "opendkim") (singleton { name = "opendkim"; gid = config.ids.gids.opendkim; }); diff --git a/nixos/modules/services/mail/opensmtpd.nix b/nixos/modules/services/mail/opensmtpd.nix index f9b890532ce..4276552d4f0 100644 --- a/nixos/modules/services/mail/opensmtpd.nix +++ b/nixos/modules/services/mail/opensmtpd.nix @@ -83,12 +83,12 @@ in { ###### implementation config = mkIf cfg.enable { - users.extraGroups = { + users.groups = { smtpd.gid = config.ids.gids.smtpd; smtpq.gid = config.ids.gids.smtpq; }; - users.extraUsers = { + users.users = { smtpd = { description = "OpenSMTPD process user"; uid = config.ids.uids.smtpd; diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index 5ab331ac067..33249aa3e55 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -616,14 +616,14 @@ in setgid = true; }; - users.extraUsers = optional (user == "postfix") + users.users = optional (user == "postfix") { name = "postfix"; description = "Postfix mail server user"; uid = config.ids.uids.postfix; group = group; }; - users.extraGroups = + users.groups = optional (group == "postfix") { name = group; gid = config.ids.gids.postfix; diff --git a/nixos/modules/services/mail/postgrey.nix b/nixos/modules/services/mail/postgrey.nix index d4ae25c066a..241f75eae27 100644 --- a/nixos/modules/services/mail/postgrey.nix +++ b/nixos/modules/services/mail/postgrey.nix @@ -136,14 +136,14 @@ in { environment.systemPackages = [ pkgs.postgrey ]; users = { - extraUsers = { + users = { postgrey = { description = "Postgrey Daemon"; uid = config.ids.uids.postgrey; group = "postgrey"; }; }; - extraGroups = { + groups = { postgrey = { gid = config.ids.gids.postgrey; }; diff --git a/nixos/modules/services/mail/postsrsd.nix b/nixos/modules/services/mail/postsrsd.nix index a1af16ec9ac..8f12a16906c 100644 --- a/nixos/modules/services/mail/postsrsd.nix +++ b/nixos/modules/services/mail/postsrsd.nix @@ -90,13 +90,13 @@ in { services.postsrsd.domain = mkDefault config.networking.hostName; - users.extraUsers = optionalAttrs (cfg.user == "postsrsd") (singleton + users.users = optionalAttrs (cfg.user == "postsrsd") (singleton { name = "postsrsd"; group = cfg.group; uid = config.ids.uids.postsrsd; }); - users.extraGroups = optionalAttrs (cfg.group == "postsrsd") (singleton + users.groups = optionalAttrs (cfg.group == "postsrsd") (singleton { name = "postsrsd"; gid = config.ids.gids.postsrsd; }); diff --git a/nixos/modules/services/mail/rmilter.nix b/nixos/modules/services/mail/rmilter.nix index e17b7516bff..7f38d757013 100644 --- a/nixos/modules/services/mail/rmilter.nix +++ b/nixos/modules/services/mail/rmilter.nix @@ -194,14 +194,14 @@ in (mkIf cfg.enable { - users.extraUsers = singleton { + users.users = singleton { name = cfg.user; description = "rmilter daemon"; uid = config.ids.uids.rmilter; group = cfg.group; }; - users.extraGroups = singleton { + users.groups = singleton { name = cfg.group; gid = config.ids.gids.rmilter; }; @@ -238,12 +238,12 @@ in }) (mkIf (cfg.enable && cfg.rspamd.enable && rspamdCfg.enable) { - users.extraUsers.${cfg.user}.extraGroups = [ rspamdCfg.group ]; + users.users.${cfg.user}.extraGroups = [ rspamdCfg.group ]; }) (mkIf (cfg.enable && cfg.postfix.enable) { services.postfix.extraConfig = cfg.postfix.configFragment; - users.extraUsers.${postfixCfg.user}.extraGroups = [ cfg.group ]; + users.users.${postfixCfg.user}.extraGroups = [ cfg.group ]; }) ]; } diff --git a/nixos/modules/services/mail/rspamd.nix b/nixos/modules/services/mail/rspamd.nix index 09fb587e74b..b3dae60c2c7 100644 --- a/nixos/modules/services/mail/rspamd.nix +++ b/nixos/modules/services/mail/rspamd.nix @@ -282,14 +282,14 @@ in # Allow users to run 'rspamc' and 'rspamadm'. environment.systemPackages = [ pkgs.rspamd ]; - users.extraUsers = singleton { + users.users = singleton { name = cfg.user; description = "rspamd daemon"; uid = config.ids.uids.rspamd; group = cfg.group; }; - users.extraGroups = singleton { + users.groups = singleton { name = cfg.group; gid = config.ids.gids.rspamd; }; diff --git a/nixos/modules/services/mail/spamassassin.nix b/nixos/modules/services/mail/spamassassin.nix index d483a8c3d67..0c11ea43136 100644 --- a/nixos/modules/services/mail/spamassassin.nix +++ b/nixos/modules/services/mail/spamassassin.nix @@ -128,14 +128,14 @@ in systemPackages = [ pkgs.spamassassin ]; }; - users.extraUsers = singleton { + users.users = singleton { name = "spamd"; description = "Spam Assassin Daemon"; uid = config.ids.uids.spamd; group = "spamd"; }; - users.extraGroups = singleton { + users.groups = singleton { name = "spamd"; gid = config.ids.gids.spamd; }; diff --git a/nixos/modules/services/misc/airsonic.nix b/nixos/modules/services/misc/airsonic.nix index b92104787a5..083587b8ebb 100644 --- a/nixos/modules/services/misc/airsonic.nix +++ b/nixos/modules/services/misc/airsonic.nix @@ -107,7 +107,7 @@ in { }; }; - users.extraUsers.airsonic = { + users.users.airsonic = { description = "Airsonic service user"; name = cfg.user; home = cfg.home; diff --git a/nixos/modules/services/misc/apache-kafka.nix b/nixos/modules/services/misc/apache-kafka.nix index 82fa1cc2e7e..363ac4411e1 100644 --- a/nixos/modules/services/misc/apache-kafka.nix +++ b/nixos/modules/services/misc/apache-kafka.nix @@ -124,7 +124,7 @@ in { environment.systemPackages = [cfg.package]; - users.extraUsers = singleton { + users.users = singleton { name = "apache-kafka"; uid = config.ids.uids.apache-kafka; description = "Apache Kafka daemon user"; diff --git a/nixos/modules/services/misc/bepasty.nix b/nixos/modules/services/misc/bepasty.nix index c499e428af3..62835c194e4 100644 --- a/nixos/modules/services/misc/bepasty.nix +++ b/nixos/modules/services/misc/bepasty.nix @@ -168,14 +168,14 @@ in }) ) cfg.servers; - users.extraUsers = [{ + users.users = [{ uid = config.ids.uids.bepasty; name = user; group = group; home = default_home; }]; - users.extraGroups = [{ + users.groups = [{ name = group; gid = config.ids.gids.bepasty; }]; diff --git a/nixos/modules/services/misc/calibre-server.nix b/nixos/modules/services/misc/calibre-server.nix index 6b19f780ec0..84c04f403d3 100644 --- a/nixos/modules/services/misc/calibre-server.nix +++ b/nixos/modules/services/misc/calibre-server.nix @@ -49,12 +49,12 @@ in environment.systemPackages = [ pkgs.calibre ]; - users.extraUsers.calibre-server = { + users.users.calibre-server = { uid = config.ids.uids.calibre-server; group = "calibre-server"; }; - users.extraGroups.calibre-server = { + users.groups.calibre-server = { gid = config.ids.gids.calibre-server; }; diff --git a/nixos/modules/services/misc/cfdyndns.nix b/nixos/modules/services/misc/cfdyndns.nix index 69a33d0b8c1..dcf41602273 100644 --- a/nixos/modules/services/misc/cfdyndns.nix +++ b/nixos/modules/services/misc/cfdyndns.nix @@ -54,14 +54,14 @@ in }; }; - users.extraUsers = { + users.users = { cfdyndns = { group = "cfdyndns"; uid = config.ids.uids.cfdyndns; }; }; - users.extraGroups = { + users.groups = { cfdyndns = { gid = config.ids.gids.cfdyndns; }; diff --git a/nixos/modules/services/misc/cgminer.nix b/nixos/modules/services/misc/cgminer.nix index d5071d8ff76..b1cf5a7d110 100644 --- a/nixos/modules/services/misc/cgminer.nix +++ b/nixos/modules/services/misc/cgminer.nix @@ -110,7 +110,7 @@ in config = mkIf config.services.cgminer.enable { - users.extraUsers = optionalAttrs (cfg.user == "cgminer") (singleton + users.users = optionalAttrs (cfg.user == "cgminer") (singleton { name = "cgminer"; uid = config.ids.uids.cgminer; description = "Cgminer user"; diff --git a/nixos/modules/services/misc/couchpotato.nix b/nixos/modules/services/misc/couchpotato.nix index 49648762235..70aa895f76d 100644 --- a/nixos/modules/services/misc/couchpotato.nix +++ b/nixos/modules/services/misc/couchpotato.nix @@ -34,7 +34,7 @@ in }; }; - users.extraUsers = singleton + users.users = singleton { name = "couchpotato"; group = "couchpotato"; home = "/var/lib/couchpotato/"; @@ -42,7 +42,7 @@ in uid = config.ids.uids.couchpotato; }; - users.extraGroups = singleton + users.groups = singleton { name = "couchpotato"; gid = config.ids.gids.couchpotato; }; diff --git a/nixos/modules/services/misc/dictd.nix b/nixos/modules/services/misc/dictd.nix index 7e3b6431a13..8d3e294622d 100644 --- a/nixos/modules/services/misc/dictd.nix +++ b/nixos/modules/services/misc/dictd.nix @@ -45,7 +45,7 @@ in # get the command line client on system path to make some use of the service environment.systemPackages = [ pkgs.dict ]; - users.extraUsers = singleton + users.users = singleton { name = "dictd"; group = "dictd"; description = "DICT.org dictd server"; @@ -53,7 +53,7 @@ in uid = config.ids.uids.dictd; }; - users.extraGroups = singleton + users.groups = singleton { name = "dictd"; gid = config.ids.gids.dictd; }; diff --git a/nixos/modules/services/misc/disnix.nix b/nixos/modules/services/misc/disnix.nix index e4517c636e8..b28995a0911 100644 --- a/nixos/modules/services/misc/disnix.nix +++ b/nixos/modules/services/misc/disnix.nix @@ -71,7 +71,7 @@ in ++ optional cfg.useWebServiceInterface "${pkgs.dbus_java}/share/java/dbus.jar"; services.tomcat.webapps = optional cfg.useWebServiceInterface pkgs.DisnixWebService; - users.extraGroups = singleton + users.groups = singleton { name = "disnix"; gid = config.ids.gids.disnix; }; diff --git a/nixos/modules/services/misc/docker-registry.nix b/nixos/modules/services/misc/docker-registry.nix index f628da4ac4c..9a3966ab30a 100644 --- a/nixos/modules/services/misc/docker-registry.nix +++ b/nixos/modules/services/misc/docker-registry.nix @@ -140,7 +140,7 @@ in { startAt = optional cfg.enableGarbageCollect cfg.garbageCollectDates; }; - users.extraUsers.docker-registry = { + users.users.docker-registry = { createHome = true; home = cfg.storagePath; }; diff --git a/nixos/modules/services/misc/emby.nix b/nixos/modules/services/misc/emby.nix index e295f0f930e..b1968784af0 100644 --- a/nixos/modules/services/misc/emby.nix +++ b/nixos/modules/services/misc/emby.nix @@ -54,14 +54,14 @@ in }; }; - users.extraUsers = mkIf (cfg.user == "emby") { + users.users = mkIf (cfg.user == "emby") { emby = { group = cfg.group; uid = config.ids.uids.emby; }; }; - users.extraGroups = mkIf (cfg.group == "emby") { + users.groups = mkIf (cfg.group == "emby") { emby = { gid = config.ids.gids.emby; }; diff --git a/nixos/modules/services/misc/errbot.nix b/nixos/modules/services/misc/errbot.nix index cb2fa677624..ac6ba2181de 100644 --- a/nixos/modules/services/misc/errbot.nix +++ b/nixos/modules/services/misc/errbot.nix @@ -76,8 +76,8 @@ in { }; config = mkIf (cfg.instances != {}) { - users.extraUsers.errbot.group = "errbot"; - users.extraGroups.errbot = {}; + users.users.errbot.group = "errbot"; + users.groups.errbot = {}; systemd.services = mapAttrs' (name: instanceCfg: nameValuePair "errbot-${name}" ( let diff --git a/nixos/modules/services/misc/etcd.nix b/nixos/modules/services/misc/etcd.nix index 7c91462883f..2d1893dae64 100644 --- a/nixos/modules/services/misc/etcd.nix +++ b/nixos/modules/services/misc/etcd.nix @@ -188,7 +188,7 @@ in { environment.systemPackages = [ pkgs.etcdctl ]; - users.extraUsers = singleton { + users.users = singleton { name = "etcd"; uid = config.ids.uids.etcd; description = "Etcd daemon user"; diff --git a/nixos/modules/services/misc/exhibitor.nix b/nixos/modules/services/misc/exhibitor.nix index 600bd780e7b..685e652c0ba 100644 --- a/nixos/modules/services/misc/exhibitor.nix +++ b/nixos/modules/services/misc/exhibitor.nix @@ -408,7 +408,7 @@ in chmod -R u+w ${cfg.baseDir}/zookeeper/conf ''; }; - users.extraUsers = singleton { + users.users = singleton { name = "zookeeper"; uid = config.ids.uids.zookeeper; description = "Zookeeper daemon user"; diff --git a/nixos/modules/services/misc/felix.nix b/nixos/modules/services/misc/felix.nix index d6ad9dcaebc..1c5ece86825 100644 --- a/nixos/modules/services/misc/felix.nix +++ b/nixos/modules/services/misc/felix.nix @@ -47,12 +47,12 @@ in ###### implementation config = mkIf cfg.enable { - users.extraGroups = singleton + users.groups = singleton { name = "osgi"; gid = config.ids.gids.osgi; }; - users.extraUsers = singleton + users.users = singleton { name = "osgi"; uid = config.ids.uids.osgi; description = "OSGi user"; diff --git a/nixos/modules/services/misc/folding-at-home.nix b/nixos/modules/services/misc/folding-at-home.nix index 164221cbab7..122c89ce068 100644 --- a/nixos/modules/services/misc/folding-at-home.nix +++ b/nixos/modules/services/misc/folding-at-home.nix @@ -42,7 +42,7 @@ in { config = mkIf cfg.enable { - users.extraUsers = singleton + users.users = singleton { name = fahUser; uid = config.ids.uids.foldingathome; description = "Folding@Home user"; diff --git a/nixos/modules/services/misc/gammu-smsd.nix b/nixos/modules/services/misc/gammu-smsd.nix index 2d406b63443..3057d7fd1a0 100644 --- a/nixos/modules/services/misc/gammu-smsd.nix +++ b/nixos/modules/services/misc/gammu-smsd.nix @@ -200,7 +200,7 @@ in { }; config = mkIf cfg.enable { - users.extraUsers.${cfg.user} = { + users.users.${cfg.user} = { description = "gammu-smsd user"; uid = config.ids.uids.gammu-smsd; extraGroups = [ "${cfg.device.group}" ]; diff --git a/nixos/modules/services/misc/geoip-updater.nix b/nixos/modules/services/misc/geoip-updater.nix index e0b9df96f8e..baf0a8d73d1 100644 --- a/nixos/modules/services/misc/geoip-updater.nix +++ b/nixos/modules/services/misc/geoip-updater.nix @@ -251,7 +251,7 @@ in } ]; - users.extraUsers.geoip = { + users.users.geoip = { group = "root"; description = "GeoIP database updater"; uid = config.ids.uids.geoip; diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix index 46efc1df12e..5d664728e0b 100644 --- a/nixos/modules/services/misc/gitea.nix +++ b/nixos/modules/services/misc/gitea.nix @@ -337,7 +337,7 @@ in }; users = mkIf (cfg.user == "gitea") { - extraUsers.gitea = { + users.gitea = { description = "Gitea Service"; home = cfg.stateDir; createHome = true; diff --git a/nixos/modules/services/misc/gitit.nix b/nixos/modules/services/misc/gitit.nix index 94a98e0335d..0025d96bd37 100644 --- a/nixos/modules/services/misc/gitit.nix +++ b/nixos/modules/services/misc/gitit.nix @@ -645,15 +645,15 @@ in config = mkIf cfg.enable { - users.extraUsers.gitit = { - group = config.users.extraGroups.gitit.name; + users.users.gitit = { + group = config.users.groups.gitit.name; description = "Gitit user"; home = homeDir; createHome = true; uid = config.ids.uids.gitit; }; - users.extraGroups.gitit.gid = config.ids.gids.gitit; + users.groups.gitit.gid = config.ids.gids.gitit; systemd.services.gitit = let uid = toString config.ids.uids.gitit; @@ -715,8 +715,8 @@ NAMED ''; serviceConfig = { - User = config.users.extraUsers.gitit.name; - Group = config.users.extraGroups.gitit.name; + User = config.users.users.gitit.name; + Group = config.users.groups.gitit.name; ExecStart = with cfg; gititSh haskellPackages extraPackages; }; }; diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index e80abf96da4..b09f0408e10 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -444,7 +444,7 @@ in { # Use postfix to send out mails. services.postfix.enable = mkDefault true; - users.extraUsers = [ + users.users = [ { name = cfg.user; group = cfg.group; home = "${cfg.statePath}/home"; @@ -453,7 +453,7 @@ in { } ]; - users.extraGroups = [ + users.groups = [ { name = cfg.group; gid = config.ids.gids.gitlab; } diff --git a/nixos/modules/services/misc/gitolite.nix b/nixos/modules/services/misc/gitolite.nix index 6e60316d000..b9c2a966e6f 100644 --- a/nixos/modules/services/misc/gitolite.nix +++ b/nixos/modules/services/misc/gitolite.nix @@ -140,7 +140,7 @@ in push( @{$RC{ENABLE}}, 'git-annex-shell ua'); ''; - users.extraUsers.${cfg.user} = { + users.users.${cfg.user} = { description = "Gitolite user"; home = cfg.dataDir; createHome = true; @@ -148,7 +148,7 @@ in group = cfg.group; useDefaultShell = true; }; - users.extraGroups."${cfg.group}".gid = config.ids.gids.gitolite; + users.groups."${cfg.group}".gid = config.ids.gids.gitolite; systemd.services."gitolite-init" = { description = "Gitolite initialization"; diff --git a/nixos/modules/services/misc/gogs.nix b/nixos/modules/services/misc/gogs.nix index ba744d37e71..ee99967c261 100644 --- a/nixos/modules/services/misc/gogs.nix +++ b/nixos/modules/services/misc/gogs.nix @@ -254,7 +254,7 @@ in }; users = mkIf (cfg.user == "gogs") { - extraUsers.gogs = { + users.gogs = { description = "Go Git Service"; uid = config.ids.uids.gogs; group = "gogs"; @@ -262,7 +262,7 @@ in createHome = true; shell = pkgs.bash; }; - extraGroups.gogs.gid = config.ids.gids.gogs; + groups.gogs.gid = config.ids.gids.gogs; }; warnings = optional (cfg.database.password != "") diff --git a/nixos/modules/services/misc/gollum.nix b/nixos/modules/services/misc/gollum.nix index 0888221ab62..d1823bc6d4d 100644 --- a/nixos/modules/services/misc/gollum.nix +++ b/nixos/modules/services/misc/gollum.nix @@ -93,8 +93,8 @@ in ''; serviceConfig = { - User = config.users.extraUsers.gollum.name; - Group = config.users.extraGroups.gollum.name; + User = config.users.users.gollum.name; + Group = config.users.groups.gollum.name; PermissionsStartOnly = true; ExecStart = '' ${pkgs.gollum}/bin/gollum \ diff --git a/nixos/modules/services/misc/gpsd.nix b/nixos/modules/services/misc/gpsd.nix index a4a4c7b5d93..71de0860907 100644 --- a/nixos/modules/services/misc/gpsd.nix +++ b/nixos/modules/services/misc/gpsd.nix @@ -78,14 +78,14 @@ in config = mkIf cfg.enable { - users.extraUsers = singleton + users.users = singleton { name = "gpsd"; inherit uid; description = "gpsd daemon user"; home = "/var/empty"; }; - users.extraGroups = singleton + users.groups = singleton { name = "gpsd"; inherit gid; }; diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix index 05555353f20..fdcfe6bc2b8 100644 --- a/nixos/modules/services/misc/home-assistant.nix +++ b/nixos/modules/services/misc/home-assistant.nix @@ -170,13 +170,13 @@ in { after = wants; }; - users.extraUsers.hass = { + users.users.hass = { home = cfg.configDir; createHome = true; group = "hass"; uid = config.ids.uids.hass; }; - users.extraGroups.hass.gid = config.ids.gids.hass; + users.groups.hass.gid = config.ids.gids.hass; }; } diff --git a/nixos/modules/services/misc/ihaskell.nix b/nixos/modules/services/misc/ihaskell.nix index 6da9cc8c47e..11597706d0d 100644 --- a/nixos/modules/services/misc/ihaskell.nix +++ b/nixos/modules/services/misc/ihaskell.nix @@ -38,23 +38,23 @@ in config = mkIf cfg.enable { - users.extraUsers.ihaskell = { - group = config.users.extraGroups.ihaskell.name; + users.users.ihaskell = { + group = config.users.groups.ihaskell.name; description = "IHaskell user"; home = "/var/lib/ihaskell"; createHome = true; uid = config.ids.uids.ihaskell; }; - users.extraGroups.ihaskell.gid = config.ids.gids.ihaskell; + users.groups.ihaskell.gid = config.ids.gids.ihaskell; systemd.services.ihaskell = { description = "IHaskell notebook instance"; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; serviceConfig = { - User = config.users.extraUsers.ihaskell.name; - Group = config.users.extraGroups.ihaskell.name; + User = config.users.users.ihaskell.name; + Group = config.users.groups.ihaskell.name; ExecStart = "${pkgs.runtimeShell} -c \"cd $HOME;${ihaskell}/bin/ihaskell-notebook\""; }; }; diff --git a/nixos/modules/services/misc/jackett.nix b/nixos/modules/services/misc/jackett.nix index 87a41ee70b5..db72d36f2ac 100644 --- a/nixos/modules/services/misc/jackett.nix +++ b/nixos/modules/services/misc/jackett.nix @@ -36,12 +36,12 @@ in }; }; - users.extraUsers.jackett = { + users.users.jackett = { uid = config.ids.uids.jackett; home = "/var/lib/jackett"; group = "jackett"; }; - users.extraGroups.jackett.gid = config.ids.gids.jackett; + users.groups.jackett.gid = config.ids.gids.jackett; }; } diff --git a/nixos/modules/services/misc/mathics.nix b/nixos/modules/services/misc/mathics.nix index 50715858881..c588a30d76c 100644 --- a/nixos/modules/services/misc/mathics.nix +++ b/nixos/modules/services/misc/mathics.nix @@ -26,23 +26,23 @@ in { config = mkIf cfg.enable { - users.extraUsers.mathics = { - group = config.users.extraGroups.mathics.name; + users.users.mathics = { + group = config.users.groups.mathics.name; description = "Mathics user"; home = "/var/lib/mathics"; createHome = true; uid = config.ids.uids.mathics; }; - users.extraGroups.mathics.gid = config.ids.gids.mathics; + users.groups.mathics.gid = config.ids.gids.mathics; systemd.services.mathics = { description = "Mathics notebook server"; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; serviceConfig = { - User = config.users.extraUsers.mathics.name; - Group = config.users.extraGroups.mathics.name; + User = config.users.users.mathics.name; + Group = config.users.groups.mathics.name; ExecStart = concatStringsSep " " [ "${pkgs.mathics}/bin/mathicsserver" "--port" (toString cfg.port) diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix index f7441988b27..3e3de911470 100644 --- a/nixos/modules/services/misc/matrix-synapse.nix +++ b/nixos/modules/services/misc/matrix-synapse.nix @@ -635,7 +635,7 @@ in { }; config = mkIf cfg.enable { - users.extraUsers = [ + users.users = [ { name = "matrix-synapse"; group = "matrix-synapse"; home = cfg.dataDir; @@ -644,7 +644,7 @@ in { uid = config.ids.uids.matrix-synapse; } ]; - users.extraGroups = [ + users.groups = [ { name = "matrix-synapse"; gid = config.ids.gids.matrix-synapse; } ]; diff --git a/nixos/modules/services/misc/mediatomb.nix b/nixos/modules/services/misc/mediatomb.nix index 40ec2831ff0..5c1977d28de 100644 --- a/nixos/modules/services/misc/mediatomb.nix +++ b/nixos/modules/services/misc/mediatomb.nix @@ -267,12 +267,12 @@ in { serviceConfig.User = "${cfg.user}"; }; - users.extraGroups = optionalAttrs (cfg.group == "mediatomb") (singleton { + users.groups = optionalAttrs (cfg.group == "mediatomb") (singleton { name = "mediatomb"; gid = gid; }); - users.extraUsers = optionalAttrs (cfg.user == "mediatomb") (singleton { + users.users = optionalAttrs (cfg.user == "mediatomb") (singleton { name = "mediatomb"; isSystemUser = true; group = cfg.group; diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 0ee105e4c6f..e64df8dc7d2 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -131,10 +131,10 @@ in description = " If set, Nix will perform builds in a sandboxed environment that it will set up automatically for each build. This prevents impurities - in builds by disallowing access to dependencies outside of the Nix - store by using network and mount namespaces in a chroot environment. - This isn't enabled by default for possible performance impacts due to - the initial setup time of a sandbox for each build. It doesn't affect + in builds by disallowing access to dependencies outside of the Nix + store by using network and mount namespaces in a chroot environment. + This isn't enabled by default for possible performance impacts due to + the initial setup time of a sandbox for each build. It doesn't affect derivation hashes, so changing this option will not trigger a rebuild of packages. "; @@ -450,7 +450,7 @@ in nix.nrBuildUsers = mkDefault (lib.max 32 cfg.maxJobs); - users.extraUsers = nixbldUsers; + users.users = nixbldUsers; services.xserver.displayManager.hiddenUsers = map ({ name, ... }: name) nixbldUsers; diff --git a/nixos/modules/services/misc/nix-ssh-serve.nix b/nixos/modules/services/misc/nix-ssh-serve.nix index 5bd9cf9086f..87ed7f0a61b 100644 --- a/nixos/modules/services/misc/nix-ssh-serve.nix +++ b/nixos/modules/services/misc/nix-ssh-serve.nix @@ -36,7 +36,7 @@ in { config = mkIf cfg.enable { - users.extraUsers.nix-ssh = { + users.users.nix-ssh = { description = "Nix SSH store user"; uid = config.ids.uids.nix-ssh; useDefaultShell = true; @@ -55,7 +55,7 @@ in { Match All ''; - users.extraUsers.nix-ssh.openssh.authorizedKeys.keys = cfg.keys; + users.users.nix-ssh.openssh.authorizedKeys.keys = cfg.keys; }; } diff --git a/nixos/modules/services/misc/nzbget.nix b/nixos/modules/services/misc/nzbget.nix index a186d57ceba..f79a04a1d74 100644 --- a/nixos/modules/services/misc/nzbget.nix +++ b/nixos/modules/services/misc/nzbget.nix @@ -86,14 +86,14 @@ let }; }; - users.extraUsers = mkIf (cfg.user == "nzbget") { + users.users = mkIf (cfg.user == "nzbget") { nzbget = { group = cfg.group; uid = config.ids.uids.nzbget; }; }; - users.extraGroups = mkIf (cfg.group == "nzbget") { + users.groups = mkIf (cfg.group == "nzbget") { nzbget = { gid = config.ids.gids.nzbget; }; diff --git a/nixos/modules/services/misc/octoprint.nix b/nixos/modules/services/misc/octoprint.nix index 6883993a893..baa7c3ade52 100644 --- a/nixos/modules/services/misc/octoprint.nix +++ b/nixos/modules/services/misc/octoprint.nix @@ -86,13 +86,13 @@ in config = mkIf cfg.enable { - users.extraUsers = optionalAttrs (cfg.user == "octoprint") (singleton + users.users = optionalAttrs (cfg.user == "octoprint") (singleton { name = "octoprint"; group = cfg.group; uid = config.ids.uids.octoprint; }); - users.extraGroups = optionalAttrs (cfg.group == "octoprint") (singleton + users.groups = optionalAttrs (cfg.group == "octoprint") (singleton { name = "octoprint"; gid = config.ids.gids.octoprint; }); diff --git a/nixos/modules/services/misc/osrm.nix b/nixos/modules/services/misc/osrm.nix index 7ec8b15906f..f89f37ccd9d 100644 --- a/nixos/modules/services/misc/osrm.nix +++ b/nixos/modules/services/misc/osrm.nix @@ -69,7 +69,7 @@ in wantedBy = [ "multi-user.target" ]; serviceConfig = { - User = config.users.extraUsers.osrm.name; + User = config.users.users.osrm.name; ExecStart = '' ${pkgs.osrm-backend}/bin/osrm-routed \ --ip ${cfg.address} \ diff --git a/nixos/modules/services/misc/plex.nix b/nixos/modules/services/misc/plex.nix index 46221ace308..85f1d4a8556 100644 --- a/nixos/modules/services/misc/plex.nix +++ b/nixos/modules/services/misc/plex.nix @@ -157,14 +157,14 @@ in allowedUDPPorts = [ 1900 5353 32410 32412 32413 32414 ]; }; - users.extraUsers = mkIf (cfg.user == "plex") { + users.users = mkIf (cfg.user == "plex") { plex = { group = cfg.group; uid = config.ids.uids.plex; }; }; - users.extraGroups = mkIf (cfg.group == "plex") { + users.groups = mkIf (cfg.group == "plex") { plex = { gid = config.ids.gids.plex; }; diff --git a/nixos/modules/services/misc/plexpy.nix b/nixos/modules/services/misc/plexpy.nix index df9f1258124..2a589fdfb27 100644 --- a/nixos/modules/services/misc/plexpy.nix +++ b/nixos/modules/services/misc/plexpy.nix @@ -74,7 +74,7 @@ in }; }; - users.extraUsers = mkIf (cfg.user == "plexpy") { + users.users = mkIf (cfg.user == "plexpy") { plexpy = { group = cfg.group; uid = config.ids.uids.plexpy; }; }; }; diff --git a/nixos/modules/services/misc/pykms.nix b/nixos/modules/services/misc/pykms.nix index 897e856e2a2..a11296e1bd0 100644 --- a/nixos/modules/services/misc/pykms.nix +++ b/nixos/modules/services/misc/pykms.nix @@ -73,7 +73,7 @@ in { }; users = { - extraUsers.pykms = { + users.pykms = { name = "pykms"; group = "pykms"; home = home; @@ -82,7 +82,7 @@ in { description = "PyKMS daemon user"; }; - extraGroups.pykms = { + groups.pykms = { gid = config.ids.gids.pykms; }; }; diff --git a/nixos/modules/services/misc/radarr.nix b/nixos/modules/services/misc/radarr.nix index 245ad9f9a6d..7738eacc6ae 100644 --- a/nixos/modules/services/misc/radarr.nix +++ b/nixos/modules/services/misc/radarr.nix @@ -36,12 +36,12 @@ in }; }; - users.extraUsers.radarr = { + users.users.radarr = { uid = config.ids.uids.radarr; home = "/var/lib/radarr"; group = "radarr"; }; - users.extraGroups.radarr.gid = config.ids.gids.radarr; + users.groups.radarr.gid = config.ids.gids.radarr; }; } diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix index 3997b3f0dca..9a9424449f8 100644 --- a/nixos/modules/services/misc/redmine.nix +++ b/nixos/modules/services/misc/redmine.nix @@ -128,13 +128,13 @@ in { } ]; - users.extraUsers = [ + users.users = [ { name = "redmine"; group = "redmine"; uid = config.ids.uids.redmine; } ]; - users.extraGroups = [ + users.groups = [ { name = "redmine"; gid = config.ids.gids.redmine; } ]; diff --git a/nixos/modules/services/misc/ripple-data-api.nix b/nixos/modules/services/misc/ripple-data-api.nix index dbca56b1333..042b496d35e 100644 --- a/nixos/modules/services/misc/ripple-data-api.nix +++ b/nixos/modules/services/misc/ripple-data-api.nix @@ -185,7 +185,7 @@ in { ]; }; - users.extraUsers = singleton + users.users = singleton { name = "ripple-data-api"; description = "Ripple data api user"; uid = config.ids.uids.ripple-data-api; diff --git a/nixos/modules/services/misc/rippled.nix b/nixos/modules/services/misc/rippled.nix index 8bcf35a8ad3..9d9a0ba44da 100644 --- a/nixos/modules/services/misc/rippled.nix +++ b/nixos/modules/services/misc/rippled.nix @@ -406,7 +406,7 @@ in config = mkIf cfg.enable { - users.extraUsers = singleton + users.users = singleton { name = "rippled"; description = "Ripple server user"; uid = config.ids.uids.rippled; diff --git a/nixos/modules/services/misc/serviio.nix b/nixos/modules/services/misc/serviio.nix index a6612e9c6ad..8808f2d2193 100644 --- a/nixos/modules/services/misc/serviio.nix +++ b/nixos/modules/services/misc/serviio.nix @@ -63,7 +63,7 @@ in { }; }; - users.extraUsers = [ + users.users = [ { name = "serviio"; group = "serviio"; @@ -74,7 +74,7 @@ in { } ]; - users.extraGroups = [ + users.groups = [ { name = "serviio";} ]; diff --git a/nixos/modules/services/misc/siproxd.nix b/nixos/modules/services/misc/siproxd.nix index 9e8fb6c228f..dcaf73aca44 100644 --- a/nixos/modules/services/misc/siproxd.nix +++ b/nixos/modules/services/misc/siproxd.nix @@ -161,7 +161,7 @@ in config = mkIf cfg.enable { - users.extraUsers = singleton { + users.users = singleton { name = "siproxyd"; uid = config.ids.uids.siproxd; }; diff --git a/nixos/modules/services/misc/sonarr.nix b/nixos/modules/services/misc/sonarr.nix index ecde2c33bfa..edba4e6c23e 100644 --- a/nixos/modules/services/misc/sonarr.nix +++ b/nixos/modules/services/misc/sonarr.nix @@ -36,12 +36,12 @@ in }; }; - users.extraUsers.sonarr = { + users.users.sonarr = { uid = config.ids.uids.sonarr; home = "/var/lib/sonarr"; group = "sonarr"; }; - users.extraGroups.sonarr.gid = config.ids.gids.sonarr; + users.groups.sonarr.gid = config.ids.gids.sonarr; }; } diff --git a/nixos/modules/services/misc/subsonic.nix b/nixos/modules/services/misc/subsonic.nix index c2efd53d413..1612b197f35 100644 --- a/nixos/modules/services/misc/subsonic.nix +++ b/nixos/modules/services/misc/subsonic.nix @@ -130,7 +130,7 @@ let cfg = config.services.subsonic; in { ! [ -e "${cfg.home}" ] && [ -d "$oldHome" ] && [ $(${pkgs.coreutils}/bin/stat -c %u "$oldHome") -eq \ - ${toString config.users.extraUsers.subsonic.uid} ]; then + ${toString config.users.users.subsonic.uid} ]; then logger Moving "$oldHome" to "${cfg.home}" ${pkgs.coreutils}/bin/mv -T "$oldHome" "${cfg.home}" fi @@ -152,7 +152,7 @@ let cfg = config.services.subsonic; in { }; }; - users.extraUsers.subsonic = { + users.users.subsonic = { description = "Subsonic daemon user"; home = cfg.home; createHome = true; @@ -160,6 +160,6 @@ let cfg = config.services.subsonic; in { uid = config.ids.uids.subsonic; }; - users.extraGroups.subsonic.gid = config.ids.gids.subsonic; + users.groups.subsonic.gid = config.ids.gids.subsonic; }; } diff --git a/nixos/modules/services/misc/uhub.nix b/nixos/modules/services/misc/uhub.nix index 15071202b9c..005951b9231 100644 --- a/nixos/modules/services/misc/uhub.nix +++ b/nixos/modules/services/misc/uhub.nix @@ -161,11 +161,11 @@ in config = mkIf cfg.enable { users = { - extraUsers = singleton { + users = singleton { name = "uhub"; uid = config.ids.uids.uhub; }; - extraGroups = singleton { + groups = singleton { name = "uhub"; gid = config.ids.gids.uhub; }; diff --git a/nixos/modules/services/misc/zookeeper.nix b/nixos/modules/services/misc/zookeeper.nix index 91539592511..cb7cc97d5a5 100644 --- a/nixos/modules/services/misc/zookeeper.nix +++ b/nixos/modules/services/misc/zookeeper.nix @@ -144,7 +144,7 @@ in { ''; }; - users.extraUsers = singleton { + users.users = singleton { name = "zookeeper"; uid = config.ids.uids.zookeeper; description = "Zookeeper daemon user"; diff --git a/nixos/modules/services/monitoring/bosun.nix b/nixos/modules/services/monitoring/bosun.nix index 496838a131b..8bf741adb6e 100644 --- a/nixos/modules/services/monitoring/bosun.nix +++ b/nixos/modules/services/monitoring/bosun.nix @@ -153,13 +153,13 @@ in { }; }; - users.extraUsers.bosun = { + users.users.bosun = { description = "bosun user"; group = "bosun"; uid = config.ids.uids.bosun; }; - users.extraGroups.bosun.gid = config.ids.gids.bosun; + users.groups.bosun.gid = config.ids.gids.bosun; }; diff --git a/nixos/modules/services/monitoring/collectd.nix b/nixos/modules/services/monitoring/collectd.nix index dfbac3446e0..6606980cdad 100644 --- a/nixos/modules/services/monitoring/collectd.nix +++ b/nixos/modules/services/monitoring/collectd.nix @@ -97,7 +97,7 @@ in { ''; }; - users.extraUsers = optional (cfg.user == "collectd") { + users.users = optional (cfg.user == "collectd") { name = "collectd"; }; }; diff --git a/nixos/modules/services/monitoring/dd-agent/dd-agent.nix b/nixos/modules/services/monitoring/dd-agent/dd-agent.nix index 6367c8245f7..cf65b6c28cf 100644 --- a/nixos/modules/services/monitoring/dd-agent/dd-agent.nix +++ b/nixos/modules/services/monitoring/dd-agent/dd-agent.nix @@ -178,7 +178,7 @@ in { config = mkIf cfg.enable { environment.systemPackages = [ pkgs."dd-agent" pkgs.sysstat pkgs.procps ]; - users.extraUsers.datadog = { + users.users.datadog = { description = "Datadog Agent User"; uid = config.ids.uids.datadog; group = "datadog"; @@ -186,7 +186,7 @@ in { createHome = true; }; - users.extraGroups.datadog.gid = config.ids.gids.datadog; + users.groups.datadog.gid = config.ids.gids.datadog; systemd.services.dd-agent = { description = "Datadog agent monitor"; diff --git a/nixos/modules/services/monitoring/fusion-inventory.nix b/nixos/modules/services/monitoring/fusion-inventory.nix index c3b869e0088..9c976c65ea4 100644 --- a/nixos/modules/services/monitoring/fusion-inventory.nix +++ b/nixos/modules/services/monitoring/fusion-inventory.nix @@ -46,7 +46,7 @@ in { config = mkIf cfg.enable { - users.extraUsers = singleton { + users.users = singleton { name = "fusion-inventory"; description = "FusionInventory user"; }; diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index eceb91525db..3e801f9b838 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -265,7 +265,7 @@ in { ''; }; - users.extraUsers.grafana = { + users.users.grafana = { uid = config.ids.uids.grafana; description = "Grafana user"; home = cfg.dataDir; diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index 4b1ad34b3a4..7ad26c137e5 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -638,13 +638,13 @@ in { cfg.web.enable || cfg.api.enable || cfg.seyren.enable || cfg.pager.enable || cfg.beacon.enable ) { - users.extraUsers = singleton { + users.users = singleton { name = "graphite"; uid = config.ids.uids.graphite; description = "Graphite daemon user"; home = dataDir; }; - users.extraGroups.graphite.gid = config.ids.gids.graphite; + users.groups.graphite.gid = config.ids.gids.graphite; }) ]; } diff --git a/nixos/modules/services/monitoring/heapster.nix b/nixos/modules/services/monitoring/heapster.nix index deee64aa41e..fbdff2eb5db 100644 --- a/nixos/modules/services/monitoring/heapster.nix +++ b/nixos/modules/services/monitoring/heapster.nix @@ -49,7 +49,7 @@ in { }; }; - users.extraUsers = singleton { + users.users = singleton { name = "heapster"; uid = config.ids.uids.heapster; description = "Heapster user"; diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix index 358ffd431dd..ff9604c7dbc 100644 --- a/nixos/modules/services/monitoring/munin.nix +++ b/nixos/modules/services/monitoring/munin.nix @@ -150,14 +150,14 @@ in environment.systemPackages = [ pkgs.munin ]; - users.extraUsers = [{ + users.users = [{ name = "munin"; description = "Munin monitoring user"; group = "munin"; uid = config.ids.uids.munin; }]; - users.extraGroups = [{ + users.groups = [{ name = "munin"; gid = config.ids.gids.munin; }]; diff --git a/nixos/modules/services/monitoring/nagios.nix b/nixos/modules/services/monitoring/nagios.nix index 4914c5db97d..3e1d727b416 100644 --- a/nixos/modules/services/monitoring/nagios.nix +++ b/nixos/modules/services/monitoring/nagios.nix @@ -143,7 +143,7 @@ in config = mkIf cfg.enable { - users.extraUsers.nagios = { + users.users.nagios = { description = "Nagios user "; uid = config.ids.uids.nagios; home = nagiosState; diff --git a/nixos/modules/services/monitoring/netdata.nix b/nixos/modules/services/monitoring/netdata.nix index d23b329eeb2..eefddf5a206 100644 --- a/nixos/modules/services/monitoring/netdata.nix +++ b/nixos/modules/services/monitoring/netdata.nix @@ -100,11 +100,11 @@ in { }; - users.extraUsers = optional (cfg.user == defaultUser) { + users.users = optional (cfg.user == defaultUser) { name = defaultUser; }; - users.extraGroups = optional (cfg.group == defaultUser) { + users.groups = optional (cfg.group == defaultUser) { name = defaultUser; }; diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix index 80122e69d16..5dda763bd56 100644 --- a/nixos/modules/services/monitoring/prometheus/default.nix +++ b/nixos/modules/services/monitoring/prometheus/default.nix @@ -471,8 +471,8 @@ in { }; config = mkIf cfg.enable { - users.extraGroups.${promGroup}.gid = config.ids.gids.prometheus; - users.extraUsers.${promUser} = { + users.groups.${promGroup}.gid = config.ids.gids.prometheus; + users.users.${promUser} = { description = "Prometheus daemon user"; uid = config.ids.uids.prometheus; group = promGroup; diff --git a/nixos/modules/services/monitoring/riemann-dash.nix b/nixos/modules/services/monitoring/riemann-dash.nix index 523f74cb72b..7eb4d888b0c 100644 --- a/nixos/modules/services/monitoring/riemann-dash.nix +++ b/nixos/modules/services/monitoring/riemann-dash.nix @@ -51,9 +51,9 @@ in { config = mkIf cfg.enable { - users.extraGroups.riemanndash.gid = config.ids.gids.riemanndash; + users.groups.riemanndash.gid = config.ids.gids.riemanndash; - users.extraUsers.riemanndash = { + users.users.riemanndash = { description = "riemann-dash daemon user"; uid = config.ids.uids.riemanndash; group = "riemanndash"; diff --git a/nixos/modules/services/monitoring/riemann-tools.nix b/nixos/modules/services/monitoring/riemann-tools.nix index de858813a76..4e8832dadc5 100644 --- a/nixos/modules/services/monitoring/riemann-tools.nix +++ b/nixos/modules/services/monitoring/riemann-tools.nix @@ -40,9 +40,9 @@ in { config = mkIf cfg.enableHealth { - users.extraGroups.riemanntools.gid = config.ids.gids.riemanntools; + users.groups.riemanntools.gid = config.ids.gids.riemanntools; - users.extraUsers.riemanntools = { + users.users.riemanntools = { description = "riemann-tools daemon user"; uid = config.ids.uids.riemanntools; group = "riemanntools"; diff --git a/nixos/modules/services/monitoring/riemann.nix b/nixos/modules/services/monitoring/riemann.nix index ac5d0134a80..237de53456f 100644 --- a/nixos/modules/services/monitoring/riemann.nix +++ b/nixos/modules/services/monitoring/riemann.nix @@ -69,9 +69,9 @@ in { config = mkIf cfg.enable { - users.extraGroups.riemann.gid = config.ids.gids.riemann; + users.groups.riemann.gid = config.ids.gids.riemann; - users.extraUsers.riemann = { + users.users.riemann = { description = "riemann daemon user"; uid = config.ids.uids.riemann; group = "riemann"; diff --git a/nixos/modules/services/monitoring/scollector.nix b/nixos/modules/services/monitoring/scollector.nix index 2684482c618..6ecb21d628d 100644 --- a/nixos/modules/services/monitoring/scollector.nix +++ b/nixos/modules/services/monitoring/scollector.nix @@ -123,13 +123,13 @@ in { }; }; - users.extraUsers.scollector = { + users.users.scollector = { description = "scollector user"; group = "scollector"; uid = config.ids.uids.scollector; }; - users.extraGroups.scollector.gid = config.ids.gids.scollector; + users.groups.scollector.gid = config.ids.gids.scollector; }; diff --git a/nixos/modules/services/monitoring/statsd.nix b/nixos/modules/services/monitoring/statsd.nix index 7b0e9981cbb..ea155821ecc 100644 --- a/nixos/modules/services/monitoring/statsd.nix +++ b/nixos/modules/services/monitoring/statsd.nix @@ -125,7 +125,7 @@ in message = "Only builtin backends (graphite, console, repeater) or backends enumerated in `pkgs.nodePackages` are allowed!"; }) cfg.backends; - users.extraUsers = singleton { + users.users = singleton { name = "statsd"; uid = config.ids.uids.statsd; description = "Statsd daemon user"; diff --git a/nixos/modules/services/monitoring/telegraf.nix b/nixos/modules/services/monitoring/telegraf.nix index 49dc9d8143e..6bfcd7143e1 100644 --- a/nixos/modules/services/monitoring/telegraf.nix +++ b/nixos/modules/services/monitoring/telegraf.nix @@ -62,7 +62,7 @@ in { }; }; - users.extraUsers = [{ + users.users = [{ name = "telegraf"; uid = config.ids.uids.telegraf; description = "telegraf daemon user"; diff --git a/nixos/modules/services/monitoring/ups.nix b/nixos/modules/services/monitoring/ups.nix index 29dc68f90cc..bc755612fd9 100644 --- a/nixos/modules/services/monitoring/ups.nix +++ b/nixos/modules/services/monitoring/ups.nix @@ -259,7 +259,7 @@ in /* - users.extraUsers = [ + users.users = [ { name = "nut"; uid = 84; home = "/var/lib/nut"; @@ -269,7 +269,7 @@ in } ]; - users.extraGroups = [ + users.groups = [ { name = "nut"; gid = 84; } diff --git a/nixos/modules/services/monitoring/vnstat.nix b/nixos/modules/services/monitoring/vnstat.nix index ca56e4a7b95..cb2f8c07edb 100644 --- a/nixos/modules/services/monitoring/vnstat.nix +++ b/nixos/modules/services/monitoring/vnstat.nix @@ -16,7 +16,7 @@ in { }; config = mkIf cfg.enable { - users.extraUsers.vnstatd = { + users.users.vnstatd = { isSystemUser = true; description = "vnstat daemon user"; home = "/var/lib/vnstat"; diff --git a/nixos/modules/services/monitoring/zabbix-agent.nix b/nixos/modules/services/monitoring/zabbix-agent.nix index 88a63b4bf16..87857225e7d 100644 --- a/nixos/modules/services/monitoring/zabbix-agent.nix +++ b/nixos/modules/services/monitoring/zabbix-agent.nix @@ -68,7 +68,7 @@ in config = mkIf cfg.enable { - users.extraUsers = mkIf (!config.services.zabbixServer.enable) (singleton + users.users = mkIf (!config.services.zabbixServer.enable) (singleton { name = "zabbix"; uid = config.ids.uids.zabbix; description = "Zabbix daemon user"; diff --git a/nixos/modules/services/monitoring/zabbix-server.nix b/nixos/modules/services/monitoring/zabbix-server.nix index acd1279ddf4..f62d55457ed 100644 --- a/nixos/modules/services/monitoring/zabbix-server.nix +++ b/nixos/modules/services/monitoring/zabbix-server.nix @@ -85,7 +85,7 @@ in services.postgresql.enable = useLocalPostgres; - users.extraUsers = singleton + users.users = singleton { name = "zabbix"; uid = config.ids.uids.zabbix; description = "Zabbix daemon user"; diff --git a/nixos/modules/services/network-filesystems/ceph.nix b/nixos/modules/services/network-filesystems/ceph.nix index 5de8ae79a24..4e3bc839d40 100644 --- a/nixos/modules/services/network-filesystems/ceph.nix +++ b/nixos/modules/services/network-filesystems/ceph.nix @@ -332,13 +332,13 @@ in in generators.toINI {} totalConfig; - users.extraUsers = singleton { + users.users = singleton { name = "ceph"; uid = config.ids.uids.ceph; description = "Ceph daemon user"; }; - users.extraGroups = singleton { + users.groups = singleton { name = "ceph"; gid = config.ids.gids.ceph; }; diff --git a/nixos/modules/services/network-filesystems/davfs2.nix b/nixos/modules/services/network-filesystems/davfs2.nix index 6b2a770100c..c16e12378d7 100644 --- a/nixos/modules/services/network-filesystems/davfs2.nix +++ b/nixos/modules/services/network-filesystems/davfs2.nix @@ -57,12 +57,12 @@ in environment.systemPackages = [ pkgs.davfs2 ]; environment.etc."davfs2/davfs2.conf".source = cfgFile; - users.extraGroups = optionalAttrs (cfg.davGroup == "davfs2") (singleton { + users.groups = optionalAttrs (cfg.davGroup == "davfs2") (singleton { name = "davfs2"; gid = config.ids.gids.davfs2; }); - users.extraUsers = optionalAttrs (cfg.davUser == "davfs2") (singleton { + users.users = optionalAttrs (cfg.davUser == "davfs2") (singleton { name = "davfs2"; createHome = false; group = cfg.davGroup; diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix index ab6d3a3d2fa..21b664e5b2f 100644 --- a/nixos/modules/services/network-filesystems/ipfs.nix +++ b/nixos/modules/services/network-filesystems/ipfs.nix @@ -212,7 +212,7 @@ in { user_allow_other ''; }; - users.extraUsers = mkIf (cfg.user == "ipfs") { + users.users = mkIf (cfg.user == "ipfs") { ipfs = { group = cfg.group; home = cfg.dataDir; @@ -222,7 +222,7 @@ in { }; }; - users.extraGroups = mkIf (cfg.group == "ipfs") { + users.groups = mkIf (cfg.group == "ipfs") { ipfs.gid = config.ids.gids.ipfs; }; diff --git a/nixos/modules/services/network-filesystems/tahoe.nix b/nixos/modules/services/network-filesystems/tahoe.nix index 80b34c48f1d..534862a3c9e 100644 --- a/nixos/modules/services/network-filesystems/tahoe.nix +++ b/nixos/modules/services/network-filesystems/tahoe.nix @@ -255,7 +255,7 @@ in cp /etc/tahoe-lafs/introducer-"${node}".cfg ${lib.escapeShellArg nodedir}/tahoe.cfg ''; }); - users.extraUsers = flip mapAttrs' cfg.introducers (node: _: + users.users = flip mapAttrs' cfg.introducers (node: _: nameValuePair "tahoe.introducer-${node}" { description = "Tahoe node user for introducer ${node}"; isSystemUser = true; @@ -355,7 +355,7 @@ in cp /etc/tahoe-lafs/${lib.escapeShellArg node}.cfg ${lib.escapeShellArg nodedir}/tahoe.cfg ''; }); - users.extraUsers = flip mapAttrs' cfg.nodes (node: _: + users.users = flip mapAttrs' cfg.nodes (node: _: nameValuePair "tahoe.${node}" { description = "Tahoe node user for node ${node}"; isSystemUser = true; diff --git a/nixos/modules/services/network-filesystems/xtreemfs.nix b/nixos/modules/services/network-filesystems/xtreemfs.nix index 95d7641e8b5..c93e201da56 100644 --- a/nixos/modules/services/network-filesystems/xtreemfs.nix +++ b/nixos/modules/services/network-filesystems/xtreemfs.nix @@ -432,14 +432,14 @@ in environment.systemPackages = [ xtreemfs ]; - users.extraUsers.xtreemfs = + users.users.xtreemfs = { uid = config.ids.uids.xtreemfs; description = "XtreemFS user"; createHome = true; home = home; }; - users.extraGroups.xtreemfs = + users.groups.xtreemfs = { gid = config.ids.gids.xtreemfs; }; diff --git a/nixos/modules/services/network-filesystems/yandex-disk.nix b/nixos/modules/services/network-filesystems/yandex-disk.nix index 44b0edf6201..e93f45b4986 100644 --- a/nixos/modules/services/network-filesystems/yandex-disk.nix +++ b/nixos/modules/services/network-filesystems/yandex-disk.nix @@ -73,7 +73,7 @@ in config = mkIf cfg.enable { - users.extraUsers = mkIf (cfg.user == null) [ { + users.users = mkIf (cfg.user == null) [ { name = u; uid = config.ids.uids.yandexdisk; group = "nogroup"; diff --git a/nixos/modules/services/networking/amuled.nix b/nixos/modules/services/networking/amuled.nix index 9898f164c5c..57f02542eaf 100644 --- a/nixos/modules/services/networking/amuled.nix +++ b/nixos/modules/services/networking/amuled.nix @@ -45,14 +45,14 @@ in config = mkIf cfg.enable { - users.extraUsers = mkIf (cfg.user == null) [ + users.users = mkIf (cfg.user == null) [ { name = "amule"; description = "AMule daemon"; group = "amule"; uid = config.ids.uids.amule; } ]; - users.extraGroups = mkIf (cfg.user == null) [ + users.groups = mkIf (cfg.user == null) [ { name = "amule"; gid = config.ids.gids.amule; } ]; diff --git a/nixos/modules/services/networking/aria2.nix b/nixos/modules/services/networking/aria2.nix index df9c92db2e5..98eb0086101 100644 --- a/nixos/modules/services/networking/aria2.nix +++ b/nixos/modules/services/networking/aria2.nix @@ -92,7 +92,7 @@ in allowedTCPPorts = [ config.services.aria2.rpcListenPort ]; }; - users.extraUsers.aria2 = { + users.users.aria2 = { group = "aria2"; uid = config.ids.uids.aria2; description = "aria2 user"; @@ -100,7 +100,7 @@ in createHome = false; }; - users.extraGroups.aria2.gid = config.ids.gids.aria2; + users.groups.aria2.gid = config.ids.gids.aria2; systemd.services.aria2 = { description = "aria2 Service"; diff --git a/nixos/modules/services/networking/asterisk.nix b/nixos/modules/services/networking/asterisk.nix index 514204db33f..b8ec2b25a22 100644 --- a/nixos/modules/services/networking/asterisk.nix +++ b/nixos/modules/services/networking/asterisk.nix @@ -211,7 +211,7 @@ in environment.etc.asterisk.source = asteriskEtc; - users.extraUsers.asterisk = + users.users.asterisk = { name = asteriskUser; group = asteriskGroup; uid = config.ids.uids.asterisk; @@ -219,7 +219,7 @@ in home = varlibdir; }; - users.extraGroups.asterisk = + users.groups.asterisk = { name = asteriskGroup; gid = config.ids.gids.asterisk; }; diff --git a/nixos/modules/services/networking/avahi-daemon.nix b/nixos/modules/services/networking/avahi-daemon.nix index 9ccdacb20e9..81e11db1040 100644 --- a/nixos/modules/services/networking/avahi-daemon.nix +++ b/nixos/modules/services/networking/avahi-daemon.nix @@ -187,14 +187,14 @@ in services.avahi.hostName = mkDefault config.networking.hostName; - users.extraUsers = singleton + users.users = singleton { name = "avahi"; uid = config.ids.uids.avahi; description = "`avahi-daemon' privilege separation user"; home = "/var/empty"; }; - users.extraGroups = singleton + users.groups = singleton { name = "avahi"; gid = config.ids.gids.avahi; }; diff --git a/nixos/modules/services/networking/bind.nix b/nixos/modules/services/networking/bind.nix index 7775a4bd87f..abcd1ef6ff5 100644 --- a/nixos/modules/services/networking/bind.nix +++ b/nixos/modules/services/networking/bind.nix @@ -170,7 +170,7 @@ in config = mkIf config.services.bind.enable { - users.extraUsers = singleton + users.users = singleton { name = bindUser; uid = config.ids.uids.bind; description = "BIND daemon user"; diff --git a/nixos/modules/services/networking/bird.nix b/nixos/modules/services/networking/bird.nix index c25bd0fdc54..9f08cc0a79e 100644 --- a/nixos/modules/services/networking/bird.nix +++ b/nixos/modules/services/networking/bird.nix @@ -60,11 +60,11 @@ let }; }; users = { - extraUsers.${variant} = { + users.${variant} = { description = "BIRD Internet Routing Daemon user"; group = variant; }; - extraGroups.${variant} = {}; + groups.${variant} = {}; }; }; }; diff --git a/nixos/modules/services/networking/bitlbee.nix b/nixos/modules/services/networking/bitlbee.nix index bd26804788f..392a8d5c2e7 100644 --- a/nixos/modules/services/networking/bitlbee.nix +++ b/nixos/modules/services/networking/bitlbee.nix @@ -149,7 +149,7 @@ in config = mkIf config.services.bitlbee.enable { - users.extraUsers = singleton + users.users = singleton { name = "bitlbee"; uid = bitlbeeUid; description = "BitlBee user"; @@ -157,7 +157,7 @@ in createHome = true; }; - users.extraGroups = singleton + users.groups = singleton { name = "bitlbee"; gid = config.ids.gids.bitlbee; }; diff --git a/nixos/modules/services/networking/btsync.nix b/nixos/modules/services/networking/btsync.nix index 6e479a5860a..33e85ef58e6 100644 --- a/nixos/modules/services/networking/btsync.nix +++ b/nixos/modules/services/networking/btsync.nix @@ -284,7 +284,7 @@ in services.btsync.package = mkOptionDefault pkgs.bittorrentSync14; - users.extraUsers.btsync = { + users.users.btsync = { description = "Bittorrent Sync Service user"; home = cfg.storagePath; createHome = true; @@ -292,7 +292,7 @@ in group = "btsync"; }; - users.extraGroups = [ + users.groups = [ { name = "btsync"; }]; diff --git a/nixos/modules/services/networking/charybdis.nix b/nixos/modules/services/networking/charybdis.nix index c354ec61fe2..6d57faa9ac2 100644 --- a/nixos/modules/services/networking/charybdis.nix +++ b/nixos/modules/services/networking/charybdis.nix @@ -71,14 +71,14 @@ in config = mkIf cfg.enable (lib.mkMerge [ { - users.extraUsers = singleton { + users.users = singleton { name = cfg.user; description = "Charybdis IRC daemon user"; uid = config.ids.uids.ircd; group = cfg.group; }; - users.extraGroups = singleton { + users.groups = singleton { name = cfg.group; gid = config.ids.gids.ircd; }; diff --git a/nixos/modules/services/networking/chrony.nix b/nixos/modules/services/networking/chrony.nix index c287ca01feb..6a89002b42d 100644 --- a/nixos/modules/services/networking/chrony.nix +++ b/nixos/modules/services/networking/chrony.nix @@ -96,12 +96,12 @@ in # Make chronyc available in the system path environment.systemPackages = [ pkgs.chrony ]; - users.extraGroups = singleton + users.groups = singleton { name = "chrony"; gid = config.ids.gids.chrony; }; - users.extraUsers = singleton + users.users = singleton { name = "chrony"; uid = config.ids.uids.chrony; group = "chrony"; diff --git a/nixos/modules/services/networking/cntlm.nix b/nixos/modules/services/networking/cntlm.nix index 3978a1969ce..4e4e3104c3a 100644 --- a/nixos/modules/services/networking/cntlm.nix +++ b/nixos/modules/services/networking/cntlm.nix @@ -117,7 +117,7 @@ in }; }; - users.extraUsers.cntlm = { + users.users.cntlm = { name = "cntlm"; description = "cntlm system-wide daemon"; isSystemUser = true; diff --git a/nixos/modules/services/networking/consul.nix b/nixos/modules/services/networking/consul.nix index 6333970cb33..ab3f8103768 100644 --- a/nixos/modules/services/networking/consul.nix +++ b/nixos/modules/services/networking/consul.nix @@ -155,7 +155,7 @@ in config = mkIf cfg.enable ( mkMerge [{ - users.extraUsers."consul" = { + users.users."consul" = { description = "Consul agent daemon user"; uid = config.ids.uids.consul; # The shell is needed for health checks diff --git a/nixos/modules/services/networking/coturn.nix b/nixos/modules/services/networking/coturn.nix index b3c64490d97..c430ce5af92 100644 --- a/nixos/modules/services/networking/coturn.nix +++ b/nixos/modules/services/networking/coturn.nix @@ -294,12 +294,12 @@ in { }; config = mkIf cfg.enable { - users.extraUsers = [ + users.users = [ { name = "turnserver"; uid = config.ids.uids.turnserver; description = "coturn TURN server user"; } ]; - users.extraGroups = [ + users.groups = [ { name = "turnserver"; gid = config.ids.gids.turnserver; members = [ "turnserver" ]; diff --git a/nixos/modules/services/networking/dhcpd.nix b/nixos/modules/services/networking/dhcpd.nix index fd7e317eee9..0b2063bc424 100644 --- a/nixos/modules/services/networking/dhcpd.nix +++ b/nixos/modules/services/networking/dhcpd.nix @@ -197,7 +197,7 @@ in config = mkIf (cfg4.enable || cfg6.enable) { users = { - extraUsers.dhcpd = { + users.dhcpd = { uid = config.ids.uids.dhcpd; description = "DHCP daemon user"; }; diff --git a/nixos/modules/services/networking/dnscache.nix b/nixos/modules/services/networking/dnscache.nix index ba5c8e2d5e5..fc30f50317f 100644 --- a/nixos/modules/services/networking/dnscache.nix +++ b/nixos/modules/services/networking/dnscache.nix @@ -84,7 +84,7 @@ in { config = mkIf config.services.dnscache.enable { environment.systemPackages = [ pkgs.djbdns ]; - users.extraUsers.dnscache = {}; + users.users.dnscache = {}; systemd.services.dnscache = { description = "djbdns dnscache server"; diff --git a/nixos/modules/services/networking/dnschain.nix b/nixos/modules/services/networking/dnschain.nix index ee1cd360003..0c2add424ba 100644 --- a/nixos/modules/services/networking/dnschain.nix +++ b/nixos/modules/services/networking/dnschain.nix @@ -141,7 +141,7 @@ in dns = "127.0.0.1:${toString cfg.dns.port}"; }; - users.extraUsers = singleton { + users.users = singleton { name = username; description = "DNSChain daemon user"; home = dataDir; diff --git a/nixos/modules/services/networking/dnsmasq.nix b/nixos/modules/services/networking/dnsmasq.nix index 91a3e54474a..24d16046c63 100644 --- a/nixos/modules/services/networking/dnsmasq.nix +++ b/nixos/modules/services/networking/dnsmasq.nix @@ -86,7 +86,7 @@ in services.dbus.packages = [ dnsmasq ]; - users.extraUsers = singleton { + users.users = singleton { name = "dnsmasq"; uid = config.ids.uids.dnsmasq; description = "Dnsmasq daemon user"; diff --git a/nixos/modules/services/networking/ejabberd.nix b/nixos/modules/services/networking/ejabberd.nix index 82ed7fc4a83..ef5e2cee6f2 100644 --- a/nixos/modules/services/networking/ejabberd.nix +++ b/nixos/modules/services/networking/ejabberd.nix @@ -94,7 +94,7 @@ in { config = mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; - users.extraUsers = optionalAttrs (cfg.user == "ejabberd") (singleton + users.users = optionalAttrs (cfg.user == "ejabberd") (singleton { name = "ejabberd"; group = cfg.group; home = cfg.spoolDir; @@ -102,7 +102,7 @@ in { uid = config.ids.uids.ejabberd; }); - users.extraGroups = optionalAttrs (cfg.group == "ejabberd") (singleton + users.groups = optionalAttrs (cfg.group == "ejabberd") (singleton { name = "ejabberd"; gid = config.ids.gids.ejabberd; }); diff --git a/nixos/modules/services/networking/freenet.nix b/nixos/modules/services/networking/freenet.nix index 3903a2c708c..3da3ab0c7df 100644 --- a/nixos/modules/services/networking/freenet.nix +++ b/nixos/modules/services/networking/freenet.nix @@ -50,7 +50,7 @@ in serviceConfig.Nice = cfg.nice; }; - users.extraUsers.freenet = { + users.users.freenet = { group = "freenet"; description = "Freenet daemon user"; home = varDir; @@ -58,7 +58,7 @@ in uid = config.ids.uids.freenet; }; - users.extraGroups.freenet.gid = config.ids.gids.freenet; + users.groups.freenet.gid = config.ids.gids.freenet; }; } diff --git a/nixos/modules/services/networking/freeradius.nix b/nixos/modules/services/networking/freeradius.nix index 45cba1ce277..e192b70c129 100644 --- a/nixos/modules/services/networking/freeradius.nix +++ b/nixos/modules/services/networking/freeradius.nix @@ -59,7 +59,7 @@ in config = mkIf (cfg.enable) { users = { - extraUsers.radius = { + users.radius = { /*uid = config.ids.uids.radius;*/ description = "Radius daemon user"; }; diff --git a/nixos/modules/services/networking/gale.nix b/nixos/modules/services/networking/gale.nix index fd83f9e3c1b..7083d87c407 100644 --- a/nixos/modules/services/networking/gale.nix +++ b/nixos/modules/services/networking/gale.nix @@ -104,7 +104,7 @@ in systemPackages = [ pkgs.gale ]; }; - users.extraUsers = [{ + users.users = [{ name = cfg.user; description = "Gale daemon"; uid = config.ids.uids.gale; @@ -113,7 +113,7 @@ in createHome = true; }]; - users.extraGroups = [{ + users.groups = [{ name = cfg.group; gid = config.ids.gids.gale; }]; diff --git a/nixos/modules/services/networking/gateone.nix b/nixos/modules/services/networking/gateone.nix index 78ff0b76198..4456a95402e 100644 --- a/nixos/modules/services/networking/gateone.nix +++ b/nixos/modules/services/networking/gateone.nix @@ -23,12 +23,12 @@ config = mkIf cfg.enable { environment.systemPackages = with pkgs.pythonPackages; [ gateone pkgs.openssh pkgs.procps pkgs.coreutils pkgs.cacert]; - users.extraUsers.gateone = { + users.users.gateone = { description = "GateOne privilege separation user"; uid = config.ids.uids.gateone; home = cfg.settingsDir; }; - users.extraGroups.gateone.gid = config.ids.gids.gateone; + users.groups.gateone.gid = config.ids.gids.gateone; systemd.services.gateone = with pkgs; { description = "GateOne web-based terminal"; diff --git a/nixos/modules/services/networking/git-daemon.nix b/nixos/modules/services/networking/git-daemon.nix index cd3fcd0f8f6..c0020349ec7 100644 --- a/nixos/modules/services/networking/git-daemon.nix +++ b/nixos/modules/services/networking/git-daemon.nix @@ -104,13 +104,13 @@ in config = mkIf cfg.enable { - users.extraUsers = if cfg.user != "git" then {} else singleton + users.users = if cfg.user != "git" then {} else singleton { name = "git"; uid = config.ids.uids.git; description = "Git daemon user"; }; - users.extraGroups = if cfg.group != "git" then {} else singleton + users.groups = if cfg.group != "git" then {} else singleton { name = "git"; gid = config.ids.gids.git; }; diff --git a/nixos/modules/services/networking/gnunet.nix b/nixos/modules/services/networking/gnunet.nix index 008b09e81a5..6a1db81413c 100644 --- a/nixos/modules/services/networking/gnunet.nix +++ b/nixos/modules/services/networking/gnunet.nix @@ -126,7 +126,7 @@ in config = mkIf config.services.gnunet.enable { - users.extraUsers.gnunet = { + users.users.gnunet = { group = "gnunet"; description = "GNUnet User"; home = homeDir; @@ -134,7 +134,7 @@ in uid = config.ids.uids.gnunet; }; - users.extraGroups.gnunet.gid = config.ids.gids.gnunet; + users.groups.gnunet.gid = config.ids.gids.gnunet; # The user tools that talk to `gnunetd' should come from the same source, # so install them globally. diff --git a/nixos/modules/services/networking/hans.nix b/nixos/modules/services/networking/hans.nix index dd34ef8d4ca..20e57e4626e 100644 --- a/nixos/modules/services/networking/hans.nix +++ b/nixos/modules/services/networking/hans.nix @@ -135,7 +135,7 @@ in }; }; - users.extraUsers = singleton { + users.users = singleton { name = hansUser; description = "Hans daemon user"; }; diff --git a/nixos/modules/services/networking/haproxy.nix b/nixos/modules/services/networking/haproxy.nix index 09e48ec4bff..0438d0bf8d8 100644 --- a/nixos/modules/services/networking/haproxy.nix +++ b/nixos/modules/services/networking/haproxy.nix @@ -52,11 +52,11 @@ with lib; environment.systemPackages = [ pkgs.haproxy ]; - users.extraUsers.haproxy = { + users.users.haproxy = { group = "haproxy"; uid = config.ids.uids.haproxy; }; - users.extraGroups.haproxy.gid = config.ids.uids.haproxy; + users.groups.haproxy.gid = config.ids.uids.haproxy; }; } diff --git a/nixos/modules/services/networking/i2p.nix b/nixos/modules/services/networking/i2p.nix index e6ee5fd1f95..3b6010531f1 100644 --- a/nixos/modules/services/networking/i2p.nix +++ b/nixos/modules/services/networking/i2p.nix @@ -11,14 +11,14 @@ in { ###### implementation config = mkIf cfg.enable { - users.extraUsers.i2p = { + users.users.i2p = { group = "i2p"; description = "i2p User"; home = homeDir; createHome = true; uid = config.ids.uids.i2p; }; - users.extraGroups.i2p.gid = config.ids.gids.i2p; + users.groups.i2p.gid = config.ids.gids.i2p; systemd.services.i2p = { description = "I2P router with administration interface for hidden services"; after = [ "network.target" ]; diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix index 8f5aeee4a16..8875309143f 100644 --- a/nixos/modules/services/networking/i2pd.nix +++ b/nixos/modules/services/networking/i2pd.nix @@ -456,7 +456,7 @@ in config = mkIf cfg.enable { - users.extraUsers.i2pd = { + users.users.i2pd = { group = "i2pd"; description = "I2Pd User"; home = homeDir; @@ -464,7 +464,7 @@ in uid = config.ids.uids.i2pd; }; - users.extraGroups.i2pd.gid = config.ids.gids.i2pd; + users.groups.i2pd.gid = config.ids.gids.i2pd; systemd.services.i2pd = { description = "Minimal I2P router"; diff --git a/nixos/modules/services/networking/iodine.nix b/nixos/modules/services/networking/iodine.nix index 3f41421d27f..58ad0df4ff2 100644 --- a/nixos/modules/services/networking/iodine.nix +++ b/nixos/modules/services/networking/iodine.nix @@ -140,11 +140,11 @@ in }; }; - users.extraUsers = singleton { + users.users = singleton { name = iodinedUser; uid = config.ids.uids.iodined; description = "Iodine daemon user"; }; - users.extraGroups.iodined.gid = config.ids.gids.iodined; + users.groups.iodined.gid = config.ids.gids.iodined; }; } diff --git a/nixos/modules/services/networking/ircd-hybrid/default.nix b/nixos/modules/services/networking/ircd-hybrid/default.nix index bd583fb020e..2bd898edf89 100644 --- a/nixos/modules/services/networking/ircd-hybrid/default.nix +++ b/nixos/modules/services/networking/ircd-hybrid/default.nix @@ -112,14 +112,14 @@ in config = mkIf config.services.ircdHybrid.enable { - users.extraUsers = singleton + users.users = singleton { name = "ircd"; description = "IRCD owner"; group = "ircd"; uid = config.ids.uids.ircd; }; - users.extraGroups.ircd.gid = config.ids.gids.ircd; + users.groups.ircd.gid = config.ids.gids.ircd; systemd.services."ircd-hybrid" = { description = "IRCD Hybrid server"; diff --git a/nixos/modules/services/networking/kippo.nix b/nixos/modules/services/networking/kippo.nix index 834de4fdc09..40c38254a57 100644 --- a/nixos/modules/services/networking/kippo.nix +++ b/nixos/modules/services/networking/kippo.nix @@ -73,12 +73,12 @@ rec { ${cfg.extraConfig} ''; - users.extraUsers = singleton { + users.users = singleton { name = "kippo"; description = "kippo web server privilege separation user"; uid = 108; # why does config.ids.uids.kippo give an error? }; - users.extraGroups = singleton { name = "kippo";gid=108; }; + users.groups = singleton { name = "kippo";gid=108; }; systemd.services.kippo = with pkgs; { description = "Kippo Web Server"; diff --git a/nixos/modules/services/networking/kresd.nix b/nixos/modules/services/networking/kresd.nix index aac02b811d7..ca34ff9df4e 100644 --- a/nixos/modules/services/networking/kresd.nix +++ b/nixos/modules/services/networking/kresd.nix @@ -62,13 +62,13 @@ in config = mkIf cfg.enable { environment.etc."kresd.conf".source = configFile; # not required - users.extraUsers = singleton + users.users = singleton { name = "kresd"; uid = config.ids.uids.kresd; group = "kresd"; description = "Knot-resolver daemon user"; }; - users.extraGroups = singleton + users.groups = singleton { name = "kresd"; gid = config.ids.gids.kresd; }; diff --git a/nixos/modules/services/networking/lambdabot.nix b/nixos/modules/services/networking/lambdabot.nix index 5a61a9f9678..b7c8bd008fe 100644 --- a/nixos/modules/services/networking/lambdabot.nix +++ b/nixos/modules/services/networking/lambdabot.nix @@ -67,7 +67,7 @@ in }; }; - users.extraUsers.lambdabot = { + users.users.lambdabot = { group = "lambdabot"; description = "Lambdabot daemon user"; home = "/var/lib/lambdabot"; @@ -75,7 +75,7 @@ in uid = config.ids.uids.lambdabot; }; - users.extraGroups.lambdabot.gid = config.ids.gids.lambdabot; + users.groups.lambdabot.gid = config.ids.gids.lambdabot; }; diff --git a/nixos/modules/services/networking/lldpd.nix b/nixos/modules/services/networking/lldpd.nix index db1534edfd7..dec30cc92f6 100644 --- a/nixos/modules/services/networking/lldpd.nix +++ b/nixos/modules/services/networking/lldpd.nix @@ -20,13 +20,13 @@ in }; config = mkIf cfg.enable { - users.extraUsers._lldpd = { + users.users._lldpd = { description = "lldpd user"; group = "_lldpd"; home = "/var/run/lldpd"; isSystemUser = true; }; - users.extraGroups._lldpd = {}; + users.groups._lldpd = {}; environment.systemPackages = [ pkgs.lldpd ]; systemd.packages = [ pkgs.lldpd ]; diff --git a/nixos/modules/services/networking/mailpile.nix b/nixos/modules/services/networking/mailpile.nix index e164d41483c..c42d3d5a44c 100644 --- a/nixos/modules/services/networking/mailpile.nix +++ b/nixos/modules/services/networking/mailpile.nix @@ -41,14 +41,14 @@ in config = mkIf config.services.mailpile.enable { - users.extraUsers.mailpile = + users.users.mailpile = { uid = config.ids.uids.mailpile; description = "Mailpile user"; createHome = true; home = "/var/lib/mailpile"; }; - users.extraGroups.mailpile = + users.groups.mailpile = { gid = config.ids.gids.mailpile; }; diff --git a/nixos/modules/services/networking/matterbridge.nix b/nixos/modules/services/networking/matterbridge.nix index e2f47840595..1fd63348c16 100644 --- a/nixos/modules/services/networking/matterbridge.nix +++ b/nixos/modules/services/networking/matterbridge.nix @@ -92,12 +92,12 @@ in warnings = optional options.services.matterbridge.configFile.isDefined "The option services.matterbridge.configFile is insecure and should be replaced with services.matterbridge.configPath"; - users.extraUsers = optional (cfg.user == "matterbridge") + users.users = optional (cfg.user == "matterbridge") { name = "matterbridge"; group = "matterbridge"; }; - users.extraGroups = optional (cfg.group == "matterbridge") + users.groups = optional (cfg.group == "matterbridge") { name = "matterbridge"; }; diff --git a/nixos/modules/services/networking/minidlna.nix b/nixos/modules/services/networking/minidlna.nix index 6401631bf62..1858f03cac1 100644 --- a/nixos/modules/services/networking/minidlna.nix +++ b/nixos/modules/services/networking/minidlna.nix @@ -84,13 +84,13 @@ in '') cfg.mediaDirs} ''; - users.extraUsers.minidlna = { + users.users.minidlna = { description = "MiniDLNA daemon user"; group = "minidlna"; uid = config.ids.uids.minidlna; }; - users.extraGroups.minidlna.gid = config.ids.gids.minidlna; + users.groups.minidlna.gid = config.ids.gids.minidlna; systemd.services.minidlna = { description = "MiniDLNA Server"; diff --git a/nixos/modules/services/networking/mjpg-streamer.nix b/nixos/modules/services/networking/mjpg-streamer.nix index 1286b0c7ef6..e0a6c112e3c 100644 --- a/nixos/modules/services/networking/mjpg-streamer.nix +++ b/nixos/modules/services/networking/mjpg-streamer.nix @@ -49,7 +49,7 @@ in { config = mkIf cfg.enable { - users.extraUsers = optional (cfg.user == "mjpg-streamer") { + users.users = optional (cfg.user == "mjpg-streamer") { name = "mjpg-streamer"; uid = config.ids.uids.mjpg-streamer; group = cfg.group; diff --git a/nixos/modules/services/networking/monero.nix b/nixos/modules/services/networking/monero.nix index 31379189f5d..8241c32bad0 100644 --- a/nixos/modules/services/networking/monero.nix +++ b/nixos/modules/services/networking/monero.nix @@ -197,7 +197,7 @@ in config = mkIf cfg.enable { - users.extraUsers = singleton { + users.users = singleton { name = "monero"; uid = config.ids.uids.monero; description = "Monero daemon user"; @@ -205,7 +205,7 @@ in createHome = true; }; - users.extraGroups = singleton { + users.groups = singleton { name = "monero"; gid = config.ids.gids.monero; }; diff --git a/nixos/modules/services/networking/morty.nix b/nixos/modules/services/networking/morty.nix index b31bec9a862..f24562f1181 100644 --- a/nixos/modules/services/networking/morty.nix +++ b/nixos/modules/services/networking/morty.nix @@ -72,7 +72,7 @@ in config = mkIf config.services.morty.enable { - users.extraUsers.morty = + users.users.morty = { description = "Morty user"; createHome = true; home = "/var/lib/morty"; diff --git a/nixos/modules/services/networking/mosquitto.nix b/nixos/modules/services/networking/mosquitto.nix index d8135f4d0ff..332dc541345 100644 --- a/nixos/modules/services/networking/mosquitto.nix +++ b/nixos/modules/services/networking/mosquitto.nix @@ -218,7 +218,7 @@ in ) cfg.users); }; - users.extraUsers.mosquitto = { + users.users.mosquitto = { description = "Mosquitto MQTT Broker Daemon owner"; group = "mosquitto"; uid = config.ids.uids.mosquitto; @@ -226,7 +226,7 @@ in createHome = true; }; - users.extraGroups.mosquitto.gid = config.ids.gids.mosquitto; + users.groups.mosquitto.gid = config.ids.gids.mosquitto; }; } diff --git a/nixos/modules/services/networking/murmur.nix b/nixos/modules/services/networking/murmur.nix index 873d62dbf34..5cd26b31533 100644 --- a/nixos/modules/services/networking/murmur.nix +++ b/nixos/modules/services/networking/murmur.nix @@ -238,7 +238,7 @@ in }; config = mkIf cfg.enable { - users.extraUsers.murmur = { + users.users.murmur = { description = "Murmur Service user"; home = "/var/lib/murmur"; createHome = true; diff --git a/nixos/modules/services/networking/namecoind.nix b/nixos/modules/services/networking/namecoind.nix index 11f7d7e5cae..8de23b442f9 100644 --- a/nixos/modules/services/networking/namecoind.nix +++ b/nixos/modules/services/networking/namecoind.nix @@ -153,7 +153,7 @@ in config = ${configFile} ''; - users.extraUsers = singleton { + users.users = singleton { name = "namecoin"; uid = config.ids.uids.namecoin; description = "Namecoin daemon user"; @@ -161,7 +161,7 @@ in createHome = true; }; - users.extraGroups = singleton { + users.groups = singleton { name = "namecoin"; gid = config.ids.gids.namecoin; }; diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 4e51725b19d..cdc3a352590 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -366,7 +366,7 @@ in { environment.systemPackages = cfg.packages; - users.extraGroups = [{ + users.groups = [{ name = "networkmanager"; gid = config.ids.gids.networkmanager; } @@ -374,7 +374,7 @@ in { name = "nm-openvpn"; gid = config.ids.gids.nm-openvpn; }]; - users.extraUsers = [{ + users.users = [{ name = "nm-openvpn"; uid = config.ids.uids.nm-openvpn; extraGroups = [ "networkmanager" ]; diff --git a/nixos/modules/services/networking/ngircd.nix b/nixos/modules/services/networking/ngircd.nix index 6a5290ffdee..4b2fa779592 100644 --- a/nixos/modules/services/networking/ngircd.nix +++ b/nixos/modules/services/networking/ngircd.nix @@ -51,7 +51,7 @@ in { serviceConfig.User = "ngircd"; }; - users.extraUsers.ngircd = { + users.users.ngircd = { uid = config.ids.uids.ngircd; description = "ngircd user."; }; diff --git a/nixos/modules/services/networking/nix-serve.nix b/nixos/modules/services/networking/nix-serve.nix index 8499e7c0f7c..e83cad949ae 100644 --- a/nixos/modules/services/networking/nix-serve.nix +++ b/nixos/modules/services/networking/nix-serve.nix @@ -64,7 +64,7 @@ in }; }; - users.extraUsers.nix-serve = { + users.users.nix-serve = { description = "Nix-serve user"; uid = config.ids.uids.nix-serve; }; diff --git a/nixos/modules/services/networking/nntp-proxy.nix b/nixos/modules/services/networking/nntp-proxy.nix index 7eebecb23b0..d24d6f77a49 100644 --- a/nixos/modules/services/networking/nntp-proxy.nix +++ b/nixos/modules/services/networking/nntp-proxy.nix @@ -210,7 +210,7 @@ in config = mkIf cfg.enable { - users.extraUsers = singleton + users.users = singleton { name = proxyUser; uid = config.ids.uids.nntp-proxy; description = "NNTP-Proxy daemon user"; diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix index fc910e59c32..cde47bf23ea 100644 --- a/nixos/modules/services/networking/nsd.nix +++ b/nixos/modules/services/networking/nsd.nix @@ -897,12 +897,12 @@ in environment.systemPackages = [ nsdPkg ]; - users.extraGroups = singleton { + users.groups = singleton { name = username; gid = config.ids.gids.nsd; }; - users.extraUsers = singleton { + users.users = singleton { name = username; description = "NSD service user"; home = stateDir; diff --git a/nixos/modules/services/networking/ntpd.nix b/nixos/modules/services/networking/ntpd.nix index 88e6dbf22b9..342350d49ab 100644 --- a/nixos/modules/services/networking/ntpd.nix +++ b/nixos/modules/services/networking/ntpd.nix @@ -67,7 +67,7 @@ in environment.systemPackages = [ pkgs.ntp ]; services.timesyncd.enable = mkForce false; - users.extraUsers = singleton + users.users = singleton { name = ntpUser; uid = config.ids.uids.ntp; description = "NTP daemon user"; diff --git a/nixos/modules/services/networking/nylon.nix b/nixos/modules/services/networking/nylon.nix index 4864ecf3f92..b7b59d95bf0 100644 --- a/nixos/modules/services/networking/nylon.nix +++ b/nixos/modules/services/networking/nylon.nix @@ -151,7 +151,7 @@ in config = mkIf (length(enabledNylons) > 0) { - users.extraUsers.nylon = { + users.users.nylon = { group = "nylon"; description = "Nylon SOCKS Proxy"; home = homeDir; @@ -159,7 +159,7 @@ in uid = config.ids.uids.nylon; }; - users.extraGroups.nylon.gid = config.ids.gids.nylon; + users.groups.nylon.gid = config.ids.gids.nylon; systemd.services = fold (a: b: a // b) {} nylonUnits; diff --git a/nixos/modules/services/networking/oidentd.nix b/nixos/modules/services/networking/oidentd.nix index ba7acd87954..8cf34623ab5 100644 --- a/nixos/modules/services/networking/oidentd.nix +++ b/nixos/modules/services/networking/oidentd.nix @@ -32,13 +32,13 @@ with lib; optionalString config.networking.enableIPv6 " -a ::"; }; - users.extraUsers.oidentd = { + users.users.oidentd = { description = "Ident Protocol daemon user"; group = "oidentd"; uid = config.ids.uids.oidentd; }; - users.extraGroups.oidentd.gid = config.ids.gids.oidentd; + users.groups.oidentd.gid = config.ids.gids.oidentd; }; diff --git a/nixos/modules/services/networking/openntpd.nix b/nixos/modules/services/networking/openntpd.nix index 241038ca12e..57638ebc9c0 100644 --- a/nixos/modules/services/networking/openntpd.nix +++ b/nixos/modules/services/networking/openntpd.nix @@ -59,7 +59,7 @@ in environment.etc."ntpd.conf".text = configFile; - users.extraUsers = singleton { + users.users = singleton { name = "ntp"; uid = config.ids.uids.ntp; description = "OpenNTP daemon user"; diff --git a/nixos/modules/services/networking/owamp.nix b/nixos/modules/services/networking/owamp.nix index a0d3e70d8e5..821a0258f4b 100644 --- a/nixos/modules/services/networking/owamp.nix +++ b/nixos/modules/services/networking/owamp.nix @@ -17,13 +17,13 @@ in ###### implementation config = mkIf cfg.enable { - users.extraUsers = singleton { + users.users = singleton { name = "owamp"; group = "owamp"; description = "Owamp daemon"; }; - users.extraGroups = singleton { + users.groups = singleton { name = "owamp"; }; diff --git a/nixos/modules/services/networking/pdns-recursor.nix b/nixos/modules/services/networking/pdns-recursor.nix index 26be72d2a61..d07deb9dcc6 100644 --- a/nixos/modules/services/networking/pdns-recursor.nix +++ b/nixos/modules/services/networking/pdns-recursor.nix @@ -128,7 +128,7 @@ in { config = mkIf cfg.enable { - users.extraUsers."${username}" = { + users.users."${username}" = { home = dataDir; createHome = true; uid = config.ids.uids.pdns-recursor; diff --git a/nixos/modules/services/networking/pdnsd.nix b/nixos/modules/services/networking/pdnsd.nix index f4467b81895..f5b174dd7b7 100644 --- a/nixos/modules/services/networking/pdnsd.nix +++ b/nixos/modules/services/networking/pdnsd.nix @@ -62,14 +62,14 @@ in }; config = mkIf cfg.enable { - users.extraUsers = singleton { + users.users = singleton { name = pdnsdUser; uid = config.ids.uids.pdnsd; group = pdnsdGroup; description = "pdnsd user"; }; - users.extraGroups = singleton { + users.groups = singleton { name = pdnsdGroup; gid = config.ids.gids.pdnsd; }; diff --git a/nixos/modules/services/networking/polipo.nix b/nixos/modules/services/networking/polipo.nix index 847fc88ead4..529115a1c6e 100644 --- a/nixos/modules/services/networking/polipo.nix +++ b/nixos/modules/services/networking/polipo.nix @@ -85,7 +85,7 @@ in config = mkIf cfg.enable { - users.extraUsers = singleton + users.users = singleton { name = "polipo"; uid = config.ids.uids.polipo; description = "Polipo caching proxy user"; @@ -93,7 +93,7 @@ in createHome = true; }; - users.extraGroups = singleton + users.groups = singleton { name = "polipo"; gid = config.ids.gids.polipo; members = [ "polipo" ]; diff --git a/nixos/modules/services/networking/prayer.nix b/nixos/modules/services/networking/prayer.nix index 8cd4a082353..f63f86496be 100644 --- a/nixos/modules/services/networking/prayer.nix +++ b/nixos/modules/services/networking/prayer.nix @@ -72,14 +72,14 @@ in config = mkIf config.services.prayer.enable { environment.systemPackages = [ prayer ]; - users.extraUsers = singleton + users.users = singleton { name = prayerUser; uid = config.ids.uids.prayer; description = "Prayer daemon user"; home = stateDir; }; - users.extraGroups = singleton + users.groups = singleton { name = prayerGroup; gid = config.ids.gids.prayer; }; diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix index 1b4f81f6b56..a37ef98caec 100644 --- a/nixos/modules/services/networking/prosody.nix +++ b/nixos/modules/services/networking/prosody.nix @@ -487,7 +487,7 @@ in '') cfg.virtualHosts) } ''; - users.extraUsers.prosody = mkIf (cfg.user == "prosody") { + users.users.prosody = mkIf (cfg.user == "prosody") { uid = config.ids.uids.prosody; description = "Prosody user"; createHome = true; @@ -495,7 +495,7 @@ in home = "${cfg.dataDir}"; }; - users.extraGroups.prosody = mkIf (cfg.group == "prosody") { + users.groups.prosody = mkIf (cfg.group == "prosody") { gid = config.ids.gids.prosody; }; diff --git a/nixos/modules/services/networking/quassel.nix b/nixos/modules/services/networking/quassel.nix index bc7d6912b5c..d850bb8b130 100644 --- a/nixos/modules/services/networking/quassel.nix +++ b/nixos/modules/services/networking/quassel.nix @@ -72,14 +72,14 @@ in config = mkIf cfg.enable { - users.extraUsers = mkIf (cfg.user == null) [ + users.users = mkIf (cfg.user == null) [ { name = "quassel"; description = "Quassel IRC client daemon"; group = "quassel"; uid = config.ids.uids.quassel; }]; - users.extraGroups = mkIf (cfg.user == null) [ + users.groups = mkIf (cfg.user == null) [ { name = "quassel"; gid = config.ids.gids.quassel; }]; diff --git a/nixos/modules/services/networking/radicale.nix b/nixos/modules/services/networking/radicale.nix index 97ee05046ff..2afab5ee3b3 100644 --- a/nixos/modules/services/networking/radicale.nix +++ b/nixos/modules/services/networking/radicale.nix @@ -59,7 +59,7 @@ in config = mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; - users.extraUsers = singleton + users.users = singleton { name = "radicale"; uid = config.ids.uids.radicale; description = "radicale user"; @@ -67,7 +67,7 @@ in createHome = true; }; - users.extraGroups = singleton + users.groups = singleton { name = "radicale"; gid = config.ids.gids.radicale; }; diff --git a/nixos/modules/services/networking/radvd.nix b/nixos/modules/services/networking/radvd.nix index 85d7f9e4a41..020faa34922 100644 --- a/nixos/modules/services/networking/radvd.nix +++ b/nixos/modules/services/networking/radvd.nix @@ -52,7 +52,7 @@ in config = mkIf cfg.enable { - users.extraUsers.radvd = + users.users.radvd = { uid = config.ids.uids.radvd; description = "Router Advertisement Daemon User"; }; diff --git a/nixos/modules/services/networking/rdnssd.nix b/nixos/modules/services/networking/rdnssd.nix index a102242eae7..887772f6e5f 100644 --- a/nixos/modules/services/networking/rdnssd.nix +++ b/nixos/modules/services/networking/rdnssd.nix @@ -64,7 +64,7 @@ in }; }; - users.extraUsers.rdnssd = { + users.users.rdnssd = { description = "RDNSSD Daemon User"; uid = config.ids.uids.rdnssd; }; diff --git a/nixos/modules/services/networking/resilio.nix b/nixos/modules/services/networking/resilio.nix index 2956a5ecbc0..ee7f82ac7be 100644 --- a/nixos/modules/services/networking/resilio.nix +++ b/nixos/modules/services/networking/resilio.nix @@ -236,7 +236,7 @@ in } ]; - users.extraUsers.rslsync = { + users.users.rslsync = { description = "Resilio Sync Service user"; home = cfg.storagePath; createHome = true; @@ -244,7 +244,7 @@ in group = "rslsync"; }; - users.extraGroups = [ { name = "rslsync"; } ]; + users.groups = [ { name = "rslsync"; } ]; systemd.services.resilio = with pkgs; { description = "Resilio Sync Service"; diff --git a/nixos/modules/services/networking/rpcbind.nix b/nixos/modules/services/networking/rpcbind.nix index cddcb09054e..0a5df698709 100644 --- a/nixos/modules/services/networking/rpcbind.nix +++ b/nixos/modules/services/networking/rpcbind.nix @@ -37,7 +37,7 @@ with lib; wantedBy = [ "multi-user.target" ]; }; - users.extraUsers.rpc = { + users.users.rpc = { group = "nogroup"; uid = config.ids.uids.rpc; }; diff --git a/nixos/modules/services/networking/sabnzbd.nix b/nixos/modules/services/networking/sabnzbd.nix index cacf753fdcd..62b24d4377f 100644 --- a/nixos/modules/services/networking/sabnzbd.nix +++ b/nixos/modules/services/networking/sabnzbd.nix @@ -41,7 +41,7 @@ in config = mkIf cfg.enable { - users.extraUsers.sabnzbd = { + users.users.sabnzbd = { uid = config.ids.uids.sabnzbd; group = "sabnzbd"; description = "sabnzbd user"; @@ -49,7 +49,7 @@ in createHome = true; }; - users.extraGroups.sabnzbd = { + users.groups.sabnzbd = { gid = config.ids.gids.sabnzbd; }; diff --git a/nixos/modules/services/networking/searx.nix b/nixos/modules/services/networking/searx.nix index c7a128ae212..9412d0ef8a6 100644 --- a/nixos/modules/services/networking/searx.nix +++ b/nixos/modules/services/networking/searx.nix @@ -47,14 +47,14 @@ in config = mkIf config.services.searx.enable { - users.extraUsers.searx = + users.users.searx = { uid = config.ids.uids.searx; description = "Searx user"; createHome = true; home = "/var/lib/searx"; }; - users.extraGroups.searx = + users.groups.searx = { gid = config.ids.gids.searx; }; diff --git a/nixos/modules/services/networking/seeks.nix b/nixos/modules/services/networking/seeks.nix index f5bc60be345..40729225b6d 100644 --- a/nixos/modules/services/networking/seeks.nix +++ b/nixos/modules/services/networking/seeks.nix @@ -46,14 +46,14 @@ in config = mkIf config.services.seeks.enable { - users.extraUsers.seeks = + users.users.seeks = { uid = config.ids.uids.seeks; description = "Seeks user"; createHome = true; home = "/var/lib/seeks"; }; - users.extraGroups.seeks = + users.groups.seeks = { gid = config.ids.gids.seeks; }; diff --git a/nixos/modules/services/networking/shairport-sync.nix b/nixos/modules/services/networking/shairport-sync.nix index 908de9efd6f..0b87140b0d8 100644 --- a/nixos/modules/services/networking/shairport-sync.nix +++ b/nixos/modules/services/networking/shairport-sync.nix @@ -55,7 +55,7 @@ in services.avahi.publish.enable = true; services.avahi.publish.userServices = true; - users.extraUsers = singleton + users.users = singleton { name = cfg.user; description = "Shairport user"; isSystemUser = true; diff --git a/nixos/modules/services/networking/shout.nix b/nixos/modules/services/networking/shout.nix index 3664c285773..9784f1d160f 100644 --- a/nixos/modules/services/networking/shout.nix +++ b/nixos/modules/services/networking/shout.nix @@ -82,7 +82,7 @@ in { }; config = mkIf cfg.enable { - users.extraUsers = singleton { + users.users = singleton { name = "shout"; uid = config.ids.uids.shout; description = "Shout daemon user"; diff --git a/nixos/modules/services/networking/smokeping.nix b/nixos/modules/services/networking/smokeping.nix index c5c131cb4c5..9ba6e48f417 100644 --- a/nixos/modules/services/networking/smokeping.nix +++ b/nixos/modules/services/networking/smokeping.nix @@ -278,7 +278,7 @@ in "fping6".source = "${pkgs.fping}/bin/fping6"; }; environment.systemPackages = [ pkgs.fping ]; - users.extraUsers = singleton { + users.users = singleton { name = cfg.user; isNormalUser = false; isSystemUser = true; diff --git a/nixos/modules/services/networking/sniproxy.nix b/nixos/modules/services/networking/sniproxy.nix index 4d0f3692329..0345c12d3af 100644 --- a/nixos/modules/services/networking/sniproxy.nix +++ b/nixos/modules/services/networking/sniproxy.nix @@ -82,14 +82,14 @@ in }; }; - users.extraUsers = mkIf (cfg.user == "sniproxy") { + users.users = mkIf (cfg.user == "sniproxy") { sniproxy = { group = cfg.group; uid = config.ids.uids.sniproxy; }; }; - users.extraGroups = mkIf (cfg.group == "sniproxy") { + users.groups = mkIf (cfg.group == "sniproxy") { sniproxy = { gid = config.ids.gids.sniproxy; }; diff --git a/nixos/modules/services/networking/spiped.nix b/nixos/modules/services/networking/spiped.nix index 005d7182351..e60d9abf42a 100644 --- a/nixos/modules/services/networking/spiped.nix +++ b/nixos/modules/services/networking/spiped.nix @@ -171,8 +171,8 @@ in message = "A pipe must either encrypt or decrypt"; }) cfg.config; - users.extraGroups.spiped.gid = config.ids.gids.spiped; - users.extraUsers.spiped = { + users.groups.spiped.gid = config.ids.gids.spiped; + users.users.spiped = { description = "Secure Pipe Service user"; group = "spiped"; uid = config.ids.uids.spiped; diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index 961e72b2b81..8b04fac089e 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -49,7 +49,7 @@ let ${concatMapStrings (f: readFile f + "\n") u.openssh.authorizedKeys.keyFiles} ''; }; - usersWithKeys = attrValues (flip filterAttrs config.users.extraUsers (n: u: + usersWithKeys = attrValues (flip filterAttrs config.users.users (n: u: length u.openssh.authorizedKeys.keys != 0 || length u.openssh.authorizedKeys.keyFiles != 0 )); in listToAttrs (map mkAuthKeyFile usersWithKeys); @@ -326,7 +326,7 @@ in config = mkIf cfg.enable { - users.extraUsers.sshd = + users.users.sshd = { isSystemUser = true; description = "SSH privilege separation user"; }; diff --git a/nixos/modules/services/networking/supybot.nix b/nixos/modules/services/networking/supybot.nix index 2cfb9fc9b92..64eb1106832 100644 --- a/nixos/modules/services/networking/supybot.nix +++ b/nixos/modules/services/networking/supybot.nix @@ -45,7 +45,7 @@ in environment.systemPackages = [ pkgs.pythonPackages.limnoria ]; - users.extraUsers = singleton { + users.users = singleton { name = "supybot"; uid = config.ids.uids.supybot; group = "supybot"; @@ -54,7 +54,7 @@ in createHome = true; }; - users.extraGroups.supybot = { + users.groups.supybot = { name = "supybot"; gid = config.ids.gids.supybot; }; diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index e485c073cbd..c610b3b6660 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -103,7 +103,7 @@ in { systemd.packages = [ pkgs.syncthing ]; users = mkIf (cfg.user == defaultUser) { - extraUsers."${defaultUser}" = + users."${defaultUser}" = { group = cfg.group; home = cfg.dataDir; createHome = true; @@ -111,7 +111,7 @@ in { description = "Syncthing daemon user"; }; - extraGroups."${defaultUser}".gid = + groups."${defaultUser}".gid = config.ids.gids.syncthing; }; diff --git a/nixos/modules/services/networking/tcpcrypt.nix b/nixos/modules/services/networking/tcpcrypt.nix index ee005e11aa3..a0ccb995009 100644 --- a/nixos/modules/services/networking/tcpcrypt.nix +++ b/nixos/modules/services/networking/tcpcrypt.nix @@ -29,7 +29,7 @@ in config = mkIf cfg.enable { - users.extraUsers = singleton { + users.users = singleton { name = "tcpcryptd"; uid = config.ids.uids.tcpcryptd; description = "tcpcrypt daemon user"; diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix index 77bcdae8019..35cdddc590b 100644 --- a/nixos/modules/services/networking/tinc.nix +++ b/nixos/modules/services/networking/tinc.nix @@ -209,7 +209,7 @@ in }; in [ cli-wrappers ]; - users.extraUsers = flip mapAttrs' cfg.networks (network: _: + users.users = flip mapAttrs' cfg.networks (network: _: nameValuePair ("tinc.${network}") ({ description = "Tinc daemon user for ${network}"; isSystemUser = true; diff --git a/nixos/modules/services/networking/tinydns.nix b/nixos/modules/services/networking/tinydns.nix index 184888ef05d..7d5db71601e 100644 --- a/nixos/modules/services/networking/tinydns.nix +++ b/nixos/modules/services/networking/tinydns.nix @@ -32,7 +32,7 @@ with lib; config = mkIf config.services.tinydns.enable { environment.systemPackages = [ pkgs.djbdns ]; - users.extraUsers.tinydns = {}; + users.users.tinydns = {}; systemd.services.tinydns = { description = "djbdns tinydns server"; diff --git a/nixos/modules/services/networking/tox-bootstrapd.nix b/nixos/modules/services/networking/tox-bootstrapd.nix index cb0e6b15865..1d349215169 100644 --- a/nixos/modules/services/networking/tox-bootstrapd.nix +++ b/nixos/modules/services/networking/tox-bootstrapd.nix @@ -56,7 +56,7 @@ in config = mkIf config.services.toxBootstrapd.enable { - users.extraUsers = singleton + users.users = singleton { name = "tox-bootstrapd"; uid = config.ids.uids.tox-bootstrapd; description = "Tox bootstrap daemon user"; diff --git a/nixos/modules/services/networking/toxvpn.nix b/nixos/modules/services/networking/toxvpn.nix index 5e13402d764..f5baea9222b 100644 --- a/nixos/modules/services/networking/toxvpn.nix +++ b/nixos/modules/services/networking/toxvpn.nix @@ -57,7 +57,7 @@ with lib; environment.systemPackages = [ pkgs.toxvpn ]; - users.extraUsers = { + users.users = { toxvpn = { uid = config.ids.uids.toxvpn; home = "/var/lib/toxvpn"; diff --git a/nixos/modules/services/networking/tvheadend.nix b/nixos/modules/services/networking/tvheadend.nix index cdd8747ba89..f495c39967e 100644 --- a/nixos/modules/services/networking/tvheadend.nix +++ b/nixos/modules/services/networking/tvheadend.nix @@ -3,7 +3,7 @@ with lib; let cfg = config.services.tvheadend; - pidFile = "${config.users.extraUsers.tvheadend.home}/tvheadend.pid"; + pidFile = "${config.users.users.tvheadend.home}/tvheadend.pid"; in { @@ -25,7 +25,7 @@ in }; config = mkIf cfg.enable { - users.extraUsers.tvheadend = { + users.users.tvheadend = { description = "Tvheadend Service user"; home = "/var/lib/tvheadend"; createHome = true; diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix index 94958bfdd83..ac10e77ba30 100644 --- a/nixos/modules/services/networking/unifi.nix +++ b/nixos/modules/services/networking/unifi.nix @@ -114,7 +114,7 @@ in config = mkIf cfg.enable { - users.extraUsers.unifi = { + users.users.unifi = { uid = config.ids.uids.unifi; description = "UniFi controller daemon user"; home = "${stateDir}"; diff --git a/nixos/modules/services/networking/vsftpd.nix b/nixos/modules/services/networking/vsftpd.nix index 6b3d658bd85..1f9107c3ce9 100644 --- a/nixos/modules/services/networking/vsftpd.nix +++ b/nixos/modules/services/networking/vsftpd.nix @@ -193,7 +193,7 @@ in message = "vsftpd: If forceLocalLoginsSSL or forceLocalDataSSL is true then a rsaCertFile must be provided!"; }; - users.extraUsers = + users.users = [ { name = "vsftpd"; uid = config.ids.uids.vsftpd; description = "VSFTPD user"; @@ -207,7 +207,7 @@ in home = cfg.anonymousUserHome; }; - users.extraGroups.ftp.gid = config.ids.gids.ftp; + users.groups.ftp.gid = config.ids.gids.ftp; # If you really have to access root via FTP use mkOverride or userlistDeny # = false and whitelist root diff --git a/nixos/modules/services/networking/znc.nix b/nixos/modules/services/networking/znc.nix index 72313ab2ee1..76e4899c85e 100644 --- a/nixos/modules/services/networking/znc.nix +++ b/nixos/modules/services/networking/znc.nix @@ -402,7 +402,7 @@ in script = "${pkgs.znc}/bin/znc --foreground --datadir ${cfg.dataDir} ${toString cfg.extraFlags}"; }; - users.extraUsers = optional (cfg.user == defaultUser) + users.users = optional (cfg.user == defaultUser) { name = defaultUser; description = "ZNC server daemon owner"; group = defaultUser; @@ -411,7 +411,7 @@ in createHome = true; }; - users.extraGroups = optional (cfg.user == defaultUser) + users.groups = optional (cfg.user == defaultUser) { name = defaultUser; gid = config.ids.gids.znc; members = [ defaultUser ]; diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index c4147986439..b074d15cbec 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -268,7 +268,7 @@ in config = mkIf config.services.printing.enable { - users.extraUsers = singleton + users.users = singleton { name = "cups"; uid = config.ids.uids.cups; group = "lp"; diff --git a/nixos/modules/services/scheduling/atd.nix b/nixos/modules/services/scheduling/atd.nix index 77a3f6b51e8..a32907647a0 100644 --- a/nixos/modules/services/scheduling/atd.nix +++ b/nixos/modules/services/scheduling/atd.nix @@ -57,14 +57,14 @@ in security.pam.services.atd = {}; - users.extraUsers = singleton + users.users = singleton { name = "atd"; uid = config.ids.uids.atd; description = "atd user"; home = "/var/empty"; }; - users.extraGroups = singleton + users.groups = singleton { name = "atd"; gid = config.ids.gids.atd; }; diff --git a/nixos/modules/services/scheduling/chronos.nix b/nixos/modules/services/scheduling/chronos.nix index 6c39997fec8..9a8ed4c09ac 100644 --- a/nixos/modules/services/scheduling/chronos.nix +++ b/nixos/modules/services/scheduling/chronos.nix @@ -49,6 +49,6 @@ in { }; }; - users.extraUsers.chronos.uid = config.ids.uids.chronos; + users.users.chronos.uid = config.ids.uids.chronos; }; } diff --git a/nixos/modules/services/scheduling/fcron.nix b/nixos/modules/services/scheduling/fcron.nix index 0ea41f3c398..ae382897775 100644 --- a/nixos/modules/services/scheduling/fcron.nix +++ b/nixos/modules/services/scheduling/fcron.nix @@ -115,7 +115,7 @@ in ]; environment.systemPackages = [ pkgs.fcron ]; - users.extraUsers.fcron = { + users.users.fcron = { uid = config.ids.uids.fcron; home = "/var/spool/fcron"; group = "fcron"; diff --git a/nixos/modules/services/scheduling/marathon.nix b/nixos/modules/services/scheduling/marathon.nix index 19c9a708f21..0961a67770e 100644 --- a/nixos/modules/services/scheduling/marathon.nix +++ b/nixos/modules/services/scheduling/marathon.nix @@ -93,6 +93,6 @@ in { }; }; - users.extraUsers.${cfg.user} = { }; + users.users.${cfg.user} = { }; }; } diff --git a/nixos/modules/services/search/hound.nix b/nixos/modules/services/search/hound.nix index a94a851e80e..6740928db9a 100644 --- a/nixos/modules/services/search/hound.nix +++ b/nixos/modules/services/search/hound.nix @@ -88,12 +88,12 @@ in { }; config = mkIf cfg.enable { - users.extraGroups = optional (cfg.group == "hound") { + users.groups = optional (cfg.group == "hound") { name = "hound"; gid = config.ids.gids.hound; }; - users.extraUsers = optional (cfg.user == "hound") { + users.users = optional (cfg.user == "hound") { name = "hound"; description = "hound code search"; createHome = true; diff --git a/nixos/modules/services/search/kibana.nix b/nixos/modules/services/search/kibana.nix index 9d7d2d79918..5885a72c662 100644 --- a/nixos/modules/services/search/kibana.nix +++ b/nixos/modules/services/search/kibana.nix @@ -193,7 +193,7 @@ in { environment.systemPackages = [ cfg.package ]; - users.extraUsers = singleton { + users.users = singleton { name = "kibana"; uid = config.ids.uids.kibana; description = "Kibana service user"; diff --git a/nixos/modules/services/security/clamav.nix b/nixos/modules/services/security/clamav.nix index 4161c61ed37..9ad0095252d 100644 --- a/nixos/modules/services/security/clamav.nix +++ b/nixos/modules/services/security/clamav.nix @@ -79,7 +79,7 @@ in config = mkIf (cfg.updater.enable || cfg.daemon.enable) { environment.systemPackages = [ pkg ]; - users.extraUsers = singleton { + users.users = singleton { name = clamavUser; uid = config.ids.uids.clamav; group = clamavGroup; @@ -87,7 +87,7 @@ in home = stateDir; }; - users.extraGroups = singleton { + users.groups = singleton { name = clamavGroup; gid = config.ids.gids.clamav; }; diff --git a/nixos/modules/services/security/fprot.nix b/nixos/modules/services/security/fprot.nix index a12aa01503e..b1ca4ab2345 100644 --- a/nixos/modules/services/security/fprot.nix +++ b/nixos/modules/services/security/fprot.nix @@ -53,14 +53,14 @@ in { target = "f-prot.conf"; }; - users.extraUsers = singleton + users.users = singleton { name = fprotUser; uid = config.ids.uids.fprot; description = "F-Prot daemon user"; home = stateDir; }; - users.extraGroups = singleton + users.groups = singleton { name = fprotGroup; gid = config.ids.gids.fprot; }; diff --git a/nixos/modules/services/security/oauth2_proxy.nix b/nixos/modules/services/security/oauth2_proxy.nix index 96d78630e6d..0c5fe8c0ef5 100644 --- a/nixos/modules/services/security/oauth2_proxy.nix +++ b/nixos/modules/services/security/oauth2_proxy.nix @@ -544,7 +544,7 @@ in cookie.secret = mkDefault null; }; - users.extraUsers.oauth2_proxy = { + users.users.oauth2_proxy = { description = "OAuth2 Proxy"; }; diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix index 15200c49d70..dcb41d187c2 100644 --- a/nixos/modules/services/security/tor.nix +++ b/nixos/modules/services/security/tor.nix @@ -686,8 +686,8 @@ in always create a container/VM with a separate Tor daemon instance. ''; - users.extraGroups.tor.gid = config.ids.gids.tor; - users.extraUsers.tor = + users.groups.tor.gid = config.ids.gids.tor; + users.users.tor = { description = "Tor Daemon User"; createHome = true; home = torDirectory; diff --git a/nixos/modules/services/security/vault.nix b/nixos/modules/services/security/vault.nix index 146afec344a..47c70cf0687 100644 --- a/nixos/modules/services/security/vault.nix +++ b/nixos/modules/services/security/vault.nix @@ -97,13 +97,13 @@ in } ]; - users.extraUsers.vault = { + users.users.vault = { name = "vault"; group = "vault"; uid = config.ids.uids.vault; description = "Vault daemon user"; }; - users.extraGroups.vault.gid = config.ids.gids.vault; + users.groups.vault.gid = config.ids.gids.vault; systemd.services.vault = { description = "Vault server daemon"; diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix index 248df7351a8..e0458021844 100644 --- a/nixos/modules/services/system/dbus.nix +++ b/nixos/modules/services/system/dbus.nix @@ -71,14 +71,14 @@ in target = "dbus-1"; }; - users.extraUsers.messagebus = { + users.users.messagebus = { uid = config.ids.uids.messagebus; description = "D-Bus system message bus daemon user"; home = homeDir; group = "messagebus"; }; - users.extraGroups.messagebus.gid = config.ids.gids.messagebus; + users.groups.messagebus.gid = config.ids.gids.messagebus; systemd.packages = [ pkgs.dbus.daemon ]; diff --git a/nixos/modules/services/system/nscd.nix b/nixos/modules/services/system/nscd.nix index eb4b5281c7c..11a30ea81ba 100644 --- a/nixos/modules/services/system/nscd.nix +++ b/nixos/modules/services/system/nscd.nix @@ -41,7 +41,7 @@ in config = mkIf cfg.enable { environment.etc."nscd.conf".text = cfg.config; - users.extraUsers.nscd = + users.users.nscd = { isSystemUser = true; description = "Name service cache daemon user"; }; diff --git a/nixos/modules/services/system/uptimed.nix b/nixos/modules/services/system/uptimed.nix index b20d6096803..3c9978ab226 100644 --- a/nixos/modules/services/system/uptimed.nix +++ b/nixos/modules/services/system/uptimed.nix @@ -20,7 +20,7 @@ in }; config = mkIf cfg.enable { - users.extraUsers.uptimed = { + users.users.uptimed = { description = "Uptimed daemon user"; home = stateDir; createHome = true; diff --git a/nixos/modules/services/torrent/deluge.nix b/nixos/modules/services/torrent/deluge.nix index bff22cd1359..84f0437b941 100644 --- a/nixos/modules/services/torrent/deluge.nix +++ b/nixos/modules/services/torrent/deluge.nix @@ -55,7 +55,7 @@ in { environment.systemPackages = [ pkgs.deluge ]; - users.extraUsers.deluge = { + users.users.deluge = { group = "deluge"; uid = config.ids.uids.deluge; home = "/var/lib/deluge/"; @@ -63,6 +63,6 @@ in { description = "Deluge Daemon user"; }; - users.extraGroups.deluge.gid = config.ids.gids.deluge; + users.groups.deluge.gid = config.ids.gids.deluge; }; } diff --git a/nixos/modules/services/torrent/peerflix.nix b/nixos/modules/services/torrent/peerflix.nix index 2e3dd9902d7..bed6661f84d 100644 --- a/nixos/modules/services/torrent/peerflix.nix +++ b/nixos/modules/services/torrent/peerflix.nix @@ -58,6 +58,6 @@ in { }; }; - users.extraUsers.peerflix.uid = config.ids.uids.peerflix; + users.users.peerflix.uid = config.ids.uids.peerflix; }; } diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix index 3564afd77f4..bf4fb76d0c0 100644 --- a/nixos/modules/services/torrent/transmission.nix +++ b/nixos/modules/services/torrent/transmission.nix @@ -113,8 +113,8 @@ in # It's useful to have transmission in path, e.g. for remote control environment.systemPackages = [ pkgs.transmission ]; - users.extraGroups.transmission.gid = config.ids.gids.transmission; - users.extraUsers.transmission = { + users.groups.transmission.gid = config.ids.gids.transmission; + users.users.transmission = { group = "transmission"; uid = config.ids.uids.transmission; description = "Transmission BitTorrent user"; diff --git a/nixos/modules/services/web-apps/atlassian/confluence.nix b/nixos/modules/services/web-apps/atlassian/confluence.nix index 84c41b6e53c..f896d92fd6f 100644 --- a/nixos/modules/services/web-apps/atlassian/confluence.nix +++ b/nixos/modules/services/web-apps/atlassian/confluence.nix @@ -137,12 +137,12 @@ in }; config = mkIf cfg.enable { - users.extraUsers."${cfg.user}" = { + users.users."${cfg.user}" = { isSystemUser = true; group = cfg.group; }; - users.extraGroups."${cfg.group}" = {}; + users.groups."${cfg.group}" = {}; systemd.services.confluence = { description = "Atlassian Confluence"; diff --git a/nixos/modules/services/web-apps/atlassian/crowd.nix b/nixos/modules/services/web-apps/atlassian/crowd.nix index 778e4afa1e0..b6cb9f3b7c4 100644 --- a/nixos/modules/services/web-apps/atlassian/crowd.nix +++ b/nixos/modules/services/web-apps/atlassian/crowd.nix @@ -103,12 +103,12 @@ in }; config = mkIf cfg.enable { - users.extraUsers."${cfg.user}" = { + users.users."${cfg.user}" = { isSystemUser = true; group = cfg.group; }; - users.extraGroups."${cfg.group}" = {}; + users.groups."${cfg.group}" = {}; systemd.services.atlassian-crowd = { description = "Atlassian Crowd"; diff --git a/nixos/modules/services/web-apps/atlassian/jira.nix b/nixos/modules/services/web-apps/atlassian/jira.nix index 13c5951524d..f5ec0a5f31b 100644 --- a/nixos/modules/services/web-apps/atlassian/jira.nix +++ b/nixos/modules/services/web-apps/atlassian/jira.nix @@ -141,12 +141,12 @@ in }; config = mkIf cfg.enable { - users.extraUsers."${cfg.user}" = { + users.users."${cfg.user}" = { isSystemUser = true; group = cfg.group; }; - users.extraGroups."${cfg.group}" = {}; + users.groups."${cfg.group}" = {}; systemd.services.atlassian-jira = { description = "Atlassian JIRA"; diff --git a/nixos/modules/services/web-apps/frab.nix b/nixos/modules/services/web-apps/frab.nix index d5329ef03c8..d411727a1a5 100644 --- a/nixos/modules/services/web-apps/frab.nix +++ b/nixos/modules/services/web-apps/frab.nix @@ -174,14 +174,14 @@ in config = mkIf cfg.enable { environment.systemPackages = [ frab-rake ]; - users.extraUsers = [ + users.users = [ { name = cfg.user; group = cfg.group; home = "${cfg.statePath}"; } ]; - users.extraGroups = [ { name = cfg.group; } ]; + users.groups = [ { name = cfg.group; } ]; systemd.services.frab = { after = [ "network.target" "gitlab.service" ]; diff --git a/nixos/modules/services/web-apps/matomo.nix b/nixos/modules/services/web-apps/matomo.nix index ef6ac9698e2..ed38eb9ce1e 100644 --- a/nixos/modules/services/web-apps/matomo.nix +++ b/nixos/modules/services/web-apps/matomo.nix @@ -109,13 +109,13 @@ in { message = "Either services.matomo.nginx or services.matomo.nginx.webServerUser is mandatory"; }]; - users.extraUsers.${user} = { + users.users.${user} = { isSystemUser = true; createHome = true; home = dataDir; group = user; }; - users.extraGroups.${user} = {}; + users.groups.${user} = {}; systemd.services.matomo_setup_update = { # everything needs to set up and up to date before matomo php files are executed diff --git a/nixos/modules/services/web-apps/mattermost.nix b/nixos/modules/services/web-apps/mattermost.nix index 96792c47cd2..8c7fc4056ad 100644 --- a/nixos/modules/services/web-apps/mattermost.nix +++ b/nixos/modules/services/web-apps/mattermost.nix @@ -146,14 +146,14 @@ in config = mkMerge [ (mkIf cfg.enable { - users.extraUsers = optionalAttrs (cfg.user == "mattermost") (singleton { + users.users = optionalAttrs (cfg.user == "mattermost") (singleton { name = "mattermost"; group = cfg.group; uid = config.ids.uids.mattermost; home = cfg.statePath; }); - users.extraGroups = optionalAttrs (cfg.group == "mattermost") (singleton { + users.groups = optionalAttrs (cfg.group == "mattermost") (singleton { name = "mattermost"; gid = config.ids.gids.mattermost; }); diff --git a/nixos/modules/services/web-apps/nexus.nix b/nixos/modules/services/web-apps/nexus.nix index b0eaee6040e..30876889cf2 100644 --- a/nixos/modules/services/web-apps/nexus.nix +++ b/nixos/modules/services/web-apps/nexus.nix @@ -80,12 +80,12 @@ in }; config = mkIf cfg.enable { - users.extraUsers."${cfg.user}" = { + users.users."${cfg.user}" = { isSystemUser = true; group = cfg.group; }; - users.extraGroups."${cfg.group}" = {}; + users.groups."${cfg.group}" = {}; systemd.services.nexus = { description = "Sonatype Nexus3"; diff --git a/nixos/modules/services/web-apps/restya-board.nix b/nixos/modules/services/web-apps/restya-board.nix index cee725e8fe5..bc6689bdb27 100644 --- a/nixos/modules/services/web-apps/restya-board.nix +++ b/nixos/modules/services/web-apps/restya-board.nix @@ -358,13 +358,13 @@ in ''; }; - users.extraUsers.restya-board = { + users.users.restya-board = { isSystemUser = true; createHome = false; home = runDir; group = "restya-board"; }; - users.extraGroups.restya-board = {}; + users.groups.restya-board = {}; services.postgresql.enable = mkIf (isNull cfg.database.host) true; diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index 1646ee5964f..2b171aa1b2b 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -624,8 +624,8 @@ let }; users = optionalAttrs (cfg.user == "tt_rss") { - extraUsers.tt_rss.group = "tt_rss"; - extraGroups.tt_rss = {}; + users.tt_rss.group = "tt_rss"; + groups.tt_rss = {}; }; }; } diff --git a/nixos/modules/services/web-apps/virtlyst.nix b/nixos/modules/services/web-apps/virtlyst.nix index 2fc67435ce8..e5c0bff2168 100644 --- a/nixos/modules/services/web-apps/virtlyst.nix +++ b/nixos/modules/services/web-apps/virtlyst.nix @@ -50,7 +50,7 @@ in }; config = mkIf cfg.enable { - users.extraUsers.virtlyst = { + users.users.virtlyst = { home = stateDir; createHome = true; group = mkIf config.virtualisation.libvirtd.enable "libvirtd"; diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index f9f2511f45d..b71ff0531cc 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -658,14 +658,14 @@ in warnings = map (cfg: ''apache-httpd's port option is deprecated. Use listen = [{/*ip = "*"; */ port = ${toString cfg.port}";}]; instead'' ) (lib.filter (cfg: cfg.port != 0) allHosts); - users.extraUsers = optionalAttrs (mainCfg.user == "wwwrun") (singleton + users.users = optionalAttrs (mainCfg.user == "wwwrun") (singleton { name = "wwwrun"; group = mainCfg.group; description = "Apache httpd user"; uid = config.ids.uids.wwwrun; }); - users.extraGroups = optionalAttrs (mainCfg.group == "wwwrun") (singleton + users.groups = optionalAttrs (mainCfg.group == "wwwrun") (singleton { name = "wwwrun"; gid = config.ids.gids.wwwrun; }); diff --git a/nixos/modules/services/web-servers/caddy.nix b/nixos/modules/services/web-servers/caddy.nix index fe65fba42a4..4237cfdd919 100644 --- a/nixos/modules/services/web-servers/caddy.nix +++ b/nixos/modules/services/web-servers/caddy.nix @@ -93,13 +93,13 @@ in { }; }; - users.extraUsers.caddy = { + users.users.caddy = { group = "caddy"; uid = config.ids.uids.caddy; home = cfg.dataDir; createHome = true; }; - users.extraGroups.caddy.gid = config.ids.uids.caddy; + users.groups.caddy.gid = config.ids.uids.caddy; }; } diff --git a/nixos/modules/services/web-servers/hitch/default.nix b/nixos/modules/services/web-servers/hitch/default.nix index 895d02827f7..a6c4cbea122 100644 --- a/nixos/modules/services/web-servers/hitch/default.nix +++ b/nixos/modules/services/web-servers/hitch/default.nix @@ -102,7 +102,7 @@ with lib; environment.systemPackages = [ pkgs.hitch ]; - users.extraUsers.hitch.group = "hitch"; - users.extraGroups.hitch = {}; + users.users.hitch.group = "hitch"; + users.groups.hitch = {}; }; } diff --git a/nixos/modules/services/web-servers/lighttpd/default.nix b/nixos/modules/services/web-servers/lighttpd/default.nix index d23e810dcc6..7a3df26e47a 100644 --- a/nixos/modules/services/web-servers/lighttpd/default.nix +++ b/nixos/modules/services/web-servers/lighttpd/default.nix @@ -245,12 +245,12 @@ in serviceConfig.KillSignal = "SIGINT"; }; - users.extraUsers.lighttpd = { + users.users.lighttpd = { group = "lighttpd"; description = "lighttpd web server privilege separation user"; uid = config.ids.uids.lighttpd; }; - users.extraGroups.lighttpd.gid = config.ids.gids.lighttpd; + users.groups.lighttpd.gid = config.ids.gids.lighttpd; }; } diff --git a/nixos/modules/services/web-servers/lighttpd/inginious.nix b/nixos/modules/services/web-servers/lighttpd/inginious.nix index 8c813d116a5..5ff1796e92a 100644 --- a/nixos/modules/services/web-servers/lighttpd/inginious.nix +++ b/nixos/modules/services/web-servers/lighttpd/inginious.nix @@ -194,7 +194,7 @@ in storageDriver = mkDefault "overlay"; }; - users.extraUsers."lighttpd".extraGroups = [ "docker" ]; + users.users."lighttpd".extraGroups = [ "docker" ]; # Ensure that docker has pulled the required images. systemd.services.inginious-prefetch = { diff --git a/nixos/modules/services/web-servers/meguca.nix b/nixos/modules/services/web-servers/meguca.nix index 8ae86c67a29..18926cbdf38 100644 --- a/nixos/modules/services/web-servers/meguca.nix +++ b/nixos/modules/services/web-servers/meguca.nix @@ -139,7 +139,7 @@ in }; users = { - extraUsers.meguca = { + users.meguca = { description = "meguca server service user"; home = cfg.baseDir; createHome = true; @@ -147,7 +147,7 @@ in uid = config.ids.uids.meguca; }; - extraGroups.meguca = { + groups.meguca = { gid = config.ids.gids.meguca; members = [ "meguca" ]; }; diff --git a/nixos/modules/services/web-servers/mighttpd2.nix b/nixos/modules/services/web-servers/mighttpd2.nix index a888f623616..4e7082c6769 100644 --- a/nixos/modules/services/web-servers/mighttpd2.nix +++ b/nixos/modules/services/web-servers/mighttpd2.nix @@ -119,13 +119,13 @@ in { }; }; - users.extraUsers.mighttpd2 = { + users.users.mighttpd2 = { group = "mighttpd2"; uid = config.ids.uids.mighttpd2; isSystemUser = true; }; - users.extraGroups.mighttpd2.gid = config.ids.gids.mighttpd2; + users.groups.mighttpd2.gid = config.ids.gids.mighttpd2; }; meta.maintainers = with lib.maintainers; [ fgaz ]; diff --git a/nixos/modules/services/web-servers/minio.nix b/nixos/modules/services/web-servers/minio.nix index 7ead33483ea..f78a966989b 100644 --- a/nixos/modules/services/web-servers/minio.nix +++ b/nixos/modules/services/web-servers/minio.nix @@ -101,11 +101,11 @@ in }; }; - users.extraUsers.minio = { + users.users.minio = { group = "minio"; uid = config.ids.uids.minio; }; - users.extraGroups.minio.gid = config.ids.uids.minio; + users.groups.minio.gid = config.ids.uids.minio; }; } diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 0aa780bf6da..355976c4b7c 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -613,13 +613,13 @@ in listToAttrs acmePairs ); - users.extraUsers = optionalAttrs (cfg.user == "nginx") (singleton + users.users = optionalAttrs (cfg.user == "nginx") (singleton { name = "nginx"; group = cfg.group; uid = config.ids.uids.nginx; }); - users.extraGroups = optionalAttrs (cfg.group == "nginx") (singleton + users.groups = optionalAttrs (cfg.group == "nginx") (singleton { name = "nginx"; gid = config.ids.gids.nginx; }); diff --git a/nixos/modules/services/web-servers/tomcat.nix b/nixos/modules/services/web-servers/tomcat.nix index bc713a08f18..d8ccb7ca65d 100644 --- a/nixos/modules/services/web-servers/tomcat.nix +++ b/nixos/modules/services/web-servers/tomcat.nix @@ -166,12 +166,12 @@ in config = mkIf config.services.tomcat.enable { - users.extraGroups = singleton + users.groups = singleton { name = "tomcat"; gid = config.ids.gids.tomcat; }; - users.extraUsers = singleton + users.users = singleton { name = "tomcat"; uid = config.ids.uids.tomcat; description = "Tomcat user"; diff --git a/nixos/modules/services/web-servers/traefik.nix b/nixos/modules/services/web-servers/traefik.nix index b6c7fef21fb..700202b1d28 100644 --- a/nixos/modules/services/web-servers/traefik.nix +++ b/nixos/modules/services/web-servers/traefik.nix @@ -114,12 +114,12 @@ in { }; }; - users.extraUsers.traefik = { + users.users.traefik = { group = "traefik"; home = cfg.dataDir; createHome = true; }; - users.extraGroups.traefik = {}; + users.groups.traefik = {}; }; } diff --git a/nixos/modules/services/web-servers/uwsgi.nix b/nixos/modules/services/web-servers/uwsgi.nix index 356b896a6dc..3ef78ea77cb 100644 --- a/nixos/modules/services/web-servers/uwsgi.nix +++ b/nixos/modules/services/web-servers/uwsgi.nix @@ -150,13 +150,13 @@ in { }; }; - users.extraUsers = optionalAttrs (cfg.user == "uwsgi") (singleton + users.users = optionalAttrs (cfg.user == "uwsgi") (singleton { name = "uwsgi"; group = cfg.group; uid = config.ids.uids.uwsgi; }); - users.extraGroups = optionalAttrs (cfg.group == "uwsgi") (singleton + users.groups = optionalAttrs (cfg.group == "uwsgi") (singleton { name = "uwsgi"; gid = config.ids.gids.uwsgi; }); diff --git a/nixos/modules/services/web-servers/varnish/default.nix b/nixos/modules/services/web-servers/varnish/default.nix index bc74d62b116..63f967185c2 100644 --- a/nixos/modules/services/web-servers/varnish/default.nix +++ b/nixos/modules/services/web-servers/varnish/default.nix @@ -103,11 +103,11 @@ in }) ]; - users.extraUsers.varnish = { + users.users.varnish = { group = "varnish"; uid = config.ids.uids.varnish; }; - users.extraGroups.varnish.gid = config.ids.uids.varnish; + users.groups.varnish.gid = config.ids.uids.varnish; }; } diff --git a/nixos/modules/services/web-servers/zope2.nix b/nixos/modules/services/web-servers/zope2.nix index 496e34db4a9..1dcc3ac9d8d 100644 --- a/nixos/modules/services/web-servers/zope2.nix +++ b/nixos/modules/services/web-servers/zope2.nix @@ -103,7 +103,7 @@ in config = mkIf (cfg.instances != {}) { - users.extraUsers.zope2.uid = config.ids.uids.zope2; + users.users.zope2.uid = config.ids.uids.zope2; systemd.services = let diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index a6a38a21b61..8b08c01ea0d 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -89,7 +89,7 @@ in services.xserver.displayManager.slim.enable = false; - users.extraUsers.gdm = + users.users.gdm = { name = "gdm"; uid = config.ids.uids.gdm; group = "gdm"; @@ -97,7 +97,7 @@ in description = "GDM user"; }; - users.extraGroups.gdm.gid = config.ids.gids.gdm; + users.groups.gdm.gid = config.ids.gids.gdm; # GDM needs different xserverArgs, presumable because using wayland by default. services.xserver.tty = null; diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 5beadacdfa9..206ede227ef 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -42,7 +42,7 @@ let '' [LightDM] ${optionalString cfg.greeter.enable '' - greeter-user = ${config.users.extraUsers.lightdm.name} + greeter-user = ${config.users.users.lightdm.name} greeters-directory = ${cfg.greeter.package} ''} sessions-directory = ${dmcfg.session.desktops} @@ -252,14 +252,14 @@ in session include lightdm ''; - users.extraUsers.lightdm = { + users.users.lightdm = { createHome = true; home = "/var/lib/lightdm-data"; group = "lightdm"; uid = config.ids.uids.lightdm; }; - users.extraGroups.lightdm.gid = config.ids.gids.lightdm; + users.groups.lightdm.gid = config.ids.gids.lightdm; services.xserver.tty = null; # We might start multiple X servers so let the tty increment themselves.. services.xserver.display = null; # We specify our own display (and logfile) in xserver-wrapper up there }; diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix index df782e82ed1..8db7414e811 100644 --- a/nixos/modules/services/x11/display-managers/sddm.nix +++ b/nixos/modules/services/x11/display-managers/sddm.nix @@ -268,7 +268,7 @@ in ''; }; - users.extraUsers.sddm = { + users.users.sddm = { createHome = true; home = "/var/lib/sddm"; group = "sddm"; @@ -277,7 +277,7 @@ in environment.etc."sddm.conf".source = cfgFile; - users.extraGroups.sddm.gid = config.ids.gids.sddm; + users.groups.sddm.gid = config.ids.gids.sddm; environment.systemPackages = [ sddm ]; services.dbus.packages = [ sddm ]; diff --git a/nixos/modules/system/boot/initrd-ssh.nix b/nixos/modules/system/boot/initrd-ssh.nix index 8b3dc2d90eb..53e993603e2 100644 --- a/nixos/modules/system/boot/initrd-ssh.nix +++ b/nixos/modules/system/boot/initrd-ssh.nix @@ -79,7 +79,7 @@ in boot.initrd.network.ssh.authorizedKeys = mkOption { type = types.listOf types.str; - default = config.users.extraUsers.root.openssh.authorizedKeys.keys; + default = config.users.users.root.openssh.authorizedKeys.keys; description = '' Authorized keys for the root user on initrd. ''; diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index d2fe33488a7..6593b1a0243 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -798,13 +798,13 @@ in mkdir -m 0700 -p /var/log/journal ''; - users.extraUsers.systemd-network.uid = config.ids.uids.systemd-network; - users.extraGroups.systemd-network.gid = config.ids.gids.systemd-network; - users.extraUsers.systemd-resolve.uid = config.ids.uids.systemd-resolve; - users.extraGroups.systemd-resolve.gid = config.ids.gids.systemd-resolve; + users.users.systemd-network.uid = config.ids.uids.systemd-network; + users.groups.systemd-network.gid = config.ids.gids.systemd-network; + users.users.systemd-resolve.uid = config.ids.uids.systemd-resolve; + users.groups.systemd-resolve.gid = config.ids.gids.systemd-resolve; # Target for ‘charon send-keys’ to hook into. - users.extraGroups.keys.gid = config.ids.gids.keys; + users.groups.keys.gid = config.ids.gids.keys; systemd.targets.keys = { description = "Security Keys"; @@ -840,9 +840,9 @@ in "TMPFS_XATTR" "SECCOMP" ]; - users.extraGroups.systemd-journal.gid = config.ids.gids.systemd-journal; - users.extraUsers.systemd-journal-gateway.uid = config.ids.uids.systemd-journal-gateway; - users.extraGroups.systemd-journal-gateway.gid = config.ids.gids.systemd-journal-gateway; + users.groups.systemd-journal.gid = config.ids.gids.systemd-journal; + users.users.systemd-journal-gateway.uid = config.ids.uids.systemd-journal-gateway; + users.groups.systemd-journal-gateway.gid = config.ids.gids.systemd-journal-gateway; # Generate timer units for all services that have a ‘startAt’ value. systemd.timers = diff --git a/nixos/modules/system/boot/timesyncd.nix b/nixos/modules/system/boot/timesyncd.nix index 57853c5698d..18aad58b36c 100644 --- a/nixos/modules/system/boot/timesyncd.nix +++ b/nixos/modules/system/boot/timesyncd.nix @@ -37,8 +37,8 @@ with lib; NTP=${concatStringsSep " " config.services.timesyncd.servers} ''; - users.extraUsers.systemd-timesync.uid = config.ids.uids.systemd-timesync; - users.extraGroups.systemd-timesync.gid = config.ids.gids.systemd-timesync; + users.users.systemd-timesync.uid = config.ids.uids.systemd-timesync; + users.groups.systemd-timesync.gid = config.ids.gids.systemd-timesync; }; diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix index 3d46ba72493..7a7fcbecd64 100644 --- a/nixos/modules/testing/test-instrumentation.nix +++ b/nixos/modules/testing/test-instrumentation.nix @@ -126,7 +126,7 @@ in networking.usePredictableInterfaceNames = false; # Make it easy to log in as root when running the test interactively. - users.extraUsers.root.initialHashedPassword = mkOverride 150 ""; + users.users.root.initialHashedPassword = mkOverride 150 ""; services.xserver.displayManager.job.logToJournal = true; diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix index a9a2095499a..a1a32c1c59a 100644 --- a/nixos/modules/virtualisation/docker.nix +++ b/nixos/modules/virtualisation/docker.nix @@ -141,7 +141,7 @@ in config = mkIf cfg.enable (mkMerge [{ environment.systemPackages = [ cfg.package ]; - users.extraGroups.docker.gid = config.ids.gids.docker; + users.groups.docker.gid = config.ids.gids.docker; systemd.packages = [ cfg.package ]; systemd.services.docker = { diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index 024db7f87c2..87409db4320 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -108,7 +108,7 @@ in { boot.kernelModules = [ "tun" ]; - users.extraGroups.libvirtd.gid = config.ids.gids.libvirtd; + users.groups.libvirtd.gid = config.ids.gids.libvirtd; systemd.packages = [ pkgs.libvirt ]; diff --git a/nixos/modules/virtualisation/lxc-container.nix b/nixos/modules/virtualisation/lxc-container.nix index 0208787e779..dbb7b881955 100644 --- a/nixos/modules/virtualisation/lxc-container.nix +++ b/nixos/modules/virtualisation/lxc-container.nix @@ -8,7 +8,7 @@ with lib; ]; # Allow the user to login as root without password. - users.extraUsers.root.initialHashedPassword = mkOverride 150 ""; + users.users.root.initialHashedPassword = mkOverride 150 ""; # Some more help text. services.mingetty.helpLine = diff --git a/nixos/modules/virtualisation/lxd.nix b/nixos/modules/virtualisation/lxd.nix index 3e76cdacfc4..505c11abd20 100644 --- a/nixos/modules/virtualisation/lxd.nix +++ b/nixos/modules/virtualisation/lxd.nix @@ -73,9 +73,9 @@ in }; - users.extraGroups.lxd.gid = config.ids.gids.lxd; + users.groups.lxd.gid = config.ids.gids.lxd; - users.extraUsers.root = { + users.users.root = { subUidRanges = [ { startUid = 1000000; count = 65536; } ]; subGidRanges = [ { startGid = 1000000; count = 65536; } ]; }; diff --git a/nixos/modules/virtualisation/rkt.nix b/nixos/modules/virtualisation/rkt.nix index 98be4f680c3..fd662b52df5 100644 --- a/nixos/modules/virtualisation/rkt.nix +++ b/nixos/modules/virtualisation/rkt.nix @@ -59,6 +59,6 @@ in }; }; - users.extraGroups.rkt = {}; + users.groups.rkt = {}; }; } diff --git a/nixos/modules/virtualisation/virtualbox-guest.nix b/nixos/modules/virtualisation/virtualbox-guest.nix index 5da4b7e3baf..78c6f740788 100644 --- a/nixos/modules/virtualisation/virtualbox-guest.nix +++ b/nixos/modules/virtualisation/virtualbox-guest.nix @@ -44,7 +44,7 @@ in boot.supportedFilesystems = [ "vboxsf" ]; boot.initrd.supportedFilesystems = [ "vboxsf" ]; - users.extraGroups.vboxsf.gid = config.ids.gids.vboxsf; + users.groups.vboxsf.gid = config.ids.gids.vboxsf; systemd.services.virtualbox = { description = "VirtualBox Guest Services"; diff --git a/nixos/modules/virtualisation/virtualbox-host.nix b/nixos/modules/virtualisation/virtualbox-host.nix index 885d752577d..8adf3aa919d 100644 --- a/nixos/modules/virtualisation/virtualbox-host.nix +++ b/nixos/modules/virtualisation/virtualbox-host.nix @@ -86,7 +86,7 @@ in "VirtualBox" ])); - users.extraGroups.vboxusers.gid = config.ids.gids.vboxusers; + users.groups.vboxusers.gid = config.ids.gids.vboxusers; services.udev.extraRules = '' From 11551f06e2b3f09df57365b175494679c14bc2e3 Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Sat, 30 Jun 2018 16:35:49 +0100 Subject: [PATCH 18/56] Update Python documentation overlay Using a recursive attribute set is not recommended. --- doc/languages-frameworks/python.section.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index c4a5bb0612c..8cdee6a3f00 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -1029,7 +1029,7 @@ To alter a python package using overlays, you would use the following approach: ```nix self: super: -rec { +{ python = super.python.override { packageOverrides = python-self: python-super: { bepasty-server = python-super.bepasty-server.overrideAttrs ( oldAttrs: { @@ -1041,7 +1041,7 @@ rec { }); }; }; - pythonPackages = python.pkgs; + pythonPackages = self.python.pkgs; } ``` From 95175cff45d7b19e7f91a58f46de2421fdc22e62 Mon Sep 17 00:00:00 2001 From: Masayuki Takeda Date: Sat, 30 Jun 2018 15:39:12 -0400 Subject: [PATCH 19/56] source-han-code-jp: init at 2.011R --- .../data/fonts/source-han-code-jp/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/data/fonts/source-han-code-jp/default.nix diff --git a/pkgs/data/fonts/source-han-code-jp/default.nix b/pkgs/data/fonts/source-han-code-jp/default.nix new file mode 100644 index 00000000000..fc016a457c2 --- /dev/null +++ b/pkgs/data/fonts/source-han-code-jp/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchzip }: + +let + pname = "source-han-code-jp"; + version = "2.011R"; +in fetchzip { + name = "${pname}-${version}"; + + url = "https://github.com/adobe-fonts/${pname}/archive/${version}.zip"; + + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + ''; + + sha256 = "184vrjkymcm29k1cx00cdvjchzqr1w17925lmh85f0frx7vwljcd"; + + meta = { + description = "A monospaced Latin font suitable for coding"; + maintainers = with stdenv.lib.maintainers; [ mt-caret ]; + platforms = with stdenv.lib.platforms; all; + homepage = https://blogs.adobe.com/CCJKType/2015/06/source-han-code-jp.html; + license = stdenv.lib.licenses.ofl; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a43f04e9411..e2c4b4081e9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14887,6 +14887,8 @@ with pkgs; source-serif-pro = callPackage ../data/fonts/source-serif-pro { }; + source-han-code-jp = callPackage ../data/fonts/source-han-code-jp { }; + sourceHanSansPackages = callPackage ../data/fonts/source-han-sans { }; source-han-sans-japanese = sourceHanSansPackages.japanese; source-han-sans-korean = sourceHanSansPackages.korean; From 70acec8ae5555742671b379e32140c29d3c87169 Mon Sep 17 00:00:00 2001 From: Okina Matara Date: Sat, 30 Jun 2018 19:58:14 -0500 Subject: [PATCH 20/56] nodePackages: meguca: use node2nix 1.6.0 --- .../node-packages/composition-v10.nix | 4 +- .../node-packages/composition-v6.nix | 2 +- .../node-packages/composition-v8.nix | 2 +- pkgs/development/node-packages/node-env.nix | 81 +- .../node-packages/node-packages-v10.nix | 64 +- .../node-packages/node-packages-v6.nix | 7235 ++++++++++------- .../node-packages/node-packages-v8.nix | 1166 +-- 7 files changed, 4919 insertions(+), 3635 deletions(-) diff --git a/pkgs/development/node-packages/composition-v10.nix b/pkgs/development/node-packages/composition-v10.nix index 2eea07b6380..9f723a6da47 100644 --- a/pkgs/development/node-packages/composition-v10.nix +++ b/pkgs/development/node-packages/composition-v10.nix @@ -1,8 +1,8 @@ -# This file has been generated by node2nix 1.5.3. Do not edit! +# This file has been generated by node2nix 1.6.0. Do not edit! {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-4_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}: let nodeEnv = import ./node-env.nix { diff --git a/pkgs/development/node-packages/composition-v6.nix b/pkgs/development/node-packages/composition-v6.nix index 2252bab3a79..ce42bfa7ba3 100644 --- a/pkgs/development/node-packages/composition-v6.nix +++ b/pkgs/development/node-packages/composition-v6.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.5.3. Do not edit! +# This file has been generated by node2nix 1.6.0. Do not edit! {pkgs ? import { inherit system; diff --git a/pkgs/development/node-packages/composition-v8.nix b/pkgs/development/node-packages/composition-v8.nix index 96266105942..7ca3e6b925a 100644 --- a/pkgs/development/node-packages/composition-v8.nix +++ b/pkgs/development/node-packages/composition-v8.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.5.3. Do not edit! +# This file has been generated by node2nix 1.6.0. Do not edit! {pkgs ? import { inherit system; diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix index fc118a788ea..720e0cc0850 100644 --- a/pkgs/development/node-packages/node-env.nix +++ b/pkgs/development/node-packages/node-env.nix @@ -27,7 +27,7 @@ let buildInputs = [ nodejs ]; buildPhase = '' export HOME=$TMPDIR - tgzFile=$(npm pack) + tgzFile=$(npm pack | tail -n 1) # Hooks to the pack command will add output (https://docs.npmjs.com/misc/scripts) ''; installPhase = '' mkdir -p $out/tarballs @@ -309,31 +309,42 @@ let }; # Builds and composes an NPM package including all its dependencies - buildNodePackage = { name, packageName, version, dependencies ? [], production ? true, npmFlags ? "", dontNpmInstall ? false, bypassCache ? false, preRebuild ? "", ... }@args: + buildNodePackage = + { name + , packageName + , version + , dependencies ? [] + , buildInputs ? [] + , production ? true + , npmFlags ? "" + , dontNpmInstall ? false + , bypassCache ? false + , preRebuild ? "" + , dontStrip ? true + , unpackPhase ? "true" + , buildPhase ? "true" + , ... }@args: let forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ]; in - stdenv.lib.makeOverridable stdenv.mkDerivation (builtins.removeAttrs args [ "dependencies" ] // { + stdenv.mkDerivation ({ name = "node-${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ stdenv.lib.optional (stdenv.isDarwin) libtool - ++ args.buildInputs or []; - dontStrip = args.dontStrip or true; # Striping may fail a build for some package deployments + ++ buildInputs; - inherit dontNpmInstall preRebuild; - - unpackPhase = args.unpackPhase or "true"; - - buildPhase = args.buildPhase or "true"; + inherit dontStrip; # Stripping may fail a build for some package deployments + inherit dontNpmInstall preRebuild unpackPhase buildPhase; compositionScript = composePackage args; pinpointDependenciesScript = pinpointDependenciesOfPackage args; passAsFile = [ "compositionScript" "pinpointDependenciesScript" ]; - installPhase = args.installPhase or '' + installPhase = '' # Create and enter a root node_modules/ folder mkdir -p $out/lib/node_modules cd $out/lib/node_modules @@ -406,27 +417,47 @@ let # Run post install hook, if provided runHook postInstall ''; - }); + } // extraArgs); # Builds a development shell - buildNodeShell = { name, packageName, version, src, dependencies ? [], production ? true, npmFlags ? "", dontNpmInstall ? false, bypassCache ? false, ... }@args: + buildNodeShell = + { name + , packageName + , version + , src + , dependencies ? [] + , buildInputs ? [] + , production ? true + , npmFlags ? "" + , dontNpmInstall ? false + , bypassCache ? false + , dontStrip ? true + , unpackPhase ? "true" + , buildPhase ? "true" + , ... }@args: + let forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; - nodeDependencies = stdenv.mkDerivation { + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ]; + + nodeDependencies = stdenv.mkDerivation ({ name = "node-dependencies-${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ stdenv.lib.optional (stdenv.isDarwin) libtool - ++ args.buildInputs or []; + ++ buildInputs; + + inherit dontStrip; # Stripping may fail a build for some package deployments + inherit dontNpmInstall unpackPhase buildPhase; includeScript = includeDependencies { inherit dependencies; }; pinpointDependenciesScript = pinpointDependenciesOfPackage args; passAsFile = [ "includeScript" "pinpointDependenciesScript" ]; - buildCommand = '' + installPhase = '' mkdir -p $out/${packageName} cd $out/${packageName} @@ -438,13 +469,15 @@ let ${stdenv.lib.optionalString bypassCache '' if [ -f ${src}/package-lock.json ] then - cp ${src}/package-lock.json . + cp ${src}/package-lock.json . fi ''} # Pinpoint the versions of all dependencies to the ones that are actually being used echo "pinpointing versions of dependencies..." cd .. + ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + source $pinpointDependenciesScriptPath cd ${packageName} @@ -474,15 +507,17 @@ let ''} cd .. + ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + mv ${packageName} lib ln -s $out/lib/node_modules/.bin $out/bin ''; - }; + } // extraArgs); in - stdenv.lib.makeOverridable stdenv.mkDerivation { + stdenv.mkDerivation { name = "node-shell-${name}-${version}"; - buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ args.buildInputs or []; + buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ buildInputs; buildCommand = '' mkdir -p $out/bin cat > $out/bin/shell < Date: Sat, 30 Jun 2018 20:10:28 -0500 Subject: [PATCH 21/56] meguca: 2018-06-29 -> 2018-07-01 --- pkgs/servers/meguca/default.nix | 6 +++--- pkgs/servers/meguca/server_deps.nix | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/meguca/default.nix b/pkgs/servers/meguca/default.nix index 6b170c8fec0..f8bad09e711 100644 --- a/pkgs/servers/meguca/default.nix +++ b/pkgs/servers/meguca/default.nix @@ -4,15 +4,15 @@ buildGoPackage rec { name = "meguca-unstable-${version}"; - version = "2018-06-29"; - rev = "504f872ebee46b8f6c165523a9fcbcd6ddbf8dc2"; + version = "2018-07-01"; + rev = "80db8298b6546c93944251c17fe03371e521671f"; goPackagePath = "github.com/bakape/meguca"; goDeps = ./server_deps.nix; src = fetchgit { inherit rev; url = "https://github.com/bakape/meguca"; - sha256 = "1xjhz4lh4alk30vk03l5qs0c9x6a2023d5gvq59ss8slp9zp8ssa"; + sha256 = "1yix0kxsjm9f3zw9jx2nb3pl8pbqjfhbvbrz42m1h20b1h02s5ml"; fetchSubmodules = true; }; diff --git a/pkgs/servers/meguca/server_deps.nix b/pkgs/servers/meguca/server_deps.nix index 7bdf498bdc3..b2e31515ab4 100644 --- a/pkgs/servers/meguca/server_deps.nix +++ b/pkgs/servers/meguca/server_deps.nix @@ -36,6 +36,15 @@ sha256 = "0maqk0rwp39kcc64w4mfkgcvn2q76hqwziwc3g7ckc1qpwxql5z3"; }; } + { + goPackagePath = "github.com/badoux/goscraper"; + fetch = { + type = "git"; + url = "https://github.com/badoux/goscraper"; + rev = "0213ced7087832e81e8892e8d044150cfc153856"; + sha256 = "0bw5g6h0hypd38z8gfbh40pbw824n4qhk3c0kasw6gn4darx972w"; + }; + } { goPackagePath = "github.com/bakape/mnemonics"; fetch = { @@ -234,6 +243,15 @@ sha256 = "020q1laxjx5kcmnqy4wmdb63zhb0lyq6wpy40axhswzg2nd21s44"; }; } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "4cb1c02c05b0e749b0365f61ae859a8e0cfceed9"; + sha256 = "05xdcj0pn245y3gpy9p5iamx09424zqwh1w34gwwn5kh51ybgv7k"; + }; + } { goPackagePath = "golang.org/x/sys"; fetch = { From cd3723bd045d01f67197115ef2712c78ead323f7 Mon Sep 17 00:00:00 2001 From: Uri Baghin Date: Sat, 30 Jun 2018 20:48:09 +1000 Subject: [PATCH 22/56] bazel: fix darwin build on hydra --- .../tools/build-managers/bazel/default.nix | 413 +++++++++++++++++- pkgs/top-level/all-packages.nix | 6 +- 2 files changed, 405 insertions(+), 14 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 28214e94c7a..112cd840a9f 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -1,9 +1,9 @@ -{ stdenv, lib, fetchurl, jdk, zip, unzip, bash, writeCBin, coreutils, makeWrapper, which, python, gnused +{ stdenv, lib, writeText, writeScript, fetchurl, jdk, zip, unzip, bash, writeCBin, coreutils, binutils, makeWrapper, which, python, gnused # Always assume all markers valid (don't redownload dependencies). # Also, don't clean up environment variables. , enableNixHacks ? false # Apple dependencies -, libcxx, CoreFoundation, CoreServices, Foundation +, cctools, clang, libcxx, CoreFoundation, CoreServices, Foundation }: stdenv.mkDerivation rec { @@ -56,9 +56,396 @@ stdenv.mkDerivation rec { } ''; + buildFile = writeText "BUILD" '' + package(default_visibility = ['//visibility:public']) + + filegroup(name = "empty") + + cc_toolchain_suite( + name = "nix", + toolchains = { + "darwin|compiler": ":nix_darwin_toolchain", + "k8|compiler": ":nix_linux_toolchain", + }, + ) + + cc_toolchain( + name = "nix_darwin_toolchain", + all_files = ":osx_wrapper", + compiler_files = ":osx_wrapper", + cpu = "darwin", + dwp_files = ":empty", + dynamic_runtime_libs = [":empty"], + linker_files = ":osx_wrapper", + objcopy_files = ":empty", + static_runtime_libs = [":empty"], + strip_files = ":empty", + supports_param_files = 0, + ) + + cc_toolchain( + name = "nix_linux_toolchain", + all_files = ":empty", + compiler_files = ":empty", + cpu = "k8", + dwp_files = ":empty", + dynamic_runtime_libs = [":empty"], + linker_files = ":empty", + objcopy_files = ":empty", + static_runtime_libs = [":empty"], + strip_files = ":empty", + supports_param_files = 0, + ) + + filegroup( + name = "osx_wrapper", + srcs = ["osx_cc_wrapper.sh"], + ) + ''; + + crosstoolFile = writeText "CROSSTOOL" ('' + major_version: "local" + minor_version: "" + default_target_cpu: "same_as_host" + '' + lib.optionalString stdenv.isDarwin '' + default_toolchain { + cpu: "darwin" + toolchain_identifier: "local_darwin" + } + toolchain { + abi_version: "local" + abi_libc_version: "local" + builtin_sysroot: "" + compiler: "compiler" + host_system_name: "local" + needsPic: true + target_libc: "macosx" + target_cpu: "darwin" + target_system_name: "local" + toolchain_identifier: "local_darwin" + + tool_path { name: "ar" path: "${cctools}/bin/libtool" } + tool_path { name: "compat-ld" path: "${cctools}/bin/ld" } + tool_path { name: "cpp" path: "${clang}/bin/cpp" } + tool_path { name: "dwp" path: "${coreutils}/bin/false" } + tool_path { name: "gcc" path: "osx_cc_wrapper.sh" } + cxx_flag: "-std=c++0x" + linker_flag: "-lstdc++" + linker_flag: "-undefined" + linker_flag: "dynamic_lookup" + linker_flag: "-headerpad_max_install_names" + # We know all files in `/nix/store` are immutable so it's safe to disable inclusion checks for them + cxx_builtin_include_directory: "/nix/store" + tool_path { name: "gcov" path: "${coreutils}/bin/false" } + tool_path { name: "ld" path: "${cctools}/bin/ld" } + tool_path { name: "nm" path: "${cctools}/bin/nm" } + tool_path { name: "objcopy" path: "${binutils}/bin/objcopy" } + objcopy_embed_flag: "-I" + objcopy_embed_flag: "binary" + tool_path { name: "objdump" path: "${binutils}/bin/objdump" } + tool_path { name: "strip" path: "${cctools}/bin/strip" } + + # Anticipated future default. + unfiltered_cxx_flag: "-no-canonical-prefixes" + + # Make C++ compilation deterministic. Use linkstamping instead of these + # compiler symbols. + unfiltered_cxx_flag: "-Wno-builtin-macro-redefined" + unfiltered_cxx_flag: "-D__DATE__=\"redacted\"" + unfiltered_cxx_flag: "-D__TIMESTAMP__=\"redacted\"" + unfiltered_cxx_flag: "-D__TIME__=\"redacted\"" + + # Security hardening on by default. + # Conservative choice; -D_FORTIFY_SOURCE=2 may be unsafe in some cases. + compiler_flag: "-D_FORTIFY_SOURCE=1" + compiler_flag: "-fstack-protector" + + # Enable coloring even if there's no attached terminal. Bazel removes the + # escape sequences if --nocolor is specified. + compiler_flag: "-fcolor-diagnostics" + + # All warnings are enabled. Maybe enable -Werror as well? + compiler_flag: "-Wall" + # Enable a few more warnings that aren't part of -Wall. + compiler_flag: "-Wthread-safety" + compiler_flag: "-Wself-assign" + + # Keep stack frames for debugging, even in opt mode. + compiler_flag: "-fno-omit-frame-pointer" + + # Anticipated future default. + linker_flag: "-no-canonical-prefixes" + + compilation_mode_flags { + mode: DBG + # Enable debug symbols. + compiler_flag: "-g" + } + compilation_mode_flags { + mode: OPT + # No debug symbols. + # Maybe we should enable https://gcc.gnu.org/wiki/DebugFission for opt or even generally? + # However, that can't happen here, as it requires special handling in Bazel. + compiler_flag: "-g0" + + # Conservative choice for -O + # -O3 can increase binary size and even slow down the resulting binaries. + # Profile first and / or use FDO if you need better performance than this. + compiler_flag: "-O2" + + # Disable assertions + compiler_flag: "-DNDEBUG" + + # Removal of unused code and data at link time (can this increase binary size in some cases?). + compiler_flag: "-ffunction-sections" + compiler_flag: "-fdata-sections" + } + linking_mode_flags { mode: DYNAMIC } + } + '' + lib.optionalString stdenv.isLinux '' + default_toolchain { + cpu: "k8" + toolchain_identifier: "local_linux" + } + + toolchain { + abi_version: "local" + abi_libc_version: "local" + builtin_sysroot: "" + compiler: "compiler" + host_system_name: "local" + needsPic: true + supports_gold_linker: false + supports_incremental_linker: false + supports_fission: false + supports_interface_shared_objects: false + supports_normalizing_ar: false + supports_start_end_lib: false + target_libc: "local" + target_cpu: "k8" + target_system_name: "local" + toolchain_identifier: "local_linux" + + tool_path { name: "ar" path: "${binutils}/bin/ar" } + tool_path { name: "compat-ld" path: "${binutils}/bin/ld" } + tool_path { name: "cpp" path: "${stdenv.cc}/bin/cpp" } + tool_path { name: "dwp" path: "${coreutils}/bin/false" } + tool_path { name: "gcc" path: "${stdenv.cc}/bin/cc" } + cxx_flag: "-std=c++0x" + linker_flag: "-lstdc++" + # We know all files in `/nix/store` are immutable so it's safe to disable inclusion checks for them + cxx_builtin_include_directory: "/nix/store" + tool_path { name: "gcov" path: "${coreutils}/bin/false" } + + # C(++) compiles invoke the compiler (as that is the one knowing where + # to find libraries), but we provide LD so other rules can invoke the linker. + tool_path { name: "ld" path: "${binutils}/bin/ld" } + + tool_path { name: "nm" path: "${binutils}/bin/nm" } + tool_path { name: "objcopy" path: "${binutils}/bin/objcopy" } + objcopy_embed_flag: "-I" + objcopy_embed_flag: "binary" + tool_path { name: "objdump" path: "${binutils}/bin/objdump" } + tool_path { name: "strip" path: "${binutils}/bin/strip" } + + # Anticipated future default. + unfiltered_cxx_flag: "-no-canonical-prefixes" + unfiltered_cxx_flag: "-fno-canonical-system-headers" + + # Make C++ compilation deterministic. Use linkstamping instead of these + # compiler symbols. + unfiltered_cxx_flag: "-Wno-builtin-macro-redefined" + unfiltered_cxx_flag: "-D__DATE__=\"redacted\"" + unfiltered_cxx_flag: "-D__TIMESTAMP__=\"redacted\"" + unfiltered_cxx_flag: "-D__TIME__=\"redacted\"" + + # Security hardening on by default. + # Conservative choice; -D_FORTIFY_SOURCE=2 may be unsafe in some cases. + # We need to undef it before redefining it as some distributions now have + # it enabled by default. + compiler_flag: "-U_FORTIFY_SOURCE" + compiler_flag: "-D_FORTIFY_SOURCE=1" + compiler_flag: "-fstack-protector" + linker_flag: "-Wl,-z,relro,-z,now" + + # Enable coloring even if there's no attached terminal. Bazel removes the + # escape sequences if --nocolor is specified. This isn't supported by gcc + # on Ubuntu 14.04. + # compiler_flag: "-fcolor-diagnostics" + + # All warnings are enabled. Maybe enable -Werror as well? + compiler_flag: "-Wall" + # Enable a few more warnings that aren't part of -Wall. + compiler_flag: "-Wunused-but-set-parameter" + # But disable some that are problematic. + compiler_flag: "-Wno-free-nonheap-object" # has false positives + + # Keep stack frames for debugging, even in opt mode. + compiler_flag: "-fno-omit-frame-pointer" + + # Anticipated future default. + linker_flag: "-no-canonical-prefixes" + # Have gcc return the exit code from ld. + linker_flag: "-pass-exit-codes" + # Gold linker only? Can we enable this by default? + # linker_flag: "-Wl,--warn-execstack" + # linker_flag: "-Wl,--detect-odr-violations" + + compilation_mode_flags { + mode: DBG + # Enable debug symbols. + compiler_flag: "-g" + } + compilation_mode_flags { + mode: OPT + + # No debug symbols. + # Maybe we should enable https://gcc.gnu.org/wiki/DebugFission for opt or + # even generally? However, that can't happen here, as it requires special + # handling in Bazel. + compiler_flag: "-g0" + + # Conservative choice for -O + # -O3 can increase binary size and even slow down the resulting binaries. + # Profile first and / or use FDO if you need better performance than this. + compiler_flag: "-O2" + + # Disable assertions + compiler_flag: "-DNDEBUG" + + # Removal of unused code and data at link time (can this increase binary size in some cases?). + compiler_flag: "-ffunction-sections" + compiler_flag: "-fdata-sections" + linker_flag: "-Wl,--gc-sections" + } + linking_mode_flags { mode: DYNAMIC } + } + ''); + + osxCcWrapperFile = writeScript "osx_cc_wrapper.sh" (if stdenv.isDarwin then '' + #!${customBash}/bin/bash + # + # Copyright 2015 The Bazel Authors. All rights reserved. + # + # Licensed under the Apache License, Version 2.0 (the "License"); + # you may not use this file except in compliance with the License. + # You may obtain a copy of the License at + # + # http://www.apache.org/licenses/LICENSE-2.0 + # + # Unless required by applicable law or agreed to in writing, software + # distributed under the License is distributed on an "AS IS" BASIS, + # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + # See the License for the specific language governing permissions and + # limitations under the License. + # + # OS X relpath is not really working. This is a wrapper script around gcc + # to simulate relpath behavior. + # + # This wrapper uses install_name_tool to replace all paths in the binary + # (bazel-out/.../path/to/original/library.so) by the paths relative to + # the binary. It parses the command line to behave as rpath is supposed + # to work. + # + # See https://blogs.oracle.com/dipol/entry/dynamic_libraries_rpath_and_mac + # on how to set those paths for Mach-O binaries. + # + set -eu + + GCC="${clang}/bin/clang" + INSTALL_NAME_TOOL="${cctools}/bin/install_name_tool" + + LIBS= + LIB_DIRS= + RPATHS= + OUTPUT= + # let parse the option list + for i in "$@"; do + if [[ "''${OUTPUT}" = "1" ]]; then + OUTPUT=$i + elif [[ "$i" =~ ^-l(.*)$ ]]; then + LIBS="''${BASH_REMATCH[1]} $LIBS" + elif [[ "$i" =~ ^-L(.*)$ ]]; then + LIB_DIRS="''${BASH_REMATCH[1]} $LIB_DIRS" + elif [[ "$i" =~ ^-Wl,-rpath,\@loader_path/(.*)$ ]]; then + RPATHS="''${BASH_REMATCH[1]} ''${RPATHS}" + elif [[ "$i" = "-o" ]]; then + # output is coming + OUTPUT=1 + fi + done + + # Call gcc + ''${GCC} "$@" + + function get_library_path() { + for libdir in ''${LIB_DIRS}; do + if [ -f ''${libdir}/lib$1.so ]; then + echo "''${libdir}/lib$1.so" + elif [ -f ''${libdir}/lib$1.dylib ]; then + echo "''${libdir}/lib$1.dylib" + fi + done + } + + # A convenient method to return the actual path even for non symlinks + # and multi-level symlinks. + function get_realpath() { + local previous="$1" + local next=$(readlink "''${previous}") + while [ -n "''${next}" ]; do + previous="''${next}" + next=$(readlink "''${previous}") + done + echo "''${previous}" + } + + # Get the path of a lib inside a tool + function get_otool_path() { + # the lib path is the path of the original lib relative to the workspace + get_realpath $1 | sed 's|^.*/bazel-out/|bazel-out/|' + } + + # Do replacements in the output + for rpath in ''${RPATHS}; do + for lib in ''${LIBS}; do + unset libname + if [ -f "$(dirname ''${OUTPUT})/''${rpath}/lib''${lib}.so" ]; then + libname="lib''${lib}.so" + elif [ -f "$(dirname ''${OUTPUT})/''${rpath}/lib''${lib}.dylib" ]; then + libname="lib''${lib}.dylib" + fi + # ''${libname-} --> return $libname if defined, or undefined otherwise. This is to make + # this set -e friendly + if [[ -n "''${libname-}" ]]; then + libpath=$(get_library_path ''${lib}) + if [ -n "''${libpath}" ]; then + ''${INSTALL_NAME_TOOL} -change $(get_otool_path "''${libpath}") \ + "@loader_path/''${rpath}/''${libname}" "''${OUTPUT}" + fi + fi + done + done + '' else ""); + postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' export NIX_LDFLAGS="$NIX_LDFLAGS -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${libcxx}/include/c++/v1" '' + '' + mkdir nix + cp ${buildFile} nix/BUILD + cp ${crosstoolFile} nix/CROSSTOOL + line=70 + for flag in $NIX_CFLAGS_COMPILE; do + sed -i -e "$line a compiler_flag: \"$flag\"" nix/CROSSTOOL + line=$((line + 1)) + done + for flag in $NIX_LDFLAGS; do + sed -i -e "$line a linker_flag: \"-Wl,$flag\"" nix/CROSSTOOL + line=$((line + 1)) + done + + cp ${osxCcWrapperFile} nix/osx_cc_wrapper.sh find src/main/java/com/google/devtools -type f -print0 | while IFS="" read -r -d "" path; do substituteInPlace "$path" \ --replace /bin/bash ${customBash}/bin/bash \ @@ -67,15 +454,14 @@ stdenv.mkDerivation rec { # Fixup scripts that generate scripts. Not fixed up by patchShebangs below. substituteInPlace scripts/bootstrap/compile.sh \ --replace /bin/sh ${customBash}/bin/bash - echo "build --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\"" >> .bazelrc - echo "build --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\"" >> .bazelrc - echo "build --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\"" >> .bazelrc - echo "build --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\"" >> .bazelrc - sed -i -e "361 a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh - sed -i -e "361 a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh - sed -i -e "361 a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh - sed -i -e "361 a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh + sed -i -e "361 a --crosstool_top=//nix:nix --host_crosstool_top=//nix:nix \\\\" scripts/bootstrap/compile.sh patchShebangs . + '' + lib.optionalString stdenv.isDarwin '' + sed -i "s,/usr/bin/xcrun clang,clang $NIX_CFLAGS_COMPILE $NIX_LDFLAGS -framework CoreFoundation,g" \ + scripts/bootstrap/compile.sh \ + src/tools/xcode/realpath/BUILD \ + src/tools/xcode/stdredirect/BUILD \ + tools/osx/BUILD ''; buildInputs = [ @@ -83,13 +469,14 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ + gnused zip python unzip makeWrapper which customBash - ] ++ lib.optionals (stdenv.isDarwin) [ libcxx CoreFoundation CoreServices Foundation ]; + ] ++ lib.optionals (stdenv.isDarwin) [ cctools clang libcxx CoreFoundation CoreServices Foundation ]; # If TMPDIR is in the unpack dir we run afoul of blaze's infinite symlink # detector (see com.google.devtools.build.lib.skyframe.FileFunction). @@ -100,7 +487,8 @@ stdenv.mkDerivation rec { ./compile.sh ./output/bazel --output_user_root=/tmp/.bazel build //scripts:bash_completion \ --spawn_strategy=standalone \ - --genrule_strategy=standalone + --genrule_strategy=standalone \ + --crosstool_top=//nix:nix --host_crosstool_top=//nix:nix cp bazel-bin/scripts/bazel-complete.bash output/ ''; @@ -110,6 +498,7 @@ stdenv.mkDerivation rec { checkPhase = '' export TEST_TMPDIR=$(pwd) ./output/bazel test --test_output=errors \ + --crosstool_top=//nix:nix --host_crosstool_top=//nix:nix \ examples/cpp:hello-success_test \ examples/java-native/src/test/java/com/example/myproject:hello ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b284bffef49..415ad4baa7b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3713,7 +3713,7 @@ with pkgs; lzip = callPackage ../tools/compression/lzip { }; luxcorerender = callPackage ../tools/graphics/luxcorerender { }; - + xz = callPackage ../tools/compression/xz { }; lz4 = callPackage ../tools/compression/lz4 { }; @@ -4978,7 +4978,7 @@ with pkgs; securefs = callPackage ../tools/filesystems/securefs { }; seexpr = callPackage ../development/compilers/seexpr { }; - + setroot = callPackage ../tools/X11/setroot { }; setserial = callPackage ../tools/system/setserial { }; @@ -7782,7 +7782,9 @@ with pkgs; bazel_0_4 = callPackage ../development/tools/build-managers/bazel/0.4.nix { }; bazel = callPackage ../development/tools/build-managers/bazel { + inherit (darwin) cctools; inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; + binutils = binutils-unwrapped; }; bazel-buildtools = callPackage ../development/tools/build-managers/bazel/buildtools { }; From f180facaa091123f9f0f99a6cb4fc5f7f1b3d0b3 Mon Sep 17 00:00:00 2001 From: Michael Gough Date: Sun, 1 Jul 2018 18:29:55 +0000 Subject: [PATCH 23/56] hmetis: init at 1.5 --- .../science/math/hmetis/default.nix | 42 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/applications/science/math/hmetis/default.nix diff --git a/pkgs/applications/science/math/hmetis/default.nix b/pkgs/applications/science/math/hmetis/default.nix new file mode 100644 index 00000000000..9eab9ca3999 --- /dev/null +++ b/pkgs/applications/science/math/hmetis/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, ghostscript }: + +stdenv.mkDerivation rec { + name = "hmetis-${version}"; + version = "1.5"; + + src = fetchurl { + url = "http://glaros.dtc.umn.edu/gkhome/fetch/sw/hmetis/hmetis-${version}-linux.tar.gz"; + sha256 = "e835a098c046e9c26cecb8addfea4d18ff25214e49585ffd87038e72819be7e1"; + }; + + nativeBuildInputs = [ ghostscript ]; + + binaryFiles = "hmetis khmetis shmetis"; + + patchPhase = '' + for binaryfile in $binaryFiles; do + patchelf \ + --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 \ + --set-rpath ${stdenv.glibc}/lib \ + $binaryfile + done + ''; + + buildPhase = '' + gs -sOutputFile=manual.pdf -sDEVICE=pdfwrite -SNOPAUSE -dBATCH manual.ps + ''; + + installPhase = '' + mkdir -p $out/bin $out/share/doc/hmetis $out/lib + mv $binaryFiles $out/bin + mv manual.pdf $out/share/doc/hmetis + mv libhmetis.a $out/lib + ''; + + meta = with stdenv.lib; { + description = "hMETIS is a set of programs for partitioning hypergraphs"; + homepage = http://glaros.dtc.umn.edu/gkhome/metis/hmetis/overview; + license = licenses.unfree; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b1219690d7..d3d40662053 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2421,6 +2421,8 @@ with pkgs; fluentd = callPackage ../tools/misc/fluentd { }; flvstreamer = callPackage ../tools/networking/flvstreamer { }; + + hmetis = callPackage_i686 ../applications/science/math/hmetis { }; libbsd = callPackage ../development/libraries/libbsd { }; From 5aa51e54a973f6635c6824ec2c585ffb4eecc382 Mon Sep 17 00:00:00 2001 From: Kevin Liu Date: Sun, 1 Jul 2018 11:52:28 -0400 Subject: [PATCH 24/56] barrier: fix compilation on Qt 5.11 --- pkgs/applications/misc/barrier/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/barrier/default.nix b/pkgs/applications/misc/barrier/default.nix index 0bc12e269c0..6151b3d55ab 100644 --- a/pkgs/applications/misc/barrier/default.nix +++ b/pkgs/applications/misc/barrier/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, curl, xorg, avahi, qt5, +{ stdenv, fetchpatch, fetchurl, cmake, curl, xorg, avahi, qt5, avahiWithLibdnssdCompat ? avahi.override { withLibdnssdCompat = true; } }: @@ -13,9 +13,18 @@ stdenv.mkDerivation rec { buildInputs = [ cmake curl xorg.libX11 xorg.libXext xorg.libXtst avahiWithLibdnssdCompat ]; propagatedBuildInputs = with qt5; [ qtbase ]; + patches = [ + # Fix compilation on Qt 5.11 + # Patch should be removed on next version bump from 2.1.1! + (fetchpatch { + url = "https://github.com/debauchee/barrier/commit/a956cad0da23f544b874888c6c3540dc7f8f22cf.patch"; + sha256 = "0x5045bdks1f9casp0v7svx9ml1gxhkhw5sqc7xk36h184m24a21"; + }) + ]; + postFixup = '' - substituteInPlace "$out/share/applications/barrier.desktop" --replace "Exec=barrier" "Exec=$out/bin/barrier" - ''; + substituteInPlace "$out/share/applications/barrier.desktop" --replace "Exec=barrier" "Exec=$out/bin/barrier" + ''; meta = { description = "Open-source KVM software"; From 964fde7eec6cc445c220f965f4ab0cfa5bf7171e Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Sun, 1 Jul 2018 20:50:13 -0400 Subject: [PATCH 25/56] dbeaver: 5.1.1 -> 5.1.2 --- pkgs/applications/misc/dbeaver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 36aca5e1729..ed08356fdc5 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "dbeaver-ce-${version}"; - version = "5.1.1"; + version = "5.1.2"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "1ll1q585b7yca9jrgg7iw7i6xhyy1wc9q8hjqj1g3gzdagbrf396"; + sha256 = "1p1klrasasc440qzxsn96lcgfib5qwhl508gvwrbslvmija6m6b2"; }; installPhase = '' From faf44ff2dc888af8e4f9f3fd9153f18dcc8b384d Mon Sep 17 00:00:00 2001 From: Eric Litak Date: Mon, 2 Jul 2018 00:40:37 -0700 Subject: [PATCH 26/56] livepeer: init at 0.2.4 --- pkgs/servers/livepeer/default.nix | 35 +++++++++++++++++++++++++++++++ pkgs/servers/livepeer/deps.nix | 20 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 57 insertions(+) create mode 100644 pkgs/servers/livepeer/default.nix create mode 100644 pkgs/servers/livepeer/deps.nix diff --git a/pkgs/servers/livepeer/default.nix b/pkgs/servers/livepeer/default.nix new file mode 100644 index 00000000000..105223f31a5 --- /dev/null +++ b/pkgs/servers/livepeer/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, buildGoPackage +, pkgconfig, ffmpeg +}: + +buildGoPackage rec { + name = "livepeer-${version}"; + version = "0.2.4"; + + goPackagePath = "github.com/livepeer/go-livepeer"; + goDeps = ./deps.nix; + + src = fetchFromGitHub { + owner = "livepeer"; + repo = "go-livepeer"; + rev = version; + sha256 = "07vhw787wq5q4xm7zvswjdsmr20pwfa39wfkgamb7hkrffn3k2ia"; + }; + + buildInputs = [ pkgconfig ffmpeg ]; + + # XXX This removes the -O2 flag, to avoid errors like: + # cgo-dwarf-inference:2:8: error: enumerator value for '__cgo_enum__0' is not an integer constant + # This is a workaround for nixpkgs+golang BUG https://github.com/NixOS/nixpkgs/issues/25959 + hardeningDisable = [ "fortify" ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Official Go implementation of the Livepeer protocol"; + homepage = http://livepeer.org; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ elitak ]; + }; +} diff --git a/pkgs/servers/livepeer/deps.nix b/pkgs/servers/livepeer/deps.nix new file mode 100644 index 00000000000..297d0724a49 --- /dev/null +++ b/pkgs/servers/livepeer/deps.nix @@ -0,0 +1,20 @@ +[ + { + goPackagePath = "github.com/golang/glog"; + fetch = { + type = "git"; + url = "https://github.com/golang/glog"; + rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998"; + sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; + }; + } + { + goPackagePath = "github.com/ericxtang/m3u8"; + fetch = { + type = "git"; + url = "https://github.com/ericxtang/m3u8"; + rev = "575aeb9f754a5dabcc03d4aa0ed05ecaee26499e"; + sha256 = "08811y4kg6rgj40v80cwjcwhy094qrfigdwjsgr8d6bn64cf9fz2"; + }; + } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b1219690d7..29a972bd181 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12752,6 +12752,8 @@ with pkgs; lighttpd = callPackage ../servers/http/lighttpd { }; + livepeer = callPackage ../servers/livepeer { ffmpeg = ffmpeg_3; }; + lwan = callPackage ../servers/http/lwan { }; labelImg = callPackage ../applications/science/machine-learning/labelimg { }; From 065c936863ca4b184334770529cd3b181b8b94e3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 1 Jul 2018 22:06:18 +0200 Subject: [PATCH 27/56] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.9.2-30-g7c77e7e from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/153e8469591bf79c60f44ce42a207d47e1544f15. --- .../haskell-modules/hackage-packages.nix | 1049 ++++++++++++----- 1 file changed, 764 insertions(+), 285 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 2a60e3b71e0..0370f10bb8b 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -921,8 +921,8 @@ self: { }: mkDerivation { pname = "Allure"; - version = "0.8.1.2"; - sha256 = "0zm2sipfhg3fc5v33z7agj3sx4xzqlsd41apnqn403ld0ffvzy58"; + version = "0.8.3.0"; + sha256 = "1yzqiidc8qbjlpgs2d3jkikzggyd7ajq7i7l1dgwqv6sh4r030vb"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -7052,6 +7052,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "HABQT" = callPackage + ({ mkDerivation, base, hmatrix, hmatrix-gsl, mtl, mwc-random + , newtype-generics, optparse-applicative, QuickCheck, streaming + , utility-ht, validation, vector + }: + mkDerivation { + pname = "HABQT"; + version = "0.1.0.0"; + sha256 = "02lni851v2997im77izycl3x2yw84sm8lsa1alpb0yp6y2f1ghay"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base hmatrix hmatrix-gsl mtl mwc-random newtype-generics streaming + utility-ht validation vector + ]; + executableHaskellDepends = [ base optparse-applicative streaming ]; + testHaskellDepends = [ + base hmatrix mwc-random newtype-generics QuickCheck streaming + utility-ht vector + ]; + description = "Hierarchical adaptive Bayesian quantum tomography for quantum bits"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "HARM" = callPackage ({ mkDerivation, array, base }: mkDerivation { @@ -9990,15 +10014,15 @@ self: { }: mkDerivation { pname = "HsYAML"; - version = "0.1.1.1"; - sha256 = "1qxblx2s67n4jmnzai00hqp92iz3kvmzl1pqyx6l9zgllmh94zrh"; + version = "0.1.1.2"; + sha256 = "1100yzyxbvin48q3dgmzpnhz1gbqaxnkpnwy7ywzj2wrvwrr8hjx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring containers dlist mtl parsec text ]; description = "Pure Haskell YAML 1.2 parser"; - license = stdenv.lib.licenses.gpl3; + license = stdenv.lib.licenses.gpl2; }) {}; "Hsed" = callPackage @@ -10336,8 +10360,8 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "IntGraph"; - version = "0.1.0.0"; - sha256 = "0b7hycjl4mrs47377h4yisy1kcypz7im9x0rs6w0jblczf7gmk46"; + version = "0.1.1.0"; + sha256 = "08cvlvqvjzcxsnqs9lh493y9yjxv5wcfaqc4pq9rl3wlhixjlrp6"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers ]; description = "Dynamically sized graph library"; @@ -22841,8 +22865,8 @@ self: { }: mkDerivation { pname = "aivika"; - version = "5.7"; - sha256 = "1zhzb9pchpj9vk0zc3wb9bpxbw7zfn63m7ng37z46lwyv5s55d5m"; + version = "5.8"; + sha256 = "0yj022qf7afxs8md45qxz42n9i5g60572lz330szbm9ziwdwb1wp"; libraryHaskellDepends = [ array base binary containers deepseq exceptions mtl mwc-random random semigroups vector @@ -23003,8 +23027,8 @@ self: { }: mkDerivation { pname = "aivika-transformers"; - version = "5.7"; - sha256 = "1nwffb0x7lzl52xqki415dgmag9dg66jv45qirdnmkjs33x0by3r"; + version = "5.8"; + sha256 = "0mndlxvi98k74q2qvzc7wry8ndcgmyi9ph1sas42cbc7a2djnlf0"; libraryHaskellDepends = [ aivika array base containers exceptions mtl mwc-random random semigroups vector @@ -30130,6 +30154,8 @@ self: { pname = "atomic-primops"; version = "0.8.2"; sha256 = "0cyr2x6xqz6s233znrz9rnrfj56m9bmnawwnka0lsqqy1hp8gy37"; + revision = "1"; + editedCabalFile = "0gdcd84x2s4jiry0was74rzv9l53an1q6ad8jiaj37fr4fim0wcc"; libraryHaskellDepends = [ base ghc-prim primitive ]; description = "A safe approach to CAS and other atomic ops in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -30271,8 +30297,8 @@ self: { }: mkDerivation { pname = "ats-pkg"; - version = "2.11.0.8"; - sha256 = "1nk802nm3s5dygk1ldhn4djxwz9priqsm3hpd9wkb6pd80w945m5"; + version = "2.11.0.10"; + sha256 = "0090max9idmqkfppzpwhmnibkmzin9gr6x1r94i0dziaa7x4iwd8"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cli-setup ]; @@ -32625,8 +32651,8 @@ self: { }: mkDerivation { pname = "barbies"; - version = "0.1.2.0"; - sha256 = "1n8m6qi30fz5xx67v0l7dsirrpd8h0smb7qd8d1q3w83yi606kvl"; + version = "0.1.3.0"; + sha256 = "1klpjn1zghaf9ln45kag21kh40kg9pp75x4p7virpvvd21s0y5xi"; libraryHaskellDepends = [ base bifunctors ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ]; description = "Classes for working with types that can change clothes"; @@ -33669,6 +33695,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "beam-core_0_7_2_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, dlist, free + , ghc-prim, hashable, microlens, mtl, network-uri, tagged, tasty + , tasty-hunit, text, time, vector-sized + }: + mkDerivation { + pname = "beam-core"; + version = "0.7.2.2"; + sha256 = "160ga0w0i1l4nbag6jg8wn3a3csid93x6fdd4j4pah2zk7dswc8j"; + libraryHaskellDepends = [ + aeson base bytestring containers dlist free ghc-prim hashable + microlens mtl network-uri tagged text time vector-sized + ]; + testHaskellDepends = [ + base bytestring tasty tasty-hunit text time + ]; + description = "Type-safe, feature-complete SQL query and manipulation interface for Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "beam-migrate" = callPackage ({ mkDerivation, aeson, base, beam-core, bytestring, containers , deepseq, dependent-map, dependent-sum, free, ghc-prim, hashable @@ -33690,6 +33737,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "beam-migrate_0_3_2_1" = callPackage + ({ mkDerivation, aeson, base, beam-core, bytestring, containers + , deepseq, dependent-map, dependent-sum, free, ghc-prim, hashable + , haskell-src-exts, mtl, parallel, pqueue, pretty, scientific, text + , time, unordered-containers, uuid-types, vector + }: + mkDerivation { + pname = "beam-migrate"; + version = "0.3.2.1"; + sha256 = "0wwkyg87wf3qcj8c5j3ammdkmjacgzw35pgxbq75bvfkx8k5j69d"; + libraryHaskellDepends = [ + aeson base beam-core bytestring containers deepseq dependent-map + dependent-sum free ghc-prim hashable haskell-src-exts mtl parallel + pqueue pretty scientific text time unordered-containers uuid-types + vector + ]; + description = "SQL DDL support and migrations support library for Beam"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "beam-postgres" = callPackage ({ mkDerivation, aeson, base, beam-core, beam-migrate, bytestring , case-insensitive, conduit, free, hashable, haskell-src-exts @@ -33699,8 +33767,8 @@ self: { }: mkDerivation { pname = "beam-postgres"; - version = "0.3.2.0"; - sha256 = "09iv1ji1kpavi42z0p4nng057h0q5f16cdsx0yiq53c3ji3yvbnf"; + version = "0.3.2.2"; + sha256 = "1wa2ajwrgha5wbbynh68jbqbivfvmr7habnn89yhhfh6gmxqj5yk"; libraryHaskellDepends = [ aeson base beam-core beam-migrate bytestring case-insensitive conduit free hashable haskell-src-exts lifted-base monad-control @@ -33730,6 +33798,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "beam-sqlite_0_3_2_2" = callPackage + ({ mkDerivation, aeson, attoparsec, base, beam-core, beam-migrate + , bytestring, dlist, free, hashable, mtl, network-uri, scientific + , sqlite-simple, text, time, unix + }: + mkDerivation { + pname = "beam-sqlite"; + version = "0.3.2.2"; + sha256 = "1k33bbh6zhhm7h88q9rwigrj5fisfgbwza6mfrhbygdpzck473hp"; + libraryHaskellDepends = [ + aeson attoparsec base beam-core beam-migrate bytestring dlist free + hashable mtl network-uri scientific sqlite-simple text time unix + ]; + description = "Beam driver for SQLite"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "beam-th" = callPackage ({ mkDerivation, base, beam, doctest, doctest-discover, microlens , mtl, tasty, tasty-hunit, template-haskell, text, th-expand-syns @@ -38612,8 +38698,8 @@ self: { pname = "bound"; version = "2.0.1"; sha256 = "0xmvkwambzmji1czxipl9cms5l3v98765b9spmb3wn5n6dpj0ji9"; - revision = "5"; - editedCabalFile = "02xvpawr73xq11lwkj1rp96h3pgpgcp693gawc3wn5zksrr0986i"; + revision = "6"; + editedCabalFile = "18fqzxy3f8r09jwcsfzjlrpvnlz711jq5gcjp4dal1pvsbbw6i09"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bifunctors binary bytes cereal comonad deepseq hashable mmorph @@ -41995,6 +42081,98 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cachix" = callPackage + ({ mkDerivation, async, base, base16-bytestring, base64-bytestring + , bifunctors, bytestring, cachix-api, conduit, conduit-combinators + , conduit-extra, cookie, cryptonite, dhall, directory, ed25519 + , fsnotify, here, hspec, http-client, http-client-tls, http-conduit + , http-types, lzma-conduit, megaparsec, memory, mmorph + , optparse-applicative, process, protolude, resourcet, servant + , servant-auth, servant-auth-client, servant-client + , servant-generic, servant-streaming-client, streaming, text, unix + , uri-bytestring, versions + }: + mkDerivation { + pname = "cachix"; + version = "0.1.0.0"; + sha256 = "1q2yglmsg5mgky7hmv8na3qpm9ywdn0b0apb7pcn9sib11nbwg5z"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base base16-bytestring base64-bytestring bifunctors + bytestring cachix-api conduit conduit-combinators conduit-extra + cookie cryptonite dhall directory ed25519 fsnotify here http-client + http-client-tls http-conduit http-types lzma-conduit megaparsec + memory mmorph optparse-applicative process protolude resourcet + servant servant-auth servant-auth-client servant-client + servant-generic servant-streaming-client streaming text unix + uri-bytestring versions + ]; + executableHaskellDepends = [ + async base base16-bytestring base64-bytestring bifunctors + bytestring cachix-api conduit conduit-combinators conduit-extra + cookie cryptonite dhall directory ed25519 fsnotify here http-client + http-client-tls http-conduit http-types lzma-conduit megaparsec + memory mmorph optparse-applicative process protolude resourcet + servant servant-auth servant-auth-client servant-client + servant-generic servant-streaming-client streaming text unix + uri-bytestring versions + ]; + testHaskellDepends = [ + async base base16-bytestring base64-bytestring bifunctors + bytestring cachix-api conduit conduit-combinators conduit-extra + cookie cryptonite dhall directory ed25519 fsnotify here hspec + http-client http-client-tls http-conduit http-types lzma-conduit + megaparsec memory mmorph optparse-applicative process protolude + resourcet servant servant-auth servant-auth-client servant-client + servant-generic servant-streaming-client streaming text unix + uri-bytestring versions + ]; + license = stdenv.lib.licenses.asl20; + }) {}; + + "cachix-api" = callPackage + ({ mkDerivation, aeson, amazonka, base, base16-bytestring + , bytestring, conduit, conduit-combinators, cookie, cryptonite + , hspec, http-api-data, http-media, lens, memory, protolude + , servant, servant-auth, servant-auth-server, servant-auth-swagger + , servant-generic, servant-streaming, servant-swagger + , servant-swagger-ui-core, string-conv, swagger2, text + , transformers + }: + mkDerivation { + pname = "cachix-api"; + version = "0.1.0.0"; + sha256 = "13nqy96m5f0kz969ix64d8il5bakhsr9wv550zab9mks3qlz6s6x"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson amazonka base base16-bytestring bytestring conduit + conduit-combinators cookie cryptonite http-api-data http-media lens + memory servant servant-auth servant-auth-server + servant-auth-swagger servant-generic servant-streaming + servant-swagger servant-swagger-ui-core string-conv swagger2 text + transformers + ]; + executableHaskellDepends = [ + aeson amazonka base base16-bytestring bytestring conduit + conduit-combinators cookie cryptonite http-api-data http-media lens + memory servant servant-auth servant-auth-server + servant-auth-swagger servant-generic servant-streaming + servant-swagger servant-swagger-ui-core string-conv swagger2 text + transformers + ]; + testHaskellDepends = [ + aeson amazonka base base16-bytestring bytestring conduit + conduit-combinators cookie cryptonite hspec http-api-data + http-media lens memory protolude servant servant-auth + servant-auth-server servant-auth-swagger servant-generic + servant-streaming servant-swagger servant-swagger-ui-core + string-conv swagger2 text transformers + ]; + license = stdenv.lib.licenses.asl20; + }) {}; + "cacophony" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, base16-bytestring , bytestring, criterion, cryptonite, deepseq, directory, exceptions @@ -42853,19 +43031,23 @@ self: { }) {}; "casa-abbreviations-and-acronyms" = callPackage - ({ mkDerivation, base, directory, doctest, filepath, QuickCheck - , template-haskell + ({ mkDerivation, base, bytestring, containers, fuzzy, lens + , monoid-subclasses, optparse-applicative, these, wreq }: mkDerivation { pname = "casa-abbreviations-and-acronyms"; - version = "0.0.1"; - sha256 = "12pcw19jf31kvccqfvsxk49ff7zldq0r3kf6zabvzyr9qbas9gjy"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ - base directory doctest filepath QuickCheck template-haskell + version = "0.0.3"; + sha256 = "0fvlmw8ha5k37l1011wpjr7bvrfkgh3ygdh2ry2aqdaadzaw4njw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers fuzzy lens monoid-subclasses these wreq + ]; + executableHaskellDepends = [ + base fuzzy lens optparse-applicative ]; description = "CASA Abbreviations and Acronyms"; - license = "unknown"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -47585,6 +47767,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cmark-gfm_0_1_4" = callPackage + ({ mkDerivation, base, blaze-html, bytestring, cheapskate + , criterion, discount, HUnit, markdown, sundown, text + }: + mkDerivation { + pname = "cmark-gfm"; + version = "0.1.4"; + sha256 = "0jjcl7pfack8aksx34m1f80ll0y62ba1fyzdn77xbs2rvlvjzw0m"; + libraryHaskellDepends = [ base bytestring text ]; + testHaskellDepends = [ base HUnit text ]; + benchmarkHaskellDepends = [ + base blaze-html cheapskate criterion discount markdown sundown text + ]; + description = "Fast, accurate GitHub Flavored Markdown parser and renderer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cmark-highlight" = callPackage ({ mkDerivation, base, blaze-html, cmark, highlighting-kate, text }: @@ -49128,6 +49328,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "comonad_5_0_4" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, containers + , contravariant, distributive, doctest, semigroups, tagged + , transformers, transformers-compat + }: + mkDerivation { + pname = "comonad"; + version = "5.0.4"; + sha256 = "09g870c4flp4k3fgbibsd0mmfjani1qcpbcl685v8x89kxzrva3q"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base containers contravariant distributive semigroups tagged + transformers transformers-compat + ]; + testHaskellDepends = [ base doctest ]; + description = "Comonads"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "comonad-extras" = callPackage ({ mkDerivation, array, base, comonad, containers, distributive , semigroupoids, transformers @@ -50162,14 +50382,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "concurrency_1_5_0_0" = callPackage + "concurrency_1_6_0_0" = callPackage ({ mkDerivation, array, atomic-primops, base, exceptions , monad-control, mtl, stm, transformers }: mkDerivation { pname = "concurrency"; - version = "1.5.0.0"; - sha256 = "0c07jkhsi9fy3ssjs19511dxsqq62yqbh9qd90r666wdhs0v86qh"; + version = "1.6.0.0"; + sha256 = "14zbwbp5mgnp3nv40qirnw1b8pv2kp1nqlhg36dnhw7l0mq5dwlk"; libraryHaskellDepends = [ array atomic-primops base exceptions monad-control mtl stm transformers @@ -51978,6 +52198,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "contravariant_1_5" = callPackage + ({ mkDerivation, base, StateVar, transformers }: + mkDerivation { + pname = "contravariant"; + version = "1.5"; + sha256 = "1hn31wl0jai2jrwc6cz19aflbv9xbyl3m5ab57zzysddjav6gw3f"; + libraryHaskellDepends = [ base StateVar transformers ]; + description = "Contravariant functors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "contravariant-extras" = callPackage ({ mkDerivation, base, base-prelude, contravariant, semigroups , template-haskell, tuple-th @@ -53959,28 +54191,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "criterion_1_4_1_0" = callPackage + "criterion_1_5_0_0" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat , base-compat-batteries, binary, bytestring, cassava, code-page - , containers, deepseq, directory, exceptions, filepath, Glob, HUnit - , js-flot, js-jquery, microstache, mtl, mwc-random - , optparse-applicative, parsec, QuickCheck, semigroups, statistics - , tasty, tasty-hunit, tasty-quickcheck, text, time, transformers - , transformers-compat, vector, vector-algorithms + , containers, criterion-measurement, deepseq, directory, exceptions + , filepath, Glob, HUnit, js-flot, js-jquery, microstache, mtl + , mwc-random, optparse-applicative, parsec, QuickCheck, semigroups + , statistics, tasty, tasty-hunit, tasty-quickcheck, text, time + , transformers, transformers-compat, vector, vector-algorithms }: mkDerivation { pname = "criterion"; - version = "1.4.1.0"; - sha256 = "0v429araqkcw3wwwi6fsp0g7g1hy3l47p061lcy7r4m7d9khd4y4"; + version = "1.5.0.0"; + sha256 = "0j9qaahlnjnwp8glzxn83924mdpnb38inyq696bs2fbdjzh8nq0x"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson ansi-wl-pprint base base-compat-batteries binary bytestring - cassava code-page containers deepseq directory exceptions filepath - Glob js-flot js-jquery microstache mtl mwc-random - optparse-applicative parsec semigroups statistics text time - transformers transformers-compat vector vector-algorithms + cassava code-page containers criterion-measurement deepseq + directory exceptions filepath Glob js-flot js-jquery microstache + mtl mwc-random optparse-applicative parsec semigroups statistics + text time transformers transformers-compat vector vector-algorithms ]; executableHaskellDepends = [ base base-compat-batteries optparse-applicative semigroups @@ -53995,6 +54227,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "criterion-measurement" = callPackage + ({ mkDerivation, aeson, base, base-compat, binary, containers + , deepseq, vector + }: + mkDerivation { + pname = "criterion-measurement"; + version = "0.1.0.0"; + sha256 = "1kn6xcnmjab0rqxjjgrdpbm5z919jwmsraqnpxqkazswgbbj6r7y"; + libraryHaskellDepends = [ + aeson base base-compat binary containers deepseq vector + ]; + description = "Criterion measurement functionality and associated types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "criterion-plus" = callPackage ({ mkDerivation, base, criterion, deepseq, HTF, HUnit, loch-th , monad-control, mtl, optparse-applicative, placeholders @@ -54981,8 +55228,8 @@ self: { }: mkDerivation { pname = "csg"; - version = "0.1.0.2"; - sha256 = "19lqlc8li2cx2kc2y3p4n6s2jz94h490zqnm0fywj7vgp4f11rcm"; + version = "0.1.0.3"; + sha256 = "17ysbi3585ag7a098lv7wjr4xsjm8mm3zz5hfvz2ahis2g151ipx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -57204,14 +57451,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "data-diverse-lens_4_2_0_1" = callPackage + "data-diverse-lens_4_3_0_0" = callPackage ({ mkDerivation, base, data-diverse, data-has, hspec, lens , profunctors, tagged }: mkDerivation { pname = "data-diverse-lens"; - version = "4.2.0.1"; - sha256 = "07nwbvjhwx3qyh2ksk027qgci91nsckgd4yskkbafndpiri1fxds"; + version = "4.3.0.0"; + sha256 = "11nrisgx7yb7qp03s3hxkbygc170fggbi3mcid196dhakxv4kl4p"; libraryHaskellDepends = [ base data-diverse data-has lens profunctors tagged ]; @@ -60023,14 +60270,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "dejafu_1_10_1_0" = callPackage + "dejafu_1_11_0_0" = callPackage ({ mkDerivation, base, concurrency, containers, contravariant , deepseq, exceptions, leancheck, profunctors, random, transformers }: mkDerivation { pname = "dejafu"; - version = "1.10.1.0"; - sha256 = "17ib90sy40ynlpjagq7f2r2kw040qjgrhwnbncyicaravips3vva"; + version = "1.11.0.0"; + sha256 = "02ifm6hq9dmscilbp5nq8hbnvp71kg1p5x8w57pw6sm2l779jb66"; libraryHaskellDepends = [ base concurrency containers contravariant deepseq exceptions leancheck profunctors random transformers @@ -60590,6 +60837,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "deriving-compat_0_5" = callPackage + ({ mkDerivation, base, base-compat, base-orphans, containers + , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged + , template-haskell, th-abstraction, transformers + , transformers-compat + }: + mkDerivation { + pname = "deriving-compat"; + version = "0.5"; + sha256 = "1777569bgb7p1xn9ch90jbg2mk4gph04mzmw3r8c6kq84db1484m"; + libraryHaskellDepends = [ + base containers ghc-boot-th ghc-prim template-haskell + th-abstraction transformers transformers-compat + ]; + testHaskellDepends = [ + base base-compat base-orphans hspec QuickCheck tagged + template-haskell transformers transformers-compat + ]; + testToolDepends = [ hspec-discover ]; + description = "Backports of GHC deriving extensions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "derp" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -71689,6 +71960,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "extensible_0_4_10" = callPackage + ({ mkDerivation, aeson, base, bytestring, cassava, comonad + , constraints, deepseq, exceptions, ghc-prim, hashable, lens + , monad-skeleton, mtl, prettyprinter, primitive, profunctors + , QuickCheck, resourcet, semigroups, StateVar, tagged + , template-haskell, text, th-lift, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "extensible"; + version = "0.4.10"; + sha256 = "012xryq2jz7k6dmrzjh8j3yn9ggyna63vppi6xwdqjxks9xms2zq"; + libraryHaskellDepends = [ + aeson base bytestring cassava comonad constraints deepseq + exceptions ghc-prim hashable monad-skeleton mtl prettyprinter + primitive profunctors QuickCheck resourcet semigroups StateVar + tagged template-haskell text th-lift transformers + unordered-containers vector + ]; + testHaskellDepends = [ base lens QuickCheck template-haskell ]; + description = "Extensible, efficient, optics-friendly data types and effects"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "extensible-data" = callPackage ({ mkDerivation, base, data-lens, hashable, template-haskell , unordered-containers @@ -73538,8 +73834,8 @@ self: { }: mkDerivation { pname = "fficxx"; - version = "0.4"; - sha256 = "0c3893jfxxihkjz9m7m25rfa8x4yfim70p8z4jsbdw6j5adgvh8b"; + version = "0.4.1"; + sha256 = "1s1yzvs1j4as4875509hzny1399zimpzyh9zh5g0ddg8dqg5lfi4"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring Cabal containers data-default directory either @@ -80025,6 +80321,8 @@ self: { pname = "generic-deriving"; version = "1.12.2"; sha256 = "1i7d6cpj9yhaqb79zays3nqchhaacacjz9bkc0zlwj73y5gvi22n"; + revision = "1"; + editedCabalFile = "0gr20ypr6s0183wmrhmia0zvpbn4dmfyr3wksrkrqj4i8nhj42fz"; libraryHaskellDepends = [ base containers ghc-prim template-haskell th-abstraction ]; @@ -80584,12 +80882,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "genvalidity_0_5_0_3" = callPackage + "genvalidity_0_5_1_0" = callPackage ({ mkDerivation, base, hspec, QuickCheck, validity }: mkDerivation { pname = "genvalidity"; - version = "0.5.0.3"; - sha256 = "0xf1sd5g87gvdg1n3g7in7x8x4cf1jnsbaxmq64qmjlns4qr0fnk"; + version = "0.5.1.0"; + sha256 = "17ykq38j9a2lzir6dqz5jgy6ndaafrpkhqhcg96c5ppg7wcxaaj0"; libraryHaskellDepends = [ base QuickCheck validity ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "Testing utilities for the validity library"; @@ -80620,7 +80918,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "genvalidity-aeson_0_2_0_1" = callPackage + "genvalidity-aeson_0_2_0_2" = callPackage ({ mkDerivation, aeson, base, genvalidity, genvalidity-hspec , genvalidity-scientific, genvalidity-text , genvalidity-unordered-containers, genvalidity-vector, hspec @@ -80628,8 +80926,8 @@ self: { }: mkDerivation { pname = "genvalidity-aeson"; - version = "0.2.0.1"; - sha256 = "0cfp5smj5ap5ppsk95yf0qmpbysqypsiccbcdckqkiky73nnvax8"; + version = "0.2.0.2"; + sha256 = "1c77lbw4y6fmrsdzxwm38la161n6k3zvjwisg17ssz0a1bm4y96i"; libraryHaskellDepends = [ aeson base genvalidity genvalidity-scientific genvalidity-text genvalidity-unordered-containers genvalidity-vector QuickCheck @@ -80662,14 +80960,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "genvalidity-bytestring_0_2_0_1" = callPackage + "genvalidity-bytestring_0_2_0_2" = callPackage ({ mkDerivation, base, bytestring, genvalidity, genvalidity-hspec , hspec, QuickCheck, validity, validity-bytestring }: mkDerivation { pname = "genvalidity-bytestring"; - version = "0.2.0.1"; - sha256 = "0lyxaisy2wjsqh0igx74wkjginnza3mmjasi8gdvkzk8kd85jvcl"; + version = "0.2.0.2"; + sha256 = "1qy19j0cyza2a6z59br4wma68081xqsq9m4ndmv195ym04a0bfa3"; libraryHaskellDepends = [ base bytestring genvalidity QuickCheck validity validity-bytestring ]; @@ -80700,14 +80998,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "genvalidity-containers_0_4_0_1" = callPackage + "genvalidity-containers_0_5_0_0" = callPackage ({ mkDerivation, base, containers, genvalidity, genvalidity-hspec , hspec, QuickCheck, validity, validity-containers }: mkDerivation { pname = "genvalidity-containers"; - version = "0.4.0.1"; - sha256 = "1b8q17s22wimh4dgm2igaw6icdc2bqfr7ih28ba6chmnhsjiw9wf"; + version = "0.5.0.0"; + sha256 = "1qjqwsmdcwww4fwd3m40cckwq3xgmm37kc6s25z75w768grr51br"; libraryHaskellDepends = [ base containers genvalidity QuickCheck validity validity-containers ]; @@ -80739,14 +81037,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "genvalidity-hspec_0_6_0_3" = callPackage + "genvalidity-hspec_0_6_1_0" = callPackage ({ mkDerivation, base, doctest, genvalidity, genvalidity-property , hspec, hspec-core, QuickCheck, validity }: mkDerivation { pname = "genvalidity-hspec"; - version = "0.6.0.3"; - sha256 = "195r2yw1ivss2w7criarmw5bpwjfpa19myvxfpkwk769wz9vih63"; + version = "0.6.1.0"; + sha256 = "1m8vlbjnpn5g3gx59z7zspk1bjq6fy56g7i1wxxb1lgmgibydm1m"; libraryHaskellDepends = [ base genvalidity genvalidity-property hspec hspec-core QuickCheck validity @@ -80781,15 +81079,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "genvalidity-hspec-aeson_0_2_0_1" = callPackage + "genvalidity-hspec-aeson_0_3_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, deepseq, doctest , genvalidity, genvalidity-aeson, genvalidity-hspec , genvalidity-text, hspec, QuickCheck, text }: mkDerivation { pname = "genvalidity-hspec-aeson"; - version = "0.2.0.1"; - sha256 = "0q681wj05vpxrplklvdxcr8l67gm71hvs7b991m7rfslpkx24smh"; + version = "0.3.0.0"; + sha256 = "0bqjfl86gj2201w5yingzizwq8hn63zdhir9wp3p0jiah2zp5rxh"; libraryHaskellDepends = [ aeson base bytestring deepseq genvalidity genvalidity-hspec hspec QuickCheck @@ -80820,14 +81118,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "genvalidity-hspec-binary_0_2_0_1" = callPackage + "genvalidity-hspec-binary_0_2_0_2" = callPackage ({ mkDerivation, base, binary, deepseq, doctest, genvalidity , genvalidity-hspec, hspec, QuickCheck }: mkDerivation { pname = "genvalidity-hspec-binary"; - version = "0.2.0.1"; - sha256 = "1ch48h0z7njxkv8ig8hk3d2s5a1w0ssxy2br05qn43snbdh33vx0"; + version = "0.2.0.2"; + sha256 = "1h14b0m5kq3md5rys07rrn5jjcpk0c09fln40v221z2rrssnh211"; libraryHaskellDepends = [ base binary deepseq genvalidity genvalidity-hspec hspec QuickCheck ]; @@ -80854,14 +81152,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "genvalidity-hspec-cereal_0_2_0_1" = callPackage + "genvalidity-hspec-cereal_0_2_0_2" = callPackage ({ mkDerivation, base, cereal, deepseq, doctest, genvalidity , genvalidity-hspec, hspec, QuickCheck }: mkDerivation { pname = "genvalidity-hspec-cereal"; - version = "0.2.0.1"; - sha256 = "18md81dfwgf6cq6aq4yz0qm0j5myfq8md9zpbb87yrdmrqsvyapn"; + version = "0.2.0.2"; + sha256 = "16r4g9k9rjifvbmy5nwkan6lnwhjvp85nlfihr1in5lwxf3gcl71"; libraryHaskellDepends = [ base cereal deepseq genvalidity genvalidity-hspec hspec QuickCheck ]; @@ -80893,15 +81191,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "genvalidity-hspec-hashable_0_2_0_1" = callPackage + "genvalidity-hspec-hashable_0_2_0_2" = callPackage ({ mkDerivation, base, doctest, genvalidity, genvalidity-hspec , genvalidity-property, hashable, hspec, hspec-core, QuickCheck , validity }: mkDerivation { pname = "genvalidity-hspec-hashable"; - version = "0.2.0.1"; - sha256 = "1llgq9181n24cjd7blan1fc2lgv9039nfwl3sj95z2z9wvy63cgm"; + version = "0.2.0.2"; + sha256 = "0s4z5k4myx4c6sky11l7s2lsvkxgyri11ikq75nfinff8b44h7iw"; libraryHaskellDepends = [ base genvalidity genvalidity-hspec genvalidity-property hashable hspec QuickCheck validity @@ -80954,14 +81252,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "genvalidity-path_0_3_0_1" = callPackage + "genvalidity-path_0_3_0_2" = callPackage ({ mkDerivation, base, criterion, genvalidity, genvalidity-hspec , hspec, path, QuickCheck, validity-path }: mkDerivation { pname = "genvalidity-path"; - version = "0.3.0.1"; - sha256 = "13avz2nlksvp6yam0mjny4fcj77i40vp8an5585n1mzrikadhr8x"; + version = "0.3.0.2"; + sha256 = "1fj0lc1il2yjlj6wmczvnk505c1dlvz4xw2aml0agkal9lpnvz00"; libraryHaskellDepends = [ base genvalidity path QuickCheck validity-path ]; @@ -80990,14 +81288,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "genvalidity-property_0_2_0_2" = callPackage + "genvalidity-property_0_2_1_0" = callPackage ({ mkDerivation, base, directory, doctest, filepath, genvalidity , hspec, QuickCheck, validity }: mkDerivation { pname = "genvalidity-property"; - version = "0.2.0.2"; - sha256 = "1rsxi6d5a4bz2dcxcrsa3xpav2nkxss8hindyncfqgn2af0vk5rp"; + version = "0.2.1.0"; + sha256 = "0xwq2wnrxlxcllina9faxxs8svslpxr73z9cw8asgc4b3hf41drm"; libraryHaskellDepends = [ base genvalidity hspec QuickCheck validity ]; @@ -81064,14 +81362,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "genvalidity-text_0_5_0_1" = callPackage + "genvalidity-text_0_5_0_2" = callPackage ({ mkDerivation, array, base, genvalidity, genvalidity-hspec, hspec , QuickCheck, text, validity, validity-text }: mkDerivation { pname = "genvalidity-text"; - version = "0.5.0.1"; - sha256 = "05dgf67zm9gbk985mz89jm4vdwd1s9rnazmjzwxn9gqkd6niqxyw"; + version = "0.5.0.2"; + sha256 = "1d955278y5522a5aji1i662iynkjn7g88af9myvg6q5b4nig5cqx"; libraryHaskellDepends = [ array base genvalidity QuickCheck text validity validity-text ]; @@ -81100,14 +81398,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "genvalidity-time_0_2_0_2" = callPackage + "genvalidity-time_0_2_1_0" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec , QuickCheck, time, validity-time }: mkDerivation { pname = "genvalidity-time"; - version = "0.2.0.2"; - sha256 = "0b0cyssqirpafla3dxkg6klq0nv6xnbaj10szb714lwiyvcx8dj1"; + version = "0.2.1.0"; + sha256 = "1r28jg9awlx1hzcfdhi0a9a6xlr0f33imqgqyxz4pm9zs4faag7s"; libraryHaskellDepends = [ base genvalidity QuickCheck time validity-time ]; @@ -81178,14 +81476,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "genvalidity-uuid_0_1_0_1" = callPackage + "genvalidity-uuid_0_1_0_2" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec , QuickCheck, uuid, validity, validity-uuid }: mkDerivation { pname = "genvalidity-uuid"; - version = "0.1.0.1"; - sha256 = "1ssihh980iz9kx2apygbw0r5qdb40hnvjkpsn2qw55r8d5hc4sa6"; + version = "0.1.0.2"; + sha256 = "04pladdynmjdcd553cp44nli7k5hxp82rlpyihi1ynm7q3glndfi"; libraryHaskellDepends = [ base genvalidity QuickCheck uuid validity validity-uuid ]; @@ -81216,14 +81514,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "genvalidity-vector_0_2_0_1" = callPackage + "genvalidity-vector_0_2_0_2" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec , QuickCheck, validity, validity-vector, vector }: mkDerivation { pname = "genvalidity-vector"; - version = "0.2.0.1"; - sha256 = "1xinffnzcaws7i6k0l3x89g6kzkg1vhiwkngh5ag69wvpzq3if7n"; + version = "0.2.0.2"; + sha256 = "0f1ycxpvi6jmwakfs26ydzwd8gw8qzlybr2v1ppyvvjn6a7rilhi"; libraryHaskellDepends = [ base genvalidity QuickCheck validity validity-vector vector ]; @@ -82850,6 +83148,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ghcjs-codemirror_0_0_0_2" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "ghcjs-codemirror"; + version = "0.0.0.2"; + sha256 = "15r09fdx6q3l8jk8k0hziw9hzvdj7p9jssj8nx78fjkdkxj2rfvc"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base ]; + description = "Installs CodeMirror JavaScript files"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghcjs-dom" = callPackage ({ mkDerivation, base, ghcjs-dom-jsaddle, text, transformers }: mkDerivation { @@ -96029,8 +96340,8 @@ self: { }: mkDerivation { pname = "haskell-dap"; - version = "0.0.5.0"; - sha256 = "1sb6jqq1nfzaycr1cx4an5yaaad3k8ijig7ss0xa6wvjkyc37xqa"; + version = "0.0.6.0"; + sha256 = "1w14vz2fgj90lx6w7w93zk9blmafpyv32gxzz7pm5fwnbrr07ds2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -102681,6 +102992,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hformat_0_3_3_0" = callPackage + ({ mkDerivation, ansi-terminal, base, base-unicode-symbols, hspec + , text + }: + mkDerivation { + pname = "hformat"; + version = "0.3.3.0"; + sha256 = "0g9kjfssaksjj3cp0qiwk7v85yy3sb2ryhjnlrdznhm3mnkvp35j"; + libraryHaskellDepends = [ + ansi-terminal base base-unicode-symbols text + ]; + testHaskellDepends = [ base base-unicode-symbols hspec text ]; + description = "Simple Haskell formatting"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hfov" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -104687,51 +105015,54 @@ self: { }) {}; "hledger" = callPackage - ({ mkDerivation, ansi-terminal, base, base-compat, bytestring - , cmdargs, containers, criterion, csv, data-default, Decimal, Diff - , directory, file-embed, filepath, hashable, haskeline, here - , hledger-lib, html, HUnit, lucid, megaparsec, mtl, mtl-compat - , old-time, parsec, pretty-show, process, regex-tdfa, safe - , shakespeare, split, tabular, temporary, terminfo, test-framework - , test-framework-hunit, text, time, timeit, transformers - , unordered-containers, utf8-string, utility-ht, wizards + ({ mkDerivation, ansi-terminal, base, base-compat-batteries + , bytestring, cmdargs, containers, criterion, csv, data-default + , Decimal, Diff, directory, file-embed, filepath, hashable + , haskeline, here, hledger-lib, html, HUnit, lucid, megaparsec, mtl + , mtl-compat, old-time, parsec, pretty-show, process, regex-tdfa + , safe, shakespeare, split, tabular, temporary, terminfo + , test-framework, test-framework-hunit, text, time, timeit + , transformers, unordered-containers, utf8-string, utility-ht + , wizards }: mkDerivation { pname = "hledger"; - version = "1.9.1"; - sha256 = "13arzk1l2hxmi8baa68kvl2sha0na34h0dl6isbfpvgnp7w1c0b3"; - revision = "1"; - editedCabalFile = "0qmvkw2zbcpjmkf71janpdpdha45yi29f9kv54rxqbckkh1ziych"; + version = "1.10"; + sha256 = "1ly4sp0lhb3w5nrd77xd84bcyvm000fwwjipm7gq8bjhabw20i7n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-terminal base base-compat bytestring cmdargs containers csv - data-default Decimal Diff directory file-embed filepath hashable - haskeline here hledger-lib HUnit lucid megaparsec mtl mtl-compat - old-time pretty-show process regex-tdfa safe shakespeare split - tabular temporary terminfo text time transformers + ansi-terminal base base-compat-batteries bytestring cmdargs + containers csv data-default Decimal Diff directory file-embed + filepath hashable haskeline here hledger-lib HUnit lucid megaparsec + mtl mtl-compat old-time parsec pretty-show process regex-tdfa safe + shakespeare split tabular temporary terminfo text time transformers unordered-containers utf8-string utility-ht wizards ]; executableHaskellDepends = [ - ansi-terminal base base-compat bytestring cmdargs containers csv - data-default Decimal directory file-embed filepath haskeline here - hledger-lib HUnit mtl mtl-compat old-time parsec pretty-show - process regex-tdfa safe shakespeare split tabular temporary - terminfo text time unordered-containers utf8-string utility-ht - wizards - ]; - testHaskellDepends = [ - ansi-terminal base base-compat bytestring cmdargs containers csv - data-default Decimal directory file-embed filepath haskeline here - hledger-lib HUnit mtl mtl-compat old-time parsec pretty-show - process regex-tdfa safe shakespeare split tabular temporary - terminfo test-framework test-framework-hunit text time + ansi-terminal base base-compat-batteries bytestring cmdargs + containers csv data-default Decimal directory file-embed filepath + haskeline here hledger-lib HUnit megaparsec mtl mtl-compat old-time + parsec pretty-show process regex-tdfa safe shakespeare split + tabular temporary terminfo text time transformers unordered-containers utf8-string utility-ht wizards ]; + testHaskellDepends = [ + ansi-terminal base base-compat-batteries bytestring cmdargs + containers csv data-default Decimal directory file-embed filepath + haskeline here hledger-lib HUnit megaparsec mtl mtl-compat old-time + parsec pretty-show process regex-tdfa safe shakespeare split + tabular temporary terminfo test-framework test-framework-hunit text + time transformers unordered-containers utf8-string utility-ht + wizards + ]; benchmarkHaskellDepends = [ - ansi-terminal base base-compat criterion directory file-embed - filepath here hledger-lib html pretty-show process shakespeare - tabular temporary terminfo time timeit utility-ht + ansi-terminal base base-compat-batteries bytestring cmdargs + containers criterion csv data-default Decimal directory file-embed + filepath haskeline here hledger-lib html HUnit megaparsec mtl + mtl-compat old-time parsec pretty-show process regex-tdfa safe + shakespeare split tabular temporary terminfo text time timeit + transformers unordered-containers utf8-string utility-ht wizards ]; description = "Command-line interface for the hledger accounting tool"; license = stdenv.lib.licenses.gpl3; @@ -104746,8 +105077,8 @@ self: { }: mkDerivation { pname = "hledger-api"; - version = "1.9.1"; - sha256 = "1krg8pxqcndrs6z196lb7z5nanyp9vxk5ziqpapj0f11ifxcijj8"; + version = "1.10"; + sha256 = "1axcpipq6m4r9bh2633j7l88pc4ax8ycb2q0wivhfq2dp1pbylbf"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -104861,59 +105192,56 @@ self: { }) {}; "hledger-lib" = callPackage - ({ mkDerivation, ansi-terminal, array, base, base-compat + ({ mkDerivation, ansi-terminal, array, base, base-compat-batteries , blaze-markup, bytestring, cmdargs, containers, csv, data-default , Decimal, deepseq, directory, doctest, easytest, extra, filepath , Glob, hashtables, HUnit, megaparsec, mtl, mtl-compat, old-time - , parsec, pretty-show, regex-tdfa, safe, split, tabular - , test-framework, test-framework-hunit, text, time, transformers - , uglymemo, utf8-string + , parsec, parser-combinators, pretty-show, regex-tdfa, safe, split + , tabular, test-framework, test-framework-hunit, text, time + , transformers, uglymemo, utf8-string }: mkDerivation { pname = "hledger-lib"; - version = "1.9.1"; - sha256 = "0yxgx4bpqn8vchrfp07d1fqmsscj8w5g63nqd2n49r29d6i5q5az"; - revision = "1"; - editedCabalFile = "1j7yhnjkiw2vm63d6va18kknjxkywb2j0h525ys4z3y6840i8b8k"; + version = "1.10"; + sha256 = "1kj3376gaaq39rwfyhfg7npdsy7z561184wia4rc8ijzf0isz2p1"; libraryHaskellDepends = [ - ansi-terminal array base base-compat blaze-markup bytestring - cmdargs containers csv data-default Decimal deepseq directory extra - filepath hashtables HUnit megaparsec mtl mtl-compat old-time parsec - pretty-show regex-tdfa safe split tabular text time transformers - uglymemo utf8-string + ansi-terminal array base base-compat-batteries blaze-markup + bytestring cmdargs containers csv data-default Decimal deepseq + directory extra filepath hashtables HUnit megaparsec mtl mtl-compat + old-time parsec parser-combinators pretty-show regex-tdfa safe + split tabular text time transformers uglymemo utf8-string ]; testHaskellDepends = [ - ansi-terminal array base base-compat blaze-markup bytestring - cmdargs containers csv data-default Decimal deepseq directory - doctest easytest extra filepath Glob hashtables HUnit megaparsec - mtl mtl-compat old-time parsec pretty-show regex-tdfa safe split - tabular test-framework test-framework-hunit text time transformers - uglymemo utf8-string + ansi-terminal array base base-compat-batteries blaze-markup + bytestring cmdargs containers csv data-default Decimal deepseq + directory doctest easytest extra filepath Glob hashtables HUnit + megaparsec mtl mtl-compat old-time parsec parser-combinators + pretty-show regex-tdfa safe split tabular test-framework + test-framework-hunit text time transformers uglymemo utf8-string ]; description = "Core data types, parsers and functionality for the hledger accounting tools"; license = stdenv.lib.licenses.gpl3; }) {}; "hledger-ui" = callPackage - ({ mkDerivation, ansi-terminal, async, base, base-compat, brick - , cmdargs, containers, data-default, directory, filepath, fsnotify - , hledger, hledger-lib, HUnit, megaparsec, microlens + ({ mkDerivation, ansi-terminal, async, base, base-compat-batteries + , brick, cmdargs, containers, data-default, directory, filepath + , fsnotify, hledger, hledger-lib, HUnit, megaparsec, microlens , microlens-platform, pretty-show, process, safe, split, text , text-zipper, time, transformers, vector, vty }: mkDerivation { pname = "hledger-ui"; - version = "1.9.1"; - sha256 = "18ar9lja583rg06q9dbnrpify6hj99444fjw2z54lr54587151v0"; - revision = "1"; - editedCabalFile = "0dy5vrm969cqp4mz31524z8w1m3lznrr17kgn204rgq91j7zzwx2"; + version = "1.10"; + sha256 = "1k9bz8gl0xdiz5va1abl1xsqyrid9gfq9ahbal0kmh2jdqppqs0j"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - ansi-terminal async base base-compat brick cmdargs containers - data-default directory filepath fsnotify hledger hledger-lib HUnit - megaparsec microlens microlens-platform pretty-show process safe - split text text-zipper time transformers vector vty + ansi-terminal async base base-compat-batteries brick cmdargs + containers data-default directory filepath fsnotify hledger + hledger-lib HUnit megaparsec microlens microlens-platform + pretty-show process safe split text text-zipper time transformers + vector vty ]; description = "Curses-style user interface for the hledger accounting tool"; license = stdenv.lib.licenses.gpl3; @@ -104939,46 +105267,29 @@ self: { }) {}; "hledger-web" = callPackage - ({ mkDerivation, base, base-compat, blaze-html, blaze-markup - , bytestring, clientsession, cmdargs, conduit-extra, data-default - , directory, filepath, hjsmin, hledger, hledger-lib, hspec - , http-client, http-conduit, HUnit, json, megaparsec, mtl, parsec - , safe, shakespeare, template-haskell, text, time, transformers - , wai, wai-extra, wai-handler-launch, warp, yaml, yesod, yesod-core - , yesod-form, yesod-static, yesod-test + ({ mkDerivation, base, blaze-html, blaze-markup, bytestring + , case-insensitive, clientsession, cmdargs, conduit, conduit-extra + , data-default, directory, filepath, hjsmin, hledger, hledger-lib + , http-client, http-conduit, HUnit, json, megaparsec, mtl + , semigroups, shakespeare, template-haskell, text, time + , transformers, wai, wai-extra, wai-handler-launch, warp, yaml + , yesod, yesod-core, yesod-form, yesod-static }: mkDerivation { pname = "hledger-web"; - version = "1.9.2"; - sha256 = "0b533vs5vrk4wpwgf23l7rvijq4qpi6w5nql2hsjwl3xk2ihfpv3"; - revision = "1"; - editedCabalFile = "1njgbfl71iif3f7z3kkyqgab98md93a56mpl6laq0kw4azgdsajy"; + version = "1.10"; + sha256 = "1hfl9kr3h9lcmy512s3yiv3rp31md7kw5n1145khj2j3l8qd3py9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base base-compat blaze-html blaze-markup bytestring clientsession - cmdargs conduit-extra data-default directory filepath hjsmin - hledger hledger-lib http-client http-conduit HUnit json megaparsec - mtl parsec safe shakespeare template-haskell text time transformers - wai wai-extra wai-handler-launch warp yaml yesod yesod-core - yesod-form yesod-static - ]; - executableHaskellDepends = [ - base base-compat blaze-html blaze-markup bytestring clientsession - cmdargs conduit-extra data-default directory filepath hjsmin - hledger hledger-lib http-client http-conduit HUnit json megaparsec - mtl parsec safe shakespeare template-haskell text time transformers - wai wai-extra wai-handler-launch warp yaml yesod yesod-core - yesod-form yesod-static - ]; - testHaskellDepends = [ - base base-compat blaze-html blaze-markup bytestring clientsession - cmdargs conduit-extra data-default directory filepath hjsmin - hledger hledger-lib hspec http-client http-conduit HUnit json - megaparsec mtl parsec safe shakespeare template-haskell text time - transformers wai wai-extra wai-handler-launch warp yaml yesod - yesod-core yesod-form yesod-static yesod-test + base blaze-html blaze-markup bytestring case-insensitive + clientsession cmdargs conduit conduit-extra data-default directory + filepath hjsmin hledger hledger-lib http-client http-conduit HUnit + json megaparsec mtl semigroups shakespeare template-haskell text + time transformers wai wai-extra wai-handler-launch warp yaml yesod + yesod-core yesod-form yesod-static ]; + executableHaskellDepends = [ base ]; description = "Web interface for the hledger accounting tool"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ peti ]; @@ -110076,28 +110387,30 @@ self: { , attoparsec, base, bytestring, Cabal, containers, cpphs , data-default, deepseq, direct-sqlite, directory, exceptions , filepath, fsnotify, ghc, ghc-boot, ghc-paths, ghc-syb-utils - , haddock-api, haskell-names, haskell-src-exts, hdocs, hformat - , hlint, hspec, HTTP, lens, lifted-base, mmorph, monad-control - , monad-loops, mtl, network, optparse-applicative, process - , regex-pcre-builtin, scientific, simple-log, sqlite-simple, stm - , syb, template-haskell, text, text-region, time, transformers - , transformers-base, uniplate, unix, unordered-containers, vector + , haddock-api, haddock-library, haskell-names, haskell-src-exts + , hdocs, hformat, hlint, hspec, HTTP, lens, lifted-base, mmorph + , monad-control, monad-loops, mtl, network, optparse-applicative + , process, regex-pcre-builtin, scientific, simple-log + , sqlite-simple, stm, syb, template-haskell, text, text-region + , time, transformers, transformers-base, traverse-with-class + , uniplate, unix, unordered-containers, vector }: mkDerivation { pname = "hsdev"; - version = "0.3.1.3"; - sha256 = "1xrggdkaq3b1vsnkrcsm2ji6wcrmxv53lf8x3ki7py9blgjj3vrj"; + version = "0.3.1.4"; + sha256 = "12mz6ahfs693yxi02765v4215dbs2pzqp17w49z38zz3y6kcwmb9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty array async attoparsec base bytestring Cabal containers cpphs data-default deepseq direct-sqlite directory exceptions filepath fsnotify ghc ghc-boot ghc-paths ghc-syb-utils - haddock-api haskell-names haskell-src-exts hdocs hformat hlint HTTP - lens lifted-base mmorph monad-control monad-loops mtl network - optparse-applicative process regex-pcre-builtin scientific - simple-log sqlite-simple stm syb template-haskell text text-region - time transformers transformers-base uniplate unix + haddock-api haddock-library haskell-names haskell-src-exts hdocs + hformat hlint HTTP lens lifted-base mmorph monad-control + monad-loops mtl network optparse-applicative process + regex-pcre-builtin scientific simple-log sqlite-simple stm syb + template-haskell text text-region time transformers + transformers-base traverse-with-class uniplate unix unordered-containers vector ]; executableHaskellDepends = [ @@ -112882,6 +113195,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "html-entity" = callPackage + ({ mkDerivation, attoparsec, base, base-compat, Cabal + , cabal-doctest, doctest, text, unordered-containers + }: + mkDerivation { + pname = "html-entity"; + version = "0.1.0.0"; + sha256 = "1mvnj040fwisi8ys0pkxd19dkwpcj7vby6hw9yh7zrh7k7hs3jsi"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + attoparsec base base-compat text unordered-containers + ]; + testHaskellDepends = [ base doctest ]; + description = "HTML entity decoding and encoding for Text"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "html-entity-map" = callPackage ({ mkDerivation, base, criterion, text, unordered-containers }: mkDerivation { @@ -113274,6 +113607,8 @@ self: { pname = "http-client"; version = "0.5.13"; sha256 = "12q0w3avdkddrp7cgvwkmmfxdi4cz1ajic8jlrgp2plhn8ggnag2"; + revision = "1"; + editedCabalFile = "1ivwpyz9j7p1qp6sc256nb3p7bdprz92kfjgxynn0m6fldbbbvpp"; libraryHaskellDepends = [ array base blaze-builder bytestring case-insensitive containers cookie deepseq exceptions filepath ghc-prim http-types memory @@ -114556,12 +114891,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hunit-dejafu_1_2_0_5" = callPackage + "hunit-dejafu_1_2_0_6" = callPackage ({ mkDerivation, base, dejafu, exceptions, HUnit }: mkDerivation { pname = "hunit-dejafu"; - version = "1.2.0.5"; - sha256 = "17k7sg2ifvmikzjlzhawc65afq32lva5p79szva6xplghh689xv6"; + version = "1.2.0.6"; + sha256 = "10zndwkgpliyycyynfd34nhzplfhs9cychpznzzcwbpckx3w5ajl"; libraryHaskellDepends = [ base dejafu exceptions HUnit ]; description = "Deja Fu support for the HUnit test framework"; license = stdenv.lib.licenses.mit; @@ -123069,19 +123404,20 @@ self: { "jsaddle" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring - , bytestring, containers, deepseq, filepath, ghc-prim, http-types - , lens, primitive, process, random, ref-tf, scientific, stm, text - , time, transformers, unordered-containers, vector + , bytestring, containers, deepseq, exceptions, filepath, ghc-prim + , http-types, lens, primitive, process, random, ref-tf, scientific + , stm, text, time, transformers, unliftio-core + , unordered-containers, vector }: mkDerivation { pname = "jsaddle"; - version = "0.9.4.0"; - sha256 = "0lk4cbvl2n3zcc709hjcnxw3wm1vd49dqlm12cwy9im4aif1zbq1"; + version = "0.9.5.0"; + sha256 = "1b1d8dvj5lqpn0k6ay90jdgm0a05vbchxy4l3r9s4fn4mx56jp9z"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring bytestring containers - deepseq filepath ghc-prim http-types lens primitive process random - ref-tf scientific stm text time transformers unordered-containers - vector + deepseq exceptions filepath ghc-prim http-types lens primitive + process random ref-tf scientific stm text time transformers + unliftio-core unordered-containers vector ]; description = "Interface for JavaScript that works with GHCJS and GHC"; license = stdenv.lib.licenses.mit; @@ -123352,10 +123688,8 @@ self: { }: mkDerivation { pname = "json-autotype"; - version = "1.1.2"; - sha256 = "1gf7g5y46wpkkhdnmvi85h518a59yb5j8ffgrnb82cs5zjwjpa9j"; - revision = "1"; - editedCabalFile = "0qc69s8wcsfy8h8mbz2iyxi02gwissb93wn5gapwisinhm44ldpd"; + version = "2.0.0"; + sha256 = "0mip3k489321sqzzwbv0sbcscv2q9n4lbc63sx8lslsy95da9x68"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -126858,8 +127192,8 @@ self: { }: mkDerivation { pname = "lambdabot"; - version = "5.1.0.1"; - sha256 = "195xm7ncqfpj51vipmv7di1yqba9iy6c38a0rqrkji0w13aprp14"; + version = "5.1.0.2"; + sha256 = "1nzjlxyzrri8zw67flqn1arz10mgbmyglhvf6pg4r8w78iwg5nk3"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -126898,6 +127232,33 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; + "lambdabot-core_5_1_0_2" = callPackage + ({ mkDerivation, base, binary, bytestring, containers + , dependent-map, dependent-sum, dependent-sum-template, directory + , edit-distance, filepath, haskeline, hslogger, HTTP, lifted-base + , monad-control, mtl, network, parsec, prim-uniq, random, random-fu + , random-source, regex-tdfa, SafeSemaphore, split, syb + , template-haskell, time, transformers, transformers-base, unix + , utf8-string, zlib + }: + mkDerivation { + pname = "lambdabot-core"; + version = "5.1.0.2"; + sha256 = "1n0cqkbiadc169vq7pj5zwvi3yay6db60q8pdk4kci0s9clz4161"; + libraryHaskellDepends = [ + base binary bytestring containers dependent-map dependent-sum + dependent-sum-template directory edit-distance filepath haskeline + hslogger HTTP lifted-base monad-control mtl network parsec + prim-uniq random random-fu random-source regex-tdfa SafeSemaphore + split syb template-haskell time transformers transformers-base unix + utf8-string zlib + ]; + description = "Lambdabot core functionality"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ peti ]; + }) {}; + "lambdabot-haskell-plugins" = callPackage ({ mkDerivation, array, arrows, base, bytestring, containers , data-memocombinators, directory, filepath @@ -126909,8 +127270,8 @@ self: { }: mkDerivation { pname = "lambdabot-haskell-plugins"; - version = "5.1.0.2"; - sha256 = "1vr4f92zsjdr2j1zxb2v1hmyrb4lvq32c08jgind7apkmvqjgm19"; + version = "5.1.0.3"; + sha256 = "1hka7kb2j5nqzv9jljjyylfyrf5z3hsfp2sfgv95y5qsr2b6g96a"; libraryHaskellDepends = [ array arrows base bytestring containers data-memocombinators directory filepath haskell-src-exts-simple hoogle HTTP IOSpec @@ -131776,20 +132137,19 @@ self: { }) {}; "linearmap-category" = callPackage - ({ mkDerivation, base, constrained-categories, containers - , free-vector-spaces, ieee754, lens, linear, manifolds-core - , semigroups, tagged, transformers, vector, vector-space + ({ mkDerivation, base, call-stack, constrained-categories + , containers, free-vector-spaces, ieee754, lens, linear + , manifolds-core, semigroups, tagged, transformers, vector + , vector-space }: mkDerivation { pname = "linearmap-category"; - version = "0.3.4.0"; - sha256 = "0idmaw25cz7lk3kr9n0jri776j0qajrlc9j1aki0brvx6p6yh2dp"; - revision = "1"; - editedCabalFile = "0vrx3ws23qg1ygh1ksvgrpz92nhnr1nmrwy8a3ax08n8jcx2nrrw"; + version = "0.3.5.0"; + sha256 = "0qmd0nz343j3j3kprbhwfkglcswfcawfy0y6g4ai6nzdga42nfrf"; libraryHaskellDepends = [ - base constrained-categories containers free-vector-spaces ieee754 - lens linear manifolds-core semigroups tagged transformers vector - vector-space + base call-stack constrained-categories containers + free-vector-spaces ieee754 lens linear manifolds-core semigroups + tagged transformers vector vector-space ]; description = "Native, complete, matrix-free linear algebra"; license = stdenv.lib.licenses.gpl3; @@ -135713,8 +136073,8 @@ self: { pname = "machines"; version = "0.6.3"; sha256 = "1kxypm26xxd30979yrg94pnaaj3yfn180ri3y4z2xsm2m5iyiliz"; - revision = "7"; - editedCabalFile = "00wq0lnz081bcjrnsg2pvn3i08b4ssgqm92n5j0lpqlym2vm0ar8"; + revision = "8"; + editedCabalFile = "09lpkqc5c0d8x8wqx5lyjdgkrqybn8dz241n3bgb5iy9ghlxinac"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ adjunctions base comonad containers distributive mtl pointed @@ -136910,8 +137270,8 @@ self: { ({ mkDerivation, base, call-stack, tagged, vector-space }: mkDerivation { pname = "manifolds-core"; - version = "0.4.5.0"; - sha256 = "1g2lb8f2l9gwpflifm8idvf2w6if497gc6pgpr7j6s9c7byh8p3p"; + version = "0.5.0.0"; + sha256 = "0b8ac9l2asqlhazl0wlgb0qiyj1adk89m5fvhqqx1nw829dly6gw"; libraryHaskellDepends = [ base call-stack tagged vector-space ]; description = "The basic classes for the manifolds hierarchy"; license = stdenv.lib.licenses.gpl3; @@ -140595,6 +140955,38 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "minio-hs_1_1_0" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , case-insensitive, conduit, conduit-extra, containers, cryptonite + , cryptonite-conduit, directory, filepath, http-client + , http-conduit, http-types, ini, memory, protolude, QuickCheck + , resourcet, tasty, tasty-hunit, tasty-quickcheck, tasty-smallcheck + , temporary, text, time, transformers, unliftio, unliftio-core + , xml-conduit + }: + mkDerivation { + pname = "minio-hs"; + version = "1.1.0"; + sha256 = "0nmjv4khbw5pi01sin6vksh8r7xy6v5y1fadiy9ww2fh9y5ix56b"; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring case-insensitive conduit + conduit-extra containers cryptonite cryptonite-conduit directory + filepath http-client http-conduit http-types ini memory protolude + resourcet text time transformers unliftio unliftio-core xml-conduit + ]; + testHaskellDepends = [ + aeson base base64-bytestring bytestring case-insensitive conduit + conduit-extra containers cryptonite cryptonite-conduit directory + filepath http-client http-conduit http-types ini memory protolude + QuickCheck resourcet tasty tasty-hunit tasty-quickcheck + tasty-smallcheck temporary text time transformers unliftio + unliftio-core xml-conduit + ]; + description = "A Minio Haskell Library for Amazon S3 compatible cloud storage"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "minions" = callPackage ({ mkDerivation, ansi-terminal, base, MissingH, process, time }: mkDerivation { @@ -145609,6 +146001,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "mwc-probability_2_0_4" = callPackage + ({ mkDerivation, base, mwc-random, primitive, transformers }: + mkDerivation { + pname = "mwc-probability"; + version = "2.0.4"; + sha256 = "0msi72qp5aps3n4ji565r4rzyjg7svwilsh8lch59y2b4q7fvscz"; + libraryHaskellDepends = [ base mwc-random primitive transformers ]; + description = "Sampling function-based probability distributions"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mwc-probability-transition" = callPackage ({ mkDerivation, base, exceptions, ghc-prim, hspec, logging-effect , mtl, mwc-probability, primitive, QuickCheck, transformers @@ -159075,8 +159479,8 @@ self: { }: mkDerivation { pname = "phoityne-vscode"; - version = "0.0.24.0"; - sha256 = "1kk8bfvai1196960cqq6zg5xhs15jzwllw57n247csiifijs0b0v"; + version = "0.0.25.0"; + sha256 = "16l1w92i0nr6a9z4l9cq3372mqgis17nqhdky8a157cqa2if150b"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -172164,6 +172568,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "recursion-schemes_5_0_3" = callPackage + ({ mkDerivation, base, base-orphans, comonad, free, HUnit + , template-haskell, th-abstraction, transformers + }: + mkDerivation { + pname = "recursion-schemes"; + version = "5.0.3"; + sha256 = "17x0kjl3yqanx234mb838yy21gw4if6qgzpi5l0b17m8llvp086v"; + libraryHaskellDepends = [ + base base-orphans comonad free template-haskell th-abstraction + transformers + ]; + testHaskellDepends = [ base HUnit template-haskell transformers ]; + description = "Generalized bananas, lenses and barbed wire"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "recursion-schemes-ext" = callPackage ({ mkDerivation, base, composition-prelude, criterion, deepseq , hspec, lens, recursion-schemes @@ -174035,8 +174457,8 @@ self: { }: mkDerivation { pname = "relational-record-examples"; - version = "0.5.1.0"; - sha256 = "0xsd1syrs1fsxkkbc7zb0dwl9wqjyf31n44h4b3la93pcjv4dl7q"; + version = "0.5.1.1"; + sha256 = "0ll6yjp0scbv2fl18b8qplj488a4wp985dr2km0hf4zjb1mri0i0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -183847,8 +184269,8 @@ self: { ({ mkDerivation, base, hspec, http-types, QuickCheck, servant }: mkDerivation { pname = "servant-streaming"; - version = "0.2.0.0"; - sha256 = "10cs6yrzy75w8zvjddqw0gcnqmwmk28112vbj9dwpg2qgh1s1194"; + version = "0.3.0.0"; + sha256 = "0k2sgh7qhp54050k6xlz4zi5jf29xnar2iv02f4rg1k5fxjlh3cq"; libraryHaskellDepends = [ base http-types servant ]; testHaskellDepends = [ base hspec http-types QuickCheck servant ]; description = "Servant combinators for the 'streaming' package"; @@ -183863,8 +184285,8 @@ self: { }: mkDerivation { pname = "servant-streaming-client"; - version = "0.2.0.0"; - sha256 = "056k8ysani675ab9x7ls6fns55frw26krcdrsznwc2808bi71p3x"; + version = "0.3.0.0"; + sha256 = "1h3haws61m064zziyzn03n0450swffmr46gsv9k88lrpz8lv5qj2"; libraryHaskellDepends = [ base bytestring http-media http-types resourcet servant servant-client-core servant-streaming streaming @@ -183885,8 +184307,8 @@ self: { }: mkDerivation { pname = "servant-streaming-docs"; - version = "0.2.0.0"; - sha256 = "0a5f5bz4qgk9a7bfgym950mcqxx83629j3x35rmp7faxd50jx055"; + version = "0.3.0.0"; + sha256 = "0jy0na8cavym2vsy1a059n0yjzfb5a0xylyzxpz0i5apafv1xvlz"; libraryHaskellDepends = [ base lens servant servant-docs servant-streaming ]; @@ -183902,8 +184324,8 @@ self: { }: mkDerivation { pname = "servant-streaming-server"; - version = "0.2.0.0"; - sha256 = "1a95hzvcki51109hd563kk23zgv909pwdvpdxah3asbv78b9i7id"; + version = "0.3.0.0"; + sha256 = "0lsh3x6hkbk7p095pkp7ld0m54xlkw0101x6nrxhjvhmw13aiq66"; libraryHaskellDepends = [ base bytestring http-media http-types resourcet servant servant-server servant-streaming streaming streaming-wai wai @@ -184267,8 +184689,8 @@ self: { }: mkDerivation { pname = "serverless-haskell"; - version = "0.6.0"; - sha256 = "0vwvgncayp0wknycg1d3w2dx5nhr4dik9vkcc4mcxw9p479llx5r"; + version = "0.6.1"; + sha256 = "1amv4plafwjnw2nd4hc429zpybvd70c4c76hvnmkwc4d13z3rh3b"; libraryHaskellDepends = [ aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis amazonka-s3 base bytestring case-insensitive http-types iproute @@ -187334,8 +187756,8 @@ self: { }: mkDerivation { pname = "simple-vec3"; - version = "0.4.0.6"; - sha256 = "1ijwh5xsqiaykm8y39jz4vnzvcbdq2za77ahkb6l7nqfc5ryv5z1"; + version = "0.4.0.7"; + sha256 = "1snhvy9nlwi6ka6lj6qhc3p9wz9q88mj9yr80lir7z0i1qy0yvar"; libraryHaskellDepends = [ base QuickCheck vector ]; testHaskellDepends = [ base doctest doctest-driver-gen tasty tasty-quickcheck @@ -191711,6 +192133,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "spatial-rotations" = callPackage + ({ mkDerivation, base, containers, linear, manifolds + , manifolds-core, pragmatic-show, tasty, tasty-hunit + , tasty-quickcheck, vector-space + }: + mkDerivation { + pname = "spatial-rotations"; + version = "0.1.0.0"; + sha256 = "1315zk74kznhizi7wvd48n0j06d1ja3z16240hv16cbsh14lsxhm"; + revision = "1"; + editedCabalFile = "1qsnkxg0r68c675fsvg2wsqkkimlzx9zw92zwmpv69ww42qxrrhy"; + libraryHaskellDepends = [ + base linear manifolds-core vector-space + ]; + testHaskellDepends = [ + base containers manifolds pragmatic-show tasty tasty-hunit + tasty-quickcheck vector-space + ]; + description = "Rotate about any suitable axis"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "spawn" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -194548,26 +194992,27 @@ self: { "staversion" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, Cabal - , containers, directory, filepath, hspec, http-client + , containers, directory, filepath, heredoc, hspec, http-client , http-client-tls, http-types, megaparsec, optparse-applicative - , pretty, QuickCheck, semigroups, text, transformers + , pretty, process, QuickCheck, semigroups, text, transformers , transformers-compat, unordered-containers, yaml }: mkDerivation { pname = "staversion"; - version = "0.2.1.4"; - sha256 = "1lhj8cbn8x1dxd9pv0sr298i304vaj4zdpasz1r9avpyxwcq6shc"; + version = "0.2.2.0"; + sha256 = "1pqb2sqhcjpzkxm45gjw4ih4nzky2l4kin80mwzcgd6q3y0n775x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-wl-pprint base bytestring Cabal containers directory filepath http-client http-client-tls http-types megaparsec - optparse-applicative pretty semigroups text transformers + optparse-applicative pretty process semigroups text transformers transformers-compat unordered-containers yaml ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base bytestring Cabal filepath hspec QuickCheck semigroups text + base bytestring Cabal filepath heredoc hspec QuickCheck semigroups + text ]; description = "What version is the package X in stackage lts-Y.ZZ?"; license = stdenv.lib.licenses.bsd3; @@ -200787,12 +201232,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "tasty-dejafu_1_2_0_6" = callPackage + "tasty-dejafu_1_2_0_7" = callPackage ({ mkDerivation, base, dejafu, random, tagged, tasty }: mkDerivation { pname = "tasty-dejafu"; - version = "1.2.0.6"; - sha256 = "193bf26vccbs0wpdhcqi0pi8mw806acrk1hpr2a7jl70jfwxhp98"; + version = "1.2.0.7"; + sha256 = "1wg6baw9rll5wajbr10av664i0dswy72flfha320137s6s3by2wc"; libraryHaskellDepends = [ base dejafu random tagged tasty ]; description = "Deja Fu support for the Tasty test framework"; license = stdenv.lib.licenses.mit; @@ -204379,6 +204824,8 @@ self: { pname = "th-abstraction"; version = "0.2.8.0"; sha256 = "0n17w4q2ykd0nica4sck2wng6md56rfad8x0icl0l8vnzb9nn4ya"; + revision = "1"; + editedCabalFile = "0yr4bj9ypbls0ysmwrgn2nsjb1xpsb12bjaiwbkzp6nf3kljwnnv"; libraryHaskellDepends = [ base containers ghc-prim template-haskell ]; @@ -204737,6 +205184,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "th-orphans_0_13_6" = callPackage + ({ mkDerivation, base, hspec, hspec-discover, mtl, template-haskell + , th-lift, th-lift-instances, th-reify-many + }: + mkDerivation { + pname = "th-orphans"; + version = "0.13.6"; + sha256 = "0sfl3pn9kq9da3ji3lsgzgzy82vz6yvsg80dmakc1jvk7awycibp"; + libraryHaskellDepends = [ + base mtl template-haskell th-lift th-lift-instances th-reify-many + ]; + testHaskellDepends = [ base hspec template-haskell ]; + testToolDepends = [ hspec-discover ]; + description = "Orphan instances for TH datatypes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "th-pprint" = callPackage ({ mkDerivation, base, lens, pretty, template-haskell }: mkDerivation { @@ -205167,6 +205632,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "thread-local-storage_0_2" = callPackage + ({ mkDerivation, atomic-primops, base, containers, criterion }: + mkDerivation { + pname = "thread-local-storage"; + version = "0.2"; + sha256 = "152j8r7rfixkjrh1ynv2s0586bl65cpy47frhsikd40q64bf0j6n"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ atomic-primops base ]; + benchmarkHaskellDepends = [ atomic-primops base criterion ]; + description = "Several options for thread-local-storage (TLS) in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "threadPool" = callPackage ({ mkDerivation, base, process }: mkDerivation { @@ -213285,8 +213764,8 @@ self: { }: mkDerivation { pname = "unordered-intmap"; - version = "0.1.0.0"; - sha256 = "0b4azafy32jwq3s9dy52l9lqkpy7hj4jqin3mj1hnh1qrlnm9jwr"; + version = "0.1.1"; + sha256 = "1vvn510v4gy70lk2bkx45bh7hk0kfdn62j3rp913j57d4c6azynq"; libraryHaskellDepends = [ base deepseq primitive ]; testHaskellDepends = [ base containers deepseq primitive QuickCheck tasty tasty-quickcheck @@ -215021,12 +215500,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "validity_0_6_0_0" = callPackage + "validity_0_7_0_0" = callPackage ({ mkDerivation, base, hspec }: mkDerivation { pname = "validity"; - version = "0.6.0.0"; - sha256 = "1ba7dvxz2x3ng4k221xawp0bz4gk4lz5gklklgypavp1fdrhf27q"; + version = "0.7.0.0"; + sha256 = "0xribw98amafihw87ddajk6vlirp7w9b26lrnjgq7jfm4710j95f"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "Validity typeclass"; @@ -215050,14 +215529,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "validity-aeson_0_2_0_1" = callPackage + "validity-aeson_0_2_0_2" = callPackage ({ mkDerivation, aeson, base, validity, validity-scientific , validity-text, validity-unordered-containers, validity-vector }: mkDerivation { pname = "validity-aeson"; - version = "0.2.0.1"; - sha256 = "001smpck69y4bmrzrykjvjnrwjllny83kh1l1c2fyy4zzjw14lpy"; + version = "0.2.0.2"; + sha256 = "010x1sprssj282gv85n63955fmn6ngz6h6qii3174vrxrwlkvh7s"; libraryHaskellDepends = [ aeson base validity validity-scientific validity-text validity-unordered-containers validity-vector @@ -215078,12 +215557,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "validity-bytestring_0_3_0_1" = callPackage + "validity-bytestring_0_3_0_2" = callPackage ({ mkDerivation, base, bytestring, validity }: mkDerivation { pname = "validity-bytestring"; - version = "0.3.0.1"; - sha256 = "1jp1d72qr9axngzgq18k0kvvmc2x8yndpnh9g52zcmm66nkhn2d9"; + version = "0.3.0.2"; + sha256 = "0bwixp9fcblqy6b8kxvzg9l2i9lksn9g71243m2zcan1kh7a1qb2"; libraryHaskellDepends = [ base bytestring validity ]; description = "Validity instances for bytestring"; license = stdenv.lib.licenses.mit; @@ -215101,12 +215580,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "validity-containers_0_3_0_1" = callPackage + "validity-containers_0_3_1_0" = callPackage ({ mkDerivation, base, containers, validity }: mkDerivation { pname = "validity-containers"; - version = "0.3.0.1"; - sha256 = "0ksqyr335f0d686j0slpzyph7663xiyv86rblgiaqjjwbj9y1jqf"; + version = "0.3.1.0"; + sha256 = "1ci07x5k9hjpn23pbp4bc0zvml5xbpppsmcxr1qfcg0g4036q29r"; libraryHaskellDepends = [ base containers validity ]; description = "Validity instances for containers"; license = stdenv.lib.licenses.mit; @@ -225207,7 +225686,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) libyaml;}; - "yaml_0_8_31" = callPackage + "yaml_0_8_31_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring , conduit, containers, directory, filepath, hspec, HUnit, libyaml , mockery, resourcet, scientific, semigroups, template-haskell @@ -225215,8 +225694,8 @@ self: { }: mkDerivation { pname = "yaml"; - version = "0.8.31"; - sha256 = "1a9b24czyrls3d7lgamm0cmrwkndr8ip3h6d338q79alhdz8ziqm"; + version = "0.8.31.1"; + sha256 = "0lwbdlz2r54nvdr5snmjp5lnkv6wwk118bhy13v1vjz62wclb88v"; configureFlags = [ "-fsystem-libyaml" ]; isLibrary = true; isExecutable = true; From 0b36a94ed49214cdcfd5798b0455d417fc5f5cd4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 1 Jul 2018 22:26:09 +0200 Subject: [PATCH 28/56] hledger: fix ghc-8.2.x build of the new 1.10 version --- .../haskell-modules/configuration-ghc-8.2.x.nix | 13 +++++++++++++ .../haskell-modules/configuration-ghc-8.4.x.nix | 6 ------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix index ce24d9a27f4..1cfbfa879bb 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix @@ -94,4 +94,17 @@ self: super: { haddock-library = dontHaddock (dontCheck self.haddock-library_1_5_0_1); })); + # Hledger depends indirectly on different versions of base-compat. The + # override can probably be removed once we update to LTS 12.x. + hledger-lib = super.hledger-lib.overrideScope (self: super: { base-compat = self.base-compat_0_10_1; }); + hledger-ui = super.hledger-ui.overrideScope (self: super: { fsnotify = self.fsnotify_0_3_0_1; }); + hledger = super.hledger.overrideScope (self: super: { + base-compat = self.base-compat_0_10_1; + aeson = self.aeson_1_4_0_0; + }); + hledger-web = super.hledger-web.overrideScope (self: super: { + base-compat = self.base-compat_0_10_1; + aeson = self.aeson_1_4_0_0; + }); + } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index 736be056e0e..45b0d768a22 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -429,10 +429,4 @@ self: super: { lambdabot-core = appendPatch super.lambdabot-core ./patches/lambdabot-core-ghc-8.4.x-fix.patch; - # Version 1.9.1 excludes base-compat 0.10.x for the benefit of older - # compilers, but ghc 8.4.x works fine with the new version. - hledger-lib = doJailbreak super.hledger-lib; - hledger = doJailbreak super.hledger; - hledger-ui = doJailbreak super.hledger-ui; - } From cbc1a03ab80a4360d6dcb8458ffa43fabf76c4ec Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 2 Jul 2018 11:21:39 +0200 Subject: [PATCH 29/56] R: update to version 3.5.1 (cherry picked from commit 7e2f2037ea6d6533492d407696f260e7b11df49d) --- pkgs/applications/science/math/R/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index f20b75605d5..25ebee96a10 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -7,11 +7,11 @@ }: stdenv.mkDerivation rec { - name = "R-3.5.0"; + name = "R-3.5.1"; src = fetchurl { url = "https://cran.r-project.org/src/base/R-3/${name}.tar.gz"; - sha256 = "0w38865laqg28cdhikxdxhx4rfp0kgcn72gakwypsy91br9ja5zx"; + sha256 = "0463bff5eea0f3d93fa071f79c18d0993878fd4f2e18ae6cf22c1639d11457ed"; }; buildInputs = [ @@ -65,8 +65,7 @@ stdenv.mkDerivation rec { installTargets = [ "install" "install-info" "install-pdf" ]; - doCheck = withRecommendedPackages; # R 3.5.0 fails the test suite if the - # recommended packages are not built + doCheck = true; preCheck = "export TZ=CET; bin/Rscript -e 'sessionInfo()'"; enableParallelBuilding = true; From 24ef1450bd5616bf8f48598cedaaf53039665464 Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Mon, 2 Jul 2018 11:04:17 +0200 Subject: [PATCH 30/56] dhall-json_1_2_1: Bump dhall dep --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 966334f1e45..4e8f43f337e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1063,7 +1063,7 @@ self: super: { }); # dhall-json requires a very particular dhall version - dhall-json_1_2_1 = super.dhall-json_1_2_1.override { dhall = self.dhall_1_14_0; }; + dhall-json_1_2_1 = super.dhall-json_1_2_1.override { dhall = self.dhall_1_15_0; }; # https://github.com/fpco/streaming-commons/issues/49 streaming-commons = dontCheck super.streaming-commons; From 587467a18e6ab2730ab49408086e8f4e9c3a334b Mon Sep 17 00:00:00 2001 From: sander Date: Mon, 2 Jul 2018 11:59:27 +0200 Subject: [PATCH 31/56] github-gentoo-compromized_cannot-download_boehm-gc-7.6.0-sys_select.patch-from-any-mirror - change to gentoo git repository gitweb.gentoo.org --- pkgs/development/libraries/boehm-gc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index 14479a56091..f33ee862358 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; patches = [ (fetchpatch { - url = "https://raw.githubusercontent.com/gentoo/musl/85b6a600996bdd71162b357e9ba93d8559342432/dev-libs/boehm-gc/files/boehm-gc-7.6.0-sys_select.patch"; + url = "https://gitweb.gentoo.org/proj/musl.git/plain/dev-libs/boehm-gc/files/boehm-gc-7.6.0-sys_select.patch"; sha256 = "1gydwlklvci30f5dpp5ccw2p2qpph5y41r55wx9idamjlq66fbb3"; }) ] ++ # https://github.com/ivmai/bdwgc/pull/208 From 3bec94f2e1e75c0d2bb08912ff7bc8c94fe9d779 Mon Sep 17 00:00:00 2001 From: Okina Matara Date: Mon, 2 Jul 2018 05:43:57 -0500 Subject: [PATCH 32/56] meguca: Disable building C++ client for Darwin --- pkgs/servers/meguca/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/meguca/default.nix b/pkgs/servers/meguca/default.nix index f8bad09e711..67b2685262d 100644 --- a/pkgs/servers/meguca/default.nix +++ b/pkgs/servers/meguca/default.nix @@ -1,6 +1,5 @@ -{ stdenv, buildGoPackage, fetchgit, pkgconfig, cmake, libcxx, libcxxabi -, ffmpeg-full, graphicsmagick, ghostscript, quicktemplate, go-bindata, easyjson -, nodePackages, emscripten }: +{ stdenv, buildGoPackage, fetchgit, pkgconfig, cmake, ffmpeg-full, ghostscript +, graphicsmagick, quicktemplate, go-bindata, easyjson, nodePackages, emscripten }: buildGoPackage rec { name = "meguca-unstable-${version}"; @@ -22,7 +21,7 @@ buildGoPackage rec { buildInputs = [ ffmpeg-full graphicsmagick ghostscript quicktemplate go-bindata easyjson emscripten - ] ++ stdenv.lib.optionals stdenv.isDarwin [ libcxx libcxxabi ]; + ]; buildPhase = '' export HOME=$PWD @@ -32,8 +31,10 @@ buildGoPackage rec { sed -i "/npm install --progress false --depth 0/d" Makefile make generate_clean go generate meguca/... - go build -p $NIX_BUILD_CORES meguca - make -j $NIX_BUILD_CORES client wasm + go build -v -p $NIX_BUILD_CORES meguca + make -j $NIX_BUILD_CORES client + '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' + make -j $NIX_BUILD_CORES wasm ''; installPhase = '' From 1fa2503f9dba814eb23726a25642d2180ce791c3 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Mon, 2 Jul 2018 06:02:23 -0500 Subject: [PATCH 33/56] foundationdb: add 5.2.5 release, and new 6.0.0 snapshot This requires a bit of fiddling with the ldflags patches and reworking a few things about how the SCM info is configured. Ideally, not much more will change before the 6.0 release, I think... This also upgrades all FoundationDB packages to use the ordinary libressl expression (which is now at 2.7.x), and changes around a few other things, which will require a rebuild. Signed-off-by: Austin Seipp --- pkgs/servers/foundationdb/default.nix | 94 ++++++++++++--------- pkgs/servers/foundationdb/ldflags-5.1.patch | 90 ++++++++++++++++++++ pkgs/servers/foundationdb/ldflags.patch | 14 +-- pkgs/top-level/all-packages.nix | 4 +- 4 files changed, 155 insertions(+), 47 deletions(-) create mode 100644 pkgs/servers/foundationdb/ldflags-5.1.patch diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix index 5ebb510be46..ecefc1d8fab 100644 --- a/pkgs/servers/foundationdb/default.nix +++ b/pkgs/servers/foundationdb/default.nix @@ -1,17 +1,42 @@ -{ stdenv, fetchurl, fetchFromGitHub +{ stdenv49 +, lib, fetchurl, fetchFromGitHub + , which, findutils, m4, gawk -, python, openjdk, mono58, libressl_2_6 -, boost16x +, python, openjdk, mono58, libressl }: let + # hysterical raisins dictate a version of boost this old. however, + # we luckily do not need to build anything, we just need the header + # files. + boost152 = stdenv49.mkDerivation rec { + name = "boost-headers-1.52.0"; + + src = fetchurl { + url = "mirror://sourceforge/boost/boost_1_52_0.tar.bz2"; + sha256 = "14mc7gsnnahdjaxbbslzk79rc0d12h1i681cd3srdwr3fzynlar2"; + }; + + configurePhase = ":"; + buildPhase = ":"; + installPhase = "mkdir -p $out/include && cp -R boost $out/include/"; + }; + makeFdb = { version , branch - , rev, sha256 + , sha256 - # fdb 6.0+ support boost 1.6x+, so default to it - , boost ? boost16x + # the revision can be inferred from the fdb tagging policy + , rev ? "refs/tags/${version}" + + # in theory newer versions of fdb support newer compilers, but they + # don't :( maybe one day + , stdenv ? stdenv49 + + # in theory newer versions of fdb support newer boost versions, but they + # don't :( maybe one day + , boost ? boost152 }: stdenv.mkDerivation rec { name = "foundationdb-${version}"; inherit version; @@ -23,14 +48,20 @@ let }; nativeBuildInputs = [ gawk which m4 findutils mono58 ]; - buildInputs = [ python openjdk libressl_2_6 boost ]; + buildInputs = [ python openjdk libressl boost ]; patches = - [ ./fix-scm-version.patch - ./ldflags.patch - ]; + [ # For 5.2+, we need a slightly adjusted patch to fix all the ldflags + (if lib.versionAtLeast version "5.2" + then ./ldflags.patch + else ./ldflags-5.1.patch) + ] ++ + # for 6.0+, we do NOT need to apply this version fix, since we can specify + # it ourselves. see configurePhase + (lib.optional (!lib.versionAtLeast version "6.0") ./fix-scm-version.patch); postPatch = '' + # note: this does not do anything for 6.0+ substituteInPlace ./build/scver.mk \ --subst-var-by NIXOS_FDB_VERSION_ID "${rev}" \ --subst-var-by NIXOS_FDB_SCBRANCH "${branch}" @@ -51,7 +82,13 @@ let enableParallelBuilding = true; makeFlags = [ "all" "fdb_c" "fdb_java" "KVRELEASE=1" ]; - configurePhase = ":"; + # on 6.0 and later, we can specify all this information manually + configurePhase = lib.optionalString (lib.versionAtLeast version "6.0") '' + export SOURCE_CONTROL=GIT + export SCBRANCH="${branch}" + export VERSION_ID="${rev}" + ''; + installPhase = '' mkdir -vp $out/{bin,libexec/plugins} $lib/{lib,share/java} $dev/include/foundationdb @@ -85,45 +122,24 @@ let }; }; - # hysterical raisins dictate a version of boost this old. however, - # we luckily do not need to build anything, we just need the header - # files. - boost152 = stdenv.mkDerivation rec { - name = "boost-headers-1.52.0"; - - src = fetchurl { - url = "mirror://sourceforge/boost/boost_1_52_0.tar.bz2"; - sha256 = "14mc7gsnnahdjaxbbslzk79rc0d12h1i681cd3srdwr3fzynlar2"; - }; - - configurePhase = ":"; - buildPhase = ":"; - installPhase = "mkdir -p $out/include && cp -R boost $out/include/"; - }; - in with builtins; { - foundationdb51 = makeFdb { + foundationdb51 = makeFdb rec { version = "5.1.7"; branch = "release-5.1"; - rev = "9ad8d02386d4a6a5efecf898df80f2747695c627"; sha256 = "1rc472ih24f9s5g3xmnlp3v62w206ny0pvvw02bzpix2sdrpbp06"; - boost = boost152; }; foundationdb52 = makeFdb rec { - version = "5.2.0pre1488_${substring 0 8 rev}"; - branch = "master"; - rev = "18f345487ed8d90a5c170d813349fa625cf05b4e"; - sha256 = "0mz30fxj6q99cvjzg39s5zm992i6h2l2cb70lc58bdhsz92dz3vc"; - boost = boost152; + version = "5.2.5"; + branch = "release-5.2"; + sha256 = "00csr4v9cwl9y8r63p73grc6cvhlqmzcniwrf80i0klxv5asg7q7"; }; foundationdb60 = makeFdb rec { - version = "6.0.0pre1636_${substring 0 8 rev}"; + version = "6.0.0pre2227_${substring 0 8 rev}"; branch = "master"; - rev = "1265a7b6d5e632dd562b3012e70f0727979806bd"; - sha256 = "0z1i5bkbszsbn8cc48rlhr29m54n2s0gq3dln0n7f97gf58mi5yf"; + rev = "8caa6eaecf1eeec0298fc77db334761b0c1d1523"; + sha256 = "1q200rpsphl5fzwzp2vk7ifgsnqh95k0xfiicfi1c8253ylnsgll"; }; - } diff --git a/pkgs/servers/foundationdb/ldflags-5.1.patch b/pkgs/servers/foundationdb/ldflags-5.1.patch new file mode 100644 index 00000000000..4d523a7ecdd --- /dev/null +++ b/pkgs/servers/foundationdb/ldflags-5.1.patch @@ -0,0 +1,90 @@ +diff --git a/FDBLibTLS/local.mk b/FDBLibTLS/local.mk +index 0b6eac8..b1891ca 100644 +--- a/FDBLibTLS/local.mk ++++ b/FDBLibTLS/local.mk +@@ -1,6 +1,5 @@ + FDBLibTLS_CFLAGS := -fPIC -I/usr/local/include -I$(BOOSTDIR) +-FDBLibTLS_STATIC_LIBS := -ltls -lssl -lcrypto +-FDBLibTLS_LDFLAGS := -L/usr/local/lib -static-libstdc++ -static-libgcc -lrt ++FDBLibTLS_LDFLAGS := -L/usr/local/lib -static-libstdc++ -static-libgcc -lrt -ltls -lssl -lcrypto + FDBLibTLS_LDFLAGS += -Wl,-soname,FDBLibTLS.so -Wl,--version-script=FDBLibTLS/FDBLibTLS.map + + # The plugin isn't a typical library, so it feels more sensible to have a copy +diff --git a/bindings/c/local.mk b/bindings/c/local.mk +index 44f0c31..7aea5a4 100644 +--- a/bindings/c/local.mk ++++ b/bindings/c/local.mk +@@ -29,8 +29,8 @@ fdb_c_tests_HEADERS := -Ibindings/c + CLEAN_TARGETS += fdb_c_tests_clean + + ifeq ($(PLATFORM),linux) +- fdb_c_LIBS += lib/libstdc++.a -lm -lpthread -lrt -ldl +- fdb_c_LDFLAGS += -Wl,--version-script=bindings/c/fdb_c.map -static-libgcc -Wl,-z,nodelete ++ fdb_c_LIBS += lib/libstdc++.a ++ fdb_c_LDFLAGS += -Wl,--version-script=bindings/c/fdb_c.map -static-libgcc -Wl,-z,nodelete -lm -lpthread -lrt -ldl + fdb_c_tests_LIBS += -lpthread + endif + +diff --git a/bindings/flow/tester/local.mk b/bindings/flow/tester/local.mk +index 2ef4fcb..6e59625 100644 +--- a/bindings/flow/tester/local.mk ++++ b/bindings/flow/tester/local.mk +@@ -35,8 +35,7 @@ _fdb_flow_tester_clean: + @rm -rf bindings/flow/bin + + ifeq ($(PLATFORM),linux) +- fdb_flow_tester_LIBS += -ldl -lpthread -lrt +- fdb_flow_tester_LDFLAGS += -static-libstdc++ -static-libgcc ++ fdb_flow_tester_LDFLAGS += -static-libstdc++ -static-libgcc -ldl -lpthread -lrt + else ifeq ($(PLATFORM),osx) + fdb_flow_tester_LDFLAGS += -lc++ + endif +diff --git a/fdbbackup/local.mk b/fdbbackup/local.mk +index 033fe7d..865fc92 100644 +--- a/fdbbackup/local.mk ++++ b/fdbbackup/local.mk +@@ -25,8 +25,7 @@ fdbbackup_LDFLAGS := $(fdbrpc_LDFLAGS) + fdbbackup_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a + + ifeq ($(PLATFORM),linux) +- fdbbackup_LIBS += -ldl -lpthread -lrt +- fdbbackup_LDFLAGS += -static-libstdc++ -static-libgcc ++ fdbbackup_LDFLAGS += -static-libstdc++ -static-libgcc -ldl -lpthread -lrt + + # GPerfTools profiler (uncomment to use) + # fdbbackup_CFLAGS += -I/opt/gperftools/include -DUSE_GPERFTOOLS=1 +diff --git a/fdbcli/local.mk b/fdbcli/local.mk +index 81a4a42..892c079 100644 +--- a/fdbcli/local.mk ++++ b/fdbcli/local.mk +@@ -22,14 +22,13 @@ + + fdbcli_CFLAGS := $(fdbclient_CFLAGS) + fdbcli_LDFLAGS := $(fdbrpc_LDFLAGS) +-fdbcli_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a -ldl ++fdbcli_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a + fdbcli_STATIC_LIBS := + + fdbcli_GENERATED_SOURCES += versions.h + + ifeq ($(PLATFORM),linux) +- fdbcli_LDFLAGS += -static-libstdc++ -static-libgcc +- fdbcli_LIBS += -lpthread -lrt ++ fdbcli_LDFLAGS += -static-libstdc++ -static-libgcc -lpthread -lrt -ldl + else ifeq ($(PLATFORM),osx) + fdbcli_LDFLAGS += -lc++ + endif +diff --git a/fdbserver/local.mk b/fdbserver/local.mk +index 78cad1b..36f2c0f 100644 +--- a/fdbserver/local.mk ++++ b/fdbserver/local.mk +@@ -25,8 +25,7 @@ fdbserver_LDFLAGS := $(fdbrpc_LDFLAGS) + fdbserver_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a + + ifeq ($(PLATFORM),linux) +- fdbserver_LIBS += -ldl -lpthread -lrt +- fdbserver_LDFLAGS += -static-libstdc++ -static-libgcc ++ fdbserver_LDFLAGS += -static-libstdc++ -static-libgcc -ldl -lpthread -lrt + + # GPerfTools profiler (uncomment to use) + # fdbserver_CFLAGS += -I/opt/gperftools/include -DUSE_GPERFTOOLS=1 diff --git a/pkgs/servers/foundationdb/ldflags.patch b/pkgs/servers/foundationdb/ldflags.patch index 4d523a7ecdd..ee5911e495f 100644 --- a/pkgs/servers/foundationdb/ldflags.patch +++ b/pkgs/servers/foundationdb/ldflags.patch @@ -1,9 +1,9 @@ diff --git a/FDBLibTLS/local.mk b/FDBLibTLS/local.mk -index 0b6eac8..b1891ca 100644 +index 5e6b9cfb..73f4e5f3 100644 --- a/FDBLibTLS/local.mk +++ b/FDBLibTLS/local.mk @@ -1,6 +1,5 @@ - FDBLibTLS_CFLAGS := -fPIC -I/usr/local/include -I$(BOOSTDIR) + FDBLibTLS_CFLAGS := -fPIC -I/usr/local/include -I$(BOOSTDIR) -Ifdbrpc -FDBLibTLS_STATIC_LIBS := -ltls -lssl -lcrypto -FDBLibTLS_LDFLAGS := -L/usr/local/lib -static-libstdc++ -static-libgcc -lrt +FDBLibTLS_LDFLAGS := -L/usr/local/lib -static-libstdc++ -static-libgcc -lrt -ltls -lssl -lcrypto @@ -11,7 +11,7 @@ index 0b6eac8..b1891ca 100644 # The plugin isn't a typical library, so it feels more sensible to have a copy diff --git a/bindings/c/local.mk b/bindings/c/local.mk -index 44f0c31..7aea5a4 100644 +index 44f0c31b..7aea5a4f 100644 --- a/bindings/c/local.mk +++ b/bindings/c/local.mk @@ -29,8 +29,8 @@ fdb_c_tests_HEADERS := -Ibindings/c @@ -26,7 +26,7 @@ index 44f0c31..7aea5a4 100644 endif diff --git a/bindings/flow/tester/local.mk b/bindings/flow/tester/local.mk -index 2ef4fcb..6e59625 100644 +index 2ef4fcb7..6e59625c 100644 --- a/bindings/flow/tester/local.mk +++ b/bindings/flow/tester/local.mk @@ -35,8 +35,7 @@ _fdb_flow_tester_clean: @@ -40,7 +40,7 @@ index 2ef4fcb..6e59625 100644 fdb_flow_tester_LDFLAGS += -lc++ endif diff --git a/fdbbackup/local.mk b/fdbbackup/local.mk -index 033fe7d..865fc92 100644 +index 033fe7d4..865fc923 100644 --- a/fdbbackup/local.mk +++ b/fdbbackup/local.mk @@ -25,8 +25,7 @@ fdbbackup_LDFLAGS := $(fdbrpc_LDFLAGS) @@ -54,7 +54,7 @@ index 033fe7d..865fc92 100644 # GPerfTools profiler (uncomment to use) # fdbbackup_CFLAGS += -I/opt/gperftools/include -DUSE_GPERFTOOLS=1 diff --git a/fdbcli/local.mk b/fdbcli/local.mk -index 81a4a42..892c079 100644 +index 81a4a42e..892c079c 100644 --- a/fdbcli/local.mk +++ b/fdbcli/local.mk @@ -22,14 +22,13 @@ @@ -75,7 +75,7 @@ index 81a4a42..892c079 100644 fdbcli_LDFLAGS += -lc++ endif diff --git a/fdbserver/local.mk b/fdbserver/local.mk -index 78cad1b..36f2c0f 100644 +index 78cad1bf..36f2c0f7 100644 --- a/fdbserver/local.mk +++ b/fdbserver/local.mk @@ -25,8 +25,7 @@ fdbserver_LDFLAGS := $(fdbrpc_LDFLAGS) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d3d40662053..c53a9ceeabe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2522,7 +2522,9 @@ with pkgs; fuseiso = callPackage ../tools/filesystems/fuseiso { }; - fdbPackages = callPackage ../servers/foundationdb { stdenv = overrideCC stdenv gcc49; }; + fdbPackages = callPackage ../servers/foundationdb { + stdenv49 = overrideCC stdenv gcc49; + }; inherit (fdbPackages) foundationdb51 From 6abb68d47a57699b54993983e5c1b8691fb08714 Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Mon, 2 Jul 2018 16:08:54 +0200 Subject: [PATCH 34/56] Revert "foundationdb: add 5.2.5 release, and new 6.0.0 snapshot" This reverts commit 1fa2503f9dba814eb23726a25642d2180ce791c3. Broke ofborg evals due to missing required argument sdvend49 --- pkgs/servers/foundationdb/default.nix | 94 +++++++++------------ pkgs/servers/foundationdb/ldflags-5.1.patch | 90 -------------------- pkgs/servers/foundationdb/ldflags.patch | 14 +-- pkgs/top-level/all-packages.nix | 4 +- 4 files changed, 47 insertions(+), 155 deletions(-) delete mode 100644 pkgs/servers/foundationdb/ldflags-5.1.patch diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix index ecefc1d8fab..5ebb510be46 100644 --- a/pkgs/servers/foundationdb/default.nix +++ b/pkgs/servers/foundationdb/default.nix @@ -1,42 +1,17 @@ -{ stdenv49 -, lib, fetchurl, fetchFromGitHub - +{ stdenv, fetchurl, fetchFromGitHub , which, findutils, m4, gawk -, python, openjdk, mono58, libressl +, python, openjdk, mono58, libressl_2_6 +, boost16x }: let - # hysterical raisins dictate a version of boost this old. however, - # we luckily do not need to build anything, we just need the header - # files. - boost152 = stdenv49.mkDerivation rec { - name = "boost-headers-1.52.0"; - - src = fetchurl { - url = "mirror://sourceforge/boost/boost_1_52_0.tar.bz2"; - sha256 = "14mc7gsnnahdjaxbbslzk79rc0d12h1i681cd3srdwr3fzynlar2"; - }; - - configurePhase = ":"; - buildPhase = ":"; - installPhase = "mkdir -p $out/include && cp -R boost $out/include/"; - }; - makeFdb = { version , branch - , sha256 + , rev, sha256 - # the revision can be inferred from the fdb tagging policy - , rev ? "refs/tags/${version}" - - # in theory newer versions of fdb support newer compilers, but they - # don't :( maybe one day - , stdenv ? stdenv49 - - # in theory newer versions of fdb support newer boost versions, but they - # don't :( maybe one day - , boost ? boost152 + # fdb 6.0+ support boost 1.6x+, so default to it + , boost ? boost16x }: stdenv.mkDerivation rec { name = "foundationdb-${version}"; inherit version; @@ -48,20 +23,14 @@ let }; nativeBuildInputs = [ gawk which m4 findutils mono58 ]; - buildInputs = [ python openjdk libressl boost ]; + buildInputs = [ python openjdk libressl_2_6 boost ]; patches = - [ # For 5.2+, we need a slightly adjusted patch to fix all the ldflags - (if lib.versionAtLeast version "5.2" - then ./ldflags.patch - else ./ldflags-5.1.patch) - ] ++ - # for 6.0+, we do NOT need to apply this version fix, since we can specify - # it ourselves. see configurePhase - (lib.optional (!lib.versionAtLeast version "6.0") ./fix-scm-version.patch); + [ ./fix-scm-version.patch + ./ldflags.patch + ]; postPatch = '' - # note: this does not do anything for 6.0+ substituteInPlace ./build/scver.mk \ --subst-var-by NIXOS_FDB_VERSION_ID "${rev}" \ --subst-var-by NIXOS_FDB_SCBRANCH "${branch}" @@ -82,13 +51,7 @@ let enableParallelBuilding = true; makeFlags = [ "all" "fdb_c" "fdb_java" "KVRELEASE=1" ]; - # on 6.0 and later, we can specify all this information manually - configurePhase = lib.optionalString (lib.versionAtLeast version "6.0") '' - export SOURCE_CONTROL=GIT - export SCBRANCH="${branch}" - export VERSION_ID="${rev}" - ''; - + configurePhase = ":"; installPhase = '' mkdir -vp $out/{bin,libexec/plugins} $lib/{lib,share/java} $dev/include/foundationdb @@ -122,24 +85,45 @@ let }; }; + # hysterical raisins dictate a version of boost this old. however, + # we luckily do not need to build anything, we just need the header + # files. + boost152 = stdenv.mkDerivation rec { + name = "boost-headers-1.52.0"; + + src = fetchurl { + url = "mirror://sourceforge/boost/boost_1_52_0.tar.bz2"; + sha256 = "14mc7gsnnahdjaxbbslzk79rc0d12h1i681cd3srdwr3fzynlar2"; + }; + + configurePhase = ":"; + buildPhase = ":"; + installPhase = "mkdir -p $out/include && cp -R boost $out/include/"; + }; + in with builtins; { - foundationdb51 = makeFdb rec { + foundationdb51 = makeFdb { version = "5.1.7"; branch = "release-5.1"; + rev = "9ad8d02386d4a6a5efecf898df80f2747695c627"; sha256 = "1rc472ih24f9s5g3xmnlp3v62w206ny0pvvw02bzpix2sdrpbp06"; + boost = boost152; }; foundationdb52 = makeFdb rec { - version = "5.2.5"; - branch = "release-5.2"; - sha256 = "00csr4v9cwl9y8r63p73grc6cvhlqmzcniwrf80i0klxv5asg7q7"; + version = "5.2.0pre1488_${substring 0 8 rev}"; + branch = "master"; + rev = "18f345487ed8d90a5c170d813349fa625cf05b4e"; + sha256 = "0mz30fxj6q99cvjzg39s5zm992i6h2l2cb70lc58bdhsz92dz3vc"; + boost = boost152; }; foundationdb60 = makeFdb rec { - version = "6.0.0pre2227_${substring 0 8 rev}"; + version = "6.0.0pre1636_${substring 0 8 rev}"; branch = "master"; - rev = "8caa6eaecf1eeec0298fc77db334761b0c1d1523"; - sha256 = "1q200rpsphl5fzwzp2vk7ifgsnqh95k0xfiicfi1c8253ylnsgll"; + rev = "1265a7b6d5e632dd562b3012e70f0727979806bd"; + sha256 = "0z1i5bkbszsbn8cc48rlhr29m54n2s0gq3dln0n7f97gf58mi5yf"; }; + } diff --git a/pkgs/servers/foundationdb/ldflags-5.1.patch b/pkgs/servers/foundationdb/ldflags-5.1.patch deleted file mode 100644 index 4d523a7ecdd..00000000000 --- a/pkgs/servers/foundationdb/ldflags-5.1.patch +++ /dev/null @@ -1,90 +0,0 @@ -diff --git a/FDBLibTLS/local.mk b/FDBLibTLS/local.mk -index 0b6eac8..b1891ca 100644 ---- a/FDBLibTLS/local.mk -+++ b/FDBLibTLS/local.mk -@@ -1,6 +1,5 @@ - FDBLibTLS_CFLAGS := -fPIC -I/usr/local/include -I$(BOOSTDIR) --FDBLibTLS_STATIC_LIBS := -ltls -lssl -lcrypto --FDBLibTLS_LDFLAGS := -L/usr/local/lib -static-libstdc++ -static-libgcc -lrt -+FDBLibTLS_LDFLAGS := -L/usr/local/lib -static-libstdc++ -static-libgcc -lrt -ltls -lssl -lcrypto - FDBLibTLS_LDFLAGS += -Wl,-soname,FDBLibTLS.so -Wl,--version-script=FDBLibTLS/FDBLibTLS.map - - # The plugin isn't a typical library, so it feels more sensible to have a copy -diff --git a/bindings/c/local.mk b/bindings/c/local.mk -index 44f0c31..7aea5a4 100644 ---- a/bindings/c/local.mk -+++ b/bindings/c/local.mk -@@ -29,8 +29,8 @@ fdb_c_tests_HEADERS := -Ibindings/c - CLEAN_TARGETS += fdb_c_tests_clean - - ifeq ($(PLATFORM),linux) -- fdb_c_LIBS += lib/libstdc++.a -lm -lpthread -lrt -ldl -- fdb_c_LDFLAGS += -Wl,--version-script=bindings/c/fdb_c.map -static-libgcc -Wl,-z,nodelete -+ fdb_c_LIBS += lib/libstdc++.a -+ fdb_c_LDFLAGS += -Wl,--version-script=bindings/c/fdb_c.map -static-libgcc -Wl,-z,nodelete -lm -lpthread -lrt -ldl - fdb_c_tests_LIBS += -lpthread - endif - -diff --git a/bindings/flow/tester/local.mk b/bindings/flow/tester/local.mk -index 2ef4fcb..6e59625 100644 ---- a/bindings/flow/tester/local.mk -+++ b/bindings/flow/tester/local.mk -@@ -35,8 +35,7 @@ _fdb_flow_tester_clean: - @rm -rf bindings/flow/bin - - ifeq ($(PLATFORM),linux) -- fdb_flow_tester_LIBS += -ldl -lpthread -lrt -- fdb_flow_tester_LDFLAGS += -static-libstdc++ -static-libgcc -+ fdb_flow_tester_LDFLAGS += -static-libstdc++ -static-libgcc -ldl -lpthread -lrt - else ifeq ($(PLATFORM),osx) - fdb_flow_tester_LDFLAGS += -lc++ - endif -diff --git a/fdbbackup/local.mk b/fdbbackup/local.mk -index 033fe7d..865fc92 100644 ---- a/fdbbackup/local.mk -+++ b/fdbbackup/local.mk -@@ -25,8 +25,7 @@ fdbbackup_LDFLAGS := $(fdbrpc_LDFLAGS) - fdbbackup_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a - - ifeq ($(PLATFORM),linux) -- fdbbackup_LIBS += -ldl -lpthread -lrt -- fdbbackup_LDFLAGS += -static-libstdc++ -static-libgcc -+ fdbbackup_LDFLAGS += -static-libstdc++ -static-libgcc -ldl -lpthread -lrt - - # GPerfTools profiler (uncomment to use) - # fdbbackup_CFLAGS += -I/opt/gperftools/include -DUSE_GPERFTOOLS=1 -diff --git a/fdbcli/local.mk b/fdbcli/local.mk -index 81a4a42..892c079 100644 ---- a/fdbcli/local.mk -+++ b/fdbcli/local.mk -@@ -22,14 +22,13 @@ - - fdbcli_CFLAGS := $(fdbclient_CFLAGS) - fdbcli_LDFLAGS := $(fdbrpc_LDFLAGS) --fdbcli_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a -ldl -+fdbcli_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a - fdbcli_STATIC_LIBS := - - fdbcli_GENERATED_SOURCES += versions.h - - ifeq ($(PLATFORM),linux) -- fdbcli_LDFLAGS += -static-libstdc++ -static-libgcc -- fdbcli_LIBS += -lpthread -lrt -+ fdbcli_LDFLAGS += -static-libstdc++ -static-libgcc -lpthread -lrt -ldl - else ifeq ($(PLATFORM),osx) - fdbcli_LDFLAGS += -lc++ - endif -diff --git a/fdbserver/local.mk b/fdbserver/local.mk -index 78cad1b..36f2c0f 100644 ---- a/fdbserver/local.mk -+++ b/fdbserver/local.mk -@@ -25,8 +25,7 @@ fdbserver_LDFLAGS := $(fdbrpc_LDFLAGS) - fdbserver_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a - - ifeq ($(PLATFORM),linux) -- fdbserver_LIBS += -ldl -lpthread -lrt -- fdbserver_LDFLAGS += -static-libstdc++ -static-libgcc -+ fdbserver_LDFLAGS += -static-libstdc++ -static-libgcc -ldl -lpthread -lrt - - # GPerfTools profiler (uncomment to use) - # fdbserver_CFLAGS += -I/opt/gperftools/include -DUSE_GPERFTOOLS=1 diff --git a/pkgs/servers/foundationdb/ldflags.patch b/pkgs/servers/foundationdb/ldflags.patch index ee5911e495f..4d523a7ecdd 100644 --- a/pkgs/servers/foundationdb/ldflags.patch +++ b/pkgs/servers/foundationdb/ldflags.patch @@ -1,9 +1,9 @@ diff --git a/FDBLibTLS/local.mk b/FDBLibTLS/local.mk -index 5e6b9cfb..73f4e5f3 100644 +index 0b6eac8..b1891ca 100644 --- a/FDBLibTLS/local.mk +++ b/FDBLibTLS/local.mk @@ -1,6 +1,5 @@ - FDBLibTLS_CFLAGS := -fPIC -I/usr/local/include -I$(BOOSTDIR) -Ifdbrpc + FDBLibTLS_CFLAGS := -fPIC -I/usr/local/include -I$(BOOSTDIR) -FDBLibTLS_STATIC_LIBS := -ltls -lssl -lcrypto -FDBLibTLS_LDFLAGS := -L/usr/local/lib -static-libstdc++ -static-libgcc -lrt +FDBLibTLS_LDFLAGS := -L/usr/local/lib -static-libstdc++ -static-libgcc -lrt -ltls -lssl -lcrypto @@ -11,7 +11,7 @@ index 5e6b9cfb..73f4e5f3 100644 # The plugin isn't a typical library, so it feels more sensible to have a copy diff --git a/bindings/c/local.mk b/bindings/c/local.mk -index 44f0c31b..7aea5a4f 100644 +index 44f0c31..7aea5a4 100644 --- a/bindings/c/local.mk +++ b/bindings/c/local.mk @@ -29,8 +29,8 @@ fdb_c_tests_HEADERS := -Ibindings/c @@ -26,7 +26,7 @@ index 44f0c31b..7aea5a4f 100644 endif diff --git a/bindings/flow/tester/local.mk b/bindings/flow/tester/local.mk -index 2ef4fcb7..6e59625c 100644 +index 2ef4fcb..6e59625 100644 --- a/bindings/flow/tester/local.mk +++ b/bindings/flow/tester/local.mk @@ -35,8 +35,7 @@ _fdb_flow_tester_clean: @@ -40,7 +40,7 @@ index 2ef4fcb7..6e59625c 100644 fdb_flow_tester_LDFLAGS += -lc++ endif diff --git a/fdbbackup/local.mk b/fdbbackup/local.mk -index 033fe7d4..865fc923 100644 +index 033fe7d..865fc92 100644 --- a/fdbbackup/local.mk +++ b/fdbbackup/local.mk @@ -25,8 +25,7 @@ fdbbackup_LDFLAGS := $(fdbrpc_LDFLAGS) @@ -54,7 +54,7 @@ index 033fe7d4..865fc923 100644 # GPerfTools profiler (uncomment to use) # fdbbackup_CFLAGS += -I/opt/gperftools/include -DUSE_GPERFTOOLS=1 diff --git a/fdbcli/local.mk b/fdbcli/local.mk -index 81a4a42e..892c079c 100644 +index 81a4a42..892c079 100644 --- a/fdbcli/local.mk +++ b/fdbcli/local.mk @@ -22,14 +22,13 @@ @@ -75,7 +75,7 @@ index 81a4a42e..892c079c 100644 fdbcli_LDFLAGS += -lc++ endif diff --git a/fdbserver/local.mk b/fdbserver/local.mk -index 78cad1bf..36f2c0f7 100644 +index 78cad1b..36f2c0f 100644 --- a/fdbserver/local.mk +++ b/fdbserver/local.mk @@ -25,8 +25,7 @@ fdbserver_LDFLAGS := $(fdbrpc_LDFLAGS) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c53a9ceeabe..d3d40662053 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2522,9 +2522,7 @@ with pkgs; fuseiso = callPackage ../tools/filesystems/fuseiso { }; - fdbPackages = callPackage ../servers/foundationdb { - stdenv49 = overrideCC stdenv gcc49; - }; + fdbPackages = callPackage ../servers/foundationdb { stdenv = overrideCC stdenv gcc49; }; inherit (fdbPackages) foundationdb51 From f5793578732a034b4b5835808394476957ee8204 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 2 Jul 2018 16:26:09 +0200 Subject: [PATCH 35/56] python.pkgs.google_cloud_speech: update propagatedBuildInputs --- .../python-modules/google_cloud_speech/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_speech/default.nix b/pkgs/development/python-modules/google_cloud_speech/default.nix index 56882c5269a..8cf3fe5753e 100644 --- a/pkgs/development/python-modules/google_cloud_speech/default.nix +++ b/pkgs/development/python-modules/google_cloud_speech/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi -, setuptools, google_api_core, google_gax, google_cloud_core, pytest, mock }: +, google_api_core, pytest, mock }: buildPythonPackage rec { pname = "google-cloud-speech"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "8396646aa9de210bacb144fabd82ab5fe577b3b11708725c879b72c96009d631"; }; - propagatedBuildInputs = [ setuptools google_api_core google_gax google_cloud_core ]; + propagatedBuildInputs = [ google_api_core ]; checkInputs = [ pytest mock ]; # needs credentials From 6a8f7e40d72d0b5758bbf9ced9f43cefd5b86080 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 2 Jul 2018 16:28:16 +0200 Subject: [PATCH 36/56] python.pkgs.google_gax: remove deprecated package See https://github.com/googleapis/gax-python#deprecated. --- pkgs/top-level/python-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1563176c39a..5f8530cbc0f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6247,8 +6247,6 @@ in { google_cloud_speech = callPackage ../development/python-modules/google_cloud_speech { }; - google_gax = callPackage ../development/python-modules/google_gax { }; - gpgme = toPythonModule (pkgs.gpgme.override { withPython=true; }); grammalecte = callPackage ../development/python-modules/grammalecte { }; From 5cc97704e40df982ea0dee819168a01e66ed7270 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 2 Jul 2018 16:30:24 +0200 Subject: [PATCH 37/56] python.pkgs.google_gax: remove unused expression --- .../python-modules/google_gax/default.nix | 31 ------------------- 1 file changed, 31 deletions(-) delete mode 100644 pkgs/development/python-modules/google_gax/default.nix diff --git a/pkgs/development/python-modules/google_gax/default.nix b/pkgs/development/python-modules/google_gax/default.nix deleted file mode 100644 index daabba6c390..00000000000 --- a/pkgs/development/python-modules/google_gax/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, buildPythonPackage, fetchPypi -, google_auth, ply, protobuf, grpcio, requests -, googleapis_common_protos, dill, future, pytest, mock, unittest2 }: - -buildPythonPackage rec { - pname = "google-gax"; - version = "0.16.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "1d844c56f942d98f12a1b0ecabe8a17d69bef41ff513edd97253bcde02ffd929"; - }; - - propagatedBuildInputs = [ google_auth ply protobuf grpcio requests googleapis_common_protos dill future ]; - checkInputs = [ pytest mock unittest2 ]; - - # Importing test__grpc_google_auth fails with "ModuleNotFoundError: No module named 'google_auth_httplib2'", where - # that file would be is unclear to me so I just remove the test. - postPatch = ''rm tests/test__grpc_google_auth.py''; - - checkPhase = '' - py.test - ''; - - meta = with stdenv.lib; { - description = "Google API Extensions for Python (gax-python) tools based on gRPC and Google API conventions."; - homepage = "http://gax-python.readthedocs.io/en/latest/"; - license = licenses.bsd3; - maintainers = with maintainers; [ vanschelven ]; - }; -} From eb90f5c08e3741c42655b250c19fcd0243a472b1 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 14 Jun 2018 22:17:01 -0400 Subject: [PATCH 38/56] all-packages: add pkgsCross --- pkgs/top-level/all-packages.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d3d40662053..86b5ee6a8b0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31,6 +31,11 @@ with pkgs; then pkgsi686Linux.callPackage else throw "callPackage_i686 not supported on system '${stdenv.system}'"; + # Useful attribute of systems to cross compile to. + pkgsCross = lib.mapAttrs (n: crossSystem: + nixpkgsFun { inherit crossSystem; }) + lib.systems.examples; + # A stdenv capable of building 32-bit binaries. On x86_64-linux, # it uses GCC compiled with multilib support; on i686-linux, it's # just the plain stdenv. From d665e80450efcfeed9b245aecb6218cb82e1a24c Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 25 Jun 2018 14:18:51 -0400 Subject: [PATCH 39/56] top-level: move cross pkgs to overlay --- pkgs/top-level/all-packages.nix | 5 ----- pkgs/top-level/stage.nix | 7 +++++++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 86b5ee6a8b0..d3d40662053 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31,11 +31,6 @@ with pkgs; then pkgsi686Linux.callPackage else throw "callPackage_i686 not supported on system '${stdenv.system}'"; - # Useful attribute of systems to cross compile to. - pkgsCross = lib.mapAttrs (n: crossSystem: - nixpkgsFun { inherit crossSystem; }) - lib.systems.examples; - # A stdenv capable of building 32-bit binaries. On x86_64-linux, # it uses GCC compiled with multilib support; on i686-linux, it's # just the plain stdenv. diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index f9941a1c500..ecb3541cbb3 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -117,6 +117,12 @@ let lib.optionalAttrs allowCustomOverrides ((config.packageOverrides or (super: {})) super); + # Convenient way to reference cross + # Used in aliases for now but should not be used in Nixpkgs. + cross = self: super: { pkgsCross = lib.mapAttrs (n: crossSystem: + nixpkgsFun { inherit crossSystem; }) + lib.systems.examples; }; + # The complete chain of package set builders, applied from top to bottom. # stdenvOverlays must be last as it brings package forward from the # previous bootstrapping phases which have already been overlayed. @@ -127,6 +133,7 @@ let trivialBuilders splice allPackages + cross aliases configOverrides ] ++ overlays ++ [ From b6b195059468d610309d70db99690111cc4a6714 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 25 Jun 2018 14:22:51 -0400 Subject: [PATCH 40/56] top-level: add extraPkgs to stage.nix --- pkgs/top-level/stage.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index ecb3541cbb3..a9d1988ad5f 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -117,11 +117,17 @@ let lib.optionalAttrs allowCustomOverrides ((config.packageOverrides or (super: {})) super); - # Convenient way to reference cross - # Used in aliases for now but should not be used in Nixpkgs. - cross = self: super: { pkgsCross = lib.mapAttrs (n: crossSystem: - nixpkgsFun { inherit crossSystem; }) - lib.systems.examples; }; + # Convenience attributes for instantitating nixpkgs. Each of these + # will instantiate a new version of allPackages. They map example + # attributes to their own thing. + extraPkgs = self: super: { + pkgsCross = lib.mapAttrs (n: crossSystem: + nixpkgsFun { inherit crossSystem; }) + lib.systems.examples; + pkgsLocal = lib.mapAttrs (n: localSystem: + nixpkgsFun { inherit localSystem; }) + lib.systems.examples; + }; # The complete chain of package set builders, applied from top to bottom. # stdenvOverlays must be last as it brings package forward from the @@ -133,7 +139,7 @@ let trivialBuilders splice allPackages - cross + extraPkgs aliases configOverrides ] ++ overlays ++ [ From d1bd9faf6199096adc547ccd60ca850ef18324e4 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 25 Jun 2018 14:32:35 -0400 Subject: [PATCH 41/56] stage: move old stuff to stage.nix --- pkgs/top-level/all-packages.nix | 17 ----------------- pkgs/top-level/stage.nix | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d3d40662053..f8a814ebf05 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12,25 +12,8 @@ with pkgs; { - # Allow callPackage to fill in the pkgs argument inherit pkgs; - - # Override system. This is useful to build i686 packages on x86_64-linux. - forceSystem = system: kernel: nixpkgsFun { - localSystem = { - inherit system; - platform = platform // { kernelArch = kernel; }; - }; - }; - - # Used by wine, firefox with debugging version of Flash, ... - pkgsi686Linux = forceSystem "i686-linux" "i386"; - - callPackage_i686 = if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" - then pkgsi686Linux.callPackage - else throw "callPackage_i686 not supported on system '${stdenv.system}'"; - # A stdenv capable of building 32-bit binaries. On x86_64-linux, # it uses GCC compiled with multilib support; on i686-linux, it's # just the plain stdenv. diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index a9d1988ad5f..551a4a6945b 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -117,6 +117,14 @@ let lib.optionalAttrs allowCustomOverrides ((config.packageOverrides or (super: {})) super); + # Override system. This is useful to build i686 packages on x86_64-linux. + forceSystem = system: kernel: nixpkgsFun { + localSystem = { + inherit system; + platform = stdenv.hostPlatform.platform // { kernelArch = kernel; }; + }; + }; + # Convenience attributes for instantitating nixpkgs. Each of these # will instantiate a new version of allPackages. They map example # attributes to their own thing. @@ -127,6 +135,13 @@ let pkgsLocal = lib.mapAttrs (n: localSystem: nixpkgsFun { inherit localSystem; }) lib.systems.examples; + + # Used by wine, firefox with debugging version of Flash, ... + pkgsi686Linux = forceSystem "i686-linux" "i386"; + + callPackage_i686 = if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" + then self.pkgsi686Linux.callPackage + else throw "callPackage_i686 not supported on system '${stdenv.system}'"; }; # The complete chain of package set builders, applied from top to bottom. From 18af089de75270523a127a76b62da32165f1f548 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 25 Jun 2018 14:50:50 -0400 Subject: [PATCH 42/56] stage: remove nixpkgsFun also inherit forceSystem for some GNU Hurd stuff --- pkgs/top-level/all-packages.nix | 18 ++++++------------ pkgs/top-level/stage.nix | 8 +++----- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f8a814ebf05..9224793c8c0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5,13 +5,14 @@ * to merges. Please use the full-text search of your editor. ;) * Hint: ### starts category names. */ -{ lib, nixpkgsFun, noSysDirs, config}: +{ lib, noSysDirs, config}: self: pkgs: with pkgs; { + # Allow callPackage to fill in the pkgs argument inherit pkgs; # A stdenv capable of building 32-bit binaries. On x86_64-linux, @@ -2404,7 +2405,7 @@ with pkgs; fluentd = callPackage ../tools/misc/fluentd { }; flvstreamer = callPackage ../tools/networking/flvstreamer { }; - + hmetis = callPackage_i686 ../applications/science/math/hmetis { }; libbsd = callPackage ../development/libraries/libbsd { }; @@ -3703,7 +3704,7 @@ with pkgs; lzip = callPackage ../tools/compression/lzip { }; luxcorerender = callPackage ../tools/graphics/luxcorerender { }; - + xz = callPackage ../tools/compression/xz { }; lz4 = callPackage ../tools/compression/lz4 { }; @@ -4968,7 +4969,7 @@ with pkgs; securefs = callPackage ../tools/filesystems/securefs { }; seexpr = callPackage ../development/compilers/seexpr { }; - + setroot = callPackage ../tools/X11/setroot { }; setserial = callPackage ../tools/system/setserial { }; @@ -5873,14 +5874,7 @@ with pkgs; xbursttools = callPackage ../tools/misc/xburst-tools { # It needs a cross compiler for mipsel to build the firmware it will # load into the Ben Nanonote - gccCross = - let - pkgsCross = nixpkgsFun { - # Ben Nanonote system - crossSystem = lib.systems.examples.ben-nanonote; - }; - in - pkgsCross.buildPackages.gccCrossStageStatic; + gccCross = pkgsCross.ben-nanonote.buildPackages.gccCrossStageStatic; }; xclip = callPackage ../tools/misc/xclip { }; diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 551a4a6945b..c209b05b09c 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -93,7 +93,7 @@ let allPackages = self: super: let res = import ./all-packages.nix - { inherit lib nixpkgsFun noSysDirs config; } + { inherit lib noSysDirs config; } res self; in res; @@ -138,10 +138,8 @@ let # Used by wine, firefox with debugging version of Flash, ... pkgsi686Linux = forceSystem "i686-linux" "i386"; - - callPackage_i686 = if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" - then self.pkgsi686Linux.callPackage - else throw "callPackage_i686 not supported on system '${stdenv.system}'"; + callPackage_i686 = self.pkgsi686Linux.callPackage; + inherit forceSystem; }; # The complete chain of package set builders, applied from top to bottom. From 98ddba156c9cde7bd8292e9c1ad74dc723b7ee7c Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 2 Jul 2018 11:22:47 -0400 Subject: [PATCH 43/56] buildRustCrate: Add some commentary about target_os. --- pkgs/build-support/rust/build-rust-crate.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/rust/build-rust-crate.nix b/pkgs/build-support/rust/build-rust-crate.nix index 5e89c1411fd..be76c283bab 100644 --- a/pkgs/build-support/rust/build-rust-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate.nix @@ -15,6 +15,12 @@ let makeDeps = dependencies: " --extern ${extern}=${dep.out}/lib/lib${extern}-${dep.metadata}${buildPlatform.extensions.sharedLibrary}") ) dependencies); + # This doesn't appear to be officially documented anywhere yet. + # See https://github.com/rust-lang-nursery/rust-forge/issues/101. + target_os = if buildPlatform.isDarwin + then "macos" + else buildPlatform.parsed.kernel.name; + echo_build_heading = colors: '' echo_build_heading() { start="" @@ -101,7 +107,7 @@ let makeDeps = dependencies: export CARGO_PKG_AUTHORS="${authors}" export CARGO_CFG_TARGET_ARCH=${buildPlatform.parsed.cpu.name} - export CARGO_CFG_TARGET_OS=${if buildPlatform.isDarwin then "macos" else buildPlatform.parsed.kernel.name} + export CARGO_CFG_TARGET_OS=${target_os} export CARGO_CFG_TARGET_FAMILY="unix" export CARGO_CFG_UNIX=1 export CARGO_CFG_TARGET_ENV="gnu" From cb96b8643c83a4815e21e2f98d51aa867a9539e7 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 30 Jun 2018 12:30:58 +0200 Subject: [PATCH 44/56] eclipse-plugin-jdt-codemining: init at 1.0.0.201806221018 --- pkgs/applications/editors/eclipse/plugins.nix | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index 28fe3e294b5..8b03d93d183 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -487,6 +487,29 @@ rec { }; }; + jdt-codemining = buildEclipsePlugin rec { + name = "jdt-codemining-${version}"; + version = "1.0.0.201806221018"; + + srcFeature = fetchurl { + url = "http://oss.opensagres.fr/jdt-codemining/snapshot/features/jdt-codemining-feature_${version}.jar"; + sha256 = "1vy30rsb9xifn4r1r2n84d48g6riadzli1xvhfs1mf5pkm5ljwl6"; + }; + + srcPlugin = fetchurl { + url = "http://oss.opensagres.fr/jdt-codemining/snapshot/plugins/org.eclipse.jdt.codemining_${version}.jar"; + sha256 = "0qdzlqcjcm2i4mwhmcdml0am83z1dayrcmf37ji7vmw6iwdk1xmp"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/angelozerr/jdt-codemining; + description = "Provides JDT Java CodeMining"; + license = licenses.epl10; + platforms = platforms.all; + maintainers = [ maintainers.rycee ]; + }; + }; + rustdt = buildEclipseUpdateSite rec { name = "rustdt-${version}"; version = "0.6.2"; From b045d1f139c5a6e4e5ecc480c851d3b06f91d591 Mon Sep 17 00:00:00 2001 From: numkem Date: Mon, 2 Jul 2018 11:47:06 -0400 Subject: [PATCH 45/56] pythonPackages.grpcio: 1.12.1 -> 1.13.0 (#42854) --- pkgs/development/python-modules/grpcio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index 265b631e112..5e94f8f078c 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "grpcio"; - version = "1.12.1"; + version = "1.13.0"; src = fetchPypi { inherit pname version; - sha256 = "f14faadfd09aa8526536cd2149e274563f45b767fca1736ccc53803a6af3f90e"; + sha256 = "6324581e215157f0fbe335dff2e21a65b4406db98ac7cca05f1e23b4f510b426"; }; propagatedBuildInputs = [ six protobuf ] From 033c9ace4ee1bae291d9fd793613795a2ff034cb Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Mon, 2 Jul 2018 17:59:17 +0200 Subject: [PATCH 46/56] josm: 13878 -> 13996 --- pkgs/applications/misc/josm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index d79e2620c34..44531a672b3 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "josm-${version}"; - version = "13878"; + version = "13996"; src = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "0f8cbzlrlyq8awhzgbjvsljih19s8dzxhhwb4h2dfiakv1rl6vvx"; + sha256 = "1j98wxw84f5rf3finr38bkr1sh9ckah8pmhmxyhmcw2rxf1mv9bf"; }; buildInputs = [ jre8 makeWrapper ]; From dcc1013f6be1298e682e883b7f4578db4d380a45 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Mon, 2 Jul 2018 18:03:05 +0200 Subject: [PATCH 47/56] pythonPackages.backports_shutil_get_terminal_size: 1.0 -> 2016-02-21 (#42840) --- .../science/math/sage/sage-src.nix | 7 ------ .../default.nix | 25 +++++++++++++------ 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 244a6ea7267..2eb7f810059 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -104,13 +104,6 @@ stdenv.mkDerivation rec { # https://trac.sagemath.org/ticket/24935 ./patches/sphinx-1.7.patch - # https://trac.sagemath.org/ticket/25320 - (fetchpatch { - name = "zero_division_error_formatting.patch"; - url = "https://git.sagemath.org/sage.git/patch/?h=f79070ddd09fa0ad6b340b097bd8d690a7aa35f0"; - sha256 = "02wsc3wbp8g8dk5jcjyv18d9v537h3zp5v8lwir46j4na4kj0dlb"; - }) - # Adapt hashes to new boost version # https://trac.sagemath.org/ticket/22243 # (this ticket doesn't only upgrade boost but also avoids this problem in the future) diff --git a/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix b/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix index 7f4faa8a8b4..3cd37617a39 100644 --- a/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix +++ b/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix @@ -1,26 +1,35 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pytest , pythonOlder }: if !(pythonOlder "3.3") then null else buildPythonPackage rec { pname = "backports.shutil_get_terminal_size"; - version = "1.0.0"; + version = "unstable-2016-02-21"; - src = fetchPypi { - inherit pname version; - sha256 = "713e7a8228ae80341c70586d1cc0a8caa5207346927e23d09dcbcaf18eadec80"; + # there have been numerous fixes commited since the initial release. + # Most notably fixing a problem where the backport would always return + # terminal size 0. See https://trac.sagemath.org/ticket/25320#comment:5. + # Unfortunately the maintainer seems inactive and has not responded to + # a request for a new release since 2016: + # https://github.com/chrippa/backports.shutil_get_terminal_size/issues/7 + src = fetchFromGitHub { + owner = "chrippa"; + repo = "backports.shutil_get_terminal_size"; + rev = "159e269450dbf37c3a837f6ea7e628d59acbb96a"; + sha256 = "17sgv8vg0xxfdnca45l1mmwwvj29gich5c8kqznnj51kfccch7sg"; }; checkInputs = [ pytest ]; - meta = { + meta = with lib; { description = "A backport of the get_terminal_size function from Python 3.3’s shutil."; homepage = https://github.com/chrippa/backports.shutil_get_terminal_size; - license = with lib.licenses; [ mit ]; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ timokau ]; }; -} \ No newline at end of file +} From 6e4711727e7e7b56a7b479a5f5839a87e5b334cf Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 2 Jul 2018 17:57:31 +0200 Subject: [PATCH 48/56] nixos/hadoop: Replace users.extra{Users,Groups} In fff5923686c21dd147bde62d08e9f1042deadb4f all occurences of users.extraUsers and users.extraGroups have been changed tree-wide to users.users and users.group. In the meantime the hadoop modules were introduced via #41381 (060a98e9f4ad879492e48d63e887b0b6db26299e). Unfortunately those modules still use users.extraUsers, which has been renamed a long time ago (14321ae2431e33f5ed81f1ee43eddd29c7e9d01d, about three years from now), so let's actually rename it accordingly as well. Signed-off-by: aszlig Cc: @matthewbauer, @aespinosa --- nixos/modules/services/cluster/hadoop/default.nix | 6 +++--- nixos/modules/services/cluster/hadoop/hdfs.nix | 2 +- nixos/modules/services/cluster/hadoop/yarn.nix | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/cluster/hadoop/default.nix b/nixos/modules/services/cluster/hadoop/default.nix index 53c13fd0603..240938f0d62 100644 --- a/nixos/modules/services/cluster/hadoop/default.nix +++ b/nixos/modules/services/cluster/hadoop/default.nix @@ -52,9 +52,9 @@ with lib; config = mkMerge [ - (mkIf (builtins.hasAttr "yarn" config.users.extraUsers || - builtins.hasAttr "hdfs" config.users.extraUsers ) { - users.extraGroups.hadoop = { + (mkIf (builtins.hasAttr "yarn" config.users.users || + builtins.hasAttr "hdfs" config.users.users) { + users.groups.hadoop = { gid = config.ids.gids.hadoop; }; }) diff --git a/nixos/modules/services/cluster/hadoop/hdfs.nix b/nixos/modules/services/cluster/hadoop/hdfs.nix index 48020e6139c..a38b6a78d3a 100644 --- a/nixos/modules/services/cluster/hadoop/hdfs.nix +++ b/nixos/modules/services/cluster/hadoop/hdfs.nix @@ -62,7 +62,7 @@ with lib; (mkIf ( cfg.hdfs.namenode.enabled || cfg.hdfs.datanode.enabled ) { - users.extraUsers.hdfs = { + users.users.hdfs = { description = "Hadoop HDFS user"; group = "hadoop"; uid = config.ids.uids.hdfs; diff --git a/nixos/modules/services/cluster/hadoop/yarn.nix b/nixos/modules/services/cluster/hadoop/yarn.nix index ce5b04a331c..5345a2732d7 100644 --- a/nixos/modules/services/cluster/hadoop/yarn.nix +++ b/nixos/modules/services/cluster/hadoop/yarn.nix @@ -27,7 +27,7 @@ with lib; cfg.yarn.resourcemanager.enabled || cfg.yarn.nodemanager.enabled ) { - users.extraUsers.yarn = { + users.users.yarn = { description = "Hadoop YARN user"; group = "hadoop"; uid = config.ids.uids.yarn; From 8b48b33e248561fb70649a526463596a12fe212b Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 1 Jul 2018 13:47:04 +0800 Subject: [PATCH 49/56] firefox-devedition-bin: 62.0b3 -> 62.0b4 --- .../firefox-bin/devedition_sources.nix | 794 +++++++++--------- 1 file changed, 397 insertions(+), 397 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index 8626b9ef664..af63defb129 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,995 +1,995 @@ { - version = "62.0b3"; + version = "62.0b4"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ach/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/ach/firefox-62.0b4.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "fb662a573025fc9f8e4de57d81f0a237b507040a040844150d55d37210296873112de5cca3a57b3f849ca9d4ba4a11786d8118446b0d190c2895e7144945ab28"; + sha512 = "7b1c0f5e135054a3d4be3f73492cbe94049d62a54d582929a2154081067eda79346510f0dd96f226b608a93280f55f02c247121725ae2cf4522fcf60f57d2fee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/af/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/af/firefox-62.0b4.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "000ce0eadeec614c9ec6388932fc0835fe844966be86516b71c9baf33126ab8e7245231da12046ed38c5b0f9ebe79ac1af61ce7d0c39263a8e890032bd36f24a"; + sha512 = "f55d886f91572d202a4d00f103c7559df110d59c893d716020fe6c26d0bcd3194f09d04fcd81411f826a8331215f7b30d9b7135aac3bf5474342af1f8e5ded51"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/an/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/an/firefox-62.0b4.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "b081b77430f9a0f9d4459c680f6b544acb290522308bbae6c2635791d325c3283afa3db97e9bdafb446a9f2265f3f20836eade5a687fb9f38811cb12e7af2330"; + sha512 = "75099685a950aed87379575453199440b9818c264d76a3d3c883e7c97a707bd58d602f0947501ace39feea5232f86f4978f0dc399abc90d0b7b975ff9fcf7351"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ar/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/ar/firefox-62.0b4.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "6e9fa89945b9ef32cffd2fb936151a642e0b5a1ac1b333e22406fd409087c456e64095edb371eb244af2100cfc0d36d4b106d7fee6d67d9ff5627d3efefe0434"; + sha512 = "cdcfa58150b5b30e64e7e5a6f19ae30540906a21a1dbead35ceaaf043296bb88ab9e1bb35701ebf0a04ad97d058be6cc0335c6539499802abea0fa7fe0984d54"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/as/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/as/firefox-62.0b4.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "53750c2fb6abb624c5fd645bd08406bb4d0dfbc7094e128a773d1222f211d25fa4ad042879e0aab53a092fed0e6d4a1997f941662afda2bbd5740a6946768241"; + sha512 = "f65af596cf506c10968c20260f71c48591639d2fe0d32928ab93fdff4d5b73cac9eedd865eb6734eb328f8777142d7fb916e0ac10ad655c185e1fdba7e7b192f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ast/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/ast/firefox-62.0b4.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "26105f6c7568727608f70351d3111f2997eab7a3670bec9733415b8612c38f5c780568ffd0da4ca840ffd12a7fa27b4e7e34cf8749817762f9d805e0fe4e3bc9"; + sha512 = "bf70fcc39415d4aabb8cc3587ea4f70ed3c9f659154d8c4360aafad06a86c8a5f279495475c8c299621b40a6a89d4608c1c444d71dad86be8a2dcd5c243bf2a4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/az/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/az/firefox-62.0b4.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "d4d0507bbf25810e39fb348705ef950d1d0b85d9570b72d6a24aab5d95a5860632229392863aff6f719cf41975299e76b57f337681d233be9f32fab2a3a6ec57"; + sha512 = "70fbbdff4a85a57a5ccf4daa0a96cbf4e966d23397ca7378faa034975118bca9d28637632e9dc396827dba6b0ada9a9fdc68882813800a7db798da0b1fc22d5b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/be/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/be/firefox-62.0b4.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "d6426e87f85d76da37e58a3f2f59d965bb96fd8d10c066130fc8445dc753c04fa9103987e29d9dd2cde38d1123d63f3741997d823f14ccf51d57746fa3508070"; + sha512 = "be5a3316e08459cd03b99300ce1614d6b807bca39e994bbdc612a23cdd2a10dfda43ef2985fe321a0be472a8388034101b8f14eaa723f87a1c19341169db2113"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/bg/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/bg/firefox-62.0b4.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "e99f471aaf2aadc26e6484dec1a0969da2459aaa7fbc4c16bae76abf5bd325d43642853aa6b5b1d8b7375c82f69a5a012743a2a458c6fb365f8429a4d4e7c9df"; + sha512 = "dcdeddaf1df6bce66b8212d920a5064c40fc0a6ba5d680c581c8153d78b11e2a596b2c310acee9eedd63ac450ce01706d2e058efb7c2c66633a41c487cf06caa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/bn-BD/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/bn-BD/firefox-62.0b4.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "55e3d8ecc06fb8d12310ec6ed6a7458c7f0f357ba286ad7a4967880e0da591704133525e989349f57696a64b168a532da3d167897fb91aad7ae0fd153bf96f09"; + sha512 = "aa35706664daf687efc58398663429b7e69ed9b2e37cfb64675b76155c2bd76154475f8be1492959cbda4da0a34e8002e67c4cf275aca25714d9fb0a87e79e16"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/bn-IN/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/bn-IN/firefox-62.0b4.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "ca0940bb07232cbcd9143547a3870593b938979f4aeb6711e9320468f1b55bd8da02c363be6450f9cd6ca4320e0b41b401b21c8b16b7fa8238f4ececb1cc82bb"; + sha512 = "30cb5feb648978a4d74c71b35db53605ef00e425fa4dcfeae93e3af86238f6f14161e15d009c95227cff7733d562961acac04a872a0e63063df1c064ff36ba0d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/br/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/br/firefox-62.0b4.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "bc060aa4d847eb5e3694f2c88f536de9dee2f0e83967f3ed3559894fc91f483b8cfc9a160d57d0c97008f145bcaec2eea5b7a9a442439d71cadce35820765c6c"; + sha512 = "4843fbc4a3eadc5f35e8b191d2cf023a97d16d755b167be71143f67747efe7c089b7e8eb6c945683a35dc707a82b35381cd39f9d42b62493841efff7a0a92c76"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/bs/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/bs/firefox-62.0b4.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "b6ad77b36fb6613234aff3e120e8e0954dfa430287c6a48662c8affde272f4449a452104a215a25e075b6afc4e4b3d7ceb6f7e9439e10ba4de411e7c6396be39"; + sha512 = "37500eef420d5741f78b085954b5a4f93883deaf7663192666478c9e4257fcf1027254cb757c8fbd6306ce77828d78ff45eac512707d7db553ced22428fe67c5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ca/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/ca/firefox-62.0b4.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "261fa5ad64ad6f3d58d87ed71843105b12ad689372f215be4572e23937cac0dd648d8bf722c614c08211c864045dfe8a7f65eef45a297666a762f80a62cf56b4"; + sha512 = "263b9a74d096393c8052136aed8853d677f6f3a6537bf1b75aface279d54735de784c887324cf24b76bc155760bdb4094986dcf6205363ae58860996747f827b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/cak/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/cak/firefox-62.0b4.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "27feba8268ddfe5d12876520f6dec73799802ef179464c54c44fc134fa18c15faeca9d946b6d3f67a8b7210cc68130c7373167aaf1732f5ed9df1febd6077860"; + sha512 = "1ae49a9b46d8905c4166760bb5cf1a1ba1c22d53143069a709d1e615a893f470155f95f3b10e1cd81482e2e92eb143e4d0c553aadb004748380923ae4502f879"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/cs/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/cs/firefox-62.0b4.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "4f922f1a443c630571c0389b816db1880f0cd386326778560461eaed7ede66700be9f69294e90c9339295009c3ce2a1a2b3e545a73f3b61854f899ae5cfda75c"; + sha512 = "d5ce2026bc7602715f8ff9607af6d8a6b7cbbdfd7fb3ffd751b1349362e422a51778c25b4bd68ac23bf11bc619590afdca5047cf5685c34d24bef855e79c8fac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/cy/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/cy/firefox-62.0b4.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "2a36df61f32b2da0a3d0e6d37c4f7e9fce3e596a23feede17539baaeb74f24abdc9fa562ee6ab6cad57650b25a1e117a20d308cbdb30a07c59b11907efdc631a"; + sha512 = "69f38b1babe322ff978706be92000315e4554ded0f54e33417dc6827a47f46d109fcabde5f54e66efb87ffaca8ac4c4cd21590296be152892e70911609fe38ae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/da/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/da/firefox-62.0b4.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "4840577c308c51eecc349fd3780311a9dda632c0ffeb3df10bf028c3e6ad27d0fe5fb7c572bf706a69fcd49ab9de83680023ac4373abd46860b8afe8e6d2bd2f"; + sha512 = "abb552eaeaec53b7454a2757f119a5941b55a1a4fbba07d0d3d552126dddcf964d1715f0945cd141a5fb03e7c68ef219cef8ee452a49204a57168052335d8b89"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/de/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/de/firefox-62.0b4.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "4767e6bb638664c9abbf4c93547e6f9498e84181b5924f8f96a35b8e7e3cc11ab04b18cfbca38efa075274cc9bd2a036e25f53eb84d462f2afd7abda4f4e32c0"; + sha512 = "eac5458755435b43204118e88b9662baf3ed64501c7f1aa874d00b572c3747771bfbd592dcdf73b5da3ce0cb1973994bc1020b2dce09d02cd92f1465634aa671"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/dsb/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/dsb/firefox-62.0b4.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "4620c84dea2fffaa684554ec8517a5a6dabbdbbf4f60b999a490e70fe0da5a1fa21ef2183e089414b979f0529d867bd98ec892df146507502eb81ba6c2c04856"; + sha512 = "ff06c526c8bbc5aaedd84fa625c7396b1bc2a97a192ed8663190e0560ec06314da8a555adabb2cc822ac581b9ff41a9875a3f18bb8021ea797ea9ba9acf92856"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/el/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/el/firefox-62.0b4.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "12ad8e39c55f975f82351e1499ce1ba78565326eff521f36c87d31b7500f3da004c1e8c72c98cc603949c8456cbd709f8810491c6914f5c42e6cf8b05eac4684"; + sha512 = "b82cb8ad70683fe88bb15ff180e876417e6572013b57b36935488949d87ef4a5e396841d188bd521397bd279666aefe5908ceeaf30b3228e8b16ea804e552df3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/en-CA/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/en-CA/firefox-62.0b4.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "0f7c43bd7f5586a1ec78ccbb2bf424933be3964c16c2424adde1e901c0fdd5d523adcd974b02e09999bad66bb719a9976e7749b8673d303613447861e07c65a7"; + sha512 = "97bbd91f565d963e48134c25bff041e73cfcaca26c0e346c14fde3abdf768d35247dd566ad097e6e5ceeb3d5c202192712ed57f2e5792976f87560ffac7aaad3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/en-GB/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/en-GB/firefox-62.0b4.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "5c234d1017b65319b129e8430469850e9c5d25990df2949e16dbd610cef45bcb5061d044cbfd0ef95cc0328f9c27eb239c251b7d41388677741e638349bce26e"; + sha512 = "937bed60da27364461ff894f9fdcc695e7c9525fd27efc45345351fb4465cbc89b2cb30c64b84c7a5e2268acab722930ab491ada49efe2ec1d2238c4bb65a0cf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/en-US/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/en-US/firefox-62.0b4.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "638b97dd86c548b666220b0b4e785d49c40f8dc46ea006416b7f66cadd2fa511040604743c921bf5c156b06fa26007859d26923ab39cbca0a5def80c9e171ffc"; + sha512 = "1e7e3e0a934ac0952e1ef21967106da6f04b71bd55e7fb0b68a6433b9355c3a0e9f761221399f6cd4b43bb50371b0439937a5d20205861b9251322cf0866f834"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/en-ZA/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/en-ZA/firefox-62.0b4.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "3a64761e9083c5b6eedf25c6641534211d6325d9b97b22a19a413305ecdc697d75bd06322f04c7b84c08ee077685fd23da3363306a31ec3439794333a2e264cb"; + sha512 = "e641ea2f7ea7d8a821768df8864f192683174d794dd30adbfd2c70b890dd512c1de852e6eef410d833f1778394d8f7585e1c51e575b1ead2e88f9bc3339d639d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/eo/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/eo/firefox-62.0b4.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "d244bf5d4a4f385116228b6b3f306d15b8710a969ea50580e91da861b97ece4473aa2851ea02bccfc73dc183abd523089c09da320cb6d34e1db492ce0bf58cb9"; + sha512 = "b2921289962748ea69581338262c4b029fbc81e4129e653e70d9e429626fadbdb96a6ef4f02cc9f5e79dbe4a9b8bb5d5996ff053164f1276c7c04efb8b2311f8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/es-AR/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/es-AR/firefox-62.0b4.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "5e53d61b916f9774c2471d941b26b72e5d1caef0c1997a1b435b1f57b70cb96ffd8b4061ee4a3bd90c2d480fb94314d2f71d6be336ced511b27b447b6dc2e6b2"; + sha512 = "b1b36f8b2048013d79d1709457ded9c0c1193576905df438dbe5f23c77b10e6d56b5a1b0d033382dd268dc4910190681d63d3a98494086fe5d1ae88ca7011419"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/es-CL/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/es-CL/firefox-62.0b4.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "23f44b92bee6543ef4919554533a2ba35e1597d4ff46246047b4f2f0e45751c5739f00167f535f39c8f06415bc63e204a5b38152da33a26cd8dc2f713b3ebb4b"; + sha512 = "7c9eb0317882de9f9e0d17089e845a73d326339626a7cf586e2deaef7e9c23a3f9c036c958c6e75ae95442ea8227fa4054e99626b7760fcb3879169299f7bec3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/es-ES/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/es-ES/firefox-62.0b4.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "47b30177bdf420887782067817ffb7618b0aa73a4777568de97e9b09fd86ca3d575c1b00f8ecaf24455ebb654238dc873ad3544818353d48d18f1202fd96c9f6"; + sha512 = "a5bde102f8292df5b43ad2e885bff17155649cb5aa783936cca1138199d68b11ccd7f9545f5e74dabbc45ccfc0c767a68c4f3235c64b7ddb2fd6c79227cf0dcb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/es-MX/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/es-MX/firefox-62.0b4.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "34749402c8fbee479097d411981b271c4c5f3fe17faa7a22684ba4755035d1316b01b94e085a0d7107f3e14caed296c37e96007af32ff447672cf3732bdf6fa5"; + sha512 = "7402957c440a8180e5fa6fc231f62558287d3d5e97b6b3137b9bfa94a218b3eb46077f29b940869c2a878f6acce1cf43cc617117ba2f9bb6feb5f17b4cbd2549"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/et/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/et/firefox-62.0b4.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "093f375d961b48a70457f31c007547341f72eb86f4b91ad84fcc8dd2bbbc4b23a2b20d2422904f9959b6906c3075166f82669b30938525dd72287e864ea98ab1"; + sha512 = "036c24caefc760cab1803c802c40c65ae13adf3803f49c48da2ce79be88a5b4e9f138053c5d56caad48344a8e260abcb2a1bada3764e5f513b5539014d5232c2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/eu/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/eu/firefox-62.0b4.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "a9dfab6c92cb6a78cab0a9e2f1f273bed2d54d18a918367cd8e1fdd9f96dfa9e065bf4205211e8c95c6e085c947aa48e22a82c8ef4e5b87f94829bf6de4d1547"; + sha512 = "57f2bddb7fe4a5c23dd90d6427b9602b66d3ed4ba51c431ac3dac2d375a996b7ec183dc8e4c29d413e5a85f36df72c50271b68fb2cae43a25fcee8306a33253a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/fa/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/fa/firefox-62.0b4.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "5e20caf1360465aed8711f914d2d6d727aecf3e94b6b19cd3264c4b0fd567950bac73eb602b2a7813f6d7bae6717aa598f04daafa49960c19852ba8dbb06f849"; + sha512 = "b21fcc808ff0ab36c2a514eca911acfbe096d00b052d604660e67ffa07a568518db5e2521e311a9cd471ec3c166396e82ea80972298492bba963d7e1ba2d4c3e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ff/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/ff/firefox-62.0b4.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "4d2a56f24d2be12653e3b3a3d5466702c2a83a3e2d6a3628897b63e0de8653dd7412878a6fc855ee37f588a3aa3ff3d587ef544b4f81dd8f73042fa9a2918243"; + sha512 = "8a00c930b554a9416a5459ad23dee37266fe87fd669533f6d4345a133c26fe59df1c867784e9751ffe91c1cc78d7c6b57fe18ef7450ac1dad05f45e3416b0bdb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/fi/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/fi/firefox-62.0b4.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "ba75525f36e0fdd30f030b3490aed77ea5ba53a21da526871d1813882bdb11aef2576448dc066d0aa995a0ccaa7c3740b4e19c88c4c9a6490b23432800637b33"; + sha512 = "8dac0f1215ea1237b3665900e7b81f22d3acce421ae284bd3b1a3a7dccfbbbb298db11cb714227a2b0b678392b5b17b94bef1e51334aab4dd63f6c42d9645f46"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/fr/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/fr/firefox-62.0b4.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "bd8ec59817759393c6a248769873673e05591241e172404b8277709dcfa8496061fb411641145bc51bc7c34b26427c88088199ac1b7314c1780e312038e48643"; + sha512 = "9a63785fe41f013e9742f809372f82abd56b88944df754dee4d109c7b5f5be903389684dc943fa3445fcb240697a7be668cad1c8ebb1da481798fa9daf6a5ecc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/fy-NL/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/fy-NL/firefox-62.0b4.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "af9180e4773207eed96741f8aaf0448e3f0b0ea061a6d9d6059f01cfe6f9a599a0a68c54868e1ce2428b5b6c3c5262a8a5de545dad96799c144da49e591184bd"; + sha512 = "509de629d1398a848d2f465c0c7aa1a442c4ddaa0f4dd16da9442f04d7dc8f3eeb1643020ad69584e93122d450e20f25e98ce298e6c19116373dc59da33a5c5a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ga-IE/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/ga-IE/firefox-62.0b4.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "2cfe60bc05ab09bd86dfbd77d5b9cfd0b768cd8c9cdcee7772a712056cb0aff70ddba515e10fd5f2be29ca4f82e1dd8632cc131a30d70dcb183b3dcd1e9e5f46"; + sha512 = "5a53102494178c6ea1b265981e0faacd251c024ec5e5e611b00e9d928ed17eeef553569664f31630d2c67a73c3793265bfbca973ea47c374d4692ee24e04dea5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/gd/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/gd/firefox-62.0b4.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "2a918ffae1c37d06aedb5e33cb3771c0879edd31722fc4afcb50b58be984122a573b59130dbd978521c7473fc24584bd5dfb05e46877bd885c9468d20050a997"; + sha512 = "ef0a66000cdd133ceb5d63c253f6d36ea8a480cc7bfb2bd00d3b09a6b2daaea5d53fec36e48b2dfe76e9695aa2894ca5560cd6f8ed73a3e06354e9a124b8433c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/gl/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/gl/firefox-62.0b4.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "0cf0fe3099b4c1967c152a95228eccc8043c65324b42f87c2dea5d33a3bac93672eeb93dc85c7d12f8768489ee071d6437aa6efbcbe6d5b81a7129ce20da1312"; + sha512 = "ed8d4938ad9129856d229acef1bbf7414a598b8268038a9d13e0d8aa81f16799de153a0cb39ef5816b18d046806944716732dddfeb60037e57dea8fd050a8bd9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/gn/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/gn/firefox-62.0b4.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "0156f9882dd2ab3a02aa2916eae8eeeddad584038bcbd79a877ccee67bf24d2095a95817fc4add01dda9680db6d713f13629d83e0470faf84187b9a836e0a489"; + sha512 = "7a9336902b3f08e7d0cd32f0ec56e837a6d4fbc384778e0c150d24cb94a95996a9a8e178e43189069cf621f6a15c5713beffb113ea9a07350412c50343db1d6d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/gu-IN/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/gu-IN/firefox-62.0b4.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "78421ec8446122895822893559d5d1d8180a38158a41e04529eb165e7e68f50d0419ed60dd6a94076dcea270f3cf492376ed1ca8b53bc67cd70e19a18fad5c77"; + sha512 = "af0c7c80672714e44e9bf5d0e452a832b9ce5a7f6e64ff9268b191ed1a85b1342020d521da638741e78d92fc10bc56fd761c5f36719092c439387195a6f9f9d0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/he/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/he/firefox-62.0b4.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "77fcfd12786a328f27dc59b1fa6bccf3427090d557d4f2be945f575d3d2b46049d293a400c74496ceabc24b3c17e6dfe6fd038c1dc9ab9460c5ff807f30a8993"; + sha512 = "dfdca9e98dfb8515d80d4c57faac7b3e321fc4b283a68e2c0e7c87d8da679e0dca156bc142a9c84567c1e0257ac2f324347cef2e9eaf9daac0a55509c2d6e1ec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/hi-IN/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/hi-IN/firefox-62.0b4.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "4437886e4647b086556b19f3530c1974dd429b6ddb1f678ae3fb3448bf75ea27a4ad153692328d22d8e15ad21233ada1769e6ed7222560d26ab2f1c4cfba5f56"; + sha512 = "24bda6b2c26431b68b10be6d512419eff2ec3c6967d65d3be1ef89c94ac3f3a129dd28b34f32a299bc5ea886818e53d04a19baf8a4af87cc231284c90ba4a5e1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/hr/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/hr/firefox-62.0b4.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "f0226760fb545f730a218d24129e95a2f0739044421cc91d921377afd0c0118811cf3f7f26a3be63ebcaf2f0b259f5279a2b4da17399e9ba076eea6980f9816b"; + sha512 = "f5fca09c123b522ee8596906ceedb5961ace6360603f318324f216f6c09728dc3f365222b998cf1cb43179667babaedf4bd244102e529f7c796ca9f64ff47d8c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/hsb/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/hsb/firefox-62.0b4.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "be593a431d81bba03f5cb9d4e15a2e31a2be4561c5b89c585b23edc08b618383d8658d4898320dfd34483de95f483176e5fbd9c6493f72a416f040a3485f4eee"; + sha512 = "8fabe35e5da07d3ef8c97eaad7ca111770cd906f010926d903c6fafb6cf1a41dab87b9ee6dc508b37707f2b253cbd60ba4d5d8e2f20c8461fc21f3d53a90f709"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/hu/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/hu/firefox-62.0b4.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "2d3e066b7eb24c948759cf62ee2ceddafd86b51b73a67e306c78ade75661b3a6a47c1dee51b1b43057ddfc555a64c523befce8e17afa9008d7e2ee382c2e3c28"; + sha512 = "ef495708b2683b1e7342160a60ae17498c221021e6bb8ab78c37d0cf8ea6718955a2e17d75e147217c8ad2f73cbfd7ad5e6e0a96783cd12c3dcb65d4f7dea330"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/hy-AM/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/hy-AM/firefox-62.0b4.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "a23afdceaf33a3ce0bb323812cd6a1e0239b2f2c4ba688c601f8a158e64a2635e1cab1313edcccd337bbbba63173e9d171254e00ca3bafc6ebaab4297ed6584f"; + sha512 = "5fb3919327dcf6a12110dc99053aac0fdbb55227f00003b3e6b464cab6ef02527b66be9ec92a7a820761f75d72dd7b0edf604224923ad6b363b2e66edc06562f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ia/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/ia/firefox-62.0b4.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "b36bfea78825a783d4813f9454d9fca02c6ac9ae685c7ab81efebf3fdada08e76b2e02cba0b19fc6a1809bab46dee01dfbcec2fd57fa83186de092e5b2744227"; + sha512 = "27330840ff2f984d22406629679b4155c4edd0cd6c2db04e819836cdd5eb54fa7c5e8a64ceb0450541e0a47029ab9f8e9d52a39be6b180c075efe8a2123bb8cc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/id/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/id/firefox-62.0b4.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "013c40d4a0775101cbd66078c62a4bd28be2335b9bf38350474fc2593b7fcc43c5caed4cef4ad906245ad0192df8de38e8fc537ecd6a48afdc97d5141738a2db"; + sha512 = "9a7e0921ade3d09b954656785699e59d542959ab385d723c10971b7de16f47ee57b173765f408b4989c2ac95454b2f9033442419f2a2a804a9712fec7286ec4b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/is/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/is/firefox-62.0b4.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "f9c95cde0a4927c5b7e3d2920a90ee3229319fa8989b6c7e2deb2cc864e12822b156e6b44fdc8b4ed6d8e8bc706e323cd0e38bf1e2393eaffd32040eda2faa78"; + sha512 = "b6b2d236e2dec8c96a5278f349cd9c54c7dcb9abbcfada262bafb54a2ae434a602303cab1cee8c1a05824f389b73f8d5ecc1b79296ccd8cd31f8970cc7e87b2b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/it/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/it/firefox-62.0b4.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "3a1f50aba975761e41626b3e5f3f6619dcc09d31a27899e4b0348c45af5079883de2b67135197e7a57e448172e55cb9bed4864ad6fb9e0e0c0624152c180632b"; + sha512 = "6d025abc254162bcceacb6d52aef9df44ddbbbf175bed582d62fc09ddbf5ae4d702dfd287fde93eae55b12a154649b1565bf80727929f421cc35f89b3b7d7417"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ja/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/ja/firefox-62.0b4.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "b513ec2ed69e0e8c16a53404fc3b891181a581101972e54ec509f4f2b842d2a18fda2b6dcc573bf3a426bd06dae4de8295b12d016b81242d93bcb1e25e11557c"; + sha512 = "a8fd1f01b6efad9dddc43e1c770bdcd09cc6f12c22c0c08c0e5f71b3adac6b383c0673ef525775de292e211d5d494faf576723f290a65748f646e86086c04dad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ka/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/ka/firefox-62.0b4.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "520f4d76371051d4f97a3ecf295031b208561b5ec1bd81317d63fe445fd80d75f5ed8fa866e2e742073a8fe6f92cbe018edba93d4ccef50d1f78c90f598950e9"; + sha512 = "7277b0b0e9affb5d968cd172d4fd0ae280409f9afe8b5b9f9b3356137b291afd09b5bd43ca5725019813eb23f49dedc8932e01ab3d1dd0cd05d07024e140d25b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/kab/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/kab/firefox-62.0b4.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "c0744662c499216249ccd2c8a926933c00f2bca52fb3c8f865c5f7a0e0a4699938dd146ec94ca16517bf9f6502c30dc5695c1505c033ff6bde3c08af5bd2966e"; + sha512 = "d06e6cd182eb3b11c79aee0e203c8b3c7d348a0496ec64faf17af7c25ce27d86dd3a54fcd5677b250d75c2742e3cafc1b9f57cdc3ebd3d2e7d30af428cb8f26b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/kk/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/kk/firefox-62.0b4.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "aa939d0305fcb03f62bc704fcd1aebffc2389e69674a05033d268dfa87eba3c31828ef70a658c072766afdcdb2435ab451cf47f9a4776d6bb5b15bf871b393fe"; + sha512 = "775173c41c4c0a6b13cae35c672ffb85551f3b51313cd0083666dda77f5318c8f41fe464d3fdec76b420d28d7800dd6a756e9465f101e6b3cd0ab8da2c7fac0f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/km/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/km/firefox-62.0b4.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "cc0bf0b7332423df05ffb8f3b22d02765f5a8a78922ee0b6bb832cf7d9117bc8a79e4abdb4b06008736db8eb519fa22eb929aac37df443e788305098cc694418"; + sha512 = "eda2bb6ded848181d01db9b3e6757f95472d013cd5244a9ecb0ec2521a5b696fb2106a894b3dc550f11939bc43aaa4dd5f3973b64e0cc201267fe1b78602de50"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/kn/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/kn/firefox-62.0b4.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "4e90b10dfae4126cd4a5f4855118ed011a7cd2f54af02148b46a8001326aa167b508e053a259105513f4341982b163835ac58d5459052f847584aeb2584e97c9"; + sha512 = "949dee64ee2304a1042798379b3fc40d47e88e88ab3292a20c232e9b0efd82a79569ad9b89631aa0c4f884a01f9aa01bd88d2d9261cc65085e87fcda73b7fdf5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ko/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/ko/firefox-62.0b4.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "2e3645774a2746be83e18169b0b0dddfed5e89f0c7d804f76b1e672f3606ab448359e3086085762a8cbe1ea3431ba73f4ebad94f3819624d8bb3b4e5edff9cfa"; + sha512 = "2ba53d8d137831a2f04bd3e06c9ae44e0d127b118140196783c905e28daa2f6af1166766fa1b9dbcb13ddbb5dabcd93c439944a7d0dc1a85fa9530a66bb9cfa7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/lij/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/lij/firefox-62.0b4.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "9ca670bf8828933e587c3d1ed2f4bdd730b12afcb757f88f50e55cf79afcd51a9edf67f0d15eb44d8166bf8afde2d54bce1a9a3f7d10596a31f7f73d2b1d4c71"; + sha512 = "796c7445ff1a17ca0e89ce214f8e7f7f5dab9698a5827c7ea0ea5dd9f6cd829200809c10866411c8a05d653e7dfdf89f57923b4b04aafd27aaa5cb71b577265f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/lt/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/lt/firefox-62.0b4.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "be2de3a6c0b9510fcb6e1fb09d366019e7a27517bf00c85a33ab35719c091ac821c560828ba6bd4252456dad2cd5d52ffa16131d3c4024c9b66d02584187f6e1"; + sha512 = "d4f10bdf169fafa7cb7435fd8852ddf79881d046da1b4c8c9cee07fa7ff2714daa751bf2ea2959ce96572c587f9edec2d91b940d085e870e817dbfede61a3ebc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/lv/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/lv/firefox-62.0b4.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "e99ab69dadfec0765ef4c616c12f919fe6fdbc048e96e2b2a67580e5d36123cf3e0dbdb2c45066cb535ca5c1b7b1f151a779ff6b93994026ca88ca558ad6fd71"; + sha512 = "36d0a6463c019d5a19ae35a4cb9f80ff1ffbbe070370b90c007b5841640cc5c017cde8352a67ceca234188815824ed958449ac3d80dba9c19650dfb0ddf5c9d1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/mai/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/mai/firefox-62.0b4.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "6d57ef217c9f51725586087c366d52421181f4fd90744f6481d923fc4fdc094dfff5452a39a307d8302eb3cad84293feb1dd5319cf3007dbcf895d0a11219982"; + sha512 = "483b61af964d2f6b7e671d024dbf51b0b17debb17f777395f07509e399623cbb46b05031b7a9f90030fb715a463768072a765481437d2643f156b3517256da2e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/mk/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/mk/firefox-62.0b4.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "64d24756a2c0ed9b237d2241150ee0b45618c2f66b13f29d0c28f0a77fd3893c5845ae29d93590f461a9ae67bd18e6e6bc07597a8e55fa1fa98b8ea2551a9048"; + sha512 = "2e898d315c5cabc6d65613f30084d949bb027a58b6eed1532bd25ffedf26515ab0151e97130d9138273bd1f7735091035b75eb2c55264b17ffe0b3e8e6a7811f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ml/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/ml/firefox-62.0b4.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "88d21818c5f251676f67ae42ee498a55124104bcf9c96b4dc92d490b0d3ad33846edb7fb9011ad53b6b85c7d5a7fc7540124aea3b89d37ffd6e8ab60da638626"; + sha512 = "7d8d41faf6b833feded6909c45f0e56d6ef28d1903ede69c0d83a9b7f464028b590890ed1e45bb8dfcfa69fd2136aaf14b242fd4faf1c29b018f5a3d86dca9f8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/mr/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/mr/firefox-62.0b4.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "7b1fc11292246ad1bc87421081c4a2c45e34ea262b3ca2eb77acc619b6290c8ba25db3465f15205496d662a6ed6eb9ce69a46f941eeea4b0009458bb008482ea"; + sha512 = "d2da57f366f99760f852b2b3957d1d850cbd5277c6a2336e8997c82e6e200061a6d60749c829e5e543c52266b96452e053fe3a630d5d3480a76dcaed03014512"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ms/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/ms/firefox-62.0b4.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "c790907f60b92d67e2a100607e5b1a8de8047385eb777313d0b349bcaa9ead166c2a51295c25269fc9a9928e228b76fc981c58842097c3294fcaa3f3ada870b6"; + sha512 = "83457c7729039e9f31a133abef9f8b0191fe1518c5f7b21a79262e6745fba196b1481bfcde3935b66b3a1f49d73b81c65a3c9a1b5b43d41aed4f66b146ad71c9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/my/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/my/firefox-62.0b4.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "481f21afd3dcd418749bdf8eee509d35c915003e92c5db39fc41f3fe84ed9f83f3a343eb83c195e5c72f6c48f69fe878798a6b8df80c80f3d6f23811f288bc42"; + sha512 = "d72e82b9673d9cd7d28b9cf04a6790fe27b98fce4f61d8414920cc9c747d66849e24ef0a23cbc3feef6cf1580f8bfa790a50fa3de2ce48de2925de61e27d9317"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/nb-NO/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/nb-NO/firefox-62.0b4.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "51f8ea1ec330464d69b805ebc0da9130a0a08063b0c535d6da4b0ad396f6073947d0bb28bfe19fd07d0054a32afb96d43e9a3a83cc65356d921295cc51186c73"; + sha512 = "7f518cf54ec3945c87637703ba71bb5c83fa169c34f4884f34ce52046fcc2fcd631b2d57e6aa9141c7d43479e7a6f1dcda07816ae7f6ee0d0fb12ee3323c0925"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ne-NP/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/ne-NP/firefox-62.0b4.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "57e69cb671901ca78dac898c4c304bbcd19f1c54d63be2dcaeaf921ea26d6b4adfc6ffe415547fa5b2b871c6356e65ca21b23c5e7160fbd81885d17e9ffca682"; + sha512 = "e93966f90003823d145fdc0a5901f32c39641379d2c7ab35df7e67765ea3ef56c16475acc0637abf8228f7a5862a3d61980cf48c2c8f3665b20476a589fa71bf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/nl/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/nl/firefox-62.0b4.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "8dde66286a7fbc6eab4b7ad6573aa4602172ae7b96cbd732cf4886512f1cc085a9659a3943704eaeaf99b8a3005400e3d3cbcdf9452768575910cfec16756f9d"; + sha512 = "7ed739fd8275faaaea612da186d3428999bea01a2200b9110af4569e4ed8edf54e358149c57d7272efd49ec7b74fb01d7f4289685e8a50d8e35dca2c6b7652a3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/nn-NO/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/nn-NO/firefox-62.0b4.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "97f460ce8d17b03f24f13bdfe6119f08c727523900eec0549095dc6c97cfacf4e9081447cc8984d33050196453a22d47dbb7bf205efe595eeae794b5c78088cf"; + sha512 = "327d66e7411f8a1603da4f701b8db683b60f8b885fb75f59612aa57be4f9ca7fb2c27c5fa6cd61c945c8d23d4a882a830321111725a54b7495fae3a7f323eef2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/oc/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/oc/firefox-62.0b4.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "09e0e00dc7c06445efe7d12c46b77ccfd749726a9b7e9f291dd79025b14f07540b741c949b64d9eea27fd6549a3ed0a3a4da6034b25e455bc124c44e5238a6bb"; + sha512 = "5e81aa33cf704d92bc51effb138f29da3da0406a0cc3dbcbefa1a61a712849de1e8bf528a2a282feba7285d6853c0e3f8aa1ab8356cd3abe64d3c6112c5525ab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/or/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/or/firefox-62.0b4.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "ca47ca122004c43b9ad3e46a6743b3b16595786894fdf9e90ec82196b1aa2a4befe6e75599faf2e12754d301f74fefe318afc9ff994d27e696ef94ef2af0abc9"; + sha512 = "58c5f696748bc26814f9d1e47dcc0247d2f251416791b08b5483e27dd92bd4c7158be564cf83c93f8d6d625185c4d1bb09115a961484e4fdb02e4b27639f2005"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/pa-IN/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/pa-IN/firefox-62.0b4.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "a173b1561fa796e914200b8ac027a8fe9e57de7806ce72ca7c6126c1fc3cee2cad5694ba34c2e2dfa8748378192b15721f14c01b10344eaf073fc1efe51d0005"; + sha512 = "157b37b696e71ce8abf2560df123d904b399cbbc74405d62632cd7f566a657ca7415401ecbfb68191e193c4ff55e619134d5b6d7f40aa8916d93f01eb3223a9d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/pl/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/pl/firefox-62.0b4.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "935dbcf9df73b7f2a689e81a7726c4009f3284ece8ba4f9a5c19326842f8dbe262ce1d68d025c79d09a2317a0260344ce110f2a8470dbd41a87aa2deb20285b8"; + sha512 = "cdbca328b8579218e6a363d699be7c6825661fa643c04cda5b5e5b009f3dbc96d862dc90cd0c90878871412d323875c7974eb25e148d5160487b4baec983ea64"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/pt-BR/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/pt-BR/firefox-62.0b4.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "8b783f8b348b021afd50447b96d931ea3e59b607ca0e6127e680af13959c2396b952f9d9395a21515b27d9bf0718a756c6276e54fea169a58783f706316848e0"; + sha512 = "8cc429e6e7974c3d9f7d4d27897e6098ece0558839eb8b8ce58c4562ac52a29812977add2593e7b63e5efacd47e41f2307e776f58ea78732a54faa0e6e75171d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/pt-PT/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/pt-PT/firefox-62.0b4.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "2f0b3fcba8ed0b14b6270d4fe3dfcb1a4ad273e3723191bf2b041fca7776e362601a2e06beb6a544957fc66208072e4106d33bf8b52a2be0610f4db21c651c93"; + sha512 = "1b0603547be269e4bfdeefd41c589fef3a3482d89e43a7de7466c6c474ad935a79209fd66fe0feb14c13bde728ccdda068a862b0ef5d353369c360ea819cede3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/rm/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/rm/firefox-62.0b4.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "cb1b633c75cb08d1a84edfd315e02f3d3056f70a3eb382d1ab31dc317cd37522c7719a23eb1ab5f89c11711e4ce901e23b65f7f9182c88008ac964571c844a27"; + sha512 = "27829da497e3b8644cafcff7aba036eb320754fdee24ec6052a15b4cc3215efdee395c1239d904948ea51f268ddeab09240f49250555e12c8f04d3d6cdfd922b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ro/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/ro/firefox-62.0b4.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "2d56b60d2843bf0a526fe1ab6edae613fe78ecec4acc4a603ce107d2a67b286d8e6098dfd1fadccb77335977a0401ca73527ff8414a6537edcd001ff288bad77"; + sha512 = "6d4cb8e30c7cc44b478f46bc46c0ea9cded9939edbb51abeb9e8bb98e406f276edba665c888209f4956a2e9f944a79cd62ed8a9ecb200a5e760c6d6d5bf09af7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ru/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/ru/firefox-62.0b4.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "32cbeb54cd3b9c6edd56d05988d1fee6617b2aa8f0166f4acb07cd701aa1cdb03718edbb6fca776ba13103a377a31cc65e5800a49d1466500afc6cd8a92baf8b"; + sha512 = "c9e1dcf95fd6cb06e3752862061e95abc21b90323cc1aa3708c9d037f87d613e4b7ea2aaab30e83c414d9469288564eec65c9ecad99a138cc83421f9385da276"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/si/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/si/firefox-62.0b4.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "06243a2358db5b9fa50a56e6302878a1cefc4fff42bfda6bcee57a8996314b101a61e544413c1cfc3e72555e88b0e946c5691956c33c04e44fdb199bbd30844f"; + sha512 = "00beebdc6a203e868bf8a48fcdf5fbe9547e8d414fba48980fb1c0bdb60a75e5e48e81c3673b128c1a381a7eefc902fdc6f13d03e9ab5f5c8afdeee4a1e03e6f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/sk/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/sk/firefox-62.0b4.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "642c96e2dfb5f809504c27754dacc7dc604d724e8d783373b5c3d37c8fb5d2c159f4f7536353859d3263ce8648c53740eaf7ec7448c165718bf9f0d53870df06"; + sha512 = "f66b8bc4a1542600febdc2ae9569d4b3ce55c1989dcff975176de6bf4ed956836ebfb35a905afb48a650c92f9dfa55382f96f848da3f78575cb3b2c27f2f2529"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/sl/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/sl/firefox-62.0b4.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "4a803d3a1ad2720e4af3aaf1540ea56683a4d22c76beedb0b6928d7c5a89fa5bd36233a675fb85ad2d7d6f5c1c4cd7ab5e5ce77c3f49ca71a195cb93fbe37d1f"; + sha512 = "659d514c44f4e4a8d53a337f708bf37e3bb203ef152b7f421e14edb375e7a3dbb072406e011280916c30b3e6ae173c52c0154ae33d7211a499bcfb480a6b677b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/son/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/son/firefox-62.0b4.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "16f89877424340062914fcdb4be8e4d88bb0b6e04104069fc74b50a54c8610b4f766cc4623b5e39c794d2974144cad610900516054af51cd963529fa4d6d37d5"; + sha512 = "2f4e62d373509ac83ab7ef175053b0f73422dd150e5f781fd1aff1bd0de2e55b542143c26a89ea29e3e45e91f6e142be436baecdda814bbeeee43db8dcd7aa6b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/sq/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/sq/firefox-62.0b4.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "10c97decc9c113535042386b005687f32c16a6bfaa8930f23dd3787e7753d2c41d94e6dd5caef6183f0d3f72156bc5bbbf72389186b50a8a7376e5abda333132"; + sha512 = "95a25ebed39de779ebda25979d68170908998da49a5f62499ca4f32200920db91dd141d3fb7e8581957d755850b6486469fc5f5936b233e2c5f8225721b762a9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/sr/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/sr/firefox-62.0b4.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "8d34baaf402bfdb3bb0c3c5104a9080da4d5eededb6d55b490a5a7c62a095f68e2e0534691bea826281abb91e7f28f3fd4a22076aec0e1600abd31c94c937f10"; + sha512 = "8914af2d33037f09cd1accb1cc366d9320e25a0ae57b8cf83167112d50e6361bcaacba1aa55638804cc8221779f87cf8658717542dd211f2c40cac4eb2e394d2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/sv-SE/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/sv-SE/firefox-62.0b4.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "d4317109b5309eb355f5bdab8edb0259840b0ff940f57295851491d2dc0d8ef5488626bb952fda4055e2459ef502c57a836cce688a99aa88a570a388658b1ff3"; + sha512 = "72d42a5f6e3c569e0ae609105c2c379420fde4c7c995ea140b114c52873d06c5f3288e494bf5c205727b63dcfc450368bf4aecb89cec1f61b263756d76ceb087"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ta/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/ta/firefox-62.0b4.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "6433f05c761095a3efc838eee6d46f8ef2337d6fd655c79dcd8dc95572875bc13d393ce98757c70c895161becbac3d3e08458ff24a604fc8c389405cee7fffa1"; + sha512 = "027f6d4c36cc898c74ad6756be31b8677a93f8d945a642e16316ff0e7fb0455a4ed3da4a0290ece2a5c9e8013539bd5d9006d0477b375341da791fd0ff1a0c2c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/te/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/te/firefox-62.0b4.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "07c2413be438177e6557b275a308ba5198b3332a128822a0ddf5c51dd13b2c2b50249990b2d541b58180d6bce4c4b7c42b984cef6f8ef9e4f62f5f0307261484"; + sha512 = "5b126d5187023ac2a4241350ff1f4755730c0e61bcff766df36b006fdc7f968017db288885e16755516477787954d81f9b8a28b807cc8b063e580349057df375"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/th/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/th/firefox-62.0b4.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "fd82735960e4ea6db66928a022796606bfeb9ca00e889c6140d224d7a6382f1f0ba55f3cf171203a110d5429fc38cd84353296fee950857dfa0e3ea5fec2f22a"; + sha512 = "5ddfbcc8d9bf0d9a345557668ddc3309d2197497657ebafc05e7aa56924385ca6e74580b2fa0f7932812b09cb7aa079693eed0f38135278516ceac9aab71fc29"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/tr/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/tr/firefox-62.0b4.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "16b41ff0ac170a58f2dd8eb7adf0a7e1ed68fe88bce71ca594daa26e1881358697984a46dc74b75d5d4d554be28591ef570e9da672390eab57c97a9eecd36506"; + sha512 = "5c7d171642c1f88d916a9083bd0b15fa5b60d3cf0edf711f85a6c155a7fab7e42aa9f9fd5af66d26202912016d68cb9cb7d7e09d6993178fa1981d6c5733de5f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/uk/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/uk/firefox-62.0b4.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "fd8c5c8aee503dae022dd76a6e4af91c15796219c05a8350458ece2f6ea0bcbf15a461a5be035df6880e1d3aa287e447911023ecdf36a59451e44bc2cc819063"; + sha512 = "847913aede362643c57bd6bc62e6c7fe0206a48577ad88c29d08ae6a3deb5c8a2eff2b0d54bc72a0366fc135f730da0ea58ba7f503de0aaaba227cd5478e0b2a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ur/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/ur/firefox-62.0b4.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "12db58871502288ffdad76881f4d4b7c7922f22f4317c1286984035b6ddbe9155e3f0bac2f4645c3bb5878b491d326af68234ff69d046435a8ed1b5f2bcc2618"; + sha512 = "93edc48cd0dc44b97d012d3a481ce0d33c678f71a459a46271868819d873e22c6910bb86565d2c1b79e5f6553ab90efdd7f6a18c0b761b3a1a4b8ae553985c8b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/uz/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/uz/firefox-62.0b4.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "e3d5c3df93ecb48e685162a751f9eb225c063fd2b5a8676f7956cc1e3a651529dae38693304320187ef8f0eeb92c2fbe0c3dd7541443800d235ae0059562c0aa"; + sha512 = "119ad46c5560521f7e0df6995d8bebba19e900acc352f029af3280d6c3e94e92e07dd6268686fab12de3b9a95edea96f3c11a0a56ff388ed3bcf29646a7e6b5a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/vi/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/vi/firefox-62.0b4.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "6e4eb1cb75f36c600bb9211a5560578441c0bb4ff5c58e75d07025ec98843e74e01299ea1686f45b461aae664dca68fe9c2f6352b389cb8229ac4c1578a4e494"; + sha512 = "316141fabc76f46618e2559508ac32a256cd8ed4034f71e4411cb904955b089f423b593c7af9742f14ed6ef238bea8f72834fc9f5151ec52bcce72df280cabc8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/xh/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/xh/firefox-62.0b4.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "695ec0a3141c102270b09ffe55045b539981d68d35b13cb948570669edb86ee7dcb34e3d246800fc155d0126acadec73d97bab0eb5f7e63bca82270cdd3659cc"; + sha512 = "5f36c24708f5482dc6f2ab4684b8078b7dc180f7339ab92aa15a2a7de4d7edc8ff95dc973e5186a49919e8a3b86a26967ff91f485dbba89c0c1c75781db87cd2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/zh-CN/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/zh-CN/firefox-62.0b4.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "a94b0b7e67ffe5e3c961df0b6ed802ea9c20a6054236b5c17b638a1526bbe6f65392ec9eed2de6fc64dc9d8904e72da98f7262812273ad977694eaf53609295c"; + sha512 = "02d40e05810cc8b097c15ad7fcbb9db7020baf94f680fdca479ad25f12b36fe84080266f214ff77eb4030c0500ee029876929ab0726a14e2519331259b80f87e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/zh-TW/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-x86_64/zh-TW/firefox-62.0b4.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "ec12bbb68350a10ab67da8160be765a5893a497a373267efc992bdb0429eb17bed9526247a313ff72aac4b491f42fdf618d4b03229d5f7b8aec7e680b60acd03"; + sha512 = "8336818351f6e058a7be2b8441debaa6763b23e75ba5dd7197d48e7081860cccc702d1a1f19d8c222c06cf80bfbecec673903c43116470658a689075f1aef32b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ach/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/ach/firefox-62.0b4.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "377a6ec42ee65a5002d6abe5f2c6f949f64914ef28f86c6ab4ce7218fbc689018f2e20c17660b340a34e047227a48cb0f9ee566ba5f390febfae4eb0f7675d6c"; + sha512 = "0ab9ccb670210a22a9f076027515945842bbd0deab22163f912292c91c5fec4a40666e9d700932a091f3012b1d25b99cff3e7654fa1f506e1fcb115a239bb39b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/af/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/af/firefox-62.0b4.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "fd4558780ab15eac16d81e35b8ce8919c5968296d3c407f5d937dfecf72d1b63d53548f1775999a01792cabbc0118ad8c118c03f9b82e51abf1a6fa0ecc3220c"; + sha512 = "b71df9f461353c7b41f446337ce500332a941692cb9f64bbeb75be870e197a87e17d1c9b36f99b1bc240405ca598bca1a99d47589136526012ec8f3896c1b7c5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/an/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/an/firefox-62.0b4.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "3dca1d995e534f9f037e13809d65fa3a59f3d97ceae7e3820685886130350ce3e1da9f6cf8b75dd213f8c1021cde55c5f215886f2e045ab7f60d1910c60ad4de"; + sha512 = "403080ed6c524bee04c4f0de5d799e35f59c52619fc22e5c4f992c73d2cad6f30b9ac2e873c390bb9b8156f80dbeb9155c4aabb9ea49247d3394802830b19b30"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ar/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/ar/firefox-62.0b4.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "5e3cba2868e67303d6cd340fa6540aa0a892ac0d0a81fef8d2c17586565a68974cc88c92cf98e2dbe79882c5897ba9229d0bcf49a883f64b7c0697cc2fdfba7e"; + sha512 = "cbd3134fe7e067fc09d0277d4a6392c370cda15d90942c17f8bb27d6de00b487e7f5b5e129737a4e866c66c71052a59db6420e940737000f8de0037f9072e78d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/as/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/as/firefox-62.0b4.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "dfb1e492f247efbc86a326e4ec3d5524a0b9f16991f80b9d10d7da2929b252532b96a29ee32ad38bd151c2260eb8f3afe924c4c897b3171606db42046fc70641"; + sha512 = "b23430089319a8a2f2b51374c3212feb273ec540fae4d1462005d459315ad92f634709643a48dcc6f47e9288265677396dfb7e442282ed49eab529853ba403e3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ast/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/ast/firefox-62.0b4.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "bd3e42054d2e52eaa683eebd163656d69d59df1b479341a5236dcf46ca9195582ef5e980d5bb44df2503010a7f406b1fd3678733754aa4cf2405995a62c93ae8"; + sha512 = "aea906137cefc176e9e95c2e1d4bb470fe64d7f4b5d8d5acc0effec7a8c49beb0fe48a132e3c92b3e0e5a348e0603261b9a78244492a47f0a79a4d77a16b75bd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/az/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/az/firefox-62.0b4.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "4d159eb67bf68275f000af3027dfd6059c532254ed2be98297b0cf8bc4c622b902d8bd17c00498600892f431d87dccaa6177cb8991ac37623422e197c5b3130a"; + sha512 = "1af027951814e969dcf7ffeb81c948f1f7feb505d248cb8e039a50b1689c2ee78eefe9672b2bf1fdf14e8ff7a776272073d548da967bbc92afec0261d82188cc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/be/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/be/firefox-62.0b4.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "bff2e6c483a3bba92d591e57d4f3c7c144ef1d43ef8d86d64beb9e0970ac585b04175135228aa43eeca1d518bc396c0ebbb7632e1d91909e92239269d1484393"; + sha512 = "86add287a5735d3c81b44780b623cbe57519d16ef3c9ea53f7084c928d9ae7ac8756f3a7ec8e4e6d9aba92dff2f6ec8ebd84d75d23943548db34c66c2b5fe6c0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/bg/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/bg/firefox-62.0b4.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "a07453ebbb39d427df3fcfe83280dd53519eb4a3b9aefc975098741d803bad430d84de733ef67b7f50738ed056c8db9c0867f9efa245a15c28955ac88fadc180"; + sha512 = "3e9e6d36df2f358c2d0be39a59ef76094e0f1b8b28ba57a3040027ba749288b88fac8b20917a5644143b6ef8b0bdedf2aa62743c44c86881e91161cabe3f78b9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/bn-BD/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/bn-BD/firefox-62.0b4.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "4c5c0d9bc4d9169d0d87a809bfb7740fec274c0f05cc1927e7c93058b948dccf66b0d3e35d111d1bab9c03496f6c78a8619a2edced3999c13f06e9522feddf02"; + sha512 = "276fa71fd211fd184a46409603f5be6289f4de54aa9fc1904d88d35a1b2a1f4b57b7064aecaba9b8873adce7c323357a9a2b59763d05564d2f965a3dde2d82bc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/bn-IN/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/bn-IN/firefox-62.0b4.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "e6e2aa7643901ecd94149d2ac90f6d190edddae8f6692deecad4c5b619e75538765840c968f78ebefad73ccb85e05d429e6c20d040bbaaaff07513f49ba7fa37"; + sha512 = "4ef6c14add82deeb4f5f5d69f6d7456662e0122873bf04526d5a5e09c7e89c81643224a7df3208960e15b378bf9d83664bd5428e2f782b8c7ac0cbda7a6198fe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/br/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/br/firefox-62.0b4.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "6802ba52185ff5145f0d4dd6f33606c3a66796b24b4a43d8c3ce1967ddc916bdea935eee11453eb0e84d4a557784cdb2511c52ad9ee52fca5e9df7f6e70d144e"; + sha512 = "0c9f1ad031a1fe952d25ee18955dd8ba0caded69913d39037be09a62ab0106cc3b87c98e86c994e02a7f103608615b586fe0e842e1ebfa6dfc77a18f3c0cd5fb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/bs/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/bs/firefox-62.0b4.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "16af58f6127df1b72bd672d1942e66adf6e5fdcae8a43e18cd3fdaee592468f492668bf3272e15d440a123b97d15e913a668af3f069615a295e9de24b2b1ba8c"; + sha512 = "343f7d17c09d5a24d90e284511e10c1d75309719960783e1b1bd1dd8be67da6d6599c8487023e88324ea4a8ec7b78c1bfd099dce8fd91081634c9af437c957b7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ca/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/ca/firefox-62.0b4.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "9bfbe17e3bdf5bdc72a346c909c1e8c97a3158407b1bf937fa1b6b86fba831607401b1cee55dcd5a0b3553849f2f1cef8a5adcc563c44e1a88dd1101dc7f8700"; + sha512 = "e0ca1130f51e19afcb3c7d13a15568e266f0dc5099d7d6e66bf5aa8b706cff2745165668db9a099921f6e414acbb585f3fd9a090f8228175f6087658a35233ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/cak/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/cak/firefox-62.0b4.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "55f887c4dd9d8c9251982a1274ff0986b3634fea2b974cc0edfa42a1777d75645314e22d5c1583990c5dc3448cc6ebb6b6ada590a9fb8673cfa4949b19c970a6"; + sha512 = "e7f0cc0ec01563ecd7e9bf1965412527a8068b3387e812bc8ab2aa970eb985178ab3a83e5331d5229dea939fd3e37fa7f6660cbbdb80442c0bcfe5d5b14054ff"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/cs/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/cs/firefox-62.0b4.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "0d242c4d5ceb72d21884589ba6562617000206faafc4a55fa984ab083e35f4bec820e5d75ff7a152b0ffbd486798de18f7a17cc6cde9e5fdc52f3b2d1ad0e076"; + sha512 = "d262e6f024d0ac7683477bc2647a9dd32ee0f3bc37069b6c2e2b25b6dc748d1bbc6e3424cdb1c7acc5c0f2590ee1d176d12b157cd8eb384df00e2400c6fe59ad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/cy/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/cy/firefox-62.0b4.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "0c8202cd52179cb76e7037a6d3e19bc362ddc66742bee71b1df8ae01a016437ac10e7723ce43decf28d5b31020c625021c62bcd9786754296303ec11960ebe18"; + sha512 = "debfbe768d7d4c8738f243acb170df29f4d2c40324c1bc5bb8cc967eaebd6807a8266e62718d8fa56a38a48dc74ce8c402e1d9f61a192b0abb4cf1ec3128b255"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/da/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/da/firefox-62.0b4.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "92017b5cc8fc9c7d2973cc40c870f3022aa6f0a643b41425f436c458e19639c1e46f068028eac9956ecd33db5f73ffcccd208a9d694b3d749ce69b2decf7ba32"; + sha512 = "79d2f5cfcb7744f5750d5ebb0ceb36412eeb0ad47b4067310bd8245f67ed6f3999bf932bd6c0611870af9b6c0131405e738d60f8669ab58d277f3606ff282ca8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/de/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/de/firefox-62.0b4.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "c454fdc29eb41afda1b9ff074d41b471fdf31cf9f75e4dc45a8e5f94d4d526f928d88918dfe9617f95ed755cd22de8dd4c7fb5b64f7566e3df70beca6795c897"; + sha512 = "f303617a311b34656dbe367e92676b67759307003785ea370095531f40c0e55d5d44daab74532cfdec1f99cfccfc01d37830bfe5eb6bb79855dfaf82abb2e65e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/dsb/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/dsb/firefox-62.0b4.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "e80c89860ad364d66913d1c67d05057bf4fac56b17339833bacdeebf0e55ee20dda723ae404364fb6d4bb58728cb4cd13e7660f11fd5cb4c29284e5d67d27a50"; + sha512 = "3f0602e8a4478fd9e07f505408d097fcbb1c20ddf216c6f2647584892ec06feaddd10945fa0fd79a71484374ca531aef8d34fa4e3fe0d6e7f8d4e3135ecdf809"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/el/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/el/firefox-62.0b4.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "faff2b3992f2ec2c312a68e1d6562a3d5d72b9cb29bdb4a0503ad1b08a9abcfa5f934b2ffc5cb85a9dc5dbd74d772b5e1d239216510c5825706be406380369b7"; + sha512 = "30d330a6067056237c067e1a720805c6e24703b624b5d2deae885295d2d1a5203a1b1cf019755c6db79b192e6d0cc09f97720da7c439dcd47567a91e5f2938ae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/en-CA/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/en-CA/firefox-62.0b4.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "24643937312c2500dd9f7cae8dce49564e5e891b85b97be408793d7d0df9797fb43a0e03e685b8e3d84011d87da46b5036887d66d69ed4b9301b89454b6cfa47"; + sha512 = "2bb74b54532dfe5775fbe4987338531c2003568f00031d5a1bd862f1c65a006a4ce924987a236f983d0bd30399073250604f725783aa54134a92a0ef9514410f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/en-GB/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/en-GB/firefox-62.0b4.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "66f84337f0bd9f25069cd086d5f963b56bf372e3fec1d09e4bc6f39a94b6b177dffbd95c829eb0e78914cc915b55bfe7b5e25f14cd594339c7ce270ac77a2667"; + sha512 = "040d4027467956dd96ceaaef4e56b1a42f88dfa0d51daeea8b5faf03904467aed97aa17f314f1fa33daab894b648b00f5c6e70621a8c28bcdd907333a798634c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/en-US/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/en-US/firefox-62.0b4.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "a5ddbe8f111ba737ab0f123b888d0638bd299a715b231ccb40c2f92b1abdf859d8e077fc80184becfe675e4e35c88dcdd720b85f57c4d4ccd814b355349e1a51"; + sha512 = "9904681cc422fc9e3bb6ef7375e9bb93246a2faeb7ee32e1f4771756265d68ca61072a70479500745038c255d07ba8f1a0813b43ef2ffee10b1b899bea1b4aab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/en-ZA/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/en-ZA/firefox-62.0b4.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "d6f01366d3fbc8650576f9ffef64c23672b638003e5da7dbf66a2c19ee2b3486f0e4dcf724cb95daf2749dd4b2875f2037d8211ecbe3a617ce4afceeeaecaf1f"; + sha512 = "e674dd298c15ee0df2b3f312c022c6bdb4fcf5a028cdab23c4c58c1b16bca8edceac48fc9f95065212f2bee39b96b9c3833d835cd208739fd2855d41fdfc847a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/eo/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/eo/firefox-62.0b4.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "aa1e0d8b9f25893ecf6397fb017e32aa44bf06d57b13366528c5a59ad6f5b88dae0dd06784a133fc67cb9acdfeda57f56147a3970911a870b6773f8c1773fcf0"; + sha512 = "7d32840d8b3b5b154c7e31fd5da37b2556641d380d4225d5aea0040028106472eb55066fee244d76c7b83ea3a8931cde7443d7ad5d0edc51195549f58d632c7a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/es-AR/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/es-AR/firefox-62.0b4.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "59517a73c001c4d72b33f191cac521c7f4982b44c942185758ecc2a451fb41811198c771661966c550ea27d747ef60bc7589209f9680016f9f2296696b52a649"; + sha512 = "ac41c12249ac1649221fec77a8223ce2d7a3aea4514b834510f1fb3f007374b442431a0db30114c127aa938a977602ec2e32c2c49ed97af40addd1a1ce5c6cf3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/es-CL/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/es-CL/firefox-62.0b4.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "03b89336a014fb2b8f10227f210b33a4250eaa86604e65cd4ded3407d8b960ac1d2f67732fbd5ea7d8b0fcb25eb17f431ca69fb1820cec234deb9e68fc2664c8"; + sha512 = "b5cc00aa951926f5905b635eeff186ee4245c66d54382b57005fda92f205ee79f76402368a399590dc9357f9f7075c7c6530849a4678d273229178acf101c458"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/es-ES/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/es-ES/firefox-62.0b4.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "0e023192c1b88270a6a1f6d7bad506233b47461f669949912b84d502fb404db6d797b51eb35ee898f10ddcee6d7e2ec98c46fc1c65d7a79b6cee1b47056a5b3a"; + sha512 = "806243d057344f54f0c5b27812ae67cf1d95019894a66f08be6e1f82e851ad28d657a81c0d3cb5f4047c167c63e3b6558c63b40675d1c96d802a8a805939b1cb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/es-MX/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/es-MX/firefox-62.0b4.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "4ccc60cdacd9b5144c56cdbbc8d51c41822c5a6ca43713080a62c46924627ef98dbb259c22842aaa6255b45bc95b9a72c169352e505a353be95886036b122bde"; + sha512 = "b4ea652829b13b8afd10fdabcab2959b7de55138a64f19e539f4c3abe5c61cc53bb8c78962bf4ea8d2aa23cf2ad405c025158c3cd1bfb711be430d42fdfabd13"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/et/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/et/firefox-62.0b4.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "3472a528bcdaa138dd68a44e872da9f17b3e3dd0cf99e1bd9cf99057fa0a71332dad99df2eedae82f015e3306531ed7575d579e94391b0d1262604f9294c6f78"; + sha512 = "d003b7684b2b7f497ab14309c625b39cf643176f389d0685ee10f24f1035e22a7a5461547001d5237ec82bb9af2eeda2750df605cfb36dffc5c5663d4f31ce5c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/eu/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/eu/firefox-62.0b4.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "2cc55b33e020985729d144357329429ba803d3380383051728e42824bbcca2da27458f42a6d4cd19015e7b14bb175ef104c02a7416fff69cdf425699246370b7"; + sha512 = "bd8090445cbaa8221c3e9e242f271fa7fad3c8e5c45d37db77a41033748e1fb19b2af27ecf80f6eb6ab3d65ea1f8c1c9b18a35c94d2ac32b0cbf46d724cd2048"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/fa/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/fa/firefox-62.0b4.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "8874887a56222ba65fc675cc6c98b99ca5934121b3ab358fa1bd9bf284f8e34dae3d705010dab891d7f4896be0526f5c050cba688c06b55e90ee8ae30ff5813c"; + sha512 = "ae9bbc112d07efd44af7c58cbc1df9c1c2d63ebad3298633d02c154514ba3a951eea6aeb307be1d9ce527023f1cddff890a524969c81aa195d593b1b2872e18e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ff/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/ff/firefox-62.0b4.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "1c58c56d95834bcb6dd008dba4454ca4f21f63698bfc538d4e4f1565a09cb12735fb44067173637baab3ef530b8eddf28a0aa69065a2b2049b0dbee8f49483a8"; + sha512 = "56f63a579e867fb1e6a508d3d939e204d29df433e46c2fc4fd24bca94d816c0adb7a2d0d5fd47d85b033059976bd34190acc4adca48517cbbfb0ac35a948e4f4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/fi/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/fi/firefox-62.0b4.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "3b64e794db0017d38f15d348181ef8a93d94f88d8ef69b5ed2171af7f1ebf529835783924286d55acae1eeec944bb5f45dfa2c59639ac258f1dfd56eb7120710"; + sha512 = "6a4bb9605094884369e64f96d8b044d9e28a6abe32e007a0faa76975db01628091c78e011d24f4a18ffa09f9e43e44606a60fff08dd268a12edcb1bf9ee0735a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/fr/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/fr/firefox-62.0b4.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "d4022a1d25798844582c39f71311ea8c416dab9c2554a510a1ee2171acdf26c30bc85bfcddde07b29aec5ba0a30f1c3f957e2cb97f9c4dbdd9e539685703ca49"; + sha512 = "5924b8f0623773fb437e3955df683b8b87be82c29eaec6af24390f4a44af052524750644043a6edea116a6739c376a35009f2c408d4841ebed8ba42bfc2eabca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/fy-NL/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/fy-NL/firefox-62.0b4.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "d684855eb69e1574311493d9b86be37486e4391b48b377019b53fbc119cc10ff5364a0b004f9fa64575b84404b0a49c75780bdfe29d5a06c37d217558e025ccb"; + sha512 = "3939ac71576645aa3475173d8753c343b25b77994f09f881878722e4717b7a1ef3bcb28ed85394dc2124a92331076bbde95917305487b6053115e98df8a17374"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ga-IE/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/ga-IE/firefox-62.0b4.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "7874e6b777a01b696310ea96bb6ce28355f9aab492d05a0529ac9cf33c7ed76d896aa441a457ec304ed8bbcd6346a95553c91399f62938c19efeeeb5c3c08c27"; + sha512 = "93328ebd748b206e4e749ec6bef07596884ac2871756cd0a1d212b3f0afdb993cc22e670c85a8ce71690d959e274cd8ec0ba99f6c3e28eb9f8d480081841ad97"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/gd/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/gd/firefox-62.0b4.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "a570db98e06387e46ec29f14ee2048c9b7c8e4406f8f216748635ec471d2073a843039e2d6de8aad1773ec82e97a817b005b9b4f2200922d934aaad4ed950a65"; + sha512 = "07efecf6e00131142597fe816358d06ede1e935ccc2751ea32702ce4ca95859770a671ca37d1ee3d67f405c2723eeb2047413aad7898ee374eef7e85fd11c3b3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/gl/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/gl/firefox-62.0b4.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "959e9863455c7802bd6720dcc8203b426e00bc17038785c22a00ed7f8f6c6942fd30548fe607bab66c7e234ffa4b94408a4bc0591b78674e097f9be26d465967"; + sha512 = "65f0cb62e752bfad13ba893801f3d6be119e782f828d68aa8aa0d2fdb36ce51f5f34785fa31a251db94af1aa6968022c2c7e489b71f7eab14978ee7f05669c83"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/gn/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/gn/firefox-62.0b4.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "cc8f2acbd0830430192c14a994eb0a47a6f0366e2bedab3fc43e2590e208440afecdda67e0571779b7003d2f800f1705d3a2851fe1f5c9d0b08eb855b09d5154"; + sha512 = "03d3c2395e70a60aec66c31c125d76a55cabaece3142e3dd005b520400ac64185d6338dd09e1cdb65405edf391d1b29f63d3db563c64ab2570f8644ec9124f54"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/gu-IN/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/gu-IN/firefox-62.0b4.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "eff0f28add6f701db024d6319c11a95d6d82437cd42a2b1fb608325d6198301af361cd02c77b807f894adca8e3c418ab2bd6473b2a9be7a6a038d147655f3d00"; + sha512 = "b1d5f204003862a42423747a9d39ea65fe065c8696d72c6669c1081da2c64a1f79db655c5e82a1a226b0535265589d9d55f309180a3b8152a3f4f116095c7a17"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/he/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/he/firefox-62.0b4.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "6191a8070cf7327e2cecc4433744f43a173daaa882a0fc2b440d9239af8e2e0a579b9c3b6da608fa0951000f527adf408e43e529a09fea4f232adf44f1fd1afb"; + sha512 = "e2635b02e7519818ca8cb366ddcb1e89cdc759c33f7738e01e41490c3068bf16958b303541cd5e94444efa18f986bed71ab527743865841f60f8931813316c3f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/hi-IN/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/hi-IN/firefox-62.0b4.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "3ef5346c74bcb81345aebb4be162f046392d84792a5024ce438a460d8fd147082a46e38e97b24c99567d880ebe4f4e8b84c9a83186bcc9f36333aa2ee26b1192"; + sha512 = "3815d9f90110c1c34229e7189732e6f526826a92331be208e4aefca40dd8d0f2db305b348cd573de27bdcbc730cb00da80c65b6ac93c41c75a72af5ef74488aa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/hr/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/hr/firefox-62.0b4.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "3550f03d1bcf399664d6a53fb932c5d1eb7e6de9345055071f14e65c7672f767d58983bcb0b95c77ba02a45d734f3d6bf65b720edfa6f441146765ebdebc6201"; + sha512 = "3b8d18283a503891f6f89f502048068175bb28aa23a0155ac8b360d6e7051ae1d01a3f569817fd88b707c808e9b4072e0cf5341040ab9d06945584176b071882"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/hsb/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/hsb/firefox-62.0b4.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "2048278924a2d413c1807a15e937933cd76a02b8daf56ed44b89ec789cfab5d0ac4d666b06ba282350b17f96ff72755b4e52f49bc4fdb50ece4ff78ddc6c8833"; + sha512 = "a2ad3d5b260a8c13e0d00fdbe374fe9077277c2bcd71cf8c46607962411224a5577ca660b0e0b78d9c4847fea697339463e32914f2dcc430bb1a61016b85a532"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/hu/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/hu/firefox-62.0b4.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "5ed4bf6277af178fb7c92c6b1c915896c02b35581506da5ef5048289199b501e690f44b5f82f857d8ab4a9ce737d36fcf761437f80f1a6933a934fa746c5a5ef"; + sha512 = "970eca1acb7a9c181bbbd4ad4cacd34ee6a525e054485b8a2ce9e0a3bda7eb80a691e2c1c8af29c478be0d0c233a7f691ac7d556e1991a55215a526550f00f36"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/hy-AM/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/hy-AM/firefox-62.0b4.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "97170265155cd43aecae59534d8876748a64ee4ac336037f60202925dc8ed84c3b1d0dd49bb278d4f3f20e1e1b87158270d710346ed16d2839a9d32fd6f0b064"; + sha512 = "bdcfb8e65db501c1000c9a9a836d4144d0c8f142a37c7535de0a6dbd3ddf5af6354b0c3a12b25fc33ad0403181cfec31a9a346c799b78fcafbb86096f4091c47"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ia/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/ia/firefox-62.0b4.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "e0b22f7c2687368f8255c050750c017edfea66cfdef8ef0f37d0d17a4f700498ddb6d567cee655292cff74be204023927f85c5a709ae0f32bb919d751d258538"; + sha512 = "c7d76bb75c0e8a7c1e90f3049670901b11cdf9bec23c5baa2e628f7d743b2339ee64fb5784477e37af428133ca62ec3eb3351316a5c80fa6beee95a72455c929"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/id/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/id/firefox-62.0b4.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "b430ee23b6a5b26b218e8d23622778b0bcc70d562188018900bdd14cb66f25114448ea263772c9a38d6db2c1a97b89ba69b1d9d855c1fd9d737d6626e19e46cb"; + sha512 = "c79e11638430d751257cf6ab802c10378b29834c0247587199062471592d6a30e70ed941ae98eb3bbc3481b70db38e22fee52f9a4206737f433bfbe079b0a414"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/is/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/is/firefox-62.0b4.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "88670e161184ea78f1438bf56f66181956a18e31eb16735cdef1c2024d59fff3d0fc257c691249a1d93e96321ef80601af17733b347bdfa485945b4d4f41992b"; + sha512 = "7aa8eeaae4666c2411abba3d18ca745b0ba27c0a4575121cb6c88e7cfbedfe7bb6bf37f721f2e63dab3597a602b9343b9e0c13c79e205eac35e537842e1c615f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/it/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/it/firefox-62.0b4.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "4bcc1492d278b3d7184ca2ddd494e31ae0689f7edf198d75e54d3c78fdd3f9a3f2a1839efaae2838ecb6f10bfd63348a4ef4a742f9f256a22f10d1049d50e244"; + sha512 = "a80a572a60ff9c4b48749006b03eac03d1c8d4185ec3d65de3e19efe719c499831ab4d4ab6ca8a525c2bddcaa9d290dbcae8c34e6433a948b0f75bff25a37519"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ja/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/ja/firefox-62.0b4.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "a3e1bc8b5d1939956639b5ee52b154b1a26bc7209db675b4d29bab67ca7f0dac925014ed10ca176bf6bb52b1749207a4dc2d504170c97b24a542cc95ba78c61f"; + sha512 = "3e7beab35b1c7c717a64d2bea400d0851198c28f390c8dfdd99ae1aa10504c9fb351969e3c3f680f7bd52161e70c00b1179b1fa3e809dc535ccc99e03e5db9a9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ka/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/ka/firefox-62.0b4.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "13816a6488fb90c56f951d44db171c8b3142f366c4047edbe31c10e3f2834abf329c45b9b737f86107f0dc6f852e825e1978e7369fb5f10a51c578b520678148"; + sha512 = "44b1016a345c42a88f40764dc090b85bd1bc7a5b7788181c44646443d9db3a3167ee0b2a4a9e9a8e2794d6b898494e5714377a70fb5dc86057509dd5855c7aeb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/kab/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/kab/firefox-62.0b4.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "a5bf1a8f85876bdc2b289e1e9688c7b3dec6783167cb14d5049b04e11f4a3efa1ba885468ca84ec6f8109e5363dfc1f3688020459532290416595d4d92713b95"; + sha512 = "5f7e9d26f4ac85d0caa81b1c09ecb79019bd5c2fc1193291b0e6e8a3daed762933fa1670f44e7e47d0c3f083984121bbca1a5bf781af2bdd1c8a8d9dda1b81f1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/kk/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/kk/firefox-62.0b4.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "68401c28fa4389a98614a40963978bcab94b15d2d9ea4818b28b488d905e9b223c82e1f3aae9bcbe2dd7da6ffd9d3d20e10dbc3bb4ac7ba182e0b7833c074093"; + sha512 = "7d6d3bbfbdf397d459bc871cca6b1fd15e4efc525d38f9d2da60bbe2c823ce1be22b0a16793a449188b3cbe37ef916a547122a2d56524d697ad67960092c8c3a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/km/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/km/firefox-62.0b4.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "71a8d5c71839c48e3117bb93735eaf8d56fa6d762ed46cd9514e91a13bf968db9c88d8c8b225d9842a9e7726ab2658568df7392cb4c45f0d736f60d2ed9e6f8b"; + sha512 = "c9718afa69b80e26f6e5d03e647b9fb8b668e90c5a83c85cf6d205645433419e22ee9b1697ae4582f39dc56fcc484a46f396e37920757bcdb8492906942feed9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/kn/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/kn/firefox-62.0b4.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "d7b4644db963ef737eec03981cf795dd279f49cf87893a0647c229ad55dad45c85a42462b6ea94fc44b40d145853a86b0dfd92094ea17c441f0f997800d8b5a9"; + sha512 = "79106922fd04f437cc8bb4e6364b131607f01ec9a2493553932b8d037f3e21f99b8c129e569702dfbbca3f1256f42bd0283b118e5b0d7e6faeed2d8dd5c7b91e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ko/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/ko/firefox-62.0b4.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "9c63a2d88f1c6073a0322d4464ac801e70b16fc82eb9ff544e1593a9d1b3478b123724d323062661b548dc6351f42e5885e659bcae94b022e4a7a79edf93bec5"; + sha512 = "fcc25e208cad00473543b84f14baa1015e7c30ee96ec44fd22bf2eabb00e47223f913967b4e6c89f3cc61cece47a39985662cc7683de2b12052f3a155d66fbf3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/lij/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/lij/firefox-62.0b4.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "a47014e854a7902098354556c389dac98b8b58ad928f65d864e70f74f6da47b4c4a10d2383eb18cfc3970d2cedc958861a912982b3d648d60c0f24f3662b1cf6"; + sha512 = "2d1dcac79763d743a50d1c461668ae840f863bfdf632dabee31f62233cea5fc8949307f4feef259002e2d986a67509a17f36311642f4ee1a03e7baa7bae8c8d2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/lt/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/lt/firefox-62.0b4.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "41d66d0786e84ec6b39016d96536d41a011d202d741d1322d025f43e50a7d47df9216afe859700c3d79e6a2d4e11297b4d0b11ba6ab9de7f303f07186a58b0b8"; + sha512 = "df5bd96ced542e20a51fcfb0a762436490db589e26dd014dd02eb7b945d55fefa754ea5569579dfa7054a7360c6b4629e431acfb2928a55cd29794c1f8f6383c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/lv/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/lv/firefox-62.0b4.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "e46264a45fc3b68a161558fd3f1ce16d0d2a50179109626b133ca398605f71fa09b51de54d5b4f063645b8b79d220a9b52dfa5cacf05f0eb4ab43677a17d5359"; + sha512 = "08cd3473eb84852135ad985fc25f7ddc1d18665ebf1a1a810fac9a7e076cac7b0f6840fa611236b844e3c5a4f7ef90f335555be39fae05306b2768b5d994a1b3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/mai/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/mai/firefox-62.0b4.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "fc43421d4976d4a5f9c9c86aa0ba3eae5adeb8244f49edcbf2b6e94acae2006b58931e26d2f627e02b9119e99a4e45216d48f3d687cdfff1f67b837115a14439"; + sha512 = "4ee973d76f5be26307f6bb246441ef4a42c63a9d57d50725f02daf1b39f5155a70d74edbaf33b4e03e7a06f8f7205631b3f715bc35729b19a242b1e451ae36f7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/mk/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/mk/firefox-62.0b4.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "7dc4e4697e085af373f144efd50e9710ed83e9bb7d6415f7a1c2f5323555aa441bd1062893727aebb0002cea5a8856703e1f21d181349babe72c6b01b3e7b2c8"; + sha512 = "bacf1c4f36a0f1ff9e14a03d930835b9fd948f64948954d79b2038c6445da38c9805907e919c5476f38f9495af73517fb92896909d38fa280c69de4512bd47ac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ml/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/ml/firefox-62.0b4.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "c0a584e609a230cc65203b4064e6cf88ebbd83884f6a6c4b6e09c677076e99256088c99a9d9ef2dc0ab918bcda10f679298edba3d4b713e8cff066a3bae86502"; + sha512 = "4c370e51c56803a0ff063d3cced6870eefb4119bf282a40386e4d336bc1c49480b0a16c74e6e8af32cbbc1fa0e5120079e9d4985331288175e67dff37548f2ca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/mr/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/mr/firefox-62.0b4.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "4c49e33fbb66025ab682196440277b78e4241c05573a383ca925f789ef5c049b58a366b7af121cefc8a6f10181273d3ce86c2a80a33955e5200822ae363dba40"; + sha512 = "94dbf14e0431599ebdb12179163fc816109a4a0267be8deb11070b732b933fc61a5e54e45034da0b27aebeb44a6f496c0c4c44fff79f4e7f54fd74c6c3120867"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ms/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/ms/firefox-62.0b4.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "1b649a0ef49cdf869ce3836c4ef037882f9b66889af787aae28032b879b0e38ec86ac823276397903ba91c3b640d15644225b0418fe748d94bb1499b0c9409b7"; + sha512 = "bb9526e56ecb2164fc591d0cfa09d350341aaa21ad005ab5066e4fc391a140a3701cc6be38688250e02f34bbc000dcaded7cd7a35f1ced03e7b687f5f394a914"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/my/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/my/firefox-62.0b4.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "266b5e3e6c6c26bd9c82839716cd2d3eac168ff96960a406f24ffe4d3a9b8e7da72f68ec01df9d13577ac8c9a38354d30babbb3067c4ad6477cb0d63038c669a"; + sha512 = "8d6a5a687a3f0ce43751dff8d9533dec6a06e96995e2dd4f398b4ec0c357b726297aa1dc46ccfeb4f22e97c047224f838554a25d1ec47dcd19e469330344c0cf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/nb-NO/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/nb-NO/firefox-62.0b4.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "9ed5567c8bd5e8bdc274ce55c03cf609911276b2c33bc58aaafe4f3828dd4d8c32c669337c747b1283ea0fcc7fa6813d9fc06c3b6384c2c1d6911d69456604d4"; + sha512 = "63de5283834f54860cefb5aa417bfec35b5fcda0aa358ba387a05c44bf9bbf72114256da9ab880f852666ea8c1c148fe8b42db3be8ecf85b9af7817870db8283"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ne-NP/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/ne-NP/firefox-62.0b4.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "f98bb5236d175ee3b40e8cbcf2a92899fde9c35fd1528e6160876f9f541b9de8395af4043be8afbfc4070cd2ae9b1d85a3ef40883051615a6591564f47533776"; + sha512 = "367662ba948cdd8c0925c2d2b133240acfff8e4218a9a9f05a94e2fe25cfc6e9df20d0d044f1228efcc92cbb1773ecc1b688bfa11504c613381e66fdd626a8ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/nl/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/nl/firefox-62.0b4.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "9af76a903df95d99d20cd9acc28badb1d39c2112844668993bc4ae9158221700ebc115dea198f8fb4afb7db59f6f855c7e1b8fe7ef15888072a4ee1bd6eb61d7"; + sha512 = "166bc1d6352efd2acd8aa3f5fb294a9157c17035d5a1b22773212459b430541473be787e5f0d30833586e82ee3f29ef33f85f6b6586641bc66df6828ad2007c7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/nn-NO/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/nn-NO/firefox-62.0b4.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "d23038b982bda5a7f636e5ef012d8618072eb188d379d026488695c21698e6ac452340d1719dca89cd0c7487a14271339f36a716ffd08f23b4bf5dbbafc121aa"; + sha512 = "1a72fffce901e700d4784e52cad6082e16015759fe606943c3ddbc30dffcc7e1a01fb772f2ad65abd453607f7509841a9d2b565bc433f7e5c00126c0efad709d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/oc/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/oc/firefox-62.0b4.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "cf5e95c8024d827ef3ab242f09d99789b1e074f4982d77ad13ff4f03ca060a4a1c597d9359a01afd20d465fa23605e77fd1ec9dda71159fa34c468cfec4462f4"; + sha512 = "5c69cc27edd926ed450fb77cd264169da82628e5facd22c02861a299af87f6a46364f3f31844689b7d8a5808a172df81715ef3f9a079da18386121e5cb58cdd2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/or/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/or/firefox-62.0b4.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "ae80ab15d337a5b0f4e7b56f0dafe32689ae5a6bef1a2a3b0dfbb022e12452c5ebf54d39395e67a10daa3d29db7f74e199080a39978960c4b4e5ebcfd2ac762d"; + sha512 = "1eb09af2f115da520ba668d835b2b6111877c8d65ab8aff099ca9fad69f22a5fe1f7754d5f1757c35a4e5919ee0f2e4dedf2a24f5cbb1e046a005c73e6410240"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/pa-IN/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/pa-IN/firefox-62.0b4.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "071a1bcf9ae7da98577c561264820b8f31fb81b2778f96a7e5707b175314b0d124b3ab484d057b90eb39897314e80c8ecaf95605f984a355e5c0b73fad9714a1"; + sha512 = "545511282e46949e3a0bd6ee16b0fb655fdd9e6e4e9113eb4f663956f507e6c85549b6065c11bfae40c0ef791d48e30249f10879d3918c6494836fa6621e2b2c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/pl/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/pl/firefox-62.0b4.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "2b9c7af72db100e0acd9023855e1ef14aa13972e6a46eac0829831bcdbd6e059c5bf8f75c70f3e4687b243bd60bd9b8617c80cc036021926459092495c294728"; + sha512 = "aa5e7560ea5eefe457dbcad3578ef28ac0fe96824b9d2d62a25d73d9b36f0845b5eefdad3c6dad7e0f551bad56d1516f810c71e0436f06dd064e0c5991c5b88f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/pt-BR/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/pt-BR/firefox-62.0b4.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "6b2efbf5c74352f903035105db81bdf17a3ea2680711d7efd780801215d1f772b3e031162ec296c411dcea63b0b899ac8be51001049b6c4acf607a27a94823b6"; + sha512 = "a9aaae811ec9d400e412b169853e53aa8da361f1b6e2c9eccc91e3412b296e8687a6484801fc6ab03727fdbb43674887ded1f0585cb03a487c12cb171172bb00"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/pt-PT/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/pt-PT/firefox-62.0b4.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "3e666c69a66c5e341140cdf00dbf5e2b13d90af067e79fb242b2e34b2bba3849131cbd408c4822945a516965e4c09c55f2283bf2cd83722d4307f0445e2588d6"; + sha512 = "aa2627586203941c9bcf68e0e44c72811f70882626eb292e883792d4a80cbf58c3ff2679adb27166473bcb5672731b0bebfc6b36e9300daffd25f891ba9e776f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/rm/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/rm/firefox-62.0b4.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "d46528605791a92de03bd6db6e7cc00b9d6966affc5523266f9baa0750ff052b892e4dcea852cb4c5e6546a5d8cb6a3bc4b01102ee81e12df7030dbdd7d2b9ff"; + sha512 = "6197521706c62a10aa6984d44c3f41a061fce854e0232ad6b56261920d00e39b902f25c2af913ffafb21f9f88dbd107485ee2ad0a42e2603e9642ba6334d97b5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ro/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/ro/firefox-62.0b4.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "8584be2c838c721046fccee9580ff1fd251fa7b0bb0284e8e2f0d65ff1349312de6ebf6072e4782b57d80173f6c526df773c68d0a5f9472baa88394e9cf84c4e"; + sha512 = "c8e2cf7c872e1c7e57805a5dee11b17a39b3e0f0f8abd3f0f43d8ceaf7eed1a70f082f60b4fd9f05a525949c8074a0071793ecc6cd0b1ea2876b0dccd5796d91"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ru/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/ru/firefox-62.0b4.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "150c7ecd29983f9ebde9d85d7ea0cb3dbb552945bb7dc4a90d103207ee868c3809c8ce2a77f5cbb093b9cda913abd70afce78c9547a57bc6321ae8694b1c5874"; + sha512 = "5ed48e1c59a07cfa1ef7c11ee5c31a47a497a05f95718cdac39149fb50fa1eefb75c8c01f5e9021e2acf626d4cf294792331c64eb4ffef077fe9261cb9d90fc1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/si/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/si/firefox-62.0b4.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "fe49558596b3ed3b8e922145f3d55de6d47854137fb2992769d7a4f1b718e4b6c7c4ccc0f9b99f53d6474111e055947f8f9f52aea248217e207f7ac022746da4"; + sha512 = "a31b1cb726f7aa10acabde4d8a363d5b095ed66bc15745f0070a3ddf29dfb590a47fdd13b43420d13ff8da9606f3b2d460e120b7cd1bfced05ea3ea005872d7d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/sk/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/sk/firefox-62.0b4.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "48021f8552165f9ade8779e967469f5d8db761c90aa3535f6f073f9d00de378a991d8705a46e8a8e5071ddfe1ca64915530f131e80028e29b706f6d41c0b7889"; + sha512 = "c5bf0e08161e06025c0856d585711e3717b71abd980f1cfa3da1d40219022cb9befba8af1efa300a85ea7e0c2d0c3957085014eb55df810562a6932cc35d587d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/sl/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/sl/firefox-62.0b4.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "74c14db1244825e0914c0719e9d8617e760da562600df1eec65ec8853a3a6a2c0516f8286d81933946abb1803f3807fbe21a295442edabf49c174611e440562b"; + sha512 = "871ddd2ded81bfebd39dfdd8c36b8fd504fec3c3281f45625149d8cff43b3a976b35e7c91c76d34adcda3eadcf307533ff79bc1904e0278068c2e8d9463fd508"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/son/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/son/firefox-62.0b4.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "486d10059b08aed3473b0d13bdf2490ac8299fd47295169ac631990d6ea4947859ede13aa86ed201343be9e40ef4e63a40b0a96947ae0f5fc0ab23b666f4b16d"; + sha512 = "fd79c6e4b9d9d0d69645abc794fa8b463bfdb0a9ae7789fe16e597588fbc35521c912cb47bbee55954a240ff5d9fa7e5d5d5b1c8f5e883130c3d120cbce90a6d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/sq/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/sq/firefox-62.0b4.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "75d6265c3eed948d4b5ea8168a1ba992655be83550f0fd4f3ed1d35e25aeaf09cc168dd2dbc1158e08b99bbdcc3f032e75f1675c35cdd37a683e9fb24248b5df"; + sha512 = "4a62312b7e0bd34ec56f10bf68b85a3488c5f95d0eb3f8c35d00b7de3193a307e82154370340126fde5354ce79a5e448dec48f31757181d6f7717226a212d422"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/sr/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/sr/firefox-62.0b4.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "755e742490df25bd5c69a40bcaccb58637684b549092bab195cc524d89747b62d424ee693579cfdb2ab8a125070c3f26cafe3d919290fa9a8e4cc2bb71fd9297"; + sha512 = "09f423726c43d9318012f8b33b7dc0c4eba8994eddba823bb8bc9284177f1ec700c20eb5085967c701b24b49c89dd156c009e1783d83e7b7dfa97c466ac61302"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/sv-SE/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/sv-SE/firefox-62.0b4.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "aa6a119f69e4c4e6ce3d7eb45c3d21019fd3e29fd8d4f3a9fc12e939f230646cccbb1dee54a0528cbecb48db4bed42a1996a0e1757a1d18ff647b5de1b203379"; + sha512 = "a7fcfa607ac96ed9b97248b107abfca8f80817a667af0038cb8c402f71e50a188a77f6d46d2dbb2219351fa6265a8fdd648789c97525b6870357793eed740d44"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ta/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/ta/firefox-62.0b4.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "1b034a6959630fc7f5fd32d4288d43d374338c38371e2357702cf0e1055ea513aadb0dfab819edcb751c98e9bff993d59a571eb86cf493584451ec4e8e66aa03"; + sha512 = "2794a71b2a7a61468ce6b1b7fabbe800b234ed7695de2d25afc5d1be49581d3ebee70cfa0983bcf973aeb5707dfbf34872b23fae2a67f150c7885bab20d37340"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/te/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/te/firefox-62.0b4.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "294f92edf25d2e89661f25b1fd2b750649c0b6f965ad1fcfeee2cdf61d3781e1ae2a11b6731a77e7fb2ccb399cef5a045d5a707f4a84713cf4b5cf23faa747bc"; + sha512 = "542b5d6045591ec500131c290b141704d019dc939b7d4a9be99ec1581dd52bec5465e3fb262bd7572e6f5ec55c9298bb7ef1281d1b34d0a04e9e5a187b0857d6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/th/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/th/firefox-62.0b4.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "1d5b15208d4b3d59241d244334328cdda547772aca5de8652bf4710222c9ecbedd590280d2632dacfb6e28e7803556d652da6539688d41d7c8299daa480ae81e"; + sha512 = "b1c0d493acf631f7e176b985b627cad63557ab03f2f2dda0c739c190863c26acf3a9cf3ee6f59eb2355156a1fd43fb43b80f15ae11f93b73d55e635e431b0a56"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/tr/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/tr/firefox-62.0b4.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "c155c13c7a8964dc163214bc6ade3f0966b349766d072d4846f2228b761ac221dca0d79961e8ea5c8afe0a4ebb73e5ec65bc350a3b1a1905ae289ab7f378d88e"; + sha512 = "35729bdf5c7474535001548c455ec4a0fc0b51b9b034216961d3f416c2de1a355b7e6a24336bdb3a09fcb1deb909dfea4184d43a31768735d2567aeccf85ff3c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/uk/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/uk/firefox-62.0b4.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "bd6084b296f308f04708b301dbc46ec7cdf3e95249b3ec8f4f64b129df1e979721f3796cfabaacc56e124312b86dfdbe19161928b8783a731e59f6b29079c12e"; + sha512 = "fca9d5cd5446f367465be19d9068b64cc6e01f1644eda8acb1a1e77b6c1a6359215852efab4b009f4dbc1c2b4512e9d6a158f8d13821e86d3ea9a85d17719a9f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ur/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/ur/firefox-62.0b4.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "0b3d5447fcfbb3cfab741848fc64f1dcc013bc1a13dbabc880c59721803e62f0dc6605db15b1cd6f9c150085934674d364974f947d37c4c1208e98919a0c4044"; + sha512 = "d8734b41378d4708f5d4d6deeafefd209f30ac5d73f39d169309574452ffbc62039dc8f927c95801a94f12efbbc8993d16ba844f6f17883813ba84964df82c69"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/uz/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/uz/firefox-62.0b4.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "b5d91159caa13ed34e51206c3127a29d1b7b7f1e07090eeeb25d21dbce4fbc86cae16dfed9f5f1e8b59ee75e9b15460ed89669501d466b5992a9b731e28ae04e"; + sha512 = "44c1b055f532c4e956c6bab72a1ed71d778fe7e2a624309b33177d4bccd7211098a370c6bdadbdd9265eee989de979b14ebae7fce4303a580d1c2a1d531f2a03"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/vi/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/vi/firefox-62.0b4.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "9ec16c42df70d29b879d0bf38a0e3173a4c5e5b45231d5a04ea111ab347c91cfebdb68c4fa960710cb37e4ea439d48b843e5823171e3bb094ffcfcc53cd50aca"; + sha512 = "38e515a790e12f86bde4470185a9429b142df4b1472cc1e9f138cd5026f6ee6f6d6a22c1d452b92f9f1f34498897b585f20c161767f13052d8e8738fbe188ed6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/xh/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/xh/firefox-62.0b4.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "b2c5fa48411cd13dcbccdc747ca0d73458e1b067aedb57aba7a2bed66a46cf8e6466d6b7e5e49f919cb30190daef1d82dd60efa9ffa6d80ca63d7d0998c390f0"; + sha512 = "9069e16c8e0d38dd491f607428b87191ce70619351db59a5eb7f5af461a76ec59882e080ca89a7e2b7a72949804b0c59f8c35c15a881357409a84e04a4c4fa3b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/zh-CN/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/zh-CN/firefox-62.0b4.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "90b830a074e653bab78fcfd4863090af1225a99fce271f8427421d2a70ab04d3c58a0ca367530f2e34b52034d662ccc219b53f0c4793b906be4049d23fb91b9d"; + sha512 = "058f5c73e6b54b5d64679309c4aea0354753152192bc7c58fcadff19693bad772f5f9baed3bb4db098c6c44e5c4d69fb9ace7eaaa096ff7e2e2205f402159bb5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/zh-TW/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b4/linux-i686/zh-TW/firefox-62.0b4.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "454fbf27e514638892061d78ce85290e66569e411f5f38f49260b7e14704ceb9cf1d8ddbe3bed524b92dab07c06b1a8527e373ad6e2233c6761f672cd3c57a38"; + sha512 = "08a37626f384b98661723544c83abd0fcb796f6ca6158fe27f8cbe752d0ac092f82f649b087c72ae3a493704104fc7a83cc46d09df377443add031fdbf67e6d3"; } ]; } From 215db45f62ccdc8245dca05ef2c7b9fed8936a6c Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 1 Jul 2018 13:47:13 +0800 Subject: [PATCH 50/56] firefox-beta-bin: 62.0b3 -> 62.0b4 --- .../browsers/firefox-bin/beta_sources.nix | 794 +++++++++--------- 1 file changed, 397 insertions(+), 397 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 9be83bc3678..7e1205bb7e8 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,995 +1,995 @@ { - version = "62.0b3"; + version = "62.0b4"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ach/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/ach/firefox-62.0b4.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "30ede248dbc0a8d9375d372dd1c0260dbf7fbbb398d1528400933953da56ef018cf7bac604bef1138a5454fde8cbb96906f65b0afe3605dc9ff5edee91245c41"; + sha512 = "9c9e174325665a79108f4a3fb6cd533539b8d473d05f95716a0dd74146bea0c8a7d12c9aeaf04865680519ffa72539d897457447d7364c137e52d2ad6b120e07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/af/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/af/firefox-62.0b4.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "52227774b4c0f4817c208ca46f68d09fcdd9865867a438ec2eda8dcb66564e7cc7f88d3102dcaa1de6edf428b16167a2460b181facd2b12a2dd0c287deac75e8"; + sha512 = "324102aeded0ba1650409d92439857732eecb4948bd408bd482e3188e45612dbbaffa6a9872235aca325b358d2e284eac5a909894bacc9614c38a24719dcd5e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/an/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/an/firefox-62.0b4.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "e932625df7fcdfbd8c30898008ac07aa91c446a3785eb3c7cc0998ed5e52659268bc8b86086968534e8108312dacd53de4d0e5d9cd0bdc2f76edd46c29599bd3"; + sha512 = "0041fea717228047c21cc65cb0fa6ff7eb16397e1be2243cf52845aaa3a79934b37e07e93bc1cdefcb44639ddb3736b656c8abbc36401ecaf8ace3c7a5350eea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ar/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/ar/firefox-62.0b4.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "1873b5a75b3b51e69143f8b85442a995d05a2b753e5ddc06b15224b34d694f8f3ccfba3d15e522e12a265813255023258b791e0a95c680af1d07771aac196ef1"; + sha512 = "328aa37bfa93ed2f4824d692af938137052fb7587aaf401813235e075152b84b14cb8f284563f8d43bb19464e41f1c63244d07419a77872bcb28ca1121744893"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/as/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/as/firefox-62.0b4.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "31b0241902ece8d7364e85a5072f8e4f9ee18fb0b45f3f0d11dff4c25499e6488fa47fbe4eaed6ab16fb63d72fa153e8459ef0e455973d0142e3240ebee35503"; + sha512 = "1b29a35b22a8fe82acf73c1ef79d599943094dc19a658fd32cf3d4ac53dbc614a24ac57a52d38fbede00f815dd49fce2fd7d9a6424add580e064defa127580fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ast/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/ast/firefox-62.0b4.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "d4b3033952e71c3aa9c4a0b6e3835c35795deddee65c0f39f50f24d4b5557407d7bbfb6f7e69969856c1ae4e8d7654e943656377c94dd33d8e45a5ce44054eda"; + sha512 = "1b67531b7708182af18e1468ed700080cac457ebf1d5858210230498c5b5ac2b1d24228726bc0432c1e5e9670a7acf27a8cf1597b4948679142bd212cb27eb58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/az/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/az/firefox-62.0b4.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "8bb472d6f3a81db37b5d3e06f19b1c7a3c44f7055ccbc922a600b10870f45e2380ea427cd7e0a3b4567798a21274f9619482e077650a22f2bcd7d52c8d83a06f"; + sha512 = "a208ff6404b48893d6e35b2e207c1a136ea1df43f58ef73929855a65bb0db1c4ef3df93b14037619fbbadaeaeb90615f67923e373e7a8ce8b44d4b508daaeaa9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/be/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/be/firefox-62.0b4.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "4c5e859878a9463d9c55b08b1a1ef41d09265bfb4b217cfb3c70ee98f6df50910493a5425fcbff0473ca9c29a8ff753097530d7747506747b4ac05f2b9e87f39"; + sha512 = "a972cc8b76c10a20578f477d8251995998be3765c5f74a869dafaf087c0a644ebc9df5c6e6e0dbca5050fefb102b952d860dc7c8e66e4cf35170d74f32758416"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/bg/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/bg/firefox-62.0b4.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "95eb87c22eeb1302cd86c4a92ffdd367d3586eb9ad6a6472a4b7cb8133554f09f322572d576c46a23d0b0a6fd9f84fd2b7217ada82eeedaeb31484c8d85e6807"; + sha512 = "a44e6b438fc72c7ceb8e25d54717f6d529ee165f5c1d1457aec611394926f5c29d21e3ca5e8bd0b5711ea671b44afa1402765a63a98a41d2bcdbe9bb92f65532"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/bn-BD/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/bn-BD/firefox-62.0b4.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "629ecff0efa7aad6f6ce407f1d44ac5c52f781828909a953ad6efe92c43c1cb94fb555bf96e2474b664bdeefaf40b1f6ed7e0acbc43ab9e48ee37b5d0164908c"; + sha512 = "bf7753296fba0a0c3f0373073682353d2a2efe307f40091488eac05b8a112a13aac1175854c8e108659ae56fd613755c055b0497459356b144bf904f7f691b63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/bn-IN/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/bn-IN/firefox-62.0b4.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "ae7a67643bcaaaa199560785169c41f43854ef0ca110e1fffcd7f118433e6213bb4549fb6c85b52a3c1b00a7700609f489eb7e649225f4f3f1aeab0097af82e1"; + sha512 = "61524e21314a0badf8df3769d953ce5076ce71fdd604bb7115e9c5b2e1a56c9fbb2728f606b757d0126c1e85163d517fc2dcfdb6060e5e3e661ce9c40b280915"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/br/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/br/firefox-62.0b4.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "eaffdb43d8870a26989be3f3ac44649a593c40679f2d7ff230fd710f3edd2fd9d011503e9a7e4659a4db5acc9eddb979c9bc9c6953d3f089c278e145e2a89eb0"; + sha512 = "6bb1a8a08e33973dd0c9d97555c2c25ff75590b2f8b0d506b1d4097881b520a6211543e6df1eb50e5bbdfc9b70f20ca79a4f74caa9ad398c16dc63896b41db89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/bs/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/bs/firefox-62.0b4.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "b431d7b07bad19fb209ce8563cbac95f2385b921f13bbc931deaa37528850d7234734a223775796c7d919e67931ac4d931345badebdf158f3d9de20b7267dac6"; + sha512 = "5923fb7ee306e8e42773cc169ecd7cdbc96c5b1fab2c075f6fd41c336270691699d55a61f6e72dd680d4d3b6ab5fd56dac11c98fab9d1b01edd87d0d97aa37fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ca/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/ca/firefox-62.0b4.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "04b5aaf8c9e29f85cb5c8a71a1bd6c43e0247f3c92bfb56bd3c0b862ec813c5d94dd40ae901609516a12649beeaac7d7e512b585d1e9b5e87167329942b614e9"; + sha512 = "28b50bca997939d34e04a4953eb125117394f651b5b3c0667d2fd9915040157e464a0304de1e9dec6038f30ecddb13fa9b95c7b8a3507a4b9fc431095e564718"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/cak/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/cak/firefox-62.0b4.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "80680ed074f4f532bf5138174bc7f79b1f0dac4617e717e52dea3ceb6592919776ba7afcfc8b63d9dae8816d0dfde8af7badecf6f84610404f94c5a92486abf3"; + sha512 = "580be1d0b942388aa69d7511ae51214ea4bbc2b2f424b5198a9f166bd30a897123835c8be767c4cb4df01b173a7811ef812604af931245770d161f9d12eacf56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/cs/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/cs/firefox-62.0b4.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "d93cd8788dffaa1f58ea70454d2b5693d0b22bbd8f8d65456add235c6ce812faa04e63ee375b07154f8a0d6364df39637b43bb7e7619eae2df394c9e8724eeb4"; + sha512 = "6a4f9a0ce13974c739eca1b626eee7b545e14bf512a80194365f1bd80da0bf3f63d0594fdf51e0b21e24e593e3da41f091b7d8c0f40971056bb1d9571ef06f2f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/cy/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/cy/firefox-62.0b4.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "2a3a4f1d31dc97655b2a0dab87d21c71b974545be1d35c427f459cc079b32d91da65ede482c9915d333d865266a1a2ed6dfa0ab770943972a91064f08bfca67b"; + sha512 = "039960964dc25fb3f3a181209c431b42c67d117e6514cc0f96ce0719228d315c2e698360b149162ca65caaf57b36226328184543e83ac0668afba2859c9903a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/da/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/da/firefox-62.0b4.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "529aa1487c7cd7e488fdf8e011acb0284b2d9d2c89cbcf4799f530fc9301f4894eaea555939896d289a63cbe737e0dbc5b1312dab6a2684213cf33ee988799d9"; + sha512 = "6f285a0af1311bd3deca1a7b5b69e9d9cab0c00aa96de2818123590dfb5410e978faa9dd55cfe91338242979ceb6d5542493a61308fac6661e9a53765c7d4368"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/de/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/de/firefox-62.0b4.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "160a7ef01b28c72b66ba07c9d3cb7bf8acd8935ed2a3e17d14bf62385e46f19b6e8d24cf4f3b98e321183a17bd7f6d6ee75bc144244f66f93d1b3945cfe9ad1d"; + sha512 = "65936fb24629c776bc0c691afced76b56266c88cd4e1c500d58d2abbfc84185464643811bab0cedc3fdc26e6d52a22463ebcfa65ffa42ab370538485060c5a1a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/dsb/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/dsb/firefox-62.0b4.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "c0f3095ad12bc6f9131f676d17dca3385b586c593f0de8568c3b7dbb1c6ca43729720b962f35d5993be0fdef096da5085ab64d4868f29727d49a136955abe086"; + sha512 = "5155e07fdd93f872428fa6dffe3503b18f28af9f3c0896e49e6fe2879b3532dc168cc59ca3989e39636f8ad65f129d7238598aac1e9860052ec8cd8280bc3311"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/el/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/el/firefox-62.0b4.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "e899b6aeafab429521cf25de489d98fad392a901c5533185b7b2e7516b6705f13a57c6bb68b5904a0887c54a026959df2b0fb1375df3a926b3065d516bdc0f4b"; + sha512 = "282efb966ab6d742f951fc9c7ac18af0a0449fd325a0a697f9d3fcc9ae7ad456747cb5daa652e020afd8c2aaa0d5b9332bf32fd888a2f63a69c24db15e827be3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/en-CA/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/en-CA/firefox-62.0b4.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "ccdb6270c83ca3475a4a77d3bc9304c1407977d0c60a4cee9680122b8e16a481f656914174cd6e4ea9b9a738424c74eecc34c864f897bfb2b59736d9cbe7a8ab"; + sha512 = "d233670c8d1b50bed4a5e151bc27ce4392bb217b38ca5b4a972b36b1fd60d9616141c139009b5034c02612c90c5b860ef2e946ce970ee6e4120fee853a0a4c3b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/en-GB/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/en-GB/firefox-62.0b4.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "674854163f9ede8b6e4eab70b748635e0111420c127a9b94ead1294330255f4f00c89160608b98dc6231114bf4be87aa470631645069ac5a587f84a282ca6656"; + sha512 = "956aa3d947e51820a004612378611fb0d021d6254ceb86f8f80ed95c1ae32947e6fa1127777f0c2b350f056c72e1188191d9ac86525cddaea2743e43fc6b5fba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/en-US/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/en-US/firefox-62.0b4.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "b09b00a8a5228fc2afb0d890ec63a19a078cdfbf82c64b7255aa26ed5ec26591b2dbc4e313bff40fab0accd6ecdaa4fbbce363bb78fed5d29d4fb7b7e46713ca"; + sha512 = "427a9086ca2feaeb3e1f81d98e641b5e95932fd18a952408e2d7f7cddcd8f5eebfaa8a94c8936ac6e9ee6126cbd949cb3ef5ec5c6ac4b160d7cb451c9634d6d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/en-ZA/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/en-ZA/firefox-62.0b4.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "72be1014c8be0030cd0c512c31c64a73957d24eb756bf4cc9959a5656f460ecbae5c984d0708cb9d5d29c434468f7b68bb215d04bc261057921bfcc75bb420c3"; + sha512 = "58f28088a76bbf112a2fe3bf61b3eb5b4359e5c867bb7282cbe4495a07512106f1fec12425387e8212d3d5b4d5a7b343538c20c0e6fc3269407bd139cc6f1be6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/eo/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/eo/firefox-62.0b4.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "65fd6961a1f694711336bbab7f1cf1ca5804f838295a9e3d4ead6c7fee7779c7c881820bf35eb8de218e08b8435329514a43e9018253f5519856fc0a75382d82"; + sha512 = "db60a869635572afd9833adf05fff987628b95a0120488bf7da9f4ae49e0a06d767006a7997cda303f0a889eaaf0c24cf0732cb9f5e079f74766d001b58e21ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/es-AR/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/es-AR/firefox-62.0b4.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "a1b23e9591635e0f4bf8520e63cbc7e7ee8c9b016983b4e71185f067deaf2f1edeca80798ac833fd0aa2f337fcce71ebb36fec7afb30f9a36bdf0b59162ffef8"; + sha512 = "88c67f949896f55ab89e5b6c39076dfc2cb950bf14ee88cec0fad8d6f1ab58e39be7e40786fc19bea14ce145c38e0ce283b3f7c53d75f5ab5fa12a3fed49282b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/es-CL/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/es-CL/firefox-62.0b4.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "ed19154cc73ba0115a5f3b5606661324992d09347fc4debea0174d49ce01ed6aa4d7a1db51a064d4190053ef20f3d1263f8c48125075178a41da80ab4870e7f1"; + sha512 = "07c5049820709440da9d395ad42949ba1e4a62e945941ff0b12162a08fd9de4540c3f60bf050f56b6e2e627065491ab26f2e4c328c9b8bcb3e620540880bc6cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/es-ES/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/es-ES/firefox-62.0b4.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "b6ce87d1adde83a33bddf2c26051facfee52197fdc8e1f9d3e457b05dee15ff76c36e0987d4802a68717ffbbdb3cb22d7737fe76d0b4b19be9b818c2d319ea8a"; + sha512 = "6e268a9ae8ae564baaba04e83a348e19d90edaf9ad77221ca98bbd05afda9ca02ebddf94e2508d4c20ec7aca25c23c07b35a363c0607e9f19786ab259d56a400"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/es-MX/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/es-MX/firefox-62.0b4.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "286c1b3cee8b93496b2ea1c158af19a5dc8f8094c5656ca3062463783834590199a2ce20e31141be2de9772b2e5d2a16ec52ad46fd19fadd25ae5c828f0b3b5a"; + sha512 = "c2efcc63edcfee7ad4c414a1115158aa0965aaddf379844acc9d1a61e33638097b7a97ecb501b074c262f333691c17b91539ab2771c7725a1d9de84bc6ff1dce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/et/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/et/firefox-62.0b4.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "d99ffaf22ad6040382d4501572591f5a5f507baa812ff51911d7d7df876a22c961eedd2570eca9efa2a9109ab48e8b17b54838e90ef1b8bd619a0b3f57cef239"; + sha512 = "144b098c096c118de7c79faccf29c3643248b2c609f970aed4caaea5dbb2986b3b1fdddb449d9e89d4766a51d6c918c5d34ab09ef61b4561f75d41cbe66fcd0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/eu/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/eu/firefox-62.0b4.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "0ccfe1605789438672104bf54325676c1fdf2cafb3a3698eacfc9844843d8d33e1dee11fa38934c625301a5ce1f3ee271c2587d39aa64abc9efa509549d897df"; + sha512 = "540d1e68fc8a43abf5c24afc1df3ac6bb06a0737d6fad758ab570caf0dbeee44a1ea77a971fd5f7cdda0ada260f52f7909058fa8441bb6c4f7c98cd155c265a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/fa/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/fa/firefox-62.0b4.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "7114be05fc7418f4426e6b61e2dc6b3629b905117af1517004a68eda17f6bdd0818c656efc5c298e2a2b357c740d2410e96022aa0c1d964ef83bda48b2c55d2b"; + sha512 = "501654581baa56ce5c54c1d990e9102dd449677991822086b643c0ad68b3fcc49b8704bf3aab7413187f3a11e7ba95d9288b94a098f4708fb7fafe5b706bf686"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ff/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/ff/firefox-62.0b4.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "74eeccf7d25e71482d1a0b96096559aa90d969aff0e5085f7c0f51fbb6cd6b7bb9689e648f89ca5773efcd9ec51ed493baa49d007a10163a8995c3738573d880"; + sha512 = "7d5ebe9f02a4bdcd3b0ebb0ccdfd0dbf73c1c919872c1b117f8af6566523cc234197b2f33f3dc81ad9e7cb2f8defb6b86f3697a7cab997ba1ef371cb570fbdc3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/fi/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/fi/firefox-62.0b4.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "30df120ccd5fbd0970851694edd0f09058a02bcf7e22928869f779b2ab4f31886b5893379bb742f67cba3427a368c5413354ac49d89cbcd6ed0e7a5d15941792"; + sha512 = "d410dd89ab3638bc1e76a7eb3fa692486ee2280b9e58a0242e57282db58c2e7ce934937805b3b0907dea2a334b31239443c4ca660ef34c260cdadb66a754bb45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/fr/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/fr/firefox-62.0b4.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "7ccb92068898d13494047de74e4663b87e2567a8ba252d53d5ca7b395053d5488524aeb035db2c01b25eb4320c79f5628da7faccf57d9c9e076921bfdf4bf84f"; + sha512 = "addc1957ac3f8480c1b5c836d76c47b2949c120772981c2642be21442268e1a406a150e02382b7487f64a4f76d1c5042f1367247ccd59e51798c82313d0a1928"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/fy-NL/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/fy-NL/firefox-62.0b4.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "d2c468239240c860324733dfda2aa3b94864e31d83079ff3026c7abbb2949c891da4a72fe7ae4509d9f3e88d3805201f200c1dd6ac0169c4206bf651977b5ad9"; + sha512 = "7a88d0907bd30c3f93ea8afeda68f0d04ec43cdfb68890530f9095598317086d843be11398639fbb38e564a8ff38cbe7358d42a796f5d174b4d318444b1108ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ga-IE/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/ga-IE/firefox-62.0b4.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "a4646dfa1761ec80139ab38106bb823b90170dacd851a5406a675d4b388391da01faf2211ae5913ccbf0b0207c2af6c166f12bdc51185a2c97de1d7fbac1e262"; + sha512 = "8090137d93a3f99296f15cffc595fba9cb5367d73840f86b3a5e8b58444aca20abfbbbc386ea1482292231f0d19d2dfd2b1262963738742c2bc0d13766ebe382"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/gd/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/gd/firefox-62.0b4.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "6caf34ec1b45abe91ccb48d09d4462c5b3dd6bb1f42a727805b7348b5d027f5b7128661979e9f711ef93c55f36abb082d7ae38961d1333bbc0422047e0ec05a7"; + sha512 = "842256c8193a5e8ba7a49012ec6f69dcea51a2b2b5b5d4be42de8ccc3aa412144b72872b69d96eb83bdc34e5ec14e6dcc5fed494cf06fc71100e235bdf252a25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/gl/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/gl/firefox-62.0b4.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "b8193b7b4123635a7df3c7fc89afbafbca04f29789bb8165f32f91afbac91255d9f157e320ef34775ba8aef9de6c05c556de8ba0f8a108601cd75b1d2d8ff7b2"; + sha512 = "04bd8325112b05d4b261da3fdd4fc51256bb1ccb806d3861bf8a044dde3c97ae0d179e5939412c89ac8fc2a99f639828257aff739e02b1978b415fb85d042a2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/gn/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/gn/firefox-62.0b4.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "a8d3614e837c3c62c7eda24dfcb8347240b3e8d23282c9dc02a62ffc2bf84ec97602288f9459e05fbb364e4ab196099e7a4e881f8c39211b027c64a8baf1ecd4"; + sha512 = "a0761eb912d079539bdf848d274cc4a829c69fbe088c37ed246ebe67b859090d5847fda52470d066b7f6336cfb69a9d44daf286467e49f750e3059bd31ab1818"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/gu-IN/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/gu-IN/firefox-62.0b4.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "953acf6c1f65c7e5ad67dc3c8f0f2e8cf764aa230b8a1391221ab1966dbdc45c0199cd4d8e11b2409ec1a964a14c468a2bc4a517ec1597578f02301b60965768"; + sha512 = "d48e7c8e94f936ebb5bcd12c98c4acd008bf81dcff99ed0babfeee84a108cc51d6e2a355378ad9a67174306b89aeba08d1dcc60c4b62143363b209b03cd5f170"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/he/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/he/firefox-62.0b4.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "0a4364e10a169fa755cd04ad205fa9fea01c8197a299c0c8a6857861343b6cf154bbe9b615c7592823cdf5a05043d97974d61867db63b4d4971fd28ddafe6c85"; + sha512 = "1e895117d27313f89a681583823724471193cd90dc5e19c104bc74a3b31ce85a647f6b814c8aca1a8e74c2453800970597424ef979ef94a81d4a2c9ba4853d62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/hi-IN/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/hi-IN/firefox-62.0b4.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "7ca2d592ff66147387cbdd651addc07f05fa8f7def67200f7b6e8b5d7b71874eeb2f289ae5e8a91f321c90e2216a7ed2accba1f45bdb40bbf5f115509ae0a660"; + sha512 = "967f57e43c407687b8db196122c0a7545fc6e778d5f068bc58e6a266ae4e52c33e12eb6c925fdd63994236a8bbacb4cd25028742dba1cc041116d7563e051a42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/hr/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/hr/firefox-62.0b4.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "a3f9f110b344e6c5e204b2d5439594ea2a38db591693be6a357ae145864e4f2f989e876fcf947ae4ddb897c32d3f376931075a0b56e0034b4f558eed8d6293f3"; + sha512 = "fda1070644cf7a2f30fe3e1832ca81aa30ea800c52fed15d5f1f0596b067ac20ff9b0d729679a9de9ef4bcd5aba38125d99bbc1fa23a0ba3e26fae53141eee7b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/hsb/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/hsb/firefox-62.0b4.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "816e5aaa60e9041f127a5792e44357245a551feef2415d6c1d1e3e5045629382be7cad0cb9947c666cde0010ff93e4c114a0b04e0e060ed508b5c280456e118e"; + sha512 = "961d0d3efb9c3a838e6600350bd138c3ccef351f5ab4cdb62a64b109d32e893f3f97ca109d8439d2084faab65ed06e5a434eed92294a74bd27785dfe2bfad535"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/hu/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/hu/firefox-62.0b4.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "5cb7979744039864ec9451db0d4f8771792df35be22171a2d1934533f751aa3269fde7dcd6bb263284a2e66c83823f6b36c821e92aed7804c2b091c23c6abd72"; + sha512 = "1fea6e9f66e31e5a9ee188f1e04b1623fa92c55dd5e60e2554c00ecf18ac3a9f72d75337909008ac0ba092a7110670b52cd6cb6ccd059c1e7e212e7f4cab4441"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/hy-AM/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/hy-AM/firefox-62.0b4.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "971051896b26735f0e94ec60bc046900c62cad571b1d6daf4c41c65d825056ae72c5fc4428c696cc148ad107050685471cd99887251c52223a46f3cff9347c4d"; + sha512 = "39300550115a4a327aa701314ad77758adfa5cc3604021e3666cb0dbc766a4c1e3065d9c3948bd50a4bff0432ff23d28eb0ccbc47d313962d94280293005c39c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ia/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/ia/firefox-62.0b4.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "086733f47febb78bdcf1dff692a3ba03c3de57a03d84245cf8add743f7006f75f9fd1813d6bedab9c71bfe5b2d8d7e2f79950e19cca9a1082664e08f8f3ecd4f"; + sha512 = "1013bef21eb3421e876019544f5331e1eeecc7c7bf1caf886ee35053dfed4815e56447cca9ad8f1e0dfc45a3a2bf43baa77d4a7adad8f4e03cfef5cd3fcf4420"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/id/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/id/firefox-62.0b4.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "fce9a1a60caef1f77572fee5934d072e9321ff0d6146745da4c48f5461a3e7e74e756ac4e6ebaf1bad804b6e6062eed2d8511377693b459ea8d47a80a99940e2"; + sha512 = "642256bca6dc5a3d71ee54476e6661685ee4e27cf12b173fc08f0ed1ae701d61e7a64dfd40abe1ef96d456537e946fdddf0b20f7b5eace0b1df01f06477b2034"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/is/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/is/firefox-62.0b4.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "82480e44a7402deba55cd1bf3112a9c90ef937da3f5c41a4340b8097035e0b7583d8927b73b28433768f7f40e2010704b51e895a703ba40b6ebe1ce106b56946"; + sha512 = "e11b26ba593d684aa7e4516fcc50fde023166cf5458910c6612f66f886b51c5a741786a56745000b2f599e0db5f1854718b42ecd2bbc3264ec3b64920ab8908c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/it/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/it/firefox-62.0b4.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "ecb4cb08e7638478281522346181af2ad939567e777f9b49bbac54985f0d01a98260a3a36ee9053d0cb8e549a3aee481d2639d87eced7fdfd31693c88675bfd8"; + sha512 = "4ce2e60f7dacb99ba646e443b8901307fe5526d43e636852f626bdc509bd895567a8e62e5d8400bd5e31623a0e1a8810f7b95d2ff80542199e7e76e65fb828aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ja/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/ja/firefox-62.0b4.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "0cc094cde71d8729a93d3ffeaa8f1ce0e878835133dd32de8a807caea71e06fbc6f41ee748135eebad3fe9241628d6d17628e8a2e68f5e8e4a18e88b31f0fd6c"; + sha512 = "70a6e0438c954d68a6e2397df2de7c78c16798d67861013031a15c100694f205f205992a0fb55b0209b7af8ea60e1ca4eb8991df873cffcf65d29fec717214e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ka/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/ka/firefox-62.0b4.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "ba98c0d5270f7d16bb865212a4602bc0baaf0d956e5ffd4cb6f83e67391df450e187a7b927d99e6b4668e5465be0b9839099ea9eb7c67765ab0db2d3d72c6f91"; + sha512 = "8747cad30b0312d5e4e2a77c71604b8aae16036a914c89bc3a05a22255bc621e06d28a8e3e9d33bbb90c516a73f349a84c3ba772b69f57c2f8fa98f3b77ab5d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/kab/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/kab/firefox-62.0b4.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "3553d3dd634693226bfc0db1aaf94c3c9b43461ab2c4466a8419e4429dc2f8cc87f25d15fe23a588ed1f415944a7019a9686b7bfd3057e6687ce56b63f674236"; + sha512 = "8b57cc8f2c3817c6bd6ed43c21ef3e9d881ee5e2a9a2a936af444def467c5eaadc22136cb661075a81013707ca749af05807e13ce00df5c2407f7f97059ca0d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/kk/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/kk/firefox-62.0b4.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "79d9097b7b000d95bf967aeca33d043227155e2acf10aa2812af1ada20547e37ca33975ba922b267ae9ed35c107eb466edf6a188d2c87d847828db66df4ad012"; + sha512 = "35d61e9533d27ceb6677140288d78f81f691191eb9f8fb59cb8463bf6d02727892e0ad95baf94ce15af4688f680b848815e7672bb3305fc42c23d6a3435b9950"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/km/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/km/firefox-62.0b4.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "ebf3264bf56422e8bff7170eca01909ffc197704d386d0fd08847b7dda0b832a4e9e42ef200a7e516b037e6ef02364a5fbfb844faf1dc65c2e99e55cf5d89c8c"; + sha512 = "6ff9e959489963da790be6eb00d0391fe5ac9faa74134c14dc8c1c217c28bbd2c848349a7d80ce380be08947076212a5867090155a5dde124df83f2b38bad249"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/kn/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/kn/firefox-62.0b4.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "37859cc2086c393f0026d5b164ce1a8ae7f43f231f92a94bca3c5d33781a502b1c108b9773745689bc6c7ea17311ccc9b692ef7cbedeb09abf8c8914a4bfdadb"; + sha512 = "cfa5b403fe617913a2a0fd9a7116db0a53f9b739759aa1834e2fd76161651f2fab52504d33caca46f0f9082ef5e3cd93413b78514606b7a0b5b672385eb41ddc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ko/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/ko/firefox-62.0b4.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "f2032095748d301b1c1a7503d80f92f96bb07dbc7373a2b07e879850a706615eb82a838bb2a0617ba3ea779165256bdb2be24f5186073009d52123609310f9da"; + sha512 = "fed2fb230bd74fb636071d6f44378c5a0c6b390705b670db5842492b64ef6bd7a8492e618cb34769325c872c6ece0fe2fea08569e33c63765f60a6bc3e6ff102"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/lij/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/lij/firefox-62.0b4.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "50e742da88e94d29ef02d172ee9de5ccf78e51997bf9bae048a1c63f703f1af4948cd1b70740a5d8d944fff58bea03c6b66edbb75732fe0817bac89d238203b4"; + sha512 = "aded2a35de0ed198ffb327d0152f25c963829efb7af678cb4a71bec784601ec986e0679698e67468a2dad0d9f6bcb4eb3031043fa077162285ccf2f47515fe4b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/lt/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/lt/firefox-62.0b4.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "bd34739a3f1c7722d8532d3c960af7d1abc1150b75d97188551ad4d811b60fd585143e2c2828786a84138753443bb29d480ab342a5bdc843be1d8772641d2243"; + sha512 = "7c8fe81bdc9076cf6d1980a767f1ca50ff55e41786404890c75e4854dc761e3175e45fb60133db22cc22768904a2cec592f60323fb0bef23f2c31cf5534cd229"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/lv/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/lv/firefox-62.0b4.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "3accceec24b52c19bab59f0b99e1bbd5ac51553056cbd3a304d0e38fba0c94aa927d3f4ddcf709996a819be64f0eeb30127c59c0f8b7a2a142e8e37b6d386675"; + sha512 = "97ae54c8723e83b8d57b925dff2a0bf3c50b642e45d15541ea552511704e1747c70fc09bbeaa4e98a23cd5e207a69c86bff3d66e0f652f45cca314c87cffdb99"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/mai/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/mai/firefox-62.0b4.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "614cd2818a1868667d17576b793c471dbccf1afe450a1dbda969aa4c84fe67dc44108fcaa2146ca64a0f5109201e4efcbb65dbf49ae68b900f57138a2a562ece"; + sha512 = "f19f903bdebf6b61e05939f268821f5e55afce799d3f2000f93f8132f637387b243fac9137cb08b93931827a3ae95e5f6bd77bd4a99f474683cfb58852fbc37a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/mk/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/mk/firefox-62.0b4.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "85068377c4a31e96c85efeab9019830bd4703bd3a26ba8a9d5c52e3c8c3fda4c23efef0a9c5a97c17fa0cc7a4f982024bd7fa0eeb0a80eb05ec90d22f610859f"; + sha512 = "364e51cd3dc1ae4e3759d5cc5cad9c856a789c32c5d76cfe4428b4166392c3d42eb4063c35eefc7f9006e7f5fa84bb6f3ba9bfa632f5ea0983b1ebf40ae1f07d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ml/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/ml/firefox-62.0b4.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "88f09504637268604a77b59b61f0fbd38fe3f4a04d557c7e2abb36d5c2bdff88d1c6fc07ca1cc18e00a4a032de4e93fb674552d9ab77d3ad2256dba45438cce4"; + sha512 = "ee31871f4a9e81547861f532cc2c597c8b20227546e82ec6e2c12294c12e7cf803dfbc8acd74ff20cb83001f0650a2acd70f537d72c2460e773c05e9bd88bb22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/mr/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/mr/firefox-62.0b4.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "97f39a0b777d7bfc90b744e9487cfd7552802978247b0285577bc10f27383d5033f7a3555c399939182dae046e716b35f542b50f7d1e39f7cb78bfa9afd184ed"; + sha512 = "2e89522a9c209f459deefe6b73eaed46e619d5f46a11e413fe0781ce416e6da82cbdc147484958b061fae3bc4c7dcd8c29047eed5cf725e13e28030720a183c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ms/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/ms/firefox-62.0b4.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "ce9cbecf5ec72ba7843426fab4c62e0ace1d0870816e00b104e60f7ee7300111d2f6759d3f52c128e0c06a912fb22ee0e7db74e185d1ca33451739c703520a9c"; + sha512 = "44c1306b60cbc42eb550a6cca98f02b5a8272c4db5d7587720948dd5043e8dd96ce337989cf97bda06fb7f90d080ba320cb5e4f373280b9b9b93d895694752e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/my/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/my/firefox-62.0b4.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "8b52d27861a1a48fb5dce225f88cd7b7104443de0fca537c060225ee0bc5205be40677a8743900eaab892996e2f1fd829865962ad22f72a1dcaa157bfc8b0499"; + sha512 = "931167c6561fe18faa71e7892ce5ce07db9e55e26dbfedfb229552b14a9a2df9c58eb4949d98ef3e2e565684093e8f1b4b8ba61ee0513c4b5bf0137ced52682d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/nb-NO/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/nb-NO/firefox-62.0b4.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "d8da0175bf389c1d85534b1f8b2fa3acaba0d7f42c4b31c19c1099dda1ad505af1921c9c0009b219a78e6f929978be77eb73ad399dd67e9ccf143339862f4923"; + sha512 = "1d292c95e573295846d93ff9b4ef1f10e8617ae4af429171279a06d9d69856152dda2ffbe5aedf951143f537e4dba66efef1bed1e732e71f1a655e6de1c7f1be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ne-NP/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/ne-NP/firefox-62.0b4.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "9a7c68be248103fa7f817d63169f362c0a74de4e3214cd20dd51e0d2b9f0997dad9e71fe4f4cfa908486013c010ccf018e68b26f45f4725cf7c6c6d0f6f51707"; + sha512 = "223c4b2d0faf330600135130c3d83fdcff5567e16239fc7a6a51a5f8c92c9170400e50c75216a98a5c62507ccd3a18e016cd6124631a308536e8e69c33d2029a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/nl/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/nl/firefox-62.0b4.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "a39ba40d3d17bfe4c8ec26e1a727255b3c6d1e4dd1d18f0af473fed1d5955849d035ee1b51969e21e9b20d04a1341f6cc3f0cec02cbe3358cf7f5225ea773ea7"; + sha512 = "6f14ddaeb40bb4960ca06bbdeac55f0d5ba246e482f94cae4e2cc1155787ea14cde6ffb4a94178ae59aecb2296a1ce509e53e06102d765c255336fb9881c8332"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/nn-NO/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/nn-NO/firefox-62.0b4.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "2bf0dc2ae462d160fbaa3cc0351dac577537649adeabd321b44aedda65c4525382dd8627b925ccfc4701966c593dad81b30391819affc15f62481eb93fc46e9e"; + sha512 = "1ec96abb877c90dcfe5778775458e8e40d9b5d11a269ddca43042ff6d2a26bf05d8da8e8b65d66c3bc1cefccca14f274f1c3f2c3e295b9a386fb8a6eed9a9590"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/oc/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/oc/firefox-62.0b4.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "e63393b51019891b1662f6b5950efd62e7880b9f1921abf35fbcb851cce68d544069a0bf06ffc297c198d216ba7a407165bbd7c127578f6da8a1a173cd5d06a9"; + sha512 = "e0f926f2807806121580a9f07160d5692aa90da622ef073f2944fd735851929d21c5c99b6f2b7372fed09a129b36bb2bc182b0cf6be21c93a15677a937c3b3c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/or/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/or/firefox-62.0b4.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "7acc56b02539257d5f08605dd9fa64c01ad4ddbfcae34d81e805f7e46dc311105a43ad102cf588fe332d70d79558119c17d69e653b5bf11eca2d63863725b936"; + sha512 = "54ad421b3a038b957db6d34f3bad4adf93e5da2d0296159d72975e9e038adb66b4289ea1e5faf536136f8d31ef066af55879b4920b3edc36d5a92543e6e8cc5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/pa-IN/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/pa-IN/firefox-62.0b4.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "f4dbf55b3861e2018412ef3d27d06d531ebd59b1dc0d4b60161f006e920ddcb4cb0ff3bbca7ad2559f3052003044b5bf4370af1d0cf9f2375869f68673dbd102"; + sha512 = "71613c87ce235a4b3687ddd4c586b534c19eafdab2f30d5d18d41c9593ab09bc400d2db73370ad409b34f46735e7d4e5290671f1d7d9582b0c0b2753c6551733"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/pl/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/pl/firefox-62.0b4.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "2c4cb6f9c190a0b286ca9657c29e9bc7065809b5a532c5da906d66095430b01c5b401551eaf3f29fdd5beb44dcdde9de26c9df5fd7acc78474db1509c25f063a"; + sha512 = "210cfe080e5a97a4bb74f4420fcf0e69e4fc3a14701a957457474df2fcacde38b3e3741e0692094457009fbbb7e2215209951f16984bba771003d7d93c1802b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/pt-BR/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/pt-BR/firefox-62.0b4.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "5dff06cbf8da6a5006ec927adc192f6afdbebd816ff49e2b68036f52fdbe26542da66370a1a574cfb33949a9aa5e18f0f9f4ef5358fbbd65608ea68f9507cc62"; + sha512 = "3a7323821031cd793cd6ed1f50503f71193cb65be792e11e4162d0f5488565ac4d4dee376c9004302192f76280134c07905b57c1db4730abf88f40306ffaed72"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/pt-PT/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/pt-PT/firefox-62.0b4.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "e3ab34d448e7a5408461a6663c621da74145381fc25e1db98ac3989b383e093ee2fa1b12429d5d1ece58bc27a3b2a94cefe0fce22e79b8d74116cff637de125a"; + sha512 = "7ebd1d48e9cda26e865ecec1357e779d06d1a44326599b5805d4842dd8d334698a06388a45867617e4e3b3282496744d1a81ee89190cfd5854531367cd482d9f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/rm/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/rm/firefox-62.0b4.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "f8355c83a7af21259a2be8d720cf2cb00bfddd06d699d888da41cdd7a8fc5834833992787f75319193b0cdf7f0b5c87f7b8705bf88de3a5ea357a719cfd58886"; + sha512 = "b1d94342db68f3a60923493de220185fba0eaec9c76c6533bfbd6b7cd1782f44544eb47deab5dfb0fbeeab6d3c4612dc00ea2dbb21e80d59256ae1bc236492da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ro/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/ro/firefox-62.0b4.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "daca4090ea994c8111098d874b77e1ed8c8874a993c2c81328081fc42111c476e3a5eda2e383bec557b4bf2e9ac6cb8a78bb75c930cae69d760f231f7bbbda35"; + sha512 = "d922a5ff6f9f49f7c6a5576a0c0be3edc9559c9e7829fbbb2222d9b638d4b187621a7dec1042ef72cb237ee9f49c953f56aea759da57ade8f353a2028c195773"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ru/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/ru/firefox-62.0b4.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "c1f6c877b1119b2d16960cd5724ac9044912524791dc25658a86b34f1b1ee800dea524e954e60048fe8211285f227a864359902562a0a721ec6b948fa722da02"; + sha512 = "097f2e09a5351cf4824ad3a3cea94b559d92ff641cf6a73b46fe168b62f0ddb774a8c4ca8d58bf30e33236c256aeea64c95aeb9de72cc3a8d816eb72ce8158f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/si/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/si/firefox-62.0b4.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "0784b64e92df8b00d48695e627a00c3d4bd4ca56f717f0582c4f2fe025f3da9984d6b509fa4ecd06b9367ec6a9931938e69f6edd83397f0ff416e74167d85d15"; + sha512 = "26a365b78628f2d45ecc1fe7a2b62928da8430dc634e64d926107d58f7ad172cc8d03b5b0248d6e0b356f5f17a22f95786f583e5d2ef95a7feca5dc40c8bb278"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/sk/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/sk/firefox-62.0b4.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "76b6412df2dad10607b201d7be480e436e44988d401a055669e2ae308c0d687ead9e3f1bd06d30ccfab55fcff2f605fe96f98e3df8e321bd4ab11a3d211a5ce8"; + sha512 = "c6adc577824fb9d7f019624b4f752ecf109c79a982996702d9e0747a8ef8ca8d8671f6498e843fcf277646c256549a3e1e453069ce1b236f77baf8a85e3e29de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/sl/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/sl/firefox-62.0b4.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "056b78321432303d6dd09f4833b6420f0134a47b90d62820f7bf12b430f608be3cb3d3960bc6e7b4d247c599efbd7305989ca44b55bdaba37c49ef57ce19cf0c"; + sha512 = "c988c496b11a67427f609d42baa31f375d486a8c143af379ad5dbb4b3592f7b4440c502ba1b5db9c66f45963f151c08c23fc69237c1eaab4b7aef6d97e3dc355"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/son/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/son/firefox-62.0b4.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "f7b5b82969e199a12887f381f39def4d2ab8cf6fb9a722b3b9c312c841dc5fa8b4568e98940d0b683a9165edbdabfcf17092497c80b732108d0883a1ec58bfda"; + sha512 = "d1ae028c5e8b78b0d9714c2eca01b26b2095c6b8e3a516569e0053f328221d14f7aff6165ff714d1115f101206fd4f1cf8b02a094af89ff5c725f5742ecb5163"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/sq/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/sq/firefox-62.0b4.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "2a8f683b0529596c35cd0f76b7d8fc1f1503f1298ff05a7596972d3ece439d88587b250615f5994dc75fd1ceb370ef2473f91028015b2464ef259838cd9d78be"; + sha512 = "744700533a1f487804be08333893b6523835999858837d77a4f9394a5a178d39f5ccb33ec1a552b02f67c23c29061110b37f7473c65a15223600638a06725fc4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/sr/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/sr/firefox-62.0b4.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "b33187d6b6b20023fa810a0b3c70792f1c665833213460dbb081c5b2848217a025688b456e66e50d8750e42cb7e71f6445e5680e5d8d7b77c3999463ffbcfbbc"; + sha512 = "b820013c9edb167bf9e209b677935aae52f693a4afb9f861c78afd2ec1048efdfacc1a7b53cbbb53be75bc6981690ffcb1d77423aa537ecc2f58e1b408803a45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/sv-SE/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/sv-SE/firefox-62.0b4.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "ea2b99d16d891e742697a68749cb8499c0457e15e42d61bfe0f2356f3f42ba272df6fe88088a594c9423d59177f4bbbf11dd929d6f33459a280948ecff55a2c0"; + sha512 = "62117fc5430ca6307d2fe994bbd4d27b10fd950a8c92b0897c92be00aa7ce66eebb155c6df883553dfea4f872c4bd210d1cb8b85439d50a640da8f1f3b98e111"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ta/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/ta/firefox-62.0b4.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "fdcfdaba2ef1cda3f7434aea3d7931a9f88b4406ae8a05d5fd1b84722b2170079385f99bb071febfb6416e147f0b06bd0dd710766222edaa5e68331d92edf106"; + sha512 = "b2efa2c842edef0333b88fbfa8595b545cdf1018f1ff11d6e732013a29b5ef63d11fe88f85a6172f1b3f33ed7b115745b60abfbf01761633143bcbbe20ef74f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/te/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/te/firefox-62.0b4.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "b4e55cd67c66362d28867f9ddef1f6a44d3081e183fb19d4a73895817a37e2eec0a87e394c0fa70305f7752c40ed355ed16fc3111d72e70f6e667b959bf22c56"; + sha512 = "ad1160ab79995a563b92af0145e4b4147f3470808dfa4300c7f89ad38070a78c56362651b8f86744a114c2f0bf9fec0a2618b65cca3fbbd78afcf5bdbdd9c683"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/th/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/th/firefox-62.0b4.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "20780e1eafed9667b1124a3e99636fe3b401f8da0785c9f44bf5b797b2d7b0ee17cefa916c5a30813bf66fd6bfaa1313d74b8b59e65c05d6488d30aa9939d3cb"; + sha512 = "f70d712cf6cfd7d66d81ae7f65f3931d953b591b8bde0434f52ebed9e4f2ee654d121fbd0f37f21924c8e95111624342932399b3106af5e8439927ba5c5ca69b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/tr/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/tr/firefox-62.0b4.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "bc3cd8e37a59f599b486c966097f152836e1486925fc99f7b65df33535d99347659dea5c0696c061d36a5fe85a8ac307fc43c3b88152daef40389395ca3a43d5"; + sha512 = "72dfc2ebc321e0bb8688af5496b2e4f6fecaf8fffb5322bf7453dc56fe1d1aa074657b0763fa80a87bddc87d7ef6c878f459d02a11abafe7f5069226d8eca57d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/uk/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/uk/firefox-62.0b4.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "4a0b66639dfe743bc585d35887f1c32bc93df6345b943e4e21909bd5613bb298273640bd97a50a38f1577a985368b169cfd6528da6b7816282411483f1a83782"; + sha512 = "92e52cc75e193ba38b4a56c11fdce21f69cdffe9e39050a35aaa2bc9de27e757f492be7f7a549dc8a3ca40a8830c07a810c4441821adea20ff8b68d7d3413d51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ur/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/ur/firefox-62.0b4.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "69d6451c07778120ec20003f7106ebe77b04569a81e0a9b8643e8436b7a05d8a6fb97f9d8d9e91c6bfec1031d0518e720520ccbcb9461350f4ae2b7efe421d8a"; + sha512 = "40fb179d904521bbc045b9173b15a0a4a1de198dae924fb4b1b23955e9790db71f2940c95ca8d5c98bff4f61439e2850113a2ee6548c0bbbf38231ad4e5f6872"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/uz/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/uz/firefox-62.0b4.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "6cbc42bc4f147c6f6a30e41a42b019938d8984dbe21f6f01be689b212f3308bc409f02c5dd1337edacd29d80ab5af2b67e14fe2666d349d3368030b551965e2b"; + sha512 = "52dcb2cb2df6a0764848d9cbf45ba491822bdf6e9a9ec2c181f48b6b3f2d465ed8ac393a5d0c93a0dd3841c35e92eb17f102c9c674914d7969a51276d22108df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/vi/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/vi/firefox-62.0b4.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "07877f515cc5c04bc03173108321ca019432dc4440bd66b3de0c8bcefcad22a2671a84b82ea4120a630b5bf732067d59e0be9abf003566ce4e00da8ae64e3d66"; + sha512 = "cdcf4f3ee2c4943820a329530dba8827cdbbbfb4eadfe8f976679c4366f169bcdc0fe4345bcf82d3e4ea866e2aafb0c511d7a78e4ac2e5cce2704638e0eec089"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/xh/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/xh/firefox-62.0b4.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "db8c70eb94f26d07f6f80d842b632353e353ef4577fd341f3c66e81b48421b948999104570a545cd3366dea286a5640547c999f3c9ef69cb443b770c37c73083"; + sha512 = "94f83b9c58e425ca16fecc4ddeea0063999c4deeeb0fdfd66cc19139370312cd6847866e01001e7a6b6abdb104c0f807df7d930777e4efbc079ab87aef99ff71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/zh-CN/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/zh-CN/firefox-62.0b4.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "a4b7a5bcde4951b94cb688b0c9760dab85c879ddaba0627113f53b80dc80958fb85d8edea61e6a923f0aa8d78af1ee751cf40c34683aa077481cca4a6688c65f"; + sha512 = "14e8181b9cc35ad5e63f7fd0b5d238a091886bfd8d4ec8b3b74b5da44f73305cb1fbd519b9275706c7d0729ba475465d466d33b002b0de425afd8ed3c222ecb5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/zh-TW/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-x86_64/zh-TW/firefox-62.0b4.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "37c477b745d2ed5c0fb0dcffdd2727e3c95cb73e5d5d88a5f707bec8be3deeea4e05cf35562059a8274734524a85987943d7a7085e3194fdd83eb4517c2c8870"; + sha512 = "df81e26ff01811b85167c4aa8ba9e0572d66c1193ec3c19e0c62ee0838d679a3d617476aefc23a2d742dfcd2c52c38cae80eee16e48deb3fcfd17231b1a0839d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ach/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/ach/firefox-62.0b4.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "a037c7a7e98174c7ea9b2a87ba0fdc0dd1059fbbf087cd6f6831e3eb0a06d223dd1a2f99a52898d324f40d08337525c4604f35bd154b216d369e9da70db744f0"; + sha512 = "866c54c67d67640d0015dcac1091f34d202390175561c33e66ad2f7ebc41e9d8c866a8f70d8eb9414a54d30aa3fd9ec7513e2a29b06a7f34039660f79b3fac1d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/af/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/af/firefox-62.0b4.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "558a10aaa328676b5540990cca5be794e5dc7202a74cc97948db71642ef4d045d16ed5a72e816d8f0ce63741fd78b815ecdc1aa4a2fd4e4241d1ebddf5d25022"; + sha512 = "f0b018dc66ab68329eff9f8bd867ad2799012951ce65b6277c67d03edb183577bce2d0a77c034fdc6dca7496c82520eddf3a3ef74850da23982ef355a9a36dce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/an/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/an/firefox-62.0b4.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "810b5e449cdc78806b9aee08a5a43fe0e5f771e49a8f2185f950609d397b9cbb80ba16c35c8efb24fb8d9d6d7b1e41a5a3da1374c84a919f47c3db70b31090a4"; + sha512 = "f1b5e89bb78669e9882bff1edd9ef8b7244d7f97d048eb2220b78c4fcb09edc9bbb8c10ff4fffa1ed6db7e2e8bf30b9c598169e9e2cba56d32707c1ba301eb33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ar/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/ar/firefox-62.0b4.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "39762c036ce21ce118dd5529b35be17fe9a8f03753e59deffe8903d20f73355ff20466a2a4d3e400826575fb08a5882002019421240490987d7e9b9215499654"; + sha512 = "9c468998b90cf087678ee6904fc4d86b668ced79a2ee48663a9b03a7e8f6dd33aec608d7e807a250ce32bb2d9890fdc383f2579530442b9c09860d95b0c4ba93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/as/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/as/firefox-62.0b4.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "12d9b7000d8a2a3b0c0930b778a0e262793381dc57ae53532043c2dcddc520ab931baa67eed24c3bc2dae8d9ea198a34250d41cf61b80b0af18aca24b754387b"; + sha512 = "26086fa96511e5c58a302345b649adbea9e2298308f4c87dfe154cfecfddf9168b699bbd9607bacc948938df54851d65ad568d413cbf1e7660dc7279c06b4e51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ast/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/ast/firefox-62.0b4.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "3c84c453e4d583b2df67649badf90f0dfc0d25780d1d7cb5fb38c9b9b749a25842d986554b4cc8a66aa4193f93688a570bd7ccbdcfc901203b8e240bde2235e4"; + sha512 = "a07877b0c7a4493aa1a32170863c022ffb68007e66a7c2ae5db70ce6a87b75b51a65acbda962552794bec4eb4b9f20c266ea7eb6e896ea763a00f195025a302a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/az/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/az/firefox-62.0b4.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "dfca240828b9c4e4e7b555f6c7e33c29e6b095ef73b91e87c548bfbccc80d78a25f58a790f02de3d53303ff6a554dcd0b538a0bd5a34e95469bf0fdb319ee4ff"; + sha512 = "82f8d35a867e6551b88df28eb7653766836b4a17897f1897a6de95a589f3f98ab9b5c451cc0e3fa05c545c9e7b5891d045907a2e6eb6566aabaedeeff4cf5e85"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/be/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/be/firefox-62.0b4.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "4080e78d935385a39bdaa1a1433642e89b2026e4803bf76e45e92da9a741ec5bcbcff5fbcd6dca6cca072334610189614382df9d6d1cbb116a0e95758c2f5930"; + sha512 = "00e343c5d6449051922f436080e9485bab2df82870e3b3cc16b44b73fea744ae3a7eb46a694764e815b512426e41d6b2e3c730bb959514b77ffbb350d4aa2de2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/bg/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/bg/firefox-62.0b4.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "fbfe7107d0f3c70c283a643426c530e62a45962973818311dd3787563c54ae8fda3826bc8bc807ed5b9fb281ac0ab163162705cccdedb84d3f8cc2eb2a68a712"; + sha512 = "df4d4e6096de576d8e36a9fdf2ddb365a8f4ba1a11538cc469e498f21eefd118f6b1fbf599c01f8af085989d934f6cd3398a04d6b0cc0fe2a5b03f5331c711b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/bn-BD/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/bn-BD/firefox-62.0b4.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "5fc9c22452bf775577ffacfa0a6a328265e5143c0c7804b40fa33f887eda33cccb95aedba9426f65ff60d7d3fda28fa4e82bd7fb740341f4dc4d5991526eb3d8"; + sha512 = "a349c043134120d44dbbf77c3a2575cd71abafd2f4432b985b1f285ddd5bc4e16ec6e6794e485a0a319d245f40101c88412a3c9bad754f45c2a40b1d99d13d58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/bn-IN/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/bn-IN/firefox-62.0b4.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "ffb74d1aecadb920208bf282e5805dce203d854f79f733d34dc5834b065e2bdd5f9feaf2646c13247be9b9a3fc47f1277a917c89f86f14285d7c6c41b9399cf0"; + sha512 = "46ab2bb77874a2189ebf73660af3384a45e03d4e88072f7be00cbccdd140a04fc55cfe449ef4f5d2699caa3fa9a593f2f9139170a4bd4302bfd389192fe09b3f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/br/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/br/firefox-62.0b4.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "7a127b5901965324d47d2fe2a263ee7e088df95cb7a53014a06bc4dbfdef0eac7026272af2616c90e2dd7aef82be12dfc5fc7010b306376d97db9588f30a1133"; + sha512 = "54452acdc6c5c25758c2976c35adc980e22080681d85b532576891c89c7c2eac2748e2028d0d80e638ae1acb52302285a65663b8d59c3bbcadea263444e3591e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/bs/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/bs/firefox-62.0b4.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "704022cfbc5ec0d9bd74c6782354c507cf6c1945fb6101bfa5bdafa982c69c38e66527db09a00f5fafa4b7263e9b5e53f95b68d6e4be24f9c4f48d90d63db38e"; + sha512 = "9cfb5f6645c3278b2cfc052596e7ced511f93133fd1405cf65ca647204ad0da35ce48d64b0e6e7450799a087ce552e6f5f3955090d6d46564ba4b74ce85869cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ca/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/ca/firefox-62.0b4.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "a2efb994515d3c85e501c32f77a9bfdbb80a27e0e30f6cfc0dd877041906866665d7663266acc50d1acb73f2d56349a80e47ea51ac4891a588f40a2861e89007"; + sha512 = "a6465f305221ad4bdd8e60c3862bef25529a8d7dd8fc8934bc9b2a9b95330158aa3d36d4e3ac3ef1062da9c3cbc074d0f341b01dfd31b88b2742d2c75a6e4c55"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/cak/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/cak/firefox-62.0b4.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "bdcda65e9f15ceecf75294af72fa9dfebd64253521545b24d543b3adbe2f98418700ebf0191ad5d894cec4cdf7457a2a8a2f60734b9a437f35e870f27efe5d04"; + sha512 = "bb6c2d5668233db3e5b5e7afee7f9781e5b772ec5e161abe6b59dc48b40e78e17dcf342b1e605ea1e09364176a781636174b62a52f983874dfb4ca4f3a50e8e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/cs/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/cs/firefox-62.0b4.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "a2d6b96afc9f2f3ea5707504329233c536f4fd387f0125da39bd68d94efc40f46080f5184e45362dbbb4f44896a662d7855ac4c57be44c4b2caf9dac23f899d8"; + sha512 = "8f9063e07aa960f11be7d72745414a010aceae167652049fe7bb7a5863d2fa394a7a7e3e69bac92466da7901401179d50ea80e65caa2d06c478ddca2d1521a62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/cy/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/cy/firefox-62.0b4.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "82f87813b206d623680b20ef3f687f59fb83decc4479e25f6bbb7f46d986ec805ed054c643f2b5955c43925d930a04ead99ebfad2862652f4fd4e71043f137b6"; + sha512 = "aeb16c2ae757b9098a9284c993de6b98860ec2a5d62425da19be1fda0204e05141f5e1adcf5d9a774d86fe27e7cc967b29396c1b552b0b1c411c033251bb0ed2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/da/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/da/firefox-62.0b4.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "7b023117930f5266c75819fad5d207aa9a177776864a798cfdbec24ad25507af139a184b593b267f045ef381cac8baa28240d5788667dfae37967e4364fa07da"; + sha512 = "77fca51369ea914e0baa6a73a6fd87668423106b78f6dee968b4eef875dfac46e87c8eeed3b4582cf6d935a3e0f9bb7bf129cc832552ddb05622f402d1347d7a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/de/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/de/firefox-62.0b4.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "cbf905036051c20ab3afc1899ccf5ca2db3a137023764f039830d996f515967b78a02349a118d0bc0be022be353b0ba57e8f27b8baddd21ff4d8eb240577b208"; + sha512 = "4cd9f01b365bb62a09db842fdfd74b7a2427e4325e5348d3e01823740984c218dd2225ebf83a88b3161674bfb83fefd5d39c05787705f630cf6a160ff31a995e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/dsb/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/dsb/firefox-62.0b4.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "f7a109193d3fccd09718763d44f9c30313b2062b25c962e4fe4273e62f630655cc7c162d2b6648bbcff89469d5ba26fc894c330f074dab3924d705e3406dc9e6"; + sha512 = "7b82c4d5595f3dc22a0001b55f7fff79bc9a2054c97edb4f11430ebd64d5a7a9ec00d2399cdcfc926866b031da311691ab7343225c286c904e6dae6f46abcc99"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/el/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/el/firefox-62.0b4.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "80a90637d8678a1817e653f50ad7a67b7bcb395e3f6df3e39f90b575b9d554e86554e0732675210ac2979e030827135a6ddc752640b7d6e55d6a6c0098c9e34a"; + sha512 = "8579c925232317f1a93c12d1d8f7f92b058a2544e699c26046f76101c32e925f4b199b6716f9dfa4978e3a49dfb7e21d714620ad594ff63fdb976eed89bd0d9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/en-CA/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/en-CA/firefox-62.0b4.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "2dae6b1eaf95e735adb0d4299a7ad5abb3dcf15ee8fd117f200600e3b668d1d4a0e5e23a3b1db2d3ca00498b1abcbeef1494dea834b18e43bed067a60000feda"; + sha512 = "60402b01f781717d3bb082ffd310279fe45d5145c10350ff664cf9310f307e564c50a16853d31cacbe5d678935cceb995ff3087248d80f37d5263cfb0969c7f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/en-GB/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/en-GB/firefox-62.0b4.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "63e280fc13f34b19b07fd2dca94f38d1d2d6a0d2d300b430dedc23ef60d248bab8171dfd8836d0d9476ffdeab9951083307b36fa2324cd39feafddd71599093c"; + sha512 = "7074479bfe246666712eb4c27dd62d2fa4fbc8b95c8700d21e9b15d459f4b6332103d1bb951ec92f84230b12bf131943f77ef505ae5a95cff10271203d76c09a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/en-US/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/en-US/firefox-62.0b4.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "03d8cbc65efa158d1b7fe303db38df37648aa0f56b6afb7a3e6349f4a658946e8b78fc892391866175966387b90bfcad3e1543b615521c4c8aa15053a34b60b5"; + sha512 = "ab3cdbb6a5a9eceaea2e196bde17a56516b5150eab4643dff9ff5fb4dd9c9bd0c4f2d88ab483bd010a855ba2f10ed58357f19a0955160b83141f41612a805dfa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/en-ZA/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/en-ZA/firefox-62.0b4.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "a5510a63055c47b313eefe5d4aa21b1e9411c9a155ee4e89fc3438ad6a0b9909bc197ad5462bcf29df4e7bcd8a86ca0eba33ed222e15d4061cc4ce7bd67f757d"; + sha512 = "4e2ccae6681e1ab38627b17a6df1e19022569fe946a03fc9b405a6e81eb7a694d5a4d31cff89e02e1a8f3260eb716895ee20604673422b7448e8f86dfea25666"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/eo/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/eo/firefox-62.0b4.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "29908c15095edc7701609dc8d2ac0ab3a8ec2f18bfaa74e5b410e80fbc2f1476f3f98db67dece9e8caa37cbf3e0f8034cf791958220a906e2b53205487c9e8a5"; + sha512 = "2d9f6e9690b687d859b0538a0e862b78c951912287fc19b6dbf8c8614cef37ad501cdd800607fb827300317b849e32f35977f5db85785411bea670add9505555"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/es-AR/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/es-AR/firefox-62.0b4.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "1b2cb7e7fa15219988b87c465c74516d04c8642033504888de896b8c29555073864a5f5ca9a39baf3f273dc981dba139322e6f65c242dbb69ab5d335e4952540"; + sha512 = "786753c8c2f738655cc598f5eb56c355a48cf2b6d4fc993180673f5d30102223ab1410b039a8d0beeb7fbc476e80c594ee40f9bcf219fb616f27a7393639e3f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/es-CL/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/es-CL/firefox-62.0b4.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "232a910b28f3e415bfbf2ba56167941f5076bef3f58c24d3647fbc2c034ac71a1bc4d4903c4e7e26f56f73c72a4759baab9e8a9edbcd848b6235337e095100c2"; + sha512 = "f043360f69d5a49acd4c4ef3b563bbfb39832cb06fb3a0cee6fae08a60526b7feb8f35bc46527a222300a6cd1cb31751efaa936fcc50e47a21673ca39a67c079"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/es-ES/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/es-ES/firefox-62.0b4.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "3ab5192cc1bd24a565cee5a24e4f11719fb6f052c6503770bab5436b308b2ea1aa935b40ee4fe9a1168ddbf206c9a8361585880cab0380cc6794b15a172b2089"; + sha512 = "62d3eb82d5fd034e97b43d80aa03225cb90e164450421d5ba630725fbca9200bdb10260c29e050c5c3bfcc52658687f5422f371dc930664cb562dc3ee18e8b9b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/es-MX/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/es-MX/firefox-62.0b4.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "d5ec7c8b509370002108a741c46b1846d03af3805e22724a26d8195cfaee3a5bdf09b1140df2755d43593bdb7ac0eacd68df59348e818cb0ebd102343a30ec4b"; + sha512 = "689a54418fcbba2dd4f827ac7284374001432b5d3b0570f172c5ba2f2b3eec4a707fd8b7e8a48f8a2ad0ed210b45a6f3dc503088e1d0c091a08e5545535daa2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/et/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/et/firefox-62.0b4.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "aa3bfe0fffe0ef16ac9ca5ba50374eacd82435a2b2625999e1663f4335dd7f0ff56559ef43247d858e85f7c6bdf8c2dc971ee7cfdf457de99ea0434002c40571"; + sha512 = "6a3bbd7a80c6525a0802f6264ef77afc7ebeb32f0ac5b2c9853220f6b358132f487f7bf9c086b91487506b33972c574b669f459a1d2bb1ed224a2e404eb96a8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/eu/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/eu/firefox-62.0b4.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "d41a08fdb3188c6e9c8c97e3b4883442c9ec8e2c4915c179bdef70af8da8d31c2750b8128298de9fa9a7aaad1ed2374ee91285057eb5e80bf22845572df6292f"; + sha512 = "fc86784b49bb00ee8d9c56493f4c34dbcbdac6f6cf091e146e50451f6cee407fe91658c099780c908e07147688cad183f930650d60f9c764404afaabb12f7c31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/fa/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/fa/firefox-62.0b4.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "7fce80e993a00210aff7afe4f75b19e55e39e2ccdaf6346186be1fc508df298dcab101da349c7c243e736a2e3d4b5ce59a7ed88c5f5602e2263d0bde3406472e"; + sha512 = "4257e8ffca675460b1286f69699997d82f0784e0196a42d1d2754bd83e64dcddb35164569f5d5e35d54ed22f700b67cd8807656dd8b97239dce698a7b748ddb1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ff/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/ff/firefox-62.0b4.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "87387872c03dc64afa6f92f36614898de6d22f946a8f65ee8647a1b80705e180dc36688f23285a6db8fb57056ce7d6562251cea9bb44bf9dc60a2c63c6d74399"; + sha512 = "b093cce19803e99abf8fa1e528cd698aa416af11b0f02d8f614901ccdfe34691edb27d1135a425c6a4303f5b854934699299cd8c615b25fff45bb808aa37b5e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/fi/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/fi/firefox-62.0b4.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "d09dcb33a339c274c9559a3835ce376e0dffe4bdba6c80dd0de877ea3324a3ed752f5bb7e1f28eba3c5ff48cf0fa85f0807756edf8bbeeef22bbb163b13bd433"; + sha512 = "c1cbb9a164acf9afabff02f28f3dd57e603fb67a68015e3b6122301b586c80dfdb6c592c7d8e7981b8c7a32a270c3cde4efdf425ad0358e7eff74bcb7d34f437"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/fr/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/fr/firefox-62.0b4.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "5180d006c4fca181bf96b5cc2a36f6668398ea1670b3bae4ca3802d30e3e7f6a0c9f0bf26ee4e8596bfaef451dd3724dc0e16e95eef5d5117bd67d39a0967ff6"; + sha512 = "aba118ef5690d34a077903b337ecee80080e1d5f6f049c7fcfc86a1b61cf45376a7afa313b6ac49f118805ec6a00937dd775cd8ca0bb678b994aaa493dc66810"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/fy-NL/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/fy-NL/firefox-62.0b4.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "7f95c5d348ec4b9881a1c0f2a6d6b0b71f98f007ee9237ac11a5aea0c05266ecf9f2b2a1df6cae7926ce338e04e2930fa41ca394ad6d6434c2eae225e3d08276"; + sha512 = "b61bb9041d87097e79eae24b261ca1833fb24a8e7cb55bf78585891e4c801262bebbbe6d80aa5674fd646cdd5a294308f3337d855bae18ae0c73ba2dfdfb6794"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ga-IE/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/ga-IE/firefox-62.0b4.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "fd264de05253312e94660883857194c80049435398e39cdaa45d7c06f2f39e356903f14d27c70899f71d79aed22286476ef65fe18737810b767875d8557bc67c"; + sha512 = "fe1d2f3a2bf65ee6a6bad59d9ae8a3b2304b5c692119dd3dc973ab859ad78861b3bac1d83b8ada5ae636016888353664b30960ad9f2c777b5886de1ac0cc9d1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/gd/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/gd/firefox-62.0b4.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "a82e59321fc99f0b853e8febaf74ca709572473a0e1ba80c450b83bd213a27c0d3a42e13958d239ed78078abc22b518c19f15a9f6ed95b2799c0b3644aad724f"; + sha512 = "4324ab43189fec62f049f068ca85bf50c89485e10fe9c17c3be54255ac25556014a03d437fd507c596cb19b505cf960ca051131a734b4b5254cdc34848094050"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/gl/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/gl/firefox-62.0b4.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "f2ecdfded32e7a99d225d6e535a24d0e7e73270020d0a16abffaa05a5553a309ec412ccd7d2fc45a0ea3dadd7a46f78279c1a6a79f884f00e06d9502e26b05a4"; + sha512 = "0d3269d9c4fc59199a6c6ba1bd8c0dc8d5ca90d8791c6e4a108d3275b6954caf644a7a3e47c814d5164df2a210059b9ec216cd5c000872a619c3b6d5fdc9aa51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/gn/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/gn/firefox-62.0b4.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "3e807ffd78b3bd9ecb46f1c0f26b69be6108adbce27eb6235fd8d44c46ab8555dd84fb626a40c361ff7a93a233b03ab58754430fbdaa9d059da338decc45906e"; + sha512 = "2c0970aad0e575b6cad11b2bace12058bb26e20388a1b1d9669905f8422a600733261ee3e2da72d1096846d231b0f482ccbe5b2c4dc0e44109af4eeb7854a70d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/gu-IN/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/gu-IN/firefox-62.0b4.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "50edcc06670da6e41903cc476efb66412cdb025e7dab4bc6777743f0ca59c9f8aba1ecfa445b25185bef69a950b24febf79dd6becb43b8a5e96cc23441285d32"; + sha512 = "7dabcc2cfc77e8d9320b74de6eef46e9db4be6a6ba9ef1cfcff9f5204771f3019fe899657593d8d3ea4c3d9a1cdc2deba7a3cdec58b24cb42af2c4e77a4d2bc5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/he/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/he/firefox-62.0b4.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "dcf02abacc28fa133db89513ed696d9063c263edf46e35e920804e1ec059c673aa9174181f96809c844fc42738a38d3c1abd7b0e1588b8b501ceef874382b103"; + sha512 = "2870a8c7b1854c5f5db99860d49b129bc3e59eb1dd65dc8ac04e7f1a6e04c339924038b316e10e2bee122b09a28646b20638dcebc0f2409fec3a711816294d67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/hi-IN/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/hi-IN/firefox-62.0b4.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "06d36c3e16e66c5d5a46c1fff49d7e42316a9cf0de734582759b01489a73b51a0e338db104635ae941a206ae18749be124ee7ce578517306f898b2a24e7e9d62"; + sha512 = "123e4c13bf3667ba85d5690638748a6d31f1f093c97e689883483ba52007d3ceabd153b7e2521390eda5a0db53e19d521ad05c029811515c74ddc8d9e6d5301c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/hr/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/hr/firefox-62.0b4.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "77d49817ee73c36cf4297a0e0d97fb54f4551051a444c61ff15ea8f4de3b10f842307ca5ea58d588f571e967b3abc1a2a8a5f2cfcc4f08e3f3e745c0a2f8b2b4"; + sha512 = "70bef305d773a716e845f180931f1b1eece7fca71533cad1ecf08057f29899e89e13fb319bee43f694fb8c8ed89eba8d4dc6d26f1bc5e41850e8f3b40d082520"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/hsb/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/hsb/firefox-62.0b4.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "07578453be912cda63cb87240aa8254b87a64d119339d9f1a89fa64d397391f03e99d3177e2a0853f06f78e1008706735c4c8eb835b627cd2322c404c6cc0cb7"; + sha512 = "9366e67cda419cc6188e6a3e7b63cbfc7145f0cdcf371604b5d91ebf2c5e68726e0bb914e316ac6773a16f57b49dec0e382a79e0e548c0ad7497a45f6c95d483"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/hu/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/hu/firefox-62.0b4.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "db3646504427cdca82196a6fcd56b133e06a8630dd3b55200a9627dba91adb2ba5f2d4747742cd89f1b4eda70eb95d06a229a5b783ccb68aa52aa40c6e69086c"; + sha512 = "2bc383abd969fe818dd2164d7881c8ba3a8006c8fab9f51263e74459caca06d3f79dd84d28a934a8ff0d67c45fdd22186b380afd25f0e5788342f105be6c127c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/hy-AM/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/hy-AM/firefox-62.0b4.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "359d64594bc2009a4aa71e0d49406e87a071c312b78b51b82a5bf1501b3e75fa693029e7999846f2d0e204d43525a18d3bec5370d04c4fa6d27de0754950affb"; + sha512 = "880816992836eef7451ce22a2dc9cab08e2ca128ad7427a3108e02bb85748663ee1a041a031bb0101efe84e7aaa53ee5120d4a505d2030e43a8f671bccac39c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ia/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/ia/firefox-62.0b4.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "dde35f60387a9ffe930f77638660e7765e3bcad00116e5c36b9256f06af61966758679cdc27b254d43ef12a1a3ae0b3d5cbde7e338cb3e4245ab60bf29792d9f"; + sha512 = "587d4c7553e55b695d836ec982228be0221d14e5d46494cc89c005670fc9d50694a633d748a6fea1293d3ac6c9646af614690ed9db47b3f63c526e55bc66b07c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/id/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/id/firefox-62.0b4.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "7d480fb09f3171cb3b7fcebac9a548c16622bbd19822de288def3e6d3cfb56eb68aeb0c23de4c1c74e303a5491a0a818dbc420dee6d117f6734ed8a3018f4f8c"; + sha512 = "973d4fb6e2232981493d387deade949f80adb9d6359ce7b2a5efecb57407aa4cca5a6277b137341405ee5316d2efd97b5ee1021bb5b4202c7e578a95862490fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/is/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/is/firefox-62.0b4.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "fdeef94f70504762ae64060590cbe59804aa1023d6b9095a96c87fa06c42919e36004917228219a012a3036fe64b6550d0f6851c56e09d66472385ba8a9764b2"; + sha512 = "94c4c17968a967ff15e1495fbb2e0e47daa27e4495fe0e288b758698bef0fe4cb60374a07a6ebbb9e1e59e523c3664df34895b6760c331dde8f5e67a586c88e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/it/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/it/firefox-62.0b4.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "446f92129d027d4cde2d34d3b5fda8890a5461db89a95e1f456f0beb8b59f77bad0306565062307d2b02c69504376e31e933955803ea0a08e8c9de10077c9807"; + sha512 = "57509c7305c8a8b5c93849a0a424e54cd3f4ddd1f92c580c866d284424bef1b9511052410e0631f3138241fa37a9ae81674f29b96064162638c872103b91e7f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ja/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/ja/firefox-62.0b4.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "0bf6139ddc700056295969d193b1663edc11c22832a789edf1010dc979f8da2d08f2c58ef67b37119dbf80fcb6b0564db54d1f15b6bbb94ee43d01ee113a11f5"; + sha512 = "2f6e64693bfebe1afcba936cafb7e93f068a96c63bf38a81f3d3ecde8b5c27015119b67bed9c9dc2d2659d63d5f0ba73cf4d13408662657201910deee1d55a14"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ka/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/ka/firefox-62.0b4.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "e1d94e02cfa454564a8d57f7297337189157bb4632f603f41678b204fd52c25b46c3bc2bb445fc947baa50a9a23aea287b747998ed2126a1de77f425637bf2b6"; + sha512 = "7e154e77f654cf588febdf8a128c08fa2e7989b29b574b69f4db08df64adf6e4c333483f705ad8e4f908701dfa459471eaf4c15a269907e122aeaf7ee3e2efd3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/kab/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/kab/firefox-62.0b4.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "3de3ab72850763d06ea987fe92841024121f245ecc2c3e5ba44904bbbbc926063ee104ccf287a85cd88f189f11dd4fef12e3917c2f481659a03d99ad90ab06ab"; + sha512 = "81e89c3049941f52ddbf891bf1baa0cdd72e42fa83b5258845ed186d998b3df8e28b211f409cd58584a77216557de5098b6e33abfe4a7c4c322298638e6f04db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/kk/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/kk/firefox-62.0b4.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "7ae95f7a83ab91def7b2d9c83777f85b88ed5d4507a0b4c2b1258b46f38c08e6db9506adde4d8343cf92eafb595506b8c9ae6eb4c4b7c0735c367fc583d2f933"; + sha512 = "51d364f5f9cd2f93dbf410082c5522cf13022c8a60467f121a6f10de76f25c3e6ec66f28e440115f853670731fae2c32af79ee9d339d0ba1e5a3b32710dc8364"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/km/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/km/firefox-62.0b4.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "adc3ae9055915eeadd5f1c7b3c76a562ec4043a3e73d6f0885a8577d9bb86b46ae4df2d537c920d9077b9cdafe14c78296e22ff76e18bab2123ca91c37df2479"; + sha512 = "3b310d38d64b939ebf5a9546d6e4760448b6969b45e80b5ea9abe22e71b647f3126d2b1b3272b9f81a9d46f99de22b24ba56789f098fe4bfcbd682c552f26e90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/kn/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/kn/firefox-62.0b4.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "b005a955cc8d47d9e00605fb02b508ec7153dffb5c4d0e5a49cb89dad8f7e4cafc4ce0c3208076e80611f35bd4ab8f8bca07e5112219a6a62aa87a2966342fe9"; + sha512 = "1468661363c2ed28c47c7efca36ae0ae0a4dca0dce8e664b77e3e69d68bb0be280a9cf9a06e97013cb98f719604869b83bc6abdf8493eea1459083cede8d69c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ko/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/ko/firefox-62.0b4.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "96c1191ea09841dd73c7e0c0f25f0cb0a31cfce8d5231a18df7c54190e4dc4c6bda9fdc23b49d3c7de54ed179b0c6c876f4932f01f6dc0fbd79b5a97104629b1"; + sha512 = "c4086c8167d02e20f7f7a8929ac669aa5d2a19e85ab0533af4dbbad007e26293aa5c58be71ab27037451e01ad8807d10305a35a8f31a7207ed484185a22b02d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/lij/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/lij/firefox-62.0b4.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "a457973ea05899d64bd691509fa1a0e915747015111e1c146b366cb3cd41d20563bfaf0d034b8935876dc53b80a02fd4b0e9c0a693a31a930fe6c70bc675b98f"; + sha512 = "4fd6494d8865351e7ea0067692b2b29348f06648f6753801728e25cc76c65312d6753f5a54ec5b2c7fcbf37df8ca52c1d9c89d661484fce800ea47580fd9a8ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/lt/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/lt/firefox-62.0b4.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "ea78673f152de3a08964db5bd9ce91a77c1725a947f6af2b074ef73987297f3f48fc37b11ee8e7b4a8a9f5369a99f56906ab233a3615b462dca9eeb4c71626ce"; + sha512 = "70559109b4e13cc780ddcb50a4ba46bb789bfe146dbe2cd3470f93f6502818aa6fa4ef78779fabe58644f0925c8ac1a92312de5a0cfe228669dfb20f6ccbcc8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/lv/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/lv/firefox-62.0b4.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "6cbcadd3ac50a21409e83d1c60a533559602824a1deab1b3b66d89479f43dda4b44abbcdf4795fbe5291e3e718a5574d88388d66e8a79a842ad1bb29febe8e8c"; + sha512 = "9f934d6732857a3cbd9495e2e70c887a4435eedd845658583826f729cfb8acd2731496982805d87abe3e60f01e7ba8e9c56fb0c199dc9c9ad8281ab62eb6da80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/mai/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/mai/firefox-62.0b4.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "8159ff18abf68b9d3dd4744913fef67695cd98ff3e6eb2b7ff727c53a34949be9b49986e6a2c7b88cc1163075dfa688e263b7340ed378dbee285c03ab4cb9af5"; + sha512 = "174981f8800a4abf6083408a07025999e2f13b07d623b067f265ed0ecdbfe7b55092364fda4c640f91d185a683793a798b215680434c188445d226629ed26767"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/mk/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/mk/firefox-62.0b4.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "e5f1e26acdef22b51aad608950dd1a0d459c8fbb0f0b11a73bef67bfdf645366a56bab865a198e48fb8ad5a082cdd03a5b2682469c383044a6a6863fb5ebe295"; + sha512 = "29db4a8c4e78410ae5b1adbfedb37d91dd64be7b5a29191b82c8616094bfdc928f0be64a6940480cd6a824c19cea8cb7456cb7cd77e063e52bca3c592e095441"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ml/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/ml/firefox-62.0b4.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "779d447f6457441c3723862a2487d5c807f709d234b07cc5f4308a4da39945ec872793b0868f7f8fca684b63623f05f03bd51f9ba7bf37818a7505b11e9e4c39"; + sha512 = "a68d7ee05b17ed4ec7b25894a5b1916cf25da214bee2a5fbd99210290067ceb8b4d2547992d7f0337e9da2fba2d71fce522dbeaae4aac8e34627c8319e01d396"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/mr/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/mr/firefox-62.0b4.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "e42cd6f92c9c5e3bced29c7310c571dfc2a13fbd0295200695ec1243fa94a4ef57d8b0bc213da1acc5c0004ad5c608eb84e3b8d8d3a7d4c0b9f46c055d22b80d"; + sha512 = "098d4088370711c5d6c23900d3aa20167051712f543ac16de2a17f180b641a516695b303abdf837ecda1849ad34c7ce181b65fcdfec2d28ec529e9e3016b89fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ms/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/ms/firefox-62.0b4.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "b30f42f4d4824b8bfa0a31bc08a24094fec0c12dbe91449c263295c1e349a59bba04f13c0d0fa02884c673b3627cf356d567ee075bea401139640a814cebb7a3"; + sha512 = "0130cf6091da988ca7145f5ce54854ec227b0afd807169489364a941318b559d9d1c633aa35eebad71adb57228be12fa1b64870c512f3637ae93a8c28db80261"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/my/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/my/firefox-62.0b4.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "c3b3307bd8668e5918857860a639dda21969e2ebdc35905faf4f5788644ffe4973b99585a3966e4e127715ed3654f9d5151f1d3d7fbfbf6380f74f228cc711d5"; + sha512 = "20b2f56a9aea54ecd2b44918a1d2a11b9378eeac3e36e6df772b1727a8ee725a3cdf225f4896a0ce2e5fa9a6160d0a9b9605d5d692a2c0f5b987e1225bfc55e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/nb-NO/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/nb-NO/firefox-62.0b4.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "41776a30a2345be5845348dbfe5146dc1ccca4ace6fe5cc152fa7a08ee346b2e15be3a3b35f27df49ed1e199d43b6f70748a8e0322877386374b4678648cd912"; + sha512 = "7aa144a252c46ad1225188ffccb5564091f3c822858b94b48ec33f0fd98941e6af29ceaa2abe45200c8ff06142777e0adf3e4364c83dda6032ea9352fa829e2f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ne-NP/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/ne-NP/firefox-62.0b4.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "4130075d9546cddc151e2cfb3deb45747173009fd56ff01ad7b6c84f4de48cded9627bbe8e7cf9b3993fd4438904d78259ac1d75013afa6d48c7f81ddbe2a42a"; + sha512 = "2b28d4602c16d3cef09720e45e2e8b3bc00f5ed6c14c26ae214d1c40bebe7051e11661e757496f3a74bfc9ea172dd4537465135426d5173126044f4da89a789e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/nl/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/nl/firefox-62.0b4.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "0ea7b52e6e065ce99ccdc7a2a126af8a2c5695ba5cce5504b308881450bed0d0744f445e0193300353b9a6497b29c1f20fb7bfaddb78582b478c6fd7225dd506"; + sha512 = "b1b9dfafaba77c0d7e95294bf1932398fd60ca1cfc4d35791a07d0070dff98289cde194259f335247e8e54777ebce2c5f2a2e8f722b43145e60d06f8b6de4e7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/nn-NO/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/nn-NO/firefox-62.0b4.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "3cc74dce8034e05d8839a7302cb755200e1bd13768fabc33281bc6d698a4311b4af4540fb407fbf2df71353e746edeab6ef33d9490e4851d615dcbabc5129d6f"; + sha512 = "2c3b7eee25b2293d0c1446725168313664d4615a4d3fcfd0eefbd90f6274813748d65a4e8f67f24eb3b8803a698d611e8211854521370a0dc3a8e267f5d6cd77"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/oc/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/oc/firefox-62.0b4.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "eada735c781efbf19f68c3fc92dd0502a6be3eaa1be3363499ded16d7ecf2ff55c8b3922c18bda74f516fde4f827946989eedaefe0f89b4f1378c08c8e4a60d1"; + sha512 = "ad8ac5f95b2c88aa467419f986f08476c21bc3e18498cd7983b76b912317154d3c2eb09d0a503bdc3450ef44d2aa693d1d3d89b1de25982456837980a13283a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/or/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/or/firefox-62.0b4.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "85ca6b655f77ea788d0a7f35cd0af4c498189dd9b0b69a02f7efbd57dbdbe7de48d20f1b74487ab03a136a6c64f9606a1ed3472c7510107f4dc4a82473873152"; + sha512 = "72e105ec8569df27968f758d3c22ecea3a720cf24a68a88cd6dad1671ef9a31a6ebceac450da1cb789f46d4142943f9c82a6469ddca4cf3cfc1d0a4921abb1ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/pa-IN/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/pa-IN/firefox-62.0b4.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "1a953691cacb7aaced202ee466e217feb66a87eba5789b77beb98cf4b8636d6f4880f2a3608af9392e0363e596588f2cd6362553ce301dd26d16f5cdc62c9266"; + sha512 = "1054ac6d1775aa26174e3a0d3e208e81631c27fcab86cb5a2ccf5c4f2df1dfaf1da033d85dda67a188f3ce34f11196f8753567755fe24d58b8d41d913cd8688e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/pl/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/pl/firefox-62.0b4.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "298dafd3d49890c295ed24e525424cd8eede31bbe295509e5eb24e815c51adc79848d391af61c35cc79be30feed2990acee9bdd3f8029b11be2dcd8090f43ac2"; + sha512 = "4b59a52368787123f989b8a2ce5bca17551dec86ecdfe686c96a0066fd08b7f33f304bb852d9ecd586b457ef3aea26697b71ed7c022f805eb1868461f269368c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/pt-BR/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/pt-BR/firefox-62.0b4.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "fe779f5e6cbce2be6c12a934a2b83681ba77bb570a75c2b9d7d68e27c34823dbd88c14e75543900c38b1edad440a124036027dc8756527b9db0c7bdf26829b30"; + sha512 = "6fbcd59b80b7ed08aca60d0cd5620bc43498f191d4aa18761d2d3076e58c2724a5b6a43a1a112f6905df2e7d8d327e9775205e38e753e7c7e248cd8ffa3a8857"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/pt-PT/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/pt-PT/firefox-62.0b4.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "9423cd6a91564aae4af0dc53db5cee24a93f97bdee5c6311c0bd798395312a583d4a1e45ce49516a37cda3864e38b0f243b5502cd380dc9fee08512d37573bee"; + sha512 = "3c6827d187b0e1f6efad9c44e6d9c92d6ae087a843b62d19348916e4ff738505f306d6762744e04b9df8c0eec7042e6c3f9280e11e82df376ce9b5f50c322f4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/rm/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/rm/firefox-62.0b4.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "49cd84478b01cae06135706e04f43768d989ec29cb418595476bedb97c1af9ff5e99cfc1e2e13a0a447ca4a6450ee873043c612da76a9acf4e1cc834db40976d"; + sha512 = "06700f88857ee9e88ef16f4d2e9d2ab10a2a5657f105ccdc316e53a236ce6dc76fd570fcead24cedcfca253dcf8302ac9fa4a9c30d839ee0d3a247d555951b20"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ro/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/ro/firefox-62.0b4.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "0f84b684db2d68be8d344424f8ad5bd3bb7d4b9e48304bb305d6cb5c7622cf2243a301a51fb3544c6fc3526bb4c17088771d1cea86c142fad6d8aea4323dee3d"; + sha512 = "56d7cf7b47a883c6b2320000a25fa1dc85eb9004b506b9493e1c0f3d5caee386218e4ea0835bb41dd5cf0cd7247ec1c7b163795a1cbd62aae6e62eff3b62cd76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ru/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/ru/firefox-62.0b4.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "5620a6765d5c911c825477129a7fed51921ad0c7623d81ef8554c86015ace816a38ed2a99ea2bdc9d04144aa301eee8a22d4a773a80fff642777268c2885ea12"; + sha512 = "01f1c97fd97c1919bde9eccdaf436e9b64b05d9808d39b788bcfa3f61e2785d24e4e9194172c6b5e7204b3cb6f55b7f2b48c64c43d4c460d3906ff7944235bc2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/si/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/si/firefox-62.0b4.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "fab980c5319bf1e09d9433fabeb48657929430d79154817e414b3abec731271a5444485da7b4a4639564f2cc1e0ac1c862c6e048a7f955f0e8282f3fbcd6a897"; + sha512 = "81a429590df8744f2e35c1e52edcd991fa178dca0bc49c1f8711ea80598b5d479dcaf5cf45b3b0f3a2f156c29daf81b38511e4de5caa3004832d43a0c35e8d21"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/sk/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/sk/firefox-62.0b4.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "d83016d0992f3f2a707623e422ad98b1fcf7ba2e0f48524ce188ac68c1e9e1174a3de95745f3a1f804cddebc790f4e46f1d6184b5ba30e5b839e208fa83d0946"; + sha512 = "59298d7fc6832fe3ad202863ab0ed075cd891f45d0f56e0d32110957bf8e096efe9942c166e9568a0e5ac2a727688d360dff0e9f4413778dd35c72f0de3fa14d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/sl/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/sl/firefox-62.0b4.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "e659376911924a58ad5a8298ae98787307d133dcde179c8b1f358e929e7321dc87eec8d2a601f4dc3aeb4cdbe1105309fdbb9efdfd3d22828d5ae6e9f627819a"; + sha512 = "681acf5683cbd03f3fd66939e6b41e818884787d9c66f363ec191eb3d3409b1a785daa8d63dcf9d6a3949b0414c9670d510d1f50c1b44f15a686889ce9d1f6a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/son/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/son/firefox-62.0b4.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "8ee3e51d3549635793ada4af651c063e3440e0a5bd4d88af15d33c783b03c97c553cad06872b60cdde416031a81816b546c3452e07e93535bd97c38d3f278833"; + sha512 = "f7c8ab69638e6ef2fadfc110eb10553eca7bb52b376cf8acc43462a53a6402b73f9fd44bb3eea4809b84c076f0fdcc9ae16856112d3d5467d846131b6762c585"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/sq/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/sq/firefox-62.0b4.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "ac8d9f7ee122c4362a1efed25137ea34fa2125c563d150c3660a079b9c9af35eb3a90f0fd96cf5fa3747df71e040f99953847b065ce6a3b568e3d5cce3884cc0"; + sha512 = "2bd0e473620e369b06704ad585d9078f4cee0795dd3e1fc08cf873a79add41a7e6bad19ab2a09578a69b20b90fb6d87dc78e149d4ba248f605bab829ccf7ba4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/sr/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/sr/firefox-62.0b4.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "d044cfa14abb017c042fe41bcd8ce8acada46c461afc308bbf3e8475c7869ea228aa7cdcb5c18d97f49fb4feccb691ab5c13232c944b900ad478bce08c070232"; + sha512 = "b8dd63dca496c86fc62fab21b9ff8700f262b5c2f7a711ea005c7803286d598baaca369513514a14057be0b181681a5ed8d8bb34dd9e40900e4c3b8bf042145e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/sv-SE/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/sv-SE/firefox-62.0b4.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "ac3e16d233061a774dcca9ae76f6c2f4ba42b885c771d3da1186e1329735efb1fb34e7672a050058cacd2d3db7f4bf4d60bcfef77529777a7ff10ac7f93f30d6"; + sha512 = "39e3c33aa8f5c724e1f1abe1acf72002b0b02e1f32a6a84e22b34ccb81320dc4cfa58e1fc698e003d95520fdf668e8c2059a31826c2a62d07c80f2040690c921"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ta/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/ta/firefox-62.0b4.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "89dee1fe6edaa32cd5f5eda39ed175a3debc23de44b116f8de32e38e1827a7ac30613614ab3fc6401165db0d0486db3c94045750e37294a43211ab9718b26911"; + sha512 = "86813002178c6c31ac28f34d151df9a9e93b9f2ce9578d269672d2c7c65146eb9f2ad95ef0ea94d81d6e4e4756bd5e777d3ee00cfdce00f25df9fd8ea8e230ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/te/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/te/firefox-62.0b4.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "3c292980d3ff21d59c98d68eec743d397cd76516561a610d912866bc25f0dbaa2db70d76b7bfcd94dab21cf86857e134f9ddd5bb85b5b38be86d7987c3cce1c7"; + sha512 = "7f36a3a6199e0a13cdff561e04eb2f22a38d66a2ec8d753e69ccd4c225522116df0b4b2647e47aa1094a806a431555bba54ff41ab7758d109e494d7597e1599a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/th/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/th/firefox-62.0b4.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "867b8860acb1764cefe3b5b691beb9a2c521f0738b927b41c896517ef7712d6e082eb15272b8aac3efdaaa103fcdcd57279ae71096b7a94a851121f7e7103ff9"; + sha512 = "dd3336869dba11b688260248507fec542ae4802fa85b488a904427d302bd38320a52624a3d2508b6d12b724d0517a522cb60c88fe97b91f16275e0692b11252f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/tr/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/tr/firefox-62.0b4.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "56416e1fd7ba25d1a6d0b65e5a6f0035addc2d8c28145c6ee91a2dfe8893f6fbdbaaf82a05304b687512e4f6f1b8798e9c83bbdf6a1d72bfd32a85710b5df91c"; + sha512 = "77aa8455e70b733ba7a3e30f4b7ce2832a726ca09c78a69b66bb5f8fb71697aed6d63dc514fc72c6d20ee82117f44a4295e1bca4695165f4673c0d2ce451613a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/uk/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/uk/firefox-62.0b4.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "c228886955089f11567361056d6ddb043617e4d48613592be7d2ffae5cf8528a7109eb10760fcf7d731aaf26d1c6ce92cbadca32013864c2a29117017aa3552c"; + sha512 = "c11cd9a7aac75d4a8aa3762fc2a08cb497208d74961de8307b46e2e541793eadc9d43da4dfad00bbcabda23635a84fadb157f29c626889582d7bf43b21b5c0b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ur/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/ur/firefox-62.0b4.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "e10d8c5e1723148909ba855c111ee077942a8d5a3d8154b10349a718a8fbfc44b3eb366a95cbf30aa01e71f9123dabad27b29513bcd2dd31dd7665aa5c01f060"; + sha512 = "844913f36a6c6a013e547aa6c8c870c6eaadd46742e67d176ce4d8de9c5a48ff2b6e23f69dbc8873aa92c034c54debe66ed016ed987286fd57f285df2cbb38d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/uz/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/uz/firefox-62.0b4.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "d2ffc996a3bc7eb852e4627a4968d6e48ea3b5d7fb19c756f90d42b0da4ad6325ae5bfb23c8feab969a3fac96e5712fd1fc8978949d59f677a9bc36f3d440d90"; + sha512 = "2bc554da1820f335b457ef1d0348031d15130550d8ff5d90dc19b187a25dcc169b5ef8ea995b335a5acc420bf83e2cfee852cdeaff9accc14d37eace1946fcb8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/vi/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/vi/firefox-62.0b4.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "d6c045e3fb066170da74b347fe75542c34a9c7eb758bb6d85a26313b7a2d1183aa3d1a65088bcfd1dc675c44fc0532c9d6779f8b1f11236cf2eb8c287fe17af6"; + sha512 = "4c1ef2a6f39fe0c6e995ebd95fd9b33d8919f2368a84ca33e84f9135d54f303d1dae51bc2464c01484e23e6dd11fd5adf97328ead860fb918aa67b8c2a50c46b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/xh/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/xh/firefox-62.0b4.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "169196a370bc41bfc6f03c43e70d966ec2dcb10f2727ed3750afec73df7a33875af20dffe3bd1f2a97671af23b028f9de85281245f92243db1bca44361be77c0"; + sha512 = "ee6686a592fa7cb123d0ae14bf6817e8d7f3fc8915f965c57f7c2f6d0e44a67ccac1daf3ca3491f37f93c7c68887b758e3402cb1545e083889a4f256c6d4ea07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/zh-CN/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/zh-CN/firefox-62.0b4.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "3f1615c4ae6cc297c749c01f0eef3620f0a789220a1f4bd052a42e3e92a3a32ef141ada45c204ef5bb3646e0a1964f1e580e149280b04e1189b8e6c6e1fdc733"; + sha512 = "71e60211409a5828e9e1f0d2fc763f25fb9ef055f3e094946fef294d30d435096ce156d5433dada29d9e1e53821c98e359d88ba310d39ffdc21e50015dbb248b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/zh-TW/firefox-62.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b4/linux-i686/zh-TW/firefox-62.0b4.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "5f82822c82b0efeae25ca083b27a3054136a5b881139bec624764171bc1e91c352e688655006e00aac039b743273dac1155ed6312ac5f016af6ca18bb969a56a"; + sha512 = "7836257192b91ecf2a4a441328f05761e559e19e313032973eaec5b9b4b29416705cf1235b8eac468e92fe8c795a517706825404b924155362c4beddd53891af"; } ]; } From 8b312db421ca99797e60d76201f607f75c80af48 Mon Sep 17 00:00:00 2001 From: Okina Matara Date: Wed, 27 Jun 2018 18:33:13 -0500 Subject: [PATCH 51/56] dolphinEmuMaster: 2018-06-22 -> 2018-07-02 also migrate from wxwidgets to qt, wxwidgets support in dolphin has been dropped --- pkgs/misc/emulators/dolphin-emu/master.nix | 77 ++++++++-------------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 29 insertions(+), 49 deletions(-) diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index 3bfbc2565f3..6959177b3c9 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -1,26 +1,16 @@ { stdenv, fetchFromGitHub, makeWrapper, makeDesktopItem, pkgconfig, cmake, qt5 -, bluez, ffmpeg, libao, libGLU_combined, gtk2, glib, pcre, gettext, libXrandr -, libpthreadstubs, libusb, libXext, libXxf86vm, libXinerama, libSM, libXdmcp -, readline, openal, libevdev, portaudio, curl -, vulkan-loader ? null -, libpulseaudio ? null +, bluez, ffmpeg, libao, libGLU_combined, pcre, gettext, libXrandr, libusb, lzo +, libpthreadstubs, libXext, libXxf86vm, libXinerama, libSM, libXdmcp, readline +, openal, libudev, libevdev, portaudio, curl, alsaLib, miniupnpc, enet, polarssl +, soundtouch, sfml, vulkan-loader ? null, libpulseaudio ? null # - Inputs used for Darwin -, CoreBluetooth, cf-private, ForceFeedback, IOKit, OpenGL, wxGTK, libpng, hidapi - -# options -, dolphin-wxgui ? true -, dolphin-qtgui ? false }: - -# XOR: ensure only wx XOR qt are enabled -assert dolphin-wxgui || dolphin-qtgui; -assert !(dolphin-wxgui && dolphin-qtgui); +, CoreBluetooth, cf-private, ForceFeedback, IOKit, OpenGL, libpng, hidapi }: let desktopItem = makeDesktopItem { name = "dolphin-emu-master"; - exec = stdenv.lib.optionalString dolphin-wxgui "dolphin-emu-wx" - + stdenv.lib.optionalString dolphin-qtgui "dolphin-emu-qt"; + exec = "dolphin-emu-master"; icon = "dolphin-emu"; comment = "A Wii/GameCube Emulator"; desktopName = "Dolphin Emulator (master)"; @@ -30,63 +20,54 @@ let }; in stdenv.mkDerivation rec { name = "dolphin-emu-${version}"; - version = "2018-06-22"; + version = "2018-07-02"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; - rev = "971972069cc2813ee7fa5b630c67baab2b35d12d"; - sha256 = "0kf6dzvwmvhqb1iy15ldap0mmfbyyzl5f14jc65a110vwv5sww7n"; + rev = "87c5d00e2085090e51c1d44e4fd271437123c722"; + sha256 = "04f0my5k1vrj3pcg07m6wy4in4cs95db8367bp7zkraparmj1mjk"; }; enableParallelBuilding = true; nativeBuildInputs = [ cmake pkgconfig ] - ++ stdenv.lib.optionals stdenv.isLinux [ makeWrapper ]; + ++ stdenv.lib.optionals stdenv.isLinux [ makeWrapper ]; buildInputs = [ - curl ffmpeg libao libGLU_combined gtk2 glib pcre gettext libpthreadstubs - libXrandr libXext libXxf86vm libXinerama libSM readline openal libXdmcp - portaudio libusb libpulseaudio libpng hidapi - ] ++ stdenv.lib.optionals dolphin-qtgui [ qt5.qtbase ] - ++ stdenv.lib.optionals stdenv.isLinux [ bluez libevdev vulkan-loader ] - ++ stdenv.lib.optionals stdenv.isDarwin [ wxGTK CoreBluetooth cf-private - ForceFeedback IOKit OpenGL ]; + curl ffmpeg libao libGLU_combined pcre gettext libpthreadstubs libpulseaudio + libXrandr libXext libXxf86vm libXinerama libSM readline openal libXdmcp lzo + portaudio libusb libpng hidapi miniupnpc enet polarssl soundtouch sfml + qt5.qtbase + ] ++ stdenv.lib.optionals stdenv.isLinux [ + bluez libudev libevdev alsaLib vulkan-loader + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + CoreBluetooth cf-private OpenGL ForceFeedback IOKit + ]; cmakeFlags = [ - "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" - "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include" - "-DGTK2_INCLUDE_DIRS=${gtk2.dev}/include/gtk-2.0" - "-DENABLE_LTO=True" - ] ++ stdenv.lib.optionals (!dolphin-qtgui) [ "-DENABLE_QT2=False" ] - ++ stdenv.lib.optionals stdenv.isDarwin [ - "-DOSX_USE_DEFAULT_SEARCH_PATH=True" - ]; + "-DUSE_SHARED_ENET=ON" + "-DENABLE_LTO=ON" + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + "-DOSX_USE_DEFAULT_SEARCH_PATH=True" + ]; - # - Change install path to Applications relative to $out # - Allow Dolphin to use nix-provided libraries instead of building them - preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' - sed -i -e 's,/Applications,Applications,g' \ - Source/Core/DolphinWX/CMakeLists.txt + preConfigure = '' + sed -i -e 's,DISTRIBUTOR "None",DISTRIBUTOR "NixOS",g' CMakeLists.txt + '' + stdenv.lib.optionalString stdenv.isDarwin '' + sed -i -e 's,if(NOT APPLE),if(true),g' CMakeLists.txt sed -i -e 's,if(LIBUSB_FOUND AND NOT APPLE),if(LIBUSB_FOUND),g' \ CMakeLists.txt - sed -i -e 's,if(NOT APPLE),if(true),g' CMakeLists.txt - ''; - - preInstall = stdenv.lib.optionalString stdenv.isDarwin '' - mkdir -p "$out/Applications" ''; postInstall = '' cp -r ${desktopItem}/share/applications $out/share + ln -sf $out/bin/dolphin-emu $out/bin/dolphin-emu-master '' + stdenv.lib.optionalString stdenv.isLinux '' wrapProgram $out/bin/dolphin-emu-nogui \ --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib - wrapProgram $out/bin/dolphin-emu-wx \ - --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib - '' + stdenv.lib.optionalString (dolphin-qtgui && stdenv.isLinux) '' wrapProgram $out/bin/dolphin-emu \ --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib - ln -sf $out/bin/dolphin-emu $out/bin/dolphin-emu-qt ''; meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 228613358c8..6ae85cdd918 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2102,7 +2102,6 @@ with pkgs; dolphinEmuMaster = callPackage ../misc/emulators/dolphin-emu/master.nix { inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL; inherit (darwin) cf-private; - wxGTK = wxGTK31; }; doomseeker = qt5.callPackage ../applications/misc/doomseeker { }; From a260b3d681164bedaeb90fd578390147799d638c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 2 Jul 2018 19:45:02 +0100 Subject: [PATCH 52/56] dhall-nix: fix build --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4e8f43f337e..ef7e8e4d4e5 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1065,6 +1065,9 @@ self: super: { # dhall-json requires a very particular dhall version dhall-json_1_2_1 = super.dhall-json_1_2_1.override { dhall = self.dhall_1_15_0; }; + # dhall-nix requires a very particular dhall version + dhall-nix = super.dhall-nix.override { dhall = self.dhall_1_15_0; }; + # https://github.com/fpco/streaming-commons/issues/49 streaming-commons = dontCheck super.streaming-commons; From 526103a82d42e878aa41e0a2921efe55b645ae0a Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 2 Jul 2018 17:48:29 -0400 Subject: [PATCH 53/56] darwin: fix syntax in makeFlagsArray MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit the double ’ should only be needed when using the braces. Otherwise this will mess up some syntax highlighting, unfortunately, including nix-mode. --- .../apple-source-releases/libsecurity_generic/default.nix | 2 +- pkgs/os-specific/darwin/security-tool/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix index 6730e2424be..e8d0261beca 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix @@ -26,7 +26,7 @@ name: version: sha256: args: let ''; preBuild = '' ln -s lib ${n} - makeFlagsArray=(-j''$NIX_BUILD_CORES) + makeFlagsArray=(-j$NIX_BUILD_CORES) ''; buildInputs = [ pkgs.gnustep.make diff --git a/pkgs/os-specific/darwin/security-tool/default.nix b/pkgs/os-specific/darwin/security-tool/default.nix index e6846aef750..ff35c292890 100644 --- a/pkgs/os-specific/darwin/security-tool/default.nix +++ b/pkgs/os-specific/darwin/security-tool/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ''; preBuild = '' - makeFlagsArray=(-j''$NIX_BUILD_CORES) + makeFlagsArray=(-j$NIX_BUILD_CORES) ''; NIX_LDFLAGS = "-no_dtrace_dof"; From 907d7518d8d86a81fd2f7c6b85343c29ce6acde4 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 2 Jul 2018 17:49:24 -0400 Subject: [PATCH 54/56] darwin.libsecurity: switch to multiple outputs --- .../apple-source-releases/libsecurity_generic/default.nix | 1 + .../darwin/apple-source-releases/libsecurityd/default.nix | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix index e8d0261beca..25e967bd2d3 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix @@ -28,6 +28,7 @@ name: version: sha256: args: let ln -s lib ${n} makeFlagsArray=(-j$NIX_BUILD_CORES) ''; + outputs = [ "out" "dev" ]; buildInputs = [ pkgs.gnustep.make pkgs.darwin.apple_sdk.frameworks.AppKit diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurityd/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurityd/default.nix index 48bb80eb751..fb3441f7050 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurityd/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurityd/default.nix @@ -9,7 +9,7 @@ appleDerivation { unpackFile ${libsecurity_cdsa_client.src} mv libsecurity_cdsa_client*/lib security_cdsa_client ln -s lib securityd_client - + patch -p1 < ${./xdr-arity.patch} ''; preBuild = '' @@ -17,7 +17,7 @@ appleDerivation { cp derived_src/* lib rm lib/ucspClientC.c ''; - postInstall = '' - ln -s ''$out/include/securityd ''$out/include/securityd_client + postFixup = '' + ln -s $dev/include/securityd $dev/include/securityd_client ''; } From db414a2f5e3a7e7ffd84649e979b628da3cb26ee Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 2 Jul 2018 17:49:59 -0400 Subject: [PATCH 55/56] xpc: copy instead of linking to sdk This prevents the apple sdk from coming into security tool Fixes #42836 --- pkgs/os-specific/darwin/apple-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix index a62182f1d34..d4a48b9c372 100644 --- a/pkgs/os-specific/darwin/apple-sdk/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk/default.nix @@ -160,8 +160,8 @@ in rec { installPhase = '' mkdir -p $out/include pushd $out/include >/dev/null - ln -s "${lib.getDev sdk}/include/xpc" - ln -s "${lib.getDev sdk}/include/launch.h" + cp -r "${lib.getDev sdk}/include/xpc" $out/include/xpc + cp "${lib.getDev sdk}/include/launch.h" $out/include/launch.h popd >/dev/null ''; }; From d568d5016ac7bdf060e4ee255abe7f58937d2525 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 2 Jul 2018 17:50:40 -0400 Subject: [PATCH 56/56] libsecurity: set NDEBUG This prevents debugging stuff from coming into play. This avoids some headers from accidentally winding up in the .dylib file. --- .../darwin/apple-source-releases/libsecurity_generic/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix index 25e967bd2d3..7986706cb64 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix @@ -52,6 +52,7 @@ name: version: sha256: args: let "-iframework ${pkgs.darwin.Security}/Library/Frameworks" "-I." "-Wno-deprecated-declarations" + "-DNDEBUG" ]; NIX_LDFLAGS = with pkgs.darwin; with apple_sdk.frameworks; [ "-L${libobjc}/lib"